Fix bottom nav showing on resume when action mode is active (#6514)
This commit is contained in:
parent
6bba52a2b6
commit
5cd11ad8c3
@ -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() {
|
||||
|
Loading…
Reference in New Issue
Block a user