From 1e6a17b7a6989ab94eff33e87867ddf4b2836e6a Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Wed, 17 Mar 2021 21:28:16 +0800
Subject: [PATCH] Fix paddings

---
 .../java/com/hippo/ehviewer/ui/scene/DownloadsScene.java    | 2 +-
 .../main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java | 2 +-
 app/src/main/java/com/hippo/widget/ContentLayout.java       | 4 +---
 app/src/main/res/layout/scene_gallery_previews.xml          | 6 +++++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
index 588214449..cc5cbae2e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -377,7 +377,7 @@ public class DownloadsScene extends ToolbarScene
             mRecyclerView.scrollToPosition(mInitPosition);
             mInitPosition = -1;
         }
-        RecyclerViewKt.addVerticalPadding(mRecyclerView, paddingV / 2, 0);
+        RecyclerViewKt.addVerticalPadding(mRecyclerView, 4, 4);
         RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true);
 
         mFastScroller.attachToRecyclerView(mRecyclerView);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
index ef6032dcf..848c881d1 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
@@ -233,7 +233,7 @@ public class HistoryScene extends ToolbarScene {
         guardManager.attachRecyclerView(mRecyclerView);
         swipeManager.attachRecyclerView(mRecyclerView);
         RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true);
-        RecyclerViewKt.addVerticalPadding(mRecyclerView, paddingV / 2, 0);
+        RecyclerViewKt.addVerticalPadding(mRecyclerView, 4, 4);
 
         mFastScroller.attachToRecyclerView(mRecyclerView);
         HandlerDrawable handlerDrawable = new HandlerDrawable();
diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java
index d5bd338ff..8e5d821fc 100644
--- a/app/src/main/java/com/hippo/widget/ContentLayout.java
+++ b/app/src/main/java/com/hippo/widget/ContentLayout.java
@@ -124,9 +124,7 @@ public class ContentLayout extends FrameLayout {
                 resources.getColor(R.color.loading_indicator_orange));
         mBottomProgress.setIndeterminateAnimationType(LinearProgressIndicator.INDETERMINATE_ANIMATION_TYPE_CONTIGUOUS);
 
-        int paddingV = resources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v);
-
-        RecyclerViewKt.addVerticalPadding(mRecyclerView, paddingV / 2, paddingV / 2);
+        RecyclerViewKt.addVerticalPadding(mRecyclerView, 4, 4);
         RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true);
 
         mRecyclerViewOriginBottom = mRecyclerView.getPaddingBottom();
diff --git a/app/src/main/res/layout/scene_gallery_previews.xml b/app/src/main/res/layout/scene_gallery_previews.xml
index 3285305a5..aa985af14 100644
--- a/app/src/main/res/layout/scene_gallery_previews.xml
+++ b/app/src/main/res/layout/scene_gallery_previews.xml
@@ -15,6 +15,10 @@
   -->
 
 <com.hippo.widget.ContentLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/content_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:clipChildren="false"
+    app:fitSystemWindowsInsets="bottom" />