From 2106751ea4d5d778bc8bd60d008669663666837a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=8B=E9=A1=B5?=
 <31466456+canyie@users.noreply.github.com>
Date: Fri, 3 Jun 2022 18:21:56 +0800
Subject: [PATCH] Fix SnackBar shows behind window insets

---
 .../com/topjohnwu/magisk/arch/BaseFragment.kt |  1 +
 .../com/topjohnwu/magisk/ui/MainActivity.kt   |  5 +++
 .../topjohnwu/magisk/ui/log/LogFragment.kt    |  3 ++
 .../magisk/ui/settings/SettingsFragment.kt    |  1 +
 .../main/res/layout/fragment_settings_md2.xml | 39 ++++++++++++-------
 .../main/res/layout/include_log_superuser.xml |  6 +++
 6 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt b/app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt
index 227dee6f6..7891a4ed9 100644
--- a/app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt
@@ -20,6 +20,7 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
     protected abstract val layoutRes: Int
 
     private val navigation get() = activity?.navigation
+    open val snackbarView: View? get() = null
     open val snackbarAnchorView: View? get() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
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 38b75b851..32d9baaa0 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
@@ -36,6 +36,11 @@ class MainActivity : BaseMainActivity<ActivityMainMd2Binding>() {
     override val layoutRes = R.layout.activity_main_md2
     override val viewModel by viewModel<MainViewModel>()
     override val navHostId: Int = R.id.main_nav_host
+    override val snackbarView: View
+        get() {
+            val fragmentOverride = currentFragment?.snackbarView
+            return fragmentOverride ?: super.snackbarView
+        }
     override val snackbarAnchorView: View?
         get() {
             val fragmentAnchor = currentFragment?.snackbarAnchorView
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 afc6f6ce5..d20fb7c11 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
@@ -20,6 +20,9 @@ class LogFragment : BaseFragment<FragmentLogMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_log_md2
     override val viewModel by viewModel<LogViewModel>()
+    override val snackbarView: View?
+        get() = if (isMagiskLogVisible) binding.logFilterSuperuser.snackbarContainer
+                else super.snackbarView
     override val snackbarAnchorView get() = binding.logFilterToggle
 
     private var actionSave: MenuItem? = null
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
index 2da40183d..a41f7b72f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
@@ -14,6 +14,7 @@ class SettingsFragment : BaseFragment<FragmentSettingsMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_settings_md2
     override val viewModel by viewModel<SettingsViewModel>()
+    override val snackbarView: View get() = binding.snackbarContainer
 
     override fun onStart() {
         super.onStart()
diff --git a/app/src/main/res/layout/fragment_settings_md2.xml b/app/src/main/res/layout/fragment_settings_md2.xml
index c28e319ee..c06570d00 100644
--- a/app/src/main/res/layout/fragment_settings_md2.xml
+++ b/app/src/main/res/layout/fragment_settings_md2.xml
@@ -13,20 +13,31 @@
 
     </data>
 
-    <androidx.recyclerview.widget.RecyclerView
-        app:items="@{viewModel.items}"
-        app:extraBindings="@{viewModel.extraBindings}"
-        android:id="@+id/settings_list"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusableInTouchMode="false"
-        android:clipToPadding="false"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/internal_action_bar_size"
-        app:fitsSystemWindowsInsets="top|bottom"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:layout_marginTop="24dp"
-        tools:listitem="@layout/item_settings"
-        tools:paddingTop="@dimen/l1" />
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            app:items="@{viewModel.items}"
+            app:extraBindings="@{viewModel.extraBindings}"
+            android:id="@+id/settings_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusableInTouchMode="false"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/internal_action_bar_size"
+            app:fitsSystemWindowsInsets="top|bottom"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:layout_marginTop="24dp"
+            tools:listitem="@layout/item_settings"
+            tools:paddingTop="@dimen/l1" />
+
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/snackbar_container"
+            app:fitsSystemWindowsInsets="top|bottom"/>
+    </FrameLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/include_log_superuser.xml b/app/src/main/res/layout/include_log_superuser.xml
index e62903c2d..29585642e 100644
--- a/app/src/main/res/layout/include_log_superuser.xml
+++ b/app/src/main/res/layout/include_log_superuser.xml
@@ -43,6 +43,12 @@
 
         </FrameLayout>
 
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/snackbar_container"
+            app:fitsSystemWindowsInsets="top|bottom"/>
+
     </FrameLayout>
 
 </layout>