blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #5711 - Onboarding colours have contrast issues

master
Patrick Martin 2019-11-22 12:48:31 -08:00 committed by Emily Kager
parent b9656a978e
commit 71880705df
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
import android.view.View import android.view.View
import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat
import androidx.navigation.Navigation import androidx.navigation.Navigation
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.onboarding_manual_signin.view.* import kotlinx.android.synthetic.main.onboarding_manual_signin.view.*
@ -25,6 +26,7 @@ class OnboardingManualSignInViewHolder(private val view: View) : RecyclerView.Vi
val appName = view.context.getString(R.string.app_name) val appName = view.context.getString(R.string.app_name)
view.header_text.text = view.context.getString(R.string.onboarding_firefox_account_header, appName) view.header_text.text = view.context.getString(R.string.onboarding_firefox_account_header, appName)
val icon = AppCompatResources.getDrawable(view.context, R.drawable.ic_onboarding_firefox_accounts) val icon = AppCompatResources.getDrawable(view.context, R.drawable.ic_onboarding_firefox_accounts)
icon?.setTint(ContextCompat.getColor(view.context, R.color.white_color))
view.header_text.putCompoundDrawablesRelativeWithIntrinsicBounds(start = icon) view.header_text.putCompoundDrawablesRelativeWithIntrinsicBounds(start = icon)
} }

9
app/src/main/res/drawable/onboarding_card_background_dark.xml
View File

@ -4,7 +4,12 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<stroke android:width="1dp" android:color="?neutralFaded" /> <stroke
<solid android:color="@color/onboarding_card_background_dark" /> android:width="1dp"
android:color="?neutralFaded" />
<gradient
android:angle="45"
android:endColor="@color/accent_high_contrast_dark_theme"
android:startColor="@color/accent_bright_dark_theme" />
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>

7
app/src/main/res/layout/onboarding_manual_signin.xml
View File

@ -17,8 +17,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="14dp" android:layout_marginBottom="14dp"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:drawableTint="@color/white_color"
android:textAppearance="@style/Header16TextStyle" android:textAppearance="@style/Header16TextStyle"
android:textColor="@color/onboarding_card_primary_text_dark" android:textColor="@color/neutral_text"
tools:text="@string/onboarding_firefox_account_header" /> tools:text="@string/onboarding_firefox_account_header" />
<Button <Button
@ -33,8 +34,8 @@
android:padding="10dp" android:padding="10dp"
android:text="@string/onboarding_firefox_account_sign_in" android:text="@string/onboarding_firefox_account_sign_in"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="?neutral" android:textColor="@color/button_text_color"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:backgroundTint="@color/onboarding_card_button_background_dark" /> app:backgroundTint="@color/foundation_light_theme" />
</LinearLayout> </LinearLayout>