fix: links in sms are not following the theme

you-apps · Feb 15, 2024 · 855680f · 855680f
1 parent d6fafff
commit 855680f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt b/app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt
@@ -1,11 +1,8 @@
 package com.bnyro.contacts.db.obj
 
-import androidx.compose.ui.text.AnnotatedString
 import androidx.room.ColumnInfo
 import androidx.room.Entity
-import androidx.room.Ignore
 import androidx.room.PrimaryKey
-import com.bnyro.contacts.util.generateAnnotations
 
 @Entity(tableName = "localSms")
 data class SmsData(
@@ -15,6 +12,5 @@ data class SmsData(
     @ColumnInfo var timestamp: Long = 0,
     @ColumnInfo var threadId: Long = 0,
     @ColumnInfo var type: Int = 0,
-    @ColumnInfo(defaultValue = "NULL") var simNumber: Int? = null,
-    @Ignore val formatted: AnnotatedString = generateAnnotations(body)
+    @ColumnInfo(defaultValue = "NULL") var simNumber: Int? = null
 )
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/conversation/Message.kt b/app/src/main/java/com/bnyro/contacts/ui/components/conversation/Message.kt
@@ -43,6 +43,7 @@ import com.bnyro.contacts.R
 import com.bnyro.contacts.db.obj.SmsData
 import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
 import com.bnyro.contacts.ui.models.SmsModel
+import com.bnyro.contacts.util.generateAnnotations
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -225,15 +226,18 @@ fun ClickableMessage(
 ) {
     SelectionContainer {
         val uriHandler = LocalUriHandler.current
+        val primary = MaterialTheme.colorScheme.primary
+
+        val formatted = remember {
+            generateAnnotations(smsData.body, primary)
+        }
+
         ClickableText(
-            text = smsData.formatted,
+            text = formatted,
             style = MaterialTheme.typography.bodyLarge.copy(color = LocalContentColor.current),
             onClick = { offset ->
                 val annotation =
-                    smsData.formatted.getStringAnnotations(
-                        offset,
-                        offset
-                    ).firstOrNull()
+                    formatted.getStringAnnotations(offset, offset).firstOrNull()
                 annotation?.let {
                     uriHandler.openUri(it.item)
                 }

diff --git a/app/src/main/java/com/bnyro/contacts/util/TextFormatUtils.kt b/app/src/main/java/com/bnyro/contacts/util/TextFormatUtils.kt
@@ -22,7 +22,7 @@ fun MutableList<Pair<Format, String>>.addKeywords(
     }
 }
 
-fun generateAnnotations(text: String): AnnotatedString {
+fun generateAnnotations(text: String, color: Color): AnnotatedString {
     val keywords = mutableListOf<Pair<Format, String>>().apply {
         addKeywords(
             text,
@@ -48,7 +48,7 @@ fun generateAnnotations(text: String): AnnotatedString {
             val indexOf = text.indexOf(keyword)
             addStyle(
                 style = SpanStyle(
-                    color = Color.Blue,
+                    color = color,
                     textDecoration = when (format) {
                         Format.LINK -> TextDecoration.Underline
                         else -> TextDecoration.None