Fix bottom nav showing on resume when action mode is active (#6514)
Cette révision appartient à :
Parent
6bba52a2b6
révision
5cd11ad8c3
1 fichiers modifiés avec 11 ajouts et 12 suppressions
|
@ -194,17 +194,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
|
||||||
|
|
||||||
val container: ViewGroup = binding.controllerContainer
|
val container: ViewGroup = binding.controllerContainer
|
||||||
router = Conductor.attachRouter(this, container, savedInstanceState)
|
router = Conductor.attachRouter(this, container, savedInstanceState)
|
||||||
if (!router.hasRootController()) {
|
|
||||||
// Set start screen
|
|
||||||
if (!handleIntentAction(intent)) {
|
|
||||||
setSelectedNavItem(startScreenId)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
binding.toolbar.setNavigationOnClickListener {
|
|
||||||
onBackPressed()
|
|
||||||
}
|
|
||||||
|
|
||||||
router.addChangeListener(
|
router.addChangeListener(
|
||||||
object : ControllerChangeHandler.ControllerChangeListener {
|
object : ControllerChangeHandler.ControllerChangeListener {
|
||||||
override fun onChangeStarted(
|
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) {
|
if (savedInstanceState == null) {
|
||||||
// Reset Incognito Mode on relaunch
|
// Reset Incognito Mode on relaunch
|
||||||
|
@ -337,7 +337,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
checkForUpdates()
|
checkForUpdates()
|
||||||
syncActivityViewWithController()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun checkForUpdates() {
|
private fun checkForUpdates() {
|
||||||
|
|
Référencer dans un nouveau ticket