From 0b30ae02ffdbb9c60169b79a2fd1751c460dae22 Mon Sep 17 00:00:00 2001 From: Jesse Horne Date: Tue, 28 Nov 2023 14:06:13 -0500 Subject: [PATCH] removed some repetition --- .../common/views/chat/item/FramedItemView.kt | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt index b8d7b15281..b60daad213 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt @@ -295,6 +295,22 @@ fun FramedItemView( } } +@Composable +fun CIMarkdownTextMarkdown( + text: String, + ci: ChatItem, + chatTTL: Int?, + linkMode: SimplexLinkMode, + uriHandler: UriHandler?, + onLinkLongClick: (link: String) -> Unit = {} +) { + MarkdownText( + text, if (text.isEmpty()) emptyList() else ci.formattedText, + meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode, + uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick + ) +} + @Composable fun CIMarkdownText( ci: ChatItem, @@ -313,18 +329,10 @@ fun CIMarkdownText( onClick = { showMenu.value = true } ) ) { - MarkdownText( - text, if (text.isEmpty()) emptyList() else ci.formattedText, - meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode, - uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick - ) + CIMarkdownTextMarkdown(text, ci, chatTTL, linkMode, uriHandler, onLinkLongClick) } } else { - MarkdownText( - text, if (text.isEmpty()) emptyList() else ci.formattedText, - meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode, - uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick - ) + CIMarkdownTextMarkdown(text, ci, chatTTL, linkMode, uriHandler, onLinkLongClick) } } }