Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ fun ReedTopAppBar(
.fillMaxWidth()
.height(56.dp)
.background(color = White),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,
) {
if (startIconRes != null) {
IconButton(
Expand All @@ -60,9 +60,9 @@ fun ReedTopAppBar(

Text(
text = title,
style = ReedTheme.typography.heading2SemiBold,
modifier = Modifier.weight(1f),
textAlign = TextAlign.Center,
style = ReedTheme.typography.heading2SemiBold,
)

if (endIconRes != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ fun ReedBottomSheet(
sheetState = sheetState,
sheetGesturesEnabled = false,
shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp),
dragHandle = null,
containerColor = White,
dragHandle = null,
) {
content()
}
Expand All @@ -51,14 +51,14 @@ private fun ReedBottomSheetPreview() {
)
ReedTheme {
ReedBottomSheet(
sheetState = sheetState,
onDismissRequest = {},
sheetState = sheetState,
) {
ReedButton(
onClick = {},
modifier = Modifier.padding(10.dp).fillMaxWidth(),
colorStyle = ReedButtonColorStyle.PRIMARY,
sizeStyle = largeButtonStyle,
colorStyle = ReedButtonColorStyle.PRIMARY,
text = "확인",
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ data class ButtonSizeStyle(
val radius: Dp = 0.dp,
val textStyle: TextStyle,
val iconSpacing: Dp = 0.dp,
val iconSize: Dp = 24.dp,
)

val largeButtonStyle: ButtonSizeStyle
Expand All @@ -23,6 +24,7 @@ val largeButtonStyle: ButtonSizeStyle
radius = ReedTheme.radius.sm,
textStyle = ReedTheme.typography.body1Medium,
iconSpacing = ReedTheme.spacing.spacing2,
iconSize = 24.dp,
)

val mediumButtonStyle: ButtonSizeStyle
Expand All @@ -34,6 +36,7 @@ val mediumButtonStyle: ButtonSizeStyle
radius = ReedTheme.radius.sm,
textStyle = ReedTheme.typography.label1Medium,
iconSpacing = ReedTheme.spacing.spacing1,
iconSize = 24.dp,
)

val smallButtonStyle: ButtonSizeStyle
Expand All @@ -45,4 +48,41 @@ val smallButtonStyle: ButtonSizeStyle
radius = ReedTheme.radius.xs,
textStyle = ReedTheme.typography.label1Medium,
iconSpacing = ReedTheme.spacing.spacing1,
iconSize = 22.dp,
)

val largeRoundedButtonStyle: ButtonSizeStyle
@Composable get() = ButtonSizeStyle(
paddingValues = PaddingValues(
horizontal = ReedTheme.spacing.spacing5,
vertical = ReedTheme.spacing.spacing3,
),
radius = ReedTheme.radius.full,
textStyle = ReedTheme.typography.body1Medium,
iconSpacing = ReedTheme.spacing.spacing2,
iconSize = 24.dp,
)

val mediumRoundedButtonStyle: ButtonSizeStyle
@Composable get() = ButtonSizeStyle(
paddingValues = PaddingValues(
horizontal = ReedTheme.spacing.spacing4,
vertical = ReedTheme.spacing.spacing3,
),
radius = ReedTheme.radius.full,
textStyle = ReedTheme.typography.label1Medium,
iconSpacing = ReedTheme.spacing.spacing1,
iconSize = 24.dp,
)

val smallRoundedButtonStyle: ButtonSizeStyle
@Composable get() = ButtonSizeStyle(
paddingValues = PaddingValues(
horizontal = ReedTheme.spacing.spacing3,
vertical = ReedTheme.spacing.spacing2,
),
radius = ReedTheme.radius.full,
textStyle = ReedTheme.typography.label1Medium,
iconSpacing = ReedTheme.spacing.spacing1,
iconSize = 22.dp,
)
Loading
Loading