diff --git a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt
index cf82154b26..73fe1a1ce9 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 8dc0103a4b..b65f5ebd56 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 3d294a7858..19995bc6d6 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 1c102f299f..a1dc94302a 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 5a04a5fc43..3c06e6bbae 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 04e69e6677..5796f98ab1 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 f264366c32..ea9570edba 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 dad61a89c4..bf2877baeb 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 671b932d8b..3dcb10d786 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 0000000000..5796f98ab1
--- /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 c8d0fb3859..12882cb6f4 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 b3fa2a86b7..5dae28b505 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 fe8d3604f9..4d115fc0c8 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 a24e4adfae..9c96007bfb 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 f2cff7ad54..bbba3e3743 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 ba43b9aed3..534dac35d0 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 6f013c6e08..fff3f0e84b 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 72c55c2f6f..a72e8ed3af 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 5d612575a0..44a3beca2c 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 c002e8ed45..43c9e6e590 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 a13392f355..3396948280 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 95d72de77e..5c8e755ac7 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 8b09c3935a..e7aa665521 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
@@ -48,12 +52,21 @@
- @color/accent_bright_private_theme
- @color/foundation_private_theme
- @color/above_private_theme
- - @color/above_darkened_private_theme
+ - @color/inset_private_theme
- @color/neutral_private_theme
+ - @color/shadow_private_theme
+ - @color/destructive_private_theme
- @drawable/ic_logo_wordmark_white
+ - @drawable/private_home_background_gradient
- @color/accent_private_theme
+ - @color/above_private_theme
+
+
+
+
diff --git a/app/src/main/res/xml/home_scene.xml b/app/src/main/res/xml/home_scene.xml
index 431f92de69..28372f50e2 100644
--- a/app/src/main/res/xml/home_scene.xml
+++ b/app/src/main/res/xml/home_scene.xml
@@ -139,6 +139,7 @@