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

Reviewed-on: #1
android, add additional needs to the manifest related to the alarm, but commented out for now.
2026-09-28 04:36:42 -07:00 · 2026-09-28 04:30:14 -07:00 · 2026-09-28 04:27:23 -07:00 · 2026-09-28 04:11:44 -07:00 · 2026-09-28 04:05:25 -07:00 · 2026-09-28 04:04:49 -07:00
3 changed files with 143 additions and 29 deletions
@@ -1,4 +1,32 @@
-<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"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <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}"
@@ -30,6 +58,60 @@
        <meta-data
            android:name="flutterEmbedding"
            android:value="2" />
+
+        <receiver
+            android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver"
+            android:enabled="true" />
+        <receiver
+            android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <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
@@ -42,10 +124,4 @@
            <data android:mimeType="text/plain"/>
        </intent>
    </queries>
-
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
-    <uses-permission android:name="android.permission.USE_EXACT_ALARM"/>
 </manifest>
@@ -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,
@@ -173,7 +175,15 @@ class _HomeScreenState extends State<HomeScreen> {
  Timer? _alarmTimer;

  Future<void> _scheduleAlarm() async {
-    // Ensure that Android has the correct permissions enabled.
+    // Get the Notifications permission:
+    final android =
+        _notifications
+            .resolvePlatformSpecificImplementation<
+              AndroidFlutterLocalNotificationsPlugin
+            >();
+    await android?.requestNotificationsPermission();
+
+    // Ensure that Android has the correct alarm permissions.
    final canSchedule = await android?.canScheduleExactNotifications();
    if (canSchedule != true) {
      _showSnack('Permissions not yet granted, requesting...');
@@ -212,16 +222,17 @@ class _HomeScreenState extends State<HomeScreen> {
          timeout: LinuxNotificationTimeout.expiresNever(),
        );
        _notifications.show(
-          _alarmId,
-          'Sunset in ${_minutesBefore} min',
-          'The sun sets at $sunsetText. Time to get ready!',
-          const NotificationDetails(linux: linuxDetails),
+          id: _alarmId,
+          title: 'Sunset in ${_minutesBefore} min',
+          body: 'The sun sets at $sunsetText. Time to get ready!',
+          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(
@@ -234,16 +245,40 @@ class _HomeScreenState extends State<HomeScreen> {
        category: AndroidNotificationCategory.alarm,
      );
      await _notifications.zonedSchedule(
-        _alarmId,
-        'Sunset in ${_minutesBefore} min',
-        'The sun sets at $sunsetText. Time to get ready!',
-        tzAlarm,
-        const NotificationDetails(android: androidDetails),
+        id: _alarmId,
+        title: 'Sunset in ${_minutesBefore} min',
+        body: 'The sun sets at $sunsetText. Time to get ready!',
+        scheduledDate: tzAlarm,
+        notificationDetails: const NotificationDetails(android: androidDetails),
        androidScheduleMode: AndroidScheduleMode.alarmClock,
-        uiLocalNotificationDateInterpretation:
-            UILocalNotificationDateInterpretation.absoluteTime,
      );
-      _showSnack('Alarm scheduled.');
+      _showSnack('Alarm scheduled!');
+      debugPrint('DEBUG: Alarm time:   ${tzAlarm.toString()}');
+      debugPrint('DEBUG: Current time: ${DateTime.now().toUtc().toString()}');
+      debugPrint('DEBUG: ${_notifications.toString()}');
+      // End Notification Method ***/
+
+      /*** 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.');
    }
@@ -257,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.');
    }
@@ -386,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');
                      }
                    },
                  ),
@@ -9,16 +9,17 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
-  geolocator: ^13.0.0
-  shared_preferences: ^2.3.0
-  flutter_local_notifications: ^18.0.0
-  timezone: ^0.9.0
-  http: ^1.2.0
+  geolocator: ^14.1.1
+  shared_preferences: ^2.5.5
+  flutter_local_notifications: ^22.3.1
+  timezone: ^0.11.1
+  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
Author	SHA1	Message	Date
me	bf1c4614a1	Merge pull request '0.1.2' (#1 ) from dev into main Reviewed-on: #1	2026-09-28 04:36:42 -07:00
me	9c681094c1	android, add additional needs to the manifest related to the alarm, but commented out for now.	2026-09-28 04:30:14 -07:00
me	a44d4b1574	main, remove the alarm code for now, just do the notification based alert.	2026-09-28 04:27:23 -07:00
me	ee9821f30f	main, use the new version of flutter_local_notifications correctly.	2026-09-28 04:11:44 -07:00
me	efde9624ff	Changes from `flutter pub upgrade --major-versions --tighten`.	2026-09-28 04:05:25 -07:00
me	b9bc2ca77d	Changes from `flutter pub uprade --major-versions`.	2026-09-28 04:04:49 -07:00
me	105591910c	packages, add alarm.	2026-09-28 04:00:04 -07:00
me	6030da178c	main, add an actual alarm for Android.	2026-09-28 03:58:04 -07:00
me	dad8fff6d2	main, fix minutes not working properly when set to 0.	2026-09-28 03:57:40 -07:00
me	3d89661b37	android, add receiver block to the manifest, seems to be the last piece of the puzzle for getting a notification to go off, but was not a true alarm.	2026-09-28 03:44:10 -07:00
me	6de5fbe991	main, ensure the notifications permission is requested.	2026-09-28 03:43:27 -07:00
me	9ac5fdd4f6	android, move permissions to beginning of manifest file based on studio suggestion.	2026-09-28 03:06:18 -07:00