For mozilla-mobile#27307 - Use the correct fx_mobile_text_color_warni…

…ng_button text color for DestructiveButton
gabrielluong · Oct 7, 2022 · 5b35c8a · 5b35c8a
1 parent 3f7391a
commit 5b35c8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -60,7 +60,7 @@
     <!-- Warning text -->
     <color name="fx_mobile_text_color_warning">@color/photonRed20</color>
     <!-- Warning text on Secondary button -->
-    <color name="fx_mobile_text_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color>
+    <color name="fx_mobile_text_color_warning_button">@color/photonRed70</color>
     <!-- Small heading, Text link -->
     <color name="fx_mobile_text_color_accent">@color/photonViolet20</color>
     <!-- Small heading, Text link -->
@@ -97,7 +97,7 @@
     <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
     <color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed20</color>
     <!-- Warning icon on Secondary button -->
-    <color name="fx_mobile_icon_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color>
+    <color name="fx_mobile_icon_color_warning_button">@color/photonRed70</color>
     <color name="fx_mobile_icon_color_accent_violet">@color/photonViolet20</color>
     <color name="fx_mobile_icon_color_accent_blue">@color/photonBlue20</color>
     <color name="fx_mobile_icon_color_accent_pink">@color/photonPink20</color>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -60,7 +60,7 @@
     <!-- Warning text -->
     <color name="fx_mobile_text_color_warning">@color/photonRed70</color>
     <!-- Warning text on Secondary button -->
-    <color name="fx_mobile_text_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color>
+    <color name="fx_mobile_text_color_warning_button">@color/photonRed70</color>
     <!-- Small heading, Text link -->
     <color name="fx_mobile_text_color_accent">@color/photonViolet70</color>
     <!-- Small heading, Text link -->
@@ -97,7 +97,7 @@
     <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonInk20</color>
     <color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed70</color>
     <!-- Warning icon on Secondary button -->
-    <color name="fx_mobile_icon_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color>
+    <color name="fx_mobile_icon_color_warning_button">@color/photonRed70</color>
     <color name="fx_mobile_icon_color_accent_violet">@color/photonViolet60</color>
     <color name="fx_mobile_icon_color_accent_blue">@color/photonBlue60</color>
     <color name="fx_mobile_icon_color_accent_pink">@color/photonPink60</color>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -368,8 +368,8 @@
     </style>
 
     <style name="DestructiveButton" parent="NeutralButton">
-        <item name="iconTint">@color/fx_mobile_text_color_warning</item>
-        <item name="android:textColor">@color/fx_mobile_text_color_warning</item>
+        <item name="iconTint">@color/fx_mobile_icon_color_warning_button</item>
+        <item name="android:textColor">@color/fx_mobile_text_color_warning_button</item>
     </style>
 
     <style name="PositiveButton" parent="NeutralButton">