MohmedIbrahim/cloudstream
1
0
Fork 0
forked from recloudstream/cloudstream
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug with persisting tvTypes

Browse source 
closes #27
This commit is contained in:
Blatzar 2022-08-19 18:17:37 +02:00
parent e4a5e00ef4
commit 0635784333
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
View file

@ -1,8 +1,8 @@
package com.lagradost.cloudstream3.ui.settings.extensions package com.lagradost.cloudstream3.ui.settings.extensions
import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.view.* import android.view.*
import android.widget.SearchView
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
@ -30,6 +30,10 @@ class PluginsFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
// Since the ViewModel is getting reused the tvTypes must be cleared between uses
pluginViewModel.tvTypes.clear()
pluginViewModel.search(null)
val name = arguments?.getString(PLUGINS_BUNDLE_NAME) val name = arguments?.getString(PLUGINS_BUNDLE_NAME)
val url = arguments?.getString(PLUGINS_BUNDLE_URL) val url = arguments?.getString(PLUGINS_BUNDLE_URL)
val isLocal = arguments?.getBoolean(PLUGINS_BUNDLE_LOCAL) == true val isLocal = arguments?.getBoolean(PLUGINS_BUNDLE_LOCAL) == true
@ -52,7 +56,7 @@ class PluginsFragment : Fragment() {
} }
val searchView = val searchView =
settings_toolbar?.menu?.findItem(R.id.search_button)?.actionView as? RepoSearchView settings_toolbar?.menu?.findItem(R.id.search_button)?.actionView as? SearchView
// Don't go back if active query // Don't go back if active query
settings_toolbar?.setNavigationOnClickListener { settings_toolbar?.setNavigationOnClickListener {
@ -72,7 +76,7 @@ class PluginsFragment : Fragment() {
if (!hasFocus) pluginViewModel.search(null) if (!hasFocus) pluginViewModel.search(null)
} }
searchView?.setOnQueryTextListener(object : android.widget.SearchView.OnQueryTextListener { searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String?): Boolean { override fun onQueryTextSubmit(query: String?): Boolean {
pluginViewModel.search(query) pluginViewModel.search(query)
return true return true
@ -166,13 +170,13 @@ class PluginsFragment : Fragment() {
} }
} }
class RepoSearchView(context: Context) : android.widget.SearchView(context) { // class RepoSearchView(context: Context) : android.widget.SearchView(context) {
// var onActionViewCollapsed = {} // var onActionViewCollapsed = {}
// //
// override fun onActionViewCollapsed() { // override fun onActionViewCollapsed() {
// onActionViewCollapsed() // onActionViewCollapsed()
// } // }
} // }
} }
} }

2
app/src/main/res/menu/repository.xml
View file

@ -5,7 +5,7 @@
android:id="@+id/search_button" android:id="@+id/search_button"
android:icon="@drawable/search_icon" android:icon="@drawable/search_icon"
android:title="@string/title_search" android:title="@string/title_search"
app:actionViewClass="com.lagradost.cloudstream3.ui.settings.extensions.PluginsFragment$Companion$RepoSearchView" app:actionViewClass="android.widget.SearchView"
app:searchHintIcon="@drawable/search_icon" app:searchHintIcon="@drawable/search_icon"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item