Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chip 구현 #25

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 149 additions & 0 deletions app/src/main/kotlin/com/yourssu/handy/demo/ChipPreview.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
package com.yourssu.handy.demo

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.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Color.Companion.White
import androidx.compose.ui.layout.VerticalAlignmentLine
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.yourssu.handy.compose.Chip
import com.yourssu.handy.compose.ChipSize
import com.yourssu.handy.compose.HandyTheme
import com.yourssu.handy.compose.icons.HandyIcons
import com.yourssu.handy.compose.icons.line.Cancel
import com.yourssu.handy.compose.icons.line.Close
import com.yourssu.handy.compose.icons.line.Crop
import com.yourssu.handy.compose.icons.line.InfoCircle

@Preview
@Composable
fun ChipPreview() {
HandyTheme {
Column (
modifier = Modifier
.background(White)
.padding(10.dp),
verticalArrangement = Arrangement.spacedBy(30.dp)
) {
Row (
horizontalArrangement = Arrangement.spacedBy(10.dp)
) {
Column (
verticalArrangement = Arrangement.spacedBy(10.dp)
) {
Chip(
onCheckedChange = {},
text = "Label",
checked = false
)

Chip(
onCheckedChange = {},
text = "Label",
checked = true
)

Chip(
onCheckedChange = {},
text = "Label",
enabled = false
)
}

Column (
verticalArrangement = Arrangement.spacedBy(10.dp)
) {
Chip(
onCheckedChange = {},
text = "Label",
leftIcon = HandyIcons.Line.InfoCircle,
rightIcon = HandyIcons.Line.Close,
checked = false
)

Chip(
onCheckedChange = {},
text = "Label",
leftIcon = HandyIcons.Line.InfoCircle,
rightIcon = HandyIcons.Line.Close,
checked = true
)

Chip(
onCheckedChange = {},
text = "Label",
leftIcon = HandyIcons.Line.InfoCircle,
rightIcon = HandyIcons.Line.Close,
enabled = false
)
}
}

Row (
horizontalArrangement = Arrangement.spacedBy(10.dp)
) {
Column (
verticalArrangement = Arrangement.spacedBy(10.dp)
) {
Chip(
onCheckedChange = {},
text = "Label",
sizeType = ChipSize.Small,
checked = false
)

Chip(
onCheckedChange = {},
text = "Label",
sizeType = ChipSize.Small,
checked = true
)

Chip(
onCheckedChange = {},
text = "Label",
sizeType = ChipSize.Small,
enabled = false
)
}

Column (
verticalArrangement = Arrangement.spacedBy(10.dp)
) {
Chip(
onCheckedChange = {},
text = "Label",
sizeType = ChipSize.Small,
leftIcon = HandyIcons.Line.InfoCircle,
rightIcon = HandyIcons.Line.Close,
checked = false
)

Chip(
onCheckedChange = {},
text = "Label",
sizeType = ChipSize.Small,
leftIcon = HandyIcons.Line.InfoCircle,
rightIcon = HandyIcons.Line.Close,
checked = true
)

Chip(
onCheckedChange = {},
text = "Label",
sizeType = ChipSize.Small,
leftIcon = HandyIcons.Line.InfoCircle,
rightIcon = HandyIcons.Line.Close,
enabled = false
)
}
}
}
}
}
104 changes: 104 additions & 0 deletions compose/src/main/kotlin/com/yourssu/handy/compose/Chip.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
package com.yourssu.handy.compose

import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.yourssu.handy.compose.foundation.HandyTextStyle
import com.yourssu.handy.compose.foundation.HandyTypography

sealed class ChipSize(
val height: Dp,
val iconSize: IconSize = IconSize.XS,
val horizontalPadding: Dp = 12.dp,
val round: Dp = 40.dp
hoyaboi marked this conversation as resolved.
Show resolved Hide resolved
) {
data object Small : ChipSize(height = 24.dp)
data object Medium : ChipSize(height = 32.dp)
}

/**
* 정보를 입력하거나 선택하여 컨텐츠를 필터링할 수 있는 [Chip]입니다.
*
* @param onCheckedChange Chip의 선택 상태가 변경될 때 호출되는 함수
* @param text Chip 내부 텍스트
* @param sizeType Chip 사이즈 설정 : Small, Medium(Default)
* @param leftIcon Chip 내부 텍스트의 왼쪽에 표시되는 아이콘
* @param rightIcon Chip 내부 텍스트의 오른쪽에 표시되는 아이콘
* @param checked Chip의 선택 여부
* @param enabled Chip의 활성화 여부
*/
@Composable
fun Chip(
onCheckedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
text: String,
hoyaboi marked this conversation as resolved.
Show resolved Hide resolved
hoyaboi marked this conversation as resolved.
Show resolved Hide resolved
sizeType: ChipSize = ChipSize.Medium,
leftIcon: ImageVector? = null,
rightIcon: ImageVector? = null,
checked: Boolean = false,
enabled: Boolean = true,
) {
val iconSize = sizeType.iconSize
val height = sizeType.height
val horizontalPadding = sizeType.horizontalPadding
val round = sizeType.round

val typo = when {
checked -> HandyTypography.B3Sb14
else -> HandyTypography.B3Rg14
}

val backgroundColor = when {
checked -> HandyTheme.colors.chipSelected
!enabled -> HandyTheme.colors.chipDisabled
else -> HandyTheme.colors.chipUnselected
}

val contentColor = when {
checked -> HandyTheme.colors.textBrandPrimary
!enabled -> HandyTheme.colors.textBasicDisabled
else -> HandyTheme.colors.textBasicSecondary
}

Surface(
checked = checked,
onCheckedChange = onCheckedChange,
modifier = modifier.height(height),
enabled = enabled,
rounding = round,
backgroundColor = backgroundColor,
contentColor = contentColor
) {
Row(
modifier = Modifier.padding(horizontal = horizontalPadding),
verticalAlignment = Alignment.CenterVertically
) {
leftIcon?.let {
Icon(
imageVector = leftIcon,
iconSize = iconSize,
modifier = Modifier.padding(end = 4.dp)
)
}

Text(
text = text,
style = typo,
)

rightIcon?.let {
Icon(
imageVector = rightIcon,
iconSize = iconSize,
modifier = Modifier.padding(start = 4.dp)
)
}
}
}
}