Move text styles to core UI.

2026-02-14 23:18:43 +00:00 · 2026-02-04 13:13:49 -04:00
parent c274805eb0
commit a74651d915
22 changed files with 41 additions and 36 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowStartFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowStartFragment.kt
@@ -19,8 +19,8 @@ import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.activityViewModel
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
-import org.thoughtcrime.securesms.util.viewModel
 import java.util.concurrent.TimeUnit
+import org.signal.core.ui.R as CoreUiR

 /**
 * Landing fragment for sending gifts.
@@ -72,7 +72,7 @@ class GiftFlowStartFragment : DSLSettingsFragment(
        title = DSLSettingsText.from(
          R.string.GiftFlowStartFragment__donate_for_a_friend,
          DSLSettingsText.CenterModifier,
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_Headline)
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_Headline)
        )
      )

--- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt
@@ -46,7 +46,7 @@ class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
        title = DSLSettingsText.from(
          R.string.BecomeASustainerFragment__signal_is_a_non_profit,
          DSLSettingsText.CenterModifier,
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyMedium),
          DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), CoreUiR.color.signal_colorOnSurfaceVariant))
        )
      )
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
@@ -255,7 +255,7 @@ class CallLogAdapter(

      binding.callRecipientName.text = SearchUtil.getHighlightedSpan(
        Locale.getDefault(),
-        { arrayOf(TextAppearanceSpan(context, R.style.Signal_Text_TitleSmall)) },
+        { arrayOf(TextAppearanceSpan(context, CoreUiR.style.Signal_Text_TitleSmall)) },
        callLinkName,
        model.callLink.searchQuery,
        SearchUtil.MATCH_ALL
@@ -335,7 +335,7 @@ class CallLogAdapter(
      binding.callRecipientName.text = if (searchQuery != null) {
        SearchUtil.getHighlightedSpan(
          Locale.getDefault(),
-          { arrayOf(TextAppearanceSpan(context, R.style.Signal_Text_TitleSmall)) },
+          { arrayOf(TextAppearanceSpan(context, CoreUiR.style.Signal_Text_TitleSmall)) },
          recipient.getDisplayName(context),
          searchQuery,
          SearchUtil.MATCH_ALL
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt
@@ -5,8 +5,8 @@ import android.text.SpannableStringBuilder
 import androidx.annotation.ColorInt
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
-import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.util.SpanUtil
+import org.signal.core.ui.R as CoreUiR

 sealed class DSLSettingsText {

@@ -62,9 +62,9 @@ sealed class DSLSettingsText {
    }
  }

-  object TitleLargeModifier : TextAppearanceModifier(R.style.Signal_Text_TitleLarge)
-  object TitleMediumModifier : TextAppearanceModifier(R.style.Signal_Text_TitleMedium)
-  object BodyLargeModifier : TextAppearanceModifier(R.style.Signal_Text_BodyLarge)
+  object TitleLargeModifier : TextAppearanceModifier(CoreUiR.style.Signal_Text_TitleLarge)
+  object TitleMediumModifier : TextAppearanceModifier(CoreUiR.style.Signal_Text_TitleMedium)
+  object BodyLargeModifier : TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyLarge)

  open class TextAppearanceModifier(@StyleRes private val textAppearance: Int) : Modifier {
    override fun modify(context: Context, charSequence: CharSequence): CharSequence {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt
@@ -7,6 +7,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
+import org.signal.core.ui.R as CoreUiR

 /**
 * Displays information about how Signal keeps card details private and how
@@ -25,7 +26,7 @@ class YourInformationIsPrivateBottomSheet : DSLSettingsBottomSheetFragment() {
        title = DSLSettingsText.from(
          R.string.YourInformationIsPrivateBottomSheet__your_information_is_private,
          DSLSettingsText.CenterModifier,
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_HeadlineMedium)
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_HeadlineMedium)
        )
      )

--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import java.util.Locale
+import org.signal.core.ui.R as CoreUiR

 class DonationReceiptDetailFragment : DSLSettingsFragment(layoutId = R.layout.donation_receipt_detail_fragment) {

@@ -76,7 +77,7 @@ class DonationReceiptDetailFragment : DSLSettingsFragment(layoutId = R.layout.do
      textPref(
        title = DSLSettingsText.from(
          charSequence = FiatMoneyUtil.format(resources, record.amount),
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_Giant),
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_Giant),
          DSLSettingsText.CenterModifier
        )
      )
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageFragment.kt
@@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.util.StickyHeaderDecoration
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
+import org.signal.core.ui.R as CoreUiR

 class DonationReceiptListPageFragment : Fragment(R.layout.donation_receipt_list_page_fragment) {

@@ -61,7 +62,7 @@ class DonationReceiptListPageFragment : Fragment(R.layout.donation_receipt_list_
              title = null,
              summary = DSLSettingsText.from(
                R.string.DonationReceiptListFragment__if_you_have,
-                DSLSettingsText.TextAppearanceModifier(R.style.TextAppearance_Signal_Subtitle)
+                DSLSettingsText.TextAppearanceModifier(CoreUiR.style.TextAppearance_Signal_Subtitle)
              )
            )
        )
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
@@ -165,8 +165,8 @@ class MediaPreviewV2Fragment :
      requireActivity().onBackPressedDispatcher.onBackPressed()
    }

-    toolbar.setTitleTextAppearance(requireContext(), R.style.Signal_Text_TitleMedium)
-    toolbar.setSubtitleTextAppearance(requireContext(), R.style.Signal_Text_BodyMedium)
+    toolbar.setTitleTextAppearance(requireContext(), CoreUiR.style.Signal_Text_TitleMedium)
+    toolbar.setSubtitleTextAppearance(requireContext(), CoreUiR.style.Signal_Text_BodyMedium)
    (binding.toolbar.menu as? MenuBuilder)?.setOptionalIconsVisible(true)
    binding.toolbar.inflateMenu(R.menu.media_preview)
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendDocumentFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendDocumentFragment.kt
@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.util.MediaUtil
 import java.io.IOException
 import java.util.Optional
+import org.signal.core.ui.R as CoreUiR

 /**
 * Fragment to show full screen document attachments
@@ -60,10 +61,10 @@ class MediaSendDocumentFragment : Fragment(R.layout.mediasend_document_fragment)
      val extensionText: String = MediaUtil.getFileType(requireContext(), Optional.ofNullable(fileInfo.first), media.uri).orElse("")
      if (extensionText.length <= 3) {
        extension.text = extensionText
-        extension.setTextAppearance(requireContext(), R.style.Signal_Text_BodySmall)
+        extension.setTextAppearance(requireContext(), CoreUiR.style.Signal_Text_BodySmall)
      } else if (extensionText.length == 4) {
        extension.text = extensionText
-        extension.setTextAppearance(requireContext(), R.style.Signal_Text_Caption)
+        extension.setTextAppearance(requireContext(), CoreUiR.style.Signal_Text_Caption)
      }
    } else {
      Toast.makeText(requireContext(), R.string.ConversationActivity_sorry_there_was_an_error_setting_your_attachment, Toast.LENGTH_SHORT).show()
--- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt
@@ -152,7 +152,7 @@ private fun ViewNoteBottomSheetContent(
      factory = { context ->
        val view = EmojiTextView(context)

-        view.setTextAppearance(context, R.style.Signal_Text_BodyLarge)
+        view.setTextAppearance(context, CoreUiR.style.Signal_Text_BodyLarge)
        view.movementMethod = LinkMovementMethodCompat.getInstance()

        view
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java
@@ -207,7 +207,7 @@ public class ConfirmPaymentFragment extends BottomSheetDialogFragment {

  private static CharSequence mono(Context context, CharSequence address) {
    SpannableString spannable = new SpannableString(address);
-    spannable.setSpan(new TextAppearanceSpan(context, R.style.TextAppearance_Signal_Mono),
+    spannable.setSpan(new TextAppearanceSpan(context, org.signal.core.ui.R.style.TextAppearance_Signal_Mono),
                      0,
                      address.length(),
                      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/details/PaymentDetailsFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/details/PaymentDetailsFragment.java
@@ -192,7 +192,7 @@ public final class PaymentDetailsFragment extends LoggingFragment {

  private static @NonNull CharSequence mono(@NonNull Context context, @NonNull CharSequence address) {
    SpannableString spannable = new SpannableString(address);
-    spannable.setSpan(new TextAppearanceSpan(context, R.style.TextAppearance_Signal_Mono),
+    spannable.setSpan(new TextAppearanceSpan(context, org.signal.core.ui.R.style.TextAppearance_Signal_Mono),
                      0,
                      address.length(),
                      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanFindMeByPhoneNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanFindMeByPhoneNumberFragment.kt
@@ -78,7 +78,7 @@ class WhoCanFindMeByPhoneNumberFragment : DSLSettingsFragment(
            WhoCanFindMeByPhoneNumberState.EVERYONE -> R.string.WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your
            WhoCanFindMeByPhoneNumberState.NOBODY -> R.string.WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able
          },
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyMedium),
          DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), CoreUiR.color.signal_colorOnSurfaceVariant))
        )
      )
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameShareBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameShareBottomSheet.kt
@@ -52,7 +52,7 @@ class UsernameShareBottomSheet : DSLSettingsBottomSheetFragment() {
      noPadTextPref(
        title = DSLSettingsText.from(
          R.string.UsernameShareBottomSheet__copy_or_share_a_username_link,
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyMedium),
          DSLSettingsText.CenterModifier,
          DSLSettingsText.ColorModifier(
            ContextCompat.getColor(requireContext(), CoreUiR.color.signal_colorOnSurfaceVariant)
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
@@ -58,6 +58,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.stories.settings.my.SignalConnectionsBottomSheetDialogFragment
 import org.thoughtcrime.securesms.util.SignalE164Util
 import org.thoughtcrime.securesms.util.viewModel
+import org.signal.core.ui.R as CoreUiR

 /**
 * Displays all relevant context you know for a given user on the sheet.
@@ -227,7 +228,7 @@ private fun Content(
            AndroidView(factory = ::EmojiTextView) {
              it.text = model.about

-              TextViewCompat.setTextAppearance(it, R.style.Signal_Text_BodyLarge)
+              TextViewCompat.setTextAppearance(it, CoreUiR.style.Signal_Text_BodyLarge)

              it.setTextColor(textColor.toArgb())
            }
--- a/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetFragment.kt
@@ -120,7 +120,7 @@ class SafetyNumberBottomSheetFragment : DSLSettingsBottomSheetFragment(layoutId
            state.hasLargeNumberOfUntrustedRecipients -> R.string.SafetyNumberBottomSheetFragment__safety_number_checkup
            else -> R.string.SafetyNumberBottomSheetFragment__safety_number_changes
          },
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_TitleLarge),
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_TitleLarge),
          DSLSettingsText.CenterModifier
        )
      )
@@ -132,7 +132,7 @@ class SafetyNumberBottomSheetFragment : DSLSettingsBottomSheetFragment(layoutId
            state.hasLargeNumberOfUntrustedRecipients -> resources.getQuantityString(R.plurals.SafetyNumberBottomSheetFragment__you_have_d_connections_plural, args.untrustedRecipients.size, args.untrustedRecipients.size)
            else -> getString(R.string.SafetyNumberBottomSheetFragment__the_following_people)
          },
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyLarge),
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyLarge),
          DSLSettingsText.CenterModifier
        )
      )
@@ -143,7 +143,7 @@ class SafetyNumberBottomSheetFragment : DSLSettingsBottomSheetFragment(layoutId
        noPadTextPref(
          title = DSLSettingsText.from(
            R.string.SafetyNumberBottomSheetFragment__no_more_recipients_to_show,
-            DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyLarge),
+            DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyLarge),
            DSLSettingsText.CenterModifier,
            DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), CoreUiR.color.signal_colorOnSurfaceVariant))
          )
--- a/app/src/main/java/org/thoughtcrime/securesms/safety/review/SafetyNumberReviewConnectionsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/safety/review/SafetyNumberReviewConnectionsFragment.kt
@@ -60,7 +60,7 @@ class SafetyNumberReviewConnectionsFragment : DSLSettingsFragment(
      textPref(
        title = DSLSettingsText.from(
          resources.getQuantityString(R.plurals.SafetyNumberReviewConnectionsFragment__d_recipients_may_have, recipientCount, recipientCount),
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyMedium),
          DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), CoreUiR.color.signal_colorOnSurfaceVariant))
        )
      )
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/group/GroupStorySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/group/GroupStorySettingsFragment.kt
@@ -86,7 +86,7 @@ class GroupStorySettingsFragment : DSLSettingsFragment(menuId = R.menu.story_gro
      textPref(
        title = DSLSettingsText.from(
          getString(R.string.GroupStorySettingsFragment__members_of_the_group_s, state.name),
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+          DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyMedium),
          DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), CoreUiR.color.signal_colorOnSurfaceVariant))
        )
      )
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt
@@ -111,7 +111,7 @@ class StoriesPrivacySettingsFragment :
        noPadTextPref(
          title = DSLSettingsText.from(
            R.string.StoriesPrivacySettingsFragment__story_updates_automatically_disappear,
-            DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+            DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyMedium),
            DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), CoreUiR.color.signal_colorOnSurfaceVariant))
          )
        )
@@ -173,7 +173,7 @@ class StoriesPrivacySettingsFragment :
          title = DSLSettingsText.from(R.string.StoriesPrivacySettingsFragment__turn_off_stories),
          summary = DSLSettingsText.from(
            R.string.StoriesPrivacySettingsFragment__if_you_opt_out,
-            DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+            DSLSettingsText.TextAppearanceModifier(CoreUiR.style.Signal_Text_BodyMedium),
            DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), CoreUiR.color.signal_colorOnSurfaceVariant))
          ),
          onClick = {
--- a/core/ui/src/main/res/values-v21/text_styles.xml
+++ b/core/ui/src/main/res/values-v21/text_styles.xml
--- a/core/ui/src/main/res/values-v28/text_styles.xml
+++ b/core/ui/src/main/res/values-v28/text_styles.xml
--- a/core/ui/src/main/res/values/text_styles.xml
+++ b/core/ui/src/main/res/values/text_styles.xml
@@ -95,7 +95,7 @@
    </style>

    <style name="Signal.Text.Preview.Secondary">
-        <item name="android:textColor">@color/signal_text_secondary</item>
+        <item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
    </style>

    <style name="Signal.Text.Caption" parent="Base.TextAppearance.AppCompat.Caption">
@@ -106,20 +106,20 @@
    </style>

    <style name="Signal.Text.Caption.MessageSent">
-        <item name="android:textColor">@color/signal_text_secondary</item>
+        <item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
        <item name="android:shadowRadius">0</item>
    </style>

    <style name="Signal.Text.Giant" parent="@style/TextAppearance.AppCompat.Display1">
        <item name="android:textSize">48sp</item>
-        <item name="android:textColor">@color/signal_text_primary</item>
+        <item name="android:textColor">@color/signal_colorOnSurface</item>
        <item name="android:fontFamily">sans-serif-medium</item>
    </style>

    <style name="TextAppearance.Signal.Title1" parent="@style/TextAppearance.AppCompat.Title">
        <item name="android:textStyle">bold</item>
        <item name="android:textSize">28sp</item>
-        <item name="android:color">@color/signal_text_primary</item>
+        <item name="android:color">@color/signal_colorOnSurface</item>
    </style>

    <style name="TextAppearance.Signal.Title2" parent="@style/TextAppearance.AppCompat.Title" />
@@ -177,17 +177,17 @@

    <style name="Signal.Text.MessageRequest.Title" parent="Base.TextAppearance.AppCompat.Title">
        <item name="android:textSize">20sp</item>
-        <item name="android:textColor">@color/signal_text_primary</item>
+        <item name="android:textColor">@color/signal_colorOnSurface</item>
    </style>

    <style name="Signal.Text.MessageRequest.Subtitle" parent="Base.TextAppearance.AppCompat.Caption">
        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/signal_text_secondary</item>
+        <item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
    </style>

    <style name="Signal.Text.MessageRequest.Description" parent="Base.TextAppearance.AppCompat.Subhead">
        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/signal_text_secondary</item>
+        <item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
    </style>

    <style name="Signal.Text.Title" parent="Base.TextAppearance.AppCompat.Title">