From d52f4e92673e6048a5fb6797af1300152554b523 Mon Sep 17 00:00:00 2001
From: allenbaby <allen.baby10@gmail.com>
Date: Sat, 18 Feb 2023 19:30:10 +0530
Subject: [PATCH] Issue #381: Added new feature to clear search query.

---
 .../cloudstream3/ui/search/SearchFragment.kt  |  9 +++----
 app/src/main/res/layout/fragment_search.xml   | 24 ++++++++++++++++---
 .../main/res/layout/fragment_search_tv.xml    | 24 ++++++++++++++++---
 build.gradle.kts                              |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 5 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index b4a38216..86d312b7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -7,10 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
-import android.widget.AbsListView
-import android.widget.ArrayAdapter
-import android.widget.ImageView
-import android.widget.ListView
+import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
@@ -230,6 +227,10 @@ class SearchFragment : Fragment() {
             )!!.toMutableSet()
         }
 
+        clear_SearchView.setOnClickListener {
+            main_search.setQuery("", false)
+        }
+
         search_filter.setOnClickListener { searchView ->
             searchView?.context?.let { ctx ->
                 val validAPIs = ctx.filterProviderByPreferredMedia(hasHomePageIsRequired = false)
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index bed08570..ff79471f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -41,7 +41,7 @@
                     android:inputType="text"
                     android:nextFocusLeft="@id/nav_rail_view"
 
-                    android:nextFocusRight="@id/search_filter"
+                    android:nextFocusRight="@id/clear_SearchView"
                     android:nextFocusUp="@id/nav_rail_view"
                     android:nextFocusDown="@id/search_autofit_results"
                     android:paddingStart="-10dp"
@@ -59,7 +59,7 @@
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_gravity="center"
-                        android:layout_marginStart="-35dp"
+                        android:layout_marginStart="-60dp"
                         android:foregroundTint="@color/white"
                         android:progressTint="@color/white">
 
@@ -71,6 +71,24 @@
                 </androidx.appcompat.widget.SearchView>
             </FrameLayout>
 
+            <ImageView
+                android:id="@+id/clear_SearchView"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="center_vertical|end"
+                android:layout_margin="40dp"
+
+                android:nextFocusLeft="@id/main_search"
+                android:nextFocusRight="@id/search_filter"
+                android:nextFocusUp="@id/nav_rail_view"
+                android:nextFocusDown="@id/search_autofit_results"
+
+                android:background="@drawable/outline_drawable_less"
+                android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/ic_baseline_close_24"
+                app:tint="?attr/white"
+                tools:ignore="ContentDescription" />
+
             <ImageView
                 android:id="@+id/search_filter"
                 android:layout_width="25dp"
@@ -80,7 +98,7 @@
                 android:layout_margin="10dp"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/change_providers_img_des"
-                android:nextFocusLeft="@id/main_search"
+                android:nextFocusLeft="@id/clear_SearchView"
                 android:nextFocusRight="@id/main_search"
                 android:nextFocusUp="@id/nav_rail_view"
                 android:nextFocusDown="@id/search_autofit_results"
diff --git a/app/src/main/res/layout/fragment_search_tv.xml b/app/src/main/res/layout/fragment_search_tv.xml
index 0a85a471..013d6dd4 100644
--- a/app/src/main/res/layout/fragment_search_tv.xml
+++ b/app/src/main/res/layout/fragment_search_tv.xml
@@ -42,7 +42,7 @@
                     android:inputType="text"
                     android:nextFocusLeft="@id/nav_rail_view"
 
-                    android:nextFocusRight="@id/search_filter"
+                    android:nextFocusRight="@id/clear_SearchView"
                     android:nextFocusUp="@id/nav_rail_view"
                     android:nextFocusDown="@id/search_autofit_results"
                     android:paddingStart="-10dp"
@@ -60,7 +60,7 @@
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_gravity="center"
-                        android:layout_marginStart="-35dp"
+                        android:layout_marginStart="-60dp"
                         android:foregroundTint="@color/white"
                         android:progressTint="@color/white">
 
@@ -72,6 +72,24 @@
                 </androidx.appcompat.widget.SearchView>
             </FrameLayout>
 
+            <ImageView
+                android:id="@+id/clear_SearchView"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="center_vertical|end"
+                android:layout_margin="40dp"
+
+                android:nextFocusLeft="@id/main_search"
+                android:nextFocusRight="@id/search_filter"
+                android:nextFocusUp="@id/nav_rail_view"
+                android:nextFocusDown="@id/search_autofit_results"
+
+                android:background="@drawable/outline_drawable_less"
+                android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/ic_baseline_close_24"
+                app:tint="?attr/white"
+                tools:ignore="ContentDescription" />
+
             <ImageView
                 android:id="@+id/search_filter"
                 android:layout_width="25dp"
@@ -81,7 +99,7 @@
                 android:layout_margin="10dp"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/change_providers_img_des"
-                android:nextFocusLeft="@id/main_search"
+                android:nextFocusLeft="@id/clear_SearchView"
                 android:nextFocusRight="@id/main_search"
                 android:nextFocusUp="@id/nav_rail_view"
                 android:nextFocusDown="@id/search_autofit_results"
diff --git a/build.gradle.kts b/build.gradle.kts
index 6e2a24f3..0981f520 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("com.android.tools.build:gradle:7.4.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index baa28c97..c29bc077 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Apr 30 17:11:15 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME