fix: reminder launch review (#3716)

Author: Xazin

frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_editor.dart

@@ -366,6 +366,9 @@ class EndTimeButton extends StatelessWidget {
   }
 }
 
+const _maxLengthTwelveHour = 8;
+const _maxLengthTwentyFourHour = 5;
+
 class _TimeTextField extends StatefulWidget {
   final bool isEndTime;
   final String? timeStr;
@@ -433,6 +436,11 @@ class _TimeTextFieldState extends State<_TimeTextField> {
             errorText: widget.isEndTime
                 ? state.parseEndTimeError
                 : state.parseTimeError,
+            maxLength:
+                state.dateTypeOptionPB.timeFormat == TimeFormatPB.TwelveHour
+                    ? _maxLengthTwelveHour
+                    : _maxLengthTwentyFourHour,
+            showCounter: false,
             onSubmitted: (timeStr) {
               if (widget.isEndTime) {
                 context

frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart

@@ -82,11 +82,13 @@ class MentionDateBlock extends StatelessWidget {
                 _updateBlock(parsedDate!.withoutTime, includeTime);
 
                 // We can remove time from the date/reminder
-                //  block when toggled off.
-                if (!includeTime && isReminder) {
+                // block when toggled off.
+                if (isReminder) {
                   _updateScheduledAt(
                     reminderId: reminderId!,
-                    selectedDay: parsedDate!.withoutTime,
+                    selectedDay:
+                        includeTime ? parsedDate! : parsedDate!.withoutTime,
+                    includeTime: includeTime,
                   );
                 }
               },
@@ -99,6 +101,7 @@ class MentionDateBlock extends StatelessWidget {
                   _updateScheduledAt(
                     reminderId: reminderId!,
                     selectedDay: selectedDay,
+                    includeTime: includeTime,
                   );
                 }
               },
@@ -171,10 +174,15 @@ class MentionDateBlock extends StatelessWidget {
   void _updateScheduledAt({
     required String reminderId,
     required DateTime selectedDay,
+    bool? includeTime,
   }) {
     editorContext.read<ReminderBloc>().add(
           ReminderEvent.update(
-            ReminderUpdate(id: reminderId, scheduledAt: selectedDay),
+            ReminderUpdate(
+              id: reminderId,
+              scheduledAt: selectedDay,
+              includeTime: includeTime,
+            ),
           ),
         );
   }

frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/reminder_reference.dart

@@ -4,6 +4,7 @@ import 'package:appflowy/plugins/document/application/doc_bloc.dart';
 import 'package:appflowy/plugins/document/presentation/editor_plugins/base/string_extension.dart';
 import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_block.dart';
 import 'package:appflowy/plugins/inline_actions/inline_actions_result.dart';
+import 'package:appflowy/user/application/reminder/reminder_extension.dart';
 import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
 import 'package:appflowy_backend/protobuf/flowy-user/reminder.pb.dart';
 import 'package:appflowy_editor/appflowy_editor.dart';
@@ -209,7 +210,9 @@ class ReminderReferenceService {
       objectId: viewId,
       title: LocaleKeys.reminderNotification_title.tr(),
       message: LocaleKeys.reminderNotification_message.tr(),
-      meta: {"document_id": viewId},
+      meta: {
+        ReminderMetaKeys.includeTime.name: false.toString(),
+      },
       scheduledAt: Int64(date.millisecondsSinceEpoch ~/ 1000),
       isAck: date.isBefore(DateTime.now()),
     );

frontend/appflowy_flutter/lib/startup/deps_resolver.dart

@@ -23,7 +23,7 @@ import 'package:appflowy/user/application/user_service.dart';
 import 'package:appflowy/user/presentation/router.dart';
 import 'package:appflowy/workspace/application/edit_panel/edit_panel_bloc.dart';
 import 'package:appflowy/workspace/application/favorite/favorite_bloc.dart';
-import 'package:appflowy/workspace/application/local_notifications/notification_action_bloc.dart';
+import 'package:appflowy/workspace/application/notifications/notification_action_bloc.dart';
 import 'package:appflowy/workspace/application/settings/notifications/notification_settings_cubit.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
 import 'package:appflowy/workspace/application/tabs/tabs_bloc.dart';

frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart

@@ -14,7 +14,7 @@ import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 
 import 'package:appflowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';
-import 'package:appflowy/workspace/application/local_notifications/notification_service.dart';
+import 'package:appflowy/workspace/application/notifications/notification_service.dart';
 import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';
 import 'package:appflowy/user/application/user_settings_service.dart';
 import 'package:appflowy/startup/startup.dart';

frontend/appflowy_flutter/lib/user/application/notification_filter/notification_filter_bloc.dart

@@ -1,5 +1,4 @@
 import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'notification_filter_bloc.freezed.dart';
@@ -10,12 +9,6 @@ class NotificationFilterBloc
     on<NotificationFilterEvent>((event, emit) async {
       event.when(
         reset: () => emit(const NotificationFilterState()),
-        changeSortBy: (NotificationSortOption sortBy) => emit(
-          state.copyWith(sortBy: sortBy),
-        ),
-        toggleGroupByDate: () => emit(
-          state.copyWith(groupByDate: !state.groupByDate),
-        ),
         toggleShowUnreadsOnly: () => emit(
           state.copyWith(showUnreadsOnly: !state.showUnreadsOnly),
         ),
@@ -24,42 +17,22 @@ class NotificationFilterBloc
   }
 }
 
-enum NotificationSortOption {
-  descending,
-  ascending,
-}
-
 @freezed
 class NotificationFilterEvent with _$NotificationFilterEvent {
   const factory NotificationFilterEvent.toggleShowUnreadsOnly() =
       _ToggleShowUnreadsOnly;
 
-  const factory NotificationFilterEvent.toggleGroupByDate() =
-      _ToggleGroupByDate;
-
-  const factory NotificationFilterEvent.changeSortBy(
-    NotificationSortOption sortBy,
-  ) = _ChangeSortBy;
-
   const factory NotificationFilterEvent.reset() = _Reset;
 }
 
 @freezed
-class NotificationFilterState extends Equatable with _$NotificationFilterState {
+class NotificationFilterState with _$NotificationFilterState {
   const NotificationFilterState._();
 
   const factory NotificationFilterState({
     @Default(false) bool showUnreadsOnly,
-    @Default(false) bool groupByDate,
-    @Default(NotificationSortOption.descending) NotificationSortOption sortBy,
   }) = _NotificationFilterState;
 
   // If state is not default values, then there are custom changes
-  bool get hasFilters =>
-      showUnreadsOnly != false ||
-      groupByDate != false ||
-      sortBy != NotificationSortOption.descending;
-
-  @override
-  List<Object?> get props => [showUnreadsOnly, groupByDate, sortBy];
+  bool get hasFilters => showUnreadsOnly != false;
 }

frontend/appflowy_flutter/lib/user/application/reminder/reminder_bloc.dart

@@ -2,10 +2,11 @@ import 'dart:async';
 
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/startup/startup.dart';
+import 'package:appflowy/user/application/reminder/reminder_extension.dart';
 import 'package:appflowy/user/application/reminder/reminder_service.dart';
-import 'package:appflowy/workspace/application/local_notifications/notification_action.dart';
-import 'package:appflowy/workspace/application/local_notifications/notification_action_bloc.dart';
-import 'package:appflowy/workspace/application/local_notifications/notification_service.dart';
+import 'package:appflowy/workspace/application/notifications/notification_action.dart';
+import 'package:appflowy/workspace/application/notifications/notification_action_bloc.dart';
+import 'package:appflowy/workspace/application/notifications/notification_service.dart';
 import 'package:appflowy/workspace/application/settings/notifications/notification_settings_cubit.dart';
 import 'package:appflowy_backend/log.dart';
 import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
@@ -35,6 +36,24 @@ class ReminderBloc extends Bloc<ReminderEvent, ReminderState> {
 
     on<ReminderEvent>((event, emit) async {
       await event.when(
+        markAllRead: () async {
+          final unreadReminders =
+              state.pastReminders.where((reminder) => !reminder.isRead);
+
+          final reminders = [...state.reminders];
+          final updatedReminders = <ReminderPB>[];
+          for (final reminder in unreadReminders) {
+            reminders.remove(reminder);
+
+            reminder.isRead = true;
+            await reminderService.updateReminder(reminder: reminder);
+
+            updatedReminders.add(reminder);
+          }
+
+          reminders.addAll(updatedReminders);
+          emit(state.copyWith(reminders: reminders));
+        },
         started: () async {
           final remindersOrFailure = await reminderService.fetchReminders();
 
@@ -169,6 +188,9 @@ class ReminderEvent with _$ReminderEvent {
   // Update a reminder (eg. isAck, isRead, etc.)
   const factory ReminderEvent.update(ReminderUpdate update) = _Update;
 
+  // Mark all unread reminders as read
+  const factory ReminderEvent.markAllRead() = _MarkAllRead;
+
   const factory ReminderEvent.pressReminder({required String reminderId}) =
       _PressReminder;
 }
@@ -181,19 +203,26 @@ class ReminderUpdate {
   final bool? isAck;
   final bool? isRead;
   final DateTime? scheduledAt;
+  final bool? includeTime;
 
   ReminderUpdate({
     required this.id,
     this.isAck,
     this.isRead,
     this.scheduledAt,
+    this.includeTime,
   });
 
   ReminderPB merge({required ReminderPB a}) {
     final isAcknowledged = isAck == null && scheduledAt != null
         ? scheduledAt!.isBefore(DateTime.now())
         : a.isAck;
 
+    final meta = a.meta;
+    if (includeTime != a.includeTime) {
+      meta[ReminderMetaKeys.includeTime.name] = includeTime.toString();
+    }
+
     return ReminderPB(
       id: a.id,
       objectId: a.objectId,
@@ -204,7 +233,7 @@ class ReminderUpdate {
       isRead: isRead ?? a.isRead,
       title: a.title,
       message: a.message,
-      meta: a.meta,
+      meta: meta,
     );
   }
 }

frontend/appflowy_flutter/lib/user/application/reminder/reminder_extension.dart

@@ -0,0 +1,17 @@
+import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
+
+enum ReminderMetaKeys {
+  includeTime("include_time");
+
+  const ReminderMetaKeys(this.name);
+
+  final String name;
+}
+
+extension ReminderExtension on ReminderPB {
+  bool? get includeTime {
+    final String? includeTimeStr = meta[ReminderMetaKeys.includeTime.name];
+
+    return includeTimeStr != null ? includeTimeStr == true.toString() : null;
+  }
+}

frontend/appflowy_flutter/lib/workspace/application/local_notifications/notification_action.dart renamed to frontend/appflowy_flutter/lib/workspace/application/notifications/notification_action.dart

@@ -1,4 +1,4 @@
-import 'package:appflowy/workspace/application/local_notifications/notification_action.dart';
+import 'package:appflowy/workspace/application/notifications/notification_action.dart';
 import 'package:bloc/bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';