For #14460: Fix PBM notification tint (#14699)

pull/90/head
Tiger Oakes 4 years ago committed by GitHub
parent 043e061087
commit 53d16e78e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -11,10 +11,12 @@ import android.text.SpannableString
import android.text.Spanned import android.text.Spanned
import android.text.style.ImageSpan import android.text.style.ImageSpan
import android.view.View import android.view.View
import androidx.annotation.ColorInt
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.appcompat.content.res.AppCompatResources
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.onboarding_private_browsing.view.* import kotlinx.android.synthetic.main.onboarding_private_browsing.view.*
import mozilla.components.support.ktx.android.content.getColorFromAttr
import mozilla.components.support.ktx.android.content.getDrawableWithTint
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
@ -33,7 +35,8 @@ class OnboardingPrivateBrowsingViewHolder(
val inlineIcon = PrivateBrowsingImageSpan( val inlineIcon = PrivateBrowsingImageSpan(
view.context, view.context,
R.drawable.ic_private_browsing, R.drawable.ic_private_browsing,
view.description_text_once.lineHeight tint = view.context.getColorFromAttr(R.attr.primaryText),
size = view.description_text_once.lineHeight
) )
val text = SpannableString(view.context.getString(R.string.onboarding_private_browsing_description1)).apply { val text = SpannableString(view.context.getString(R.string.onboarding_private_browsing_description1)).apply {
@ -57,9 +60,10 @@ class OnboardingPrivateBrowsingViewHolder(
class PrivateBrowsingImageSpan( class PrivateBrowsingImageSpan(
context: Context, context: Context,
@DrawableRes drawableId: Int, @DrawableRes drawableId: Int,
@ColorInt tint: Int,
size: Int size: Int
) : ImageSpan( ) : ImageSpan(
AppCompatResources.getDrawable(context, drawableId)!!.apply { setBounds(size) } context.getDrawableWithTint(drawableId, tint)!!.apply { setBounds(size) }
) { ) {
override fun draw( override fun draw(
canvas: Canvas, canvas: Canvas,

@ -8,6 +8,6 @@
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:fillColor="?attr/primaryText" android:fillColor="@color/photonWhite"
android:pathData="M17.5 17c-2.1 0-3.5-2.5-5.5-2.5S8.4 17 6.5 17C3.9 17 2 14.6 2 10.4 2 7.8 2.8 7 6.1 7s4.3 1.4 5.9 1.4c1.6 0 2.6-1.4 5.9-1.4 3.3 0 4.1 0.8 4.1 3.4 0 4.2-1.9 6.6-4.5 6.6zm-9.8-6.8c-2 0.1-2.9 1.3-2.9 1.6 0 0.3 1.3 1.1 2.7 1.1 1.3 0 2.9-0.5 2.9-0.9 0-0.5-0.8-1.9-2.7-1.8zm8.6 0c-1.9-0.1-2.7 1.3-2.7 1.8 0 0.4 1.5 0.9 2.9 0.9s2.7-0.8 2.7-1.1c-0.1-0.3-0.9-1.5-2.9-1.6z" /> android:pathData="M17.5 17c-2.1 0-3.5-2.5-5.5-2.5S8.4 17 6.5 17C3.9 17 2 14.6 2 10.4 2 7.8 2.8 7 6.1 7s4.3 1.4 5.9 1.4c1.6 0 2.6-1.4 5.9-1.4 3.3 0 4.1 0.8 4.1 3.4 0 4.2-1.9 6.6-4.5 6.6zm-9.8-6.8c-2 0.1-2.9 1.3-2.9 1.6 0 0.3 1.3 1.1 2.7 1.1 1.3 0 2.9-0.5 2.9-0.9 0-0.5-0.8-1.9-2.7-1.8zm8.6 0c-1.9-0.1-2.7 1.3-2.7 1.8 0 0.4 1.5 0.9 2.9 0.9s2.7-0.8 2.7-1.1c-0.1-0.3-0.9-1.5-2.9-1.6z" />
</vector> </vector>

Loading…
Cancel
Save