From 0f367a018afc41bf30565dd4a67789c1cd4b88e0 Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Thu, 18 Apr 2019 09:26:03 -0700 Subject: [PATCH] For #724: Corrects colors for all themes --- .../java/org/mozilla/fenix/ThemeManager.kt | 2 +- .../fenix/home/SessionBottomSheetFragment.kt | 6 +-- .../library/bookmarks/BookmarkItemMenu.kt | 3 +- .../fenix/library/history/HistoryItemMenu.kt | 3 +- .../main/res/drawable/home_header_shadow.xml | 2 +- .../drawable/home_search_background_dark.xml | 4 +- .../home_search_background_dark_no_border.xml | 2 +- app/src/main/res/drawable/ic_delete.xml | 2 +- .../main/res/drawable/ic_private_browsing.xml | 2 +- ...l => private_home_background_gradient.xml} | 7 +-- .../search_pill_background_unselected.xml | 4 -- .../res/drawable/search_url_background.xml | 15 +++++++ .../main/res/layout/delete_history_button.xml | 2 +- .../main/res/layout/delete_tabs_button.xml | 2 +- .../res/layout/fragment_crash_reporter.xml | 4 +- app/src/main/res/layout/fragment_home.xml | 2 +- app/src/main/res/layout/fragment_search.xml | 2 +- .../main/res/layout/layout_url_background.xml | 2 +- .../main/res/layout/session_bottom_sheet.xml | 6 +-- app/src/main/res/layout/session_item.xml | 2 +- app/src/main/res/layout/tab_list_row.xml | 2 +- app/src/main/res/values-night/colors.xml | 5 ++- app/src/main/res/values-v23/styles.xml | 5 ++- app/src/main/res/values-v27/styles.xml | 1 - app/src/main/res/values/attrs.xml | 7 ++- app/src/main/res/values/colors.xml | 45 ++++++++++++------- app/src/main/res/values/styles.xml | 17 ++++++- app/src/main/res/xml/home_scene.xml | 1 + 28 files changed, 103 insertions(+), 54 deletions(-) rename app/src/main/res/drawable/{home_background_gradient.xml => private_home_background_gradient.xml} (69%) create mode 100644 app/src/main/res/drawable/search_url_background.xml diff --git a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt index cf82154b2..73fe1a1ce 100644 --- a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt +++ b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt @@ -120,7 +120,7 @@ class DefaultThemeManager : ThemeManager { window.navigationBarColor = ContextCompat .getColor( context, DefaultThemeManager - .resolveAttribute(R.attr.above, context) + .resolveAttribute(R.attr.foundation, context) ) } else { window.navigationBarColor = ContextCompat diff --git a/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt b/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt index 8dc0103a4..b65f5ebd5 100644 --- a/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt @@ -16,6 +16,7 @@ import kotlinx.android.synthetic.main.session_bottom_sheet.view.* import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.utils.ItsNotBrokenSnack import org.mozilla.fenix.R +import org.mozilla.fenix.ext.getColorFromAttr class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer { sealed class SessionType { @@ -58,10 +59,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer view.delete_session_button.apply { val drawable = ContextCompat.getDrawable(context!!, R.drawable.ic_delete) drawable?.setColorFilter( - ContextCompat.getColor( - context!!, - R.color.delete_color - ), PorterDuff.Mode.SRC_IN + R.attr.destructive.getColorFromAttr(context), PorterDuff.Mode.SRC_IN ) setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt index 3d294a785..19995bc6d 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt @@ -9,6 +9,7 @@ import mozilla.components.browser.menu.BrowserMenuBuilder import mozilla.components.browser.menu.item.SimpleBrowserMenuItem import mozilla.components.concept.storage.BookmarkNode import mozilla.components.concept.storage.BookmarkNodeType +import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.R class BookmarkItemMenu( @@ -63,7 +64,7 @@ class BookmarkItemMenu( } else null, SimpleBrowserMenuItem( context.getString(R.string.bookmark_menu_delete_button), - textColorResource = R.color.delete_color + textColorResource = DefaultThemeManager.resolveAttribute(R.attr.destructive, context) ) { onItemTapped.invoke(BookmarkItemMenu.Item.Delete) } diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt index 1c102f299..a1dc94302 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt @@ -7,6 +7,7 @@ package org.mozilla.fenix.library.history import android.content.Context import mozilla.components.browser.menu.BrowserMenuBuilder import mozilla.components.browser.menu.item.SimpleBrowserMenuItem +import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.R class HistoryItemMenu( @@ -23,7 +24,7 @@ class HistoryItemMenu( listOf( SimpleBrowserMenuItem( context.getString(R.string.history_delete_item), - textColorResource = R.color.delete_color + textColorResource = DefaultThemeManager.resolveAttribute(R.attr.destructive, context) ) { onItemTapped.invoke(Item.Delete) } diff --git a/app/src/main/res/drawable/home_header_shadow.xml b/app/src/main/res/drawable/home_header_shadow.xml index 5a04a5fc4..3c06e6bba 100644 --- a/app/src/main/res/drawable/home_header_shadow.xml +++ b/app/src/main/res/drawable/home_header_shadow.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/drawable/home_search_background_dark.xml b/app/src/main/res/drawable/home_search_background_dark.xml index 04e69e667..5796f98ab 100644 --- a/app/src/main/res/drawable/home_search_background_dark.xml +++ b/app/src/main/res/drawable/home_search_background_dark.xml @@ -3,10 +3,10 @@ - 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/. --> - + + android:color="?inset"/> - + diff --git a/app/src/main/res/drawable/ic_private_browsing.xml b/app/src/main/res/drawable/ic_private_browsing.xml index f264366c3..ea9570edb 100644 --- a/app/src/main/res/drawable/ic_private_browsing.xml +++ b/app/src/main/res/drawable/ic_private_browsing.xml @@ -23,7 +23,7 @@ android:viewportHeight="24"> + android:fillColor="?privateBrowsingButtonAccent" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/home_background_gradient.xml b/app/src/main/res/drawable/private_home_background_gradient.xml similarity index 69% rename from app/src/main/res/drawable/home_background_gradient.xml rename to app/src/main/res/drawable/private_home_background_gradient.xml index dad61a89c..bf2877bae 100644 --- a/app/src/main/res/drawable/home_background_gradient.xml +++ b/app/src/main/res/drawable/private_home_background_gradient.xml @@ -6,9 +6,10 @@ diff --git a/app/src/main/res/drawable/search_pill_background_unselected.xml b/app/src/main/res/drawable/search_pill_background_unselected.xml index 671b932d8..3dcb10d78 100644 --- a/app/src/main/res/drawable/search_pill_background_unselected.xml +++ b/app/src/main/res/drawable/search_pill_background_unselected.xml @@ -4,9 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - diff --git a/app/src/main/res/drawable/search_url_background.xml b/app/src/main/res/drawable/search_url_background.xml new file mode 100644 index 000000000..5796f98ab --- /dev/null +++ b/app/src/main/res/drawable/search_url_background.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/delete_history_button.xml b/app/src/main/res/layout/delete_history_button.xml index c8d0fb385..12882cb6f 100644 --- a/app/src/main/res/layout/delete_history_button.xml +++ b/app/src/main/res/layout/delete_history_button.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/history_delete_all" - android:textColor="@color/delete_color" + android:textColor="?destructive" android:drawablePadding="8dp" android:textSize="16sp" android:gravity="center" diff --git a/app/src/main/res/layout/delete_tabs_button.xml b/app/src/main/res/layout/delete_tabs_button.xml index b3fa2a86b..5dae28b50 100644 --- a/app/src/main/res/layout/delete_tabs_button.xml +++ b/app/src/main/res/layout/delete_tabs_button.xml @@ -10,7 +10,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:background="@drawable/button_background" - android:backgroundTint="?neutral" + android:backgroundTint="?accent" android:clickable="true" android:focusable="true" android:foreground="?android:attr/selectableItemBackground" diff --git a/app/src/main/res/layout/fragment_crash_reporter.xml b/app/src/main/res/layout/fragment_crash_reporter.xml index fe8d3604f..4d115fc0c 100644 --- a/app/src/main/res/layout/fragment_crash_reporter.xml +++ b/app/src/main/res/layout/fragment_crash_reporter.xml @@ -39,7 +39,7 @@ android:layout_width="0dp" android:layout_height="32dp" android:layout_marginBottom="20dp" - android:buttonTint="?accent" + android:buttonTint="?accentHighContrast" android:checked="true" android:text="@string/tab_crash_send_report" android:textColor="@color/primary_text_normal_theme" @@ -56,7 +56,7 @@ android:layout_marginStart="@dimen/crash_reporter_close_tab_button_horizontal_margin" android:layout_marginEnd="@dimen/crash_reporter_close_tab_button_horizontal_margin" android:layout_marginBottom="@dimen/crash_reporter_close_tab_button_bottom_margin" - android:backgroundTint="?accent" + android:backgroundTint="?accentHighContrast" android:text="@string/tab_crash_restore" android:fontFamily="Sharp Sans" android:textColor="@color/foundation_normal_theme" diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index a24e4adfa..9c96007bf 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -12,7 +12,7 @@ android:id="@+id/homeLayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/home_background_gradient" + android:background="?homeBackground" app:layoutDescription="@xml/home_scene" tools:context=".home.HomeFragment"> + android:background="@drawable/home_search_background_normal"/> \ No newline at end of file diff --git a/app/src/main/res/layout/session_bottom_sheet.xml b/app/src/main/res/layout/session_bottom_sheet.xml index f2cff7ad5..bbba3e374 100644 --- a/app/src/main/res/layout/session_bottom_sheet.xml +++ b/app/src/main/res/layout/session_bottom_sheet.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" - app:cardBackgroundColor="?foundation" + app:cardBackgroundColor="?above" android:background="?foundation" android:elevation="5dp" android:padding="10dp" @@ -81,12 +81,12 @@ android:background="?foundation" android:drawableStart="@drawable/ic_delete" android:drawablePadding="14dp" - android:drawableTint="@color/delete_color" + android:drawableTint="?destructive" android:paddingStart="20dp" android:paddingTop="12dp" android:paddingBottom="12dp" android:text="@string/current_session_delete" - android:textColor="@color/delete_color" + android:textColor="?destructive" android:textSize="16sp" tools:targetApi="m" /> diff --git a/app/src/main/res/layout/session_item.xml b/app/src/main/res/layout/session_item.xml index ba43b9aed..534dac35d 100644 --- a/app/src/main/res/layout/session_item.xml +++ b/app/src/main/res/layout/session_item.xml @@ -12,7 +12,7 @@ android:clickable="true" android:focusable="true" android:foreground="?android:attr/selectableItemBackground" - app:cardBackgroundColor="?foundation" + app:cardBackgroundColor="?above" app:cardCornerRadius="10dp" app:cardElevation="5dp"> diff --git a/app/src/main/res/layout/tab_list_row.xml b/app/src/main/res/layout/tab_list_row.xml index 6f013c6e0..fff3f0e84 100644 --- a/app/src/main/res/layout/tab_list_row.xml +++ b/app/src/main/res/layout/tab_list_row.xml @@ -12,7 +12,7 @@ android:clipToPadding="false" android:focusable="true" android:foreground="?android:attr/selectableItemBackground" - app:cardBackgroundColor="?foundation" + app:cardBackgroundColor="?above" app:cardCornerRadius="@dimen/tab_corner_radius" app:cardElevation="5dp"> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 72c55c2f6..a72e8ed3a 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -8,8 +8,11 @@ @color/secondary_text_dark_theme @color/foundation_dark_theme @color/above_dark_theme - @color/above_darkened_dark_theme + @color/inset_dark_theme @color/accent_dark_theme @color/accent_bright_dark_theme + @color/accent_high_contrast_dark_theme @color/neutral_dark_theme + @color/shadow_dark_theme + @color/destructive_dark_theme diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml index 5d612575a..44a3beca2 100644 --- a/app/src/main/res/values-v23/styles.xml +++ b/app/src/main/res/values-v23/styles.xml @@ -9,6 +9,9 @@ sure we also get them in 27+ --> @android:color/transparent @bool/theme_is_light + + + ?foundation \ No newline at end of file diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml index c002e8ed4..43c9e6e59 100644 --- a/app/src/main/res/values-v27/styles.xml +++ b/app/src/main/res/values-v27/styles.xml @@ -11,7 +11,6 @@ @bool/theme_is_light - @android:color/transparent @android:color/transparent @bool/theme_is_light diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index a13392f35..339694828 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -8,13 +8,18 @@ + - + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 95d72de77..5c8e755ac 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,41 +7,53 @@ #20123A @color/photonGrey50 #F9F9FB + #F2F2F5 #FFF - #F2F2F5 #312A65 #592ACB - @color/photonGrey20 + @color/accent_light_theme + #1F000000 + #1F000000 + @color/photonRed60 #FBFBFE - #A4A3AA + #A7A2B7 #1C1B22 + #3F3E46 #32313C - #252432 - #312A65 - #AB71FF - @color/photonGrey40 + #e6e6ea + #592ACB + #AB71FF + #1FFBFBFE + #050505 + #FF4F5E #FBFBFE - #A4A3AA - #242251 - #393862 - #2c2b58 - #AD3BFF - #AD3BFF - @color/photonGrey40 + #A7A2B7 + #492E85 + #362A5C + #291D4F + #E6E6EA + #F565FF + #F565FF + #1FFBFBFE + #2B1067 + #FF4F5E @color/primary_text_light_theme @color/secondary_text_light_theme @color/foundation_light_theme @color/above_light_theme - @color/above_darkened_light_theme + @color/inset_light_theme @color/accent_light_theme @color/accent_bright_light_theme + @color/accent_high_contrast_light_theme @color/neutral_light_theme + @color/shadow_light_theme + @color/destructive_light_theme #DFDFE3 @@ -81,6 +93,7 @@ #5C592ACB - @color/photonRed60 + + @color/foundation_private_theme #FBFBFE diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8b09c3935..e7aa66552 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -21,12 +21,16 @@ @color/accent_bright_normal_theme @color/foundation_normal_theme @color/above_normal_theme - @color/above_darkened_normal_theme + @color/inset_normal_theme @color/neutral_normal_theme + @color/shadow_normal_theme + @color/destructive_normal_theme @drawable/ic_logo_wordmark + @color/foundation_normal_theme @android:color/transparent + @color/primary_text_normal_theme + +