From 42e11d239db8977d7ab271de5dc8859be2eab486 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Tue, 11 Jun 2024 18:51:47 -0400 Subject: [PATCH] Fixes the padding of the reaction row on quotes --- .../com/vitorpamplona/amethyst/ui/note/NoteCompose.kt | 1 + .../com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt | 8 ++++++-- .../vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index b25425e842..c56b6d699f 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -506,6 +506,7 @@ fun InnerNoteWithReactions( ReactionsRow( baseNote = baseNote, showReactionDetail = notBoostedNorQuote, + addPadding = !isBoostedNote, editState = editState, accountViewModel = accountViewModel, nav = nav, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt index 709235f211..c1427d16ee 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt @@ -147,6 +147,7 @@ import kotlin.math.roundToInt fun ReactionsRow( baseNote: Note, showReactionDetail: Boolean, + addPadding: Boolean, editState: State>, accountViewModel: AccountViewModel, nav: (String) -> Unit, @@ -155,7 +156,7 @@ fun ReactionsRow( Spacer(modifier = HalfDoubleVertSpacer) - InnerReactionRow(baseNote, showReactionDetail, wantsToSeeReactions, editState, accountViewModel, nav) + InnerReactionRow(baseNote, showReactionDetail, addPadding, wantsToSeeReactions, editState, accountViewModel, nav) Spacer(modifier = HalfDoubleVertSpacer) @@ -171,6 +172,7 @@ fun ReactionsRow( private fun InnerReactionRow( baseNote: Note, showReactionDetail: Boolean, + addPadding: Boolean, wantsToSeeReactions: MutableState, editState: State>, accountViewModel: AccountViewModel, @@ -178,6 +180,7 @@ private fun InnerReactionRow( ) { GenericInnerReactionRow( showReactionDetail = showReactionDetail, + addPadding = addPadding, one = { WatchReactionsZapsBoostsAndDisplayIfExists(baseNote) { RenderShowIndividualReactionsButton(wantsToSeeReactions) @@ -219,6 +222,7 @@ private fun InnerReactionRow( @Composable private fun GenericInnerReactionRow( showReactionDetail: Boolean, + addPadding: Boolean, one: @Composable () -> Unit, two: @Composable () -> Unit, three: @Composable () -> Unit, @@ -229,7 +233,7 @@ private fun GenericInnerReactionRow( Row( verticalAlignment = CenterVertically, horizontalArrangement = RowColSpacing, - modifier = if (showReactionDetail) ReactionRowHeightWithPadding else ReactionRowHeight, + modifier = if (addPadding) ReactionRowHeightWithPadding else ReactionRowHeight, ) { if (showReactionDetail) { Row( diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt index d56c38c574..dfbbde3a54 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt @@ -651,7 +651,7 @@ fun NoteMaster( } } - ReactionsRow(note, true, editState, accountViewModel, nav) + ReactionsRow(note, true, true, editState, accountViewModel, nav) } NoteQuickActionMenu(