fixed app bar issue, deprecoated old one

CodingWithTashi · CodingWithTashi · commit 78a2a2d23e8b · 2024-10-09T12:48:13.000-04:00
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:simple_barcode_scanner/barcode_appbar.dart';
 import 'package:simple_barcode_scanner/simple_barcode_scanner.dart';
 
 void main() {
@@ -43,6 +44,12 @@ class _HomePageState extends State<HomePage> {
                     context,
                     MaterialPageRoute(
                       builder: (context) => const SimpleBarcodeScannerPage(
+                        barcodeAppBar: BarcodeAppBar(
+                          appBarTitle: 'Test',
+                          centerTitle: false,
+                          enableBackButton: true,
+                          backButtonIcon: Icon(Icons.arrow_back_ios),
+                        ),
                         child: Column(
                           children: [
                             SizedBox(
diff --git a/lib/barcode_appbar.dart b/lib/barcode_appbar.dart
@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+class BarcodeAppBar {
+  final String? appBarTitle;
+  final bool? centerTitle;
+  final bool? enableBackButton;
+  final Icon? backButtonIcon;
+
+  const BarcodeAppBar({
+    this.appBarTitle,
+    this.centerTitle,
+    this.enableBackButton,
+    this.backButtonIcon,
+  });
+}
diff --git a/lib/screens/io_device.dart b/lib/screens/io_device.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:simple_barcode_scanner/enum.dart';
 import 'package:simple_barcode_scanner/screens/window.dart';
 
+import '../barcode_appbar.dart';
 import '../flutter_barcode_scanner.dart';
 
 /// Barcode scanner for mobile and desktop devices
@@ -16,6 +17,8 @@ class BarcodeScanner extends StatelessWidget {
   final String? appBarTitle;
   final bool? centerTitle;
   final Widget? child;
+  final BarcodeAppBar? barcodeAppBar;
+
   const BarcodeScanner({
     super.key,
     required this.lineColor,
@@ -26,6 +29,7 @@ class BarcodeScanner extends StatelessWidget {
     this.child,
     this.appBarTitle,
     this.centerTitle,
+    this.barcodeAppBar,
   });
 
   @override
diff --git a/lib/screens/unsupported.dart b/lib/screens/unsupported.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:simple_barcode_scanner/barcode_appbar.dart';
 import 'package:simple_barcode_scanner/enum.dart';
 
 class BarcodeScanner extends StatelessWidget {
@@ -10,6 +11,7 @@ class BarcodeScanner extends StatelessWidget {
   final String? appBarTitle;
   final bool? centerTitle;
   final Widget? child;
+  final BarcodeAppBar? barcodeAppBar;
   const BarcodeScanner(
       {super.key,
       this.lineColor = "#ff6666",
@@ -19,7 +21,8 @@ class BarcodeScanner extends StatelessWidget {
       required this.onScanned,
       this.appBarTitle,
       this.child,
-      this.centerTitle});
+      this.centerTitle,
+      this.barcodeAppBar});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/web.dart b/lib/screens/web.dart
@@ -1,10 +1,12 @@
-// ignore: avoid_web_libraries_in_flutter
-import 'package:web/web.dart' as html;
 import 'dart:ui_web' as ui;
 
 import 'package:flutter/material.dart';
 import 'package:simple_barcode_scanner/constant.dart';
 import 'package:simple_barcode_scanner/enum.dart';
+// ignore: avoid_web_libraries_in_flutter
+import 'package:web/web.dart' as html;
+
+import '../barcode_appbar.dart';
 
 /// Barcode scanner for web using iframe
 class BarcodeScanner extends StatelessWidget {
@@ -16,6 +18,8 @@ class BarcodeScanner extends StatelessWidget {
   final String? appBarTitle;
   final bool? centerTitle;
   final Widget? child;
+  final BarcodeAppBar? barcodeAppBar;
+
   const BarcodeScanner({
     super.key,
     required this.lineColor,
@@ -26,6 +30,7 @@ class BarcodeScanner extends StatelessWidget {
     this.appBarTitle,
     this.centerTitle,
     this.child,
+    this.barcodeAppBar,
   });
 
   @override
@@ -55,10 +60,7 @@ class BarcodeScanner extends StatelessWidget {
     final width = MediaQuery.of(context).size.width;
     final height = width / (16 / 9);
     return Scaffold(
-      appBar: AppBar(
-        title: Text(appBarTitle ?? kScanPageTitle),
-        centerTitle: centerTitle,
-      ),
+      appBar: _buildAppBar(context),
       body: SingleChildScrollView(
         child: Column(
           children: [
@@ -75,4 +77,34 @@ class BarcodeScanner extends StatelessWidget {
       ),
     );
   }
+
+  _buildAppBar(BuildContext context) {
+    if (appBarTitle == null && barcodeAppBar == null) {
+      return null;
+    }
+    if (barcodeAppBar != null) {
+      return AppBar(
+        title: barcodeAppBar?.appBarTitle != null
+            ? Text(barcodeAppBar!.appBarTitle!)
+            : null,
+        centerTitle: barcodeAppBar?.centerTitle ?? false,
+        leading: barcodeAppBar?.enableBackButton == true
+            ? IconButton(
+                onPressed: () => Navigator.pop(context),
+                icon: barcodeAppBar?.backButtonIcon ??
+                    const Icon(Icons.arrow_back_ios))
+            : null,
+        automaticallyImplyLeading: false,
+      );
+    }
+    return AppBar(
+      title: Text(appBarTitle ?? kScanPageTitle),
+      centerTitle: centerTitle,
+      automaticallyImplyLeading: true,
+      leading: IconButton(
+        icon: const Icon(Icons.arrow_back_ios),
+        onPressed: () => Navigator.pop(context),
+      ),
+    );
+  }
 }
diff --git a/lib/screens/window.dart b/lib/screens/window.dart
@@ -8,6 +8,8 @@ import 'package:simple_barcode_scanner/constant.dart';
 import 'package:simple_barcode_scanner/enum.dart';
 import 'package:webview_windows/webview_windows.dart';
 
+import '../barcode_appbar.dart';
+
 class WindowBarcodeScanner extends StatelessWidget {
   final String lineColor;
   final String cancelButtonText;
@@ -16,6 +18,7 @@ class WindowBarcodeScanner extends StatelessWidget {
   final Function(String) onScanned;
   final String? appBarTitle;
   final bool? centerTitle;
+  final BarcodeAppBar? barcodeAppBar;
 
   const WindowBarcodeScanner({
     super.key,
@@ -26,6 +29,7 @@ class WindowBarcodeScanner extends StatelessWidget {
     required this.onScanned,
     this.appBarTitle,
     this.centerTitle,
+    this.barcodeAppBar,
   });
 
   @override
@@ -39,18 +43,7 @@ class WindowBarcodeScanner extends StatelessWidget {
     });
 
     return Scaffold(
-      appBar: AppBar(
-        title: Text(appBarTitle ?? kScanPageTitle),
-        centerTitle: centerTitle,
-        leading: IconButton(
-          onPressed: () {
-            /// send close event to web-view
-            controller.postWebMessage(json.encode({"event": "close"}));
-            Navigator.pop(context);
-          },
-          icon: const Icon(Icons.arrow_back_ios),
-        ),
-      ),
+      appBar: _buildAppBar(controller, context),
       body: FutureBuilder<bool>(
           future: initPlatformState(
             controller: controller,
@@ -155,4 +148,42 @@ class WindowBarcodeScanner extends StatelessWidget {
     }
     return true;
   }
+
+  _buildAppBar(WebviewController controller, BuildContext context) {
+    if (appBarTitle == null && barcodeAppBar == null) {
+      return null;
+    }
+    if (barcodeAppBar != null) {
+      return AppBar(
+        title: barcodeAppBar?.appBarTitle != null
+            ? Text(barcodeAppBar!.appBarTitle!)
+            : null,
+        centerTitle: barcodeAppBar?.centerTitle ?? false,
+        leading: barcodeAppBar!.enableBackButton == true
+            ? IconButton(
+                onPressed: () {
+                  /// send close event to web-view
+                  controller.postWebMessage(json.encode({"event": "close"}));
+                  Navigator.pop(context);
+                },
+                icon: barcodeAppBar?.backButtonIcon ??
+                    const Icon(Icons.arrow_back_ios),
+              )
+            : null,
+        automaticallyImplyLeading: false,
+      );
+    }
+    return AppBar(
+      title: Text(appBarTitle ?? kScanPageTitle),
+      centerTitle: centerTitle,
+      leading: IconButton(
+        onPressed: () {
+          /// send close event to web-view
+          controller.postWebMessage(json.encode({"event": "close"}));
+          Navigator.pop(context);
+        },
+        icon: const Icon(Icons.arrow_back_ios),
+      ),
+    );
+  }
 }
diff --git a/lib/simple_barcode_scanner.dart b/lib/simple_barcode_scanner.dart
@@ -1,6 +1,7 @@
 library simple_barcode_scanner;
 
 import 'package:flutter/material.dart';
+import 'package:simple_barcode_scanner/barcode_appbar.dart';
 import 'package:simple_barcode_scanner/enum.dart';
 import 'package:simple_barcode_scanner/screens/shared.dart';
 
@@ -20,11 +21,18 @@ class SimpleBarcodeScannerPage extends StatelessWidget {
   final ScanType scanType;
 
   ///AppBar Title
+  @Deprecated(
+      'Use BarcodeAppBar instead. This field will be removed in future versions.')
   final String? appBarTitle;
 
+  @Deprecated(
+      'Use BarcodeAppBar instead. This field will be removed in future versions.')
+
   ///center Title
   final bool? centerTitle;
 
+  final BarcodeAppBar? barcodeAppBar;
+
   /// Specify a child widget to be positioned beneath the scanner.
   /// This is beneficial when you need to include a customized text field
   /// for manual entry of barcode/QR code.
@@ -48,26 +56,34 @@ class SimpleBarcodeScannerPage extends StatelessWidget {
 
   /// appBatTitle and centerTitle support in web and window only
   /// Remaining field support in only mobile devices
-  const SimpleBarcodeScannerPage({
-    super.key,
-    this.lineColor = "#ff6666",
-    this.cancelButtonText = "Cancel",
-    this.isShowFlashIcon = false,
-    this.scanType = ScanType.barcode,
-    this.appBarTitle,
-    this.centerTitle,
-    this.child,
-  });
+  const SimpleBarcodeScannerPage(
+      {super.key,
+      this.lineColor = "#ff6666",
+      this.cancelButtonText = "Cancel",
+      this.isShowFlashIcon = false,
+      this.scanType = ScanType.barcode,
+      this.appBarTitle,
+      this.centerTitle,
+      this.child,
+      this.barcodeAppBar});
 
   @override
   Widget build(BuildContext context) {
+    assert(
+        (appBarTitle == null && centerTitle == null) ||
+            barcodeAppBar == null ||
+            (appBarTitle != null &&
+                centerTitle != null &&
+                barcodeAppBar == null),
+        'Either provide both appBarTitle and centerTitle together, or provide barcodeAppBar, but not both.');
     return BarcodeScanner(
       lineColor: lineColor,
       cancelButtonText: cancelButtonText,
       isShowFlashIcon: isShowFlashIcon,
       scanType: scanType,
       appBarTitle: appBarTitle,
       centerTitle: centerTitle,
+      barcodeAppBar: barcodeAppBar,
       child: child,
       onScanned: (res) {
         Navigator.pop(context, res);
