pubspec, increment version.

Reviewed-on: #4

.gitignore

@@ -57,6 +57,10 @@ unlinked_spec.ds
 **/android/**/GeneratedPluginRegistrant.java
 **/android/key.properties
 *.jks
+android/build
+android/app/build
+android/release
+android/app/release
 
 # iOS/XCode related
 **/ios/**/*.mode1v3
@@ -122,6 +126,9 @@ app.*.symbols
 # Gradle files
 .gradle/
 build/
+android/app/release/*
+android/build/*
+android/app/build/*
 
 # Local configuration file (sdk path, etc)
 local.properties

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,70 @@
+# Changelog
+
+## 1.2.0 (In Development)
+
+- Automatically enable next day's alarm when the current day's is activated.
+- Add the alarm's date to the SwitchTile text for confirming it's truly set.
+
+## 1.1.0 (2026-11-01)
+
+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 to use 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

@@ -55,7 +55,8 @@ android {
             isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
+                "flutter_proguard_rules.pro"
             )
 
             /// 20260928 - With minifying, helped some, but also used

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
-#Sat Sep 12 19:36:23 MST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
-#distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip
+networkTimeout=10000
+retries=0
+retryBackOffMs=500
+validateDistributionUrl=true
 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.0.1" apply false
+    id("com.android.application") version "9.5.1" apply false
 
-    // This will need removed in Gradle/AGP 9. JK - needs to exist otherwiese:
+    // This will need removed in Gradle/AGP 9. JK - needs to exist otherwise:
     // "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

@@ -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
 

lib/main.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'dart:async';
 
+import 'package:alarm/utils/alarm_set.dart';
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -17,16 +18,6 @@ import 'dart:convert';
 //import 'package:http/http.dart' as http;
 import 'package:flutter/services.dart' show rootBundle;
 
-/// TBD:
-/// - Add other languages (Spanish, Croatian)
-/// v1.1.0
-/// - Move the switchtile back to its own row so that it handles titles better.
-/// v1.2.0
-/// - Change sunset grabber to checkbox and retrieve it each alarm or open.
-/// v2.0.0
-/// - Add sunrise section and change app name to Sunshine Alarm?
-/// :TBD
-
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
@@ -39,6 +30,7 @@ void main() async {
 
   tz.initializeTimeZones();
   await Alarm.init();
+
   runApp(const SunsetAlarmApp());
 }
 
@@ -71,6 +63,11 @@ class SunsetAlarmApp extends StatelessWidget {
   }
 }
 
+int dateAsId(DateTime d) => d.year * 10000 + d.month * 100 + d.day;
+int todayAsId() {
+  return dateAsId(DateTime.now());
+}
+
 class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
 
@@ -96,20 +93,30 @@ class _HomeScreenState extends State<HomeScreen> {
   String? _minuteErrorText;
   bool _validTime = false;
 
-  static const _alarmId = 1001;
+  int _alarmId = 20260000;
 
   @override
   void initState() {
     super.initState();
     _initNotifications();
     _loadPrefs();
+
+    // Reschedule alarm any time one goes off.
+    Alarm.ringing.listen((AlarmSet alarmSet) {
+      for (final alarm in alarmSet.alarms) {
+        if (alarm.id == todayAsId()) {
+          _scheduleAlarm();
+          break;
+        }
+      }
+    });
   }
 
   Future<void> _initNotifications() async {
     const androidInit = AndroidInitializationSettings('@mipmap/ic_launcher');
     const iosInit = DarwinInitializationSettings();
     const linuxInit = LinuxInitializationSettings(
-      defaultActionName: 'Sunset Alarm',
+      defaultActionName: 'Sunset Alarm ',
     );
     await _notifications.initialize(
       settings: const InitializationSettings(
@@ -250,6 +257,10 @@ class _HomeScreenState extends State<HomeScreen> {
       alarmTime = alarmTime.add(const Duration(days: 1));
     }
 
+    _debug("_scheduleAlarm, alarmTime=${alarmTime.toIso8601String()}");
+    _alarmId = dateAsId(alarmTime);
+    _debug("_alarmId=$_alarmId");
+
     if (Platform.isLinux) {
       // Linux: use a Timer (app must stay open)
       _alarmTimer?.cancel();
@@ -272,10 +283,11 @@ class _HomeScreenState extends State<HomeScreen> {
       );
     } else if (Platform.isAndroid) {
       // Get the Notifications permission:
-      final android = _notifications
-          .resolvePlatformSpecificImplementation<
-            AndroidFlutterLocalNotificationsPlugin
-          >();
+      final android =
+          _notifications
+              .resolvePlatformSpecificImplementation<
+                AndroidFlutterLocalNotificationsPlugin
+              >();
       await android?.requestNotificationsPermission();
 
       // Ensure that Android has the correct alarm permissions.
@@ -309,9 +321,9 @@ class _HomeScreenState extends State<HomeScreen> {
           androidScheduleMode: AndroidScheduleMode.alarmClock,
         );
         _showSnack('Alarm scheduled!');
-        debugPrint('DEBUG: Alarm time:   ${tzAlarm.toString()}');
-        debugPrint('DEBUG: Current time: ${DateTime.now().toUtc().toString()}');
-        debugPrint('DEBUG: ${_notifications.toString()}');
+        _debug('Alarm time:   ${tzAlarm.toString()}');
+        _debug('Current time: ${DateTime.now().toUtc().toString()}');
+        _debug('${_notifications.toString()}');
       }
       // End Notification Method ***/
 
@@ -336,6 +348,16 @@ class _HomeScreenState extends State<HomeScreen> {
             icon: 'ic_notification',
           ),
         );
+
+        // Skip if tomorrow's alarm already exists.
+        final existing = await Alarm.getAlarm(_alarmId);
+        if (existing == settings) {
+          _debug(
+            "Alarm already exists, skipping schedule. ${settings.toString()}",
+          );
+          return;
+        }
+
         await Alarm.set(alarmSettings: settings);
       }
       // End Alarm Method ***/
@@ -343,6 +365,10 @@ class _HomeScreenState extends State<HomeScreen> {
     } else {
       _showSnack('Platform Not Detected - Contact Developer');
     }
+    // If we made it this far, refresh the alarm ID on the screen.
+    setState(() {
+      _alarmId = _alarmId;
+    });
   }
 
   Future<void> _toggleAlarm(bool value) async {
@@ -361,11 +387,13 @@ class _HomeScreenState extends State<HomeScreen> {
     } else if (Platform.isAndroid) {
       // Notification Method
       if (ANDROID_USE_NOTIF) {
-        await _notifications.cancel(id: _alarmId);
+        //await _notifications.cancel(id: _alarmId);
+        await _notifications.cancelAll();
       }
       // Alarm Method
       if (ANDROID_USE_ALARM) {
-        await Alarm.stop(_alarmId);
+        //await Alarm.stop(_alarmId);
+        await Alarm.stopAll();
       }
     }
     _showSnack('Alarm Cancelled');
@@ -375,6 +403,14 @@ class _HomeScreenState extends State<HomeScreen> {
     ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg)));
   }
 
+  void _log(String tag, String msg) {
+    debugPrint(tag + ": " + msg);
+  }
+
+  void _debug(String msg) {
+    _log("DEBUG", msg);
+  }
+
   @override
   void dispose() {
     _savePrefs();
@@ -493,9 +529,10 @@ class _HomeScreenState extends State<HomeScreen> {
                                   '${picked.hour.toString().padLeft(2, '0')}:'
                                   '${picked.minute.toString().padLeft(2, '0')}';
                               setState(
-                                () => _sunsetErrorText = _validateTime(
-                                  _sunsetController.text,
-                                ),
+                                () =>
+                                    _sunsetErrorText = _validateTime(
+                                      _sunsetController.text,
+                                    ),
                               );
                               if (_alarmEnabled) {
                                 _scheduleAlarm();
@@ -523,13 +560,14 @@ class _HomeScreenState extends State<HomeScreen> {
                   ),
                   const SizedBox(width: 8),
                   IconButton.filledTonal(
-                    icon: _loading
-                        ? const SizedBox(
-                            width: 20,
-                            height: 20,
-                            child: CircularProgressIndicator(strokeWidth: 2),
-                          )
-                        : const Icon(Icons.cloud_done_outlined),
+                    icon:
+                        _loading
+                            ? const SizedBox(
+                              width: 20,
+                              height: 20,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            )
+                            : const Icon(Icons.cloud_done_outlined),
                     tooltip: 'Fetch Open-Meteo Sunset Data',
                     onPressed: () {
                       if (!_loading) {
@@ -548,69 +586,51 @@ class _HomeScreenState extends State<HomeScreen> {
               const SizedBox(height: 8),
 
               // --- Minutes before ---
-              Row(
-                children: [
-                  if (!_alarmEnabled)
-                    Expanded(
-                      flex: 1, // _validTime ? 3 : 2,
-                      child: TextField(
-                        controller: _minutesController,
-                        keyboardType: TextInputType.number,
-                        decoration: InputDecoration(
-                          border: OutlineInputBorder(),
-                          labelText: 'Minutes Before Sunset',
-                          errorText: _minuteErrorText,
-                        ),
-                        onChanged: (v) {
-                          final val = int.tryParse(v);
-                          setState(() {
-                            if (val != null) {
-                              _minuteErrorText = null;
-                              _minutesBefore = val;
-                            } else {
-                              _minuteErrorText = 'Invalid Minute Value';
-                            }
-                            _calcPlural();
-                          });
-                        },
-                      ),
-                    ),
+              TextField(
+                controller: _minutesController,
+                keyboardType: TextInputType.number,
+                decoration: InputDecoration(
+                  border: OutlineInputBorder(),
+                  labelText: 'Minutes Before Sunset',
+                  errorText: _minuteErrorText,
+                ),
+                onChanged: (v) {
+                  final val = int.tryParse(v);
+                  setState(() {
+                    if (val != null) {
+                      _minuteErrorText = null;
+                      _minutesBefore = val;
+                    } else {
+                      _minuteErrorText = 'Invalid Minute Value';
+                    }
+                    _calcPlural();
+                  });
+                },
+              ),
 
-                  //Expanded(
-                  //  flex: 3,
-                  //  child: Center(
-                  //    child:
-                  //        _validTime ? Text("") : Text("Sunset Time Needed") ,
-                  //  ),
-                  //),
-
-                  // --- Toggle ---
-                  Expanded(
-                    flex: 1, //_validTime ? 2 : 5,
-                    child: SwitchListTile(
-                      title: Center(
-                        child: Text(
-                          _validTime
-                              ? _alarmEnabled
-                                    ? "Sunset Alarm Enabled"
-                                    : "" //"Enable"
-                              : "", // "Disabled",
-                        ),
-                      ),
-                      subtitle: Center(
-                        child: Text(
-                          _validTime
-                              ? _alarmEnabled
-                                    ? "${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime"
-                                    : "" //"Sunset Alarm"
-                              : "", //"Enter Valid Time",
-                        ),
-                      ),
-                      value: _validTime ? _alarmEnabled : false,
-                      onChanged: _validTime ? _toggleAlarm : null,
-                    ),
+              // --- Toggle ---
+              SwitchListTile(
+                title: Center(
+                  child: Text(
+                    _validTime
+                        ? _alarmEnabled
+                            ? "Sunset Alarm Enabled"
+                            : "Enable"
+                        : "Disabled",
                   ),
-                ],
+                ),
+                subtitle: Center(
+                  child: Text(
+                    _validTime
+                        ? _alarmEnabled
+                            ? "${_minutesBefore} Minute${_plural} Before @ $_alarmId $_alarmDisplayTime"
+                            : "Sunset Alarm"
+                        : "Enter Valid Time",
+                  ),
+                  // .toString().replaceRange(4, 4, '-').replaceRange(7, 7, '-')
+                ),
+                value: _validTime ? _alarmEnabled : false,
+                onChanged: _validTime ? _toggleAlarm : null,
               ),
             ],
           ),
@@ -639,10 +659,11 @@ final _plugin = FlutterLocalNotificationsPlugin();
 
 Future<void> requestPermissions() async {
   if (Platform.isAndroid) {
-    final android = _plugin
-        .resolvePlatformSpecificImplementation<
-          AndroidFlutterLocalNotificationsPlugin
-        >();
+    final android =
+        _plugin
+            .resolvePlatformSpecificImplementation<
+              AndroidFlutterLocalNotificationsPlugin
+            >();
 
     // Android 13+ — standard notification permission (shows a dialog)
     await android?.requestNotificationsPermission();
@@ -652,7 +673,8 @@ Future<void> requestPermissions() async {
   }
 }
 
-final android = _plugin
-    .resolvePlatformSpecificImplementation<
-      AndroidFlutterLocalNotificationsPlugin
-    >();
+final android =
+    _plugin
+        .resolvePlatformSpecificImplementation<
+          AndroidFlutterLocalNotificationsPlugin
+        >();

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.1
+version: 1.2.0
 
 environment:
   sdk: ^3.7.2