Skip to content

Commit

Permalink
color 이름 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
oheunchan07 committed Jun 16, 2024
1 parent 0d8d88c commit 75d8e9b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -67,15 +67,15 @@ fun JDSButtonPreview() {
text = "text",
enabled = true,
textColor = JDSColor.ERROR,
backgroundColor = JDSColor.MAIN500,
backgroundColor = JDSColor.MAIN,
onClick = {}
)
JDSButton(
modifier = Modifier.padding(vertical = 16.dp, horizontal = 32.dp),
text = "text",
enabled = false,
textColor = JDSColor.ERROR,
backgroundColor = JDSColor.MAIN500,
backgroundColor = JDSColor.MAIN,
onClick = {}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
Expand Down Expand Up @@ -74,7 +74,7 @@ fun JDSOutlinedButtonPreview() {
text = "text",
enabled = true,
textColor = JDSColor.ERROR,
backgroundColor = JDSColor.MAIN500,
backgroundColor = JDSColor.MAIN,
borderColor = JDSColor.Black,
onClick = {}
)
Expand All @@ -83,7 +83,7 @@ fun JDSOutlinedButtonPreview() {
text = "text",
enabled = false,
textColor = JDSColor.ERROR,
backgroundColor = JDSColor.MAIN500,
backgroundColor = JDSColor.MAIN,
borderColor = JDSColor.Black,
onClick = {}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fun JDSToggleButton(
val backgroundColor by remember {
derivedStateOf {
lerp(
JDSColor.MAIN500, JDSColor.GRAY200,
JDSColor.MAIN, JDSColor.GRAY200,
swipeableState.offset.value / sizePx
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -138,7 +138,7 @@ fun JDSTextFieldPreview() {
modifier = Modifier.width(312.dp),
label = "아이디",
textFieldInfo = "아이디를 입력해주세요",
textFieldOutlineColor = JDSColor.MAIN500,
textFieldOutlineColor = JDSColor.MAIN,
textState = textState,
onTextChange = onTextChange
)
Expand Down

0 comments on commit 75d8e9b

Please sign in to comment.