TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-16 12:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bottom bar not hiding on device without root

Browse Source
This commit is contained in:
Viktor De Pasquale 2020-09-24 07:53:06 +02:00 committed by John Wu
parent a63d6c03fd
commit 63a9a7d643
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt
View File

@ -10,6 +10,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import com.google.android.material.behavior.HideBottomViewOnScrollBehavior import com.google.android.material.behavior.HideBottomViewOnScrollBehavior
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.Info
import kotlin.math.roundToInt import kotlin.math.roundToInt
class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<V>(), class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<V>(),
@ -98,7 +99,7 @@ class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<
this.lockState = lockState 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 // view is not laid out and drawn yet properly, so animation will not be attached
// hence we just simply hide the view // hence we just simply hide the view
if (!isLaidOut) { if (!isLaidOut) {
@ -107,7 +108,7 @@ class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<
slideDown(view) slideDown(view)
} }
} else { } else {
view.isVisible = true view.isVisible = Info.env.isActive
slideUp(view) slideUp(view)
} }

1
app/src/main/res/layout/activity_main_md2.xml
View File

@ -67,7 +67,6 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/main_bottom_bar" android:id="@+id/main_bottom_bar"
style="@style/WidgetFoundation.Card.Elevated" style="@style/WidgetFoundation.Card.Elevated"
gone="@{!Info.env.isActive}"
android:layout_width="224dp" android:layout_width="224dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"