nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Reverts the ReactionRow change due to misalignments

Browse Source
This commit is contained in:
Vitor Pamplona
2024-02-29 18:51:27 -05:00
parent 1efef5887a
commit 600aab5e8d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+2 -3
View File
@@ -28,7 +28,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.InlineTextContent import androidx.compose.foundation.text.InlineTextContent
import androidx.compose.foundation.text.appendInlineContent 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.Font17SP
import com.vitorpamplona.amethyst.ui.theme.HalfVertPadding import com.vitorpamplona.amethyst.ui.theme.HalfVertPadding
import com.vitorpamplona.amethyst.ui.theme.MarkdownTextStyle 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.innerPostModifier
import com.vitorpamplona.amethyst.ui.theme.markdownStyle import com.vitorpamplona.amethyst.ui.theme.markdownStyle
import com.vitorpamplona.amethyst.ui.uriToRoute 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. // UrlPreviews and Images have a 5dp spacing down. This also adds the space to Text.
val lastElement = state.paragraphs.lastOrNull()?.words?.lastOrNull() val lastElement = state.paragraphs.lastOrNull()?.words?.lastOrNull()
if (lastElement !is ImageSegment && if (lastElement !is ImageSegment &&
@@ -355,7 +354,7 @@ private fun RenderRegular(
lastElement !is CashuSegment lastElement !is CashuSegment
) { ) {
Spacer(modifier = StdVertSpacer) Spacer(modifier = StdVertSpacer)
} }*/
} }
} }
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
+1 -1
View File
@@ -150,7 +150,7 @@ fun ReactionsRow(
) { ) {
val wantsToSeeReactions = remember(baseNote) { mutableStateOf(false) } val wantsToSeeReactions = remember(baseNote) { mutableStateOf(false) }
// Spacer(modifier = HalfDoubleVertSpacer) Spacer(modifier = HalfDoubleVertSpacer)
InnerReactionRow(baseNote, showReactionDetail, wantsToSeeReactions, accountViewModel, nav) InnerReactionRow(baseNote, showReactionDetail, wantsToSeeReactions, accountViewModel, nav)