From 5408bc5178ead8f8effdad3057d17a01ae7c4b22 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sat, 16 Oct 2021 13:44:10 -0400
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/21973 - Use
 destructive_normal_theme in place of R.color.design_color

---
 .../fenix/library/bookmarks/edit/EditBookmarkFragment.kt  | 2 +-
 .../fenix/settings/logins/fragment/AddLoginFragment.kt    | 8 ++++----
 .../fenix/settings/logins/fragment/EditLoginFragment.kt   | 4 ++--
 app/src/main/res/values-night/colors.xml                  | 5 +----
 app/src/main/res/values/colors.xml                        | 4 ----
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
index 99bc5869fb..5e2b32404f 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
@@ -280,7 +280,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
                     binding.inputLayoutBookmarkUrl.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
                     binding.inputLayoutBookmarkUrl.setErrorIconTintList(
                         ColorStateList.valueOf(
-                            ContextCompat.getColor(requireContext(), R.color.design_error)
+                            ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
                         )
                     )
                 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt
index 0c891032a2..22c3cf4375 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt
@@ -252,7 +252,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
                 layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
                 layout.setErrorIconTintList(
                     ColorStateList.valueOf(
-                        ContextCompat.getColor(requireContext(), R.color.design_error)
+                        ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
                     )
                 )
             }
@@ -263,7 +263,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
                 layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
                 layout.setErrorIconTintList(
                     ColorStateList.valueOf(
-                        ContextCompat.getColor(requireContext(), R.color.design_error)
+                        ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
                     )
                 )
             }
@@ -286,7 +286,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
             layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
             layout.setErrorIconTintList(
                 ColorStateList.valueOf(
-                    ContextCompat.getColor(requireContext(), R.color.design_error)
+                    ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
                 )
             )
         }
@@ -299,7 +299,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
             layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
             layout.setErrorIconTintList(
                 ColorStateList.valueOf(
-                    ContextCompat.getColor(requireContext(), R.color.design_error)
+                    ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
                 )
             )
         }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
index 4d6e5b35d4..8afcadf445 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
@@ -233,7 +233,7 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
                 layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
                 layout.setErrorIconTintList(
                     ColorStateList.valueOf(
-                        ContextCompat.getColor(requireContext(), R.color.design_error)
+                        ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
                     )
                 )
                 clearButton.isVisible = false
@@ -250,7 +250,7 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
             layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
             layout.setErrorIconTintList(
                 ColorStateList.valueOf(
-                    ContextCompat.getColor(requireContext(), R.color.design_error)
+                    ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
                 )
             )
         }
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index f3bab752da..a41f3352e8 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -19,7 +19,7 @@
     <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>
-    <color name="destructive_normal_theme">@color/destructive_dark_theme</color>
+    <color name="destructive_normal_theme">@color/photonRed40</color>
     <color name="disabled_normal_theme">@color/disabled_dark_theme</color>
     <color name="scrimStart_normal_theme">@color/scrimStart_dark_theme</color>
     <color name="scrimEnd_normal_theme">@color/scrimEnd_dark_theme</color>
@@ -103,9 +103,6 @@
     <!-- Reader View colors -->
     <color name="mozac_feature_readerview_text_color">@color/primary_text_dark_theme</color>
 
-    <!-- TextInputLayout default Error Color -->
-    <color name="design_error" tools:override="true">@color/destructive_dark_theme</color>
-
     <!-- Tab Counter colors -->
     <color name="mozac_ui_tabcounter_default_tint">@color/primary_text_dark_theme</color>
     <color name="mozac_ui_tabcounter_default_text">@color/primary_text_dark_theme</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 572d64e210..7de29bc94b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -90,7 +90,6 @@
     <color name="neutral_dark_theme">@color/photonGrey20</color>
     <color name="neutral_faded_dark_theme">#1FFBFBFE</color>
     <color name="shadow_dark_theme">#050505</color>
-    <color name="destructive_dark_theme">@color/photonRed40</color>
     <color name="disabled_dark_theme">#66FBFBFE</color>
     <color name="scrimStart_dark_theme">#F520123A</color>
     <color name="scrimEnd_dark_theme">#F515141A</color>
@@ -349,9 +348,6 @@
     <!-- SearchView Hint Color -->
     <color name="search_view_hint_color">@color/photonDarkGrey05</color>
 
-    <!-- TextInputLayout default Error Color -->
-    <color name="design_error" tools:override="true">@color/destructive_light_theme</color>
-
     <!-- Tab Counter colors -->
     <color name="mozac_ui_tabcounter_default_tint">@color/primary_text_light_theme</color>
     <color name="mozac_ui_tabcounter_default_text">@color/primary_text_light_theme</color>