From 6dfe3b9c33ed64d002eee1daeada3ad93fc8583e Mon Sep 17 00:00:00 2001
From: Sagar <85388413+Sagar0-0@users.noreply.github.com>
Date: Wed, 30 Apr 2025 09:36:02 +0530
Subject: [PATCH] Fix color resource linking in SignalSymbols.

---
 .../org/thoughtcrime/securesms/fonts/SignalSymbols.kt     | 3 ++-
 .../ui/bottomsheet/RecipientBottomSheetDialogFragment.kt  | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt
index 7aa60187d8..e62aec149b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.withStyle
+import androidx.core.content.ContextCompat
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 
@@ -214,7 +215,7 @@ object SignalSymbols {
     text.setSpan(span, 0, text.length, 0)
 
     return if (colorRes != -1) {
-      SpanUtil.color(colorRes, text)
+      SpanUtil.color(ContextCompat.getColor(context, colorRes), text)
     } else {
       text
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt
index 1ab965e19e..ee21c8f616 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt
@@ -15,7 +15,6 @@ import android.view.ViewGroup
 import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
@@ -239,15 +238,16 @@ class RecipientBottomSheetDialogFragment : BottomSheetDialogFragment() {
         val chevronGlyph = SignalSymbols.getSpannedString(
           requireContext(),
           SignalSymbols.Weight.BOLD,
-          if (isLtr) SignalSymbols.Glyph.CHEVRON_RIGHT else SignalSymbols.Glyph.CHEVRON_LEFT
+          if (isLtr) SignalSymbols.Glyph.CHEVRON_RIGHT else SignalSymbols.Glyph.CHEVRON_LEFT,
+          R.color.signal_colorOutline
         )
 
         if (isLtr) {
           nameBuilder.append(" ")
-          nameBuilder.append(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOutline), SpanUtil.ofSize(chevronGlyph, 24)))
+          nameBuilder.append(SpanUtil.ofSize(chevronGlyph, 24))
         } else {
           nameBuilder.insert(0, " ")
-          nameBuilder.insert(0, SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOutline), SpanUtil.ofSize(chevronGlyph, 24)))
+          nameBuilder.insert(0, SpanUtil.ofSize(chevronGlyph, 24))
         }
 
         fullName.text = nameBuilder