clean up the mobile_scanner_overlay sample

@@ -64,7 +64,9 @@ class MyHome extends StatelessWidget {
                 ),
                 ),
               );
               );
             },
             },
-            child: const Text('MobileScanner with Controller (returning image)'),
+            child: const Text(
+              'MobileScanner with Controller (returning image)',
+            ),
           ),
           ),
           ElevatedButton(
           ElevatedButton(
             onPressed: () {
             onPressed: () {

 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
+import 'package:mobile_scanner_example/scanned_barcode_label.dart';
+import 'package:mobile_scanner_example/scanner_button_widgets.dart';
 import 'package:mobile_scanner_example/scanner_error_widget.dart';
 import 'package:mobile_scanner_example/scanner_error_widget.dart';
 
 
 class BarcodeScannerWithOverlay extends StatefulWidget {
 class BarcodeScannerWithOverlay extends StatefulWidget {
   @override
   @override
-  _BarcodeScannerWithOverlayState createState() =>
-      _BarcodeScannerWithOverlayState();
+  _BarcodeScannerWithOverlayState createState() => _BarcodeScannerWithOverlayState();
 }
 }
 
 
 class _BarcodeScannerWithOverlayState extends State<BarcodeScannerWithOverlay> {
 class _BarcodeScannerWithOverlayState extends State<BarcodeScannerWithOverlay> {
-  String overlayText = "Please scan QR Code";
-  bool camStarted = false;
-
   final MobileScannerController controller = MobileScannerController(
   final MobileScannerController controller = MobileScannerController(
     formats: const [BarcodeFormat.qrCode],
     formats: const [BarcodeFormat.qrCode],
-    autoStart: false,
   );
   );
 
 
   @override
   @override
-  void dispose() {
-    controller.dispose();
-    super.dispose();
-  }
-
-  void startCamera() {
-    if (camStarted) {
-      return;
-    }
-
-    controller.start().then((_) {
-      if (mounted) {
-        setState(() {
-          camStarted = true;
-        });
-      }
-    }).catchError((Object error, StackTrace stackTrace) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text('Something went wrong! $error'),
-            backgroundColor: Colors.red,
-          ),
-        );
-      }
-    });
-  }
-
-  void onBarcodeDetect(BarcodeCapture barcodeCapture) {
-    final barcode = barcodeCapture.barcodes.last;
-    setState(() {
-      overlayText = barcodeCapture.barcodes.last.displayValue ??
-          barcode.rawValue ??
-          'Barcode has no displayable value';
-    });
+  void initState() {
+    super.initState();
+    controller.start();
   }
   }
 
 
   @override
   @override
@@ -64,119 +29,84 @@ class _BarcodeScannerWithOverlayState extends State<BarcodeScannerWithOverlay> {
     );
     );
 
 
     return Scaffold(
     return Scaffold(
+      backgroundColor: Colors.black,
       appBar: AppBar(
       appBar: AppBar(
         title: const Text('Scanner with Overlay Example app'),
         title: const Text('Scanner with Overlay Example app'),
       ),
       ),
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            Expanded(
-              child: camStarted
-                  ? Stack(
+      body: Stack(
         fit: StackFit.expand,
         fit: StackFit.expand,
         children: [
         children: [
           Center(
           Center(
             child: MobileScanner(
             child: MobileScanner(
               fit: BoxFit.contain,
               fit: BoxFit.contain,
-                            onDetect: onBarcodeDetect,
-                            overlay: Padding(
-                              padding: const EdgeInsets.all(16.0),
-                              child: Align(
-                                alignment: Alignment.bottomCenter,
-                                child: Opacity(
-                                  opacity: 0.7,
-                                  child: Text(
-                                    overlayText,
-                                    style: const TextStyle(
-                                      backgroundColor: Colors.black26,
-                                      color: Colors.white,
-                                      fontWeight: FontWeight.bold,
-                                      fontSize: 24,
-                                      overflow: TextOverflow.ellipsis,
-                                    ),
-                                    maxLines: 1,
-                                  ),
-                                ),
-                              ),
-                            ),
               controller: controller,
               controller: controller,
               scanWindow: scanWindow,
               scanWindow: scanWindow,
               errorBuilder: (context, error, child) {
               errorBuilder: (context, error, child) {
                 return ScannerErrorWidget(error: error);
                 return ScannerErrorWidget(error: error);
               },
               },
-                          ),
-                        ),
-                        CustomPaint(
-                          painter: ScannerOverlay(scanWindow),
-                        ),
-                        Padding(
+              overlayBuilder: (context, constraints) {
+                return Padding(
                   padding: const EdgeInsets.all(16.0),
                   padding: const EdgeInsets.all(16.0),
                   child: Align(
                   child: Align(
                     alignment: Alignment.bottomCenter,
                     alignment: Alignment.bottomCenter,
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                              children: [
-                                ValueListenableBuilder<TorchState>(
-                                  valueListenable: controller.torchState,
-                                  builder: (context, value, child) {
-                                    final Color iconColor;
-
-                                    switch (value) {
-                                      case TorchState.off:
-                                        iconColor = Colors.black;
-                                      case TorchState.on:
-                                        iconColor = Colors.yellow;
-                                    }
-
-                                    return IconButton(
-                                      onPressed: () => controller.toggleTorch(),
-                                      icon: Icon(
-                                        Icons.flashlight_on,
-                                        color: iconColor,
+                    child: ScannedBarcodeLabel(barcodes: controller.barcodes),
                   ),
                   ),
                 );
                 );
               },
               },
             ),
             ),
-                                IconButton(
-                                  onPressed: () => controller.switchCamera(),
-                                  icon: const Icon(
-                                    Icons.cameraswitch_rounded,
-                                    color: Colors.white,
           ),
           ),
+          ValueListenableBuilder(
+            valueListenable: controller,
+            builder: (context, value, child) {
+              if (!value.isInitialized || !value.isRunning || value.error != null) {
+                return const SizedBox();
+              }
+
+              return CustomPaint(
+                painter: ScannerOverlay(scanWindow: scanWindow),
+              );
+            },
           ),
           ),
+          Align(
+            alignment: Alignment.bottomCenter,
+            child: Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [
+                  ToggleFlashlightButton(controller: controller),
+                  SwitchCameraButton(controller: controller),
                 ],
                 ],
               ),
               ),
             ),
             ),
           ),
           ),
         ],
         ],
-                    )
-                  : const Center(
-                      child: Text("Tap on Camera to activate QR Scanner"),
-                    ),
-            ),
-          ],
-        ),
-      ),
-      floatingActionButton: camStarted
-          ? null
-          : FloatingActionButton(
-              onPressed: startCamera,
-              child: const Icon(Icons.camera_alt),
       ),
       ),
     );
     );
   }
   }
+
+  @override
+  Future<void> dispose() async {
+    await controller.dispose();
+    super.dispose();
+  }
 }
 }
 
 
 class ScannerOverlay extends CustomPainter {
 class ScannerOverlay extends CustomPainter {
-  ScannerOverlay(this.scanWindow);
+  const ScannerOverlay({
+    required this.scanWindow,
+    this.borderRadius = 12.0,
+  });
 
 
   final Rect scanWindow;
   final Rect scanWindow;
-  final double borderRadius = 12.0;
+  final double borderRadius;
 
 
   @override
   @override
   void paint(Canvas canvas, Size size) {
   void paint(Canvas canvas, Size size) {
+    // TODO: use `Offset.zero & size` instead of Rect.largest
+    // we need to pass the size to the custom paint widget
     final backgroundPath = Path()..addRect(Rect.largest);
     final backgroundPath = Path()..addRect(Rect.largest);
+
     final cutoutPath = Path()
     final cutoutPath = Path()
       ..addRRect(
       ..addRRect(
         RRect.fromRectAndCorners(
         RRect.fromRectAndCorners(
@@ -199,14 +129,11 @@ class ScannerOverlay extends CustomPainter {
       cutoutPath,
       cutoutPath,
     );
     );
 
 
-    // Create a Paint object for the white border
     final borderPaint = Paint()
     final borderPaint = Paint()
       ..color = Colors.white
       ..color = Colors.white
       ..style = PaintingStyle.stroke
       ..style = PaintingStyle.stroke
-      ..strokeWidth = 4.0; // Adjust the border width as needed
+      ..strokeWidth = 4.0;
 
 
-    // Calculate the border rectangle with rounded corners
-// Adjust the radius as needed
     final borderRect = RRect.fromRectAndCorners(
     final borderRect = RRect.fromRectAndCorners(
       scanWindow,
       scanWindow,
       topLeft: Radius.circular(borderRadius),
       topLeft: Radius.circular(borderRadius),
@@ -215,13 +142,15 @@ class ScannerOverlay extends CustomPainter {
       bottomRight: Radius.circular(borderRadius),
       bottomRight: Radius.circular(borderRadius),
     );
     );
 
 
-    // Draw the white border
+    // First, draw the background,
+    // with a cutout area that is a bit larger than the scan window.
+    // Finally, draw the scan window itself.
     canvas.drawPath(backgroundWithCutout, backgroundPaint);
     canvas.drawPath(backgroundWithCutout, backgroundPaint);
     canvas.drawRRect(borderRect, borderPaint);
     canvas.drawRRect(borderRect, borderPaint);
   }
   }
 
 
   @override
   @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) {
-    return false;
+  bool shouldRepaint(ScannerOverlay oldDelegate) {
+    return scanWindow != oldDelegate.scanWindow || borderRadius != oldDelegate.borderRadius;
   }
   }
 }
 }