From 1e1831b537552560809426949ec1f76c871685fb Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:40:05 +0200 Subject: [PATCH] MarkdownText: fix marker characters hidden even if they are not part of a markup --- .../mm20/launcher2/ui/component/markdown/MarkdownText.kt | 8 ++++++++ .../launcher2/ui/component/markdown/StringAnnotations.kt | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/markdown/MarkdownText.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/markdown/MarkdownText.kt index 000d76c6..524b4575 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/markdown/MarkdownText.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/markdown/MarkdownText.kt @@ -1,5 +1,6 @@ package de.mm20.launcher2.ui.component.markdown +import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -283,4 +284,11 @@ fun CheckboxNode(node: ASTNode, text: String, onTextChange: (String) -> Unit = { .padding(top = 4.dp, bottom = 4.dp, end = 8.dp) .requiredSize(18.dp) ) +} + +private fun ASTNode.print(indent: Int = 0) { + Log.d("MM20", "${" ".repeat(indent)}${this.type}") + for (child in this.children) { + child.print(indent + 2) + } } \ No newline at end of file diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/markdown/StringAnnotations.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/markdown/StringAnnotations.kt index ad90e22d..37ec8df2 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/markdown/StringAnnotations.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/markdown/StringAnnotations.kt @@ -130,7 +130,8 @@ fun AnnotatedString.Builder.applyStyles( node.type != MarkdownTokenTypes.TEXT && node.type != MarkdownTokenTypes.WHITE_SPACE && node.type != MarkdownTokenTypes.CODE_FENCE_CONTENT && - node.type != MarkdownTokenTypes.CODE_LINE + node.type != MarkdownTokenTypes.CODE_LINE && + node.parent?.type != MarkdownElementTypes.PARAGRAPH ) { addStyle( delimiterStyle,