Merge pull request #1925 from matthiasn/feat/habit_notification

feat: add (very basic) habit notification

lib/blocs/settings/habits/habit_settings_cubit.dart

@@ -9,6 +9,7 @@ import 'package:lotti/classes/tag_type_definitions.dart';
 import 'package:lotti/get_it.dart';
 import 'package:lotti/logic/habits/autocomplete_update.dart';
 import 'package:lotti/logic/persistence_logic.dart';
+import 'package:lotti/services/notification_service.dart';
 import 'package:lotti/services/tags_service.dart';
 import 'package:lotti/widgets/settings/habits/habit_autocomplete_widget.dart';
 
@@ -89,6 +90,27 @@ class HabitSettingsCubit extends Cubit<HabitSettingsState> {
     emitState();
   }
 
+  void setAlertAtTime(DateTime? alertAtTime) {
+    _dirty = true;
+    _habitDefinition = _habitDefinition.copyWith(
+      habitSchedule: HabitSchedule.daily(
+        requiredCompletions: 1,
+        alertAtTime: alertAtTime,
+      ),
+    );
+    emitState();
+  }
+
+  void clearAlertAtTime() {
+    _dirty = true;
+    _habitDefinition = _habitDefinition.copyWith(
+      habitSchedule: const HabitSchedule.daily(
+        requiredCompletions: 1,
+      ),
+    );
+    emitState();
+  }
+
   Future<void> onSavePressed() async {
     state.formKey.currentState!.save();
     if (state.formKey.currentState!.validate()) {
@@ -111,6 +133,8 @@ class HabitSettingsCubit extends Cubit<HabitSettingsState> {
       _dirty = false;
       emitState();
 
+      await getIt<NotificationService>().scheduleHabitNotification(dataType);
+
       _maybePop();
     }
   }

lib/classes/entity_definitions.dart

@@ -13,6 +13,7 @@ class HabitSchedule with _$HabitSchedule {
   const factory HabitSchedule.daily({
     required int requiredCompletions,
     DateTime? showFrom,
+    DateTime? alertAtTime,
   }) = DailyHabitSchedule;
 
   const factory HabitSchedule.weekly({

lib/classes/entity_definitions.freezed.dart

@@ -34,22 +34,27 @@ mixin _$HabitSchedule {
   int get requiredCompletions => throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(int requiredCompletions, DateTime? showFrom)
+    required TResult Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)
         daily,
     required TResult Function(int requiredCompletions) weekly,
     required TResult Function(int requiredCompletions) monthly,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(int requiredCompletions, DateTime? showFrom)? daily,
+    TResult? Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)?
+        daily,
     TResult? Function(int requiredCompletions)? weekly,
     TResult? Function(int requiredCompletions)? monthly,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(int requiredCompletions, DateTime? showFrom)? daily,
+    TResult Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)?
+        daily,
     TResult Function(int requiredCompletions)? weekly,
     TResult Function(int requiredCompletions)? monthly,
     required TResult orElse(),
@@ -131,7 +136,8 @@ abstract class _$$DailyHabitScheduleImplCopyWith<$Res>
       __$$DailyHabitScheduleImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({int requiredCompletions, DateTime? showFrom});
+  $Res call(
+      {int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime});
 }
 
 /// @nodoc
@@ -149,6 +155,7 @@ class __$$DailyHabitScheduleImplCopyWithImpl<$Res>
   $Res call({
     Object? requiredCompletions = null,
     Object? showFrom = freezed,
+    Object? alertAtTime = freezed,
   }) {
     return _then(_$DailyHabitScheduleImpl(
       requiredCompletions: null == requiredCompletions
@@ -159,6 +166,10 @@ class __$$DailyHabitScheduleImplCopyWithImpl<$Res>
           ? _value.showFrom
           : showFrom // ignore: cast_nullable_to_non_nullable
               as DateTime?,
+      alertAtTime: freezed == alertAtTime
+          ? _value.alertAtTime
+          : alertAtTime // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
     ));
   }
 }
@@ -167,7 +178,10 @@ class __$$DailyHabitScheduleImplCopyWithImpl<$Res>
 @JsonSerializable()
 class _$DailyHabitScheduleImpl implements DailyHabitSchedule {
   const _$DailyHabitScheduleImpl(
-      {required this.requiredCompletions, this.showFrom, final String? $type})
+      {required this.requiredCompletions,
+      this.showFrom,
+      this.alertAtTime,
+      final String? $type})
       : $type = $type ?? 'daily';
 
   factory _$DailyHabitScheduleImpl.fromJson(Map<String, dynamic> json) =>
@@ -177,13 +191,15 @@ class _$DailyHabitScheduleImpl implements DailyHabitSchedule {
   final int requiredCompletions;
   @override
   final DateTime? showFrom;
+  @override
+  final DateTime? alertAtTime;
 
   @JsonKey(name: 'runtimeType')
   final String $type;
 
   @override
   String toString() {
-    return 'HabitSchedule.daily(requiredCompletions: $requiredCompletions, showFrom: $showFrom)';
+    return 'HabitSchedule.daily(requiredCompletions: $requiredCompletions, showFrom: $showFrom, alertAtTime: $alertAtTime)';
   }
 
   @override
@@ -194,12 +210,15 @@ class _$DailyHabitScheduleImpl implements DailyHabitSchedule {
             (identical(other.requiredCompletions, requiredCompletions) ||
                 other.requiredCompletions == requiredCompletions) &&
             (identical(other.showFrom, showFrom) ||
-                other.showFrom == showFrom));
+                other.showFrom == showFrom) &&
+            (identical(other.alertAtTime, alertAtTime) ||
+                other.alertAtTime == alertAtTime));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, requiredCompletions, showFrom);
+  int get hashCode =>
+      Object.hash(runtimeType, requiredCompletions, showFrom, alertAtTime);
 
   /// Create a copy of HabitSchedule
   /// with the given fields replaced by the non-null parameter values.
@@ -213,34 +232,39 @@ class _$DailyHabitScheduleImpl implements DailyHabitSchedule {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(int requiredCompletions, DateTime? showFrom)
+    required TResult Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)
         daily,
     required TResult Function(int requiredCompletions) weekly,
     required TResult Function(int requiredCompletions) monthly,
   }) {
-    return daily(requiredCompletions, showFrom);
+    return daily(requiredCompletions, showFrom, alertAtTime);
   }
 
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(int requiredCompletions, DateTime? showFrom)? daily,
+    TResult? Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)?
+        daily,
     TResult? Function(int requiredCompletions)? weekly,
     TResult? Function(int requiredCompletions)? monthly,
   }) {
-    return daily?.call(requiredCompletions, showFrom);
+    return daily?.call(requiredCompletions, showFrom, alertAtTime);
   }
 
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(int requiredCompletions, DateTime? showFrom)? daily,
+    TResult Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)?
+        daily,
     TResult Function(int requiredCompletions)? weekly,
     TResult Function(int requiredCompletions)? monthly,
     required TResult orElse(),
   }) {
     if (daily != null) {
-      return daily(requiredCompletions, showFrom);
+      return daily(requiredCompletions, showFrom, alertAtTime);
     }
     return orElse();
   }
@@ -290,14 +314,16 @@ class _$DailyHabitScheduleImpl implements DailyHabitSchedule {
 abstract class DailyHabitSchedule implements HabitSchedule {
   const factory DailyHabitSchedule(
       {required final int requiredCompletions,
-      final DateTime? showFrom}) = _$DailyHabitScheduleImpl;
+      final DateTime? showFrom,
+      final DateTime? alertAtTime}) = _$DailyHabitScheduleImpl;
 
   factory DailyHabitSchedule.fromJson(Map<String, dynamic> json) =
       _$DailyHabitScheduleImpl.fromJson;
 
   @override
   int get requiredCompletions;
   DateTime? get showFrom;
+  DateTime? get alertAtTime;
 
   /// Create a copy of HabitSchedule
   /// with the given fields replaced by the non-null parameter values.
@@ -388,7 +414,8 @@ class _$WeeklyHabitScheduleImpl implements WeeklyHabitSchedule {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(int requiredCompletions, DateTime? showFrom)
+    required TResult Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)
         daily,
     required TResult Function(int requiredCompletions) weekly,
     required TResult Function(int requiredCompletions) monthly,
@@ -399,7 +426,9 @@ class _$WeeklyHabitScheduleImpl implements WeeklyHabitSchedule {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(int requiredCompletions, DateTime? showFrom)? daily,
+    TResult? Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)?
+        daily,
     TResult? Function(int requiredCompletions)? weekly,
     TResult? Function(int requiredCompletions)? monthly,
   }) {
@@ -409,7 +438,9 @@ class _$WeeklyHabitScheduleImpl implements WeeklyHabitSchedule {
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(int requiredCompletions, DateTime? showFrom)? daily,
+    TResult Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)?
+        daily,
     TResult Function(int requiredCompletions)? weekly,
     TResult Function(int requiredCompletions)? monthly,
     required TResult orElse(),
@@ -562,7 +593,8 @@ class _$MonthlyHabitScheduleImpl implements MonthlyHabitSchedule {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(int requiredCompletions, DateTime? showFrom)
+    required TResult Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)
         daily,
     required TResult Function(int requiredCompletions) weekly,
     required TResult Function(int requiredCompletions) monthly,
@@ -573,7 +605,9 @@ class _$MonthlyHabitScheduleImpl implements MonthlyHabitSchedule {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(int requiredCompletions, DateTime? showFrom)? daily,
+    TResult? Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)?
+        daily,
     TResult? Function(int requiredCompletions)? weekly,
     TResult? Function(int requiredCompletions)? monthly,
   }) {
@@ -583,7 +617,9 @@ class _$MonthlyHabitScheduleImpl implements MonthlyHabitSchedule {
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(int requiredCompletions, DateTime? showFrom)? daily,
+    TResult Function(
+            int requiredCompletions, DateTime? showFrom, DateTime? alertAtTime)?
+        daily,
     TResult Function(int requiredCompletions)? weekly,
     TResult Function(int requiredCompletions)? monthly,
     required TResult orElse(),

lib/database/journal_db/config_flags.dart

@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:lotti/database/database.dart';
 import 'package:lotti/utils/consts.dart';
 
@@ -84,13 +82,11 @@ Future<void> initConfigFlags(
       status: false,
     ),
   );
-  if (Platform.isMacOS) {
-    await db.insertFlagIfNotExists(
-      const ConfigFlag(
-        name: enableNotificationsFlag,
-        description: 'Enable desktop notifications?',
-        status: false,
-      ),
-    );
-  }
+  await db.insertFlagIfNotExists(
+    const ConfigFlag(
+      name: enableNotificationsFlag,
+      description: 'Enable notifications?',
+      status: false,
+    ),
+  );
 }

lib/l10n/app_de.arb

@@ -13,7 +13,7 @@
   "cancelButton": "Abbrechen",
   "categoryDeleteConfirm": "JA, KATEGORIE LÖSCHEN",
   "categoryDeleteQuestion": "Kategorie wirklich löschen?",
-  "configFlagEnableNotifications": "Desktop Notifications erlauben?",
+  "configFlagEnableNotifications": "Notifications erlauben?",
   "configFlagPrivate": "Private Einträge anzeigen?",
   "conflictsResolved": "gelöst",
   "conflictsUnresolved": "offen",

lib/l10n/app_en.arb

@@ -45,7 +45,7 @@
   "completeHabitFailButton": "Fail",
   "completeHabitSkipButton": "Skip",
   "completeHabitSuccessButton": "Success",
-  "configFlagEnableNotifications": "Enable desktop notifications?",
+  "configFlagEnableNotifications": "Enable notifications?",
   "configFlagPrivate": "Show private entries?",
   "configInvalidCert": "Allow invalid SSL certificate?",
   "conflictsResolved": "resolved",
@@ -109,6 +109,7 @@
   "habitsFilterOpenNow": "due",
   "habitsFilterPendingLater": "later",
   "habitShowFromLabel": "Show from",
+  "habitShowAlertAtLabel": "Show alert at",
   "habitsLongerStreaksEmptyHeader": "No week-long streaks at the moment",
   "habitsLongerStreaksHeader": "Week-long streaks (or longer)",
   "habitsOpenHeader": "Due now",

lib/logic/persistence_logic.dart

@@ -266,6 +266,13 @@ class PersistenceLogic {
         shouldAddGeolocation: shouldAddGeolocation,
       );
 
+      if (habitDefinition != null) {
+        await getIt<NotificationService>().scheduleHabitNotification(
+          habitDefinition,
+          daysToAdd: 1,
+        );
+      }
+
       return habitCompletionEntry;
     } catch (exception, stackTrace) {
       _loggingService.captureException(
@@ -766,16 +773,6 @@ class PersistenceLogic {
       );
     }
 
-    if (dashboard.reviewAt != null && dashboard.deletedAt == null) {
-      await getIt<NotificationService>().scheduleNotification(
-        title: 'Time for a Dashboard Review!',
-        body: dashboard.name,
-        notifyAt: dashboard.reviewAt!,
-        notificationId: dashboard.id.hashCode,
-        deepLink: '/dashboards/${dashboard.id}',
-      );
-    }
-
     return linesAffected;
   }