From 2e0d3c6c088c2af33937464c4df0ef723d96a625 Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Fri, 10 Mar 2023 22:31:10 +0700
Subject: [PATCH] Fix search function bug

---
 .idea/deploymentTargetDropDown.xml              | 17 -----------------
 .../foodify/Fragment/SearchFragment.java        | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index c1c2a07..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\phanh\.android\avd\Pixel_5_API_31.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-03-10T08:30:32.300635400Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
index 7df441a..4d922bc 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
@@ -212,12 +212,22 @@ public class SearchFragment extends Fragment {
                                     statusCategoryChecked.remove(Integer.valueOf(tempCategory.getId()));
                                 }
 
-                                ACTION_CODE = LIST_FOOD_BY_CATEGORY;
+
                                 listFoodSearch.clear();
                                 CURRENT_PAGE = 0;
                                 showProgressBarAndHideEndOfListText();
-                                getListFoodByCategory(CURRENT_PAGE);
-                                Toast.makeText(getContext(), "Category check: " + statusCategoryChecked, Toast.LENGTH_SHORT).show();
+
+                                //Check category list null or not
+                                if(statusCategoryChecked.size() == 0){
+
+                                    //If null, return list food
+                                    ACTION_CODE = LIST_FOOD;
+                                    getListFood(0);
+                                } else {
+                                    //If have category check, return list food by category
+                                    ACTION_CODE = LIST_FOOD_BY_CATEGORY;
+                                    getListFoodByCategory(CURRENT_PAGE);
+                                }
                             }
                         });