update package detal list and update cargo type input in carton section

lib/pages/carton/package_selection_widget.dart

@@ -1,5 +1,5 @@
 import 'package:fcs/domain/entities/fcs_shipment.dart';
-import 'package:fcs/helpers/theme.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
@@ -8,27 +8,25 @@ import 'package:provider/provider.dart';
 import '../../domain/entities/package.dart';
 import '../../domain/entities/user.dart';
 import '../main/util.dart';
-import '../widgets/barcode_scanner.dart';
+import '../package/package_info.dart';
 import '../widgets/continue_button.dart';
 import '../widgets/local_title.dart';
 import '../widgets/previous_button.dart';
 import 'model/package_selection_model.dart';
 import 'package_selection_result.dart';
 
-typedef OnPrevious = Function(List<Package> packages);
-typedef OnContinue = Function(List<Package> packages);
+typedef OnPrevious = Function();
+typedef OnContinue = Function();
 
 class PackageSelectionWidget extends StatefulWidget {
   final User sender;
   final User consignee;
   final FcsShipment shipment;
-  final List<Package> packages;
   final OnPrevious? onPrevious;
   final OnContinue? onContinue;
 
   const PackageSelectionWidget({
     super.key,
-    required this.packages,
     this.onPrevious,
     this.onContinue,
     required this.shipment,
@@ -41,8 +39,6 @@ class PackageSelectionWidget extends StatefulWidget {
 }
 
 class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
-  final TextEditingController _controller = TextEditingController();
-  String _query = "";
   bool _isLoadMore = false;
   final _scrollController = ScrollController();
   bool _down = true;
@@ -60,29 +56,18 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
   }
 
   _init() {
-    var searchModel = context.read<PackageSelectionModel>();
-    _controller.text = searchModel.query;
-    _query = searchModel.query;
-
-    searchModel.refresh(
-        shipmentId: widget.shipment.id!,
-        consigneeId: widget.consignee.id!,
-        senderId: widget.sender.id!,
-        term: _query);
-
-    searchModel.addSelectedPackage(widget.packages);
+    var packageModel = context.read<PackageSelectionModel>();
+    packageModel.refresh(
+      shipmentId: widget.shipment.id!,
+      consigneeId: widget.consignee.id!,
+      senderId: widget.sender.id!,
+    );
 
     if (mounted) {
       setState(() {});
     }
   }
 
-  // @override
-  // void didUpdateWidget(covariant PackageSelectionWidget oldWidget) {
-  //   _init();
-  //   super.didUpdateWidget(oldWidget);
-  // }
-
   Future<void> _loadMoreData() async {
     if (_isLoadMore) return;
     var model = context.read<PackageSelectionModel>();
@@ -92,10 +77,10 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
     });
 
     await model.loadMoreData(
-        shipmentId: widget.shipment.id!,
-        consigneeId: widget.consignee.id!,
-        senderId: widget.sender.id!,
-        term: _query);
+      shipmentId: widget.shipment.id!,
+      consigneeId: widget.consignee.id!,
+      senderId: widget.sender.id!,
+    );
 
     setState(() {
       _isLoadMore = false;
@@ -105,8 +90,7 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
   @override
   Widget build(BuildContext context) {
     var model = context.watch<PackageSelectionModel>();
-    List<Package> searchResults = model.packages;
-    List<Package> selectedPackageList = model.selectedPackages;
+    List<Package> packages = model.packages;
 
     final senderBox = userDisplayBox(context,
         lableKey: "box.sender.title",
@@ -132,103 +116,23 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
 
     final continueBtn = ContinueButton(
       onTap: () {
-        if (selectedPackageList.isEmpty || searchResults.isEmpty) {
-          showMsgDialog(context, 'Error', "Please select the packages");
+        if (packages.isEmpty) {
+          showMsgDialog(context, 'Error', "Please add the packages");
           return false;
         }
 
         if (widget.onContinue != null) {
-          widget.onContinue!(selectedPackageList);
+          widget.onContinue!();
         }
       },
     );
 
     final previousBtn = PreviousButton(onTap: () {
       if (widget.onPrevious != null) {
-        widget.onPrevious!(selectedPackageList);
+        widget.onPrevious!();
       }
     });
 
-    final searchBox = SizedBox(
-      height: 40,
-      child: TextField(
-        controller: _controller,
-        cursorColor: primaryColor,
-        onSubmitted: (value) {
-          setState(() {
-            _query = value;
-          });
-          _search(imm: true);
-        },
-        onChanged: (v) {
-          setState(() {
-            _query = v;
-          });
-          _search();
-        },
-        decoration: InputDecoration(
-            enabledBorder: const OutlineInputBorder(
-              borderSide: BorderSide(color: labelColor),
-            ),
-            border: OutlineInputBorder(
-                borderRadius: BorderRadius.circular(5.0),
-                borderSide:
-                    BorderSide(color: labelColor.withOpacity(0.3), width: 0)),
-            focusedBorder: const OutlineInputBorder(
-              borderRadius: BorderRadius.all(Radius.circular(5.0)),
-              borderSide: BorderSide(color: labelColor),
-            ),
-            hintText: "Search by tracking number",
-            hintStyle: const TextStyle(
-                color: Colors.grey,
-                fontSize: 16,
-                fontWeight: FontWeight.normal),
-            suffixIcon: Row(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                InkResponse(
-                    radius: 20,
-                    onTap: () {
-                      _scan(context);
-                    },
-                    child: const Icon(Icons.qr_code_scanner,
-                        color: Colors.black87)),
-                IconButton(
-                    splashRadius: 20,
-                    onPressed: () {
-                      setState(() {
-                        _controller.clear();
-                        _query = "";
-                      });
-                      _search();
-                    },
-                    icon: const Icon(Icons.close, color: Colors.black87)),
-              ],
-            ),
-            contentPadding: const EdgeInsets.all(10),
-            filled: true),
-      ),
-    );
-
-    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(
@@ -255,8 +159,6 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
                           LocalTitle(
                               textKey: "box.select.package", topPadding: 5),
                           const SizedBox(height: 10),
-                          searchBox,
-                          selectedPackageBox,
                         ])
                       : const SizedBox(),
                 ),
@@ -273,11 +175,12 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
                           _down = true;
                         });
                       },
-                      onTap: (a) async {
-                        setState(() {
-                          a.isChecked = !a.isChecked;
-                        });
-                        context.read<PackageSelectionModel>().selectPackage(a);
+                      onTap: (a) {
+                        Navigator.push(
+                          context,
+                          CupertinoPageRoute(
+                              builder: (context) => PackageInfo(package: a)),
+                        );
                       },
                     ),
                   ),
@@ -302,31 +205,4 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
       ],
     );
   }
-
-  _scan(BuildContext context) async {
-    try {
-      String? barcode = await scanBarcode();
-      if (barcode != null) {
-        setState(() {
-          _controller.text = barcode;
-          _query = barcode;
-        });
-        await _search();
-      }
-    } catch (e) {
-      showMsgDialog(context, 'Error', e.toString());
-    }
-  }
-
-  _search({bool imm = false}) async {
-    try {
-      await context.read<PackageSelectionModel>().search(_query,
-          imm: imm,
-          shipmentId: widget.shipment.id!,
-          senderId: widget.sender.id!,
-          consigneeId: widget.consignee.id!);
-    } catch (e) {
-      showMsgDialog(context, 'Error', e.toString());
-    }
-  }
 }