From 940fec7b74e4688d21d4cdb1e3540c27873a698c Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Fri, 24 Dec 2021 01:40:37 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/23193 - Remove
 @color/accent_high_contrast_dark_theme redirection

---
 app/src/main/res/values-night/colors.xml | 12 ++++++------
 app/src/main/res/values/colors.xml       |  7 ++-----
 app/src/main/res/values/styles.xml       |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 3289adf362..c49a03abc8 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -106,7 +106,7 @@
     <color name="inset_normal_theme">@color/photonDarkGrey50</color>
     <color name="accent_normal_theme">@color/photonViolet50</color>
     <color name="accent_bright_normal_theme">@color/photonViolet70</color>
-    <color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="accent_high_contrast_normal_theme">@color/photonViolet40</color>
     <color name="tab_ring_normal_theme">@color/accent_normal_theme</color>
     <color name="neutral_normal_theme">@color/photonGrey20</color>
     <color name="neutral_faded_normal_theme">#1FFBFBFE</color>
@@ -114,7 +114,7 @@
     <color name="disabled_normal_theme">@color/photonLightGrey05A40</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="accent_on_dark_background_normal_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="accent_on_dark_background_normal_theme">@color/photonViolet40</color>
     <color name="toolbar_start_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
     <color name="toolbar_center_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
     <color name="toolbar_end_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
@@ -124,7 +124,7 @@
     <color name="sync_disconnected_background_normal_theme">#5B5846</color>
     <color name="swipe_delete_background_normal_theme">@color/photonDarkGrey20</color>
     <color name="onboarding_card_background_start_gradient_normal_theme">@color/photonViolet70</color>
-    <color name="onboarding_card_background_end_gradient_normal_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="onboarding_card_background_end_gradient_normal_theme">@color/photonViolet40</color>
     <color name="onboarding_illustration_selected_normal_theme">@color/accent_normal_theme</color>
     <color name="onboarding_illustration_deselected_normal_theme">#99FBFBFE</color>
     <color name="add_on_private_browsing_exterior_circle_background_normal_theme">@color/accent_normal_theme</color>
@@ -132,9 +132,9 @@
     <color name="prompt_login_edit_text_cursor_color_normal_theme">@color/photonViolet50</color>
     <color name="search_suggestion_indicator_icon_color_normal_theme">@color/photonGreen60</color>
     <color name="search_suggestion_indicator_icon_bookmark_color_normal_theme">@color/photonBlue40</color>
-    <color name="select_login_header_normal_theme">@color/accent_high_contrast_dark_theme</color>
-    <color name="select_credit_card_header_normal_theme">@color/accent_high_contrast_dark_theme</color>
-    <color name="menu_item_button_normal_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="select_login_header_normal_theme">@color/photonViolet40</color>
+    <color name="select_credit_card_header_normal_theme">@color/photonViolet40</color>
+    <color name="menu_item_button_normal_theme">@color/photonViolet40</color>
     <color name="recently_used_share_theme">@color/photonDarkGrey10</color>
 
     <color name="mozac_widget_favicon_background_normal_theme">@color/photonDarkGrey50</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c2c2092826..bb645f6139 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -140,9 +140,6 @@
     <color name="dark_grey_90_gradient_start">@color/photonDarkGrey90</color>
     <color name="dark_grey_90_gradient_end">#0015141A</color>
 
-    <!-- Dark theme color palette -->
-    <color name="accent_high_contrast_dark_theme">@color/photonViolet40</color>
-
     <!-- Tab Tray -->
     <color name="tab_tray_item_selected_background_dark_theme">#412E69</color>
 
@@ -211,7 +208,7 @@
     <color name="sync_disconnected_background_normal_theme">#FFFDE2</color>
     <color name="swipe_delete_background_normal_theme">@color/photonLightGrey30</color>
     <color name="onboarding_card_background_start_gradient_normal_theme">@color/photonViolet70</color>
-    <color name="onboarding_card_background_end_gradient_normal_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="onboarding_card_background_end_gradient_normal_theme">@color/photonViolet40</color>
     <color name="onboarding_illustration_selected_normal_theme">@color/photonViolet70</color>
     <color name="onboarding_illustration_deselected_normal_theme">#9915141A</color>
     <color name="add_on_private_browsing_exterior_circle_background_normal_theme">@color/photonViolet70</color>
@@ -281,7 +278,7 @@
 
     <!-- Reader View colors -->
     <color name="mozac_feature_readerview_text_color">@color/primary_text_light_theme</color>
-    <color name="mozac_feature_readerview_selected">@color/accent_high_contrast_dark_theme</color>
+    <color name="mozac_feature_readerview_selected">@color/photonViolet40</color>
 
     <!-- Share UI -->
     <color name="default_share_background">#E3E2E3</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 61c3d34557..3bfbc5c7f8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -265,7 +265,7 @@
         <item name="awesomeBarIndicatorBookmarkColor">@color/photonBlue40</item>
         <item name="selectLoginHeaderTextColor">@color/accent_high_contrast_private_theme</item>
         <item name="selectCreditCardHeaderTextColor">@color/accent_high_contrast_private_theme</item>
-        <item name="preferenceSectionHeader">@color/accent_high_contrast_dark_theme</item>
+        <item name="preferenceSectionHeader">@color/photonViolet40</item>
         <item name="menuItemButtonTintColor">@color/accent_high_contrast_private_theme</item>
 
         <!-- Shared widget colors -->