From 0c9e76eeaf729df1e5fe4deec51c241d2be9af42 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 18 Apr 2024 17:17:17 -0400 Subject: [PATCH] adds content type on CardFeedView --- .../com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt | 6 +++++- .../vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt index d4adb8d7..f93c675b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt @@ -158,7 +158,11 @@ private fun FeedLoaded( ShowDonationCard(accountViewModel, nav) } - itemsIndexed(state.feed.value, key = { _, item -> item.id() }) { _, item -> + itemsIndexed( + items = state.feed.value, + key = { _, item -> item.id() }, + contentType = { _, item -> item.javaClass.simpleName }, + ) { _, item -> val defaultModifier = remember { Modifier.fillMaxWidth().animateItemPlacement() } Row(defaultModifier) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt index ab8054ce..26134adc 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt @@ -301,7 +301,9 @@ open class CardFeedViewModel(val localFilter: FeedFilter) : ViewModel(), I if (notes.isEmpty()) { _feedContent.update { CardFeedState.Empty } } else if (currentState is CardFeedState.Loaded) { - currentState.showHidden.value = localFilter.showHiddenKey() + if (currentState.showHidden.value != localFilter.showHiddenKey()) { + currentState.showHidden.value = localFilter.showHiddenKey() + } currentState.feed.value = notes } else { _feedContent.update {