Merge pull request #78 from amitjangra01/master

orientation issue fixed

Author: itsarvinddev

.flutter-plugins

@@ -1,2 +1,2 @@
 # This is a generated file; do not edit or check into version control.
-mobile_scanner=/Users/arvind/.pub-cache/hosted/pub.dev/mobile_scanner-3.4.1/
+mobile_scanner=C:\\Users\\amitj\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\mobile_scanner-3.5.5\\

.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mobile_scanner","path":"/Users/arvind/.pub-cache/hosted/pub.dev/mobile_scanner-3.4.1/","native_build":true,"dependencies":[]}],"android":[{"name":"mobile_scanner","path":"/Users/arvind/.pub-cache/hosted/pub.dev/mobile_scanner-3.4.1/","native_build":true,"dependencies":[]}],"macos":[{"name":"mobile_scanner","path":"/Users/arvind/.pub-cache/hosted/pub.dev/mobile_scanner-3.4.1/","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"mobile_scanner","path":"/Users/arvind/.pub-cache/hosted/pub.dev/mobile_scanner-3.4.1/","dependencies":[]}]},"dependencyGraph":[{"name":"mobile_scanner","dependencies":[]}],"date_created":"2023-10-02 23:08:02.151393","version":"3.13.6"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mobile_scanner","path":"C:\\\\Users\\\\amitj\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\mobile_scanner-3.5.5\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"mobile_scanner","path":"C:\\\\Users\\\\amitj\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\mobile_scanner-3.5.5\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"mobile_scanner","path":"C:\\\\Users\\\\amitj\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\mobile_scanner-3.5.5\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"mobile_scanner","path":"C:\\\\Users\\\\amitj\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\mobile_scanner-3.5.5\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"mobile_scanner","dependencies":[]}],"date_created":"2023-12-14 11:07:19.823901","version":"3.16.0"}

example/pubspec.lock

@@ -52,10 +52,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -187,10 +187,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mobile_scanner:
     dependency: transitive
     description:
@@ -232,18 +232,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -264,10 +264,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   typed_data:
     dependency: transitive
     description:
@@ -288,10 +288,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
 sdks:
-  dart: ">=3.1.0 <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.10.0"

lib/src/ai_barcode_scanner.dart

@@ -185,123 +185,187 @@ class _AiBarcodeScannerState extends State<AiBarcodeScanner> {
 
   @override
   Widget build(BuildContext context) {
-    /// keeps the app in portrait mode
-    SystemChrome.setPreferredOrientations([
-      DeviceOrientation.portraitUp,
-    ]);
-    return Scaffold(
-      bottomNavigationBar: widget.bottomBar ??
-          ListTile(
-            leading: IconButton(
-              tooltip: "Switch Camera",
-              onPressed: () => controller.switchCamera(),
-              icon: ValueListenableBuilder<CameraFacing>(
-                valueListenable: controller.cameraFacingState,
-                builder: (context, state, child) {
-                  switch (state) {
-                    case CameraFacing.front:
-                      return const Icon(Icons.camera_front);
-                    case CameraFacing.back:
-                      return const Icon(Icons.camera_rear);
+    // /// keeps the app in portrait mode
+    // SystemChrome.setPreferredOrientations([
+    //   DeviceOrientation.portraitUp,
+    // ]);
+    return OrientationBuilder(
+      builder: (context, orientation) {
+        return Scaffold(
+          bottomNavigationBar: orientation == Orientation.portrait
+              ? widget.bottomBar ??
+                  ListTile(
+                    leading: Builder(
+                      builder: (context) {
+                        return IconButton(
+                          tooltip: "Switch Camera",
+                          onPressed: () => controller.switchCamera(),
+                          icon: ValueListenableBuilder<CameraFacing>(
+                            valueListenable: controller.cameraFacingState,
+                            builder: (context, state, child) {
+                              switch (state) {
+                                case CameraFacing.front:
+                                  return const Icon(
+                                      Icons.camera_front);
+                                case CameraFacing.back:
+                                  return const Icon(
+                                      Icons.camera_rear);
+                              }
+                            },
+                          ),
+                        );
+                      },
+                    ),
+                    title: Text(
+                      widget.bottomBarText,
+                      textAlign: TextAlign.center,
+                      style: widget.bottomBarTextStyle,
+                    ),
+                    trailing: Builder(
+                      builder: (context) {
+                        return IconButton(
+                          tooltip: "Torch",
+                          onPressed: () => controller.toggleTorch(),
+                          icon: ValueListenableBuilder<TorchState>(
+                            valueListenable: controller.torchState,
+                            builder: (context, state, child) {
+                              switch (state) {
+                                case TorchState.off:
+                                  return const Icon(
+                                      Icons.flash_off);
+                                case TorchState.on:
+                                  return const Icon(
+                                      Icons.flash_on);
+                              }
+                            },
+                          ),
+                        );
+                      },
+                    ),
+                  )
+              : null,
+          appBar: widget.appBar,
+          body: Stack(
+
+            children: [
+              MobileScanner(
+                controller: controller,
+                fit: widget.fit,
+                errorBuilder: widget.errorBuilder,
+                onScannerStarted: widget.onScannerStarted,
+                placeholderBuilder: widget.placeholderBuilder,
+                scanWindow: widget.scanWindow,
+                startDelay: widget.startDelay ?? false,
+                key: widget.key,
+                onDetect: (BarcodeCapture barcode) async {
+                  widget.onDetect?.call(barcode);
+
+                  if (barcode.barcodes.isEmpty) {
+                    log('Scanned Code is Empty');
+                    return;
                   }
-                },
-              ),
-            ),
-            title: Text(
-              widget.bottomBarText,
-              textAlign: TextAlign.center,
-              style: widget.bottomBarTextStyle,
-            ),
-            trailing: IconButton(
-              tooltip: "Torch",
-              onPressed: () => controller.toggleTorch(),
-              icon: ValueListenableBuilder<TorchState>(
-                valueListenable: controller.torchState,
-                builder: (context, state, child) {
-                  switch (state) {
-                    case TorchState.off:
-                      return const Icon(
-                        Icons.flash_off,
-                        color: Colors.grey,
-                      );
-                    case TorchState.on:
-                      return const Icon(
-                        Icons.flash_on,
-                        color: Colors.orange,
-                      );
+
+                  final String code = barcode.barcodes.first.rawValue ?? "";
+
+                  if ((widget.validator != null && !widget.validator!(code))) {
+                    setState(() {
+                      HapticFeedback.heavyImpact();
+                      log('Invalid Barcode => $code');
+                      _isSuccess = false;
+                    });
+                    return;
+                  }
+                  setState(() {
+                    _isSuccess = true;
+                    HapticFeedback.lightImpact();
+                    log('Barcode rawValue => $code');
+                    widget.onScan(code);
+                  });
+                  if (widget.canPop && mounted && Navigator.canPop(context)) {
+                    Navigator.pop(context);
+                    return;
                   }
                 },
               ),
-            ),
-          ),
-      appBar: widget.appBar,
-      body: Stack(
-        children: [
-          MobileScanner(
-            controller: controller,
-            fit: widget.fit,
-            errorBuilder: widget.errorBuilder,
-            onScannerStarted: widget.onScannerStarted,
-            placeholderBuilder: widget.placeholderBuilder,
-            scanWindow: widget.scanWindow,
-            startDelay: widget.startDelay ?? false,
-            key: widget.key,
-            onDetect: (BarcodeCapture barcode) async {
-              widget.onDetect?.call(barcode);
-
-              if (barcode.barcodes.isEmpty) {
-                log('Scanned Code is Empty');
-                return;
-              }
-
-              final String code = barcode.barcodes.first.rawValue ?? "";
-
-              if ((widget.validator != null && !widget.validator!(code))) {
-                setState(() {
-                  HapticFeedback.heavyImpact();
-                  log('Invalid Barcode => $code');
-                  _isSuccess = false;
-                });
-                return;
-              }
-              setState(() {
-                _isSuccess = true;
-                HapticFeedback.lightImpact();
-                log('Barcode rawValue => $code');
-                widget.onScan(code);
-              });
-              if (widget.canPop && mounted && Navigator.canPop(context)) {
-                Navigator.pop(context);
-                return;
-              }
-            },
-          ),
-          if (widget.showOverlay)
-            Container(
-              decoration: ShapeDecoration(
-                shape: OverlayShape(
-                  borderRadius: widget.borderRadius,
-                  borderColor: ((_isSuccess ?? false) && widget.showSuccess)
-                      ? widget.successColor
-                      : (!(_isSuccess ?? true) && widget.showError)
-                          ? widget.errorColor
-                          : widget.borderColor,
-                  borderLength: widget.borderLength,
-                  borderWidth: widget.borderWidth,
-                  cutOutSize: widget.cutOutSize,
-                  cutOutBottomOffset: widget.cutOutBottomOffset,
-                  cutOutWidth: widget.cutOutWidth,
-                  cutOutHeight: widget.cutOutHeight,
-                  overlayColor: ((_isSuccess ?? false) && widget.showSuccess)
-                      ? widget.successColor.withOpacity(0.4)
-                      : (!(_isSuccess ?? true) && widget.showError)
-                          ? widget.errorColor.withOpacity(0.4)
-                          : widget.overlayColor,
+              if (widget.showOverlay)
+                Container(
+                  decoration: ShapeDecoration(
+                    shape: OverlayShape(
+                      borderRadius: widget.borderRadius,
+                      borderColor: ((_isSuccess ?? false) && widget.showSuccess)
+                          ? widget.successColor
+                          : (!(_isSuccess ?? true) && widget.showError)
+                              ? widget.errorColor
+                              : widget.borderColor,
+                      borderLength: widget.borderLength,
+                      borderWidth: widget.borderWidth,
+                      cutOutSize: widget.cutOutSize,
+                      cutOutBottomOffset: widget.cutOutBottomOffset,
+                      cutOutWidth: widget.cutOutWidth,
+                      cutOutHeight: widget.cutOutHeight,
+                      overlayColor:
+                          ((_isSuccess ?? false) && widget.showSuccess)
+                              ? widget.successColor.withOpacity(0.4)
+                              : (!(_isSuccess ?? true) && widget.showError)
+                                  ? widget.errorColor.withOpacity(0.4)
+                                  : widget.overlayColor,
+                    ),
+                  ),
                 ),
-              ),
-            ),
-        ],
-      ),
+              if(orientation == Orientation.landscape)
+              Align(
+                alignment: Alignment.centerRight,
+                child: Container(
+                  padding: const EdgeInsets.all(12),
+                  decoration: const BoxDecoration(
+                    color: Colors.white,
+                    shape: BoxShape.rectangle,),
+
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: [
+                      IconButton(
+                        tooltip: "Switch Camera",
+                        onPressed: () => controller.switchCamera(),
+                        icon: ValueListenableBuilder<CameraFacing>(
+                          valueListenable: controller.cameraFacingState,
+                          builder: (context, state, child) {
+                            switch (state) {
+                              case CameraFacing.front:
+                                return const Icon(
+                                    Icons.camera_front);
+                              case CameraFacing.back:
+                                return const Icon(
+                                    Icons.camera_rear);
+                            }
+                          },
+                        ),
+                      ),
+                      IconButton(
+                        tooltip: "Torch",
+                        onPressed: () => controller.toggleTorch(),
+                        icon: ValueListenableBuilder<TorchState>(
+                          valueListenable: controller.torchState,
+                          builder: (context, state, child) {
+                            switch (state) {
+                              case TorchState.off:
+                                return const Icon(
+                                    Icons.flash_off);
+                              case TorchState.on:
+                                return const Icon(
+                                    Icons.flash_on);
+                            }
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              )
+            ],
+          ),
+        );
+      },
     );
   }
 }