Merge branch 'feature/copy-meals' into feature/copy-meals-without-app…

…name-change
simonoppowa · Dec 18, 2024 · 8a9e8a8 · 8a9e8a8
2 parents 00fa35c + 84c6b98
commit 8a9e8a8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/lib/features/diary/presentation/widgets/day_info_widget.dart b/lib/features/diary/presentation/widgets/day_info_widget.dart
@@ -221,35 +221,13 @@ class DayInfoWidget extends StatelessWidget {
     }
   }
 
-  void showCopyOrDeleteActivityDialog(
-      BuildContext context, UserActivityEntity activityEntity) async {
-    final copyOrDelete = await showDialog<bool>(
-        context: context, builder: (context) => const CopyOrDeleteDialog());
-
-    if (copyOrDelete != null && !copyOrDelete) {
-      if (context.mounted) {
-        showDeleteActivityDialog(context, activityEntity);
-      }
-    } else if (copyOrDelete != null && copyOrDelete) {
-      onCopyActivity(activityEntity, null);
-    }
-  }
-
-  void showDeleteActivityDialog(
+  void onActivityItemLongPressed(
       BuildContext context, UserActivityEntity activityEntity) async {
-    final shouldDeleteIntake = await showDialog<bool>(
+    final shouldDeleteActivity = await showDialog<bool>(
         context: context, builder: (context) => const DeleteDialog());
-    if (shouldDeleteIntake != null) {
-      onDeleteActivity(activityEntity, trackedDayEntity);
-    }
-  }
 
-  void onActivityItemLongPressed(
-      BuildContext context, UserActivityEntity activityEntity) async {
-    if (DateUtils.isSameDay(selectedDay, DateTime.now())) {
-      showDeleteActivityDialog(context, activityEntity);
-    } else {
-      showCopyOrDeleteActivityDialog(context, activityEntity);
+    if (shouldDeleteActivity != null) {
+      onDeleteActivity(activityEntity, trackedDayEntity);
     }
   }
 }
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -85,7 +85,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Choose Weight Goal"),
         "cmLabel": MessageLookupByLibrary.simpleMessage("cm"),
         "copyDialogTitle": MessageLookupByLibrary.simpleMessage(
-            "Which meal type di you want to copy to?"),
+            "Which meal type do you want to copy to?"),
         "copyOrDeleteTimeDialogContent": MessageLookupByLibrary.simpleMessage(
             "With \"Copy to today\" you can copy the meal to today. With \"Delete\" you can delete the meal."),
         "copyOrDeleteTimeDialogTitle":

diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -94,7 +94,7 @@
   "deleteTimeDialogContent": "Do want to delete the selected item?",
   "itemDeletedSnackbar": "Item deleted",
 
-  "copyDialogTitle": "Which meal type di you want to copy to?",
+  "copyDialogTitle": "Which meal type do you want to copy to?",
 
   "copyOrDeleteTimeDialogTitle": "What do you want to do?",
   "copyOrDeleteTimeDialogContent": "With \"Copy to today\" you can copy the meal to today. With \"Delete\" you can delete the meal.",