diff --git a/lib/pages/carton/carton_info.dart b/lib/pages/carton/carton_info.dart index 64cfe69..57bd54d 100644 --- a/lib/pages/carton/carton_info.dart +++ b/lib/pages/carton/carton_info.dart @@ -55,9 +55,9 @@ class _CartonInfoState extends State { _init() async { try { _isLoading = true; + _carton.cartonType = carton_from_packages; _carton.billTo = billToConsignee; _carton.cartonSizeType = customCarton; - _carton.cartonType = carton_from_packages; multiImgController.setImageUrls = _carton.photos; _cargoTypes = _carton.cargoTypes.where((e) => !e.isCutomDuty).toList(); _surchareItems = _carton.cargoTypes.where((e) => e.isCutomDuty).toList(); @@ -77,7 +77,7 @@ class _CartonInfoState extends State { if (mounted) { setState(() {}); } - _carton.cartonType = "Carton for packages"; + totalWeight = _carton.cargoTypes.fold(0, (sum, value) => sum + value.weight); totalSurchargeCount = @@ -351,7 +351,7 @@ class _CartonInfoState extends State { onPressed: _gotoEditor), ]), body: Container( - padding: const EdgeInsets.only(left: 20,right: 20), + padding: const EdgeInsets.only(left: 20, right: 20), child: ListView(children: [ Row(children: [ Flexible(child: cartonTypeBox), diff --git a/lib/pages/carton/mix_carton/carton_selection_widget.dart b/lib/pages/carton/mix_carton/carton_selection_widget.dart index 2fc36b8..df44824 100644 --- a/lib/pages/carton/mix_carton/carton_selection_widget.dart +++ b/lib/pages/carton/mix_carton/carton_selection_widget.dart @@ -2,6 +2,7 @@ import 'package:fcs/domain/entities/fcs_shipment.dart'; import 'package:fcs/helpers/theme.dart'; import 'package:fcs/pages/carton/mix_carton/carton_selection_result.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'package:provider/provider.dart'; import '../../../domain/entities/carton.dart'; @@ -39,17 +40,26 @@ class _CartonSelectionWidgetState extends State { String _query = ""; bool _isLoadMore = false; final _scrollController = ScrollController(); + bool _down = true; @override void initState() { _init(); super.initState(); + _scrollController.addListener(() { + setState(() { + _down = _scrollController.position.userScrollDirection == + ScrollDirection.forward; + }); + }); } _init() { var model = context.read(); model.addDefaultCartons(widget.shipment.id!); + model.addSelectedCarton(widget.cartons); + _controller.text = model.query; _query = model.query; if (mounted) { @@ -167,6 +177,26 @@ class _CartonSelectionWidgetState extends State { ), ); + final selectedCartonBox = Align( + alignment: Alignment.topLeft, + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + physics: const BouncingScrollPhysics(), + padding: EdgeInsets.only(top: 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: selectedCartonList + .map((e) => Padding( + padding: const EdgeInsets.only(right: 20), + child: Text(e.cartonNumber ?? "", + style: + TextStyle(color: Colors.black, fontSize: 15)), + )) + .toList())), + ); + return Column( children: [ Expanded( @@ -174,10 +204,27 @@ class _CartonSelectionWidgetState extends State { padding: EdgeInsets.only(left: 10, right: 10), child: Column( children: [ - const SizedBox(height: 5), - LocalTitle(textKey: "box.select.cartion"), - const SizedBox(height: 10), - searchBox, + AnimatedSwitcher( + duration: const Duration(milliseconds: 300), + transitionBuilder: + (Widget child, Animation animation) => + FadeTransition( + opacity: animation, + child: SizeTransition( + sizeFactor: animation, + axis: Axis.vertical, + child: child, + ), + ), + child: _down + ? Column(children: [ + const SizedBox(height: 5), + LocalTitle(textKey: "box.select.cartion"), + const SizedBox(height: 10), + searchBox, + selectedCartonBox + ]) + : const SizedBox()), Expanded( child: Padding( padding: const EdgeInsets.only(top: 10), @@ -187,6 +234,9 @@ class _CartonSelectionWidgetState extends State { onLoadMore: _loadMoreData, onRefresh: () async { _init(); + setState(() { + _down = true; + }); }, onTap: (a) async { setState(() { diff --git a/lib/pages/carton/mix_carton/mix_carton_editor.dart b/lib/pages/carton/mix_carton/mix_carton_editor.dart index da251d3..3047ec9 100644 --- a/lib/pages/carton/mix_carton/mix_carton_editor.dart +++ b/lib/pages/carton/mix_carton/mix_carton_editor.dart @@ -16,6 +16,7 @@ import '../../main/util.dart'; import '../../widgets/local_text.dart'; import '../../widgets/progress.dart'; import '../../widgets/step_widget.dart'; +import '../model/carton_model.dart'; import '../model/carton_selection_model.dart'; import 'carton_selection_widget.dart'; import 'mix_carton_submit.dart'; @@ -56,16 +57,21 @@ class _MixCartonEditorState extends State { } _init() async { - var s = await context - .read() - .getFcsShipment(widget.carton.fcsShipmentID ?? ""); - _shipment = s; + context.read().clearSelection(); _cartonSizeType = customCarton; _length = widget.carton.length; _width = widget.carton.width; _height = widget.carton.height; - context.read().clearSelection(); + var s = await context + .read() + .getFcsShipment(widget.carton.fcsShipmentID ?? ""); + _shipment = s; + + _cartons = await context + .read() + .getCartonsByIds(widget.carton.mixCartonIDs); + if (mounted) { setState(() {}); } diff --git a/lib/pages/carton/model/carton_selection_model.dart b/lib/pages/carton/model/carton_selection_model.dart index b4b47f3..1c776c0 100644 --- a/lib/pages/carton/model/carton_selection_model.dart +++ b/lib/pages/carton/model/carton_selection_model.dart @@ -144,5 +144,8 @@ class CartonSelectionModel extends BaseModel { cartons.clear(); query = ""; } - + + addSelectedCarton(List list) { + selectedCartonList = list; + } } diff --git a/lib/pages/carton/package_selection_widget.dart b/lib/pages/carton/package_selection_widget.dart index 6785a06..c6c501b 100644 --- a/lib/pages/carton/package_selection_widget.dart +++ b/lib/pages/carton/package_selection_widget.dart @@ -1,6 +1,7 @@ import 'package:fcs/domain/entities/fcs_shipment.dart'; import 'package:fcs/helpers/theme.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart'; import 'package:provider/provider.dart'; @@ -46,11 +47,18 @@ class _PackageSelectionWidgetState extends State { String _query = ""; bool _isLoadMore = false; final _scrollController = ScrollController(); + bool _down = true; @override void initState() { _init(); super.initState(); + _scrollController.addListener(() { + setState(() { + _down = _scrollController.position.userScrollDirection == + ScrollDirection.forward; + }); + }); } _init() { @@ -212,6 +220,25 @@ class _PackageSelectionWidgetState extends State { ), ); + final selectedPackageBox = Align( + alignment: Alignment.topLeft, + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + physics: const BouncingScrollPhysics(), + padding: EdgeInsets.only(top: 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: selectedPackageList + .map((e) => Padding( + padding: const EdgeInsets.only(right: 20), + child: Text(e.trackingID ?? "", + style: + TextStyle(color: Colors.black, fontSize: 15)), + )) + .toList())), + ); return Column( children: [ Expanded( @@ -219,11 +246,30 @@ class _PackageSelectionWidgetState extends State { padding: EdgeInsets.only(left: 10, right: 10), child: Column( children: [ - const SizedBox(height: 8), - userRow, - LocalTitle(textKey: "box.select.package", topPadding: 5), - const SizedBox(height: 10), - searchBox, + AnimatedSwitcher( + duration: const Duration(milliseconds: 300), + transitionBuilder: + (Widget child, Animation animation) => + FadeTransition( + opacity: animation, + child: SizeTransition( + sizeFactor: animation, + axis: Axis.vertical, + child: child, + ), + ), + child: _down + ? Column(children: [ + const SizedBox(height: 8), + userRow, + LocalTitle( + textKey: "box.select.package", topPadding: 5), + const SizedBox(height: 10), + searchBox, + selectedPackageBox, + ]) + : const SizedBox(), + ), Expanded( child: Padding( padding: const EdgeInsets.only(top: 10), @@ -233,6 +279,9 @@ class _PackageSelectionWidgetState extends State { onLoadMore: _loadMoreData, onRefresh: () async { _init(); + setState(() { + _down = true; + }); }, onTap: (a) async { setState(() { diff --git a/lib/pages/widgets/multi_img_file.dart b/lib/pages/widgets/multi_img_file.dart index 55ee1a8..003f358 100644 --- a/lib/pages/widgets/multi_img_file.dart +++ b/lib/pages/widgets/multi_img_file.dart @@ -6,7 +6,6 @@ import 'package:fcs/pages/widgets/callbacks.dart'; import 'package:fcs/pages/widgets/right_left_page_rout.dart'; import 'package:fcs/pages/widgets/show_img.dart'; import 'package:fcs/pages/widgets/show_multiple_img.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_vector_icons/flutter_vector_icons.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/lib/pagination/paginator_listview.dart b/lib/pagination/paginator_listview.dart index 52d4033..8a3f087 100644 --- a/lib/pagination/paginator_listview.dart +++ b/lib/pagination/paginator_listview.dart @@ -77,6 +77,7 @@ class _PaginatorListViewState extends State> { children: [ Expanded( child: RefreshIndicator( + color: primaryColor, onRefresh: () { return _paginatorListener.refresh(); },