From 9fba4aa1afe6b2c66c713997d3905cda1b97cbc1 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 12 May 2023 17:07:52 +0800 Subject: [PATCH] Use FlowRow for labels on cards --- .../omnivore/omnivore/ui/components/LabelChip.kt | 2 +- .../omnivore/ui/savedItemViews/SavedItemCard.kt | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelChip.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelChip.kt index f6ece7532..63acda680 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelChip.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelChip.kt @@ -16,7 +16,7 @@ fun LabelChip( modifier: Modifier = Modifier.padding(0.dp), ) { Surface( - modifier = modifier.padding(4.dp), + modifier = modifier.padding(2.dp), shape = MaterialTheme.shapes.medium, color = colors.containerColor ) { diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/savedItemViews/SavedItemCard.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/savedItemViews/SavedItemCard.kt index 1de03a3b1..3abedc409 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/savedItemViews/SavedItemCard.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/savedItemViews/SavedItemCard.kt @@ -31,7 +31,7 @@ import app.omnivore.omnivore.ui.library.SavedItemAction import app.omnivore.omnivore.ui.library.SavedItemViewModel import coil.compose.rememberAsyncImagePainter -@OptIn(ExperimentalFoundationApi::class) +@OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class) @Composable fun SavedItemCard(savedItemViewModel: SavedItemViewModel, savedItem: SavedItemWithLabelsAndHighlights, onClickHandler: () -> Unit, actionHandler: (SavedItemAction) -> Unit) { val listState = rememberLazyListState() @@ -96,21 +96,14 @@ fun SavedItemCard(savedItemViewModel: SavedItemViewModel, savedItem: SavedItemWi ) } - LazyRow( - state = listState, - horizontalArrangement = Arrangement.Start, - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .padding(start = 5.dp, bottom = 5.dp, end = 10.dp) - ) { - items(savedItem.labels.sortedWith(compareBy { it.name.toLowerCase(Locale.current) })) { label -> + FlowRow(modifier = Modifier.fillMaxWidth().padding(10.dp)) { + savedItem.labels.sortedWith(compareBy { it.name.toLowerCase(Locale.current) }).forEach { label -> val chipColors = LabelChipColors.fromHex(label.color) LabelChip( name = label.name, colors = chipColors, ) - } }