updating code

Author: rishabnayak

example/lib/main.dart

@@ -23,12 +23,12 @@ class _MyHomePageState extends State<_MyHomePage> {
 
   void _initializeCamera() async {
     List<FirebaseCameraDescription> cameras = await camerasAvailable();
-    _vision = FirebaseVision(cameras[0], ResolutionSetting.high);
+    _vision = FirebaseVision(cameras[0], ResolutionSetting.low);
     _vision.initialize().then((_) {
       if (!mounted) {
         return;
       }
-      _vision.addBarcodeDetector().forEach((action) => print(action)); 
+      _vision.addBarcodeDetector(); 
       setState(() {});
     });
   }

ios/Classes/BarcodeDetector.m

@@ -28,8 +28,11 @@ - (void)handleDetection:(FIRVisionImage *)image result:(FlutterEventSink)result
                   for (FIRVisionBarcode *barcode in barcodes) {
                     [ret addObject:visionBarcodeToDictionary(barcode)];
                   }
-                  result(ret);
-                }];
+                result(@{
+                    @"eventType" : @"detection",
+                    @"data":ret
+                });
+            }];
 }
 
 NSDictionary *visionBarcodeToDictionary(FIRVisionBarcode *barcode) {

ios/Classes/FirebaseMlVisionPlugin.h

@@ -2,7 +2,7 @@
 
 #import "Firebase/Firebase.h"
 
-@interface FLTFirebaseMlVisionPlugin : NSObject <FlutterPlugin, FlutterStreamHandler>
+@interface FLTFirebaseMlVisionPlugin : NSObject <FlutterPlugin>
 + (void)handleError:(NSError *)error result:(FlutterResult)result;
 @end
 

ios/Classes/FirebaseMlVisionPlugin.m

@@ -17,7 +17,6 @@ @interface FirebaseCam : NSObject <FlutterTexture,
 @property(readonly, nonatomic) int64_t textureId;
 @property(nonatomic, copy) void (^onFrameAvailable)();
 @property(nonatomic) id<Detector> activeDetector;
-@property(nonatomic) FlutterEventSink resultSink;
 @property(nonatomic) FlutterEventChannel *eventChannel;
 @property(nonatomic) FlutterEventSink eventSink;
 @property(readonly, nonatomic) AVCaptureSession *captureSession;
@@ -152,7 +151,8 @@ - (void)captureOutput:(AVCaptureOutput *)output
 
             metadata.orientation = visionOrientation;
             visionImage.metadata = metadata;
-            [_activeDetector handleDetection:visionImage result:_resultSink];
+            [_activeDetector handleDetection:visionImage result:_eventSink];
+            _isRecognizing = NO;
         }
         CFRetain(newBuffer);
         CVPixelBufferRef old = _latestPixelBuffer;
@@ -223,22 +223,19 @@ @implementation FLTFirebaseMlVisionPlugin {
 }
 
 static NSMutableDictionary<NSNumber *, id<Detector>> *detectors;
-FlutterEventSink resultSink;
 
 + (void)handleError:(NSError *)error result:(FlutterResult)result {
     result(getFlutterError(error));
 }
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
     detectors = [NSMutableDictionary new];
-    FlutterEventChannel *results = [FlutterEventChannel eventChannelWithName:@"plugins.flutter.io/firebase_mlvision_results" binaryMessenger:[registrar messenger]];
     FlutterMethodChannel *channel =
     [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/firebase_mlvision"
                                 binaryMessenger:[registrar messenger]];
     FLTFirebaseMlVisionPlugin *instance = [[FLTFirebaseMlVisionPlugin alloc] initWithRegistry:[registrar textures]
                                                                                     messenger:[registrar messenger]];
     [registrar addMethodCallDelegate:instance channel:channel];
-    [results setStreamHandler:instance];
 
     SEL sel = NSSelectorFromString(@"registerLibrary:withVersion:");
     if ([FIRApp respondsToSelector:sel]) {
@@ -544,14 +541,4 @@ + (void)addDetector:(NSNumber *)handle detector:(id<Detector>)detector {
     detectors[handle] = detector;
 }
 
-- (FlutterError * _Nullable)onCancelWithArguments:(id _Nullable)arguments {
-    resultSink = nil;
-    return nil;
-}
-
-- (FlutterError * _Nullable)onListenWithArguments:(id _Nullable)arguments eventSink:(nonnull FlutterEventSink)events {
-    resultSink = events;
-    return nil;
-}
-
 @end

lib/src/barcode_detector.dart

@@ -196,7 +196,7 @@ class BarcodeDetector {
     assert(!_isClosed);
 
     _hasBeenOpened = true;
-    Stream<dynamic> data = Stream.empty();
+    Stream<Barcode> data = Stream.empty();
     FirebaseVision.channel.invokeListMethod<dynamic>(
       'BarcodeDetector#startDetection',
       <String, dynamic>{
@@ -207,7 +207,10 @@ class BarcodeDetector {
       },
     ).then((onValue){
       const EventChannel resultsChannel = EventChannel('plugins.flutter.io/firebase_mlvision_results');
-      data = resultsChannel.receiveBroadcastStream().map((convert) => Barcode._(convert));
+      data = resultsChannel.receiveBroadcastStream().map((convert){
+        print(convert);
+        return Barcode._(convert);
+        });
     });
     return data;
   }

lib/src/firebase_vision.dart

@@ -256,6 +256,9 @@ class FirebaseVision extends ValueNotifier<FirebaseCameraValue> {
     }
 
     switch (map['eventType']) {
+      case 'detection':
+        // print(event['data']);
+        break;
       case 'error':
         value = value.copyWith(errorDescription: event['errorDescription']);
         break;

pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.36.3"
+    version: "0.36.4"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
   async:
     dependency: transitive
     description:
@@ -70,7 +70,7 @@ packages:
       name: csslib
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.0"
+    version: "0.16.1"
   file:
     dependency: transitive
     description:
@@ -84,7 +84,7 @@ packages:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0+1"
+    version: "0.4.0+8"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -106,7 +106,7 @@ packages:
       name: front_end
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.18"
+    version: "0.1.19"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
@@ -139,7 +139,7 @@ packages:
       name: http_multi_server
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.0"
   http_parser:
     dependency: transitive
     description:
@@ -181,7 +181,7 @@ packages:
       name: kernel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.18"
+    version: "0.3.19"
   matcher:
     dependency: transitive
     description:
@@ -202,7 +202,7 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.6+2"
+    version: "0.9.6+3"
   multi_server_socket:
     dependency: transitive
     description:
@@ -216,7 +216,7 @@ packages:
       name: node_preamble
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.4"
+    version: "1.4.6"
   package_config:
     dependency: transitive
     description:
@@ -410,7 +410,7 @@ packages:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7+10"
+    version: "0.9.7+12"
   web_socket_channel:
     dependency: transitive
     description:
@@ -424,7 +424,7 @@ packages:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.15"
+    version: "2.1.16"
 sdks:
   dart: ">=2.2.2 <3.0.0"
-  flutter: ">=1.2.0 <2.0.0"
+  flutter: ">=1.5.0 <2.0.0"