From 79e3831b69611a797e6143cafb75c402b0b03d4f Mon Sep 17 00:00:00 2001
From: Merlin Dienst <merlin.dienst@gmail.com>
Date: Tue, 17 Dec 2024 23:16:51 +0100
Subject: [PATCH 1/7] changed package name

---
 README.md                                                   | 2 +-
 android/.gitignore                                          | 4 ++++
 android/app/build.gradle                                    | 2 +-
 android/app/src/debug/AndroidManifest.xml                   | 2 +-
 android/app/src/main/AndroidManifest.xml                    | 2 +-
 .../opennutritracker/ont/opennutritracker/MainActivity.kt   | 2 +-
 android/app/src/profile/AndroidManifest.xml                 | 2 +-
 android/gradle.properties                                   | 1 +
 android/gradle/wrapper/gradle-wrapper.properties            | 3 ++-
 ios/Runner.xcodeproj/project.pbxproj                        | 6 +++---
 10 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index a1b6159..1c548ab 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ OpenNutriTracker is an open-source mobile application designed to simplify nutri
 
 ## Install
 [<img src="fastlane/metadata/android/en-US/images/appstore_banner.png" width="30%">](https://testflight.apple.com/join/j7uKoEDl)
-[<img src="fastlane/metadata/android/en-US/images/playstore_banner.png" width="30%">](https://play.google.com/store/apps/details?id=com.opennutritracker.ont.opennutritracker)
+[<img src="fastlane/metadata/android/en-US/images/playstore_banner.png" width="30%">](https://play.google.com/store/apps/details?id=com.doktormerlin.ont.opennutritracker)
 
 ## Key Features
 - **🍎 Nutritional Tracking:** Easily log your meals and snacks, and access a vast database of food items and ingredients to get detailed nutritional information.
diff --git a/android/.gitignore b/android/.gitignore
index 6f56801..37be946 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -11,3 +11,7 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+
+# Adding gradle.properties because of changes regarding the JDK version.
+# Android Studio 2024.3 ships with JDK 21, which is incompatible with the required gradle 7.6.1
+gradle.properties
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e99dc19..7c44592 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -46,7 +46,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.opennutritracker.ont.opennutritracker"
+        applicationId "com.doktormerlin.ont.opennutritracker"
         minSdkVersion 21
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 34eed1c..1eb5596 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.opennutritracker.ont.opennutritracker">
+    package="com.doktormerlin.ont.opennutritracker">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0605b9b..79a974d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.opennutritracker.ont.opennutritracker">
+    package="com.doktormerlin.ont.opennutritracker">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt b/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt
index 99d819e..5b57e00 100644
--- a/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.opennutritracker.ont.opennutritracker
+package com.doktormerlin.ont.opennutritracker
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 34eed1c..1eb5596 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.opennutritracker.ont.opennutritracker">
+    package="com.doktormerlin.ont.opennutritracker">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/gradle.properties b/android/gradle.properties
index 94adc3a..572f3a1 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.java.home=C:\\Program Files\\Microsoft\\jdk-17.0.13.11-hotspot
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index ceccc3a..5083229 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index e689c18..68893a5 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -505,7 +505,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -536,7 +536,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

From 0ac8a03eef4acc909168658dfd5f4a5847c83da3 Mon Sep 17 00:00:00 2001
From: Merlin Dienst <merlin.dienst@gmail.com>
Date: Wed, 18 Dec 2024 19:25:51 +0100
Subject: [PATCH 2/7] wip: added copy functionality, broke diary

---
 .../widgets/copy_or_delete_dialog.dart        | 26 +++++++
 lib/features/diary/diary_page.dart            | 27 +++++++
 .../presentation/widgets/day_info_widget.dart | 75 ++++++++++++++-----
 lib/generated/l10n.dart                       | 40 ++++++++++
 4 files changed, 150 insertions(+), 18 deletions(-)
 create mode 100644 lib/core/presentation/widgets/copy_or_delete_dialog.dart

diff --git a/lib/core/presentation/widgets/copy_or_delete_dialog.dart b/lib/core/presentation/widgets/copy_or_delete_dialog.dart
new file mode 100644
index 0000000..bdfda47
--- /dev/null
+++ b/lib/core/presentation/widgets/copy_or_delete_dialog.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:opennutritracker/generated/l10n.dart';
+
+class CopyOrDeleteDialog extends StatelessWidget {
+  const CopyOrDeleteDialog({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(S.of(context).copyOrDeleteTimeDialogTitle),
+      content: Text(S.of(context).copyOrDeleteTimeDialogContent),
+      actions: [
+        TextButton(
+            onPressed: () {
+              Navigator.of(context).pop(true);
+            },
+            child: Text(S.of(context).dialogCopyLabel)),
+        TextButton(
+            onPressed: () {
+              Navigator.of(context).pop(false);
+            },
+            child: Text(S.of(context).dialogDeleteLabel))
+      ],
+    );
+  }
+}
diff --git a/lib/features/diary/diary_page.dart b/lib/features/diary/diary_page.dart
index fde9c00..9bb6510 100644
--- a/lib/features/diary/diary_page.dart
+++ b/lib/features/diary/diary_page.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:logging/logging.dart';
+import 'package:opennutritracker/core/data/data_source/intake_data_source.dart';
 import 'package:opennutritracker/core/domain/entity/intake_entity.dart';
 import 'package:opennutritracker/core/domain/entity/tracked_day_entity.dart';
 import 'package:opennutritracker/core/domain/entity/user_activity_entity.dart';
+import 'package:opennutritracker/core/domain/usecase/add_intake_usecase.dart';
 import 'package:opennutritracker/core/utils/locator.dart';
 import 'package:opennutritracker/features/diary/presentation/bloc/calendar_day_bloc.dart';
 import 'package:opennutritracker/features/diary/presentation/bloc/diary_bloc.dart';
@@ -11,6 +13,9 @@ import 'package:opennutritracker/features/diary/presentation/widgets/diary_table
 import 'package:opennutritracker/features/diary/presentation/widgets/day_info_widget.dart';
 import 'package:opennutritracker/generated/l10n.dart';
 
+import '../../core/data/dbo/intake_dbo.dart';
+import '../../core/utils/id_generator.dart';
+
 class DiaryPage extends StatefulWidget {
   const DiaryPage({super.key});
 
@@ -23,6 +28,7 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
 
   late DiaryBloc _diaryBloc;
   late CalendarDayBloc _calendarDayBloc;
+  late AddIntakeUsecase _addIntakeUsecase;
 
   static const _calendarDurationDays = Duration(days: 356);
   final _currentDate = DateTime.now();
@@ -34,6 +40,7 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     WidgetsBinding.instance.addObserver(this);
     _diaryBloc = locator<DiaryBloc>();
     _calendarDayBloc = locator<CalendarDayBloc>();
+    _addIntakeUsecase = locator<AddIntakeUsecase>();
     super.initState();
   }
 
@@ -103,6 +110,8 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
                 snackIntake: state.snackIntakeList,
                 onDeleteIntake: _onDeleteIntakeItem,
                 onDeleteActivity: _onDeleteActivityItem,
+                onCopyIntake: _onCopyIntakeItem,
+                onCopyActivity: _onCopyActivityItem,
               );
             }
             return const SizedBox();
@@ -138,6 +147,24 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     }
   }
 
+  void _onCopyIntakeItem(
+      IntakeEntity intakeEntity, TrackedDayEntity? trackedDayEntity) async {
+    final newIntake = IntakeEntity(
+        id: IdGenerator.getUniqueID(),
+        unit: intakeEntity.unit,
+        amount: intakeEntity.amount,
+        type: intakeEntity.type,
+        meal: intakeEntity.meal,
+        dateTime: DateTime.now());
+    _addIntakeUsecase.addIntake(newIntake);
+    _diaryBloc.updateHomePage();
+  }
+
+  void _onCopyActivityItem(UserActivityEntity userActivityEntity,
+      TrackedDayEntity? trackedDayEntity) async {
+    log.info("Should copy activity");
+  }
+
   void _onDateSelected(
       DateTime newDate, Map<String, TrackedDayEntity> trackedDaysMap) {
     setState(() {
diff --git a/lib/features/diary/presentation/widgets/day_info_widget.dart b/lib/features/diary/presentation/widgets/day_info_widget.dart
index 851c818..f914589 100644
--- a/lib/features/diary/presentation/widgets/day_info_widget.dart
+++ b/lib/features/diary/presentation/widgets/day_info_widget.dart
@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:opennutritracker/core/domain/entity/intake_entity.dart';
@@ -10,6 +12,8 @@ import 'package:opennutritracker/features/add_meal/presentation/add_meal_type.da
 import 'package:opennutritracker/features/home/presentation/widgets/intake_vertical_list.dart';
 import 'package:opennutritracker/generated/l10n.dart';
 
+import '../../../../core/presentation/widgets/copy_or_delete_dialog.dart';
+
 class DayInfoWidget extends StatelessWidget {
   final DateTime selectedDay;
   final TrackedDayEntity? trackedDayEntity;
@@ -22,18 +26,25 @@ class DayInfoWidget extends StatelessWidget {
       onDeleteIntake;
   final Function(UserActivityEntity userActivityEntity,
       TrackedDayEntity? trackedDayEntity) onDeleteActivity;
+  final Function(IntakeEntity intake, TrackedDayEntity? trackedDayEntity)
+      onCopyIntake;
+  final Function(UserActivityEntity userActivityEntity,
+      TrackedDayEntity? trackedDayEntity) onCopyActivity;
 
-  const DayInfoWidget(
-      {super.key,
-      required this.selectedDay,
-      required this.trackedDayEntity,
-      required this.userActivities,
-      required this.breakfastIntake,
-      required this.lunchIntake,
-      required this.dinnerIntake,
-      required this.snackIntake,
-      required this.onDeleteIntake,
-      required this.onDeleteActivity});
+  const DayInfoWidget({
+    super.key,
+    required this.selectedDay,
+    required this.trackedDayEntity,
+    required this.userActivities,
+    required this.breakfastIntake,
+    required this.lunchIntake,
+    required this.dinnerIntake,
+    required this.snackIntake,
+    required this.onDeleteIntake,
+    required this.onDeleteActivity,
+    required this.onCopyIntake,
+    required this.onCopyActivity,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -173,21 +184,49 @@ class DayInfoWidget extends StatelessWidget {
 
   void onIntakeItemLongPressed(
       BuildContext context, IntakeEntity intakeEntity) async {
+    final copyOrDelete = await showDialog<bool>(
+        context: context, builder: (context) => const CopyOrDeleteDialog());
+
+    if (copyOrDelete != null && !copyOrDelete) {
+      final shouldDeleteIntake = await showDialog<bool>(
+          context: context, builder: (context) => const DeleteDialog());
+      if (shouldDeleteIntake != null) {
+        onDeleteIntake(intakeEntity, trackedDayEntity);
+      }
+    } else if (copyOrDelete != null && copyOrDelete) {
+      onCopyIntake(intakeEntity, null);
+    }
+  }
+
+  void showCopyOrDeleteDialog(
+      BuildContext context, UserActivityEntity activityEntity) async {
+    final copyOrDelete = await showDialog<bool>(
+        context: context, builder: (context) => const CopyOrDeleteDialog());
+
+    if (copyOrDelete != null && !copyOrDelete) {
+      if (context.mounted) {
+        showDeleteDialog(context, activityEntity);
+      }
+    } else if (copyOrDelete != null && copyOrDelete) {
+      onCopyActivity(activityEntity, null);
+    }
+  }
+
+  void showDeleteDialog(
+      BuildContext context, UserActivityEntity activityEntity) async {
     final shouldDeleteIntake = await showDialog<bool>(
         context: context, builder: (context) => const DeleteDialog());
-
     if (shouldDeleteIntake != null) {
-      onDeleteIntake(intakeEntity, trackedDayEntity);
+      onDeleteActivity(activityEntity, trackedDayEntity);
     }
   }
 
   void onActivityItemLongPressed(
       BuildContext context, UserActivityEntity activityEntity) async {
-    final shouldDeleteActivity = await showDialog<bool>(
-        context: context, builder: (context) => const DeleteDialog());
-
-    if (shouldDeleteActivity != null) {
-      onDeleteActivity(activityEntity, trackedDayEntity);
+    if (DateUtils.isSameDay(selectedDay, DateTime.now())) {
+      showDeleteDialog(context, activityEntity);
+    } else {
+      showCopyOrDeleteDialog(context, activityEntity);
     }
   }
 }
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index 12a0372..5e727fb 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -891,6 +891,46 @@ class S {
     );
   }
 
+  /// `Delete Item?`
+  String get copyOrDeleteTimeDialogTitle {
+    return Intl.message(
+      'What do you want to do?',
+      name: 'copyOrDeleteTimeDialogTitle',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Do want to delete the selected item?`
+  String get copyOrDeleteTimeDialogContent {
+    return Intl.message(
+      'Click "Copy to today" to copy the content to the current day or click "Delete" to delete the item.',
+      name: 'copyOrDeleteTimeDialogContent',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `COPY TO TODAY`
+  String get dialogCopyLabel {
+    return Intl.message(
+      'COPY TO TODAY',
+      name: 'dialogCopyLabel',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `DELETE`
+  String get dialogDeleteLabel {
+    return Intl.message(
+      'DELETE',
+      name: 'dialogDeleteLabel',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Delete Item?`
   String get deleteTimeDialogTitle {
     return Intl.message(

From b15639350705642d3f476de954815b7ef71f7997 Mon Sep 17 00:00:00 2001
From: Merlin Dienst <merlin.dienst@gmail.com>
Date: Wed, 18 Dec 2024 21:12:55 +0100
Subject: [PATCH 3/7] WIP: Fixed issues from last commit, added dialog to
 select which meal to copy to

---
 .../presentation/widgets/copy_dialog.dart     | 55 +++++++++++++++++
 lib/features/diary/diary_page.dart            | 55 +++++++++--------
 .../presentation/widgets/day_info_widget.dart | 60 +++++++++++++------
 lib/generated/l10n.dart                       | 15 ++++-
 4 files changed, 141 insertions(+), 44 deletions(-)
 create mode 100644 lib/core/presentation/widgets/copy_dialog.dart

diff --git a/lib/core/presentation/widgets/copy_dialog.dart b/lib/core/presentation/widgets/copy_dialog.dart
new file mode 100644
index 0000000..d450a14
--- /dev/null
+++ b/lib/core/presentation/widgets/copy_dialog.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:opennutritracker/features/add_meal/presentation/add_meal_type.dart';
+import 'package:opennutritracker/generated/l10n.dart';
+
+class CopyDialog extends StatefulWidget {
+  const CopyDialog({super.key});
+  @override
+  State<StatefulWidget> createState() {
+    return CopyDialogState();
+  }
+}
+
+class CopyDialogState extends State<CopyDialog> {
+  AddMealType _selectedValue = AddMealType.breakfastType;
+  AddMealType get selectedMealType => _selectedValue;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(
+    BuildContext context,
+  ) {
+    return AlertDialog(
+        title: Text(S.of(context).copyDialogTitle),
+        content: DropdownButton<AddMealType>(
+            value: _selectedValue,
+            onChanged: (AddMealType? addMealType) {
+              if (addMealType != null) {
+                setState(() {
+                  _selectedValue = addMealType;
+                });
+              }
+            },
+            items: AddMealType.values.map((AddMealType addMealType) {
+              return DropdownMenuItem(
+                  value: addMealType,
+                  child: Text(addMealType.getTypeName(context)));
+            }).toList()),
+        actions: [
+          TextButton(
+              onPressed: () {
+                Navigator.of(context).pop(_selectedValue);
+              },
+              child: Text(S.of(context).dialogOKLabel)),
+          TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: Text(S.of(context).dialogCancelLabel))
+        ]);
+  }
+}
diff --git a/lib/features/diary/diary_page.dart b/lib/features/diary/diary_page.dart
index 9bb6510..f0c2924 100644
--- a/lib/features/diary/diary_page.dart
+++ b/lib/features/diary/diary_page.dart
@@ -1,20 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:logging/logging.dart';
-import 'package:opennutritracker/core/data/data_source/intake_data_source.dart';
 import 'package:opennutritracker/core/domain/entity/intake_entity.dart';
 import 'package:opennutritracker/core/domain/entity/tracked_day_entity.dart';
 import 'package:opennutritracker/core/domain/entity/user_activity_entity.dart';
-import 'package:opennutritracker/core/domain/usecase/add_intake_usecase.dart';
 import 'package:opennutritracker/core/utils/locator.dart';
 import 'package:opennutritracker/features/diary/presentation/bloc/calendar_day_bloc.dart';
 import 'package:opennutritracker/features/diary/presentation/bloc/diary_bloc.dart';
 import 'package:opennutritracker/features/diary/presentation/widgets/diary_table_calendar.dart';
 import 'package:opennutritracker/features/diary/presentation/widgets/day_info_widget.dart';
+import 'package:opennutritracker/features/meal_detail/presentation/bloc/meal_detail_bloc.dart';
 import 'package:opennutritracker/generated/l10n.dart';
 
-import '../../core/data/dbo/intake_dbo.dart';
-import '../../core/utils/id_generator.dart';
+import '../../core/domain/entity/intake_type_entity.dart';
 
 class DiaryPage extends StatefulWidget {
   const DiaryPage({super.key});
@@ -28,7 +26,7 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
 
   late DiaryBloc _diaryBloc;
   late CalendarDayBloc _calendarDayBloc;
-  late AddIntakeUsecase _addIntakeUsecase;
+  late MealDetailBloc _mealDetailBloc;
 
   static const _calendarDurationDays = Duration(days: 356);
   final _currentDate = DateTime.now();
@@ -40,7 +38,7 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     WidgetsBinding.instance.addObserver(this);
     _diaryBloc = locator<DiaryBloc>();
     _calendarDayBloc = locator<CalendarDayBloc>();
-    _addIntakeUsecase = locator<AddIntakeUsecase>();
+    _mealDetailBloc = locator<MealDetailBloc>();
     super.initState();
   }
 
@@ -79,8 +77,8 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
   Widget _getLoadingContent() =>
       const Center(child: CircularProgressIndicator());
 
-  Widget _getLoadedContent(
-      BuildContext context, Map<String, TrackedDayEntity> trackedDaysMap) {
+  Widget _getLoadedContent(BuildContext context,
+      Map<String, TrackedDayEntity> trackedDaysMap) {
     return ListView(
       children: [
         DiaryTableCalendar(
@@ -121,8 +119,8 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     );
   }
 
-  void _onDeleteIntakeItem(
-      IntakeEntity intakeEntity, TrackedDayEntity? trackedDayEntity) async {
+  void _onDeleteIntakeItem(IntakeEntity intakeEntity,
+      TrackedDayEntity? trackedDayEntity) async {
     await _calendarDayBloc.deleteIntakeItem(
         context, intakeEntity, trackedDayEntity?.day ?? DateTime.now());
     _diaryBloc.add(const LoadDiaryYearEvent());
@@ -130,7 +128,9 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     _diaryBloc.updateHomePage();
     if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(S.of(context).itemDeletedSnackbar)));
+          SnackBar(content: Text(S
+              .of(context)
+              .itemDeletedSnackbar)));
     }
   }
 
@@ -143,20 +143,27 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     _diaryBloc.updateHomePage();
     if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(S.of(context).itemDeletedSnackbar)));
+          SnackBar(content: Text(S
+              .of(context)
+              .itemDeletedSnackbar)));
     }
   }
 
-  void _onCopyIntakeItem(
-      IntakeEntity intakeEntity, TrackedDayEntity? trackedDayEntity) async {
-    final newIntake = IntakeEntity(
-        id: IdGenerator.getUniqueID(),
-        unit: intakeEntity.unit,
-        amount: intakeEntity.amount,
-        type: intakeEntity.type,
-        meal: intakeEntity.meal,
-        dateTime: DateTime.now());
-    _addIntakeUsecase.addIntake(newIntake);
+  void _onCopyIntakeItem(IntakeEntity intakeEntity,
+      TrackedDayEntity? trackedDayEntity, IntakeTypeEntity? type) async {
+    IntakeTypeEntity finalType;
+    if (type == null) {
+      finalType = intakeEntity.type;
+    } else {
+      finalType = type;
+    }
+    _mealDetailBloc.addIntake(
+        context,
+        intakeEntity.unit,
+        intakeEntity.amount.toString(),
+        finalType,
+        intakeEntity.meal,
+        DateTime.now());
     _diaryBloc.updateHomePage();
   }
 
@@ -165,8 +172,8 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     log.info("Should copy activity");
   }
 
-  void _onDateSelected(
-      DateTime newDate, Map<String, TrackedDayEntity> trackedDaysMap) {
+  void _onDateSelected(DateTime newDate,
+      Map<String, TrackedDayEntity> trackedDaysMap) {
     setState(() {
       _selectedDate = newDate;
       _focusedDate = newDate;
diff --git a/lib/features/diary/presentation/widgets/day_info_widget.dart b/lib/features/diary/presentation/widgets/day_info_widget.dart
index f914589..faf75de 100644
--- a/lib/features/diary/presentation/widgets/day_info_widget.dart
+++ b/lib/features/diary/presentation/widgets/day_info_widget.dart
@@ -1,11 +1,11 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:opennutritracker/core/domain/entity/intake_entity.dart';
+import 'package:opennutritracker/core/domain/entity/intake_type_entity.dart';
 import 'package:opennutritracker/core/domain/entity/tracked_day_entity.dart';
 import 'package:opennutritracker/core/domain/entity/user_activity_entity.dart';
 import 'package:opennutritracker/core/presentation/widgets/activity_vertial_list.dart';
+import 'package:opennutritracker/core/presentation/widgets/copy_dialog.dart';
 import 'package:opennutritracker/core/presentation/widgets/delete_dialog.dart';
 import 'package:opennutritracker/core/utils/custom_icons.dart';
 import 'package:opennutritracker/features/add_meal/presentation/add_meal_type.dart';
@@ -26,8 +26,8 @@ class DayInfoWidget extends StatelessWidget {
       onDeleteIntake;
   final Function(UserActivityEntity userActivityEntity,
       TrackedDayEntity? trackedDayEntity) onDeleteActivity;
-  final Function(IntakeEntity intake, TrackedDayEntity? trackedDayEntity)
-      onCopyIntake;
+  final Function(IntakeEntity intake, TrackedDayEntity? trackedDayEntity,
+      IntakeTypeEntity? type) onCopyIntake;
   final Function(UserActivityEntity userActivityEntity,
       TrackedDayEntity? trackedDayEntity) onCopyActivity;
 
@@ -182,37 +182,61 @@ class DayInfoWidget extends StatelessWidget {
     return 'Carbs: $carbsTracked/${carbsGoal}g, Fat: $fatTracked/${fatGoal}g, Protein: $proteinTracked/${proteinGoal}g';
   }
 
-  void onIntakeItemLongPressed(
+  void showCopyOrDeleteIntakeDialog(
       BuildContext context, IntakeEntity intakeEntity) async {
     final copyOrDelete = await showDialog<bool>(
         context: context, builder: (context) => const CopyOrDeleteDialog());
-
-    if (copyOrDelete != null && !copyOrDelete) {
-      final shouldDeleteIntake = await showDialog<bool>(
-          context: context, builder: (context) => const DeleteDialog());
-      if (shouldDeleteIntake != null) {
-        onDeleteIntake(intakeEntity, trackedDayEntity);
+    if (context.mounted) {
+      if (copyOrDelete != null && !copyOrDelete) {
+        showDeleteIntakeDialog(context, intakeEntity);
+      } else if (copyOrDelete != null && copyOrDelete) {
+        showCopyDialog(context, intakeEntity);
       }
-    } else if (copyOrDelete != null && copyOrDelete) {
-      onCopyIntake(intakeEntity, null);
     }
   }
 
-  void showCopyOrDeleteDialog(
+  void showCopyDialog(BuildContext context, IntakeEntity intakeEntity) async {
+    const copyDialog = CopyDialog();
+    final shouldCopyIntake = await showDialog<bool>(
+        context: context, builder: (context) => copyDialog);
+    if (shouldCopyIntake != null) {
+      onCopyIntake(intakeEntity, null, null);
+    }
+  }
+
+  void showDeleteIntakeDialog(
+      BuildContext context, IntakeEntity intakeEntity) async {
+    final shouldDeleteIntake = await showDialog<bool>(
+        context: context, builder: (context) => const DeleteDialog());
+    if (shouldDeleteIntake != null) {
+      onDeleteIntake(intakeEntity, trackedDayEntity);
+    }
+  }
+
+  void onIntakeItemLongPressed(
+      BuildContext context, IntakeEntity intakeEntity) async {
+    if (DateUtils.isSameDay(selectedDay, DateTime.now())) {
+      showDeleteIntakeDialog(context, intakeEntity);
+    } else {
+      showCopyOrDeleteIntakeDialog(context, intakeEntity);
+    }
+  }
+
+  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) {
-        showDeleteDialog(context, activityEntity);
+        showDeleteActivityDialog(context, activityEntity);
       }
     } else if (copyOrDelete != null && copyOrDelete) {
       onCopyActivity(activityEntity, null);
     }
   }
 
-  void showDeleteDialog(
+  void showDeleteActivityDialog(
       BuildContext context, UserActivityEntity activityEntity) async {
     final shouldDeleteIntake = await showDialog<bool>(
         context: context, builder: (context) => const DeleteDialog());
@@ -224,9 +248,9 @@ class DayInfoWidget extends StatelessWidget {
   void onActivityItemLongPressed(
       BuildContext context, UserActivityEntity activityEntity) async {
     if (DateUtils.isSameDay(selectedDay, DateTime.now())) {
-      showDeleteDialog(context, activityEntity);
+      showDeleteActivityDialog(context, activityEntity);
     } else {
-      showCopyOrDeleteDialog(context, activityEntity);
+      showCopyOrDeleteActivityDialog(context, activityEntity);
     }
   }
 }
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index 5e727fb..5035153 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -891,7 +891,18 @@ class S {
     );
   }
 
-  /// `Delete Item?`
+  /// `Select meal to copy to`
+  String get copyDialogTitle {
+    return Intl.message(
+      'Select meal to copy to',
+      name: 'copyDialogTitle',
+      desc: '',
+      args: [],
+    );
+  }
+
+
+  /// `What do you want to do?`
   String get copyOrDeleteTimeDialogTitle {
     return Intl.message(
       'What do you want to do?',
@@ -901,7 +912,7 @@ class S {
     );
   }
 
-  /// `Do want to delete the selected item?`
+  /// `Click "Copy to today" to copy the content to the current day or click "Delete" to delete the item.`
   String get copyOrDeleteTimeDialogContent {
     return Intl.message(
       'Click "Copy to today" to copy the content to the current day or click "Delete" to delete the item.',

From f7ab29049899f3329fc2ac223dbb777efc203573 Mon Sep 17 00:00:00 2001
From: Merlin Dienst <merlin.dienst@gmail.com>
Date: Wed, 18 Dec 2024 21:32:55 +0100
Subject: [PATCH 4/7] added translations, finalized functionality

---
 lib/features/diary/diary_page.dart            | 25 ++++---
 .../presentation/widgets/day_info_widget.dart |  9 ++-
 lib/generated/intl/messages_de.dart           |  9 +++
 lib/generated/intl/messages_en.dart           |  9 +++
 lib/generated/intl/messages_tr.dart           |  9 +++
 lib/generated/l10n.dart                       | 65 +++++++++----------
 lib/l10n/intl_de.arb                          |  7 ++
 lib/l10n/intl_en.arb                          |  7 ++
 lib/l10n/intl_tr.arb                          |  7 ++
 9 files changed, 95 insertions(+), 52 deletions(-)

diff --git a/lib/features/diary/diary_page.dart b/lib/features/diary/diary_page.dart
index f0c2924..0fb66fa 100644
--- a/lib/features/diary/diary_page.dart
+++ b/lib/features/diary/diary_page.dart
@@ -5,6 +5,7 @@ import 'package:opennutritracker/core/domain/entity/intake_entity.dart';
 import 'package:opennutritracker/core/domain/entity/tracked_day_entity.dart';
 import 'package:opennutritracker/core/domain/entity/user_activity_entity.dart';
 import 'package:opennutritracker/core/utils/locator.dart';
+import 'package:opennutritracker/features/add_meal/presentation/add_meal_type.dart';
 import 'package:opennutritracker/features/diary/presentation/bloc/calendar_day_bloc.dart';
 import 'package:opennutritracker/features/diary/presentation/bloc/diary_bloc.dart';
 import 'package:opennutritracker/features/diary/presentation/widgets/diary_table_calendar.dart';
@@ -77,8 +78,8 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
   Widget _getLoadingContent() =>
       const Center(child: CircularProgressIndicator());
 
-  Widget _getLoadedContent(BuildContext context,
-      Map<String, TrackedDayEntity> trackedDaysMap) {
+  Widget _getLoadedContent(
+      BuildContext context, Map<String, TrackedDayEntity> trackedDaysMap) {
     return ListView(
       children: [
         DiaryTableCalendar(
@@ -119,8 +120,8 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     );
   }
 
-  void _onDeleteIntakeItem(IntakeEntity intakeEntity,
-      TrackedDayEntity? trackedDayEntity) async {
+  void _onDeleteIntakeItem(
+      IntakeEntity intakeEntity, TrackedDayEntity? trackedDayEntity) async {
     await _calendarDayBloc.deleteIntakeItem(
         context, intakeEntity, trackedDayEntity?.day ?? DateTime.now());
     _diaryBloc.add(const LoadDiaryYearEvent());
@@ -128,9 +129,7 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     _diaryBloc.updateHomePage();
     if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(S
-              .of(context)
-              .itemDeletedSnackbar)));
+          SnackBar(content: Text(S.of(context).itemDeletedSnackbar)));
     }
   }
 
@@ -143,19 +142,17 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     _diaryBloc.updateHomePage();
     if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(S
-              .of(context)
-              .itemDeletedSnackbar)));
+          SnackBar(content: Text(S.of(context).itemDeletedSnackbar)));
     }
   }
 
   void _onCopyIntakeItem(IntakeEntity intakeEntity,
-      TrackedDayEntity? trackedDayEntity, IntakeTypeEntity? type) async {
+      TrackedDayEntity? trackedDayEntity, AddMealType? type) async {
     IntakeTypeEntity finalType;
     if (type == null) {
       finalType = intakeEntity.type;
     } else {
-      finalType = type;
+      finalType = type.getIntakeType();
     }
     _mealDetailBloc.addIntake(
         context,
@@ -172,8 +169,8 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     log.info("Should copy activity");
   }
 
-  void _onDateSelected(DateTime newDate,
-      Map<String, TrackedDayEntity> trackedDaysMap) {
+  void _onDateSelected(
+      DateTime newDate, Map<String, TrackedDayEntity> trackedDaysMap) {
     setState(() {
       _selectedDate = newDate;
       _focusedDate = newDate;
diff --git a/lib/features/diary/presentation/widgets/day_info_widget.dart b/lib/features/diary/presentation/widgets/day_info_widget.dart
index faf75de..20f0db1 100644
--- a/lib/features/diary/presentation/widgets/day_info_widget.dart
+++ b/lib/features/diary/presentation/widgets/day_info_widget.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:opennutritracker/core/domain/entity/intake_entity.dart';
-import 'package:opennutritracker/core/domain/entity/intake_type_entity.dart';
 import 'package:opennutritracker/core/domain/entity/tracked_day_entity.dart';
 import 'package:opennutritracker/core/domain/entity/user_activity_entity.dart';
 import 'package:opennutritracker/core/presentation/widgets/activity_vertial_list.dart';
@@ -27,7 +26,7 @@ class DayInfoWidget extends StatelessWidget {
   final Function(UserActivityEntity userActivityEntity,
       TrackedDayEntity? trackedDayEntity) onDeleteActivity;
   final Function(IntakeEntity intake, TrackedDayEntity? trackedDayEntity,
-      IntakeTypeEntity? type) onCopyIntake;
+      AddMealType? type) onCopyIntake;
   final Function(UserActivityEntity userActivityEntity,
       TrackedDayEntity? trackedDayEntity) onCopyActivity;
 
@@ -197,10 +196,10 @@ class DayInfoWidget extends StatelessWidget {
 
   void showCopyDialog(BuildContext context, IntakeEntity intakeEntity) async {
     const copyDialog = CopyDialog();
-    final shouldCopyIntake = await showDialog<bool>(
+    final selectedMealType = await showDialog<AddMealType>(
         context: context, builder: (context) => copyDialog);
-    if (shouldCopyIntake != null) {
-      onCopyIntake(intakeEntity, null, null);
+    if (selectedMealType != null) {
+      onCopyIntake(intakeEntity, null, selectedMealType);
     }
   }
 
diff --git a/lib/generated/intl/messages_de.dart b/lib/generated/intl/messages_de.dart
index 73f2111..f553d2b 100644
--- a/lib/generated/intl/messages_de.dart
+++ b/lib/generated/intl/messages_de.dart
@@ -84,6 +84,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "chooseWeightGoalLabel":
             MessageLookupByLibrary.simpleMessage("Gewichtsziel wählen"),
         "cmLabel": MessageLookupByLibrary.simpleMessage("cm"),
+        "copyDialogTitle": MessageLookupByLibrary.simpleMessage(
+            "Zu welcher Mahlzeit hinzufügen?"),
+        "copyOrDeleteTimeDialogContent": MessageLookupByLibrary.simpleMessage(
+            "Auf \"Nach heute kopieren\" klicken, um die Mahlzeit nach heute zu kopieren. Mit \"Löschen\" kann die Mahlzeit entfernt werden"),
+        "copyOrDeleteTimeDialogTitle":
+            MessageLookupByLibrary.simpleMessage("Was soll getan werden?"),
         "createCustomDialogContent": MessageLookupByLibrary.simpleMessage(
             "Möchten Sie einen benutzerdefinierte Mahlzeit erstellen?"),
         "createCustomDialogTitle": MessageLookupByLibrary.simpleMessage(
@@ -95,6 +101,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteTimeDialogTitle":
             MessageLookupByLibrary.simpleMessage("Eintrag löschen?"),
         "dialogCancelLabel": MessageLookupByLibrary.simpleMessage("ABBRECHEN"),
+        "dialogCopyLabel":
+            MessageLookupByLibrary.simpleMessage("NACH HEUTE KOPIEREN"),
+        "dialogDeleteLabel": MessageLookupByLibrary.simpleMessage("LÖSCHEN"),
         "dialogOKLabel": MessageLookupByLibrary.simpleMessage("OK"),
         "diaryLabel": MessageLookupByLibrary.simpleMessage("Tagebuch"),
         "dinnerExample": MessageLookupByLibrary.simpleMessage(
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index 6867887..547be12 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -84,6 +84,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "chooseWeightGoalLabel":
             MessageLookupByLibrary.simpleMessage("Choose Weight Goal"),
         "cmLabel": MessageLookupByLibrary.simpleMessage("cm"),
+        "copyDialogTitle": MessageLookupByLibrary.simpleMessage(
+            "Which meal type di 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":
+            MessageLookupByLibrary.simpleMessage("What do you want to do?"),
         "createCustomDialogContent": MessageLookupByLibrary.simpleMessage(
             "Do you want create a custom meal item?"),
         "createCustomDialogTitle":
@@ -95,6 +101,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteTimeDialogTitle":
             MessageLookupByLibrary.simpleMessage("Delete Item?"),
         "dialogCancelLabel": MessageLookupByLibrary.simpleMessage("CANCEL"),
+        "dialogCopyLabel":
+            MessageLookupByLibrary.simpleMessage("COPY TO TODAY"),
+        "dialogDeleteLabel": MessageLookupByLibrary.simpleMessage("DELETE"),
         "dialogOKLabel": MessageLookupByLibrary.simpleMessage("OK"),
         "diaryLabel": MessageLookupByLibrary.simpleMessage("Diary"),
         "dinnerExample": MessageLookupByLibrary.simpleMessage(
diff --git a/lib/generated/intl/messages_tr.dart b/lib/generated/intl/messages_tr.dart
index 9d56d44..c4ffea4 100644
--- a/lib/generated/intl/messages_tr.dart
+++ b/lib/generated/intl/messages_tr.dart
@@ -82,6 +82,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "chooseWeightGoalLabel":
             MessageLookupByLibrary.simpleMessage("Kilo Hedefi Seçin"),
         "cmLabel": MessageLookupByLibrary.simpleMessage("cm"),
+        "copyDialogTitle": MessageLookupByLibrary.simpleMessage(
+            "Hangi öğüne eklemek istiyorsunuz?"),
+        "copyOrDeleteTimeDialogContent": MessageLookupByLibrary.simpleMessage(
+            "\"Bugüne kopyala\" seçeneğine tıklayarak öğünü bugüne kopyalayabilirsiniz. \"Sil\" seçeneği ile öğün kaldırılabilir."),
+        "copyOrDeleteTimeDialogTitle":
+            MessageLookupByLibrary.simpleMessage("Ne yapılmalı?"),
         "createCustomDialogContent": MessageLookupByLibrary.simpleMessage(
             "Özel bir yemek öğesi oluşturmak istiyor musunuz?"),
         "createCustomDialogTitle": MessageLookupByLibrary.simpleMessage(
@@ -93,6 +99,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteTimeDialogTitle":
             MessageLookupByLibrary.simpleMessage("Öğe Silinsin mi?"),
         "dialogCancelLabel": MessageLookupByLibrary.simpleMessage("İPTAL"),
+        "dialogCopyLabel":
+            MessageLookupByLibrary.simpleMessage("BUGÜNE KOPYALA"),
+        "dialogDeleteLabel": MessageLookupByLibrary.simpleMessage("SİL"),
         "dialogOKLabel": MessageLookupByLibrary.simpleMessage("TAMAM"),
         "diaryLabel": MessageLookupByLibrary.simpleMessage("Günlük"),
         "dinnerExample": MessageLookupByLibrary.simpleMessage(
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index 5035153..dff2065 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -891,82 +891,81 @@ class S {
     );
   }
 
-  /// `Select meal to copy to`
-  String get copyDialogTitle {
+  /// `Delete Item?`
+  String get deleteTimeDialogTitle {
     return Intl.message(
-      'Select meal to copy to',
-      name: 'copyDialogTitle',
+      'Delete Item?',
+      name: 'deleteTimeDialogTitle',
       desc: '',
       args: [],
     );
   }
 
-
-  /// `What do you want to do?`
-  String get copyOrDeleteTimeDialogTitle {
+  /// `Do want to delete the selected item?`
+  String get deleteTimeDialogContent {
     return Intl.message(
-      'What do you want to do?',
-      name: 'copyOrDeleteTimeDialogTitle',
+      'Do want to delete the selected item?',
+      name: 'deleteTimeDialogContent',
       desc: '',
       args: [],
     );
   }
 
-  /// `Click "Copy to today" to copy the content to the current day or click "Delete" to delete the item.`
-  String get copyOrDeleteTimeDialogContent {
+  /// `Item deleted`
+  String get itemDeletedSnackbar {
     return Intl.message(
-      'Click "Copy to today" to copy the content to the current day or click "Delete" to delete the item.',
-      name: 'copyOrDeleteTimeDialogContent',
+      'Item deleted',
+      name: 'itemDeletedSnackbar',
       desc: '',
       args: [],
     );
   }
 
-  /// `COPY TO TODAY`
-  String get dialogCopyLabel {
+  /// `Which meal type di you want to copy to?`
+  String get copyDialogTitle {
     return Intl.message(
-      'COPY TO TODAY',
-      name: 'dialogCopyLabel',
+      'Which meal type di you want to copy to?',
+      name: 'copyDialogTitle',
       desc: '',
       args: [],
     );
   }
 
-  /// `DELETE`
-  String get dialogDeleteLabel {
+  /// `What do you want to do?`
+  String get copyOrDeleteTimeDialogTitle {
     return Intl.message(
-      'DELETE',
-      name: 'dialogDeleteLabel',
+      'What do you want to do?',
+      name: 'copyOrDeleteTimeDialogTitle',
       desc: '',
       args: [],
     );
   }
 
-  /// `Delete Item?`
-  String get deleteTimeDialogTitle {
+  /// `With "Copy to today" you can copy the meal to today. With "Delete" you can delete the meal.`
+  String get copyOrDeleteTimeDialogContent {
     return Intl.message(
-      'Delete Item?',
-      name: 'deleteTimeDialogTitle',
+      'With "Copy to today" you can copy the meal to today. With "Delete" you can delete the meal.',
+      name: 'copyOrDeleteTimeDialogContent',
       desc: '',
       args: [],
     );
   }
 
-  /// `Do want to delete the selected item?`
-  String get deleteTimeDialogContent {
+  /// `COPY TO TODAY`
+  String get dialogCopyLabel {
     return Intl.message(
-      'Do want to delete the selected item?',
-      name: 'deleteTimeDialogContent',
+      'COPY TO TODAY',
+      name: 'dialogCopyLabel',
       desc: '',
       args: [],
     );
   }
 
-  /// `Item deleted`
-  String get itemDeletedSnackbar {
+  /// `DELETE`
+  String get dialogDeleteLabel {
     return Intl.message(
-      'Item deleted',
-      name: 'itemDeletedSnackbar',
+      'DELETE',
+      name: 'dialogDeleteLabel',
       desc: '',
       args: [],
     );
diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb
index ac1bb05..e4f21bb 100644
--- a/lib/l10n/intl_de.arb
+++ b/lib/l10n/intl_de.arb
@@ -94,6 +94,13 @@
   "deleteTimeDialogContent": "Möchten Sie den ausgewählten Eintrag löschen?",
   "itemDeletedSnackbar": "Eintrag gelöscht",
 
+  "copyDialogTitle": "Zu welcher Mahlzeit hinzufügen?",
+
+  "copyOrDeleteTimeDialogTitle": "Was soll getan werden?",
+  "copyOrDeleteTimeDialogContent": "Auf \"Nach heute kopieren\" klicken, um die Mahlzeit nach heute zu kopieren. Mit \"Löschen\" kann die Mahlzeit entfernt werden",
+  "dialogCopyLabel": "NACH HEUTE KOPIEREN",
+  "dialogDeleteLabel": "LÖSCHEN",
+
   "suppliedLabel": "zugeführt",
   "burnedLabel": "verbrannt",
   "kcalLeftLabel": "kcal übrig",
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 477e40d..a6cb207 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -94,6 +94,13 @@
   "deleteTimeDialogContent": "Do want to delete the selected item?",
   "itemDeletedSnackbar": "Item deleted",
 
+  "copyDialogTitle": "Which meal type di 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.",
+  "dialogCopyLabel": "COPY TO TODAY",
+  "dialogDeleteLabel": "DELETE",
+
   "suppliedLabel": "supplied",
   "burnedLabel": "burned",
   "kcalLeftLabel": "kcal left",
diff --git a/lib/l10n/intl_tr.arb b/lib/l10n/intl_tr.arb
index b897435..9f82e44 100644
--- a/lib/l10n/intl_tr.arb
+++ b/lib/l10n/intl_tr.arb
@@ -94,6 +94,13 @@
   "deleteTimeDialogContent": "Seçili öğeyi silmek istiyor musunuz?",
   "itemDeletedSnackbar": "Öğe silindi",
 
+  "copyDialogTitle": "Hangi öğüne eklemek istiyorsunuz?",
+
+  "copyOrDeleteTimeDialogTitle": "Ne yapılmalı?",
+  "copyOrDeleteTimeDialogContent": "\"Bugüne kopyala\" seçeneğine tıklayarak öğünü bugüne kopyalayabilirsiniz. \"Sil\" seçeneği ile öğün kaldırılabilir.",
+  "dialogCopyLabel": "BUGÜNE KOPYALA",
+  "dialogDeleteLabel": "SİL",
+
   "suppliedLabel": "alınan",
   "burnedLabel": "yakılan",
   "kcalLeftLabel": "kalan kalori",

From 00fa35c62a793e0ad5c4eb4377326a917c6459b1 Mon Sep 17 00:00:00 2001
From: Merlin Dienst <merlin.dienst@gmail.com>
Date: Wed, 18 Dec 2024 21:34:49 +0100
Subject: [PATCH 5/7] Revert "changed package name"

This reverts commit 79e3831b69611a797e6143cafb75c402b0b03d4f.
---
 README.md                                                   | 2 +-
 android/.gitignore                                          | 4 ----
 android/app/build.gradle                                    | 2 +-
 android/app/src/debug/AndroidManifest.xml                   | 2 +-
 android/app/src/main/AndroidManifest.xml                    | 2 +-
 .../opennutritracker/ont/opennutritracker/MainActivity.kt   | 2 +-
 android/app/src/profile/AndroidManifest.xml                 | 2 +-
 android/gradle.properties                                   | 1 -
 android/gradle/wrapper/gradle-wrapper.properties            | 3 +--
 ios/Runner.xcodeproj/project.pbxproj                        | 6 +++---
 10 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 1c548ab..a1b6159 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ OpenNutriTracker is an open-source mobile application designed to simplify nutri
 
 ## Install
 [<img src="fastlane/metadata/android/en-US/images/appstore_banner.png" width="30%">](https://testflight.apple.com/join/j7uKoEDl)
-[<img src="fastlane/metadata/android/en-US/images/playstore_banner.png" width="30%">](https://play.google.com/store/apps/details?id=com.doktormerlin.ont.opennutritracker)
+[<img src="fastlane/metadata/android/en-US/images/playstore_banner.png" width="30%">](https://play.google.com/store/apps/details?id=com.opennutritracker.ont.opennutritracker)
 
 ## Key Features
 - **🍎 Nutritional Tracking:** Easily log your meals and snacks, and access a vast database of food items and ingredients to get detailed nutritional information.
diff --git a/android/.gitignore b/android/.gitignore
index 37be946..6f56801 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -11,7 +11,3 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
-
-# Adding gradle.properties because of changes regarding the JDK version.
-# Android Studio 2024.3 ships with JDK 21, which is incompatible with the required gradle 7.6.1
-gradle.properties
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7c44592..e99dc19 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -46,7 +46,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.doktormerlin.ont.opennutritracker"
+        applicationId "com.opennutritracker.ont.opennutritracker"
         minSdkVersion 21
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 1eb5596..34eed1c 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.doktormerlin.ont.opennutritracker">
+    package="com.opennutritracker.ont.opennutritracker">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 79a974d..0605b9b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.doktormerlin.ont.opennutritracker">
+    package="com.opennutritracker.ont.opennutritracker">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt b/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt
index 5b57e00..99d819e 100644
--- a/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.doktormerlin.ont.opennutritracker
+package com.opennutritracker.ont.opennutritracker
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 1eb5596..34eed1c 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.doktormerlin.ont.opennutritracker">
+    package="com.opennutritracker.ont.opennutritracker">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/gradle.properties b/android/gradle.properties
index 572f3a1..94adc3a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.java.home=C:\\Program Files\\Microsoft\\jdk-17.0.13.11-hotspot
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 5083229..ceccc3a 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
-networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 68893a5..e689c18 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -505,7 +505,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -536,7 +536,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

From e38fd3009c34fe2fc3cf403725d1eb02429882cb Mon Sep 17 00:00:00 2001
From: Merlin Dienst <merlin.dienst@gmail.com>
Date: Wed, 18 Dec 2024 21:42:27 +0100
Subject: [PATCH 6/7] reverted changes for onActivityItemLongPressed

---
 .../presentation/widgets/day_info_widget.dart | 30 +++----------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/lib/features/diary/presentation/widgets/day_info_widget.dart b/lib/features/diary/presentation/widgets/day_info_widget.dart
index 20f0db1..05779c0 100644
--- 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);
     }
   }
 }

From 84c6b98e6dc8cd069137d6c185eb6d5869556d2c Mon Sep 17 00:00:00 2001
From: Merlin Dienst <merlin.dienst@gmail.com>
Date: Wed, 18 Dec 2024 21:49:09 +0100
Subject: [PATCH 7/7] fixed translation

---
 lib/generated/intl/messages_en.dart | 2 +-
 lib/generated/l10n.dart             | 4 ++--
 lib/l10n/intl_en.arb                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index 547be12..fc1c371 100644
--- 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
index dff2065..98bae11 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -921,10 +921,10 @@ class S {
     );
   }
 
-  /// `Which meal type di you want to copy to?`
+  /// `Which meal type do you want to copy to?`
   String get copyDialogTitle {
     return Intl.message(
-      'Which meal type di you want to copy to?',
+      'Which meal type do you want to copy to?',
       name: 'copyDialogTitle',
       desc: '',
       args: [],
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index a6cb207..9772fcf 100644
--- 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.",