[Presentation] In the notif. list item, hide the stop button if the n…

…otif. is already completed. Show a dialog before deleting a notif.
Wolfteam · Nov 2, 2022 · c5b6c5a · c5b6c5a
1 parent acc781b
commit c5b6c5a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/lib/domain/extensions/duration_extensions.dart b/lib/domain/extensions/duration_extensions.dart
@@ -2,7 +2,7 @@ import 'package:shiori/domain/extensions/string_extensions.dart';
 
 extension DurationExtensions on Duration {
   String formatDuration({String? negativeText}) {
-    if (isNegative) {
+    if (isNegative || inSeconds == 0) {
       return negativeText.isNotNullEmptyOrWhitespace ? negativeText! : '∞';
     }
     String twoDigits(num n) => n.toString().padLeft(2, '0');

diff --git a/lib/presentation/notifications/widgets/items/notification_list_tile.dart b/lib/presentation/notifications/widgets/items/notification_list_tile.dart
@@ -8,6 +8,7 @@ import 'package:shiori/domain/models/models.dart' as models;
 import 'package:shiori/generated/l10n.dart';
 import 'package:shiori/injection.dart';
 import 'package:shiori/presentation/notifications/widgets/add_edit_notification_bottom_sheet.dart';
+import 'package:shiori/presentation/shared/dialogs/confirm_dialog.dart';
 import 'package:shiori/presentation/shared/dialogs/number_picker_dialog.dart';
 import 'package:shiori/presentation/shared/images/circle_item.dart';
 import 'package:shiori/presentation/shared/styles.dart';
@@ -26,6 +27,11 @@ class NotificationListTitle extends StatelessWidget {
 
   final Widget subtitle;
 
+  bool get isCompleted {
+    final diff = completesAt.difference(DateTime.now());
+    return diff.inSeconds <= 0;
+  }
+
   NotificationListTitle({
     Key? key,
     required models.NotificationItem item,
@@ -56,18 +62,26 @@ class NotificationListTitle extends StatelessWidget {
           extentRatio: extentRatio,
           motion: const ScrollMotion(),
           children: [
-            SlidableAction(
-              label: s.stop,
-              backgroundColor: Colors.deepOrange,
-              icon: Icons.stop,
-              foregroundColor: Colors.white,
-              onPressed: (_) => context.read<NotificationsBloc>().add(NotificationsEvent.stop(id: itemKey, type: type)),
-            ),
+            if (!isCompleted)
+              SlidableAction(
+                label: s.stop,
+                backgroundColor: Colors.deepOrange,
+                icon: Icons.stop,
+                foregroundColor: Colors.white,
+                onPressed: (_) => context.read<NotificationsBloc>().add(NotificationsEvent.stop(id: itemKey, type: type)),
+              ),
             SlidableAction(
               label: s.delete,
               backgroundColor: Colors.red,
               icon: Icons.delete,
-              onPressed: (_) => context.read<NotificationsBloc>().add(NotificationsEvent.delete(id: itemKey, type: type)),
+              onPressed: (_) => showDialog(
+                context: context,
+                builder: (_) => ConfirmDialog(
+                  title: s.delete,
+                  content: s.confirmQuestion,
+                  onOk: () => context.read<NotificationsBloc>().add(NotificationsEvent.delete(id: itemKey, type: type)),
+                ),
+              ),
             ),
           ],
         ),