blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #5711 Added tint to onboarding icons (#8093) 

* Added tint to onboarding icons and udpated finish button tint

* Replaced tint parameter with onboarding_card_icon color in setOnboardingIcon
master
Mohammaduvez 2020-02-06 11:16:12 +05:30 committed by GitHub
parent 453e7955bb
commit 00d7f4c91c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingIcon.kt
View File

@ -5,7 +5,6 @@
package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
import android.widget.TextView
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat
@ -16,12 +15,10 @@ import org.mozilla.fenix.ext.setBounds
/**
* Sets the drawableStart of a header in an onboarding card.
*/
fun TextView.setOnboardingIcon(@DrawableRes id: Int, @ColorRes tint: Int? = null) {
fun TextView.setOnboardingIcon(@DrawableRes id: Int) {
val icon = AppCompatResources.getDrawable(context, id)
val size = context.resources.getDimensionPixelSize(R.dimen.onboarding_header_icon_height_width)
icon?.setBounds(size)
tint?.let {
icon?.setTint(ContextCompat.getColor(context, tint))
}
icon?.setTint(ContextCompat.getColor(context, R.color.onboarding_card_icon))
putCompoundDrawablesRelative(start = icon)
}

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
View File

@ -8,8 +8,6 @@ import android.view.View
import android.widget.Switch
import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.onboarding_tracking_protection.view.*
import kotlinx.android.synthetic.main.onboarding_tracking_protection.view.description_text
import kotlinx.android.synthetic.main.onboarding_tracking_protection.view.header_text
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.settings

4
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolder.kt
View File

@ -8,16 +8,14 @@ import android.text.SpannableString
import android.text.style.UnderlineSpan
import android.view.View
import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.onboarding_tracking_protection.view.header_text
import kotlinx.android.synthetic.main.onboarding_whats_new.view.*
import kotlinx.android.synthetic.main.onboarding_whats_new.view.description_text
import org.mozilla.fenix.R
import org.mozilla.fenix.settings.SupportUtils
class OnboardingWhatsNewViewHolder(view: View) : RecyclerView.ViewHolder(view) {
init {
view.header_text.setOnboardingIcon(R.drawable.ic_whats_new, R.color.accent_bright_dark_theme)
view.header_text.setOnboardingIcon(R.drawable.ic_whats_new)
val appName = view.context.getString(R.string.app_name)
view.description_text.text = view.context.getString(R.string.onboarding_whats_new_description, appName)

2
app/src/main/res/layout/onboarding_finish.xml
View File

@ -8,7 +8,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:background="@drawable/onboarding_button_background"
android:backgroundTint="?accent"
android:backgroundTint="@color/onboarding_card_icon"
android:clickable="true"
android:focusable="true"
android:gravity="center"

3
app/src/main/res/values-night/colors.xml
View File

@ -43,4 +43,7 @@
<!-- Reader View colors -->
<color name="mozac_feature_readerview_text_color">@color/primary_text_dark_theme</color>
<!-- Onboarding colors -->
<color name="onboarding_card_icon">@color/accent_dark_theme</color>
</resources>

1
app/src/main/res/values/colors.xml
View File

@ -212,6 +212,7 @@
<color name="onboarding_card_primary_text_dark">#FFFFFF</color>
<color name="onboarding_card_button_background_dark">#F9F9FB</color>
<color name="onboarding_card_button_text_dark">#312A65</color>
<color name="onboarding_card_icon">@color/accent_bright_light_theme</color>
<!-- Share UI -->
<color name="default_share_background">#E3E2E3</color>