sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge material 3

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/pages/delivery/delivery_info.dart
View File

@@ -13,12 +13,11 @@ import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/fcs_id_icon.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/local_button.dart';
import 'package:fcs/pages/widgets/local_radio_buttons.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_title.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:intl/intl.dart';
@@ -226,23 +225,11 @@ class _DeliveryInfoState extends State<DeliveryInfo> {
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,
backgroundColor: Colors.white,
title: LocalText(
context,
"delivery.info.title",
fontSize: 20,
color: primaryColor,
),
),
appBar: LocalAppBar(
labelKey: "delivery.info.title",
backgroundColor: Colors.white,
labelColor: primaryColor,
arrowColor: primaryColor),
body: Padding(
padding: const EdgeInsets.all(10.0),
child: ListView(children: <Widget>[

15
lib/pages/delivery/delivery_list.dart
View File

@@ -1,9 +1,8 @@
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/local_popup_menu_button.dart';
import 'package:fcs/pages/widgets/local_popupmenu.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -61,17 +60,7 @@ class _DeliverListState extends State<DeliverList> {
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, "delivery",
color: Colors.white, fontSize: 20),
actions: <Widget>[popupMenu],
),
appBar: LocalAppBar(labelKey: "delivery", actions: [popupMenu]),
body: PaginatorListView<Carton>(
paginatorListener: deliveryModel.getCartons!,
rowBuilder: (p) => DeliveryListRow(box: p),