From 600aab5e8d7fd24730249aee8190292304322480 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 29 Feb 2024 18:51:27 -0500 Subject: [PATCH] Reverts the ReactionRow change due to misalignments --- .../vitorpamplona/amethyst/ui/components/RichTextViewer.kt | 5 ++--- .../java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt index db6a35bc8..bd3ffa1ea 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt @@ -28,7 +28,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.InlineTextContent import androidx.compose.foundation.text.appendInlineContent @@ -103,7 +102,6 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.LoadedBechLink import com.vitorpamplona.amethyst.ui.theme.Font17SP import com.vitorpamplona.amethyst.ui.theme.HalfVertPadding import com.vitorpamplona.amethyst.ui.theme.MarkdownTextStyle -import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer import com.vitorpamplona.amethyst.ui.theme.innerPostModifier import com.vitorpamplona.amethyst.ui.theme.markdownStyle import com.vitorpamplona.amethyst.ui.uriToRoute @@ -347,6 +345,7 @@ private fun RenderRegular( } } + /* // UrlPreviews and Images have a 5dp spacing down. This also adds the space to Text. val lastElement = state.paragraphs.lastOrNull()?.words?.lastOrNull() if (lastElement !is ImageSegment && @@ -355,7 +354,7 @@ private fun RenderRegular( lastElement !is CashuSegment ) { Spacer(modifier = StdVertSpacer) - } + }*/ } } 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 25de08d53..794a20752 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 @@ -150,7 +150,7 @@ fun ReactionsRow( ) { val wantsToSeeReactions = remember(baseNote) { mutableStateOf(false) } - // Spacer(modifier = HalfDoubleVertSpacer) + Spacer(modifier = HalfDoubleVertSpacer) InnerReactionRow(baseNote, showReactionDetail, wantsToSeeReactions, accountViewModel, nav)