blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #3439 - Clean up where accent colors didn't work with dark theming

master
Emily Kager 2019-06-13 17:10:13 -07:00 committed by Emily Kager
parent 7abf135c89
commit a941b875b4
7 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/fenix_snackbar_background.xml
View File

@ -4,6 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?accentBright" />
<solid android:color="?snackbar" />
<corners android:radius="8dp" />
</shape>

2
app/src/main/res/drawable/session_border.xml
View File

@ -5,5 +5,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/tab_corner_radius"/>
<stroke android:width="@dimen/tab_border_width" android:color="?accentBright"/>
<stroke android:width="@dimen/tab_border_width" android:color="?accentUsedOnDarkBackground"/>
</shape>

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

@ -79,7 +79,7 @@
android:gravity="top"
android:paddingStart="48dp"
android:text="@string/browser_menu_report_issue"
android:textColor="?accentBright"
android:textColor="?accentUsedOnDarkBackground"
app:layout_constraintBottom_toTopOf="@id/line_divider"
app:layout_constraintTop_toBottomOf="@id/tracking_protection_action" />

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

@ -22,6 +22,8 @@
<color name="scrimEnd_normal_theme">@color/scrimEnd_dark_theme</color>
<color name="toggle_off_knob_normal_theme">@color/toggle_off_knob_dark_theme</color>
<color name="toggle_off_track_normal_theme">@color/toggle_off_track_dark_theme</color>
<color name="snackbar_normal_theme">@color/accent_bright_dark_theme</color>
<color name="accent_on_dark_background_normal_theme">@color/accent_high_contrast_dark_theme</color>
<!-- Collection icons-->
<color name="collection_icon_color_violet">@color/collection_icon_color_violet_dark_theme</color>

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

@ -10,6 +10,8 @@
<attr name="accent" format="reference" />
<attr name="accentBright" format="reference" />
<attr name="accentHighContrast" format="reference" />
<attr name="accentUsedOnDarkBackground" format="reference" />
<attr name="snackbar" format="reference" />
<attr name="foundation" format="reference" />
<attr name="above" format="reference" />
<attr name="inset" format="reference" />

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

@ -66,6 +66,8 @@
<color name="disabled_private_theme">#66FBFBFE</color>
<color name="scrimStart_private_theme">#F520123A</color>
<color name="scrimEnd_private_theme">#F515141A</color>
<color name="snackbar_private_theme">@color/accent_bright_private_theme</color>
<color name="accent_on_dark_background_private_theme">@color/accent_high_contrast_private_theme</color>
<!-- Normal theme colors for light mode -->
<color name="primary_text_normal_theme">@color/primary_text_light_theme</color>
@ -84,6 +86,8 @@
<color name="disabled_normal_theme">@color/disabled_light_theme</color>
<color name="scrimStart_normal_theme">@color/scrimStart_light_theme</color>
<color name="scrimEnd_normal_theme">@color/scrimEnd_light_theme</color>
<color name="snackbar_normal_theme">@color/accent_light_theme</color>
<color name="accent_on_dark_background_normal_theme">@color/accent_bright_light_theme</color>
<!-- Bookmark buttons -->
<color name="bookmark_favicon_background">#DFDFE3</color>

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

@ -42,7 +42,8 @@
<item name="disabled">@color/disabled_normal_theme</item>
<item name="scrimStart">@color/scrimStart_normal_theme</item>
<item name="scrimEnd">@color/scrimEnd_normal_theme</item>
<item name="snackbar">@color/snackbar_normal_theme</item>
<item name="accentUsedOnDarkBackground">@color/accent_on_dark_background_normal_theme</item>
<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
<item name="homeBackground">@color/foundation_normal_theme</item>
@ -115,6 +116,8 @@
<item name="disabled">@color/disabled_private_theme</item>
<item name="scrimStart">@color/scrimStart_private_theme</item>
<item name="scrimEnd">@color/scrimEnd_private_theme</item>
<item name="snackbar">@color/snackbar_private_theme</item>
<item name="accentUsedOnDarkBackground">@color/accent_on_dark_background_private_theme</item>
<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
@ -274,7 +277,7 @@
<item name="android:paddingEnd">24dp</item>
<item name="android:gravity">end|center_vertical</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:textColor">?accentBright</item>
<item name="android:textColor">?accentUsedOnDarkBackground</item>
</style>
<style name="OnboardingCardLight">