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

List 컴포넌트 구현 #18

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
33 changes: 22 additions & 11 deletions .idea/other.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ data class ColorScheme(
val iconBasicPrimary: Color = ColorNeutralBlack,
val iconBasicSecondary: Color = ColorGray700,
val iconBasicTertiary: Color = ColorGray500,
val iconBasicDisabledStrong: Color = ColorGray300,
val iconBasicDisabled: Color = ColorGray200,
val iconBasicWhite: Color = ColorNeutralWhite,

Expand All @@ -112,7 +113,13 @@ data class ColorScheme(

// Pagination / Basic
val paginationBasicSelected: Color = ColorNeutralBlack,
val paginationBasicUnselected: Color = ColorGray500
val paginationBasicUnselected: Color = ColorGray500,

// List
val listEnabled: Color = ColorNeutralWhite,
val listPressed: Color = ColorGray50,
val listDisabled: Color = ColorNeutralWhite,

)

val lightColorScheme = ColorScheme()
Expand Down
180 changes: 180 additions & 0 deletions compose/src/main/kotlin/com/yourssu/handy/compose/list/ListItem.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
package com.yourssu.handy.compose.list

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.collectIsPressedAsState
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.yourssu.handy.compose.HandyTheme
import com.yourssu.handy.compose.Icon
import com.yourssu.handy.compose.Text
import com.yourssu.handy.compose.icons.HandyIcons
import com.yourssu.handy.compose.icons.line.ArrowsChevronRight
import com.yourssu.handy.compose.icons.line.User
import org.w3c.dom.Text

@Composable
fun ListItem(
headline: String,
onClick: () -> Unit,
modifier: Modifier = Modifier,
enabled: Boolean = true,
leadingIcon: ImageVector? = null,
trailingIcon: ImageVector? = null,
containerColor: Color = HandyTheme.colors.listEnabled,
pressedContainerColor: Color = HandyTheme.colors.listPressed,
headlineColor: Color = HandyTheme.colors.textBasicPrimary,
leadingIconColor: Color = HandyTheme.colors.iconBasicPrimary,
tailingIconColor: Color = HandyTheme.colors.iconBasicTertiary,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
) {
val pressed by interactionSource.collectIsPressedAsState()

val backgroundColor = determineContainerColor(enabled, pressed, containerColor, pressedContainerColor)

Row(
modifier = modifier
.fillMaxWidth()
.height(64.dp)
.clickable(
onClick = onClick,
enabled = enabled,
interactionSource = interactionSource,
indication = null
)
.background(backgroundColor),
horizontalArrangement = Arrangement.SpaceBetween
) {
Row(
modifier = modifier.padding(horizontal = 16.dp, vertical = 20.dp),
verticalAlignment = Alignment.CenterVertically
) {
leadingIcon?.let {
Icon(
imageVector = leadingIcon,
contentDescription = "leadingIcon",
tint = determineContentColor(enabled, leadingIconColor),
)
}
Comment on lines +67 to +73
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

leadingIcon과 trailingIcon이 없을때에 디자인이 반영되지 않은 것 같습니당!


Text(
text = headline,
color = determineContentColor(enabled, headlineColor),
modifier = modifier.padding(horizontal = 16.dp),
overflow = TextOverflow.Ellipsis,
)
}

trailingIcon?.let {
Icon(
imageVector = trailingIcon,
contentDescription = "trailingIcon",
tint = determineContentColor(enabled, tailingIconColor),
modifier = modifier.padding(end = 16.dp, bottom = 20.dp, top = 20.dp)
)
}
}
}

@Composable
fun determineContainerColor(
enabled: Boolean,
pressed: Boolean,
containerColor: Color,
pressedContainerColor: Color
): Color {
return when {
!enabled -> HandyTheme.colors.listDisabled
pressed -> pressedContainerColor
else -> containerColor
}
}

@Composable
fun determineContentColor(
enabled: Boolean,
contentColor: Color
): Color {
return when {
!enabled -> HandyTheme.colors.textBasicDisabled
else -> contentColor
}
}

@Composable
@Preview
fun ListItemPreview() {
HandyTheme {
Column(
modifier = Modifier
.background(Color.Red)
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(10.dp)
) {
ListItem(
headline = "Title",
onClick = {},
leadingIcon = HandyIcons.Line.User,
trailingIcon = HandyIcons.Line.ArrowsChevronRight,
)

ListItem(
headline = "Title",
onClick = {},
leadingIcon = HandyIcons.Line.User,
trailingIcon = HandyIcons.Line.ArrowsChevronRight,
enabled = false
)

ListItem(
headline = "Titleeeeeeeeeeeeeeeeeeeeeeee",
onClick = {},
leadingIcon = HandyIcons.Line.User,
trailingIcon = HandyIcons.Line.ArrowsChevronRight,
containerColor = HandyTheme.colors.textBrandPrimary,
tailingIconColor = HandyTheme.colors.textStatusNegative,
headlineColor = HandyTheme.colors.textBasicWhite,
leadingIconColor = HandyTheme.colors.iconBasicTertiary
)

ListItem(
headline = "Titleeeeeeeeeeeeeeeeeeeeeeee",
onClick = {},
leadingIcon = HandyIcons.Line.User,
trailingIcon = HandyIcons.Line.ArrowsChevronRight,
containerColor = HandyTheme.colors.textBrandPrimary,
tailingIconColor = HandyTheme.colors.textStatusNegative,
headlineColor = HandyTheme.colors.textBasicWhite,
leadingIconColor = HandyTheme.colors.iconBasicTertiary,
pressedContainerColor = HandyTheme.colors.iconBasicTertiary
)

ListItem(
headline = "Titleeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
onClick = {},
leadingIcon = HandyIcons.Line.User,
trailingIcon = HandyIcons.Line.ArrowsChevronRight,
containerColor = HandyTheme.colors.textBrandPrimary,
tailingIconColor = HandyTheme.colors.textStatusNegative,
headlineColor = HandyTheme.colors.textBasicWhite,
leadingIconColor = HandyTheme.colors.iconBasicTertiary,
pressedContainerColor = HandyTheme.colors.iconBasicTertiary
)
}
}
}