Skip to content

Commit b4b45ae

Browse files
committed
Update legacy secondary button style colors
1 parent 1365ee8 commit b4b45ae

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

library/src/main/java/com/spendesk/grapes/Button.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ class Button : MaterialCardView {
180180
Style.SECONDARY ->
181181
ButtonConfig(
182182
colorBackground = R.color.buttonSecondaryBackground,
183-
colorBackgroundPressed = R.color.buttonSecondaryBackgroundPressed,
184-
colorBackgroundDisabled = R.color.buttonSecondaryBackgroundDisabled,
183+
colorBackgroundPressed = R.color.backgroundPressed,
184+
colorBackgroundDisabled = R.color.buttonPrimaryBackgroundDisabled,
185185
contentTextColorStateList = R.color.btn_secondary_text,
186186
radius = R.dimen.buttonRadius,
187187
stroke = R.dimen.buttonSecondaryBackgroundStroke,

library/src/main/res/values/colors.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<!-- endregion Default -->
6969

7070
<!-- region BadgeView -->
71-
<color name="badgeViewTextColor">@color/mainWhite</color> white
71+
<color name="badgeViewTextColor">@color/mainWhite</color>
7272

7373
<!-- region Button -->
7474
<color name="buttonPrimaryBackground">@color/backgroundPrimaryBrandDefault</color>
@@ -80,10 +80,10 @@
8080
<color name="buttonPrimaryBorder">@color/borderDefault</color>
8181

8282
<color name="buttonSecondaryBackground">@color/backgroundPrimary</color>
83-
<color name="buttonSecondaryBackgroundPressed">@color/backgroundPressed</color>
84-
<color name="buttonSecondaryBackgroundDisabled">@color/backgroundDisabled</color>
83+
<color name="buttonSecondaryBackgroundPressed">@color/contentPrimary</color>
84+
<color name="buttonSecondaryBackgroundDisabled">@color/contentSecondaryBGSecondary</color>
8585
<color name="buttonSecondaryBackgroundStroke">@color/borderDefault</color>
86-
<color name="buttonSecondaryContent">@color/contentBrandDefault</color>
86+
<color name="buttonSecondaryContent">@color/contentPrimary</color>
8787
<color name="buttonSecondaryContentDisabled">@color/contentSecondaryBGSecondary</color>
8888

8989
<color name="buttonAlertBackground">@color/backgroundPrimaryAlertDefault</color>

0 commit comments

Comments
 (0)