Skip to content

Commit

Permalink
feat: 3712 - new mlkit and zxing scanners on flutter 3.7 (#3767)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
monsieurtanuki and M123-dev authored Mar 17, 2023
1 parent 8f1c7f6 commit 87d9280
Show file tree
Hide file tree
Showing 84 changed files with 1,057 additions and 4,060 deletions.
4 changes: 0 additions & 4 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,7 @@ 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/scanner_overlay.dart
- packages/smooth_app/lib/pages/scan/lifecycle_manager.dart
- packages/smooth_app/lib/pages/scan/abstract_camera_image_getter.dart
- packages/smooth_app/lib/pages/scan/camera_image_cropper.dart
- packages/smooth_app/lib/pages/scan/camera_image_full_getter.dart
- packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart

mlkit:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ jobs:
with:
channel: stable
cache: true
flutter-version: '3.0.5'
cache-key: revert-3.0.5
#flutter-version: '3.0.5'
cache-key: current-stable

- name: Flutter version
run: flutter --version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ jobs:
with:
channel: stable
cache: true
flutter-version: '3.0.5'
cache-key: revert-3.0.5
#flutter-version: '3.0.5'
cache-key: current-stable

- name: Flutter version
run: flutter --version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
with:
channel: stable
cache: true
flutter-version: '3.0.5'
cache-key: revert-3.0.5
#flutter-version: '3.0.5'
cache-key: current-stable

- run: flutter --version

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
with:
channel: stable
cache: true
flutter-version: '3.0.5'
cache-key: revert-3.0.5-debug
#flutter-version: '3.0.5'
cache-key: current-stable

- run: flutter --version

Expand Down
3 changes: 1 addition & 2 deletions packages/app_store/apple_app_store/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.0.1
publish_to: "none"

environment:
sdk: ">=2.17.0 <3.0.0"
flutter: "<3.3.0"
sdk: ">=2.19.0 <3.0.0"

dependencies:
flutter:
Expand Down
3 changes: 1 addition & 2 deletions packages/app_store/google_play/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.0.1
publish_to: "none"

environment:
sdk: ">=2.17.0 <3.0.0"
flutter: "<3.3.0"
sdk: ">=2.19.0 <3.0.0"

dependencies:
flutter:
Expand Down
3 changes: 1 addition & 2 deletions packages/app_store/shared/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 1.0.0
publish_to: "none"

environment:
sdk: ">=2.17.0 <3.0.0"
flutter: "<3.3.0"
sdk: ">=2.19.0 <3.0.0"

dependencies:
flutter:
Expand Down
3 changes: 1 addition & 2 deletions packages/app_store/uri_store/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.0.1
publish_to: "none"

environment:
sdk: ">=2.17.0 <3.0.0"
flutter: "<3.3.0"
sdk: ">=2.19.0 <3.0.0"

dependencies:
flutter:
Expand Down
3 changes: 1 addition & 2 deletions packages/data_importer/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=2.17.0 <3.0.0"
flutter: "<3.3.0"
sdk: ">=2.19.0 <3.0.0"

dependencies:
flutter:
Expand Down
3 changes: 1 addition & 2 deletions packages/data_importer_shared/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ description: A starting point for Dart libraries or applications.
publish_to: none

environment:
sdk: ">=2.17.0 <3.0.0"
flutter: "<3.3.0"
sdk: ">=2.19.0 <3.0.0"

dev_dependencies:
flutter_driver:
Expand Down
30 changes: 0 additions & 30 deletions packages/scanner/mlkit/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions packages/scanner/mlkit/.metadata

This file was deleted.

2 changes: 0 additions & 2 deletions packages/scanner/mlkit/analysis_options.yaml

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions packages/scanner/mlkit/lib/scanner_mlkit.dart

This file was deleted.

Loading

0 comments on commit 87d9280

Please sign in to comment.