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

@@ -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),
],