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

fix ui

Browse Source
This commit is contained in:
PhyoThandar
2020-06-25 15:34:41 +06:30
parent 0007c193b4
commit a41edffe02
4 changed files with 272 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
lib/pages_fcs/package_list.dart
View File

@@ -9,12 +9,12 @@ import 'package:fcs/vo/buyer.dart';
import 'package:fcs/widget/bottom_up_page_route.dart';
import 'package:fcs/widget/localization/app_translations.dart';
import 'package:fcs/widget/progress.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:provider/provider.dart';
import '../theme/theme.dart';
import 'pickup_editor.dart';
class PackageList extends StatefulWidget {
@override
@@ -40,7 +40,7 @@ class _PackageListState extends State<PackageList> {
return LocalProgress(
inAsyncCall: _isLoading,
child: DefaultTabController(
length: 2,
length: 5,
child: Scaffold(
appBar: AppBar(
centerTitle: true,
@@ -51,19 +51,19 @@ class _PackageListState extends State<PackageList> {
backgroundColor: primaryColor,
title: Text(AppTranslations.of(context).text("package.title")),
actions: <Widget>[
IconButton(
icon: Icon(
FontAwesomeIcons.barcode,
color: Colors.white,
),
iconSize: 30,
onPressed: () {
Navigator.push(
context,
BottomUpPageRoute(BarcodeScreenPage()),
);
},
),
// IconButton(
// icon: Icon(
// Ionicons.ios_barcode,
// color: Colors.white,
// ),
// iconSize: 30,
// onPressed: () {
// Navigator.push(
// context,
// BottomUpPageRoute(BarcodeScreenPage()),
// );
// },
// ),
IconButton(
icon: Icon(
Icons.search,
@@ -74,12 +74,20 @@ class _PackageListState extends State<PackageList> {
),
],
bottom: TabBar(
dragStartBehavior: DragStartBehavior.start,
unselectedLabelColor: Colors.grey,
tabs: [
Tab(
text: "Received",
),
Tab(text: "Processed"),
Tab(
text: "Shipped",
),
Tab(text: "Arrived"),
Tab(
text: "Delivered",
),
],
),
),
@@ -95,6 +103,9 @@ class _PackageListState extends State<PackageList> {
children: [
_upComing(),
_completed(),
_shipped(),
_arrived(),
_delivered(),
],
)),
),
@@ -155,4 +166,76 @@ class _PackageListState extends State<PackageList> {
],
);
}
Widget _shipped() {
var packageModel = Provider.of<PackageModel>(context);
return Column(
children: <Widget>[
Expanded(
child: new ListView.separated(
separatorBuilder: (context, index) => Divider(
color: Colors.black,
),
scrollDirection: Axis.vertical,
padding: EdgeInsets.only(top: 15),
shrinkWrap: true,
itemCount: packageModel.shipped.length,
itemBuilder: (BuildContext context, int index) {
return PackageListRow(
package: packageModel.shipped[index],
isReadOnly: false,
);
}),
),
],
);
}
Widget _arrived() {
var packageModel = Provider.of<PackageModel>(context);
return Column(
children: <Widget>[
Expanded(
child: new ListView.separated(
separatorBuilder: (context, index) => Divider(
color: Colors.black,
),
scrollDirection: Axis.vertical,
padding: EdgeInsets.only(top: 15),
shrinkWrap: true,
itemCount: packageModel.arrived.length,
itemBuilder: (BuildContext context, int index) {
return PackageListRow(
package: packageModel.arrived[index],
isReadOnly: false,
);
}),
),
],
);
}
Widget _delivered() {
var packageModel = Provider.of<PackageModel>(context);
return Column(
children: <Widget>[
Expanded(
child: new ListView.separated(
separatorBuilder: (context, index) => Divider(
color: Colors.black,
),
scrollDirection: Axis.vertical,
padding: EdgeInsets.only(top: 15),
shrinkWrap: true,
itemCount: packageModel.delivered.length,
itemBuilder: (BuildContext context, int index) {
return PackageListRow(
package: packageModel.delivered[index],
isReadOnly: false,
);
}),
),
],
);
}
}