blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #8643: Updates colors of onboarding accents

master
Sawyer Blatz 2020-05-07 12:09:36 -07:00 committed by Emily Kager
parent 5f11c5e648
commit a01881067f
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<Button xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/FinishOnboardingButton"
style="@style/PositiveButton"
android:layout_height="36dp"
android:id="@+id/finish_button"
android:layout_marginBottom="16dp"

3
app/src/main/res/values/attrs.xml
View File

@ -45,9 +45,6 @@
<attr name="swipeDeleteBackground" format="reference" />
<attr name="onboardingDarkGradientStartBackground" format="reference" />
<attr name="onboardingDarkGradientEndBackground" format="reference" />
<attr name="onboardingActionButtonBackground" format="reference" />
<attr name="onboardingFinishButtonBackground" format="reference" />
<attr name="onboardingFinishButtonText" format="reference" />
<attr name="onboardingSelected" format="reference"/>
<attr name="onboardingDeselected" format="reference"/>

13
app/src/main/res/values/styles.xml
View File

@ -68,9 +68,6 @@
<item name="swipeDeleteBackground">@color/swipe_delete_background_normal_theme</item>
<item name="onboardingDarkGradientStartBackground">@color/onboarding_card_background_start_gradient_normal_theme</item>
<item name="onboardingDarkGradientEndBackground">@color/onboarding_card_background_end_gradient_normal_theme</item>
<item name="onboardingActionButtonBackground">@color/onboarding_card_button_normal_theme</item>
<item name="onboardingFinishButtonBackground">@color/onboarding_card_finish_button_normal_theme</item>
<item name="onboardingFinishButtonText">@color/onboarding_finish_button_text_normal_theme</item>
<item name="onboardingSelected">@color/onboarding_illustration_selected_normal_theme</item>
<item name="onboardingDeselected">@color/onboarding_illustration_deselected_normal_theme</item>
@ -191,9 +188,6 @@
<item name="swipeDeleteBackground">@color/swipe_delete_background_private_theme</item>
<item name="onboardingDarkGradientStartBackground">@color/onboarding_card_background_start_gradient_private_theme</item>
<item name="onboardingDarkGradientEndBackground">@color/onboarding_card_background_end_gradient_private_theme</item>
<item name="onboardingActionButtonBackground">@color/onboarding_card_button_private_theme</item>
<item name="onboardingFinishButtonBackground">@color/onboarding_card_finish_button_private_theme</item>
<item name="onboardingFinishButtonText">@color/onboarding_finish_button_text_private_theme</item>
<item name="onboardingSelected">@color/onboarding_illustration_selected_private_theme</item>
<item name="onboardingDeselected">@color/onboarding_illustration_deselected_private_theme</item>
@ -247,7 +241,7 @@
<!-- Ideally we should consolidate this with NeutralButton in the future -->
<style name="NeutralOnboardingButton" parent="NeutralButton">
<item name="backgroundTint">?onboardingActionButtonBackground</item>
<item name="backgroundTint">?neutralFaded</item>
<item name="android:layout_height">36dp</item>
<item name="android:textColor">?primaryText</item>
</style>
@ -263,11 +257,6 @@
<item name="android:textColor">?contrastText</item>
</style>
<style name="FinishOnboardingButton" parent="NeutralButton">
<item name="backgroundTint">?onboardingFinishButtonBackground</item>
<item name="android:textColor">?onboardingFinishButtonText</item>
</style>
<style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">32dp</item>