feat: reply markdown [WPB-3558] (#2904)

wireapp · Apr 17, 2024 · 7e10577 · 7e10577
1 parent 25ec09e
commit 7e10577
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 8 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/QuotedMessage.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/QuotedMessage.kt
@@ -39,6 +39,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -62,7 +63,12 @@ import com.wire.android.ui.common.typography
 import com.wire.android.ui.home.conversations.messages.QuotedMessageStyle.COMPLETE
 import com.wire.android.ui.home.conversations.messages.QuotedMessageStyle.PREVIEW
 import com.wire.android.ui.home.conversations.model.UIQuotedMessage
+import com.wire.android.ui.markdown.MarkdownInline
+import com.wire.android.ui.markdown.NodeData
+import com.wire.android.ui.markdown.getFirstInlines
+import com.wire.android.ui.markdown.toMarkdownDocument
 import com.wire.android.ui.theme.wireColorScheme
+import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.ui.UIText
 
 private const val TEXT_QUOTE_MAX_LINES = 7
@@ -338,14 +344,16 @@ private fun QuotedText(
         modifier = modifier,
         startContent = {
             startContent()
-        }, centerContent = {
+        },
+        centerContent = {
             editedTimeDescription?.let {
                 if (style == COMPLETE) {
                     StatusBox(it.asString())
                 }
             }
-            MainContentText(text)
-        }, footerContent = {
+            MainMarkdownText(text)
+        },
+        footerContent = {
             QuotedMessageOriginalDate(originalDateTimeDescription)
         },
         clickable = clickable
@@ -515,6 +523,33 @@ fun QuotedAudioMessage(
     )
 }
 
+@Composable
+private fun MainMarkdownText(text: String, fontStyle: FontStyle = FontStyle.Normal) {
+    val nodeData = NodeData(
+        color = colorsScheme().onSurfaceVariant,
+        style = MaterialTheme.wireTypography.subline01.copy(fontStyle = fontStyle),
+        colorScheme = MaterialTheme.wireColorScheme,
+        typography = MaterialTheme.wireTypography,
+        searchQuery = "",
+        mentions = listOf(),
+        disableLinks = true,
+    )
+
+    val markdownPreview = remember(text) {
+        text.toMarkdownDocument().getFirstInlines()
+    }
+
+    if (markdownPreview != null) {
+        MarkdownInline(
+            inlines = markdownPreview.children,
+            maxLines = TEXT_QUOTE_MAX_LINES,
+            nodeData = nodeData
+        )
+    } else {
+        MainContentText(text, fontStyle)
+    }
+}
+
 @Composable
 private fun MainContentText(text: String, fontStyle: FontStyle = FontStyle.Normal) {
     Text(

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt
@@ -105,9 +105,13 @@ internal fun MessageBody(
         )
     )
 
-    text?.also {
+    val markdownDocument = remember(text) {
+        text?.toMarkdownDocument()
+    }
+
+    markdownDocument?.also {
         MarkdownDocument(
-            it.toMarkdownDocument(),
+            it,
             nodeData,
             clickable
         )

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/LastMessageSubtitle.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/LastMessageSubtitle.kt
@@ -21,6 +21,7 @@ package com.wire.android.ui.home.conversationslist.common
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.text.style.TextOverflow
 import com.wire.android.ui.markdown.MarkdownConstants
 import com.wire.android.ui.markdown.MarkdownInline
@@ -59,8 +60,13 @@ private fun LastMessageMarkdown(text: String, leadingText: String = "") {
         disableLinks = true
     )
 
-    val markdownPreview = text.toMarkdownDocument().getFirstInlines()
-    val leadingInlines = leadingText.toMarkdownDocument().getFirstInlines()?.children ?: persistentListOf()
+    val markdownPreview = remember(text) {
+        text.toMarkdownDocument().getFirstInlines()
+    }
+
+    val leadingInlines = remember(leadingText) {
+        leadingText.toMarkdownDocument().getFirstInlines()?.children ?: persistentListOf()
+    }
 
     if (markdownPreview != null) {
         MarkdownInline(

diff --git a/app/src/main/kotlin/com/wire/android/ui/markdown/MarkdownInline.kt b/app/src/main/kotlin/com/wire/android/ui/markdown/MarkdownInline.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.text.style.TextOverflow
 @Composable
 fun MarkdownInline(
     inlines: List<MarkdownNode.Inline>,
+    maxLines: Int = 1,
     nodeData: NodeData
 ) {
     val annotatedString = buildAnnotatedString {
@@ -36,7 +37,7 @@ fun MarkdownInline(
         style = nodeData.style,
         color = nodeData.color,
         clickable = false,
-        maxLines = 1,
+        maxLines = maxLines,
         overflow = TextOverflow.Ellipsis
     )
 }