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

(cherry picked from commit 5cd11ad8c357d1057474dc0ab660068f7982573d)
This commit is contained in:
Ivan Iskandar 2022-01-30 01:55:33 +07:00 committed by Jobobby04
parent 454edf3ea2
commit 2003f6843d

View File

@ -221,17 +221,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(
@ -254,6 +243,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
@ -391,7 +391,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
override fun onResume() {
super.onResume()
checkForUpdates()
syncActivityViewWithController()
}
private fun checkForUpdates() {