Merge branch 'master' of https://github.com/rishab2113/firebase_mlvision

Author: rishabnayak

lib/src/barcode_detector.dart

@@ -241,7 +241,6 @@ class BarcodeDetectorOptions {
   final BarcodeFormat barcodeFormats;
 }
 
-// TODO(bparrishMines): Normalize default string values. Some values return null on iOS while Android returns empty string.
 /// Represents a single recognized barcode and its value.
 class Barcode {
   Barcode._(Map<dynamic, dynamic> _data)

lib/src/face_detector.dart

@@ -65,13 +65,13 @@ class FaceDetector {
   bool _isClosed = false;
 
   /// Detects faces in the input image.
-  Future<List<Face>> processImage(FirebaseVisionImage visionImage) async {
+  Stream<List<Face>> startDetection() {
     assert(!_isClosed);
 
     _hasBeenOpened = true;
-    final List<dynamic> reply =
-        await FirebaseVision.channel.invokeListMethod<dynamic>(
-      'FaceDetector#processImage',
+    Stream<dynamic> data = Stream.empty();
+    FirebaseVision.channel.invokeListMethod<dynamic>(
+      'FaceDetector#startDetection',
       <String, dynamic>{
         'handle': _handle,
         'options': <String, dynamic>{
@@ -82,15 +82,12 @@ class FaceDetector {
           'minFaceSize': options.minFaceSize,
           'mode': _enumToString(options.mode),
         },
-      }..addAll(visionImage._serialize()),
-    );
-
-    final List<Face> faces = <Face>[];
-    for (dynamic data in reply) {
-      faces.add(Face._(data));
-    }
-
-    return faces;
+    },
+).then((onValue){
+      const EventChannel resultsChannel = EventChannel('plugins.flutter.io/firebase_mlvision_results');
+      data = resultsChannel.receiveBroadcastStream();
+  });
+    return data;
   }
 
   /// Release resources used by this detector.

lib/src/firebase_vision.dart

@@ -303,9 +303,11 @@ class FirebaseVision extends ValueNotifier<FirebaseCameraValue> {
   }
 
   /// Creates an instance of [FaceDetector].
-  FaceDetector faceDetector([FaceDetectorOptions options]) {
-    return FaceDetector._(options ?? const FaceDetectorOptions(),
-    nextHandle++,);
+  Stream<List<Face>> addFaceDetector([FaceDetectorOptions options]) {
+    FaceDetector detector = FaceDetector._(options ?? const FaceDetectorOptions(),
+    nextHandle++,
+    );
+        return detector.startDetection();
   }
 
   /// Creates an instance of [ModelManager].
@@ -314,12 +316,13 @@ class FirebaseVision extends ValueNotifier<FirebaseCameraValue> {
   }
 
   /// Creates an on device instance of [ImageLabeler].
-  ImageLabeler imageLabeler([ImageLabelerOptions options]) {
-    return ImageLabeler._(
+  Stream<List<ImageLabel>> addImageLabeler([ImageLabelerOptions options]) {
+    ImageLabeler labeler = ImageLabeler._(
       options: options ?? const ImageLabelerOptions(),
       modelType: ModelType.onDevice,
       handle: nextHandle++,
     );
+  return labeler.startDetection();
   }
 
   /// Creates an instance of [TextRecognizer].

lib/src/image_labeler.dart

@@ -45,28 +45,32 @@ class ImageLabeler {
   bool _isClosed = false;
 
   /// Finds entities in the input image.
-  Future<List<ImageLabel>> processImage(FirebaseVisionImage visionImage) async {
+  Stream<List<ImageLabel>> startDetection() {
     assert(!_isClosed);
 
     _hasBeenOpened = true;
-    final List<dynamic> reply =
-        await FirebaseVision.channel.invokeListMethod<dynamic>(
-      'ImageLabeler#processImage',
+    Stream<dynamic> data = Stream.empty();
+    FirebaseVision.channel.invokeListMethod<dynamic>(
+      'ImageLabeler#startDetection',
       <String, dynamic>{
         'handle': _handle,
         'options': <String, dynamic>{
           'modelType': _enumToString(modelType),
           'confidenceThreshold': _options.confidenceThreshold,
         },
-      }..addAll(visionImage._serialize()),
-    );
+      },
+      ).then((onValue){
+      const EventChannel resultsChannel = EventChannel('plugins.flutter.io/firebase_mlvision_results');
+      data = resultsChannel.receiveBroadcastStream();
+  });
 
+/*
     final List<ImageLabel> labels = <ImageLabel>[];
-    for (dynamic data in reply) {
+    for (dynamic data in data) {
       labels.add(ImageLabel._(data));
     }
-
-    return labels;
+*/
+    return data;
   }
 
   /// Release resources used by this labeler.

lib/src/text_recognizer.dart

@@ -32,22 +32,25 @@ class TextRecognizer {
   bool _isClosed = false;
 
   /// Detects [VisionText] from a [FirebaseVisionImage].
-  Future<VisionText> processImage(FirebaseVisionImage visionImage) async {
+  Stream<List<VisionText>> startDetection() {
     assert(!_isClosed);
 
     _hasBeenOpened = true;
-    final Map<String, dynamic> reply =
-        await FirebaseVision.channel.invokeMapMethod<String, dynamic>(
-      'TextRecognizer#processImage',
+    Stream<dynamic> data = Stream.empty();
+    FirebaseVision.channel.invokeListMethod<dynamic>(
+      'TextRecognizer#startDetection',
       <String, dynamic>{
         'handle': _handle,
         'options': <String, dynamic>{
           'modelType': _enumToString(modelType),
         },
-      }..addAll(visionImage._serialize()),
-    );
+      },
 
-    return VisionText._(reply);
+    ).then((onValue){
+      const EventChannel resultsChannel = EventChannel('plugins.flutter.io/firebase_mlvision_results');
+      data = resultsChannel.receiveBroadcastStream();
+  });
+    return data;
   }
 
   /// Release resources used by this recognizer.

lib/src/vision_edge.dart

@@ -42,50 +42,56 @@ class VisionEdgeImageLabeler {
   bool _isClosed = false;
 
   /// Finds entities in the input image.
-  Future<List<VisionEdgeImageLabel>> processImage(
-      FirebaseVisionImage visionImage) async {
+ Stream<List<VisionEdgeImageLabel>> startDetection() {
     assert(!_isClosed);
 
     _hasBeenOpened = true;
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
     if (_modelLocation == ModelLocation.Local) {
-      final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
+      Stream<dynamic> data = Stream.empty();
+    FirebaseVision.channel.invokeListMethod<dynamic>(
         'VisionEdgeImageLabeler#processLocalImage',
         <String, dynamic>{
           'handle': _handle,
           'options': <String, dynamic>{
             'dataset': _dataset,
             'confidenceThreshold': _options.confidenceThreshold,
           },
-        }..addAll(visionImage._serialize()),
-      );
-
+        },
+).then((onValue){
+      const EventChannel resultsChannel = EventChannel('plugins.flutter.io/firebase_mlvision_results');
+      data = resultsChannel.receiveBroadcastStream();
+  });
+/*
       final List<VisionEdgeImageLabel> labels = <VisionEdgeImageLabel>[];
       for (dynamic data in reply) {
         labels.add(VisionEdgeImageLabel._(data));
       }
-
-      return labels;
+*/
+      return data;
     } else {
-      final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
+      Stream<dynamic> data = Stream.empty();
+    FirebaseVision.channel.invokeListMethod<dynamic>(
         'VisionEdgeImageLabeler#processRemoteImage',
         <String, dynamic>{
           'handle': _handle,
           'options': <String, dynamic>{
             'dataset': _dataset,
             'confidenceThreshold': _options.confidenceThreshold,
           },
-        }..addAll(visionImage._serialize()),
-      );
-
+        },
+).then((onValue){
+      const EventChannel resultsChannel = EventChannel('plugins.flutter.io/firebase_mlvision_results');
+      data = resultsChannel.receiveBroadcastStream();
+  });
+/*
       final List<VisionEdgeImageLabel> labels = <VisionEdgeImageLabel>[];
       for (dynamic data in reply) {
         labels.add(VisionEdgeImageLabel._(data));
       }
-
-      return labels;
+*/
+      return data;
     }
   }