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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
PhyoThandar
2020-10-16 13:46:07 +06:30
parent 0e9e3da0c4 e4fbf8bd20
commit ad7d0039fc
32 changed files with 1180 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pages/invoice/invoice_shipment_list.dart
View File

@@ -1,13 +1,10 @@
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/localization/app_translations.dart';
import 'package:fcs/pages/shipment/model/shipment_model.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:provider/provider.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'invoice_shipment_list_row.dart';
@@ -31,7 +28,7 @@ class _InvoiceShipmentListState extends State<InvoiceShipmentList> {
@override
Widget build(BuildContext context) {
var pickupModel = Provider.of<ShipmentModel>(context);
ShipmentModel shipmentModel = Provider.of<ShipmentModel>(context);
return LocalProgress(
inAsyncCall: _isLoading,
child: DefaultTabController(
@@ -64,10 +61,10 @@ class _InvoiceShipmentListState extends State<InvoiceShipmentList> {
scrollDirection: Axis.vertical,
padding: EdgeInsets.only(top: 15),
shrinkWrap: true,
itemCount: pickupModel.pickups.length,
itemCount: shipmentModel.shipments.length,
itemBuilder: (BuildContext context, int index) {
return InvoiceShipmentListRow(
pickUp: pickupModel.pickups[index]);
pickUp: shipmentModel.shipments[index]);
}),
),
),

3
lib/pages/invoice/invoice_shipment_list_row.dart
View File

@@ -29,7 +29,6 @@ class _InvoiceShipmentListRowState extends State<InvoiceShipmentListRow> {
@override
Widget build(BuildContext context) {
print('_pickup $_pickUp');
return Container(
padding: EdgeInsets.only(left: 15, right: 15),
child: InkWell(
@@ -83,7 +82,7 @@ class _InvoiceShipmentListRowState extends State<InvoiceShipmentListRow> {
children: <Widget>[
Padding(
padding: const EdgeInsets.all(0),
child: getStatus(_pickUp.status),
child: getStatus(_pickUp.currentStatus),
),
Padding(
padding: const EdgeInsets.only(left: 8.0, top: 5, bottom: 5),