update Android with latest from upstream.

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

@@ -3,6 +3,8 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.vision.FirebaseVision;
@@ -15,15 +17,19 @@
 import java.util.List;
 import java.util.Map;
 
-class BarcodeDetector implements Detector {
+public class BarcodeDetector extends Detector {
   public static final BarcodeDetector instance = new BarcodeDetector();
   private static FirebaseVisionBarcodeDetector barcodeDetector;
 
   private BarcodeDetector() {}
 
   @Override
-  public void handleDetection(
-      FirebaseVisionImage image, Map<String, Object> options, final MethodChannel.Result result) {
+  public void close(@Nullable OperationFinishedCallback callback) {
+
+  }
+
+  @Override
+  void processImage(FirebaseVisionImage image, Map<String, Object> options, final OperationFinishedCallback finishedCallback) {
     if (barcodeDetector == null)
       barcodeDetector = FirebaseVision.getInstance().getVisionBarcodeDetector();
 
@@ -178,14 +184,14 @@ public void onSuccess(List<FirebaseVisionBarcode> firebaseVisionBarcodes) {
 
                   barcodes.add(barcodeMap);
                 }
-                result.success(barcodes);
+                finishedCallback.success(BarcodeDetector.this, barcodes);
               }
             })
         .addOnFailureListener(
             new OnFailureListener() {
               @Override
               public void onFailure(@NonNull Exception exception) {
-                result.error("barcodeDetectorError", exception.getLocalizedMessage(), null);
+                finishedCallback.error(new DetectorException("barcodeDetectorError", exception.getLocalizedMessage(), null));
               }
             });
   }

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

@@ -4,6 +4,7 @@
 
 import com.google.firebase.ml.vision.common.FirebaseVisionImage;
 
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class Detector {
@@ -25,7 +26,7 @@ public void handleDetection(
     if (shouldThrottle.get()) {
       return;
     }
-    processImage(image, new OperationFinishedCallback() {
+    processImage(image, options, new OperationFinishedCallback() {
       @Override
       public void success(Detector detector, Object data) {
         shouldThrottle.set(false);
@@ -45,5 +46,5 @@ public void error(DetectorException e) {
   }
 
   abstract void processImage(
-    FirebaseVisionImage image, OperationFinishedCallback finishedCallback);
+    FirebaseVisionImage image, Map<String, Object> options, OperationFinishedCallback finishedCallback);
 }

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

@@ -1,6 +1,8 @@
 package io.flutter.plugins.firebasemlvision;
 
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.vision.FirebaseVision;
@@ -15,15 +17,18 @@
 import java.util.List;
 import java.util.Map;
 
-class FaceDetector implements Detector {
+public class FaceDetector extends Detector {
   public static final FaceDetector instance = new FaceDetector();
 
   private FaceDetector() {}
 
   @Override
-  public void handleDetection(
-      FirebaseVisionImage image, Map<String, Object> options, final MethodChannel.Result result) {
+  public void close(@Nullable OperationFinishedCallback callback) {
+    // TODO: figure out if we still need to do this
+  }
 
+  @Override
+  void processImage(FirebaseVisionImage image, Map<String, Object> options, final OperationFinishedCallback finishedCallback) {
     FirebaseVisionFaceDetector detector;
     if (options == null) {
       detector = FirebaseVision.getInstance().getVisionFaceDetector();
@@ -72,14 +77,14 @@ public void onSuccess(List<FirebaseVisionFace> firebaseVisionFaces) {
                   faces.add(faceData);
                 }
 
-                result.success(faces);
+                finishedCallback.success(FaceDetector.this, faces);
               }
             })
         .addOnFailureListener(
             new OnFailureListener() {
               @Override
               public void onFailure(@NonNull Exception exception) {
-                result.error("faceDetectorError", exception.getLocalizedMessage(), null);
+                finishedCallback.error(new DetectorException("faceDetectorError", exception.getLocalizedMessage(), null));
               }
             });
   }

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

@@ -134,7 +134,7 @@ public void onMethodCall(MethodCall call, final Result result) {
           camera.stop();
         }
         camera = new LegacyCamera(registrar, resolutionPreset, Integer.parseInt(cameraName)); //new Camera(registrar, cameraName, resolutionPreset, result);
-        camera.setMachineLearningFrameProcessor(TextDetector.instance);
+        camera.setMachineLearningFrameProcessor(TextDetector.instance, options);
         try {
           camera.start(new LegacyCamera.OnCameraOpenedCallback() {
             @Override
@@ -174,17 +174,20 @@ public void onFailed(Exception e) {
             case "barcode":
               detector = BarcodeDetector.instance;
               break;
+            case "face":
+              detector = FaceDetector.instance;
+              break;
             default:
               detector = TextDetector.instance;
           }
-          camera.setMachineLearningFrameProcessor(detector);
+          camera.setMachineLearningFrameProcessor(detector, options);
         }
         result.success(null);
         break;
       case "BarcodeDetector#detectInImage":
         try {
           image = filePathToVisionImage((String) call.argument("path"));
-          BarcodeDetector.instance.handleDetection(image, options, result);
+          BarcodeDetector.instance.handleDetection(image, options, handleDetection(result));
         } catch (IOException e) {
           result.error("barcodeDetectorIOError", e.getLocalizedMessage(), null);
         } catch (Exception e) {
@@ -194,7 +197,7 @@ public void onFailed(Exception e) {
       case "FaceDetector#detectInImage":
         try {
           image = filePathToVisionImage((String) call.argument("path"));
-          FaceDetector.instance.handleDetection(image, options, result);
+          FaceDetector.instance.handleDetection(image, options, handleDetection(result));
         } catch (IOException e) {
           result.error("faceDetectorIOError", e.getLocalizedMessage(), null);
         } catch (Exception e) {
@@ -206,7 +209,7 @@ public void onFailed(Exception e) {
       case "TextDetector#detectInImage":
         try {
           image = filePathToVisionImage((String) call.argument("path"));
-          TextDetector.instance.handleDetection(image, options, result);
+          TextDetector.instance.handleDetection(image, options, handleDetection(result));
         } catch (IOException e) {
           result.error("textDetectorIOError", e.getLocalizedMessage(), null);
         } catch (Exception e) {
@@ -218,6 +221,20 @@ public void onFailed(Exception e) {
     }
   }
 
+  private Detector.OperationFinishedCallback handleDetection(final Result result) {
+    return new Detector.OperationFinishedCallback() {
+      @Override
+      public void success(Detector detector, Object data) {
+        result.success(data);
+      }
+
+      @Override
+      public void error(DetectorException e) {
+        e.sendError(result);
+      }
+    };
+  }
+
   private FirebaseVisionImage filePathToVisionImage(String path) throws IOException {
     File file = new File(path);
     return FirebaseVisionImage.fromFilePath(registrar.context(), Uri.fromFile(file));

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

@@ -1,11 +1,20 @@
 package io.flutter.plugins.firebasemlvision;
 
+import android.support.annotation.Nullable;
+
 import com.google.firebase.ml.vision.common.FirebaseVisionImage;
 import io.flutter.plugin.common.MethodChannel;
 import java.util.Map;
 
-class LabelDetector implements Detector {
+public class LabelDetector extends Detector {
+
+  @Override
+  public void close(@Nullable OperationFinishedCallback callback) {
+
+  }
+
   @Override
-  public void handleDetection(
-      FirebaseVisionImage image, Map<String, Object> options, final MethodChannel.Result result) {}
-}
+  void processImage(FirebaseVisionImage image, Map<String, Object> options, OperationFinishedCallback finishedCallback) {
+
+  }
+}

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

@@ -3,6 +3,8 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.vision.FirebaseVision;
@@ -15,15 +17,19 @@
 import java.util.List;
 import java.util.Map;
 
-public class TextDetector implements Detector {
+public class TextDetector extends Detector {
   public static final TextDetector instance = new TextDetector();
   private static FirebaseVisionTextDetector textDetector;
 
   private TextDetector() {}
 
   @Override
-  public void handleDetection(
-      FirebaseVisionImage image, Map<String, Object> options, final MethodChannel.Result result) {
+  public void close(@Nullable OperationFinishedCallback callback) {
+
+  }
+
+  @Override
+  void processImage(FirebaseVisionImage image, Map<String, Object> options, final OperationFinishedCallback finishedCallback) {
     if (textDetector == null) textDetector = FirebaseVision.getInstance().getVisionTextDetector();
     textDetector
         .detectInImage(image)
@@ -59,14 +65,14 @@ public void onSuccess(FirebaseVisionText firebaseVisionText) {
                   blockData.put("lines", lines);
                   blocks.add(blockData);
                 }
-                result.success(blocks);
+                finishedCallback.success(TextDetector.this, blocks);
               }
             })
         .addOnFailureListener(
             new OnFailureListener() {
               @Override
               public void onFailure(@NonNull Exception exception) {
-                result.error("textDetectorError", exception.getLocalizedMessage(), null);
+                finishedCallback.error(new DetectorException("textDetectorError", exception.getLocalizedMessage(), null));
               }
             });
   }

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

@@ -359,7 +359,7 @@ private void processImage(Image image) {
       .build();
     FirebaseVisionImage firebaseVisionImage = FirebaseVisionImage.fromByteBuffer(imageBuffer, metadata);
 
-    currentDetector.handleDetection(firebaseVisionImage, liveDetectorFinishedCallback);
+    currentDetector.handleDetection(firebaseVisionImage, new HashMap<String, Object>(), liveDetectorFinishedCallback);
 
 //    FirebaseVisionBarcodeDetector visionBarcodeDetector = FirebaseVision.getInstance().getVisionBarcodeDetector();
 //    visionBarcodeDetector.detectInImage(firebaseVisionImage).addOnSuccessListener(new OnSuccessListener<List<FirebaseVisionBarcode>>() {

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

@@ -47,6 +47,8 @@
 import io.flutter.plugins.firebasemlvision.BarcodeDetector;
 import io.flutter.plugins.firebasemlvision.Detector;
 import io.flutter.plugins.firebasemlvision.DetectorException;
+import io.flutter.plugins.firebasemlvision.FaceDetector;
+import io.flutter.plugins.firebasemlvision.LabelDetector;
 import io.flutter.plugins.firebasemlvision.TextDetector;
 import io.flutter.view.FlutterView;
 
@@ -123,6 +125,7 @@ public interface OnCameraOpenedCallback {
 
   private final Object processorLock = new Object();
   private Detector detector;
+  private Map<String, Object> detectorOptions;
 
   /**
    * Map to convert between a byte array, received from the camera, and its associated byte buffer.
@@ -145,6 +148,10 @@ public void success(Detector detector, Object data) {
         dataType = "barcode";
       } else if (detector instanceof TextDetector) {
         dataType = "text";
+      } else if (detector instanceof LabelDetector) {
+        dataType = "label";
+      } else if (detector instanceof FaceDetector) {
+        dataType = "face";
       } else {
         // unsupported live detector
         return;
@@ -658,12 +665,13 @@ public void onPreviewFrame(byte[] data, Camera camera) {
     }
   }
 
-  public void setMachineLearningFrameProcessor(Detector processor) {
+  public void setMachineLearningFrameProcessor(Detector processor, @Nullable Map<String, Object> options) {
     synchronized (processorLock) {
       if (detector != null) {
         detector.close(null);
       }
       detector = processor;
+      detectorOptions = options;
     }
   }
 
@@ -795,7 +803,7 @@ public void run() {
                 .setRotation(rotation)
                 .build();
             FirebaseVisionImage image = FirebaseVisionImage.fromByteBuffer(data, metadata);
-            detector.handleDetection(image, liveDetectorFinishedCallback);
+            detector.handleDetection(image, detectorOptions, liveDetectorFinishedCallback);
           }
         } catch (Throwable t) {
           Log.e(TAG, "Exception thrown from receiver.", t);

packages/firebase_ml_vision/example/lib/detector_painters.dart

@@ -5,9 +5,28 @@
 import 'dart:ui';
 
 import 'package:firebase_ml_vision/firebase_ml_vision.dart';
+import 'package:firebase_ml_vision/live_view.dart';
 import 'package:flutter/material.dart';
 
-enum Detector { barcode, face, label, text }
+CustomPaint customPaintForResults(
+    Size imageSize, LiveViewDetectionList results) {
+  CustomPainter painter;
+  if (results is LiveViewBarcodeDetectionList) {
+    painter = new BarcodeDetectorPainter(imageSize, results.data);
+  } else if (results is LiveViewTextDetectionList) {
+    painter = new TextDetectorPainter(imageSize, results.data);
+  } else if (results is LiveViewFaceDetectionList) {
+    painter = new FaceDetectorPainter(imageSize, results.data);
+  } else if (results is LiveViewLabelDetectionList) {
+    painter = new LabelDetectorPainter(imageSize, results.data);
+  } else {
+    painter = null;
+  }
+
+  return new CustomPaint(
+    painter: painter,
+  );
+}
 
 class BarcodeDetectorPainter extends CustomPainter {
   BarcodeDetectorPainter(this.absoluteImageSize, this.barcodeLocations);

packages/firebase_ml_vision/example/lib/live_preview.dart

@@ -22,6 +22,7 @@ class LivePreview extends StatefulWidget {
 class LivePreviewState extends State<LivePreview> {
   bool _isShowingPreview = false;
   LiveViewCameraLoadStateReady _readyLoadState;
+  GlobalKey<LiveViewState> _liveViewKey = new GlobalKey();
 
   Stream<LiveViewCameraLoadState> _prepareCameraPreview() async* {
     if (_readyLoadState != null) {
@@ -60,7 +61,7 @@ class LivePreviewState extends State<LivePreview> {
   }
 
   Future<Null> setLiveViewDetector() async {
-    return FirebaseVision.instance.setLiveViewRecognizer(widget.detector);
+    return _readyLoadState?.controller?.setDetector(widget.detector);
   }
 
   @override
@@ -76,7 +77,7 @@ class LivePreviewState extends State<LivePreview> {
       initialData: new LiveViewCameraLoadStateLoading(),
       builder: (BuildContext context,
           AsyncSnapshot<LiveViewCameraLoadState> snapshot) {
-        final loadState = snapshot.data;
+        final LiveViewCameraLoadState loadState = snapshot.data;
         if (loadState != null) {
           if (loadState is LiveViewCameraLoadStateLoading ||
               loadState is LiveViewCameraLoadStateLoaded) {
@@ -91,12 +92,11 @@ class LivePreviewState extends State<LivePreview> {
               aspectRatio: _readyLoadState.controller.value.aspectRatio,
               child: new LiveView(
                 controller: _readyLoadState.controller,
-                overlayBuilder:
-                    (BuildContext context, Size previewSize, dynamic data) {
+                overlayBuilder: (BuildContext context, Size previewSize,
+                    LiveViewDetectionList data) {
                   return data == null
                       ? new Container()
-                      : customPaintForResults(
-                          widget.detector, previewSize, data);
+                      : customPaintForResults(previewSize, data);
                 },
               ),
             );