merge material 3

lib/pages/term/term_edit.dart

@@ -1,4 +1,3 @@
-
 import 'package:fcs/domain/vo/term.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/util.dart';
@@ -69,11 +68,7 @@ class _TermEditState extends State<TermEdit> {
               color: primaryColor,
             ),
             leading: IconButton(
-              icon: Icon(
-                CupertinoIcons.back,
-                color: primaryColor,
-                size: 30,
-              ),
+              icon: Icon(CupertinoIcons.back, color: primaryColor, size: 25),
               onPressed: () {
                 Navigator.of(context).pop();
               },
@@ -85,7 +80,8 @@ class _TermEditState extends State<TermEdit> {
                   onPressed: _unfocus,
                   icon: Icon(Icons.check, color: primaryColor))
             ],
-            bottom: TabBar(
+            bottom: TabBar.secondary(
+              indicatorColor: primaryColor,
               onTap: (index) {
                 if (index == 0) {
                   _focusNodeEng = new FocusNode();
@@ -119,12 +115,15 @@ class _TermEditState extends State<TermEdit> {
                 height: MediaQuery.of(context).size.height - 200,
                 child: TabBarView(
                   children: [
+                    const SizedBox(),
+                    const SizedBox(),
                     // textEditor(_controllerEng, _focusNodeEng),
                     // textEditor(_controllerMm, _focusNodeMm),
                   ],
                 ),
               ),
               savebtn,
+              const SizedBox(height: 20)
             ],
           ),
         ),

lib/pages/term/term_page.dart

@@ -1,10 +1,9 @@
-
 import 'package:fcs/domain/entities/setting.dart';
 import 'package:fcs/domain/vo/term.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/term/term_edit.dart';
-import 'package:fcs/pages/widgets/local_text.dart';
+import 'package:fcs/pages/widgets/local_app_bar.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -51,23 +50,11 @@ class _TermPageState extends State<TermPage> {
     bool isEditable = context.select((MainModel m) => m.termEditable());
 
     return Scaffold(
-      appBar: AppBar(
-        shadowColor: Colors.transparent,
+      appBar: LocalAppBar(
+        labelKey: 'term',
         backgroundColor: Colors.white,
-        centerTitle: true,
-        leading: new IconButton(
-          icon: new Icon(
-            CupertinoIcons.back,
-            color: primaryColor,
-          ),
-          onPressed: () => Navigator.of(context).pop(),
-        ),
-        title: LocalText(
-          context,
-          'term',
-          color: primaryColor,
-          fontSize: 20,
-        ),
+        labelColor: primaryColor,
+        arrowColor: primaryColor,
         actions: isEditable
             ? [
                 IconButton(
@@ -76,10 +63,7 @@ class _TermPageState extends State<TermPage> {
                           builder: (context) =>
                               TermEdit(term: Term.fromSetting(setting!)),
                         )),
-                    icon: Icon(
-                      Icons.edit,
-                      color: primaryColor,
-                    ))
+                    icon: Icon(Icons.edit, color: primaryColor))
               ]
             : [],
       ),