Merge pull request '0.1.2' (#1) from dev into main

Reviewed-on: #1

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    >
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -6,6 +9,24 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
     <uses-permission android:name="android.permission.USE_EXACT_ALARM"/>
 
+    <!--
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    -->
+
     <application
         android:label="sunset_alarm"
         android:name="${applicationName}"
@@ -52,6 +73,45 @@
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
+
+        <!--
+        <service
+            android:name="com.gdelataillade.alarm.AlarmService"
+            android:foregroundServiceType="mediaPlayback"
+            android:exported="false" />
+
+        <receiver
+            android:name="com.gdelataillade.alarm.AlarmBroadcastReceiver"
+            android:exported="false" />
+
+        <receiver
+            android:name="com.gdelataillade.alarm.BootBroadcastReceiver"
+            android:enabled="false"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false"
+            tools:ignore="MissingClass"/>
+        <receiver
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmBroadcastReceiver"
+            android:exported="false"
+            tools:ignore="MissingClass"/>
+        <receiver
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.RebootBroadcastReceiver"
+            android:enabled="false"
+            android:exported="false"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+        -->
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and

lib/main.dart

@@ -8,12 +8,14 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:timezone/data/latest_all.dart' as tz;
 import 'package:timezone/timezone.dart' as tz;
 import 'package:http/http.dart' as http;
+//import 'package:alarm/alarm.dart';
 
 import 'dart:convert';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   tz.initializeTimeZones();
+  //await Alarm.init();
   runApp(const SunsetAlarmApp());
 }
 
@@ -69,7 +71,7 @@ class _HomeScreenState extends State<HomeScreen> {
       defaultActionName: 'Sunset Alarm',
     );
     await _notifications.initialize(
-      const InitializationSettings(
+      settings: const InitializationSettings(
         android: androidInit,
         iOS: iosInit,
         linux: linuxInit,
@@ -220,16 +222,17 @@ class _HomeScreenState extends State<HomeScreen> {
           timeout: LinuxNotificationTimeout.expiresNever(),
         );
         _notifications.show(
-          _alarmId,
+          id: _alarmId,
-          'Sunset in ${_minutesBefore} min',
+          title: 'Sunset in ${_minutesBefore} min',
-          'The sun sets at $sunsetText. Time to get ready!',
+          body: 'The sun sets at $sunsetText. Time to get ready!',
-          const NotificationDetails(linux: linuxDetails),
+          notificationDetails: const NotificationDetails(linux: linuxDetails),
         );
       });
       _showSnack(
         'Alarm set for ${alarmTime.hour.toString().padLeft(2, '0')}:${alarmTime.minute.toString().padLeft(2, '0')} (app must stay open)',
       );
     } else if (Platform.isAndroid) {
+      /*** Notifcation Method - Works ***/
       // Android: use zonedSchedule (works in background)
       final tzAlarm = tz.TZDateTime.from(alarmTime, tz.local);
       const androidDetails = AndroidNotificationDetails(
@@ -242,21 +245,40 @@ class _HomeScreenState extends State<HomeScreen> {
         category: AndroidNotificationCategory.alarm,
       );
       await _notifications.zonedSchedule(
-        _alarmId,
+        id: _alarmId,
-        'Sunset in ${_minutesBefore} min',
+        title: 'Sunset in ${_minutesBefore} min',
-        'The sun sets at $sunsetText. Time to get ready!',
+        body: 'The sun sets at $sunsetText. Time to get ready!',
-        tzAlarm,
+        scheduledDate: tzAlarm,
-        const NotificationDetails(android: androidDetails),
+        notificationDetails: const NotificationDetails(android: androidDetails),
         androidScheduleMode: AndroidScheduleMode.alarmClock,
-        uiLocalNotificationDateInterpretation:
-            UILocalNotificationDateInterpretation.absoluteTime,
       );
       _showSnack('Alarm scheduled!');
       debugPrint('DEBUG: Alarm time:   ${tzAlarm.toString()}');
       debugPrint('DEBUG: Current time: ${DateTime.now().toUtc().toString()}');
       debugPrint('DEBUG: ${_notifications.toString()}');
+      // End Notification Method ***/
 
-      debugPrint('alarm: $tzAlarm, now: ${tz.TZDateTime.now(tz.local)}');
+      /*** Alarm Method - WIP *** /
+      // Schedule:
+      final settings = AlarmSettings(
+        id: 42,
+        dateTime: alarmTime, // your computed sunset time
+        assetAudioPath: 'assets/alarm.mp3', // put an alarm sound in assets/
+        loopAudio: true, // keeps ringing until dismissed
+        vibrate: true,
+        androidFullScreenIntent: true, // wakes screen like clock app
+        volumeSettings: VolumeSettings.fade(
+          volume: 0.8,
+          fadeDuration: Duration(seconds: 5),
+        ),
+        notificationSettings: const NotificationSettings(
+          title: 'Sunset Alarm',
+          body: 'The sun sets now. Time to get ready!',
+          stopButton: 'Dismiss',
+        ),
+      );
+      await Alarm.set(alarmSettings: settings);
+      // End Alarm Method ***/
     } else {
       _showSnack('Platform not detected, unsure how to show alarm.');
     }
@@ -270,7 +292,7 @@ class _HomeScreenState extends State<HomeScreen> {
     } else {
       _alarmTimer?.cancel();
       if (!Platform.isLinux) {
-        await _notifications.cancel(_alarmId);
+        await _notifications.cancel(id: _alarmId);
       }
       _showSnack('Alarm cancelled.');
     }
@@ -399,8 +421,10 @@ class _HomeScreenState extends State<HomeScreen> {
                     ),
                     onChanged: (v) {
                       final val = int.tryParse(v);
-                      if (val != null && val > 0) {
+                      if (val != null && val >= 0) {
                         _minutesBefore = val;
+                      } else {
+                        _showSnack('Invalid Minute Value');
                       }
                     },
                   ),

pubspec.yaml

@@ -9,16 +9,17 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  geolocator: ^13.0.0
+  geolocator: ^14.1.1
-  shared_preferences: ^2.3.0
+  shared_preferences: ^2.5.5
-  flutter_local_notifications: ^18.0.0
+  flutter_local_notifications: ^22.3.1
-  timezone: ^0.9.0
+  timezone: ^0.11.1
-  http: ^1.2.0
+  http: ^1.6.0
+  alarm: ^5.13.2
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true