mirror of
https://github.com/recloudstream/cloudstream.git
synced 2024-08-15 01:53:11 +00:00
Issue #381: Added new feature to clear search query.
This commit is contained in:
parent
1117271a71
commit
d52f4e9267
5 changed files with 49 additions and 12 deletions
|
@ -7,10 +7,7 @@ import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
import android.widget.AbsListView
|
import android.widget.*
|
||||||
import android.widget.ArrayAdapter
|
|
||||||
import android.widget.ImageView
|
|
||||||
import android.widget.ListView
|
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import androidx.appcompat.widget.SearchView
|
import androidx.appcompat.widget.SearchView
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
|
@ -230,6 +227,10 @@ class SearchFragment : Fragment() {
|
||||||
)!!.toMutableSet()
|
)!!.toMutableSet()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clear_SearchView.setOnClickListener {
|
||||||
|
main_search.setQuery("", false)
|
||||||
|
}
|
||||||
|
|
||||||
search_filter.setOnClickListener { searchView ->
|
search_filter.setOnClickListener { searchView ->
|
||||||
searchView?.context?.let { ctx ->
|
searchView?.context?.let { ctx ->
|
||||||
val validAPIs = ctx.filterProviderByPreferredMedia(hasHomePageIsRequired = false)
|
val validAPIs = ctx.filterProviderByPreferredMedia(hasHomePageIsRequired = false)
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
android:inputType="text"
|
android:inputType="text"
|
||||||
android:nextFocusLeft="@id/nav_rail_view"
|
android:nextFocusLeft="@id/nav_rail_view"
|
||||||
|
|
||||||
android:nextFocusRight="@id/search_filter"
|
android:nextFocusRight="@id/clear_SearchView"
|
||||||
android:nextFocusUp="@id/nav_rail_view"
|
android:nextFocusUp="@id/nav_rail_view"
|
||||||
android:nextFocusDown="@id/search_autofit_results"
|
android:nextFocusDown="@id/search_autofit_results"
|
||||||
android:paddingStart="-10dp"
|
android:paddingStart="-10dp"
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
android:layout_width="20dp"
|
android:layout_width="20dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_marginStart="-35dp"
|
android:layout_marginStart="-60dp"
|
||||||
android:foregroundTint="@color/white"
|
android:foregroundTint="@color/white"
|
||||||
android:progressTint="@color/white">
|
android:progressTint="@color/white">
|
||||||
|
|
||||||
|
@ -71,6 +71,24 @@
|
||||||
</androidx.appcompat.widget.SearchView>
|
</androidx.appcompat.widget.SearchView>
|
||||||
</FrameLayout>
|
</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
|
<ImageView
|
||||||
android:id="@+id/search_filter"
|
android:id="@+id/search_filter"
|
||||||
android:layout_width="25dp"
|
android:layout_width="25dp"
|
||||||
|
@ -80,7 +98,7 @@
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
android:background="?selectableItemBackgroundBorderless"
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
android:contentDescription="@string/change_providers_img_des"
|
android:contentDescription="@string/change_providers_img_des"
|
||||||
android:nextFocusLeft="@id/main_search"
|
android:nextFocusLeft="@id/clear_SearchView"
|
||||||
android:nextFocusRight="@id/main_search"
|
android:nextFocusRight="@id/main_search"
|
||||||
android:nextFocusUp="@id/nav_rail_view"
|
android:nextFocusUp="@id/nav_rail_view"
|
||||||
android:nextFocusDown="@id/search_autofit_results"
|
android:nextFocusDown="@id/search_autofit_results"
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
android:inputType="text"
|
android:inputType="text"
|
||||||
android:nextFocusLeft="@id/nav_rail_view"
|
android:nextFocusLeft="@id/nav_rail_view"
|
||||||
|
|
||||||
android:nextFocusRight="@id/search_filter"
|
android:nextFocusRight="@id/clear_SearchView"
|
||||||
android:nextFocusUp="@id/nav_rail_view"
|
android:nextFocusUp="@id/nav_rail_view"
|
||||||
android:nextFocusDown="@id/search_autofit_results"
|
android:nextFocusDown="@id/search_autofit_results"
|
||||||
android:paddingStart="-10dp"
|
android:paddingStart="-10dp"
|
||||||
|
@ -60,7 +60,7 @@
|
||||||
android:layout_width="20dp"
|
android:layout_width="20dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_marginStart="-35dp"
|
android:layout_marginStart="-60dp"
|
||||||
android:foregroundTint="@color/white"
|
android:foregroundTint="@color/white"
|
||||||
android:progressTint="@color/white">
|
android:progressTint="@color/white">
|
||||||
|
|
||||||
|
@ -72,6 +72,24 @@
|
||||||
</androidx.appcompat.widget.SearchView>
|
</androidx.appcompat.widget.SearchView>
|
||||||
</FrameLayout>
|
</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
|
<ImageView
|
||||||
android:id="@+id/search_filter"
|
android:id="@+id/search_filter"
|
||||||
android:layout_width="25dp"
|
android:layout_width="25dp"
|
||||||
|
@ -81,7 +99,7 @@
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
android:background="?selectableItemBackgroundBorderless"
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
android:contentDescription="@string/change_providers_img_des"
|
android:contentDescription="@string/change_providers_img_des"
|
||||||
android:nextFocusLeft="@id/main_search"
|
android:nextFocusLeft="@id/clear_SearchView"
|
||||||
android:nextFocusRight="@id/main_search"
|
android:nextFocusRight="@id/main_search"
|
||||||
android:nextFocusUp="@id/nav_rail_view"
|
android:nextFocusUp="@id/nav_rail_view"
|
||||||
android:nextFocusDown="@id/search_autofit_results"
|
android:nextFocusDown="@id/search_autofit_results"
|
||||||
|
|
|
@ -5,7 +5,7 @@ buildscript {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
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.kotlin:kotlin-gradle-plugin:1.7.20")
|
||||||
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
|
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
|
||||||
|
|
||||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
#Fri Apr 30 17:11:15 CEST 2021
|
#Fri Apr 30 17:11:15 CEST 2021
|
||||||
distributionBase=GRADLE_USER_HOME
|
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
|
distributionPath=wrapper/dists
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue