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

update carton list

Browse Source
This commit is contained in:
tzw
2024-02-15 16:41:49 +06:30
parent 2993ed78a3
commit ad5e61a6af
4 changed files with 144 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
lib/pages/carton/carton_list.dart
View File

@@ -28,6 +28,7 @@ class _CartonListState extends State<CartonList> {
bool _isLoading = false;
List<FcsShipment> _shipments = [];
FcsShipment? _selectedShipment;
bool _down = true;
@override
void initState() {
@@ -119,6 +120,20 @@ class _CartonListState extends State<CartonList> {
backgroundColor: primaryColor,
),
body: Column(
children: [
AnimatedSwitcher(
duration: const Duration(milliseconds: 300),
transitionBuilder: (Widget child, Animation<double> animation) =>
FadeTransition(
opacity: animation,
child: SizeTransition(
child: child,
sizeFactor: animation,
axis: Axis.vertical,
),
),
child: _down
? Column(
children: [
shipmentFilterBox,
Wrap(
@@ -135,24 +150,32 @@ class _CartonListState extends State<CartonList> {
children: [
const Text("Consignee: ",
style: TextStyle(
fontSize: 12, color: Colors.grey)),
fontSize: 12,
color: Colors.grey)),
Text(
cartonModel.filterByConsingee!.name ??
cartonModel
.filterByConsingee!
.name ??
"",
style: const TextStyle(
fontSize: 12, color: Colors.black)),
fontSize: 12,
color: Colors.black)),
const SizedBox(width: 3),
Text(
cartonModel.filterByConsingee!.fcsID ??
cartonModel
.filterByConsingee!
.fcsID ??
"",
style: const TextStyle(
fontSize: 12, color: labelColor)),
fontSize: 12,
color: labelColor)),
],
)
],
),
Padding(
padding: const EdgeInsets.only(left: 5),
padding:
const EdgeInsets.only(left: 5),
child: InkResponse(
radius: 30,
onTap: () {
@@ -160,8 +183,10 @@ class _CartonListState extends State<CartonList> {
.read<CartonModel>()
.clearFilterConsignee();
},
child: const Icon(AntDesign.closecircleo,
size: 20, color: dangerColor),
child: const Icon(
AntDesign.closecircleo,
size: 20,
color: dangerColor),
),
)
],
@@ -179,21 +204,30 @@ class _CartonListState extends State<CartonList> {
children: [
const Text("Sender: ",
style: TextStyle(
fontSize: 12, color: Colors.grey)),
Text(cartonModel.filterBySender!.name ?? "",
fontSize: 12,
color: Colors.grey)),
Text(
cartonModel.filterBySender!
.name ??
"",
style: const TextStyle(
fontSize: 12, color: Colors.black)),
fontSize: 12,
color: Colors.black)),
const SizedBox(width: 3),
Text(
cartonModel.filterBySender!.fcsID ?? "",
cartonModel.filterBySender!
.fcsID ??
"",
style: const TextStyle(
fontSize: 12, color: labelColor)),
fontSize: 12,
color: labelColor)),
],
)
],
),
Padding(
padding: const EdgeInsets.only(left: 5),
padding:
const EdgeInsets.only(left: 5),
child: InkResponse(
radius: 30,
onTap: () {
@@ -201,8 +235,10 @@ class _CartonListState extends State<CartonList> {
.read<CartonModel>()
.clearFilterSender();
},
child: const Icon(AntDesign.closecircleo,
size: 20, color: dangerColor),
child: const Icon(
AntDesign.closecircleo,
size: 20,
color: dangerColor),
),
)
],
@@ -212,13 +248,24 @@ class _CartonListState extends State<CartonList> {
],
),
Divider(color: Colors.grey.shade400),
],
)
: const SizedBox(),
),
Expanded(
child: cartonModel.getBoxes == null
? const SizedBox()
: PaginatorListView<Carton>(
paginatorListener: cartonModel.getBoxes!,
rowBuilder: (p) => CartonListRow(box: p),
color: primaryColor),
color: primaryColor,
onScroll: ((down) {
if (_down == down) return;
setState(() {
_down = down;
});
}),
),
),
],
),

10
lib/pages/delivery_address/delivery_address_row.dart
View File

@@ -37,22 +37,22 @@ class DeliveryAddressRow extends StatelessWidget {
deliveryAddress.addressLine1!=""
?
line(context, deliveryAddress.addressLine1,
iconData: Icons.location_on,color: Colors.black, fontSize: 16):SizedBox(),
iconData: Icons.location_on,color: Colors.grey, fontSize: 16):SizedBox(),
deliveryAddress.addressLine2!=""
?
line(
context,
deliveryAddress.addressLine2,color: Colors.black, fontSize: 16
deliveryAddress.addressLine2,color: Colors.grey, fontSize: 16
):SizedBox(),
deliveryAddress.city!=""
?
line(
context,
deliveryAddress.city,color: Colors.black, fontSize: 16
deliveryAddress.city,color: Colors.grey, fontSize: 16
):SizedBox(),
deliveryAddress.state!=""
?
line(context, deliveryAddress.state,color: Colors.black, fontSize: 16):SizedBox(),
line(context, deliveryAddress.state,color: Colors.grey, fontSize: 16):SizedBox(),
],
),
),
@@ -69,7 +69,7 @@ class DeliveryAddressRow extends StatelessWidget {
? SizedBox(width: 40)
: Padding(
padding: const EdgeInsets.only(left: 8.0, right: 8),
child: Icon(iconData, color: Colors.black38),
child: Icon(iconData, color: Colors.grey),
),
Flexible(
child: TextLocalStyle(

2
lib/pages/fcs_shipment/fcs_shipment_list.dart
View File

@@ -107,7 +107,7 @@ class _FcsShipmentListState extends State<FcsShipmentList> {
value: choice,
child: Row(
children: <Widget>[
Flexible(child: Text("${choice.text}")),
Flexible(child: Text("${choice.text}",style: TextStyle(color: Colors.black))),
const SizedBox(
width: 10,
),

4
lib/pages/widgets/local_popup_menu_button.dart
View File

@@ -107,9 +107,9 @@ class _LocalPopupMenuButtonState extends State<LocalPopupMenuButton> {
style: TextStyle(
fontSize: 14,
color:
choice.enabled ? primaryColor : Colors.grey))
choice.enabled ? Colors.black : Colors.grey))
: LocalText(context, choice.textKey ?? "",
color: choice.enabled ? primaryColor : Colors.grey,
color: choice.enabled ? Colors.black : Colors.grey,
fontSize: 14),
SizedBox(
width: 10,