From c253a4e415bcdf660418f8e8b8d92a70e98849b5 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sun, 6 Aug 2023 11:26:31 +0200 Subject: [PATCH] fix: show search history when clearing query --- .../java/com/github/libretube/ui/activities/MainActivity.kt | 2 +- .../java/com/github/libretube/ui/fragments/SearchFragment.kt | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt index e188c4c14..269244159 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt @@ -335,7 +335,7 @@ class MainActivity : BaseActivity() { R.id.channelFragment, R.id.playlistFragment ) - if (navController.currentDestination?.id in destIds && newText.isNullOrEmpty()) { + if (navController.currentDestination?.id in destIds && newText == null) { return false } diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt index c42c8d40c..3747ca1e7 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt @@ -33,11 +33,9 @@ class SearchFragment : Fragment() { private val binding get() = _binding!! private val viewModel: SearchViewModel by activityViewModels() - private var query: String? = null - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - query = arguments?.getString(IntentData.query) + viewModel.searchQuery.value = arguments?.getString(IntentData.query) } override fun onCreateView(