From f6061ba00e0b7714f6490142ed9c57e56b62d33f Mon Sep 17 00:00:00 2001 From: Viktor De Pasquale Date: Thu, 24 Oct 2019 18:07:36 +0200 Subject: [PATCH] Fixed bottom navigation popping up when it shouldn't --- .../java/com/topjohnwu/magisk/redesign/MainActivity.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt index 02871a3af..6563bb886 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt @@ -84,6 +84,11 @@ open class MainActivity : CompatActivity( if (intent.getBooleanExtra(Const.Key.OPEN_SETTINGS, false)) { binding.mainNavigation.selectedItemId = R.id.settingsFragment } + + if (savedInstanceState != null) { + onTabTransaction(null, -1) + onFragmentTransaction(null, FragNavController.TransactionType.PUSH) + } } override fun onResume() { @@ -128,8 +133,8 @@ open class MainActivity : CompatActivity( binding.mainBottomBar.animate() .translationY(translation.toFloat()) .setInterpolator(FastOutSlowInInterpolator()) - .withStartAction { if (translation == 0) binding.mainBottomBar.isVisible = true } - .withEndAction { if (translation > 0) binding.mainBottomBar.isVisible = false } + .withStartAction { if (navigation.isRoot) binding.mainBottomBar.isVisible = true } + .withEndAction { if (!navigation.isRoot) binding.mainBottomBar.isVisible = false } .start() }