Merge remote-tracking branch 'origin/develop' into pr/271

# Conflicts:
#	lib/features/edit_meal/presentation/edit_meal_screen.dart

Author: simonoppowa

.github/workflows/default_workflow.yml

@@ -19,6 +19,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+      
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
@@ -30,6 +31,9 @@ jobs:
           flutter-version: '3.27.1'
           channel: 'stable'
           cache: true
+
+      - name: Setup Just
+        uses: taiki-e/install-action@just
 
       - name: Cache Flutter packages
         uses: actions/cache@v4
@@ -39,19 +43,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pub-cache-
 
-      - name: Install Pub Dependencies
-        run: flutter pub get
-        
-      - name: Build with secrets
-        run: flutter pub run build_runner build --delete-conflicting-outputs
-        env:
-          FDC_API_KEY: ${{ secrets.FDC_API_KEY }}
-          SENTRY_DNS: ${{ secrets.SENTRY_DNS }}
-          SUPABASE_PROJECT_ANON_KEY: ${{ secrets.SUPABASE_PROJECT_ANON_KEY }}
-          SUPABASE_PROJECT_URL: ${{ secrets.SUPABASE_PROJECT_URL }}
-
-      - name: Analyze Code
-        run: flutter analyze
-
-      - name: Run Tests
-        run: flutter test
+#      - name: Run CI
+#        run: just ci
+#        env:
+#          FDC_API_KEY: ${{ secrets.FDC_API_KEY }}
+#          SENTRY_DNS: ${{ secrets.SENTRY_DNS }}
+#          SUPABASE_PROJECT_ANON_KEY: ${{ secrets.SUPABASE_PROJECT_ANON_KEY }}
+#          SUPABASE_PROJECT_URL: ${{ secrets.SUPABASE_PROJECT_URL }}

.metadata

@@ -1,26 +1,23 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-  channel: stable
+  revision: "35c388afb57ef061d06a39b537336c87e0e3d1b1"
+  channel: "[user-branch]"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-    - platform: android
-      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-    - platform: ios
-      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+      create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
+      base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
+    - platform: web
+      create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
+      base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
 
   # User provided section
 

README.md

@@ -56,6 +56,11 @@ See [Data Protection](https://www.iubenda.com/privacy-policy/53501884)
 ## Contribution
 Contributions to OpenNutriTracker are welcome! If you find any issues or have suggestions for new features, please open an issue or submit a pull request. Make sure to follow the project's code style and guidelines.
 
+Thanks to all the contributors:
+<a href="https://github.com/simonoppowa/OpenNutriTracker/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=simonoppowa/OpenNutriTracker" />
+</a>
+
 ## Getting Started
 See the [Getting Started](GettingStarted.md) file for more information.
 

analysis_options.yaml

@@ -9,6 +9,12 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+analyzer:
+  # generated files throw `unnecessary_string_escapes` lint so we ignore warnings.
+  # TODO: inject `ignore_for_file` as described below.
+  exclude:
+    - lib/generated/intl/*.dart
+
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`

justfile

@@ -0,0 +1,29 @@
+intl_output_dir := "./lib/generated/intl/"
+
+# Install dependencies
+install:
+  flutter pub get
+
+# Build OpenNutriTracker
+build:
+  flutter pub run build_runner build --delete-conflicting-outputs
+
+# Format dart code
+format *OPTIONS:
+  dart format {{OPTIONS}} ./lib ./test
+
+# Regenerate intl files
+run_intl: && format
+  dart run intl_translation:generate_from_arb --output-dir {{intl_output_dir}} lib/**/*.dart ./lib/l10n/*.arb
+
+# Check if intl files are correctly generated
+check_intl: run_intl 
+  git diff  --exit-code {{intl_output_dir}}
+
+# Run tests
+test:
+  flutter test
+
+# Run CI checks
+ci: install (format "--set-exit-if-changed") check_intl build && test
+  flutter analyze

lib/core/data/data_source/config_data_source.dart

@@ -23,16 +23,19 @@ class ConfigDataSource {
 
   Future<void> setConfigDisclaimer(bool hasAcceptedDisclaimer) async {
     _log.fine(
-        'Updating config hasAcceptedDisclaimer to $hasAcceptedDisclaimer');
+      'Updating config hasAcceptedDisclaimer to $hasAcceptedDisclaimer',
+    );
     final config = _configBox.get(_configKey);
     config?.hasAcceptedDisclaimer = hasAcceptedDisclaimer;
     config?.save();
   }
 
   Future<void> setConfigAcceptedAnonymousData(
-      bool hasAcceptedAnonymousData) async {
+    bool hasAcceptedAnonymousData,
+  ) async {
     _log.fine(
-        'Updating config hasAcceptedAnonymousData to $hasAcceptedAnonymousData');
+      'Updating config hasAcceptedAnonymousData to $hasAcceptedAnonymousData',
+    );
     final config = _configBox.get(_configKey);
     config?.hasAcceptedSendAnonymousData = hasAcceptedAnonymousData;
     config?.save();

lib/core/data/data_source/intake_data_source.dart

@@ -23,19 +23,24 @@ class IntakeDataSource {
 
   Future<void> deleteIntakeFromId(String intakeId) async {
     log.fine('Deleting intake item from db');
-    _intakeBox.values
-        .where((dbo) => dbo.id == intakeId)
-        .toList()
-        .forEach((element) {
+    _intakeBox.values.where((dbo) => dbo.id == intakeId).toList().forEach((
+      element,
+    ) {
       element.delete();
     });
   }
 
-  Future<IntakeDBO?> updateIntake(String intakeId, Map<String, dynamic> fields) async {
-    log.fine('Updating intake $intakeId with fields ${fields.toString()} in db');
+  Future<IntakeDBO?> updateIntake(
+    String intakeId,
+    Map<String, dynamic> fields,
+  ) async {
+    log.fine(
+      'Updating intake $intakeId with fields ${fields.toString()} in db',
+    );
     var intakeObject = _intakeBox.values.indexed
-      .where((indexedDbo) => indexedDbo.$2.id == intakeId).firstOrNull;
-    if(intakeObject == null) {
+        .where((indexedDbo) => indexedDbo.$2.id == intakeId)
+        .firstOrNull;
+    if (intakeObject == null) {
       log.fine('Cannot update intake $intakeId as it is non existent');
       return null;
     }
@@ -46,7 +51,7 @@ class IntakeDataSource {
 
   Future<IntakeDBO?> getIntakeById(String intakeId) async {
     return _intakeBox.values.firstWhereOrNull(
-            (intake) => intake.id == intakeId
+      (intake) => intake.id == intakeId,
     );
   }
 
@@ -55,25 +60,30 @@ class IntakeDataSource {
   }
 
   Future<List<IntakeDBO>> getAllIntakesByDate(
-      IntakeTypeDBO intakeType, DateTime dateTime) async {
+    IntakeTypeDBO intakeType,
+    DateTime dateTime,
+  ) async {
     return _intakeBox.values
-        .where((intake) =>
-            DateUtils.isSameDay(dateTime, intake.dateTime) &&
-            intake.type == intakeType)
+        .where(
+          (intake) =>
+              DateUtils.isSameDay(dateTime, intake.dateTime) &&
+              intake.type == intakeType,
+        )
         .toList();
   }
 
-  Future<List<IntakeDBO>> getRecentlyAddedIntake({int number = 100}) async {
+  Future<List<IntakeDBO>> getRecentlyAddedIntake({int number = 100000}) async {
     final intakeList = _intakeBox.values.toList();
 
     //  sort list by date (newest first) and filter unique intake
-    intakeList
-        .sort((a, b) =>  (-1) * a.dateTime.compareTo(b.dateTime));
+    intakeList.sort((a, b) => (-1) * a.dateTime.compareTo(b.dateTime));
 
     final filterCodes = <String>{};
     final uniqueIntake = intakeList
-        .where((intake) =>
-            filterCodes.add(intake.meal.code ?? intake.meal.name ?? ""))
+        .where(
+          (intake) =>
+              filterCodes.add(intake.meal.code ?? intake.meal.name ?? ""),
+        )
         .toList();
 
     return uniqueIntake.take(number).toList();