From 153dcf3b2e592bcbe5579729fe159873886d638e Mon Sep 17 00:00:00 2001 From: mtgriego Date: Tue, 5 Mar 2024 10:04:00 -0800 Subject: [PATCH] adjust some colors to be closer to new design color schemes (#1966) --- .../ui/compose/designsystem/KSBadges.kt | 8 ++-- .../ui/compose/designsystem/KSButtons.kt | 48 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/kickstarter/ui/compose/designsystem/KSBadges.kt b/app/src/main/java/com/kickstarter/ui/compose/designsystem/KSBadges.kt index 07ffe48eb3..2c2f211358 100644 --- a/app/src/main/java/com/kickstarter/ui/compose/designsystem/KSBadges.kt +++ b/app/src/main/java/com/kickstarter/ui/compose/designsystem/KSBadges.kt @@ -43,7 +43,7 @@ fun KSGreenBadge( Text( modifier = Modifier .background( - color = colors.kds_create_700.copy(alpha = 0.06f), + color = colors.backgroundAccentGreenSubtle, shape = shapes.small ) .padding( @@ -53,7 +53,7 @@ fun KSGreenBadge( end = dimensions.paddingMediumSmall ), text = text, - color = colors.kds_create_700, + color = colors.textAccentGreen, style = typography.footnoteMedium ) } @@ -65,7 +65,7 @@ fun KSCoralBadge( Text( modifier = Modifier .background( - color = colors.kds_celebrate_100, + color = colors.backgroundDangerSubtle, shape = shapes.small ) .padding( @@ -75,7 +75,7 @@ fun KSCoralBadge( end = dimensions.paddingMediumSmall ), text = text, - color = colors.kds_support_400, + color = colors.textSecondary, style = typography.footnoteMedium ) } diff --git a/app/src/main/java/com/kickstarter/ui/compose/designsystem/KSButtons.kt b/app/src/main/java/com/kickstarter/ui/compose/designsystem/KSButtons.kt index 4559364d69..fc2c2cce9e 100644 --- a/app/src/main/java/com/kickstarter/ui/compose/designsystem/KSButtons.kt +++ b/app/src/main/java/com/kickstarter/ui/compose/designsystem/KSButtons.kt @@ -172,9 +172,9 @@ fun KSPrimaryGreenButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_create_700, + backgroundColor = colors.backgroundAccentGreenBold, text = text, - textColor = colors.kds_white + textColor = colors.textInversePrimary ) } } @@ -191,9 +191,9 @@ fun KSPrimaryBlueButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_trust_500, + backgroundColor = colors.backgroundAccentBlueBold, text = text, - textColor = colors.kds_white + textColor = colors.textInversePrimary ) } } @@ -210,9 +210,9 @@ fun KSPrimaryBlackButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_support_700, + backgroundColor = colors.backgroundAction, text = text, - textColor = colors.kds_white + textColor = colors.textInversePrimary ) } } @@ -229,9 +229,9 @@ fun KSSecondaryGreyButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_support_300, + backgroundColor = colors.backgroundAccentGraySubtle, text = text, - textColor = colors.kds_black + textColor = colors.textPrimary ) } } @@ -248,9 +248,9 @@ fun KSSecondaryRedButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_alert, + backgroundColor = colors.backgroundDangerBold, text = text, - textColor = colors.kds_white + textColor = colors.textInversePrimary ) } } @@ -267,9 +267,9 @@ fun KSSecondaryWhiteButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_white, + backgroundColor = colors.backgroundSurfacePrimary, text = text, - textColor = colors.kds_create_700 + textColor = colors.textAccentGreenBold ) } } @@ -328,7 +328,7 @@ fun KSIconButton( .defaultMinSize(minHeight = dimensions.minButtonHeight), colors = ButtonDefaults.buttonColors( backgroundColor = backgroundColor, - disabledBackgroundColor = colors.kds_support_300 + disabledBackgroundColor = colors.backgroundActionDisabled ), onClick = { onClickAction.invoke() }, elevation = ButtonDefaults.elevation(), @@ -350,7 +350,7 @@ fun KSIconButton( Text( text = copy, - color = if (isEnabled) color else colors.kds_support_400, + color = if (isEnabled) color else colors.textAccentGrey, style = typography.body ) } @@ -371,9 +371,9 @@ fun KSSmallBlueButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_trust_500, + backgroundColor = colors.backgroundAccentBlueBold, text = text, - textColor = colors.kds_white, + textColor = colors.textInversePrimary, radius = radius ) } @@ -392,9 +392,9 @@ fun KSSmallRedButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_alert, + backgroundColor = colors.backgroundDangerBold, text = text, - textColor = colors.kds_white, + textColor = colors.textInversePrimary, radius = radius ) } @@ -413,9 +413,9 @@ fun KSSmallWhiteButton( modifier = modifier, onClickAction = onClickAction, isEnabled = isEnabled, - backgroundColor = colors.kds_white, + backgroundColor = colors.backgroundInverse, text = text, - textColor = colors.kds_create_700, + textColor = colors.textAccentGreenBold, radius = radius ) } @@ -435,7 +435,7 @@ fun KSSmallButton( modifier = modifier, colors = ButtonDefaults.buttonColors( backgroundColor = backgroundColor, - disabledBackgroundColor = colors.kds_support_300 + disabledBackgroundColor = colors.backgroundActionDisabled ), onClick = { onClickAction.invoke() }, elevation = ButtonDefaults.elevation(), @@ -444,7 +444,7 @@ fun KSSmallButton( ) { Text( text = text, - color = if (isEnabled) textColor else colors.kds_support_400, + color = if (isEnabled) textColor else colors.textAccentGrey, style = typography.buttonText ) } @@ -465,7 +465,7 @@ fun KSButton( .defaultMinSize(minHeight = dimensions.minButtonHeight), colors = ButtonDefaults.buttonColors( backgroundColor = backgroundColor, - disabledBackgroundColor = colors.kds_support_300 + disabledBackgroundColor = colors.backgroundActionDisabled ), onClick = { onClickAction.invoke() }, elevation = ButtonDefaults.elevation(), @@ -474,7 +474,7 @@ fun KSButton( ) { Text( text = text, - color = if (isEnabled) textColor else colors.kds_support_400, + color = if (isEnabled) textColor else colors.textAccentGrey, style = typography.body ) }