From 75d8e9b53943285e4f2ef60d097dcc7868160c91 Mon Sep 17 00:00:00 2001 From: oheunchan07 <131967057+oheunchan07@users.noreply.github.com> Date: Sun, 16 Jun 2024 23:10:14 +0900 Subject: [PATCH] =?UTF-8?q?color=20=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jusiCool/jds_component/button/JDSButton.kt | 6 +++--- .../jusiCool/jds_component/button/JDSOutlinedButton.kt | 8 ++++---- .../com/jusiCool/jds_component/button/JDSToggleButton.kt | 2 +- .../java/com/jusiCool/jds_component/color/JDSColor.kt | 2 +- .../com/jusiCool/jds_component/textField/JDSTextField.kt | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSButton.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSButton.kt index fe20dc1..f543e95 100644 --- a/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSButton.kt +++ b/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSButton.kt @@ -22,7 +22,7 @@ fun JDSButton( text: String, enabled: Boolean = true, textColor: Color = JDSColor.WHITE, - backgroundColor: Color = JDSColor.MAIN500, + backgroundColor: Color = JDSColor.MAIN, onClick: () -> Unit, ) { Column( @@ -67,7 +67,7 @@ fun JDSButtonPreview() { text = "text", enabled = true, textColor = JDSColor.ERROR, - backgroundColor = JDSColor.MAIN500, + backgroundColor = JDSColor.MAIN, onClick = {} ) JDSButton( @@ -75,7 +75,7 @@ fun JDSButtonPreview() { text = "text", enabled = false, textColor = JDSColor.ERROR, - backgroundColor = JDSColor.MAIN500, + backgroundColor = JDSColor.MAIN, onClick = {} ) } diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSOutlinedButton.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSOutlinedButton.kt index 9829908..3b66e3b 100644 --- a/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSOutlinedButton.kt +++ b/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSOutlinedButton.kt @@ -22,8 +22,8 @@ fun JDSOutlinedButton( modifier: Modifier = Modifier, text: String, enabled: Boolean = true, - textColor: Color = JDSColor.MAIN500, - borderColor: Color = JDSColor.MAIN500, + textColor: Color = JDSColor.MAIN, + borderColor: Color = JDSColor.MAIN, backgroundColor: Color = JDSColor.WHITE, onClick: () -> Unit, ) { @@ -74,7 +74,7 @@ fun JDSOutlinedButtonPreview() { text = "text", enabled = true, textColor = JDSColor.ERROR, - backgroundColor = JDSColor.MAIN500, + backgroundColor = JDSColor.MAIN, borderColor = JDSColor.Black, onClick = {} ) @@ -83,7 +83,7 @@ fun JDSOutlinedButtonPreview() { text = "text", enabled = false, textColor = JDSColor.ERROR, - backgroundColor = JDSColor.MAIN500, + backgroundColor = JDSColor.MAIN, borderColor = JDSColor.Black, onClick = {} ) diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSToggleButton.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSToggleButton.kt index a51162d..45644bc 100644 --- a/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSToggleButton.kt +++ b/JDS-component/src/main/java/com/jusiCool/jds_component/button/JDSToggleButton.kt @@ -58,7 +58,7 @@ fun JDSToggleButton( val backgroundColor by remember { derivedStateOf { lerp( - JDSColor.MAIN500, JDSColor.GRAY200, + JDSColor.MAIN, JDSColor.GRAY200, swipeableState.offset.value / sizePx ) } diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/color/JDSColor.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/color/JDSColor.kt index 4e71906..6adcb91 100644 --- a/JDS-component/src/main/java/com/jusiCool/jds_component/color/JDSColor.kt +++ b/JDS-component/src/main/java/com/jusiCool/jds_component/color/JDSColor.kt @@ -3,7 +3,7 @@ package com.jusiCool.jds_component.color import androidx.compose.ui.graphics.Color object JDSColor { - val MAIN500 = Color(0xFF2756F1) + val MAIN = Color(0xFF2756F1) val Black = Color(0xFF000000) val WHITE = Color(0xFFFFFFFF) diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/textField/JDSTextField.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/textField/JDSTextField.kt index 7e7f510..db7bc08 100644 --- a/JDS-component/src/main/java/com/jusiCool/jds_component/textField/JDSTextField.kt +++ b/JDS-component/src/main/java/com/jusiCool/jds_component/textField/JDSTextField.kt @@ -69,7 +69,7 @@ fun JDSTextField( modifier = Modifier .border( width = 1.dp, - color = if (isFocused.value && textFieldOutlineColor == JDSColor.GRAY100) JDSColor.MAIN500 else textFieldOutlineColor, + color = if (isFocused.value && textFieldOutlineColor == JDSColor.GRAY100) JDSColor.MAIN else textFieldOutlineColor, shape = RoundedCornerShape(size = 8.dp) ) .height(54.dp) @@ -107,7 +107,7 @@ fun JDSTextField( Text( text = supportText, - color = if (isError) JDSColor.ERROR else JDSColor.MAIN500, + color = if (isError) JDSColor.ERROR else JDSColor.MAIN, style = JDSTypography.labelLarge, modifier = if (!isError) Modifier .align(Alignment.End) @@ -138,7 +138,7 @@ fun JDSTextFieldPreview() { modifier = Modifier.width(312.dp), label = "아이디", textFieldInfo = "아이디를 입력해주세요", - textFieldOutlineColor = JDSColor.MAIN500, + textFieldOutlineColor = JDSColor.MAIN, textState = textState, onTextChange = onTextChange )