Skip to content

Commit

Permalink
adjust some colors to be closer to new design color schemes (#1966)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtgriego
mtgriego authored Mar 5, 2024
1 parent 78f81ff commit 153dcf3
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
8 changes: 4 additions & 4 deletions app/src/main/java/com/kickstarter/ui/compose/designsystem/KSBadges.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -53,7 +53,7 @@ fun KSGreenBadge(
end = dimensions.paddingMediumSmall
),
text = text,
color = colors.kds_create_700,
color = colors.textAccentGreen,
style = typography.footnoteMedium
)
}
Expand All @@ -65,7 +65,7 @@ fun KSCoralBadge(
Text(
modifier = Modifier
.background(
color = colors.kds_celebrate_100,
color = colors.backgroundDangerSubtle,
shape = shapes.small
)
.padding(
Expand All @@ -75,7 +75,7 @@ fun KSCoralBadge(
end = dimensions.paddingMediumSmall
),
text = text,
color = colors.kds_support_400,
color = colors.textSecondary,
style = typography.footnoteMedium
)
}
48 changes: 24 additions & 24 deletions app/src/main/java/com/kickstarter/ui/compose/designsystem/KSButtons.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
}
Expand All @@ -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
)
}
}
Expand All @@ -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
)
}
}
Expand All @@ -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
)
}
}
Expand All @@ -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
)
}
}
Expand All @@ -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
)
}
}
Expand Down Expand Up @@ -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(),
Expand All @@ -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
)
}
Expand All @@ -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
)
}
Expand All @@ -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
)
}
Expand All @@ -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
)
}
Expand All @@ -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(),
Expand All @@ -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
)
}
Expand All @@ -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(),
Expand All @@ -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
)
}
Expand Down

0 comments on commit 153dcf3

Please sign in to comment.