Skip to content

Commit

Permalink
Merge branch 'develop' into fix/4766
Browse files Browse the repository at this point in the history
  • Loading branch information
monsieurtanuki authored Nov 17, 2023
2 parents 68d9aab + c85f0bd commit 359ff0a
Show file tree
Hide file tree
Showing 220 changed files with 4,633 additions and 3,440 deletions.
46 changes: 23 additions & 23 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# Add labels to any any pull request with changes to the specified paths
android:
Android:
- packages/smooth_app/android/**/*

macos:
MacOS:
- packages/smooth_app/macos/**/*

assets cache:
Assets cache:
- packages/smooth_app/assets/cache/

background tasks:
Background tasks:
- packages/smooth_app/lib/background/background_task_manager.dart
- packages/smooth_app/lib/pages/offline_tasks_page.dart

documentation:
📚 Documentation:
- README.md
- packages/smooth_app/android/fastlane/README.md
- packages/smooth_app/README.md
- packages/smooth_app/lib/l10n/README.md

dependencies:
Dependencies:
- packages/smooth_app/pubspec.yaml
- packages/data_importer/pubspec.yaml
- packages/scanner/zxing/pubspec.yaml
Expand All @@ -30,20 +30,20 @@ dependencies:
- packages/app_store/google_play/pubspec.yaml
- packages/app_store/apple_app_store/pubspec.yaml

ios:
🍎 iOS:
- packages/smooth_app/ios/**/*

fastlane:
Fastlane:
- packages/smooth_app/ios/Gemfile.lock
- packages/smooth_app/android/Gemfile.lock

asset cache:
- packages/smooth_app/assets/cache/**/*

web:
Web:
- packages/smooth_app/web/**/*

tests:
🧪 Tests:
- packages/smooth_app/test/**/*
- packages/smooth_app/test/widget_test.dart
- packages/smooth_app/test/basic_test.dart
Expand Down Expand Up @@ -82,21 +82,21 @@ settings:
food preferences:
- packages/smooth_app/lib/widgets/attribute_button.dart

onboarding:
🤗 Onboarding:
- packages/smooth_app/lib/pages/onboarding/**/*
- packages/smooth_app/assets/onboarding/**/*

nutrition input:
✏️ Editing - Nutrition input:
- packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart

scan:
🤳🥫 Scan:
- packages/smooth_app/lib/pages/scan/**/*
- packages/smooth_app/lib/pages/scan/continuous_scan_page.dart
- packages/smooth_app/lib/pages/scan/scan_page.dart
- packages/smooth_app/lib/pages/scan/abstract_camera_image_getter.dart
- packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart

mlkit:
🤳🥫 MLKit:
- packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart

Amazon Appstore:
Expand All @@ -108,7 +108,7 @@ fdroid:
Huawei AppGallery:
- packages/smooth_app/lib/entrypoints/android/main_huawei_appgallery.dart,

zxing:
🤳🥫 zxing:
- packages/scanner/zxing/**/*

product addition:
Expand All @@ -121,18 +121,18 @@ product page:
knowledge panels:
- packages/smooth_app/lib/cards/product_cards/knowledge_panels/

robotoff:
🤖 Robotoff:
- packages/smooth_app/lib/database/robotoff_questions_query.dart
- packages/smooth_app/lib/cards/product_cards/question_card.dart

hunger games:
Hunger Games:
- packages/smooth_app/lib/pages/hunger_games/question_answers_options.dart
- packages/smooth_app/lib/pages/hunger_games/question_card.dart

summary card:
- packages/smooth_app/lib/pages/product/summary_card.dart

analytics:
📈 Analytics:
- packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart
- packages/smooth_app/assets/onboarding/analytics.svg
- packages/smooth_app/lib/helpers/analytics_helper.dart
Expand All @@ -151,10 +151,10 @@ goldens:
- packages/smooth_app/test/dialogs/generic_lib/goldens/user_preferences_page_dialogs_Software development-dark.png
- packages/smooth_app/test/dialogs/generic_lib/goldens/user_preferences_page_dialogs_Software development-light.png

github:
GitHub:
- .github/**/*

User management:
👥 User management:
- packages/smooth_app/lib/pages/user_management/login_page.dart
- packages/smooth_app/lib/pages/user_management/forgot_password_page.dart
- packages/smooth_app/lib/pages/user_management/sign_up_page.dart
Expand All @@ -167,7 +167,7 @@ User management:

#tag picker:

category picker:
✏️ Editing - Category picker:
- packages/smooth_app/lib/data_models/category_tree_supplier.dart
- packages/smooth_app/example/smooth_category_picker_example.dart
- packages/smooth_app/generic_lib/dialogs/smooth_category_picker.dart
Expand All @@ -192,9 +192,9 @@ user lists:
product scan carousel:
- packages/smooth_app/lib/widgets/smooth_product_carousel.dart

packaging input:
✏️ Editing - 📦 Packaging input:
- packages/smooth_app/lib/pages/product/edit_new_packagings.dart
- packages/smooth_app/lib/pages/product/ocr_packaging_helper.dart

basic info input:
✏️ Editing - Basic info input:
- packages/smooth_app/lib/pages/product/add_basic_details_page.dart
2 changes: 1 addition & 1 deletion .github/workflows/crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v4

- name: crowdin action
uses: crowdin/github-action@v1.14.1
uses: crowdin/github-action@v1.15.2
continue-on-error: true
with:
# Upload sources to Crowdin
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
- We strive to timebox the core of the meeting (decision making) to 30 minutes, with an optional free discussion/live debugging afterwards.
- We take comprehensive notes in the Weekly Agenda of agenda item discussions and of decisions taken.

## 🆕 The future of the app

Starting this April, we invite all users and contributors to build a vision for the app. All information are detailed on this [blog post](https://blog.openfoodfacts.org/en/news/towards-1-million-users-and-beyond-for-open-food-facts-mobile-app).

## User interface

- [![Figma](https://img.shields.io/badge/figma-%23F24E1E.svg?logo=figma&logoColor=white) Mockups on the current app and future plans to discuss](https://www.figma.com/file/nFMjewFAOa8c4ahtob7CAB/Mobile-App-Design-(Quentin)?node-id=0%3A1&t=SrBuT7gBdhapUerx-0)
Expand Down
2 changes: 1 addition & 1 deletion crowdin.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project_id_env: CROWDIN_PROJECT_ID
api_token_env: CROWDIN_PERSONAL_TOKEN
pull_request_title: "l10n: New Crowdin translations to review and merge"
pull_request_title: "chore: New translations to review and merge"
pull_request_body: '### What\n- Automated pull request pulling in new or updated translations from Crowdin (https://translate.openfoodfacts.org).\n## Checklist\n- [ ] Check that they are no bad translations. If there are, correct them directly in Crowdin so that they are not resynced again. Then you can correct them here as well, or wait 24 hours for the sync to happen automatically.\n- [ ] Put extra attention on Acholi, which is used mistakenly as a sandbox by people discovering the self-service translation button on Open Food Facts\n- [ ] Once you are happy, that automated checks pass, you can approve the PR and merge it.\n### Part of\n- Translations'
files:
- source: /packages/smooth_app/lib/l10n/app_en.arb
Expand Down
30 changes: 0 additions & 30 deletions packages/data_importer/.gitignore

This file was deleted.

33 changes: 0 additions & 33 deletions packages/data_importer/.metadata

This file was deleted.

5 changes: 0 additions & 5 deletions packages/data_importer/analysis_options.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions packages/data_importer/android/.gitignore

This file was deleted.

50 changes: 0 additions & 50 deletions packages/data_importer/android/build.gradle

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion packages/data_importer/android/settings.gradle

This file was deleted.

3 changes: 0 additions & 3 deletions packages/data_importer/android/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

Empty file.
Loading

0 comments on commit 359ff0a

Please sign in to comment.