Skip to content

Commit

Permalink
ADS: Destructive Colors (#2703)
Browse files Browse the repository at this point in the history
<!--
Note: This checklist is a reminder of our shared engineering
expectations.
The items in Bold are required
If your PR involves UI changes:
1. Upload screenshots or screencasts that illustrate the changes before
/ after
2. Add them under the UI changes section (feel free to add more columns
if needed)
    3. Make sure these changes are tested in API 23 and API 26
If your PR does not involve UI changes, you can remove the **UI
changes** section
-->

Task/Issue URL:
https://app.asana.com/0/1202857801505092/1203560741717081

### Description
This PR updates the colors of destructive primary and ghost buttons
  • Loading branch information
malmstein committed Jan 12, 2023
1 parent fd59599 commit d66fc81
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
8 changes: 8 additions & 0 deletions common-ui/src/main/res/values/design-system-colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@

<!-- Design System Brand Colors -->
<color name="disabledColor">#59000000</color>
<color name="alertRedOnLightDefault">#EB102D</color>
<color name="alertRedOnLightDefault_18">#2EEB102D</color>
<color name="alertRedOnLightPressed">#C10D25</color>
<color name="alertRedOnDarkDefault">#FF545A</color>
<color name="alertRedOnDarkDefault_18">#2EFF545A</color>
<color name="alertRedOnDarkPressed">#D1454A</color>
<color name="alertRedOnLightTextPressed">@color/alertRedOnLightPressed</color>
<color name="alertRedOnDarkTextPressed">#FF7378</color>

<!-- Design System Raw Colors -->
<color name="red20">#F2A18A</color>
Expand Down
24 changes: 12 additions & 12 deletions common-ui/src/main/res/values/design-system-theming.xml
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
<item name="daxColorSecondaryText">@color/white60</item>
<item name="daxColorSecondaryInvertedText">@color/black60</item>
<item name="daxColorPrimaryIcon">@color/white84</item>
<item name="daxColorDestructive">@color/red30</item>
<item name="daxColorDestructive">@color/alertRedOnDarkDefault</item>
<item name="daxColorContainerDisabled">@color/white18</item>
<item name="daxColorTextDisabled">@color/white36</item>
<item name="daxColorLines">@color/white9</item>
Expand All @@ -259,16 +259,16 @@
<item name="daxColorButtonPrimaryContainerPressed">@color/blue50</item>
<item name="daxColorButtonSecondaryContainer">@android:color/transparent</item>
<item name="daxColorButtonSecondaryContainerPressed">@color/blue30</item>
<item name="daxColorButtonDestructiveContainer">@color/red30</item>
<item name="daxColorButtonDestructiveContainerPressed">@color/red50</item>
<item name="daxColorButtonDestructiveContainer">@color/alertRedOnDarkDefault</item>
<item name="daxColorButtonDestructiveContainerPressed">@color/alertRedOnDarkPressed</item>
<item name="daxColorButtonDestructiveGhostContainer">@android:color/transparent</item>
<item name="daxColorButtonDestructiveGhostContainerPressed">@color/red30_18</item>
<item name="daxColorButtonDestructiveGhostContainerPressed">@color/alertRedOnDarkDefault_18</item>
<item name="daxColorButtonPrimaryText">@color/black84</item>
<item name="daxColorButtonPrimaryTextPressed">@color/black84</item>
<item name="daxColorButtonSecondaryText">@color/blue30</item>
<item name="daxColorButtonSecondaryTextPressed">@color/blue20</item>
<item name="daxColorButtonDestructiveGhostText">@color/red30</item>
<item name="daxColorButtonDestructiveGhostTextPressed">@color/red20</item>
<item name="daxColorButtonDestructiveGhostText">@color/alertRedOnDarkDefault</item>
<item name="daxColorButtonDestructiveGhostTextPressed">@color/alertRedOnDarkTextPressed</item>

<!-- Switch -->
<item name="daxColorSwitchTrackOn">?attr/daxColorAccentBlue</item>
Expand Down Expand Up @@ -384,7 +384,7 @@
<item name="daxColorSecondaryText">@color/black60</item>
<item name="daxColorSecondaryInvertedText">@color/white60</item>
<item name="daxColorPrimaryIcon">@color/black84</item>
<item name="daxColorDestructive">@color/red50</item>
<item name="daxColorDestructive">@color/alertRedOnLightDefault</item>
<item name="daxColorContainerDisabled">@color/black6</item>
<item name="daxColorTextDisabled">@color/black36</item>
<item name="daxColorLines">@color/black18</item>
Expand All @@ -398,16 +398,16 @@
<item name="daxColorButtonPrimaryContainerPressed">@color/blue70</item>
<item name="daxColorButtonSecondaryContainer">@android:color/transparent</item>
<item name="daxColorButtonSecondaryContainerPressed">@color/blue50</item>
<item name="daxColorButtonDestructiveContainer">@color/red70</item>
<item name="daxColorButtonDestructiveContainerPressed">@color/red70</item>
<item name="daxColorButtonDestructiveContainer">@color/alertRedOnLightDefault</item>
<item name="daxColorButtonDestructiveContainerPressed">@color/alertRedOnLightPressed</item>
<item name="daxColorButtonDestructiveGhostContainer">@android:color/transparent</item>
<item name="daxColorButtonDestructiveGhostContainerPressed">@color/red60_12</item>
<item name="daxColorButtonDestructiveGhostContainerPressed">@color/alertRedOnLightDefault</item>
<item name="daxColorButtonPrimaryText">@color/white</item>
<item name="daxColorButtonPrimaryTextPressed">@color/white</item>
<item name="daxColorButtonSecondaryText">@color/blue50</item>
<item name="daxColorButtonSecondaryTextPressed">@color/blue70</item>
<item name="daxColorButtonDestructiveGhostText">@color/red50</item>
<item name="daxColorButtonDestructiveGhostTextPressed">@color/red70</item>
<item name="daxColorButtonDestructiveGhostText">@color/alertRedOnLightDefault</item>
<item name="daxColorButtonDestructiveGhostTextPressed">@color/alertRedOnLightPressed</item>

<!-- Switch -->
<item name="daxColorSwitchTrackOn">?attr/daxColorAccentBlue</item>
Expand Down

0 comments on commit d66fc81

Please sign in to comment.