From 2159a399bb3a813ab538da74fdaaefb06b94ff99 Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Sun, 21 Mar 2021 09:37:04 +0800
Subject: [PATCH] Fix preference fragments

---
 app/src/main/res/layout/activity_filter.xml   | 30 ++++++++-----------
 app/src/main/res/layout/activity_hosts.xml    | 29 ++++++++----------
 .../main/res/layout/activity_preference.xml   |  3 +-
 .../res/layout/preference_recyclerview.xml    |  3 +-
 4 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/app/src/main/res/layout/activity_filter.xml b/app/src/main/res/layout/activity_filter.xml
index 39e55b22a..0d333c198 100644
--- a/app/src/main/res/layout/activity_filter.xml
+++ b/app/src/main/res/layout/activity_filter.xml
@@ -36,23 +36,17 @@
         android:text="@string/no_filter"
         app:fitSystemWindowsInsets="bottom" />
 
-    <com.hippo.widget.FabLayout
-        android:id="@+id/fab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingRight="@dimen/corner_fab_margin"
-        android:paddingBottom="@dimen/corner_fab_margin"
-        app:fitSystemWindowsInsets="bottom">
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/fab"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:backgroundTint="?attr/widgetColorThemePrimary"
-            app:srcCompat="@drawable/v_plus_dark_x24"
-            app:tint="#fff" />
-
-    </com.hippo.widget.FabLayout>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/fab"
+        style="@style/Widget.MaterialComponents.FloatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/corner_fab_margin"
+        android:layout_marginBottom="@dimen/corner_fab_margin"
+        android:layout_gravity="bottom|end"
+        app:backgroundTint="?attr/widgetColorThemePrimary"
+        app:srcCompat="@drawable/v_plus_dark_x24"
+        app:tint="#fff"
+        app:layout_fitSystemWindowsInsets="bottom" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/activity_hosts.xml b/app/src/main/res/layout/activity_hosts.xml
index cf60b93c2..c3b1bd626 100644
--- a/app/src/main/res/layout/activity_hosts.xml
+++ b/app/src/main/res/layout/activity_hosts.xml
@@ -37,22 +37,17 @@
         android:textSize="@dimen/text_super_large"
         app:fitSystemWindowsInsets="bottom" />
 
-    <com.hippo.widget.FabLayout
-        android:id="@+id/fab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingRight="@dimen/corner_fab_margin"
-        android:paddingBottom="@dimen/corner_fab_margin"
-        app:fitSystemWindowsInsets="bottom">
+    <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/fab"
+        style="@style/Widget.MaterialComponents.FloatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/corner_fab_margin"
+        android:layout_marginBottom="@dimen/corner_fab_margin"
+        android:layout_gravity="bottom|end"
+        app:backgroundTint="?attr/widgetColorThemePrimary"
+        app:srcCompat="@drawable/v_plus_dark_x24"
+        app:tint="#fff"
+        app:layout_fitSystemWindowsInsets="bottom" />
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/fab"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:backgroundTint="?attr/widgetColorThemePrimary"
-            app:srcCompat="@drawable/v_plus_dark_x24"
-            app:tint="#fff" />
-
-    </com.hippo.widget.FabLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/activity_preference.xml b/app/src/main/res/layout/activity_preference.xml
index 635c04846..dfc4a9c4c 100644
--- a/app/src/main/res/layout/activity_preference.xml
+++ b/app/src/main/res/layout/activity_preference.xml
@@ -28,6 +28,7 @@
         android:id="@+id/fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipChildren="false" />
+        android:clipChildren="false"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </com.hippo.widget.SafeCoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_recyclerview.xml b/app/src/main/res/layout/preference_recyclerview.xml
index 0e1bd4fe1..9a8b7f625 100644
--- a/app/src/main/res/layout/preference_recyclerview.xml
+++ b/app/src/main/res/layout/preference_recyclerview.xml
@@ -26,9 +26,8 @@
     android:layout_height="match_parent"
     android:clipToPadding="false"
     android:fadeScrollbars="true"
-    android:paddingTop="?actionBarSize"
     android:scrollbarStyle="outsideOverlay"
     android:scrollbars="vertical"
-    app:fitSystemWindowsInsets="bottom|top"
+    app:fitSystemWindowsInsets="bottom"
     tools:ignore="UnusedResources"
     tools:viewBindingIgnore="true" />
\ No newline at end of file