From 28b394d5eadd313e2178ac35c9b00d3cd8f91bd2 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Tue, 11 Mar 2025 22:26:28 +0800 Subject: [PATCH] Tweak side sheet item style --- .../com/hippo/ehviewer/ui/screen/DownloadsScreen.kt | 10 ++++++---- .../com/hippo/ehviewer/ui/screen/FavoritesScreen.kt | 8 ++++++-- .../com/hippo/ehviewer/ui/screen/GalleryListScreen.kt | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt index e174ab2de..c48dd41d4 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt @@ -42,6 +42,7 @@ import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material.icons.filled.Reorder import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Shuffle +import androidx.compose.material3.CardDefaults import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon @@ -69,6 +70,7 @@ import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.geometry.Offset import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.NestedScrollSource @@ -302,13 +304,13 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) = } var fromIndex by remember { mutableIntStateOf(-1) } FastScrollLazyColumn( - modifier = Modifier.fillMaxSize(), + modifier = Modifier.fillMaxSize().padding(horizontal = 4.dp), state = labelsListState, contentPadding = WindowInsets.systemBars.only(WindowInsetsSides.Bottom).asPaddingValues(), ) { item { ListItem( - modifier = Modifier.clickable { + modifier = Modifier.clip(CardDefaults.shape).clickable { switchLabel("") closeSheet() }, @@ -321,7 +323,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) = } item { ListItem( - modifier = Modifier.clickable { + modifier = Modifier.clip(CardDefaults.shape).clickable { switchLabel(null) closeSheet() }, @@ -379,7 +381,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) = label = "elevation", ) ListItem( - modifier = Modifier.clickable { + modifier = Modifier.clip(CardDefaults.shape).clickable { switchLabel(item) closeSheet() }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt index 0e8048c0a..b92af7937 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.rememberScrollState @@ -23,6 +24,7 @@ import androidx.compose.material.icons.filled.Download import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Shuffle import androidx.compose.material.icons.outlined.FolderSpecial +import androidx.compose.material3.CardDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.ListItem @@ -41,12 +43,14 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.geometry.Offset import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.NestedScrollSource import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import androidx.lifecycle.viewModelScope import androidx.paging.Pager import androidx.paging.PagingConfig @@ -207,14 +211,14 @@ fun AnimatedVisibilityScope.FavouritesScreen(navigator: DestinationsNavigator) = arrayOf(localFav) } Column( - modifier = Modifier.verticalScroll(rememberScrollState()) + modifier = Modifier.verticalScroll(rememberScrollState()).padding(horizontal = 4.dp) .windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Bottom)), ) { faves.forEachIndexed { index, (name, count) -> ListItem( headlineContent = { Text(text = name) }, trailingContent = { Text(text = count.toString(), style = MaterialTheme.typography.bodyLarge) }, - modifier = Modifier.clickable { + modifier = Modifier.clip(CardDefaults.shape).clickable { val newCat = index - 2 refresh(FavListUrlBuilder(newCat)) Settings.recentFavCat = newCat diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt index 427865b22..bf7190029 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.foundation.lazy.itemsIndexed @@ -28,6 +29,7 @@ import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Reorder import androidx.compose.material.icons.filled.Shuffle import androidx.compose.material.icons.outlined.Bookmarks +import androidx.compose.material3.CardDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.ListItem @@ -50,6 +52,7 @@ import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.geometry.Offset import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.NestedScrollSource @@ -254,7 +257,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De ) toplists.forEach { (name, keyword) -> ListItem( - modifier = Modifier.clickable { + modifier = Modifier.padding(horizontal = 4.dp).clip(CardDefaults.shape).clickable { Settings.recentToplist = keyword urlBuilder = ListUrlBuilder(MODE_TOPLIST, mKeyword = keyword) data.refresh() @@ -352,7 +355,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De } var fromIndex by remember { mutableIntStateOf(-1) } FastScrollLazyColumn( - modifier = Modifier.fillMaxSize(), + modifier = Modifier.fillMaxSize().padding(horizontal = 4.dp), state = quickSearchListState, contentPadding = WindowInsets.systemBars.only(WindowInsetsSides.Bottom).asPaddingValues(), ) { @@ -401,7 +404,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De label = "elevation", ) ListItem( - modifier = Modifier.clickable { + modifier = Modifier.clip(CardDefaults.shape).clickable { if (urlBuilder.mode == MODE_WHATS_HOT) { val builder = ListUrlBuilder(item).apply { language = languageFilter