yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Adjust padding"

Browse Source 
This reverts commit 743bd951c8.
This commit is contained in:
tarsin committed 2023-05-12 16:42:46 +08:00
1 parent 743bd951c8
commit f7b9be3bc5
5 files changed
+7 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
-1
View File
@@ -126,7 +126,6 @@ class HistoryScene : BaseScene() {
) { paddingValues ->
LazyColumnWithScrollBar(
contentPadding = paddingValues,
verticalArrangement = Arrangement.spacedBy(12.dp),
) {
items(
count = historyData.itemCount,
app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
+3 -4
View File
@@ -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)) {
app/src/main/java/com/hippo/ehviewer/ui/widget/LazyColumn.kt
-3
View File
@@ -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)) {
app/src/main/res/values-sw600dp/dimens.xml
+1 -1
View File
@@ -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 -->
app/src/main/res/values/dimens.xml
+3 -3
View File
@@ -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 -->