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.

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

Migrated from firebase_ml_vision to google_ml_kit #151

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
**/android/**/gradle-wrapper.jar
**/android/.gradle
**/android/captures/
**/android/app/google-services.json
**/android/gradlew
**/android/gradlew.bat
**/android/local.properties
Expand Down
12 changes: 7 additions & 5 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,21 @@ if (flutterVersionName == null) {
}

apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 28
compileSdkVersion 29

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "fr.rushioconsulting.flutter_camera_ml_vision_example"
minSdkVersion 21
targetSdkVersion 28
applicationId "com.android.flutter_camera_ml_example"
minSdkVersion 29
targetSdkVersion 29
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -55,7 +56,8 @@ flutter {
}

dependencies {
api 'com.google.firebase:firebase-ml-vision-barcode-model:16.1.2'
implementation platform('com.google.firebase:firebase-bom:29.0.1')
api 'com.google.mlkit:barcode-scanning:17.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
Expand Down
4 changes: 3 additions & 1 deletion example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application
android:name="io.flutter.app.FlutterApplication"
android:label="flutter_camera_ml_vision_example"
android:icon="@mipmap/ic_launcher">
<activity
Expand All @@ -29,6 +28,9 @@
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</activity>
<meta-data
android:name="com.google.firebase.ml.vision.DEPENDENCIES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
package fr.rushioconsulting.flutter_camera_ml_vision_example;

import android.os.Bundle;
import io.flutter.app.FlutterActivity;
import io.flutter.plugins.GeneratedPluginRegistrant;
import io.flutter.embedding.android.FlutterActivity;



public class MainActivity extends FlutterActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
GeneratedPluginRegistrant.registerWith(this);
}

}
5 changes: 3 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.google.gms:google-services:4.3.5'
// classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.google.gms:google-services:4.3.10'
}
}

Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
8 changes: 4 additions & 4 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'dart:ui';

import 'package:firebase_ml_vision/firebase_ml_vision.dart';
import 'package:flutter/material.dart';
import 'package:flutter_camera_ml_vision/flutter_camera_ml_vision.dart';
import 'package:google_ml_kit/google_ml_kit.dart';

void main() => runApp(MyApp());

Expand Down Expand Up @@ -55,7 +55,7 @@ class _MyHomePageState extends State<MyHomePage> {
}

setState(() {
data.add(barcode.displayValue);
data.add(barcode.value.displayValue);
});
},
child: Text('Scan product'),
Expand All @@ -78,7 +78,7 @@ class ScanPage extends StatefulWidget {

class _ScanPageState extends State<ScanPage> {
bool resultSent = false;
BarcodeDetector detector = FirebaseVision.instance.barcodeDetector();
BarcodeScanner detector = GoogleMlKit.vision.barcodeScanner();

@override
Widget build(BuildContext context) {
Expand All @@ -97,7 +97,7 @@ class _ScanPageState extends State<ScanPage> {
),
);
},
detector: detector.detectInImage,
detector: detector.processImage,
onResult: (List<Barcode> barcodes) {
if (!mounted ||
resultSent ||
Expand Down
6 changes: 2 additions & 4 deletions example/lib/main_face.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:camera/camera.dart';
import 'package:firebase_ml_vision/firebase_ml_vision.dart';
import 'package:flutter/material.dart';
import 'package:flutter_camera_ml_vision/flutter_camera_ml_vision.dart';
import 'package:google_ml_kit/google_ml_kit.dart';

void main() => runApp(MyApp());

Expand Down Expand Up @@ -31,8 +30,7 @@ class _MyHomePageState extends State<MyHomePage> {
List<Face> _faces = [];
final _scanKey = GlobalKey<CameraMlVisionState>();
CameraLensDirection cameraLensDirection = CameraLensDirection.front;
FaceDetector detector =
FirebaseVision.instance.faceDetector(FaceDetectorOptions(
FaceDetector detector = GoogleMlKit.vision.faceDetector(FaceDetectorOptions(
enableTracking: true,
mode: FaceDetectorMode.accurate,
));
Expand Down
10 changes: 5 additions & 5 deletions example/lib/main_live.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:firebase_ml_vision/firebase_ml_vision.dart';
import 'package:flutter/material.dart';
import 'package:flutter_camera_ml_vision/flutter_camera_ml_vision.dart';
import 'package:google_ml_kit/google_ml_kit.dart';

void main() => runApp(MyApp());

Expand Down Expand Up @@ -29,7 +29,7 @@ class MyHomePage extends StatefulWidget {
class _MyHomePageState extends State<MyHomePage> {
List<String> data = [];
final _scanKey = GlobalKey<CameraMlVisionState>();
BarcodeDetector detector = FirebaseVision.instance.barcodeDetector();
BarcodeScanner detector = GoogleMlKit.vision.barcodeScanner();

@override
Widget build(BuildContext context) {
Expand All @@ -42,17 +42,17 @@ class _MyHomePageState extends State<MyHomePage> {
children: [
CameraMlVision<List<Barcode>>(
key: _scanKey,
detector: detector.detectInImage,
detector: detector.processImage,
resolution: ResolutionPreset.high,
onResult: (barcodes) {
if (barcodes == null ||
barcodes.isEmpty ||
data.contains(barcodes.first.displayValue) ||
data.contains(barcodes.first.value.displayValue) ||
!mounted) {
return;
}
setState(() {
data.add(barcodes.first.displayValue);
data.add(barcodes.first.value.displayValue);
});
},
onDispose: () {
Expand Down
Loading