TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-23 18:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

No KeyDispatch or OnBackPress when no currentFocus

Browse Source
This commit is contained in:
LoveSy 2023-03-08 10:36:48 +08:00 committed by John Wu
parent 4709a32641
commit e14f7b6908
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
View File

@ -20,12 +20,16 @@ abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Bindin
val navigation: NavController get() = navHostFragment.navController
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
return currentFragment?.onKeyEvent(event) == true || super.dispatchKeyEvent(event)
return currentFocus?.let {
currentFragment?.onKeyEvent(event).takeIf { it == true }
} ?: super.dispatchKeyEvent(event)
}
override fun onBackPressed() {
if (currentFragment?.onBackPressed()?.not() == true) {
super.onBackPressed()
currentFocus?.let {
if (currentFragment?.onBackPressed() == false) {
super.onBackPressed()
}
}
}