Fix search being cleared sometimes

mediathekview · Dec 23, 2023 · 992d746 · 992d746
1 parent c35a496
commit 992d746
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/main/MainActivity.kt b/app/src/main/java/de/christinecoenen/code/zapp/app/main/MainActivity.kt
@@ -23,7 +23,11 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.navOptions
-import androidx.navigation.ui.*
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.navigateUp
+import androidx.navigation.ui.onNavDestinationSelected
+import androidx.navigation.ui.setupActionBarWithNavController
+import androidx.navigation.ui.setupWithNavController
 import androidx.preference.PreferenceManager
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
@@ -140,8 +144,11 @@ class MainActivity : AppCompatActivity(), MenuProvider {
 				}
 			}
 			it.editText.setOnFocusChangeListener { _, hasFocus ->
-				if (hasFocus) {
-					searchViewModel.enterQueryMode()
+				if (hasFocus &&
+					it.currentTransitionState != SearchView.TransitionState.SHOWN &&
+					navController.currentDestination?.id != R.id.searchResultsFragment
+				) {
+					searchViewModel.enterNewSearch()
 				}
 			}
 			it.editText.setOnEditorActionListener { _, _, _ ->

diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/search/SearchViewModel.kt b/app/src/main/java/de/christinecoenen/code/zapp/app/search/SearchViewModel.kt
@@ -173,13 +173,17 @@ class SearchViewModel(
 		}
 	}
 
-	fun enterQueryMode() {
+	fun enterNewSearch() {
+		_searchState.tryEmit(SeachState.Query)
+		clearTempData()
+	}
+
+	fun enterLastSearch() {
 		_searchState.tryEmit(SeachState.Query)
 	}
 
 	fun exitToNone() {
 		_searchState.tryEmit(SeachState.None)
-		clearTempData()
 	}
 
 	fun exitToResults() {

diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/search/results/SearchResultsFragment.kt b/app/src/main/java/de/christinecoenen/code/zapp/app/search/results/SearchResultsFragment.kt
@@ -125,7 +125,7 @@ class SearchResultsFragment : Fragment(), MenuProvider, MediathekShowListItemLis
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
 		return when (menuItem.itemId) {
 			R.id.menu_search -> {
-				viewModel.enterQueryMode()
+				viewModel.enterLastSearch()
 				true
 			}
 
@@ -134,7 +134,7 @@ class SearchResultsFragment : Fragment(), MenuProvider, MediathekShowListItemLis
 	}
 
 	override fun onToolbarClicked() {
-		viewModel.enterQueryMode()
+		viewModel.enterLastSearch()
 	}
 
 	override fun onShowClicked(show: MediathekShow) {