Merge pull request '1.1.0' (#4) from dev into main

Reviewed-on: #4

BUILD.md

@@ -0,0 +1,5 @@
+1. Install Flutter SDK
+2. Install Android SDK
+3. Clone Repo
+4. Run `compile.sh`
+5. Check `releases/` Folder

CHANGELOG.md

@@ -0,0 +1,66 @@
+# Changelog
+
+## 1.1.0 (In Development)
+
+Usability improvements.
+
+- move switchtile back to its own row
+	- allows showing text without crowding out or hiding minutes field
+- fix monochrome icons, source was not white which may have been causing issues
+- begin creating tar files for Linux rather than zips, will use zstd on release
+- begin using a proper release signature rather that flutter's debug.
+- update internal plugin versions.
+
+This version may require uninstalling any previous versions before updating
+due to the signature change. It is a one-time event.
+
+## 1.0.1 (2026-09-29)
+
+Fixes for issues on hardware devices.
+
+- fix internet access on some devices
+- fix SSL certificate issues on older devices
+- fix null minutes making a null alarm time
+- fix enabling alarm with no time set yet
+- enhance the icon for older devices
+- upgrade SDKs and compilers
+
+## 1.0.0 (2026-09-28)
+
+Completed the app for Android which also brings many benefits to the Linux version.
+
+**Android**
+
+- upgraded from single notification to alarm
+- platform specific APK to help reduce file size
+
+**Both**
+
+- automatic dark theme if system is set to dark
+- input validation on sunset time and minutes
+- alarm now properly resets if time is changed
+- add optional time picker for sunset time field
+- only do the permission request on Android
+- more consistent verbiage and text styling
+- enhanced icon and added monochrome
+- added file necessary for F-Droid repo
+- updated flutter package versions
+
+This release has been tested tested tested, but only on emulators (x86_64). If you have any issues, please reach out.
+
+From now on only the arm64-v8a APK will be provided.
+
+## 0.1.2 (2026-09-28)
+
+- add icon
+- fix notification on Android
+- allow minutes to be 0
+- show toast if invalid minute value is provided
+- enhance compile.sh to allow easier publications
+- other small fixes and enhancements
+
+## 0.1.1 (2026-09-13)
+
+Linux version tested and now has alarm notification working.
+
+Android still needs testing and fixes.

UPCOMING.md

@@ -0,0 +1,16 @@
+# To Be Done
+
+Upcoming feature list. All notes subject to change.
+
+## Patch
+
+- Change time grabber to a checkbox so that it stays up to date.
+
+## Minor
+
+- Cancel and reschedule alarm when minutes are changed.
+- Add languages (Spanish, Croatian).
+
+## Major
+
+- Add sunrise section and retitle app to Sunshine Alarm.

android/app/build.gradle.kts

@@ -15,8 +15,6 @@ android {
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
-
-
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         targetCompatibility = JavaVersion.VERSION_17
@@ -77,3 +75,27 @@ dependencies {
 flutter {
     source = "../.."
 }
+
+/// To use this, first be in $PROJ/android/, then run: ./gradlew printFlutterVariables
+tasks.register("printFlutterVariables") {
+    description = "Print Local Flutter Variables"
+    doLast {
+        // android //
+        // compileSdk = flutter.compileSdkVersion
+        println("compileSdk: ${android.compileSdk}")
+        println("compileSdkVersion: ${android.compileSdkVersion}")
+        // ndkVersion = flutter.ndkVersion
+        println("ndkVersion: ${android.ndkVersion}")
+
+        // android.defaultConfig //
+        // minSdk = flutter.minSdkVersion
+        println("minSdk:     ${android.defaultConfig.minSdk}")
+        // targetSdk = flutter.targetSdkVersion
+        println("targetSdk:     ${android.defaultConfig.targetSdk}")
+        println("targetSdkVersion:     ${android.defaultConfig.targetSdkVersion}")
+        // versionCode = flutter.versionCode
+        println("versionCode:     ${android.defaultConfig.versionCode}")
+        // versionName = flutter.versionName
+        println("versionName:     ${android.defaultConfig.versionName}")
+    }
+}

android/app/src/main/AndroidManifest.xml

@@ -27,6 +27,9 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
 
+    <!-- Allow internet to work. -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
         android:label="Sunset Alarm"
         android:name="${applicationName}"

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -10,3 +10,4 @@
             android:src="@mipmap/launch_image" />
     </item> -->
 </layer-list>
+

android/app/src/main/res/drawable/launch_background.xml

@@ -10,3 +10,4 @@
             android:src="@mipmap/launch_image" />
     </item> -->
 </layer-list>
+

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 #Sat Sep 12 19:36:23 MST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip
-#distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/settings.gradle.kts

@@ -19,12 +19,11 @@ pluginManagement {
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
 
-    id("com.android.application") version "9.4.1" apply false
+    id("com.android.application") version "9.5.0" apply false
-    //id("com.android.application") version "9.0.1" apply false
 
     // This will need removed in Gradle/AGP 9. JK - needs to exist otherwiese:
     // "Error: Your project's Kotlin version (2.2.10) is lower than Flutter's minimum supported version of 2.2.20."
-    id("org.jetbrains.kotlin.android") version "2.4.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.4.21" apply false
 }
 
 include(":app")

compile.sh

@@ -32,7 +32,7 @@ version=""
 for i in `grep version $app_details`; do
 	version="$i"
 done
-version="v${version// /_}"
+version="${version// /_}"
 
 if [[ -z $name || -z $version ]]; then
 	echo "ERROR: Could not retrieve name or version. name='$name' version='$version'"
@@ -60,14 +60,29 @@ set -x
 flutter build linux ${BUILD_OPTIONS[@]}
 set +x
 
-log "Saving Linux Bundle..."
+log "- zip"
 filename=$RELEASE.linux-bundle.zip
+contents="build/linux/x64/release/bundle/"
 if [[ -e $filename ]]; then
 	rm -v $filename
 fi
-zip -r $filename build/linux/x64/release/bundle/*
+set -x
+zip -qr "$filename" "$contents"/*
+set +x
 ls -sh $filename
 
+log "- tar"
+filename=$RELEASE.linux-bundle.tar
+if [[ -e "$filename"* ]]; then
+	rm -v "$filename"*
+fi
+set -x
+tar -c --zstd -f "${filename}.zst" -C "$contents" .
+tar -cz       -f "${filename}.gz"  -C "$contents" .
+tar -cJ       -f "${filename}.xz"  -C "$contents" .
+set +x
+ls -sh "$filename"* | sort -h
+
 # Android
 
 log "Building Universal APK..."
@@ -99,9 +114,8 @@ for apk in `ls build/app/outputs/flutter-apk/app*release.apk`; do
 	filename=`basename $apk`
 	filename=${filename//app/${RELEASE}}
 	cp -v "$apk" "$filename"
-	ls -sh "$filename"
-	echo " "
 done
+ls -sh release/*.apk | sort -h
 
 # Finish
 

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

lib/main.dart

@@ -12,16 +12,21 @@ import 'package:alarm/alarm.dart';
 
 import 'dart:convert';
 
-/// TBD:
+// For trusting Let's Encrypt on older devices (SDK 24, Android 7)
-/// - Add other languages (Spanish, Croatian)
+//import 'dart:io';
-/// v1.1.0
+//import 'package:http/http.dart' as http;
-/// - Change sunset grabber to checkbox and retrieve it each alarm or open.
+import 'package:flutter/services.dart' show rootBundle;
-/// v2.0.0
-/// - Add sunrise section and change app name to Sunshine Alarm?
-/// :TBD
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+
+  final certData = await rootBundle.load(
+    'media/certs/open-meteo-com_isrg-root-x1.pem',
+  );
+  SecurityContext.defaultContext.setTrustedCertificatesBytes(
+    certData.buffer.asUint8List(),
+  );
+
   tz.initializeTimeZones();
   await Alarm.init();
   runApp(const SunsetAlarmApp());
@@ -66,8 +71,8 @@ class HomeScreen extends StatefulWidget {
 class _HomeScreenState extends State<HomeScreen> {
   final _latController = TextEditingController();
   final _lngController = TextEditingController();
-  final _sunsetController = TextEditingController();
+  final _sunsetController = TextEditingController(text: "18:00");
-  final _minutesController = TextEditingController(text: '30');
+  final _minutesController = TextEditingController(text: "30");
 
   final FlutterLocalNotificationsPlugin _notifications =
       FlutterLocalNotificationsPlugin();
@@ -79,6 +84,7 @@ class _HomeScreenState extends State<HomeScreen> {
 
   String? _sunsetErrorText;
   String? _minuteErrorText;
+  bool _validTime = false;
 
   static const _alarmId = 1001;
 
@@ -107,15 +113,20 @@ class _HomeScreenState extends State<HomeScreen> {
   Future<void> _loadPrefs() async {
     final prefs = await SharedPreferences.getInstance();
     setState(() {
-      final lat = prefs.getDouble('lat');
+      final lat = prefs.getDouble('lat').toString();
-      final lng = prefs.getDouble('lng');
+      final lng = prefs.getDouble('lng').toString();
-      final sunset = prefs.getString('sunset_time');
+      final sun = prefs.getString('sunset_time');
-      _alarmEnabled = prefs.getBool('alarm_enabled') ?? false;
+      _latController.text = (lat == "null") ? "" : lat;
+      _lngController.text = (lng == "null") ? "" : lng;
+      _sunsetController.text = sun ?? "";
+
       _minutesBefore = prefs.getInt('minutes_before') ?? 30;
-      if (lat != null) _latController.text = lat.toString();
+      _minutesController.text = _minutesBefore.toString();
-      if (lng != null) _lngController.text = lng.toString();
+
-      if (sunset != null) _sunsetController.text = sunset;
+      _alarmEnabled = prefs.getBool('alarm_enabled') ?? false;
-      _minutesController.text = '$_minutesBefore';
+      _validTime = prefs.getBool('valid_time') ?? false;
+
+      _calcPlural();
     });
     if (_alarmEnabled && _sunsetController.text.isNotEmpty) {
       _scheduleAlarm();
@@ -133,6 +144,7 @@ class _HomeScreenState extends State<HomeScreen> {
     }
     await prefs.setBool('alarm_enabled', _alarmEnabled);
     await prefs.setInt('minutes_before', _minutesBefore);
+    await prefs.setBool('valid_time', _validTime);
   }
 
   Future<void> _getGpsLocation() async {
@@ -193,7 +205,10 @@ class _HomeScreenState extends State<HomeScreen> {
     } catch (e) {
       _showSnack('Network Error: $e');
     } finally {
-      setState(() => _loading = false);
+      setState(() {
+        _loading = false;
+        _validTime = true;
+      });
     }
 
     if (_alarmEnabled) {
@@ -327,17 +342,25 @@ class _HomeScreenState extends State<HomeScreen> {
     if (value) {
       await _scheduleAlarm();
     } else {
-      _alarmTimer?.cancel();
+      _stopAlarm();
-      if (!Platform.isLinux) {
+    }
-        // Notification Method
+  }
-        if (ANDROID_USE_NOTIF) await _notifications.cancel(id: _alarmId);
 
+  Future<void> _stopAlarm() async {
+    if (Platform.isLinux) {
+      _alarmTimer?.cancel();
+    } else if (Platform.isAndroid) {
+      // Notification Method
+      if (ANDROID_USE_NOTIF) {
+        await _notifications.cancel(id: _alarmId);
+      }
       // Alarm Method
-        if (ANDROID_USE_ALARM) await Alarm.stop(_alarmId);
+      if (ANDROID_USE_ALARM) {
+        await Alarm.stop(_alarmId);
+      }
     }
     _showSnack('Alarm Cancelled');
   }
-  }
 
   void _showSnack(String msg) {
     ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg)));
@@ -354,6 +377,9 @@ class _HomeScreenState extends State<HomeScreen> {
   }
 
   String? _validateTime(String? value) {
+    setState(() {
+      _validTime = false;
+    });
     if (value == null || !RegExp(r'^\d{2}:\d{2}$').hasMatch(value)) {
       return 'Use HH:MM Format';
     }
@@ -361,9 +387,18 @@ class _HomeScreenState extends State<HomeScreen> {
     final m = int.parse(value.substring(3, 5));
     if (h > 23) return 'Hour Must Be 0–23';
     if (m > 59) return 'Minute Must Be 0–59';
+    setState(() {
+      _validTime = true;
+    });
     return null; // valid
   }
 
+  void _calcPlural() {
+    setState(() {
+      _plural = (_minutesBefore == 1) ? '' : 's';
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -462,6 +497,9 @@ class _HomeScreenState extends State<HomeScreen> {
                         ),
                       ),
                       onChanged: (v) {
+                        if (v == "") {
+                          _stopAlarm();
+                        }
                         final val = _validateTime(v);
                         if (val == null) {
                           _savePrefs();
@@ -503,11 +541,7 @@ class _HomeScreenState extends State<HomeScreen> {
               const SizedBox(height: 8),
 
               // --- Minutes before ---
-              Row(
+              TextField(
-                children: [
-                  if (!_alarmEnabled)
-                    Expanded(
-                      child: TextField(
                 controller: _minutesController,
                 keyboardType: TextInputType.number,
                 decoration: InputDecoration(
@@ -524,27 +558,33 @@ class _HomeScreenState extends State<HomeScreen> {
                     } else {
                       _minuteErrorText = 'Invalid Minute Value';
                     }
-                            _plural = (_minutesBefore == 1) ? '' : 's';
+                    _calcPlural();
                   });
                 },
               ),
-                    ),
 
               // --- Toggle ---
-                  Expanded(
+              SwitchListTile(
-                    child: SwitchListTile(
+                title: Center(
-                      //title: const Text('Enable Sunset Alarm'),
+                  child: Text(
-                      title: Text(_alarmEnabled ? 'Sunset Alarm Enabled' : ''),
+                    _validTime
-                      subtitle: Text(
+                        ? _alarmEnabled
-                        _alarmEnabled
+                            ? "Sunset Alarm Enabled"
-                            ? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
+                            : "Enable"
-                            : '',
+                        : "Disabled",
-                      ),
-                      value: _alarmEnabled,
-                      onChanged: _toggleAlarm,
                   ),
                 ),
-                ],
+                subtitle: Center(
+                  child: Text(
+                    _validTime
+                        ? _alarmEnabled
+                            ? "${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime"
+                            : "Sunset Alarm"
+                        : "Enter Valid Time",
+                  ),
+                ),
+                value: _validTime ? _alarmEnabled : false,
+                onChanged: _validTime ? _toggleAlarm : null,
               ),
             ],
           ),

media/certs/open-meteo-com_isrg-root-x1.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----

pubspec.yaml

@@ -1,7 +1,7 @@
 name: sunset_alarm
 description: "Set an alarm to go off a specified time before sunset."
 publish_to: 'none'
-version: 1.0.0
+version: 1.1.0
 
 environment:
   sdk: ^3.7.2
@@ -23,3 +23,5 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+  assets:
+    - media/certs/