From 807b5f29ee0bf8d8df4b50705f7242393d207a70 Mon Sep 17 00:00:00 2001 From: yuri <83583757+kangyuri1114@users.noreply.github.com> Date: Sun, 19 Jan 2025 19:58:00 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20button=20=ED=83=80=EC=9E=85=EB=AA=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(Box=20->=20Filled)=20(#23)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yourssu/handy/demo/ButtonPreview.kt | 187 +++++++++--------- .../handy/compose/FloatingActionButton.kt | 4 +- .../handy/compose/button/BaseButton.kt | 2 +- .../handy/compose/button/ButtonState.kt | 6 +- .../button/{BoxButton.kt => FilledButton.kt} | 66 +++---- .../handy/compose/button/TextButton.kt | 2 +- .../compose/foundation/SemanticColors.kt | 28 +-- 7 files changed, 146 insertions(+), 149 deletions(-) rename compose/src/main/kotlin/com/yourssu/handy/compose/button/{BoxButton.kt => FilledButton.kt} (69%) diff --git a/app/src/main/kotlin/com/yourssu/handy/demo/ButtonPreview.kt b/app/src/main/kotlin/com/yourssu/handy/demo/ButtonPreview.kt index 74929549..454c286c 100644 --- a/app/src/main/kotlin/com/yourssu/handy/demo/ButtonPreview.kt +++ b/app/src/main/kotlin/com/yourssu/handy/demo/ButtonPreview.kt @@ -4,18 +4,15 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color.Companion.White import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.yourssu.handy.compose.HandyTheme -import com.yourssu.handy.compose.button.BoxButton -import com.yourssu.handy.compose.button.BoxButtonSize -import com.yourssu.handy.compose.button.BoxButtonType +import com.yourssu.handy.compose.button.FilledButton +import com.yourssu.handy.compose.button.FilledButtonSize +import com.yourssu.handy.compose.button.FilledButtonType import com.yourssu.handy.compose.button.TextButton import com.yourssu.handy.compose.button.TextButtonSize import com.yourssu.handy.compose.button.TextButtonType @@ -25,7 +22,7 @@ import com.yourssu.handy.compose.icons.line.ExternalLink @Preview @Composable -private fun BoxButtonPreview() { +private fun FilledButtonPreview() { HandyTheme { Column( modifier = Modifier.background(White), @@ -38,179 +35,179 @@ private fun BoxButtonPreview() { verticalArrangement = Arrangement.spacedBy(8.dp) ) { - BoxButton( + FilledButton( onClick = {}, text = "isDisabled", enabled = false, - sizeType = BoxButtonSize.XL, + sizeType = FilledButtonSize.XL, ) - BoxButton( + FilledButton( onClick = {}, text = "XL Button", - sizeType = BoxButtonSize.XL, + sizeType = FilledButtonSize.XL, ) - BoxButton( + FilledButton( onClick = {}, text = "L Button", - sizeType = BoxButtonSize.L, + sizeType = FilledButtonSize.L, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.M, + sizeType = FilledButtonSize.M, ) - BoxButton( + FilledButton( onClick = {}, text = "S Button", - sizeType = BoxButtonSize.S, + sizeType = FilledButtonSize.S, ) - BoxButton( + FilledButton( onClick = {}, text = "XS Button", - sizeType = BoxButtonSize.XS, + sizeType = FilledButtonSize.XS, ) - BoxButton( + FilledButton( onClick = {}, text = "XXS Button", - sizeType = BoxButtonSize.XXS, + sizeType = FilledButtonSize.XXS, ) } Column( verticalArrangement = Arrangement.spacedBy(8.dp) ) { - BoxButton( + FilledButton( onClick = {}, - buttonType = BoxButtonType.Secondary, + buttonType = FilledButtonType.Secondary, text = "isDisabled", enabled = false, - sizeType = BoxButtonSize.XL, + sizeType = FilledButtonSize.XL, ) - BoxButton( + FilledButton( onClick = {}, text = "XL Button", - buttonType = BoxButtonType.Secondary, - sizeType = BoxButtonSize.XL, + buttonType = FilledButtonType.Secondary, + sizeType = FilledButtonSize.XL, ) - BoxButton( + FilledButton( onClick = {}, text = "L Button", - buttonType = BoxButtonType.Secondary, - sizeType = BoxButtonSize.L, + buttonType = FilledButtonType.Secondary, + sizeType = FilledButtonSize.L, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - buttonType = BoxButtonType.Secondary, - sizeType = BoxButtonSize.M, + buttonType = FilledButtonType.Secondary, + sizeType = FilledButtonSize.M, ) - BoxButton( + FilledButton( onClick = {}, text = "S Button", - buttonType = BoxButtonType.Secondary, - sizeType = BoxButtonSize.S, + buttonType = FilledButtonType.Secondary, + sizeType = FilledButtonSize.S, ) - BoxButton( + FilledButton( onClick = {}, text = "XS Button", - buttonType = BoxButtonType.Secondary, - sizeType = BoxButtonSize.XS, + buttonType = FilledButtonType.Secondary, + sizeType = FilledButtonSize.XS, ) - BoxButton( + FilledButton( onClick = {}, text = "XXS Button", - buttonType = BoxButtonType.Secondary, - sizeType = BoxButtonSize.XXS, + buttonType = FilledButtonType.Secondary, + sizeType = FilledButtonSize.XXS, ) } Column( verticalArrangement = Arrangement.spacedBy(8.dp) ) { - BoxButton( + FilledButton( onClick = {}, - buttonType = BoxButtonType.Tertiary, + buttonType = FilledButtonType.Outlined, text = "isDisabled", enabled = false, - sizeType = BoxButtonSize.XL, + sizeType = FilledButtonSize.XL, ) - BoxButton( + FilledButton( onClick = {}, text = "XL Button", - buttonType = BoxButtonType.Tertiary, - sizeType = BoxButtonSize.XL, + buttonType = FilledButtonType.Outlined, + sizeType = FilledButtonSize.XL, ) - BoxButton( + FilledButton( onClick = {}, text = "L Button", - buttonType = BoxButtonType.Tertiary, - sizeType = BoxButtonSize.L, + buttonType = FilledButtonType.Outlined, + sizeType = FilledButtonSize.L, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - buttonType = BoxButtonType.Tertiary, - sizeType = BoxButtonSize.M, + buttonType = FilledButtonType.Outlined, + sizeType = FilledButtonSize.M, ) - BoxButton( + FilledButton( onClick = {}, text = "S Button", - buttonType = BoxButtonType.Tertiary, - sizeType = BoxButtonSize.S, + buttonType = FilledButtonType.Outlined, + sizeType = FilledButtonSize.S, ) - BoxButton( + FilledButton( onClick = {}, text = "XS Button", - buttonType = BoxButtonType.Tertiary, - sizeType = BoxButtonSize.XS, + buttonType = FilledButtonType.Outlined, + sizeType = FilledButtonSize.XS, ) - BoxButton( + FilledButton( onClick = {}, text = "XXS Button", - buttonType = BoxButtonType.Tertiary, - sizeType = BoxButtonSize.XXS, + buttonType = FilledButtonType.Outlined, + sizeType = FilledButtonSize.XXS, ) } } Row( horizontalArrangement = Arrangement.spacedBy(8.dp), ) { - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, + sizeType = FilledButtonSize.S, leftIcon = HandyIcons.Line.Add, enabled = false, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, + sizeType = FilledButtonSize.S, rightIcon = HandyIcons.Line.Add, enabled = false, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, + sizeType = FilledButtonSize.S, leftIcon = HandyIcons.Line.Add, rightIcon = HandyIcons.Line.Add, enabled = false, @@ -219,23 +216,23 @@ private fun BoxButtonPreview() { Row( horizontalArrangement = Arrangement.spacedBy(8.dp), ) { - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, + sizeType = FilledButtonSize.S, leftIcon = HandyIcons.Line.Add, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, + sizeType = FilledButtonSize.S, rightIcon = HandyIcons.Line.Add, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, + sizeType = FilledButtonSize.S, leftIcon = HandyIcons.Line.Add, rightIcon = HandyIcons.Line.Add, ) @@ -243,26 +240,26 @@ private fun BoxButtonPreview() { Row( horizontalArrangement = Arrangement.spacedBy(8.dp), ) { - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, - buttonType = BoxButtonType.Secondary, + sizeType = FilledButtonSize.S, + buttonType = FilledButtonType.Secondary, leftIcon = HandyIcons.Line.Add, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, - buttonType = BoxButtonType.Secondary, + sizeType = FilledButtonSize.S, + buttonType = FilledButtonType.Secondary, rightIcon = HandyIcons.Line.Add, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, - buttonType = BoxButtonType.Secondary, + sizeType = FilledButtonSize.S, + buttonType = FilledButtonType.Secondary, leftIcon = HandyIcons.Line.Add, rightIcon = HandyIcons.Line.Add, ) @@ -270,26 +267,26 @@ private fun BoxButtonPreview() { Row( horizontalArrangement = Arrangement.spacedBy(8.dp), ){ - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, - buttonType = BoxButtonType.Tertiary, + sizeType = FilledButtonSize.S, + buttonType = FilledButtonType.Outlined, leftIcon = HandyIcons.Line.Add, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, - buttonType = BoxButtonType.Tertiary, + sizeType = FilledButtonSize.S, + buttonType = FilledButtonType.Outlined, rightIcon = HandyIcons.Line.Add, ) - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.S, - buttonType = BoxButtonType.Tertiary, + sizeType = FilledButtonSize.S, + buttonType = FilledButtonType.Outlined, leftIcon = HandyIcons.Line.Add, rightIcon = HandyIcons.Line.Add, ) @@ -297,10 +294,10 @@ private fun BoxButtonPreview() { Row( horizontalArrangement = Arrangement.spacedBy(8.dp), ) { - BoxButton( + FilledButton( onClick = {}, text = "M Button", - sizeType = BoxButtonSize.M, + sizeType = FilledButtonSize.M, leftIcon = HandyIcons.Line.Add, horizontalPadding = 100.dp ) diff --git a/compose/src/main/kotlin/com/yourssu/handy/compose/FloatingActionButton.kt b/compose/src/main/kotlin/com/yourssu/handy/compose/FloatingActionButton.kt index f2383207..01649927 100644 --- a/compose/src/main/kotlin/com/yourssu/handy/compose/FloatingActionButton.kt +++ b/compose/src/main/kotlin/com/yourssu/handy/compose/FloatingActionButton.kt @@ -56,7 +56,7 @@ fun FloatingActionButton( val contentColor by containerColor.contentColor(enabled) val borderColor = containerColor.borderColor() - val containerSize = boxButtonSizeStateBySize(size = sizeType) + val containerSize = floatingButtonSizeStateBySize(size = sizeType) Surface( onClick = onClick, @@ -93,7 +93,7 @@ data class FloatingActionButtonSizeState( ) -private fun boxButtonSizeStateBySize( +private fun floatingButtonSizeStateBySize( size: FloatingActionButtonSize, ): FloatingActionButtonSizeState = when (size) { FloatingActionButtonSize.S -> FloatingActionButtonSizeState( diff --git a/compose/src/main/kotlin/com/yourssu/handy/compose/button/BaseButton.kt b/compose/src/main/kotlin/com/yourssu/handy/compose/button/BaseButton.kt index 5e14a8df..46074303 100644 --- a/compose/src/main/kotlin/com/yourssu/handy/compose/button/BaseButton.kt +++ b/compose/src/main/kotlin/com/yourssu/handy/compose/button/BaseButton.kt @@ -22,7 +22,7 @@ import com.yourssu.handy.compose.Surface /** * BaseButton : ripple 효과가 없는 Composable 함수 입니다. * - * BoxButton, TextButton의 베이스가 됩니다. + * FilledButton, TextButton의 베이스가 됩니다. * * @param onClick Button 클릭 시 실행되는 함수 * @param colors Button 색상 상태 diff --git a/compose/src/main/kotlin/com/yourssu/handy/compose/button/ButtonState.kt b/compose/src/main/kotlin/com/yourssu/handy/compose/button/ButtonState.kt index 10c6ba7e..52896428 100644 --- a/compose/src/main/kotlin/com/yourssu/handy/compose/button/ButtonState.kt +++ b/compose/src/main/kotlin/com/yourssu/handy/compose/button/ButtonState.kt @@ -50,9 +50,9 @@ class ButtonColorState( @Composable private fun pressedColorFor(color: Color): Color { return when (color) { - HandyTheme.colors.buttonBoxPrimaryEnabled -> HandyTheme.colors.buttonBoxPrimaryPressed - HandyTheme.colors.buttonBoxSecondaryEnabled -> HandyTheme.colors.buttonBoxSecondaryPressed - HandyTheme.colors.buttonBoxTertiaryEnabled -> HandyTheme.colors.buttonBoxTertiaryPressed + HandyTheme.colors.buttonFilledPrimaryEnabled -> HandyTheme.colors.buttonFilledPrimaryPressed + HandyTheme.colors.buttonFilledSecondaryEnabled -> HandyTheme.colors.buttonFilledSecondaryPressed + HandyTheme.colors.buttonOutlinedEnabled -> HandyTheme.colors.buttonOutlinedPressed HandyTheme.colors.buttonTextPrimaryEnabled -> HandyTheme.colors.buttonTextPrimaryPressed HandyTheme.colors.buttonTextSecondaryEnabled -> HandyTheme.colors.buttonTextSecondaryPressed else -> color diff --git a/compose/src/main/kotlin/com/yourssu/handy/compose/button/BoxButton.kt b/compose/src/main/kotlin/com/yourssu/handy/compose/button/FilledButton.kt similarity index 69% rename from compose/src/main/kotlin/com/yourssu/handy/compose/button/BoxButton.kt rename to compose/src/main/kotlin/com/yourssu/handy/compose/button/FilledButton.kt index c395a359..1e407042 100644 --- a/compose/src/main/kotlin/com/yourssu/handy/compose/button/BoxButton.kt +++ b/compose/src/main/kotlin/com/yourssu/handy/compose/button/FilledButton.kt @@ -17,13 +17,13 @@ import com.yourssu.handy.compose.Text import com.yourssu.handy.compose.foundation.HandyTypography -enum class BoxButtonType { +enum class FilledButtonType { Primary, Secondary, - Tertiary; + Outlined; } -enum class BoxButtonSize { +enum class FilledButtonSize { XXS, XS, S, @@ -33,8 +33,8 @@ enum class BoxButtonSize { } /** - * BoxButton : Box 형태의 Button 입니다. - * type : Primary, Secondary, Tertiary + * FilledButton : Box(Filled) 형태의 Button 입니다. + * type : Primary, Secondary, Outlined * size : XXS, XS, S, M, L, XL * * @param onClick Button 클릭 시 실행되는 함수 @@ -43,35 +43,35 @@ enum class BoxButtonSize { * @param rightIcon Button 오른쪽에 표시되는 Icon * @param enabled Button 활성화 여부, default true * @param sizeType Button 사이즈 - * @param buttonType Button 타입 (Primary, Secondary, Tertiary) + * @param buttonType Button 타입 (Primary, Secondary, Outlined) * @param interactionSource Button 상호작용 소스 * @param horizontalPadding Button 내부 content padding **/ @Composable -fun BoxButton( +fun FilledButton( onClick: () -> Unit, modifier: Modifier = Modifier, text: String, leftIcon: ImageVector? = null, rightIcon: ImageVector? = null, enabled: Boolean = true, - sizeType: BoxButtonSize = BoxButtonSize.M, - buttonType: BoxButtonType = BoxButtonType.Primary, + sizeType: FilledButtonSize = FilledButtonSize.M, + buttonType: FilledButtonType = FilledButtonType.Primary, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, - horizontalPadding: Dp = boxButtonSizeStateBySize(size = sizeType).horizontalPadding, + horizontalPadding: Dp = filledButtonSizeStateBySize(size = sizeType).horizontalPadding, ) { - val roundingDp = boxButtonSizeStateBySize(size = sizeType).round - val (typo, iconSize, height) = boxButtonSizeStateBySize(size = sizeType) + val roundingDp = filledButtonSizeStateBySize(size = sizeType).round + val (typo, iconSize, height) = filledButtonSizeStateBySize(size = sizeType) BaseButton( onClick = onClick, - colors = boxButtonColorByType( + colors = filledButtonColorByType( type = buttonType, ), modifier = modifier.height(height), enabled = enabled, - showBorder = (buttonType == BoxButtonType.Tertiary), + showBorder = (buttonType == FilledButtonType.Outlined), interactionSource = interactionSource, rounding = roundingDp, contentPadding = PaddingValues( @@ -103,35 +103,35 @@ fun BoxButton( @Composable -private fun boxButtonColorByType( - type: BoxButtonType, +private fun filledButtonColorByType( + type: FilledButtonType, ): ButtonColorState = when (type) { - BoxButtonType.Primary -> ButtonColorState( + FilledButtonType.Primary -> ButtonColorState( contentColor = HandyTheme.colors.textBasicWhite, disabledContentColor = HandyTheme.colors.textBasicDisabled, - bgColor = HandyTheme.colors.buttonBoxPrimaryEnabled, - disabledBgColor = HandyTheme.colors.buttonBoxPrimaryDisabled, + bgColor = HandyTheme.colors.buttonFilledPrimaryEnabled, + disabledBgColor = HandyTheme.colors.buttonFilledPrimaryDisabled, ) - BoxButtonType.Secondary -> ButtonColorState( + FilledButtonType.Secondary -> ButtonColorState( contentColor = HandyTheme.colors.textBrandSecondary, disabledContentColor = HandyTheme.colors.textBasicDisabled, - bgColor = HandyTheme.colors.buttonBoxSecondaryEnabled, - disabledBgColor = HandyTheme.colors.buttonBoxSecondaryDisabled, + bgColor = HandyTheme.colors.buttonFilledSecondaryEnabled, + disabledBgColor = HandyTheme.colors.buttonFilledSecondaryDisabled, ) - BoxButtonType.Tertiary -> ButtonColorState( - bgColor = HandyTheme.colors.buttonBoxTertiaryEnabled, + FilledButtonType.Outlined -> ButtonColorState( + bgColor = HandyTheme.colors.buttonOutlinedEnabled, contentColor = HandyTheme.colors.textBasicPrimary, - disabledBgColor = HandyTheme.colors.buttonBoxTertiaryDisabled, + disabledBgColor = HandyTheme.colors.buttonOutlinedDisabled, disabledContentColor = HandyTheme.colors.textBasicDisabled, ) } -private fun boxButtonSizeStateBySize( - size: BoxButtonSize, +private fun filledButtonSizeStateBySize( + size: FilledButtonSize, ): ButtonStyleProperties = when (size) { - BoxButtonSize.XL -> ButtonStyleProperties( + FilledButtonSize.XL -> ButtonStyleProperties( typo = HandyTypography.B1Sb16, iconSize = IconSize.S, height = 56.dp, @@ -139,7 +139,7 @@ private fun boxButtonSizeStateBySize( round = 16.dp ) - BoxButtonSize.L -> ButtonStyleProperties( + FilledButtonSize.L -> ButtonStyleProperties( typo = HandyTypography.B1Sb16, iconSize = IconSize.S, height = 52.dp, @@ -147,7 +147,7 @@ private fun boxButtonSizeStateBySize( round = 16.dp ) - BoxButtonSize.M -> ButtonStyleProperties( + FilledButtonSize.M -> ButtonStyleProperties( typo = HandyTypography.B1Sb16, iconSize = IconSize.S, height = 48.dp, @@ -155,7 +155,7 @@ private fun boxButtonSizeStateBySize( round = 14.dp ) - BoxButtonSize.S -> ButtonStyleProperties( + FilledButtonSize.S -> ButtonStyleProperties( typo = HandyTypography.B3Sb14, iconSize = IconSize.XS, height = 40.dp, @@ -163,7 +163,7 @@ private fun boxButtonSizeStateBySize( round = 12.dp ) - BoxButtonSize.XS -> ButtonStyleProperties( + FilledButtonSize.XS -> ButtonStyleProperties( typo = HandyTypography.B5Sb12, iconSize = IconSize.XXS, height = 32.dp, @@ -171,7 +171,7 @@ private fun boxButtonSizeStateBySize( round = 10.dp ) - BoxButtonSize.XXS -> ButtonStyleProperties( + FilledButtonSize.XXS -> ButtonStyleProperties( typo = HandyTypography.B5Sb12, iconSize = IconSize.XXS, height = 24.dp, diff --git a/compose/src/main/kotlin/com/yourssu/handy/compose/button/TextButton.kt b/compose/src/main/kotlin/com/yourssu/handy/compose/button/TextButton.kt index 0445c5d7..04896441 100644 --- a/compose/src/main/kotlin/com/yourssu/handy/compose/button/TextButton.kt +++ b/compose/src/main/kotlin/com/yourssu/handy/compose/button/TextButton.kt @@ -29,7 +29,7 @@ enum class TextButtonSize { /** * BaseButton : ripple 효과가 없는 Composable 함수 입니다. * - * BoxButton, TextButton의 베이스가 됩니다. + * FilledButton, TextButton의 베이스가 됩니다. * * @param onClick Button 클릭 시 실행되는 함수 * @param text Button 내부 text diff --git a/compose/src/main/kotlin/com/yourssu/handy/compose/foundation/SemanticColors.kt b/compose/src/main/kotlin/com/yourssu/handy/compose/foundation/SemanticColors.kt index d668f4f4..e04a0bed 100644 --- a/compose/src/main/kotlin/com/yourssu/handy/compose/foundation/SemanticColors.kt +++ b/compose/src/main/kotlin/com/yourssu/handy/compose/foundation/SemanticColors.kt @@ -37,29 +37,29 @@ data class ColorScheme( val textStatusNegative: Color = ColorStatusRedMain, val textStatusPositive: Color = ColorViolet500, - // Tertiary / Basic + // Outlined / Basic val lineBasicLight: Color = ColorGray100, val lineBasicMedium: Color = ColorGray200, val lineBasicStrong: Color = ColorGray300, - // Tertiary / Status + // Outlined / Status val lineStatusNegative: Color = ColorStatusRedMain, val lineStatusPositive: Color = ColorViolet500, - // Button / Box / Primary - val buttonBoxPrimaryEnabled: Color = ColorViolet500, - val buttonBoxPrimaryPressed: Color = ColorViolet700, - val buttonBoxPrimaryDisabled: Color = ColorGray100, + // Button / Filled / Primary + val buttonFilledPrimaryEnabled: Color = ColorViolet500, + val buttonFilledPrimaryPressed: Color = ColorViolet700, + val buttonFilledPrimaryDisabled: Color = ColorGray100, - // Button / Box / Secondary - val buttonBoxSecondaryEnabled: Color = ColorViolet50, - val buttonBoxSecondaryPressed: Color = ColorViolet200, - val buttonBoxSecondaryDisabled: Color = ColorGray100, + // Button / Filled / Secondary + val buttonFilledSecondaryEnabled: Color = ColorViolet50, + val buttonFilledSecondaryPressed: Color = ColorViolet200, + val buttonFilledSecondaryDisabled: Color = ColorGray100, - // Button / Box / Tertiary - val buttonBoxTertiaryEnabled: Color = ColorNeutralTransparent, - val buttonBoxTertiaryPressed: Color = ColorGray100, - val buttonBoxTertiaryDisabled: Color = ColorNeutralTransparent, + // Button / Outlined + val buttonOutlinedEnabled: Color = ColorNeutralTransparent, + val buttonOutlinedPressed: Color = ColorGray100, + val buttonOutlinedDisabled: Color = ColorNeutralTransparent, // Button / Text / Primary val buttonTextPrimaryEnabled: Color = ColorNeutralTransparent,