Merge branch 'develop' into release-please-updt

openfoodfacts · Jan 26, 2025 · 79ec55b · 79ec55b
2 parents 4429fec + e9c8a8b
commit 79ec55b
Show file tree

Hide file tree

Showing 505 changed files with 113,885 additions and 17,881 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -104,7 +104,8 @@ History:
 ⚙️🥗 Food preferences:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/widgets/attribute_button.dart'
-
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/preferences/user_preferences_attribute_group.dart'
+
 🤗 Onboarding:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/onboarding/**/*'
@@ -154,12 +155,24 @@ Product addition:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/reordered_knowledge_panel_cards.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/standard_knowledge_panel_cards.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_card.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_page.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_table_card.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_world_map_card.dart'
+
+📖 Knowledge panels - Table widget:
+- changed-files:
+  - any-glob-to-any-file: 'packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_table_card.dart'
 
+📖 Knowledge panels - Map widget:
+- changed-files:
+  - any-glob-to-any-file: 'packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_world_map_card.dart'
+
 🤖 Robotoff:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/database/robotoff_questions_query.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/cards/product_cards/question_card.dart'
-
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/product_questions_widget.dart'
+
 Hunger Games:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/hunger_games/question_answers_options.dart'
@@ -230,13 +243,31 @@ Product scan carousel:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/scan/carousel/scan_carousel.dart'
 
+autocomplete:
+- changed-files:
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/input/smooth_autocomplete_text_field.dart'
+
 ✏️ Editing:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/edit_product_page.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/input/smooth_autocomplete_text_field.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/add_other_details_page.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/simple_input_page.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/simple_input_page_helpers.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/simple_input_text_field.dart'
 
 ✏️ Editing - Nutrition input:
 - changed-files:
-  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/nutrition_page.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/nutrition_page_loader.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_add_nutrient_button.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_availability_container.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_availability_container.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_container_helper.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_facts_editor.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_image_viewer.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_serving_size.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_serving_switch.dart'
 
 #tag picker:
 
@@ -277,7 +308,6 @@ Prices:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_amount_card.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_amount_field.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_button.dart'
-  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_count_widget.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_currency_card.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_currency_selector.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_data_widget.dart'
@@ -289,9 +319,10 @@ Prices:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_proof_card.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/prices_card.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/product_price_add_page.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_add_product_card.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_scan_page.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/onboarding/currency_selector.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/onboarding/currency_selector_helper.dart'
-
 router:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/navigator/app_navigator.dart'
@@ -309,5 +340,6 @@ tagline:
 🖼️ Photos - Photo manager:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/image/product_image_gallery_other_view.dart'
-    - any-glob-to-any-file: 'packages/smooth_app/lib/pages/image/product_image_other_page.dart'
-    - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/gallery_view/product_image_gallery_view.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/image/product_image_other_page.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/gallery_view/product_image_gallery_view.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/gallery_view/product_image_gallery_tabs.dart'
diff --git a/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
@@ -63,7 +63,7 @@ jobs:
       - run: echo Release type ${{ inputs.RELEASE_TYPE }} + Build type ${{ inputs.BUILD_TYPE }} + Tag name null if not github release ${{ inputs.TAG_NAME }}
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
@@ -13,7 +13,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: crowdin action
-      uses: crowdin/github-action@v2.3.0
+      uses: crowdin/github-action@v2.5.2
       continue-on-error: true
       with:
         # Upload sources to Crowdin

diff --git a/.github/workflows/dartdoc.yml b/.github/workflows/dartdoc.yml
@@ -30,7 +30,7 @@
               run: pub global activate dartdoc && dartdoc	
 
             - name: Deploy API documentation to Github Pages	
-              uses: JamesIves/github-pages-deploy-action@v4.6.9	
+              uses: JamesIves/github-pages-deploy-action@v4.7.2	
               with:	
                 BRANCH: gh-pages	
                 FOLDER: packages/smooth_app/doc/api/	
diff --git a/.github/workflows/flutter-analyze-commenter.txt b/.github/workflows/flutter-analyze-commenter.txt
@@ -0,0 +1,34 @@
+name: flutter-analyze-commenter example
+
+on: pull_request  # Only supports run by pull request
+
+jobs:
+  flutter-analyze:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write # Write permission is required to add comments on a PR
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: subosito/flutter-action@v2
+
+      - run: flutter pub get
+        working-directory: ./packages/smooth_app
+
+      # Run flutter analyze with --write option
+      - run: flutter analyze --write=flutter_analyze.log
+        working-directory: ./packages/smooth_app
+
+      # (Optional)Run custom lint with --format=json option
+      - if: ${{ !cancelled() }}
+        run: dart run custom_lint --format=json > custom_lint.log
+        working-directory: ./packages/smooth_app
+
+      # Use flutter-analyze-commenter
+      - if: ${{ !cancelled() }}               # Required to run this step even if failure
+        uses: yorifuji/flutter-analyze-commenter@v1
+        with:
+          analyze-log: flutter_analyze.log    # file path for analyze log
+          custom-lint-log: custom_lint.log    # file path for custom lint log (optional)
+          verbose: false                      # verbose output (optional)
diff --git a/.github/workflows/github-projects-ventilation.yml b/.github/workflows/github-projects-ventilation.yml
@@ -60,3 +60,9 @@ jobs:
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
           labeled: 📖 Knowledge panels
           label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/84 # Add issue to the Metrics project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 📈 Matomo
+          label-operator: OR
diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml
@@ -66,8 +66,7 @@ jobs:
 
       - name: Set output
         id: set_output
-        run: echo "::set-output name=VERSION_NAME::${{ env.VERSION_NAME }}" && echo "::set-output name=VERSION_CODE::${{ env.VERSION_CODE }}"
-
+        run: echo "VERSION_CODE=${{ env.VERSION_CODE }}" >> $GITHUB_OUTPUT && echo "VERSION_NAME=${{ env.VERSION_NAME }}" >> $GITHUB_OUTPUT
   android-release:
     concurrency: 
       group: android-release

diff --git a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
@@ -40,7 +40,7 @@ env:
 jobs:
   testflight-release:
     name: Build and deploy to TestFlight testers (org.openfoodfacts.scanner)
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
@@ -61,7 +61,7 @@ jobs:
         run: bundle install
         working-directory: ./packages/smooth_app/android/
       - name: Setup Java JDK
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/postsubmit.yml b/.github/workflows/postsubmit.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: 21
@@ -57,7 +57,7 @@ jobs:
         working-directory: ./packages/smooth_app
 
       - name: Upload coverage to codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: false
 

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
@@ -51,6 +51,6 @@ jobs:
         run: ci/testing.sh
 
       - name: Upload coverage to codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: false
diff --git a/.github/workflows/waldo_sessions.yml b/.github/workflows/waldo_sessions.yml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: 21

diff --git a/.gitignore b/.gitignore
@@ -174,7 +174,8 @@ obj/
 /out/
 
 # User-specific configurations
-.idea/
+.idea/*
+!.idea/dictionaries
 
 # OS-specific files
 .DS_Store

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,36 @@
+{
+    "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"
+    ]
+}