Skip to content

Commit

Permalink
Merge branch 'develop' into fix/productName
Browse files Browse the repository at this point in the history
  • Loading branch information
monsieurtanuki authored Nov 22, 2023
2 parents 22b4bed + ac3037d commit 7d9cdfe
Show file tree
Hide file tree
Showing 246 changed files with 5,308 additions and 3,963 deletions.
85 changes: 44 additions & 41 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:
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 All @@ -67,77 +67,80 @@ tests:
- packages/smooth_app/test/tests_utils/path_provider_mock.dart
- packages/smooth_app/test/smooth_ui_library/animations/smooth_reveal_animation_test.dart

database:
Database:
- packages/smooth_app/lib/database/**/*

l10n:
🌐 l10n:
- packages/smooth_app/lib/l10n/**/*

history:
History:
- packages/smooth_app/lib/pages/history_page.dart

settings:
⚙️ Settings:
- packages/smooth_app/lib/pages/user_preferences_page.dart

food preferences:
⚙️🥗 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:
- packages/smooth_app/lib/entrypoints/android/main_amazon_appstore.dart,

fdroid:
F-Droid:
- packages/smooth_app/lib/entrypoints/android/main_fdroid.dart,

Huawei AppGallery:
- packages/smooth_app/lib/entrypoints/android/main_huawei_appgallery.dart,

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

product addition:
Product addition:
- packages/smooth_app/lib/pages/product/add_new_product_page.dart
- packages/smooth_app/lib/pages/product/new_product_page.dart

product page:
Product page:
- packages/smooth_app/lib/pages/product/**/*

knowledge panels:
- packages/smooth_app/lib/cards/product_cards/knowledge_panels/
📖 Knowledge panels:
- packages/smooth_app/lib/cards/product_cards/knowledge_panels/**/*
- packages/smooth_app/lib/pages/product/reorderable_knowledge_panel_page.dart
- packages/smooth_app/lib/pages/product/reordered_knowledge_panel_cards.dart
- packages/smooth_app/lib/pages/product/standard_knowledge_panel_cards.dart

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:
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

goldens:
Goldens:
- packages/smooth_app/test/pages/goldens
- packages/smooth_app/test/tests_utils/goldens.dart
- packages/smooth_app/test/pages/goldens/user_preferences_page-dark.png
Expand All @@ -151,10 +154,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 +170,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 @@ -176,25 +179,25 @@ category picker:
- packages/smooth_app/lib/data_models/query_category_tree_supplier.dart
- packages/smooth_app/lib/data_models/smooth_category.dart

ranking:
Ranking:
- packages/smooth_app/lib/helpers/product_compatibility_helper.dart

generic lib:
Generic lib:
- packages/smooth_app/lib/generic_lib

photo cropping:
🖼️ Photos - Cropping:
- packages/smooth_app/lib/pages/image_crop_page.dart

user lists:
User lists:
- packages/smooth_app/lib/pages/product_list_user_dialog_helper.dart
- packages/smooth_app/lib/pages/product/common/product_list_page.dart

product scan carousel:
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
64 changes: 64 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,69 @@
# Changelog

## [4.12.0](https://github.com/openfoodfacts/smooth-app/compare/v4.11.0...v4.12.0) (2023-11-19)


### 🚀 Features

* 4628 - refactoring as preparatory work ([#4641](https://github.com/openfoodfacts/smooth-app/issues/4641)) ([e463ca3](https://github.com/openfoodfacts/smooth-app/commit/e463ca37a877a0e1779ee1df9c4413a73742f753))
* 4674 - new UI for main image page; fallback image only for product icon ([#4738](https://github.com/openfoodfacts/smooth-app/issues/4738)) ([efb0483](https://github.com/openfoodfacts/smooth-app/commit/efb0483f60eef10100fc02e60058d1b9bf7ac372))
* 4789 - new "add ingredients" button for nutriscore ([#4808](https://github.com/openfoodfacts/smooth-app/issues/4808)) ([a91a360](https://github.com/openfoodfacts/smooth-app/commit/a91a3600f9f58117ee6c042f78f2a73227ba38a0))
* Add btn to finish adding new product ([#4706](https://github.com/openfoodfacts/smooth-app/issues/4706)) ([9f713f5](https://github.com/openfoodfacts/smooth-app/commit/9f713f5c20f469f07adfa9e34bebeabd724153c3))
* Create a screen listing all attributes for a product ([#4714](https://github.com/openfoodfacts/smooth-app/issues/4714)) ([21469af](https://github.com/openfoodfacts/smooth-app/commit/21469afdab18936db76126834870748a109743af))
* New Crowdin translations to review and merge ([#4733](https://github.com/openfoodfacts/smooth-app/issues/4733)) ([073e9c5](https://github.com/openfoodfacts/smooth-app/commit/073e9c55ec0a30424b4d677262d8905aac67c47f))
* Step-by-step fast-track ([#4698](https://github.com/openfoodfacts/smooth-app/issues/4698)) ([bbf84d1](https://github.com/openfoodfacts/smooth-app/commit/bbf84d17d999ca7c503aeb4cc939ba1f84d109c5))


### 🐛 Bug Fixes

* 1815 - around context.mounted ([#4768](https://github.com/openfoodfacts/smooth-app/issues/4768)) ([346c6e3](https://github.com/openfoodfacts/smooth-app/commit/346c6e30c4931afe54eb0fcc6335fd9e270624d8))
* 4335 - "check" icon for "done" details - instead of "edit" ([#4739](https://github.com/openfoodfacts/smooth-app/issues/4739)) ([8b01257](https://github.com/openfoodfacts/smooth-app/commit/8b01257be8af35e188638ce002befd72b116f298))
* 4630 - no more sentry cluttering when downloading svg without internet ([#4642](https://github.com/openfoodfacts/smooth-app/issues/4642)) ([8f00dff](https://github.com/openfoodfacts/smooth-app/commit/8f00dff3d94563c9e53f3b337594bc21228f338f))
* 4637 - verbose exception with user data ([#4741](https://github.com/openfoodfacts/smooth-app/issues/4741)) ([8261f92](https://github.com/openfoodfacts/smooth-app/commit/8261f92e5b6bece30479cfaee1b75871e7467ef8))
* 4725 - refresh of the ios folder for background tasks ([#4772](https://github.com/openfoodfacts/smooth-app/issues/4772)) ([ba9c347](https://github.com/openfoodfacts/smooth-app/commit/ba9c3478ef76122405dee3b799dfb0e2adafa334))
* 4766 - when logging in, show adequate error messages ([#4783](https://github.com/openfoodfacts/smooth-app/issues/4783)) ([a6faac0](https://github.com/openfoodfacts/smooth-app/commit/a6faac096c73dd64fadd4bf02011bdffb696aeee))
* 4807 - putting back a useless hive table, just in case ([#4821](https://github.com/openfoodfacts/smooth-app/issues/4821)) ([0a5b18d](https://github.com/openfoodfacts/smooth-app/commit/0a5b18ddcf223295374f9b888195c2e642534c7e))
* 4812 - check mounted before setState ([#4814](https://github.com/openfoodfacts/smooth-app/issues/4814)) ([122aceb](https://github.com/openfoodfacts/smooth-app/commit/122aceb64231a08da4f3abe24eb81b21b448ee5c))
* add l10n type ([f064912](https://github.com/openfoodfacts/smooth-app/commit/f0649122d54cf8b8daad172be8467b666ddd9c3a))
* labeler ([7ffdf18](https://github.com/openfoodfacts/smooth-app/commit/7ffdf18ee16a38a49d841cce2a0767c3627f1f82))
* release-please.yml ([296c070](https://github.com/openfoodfacts/smooth-app/commit/296c070fe5bd1eec13655ffdcc4d29bf70fd2e01))
* typo in app_en.arb ([ecdfda9](https://github.com/openfoodfacts/smooth-app/commit/ecdfda9c51935b8dc6d7120baacfe03b78094b38))


### 🛠 Miscellaneous

* capitalize method for String ([#4734](https://github.com/openfoodfacts/smooth-app/issues/4734)) ([37ef119](https://github.com/openfoodfacts/smooth-app/commit/37ef1199141cab6df17bb656e3d14af116563f3a))
* **deps:** bump assorted_layout_widgets in /packages/smooth_app ([#4742](https://github.com/openfoodfacts/smooth-app/issues/4742)) ([1d9b365](https://github.com/openfoodfacts/smooth-app/commit/1d9b36583491d8da64089ab48d8c498e7199f76c))
* **deps:** bump audioplayers in /packages/smooth_app ([#4685](https://github.com/openfoodfacts/smooth-app/issues/4685)) ([5fe5e90](https://github.com/openfoodfacts/smooth-app/commit/5fe5e908ef7026182169dcd10b8bab09f1f38a5b))
* **deps:** bump barcode_widget in /packages/smooth_app ([#4744](https://github.com/openfoodfacts/smooth-app/issues/4744)) ([f9c2d1d](https://github.com/openfoodfacts/smooth-app/commit/f9c2d1d220123ba18e711cc03ce9e7d99413f754))
* **deps:** bump connectivity_plus in /packages/smooth_app ([#4776](https://github.com/openfoodfacts/smooth-app/issues/4776)) ([1bd71a6](https://github.com/openfoodfacts/smooth-app/commit/1bd71a64fe8d7760565a9b63751f6f5e7d0a7f60))
* **deps:** bump crowdin/github-action from 1.14.0 to 1.14.1 ([#4763](https://github.com/openfoodfacts/smooth-app/issues/4763)) ([ca252b3](https://github.com/openfoodfacts/smooth-app/commit/ca252b3332926753704416ccf064f46b05776e01))
* **deps:** bump crowdin/github-action from 1.14.1 to 1.15.1 ([#4788](https://github.com/openfoodfacts/smooth-app/issues/4788)) ([3ad22bf](https://github.com/openfoodfacts/smooth-app/commit/3ad22bff846f524191dc1003984f2078f4d385ba))
* **deps:** bump crowdin/github-action from 1.15.1 to 1.15.2 ([#4809](https://github.com/openfoodfacts/smooth-app/issues/4809)) ([c85f0bd](https://github.com/openfoodfacts/smooth-app/commit/c85f0bd6ceed8a2e5b1987459ac77a6f9ca85bb2))
* **deps:** bump cupertino_icons in /packages/smooth_app ([#4774](https://github.com/openfoodfacts/smooth-app/issues/4774)) ([b91ba63](https://github.com/openfoodfacts/smooth-app/commit/b91ba63932579371cb7afd498571a44dec228c55))
* **deps:** bump device_info_plus in /packages/smooth_app ([#4736](https://github.com/openfoodfacts/smooth-app/issues/4736)) ([84a761c](https://github.com/openfoodfacts/smooth-app/commit/84a761c123c41718cd10e69be71aff5519476d7c))
* **deps:** bump fastlane in /packages/smooth_app/android ([#4798](https://github.com/openfoodfacts/smooth-app/issues/4798)) ([6c2dafe](https://github.com/openfoodfacts/smooth-app/commit/6c2dafee2c40048f40985f99d9cf95c760a42583))
* **deps:** bump fastlane in /packages/smooth_app/ios ([#4797](https://github.com/openfoodfacts/smooth-app/issues/4797)) ([cd81469](https://github.com/openfoodfacts/smooth-app/commit/cd81469a5a451f6d717fdcbc7822baa97d876dc4))
* **deps:** bump fastlane-plugin-flutter_version ([#4760](https://github.com/openfoodfacts/smooth-app/issues/4760)) ([540dd69](https://github.com/openfoodfacts/smooth-app/commit/540dd69b96323b4157049941f6e51e34ed95d79e))
* **deps:** bump fastlane-plugin-flutter_version ([#4761](https://github.com/openfoodfacts/smooth-app/issues/4761)) ([c1d3233](https://github.com/openfoodfacts/smooth-app/commit/c1d32330cfb43154f4380c643f4898d1b8d2909b))
* **deps:** bump flutter_email_sender in /packages/smooth_app ([#4750](https://github.com/openfoodfacts/smooth-app/issues/4750)) ([cecf0c6](https://github.com/openfoodfacts/smooth-app/commit/cecf0c6e135639f11e534697bb78a2383c78af27))
* **deps:** bump flutter_native_splash in /packages/smooth_app ([#4715](https://github.com/openfoodfacts/smooth-app/issues/4715)) ([d51bb4e](https://github.com/openfoodfacts/smooth-app/commit/d51bb4eb2ff7d7724f4ccc929b28eeee9dcff16b))
* **deps:** bump flutter_svg from 2.0.8 to 2.0.9 in /packages/scanner/shared ([#4759](https://github.com/openfoodfacts/smooth-app/issues/4759)) ([c9fe4d3](https://github.com/openfoodfacts/smooth-app/commit/c9fe4d392749a5024db10f62744da540476f38c5))
* **deps:** bump openfoodfacts in /packages/smooth_app ([#4784](https://github.com/openfoodfacts/smooth-app/issues/4784)) ([1024559](https://github.com/openfoodfacts/smooth-app/commit/1024559aaa339de6b0cb75c0c08724d2d24cee0b))
* **deps:** bump path_provider_platform_interface, collection and intl ([#4605](https://github.com/openfoodfacts/smooth-app/issues/4605)) ([ac7b74b](https://github.com/openfoodfacts/smooth-app/commit/ac7b74b83bc0841cd4ed93d26a6072e585346dbc))
* **deps:** bump provider from 6.0.5 to 6.1.0 in /packages/scanner/shared ([#4773](https://github.com/openfoodfacts/smooth-app/issues/4773)) ([ae64157](https://github.com/openfoodfacts/smooth-app/commit/ae641570dde453e485598bb3e550f29e19933701))
* **deps:** bump provider from 6.1.0 to 6.1.1 in /packages/scanner/shared ([#4777](https://github.com/openfoodfacts/smooth-app/issues/4777)) ([9ee3c93](https://github.com/openfoodfacts/smooth-app/commit/9ee3c93e060268fc51b2a927f930ff5d4fd7966f))
* Formatting issue + dependencies upgraded ([#4802](https://github.com/openfoodfacts/smooth-app/issues/4802)) ([fc5daa6](https://github.com/openfoodfacts/smooth-app/commit/fc5daa6bfd603e4ae904e7af1f4a0858c1f3e0e7))
* Goodbye little Data Importer 👋 ([#4781](https://github.com/openfoodfacts/smooth-app/issues/4781)) ([9d03d4b](https://github.com/openfoodfacts/smooth-app/commit/9d03d4b7f879393cb27473e9c9a314c49b2860f6))
* Import icons from the POC ([#4747](https://github.com/openfoodfacts/smooth-app/issues/4747)) ([dceeee7](https://github.com/openfoodfacts/smooth-app/commit/dceeee7cb2f53b1968dd1242f2feb9c5fb9c7a23))
* New Crowdin translations to review and merge ([#4740](https://github.com/openfoodfacts/smooth-app/issues/4740)) ([06ec998](https://github.com/openfoodfacts/smooth-app/commit/06ec9984ca78a5c2cc8ec908ead7d2d06b7ecfe8))
* old TODOs ([#4758](https://github.com/openfoodfacts/smooth-app/issues/4758)) ([4ab2150](https://github.com/openfoodfacts/smooth-app/commit/4ab2150a60ef97dd603359c9b189c38877178d04))
* package upgrades ([#4817](https://github.com/openfoodfacts/smooth-app/issues/4817)) ([6e0034b](https://github.com/openfoodfacts/smooth-app/commit/6e0034b7474a59177a5b48073d83a09d19774fe9))
* Remove the link to "Next mobile app" ([#4792](https://github.com/openfoodfacts/smooth-app/issues/4792)) ([6ebb822](https://github.com/openfoodfacts/smooth-app/commit/6ebb822056eeae12bbbee58ac051de807157a29e))
* upgrade flutter_svg to 2.0.8 ([#4735](https://github.com/openfoodfacts/smooth-app/issues/4735)) ([17774c8](https://github.com/openfoodfacts/smooth-app/commit/17774c8aaf0dce22fb244663e4965da26d2ad959))
* upgrade to flutter_map 4.0.0 ([#4752](https://github.com/openfoodfacts/smooth-app/issues/4752)) ([b3f73c0](https://github.com/openfoodfacts/smooth-app/commit/b3f73c061b741fd36457c6e8cccf2c79a04811ab))
* upgraded flutter_map to 6.0.1 ([#4757](https://github.com/openfoodfacts/smooth-app/issues/4757)) ([0ddd5c6](https://github.com/openfoodfacts/smooth-app/commit/0ddd5c653803f716da5103ab7a57f77a2109b708))

## [4.11.0](https://github.com/openfoodfacts/smooth-app/compare/v4.10.0...v4.11.0) (2023-10-26)


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.

Loading

0 comments on commit 7d9cdfe

Please sign in to comment.