Skip to content

Commit 3b868b8

Browse files
authored
Merge pull request #41 from YAPP-Github/BOOK-123-feature/#40
feat: Design 컴포넌트 추가 및 코드 스타일 개선
2 parents 336c7af + 3e1ac21 commit 3b868b8

File tree

9 files changed

+549
-168
lines changed

9 files changed

+549
-168
lines changed

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/appbar/ReedTopAppBar.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ fun ReedTopAppBar(
3939
.fillMaxWidth()
4040
.height(56.dp)
4141
.background(color = White),
42-
verticalAlignment = Alignment.CenterVertically,
4342
horizontalArrangement = Arrangement.Start,
43+
verticalAlignment = Alignment.CenterVertically,
4444
) {
4545
if (startIconRes != null) {
4646
IconButton(
@@ -60,9 +60,9 @@ fun ReedTopAppBar(
6060

6161
Text(
6262
text = title,
63-
style = ReedTheme.typography.heading2SemiBold,
6463
modifier = Modifier.weight(1f),
6564
textAlign = TextAlign.Center,
65+
style = ReedTheme.typography.heading2SemiBold,
6666
)
6767

6868
if (endIconRes != null) {

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/bottomsheet/ReedBottomSheet.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fun ReedBottomSheet(
3232
sheetState = sheetState,
3333
sheetGesturesEnabled = false,
3434
shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp),
35-
dragHandle = null,
3635
containerColor = White,
36+
dragHandle = null,
3737
) {
3838
content()
3939
}
@@ -51,14 +51,14 @@ private fun ReedBottomSheetPreview() {
5151
)
5252
ReedTheme {
5353
ReedBottomSheet(
54-
sheetState = sheetState,
5554
onDismissRequest = {},
55+
sheetState = sheetState,
5656
) {
5757
ReedButton(
5858
onClick = {},
5959
modifier = Modifier.padding(10.dp).fillMaxWidth(),
60-
colorStyle = ReedButtonColorStyle.PRIMARY,
6160
sizeStyle = largeButtonStyle,
61+
colorStyle = ReedButtonColorStyle.PRIMARY,
6262
text = "확인",
6363
)
6464
}

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonSizeStyle.kt

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ data class ButtonSizeStyle(
1212
val radius: Dp = 0.dp,
1313
val textStyle: TextStyle,
1414
val iconSpacing: Dp = 0.dp,
15+
val iconSize: Dp = 24.dp,
1516
)
1617

1718
val largeButtonStyle: ButtonSizeStyle
@@ -23,6 +24,7 @@ val largeButtonStyle: ButtonSizeStyle
2324
radius = ReedTheme.radius.sm,
2425
textStyle = ReedTheme.typography.body1Medium,
2526
iconSpacing = ReedTheme.spacing.spacing2,
27+
iconSize = 24.dp,
2628
)
2729

2830
val mediumButtonStyle: ButtonSizeStyle
@@ -34,6 +36,7 @@ val mediumButtonStyle: ButtonSizeStyle
3436
radius = ReedTheme.radius.sm,
3537
textStyle = ReedTheme.typography.label1Medium,
3638
iconSpacing = ReedTheme.spacing.spacing1,
39+
iconSize = 24.dp,
3740
)
3841

3942
val smallButtonStyle: ButtonSizeStyle
@@ -45,4 +48,41 @@ val smallButtonStyle: ButtonSizeStyle
4548
radius = ReedTheme.radius.xs,
4649
textStyle = ReedTheme.typography.label1Medium,
4750
iconSpacing = ReedTheme.spacing.spacing1,
51+
iconSize = 22.dp,
52+
)
53+
54+
val largeRoundedButtonStyle: ButtonSizeStyle
55+
@Composable get() = ButtonSizeStyle(
56+
paddingValues = PaddingValues(
57+
horizontal = ReedTheme.spacing.spacing5,
58+
vertical = ReedTheme.spacing.spacing3,
59+
),
60+
radius = ReedTheme.radius.full,
61+
textStyle = ReedTheme.typography.body1Medium,
62+
iconSpacing = ReedTheme.spacing.spacing2,
63+
iconSize = 24.dp,
64+
)
65+
66+
val mediumRoundedButtonStyle: ButtonSizeStyle
67+
@Composable get() = ButtonSizeStyle(
68+
paddingValues = PaddingValues(
69+
horizontal = ReedTheme.spacing.spacing4,
70+
vertical = ReedTheme.spacing.spacing3,
71+
),
72+
radius = ReedTheme.radius.full,
73+
textStyle = ReedTheme.typography.label1Medium,
74+
iconSpacing = ReedTheme.spacing.spacing1,
75+
iconSize = 24.dp,
76+
)
77+
78+
val smallRoundedButtonStyle: ButtonSizeStyle
79+
@Composable get() = ButtonSizeStyle(
80+
paddingValues = PaddingValues(
81+
horizontal = ReedTheme.spacing.spacing3,
82+
vertical = ReedTheme.spacing.spacing2,
83+
),
84+
radius = ReedTheme.radius.full,
85+
textStyle = ReedTheme.typography.label1Medium,
86+
iconSpacing = ReedTheme.spacing.spacing1,
87+
iconSize = 22.dp,
4888
)

0 commit comments

Comments
 (0)