Address some PR comments and update example app Gradle version

gdelataillade · Nov 27, 2024 · 752fe20 · 752fe20
1 parent b81a008
commit 752fe20
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/services/AlarmStorage.kt b/android/src/main/kotlin/com/gdelataillade/alarm/services/AlarmStorage.kt
@@ -12,13 +12,14 @@ import io.flutter.Log
 
 class AlarmStorage(context: Context) {
     companion object {
-        private const val PREFS_NAME = "alarm_prefs"
         private const val PREFIX = "flutter.__alarm_id__"
     }
 
     private val prefs: SharedPreferences =
         context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
 
+    // TODO(gdelataillade): Ensure this function is called and alarms are rescheduled after device
+    //                      reboot.
     fun saveAlarm(alarmSettings: AlarmSettings) {
         val key = "$PREFIX${alarmSettings.id}"
         val editor = prefs.edit()

diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/services/NotificationService.kt b/android/src/main/kotlin/com/gdelataillade/alarm/services/NotificationService.kt
@@ -1,5 +1,6 @@
 package com.gdelataillade.alarm.services
 
+import android.annotation.SuppressLint
 import com.gdelataillade.alarm.models.NotificationSettings
 import android.app.Notification
 import android.app.NotificationChannel
@@ -37,6 +38,8 @@ class NotificationHandler(private val context: Context) {
         }
     }
 
+    // We need to use [Resources.getIdentifier] because resources are registered by Flutter.
+    @SuppressLint("DiscouragedApi")
     fun buildNotification(
         notificationSettings: NotificationSettings,
         fullScreen: Boolean,

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ android {
     namespace 'com.gdelataillade.alarm.alarm_example'
 
     compileSdkVersion 34
-    ndkVersion "25.1.8937393"
+    ndkVersion "26.1.10909125"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -19,7 +19,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.5.0" apply false
     id "org.jetbrains.kotlin.android" version "1.8.0" apply false
 }
 

diff --git a/example/lib/screens/home.dart b/example/lib/screens/home.dart
@@ -19,7 +19,7 @@ class ExampleAlarmHomeScreen extends StatefulWidget {
 }
 
 class _ExampleAlarmHomeScreenState extends State<ExampleAlarmHomeScreen> {
-  late List<AlarmSettings> alarms;
+  List<AlarmSettings> alarms = [];
 
   static StreamSubscription<AlarmSettings>? ringSubscription;
   static StreamSubscription<int>? updateSubscription;

diff --git a/lib/service/alarm_storage.dart b/lib/service/alarm_storage.dart
@@ -21,21 +21,22 @@ class AlarmStorage {
   /// notification on app kill body.
   static const notificationOnAppKillBody = 'notificationOnAppKillBody';
 
+  static final _prefs = SharedPreferencesAsync();
+
   /// Saves alarm info in local storage so we can restore it later
   /// in the case app is terminated.
   static Future<void> saveAlarm(AlarmSettings alarmSettings) =>
-      SharedPreferencesAsync().setString(
+      _prefs.setString(
         '$prefix${alarmSettings.id}',
         json.encode(alarmSettings.toJson()),
       );
 
   /// Removes alarm from local storage.
-  static Future<void> unsaveAlarm(int id) =>
-      SharedPreferencesAsync().remove('$prefix$id');
+  static Future<void> unsaveAlarm(int id) => _prefs.remove('$prefix$id');
 
   /// Whether at least one alarm is set.
   static Future<bool> hasAlarm() async {
-    final keys = await SharedPreferencesAsync().getKeys();
+    final keys = await _prefs.getKeys();
 
     for (final key in keys) {
       if (key.startsWith(prefix)) return true;
@@ -48,11 +49,11 @@ class AlarmStorage {
   /// and we need to restore previously scheduled alarms.
   static Future<List<AlarmSettings>> getSavedAlarms() async {
     final alarms = <AlarmSettings>[];
-    final keys = await SharedPreferencesAsync().getKeys();
+    final keys = await _prefs.getKeys();
 
     for (final key in keys) {
       if (key.startsWith(prefix)) {
-        final res = await SharedPreferencesAsync().getString(key);
+        final res = await _prefs.getString(key);
         alarms.add(
           AlarmSettings.fromJson(json.decode(res!) as Map<String, dynamic>),
         );

diff --git a/pigeons/alarm_api.dart b/pigeons/alarm_api.dart
@@ -200,8 +200,6 @@ abstract class AlarmApi {
   void disableWarningNotificationOnKill();
 }
 
-// TODO(orkun1675): Consider migrating to Pigeon type-safe channels when they
-// become available. See: https://github.com/flutter/flutter/issues/66711
 @FlutterApi()
 abstract class AlarmTriggerApi {
   @async