From 94d22a474de05dc5193ac5d63766a5ae36c16c9c Mon Sep 17 00:00:00 2001
From: "hanie.khodkari" <haniekhodkari@gmail.com>
Date: Sat, 17 May 2025 20:11:43 +0330
Subject: [PATCH] Fix loading bug in item

---
 lib/pages/CyclePages/cycle_result_screen.dart        |  2 +-
 lib/pages/ItemPages/item_add_screen.dart             |  9 +++++++--
 lib/pages/ItemPages/item_result_screen.dart          | 12 ++++++------
 .../MyItemsPages/Result/my_items_mine_screen.dart    |  2 +-
 .../Result/my_packages_mine_screen.dart              |  2 +-
 lib/pages/PackagePages/package_result_screen.dart    |  2 +-
 lib/widgets/LabelScreens/Result/search_box.dart      |  2 +-
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/pages/CyclePages/cycle_result_screen.dart b/lib/pages/CyclePages/cycle_result_screen.dart
index 751f525..f2b1a03 100755
--- a/lib/pages/CyclePages/cycle_result_screen.dart
+++ b/lib/pages/CyclePages/cycle_result_screen.dart
@@ -196,7 +196,7 @@ class _CycleResultScreenState extends State<CycleResultScreen> {
                                   context,
                                   listen: false);
                               cycles.setLoading();
-                              await cycles.search(searchVal);
+                              await cycles.search(searchVal ?? "");
                             },
                           ),
                           SizedBox(
diff --git a/lib/pages/ItemPages/item_add_screen.dart b/lib/pages/ItemPages/item_add_screen.dart
index 6e7c57c..361517c 100755
--- a/lib/pages/ItemPages/item_add_screen.dart
+++ b/lib/pages/ItemPages/item_add_screen.dart
@@ -64,12 +64,17 @@ class _ItemAddScreenState extends State<ItemAddScreen> {
       batchId,
     )
         .then(
-      (result) {
+      (result) async {
         setState(() {
           isLoading = false;
         });
         if (result == 'done') {
-          Navigator.of(context).popAndPushNamed(Routes.itemResultScreen);
+          // Navigator.of(context).popAndPushNamed(Routes.itemResultScreen);
+          Navigator.of(context).pop();
+          var items = await Provider.of<ItemProvider>(context, listen: false);
+          items.setLoading();
+          items.resetPageNumber();
+          items.getItemResults().then((value) => {items.resetLoading()});
           Fluttertoast.showToast(
             msg: "Item added.",
             toastLength: Toast.LENGTH_SHORT,
diff --git a/lib/pages/ItemPages/item_result_screen.dart b/lib/pages/ItemPages/item_result_screen.dart
index 1f85f0f..7acfe14 100755
--- a/lib/pages/ItemPages/item_result_screen.dart
+++ b/lib/pages/ItemPages/item_result_screen.dart
@@ -64,11 +64,11 @@ class _ItemResultScreenState extends State<ItemResultScreen> {
   @override
   void didChangeDependencies() {
     if (_isInit) {
-      var testResults = Provider.of<ItemProvider>(context);
-      testResults.setLoading();
-      testResults.resetPageNumber();
-      testResults.getItemResults().then((_) {
-        testResults.resetLoading();
+      var ItemResults = Provider.of<ItemProvider>(context);
+      ItemResults.setLoading();
+      ItemResults.resetPageNumber();
+      ItemResults.getItemResults().then((_) {
+        ItemResults.resetLoading();
         sc!.addListener(
           () {
             if (sc!.position.pixels == sc!.position.maxScrollExtent &&
@@ -243,7 +243,7 @@ class _ItemResultScreenState extends State<ItemResultScreen> {
                                   context,
                                   listen: false);
                               items.setLoading();
-                              await items.search(searchVal);
+                              await items.search(searchVal ?? "");
                             },
                           ),
                           SizedBox(
diff --git a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart
index 71bff8b..31a4d3c 100755
--- a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart
+++ b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart
@@ -166,7 +166,7 @@ class _MyItemsMineScreenState extends State<MyItemsMineScreen> {
                         var myItems = await Provider.of<MyItemProvider>(context,
                             listen: false);
                         myItems.setLoading();
-                        await myItems.searchMyItems(searchVal);
+                        await myItems.searchMyItems(searchVal ?? "");
                       },
                     ),
                     SizedBox(
diff --git a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart
index 34ccc95..5680fe9 100755
--- a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart
+++ b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart
@@ -140,7 +140,7 @@ class _MyPackagesMineScreenState extends State<MyPackagesMineScreen> {
                             context,
                             listen: false);
                         myPackages.setLoading();
-                        await myPackages.searchMyPackages(searchVal);
+                        await myPackages.searchMyPackages(searchVal ?? "");
                       },
                     ),
                     SizedBox(
diff --git a/lib/pages/PackagePages/package_result_screen.dart b/lib/pages/PackagePages/package_result_screen.dart
index d17c0f0..b3012a4 100755
--- a/lib/pages/PackagePages/package_result_screen.dart
+++ b/lib/pages/PackagePages/package_result_screen.dart
@@ -209,7 +209,7 @@ class _PackageResultScreenState extends State<PackageResultScreen> {
                                 context,
                                 listen: false);
                             packages.setLoading();
-                            await packages.search(searchVal);
+                            await packages.search(searchVal ?? "");
                           },
                         ),
                         SizedBox(
diff --git a/lib/widgets/LabelScreens/Result/search_box.dart b/lib/widgets/LabelScreens/Result/search_box.dart
index 6deabf6..d1753a9 100755
--- a/lib/widgets/LabelScreens/Result/search_box.dart
+++ b/lib/widgets/LabelScreens/Result/search_box.dart
@@ -54,7 +54,7 @@ class LabelSearchBox extends StatelessWidget {
             var labels =
                 await Provider.of<LabelsProvider>(context, listen: false);
             labels.setLoading();
-            await labels.search(searchVal);
+            await labels.search(searchVal ?? "");
           },
           child: Container(
             padding: EdgeInsets.all(7),