Merge pull request #333 from vicolo-dev/release/0.6.0

Merge changes form release
vicolo-dev · Sep 17, 2024 · 74b30f0 · 74b30f0
2 parents 2c83416 + 3d3460e
commit 74b30f0
Show file tree

Hide file tree

Showing 143 changed files with 3,358 additions and 1,676 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.19.3' # or, you can use 1.22
+        flutter-version: '3.22.2' # or, you can use 1.22
         channel: 'stable'
         cache: true
     - run: flutter test --coverage

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -115,6 +115,8 @@ android {
     }
 }
 
+
+
 flutter {
     source '../..'
 }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -12,11 +12,14 @@
   <uses-permission
     android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
   <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
-  <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+  <uses-permission
+        android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
   <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
 
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
 
   <application
     android:label="@string/app_name"
@@ -112,7 +115,7 @@
       />
     <service 
     android:name="com.pravera.flutter_foreground_task.service.ForegroundService"
-      android:foregroundServiceType="systemExempted"  
+      android:foregroundServiceType="specialUse"  
       android:exported="false" />
      <!-- <service android:name="me.carda.awesome_notifications.core.services.ForegroundService" -->
      <!--      android:enabled="true"             -->

diff --git a/android/app/src/main/kotlin/com/vicolo/chrono/DocumentPickerActivity.kt b/android/app/src/main/kotlin/com/vicolo/chrono/DocumentPickerActivity.kt
diff --git a/android/app/src/main/kotlin/com/vicolo/chrono/MainActivity.kt b/android/app/src/main/kotlin/com/vicolo/chrono/MainActivity.kt
@@ -14,26 +14,10 @@ import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugins.GeneratedPluginRegistrant;
 
-
-
 class MainActivity: FlutterActivity() {
     private val CHANNEL = "com.vicolo.chrono/alarm"
 
-    // // create static method channel
-    // companion object {
-    //     lateinit var channel: MethodChannel
-    // }
-
-    // override fun onCreate(savedInstanceState: Bundle?) {
-    //     super.onCreate(savedInstanceState)
-    //     // MethodChannelHolder.init(flutterView)
-    //     // MethodChannelHolder.invokeMethod("onBoot")
-    // }
-
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-        // GeneratedPluginRegistrant.registerWith(flutterEngine)
-        // flutterEngine.plugins.add(InitiateCallsToDartInBgPlugin())
-
     }
 }
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,6 +2,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven { url "${project(':background_fetch').projectDir}/libs" }
     }
 }
 

diff --git a/...tings/data/alarm_app_settings_schema.dart → ...alarm/data/alarm_app_settings_schema.dart b/...tings/data/alarm_app_settings_schema.dart → ...alarm/data/alarm_app_settings_schema.dart
@@ -1,5 +1,6 @@
 import 'package:clock_app/alarm/data/alarm_settings_schema.dart';
 import 'package:clock_app/alarm/types/notification_action.dart';
+import 'package:clock_app/common/types/list_filter.dart';
 import 'package:clock_app/icons/flux_icons.dart';
 import 'package:clock_app/notifications/widgets/notification_actions/area_notification_action.dart';
 import 'package:clock_app/notifications/widgets/notification_actions/buttons_notification_action.dart';
@@ -73,6 +74,30 @@ SettingGroup alarmAppSettingsSchema = SettingGroup(
         ]),
     SettingGroup("Filters",
         (context) => AppLocalizations.of(context)!.filtersSettingGroup, [
+    //      CustomizableListSetting<ListFilter>(
+    //   "Tasks",
+    //   (context) => AppLocalizations.of(context)!.tasksSetting,
+    //   [],
+    //   // kDebugMode
+    //   // ? [AlarmTask(AlarmTaskType.math), AlarmTask(AlarmTaskType.sequence)]
+    //   // : [],
+    //   alarmTaskSchemasMap.keys.map((key) => AlarmTask(key)).toList(),
+    //   addCardBuilder: (item) => AlarmTaskCard(task: item, isAddCard: true),
+    //   cardBuilder: (item, [onDelete, onDuplicate]) => AlarmTaskCard(
+    //     task: item,
+    //     isAddCard: false,
+    //     onPressDelete: onDelete,
+    //     onPressDuplicate: onDuplicate,
+    //   ),
+    //   valueDisplayBuilder: (context, setting) {
+    //     return Text("${setting.value.length} tasks");
+    //   },
+    //   itemPreviewBuilder: (item) => TryAlarmTaskButton(alarmTask: item),
+    //   // onChange: (context, value)async{
+    //   //   await appSettings.save();
+    //   // }
+    // ),
+
       SwitchSetting("Show Filters",
           (context) => AppLocalizations.of(context)!.showFiltersSetting, true),
       SwitchSetting("Show Sort",

diff --git a/lib/alarm/data/alarm_events_sort_options.dart b/lib/alarm/data/alarm_events_sort_options.dart
@@ -0,0 +1,27 @@
+import 'package:clock_app/alarm/types/alarm.dart';
+import 'package:clock_app/alarm/types/alarm_event.dart';
+import 'package:clock_app/common/types/list_filter.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+final List<ListSortOption<AlarmEvent>> alarmEventSortOptions = [
+  ListSortOption((context) => "Earlies start date", sortStartDateAscending),
+  ListSortOption((context) => "Latest start date", sortStartDateDescending),
+  ListSortOption((context) => "Earlies event date", sortEventDateAscending),
+  ListSortOption((context) => "Latest event date", sortEventDateDescending),
+];
+
+int sortStartDateAscending(AlarmEvent a, AlarmEvent b) {
+  return a.startDate.compareTo(b.startDate);
+}
+
+int sortStartDateDescending(AlarmEvent a, AlarmEvent b) {
+  return b.startDate.compareTo(a.startDate);
+}
+
+int sortEventDateAscending(AlarmEvent a, AlarmEvent b) {
+  return a.eventTime.compareTo(b.eventTime);
+}
+
+int sortEventDateDescending(AlarmEvent a, AlarmEvent b) {
+  return b.eventTime.compareTo(a.eventTime);
+}
diff --git a/lib/alarm/data/alarm_settings_schema.dart b/lib/alarm/data/alarm_settings_schema.dart
@@ -10,6 +10,7 @@ import 'package:clock_app/alarm/types/schedules/weekly_alarm_schedule.dart';
 import 'package:clock_app/alarm/widgets/alarm_task_card.dart';
 import 'package:clock_app/alarm/widgets/try_alarm_task_button.dart';
 import 'package:clock_app/audio/audio_channels.dart';
+import 'package:clock_app/audio/screens/ringtones_screen.dart';
 import 'package:clock_app/audio/types/ringtone_player.dart';
 import 'package:clock_app/common/data/weekdays.dart';
 import 'package:clock_app/common/logic/tags.dart';
@@ -19,13 +20,11 @@ import 'package:clock_app/common/types/tag.dart';
 import 'package:clock_app/common/types/weekday.dart';
 import 'package:clock_app/common/utils/ringtones.dart';
 import 'package:clock_app/settings/data/settings_schema.dart';
-import 'package:clock_app/settings/screens/ringtones_screen.dart';
 import 'package:clock_app/settings/screens/tags_screen.dart';
 import 'package:clock_app/settings/types/setting.dart';
 import 'package:clock_app/settings/types/setting_enable_condition.dart';
 import 'package:clock_app/settings/types/setting_group.dart';
 import 'package:clock_app/timer/types/time_duration.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -78,20 +77,6 @@ SettingGroup alarmSettingsSchema = SettingGroup(
             ),
           ],
         ),
-        //  DynamicToggleSetting(
-        //   "Week Days",
-        //   (context) => AppLocalizations.of(context)!.alarmWeekdaysSetting,
-        //   () {
-        //     return weekdays
-        //         .map((weekday) => SelectSettingOption(
-        //             (context) => weekday.getAbbreviation(context), weekday))
-        //         .toList();
-        //   },
-        //   enableConditions: [
-        //     ValueCondition(["Type"], (value) => value == WeeklyAlarmSchedule)
-        //   ],
-        // ),
-
         ToggleSetting(
           "Week Days",
           (context) => AppLocalizations.of(context)!.alarmWeekdaysSetting,
@@ -122,7 +107,7 @@ SettingGroup alarmSettingsSchema = SettingGroup(
         DateTimeSetting(
           "Date Range",
           (context) => AppLocalizations.of(context)!.alarmRangeSetting,
-          [DateTime.now(), DateTime.now().add(const Duration(days: 2))],
+          [],
           rangeOnly: true,
           enableConditions: [
             ValueCondition(["Type"], (value) => value == RangeAlarmSchedule)
@@ -195,14 +180,13 @@ SettingGroup alarmSettingsSchema = SettingGroup(
               ],
               // shouldCloseOnSelect: false,
             ),
-             SwitchSetting(
+            SwitchSetting(
               "start_melody_at_random_pos",
               (context) => AppLocalizations.of(context)!.startMelodyAtRandomPos,
               false,
-              getDescription: (context) => AppLocalizations.of(context)!.startMelodyAtRandomPosDescription,
-
+              getDescription: (context) => AppLocalizations.of(context)!
+                  .startMelodyAtRandomPosDescription,
             ),
-
             SliderSetting(
                 "Volume",
                 (context) => AppLocalizations.of(context)!.volumeSetting,
@@ -309,12 +293,13 @@ SettingGroup alarmSettingsSchema = SettingGroup(
         "Length",
       ],
     ),
-    ListSetting<AlarmTask>(
+    CustomizableListSetting<AlarmTask>(
       "Tasks",
       (context) => AppLocalizations.of(context)!.tasksSetting,
-      kDebugMode
-          ? [AlarmTask(AlarmTaskType.math), AlarmTask(AlarmTaskType.sequence)]
-          : [],
+      [],
+      // kDebugMode
+      // ? [AlarmTask(AlarmTaskType.math), AlarmTask(AlarmTaskType.sequence)]
+      // : [],
       alarmTaskSchemasMap.keys.map((key) => AlarmTask(key)).toList(),
       addCardBuilder: (item) => AlarmTaskCard(task: item, isAddCard: true),
       cardBuilder: (item, [onDelete, onDuplicate]) => AlarmTaskCard(
@@ -327,9 +312,6 @@ SettingGroup alarmSettingsSchema = SettingGroup(
         return Text("${setting.value.length} tasks");
       },
       itemPreviewBuilder: (item) => TryAlarmTaskButton(alarmTask: item),
-      // onChange: (context, value)async{
-      //   await appSettings.save();
-      // }
     ),
     DynamicMultiSelectSetting<Tag>(
       "Tags",
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,6 +115,8 @@ android { @@
         }
     }
     flutter {
         source '../..'
     }
@@ Expand Down @@