Merge pull request '1.0.1' (#3) from dev into main

Reviewed-on: #3

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/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #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.0-bin.zip
 #distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -20,6 +20,8 @@ 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?
@@ -121,14 +123,20 @@ class _HomeScreenState extends State<HomeScreen> {
   Future<void> _loadPrefs() async {
     final prefs = await SharedPreferences.getInstance();
     setState(() {
-      _latController.text = prefs.getDouble('lat').toString();
+      final lat = prefs.getDouble('lat').toString();
-      _lngController.text = prefs.getDouble('lng').toString();
+      final lng = prefs.getDouble('lng').toString();
-      _sunsetController.text = prefs.getString('sunset_time').toString();
+      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;
       _minutesController.text = _minutesBefore.toString();
-      _plural = prefs.getString('plural').toString();
+
+      _alarmEnabled = prefs.getBool('alarm_enabled') ?? false;
       _validTime = prefs.getBool('valid_time') ?? false;
+
+      _calcPlural();
     });
     if (_alarmEnabled && _sunsetController.text.isNotEmpty) {
       _scheduleAlarm();
@@ -146,7 +154,6 @@ class _HomeScreenState extends State<HomeScreen> {
     }
     await prefs.setBool('alarm_enabled', _alarmEnabled);
     await prefs.setInt('minutes_before', _minutesBefore);
-    await prefs.setString('plural', _plural);
     await prefs.setBool('valid_time', _validTime);
   }
 
@@ -208,7 +215,10 @@ class _HomeScreenState extends State<HomeScreen> {
     } catch (e) {
       _showSnack('Network Error: $e');
     } finally {
-      setState(() => _loading = false);
+      setState(() {
+        _loading = false;
+        _validTime = true;
+      });
     }
 
     if (_alarmEnabled) {
@@ -262,8 +272,7 @@ class _HomeScreenState extends State<HomeScreen> {
       );
     } else if (Platform.isAndroid) {
       // Get the Notifications permission:
-      final android =
+      final android = _notifications
-          _notifications
           .resolvePlatformSpecificImplementation<
             AndroidFlutterLocalNotificationsPlugin
           >();
@@ -377,7 +386,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';
     }
@@ -385,10 +396,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(
@@ -474,8 +493,7 @@ class _HomeScreenState extends State<HomeScreen> {
                                   '${picked.hour.toString().padLeft(2, '0')}:'
                                   '${picked.minute.toString().padLeft(2, '0')}';
                               setState(
-                                () =>
+                                () => _sunsetErrorText = _validateTime(
-                                    _sunsetErrorText = _validateTime(
                                   _sunsetController.text,
                                 ),
                               );
@@ -505,8 +523,7 @@ class _HomeScreenState extends State<HomeScreen> {
                   ),
                   const SizedBox(width: 8),
                   IconButton.filledTonal(
-                    icon:
+                    icon: _loading
-                        _loading
                         ? const SizedBox(
                             width: 20,
                             height: 20,
@@ -535,6 +552,7 @@ class _HomeScreenState extends State<HomeScreen> {
                 children: [
                   if (!_alarmEnabled)
                     Expanded(
+                      flex: 1, // _validTime ? 3 : 2,
                       child: TextField(
                         controller: _minutesController,
                         keyboardType: TextInputType.number,
@@ -552,31 +570,45 @@ class _HomeScreenState extends State<HomeScreen> {
                             } else {
                               _minuteErrorText = 'Invalid Minute Value';
                             }
-                            _plural = (_minutesBefore == 1) ? '' : 's';
+                            _calcPlural();
                           });
                         },
                       ),
                     ),
 
+                  //Expanded(
+                  //  flex: 3,
+                  //  child: Center(
+                  //    child:
+                  //        _validTime ? Text("") : Text("Sunset Time Needed") ,
+                  //  ),
+                  //),
+
                   // --- Toggle ---
                   Expanded(
-                    child:
+                    flex: 1, //_validTime ? 2 : 5,
-                        _validTime
+                    child: SwitchListTile(
-                            ? SwitchListTile(
+                      title: Center(
-                              title: Text(
+                        child: Text(
-                                _alarmEnabled ? 'Sunset Alarm Enabled' : "",
-                              ),
-                              subtitle: Text(
                           _validTime
                               ? _alarmEnabled
-                                        ? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
+                                    ? "Sunset Alarm Enabled"
-                                        : ""
+                                    : "" //"Enable"
-                                    : "Add Time",
+                              : "", // "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,
                     ),
-                              value: _alarmEnabled,
-                              onChanged: _toggleAlarm,
-                            )
-                            : Center(child: Text("Sunset Time Invalid")),
                   ),
                 ],
               ),
@@ -607,8 +639,7 @@ final _plugin = FlutterLocalNotificationsPlugin();
 
 Future<void> requestPermissions() async {
   if (Platform.isAndroid) {
-    final android =
+    final android = _plugin
-        _plugin
         .resolvePlatformSpecificImplementation<
           AndroidFlutterLocalNotificationsPlugin
         >();
@@ -621,8 +652,7 @@ Future<void> requestPermissions() async {
   }
 }
 
-final android =
+final android = _plugin
-    _plugin
     .resolvePlatformSpecificImplementation<
       AndroidFlutterLocalNotificationsPlugin
     >();