merge material 3

This commit is contained in:
tzw
2024-01-25 17:40:35 +06:30
parent 18053cbe3c
commit 991ecd7ae6
70 changed files with 572 additions and 1377 deletions

View File

@@ -4,6 +4,7 @@ import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/local_button.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/pdf_screen.dart';
@@ -132,20 +133,11 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
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: "FCSshipment.form.title",
backgroundColor: Colors.white,
title: LocalText(
context,
"FCSshipment.form.title",
fontSize: 20,
color: primaryColor,
),
labelColor: primaryColor,
arrowColor: primaryColor,
actions: [
IconButton(
icon: Icon(Icons.edit, color: primaryColor),
@@ -154,7 +146,30 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
menuPopWidget(context)
],
),
// 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,
// "FCSshipment.form.title",
// fontSize: 20,
// color: primaryColor,
// ),
// actions: [
// IconButton(
// icon: Icon(Icons.edit, color: primaryColor),
// onPressed: _edit,
// ),
// menuPopWidget(context)
// ],
// ),
body: Card(
elevation: 0,
child: Column(
children: <Widget>[
Expanded(