ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #27307 - Use the correct warning button text and icon color for DestructiveButton

This commit is contained in:
Gabriel Luong 2022-10-06 19:21:40 -04:00 committed by mergify[bot]
parent 4ecc432b69
commit b6b892faab
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/values-night/colors.xml
View File

@ -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>

4
app/src/main/res/values/colors.xml
View File

@ -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>

4
app/src/main/res/values/styles.xml
View File

@ -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">