From 6a5e48bfa8790d2882c7e4d7d368e3eeca236137 Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Mon, 20 Feb 2023 22:39:46 +0700
Subject: [PATCH] Fix bug search

---
 app/build.gradle                              |  1 -
 .../foodify/Fragment/SearchFragment.java      | 27 +++++++------------
 app/src/main/res/layout/fragment_search.xml   | 24 ++++++++++++++---
 app/src/main/res/values/themes.xml            |  1 +
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 15a57df..2a5042c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,6 +52,5 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
     implementation "com.github.kojofosu:Quantitizer:1.6.7"
     implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation "com.paulrybitskyi.persistentsearchview:persistentsearchview:1.1.4"
     implementation 'com.github.ome450901:SimpleRatingBar:1.5.1'
 }
\ 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 197b1a5..02d4956 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
 import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -59,7 +60,7 @@ public class SearchFragment extends Fragment {
         View view = inflater.inflate(R.layout.fragment_search, container, false);
 
         //Init Component
-        PersistentSearchView persistentSearchView = view.findViewById(R.id.search_view);
+        SearchView searchView = view.findViewById(R.id.search_view);
         recycler_view_search = view.findViewById(R.id.recycler_view_search);
         list_Category = view.findViewById(R.id.list_category);
         nestedScrollView = view.findViewById(R.id.search_fragment);
@@ -75,7 +76,7 @@ public class SearchFragment extends Fragment {
         recycler_view_search.setAdapter(foodAdapter);
 
         getListFoodByPagination(1);
-        if(nestedScrollView != null){
+        if (nestedScrollView != null) {
             nestedScrollView.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
                 @Override
                 public void onScrollChange(@NonNull NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
@@ -86,38 +87,30 @@ public class SearchFragment extends Fragment {
                 }
             });
         }
-
-        persistentSearchView.setLeftButtonDrawable(R.drawable.ic_search);
-        persistentSearchView.setOnSearchConfirmedListener(new OnSearchConfirmedListener() {
-
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
-            public void onSearchConfirmed(PersistentSearchView searchView, String query) {
-                // Handle a search confirmation. This is the place where you'd
-                // want to perform a search against your data provider.
+            public boolean onQueryTextSubmit(String query) {
                 ACTION_CODE = SEARCH_FOOD;
                 CURRENT_PAGE = 1;
                 showProgressBarAndHideEndOfListText();
                 listFoodSearch.clear();
-                if(!query.isEmpty()){
+                if (!query.isEmpty()) {
                     searchQuery = query;
                     getListFoodBySearch(searchQuery, CURRENT_PAGE);
                 }
-
-                searchView.collapse();
+                return true;
             }
 
-        });
-
-        persistentSearchView.setOnSearchQueryChangeListener(new OnSearchQueryChangeListener() {
             @Override
-            public void onSearchQueryChanged(PersistentSearchView searchView, String oldQuery, String newQuery) {
-                if(searchView.isInputQueryEmpty()){
+            public boolean onQueryTextChange(String newText) {
+                if (searchView.getQuery().length() == 0) {
                     CURRENT_PAGE = 1;
                     ACTION_CODE = LIST_FOOD;
                     showProgressBarAndHideEndOfListText();
                     foodAdapter.setData(listFood);
                     foodAdapter.notifyDataSetChanged();
                 }
+                return true;
             }
         });
 
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 0b3eb40..4c7aa1a 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -12,17 +12,33 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.paulrybitskyi.persistentsearchview.PersistentSearchView
-            android:id="@+id/search_view"
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_view"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            app:cardCornerRadius="5dp"
+            app:cardElevation="5dp"
+            android:layout_marginBottom="5dp"
+            >
+
+            <androidx.appcompat.widget.SearchView
+                android:id="@+id/search_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:queryBackground="@android:color/transparent"
+                app:queryHint="Search here..."
+                android:background="@color/white"
+                app:iconifiedByDefault="false"
+                />
+
+        </androidx.cardview.widget.CardView>
 
         <com.google.android.material.chip.ChipGroup
             android:id="@+id/list_category"
-            app:layout_constraintTop_toBottomOf="@+id/search_view"
+            app:layout_constraintTop_toBottomOf="@+id/card_view"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a645490..e93afaf 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -30,4 +30,5 @@
         <item name="android:color">@color/primaryColor</item>
     </style>
 
+
 </resources>
\ No newline at end of file