From 63a9a7d643a58c99af522a3280e4cec53555132a Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Thu, 24 Sep 2020 07:53:06 +0200
Subject: [PATCH] Fixed bottom bar not hiding on device without root

---
 .../topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt | 5 +++--
 app/src/main/res/layout/activity_main_md2.xml                | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt b/app/src/main/java/com/topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt
index 68aa24273..9bbcf4dee 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt
@@ -10,6 +10,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.google.android.material.behavior.HideBottomViewOnScrollBehavior
 import com.google.android.material.snackbar.Snackbar
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Info
 import kotlin.math.roundToInt
 
 class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<V>(),
@@ -98,7 +99,7 @@ class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<
             this.lockState = lockState
         }
 
-        if (hide) {
+        if (hide || !Info.env.isActive) {
             // view is not laid out and drawn yet properly, so animation will not be attached
             // hence we just simply hide the view
             if (!isLaidOut) {
@@ -107,7 +108,7 @@ class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<
                 slideDown(view)
             }
         } else {
-            view.isVisible = true
+            view.isVisible = Info.env.isActive
             slideUp(view)
         }
 
diff --git a/app/src/main/res/layout/activity_main_md2.xml b/app/src/main/res/layout/activity_main_md2.xml
index 725fc93ba..cd0133e27 100644
--- a/app/src/main/res/layout/activity_main_md2.xml
+++ b/app/src/main/res/layout/activity_main_md2.xml
@@ -67,7 +67,6 @@
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/main_bottom_bar"
             style="@style/WidgetFoundation.Card.Elevated"
-            gone="@{!Info.env.isActive}"
             android:layout_width="224dp"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center_horizontal"