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?
@@ -270,11 +272,10 @@ class _HomeScreenState extends State<HomeScreen> {
       );
     } else if (Platform.isAndroid) {
       // Get the Notifications permission:
-      final android =
+      final android = _notifications
-          _notifications
+          .resolvePlatformSpecificImplementation<
-              .resolvePlatformSpecificImplementation<
+            AndroidFlutterLocalNotificationsPlugin
-                AndroidFlutterLocalNotificationsPlugin
+          >();
-              >();
       await android?.requestNotificationsPermission();
 
       // Ensure that Android has the correct alarm permissions.
@@ -492,10 +493,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   '${picked.hour.toString().padLeft(2, '0')}:'
                                   '${picked.minute.toString().padLeft(2, '0')}';
                               setState(
-                                () =>
+                                () => _sunsetErrorText = _validateTime(
-                                    _sunsetErrorText = _validateTime(
+                                  _sunsetController.text,
-                                      _sunsetController.text,
+                                ),
-                                    ),
                               );
                               if (_alarmEnabled) {
                                 _scheduleAlarm();
@@ -523,14 +523,13 @@ class _HomeScreenState extends State<HomeScreen> {
                   ),
                   const SizedBox(width: 8),
                   IconButton.filledTonal(
-                    icon:
+                    icon: _loading
-                        _loading
+                        ? const SizedBox(
-                            ? const SizedBox(
+                            width: 20,
-                              width: 20,
+                            height: 20,
-                              height: 20,
+                            child: CircularProgressIndicator(strokeWidth: 2),
-                              child: CircularProgressIndicator(strokeWidth: 2),
+                          )
-                            )
+                        : const Icon(Icons.cloud_done_outlined),
-                            : const Icon(Icons.cloud_done_outlined),
                     tooltip: 'Fetch Open-Meteo Sunset Data',
                     onPressed: () {
                       if (!_loading) {
@@ -553,7 +552,7 @@ class _HomeScreenState extends State<HomeScreen> {
                 children: [
                   if (!_alarmEnabled)
                     Expanded(
-                      flex: _validTime ? 6 : 4,
+                      flex: 1, // _validTime ? 3 : 2,
                       child: TextField(
                         controller: _minutesController,
                         keyboardType: TextInputType.number,
@@ -587,24 +586,24 @@ class _HomeScreenState extends State<HomeScreen> {
 
                   // --- Toggle ---
                   Expanded(
-                    flex: _validTime ? 7 : 5,
+                    flex: 1, //_validTime ? 2 : 5,
                     child: SwitchListTile(
                       title: Center(
                         child: Text(
                           _validTime
                               ? _alarmEnabled
-                                  ? "Sunset Alarm Enabled"
+                                    ? "Sunset Alarm Enabled"
-                                  : "Enable"
+                                    : "" //"Enable"
-                              : "Disabled",
+                              : "", // "Disabled",
                         ),
                       ),
                       subtitle: Center(
                         child: Text(
                           _validTime
                               ? _alarmEnabled
-                                  ? "${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime"
+                                    ? "${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime"
-                                  : "Sunset Alarm"
+                                    : "" //"Sunset Alarm"
-                              : "Enter Time",
+                              : "", //"Enter Valid Time",
                         ),
                       ),
                       value: _validTime ? _alarmEnabled : false,
@@ -640,11 +639,10 @@ final _plugin = FlutterLocalNotificationsPlugin();
 
 Future<void> requestPermissions() async {
   if (Platform.isAndroid) {
-    final android =
+    final android = _plugin
-        _plugin
+        .resolvePlatformSpecificImplementation<
-            .resolvePlatformSpecificImplementation<
+          AndroidFlutterLocalNotificationsPlugin
-              AndroidFlutterLocalNotificationsPlugin
+        >();
-            >();
 
     // Android 13+ — standard notification permission (shows a dialog)
     await android?.requestNotificationsPermission();
@@ -654,8 +652,7 @@ Future<void> requestPermissions() async {
   }
 }
 
-final android =
+final android = _plugin
-    _plugin
+    .resolvePlatformSpecificImplementation<
-        .resolvePlatformSpecificImplementation<
+      AndroidFlutterLocalNotificationsPlugin
-          AndroidFlutterLocalNotificationsPlugin
+    >();
-        >();