From 224d1ebb7165bb58621fc817cc7127efdaf599a5 Mon Sep 17 00:00:00 2001 From: Luis Thein Date: Mon, 22 Jul 2019 07:56:53 +0200 Subject: [PATCH] QRViewController updated - MethodChannel is now handled inside the controller - Removed controller init, pass globalKey as required parameter - Controller now returns a stream of data - Updated README.md + example --- README.md | 60 ++++++++++------ example/lib/main.dart | 151 ++++++++++++++++++++------------------- lib/qr_code_scanner.dart | 24 ++++--- 3 files changed, 132 insertions(+), 103 deletions(-) diff --git a/README.md b/README.md index 09332c5..888c668 100644 --- a/README.md +++ b/README.md @@ -60,31 +60,39 @@ class _QRViewExampleState extends State { Widget build(BuildContext context) { return Scaffold( body: Column( - children: [ - QRView( - key: qrKey, - onQRViewCreated: _onQRViewCreated, - ), - ], - ), - ); + children: [ + Expanded( + flex: 5, + child: QRView( + key: qrKey, + onQRViewCreated: _onQRViewCreated, + ), + ), + Expanded( + flex: 1, + child: Center( + child: Text('Scan result: $qrText'), + ), + ) + ], + ), + ); } void _onQRViewCreated(QRViewController controller) { - final channel = controller.channel; - controller.init(qrKey); this.controller = controller; - channel.setMethodCallHandler((MethodCall call) async { - switch (call.method) { - case "onRecognizeQR": - dynamic arguments = call.arguments; - setState(() { - qrText = arguments.toString(); - }); - } + controller.scannedDataStream.listen((scanData) { + setState(() { + qrText = scanData; + }); }); } - + + @override + void dispose() { + controller?.dispose(); + super.dispose(); + } } ``` @@ -104,9 +112,21 @@ controller.flipCamera(); ## Flash (Off/On) By default, flash is OFF. ```dart -controller.flipFlash(); +controller.toggleFlash(); +``` + +## Resume/Pause +Pause camera stream and scanner. +```dart +controller.pause(); +``` +Resume camera stream and scanner. +```dart +controller.resume(); ``` + + # TODO'S: * iOS Native embedding is written to match what is supported in the framework as of the date of publication of this package. It needs to be improved as the framework support improves. * In future, options will be provided for default states. diff --git a/example/lib/main.dart b/example/lib/main.dart index 2e01987..49d97d3 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -37,79 +37,86 @@ class _QRViewExampleState extends State { flex: 4, ), Expanded( - child: Column( - children: [ - Text("This is the result of scan: $qrText"), - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - margin: EdgeInsets.all(8.0), - child: RaisedButton( - onPressed: () { - if (controller != null) { - controller.toggleFlash(); - if (_isFlashOn(flashState)) - setState(() { - flashState = flash_off; - }); - else - setState(() { - flashState = flash_on; - }); - } - }, - child: Text(flashState, style: TextStyle(fontSize: 20)), + child: FittedBox( + fit: BoxFit.contain, + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text("This is the result of scan: $qrText"), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + margin: EdgeInsets.all(8.0), + child: RaisedButton( + onPressed: () { + if (controller != null) { + controller.toggleFlash(); + if (_isFlashOn(flashState)) { + setState(() { + flashState = flash_off; + }); + } else { + setState(() { + flashState = flash_on; + }); + } + } + }, + child: + Text(flashState, style: TextStyle(fontSize: 20)), + ), ), - ), - Container( - margin: EdgeInsets.all(8.0), - child: RaisedButton( - onPressed: () { - if (controller != null) { - controller.flipCamera(); - if (_isBackCamera(cameraState)) - setState(() { - cameraState = front_camera; - }); - else - setState(() { - cameraState = back_camera; - }); - } - }, - child: - Text(cameraState, style: TextStyle(fontSize: 20)), + Container( + margin: EdgeInsets.all(8.0), + child: RaisedButton( + onPressed: () { + if (controller != null) { + controller.flipCamera(); + if (_isBackCamera(cameraState)) { + setState(() { + cameraState = front_camera; + }); + } else { + setState(() { + cameraState = back_camera; + }); + } + } + }, + child: + Text(cameraState, style: TextStyle(fontSize: 20)), + ), + ) + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + margin: EdgeInsets.all(8.0), + child: RaisedButton( + onPressed: () { + controller?.pauseCamera(); + }, + child: Text('pause', style: TextStyle(fontSize: 20)), + ), ), - ) - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - margin: EdgeInsets.only(bottom: 8.0), - child: RaisedButton( - onPressed: () { - controller?.pauseCamera(); - }, - child: Text('pause', style: TextStyle(fontSize: 20)), - ), - ), - Container( - margin: EdgeInsets.only(bottom: 8.0), - child: RaisedButton( - onPressed: () { - controller.resumeCamera(); - }, - child: Text('resume', style: TextStyle(fontSize: 20)), - ), - ) - ], - ), - ], + Container( + margin: EdgeInsets.all(8.0), + child: RaisedButton( + onPressed: () { + controller?.resumeCamera(); + }, + child: Text('resume', style: TextStyle(fontSize: 20)), + ), + ) + ], + ), + ], + ), ), flex: 1, ) @@ -128,7 +135,7 @@ class _QRViewExampleState extends State { void _onQRViewCreated(QRViewController controller) { this.controller = controller; - controller.scannedData.listen((scanData) { + controller.scannedDataStream.listen((scanData) { setState(() { qrText = scanData; }); diff --git a/lib/qr_code_scanner.dart b/lib/qr_code_scanner.dart index e707de1..60e08e3 100644 --- a/lib/qr_code_scanner.dart +++ b/lib/qr_code_scanner.dart @@ -10,7 +10,9 @@ class QRView extends StatefulWidget { const QRView({ @required Key key, @required this.onQRViewCreated, - }) : super(key: key); + }) : assert(key != null), + assert(onQRViewCreated != null), + super(key: key); final QRViewCreatedCallback onQRViewCreated; @@ -75,18 +77,20 @@ class _CreationParams { class QRViewController { static const scanMethodCall = "onRecognizeQR"; + final MethodChannel _channel; + StreamController _scanUpdateController = StreamController(); - Stream get scannedData => _scanUpdateController.stream; + Stream get scannedDataStream => _scanUpdateController.stream; QRViewController._(int id, GlobalKey qrKey) - : channel = MethodChannel('net.touchcapture.qr.flutterqr/qrview_$id') { + : _channel = MethodChannel('net.touchcapture.qr.flutterqr/qrview_$id') { if (defaultTargetPlatform == TargetPlatform.iOS) { final RenderBox renderBox = qrKey.currentContext.findRenderObject(); - channel.invokeMethod("setDimensions", + _channel.invokeMethod("setDimensions", {"width": renderBox.size.width, "height": renderBox.size.height}); } - channel.setMethodCallHandler( + _channel.setMethodCallHandler( (MethodCall call) async { switch (call.method) { case scanMethodCall: @@ -98,22 +102,20 @@ class QRViewController { ); } - final MethodChannel channel; - void flipCamera() { - channel.invokeMethod("flipCamera"); + _channel.invokeMethod("flipCamera"); } void toggleFlash() { - channel.invokeMethod("toggleFlash"); + _channel.invokeMethod("toggleFlash"); } void pauseCamera() { - channel.invokeMethod("pauseCamera"); + _channel.invokeMethod("pauseCamera"); } void resumeCamera() { - channel.invokeMethod("resumeCamera"); + _channel.invokeMethod("resumeCamera"); } void dispose() {