kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1218 from Nephys222/BackPress

Browse Source 
fix for searchview anormal behavior
This commit is contained in:
Bnyro 2022-09-06 19:00:00 +02:00 committed by GitHub
commit a4b722138e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/github/libretube/activities/MainActivity.kt
View File

@ -162,8 +162,6 @@ class MainActivity : BaseActivity() {
// new way of handling back presses // new way of handling back presses
onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) { onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
// remove focus from search
removeSearchFocus()
navController.popBackStack(R.id.searchFragment, false) navController.popBackStack(R.id.searchFragment, false)
if (binding.mainMotionLayout.progress == 0F) { if (binding.mainMotionLayout.progress == 0F) {
@ -260,6 +258,7 @@ class MainActivity : BaseActivity() {
val bundle = Bundle() val bundle = Bundle()
bundle.putString("query", query) bundle.putString("query", query)
navController.navigate(R.id.searchResultFragment, bundle) navController.navigate(R.id.searchResultFragment, bundle)
searchViewModel.setQuery("")
return true return true
} }
@ -284,24 +283,12 @@ class MainActivity : BaseActivity() {
override fun onMenuItemActionCollapse(p0: MenuItem): Boolean { override fun onMenuItemActionCollapse(p0: MenuItem): Boolean {
val currentFragmentId = navController.currentDestination?.id val currentFragmentId = navController.currentDestination?.id
if (currentFragmentId == R.id.searchFragment || currentFragmentId == R.id.searchResultFragment) { if (currentFragmentId == R.id.searchFragment || currentFragmentId == R.id.searchResultFragment) {
try { navController.popBackStack()
onBackPressedDispatcher.onBackPressed()
} catch (e: Exception) {
e.printStackTrace()
}
} }
return true return true
} }
} }
) )
searchView.setOnCloseListener {
if (navController.currentDestination?.id == R.id.searchFragment) {
searchViewModel.setQuery(null)
onBackPressedDispatcher.onBackPressed()
}
false
}
return super.onCreateOptionsMenu(menu) return super.onCreateOptionsMenu(menu)
} }