13 Commits

Author SHA1 Message Date
e3bc40fdf3 chore: Migration to Dart 3.8 (#6668)
* Migration to Dart 3.8

* New GA

* Fix dartdoc
2025-06-23 18:14:17 +02:00
63b65e6f79 fix: Stronger F-Droid analytics rules (#3902)
Co-authored-by: Cirrus CI <support@cirruslabs.org>
2023-04-24 19:43:34 +02:00
f7e42c762b chore: Shared common scanner (#3883)
* First movement

* devcotainer

* Lint fixes

* Shared visor

* Final moves

* Final lint fixes

* Empty widget, moved scan header

* Update scanner_ml_kit.dart

---------

Co-authored-by: Marvin Moeltgen
2023-04-18 21:05:28 +02:00
1734a20381 ci: Return to entrypoint based scanner (#3874)
* ci: Return to entrypoint based scanner

* Update basic_test.dart
2023-04-14 17:07:37 +02:00
87d928039c feat: 3712 - new mlkit and zxing scanners on flutter 3.7 (#3767)
* feat/3712 - new mlkit and zxing scanners on flutter 3.7

New files:
* `smooth_barcode_scanner_mlkit.dart`: Barcode scanner based on MLKit.
* `smooth_barcode_scanner_mockup.dart`: Fake barcode scanner, for tests.
* `smooth_barcode_scanner_type.dart`: Barcode scanner types.
* `smooth_barcode_scanner_zxing.dart`: Barcode scanner based on ZXing.

Deleted files:
* `scanner`: removed folder
* `camera_controller.dart`
* `camera_image_cropper.dart`
* `camera_full_getter.dart`
* `camera_image_preview.dart`
* `camera_modes.dart`
* `lifecycle_aware_widget.dart`
* `lifecycle_manager.dart`
* `scan_flash_toggle.dart`
* `scan_visor.dart`
* `scanner_overlay.dart`
* `user_preferences_dialog_editor.dart`

Impacted files:
* `app_test.dart`: now uses new enum `SmoothBarcodeScannerType`
* `background_task_badge.dart`: now uses flutter 3.7 badge
* `basic_test.dart`: now uses new enum `SmoothBarcodeScannerType`
* `build.gradle`: upgraded kotlin to 1.8.0
* `camera_helper.dart`: simplified
* `camera_scan_page.dart`: simplified
* `constant_icons.dart`: added an adaptive "flip camera" icon
* `file_cache_manager_impl.dart`: minor 3.7 refactoring
* `goldens.dart`: minor 3.7 refactoring
* `labeler.yml`: removed references to delete files
* `main_fdroid.dart`: now uses new enum `SmoothBarcodeScannerType`
* `main_google_play.dart`: now uses new enum `SmoothBarcodeScannerType`
* `main_ios.dart`: now uses new enum `SmoothBarcodeScannerType`
* `network_config.dart`: minor 3.7 refactoring
* `new_product_page.dart`: minor 3.7 refactoring
* `onboarding_bottom_bar.dart`: minor 3.7 refactoring
* `pubspec.lock`: wtf
* `apple_app_store/pubspec.yaml`: minor 3.7 refactoring
* `google_play/pubspec.yaml`: minor 3.7 refactoring
* `shared/pubspec.yaml`: minor 3.7 refactoring
* `uri_store/pubspec.yaml`: minor 3.7 refactoring
* `data_importer/pubspec.yaml`: minor 3.7 refactoring
* `data_importer_shared/pubspec.yaml`: minor 3.7 refactoring
* `smooth_app/pubspec.yaml`: now includes mlkit and zxing scanners; minor 3.7 refactoring; removed now redundant `badge`; minor upgrades
* `scan_page.dart`: simplified
* `user_preferences.dart`: removed now useless methods
* `user_preferences_dev_mode.dart`: removed duration and scan parameter settings
* `user_preferences_settings.dart`: removed now useless parameter; minor 3.7 refactoring

* feat/3712 - new "no camera found" message

Impacted file:
* `camera_scan_page.dart`: new "no camera found" message

* fix github actions flutter version

* feat/3712 - localized "no camera found" message

Impacted files:
* `app_en.arb`: new label for "no camera found"
* `app_fr.arb`: new label for "no camera found"
* `camera_scan_page.dart`: localized "no camera found" message

---------

Co-authored-by: Marvin M <39344769+M123-dev@users.noreply.github.com>
2023-03-17 15:41:42 +01:00
a35b7db371 ci: Show flavour in about this app and sentry (#3429)
Co-authored-by: Aman Raj <57723319+AshAman999@users.noreply.github.com>
2022-12-10 11:14:22 +01:00
80fde5335b feat: In app review (#3333)
* Implementations for Apple App Store/Google Play/Uri based store

* App Store as a service

* In app review asked after being logged in for the first time

* Don't forget to use the new path for MLKit script

* Remove a warning about the context

* Fix tests not passing

* Update packages/app/lib/entrypoints/android/main_samsung_gallery.dart

Co-authored-by: Marvin M <39344769+M123-dev@users.noreply.github.com>

* Update packages/smooth_app/pubspec.yaml

Co-authored-by: Pierre Slamich <pierre.slamich@gmail.com>
Co-authored-by: Marvin M <39344769+M123-dev@users.noreply.github.com>
Co-authored-by: Pierre Slamich <pierre@openfoodfacts.org>
2022-11-26 14:30:03 +01:00
c27767df4e feat: MLKit as a dependency (#3193)
* MLKit as a dependency

* Fix tests

* Add IntelliJ/Android build configurations

* IJ config: Rename folders

* Dynamically add the right dependency on app/pubspec.yaml

(cherry picked from commit 15b5243cab764d40e303ac9db9f3eda0b7caec03)

* Ad all VSCode configs

* Enable MLKit dependency for GitHub actions
2022-10-27 18:33:14 +02:00
e3564e53a4 refactor: Make smooth_app a module (also called step 1) (#3101)
* Make smooth_app a module (also called step 1)

Android impl is OK.
Still have to check for iOS and tests

* Fix scan sound not working

* Fix ci/pub_upgrade.sh issues

* Fix tests

* Some doc

* Fix build actions

* Fix iOS build

* Fix warnings

* Fix Flutter analyze

* Fix typo

* The CI needs at least one test

Co-authored-by: Marvin Möltgen <39344769+M123-dev@users.noreply.github.com>
2022-10-13 18:33:14 +02:00
e798376f1c fix: screenshot - different Key for different screens (#2798)
Impacted files:
* `app_test.dart`: added the "reinvention" page; set different "next" keys; handled tooltip on KP pages
* `knowledge_panel_page_template.dart`: specific "next" keys; added "tooltip" key
* `next_button.dart`: new `nextKey` parameter
* `onboarding_bottom_bar.dart`: added `nextKey` parameter used during screenshot generation
* `preferences_page.dart`: specific "next" key
* `reinvention_page.dart`: specific "next" key
* `sample_eco_card_page.dart`: specific "next" key
* `sample_health_card_page.dart`: specific "next" key
* `scan_example.dart`: specific "next" key
* `welcome_page.dart`: specific "next" key
2022-08-18 09:29:45 +02:00
c3b44aced2 fix: Flutter 3.0 fixes (#1814)
* fix: Flutter 3.0 fixes

* Workflows

* Update gradle

* Automated fixes

* Manual async gap fixes

* Fix merge conflict reverts

* Format

* qr_code_scanner fixes
2022-05-12 16:07:22 +02:00
99803dea79 feat: #217 - added shell parameters (#1548)
Something like
```
flutter drive --driver=test_driver/screenshot_driver.dart --target=integration_test/app_test.dart \
 --dart-define=LANGUAGE=fr --dart-define=COUNTRY=FR --dart-define=PLATFORM=ios --dart-define=DEVICE=iPhone8Plus
```

Impacted files:
* `app_test.dart`: added shell parameters
* `Podfile.lock`: wtf
* `pubspec.lock`: wtf
2022-04-11 16:54:28 +02:00
e23117de31 feat: #217 - onboarding screenshot generation. (#1529)
New files:
* `app_test.dart`: Onboarding screenshots.
* `screenshot_driver.dart`: Screenshot driver.

Impacted files:
* `analytics_helper.dart`: added a special case for screenshot init.
* `main.dart`: refactored for screenshots, and more specifically moved init code to be run before calling the app.
* `next_button.dart`: added a `Key` for test/screenshots
* `Podfile.lock`: wtf
* `pubspec.lock`: impacted by `pubspec.yaml`
* `pubspec.yaml`: added integration_test and flutter_driver to dev_dependencies; upgraded the version numbers.
2022-04-11 14:38:05 +02:00