github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-12-29 03:53:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync view state with controller on activity resume

Browse source 
Hopefully fixes some weird states where the bottom nav shows up when it shouldn't.
This commit is contained in:
arkon 2021-10-23 17:30:56 -04:00
parent 22ed163c8f
commit 593091a5e3
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -215,7 +215,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
} }
) )
syncActivityViewWithController(router.backstack.lastOrNull()?.controller) syncActivityViewWithController()
if (savedInstanceState == null) { if (savedInstanceState == null) {
// Reset Incognito Mode on relaunch // Reset Incognito Mode on relaunch
@ -320,6 +320,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
syncActivityViewWithController()
checkForUpdates() checkForUpdates()
} }
@ -488,7 +489,11 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
} }
} }
private fun syncActivityViewWithController(to: Controller?, from: Controller? = null, isPush: Boolean = true) { private fun syncActivityViewWithController(
to: Controller? = router.backstack.lastOrNull()?.controller,
from: Controller? = null,
isPush: Boolean = true,
) {
if (from is DialogController || to is DialogController) { if (from is DialogController || to is DialogController) {
return return
} }