mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-07 03:07:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bottom nav showing on resume when action mode is active (#6514)

Browse Source
This commit is contained in:
Ivan Iskandar 2022-01-30 01:55:33 +07:00 committed by GitHub
parent 6bba52a2b6
commit 5cd11ad8c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -194,17 +194,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
val container: ViewGroup = binding.controllerContainer
router = Conductor.attachRouter(this, container, savedInstanceState)
if (!router.hasRootController()) {
// Set start screen
if (!handleIntentAction(intent)) {
setSelectedNavItem(startScreenId)
}
}
binding.toolbar.setNavigationOnClickListener {
onBackPressed()
}
router.addChangeListener(
object : ControllerChangeHandler.ControllerChangeListener {
override fun onChangeStarted(
@ -227,6 +216,17 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
}
}
)
if (!router.hasRootController()) {
// Set start screen
if (!handleIntentAction(intent)) {
setSelectedNavItem(startScreenId)
}
}
syncActivityViewWithController()
binding.toolbar.setNavigationOnClickListener {
onBackPressed()
}
if (savedInstanceState == null) {
// Reset Incognito Mode on relaunch
@ -337,7 +337,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
override fun onResume() {
super.onResume()
checkForUpdates()
syncActivityViewWithController()
}
private fun checkForUpdates() {