From eaf301b7e3cbef3818c0cc60ffb38db16ed43618 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Mon, 8 Jul 2024 09:09:31 +0900 Subject: [PATCH] =?UTF-8?q?[CHORE/#16]=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0=20=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/designsystem/component/button/RectangleButton.kt | 8 ++++---- .../core/designsystem/component/button/RoundButton.kt | 6 +++--- .../designsystem/component/button/TerningBasicButton.kt | 4 ++-- .../main/java/com/terning/core/designsystem/theme/Type.kt | 1 - 4 files changed, 9 insertions(+), 10 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 77cf1e4bc..66e456677 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 @@ -14,21 +14,21 @@ import com.terning.core.designsystem.theme.TerningTheme @Composable fun RectangleButton( - modifier: Modifier = Modifier, style: TextStyle, paddingVertical: Dp, @StringRes text: Int, - isEnabled: Boolean = true, onButtonClick: () -> Unit, + modifier: Modifier = Modifier, + isEnabled: Boolean = true ) { TerningBasicButton( - modifier = modifier, style = style, paddingVertical = paddingVertical, text = text, + onButtonClick = onButtonClick, + modifier = modifier, isEnabled = isEnabled, shape = RoundedCornerShape(0.dp), - onButtonClick = onButtonClick, ) } 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 6ddd03314..5dd31848f 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 @@ -14,13 +14,13 @@ import com.terning.core.designsystem.theme.TerningTheme @Composable fun RoundButton( - modifier: Modifier = Modifier, style: TextStyle, paddingVertical: Dp, cornerRadius: Dp, @StringRes text: Int, - isEnabled: Boolean = true, onButtonClick: () -> Unit, + modifier: Modifier = Modifier, + isEnabled: Boolean = true, ) { TerningBasicButton( modifier = modifier, @@ -28,8 +28,8 @@ fun RoundButton( paddingVertical = paddingVertical, shape = RoundedCornerShape(cornerRadius), text = text, - isEnabled = isEnabled, onButtonClick = onButtonClick, + isEnabled = isEnabled, ) } 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 6bc667e6d..4da897a1d 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 @@ -32,13 +32,13 @@ import com.terning.core.util.NoRippleTheme @Composable fun TerningBasicButton( - modifier: Modifier = Modifier, shape: Shape, style: TextStyle, paddingVertical: Dp, @StringRes text: Int, + onButtonClick: () -> Unit, + modifier: Modifier = Modifier, isEnabled: Boolean = true, - onButtonClick: () -> Unit ) { val interactionSource = remember { MutableInteractionSource() } val isPressed by interactionSource.collectIsPressedAsState() diff --git a/core/src/main/java/com/terning/core/designsystem/theme/Type.kt b/core/src/main/java/com/terning/core/designsystem/theme/Type.kt index 03c10cb34..fd067ced8 100644 --- a/core/src/main/java/com/terning/core/designsystem/theme/Type.kt +++ b/core/src/main/java/com/terning/core/designsystem/theme/Type.kt @@ -204,7 +204,6 @@ class TerningTypography internal constructor( } } - @Composable fun TerningTypography(): TerningTypography { return TerningTypography(