From cc679e3d6b2bd143f50da1d13b95736b7326e07a Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Tue, 2 Dec 2025 18:33:10 -0500 Subject: [PATCH] Using banner without the user header for Follow packs because the user is already listed in the bottom of the card. --- .../ui/note/elements/DefaultImageHeader.kt | 22 +++++++++++++++++++ .../discover/nip51FollowSets/FollowSetCard.kt | 10 ++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt index 5d0c30fdc..7d63d9c9e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt @@ -60,6 +60,17 @@ fun DefaultImageHeader( } } +@Composable +fun DefaultImageBanner( + note: Note, + accountViewModel: AccountViewModel, + modifier: Modifier = SimpleHeaderImage, +) { + WatchAuthor(baseNote = note, accountViewModel) { + BannerImage(it, modifier, accountViewModel) + } +} + @Composable fun DefaultImageHeaderBackground( note: Note, @@ -77,6 +88,17 @@ fun DefaultImageHeaderBackground( } } +@Composable +fun DefaultImageBannerBackground( + note: Note, + accountViewModel: AccountViewModel, + modifier: Modifier = SimpleHeaderImage, +) { + WatchAuthor(baseNote = note, accountViewModel) { + BannerImage(it, modifier.blur(Size16dp), accountViewModel) + } +} + @Composable fun BannerImage( author: User, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/FollowSetCard.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/FollowSetCard.kt index 22779c0d5..529f49992 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/FollowSetCard.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/FollowSetCard.kt @@ -49,8 +49,8 @@ import com.vitorpamplona.amethyst.ui.note.LikeReaction import com.vitorpamplona.amethyst.ui.note.UserPicture import com.vitorpamplona.amethyst.ui.note.UsernameDisplay import com.vitorpamplona.amethyst.ui.note.ZapReaction -import com.vitorpamplona.amethyst.ui.note.elements.DefaultImageHeader -import com.vitorpamplona.amethyst.ui.note.elements.DefaultImageHeaderBackground +import com.vitorpamplona.amethyst.ui.note.elements.DefaultImageBanner +import com.vitorpamplona.amethyst.ui.note.elements.DefaultImageBannerBackground import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel import com.vitorpamplona.amethyst.ui.stringRes @@ -177,10 +177,10 @@ fun RenderFollowSetThumb( mainImageModifier = FollowSetImageModifier, loadedImageModifier = Modifier, accountViewModel = accountViewModel, - onLoadingBackground = { DefaultImageHeaderBackground(baseNote, accountViewModel) }, - onError = { DefaultImageHeader(baseNote, accountViewModel) }, + onLoadingBackground = { DefaultImageBannerBackground(baseNote, accountViewModel) }, + onError = { DefaultImageBanner(baseNote, accountViewModel) }, ) - } ?: run { DefaultImageHeader(baseNote, accountViewModel, FollowSetImageModifier) } + } ?: run { DefaultImageBanner(baseNote, accountViewModel, FollowSetImageModifier) } GalleryUnloaded(card.users, StdPadding, accountViewModel, nav) }