From 5b75afbdc81159f78f2066a7b2224ba918a9bc0e Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 12 May 2023 16:54:39 +0800
Subject: [PATCH] Adjust grid padding

---
 .../hippo/ehviewer/ui/scene/GalleryAdapter.kt | 30 +++++++++----------
 .../hippo/ehviewer/ui/scene/GalleryHolder.kt  |  2 --
 app/src/main/res/values/dimens.xml            |  4 +--
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
index 27a4cfa3d..aaa676c25 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
@@ -63,14 +63,10 @@ abstract class GalleryAdapter(
                         recyclerView.removeItemDecoration(mGirdDecoration!!)
                     }
                     if (null == mListDecoration) {
-                        val interval =
-                            mResources.getDimensionPixelOffset(R.dimen.gallery_list_interval)
-                        val paddingH =
-                            mResources.getDimensionPixelOffset(R.dimen.gallery_list_margin_h)
-                        val paddingV =
-                            mResources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v)
-                        mListDecoration =
-                            MarginItemDecoration(interval, paddingH, paddingV, paddingH, paddingV)
+                        val interval = mResources.getDimensionPixelOffset(R.dimen.gallery_list_interval)
+                        val paddingH = mResources.getDimensionPixelOffset(R.dimen.gallery_list_margin_h)
+                        val paddingV = mResources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v)
+                        mListDecoration = MarginItemDecoration(interval, paddingH, paddingV, paddingH, paddingV)
                     }
                     recyclerView.addItemDecoration(mListDecoration!!)
                     notifyDataSetChanged()
@@ -84,14 +80,16 @@ abstract class GalleryAdapter(
                         recyclerView.removeItemDecoration(mListDecoration!!)
                     }
                     if (null == mGirdDecoration) {
-                        val interval =
-                            mResources.getDimensionPixelOffset(R.dimen.gallery_grid_interval)
-                        val paddingH =
-                            mResources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_h)
-                        val paddingV =
-                            mResources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_v)
-                        mGirdDecoration =
-                            MarginItemDecoration(interval, paddingH, paddingV, paddingH, paddingV)
+                        val interval = mResources.getDimensionPixelOffset(R.dimen.gallery_grid_interval)
+                        val paddingH = mResources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_h)
+                        val paddingV = mResources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_v)
+                        mGirdDecoration = MarginItemDecoration(interval, 0, 0, 0, 0)
+                        recyclerView.setPadding(
+                            recyclerView.paddingLeft + paddingH,
+                            recyclerView.paddingTop + paddingV,
+                            recyclerView.paddingRight + paddingH,
+                            recyclerView.paddingBottom + paddingV,
+                        )
                     }
                     recyclerView.addItemDecoration(mGirdDecoration!!)
                     notifyDataSetChanged()
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
index 7085a8f34..44a5276c3 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
@@ -16,7 +16,6 @@
 package com.hippo.ehviewer.ui.scene
 
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.unit.dp
@@ -65,7 +64,6 @@ class GridGalleryHolder(private val composeView: ComposeView) : GalleryHolder(co
                 onClick = onClick,
                 onLongClick = onLongClick,
                 info = galleryInfo,
-                modifier = Modifier.padding(2.dp),
             )
         }
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ae2ff0e61..5b67942a0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -43,9 +43,9 @@
     <dimen name="gallery_list_margin_v">4dp</dimen>
 
     <!-- 4dp - 4dp, 4dp for card padding -->
-    <dimen name="gallery_grid_interval">0dp</dimen>
+    <dimen name="gallery_grid_interval">4dp</dimen>
     <!-- 8dp - 4dp, 4dp for card padding -->
-    <dimen name="gallery_grid_margin_h">4dp</dimen>
+    <dimen name="gallery_grid_margin_h">12dp</dimen>
     <!-- 8dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_grid_margin_v">4dp</dimen>