updated scanner page

CodingWithTashi · CodingWithTashi · commit efd30d295aa3 · 2024-11-01T22:20:04.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.9
+* `SimpleBarcodeScannerPage` is now depreciated, use `SimpleBarcodeScanner` instead
+* Scan barcode with `SimpleBarcodeScanner` `scanBarcode` method
+* Stream barcode with `SimpleBarcodeScanner` `streamBarcode` method
+
 ## 0.1.8
 * IOS build issue fixed
 * Delay feature added for android and ios
diff --git a/README.md b/README.md
@@ -75,9 +75,10 @@ project, I'd appreciate your [🌟 on GitHub](https://github.com/CodingWithTashi
 
 ## publish
 
-```agsl
+```
 dart pub publish --dry-run
 ```
 ```
 dart pub publish
-```
+```
+
diff --git a/android/src/main/java/com/amolg/flutterbarcodescanner/BarcodeCaptureActivity.java b/android/src/main/java/com/amolg/flutterbarcodescanner/BarcodeCaptureActivity.java
@@ -100,6 +100,17 @@ enum USE_FLASH {
 
     private int flashStatus = USE_FLASH.OFF.ordinal();
 
+
+    @Override
+    public void onBackPressed() {
+        Barcode barcode = new Barcode();
+        // -2 is the code for user cancelled the scan
+        barcode.rawValue = "-2";
+        barcode.displayValue = "-2";
+        FlutterBarcodeScannerPlugin.onBarcodeScanReceiver(barcode);
+        finish();
+    }
+
     /**
      * Initializes the UI and creates the detector pipeline.
      */
@@ -415,11 +426,8 @@ public void onClick(View v) {
                 Log.e("BarcodeCaptureActivity", "FlashOnFailure: " + e.getLocalizedMessage());
             }
         } else if (i == R.id.btnBarcodeCaptureCancel) {
-            Barcode barcode = new Barcode();
-            barcode.rawValue = "-1";
-            barcode.displayValue = "-1";
-            FlutterBarcodeScannerPlugin.onBarcodeScanReceiver(barcode);
-            finish();
+            onBackPressed();
+
         } else if (i == R.id.imgViewSwitchCamera) {
             int currentFacing = mCameraSource.getCameraFacing();
             boolean autoFocus = mCameraSource.getFocusMode() != null;
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -39,41 +39,48 @@ class _HomePageState extends State<HomePage> {
           children: [
             ElevatedButton(
               onPressed: () async {
-                var res = await Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => const SimpleBarcodeScannerPage(
-                        barcodeAppBar: BarcodeAppBar(
-                          appBarTitle: 'Test',
-                          centerTitle: false,
-                          enableBackButton: true,
-                          backButtonIcon: Icon(Icons.arrow_back_ios),
-                        ),
-                        delayMillis: 2000,
-                        child: Column(
-                          children: [
-                            SizedBox(
-                              height: 20,
-                            ),
-                            TextField(
-                              decoration: InputDecoration(
-                                labelText: 'Enter Text',
-                                border: OutlineInputBorder(),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ));
+                String? res = await SimpleBarcodeScanner.scanBarcode(
+                  context,
+                  barcodeAppBar: const BarcodeAppBar(
+                    appBarTitle: 'Test',
+                    centerTitle: false,
+                    enableBackButton: true,
+                    backButtonIcon: Icon(Icons.arrow_back_ios),
+                  ),
+                  isShowFlashIcon: true,
+                  delayMillis: 2000,
+                );
                 setState(() {
-                  if (res is String) {
-                    result = res;
-                  }
+                  result = res as String;
                 });
               },
-              child: const Text('Open Scanner'),
+              child: const Text('Scan Barcode'),
+            ),
+            const SizedBox(
+              height: 10,
+            ),
+            Text('Scan Barcode Result: $result'),
+            const SizedBox(
+              height: 10,
+            ),
+            ElevatedButton(
+              onPressed: () async {
+                SimpleBarcodeScanner.streamBarcode(
+                  context,
+                  barcodeAppBar: const BarcodeAppBar(
+                    appBarTitle: 'Test',
+                    centerTitle: false,
+                    enableBackButton: true,
+                    backButtonIcon: Icon(Icons.arrow_back_ios),
+                  ),
+                  isShowFlashIcon: true,
+                  delayMillis: 2000,
+                ).listen((event) {
+                  print("Stream Barcode Result: $event");
+                });
+              },
+              child: const Text('Stream Barcode'),
             ),
-            Text('Barcode Result: $result'),
           ],
         ),
       ),
diff --git a/ios/Classes/SwiftFlutterBarcodeScannerPlugin.swift b/ios/Classes/SwiftFlutterBarcodeScannerPlugin.swift
@@ -469,7 +469,7 @@ class BarcodeScannerViewController: UIViewController {
     @IBAction private func cancelButtonClicked() {
         if SwiftFlutterBarcodeScannerPlugin.isContinuousScan{
             self.dismiss(animated: true, completion: {
-                SwiftFlutterBarcodeScannerPlugin.onBarcodeScanReceiver(barcode: "-1")
+                SwiftFlutterBarcodeScannerPlugin.onBarcodeScanReceiver(barcode: "-2")
             })
         }else{
             if self.delegate != nil {
diff --git a/lib/constant.dart b/lib/constant.dart
@@ -6,3 +6,4 @@ class PackageConstant {
 }
 
 String kScanPageTitle = 'Scan barcode/qrcode';
+String kCancelValue = '-2';
diff --git a/lib/screens/io_device.dart b/lib/screens/io_device.dart
@@ -5,6 +5,7 @@ import 'package:simple_barcode_scanner/enum.dart';
 import 'package:simple_barcode_scanner/screens/window.dart';
 
 import '../barcode_appbar.dart';
+import '../constant.dart';
 import '../flutter_barcode_scanner.dart';
 
 /// Barcode scanner for mobile and desktop devices
@@ -19,20 +20,20 @@ class BarcodeScanner extends StatelessWidget {
   final Widget? child;
   final BarcodeAppBar? barcodeAppBar;
   final int? delayMillis;
-
-  const BarcodeScanner({
-    super.key,
-    required this.lineColor,
-    required this.cancelButtonText,
-    required this.isShowFlashIcon,
-    required this.scanType,
-    required this.onScanned,
-    this.child,
-    this.appBarTitle,
-    this.centerTitle,
-    this.barcodeAppBar,
-    this.delayMillis,
-  });
+  final Function? onClose;
+  const BarcodeScanner(
+      {super.key,
+      required this.lineColor,
+      required this.cancelButtonText,
+      required this.isShowFlashIcon,
+      required this.scanType,
+      required this.onScanned,
+      this.child,
+      this.appBarTitle,
+      this.centerTitle,
+      this.barcodeAppBar,
+      this.delayMillis,
+      this.onClose});
 
   @override
   Widget build(BuildContext context) {
@@ -50,7 +51,24 @@ class BarcodeScanner extends StatelessWidget {
       );
     } else {
       /// Scan Android and ios barcode scanner with flutter_barcode_scanner
-      _scanBarcodeForMobileAndTabDevices();
+      /// If onClose is not null then stream barcode otherwise scan barcode
+      /// Scan barcode for mobile devices
+      ScanMode scanMode;
+      switch (scanType) {
+        case ScanType.barcode:
+          scanMode = ScanMode.BARCODE;
+          break;
+        case ScanType.qr:
+          scanMode = ScanMode.QR;
+          break;
+        default:
+          scanMode = ScanMode.DEFAULT;
+          break;
+      }
+      onClose != null
+          ? _streamBarcodeForMobileAndTabDevices(scanMode)
+          : _scanBarcodeForMobileAndTabDevices(scanMode);
+
       return const Scaffold(
         body: Center(
           child: CircularProgressIndicator(),
@@ -59,22 +77,19 @@ class BarcodeScanner extends StatelessWidget {
     }
   }
 
-  _scanBarcodeForMobileAndTabDevices() async {
-    /// Scan barcode for mobile devices
-    ScanMode scanMode;
-    switch (scanType) {
-      case ScanType.barcode:
-        scanMode = ScanMode.BARCODE;
-        break;
-      case ScanType.qr:
-        scanMode = ScanMode.QR;
-        break;
-      default:
-        scanMode = ScanMode.DEFAULT;
-        break;
-    }
+  _scanBarcodeForMobileAndTabDevices(ScanMode scanMode) async {
     String barcode = await FlutterBarcodeScanner.scanBarcode(
         lineColor, cancelButtonText, isShowFlashIcon, scanMode, delayMillis);
     onScanned(barcode);
   }
+
+  void _streamBarcodeForMobileAndTabDevices(ScanMode scanMode) {
+    FlutterBarcodeScanner.getBarcodeStreamReceiver(
+            lineColor, cancelButtonText, isShowFlashIcon, scanMode, delayMillis)
+        ?.listen((barcode) {
+      if (barcode != null) {
+        barcode == kCancelValue ? onClose?.call() : onScanned(barcode);
+      }
+    });
+  }
 }
diff --git a/lib/screens/unsupported.dart b/lib/screens/unsupported.dart
@@ -13,6 +13,7 @@ class BarcodeScanner extends StatelessWidget {
   final Widget? child;
   final BarcodeAppBar? barcodeAppBar;
   final int? delayMillis;
+  final Function? onClose;
   const BarcodeScanner(
       {super.key,
       this.lineColor = "#ff6666",
@@ -24,7 +25,8 @@ class BarcodeScanner extends StatelessWidget {
       this.child,
       this.centerTitle,
       this.barcodeAppBar,
-      this.delayMillis});
+      this.delayMillis,
+      this.onClose});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/web.dart b/lib/screens/web.dart
@@ -20,6 +20,7 @@ class BarcodeScanner extends StatelessWidget {
   final Widget? child;
   final BarcodeAppBar? barcodeAppBar;
   final int? delayMillis;
+  final Function? onClose;
 
   const BarcodeScanner({
     super.key,
@@ -33,6 +34,7 @@ class BarcodeScanner extends StatelessWidget {
     this.child,
     this.barcodeAppBar,
     this.delayMillis,
+    this.onClose,
   });
 
   @override
diff --git a/lib/screens/window.dart b/lib/screens/window.dart
@@ -20,6 +20,7 @@ class WindowBarcodeScanner extends StatelessWidget {
   final bool? centerTitle;
   final BarcodeAppBar? barcodeAppBar;
   final int? delayMillis;
+  final Function? onClose;
 
   const WindowBarcodeScanner({
     super.key,
@@ -32,6 +33,7 @@ class WindowBarcodeScanner extends StatelessWidget {
     this.centerTitle,
     this.barcodeAppBar,
     this.delayMillis,
+    this.onClose,
   });
 
   @override
diff --git a/lib/simple_barcode_scanner.dart b/lib/simple_barcode_scanner.dart

Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@ class PackageConstant {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`String kScanPageTitle = 'Scan barcode/qrcode';`
	`9`	`+String kCancelValue = '-2';`