merge material 3

lib/pages/receiving/receiving_editor.dart

@@ -8,11 +8,10 @@ import 'package:fcs/pages/widgets/barcode_scanner.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/fcs_id_icon.dart';
 import 'package:fcs/pages/widgets/input_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';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:provider/provider.dart';
@@ -143,29 +142,20 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
     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: _isNew ? "receiving.create" : "receiving.update",
             backgroundColor: Colors.white,
-            title: LocalText(
-              context,
-              _isNew ? "receiving.create" : "receiving.update",
-              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.only(left: 12.0, right: 12),

lib/pages/receiving/receiving_info.dart

@@ -5,7 +5,7 @@ import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/fcs_id_icon.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';
@@ -85,20 +85,11 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
     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,
+        appBar: LocalAppBar(
+          labelKey: "receiving.info",
           backgroundColor: Colors.white,
-          title: LocalText(
-            context,
-            "receiving.info",
-            fontSize: 20,
-            color: primaryColor,
-          ),
+          arrowColor: primaryColor,
+          labelColor: primaryColor,
           actions: isCustomer
               ? null
               : <Widget>[
@@ -113,6 +104,7 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
                 ],
         ),
         body: Card(
+          elevation: 0,
           child: Column(
             children: <Widget>[
               Expanded(

lib/pages/receiving/receiving_list.dart

@@ -2,6 +2,7 @@ import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package_search/package_serach.dart';
+import 'package:fcs/pages/widgets/local_app_bar.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:fcs/pagination/paginator_listview.dart';
@@ -29,20 +30,9 @@ class _ReceivingListState extends State<ReceivingList> {
     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,
-              "receiving.title",
-              fontSize: 20,
-              color: Colors.white,
-            ),
-            actions: <Widget>[
+          appBar: LocalAppBar(
+            labelKey: "receiving.title",
+            actions: [
               IconButton(
                 icon: Icon(
                   Icons.search,
@@ -51,7 +41,7 @@ class _ReceivingListState extends State<ReceivingList> {
                 iconSize: 30,
                 onPressed: () => searchPackage(context,
                     callbackPackageSelect: _searchCallback),
-              ),
+              )
             ],
           ),
           floatingActionButton: FloatingActionButton.extended(