From 51402e68d2c359423117cab73c526ab8ef0f61d4 Mon Sep 17 00:00:00 2001 From: Viktor De Pasquale Date: Tue, 24 Mar 2020 15:52:02 +0100 Subject: [PATCH] Fixed log not displaying back button when alternative view is shown --- app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt | 2 +- app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt index 08225faa0..e691903d3 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt @@ -137,7 +137,7 @@ open class MainActivity : BaseUIActivity( viewModel.insets.value = insets } - private fun setDisplayHomeAsUpEnabled(isEnabled: Boolean) { + fun setDisplayHomeAsUpEnabled(isEnabled: Boolean) { binding.mainToolbar.startAnimations() when { isEnabled -> binding.mainToolbar.setNavigationIcon(R.drawable.ic_back_md2) diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt index e36d725ac..f53679f95 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt @@ -24,7 +24,10 @@ class LogFragment : BaseUIFragment() { set(value) { MotionRevealHelper.withViews(binding.logFilter, binding.logFilterToggle, value) actionSave?.isVisible = !value - (activity as MainActivity).invalidateToolbar() + with(activity as MainActivity) { + invalidateToolbar() + setDisplayHomeAsUpEnabled(value) + } } override fun onStart() {