Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

(cherry picked from commit 593091a5e304eff771604ff2a91cdc0c886c4d68)
This commit is contained in:
arkon 2021-10-23 17:30:56 -04:00 committed by Jobobby04
parent e28d72bf9c
commit d8407e20da
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

@ -244,7 +244,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
@ -376,6 +376,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
syncActivityViewWithController()
checkForUpdates() checkForUpdates()
} }
@ -544,7 +545,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
} }