Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: #1245 revert issue #1155 #1258

Merged
merged 4 commits into from
Mar 18, 2022
Merged

fix: #1245 revert issue #1155 #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17e63a4
fix: #1155 - MissingPluginException (iOS scanner issue)
cli1005 Mar 14, 2022
af07202
fix: openfoodfacts#1155 - MissingPluginException (iOS scanner issue)
cli1005 Mar 16, 2022
751264a
Merge branch 'openfoodfacts:develop' into bug/1155-ios-scanner-issue
cli1005 Mar 18, 2022
7279e30
fix: #1245 - google_ml_kit build issue revert 1155
cli1005 Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/smooth_app/lib/pages/scan/abstract_camera_image_getter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:typed_data';
import 'package:camera/camera.dart';
import 'package:flutter/material.dart';
import 'package:google_ml_kit/google_ml_kit.dart';
import 'package:google_ml_barcode_scanner/google_ml_barcode_scanner.dart';

/// Abstract getter of Camera Image, for barcode scan.
///
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/lib/pages/scan/camera_image_cropper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:typed_data';
import 'package:camera/camera.dart';
import 'package:flutter/material.dart';
import 'package:google_ml_kit/google_ml_kit.dart';
import 'package:google_ml_barcode_scanner/google_ml_barcode_scanner.dart';
import 'package:smooth_app/pages/scan/abstract_camera_image_getter.dart';
import 'package:typed_data/typed_buffers.dart';

Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/lib/pages/scan/camera_image_full_getter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:typed_data';
import 'package:camera/camera.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:google_ml_kit/google_ml_kit.dart';
import 'package:google_ml_barcode_scanner/google_ml_barcode_scanner.dart';
import 'package:smooth_app/pages/scan/abstract_camera_image_getter.dart';

/// Camera Image helper where we get the full image.
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:camera/camera.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:google_ml_kit/google_ml_kit.dart';
import 'package:google_ml_barcode_scanner/google_ml_barcode_scanner.dart';
import 'package:provider/provider.dart';
import 'package:smooth_app/data_models/continuous_scan_model.dart';
import 'package:smooth_app/data_models/user_preferences.dart';
Expand Down
6 changes: 3 additions & 3 deletions packages/smooth_app/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,13 +357,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
google_ml_kit:
google_ml_barcode_scanner:
dependency: "direct main"
description:
name: google_ml_kit
name: google_ml_barcode_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.0"
version: "0.0.2"
hive:
dependency: "direct main"
description:
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies:
crop_your_image: ^0.7.0
mailto: ^2.0.0
flutter_native_splash: ^2.1.0
google_ml_kit: 0.6.0
google_ml_barcode_scanner: ^0.0.2



Expand Down