merge material 3

lib/pages/customer/customer_list.dart

@@ -7,6 +7,7 @@ import 'package:fcs/pages/customer/customer_editor.dart';
 import 'package:fcs/pages/customer/model/customer_model.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/user_search/user_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:flutter/cupertino.dart';
@@ -28,7 +29,6 @@ class _CustomerListState extends State<CustomerList> {
   final double dotSize = 15.0;
   bool _isLoading = false;
 
-  
   @override
   void initState() {
     context.read<CustomerModel>().loadPaginationCustomers();
@@ -42,26 +42,15 @@ class _CustomerListState extends State<CustomerList> {
     return LocalProgress(
       inAsyncCall: _isLoading,
       child: Scaffold(
-          appBar: AppBar(
-            centerTitle: true,
-            leading: new IconButton(
-              icon: new Icon(CupertinoIcons.back),
-              onPressed: () => Navigator.of(context).pop(),
-            ),
-            actions: <Widget>[
+          appBar: LocalAppBar(
+            labelKey: "customer.list.title",
+            actions: [
               IconButton(
                   icon: Icon(Icons.search, color: Colors.white),
                   onPressed: () => searchUser(context, onUserSelect: (u) {
                         _select(u);
                       })),
             ],
-            backgroundColor: primaryColor,
-            title: LocalText(
-              context,
-              "customer.list.title",
-              fontSize: 20,
-              color: Colors.white,
-            ),
           ),
           floatingActionButton: FloatingActionButton.extended(
             onPressed: () {
@@ -88,7 +77,7 @@ class _CustomerListState extends State<CustomerList> {
           children: <Widget>[
             Expanded(
               child: new Padding(
-                padding: const EdgeInsets.symmetric(vertical: 2.0),
+                padding: const EdgeInsets.symmetric(vertical: 5.0),
                 child: new Row(
                   children: <Widget>[
                     InkWell(
@@ -120,7 +109,7 @@ class _CustomerListState extends State<CustomerList> {
                               child: new Text(
                                 customer.name ?? "",
                                 style: new TextStyle(
-                                    fontSize: 20.0, color: primaryColor),
+                                    fontSize: 18.0, color: primaryColor),
                               ),
                             ),
                             Padding(
@@ -146,16 +135,13 @@ class _CustomerListState extends State<CustomerList> {
                       onPressed: () => _share(customer),
                       style: TextButton.styleFrom(
                           shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(18.0),
+                              borderRadius: BorderRadius.circular(20.0),
                               side: BorderSide(color: primaryColor))),
-                      // shape: RoundedRectangleBorder(
-                      //     borderRadius: BorderRadius.circular(18.0),
-                      //     side: BorderSide(color: primaryColor)),
                       child: Row(
                         children: [
                           Text(
                             "Share",
-                            style: TextStyle(fontSize: 12),
+                            style: TextStyle(fontSize: 12, color: primaryColor),
                           ),
                           Icon(Icons.share, color: primaryColor),
                         ],

lib/pages/customer/invitation_create.dart

@@ -3,9 +3,8 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/customer/model/customer_model.dart';
 import 'package:fcs/pages/main/util.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/progress.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -42,31 +41,20 @@ class _InvitationCreateState extends State<InvitationCreate> {
     return LocalProgress(
       inAsyncCall: _isLoading,
       child: Scaffold(
-        appBar: AppBar(
+        appBar: LocalAppBar(
+          labelKey: "invitation.form.title",
           backgroundColor: Colors.white,
-          shadowColor: Colors.transparent,
-          centerTitle: true,
-          leading: new IconButton(
-            icon: new Icon(
-              CupertinoIcons.back,
-              color: primaryColor,
-            ),
-            onPressed: () {
-              if (isDataChanged()) {
-                showConfirmDialog(context, "back.button_confirm", () {
-                  Navigator.of(context).pop();
-                });
-              } else {
+          labelColor: primaryColor,
+          arrowColor: primaryColor,
+          onBack: () {
+            if (isDataChanged()) {
+              showConfirmDialog(context, "back.button_confirm", () {
                 Navigator.of(context).pop();
-              }
-            },
-          ),
-          title: LocalText(
-            context,
-            "invitation.form.title",
-            fontSize: 20,
-            color: primaryColor,
-          ),
+              });
+            } else {
+              Navigator.of(context).pop();
+            }
+          },
         ),
         body: Container(
           padding: EdgeInsets.all(18),