From 28eb5c541a2efc834dc9ddeddee212c937069623 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Tue, 23 Jul 2019 09:35:24 -0700
Subject: [PATCH] For #1944 & #1750: Updates private & night mode colors
 (#4232)

---
 .../org/mozilla/fenix/search/SearchFragment.kt     |  2 +-
 app/src/main/res/color/toggle_text_color.xml       |  2 +-
 app/src/main/res/drawable/session_border.xml       |  2 +-
 app/src/main/res/layout/save_tab_group_button.xml  |  4 ++--
 app/src/main/res/values-night/colors.xml           |  1 +
 app/src/main/res/values/attrs.xml                  |  1 +
 app/src/main/res/values/colors.xml                 | 14 +++++++++-----
 app/src/main/res/values/styles.xml                 |  4 +++-
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
index f1d4bc56d..2f2f92980 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -225,7 +225,7 @@ class SearchFragment : Fragment(), BackHandler {
             val showShortcuts = searchState.showShortcutEnginePicker
             search_shortcuts_button?.isChecked = showShortcuts
 
-            val color = if (showShortcuts) R.attr.foundation else R.attr.primaryText
+            val color = if (showShortcuts) R.attr.contrastText else R.attr.primaryText
 
             search_shortcuts_button.compoundDrawables[0]?.setTint(
                 ContextCompat.getColor(
diff --git a/app/src/main/res/color/toggle_text_color.xml b/app/src/main/res/color/toggle_text_color.xml
index 26386a9fc..a4093484e 100644
--- a/app/src/main/res/color/toggle_text_color.xml
+++ b/app/src/main/res/color/toggle_text_color.xml
@@ -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/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?foundation" android:state_checked="true" />
+    <item android:color="?contrastText" android:state_checked="true" />
     <!-- Default State -->
     <item android:color="?primaryText" />
 </selector>
diff --git a/app/src/main/res/drawable/session_border.xml b/app/src/main/res/drawable/session_border.xml
index 8506940c7..daa19bd86 100644
--- a/app/src/main/res/drawable/session_border.xml
+++ b/app/src/main/res/drawable/session_border.xml
@@ -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="?accentUsedOnDarkBackground"/>
+    <stroke android:width="@dimen/tab_border_width" android:color="?tabRing"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/save_tab_group_button.xml b/app/src/main/res/layout/save_tab_group_button.xml
index 11bb5f5d6..5146f70a4 100644
--- a/app/src/main/res/layout/save_tab_group_button.xml
+++ b/app/src/main/res/layout/save_tab_group_button.xml
@@ -16,9 +16,9 @@
     android:letterSpacing="0"
     android:text="@string/save_to_collection"
     android:textAllCaps="false"
-    android:textColor="?contrastText"
+    android:textColor="?primaryText"
     app:backgroundTint="?accent"
     app:icon="@drawable/ic_tab_collection"
     app:iconGravity="textStart"
     app:iconPadding="8dp"
-    app:iconTint="?attr/foundation" />
+    app:iconTint="?attr/primaryText" />
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 8a1ae469e..3d676cf16 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -13,6 +13,7 @@
     <color name="accent_normal_theme">@color/accent_dark_theme</color>
     <color name="accent_bright_normal_theme">@color/accent_bright_dark_theme</color>
     <color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="tab_ring_normal_theme">@color/tab_ring_dark_theme</color>
     <color name="neutral_normal_theme">@color/neutral_dark_theme</color>
     <color name="neutral_faded_normal_theme">@color/neutral_faded_dark_theme</color>
     <color name="shadow_normal_theme">@color/shadow_dark_theme</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4d80ee59d..db12e0eb7 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -11,6 +11,7 @@
     <attr name="accentBright" format="reference" />
     <attr name="accentHighContrast" format="reference" />
     <attr name="accentUsedOnDarkBackground" format="reference" />
+    <attr name="tabRing" format="reference" />
     <attr name="snackbar" format="reference" />
     <attr name="foundation" format="reference" />
     <attr name="above" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 613c08043..e6b15750b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,6 +13,7 @@
     <color name="accent_light_theme">#312A65</color>
     <color name="accent_bright_light_theme">#592ACB</color>
     <color name="accent_high_contrast_light_theme">@color/accent_light_theme</color>
+    <color name="tab_ring_light_theme">@color/accent_light_theme</color>
     <color name="neutral_light_theme">@color/photonGrey30</color>
     <color name="neutral_faded_light_theme">@color/photonGrey20</color>
     <color name="shadow_light_theme">#1F000000</color>
@@ -29,13 +30,14 @@
     <!-- Dark theme color palette -->
     <color name="primary_text_dark_theme">#FBFBFE</color>
     <color name="secondary_text_dark_theme">#A7A2B7</color>
-    <color name="contrast_text_dark_theme">@color/primary_text_light_theme</color>
+    <color name="contrast_text_dark_theme">@color/primary_text_dark_theme</color>
     <color name="foundation_dark_theme">#1C1B22</color>
     <color name="inset_dark_theme">#3F3E46</color>
     <color name="above_dark_theme">#32313C</color>
-    <color name="accent_dark_theme">#E6E6EA</color>
+    <color name="accent_dark_theme">#9059FF</color>
     <color name="accent_bright_dark_theme">#592ACB</color>
     <color name="accent_high_contrast_dark_theme">#AB71FF</color>
+    <color name="tab_ring_dark_theme">@color/accent_dark_theme</color>
     <color name="neutral_dark_theme">@color/photonGrey20</color>
     <color name="neutral_faded_dark_theme">#1FEDEDF0</color>
     <color name="shadow_dark_theme">#050505</color>
@@ -52,13 +54,14 @@
     <!-- Private theme color palette -->
     <color name="primary_text_private_theme">#FBFBFE</color>
     <color name="secondary_text_private_theme">#A7A2B7</color>
-    <color name="contrast_text_private_theme">@color/primary_text_light_theme</color>
+    <color name="contrast_text_private_theme">@color/primary_text_private_theme</color>
     <color name="foundation_private_theme">#1D1133</color>
     <color name="inset_private_theme">#362A5C</color>
     <color name="above_private_theme">#291D4F</color>
-    <color name="accent_private_theme">#E6E6EA</color>
-    <color name="accent_bright_private_theme">#AA71FF</color>
+    <color name="accent_private_theme">#9059FF</color>
+    <color name="accent_bright_private_theme">#592ACB</color>
     <color name="accent_high_contrast_private_theme">#AA71FF</color>
+    <color name="tab_ring_private_theme">#F565FF</color>
     <color name="neutral_private_theme">@color/photonGrey20</color>
     <color name="neutral_faded_private_theme">#1FEDEDF0</color>
     <color name="shadow_private_theme">#2B1067</color>
@@ -79,6 +82,7 @@
     <color name="accent_normal_theme">@color/accent_light_theme</color>
     <color name="accent_bright_normal_theme">@color/accent_bright_light_theme</color>
     <color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_light_theme</color>
+    <color name="tab_ring_normal_theme">@color/tab_ring_light_theme</color>
     <color name="neutral_normal_theme">@color/neutral_light_theme</color>
     <color name="neutral_faded_normal_theme">@color/neutral_faded_light_theme</color>
     <color name="shadow_normal_theme">@color/shadow_light_theme</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e8c0867e7..7d3f0e0f5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,6 +35,7 @@
         <item name="foundation">@color/foundation_normal_theme</item>
         <item name="above">@color/above_normal_theme</item>
         <item name="inset">@color/inset_normal_theme</item>
+        <item name="tabRing">@color/tab_ring_normal_theme</item>
         <item name="neutral">@color/neutral_normal_theme</item>
         <item name="neutralFaded">@color/neutral_faded_normal_theme</item>
         <item name="shadow">@color/shadow_normal_theme</item>
@@ -110,6 +111,7 @@
         <item name="foundation">@color/foundation_private_theme</item>
         <item name="above">@color/above_private_theme</item>
         <item name="inset">@color/inset_private_theme</item>
+        <item name="tabRing">@color/tab_ring_private_theme</item>
         <item name="neutral">@color/neutral_private_theme</item>
         <item name="neutralFaded">@color/neutral_faded_private_theme</item>
         <item name="shadow">@color/shadow_private_theme</item>
@@ -123,7 +125,7 @@
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
         <item name="homeBackground">@drawable/private_home_background_gradient</item>
-        <item name="privateBrowsingButtonBackground">@color/accent_private_theme</item>
+        <item name="privateBrowsingButtonBackground">@color/primary_text_private_theme</item>
         <item name="privateBrowsingButtonAccent">@color/above_private_theme</item>
 
     </style>