From 91a9200fe3d4885784fecc4c6045036599ea44ef Mon Sep 17 00:00:00 2001 From: mcarare Date: Wed, 19 Aug 2020 17:47:39 +0300 Subject: [PATCH] For #13911: Fix resolving color attribute for title and description. For SDK < 23 color attr cannot be resolved in selectors. --- app/src/main/java/org/mozilla/fenix/ext/SpannableString.kt | 7 ++----- .../org/mozilla/fenix/onboarding/OnboardingRadioButton.kt | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/ext/SpannableString.kt b/app/src/main/java/org/mozilla/fenix/ext/SpannableString.kt index 68a2b2e61..8a8de7dce 100644 --- a/app/src/main/java/org/mozilla/fenix/ext/SpannableString.kt +++ b/app/src/main/java/org/mozilla/fenix/ext/SpannableString.kt @@ -9,7 +9,7 @@ import android.text.Spannable import android.text.SpannableString import android.text.style.AbsoluteSizeSpan import android.text.style.ForegroundColorSpan -import androidx.core.content.ContextCompat +import mozilla.components.support.ktx.android.content.getColorFromAttr import mozilla.components.support.ktx.android.util.dpToPx fun SpannableString.setTextSize(context: Context, textSize: Int) = @@ -23,10 +23,7 @@ fun SpannableString.setTextSize(context: Context, textSize: Int) = fun SpannableString.setTextColor(context: Context, colorResId: Int) = this.setSpan( ForegroundColorSpan( - ContextCompat.getColor( - context, - colorResId - ) + context.getColorFromAttr(colorResId) ), 0, this.length, diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt index 4ed8d330c..6fdb7d0af 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt @@ -71,14 +71,14 @@ class OnboardingRadioButton( val spannableTitle = SpannableString(resources.getString(title)) spannableTitle.setTextSize(context, TITLE_TEXT_SIZE) - spannableTitle.setTextColor(context, R.color.primary_state_list_text_color) + spannableTitle.setTextColor(context, R.attr.primaryText) builder.append(spannableTitle) if (description != 0) { val spannableDescription = SpannableString(resources.getString(description)) spannableDescription.setTextSize(context, DESCRIPTION_TEXT_SIZE) - spannableDescription.setTextColor(context, R.color.secondary_state_list_text_color) + spannableDescription.setTextColor(context, R.attr.secondaryText) builder.append("\n") builder.append(spannableDescription) }