From 5a860ac68927918b7cf3a23516ac305446110993 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Mon, 8 Jul 2024 02:53:30 +0900 Subject: [PATCH] =?UTF-8?q?[CHORE/#16]=20=EB=A7=A4=EA=B0=9C=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=9C=84=EC=B9=98=20=EB=B0=8F=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/button/RectangleButton.kt | 10 +++++----- .../designsystem/component/button/RoundButton.kt | 16 ++++++++-------- .../component/button/TerningBasicButton.kt | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/com/terning/core/designsystem/component/button/RectangleButton.kt b/core/src/main/java/com/terning/core/designsystem/component/button/RectangleButton.kt index d5ad56bbf..91505789f 100644 --- a/core/src/main/java/com/terning/core/designsystem/component/button/RectangleButton.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/button/RectangleButton.kt @@ -13,20 +13,20 @@ import com.terning.core.designsystem.theme.TerningTheme @Composable fun RectangleButton( modifier: Modifier = Modifier, - isEnabled: Boolean = true, - text: String = "", style: TextStyle, paddingVertical: Dp, + isEnabled: Boolean = true, + text: String = "", onButtonClick: () -> Unit, ) { TerningBasicButton( modifier = modifier, + style = style, + paddingVertical = paddingVertical, isEnabled = isEnabled, + text = text, shape = RoundedCornerShape(0.dp), onButtonClick = onButtonClick, - text = text, - style = style, - paddingVertical = paddingVertical ) } diff --git a/core/src/main/java/com/terning/core/designsystem/component/button/RoundButton.kt b/core/src/main/java/com/terning/core/designsystem/component/button/RoundButton.kt index ccf43e196..63c83b0a8 100644 --- a/core/src/main/java/com/terning/core/designsystem/component/button/RoundButton.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/button/RoundButton.kt @@ -13,21 +13,21 @@ import com.terning.core.designsystem.theme.TerningTheme @Composable fun RoundButton( modifier: Modifier = Modifier, - isEnabled: Boolean = true, - text: String = "", style: TextStyle, paddingVertical: Dp, - roundedCornerShape: Dp, + cornerRadius: Dp, + isEnabled: Boolean = true, + text: String = "", onButtonClick: () -> Unit, ) { TerningBasicButton( modifier = modifier, + style = style, + paddingVertical = paddingVertical, + shape = RoundedCornerShape(cornerRadius), isEnabled = isEnabled, - shape = RoundedCornerShape(roundedCornerShape), - onButtonClick = onButtonClick, text = text, - style = style, - paddingVertical = paddingVertical + onButtonClick = onButtonClick, ) } @@ -39,7 +39,7 @@ fun RoundButtonPreview() { style = TerningTheme.typography.button0, text = "RoundButton", paddingVertical = 19.dp, - roundedCornerShape = 10.dp, + cornerRadius = 10.dp, onButtonClick = {} ) } diff --git a/core/src/main/java/com/terning/core/designsystem/component/button/TerningBasicButton.kt b/core/src/main/java/com/terning/core/designsystem/component/button/TerningBasicButton.kt index ae050648e..b8f880281 100644 --- a/core/src/main/java/com/terning/core/designsystem/component/button/TerningBasicButton.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/button/TerningBasicButton.kt @@ -30,11 +30,11 @@ import com.terning.core.util.NoRippleTheme @Composable fun TerningBasicButton( modifier: Modifier = Modifier, - isEnabled: Boolean = true, - text: String = "", shape: Shape, style: TextStyle, paddingVertical: Dp, + isEnabled: Boolean = true, + text: String = "", onButtonClick: () -> Unit ) { val interactionSource = remember { MutableInteractionSource() }