diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/library/LibraryView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/library/LibraryView.kt index f619d0dbf..6240d8d71 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/library/LibraryView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/library/LibraryView.kt @@ -473,11 +473,6 @@ fun LibraryViewContent( val intent = Intent(context, activityClass) intent.putExtra("SAVED_ITEM_SLUG", currentItem.slug) context.startActivity(intent) - }, - actionHandler = { - onSavedItemAction( - currentItem.savedItemId, it - ) }) }, ) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/library/SearchView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/library/SearchView.kt index 5b18aae4f..d7a63dfcc 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/library/SearchView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/library/SearchView.kt @@ -214,12 +214,6 @@ fun SearchViewContent(viewModel: SearchViewModel, modifier: Modifier) { val intent = Intent(context, activityClass) intent.putExtra("SAVED_ITEM_SLUG", cardDataWithLabels.savedItem.slug) context.startActivity(intent) - }, - actionHandler = { - viewModel.handleSavedItemAction( - cardDataWithLabels.savedItem.savedItemId, - it - ) } ) } diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/savedItemViews/SavedItemCard.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/savedItemViews/SavedItemCard.kt index 134cb9bed..21d38cd7e 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/savedItemViews/SavedItemCard.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/savedItemViews/SavedItemCard.kt @@ -38,7 +38,6 @@ import app.omnivore.omnivore.core.database.entities.SavedItemLabel import app.omnivore.omnivore.core.database.entities.SavedItemWithLabelsAndHighlights import app.omnivore.omnivore.feature.components.LabelChip import app.omnivore.omnivore.feature.components.LabelChipColors -import app.omnivore.omnivore.feature.library.SavedItemAction import app.omnivore.omnivore.feature.library.SavedItemViewModel import coil.compose.rememberAsyncImagePainter @@ -48,10 +47,10 @@ fun SavedItemCard( selected: Boolean, savedItemViewModel: SavedItemViewModel, savedItem: SavedItemWithLabelsAndHighlights, - onClickHandler: () -> Unit, - actionHandler: (SavedItemAction) -> Unit + onClickHandler: () -> Unit ) { Column( + verticalArrangement = Arrangement.Center, modifier = Modifier .combinedClickable(onClick = onClickHandler, onLongClick = { savedItemViewModel.actionsMenuItemLiveData.postValue(savedItem) @@ -61,18 +60,17 @@ fun SavedItemCard( ) { Row( horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.Top, + verticalAlignment = Alignment.CenterVertically, modifier = Modifier .fillMaxWidth() - .padding(10.dp) + .padding(16.dp) .background(Color.Transparent) ) { Column( - verticalArrangement = Arrangement.spacedBy(5.dp), + verticalArrangement = Arrangement.spacedBy(5.dp, Alignment.CenterVertically), modifier = Modifier .weight(1f, fill = false) - .padding(end = 20.dp) .defaultMinSize(minHeight = 50.dp) ) { ReadInfo(item = savedItem) @@ -100,26 +98,27 @@ fun SavedItemCard( painter = rememberAsyncImagePainter(savedItem.savedItem.imageURLString), contentDescription = "Image associated with saved item", modifier = Modifier - .size(55.dp, 73.dp) - .clip(RoundedCornerShape(10.dp)) - .defaultMinSize(minWidth = 55.dp, minHeight = 73.dp) + .size(55.dp, 55.dp) .clip(RoundedCornerShape(10.dp)) + .defaultMinSize(minWidth = 55.dp, minHeight = 55.dp) ) } - FlowRow( - modifier = Modifier - .fillMaxWidth() - .padding(10.dp) - ) { - savedItem.labels.filter { !isFlairLabel(it) } - .sortedWith(compareBy { it.name.toLowerCase(Locale.current) }).forEach { label -> - val chipColors = LabelChipColors.fromHex(label.color) + if (savedItem.labels.any { !isFlairLabel(it) }) { + FlowRow( + modifier = Modifier + .fillMaxWidth() + .padding(start = 16.dp, bottom = 16.dp, end = 16.dp) + ) { + savedItem.labels.filter { !isFlairLabel(it) } + .sortedWith(compareBy { it.name.toLowerCase(Locale.current) }).forEach { label -> + val chipColors = LabelChipColors.fromHex(label.color) - LabelChip( - modifier = Modifier.clickable { }, name = label.name, colors = chipColors - ) - } + LabelChip( + modifier = Modifier.clickable { }, name = label.name, colors = chipColors + ) + } + } } HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant)