Skip to content

Commit 96abbc7

Browse files
authored
Merge pull request #147 from YAPP-Github/BOOK-264-fix/#144
fix: 디자인 QA 반영
2 parents fabd9b2 + 0fbfb09 commit 96abbc7

File tree

25 files changed

+87
-57
lines changed

25 files changed

+87
-57
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ val largeButtonStyle: ButtonSizeStyle
1919
@Composable get() = ButtonSizeStyle(
2020
paddingValues = PaddingValues(
2121
horizontal = ReedTheme.spacing.spacing5,
22-
vertical = ReedTheme.spacing.spacing3,
22+
vertical = 14.dp,
2323
),
2424
radius = ReedTheme.radius.sm,
2525
textStyle = ReedTheme.typography.body1Medium,
@@ -36,7 +36,7 @@ val mediumButtonStyle: ButtonSizeStyle
3636
radius = ReedTheme.radius.sm,
3737
textStyle = ReedTheme.typography.label1Medium,
3838
iconSpacing = ReedTheme.spacing.spacing1,
39-
iconSize = 24.dp,
39+
iconSize = 22.dp,
4040
)
4141

4242
val smallButtonStyle: ButtonSizeStyle
@@ -48,7 +48,7 @@ val smallButtonStyle: ButtonSizeStyle
4848
radius = ReedTheme.radius.xs,
4949
textStyle = ReedTheme.typography.label1Medium,
5050
iconSpacing = ReedTheme.spacing.spacing1,
51-
iconSize = 22.dp,
51+
iconSize = 18.dp,
5252
)
5353

5454
val largeRoundedButtonStyle: ButtonSizeStyle
@@ -72,7 +72,7 @@ val mediumRoundedButtonStyle: ButtonSizeStyle
7272
radius = ReedTheme.radius.full,
7373
textStyle = ReedTheme.typography.label1Medium,
7474
iconSpacing = ReedTheme.spacing.spacing1,
75-
iconSize = 24.dp,
75+
iconSize = 22.dp,
7676
)
7777

7878
val smallRoundedButtonStyle: ButtonSizeStyle
@@ -84,5 +84,5 @@ val smallRoundedButtonStyle: ButtonSizeStyle
8484
radius = ReedTheme.radius.full,
8585
textStyle = ReedTheme.typography.label1Medium,
8686
iconSpacing = ReedTheme.spacing.spacing1,
87-
iconSize = 22.dp,
87+
iconSize = 18.dp,
8888
)

core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedDialog.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ fun ReedDialog(
7070
textAlign = TextAlign.Center,
7171
style = ReedTheme.typography.headline1SemiBold,
7272
)
73-
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2))
73+
74+
if (!description.isNullOrEmpty()) {
75+
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2))
76+
}
7477
}
7578
description?.let {
7679
Text(

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import com.ninecraft.booket.core.designsystem.ComponentPreview
3535
import com.ninecraft.booket.core.designsystem.component.ReedDivider
3636
import com.ninecraft.booket.core.designsystem.component.button.ReedButton
3737
import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
38-
import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
38+
import com.ninecraft.booket.core.designsystem.component.button.mediumButtonStyle
3939
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
4040
import com.ninecraft.booket.core.model.BookDetailModel
4141
import com.ninecraft.booket.core.ui.ReedScaffold
@@ -181,7 +181,7 @@ internal fun BookDetailContent(
181181
BookStatus.fromValue(state.bookDetail.userBookStatus)?.getDisplayNameRes()
182182
?: BookStatus.BEFORE_READING.getDisplayNameRes(),
183183
),
184-
sizeStyle = largeButtonStyle,
184+
sizeStyle = mediumButtonStyle,
185185
colorStyle = ReedButtonColorStyle.SECONDARY,
186186
modifier = Modifier.widthIn(min = 98.dp),
187187
trailingIcon = {
@@ -199,7 +199,7 @@ internal fun BookDetailContent(
199199
state.eventSink(BookDetailUiEvent.OnRegisterRecordButtonClick)
200200
},
201201
text = stringResource(R.string.register_book_record),
202-
sizeStyle = largeButtonStyle,
202+
sizeStyle = mediumButtonStyle,
203203
colorStyle = ReedButtonColorStyle.PRIMARY,
204204
modifier = Modifier.weight(1f),
205205
)

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookItem.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ internal fun BookItem(
9494
)
9595
}
9696
}
97+
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing05))
9798
Text(
9899
text = bookDetail.pubDate.formatPublishYear(),
99100
color = ReedTheme.colors.contentTertiary,

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
2828
import androidx.compose.ui.res.stringResource
2929
import androidx.compose.ui.res.vectorResource
3030
import androidx.compose.ui.text.style.TextAlign
31+
import androidx.compose.ui.unit.dp
3132
import com.ninecraft.booket.core.common.constants.BookStatus
3233
import com.ninecraft.booket.core.designsystem.ComponentPreview
3334
import com.ninecraft.booket.core.designsystem.component.button.ReedButton
@@ -140,7 +141,7 @@ fun RowScope.BookStatusItem(
140141
interactionSource = remember { MutableInteractionSource() },
141142
onClick = onClick,
142143
)
143-
.padding(vertical = ReedTheme.spacing.spacing3),
144+
.padding(vertical = 14.dp),
144145
contentAlignment = Alignment.Center,
145146
) {
146147
Text(

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/ReadingRecordsHeader.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ internal fun ReadingRecordsHeader(
4646
}
4747
Row(
4848
modifier = Modifier.clickable { onReadingRecordClick() },
49+
verticalAlignment = Alignment.CenterVertically,
4950
) {
5051
Text(
5152
text = stringResource(currentRecordSort.getDisplayNameRes()),
5253
color = ReedTheme.colors.contentSecondary,
5354
style = ReedTheme.typography.label1Medium,
5455
)
56+
Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing1))
5557
Icon(
5658
imageVector = ImageVector.vectorResource(designR.drawable.ic_chevron_down),
5759
contentDescription = "Dropdown Icon",

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordItem.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ internal fun RecordItem(
6464
contentDescription = "Emotion Graphic",
6565
modifier = Modifier
6666
.size(40.dp)
67-
.clip(CircleShape),
67+
.clip(CircleShape)
68+
.background(ReedTheme.colors.basePrimary),
6869
)
6970
Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2))
7071
Column {

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordSortBottomSheet.kt

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.height
1212
import androidx.compose.foundation.layout.padding
1313
import androidx.compose.foundation.selection.selectable
1414
import androidx.compose.material3.ExperimentalMaterial3Api
15+
import androidx.compose.material3.HorizontalDivider
1516
import androidx.compose.material3.Icon
1617
import androidx.compose.material3.SheetState
1718
import androidx.compose.material3.SheetValue
@@ -24,6 +25,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
2425
import androidx.compose.ui.res.stringResource
2526
import androidx.compose.ui.res.vectorResource
2627
import androidx.compose.ui.text.style.TextAlign
28+
import androidx.compose.ui.unit.dp
2729
import com.ninecraft.booket.core.designsystem.ComponentPreview
2830
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
2931
import com.ninecraft.booket.core.ui.component.ReedBottomSheet
@@ -52,15 +54,13 @@ internal fun RecordSortBottomSheet(
5254
) {
5355
Column(
5456
modifier = modifier
55-
.padding(
56-
start = ReedTheme.spacing.spacing5,
57-
top = ReedTheme.spacing.spacing5,
58-
end = ReedTheme.spacing.spacing5,
59-
),
57+
.padding(top = ReedTheme.spacing.spacing5),
6058
horizontalAlignment = Alignment.CenterHorizontally,
6159
) {
6260
Row(
63-
modifier = Modifier.fillMaxWidth(),
61+
modifier = Modifier
62+
.fillMaxWidth()
63+
.padding(horizontal = ReedTheme.spacing.spacing5),
6464
horizontalArrangement = Arrangement.SpaceBetween,
6565
) {
6666
Text(
@@ -77,12 +77,12 @@ internal fun RecordSortBottomSheet(
7777
},
7878
)
7979
}
80-
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing5))
80+
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing3))
8181
Column(
8282
modifier = Modifier.fillMaxWidth(),
8383
verticalArrangement = Arrangement.Center,
8484
) {
85-
recordSortItems.forEach { item ->
85+
recordSortItems.forEachIndexed { index, item ->
8686
RecordSortItem(
8787
item = item,
8888
selected = item == currentRecordSort,
@@ -91,7 +91,16 @@ internal fun RecordSortBottomSheet(
9191
onItemSelected(item)
9292
}
9393
},
94+
modifier = Modifier.padding(horizontal = ReedTheme.spacing.spacing5),
9495
)
96+
97+
if (index < recordSortItems.lastIndex) {
98+
HorizontalDivider(
99+
modifier = Modifier.fillMaxWidth(),
100+
thickness = 1.dp,
101+
color = ReedTheme.colors.dividerSm,
102+
)
103+
}
95104
}
96105
}
97106
}

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ internal fun SeedItem(
5252
Text(
5353
text = emotion.name.displayName,
5454
color = emotion.name.toTextColor(),
55-
style = ReedTheme.typography.body2Medium,
55+
style = ReedTheme.typography.label2SemiBold,
5656
)
5757
}
5858
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing1))
5959
Text(
6060
text = "${emotion.count}",
6161
color = ReedTheme.colors.contentSecondary,
62-
style = ReedTheme.typography.body2Medium,
62+
style = ReedTheme.typography.label2Regular,
6363
)
6464
}
6565
}

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/component/ReviewBox.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ fun ReviewBox(
5252
contentDescription = "Emotion Graphic",
5353
modifier = Modifier
5454
.size(ReedTheme.spacing.spacing10)
55-
.clip(CircleShape),
55+
.clip(CircleShape)
56+
.background(ReedTheme.colors.basePrimary),
5657
)
5758
Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2))
5859
Text(

0 commit comments

Comments
 (0)