From f7b9be3bc550d7b5a7113234a8debc11f3bf1cb2 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 12 May 2023 16:42:46 +0800
Subject: [PATCH] Revert "Adjust padding"

This reverts commit 743bd951c86690078fe852080091844a530ae25f.
---
 .../main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt  | 1 -
 .../java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt   | 7 +++----
 .../main/java/com/hippo/ehviewer/ui/widget/LazyColumn.kt   | 3 ---
 app/src/main/res/values-sw600dp/dimens.xml                 | 2 +-
 app/src/main/res/values/dimens.xml                         | 6 +++---
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
index c12aa084e..95edcf6ab 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
@@ -126,7 +126,6 @@ class HistoryScene : BaseScene() {
                 ) { paddingValues ->
                     LazyColumnWithScrollBar(
                         contentPadding = paddingValues,
-                        verticalArrangement = Arrangement.spacedBy(12.dp),
                     ) {
                         items(
                             count = historyData.itemCount,
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
index 46e4f06ef..d0283c95d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -46,9 +45,9 @@ fun GalleryInfoListItem(
     isInFavScene: Boolean = false,
     showPages: Boolean = false,
 ) {
-    CrystalCard(modifier = modifier) {
+    CrystalCard(modifier = Modifier.padding(6.dp)) {
         Row(
-            modifier = Modifier.combinedClickable(
+            modifier = modifier.combinedClickable(
                 onClick = onClick,
                 onLongClick = onLongClick,
             ),
@@ -56,7 +55,7 @@ fun GalleryInfoListItem(
             Card {
                 EhAsyncCropThumb(
                     model = info.thumb,
-                    modifier = Modifier.aspectRatio(0.6666667F).fillMaxSize(),
+                    modifier = modifier.aspectRatio(0.6666667F),
                 )
             }
             Column(modifier = Modifier.padding(8.dp, 4.dp)) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/LazyColumn.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/LazyColumn.kt
index 5d754a485..8bc4ffeaf 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/LazyColumn.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/LazyColumn.kt
@@ -1,6 +1,5 @@
 package com.hippo.ehviewer.ui.widget
 
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
@@ -19,7 +18,6 @@ fun LazyColumnWithScrollBar(
     modifier: Modifier = Modifier,
     state: LazyListState = rememberLazyListState(),
     contentPadding: PaddingValues = PaddingValues(0.dp),
-    verticalArrangement: Arrangement.Vertical,
     content: LazyListScope.() -> Unit,
 ) = Box(
     modifier = modifier,
@@ -28,7 +26,6 @@ fun LazyColumnWithScrollBar(
         modifier = Modifier,
         state = state,
         contentPadding = contentPadding,
-        verticalArrangement = verticalArrangement,
         content = content,
     )
     Box(modifier = Modifier.padding(contentPadding)) {
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index bbf0a0dbc..9984d4bdf 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -22,7 +22,7 @@
     <dimen name="strip_item_padding">12dp</dimen>
 
     <!-- 8dp - 4dp, 4dp for card padding -->
-    <dimen name="gallery_list_interval">16dp</dimen>
+    <dimen name="gallery_list_interval">4dp</dimen>
     <!-- 24dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_margin_h">20dp</dimen>
     <!-- 24dp - 4dp, 4dp for card padding -->
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 73e592521..ae2ff0e61 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -36,14 +36,14 @@
     <dimen name="rating_interval">1dp</dimen>
 
     <!-- 4dp - 4dp, 4dp for card padding -->
-    <dimen name="gallery_list_interval">12dp</dimen>
+    <dimen name="gallery_list_interval">0dp</dimen>
     <!-- 8dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_margin_h">4dp</dimen>
     <!-- 8dp - 4dp, 4dp for card padding -->
-    <dimen name="gallery_list_margin_v">10dp</dimen>
+    <dimen name="gallery_list_margin_v">4dp</dimen>
 
     <!-- 4dp - 4dp, 4dp for card padding -->
-    <dimen name="gallery_grid_interval">2dp</dimen>
+    <dimen name="gallery_grid_interval">0dp</dimen>
     <!-- 8dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_grid_margin_h">4dp</dimen>
     <!-- 8dp - 4dp, 4dp for card padding -->