merge material 3

lib/pages/pickup/pickup_editor.dart

@@ -10,6 +10,7 @@ import 'package:fcs/pages/pickup/model/pickup_model.dart';
 import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
+import 'package:fcs/pages/widgets/local_app_bar.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/multi_img_file.dart';
@@ -131,28 +132,20 @@ class _PickupEditorState extends State<PickupEditor> {
     return LocalProgress(
       inAsyncCall: _isLoading,
       child: Scaffold(
-        appBar: AppBar(
-          centerTitle: true,
-          leading: new IconButton(
-            icon: new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
-            onPressed: () {
-              if (isDataChanged()) {
-                showConfirmDialog(context, "back.button_confirm", () {
-                  Navigator.of(context).pop();
-                });
-              } else {
-                Navigator.of(context).pop();
-              }
-            },
-          ),
-          shadowColor: Colors.transparent,
+        appBar: LocalAppBar(
+          labelKey: "pickup.edit.title",
           backgroundColor: Colors.white,
-          title: LocalText(
-            context,
-            "pickup.edit.title",
-            fontSize: 20,
-            color: primaryColor,
-          ),
+          labelColor: primaryColor,
+          arrowColor: primaryColor,
+          onBack: () {
+            if (isDataChanged()) {
+              showConfirmDialog(context, "back.button_confirm", () {
+                Navigator.of(context).pop();
+              });
+            } else {
+              Navigator.of(context).pop();
+            }
+          },
         ),
         body: Padding(
           padding: const EdgeInsets.all(8.0),

lib/pages/pickup/pickup_info.dart

@@ -5,7 +5,7 @@ import 'package:fcs/pages/pickup/model/pickup_model.dart';
 import 'package:fcs/pages/pickup/pickup_editor.dart';
 import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
-import 'package:fcs/pages/widgets/local_text.dart';
+import 'package:fcs/pages/widgets/local_app_bar.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/multi_img_file.dart';
 import 'package:fcs/pages/widgets/progress.dart';
@@ -149,22 +149,13 @@ class _PickupInfoState extends State<PickupInfo> {
     return LocalProgress(
       inAsyncCall: _isLoading,
       child: Scaffold(
-        appBar: AppBar(
-          centerTitle: true,
-          leading: new IconButton(
-            icon: new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          shadowColor: Colors.transparent,
-          backgroundColor: Colors.white,
-          title: LocalText(
-            context,
-            "pickup.info.title",
-            fontSize: 20,
-            color: primaryColor,
-          ),
-        ),
+        appBar: LocalAppBar(
+            labelKey: "pickup.info.title",
+            backgroundColor: Colors.white,
+            labelColor: primaryColor,
+            arrowColor: primaryColor),
         body: Card(
+          elevation: 0,
           child: Column(
             children: <Widget>[
               Expanded(

lib/pages/pickup/pickup_list.dart

@@ -3,7 +3,7 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/pickup/pickup_info.dart';
 import 'package:fcs/pages/pickup/pickup_list_row.dart';
 import 'package:fcs/pages/pickup_search/pickup_serach.dart';
-import 'package:fcs/pages/widgets/local_text.dart';
+import 'package:fcs/pages/widgets/local_app_bar.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:fcs/pagination/paginator_listview.dart';
 import 'package:flutter/cupertino.dart';
@@ -26,7 +26,6 @@ class _PickupListState extends State<PickupList> {
     super.initState();
   }
 
-
   @override
   Widget build(BuildContext context) {
     var pickupModel = Provider.of<PickupModel>(context);
@@ -35,29 +34,17 @@ class _PickupListState extends State<PickupList> {
     return LocalProgress(
       inAsyncCall: _isLoading,
       child: Scaffold(
-          appBar: AppBar(
-            centerTitle: true,
-            leading: new IconButton(
-              icon: new Icon(CupertinoIcons.back),
-              onPressed: () => Navigator.of(context).pop(),
-            ),
-            backgroundColor: primaryColor,
-            title: LocalText(
-              context,
-              "pickup.title",
-              fontSize: 20,
-              color: Colors.white,
-            ),
-            actions: <Widget>[
+          appBar: LocalAppBar(
+            labelKey: "pickup.title",
+            actions: [
               IconButton(
-                icon: Icon(
-                  Icons.search,
-                  color: Colors.white,
-                ),
-                iconSize: 30,
-                onPressed: () => searchPickup(context,
-                    callbackPickupSelect: _searchCallback),
-              ),
+                  icon: Icon(
+                    Icons.search,
+                    color: Colors.white,
+                  ),
+                  iconSize: 30,
+                  onPressed: () => searchPickup(context,
+                      callbackPickupSelect: _searchCallback)),
             ],
           ),
           body: PaginatorListView<Pickup>(