From be09577db156509f018c57b61ae5e5f7ab5cf738 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 23 Mar 2023 11:07:29 -0400 Subject: [PATCH] Adds extra space before uncited hashtags. --- .../amethyst/ui/components/RichTextViewer.kt | 3 +-- .../com/vitorpamplona/amethyst/ui/note/NoteCompose.kt | 8 +++++--- 2 files changed, 6 insertions(+), 5 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 836804f76..b306533d2 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 @@ -120,8 +120,7 @@ fun RichTextViewer( content.contains("```") ) { MaterialRichText( - style = myMarkDownStyle, - modifier = Modifier.padding(bottom = 5.dp) + style = myMarkDownStyle ) { Markdown( content = content, 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 b4dfb48c7..46cd239ab 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 @@ -542,9 +542,11 @@ fun DisplayUncitedHashtags( ) { val hashtags = noteEvent.hashtags() if (hashtags.isNotEmpty()) { - FlowRow() { - hashtags.forEach { - if (!eventContent.contains(it, true)) { + FlowRow( + modifier = Modifier.padding(top = 5.dp) + ) { + hashtags.forEach { hashtag -> + if (!eventContent.contains(hashtag, true)) { ClickableText( text = AnnotatedString("#$hashtag "), onClick = { navController.navigate("Hashtag/$hashtag") },