Merge pull request #35 from bounty1342/patch-1

Severals fix

lib/src/ui/reader_widget.dart

@@ -4,13 +4,12 @@ import 'dart:math';
 
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+
 // import 'package:flutter_beep/flutter_beep.dart';
 
 import '../../generated_bindings.dart';
 import '../logic/zxing.dart';
 import '../utils/extentions.dart';
-import '../utils/isolate_utils.dart';
 import 'scanner_overlay.dart';
 
 class ReaderWidget extends StatefulWidget {
@@ -24,8 +23,10 @@ class ReaderWidget extends StatefulWidget {
     this.showFlashlight = true,
     this.allowPinchZoom = true,
     this.scanDelay = const Duration(milliseconds: 1000), // 1000ms delay
+    this.scanDelaySuccess = const Duration(milliseconds: 1000), // 1000ms delay
     this.cropPercent = 0.5, // 50% of the screen
     this.resolution = ResolutionPreset.high,
+    this.loading = const DecoratedBox(decoration: BoxDecoration(color: Colors.black)),
   });
 
   final Function(CodeResult) onScan;
@@ -38,14 +39,15 @@ class ReaderWidget extends StatefulWidget {
   final Duration scanDelay;
   final double cropPercent;
   final ResolutionPreset resolution;
+  final Duration scanDelaySuccess;
+  final Widget loading;
 
   @override
   State<ReaderWidget> createState() => _ReaderWidgetState();
 }
 
-class _ReaderWidgetState extends State<ReaderWidget>
+class _ReaderWidgetState extends State<ReaderWidget> with TickerProviderStateMixin, WidgetsBindingObserver {
-    with TickerProviderStateMixin {
+  List<CameraDescription> cameras = <CameraDescription>[];
-  List<CameraDescription>? cameras;
   CameraController? controller;
   bool _cameraOn = false;
 
@@ -59,13 +61,10 @@ class _ReaderWidgetState extends State<ReaderWidget>
   // true when code detecting is ongoing
   bool _isProcessing = false;
 
-  /// Instance of [IsolateUtils]
-  IsolateUtils? isolateUtils;
-
   @override
   void initState() {
     super.initState();
-
+    WidgetsBinding.instance.addObserver(this);
     initStateAsync();
   }
 
@@ -81,38 +80,50 @@ class _ReaderWidgetState extends State<ReaderWidget>
         }
       });
     });
+  }
 
-    SystemChannels.lifecycle.setMessageHandler((String? message) async {
+  @override
-      debugPrint(message);
+  void didChangeAppLifecycleState(AppLifecycleState state) {
-      final CameraController? cameraController = controller;
+    switch (state) {
-      if (cameraController == null || !cameraController.value.isInitialized) {
+      case AppLifecycleState.resumed:
-        return;
+        if (cameras.isNotEmpty && !_cameraOn) {
-      }
+          onNewCameraSelected(cameras.first);
-      if (mounted) {
-        if (message == AppLifecycleState.paused.toString()) {
-          await cameraController.stopImageStream();
-          await cameraController.dispose();
-          _cameraOn = false;
-          setState(() {});
-        }
-        if (message == AppLifecycleState.resumed.toString()) {
-          _cameraOn = true;
-          onNewCameraSelected(cameraController.description);
         }
-      }
+
-      return null;
+        break;
-    });
+      case AppLifecycleState.inactive:
+        break;
+      case AppLifecycleState.paused:
+        controller?.stopImageStream().then((_) => controller?.dispose());
+        setState(() {
+          _cameraOn = false;
+        });
+        break;
+      case AppLifecycleState.detached:
+        break;
+    }
   }
 
   @override
   void dispose() {
     stopCameraProcessing();
+    controller?.removeListener(rebuildOnMount);
     controller?.dispose();
+    WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
 
+  void rebuildOnMount() {
+    if (mounted) {
+      setState(() {
+        _cameraOn = true;
+      });
+    }
+  }
+
   Future<void> onNewCameraSelected(CameraDescription cameraDescription) async {
     if (controller != null) {
+      controller?.removeListener(rebuildOnMount);
       await controller!.dispose();
     }
 
@@ -120,35 +131,24 @@ class _ReaderWidgetState extends State<ReaderWidget>
       cameraDescription,
       widget.resolution,
       enableAudio: false,
-      imageFormatGroup:
+      imageFormatGroup: isAndroid() ? ImageFormatGroup.yuv420 : ImageFormatGroup.bgra8888,
-          isAndroid() ? ImageFormatGroup.yuv420 : ImageFormatGroup.bgra8888,
     );
-    final CameraController? cameraController = controller;
+    if (controller == null) {
-    if (cameraController == null) {
       return;
     }
     try {
-      await cameraController.initialize();
+      await controller!.initialize();
-      await cameraController.setFlashMode(FlashMode.off);
+      await controller!.setFlashMode(FlashMode.off);
-      _maxZoomLevel = await cameraController.getMaxZoomLevel();
+      _maxZoomLevel = await controller!.getMaxZoomLevel();
-      _minZoomLevel = await cameraController.getMinZoomLevel();
+      _minZoomLevel = await controller!.getMinZoomLevel();
-      cameraController.startImageStream(processImageStream);
+      controller!.startImageStream(processImageStream);
     } on CameraException catch (e) {
       debugPrint('${e.code}: ${e.description}');
     }
 
-    cameraController.addListener(() {
+    controller!.addListener(rebuildOnMount);
-      if (mounted) {
+    rebuildOnMount();
-        setState(() {});
+    widget.onControllerCreated?.call(controller);
-      }
-    });
-
-    if (mounted) {
-      _cameraOn = true;
-      setState(() {});
-    }
-
-    widget.onControllerCreated?.call(cameraController);
   }
 
   Future<void> processImageStream(CameraImage image) async {
@@ -163,7 +163,7 @@ class _ReaderWidgetState extends State<ReaderWidget>
         if (result.isValidBool) {
           widget.onScan(result);
           setState(() {});
-          await Future<void>.delayed(const Duration(seconds: 1));
+          await Future<void>.delayed(widget.scanDelaySuccess);
         }
       } on FileSystemException catch (e) {
         debugPrint(e.message);
@@ -179,30 +179,13 @@ class _ReaderWidgetState extends State<ReaderWidget>
 
   @override
   Widget build(BuildContext context) {
-    final Size size = MediaQuery.of(context).size;
+    final bool isCameraReady = cameras.isNotEmpty && _cameraOn && controller != null && controller!.value.isInitialized;
-    final double cropSize = min(size.width, size.height) * widget.cropPercent;
-    return Stack(
-      children: <Widget>[
-        // Camera preview
-        Center(
-          child: _cameraPreviewWidget(cropSize),
-        ),
-      ],
-    );
-  }
-
-  // Display the preview from the camera.
-  Widget _cameraPreviewWidget(double cropSize) {
-    final CameraController? cameraController = controller;
-    final bool isCameraReady = cameras != null &&
-        (cameras?.isNotEmpty ?? false) &&
-        _cameraOn &&
-        !(cameraController == null || !cameraController.value.isInitialized);
     final Size size = MediaQuery.of(context).size;
     final double cameraMaxSize = max(size.width, size.height);
+    final double cropSize = min(size.width, size.height) * widget.cropPercent;
     return Stack(
       children: <Widget>[
-        if (!isCameraReady) Container(color: Colors.black),
+        if (!isCameraReady) widget.loading,
         if (isCameraReady)
           SizedBox(
             width: cameraMaxSize,
@@ -214,7 +197,7 @@ class _ReaderWidgetState extends State<ReaderWidget>
                   child: SizedBox(
                     width: cameraMaxSize,
                     child: CameraPreview(
-                      cameraController,
+                      controller!,
                     ),
                   ),
                 ),
@@ -241,9 +224,8 @@ class _ReaderWidgetState extends State<ReaderWidget>
               _zoom = _scaleFactor;
             },
             onScaleUpdate: (ScaleUpdateDetails details) {
-              _scaleFactor =
+              _scaleFactor = (_zoom * details.scale).clamp(_minZoomLevel, _maxZoomLevel);
-                  (_zoom * details.scale).clamp(_minZoomLevel, _maxZoomLevel);
+              controller?.setZoomLevel(_scaleFactor);
-              cameraController?.setZoomLevel(_scaleFactor);
             },
           ),
         if (widget.showFlashlight)
@@ -251,37 +233,41 @@ class _ReaderWidgetState extends State<ReaderWidget>
             bottom: 20,
             left: 20,
             child: FloatingActionButton(
-              onPressed: () {
+                onPressed: () {
-                if (cameraController != null) {
+                  if (controller != null) {
-                  FlashMode mode = cameraController.value.flashMode;
+                    FlashMode mode = controller!.value.flashMode;
-                  if (mode == FlashMode.torch) {
+                    if (mode == FlashMode.torch) {
-                    mode = FlashMode.off;
+                      mode = FlashMode.off;
-                  } else {
+                    } else {
-                    mode = FlashMode.torch;
+                      mode = FlashMode.torch;
+                    }
+                    controller!.setFlashMode(mode);
+                    setState(() {});
                   }
-                  cameraController.setFlashMode(mode);
+                },
-                  setState(() {});
+                backgroundColor: Colors.black26,
-                }
+                child: _FlashIcon(flashMode: controller!.value.flashMode)),
-              },
+          ),
-              backgroundColor: Colors.black26,
-              child: Icon(_flashIcon(cameraController)),
-            ),
-          )
       ],
     );
   }
+}
+
+class _FlashIcon extends StatelessWidget {
+  const _FlashIcon({required this.flashMode});
+  final FlashMode flashMode;
 
-  IconData _flashIcon(CameraController? cameraController) {
+  @override
-    final FlashMode mode = cameraController?.value.flashMode ?? FlashMode.torch;
+  Widget build(BuildContext context) {
-    switch (mode) {
+    switch (flashMode) {
       case FlashMode.torch:
-        return Icons.flash_on;
+        return const Icon(Icons.flash_on);
       case FlashMode.off:
-        return Icons.flash_off;
+        return const Icon(Icons.flash_off);
       case FlashMode.always:
-        return Icons.flash_on;
+        return const Icon(Icons.flash_on);
       case FlashMode.auto:
-        return Icons.flash_auto;
+        return const Icon(Icons.flash_auto);
     }
   }
 }