Merging develop to this branch

Author: chetanr25

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.27.4"
+}

.github/workflows/crowdin.yml

@@ -13,7 +13,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: crowdin action
-      uses: crowdin/[email protected].0
+      uses: crowdin/[email protected].1
       continue-on-error: true
       with:
         # Upload sources to Crowdin

.github/workflows/internal-release.yml

@@ -10,7 +10,7 @@ jobs:
     concurrency: 
       group: release
       cancel-in-progress: true
-    if: github.triggering_actor == 'teolemon' || github.triggering_actor == 'stephanegigandet' || github.triggering_actor == 'g123k' || github.triggering_actor == 'monsieurtanuki' || github.triggering_actor == 'M123-dev'
+    if: github.triggering_actor == 'teolemon' || github.triggering_actor == 'stephanegigandet' || github.triggering_actor == 'g123k' || github.triggering_actor == 'monsieurtanuki' || github.triggering_actor == 'M123-dev' || github.triggering_actor == 'raphael0202'
     runs-on: ubuntu-latest
     outputs:
       VERSION_NAME: ${{ steps.set_output.outputs.VERSION_NAME }}

.github/workflows/on-demand.yml

@@ -56,7 +56,7 @@ jobs:
     - name: Check for formatting issues (run "dart format . ")
       run: dart format .
     - name: Push changes if needed
-      uses: stefanzweifel/git-auto-commit-action@v5
+      uses: stefanzweifel/git-auto-commit-action@v6
       with:
         commit_message: "chore: Linting changes"
         branch: ${{ github.event.pull_request.head.ref }}
@@ -104,7 +104,7 @@ jobs:
     - name: Deletion of 3-letter translation files (2/2)
       run: packages/smooth_app/lib/l10n/remove_3_letter_locales.sh
     - name: Push changes if needed
-      uses: stefanzweifel/git-auto-commit-action@v5
+      uses: stefanzweifel/git-auto-commit-action@v6
       with:
         commit_message: "chore: Deletion of 3-letter translation files"
         branch: ${{ github.event.pull_request.head.ref }}

.gitignore

@@ -227,8 +227,6 @@ fabric.properties
 # https://plugins.jetbrains.com/plugin/13666-flutter-intl
 generated
 
-
-
 # Fastlane
 key.jks
 service_account_key.json
@@ -239,7 +237,6 @@ android_keys.zip
 # Flutter version manager
 .fvm/
 
-
 # Unsupported locales
 packages/smooth_app/lib/l10n/app_ach.arb
 packages/smooth_app/lib/l10n/app_ast.arb

.vscode/settings.json

@@ -1,36 +1,37 @@
 {
-    "cSpell.words": [
-        "artboard",
-        "cortado",
-        "ecoscore",
-        "entrypoints",
-        "fdroid",
-        "fimber",
-        "folksonomy",
-        "hideable",
-        "lerp",
-        "macchiato",
-        "nutri",
-        "nutriscore",
-        "openbeautyfacts",
-        "openfoodfacts",
-        "openpetfoodfacts",
-        "openproductsfacts",
-        "opff",
-        "packagings",
-        "reorderable",
-        "ristreto",
-        "robotoff",
-        "rrect",
-        "snackbar",
-        "sqflite",
-        "swipeable",
-        "tabbar",
-        "tadam",
-        "teolemon",
-        "textfield",
-        "topbar",
-        "unfocus",
-        "webview"
-    ]
+  "cSpell.words": [
+    "artboard",
+    "cortado",
+    "ecoscore",
+    "entrypoints",
+    "fdroid",
+    "fimber",
+    "folksonomy",
+    "hideable",
+    "lerp",
+    "macchiato",
+    "nutri",
+    "nutriscore",
+    "openbeautyfacts",
+    "openfoodfacts",
+    "openpetfoodfacts",
+    "openproductsfacts",
+    "opff",
+    "packagings",
+    "reorderable",
+    "ristreto",
+    "robotoff",
+    "rrect",
+    "snackbar",
+    "sqflite",
+    "swipeable",
+    "tabbar",
+    "tadam",
+    "teolemon",
+    "textfield",
+    "topbar",
+    "unfocus",
+    "webview"
+  ],
+  "dart.flutterSdkPath": ".fvm/versions/3.27.4"
 }

README.md

@@ -78,6 +78,19 @@ Full list of features on the wiki: https://wiki.openfoodfacts.org/Mobile_App/Fea
 - Make sure you have installed Flutter and all the requirements
   - [Official Flutter installation guide](https://docs.flutter.dev/get-started/install)
 - Currently, the app uses the following version of Flutter: **3.27**.
+ - **Setting Up Your Environment with FVM**
+   - To manage Flutter versions easily, download and install **FVM (Flutter Version Management)**:
+     - Install FVM by following the [official FVM installation guide](https://fvm.app/documentation/getting-started/installation).
+     - Once FVM is installed, run the following commands to set Flutter to version 3.27.4:
+       ```bash
+       fvm install 3.27.4
+       fvm use 3.27.4
+       ```
+     - Verify the Flutter version with:
+       ```bash
+       fvm flutter --version
+       ```
+
 We have predefined run configurations for Android Studio and Visual Studio Code
 In order to run the application, make sure you are in the `packages/smooth_app` directory and run these commands:
 - `flutter pub get .`

crowdin.yml

@@ -7,5 +7,13 @@ pull_request_labels:
 files:
   - source: /packages/smooth_app/lib/l10n/app_en.arb
     translation: /packages/smooth_app/lib/l10n/app_%two_letters_code%.arb
+    languages_mapping:
+      two_letters_code:
+        pt-BR: pt_BR
+        pt-PT: pt
   - source: /packages/smooth_app/ios/Runner/en.lproj/InfoPlist.strings
     translation: /packages/smooth_app/ios/Runner/%two_letters_code%.lproj/InfoPlist.strings
+    languages_mapping:
+      two_letters_code:
+        pt-BR: pt_BR
+        pt-PT: pt

packages/smooth_app/android/Gemfile.lock

@@ -15,26 +15,26 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.2)
-    aws-partitions (1.1097.0)
-    aws-sdk-core (3.223.0)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1114.0)
+    aws-sdk-core (3.225.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.100.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-kms (1.104.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.185.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.189.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.2.0)
+    base64 (0.3.0)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -76,7 +76,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.2)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -165,7 +165,7 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.11.3)
+    json (2.12.2)
     jwt (2.10.1)
       base64
     logger (1.7.0)
@@ -175,13 +175,13 @@ GEM
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
-    naturally (2.2.1)
+    naturally (2.2.2)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
     plist (3.7.2)
     public_suffix (6.0.2)
-    rake (13.2.1)
+    rake (13.3.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)

packages/smooth_app/ios/Gemfile.lock

@@ -15,26 +15,26 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.2)
-    aws-partitions (1.1097.0)
-    aws-sdk-core (3.223.0)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1114.0)
+    aws-sdk-core (3.225.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.100.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-kms (1.104.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.185.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.189.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.2.0)
+    base64 (0.3.0)
     blockenspiel (0.5.0)
     claide (1.1.0)
     colored (1.2)
@@ -77,7 +77,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.2)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -166,7 +166,7 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.11.3)
+    json (2.12.2)
     jwt (2.10.1)
       base64
     logger (1.7.0)
@@ -176,13 +176,13 @@ GEM
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
-    naturally (2.2.1)
+    naturally (2.2.2)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
     plist (3.7.2)
     public_suffix (6.0.2)
-    rake (13.2.1)
+    rake (13.3.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)