Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix color resource linking in SignalSymbols.

Browse Source
This commit is contained in:
Sagar
2025-04-30 09:36:02 +05:30
committed by Cody Henthorne
parent 3aa4e75ef3
commit 6dfe3b9c33
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt
View File

@@ -18,6 +18,7 @@ import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.withStyle import androidx.compose.ui.text.withStyle
import androidx.core.content.ContextCompat
import org.thoughtcrime.securesms.util.SpanUtil import org.thoughtcrime.securesms.util.SpanUtil
import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.ViewUtil
@@ -214,7 +215,7 @@ object SignalSymbols {
text.setSpan(span, 0, text.length, 0) text.setSpan(span, 0, text.length, 0)
return if (colorRes != -1) { return if (colorRes != -1) {
SpanUtil.color(colorRes, text) SpanUtil.color(ContextCompat.getColor(context, colorRes), text)
} else { } else {
text text
} }

8
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt
View File

@@ -15,7 +15,6 @@ import android.view.ViewGroup
import android.widget.ProgressBar import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.core.content.ContextCompat
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
@@ -239,15 +238,16 @@ class RecipientBottomSheetDialogFragment : BottomSheetDialogFragment() {
val chevronGlyph = SignalSymbols.getSpannedString( val chevronGlyph = SignalSymbols.getSpannedString(
requireContext(), requireContext(),
SignalSymbols.Weight.BOLD, 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) { if (isLtr) {
nameBuilder.append(" ") nameBuilder.append(" ")
nameBuilder.append(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOutline), SpanUtil.ofSize(chevronGlyph, 24))) nameBuilder.append(SpanUtil.ofSize(chevronGlyph, 24))
} else { } else {
nameBuilder.insert(0, " ") 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 fullName.text = nameBuilder