Update firebase_ml_vision for latest Firebase MLKit API

packages/firebase_ml_vision/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0
+
+* **Breaking Change** Update TextDetector to TextRecognizer for android mlkit '17.0.0' and
+firebase-ios-sdk '5.6.0'.
+* Added CloudLabelDetector.
+
 ## 0.1.2
 
 * Fix example imports so that publishing will be warning-free.

packages/firebase_ml_vision/README.md

@@ -1,8 +1,8 @@
-# Google ML Kit for Firebase
+# ML Kit for Firebase
 
 [![pub package](https://img.shields.io/pub/v/firebase_ml_vision.svg)](https://pub.dartlang.org/packages/firebase_ml_vision)
 
-A Flutter plugin to use the [Google ML Kit for Firebase API](https://firebase.google.com/docs/ml-kit/).
+A Flutter plugin to use the [ML Kit for Firebase API](https://firebase.google.com/docs/ml-kit/).
 
 For Flutter plugins for other Firebase products, see [FlutterFire.md](https://github.com/flutter/plugins/blob/master/FlutterFire.md).
 
@@ -42,12 +42,13 @@ Get an instance of a `FirebaseVisionDetector`.
 
 ```dart
 final BarcodeDetector barcodeDetector = FirebaseVision.instance.barcodeDetector();
+final CloudLabelDetector cloudLabelDetector = FirebaseVision.instance.cloudLabelDetector();
 final FaceDetector faceDetector = FirebaseVision.instance.faceDetector();
 final LabelDetector labelDetector = FirebaseVision.instance.labelDetector();
-final TextDetector textDetector = FirebaseVision.instance.textDetector();
+final TextRecognizer textRecognizer = FirebaseVision.instance.textRecognizer();
 ```
 
-You can also configure all detectors except `TextDetector` with desired options.
+You can also configure all detectors except `TextRecognizer` with desired options.
 
 ```dart
 final LabelDetector detector = FirebaseVision.instance.labelDetector(
@@ -59,9 +60,10 @@ final LabelDetector detector = FirebaseVision.instance.labelDetector(
 
 ```dart
 final List<Barcode> barcodes = await barcodeDetector.detectInImage(visionImage);
+final List<Label> labels = await cloudLabelDetector.detectInImage(visionImage);
 final List<Face> faces = await faceDetector.detectInImage(visionImage);
 final List<Label> labels = await labelDetector.detectInImage(visionImage);
-final List<TextBlock> blocks = await textDetector.detectInImage(visionImage);
+final VisionText visionText = await textRecognizer.detectInImage(visionImage);
 ```
 
 ### 4. Extract data.
@@ -133,21 +135,22 @@ for (Label label in labels) {
 d. Extract text.
 
 ```dart
-for (TextBlock block in blocks) {
+String text = visionText.text;
+for (TextBlock block in visionText.blocks) {
   final Rectangle<int> boundingBox = block.boundingBox;
   final List<Point<int>> cornerPoints = block.cornerPoints;
   final String text = block.text;
+  final List<RecognizedLanguage> languages = block.recognizedLanguages;
 
   for (TextLine line in block.lines) {
-    // ...
-
+    // Same getters as TextBlock
     for (TextElement element in line.elements) {
-      // ...
+      // Same getters as TextBlock
     }
   }
 }
 ```
 
 ## Getting Started
 
-See the `example` directory for a complete sample app using Google ML Kit for Firebase.
+See the `example` directory for a complete sample app using ML Kit for Firebase.

packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java

@@ -55,7 +55,20 @@ public void onFailure(@NonNull Exception e) {
 
   private FirebaseVisionCloudDetectorOptions parseOptions(Map<String, Object> optionsData) {
     final int maxResults = (int) optionsData.get("maxResults");
-    final int modelType = (int) optionsData.get("modelType");
+    final String modelTypeStr = (String) optionsData.get("modelType");
+
+    final int modelType;
+    switch (modelTypeStr) {
+      case "stable":
+        modelType = FirebaseVisionCloudDetectorOptions.STABLE_MODEL;
+        break;
+      case "latest":
+        modelType = FirebaseVisionCloudDetectorOptions.LATEST_MODEL;
+        break;
+      default:
+        throw new IllegalArgumentException(String.format("No type for model: %s", modelTypeStr));
+    }
+
     return new FirebaseVisionCloudDetectorOptions.Builder()
         .setMaxResults(maxResults)
         .setModelType(modelType)

packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java

@@ -37,8 +37,6 @@ public void onMethodCall(MethodCall call, Result result) {
           BarcodeDetector.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("barcodeDetectorIOError", e.getLocalizedMessage(), null);
-        } catch (Exception e) {
-          result.error("barcodeDetectorError", e.getLocalizedMessage(), null);
         }
         break;
       case "FaceDetector#detectInImage":
@@ -47,8 +45,6 @@ public void onMethodCall(MethodCall call, Result result) {
           FaceDetector.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("faceDetectorIOError", e.getLocalizedMessage(), null);
-        } catch (Exception e) {
-          result.error("faceDetectorError", e.getLocalizedMessage(), null);
         }
         break;
       case "LabelDetector#detectInImage":
@@ -57,28 +53,22 @@ public void onMethodCall(MethodCall call, Result result) {
           LabelDetector.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("labelDetectorIOError", e.getLocalizedMessage(), null);
-        } catch (Exception e) {
-          result.error("labelDetectorError", e.getLocalizedMessage(), null);
         }
         break;
       case "CloudLabelDetector#detectInImage":
         try {
           image = filePathToVisionImage((String) call.argument("path"));
           CloudLabelDetector.instance.handleDetection(image, options, result);
         } catch (IOException e) {
-          result.error("labelDetectorIOError", e.getLocalizedMessage(), null);
-        } catch (Exception e) {
-          result.error("labelDetectorError", e.getLocalizedMessage(), null);
+          result.error("cloudLabelDetectorIOError", e.getLocalizedMessage(), null);
         }
         break;
-      case "TextRecognizer#detectInImage":
+      case "TextRecognizer#processImage":
         try {
           image = filePathToVisionImage((String) call.argument("path"));
           TextRecognizer.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("textRecognizerIOError", e.getLocalizedMessage(), null);
-        } catch (Exception e) {
-          result.error("textRecognizerError", e.getLocalizedMessage(), null);
         }
         break;
       default:

packages/firebase_ml_vision/example/lib/detector_painters.dart

@@ -122,10 +122,10 @@ class LabelDetectorPainter extends CustomPainter {
 
 // Paints rectangles around all the text in the image.
 class TextDetectorPainter extends CustomPainter {
-  TextDetectorPainter(this.absoluteImageSize, this.textLocations);
+  TextDetectorPainter(this.absoluteImageSize, this.visionText);
 
   final Size absoluteImageSize;
-  final List<TextBlock> textLocations;
+  final VisionText visionText;
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -145,7 +145,7 @@ class TextDetectorPainter extends CustomPainter {
       ..style = PaintingStyle.stroke
       ..strokeWidth = 2.0;
 
-    for (TextBlock block in textLocations) {
+    for (TextBlock block in visionText.blocks) {
       for (TextLine line in block.lines) {
         for (TextElement element in line.elements) {
           paint.color = Colors.green;
@@ -164,6 +164,6 @@ class TextDetectorPainter extends CustomPainter {
   @override
   bool shouldRepaint(TextDetectorPainter oldDelegate) {
     return oldDelegate.absoluteImageSize != absoluteImageSize ||
-        oldDelegate.textLocations != textLocations;
+        oldDelegate.visionText != visionText;
   }
 }

packages/firebase_ml_vision/example/lib/main.dart

@@ -21,7 +21,7 @@ class _MyHomePage extends StatefulWidget {
 class _MyHomePageState extends State<_MyHomePage> {
   File _imageFile;
   Size _imageSize;
-  List<dynamic> _scanResults;
+  dynamic _scanResults;
   Detector _currentDetector = Detector.text;
 
   Future<void> _getAndScanImage() async {
@@ -85,21 +85,21 @@ class _MyHomePageState extends State<_MyHomePage> {
         detector = FirebaseVision.instance.cloudLabelDetector();
         break;
       case Detector.text:
-        detector = FirebaseVision.instance.textDetector();
+        detector = FirebaseVision.instance.textRecognizer();
         break;
       default:
         return;
     }
 
-    final List<dynamic> results =
+    final dynamic results =
         await detector.detectInImage(visionImage) ?? <dynamic>[];
 
     setState(() {
       _scanResults = results;
     });
   }
 
-  CustomPaint _buildResults(Size imageSize, List<dynamic> results) {
+  CustomPaint _buildResults(Size imageSize, dynamic results) {
     CustomPainter painter;
 
     switch (_currentDetector) {

packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m

@@ -34,14 +34,18 @@ + (void)handleDetection:(FIRVisionImage *)image
 }
 
 + (FIRVisionCloudDetectorOptions *)parseOptions:(NSDictionary *)optionsData {
-  FIRVisionCloudDetectorOptions *detector = [[FIRVisionCloudDetectorOptions alloc] init];
-
-  NSNumber *modelType = optionsData[@"modelType"];
-  detector.modelType = (FIRVisionCloudModelType)[modelType intValue];
+  FIRVisionCloudDetectorOptions *options = [[FIRVisionCloudDetectorOptions alloc] init];
 
   NSNumber *maxResults = optionsData[@"maxResults"];
-  detector.maxResults = [maxResults unsignedIntegerValue];
+  options.maxResults = [maxResults unsignedIntegerValue];
+
+  NSString *modelTypeStr = optionsData[@"modelType"];
+  if ([@"stable" isEqualToString:modelTypeStr]) {
+    options.modelType = FIRVisionCloudModelTypeStable;
+  } else if ([@"latest" isEqualToString:modelTypeStr]) {
+    options.modelType = FIRVisionCloudModelTypeLatest;
+  }
 
-  return detector;
+  return options;
 }
 @end