Merge pull request #22 from CodingWithTashi/revert-21-main

CodingWithTashi · web-flow · commit 704118f2085b · 2023-01-12T21:59:38.000+05:30
Revert "Removed the inline script in barcode.html file and added two properties to set qrbox width and height in web apps"
diff --git a/lib/assets/barcode.html b/lib/assets/barcode.html
@@ -20,6 +20,50 @@
 <body>
 <!-- Div to show the scanner -->
 <div id="reader" ></div>
-<script src="reader.js"></script>
+<script>
+  //refer doc here https://github.com/mebjas/html5-qrcode
+ const html5QrCode = new Html5Qrcode("reader");
+ console.log("Starting SCANNING CODE");
+ const qrCodeSuccessCallback = (decodedText, decodedResult) => {
+     html5QrCode.stop();
+     /* handle success for web */
+     window.parent.postMessage(decodedText, "*");
+
+     /* handle success for window */
+     if (window.chrome.webview != "undefined") {
+         var param = {
+             "methodName": "successCallback",
+             "data": decodedText
+         }
+         window.chrome.webview.postMessage(param);
+     }
+
+ };
+ const config = {
+     fps: 10,
+     qrbox: {
+         width: 280,
+         height: 120,
+         aspectRatio: 1.7777778
+     }
+ };
+
+ // If you want to prefer back camera
+ html5QrCode.start({
+     facingMode: "environment"
+ }, config, qrCodeSuccessCallback);
+ //html5QrCode.start({ facingMode: "user" }, config, qrCodeSuccessCallback);
+
+ //Window event listener
+ if (window.chrome.webview != undefined) {
+     window.chrome.webview.addEventListener('message', function(e) {
+         let data = JSON.parse(JSON.stringify(e.data));
+         if (data.event === "close") {
+             html5QrCode.stop();
+         }
+
+     });
+ }
+ </script>
 </body>
 </html>
diff --git a/lib/assets/reader.js b/lib/assets/reader.js
diff --git a/lib/screens/io_device.dart b/lib/screens/io_device.dart
@@ -14,10 +14,6 @@ class BarcodeScanner extends StatelessWidget {
   final Function(String) onScanned;
   final String? appBarTitle;
   final bool? centerTitle;
-  /// Properties only added to standardize the implementation of the BarcodeScanner class
-  final int scanWidth;
-  final int scanHeight;
-
   const BarcodeScanner({
     Key? key,
     required this.lineColor,
@@ -27,8 +23,6 @@ class BarcodeScanner extends StatelessWidget {
     required this.onScanned,
     this.appBarTitle,
     this.centerTitle,
-    this.scanWidth = 0,
-    this.scanHeight = 0
   }) : super(key: key);
 
   @override
diff --git a/lib/screens/unsupported.dart b/lib/screens/unsupported.dart
@@ -9,10 +9,6 @@ class BarcodeScanner extends StatelessWidget {
   final Function(String) onScanned;
   final String? appBarTitle;
   final bool? centerTitle;
-    /// Properties only added to standardize the implementation of the BarcodeScanner class
-  final int scanWidth;
-  final int scanHeight;
-
   const BarcodeScanner(
       {Key? key,
       this.lineColor = "#ff6666",
@@ -21,9 +17,7 @@ class BarcodeScanner extends StatelessWidget {
       this.scanType = ScanType.barcode,
       required this.onScanned,
       this.appBarTitle,
-      this.centerTitle,
-      this.scanWidth = 0,
-      this.scanHeight= 0})
+      this.centerTitle})
       : super(key: key);
 
   @override
diff --git a/lib/screens/web.dart b/lib/screens/web.dart
@@ -1,7 +1,6 @@
 // ignore: avoid_web_libraries_in_flutter
 import 'dart:html' as html;
 import 'dart:ui' as ui;
-import 'dart:js' as js;
 
 import 'package:flutter/material.dart';
 import 'package:simple_barcode_scanner/constant.dart';
@@ -16,8 +15,6 @@ class BarcodeScanner extends StatelessWidget {
   final Function(String) onScanned;
   final String? appBarTitle;
   final bool? centerTitle;
-  final int scanWidth;
-  final int scanHeight;
 
   const BarcodeScanner({
     Key? key,
@@ -28,8 +25,6 @@ class BarcodeScanner extends StatelessWidget {
     required this.onScanned,
     this.appBarTitle,
     this.centerTitle,
-    this.scanWidth = 288,
-    this.scanHeight = 120    
   }) : super(key: key);
 
   @override
@@ -41,15 +36,8 @@ class BarcodeScanner extends StatelessWidget {
       ..src = PackageConstant.barcodeFileWebPath
       ..style.border = 'none'
       ..onLoad.listen((event) async {
-        html.window.onMessage.listen((event) {
-        /// Create reader setting qrBox width and height
-        html.CustomEvent event = new html.CustomEvent("reader", detail : {
-          "qrBoxWidth": scanWidth,
-          "qrBoxHeight": scanHeight
-        });
-        html.window.document.dispatchEvent(event);
-
         /// Barcode listener on success barcode scanned
+        html.window.onMessage.listen((event) {
           /// If barcode is null then assign scanned barcode
           /// and close the screen otherwise keep scanning
           if (barcodeNumber == null) {
diff --git a/lib/simple_barcode_scanner.dart b/lib/simple_barcode_scanner.dart
@@ -25,10 +25,6 @@ class SimpleBarcodeScannerPage extends StatelessWidget {
   ///center Title
   final bool? centerTitle;
 
-  /// Only for web apps, set qrBox width and height
-  final int scanWidth;
-  final int scanHeight;
-
   /// appBatTitle and centerTitle support in web and window only
   /// Remaining field support in only mobile devices
   const SimpleBarcodeScannerPage({
@@ -39,8 +35,6 @@ class SimpleBarcodeScannerPage extends StatelessWidget {
     this.scanType = ScanType.barcode,
     this.appBarTitle,
     this.centerTitle,
-    this.scanWidth = 280,
-    this.scanHeight = 120    
   }) : super(key: key);
 
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -39,7 +39,6 @@ flutter:
   assets:
     - packages/simple_barcode_scanner/assets/barcode.html
     - packages/simple_barcode_scanner/assets/html5-qrcode.min.js
-    - packages/simple_barcode_scanner/assets/reader.js
   #
   # For details regarding assets in packages, see
   # https://flutter.dev/assets-and-images/#from-packages

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ flutter:`
`39`	`39`	`assets:`
`40`	`40`	`- packages/simple_barcode_scanner/assets/barcode.html`
`41`	`41`	`- packages/simple_barcode_scanner/assets/html5-qrcode.min.js`
`42`		`- - packages/simple_barcode_scanner/assets/reader.js`
`43`	`42`	`#`
`44`	`43`	`# For details regarding assets in packages, see`
`45`	`44`	`# https://flutter.dev/assets-and-images/#from-packages`