From 6ac2a7150f0f166d0cb4ba9cd8d7aff25692057c Mon Sep 17 00:00:00 2001 From: KotlinGeekDev Date: Wed, 24 Sep 2025 11:50:15 +0100 Subject: [PATCH] Change appearance of CustomSetItem. Use horizontal dividers instead of rounded borders. Adjust padding. --- .../amethyst/ui/screen/loggedIn/lists/CustomSetItem.kt | 10 +--------- .../ui/screen/loggedIn/lists/FollowSetFeedView.kt | 6 ++++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomSetItem.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomSetItem.kt index 35737d74b..26cdf279e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomSetItem.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomSetItem.kt @@ -20,14 +20,12 @@ */ package com.vitorpamplona.amethyst.ui.screen.loggedIn.lists -import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.People import androidx.compose.material3.AlertDialog @@ -54,7 +52,6 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.withStyle -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.vitorpamplona.amethyst.R @@ -79,12 +76,7 @@ fun CustomSetItem( Row( modifier = modifier - .clickable(onClick = onFollowSetClick) - .border( - width = Dp.Hairline, - color = Color.Gray, - shape = RoundedCornerShape(percent = 20), - ).padding(horizontal = 10.dp), + .clickable(onClick = onFollowSetClick), ) { Row( modifier = diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/FollowSetFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/FollowSetFeedView.kt index 93921305d..4e524a0d8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/FollowSetFeedView.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/FollowSetFeedView.kt @@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -38,6 +39,7 @@ import com.vitorpamplona.amethyst.ui.feeds.FeedError import com.vitorpamplona.amethyst.ui.feeds.LoadingFeed import com.vitorpamplona.amethyst.ui.feeds.RefresheableBox import com.vitorpamplona.amethyst.ui.stringRes +import com.vitorpamplona.amethyst.ui.theme.DividerThickness import com.vitorpamplona.amethyst.ui.theme.FeedPadding import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer @@ -102,7 +104,7 @@ fun FollowSetLoaded( ) { itemsIndexed(loadedFeedState, key = { _, item -> item.identifierTag }) { _, set -> CustomSetItem( - modifier = Modifier.animateItem(), + modifier = Modifier.fillMaxSize().animateItem(), followSet = set, onFollowSetClick = { onItemClick(set.identifierTag) @@ -114,7 +116,7 @@ fun FollowSetLoaded( onItemDelete(set) }, ) - Spacer(modifier = StdVertSpacer) + HorizontalDivider(thickness = DividerThickness) } } }