diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonSizeStyle.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonSizeStyle.kt index 2bce40a1..7f0510b4 100644 --- a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonSizeStyle.kt +++ b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonSizeStyle.kt @@ -19,7 +19,7 @@ val largeButtonStyle: ButtonSizeStyle @Composable get() = ButtonSizeStyle( paddingValues = PaddingValues( horizontal = ReedTheme.spacing.spacing5, - vertical = ReedTheme.spacing.spacing3, + vertical = 14.dp, ), radius = ReedTheme.radius.sm, textStyle = ReedTheme.typography.body1Medium, @@ -36,7 +36,7 @@ val mediumButtonStyle: ButtonSizeStyle radius = ReedTheme.radius.sm, textStyle = ReedTheme.typography.label1Medium, iconSpacing = ReedTheme.spacing.spacing1, - iconSize = 24.dp, + iconSize = 22.dp, ) val smallButtonStyle: ButtonSizeStyle @@ -48,7 +48,7 @@ val smallButtonStyle: ButtonSizeStyle radius = ReedTheme.radius.xs, textStyle = ReedTheme.typography.label1Medium, iconSpacing = ReedTheme.spacing.spacing1, - iconSize = 22.dp, + iconSize = 18.dp, ) val largeRoundedButtonStyle: ButtonSizeStyle @@ -72,7 +72,7 @@ val mediumRoundedButtonStyle: ButtonSizeStyle radius = ReedTheme.radius.full, textStyle = ReedTheme.typography.label1Medium, iconSpacing = ReedTheme.spacing.spacing1, - iconSize = 24.dp, + iconSize = 22.dp, ) val smallRoundedButtonStyle: ButtonSizeStyle @@ -84,5 +84,5 @@ val smallRoundedButtonStyle: ButtonSizeStyle radius = ReedTheme.radius.full, textStyle = ReedTheme.typography.label1Medium, iconSpacing = ReedTheme.spacing.spacing1, - iconSize = 22.dp, + iconSize = 18.dp, ) diff --git a/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedDialog.kt b/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedDialog.kt index c24ee2a6..d82b136c 100644 --- a/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedDialog.kt +++ b/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedDialog.kt @@ -70,7 +70,10 @@ fun ReedDialog( textAlign = TextAlign.Center, style = ReedTheme.typography.headline1SemiBold, ) - Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2)) + + if (!description.isNullOrEmpty()) { + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2)) + } } description?.let { Text( diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt index 35ec50ee..189505ac 100644 --- a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt +++ b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt @@ -35,7 +35,7 @@ import com.ninecraft.booket.core.designsystem.ComponentPreview import com.ninecraft.booket.core.designsystem.component.ReedDivider import com.ninecraft.booket.core.designsystem.component.button.ReedButton import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle -import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle +import com.ninecraft.booket.core.designsystem.component.button.mediumButtonStyle import com.ninecraft.booket.core.designsystem.theme.ReedTheme import com.ninecraft.booket.core.model.BookDetailModel import com.ninecraft.booket.core.ui.ReedScaffold @@ -181,7 +181,7 @@ internal fun BookDetailContent( BookStatus.fromValue(state.bookDetail.userBookStatus)?.getDisplayNameRes() ?: BookStatus.BEFORE_READING.getDisplayNameRes(), ), - sizeStyle = largeButtonStyle, + sizeStyle = mediumButtonStyle, colorStyle = ReedButtonColorStyle.SECONDARY, modifier = Modifier.widthIn(min = 98.dp), trailingIcon = { @@ -199,7 +199,7 @@ internal fun BookDetailContent( state.eventSink(BookDetailUiEvent.OnRegisterRecordButtonClick) }, text = stringResource(R.string.register_book_record), - sizeStyle = largeButtonStyle, + sizeStyle = mediumButtonStyle, colorStyle = ReedButtonColorStyle.PRIMARY, modifier = Modifier.weight(1f), ) diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookItem.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookItem.kt index da452ed5..9925556a 100644 --- a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookItem.kt +++ b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookItem.kt @@ -94,6 +94,7 @@ internal fun BookItem( ) } } + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing05)) Text( text = bookDetail.pubDate.formatPublishYear(), color = ReedTheme.colors.contentTertiary, diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt index d324c67a..35b6554f 100644 --- a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt +++ b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp import com.ninecraft.booket.core.common.constants.BookStatus import com.ninecraft.booket.core.designsystem.ComponentPreview import com.ninecraft.booket.core.designsystem.component.button.ReedButton @@ -140,7 +141,7 @@ fun RowScope.BookStatusItem( interactionSource = remember { MutableInteractionSource() }, onClick = onClick, ) - .padding(vertical = ReedTheme.spacing.spacing3), + .padding(vertical = 14.dp), contentAlignment = Alignment.Center, ) { Text( diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/ReadingRecordsHeader.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/ReadingRecordsHeader.kt index 658d672a..57c25d97 100644 --- a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/ReadingRecordsHeader.kt +++ b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/ReadingRecordsHeader.kt @@ -46,12 +46,14 @@ internal fun ReadingRecordsHeader( } Row( modifier = Modifier.clickable { onReadingRecordClick() }, + verticalAlignment = Alignment.CenterVertically, ) { Text( text = stringResource(currentRecordSort.getDisplayNameRes()), color = ReedTheme.colors.contentSecondary, style = ReedTheme.typography.label1Medium, ) + Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing1)) Icon( imageVector = ImageVector.vectorResource(designR.drawable.ic_chevron_down), contentDescription = "Dropdown Icon", diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordItem.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordItem.kt index c8af70a1..ee770622 100644 --- a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordItem.kt +++ b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordItem.kt @@ -64,7 +64,8 @@ internal fun RecordItem( contentDescription = "Emotion Graphic", modifier = Modifier .size(40.dp) - .clip(CircleShape), + .clip(CircleShape) + .background(ReedTheme.colors.basePrimary), ) Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2)) Column { diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordSortBottomSheet.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordSortBottomSheet.kt index 6f4fa36f..98220e8e 100644 --- a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordSortBottomSheet.kt +++ b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordSortBottomSheet.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.selection.selectable import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.SheetState import androidx.compose.material3.SheetValue @@ -24,6 +25,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp import com.ninecraft.booket.core.designsystem.ComponentPreview import com.ninecraft.booket.core.designsystem.theme.ReedTheme import com.ninecraft.booket.core.ui.component.ReedBottomSheet @@ -52,15 +54,13 @@ internal fun RecordSortBottomSheet( ) { Column( modifier = modifier - .padding( - start = ReedTheme.spacing.spacing5, - top = ReedTheme.spacing.spacing5, - end = ReedTheme.spacing.spacing5, - ), + .padding(top = ReedTheme.spacing.spacing5), horizontalAlignment = Alignment.CenterHorizontally, ) { Row( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = ReedTheme.spacing.spacing5), horizontalArrangement = Arrangement.SpaceBetween, ) { Text( @@ -77,12 +77,12 @@ internal fun RecordSortBottomSheet( }, ) } - Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing5)) + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing3)) Column( modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.Center, ) { - recordSortItems.forEach { item -> + recordSortItems.forEachIndexed { index, item -> RecordSortItem( item = item, selected = item == currentRecordSort, @@ -91,7 +91,16 @@ internal fun RecordSortBottomSheet( onItemSelected(item) } }, + modifier = Modifier.padding(horizontal = ReedTheme.spacing.spacing5), ) + + if (index < recordSortItems.lastIndex) { + HorizontalDivider( + modifier = Modifier.fillMaxWidth(), + thickness = 1.dp, + color = ReedTheme.colors.dividerSm, + ) + } } } } diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt index cd283966..ac9d84d1 100644 --- a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt +++ b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt @@ -52,14 +52,14 @@ internal fun SeedItem( Text( text = emotion.name.displayName, color = emotion.name.toTextColor(), - style = ReedTheme.typography.body2Medium, + style = ReedTheme.typography.label2SemiBold, ) } Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing1)) Text( text = "${emotion.count}", color = ReedTheme.colors.contentSecondary, - style = ReedTheme.typography.body2Medium, + style = ReedTheme.typography.label2Regular, ) } } diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/component/ReviewBox.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/component/ReviewBox.kt index 42aa6103..88f56dc0 100644 --- a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/component/ReviewBox.kt +++ b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/component/ReviewBox.kt @@ -52,7 +52,8 @@ fun ReviewBox( contentDescription = "Emotion Graphic", modifier = Modifier .size(ReedTheme.spacing.spacing10) - .clip(CircleShape), + .clip(CircleShape) + .background(ReedTheme.colors.basePrimary), ) Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2)) Text( diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt index 7ddc1ab8..094c5955 100644 --- a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt +++ b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt @@ -126,7 +126,7 @@ internal fun HomeContent( onBookRegisterClick = { state.eventSink(HomeUiEvent.OnBookRegisterClick) }, - modifier = Modifier.padding(ReedTheme.spacing.spacing5), + modifier = Modifier.padding(horizontal = ReedTheme.spacing.spacing5), ) } else { val pagerState = rememberPagerState(pageCount = { state.recentBooks.size }) @@ -190,6 +190,7 @@ private fun HomePreview() { ReedTheme { HomeUi( state = HomeUiState( + uiState = UiState.Success, eventSink = {}, ), ) diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/BookCard.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/BookCard.kt index 05b11ec3..75851327 100644 --- a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/BookCard.kt +++ b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/BookCard.kt @@ -158,14 +158,14 @@ fun BookCard( } .padding( horizontal = ReedTheme.spacing.spacing3, - vertical = ReedTheme.spacing.spacing2, + vertical = 9.dp, ), verticalAlignment = Alignment.CenterVertically, ) { Image( painter = painterResource(R.drawable.img_seed_count), contentDescription = "Seed Count Image", - modifier = Modifier.size(32.dp), + modifier = Modifier.size(ReedTheme.spacing.spacing7), ) Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing1)) Text( @@ -224,8 +224,8 @@ fun EmptyBookCard( shape = RoundedCornerShape(ReedTheme.radius.sm), ) .border( - width = 1.dp, - color = ReedTheme.colors.borderSecondary, + width = ReedTheme.border.border1, + color = ReedTheme.colors.borderPrimary, shape = RoundedCornerShape(ReedTheme.radius.sm), ) .padding( @@ -253,7 +253,7 @@ fun EmptyBookCard( color = ReedTheme.colors.contentTertiary, style = ReedTheme.typography.label1Medium, ) - Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing5)) + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing6)) ReedButton( onClick = { onBookRegisterClick() diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/HomeBanner.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/HomeBanner.kt index 5ce5ed1b..3b140709 100644 --- a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/HomeBanner.kt +++ b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/HomeBanner.kt @@ -73,9 +73,11 @@ fun HomeBanner( color = ReedTheme.colors.contentBrand, style = ReedTheme.typography.body2Medium, ) + Spacer(modifier = Modifier.size(ReedTheme.spacing.spacing1)) Icon( imageVector = ImageVector.vectorResource(id = designR.drawable.ic_chevron_right), contentDescription = "Chevron Right Icon", + modifier = Modifier.size(ReedTheme.spacing.spacing5), tint = ReedTheme.colors.contentBrand, ) } diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt index 32be5462..982bada8 100644 --- a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt +++ b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt @@ -16,6 +16,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.ninecraft.booket.core.designsystem.DevicePreview import com.ninecraft.booket.core.designsystem.theme.ReedTheme @@ -97,6 +98,7 @@ internal fun LibraryContent( state.eventSink(LibraryUiEvent.OnFilterClick(status)) }, ) + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing1)) when (state.uiState) { is UiState.Idle -> { @@ -168,12 +170,14 @@ private fun EmptyResult() { Text( text = stringResource(R.string.library_empty_book_title), color = ReedTheme.colors.contentPrimary, + textAlign = TextAlign.Center, style = ReedTheme.typography.headline1SemiBold, ) Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2)) Text( text = stringResource(R.string.library_empty_book_description), color = ReedTheme.colors.contentSecondary, + textAlign = TextAlign.Center, style = ReedTheme.typography.body1Medium, ) } diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/component/FilterChip.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/component/FilterChip.kt index fe0fe4f4..0e9f1a65 100644 --- a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/component/FilterChip.kt +++ b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/component/FilterChip.kt @@ -30,7 +30,9 @@ fun FilterChip( modifier: Modifier = Modifier, ) { val chipColor = if (isSelected) ReedTheme.colors.bgPrimary else ReedTheme.colors.basePrimary - val textColor = if (isSelected) White else ReedTheme.colors.contentSecondary + val labelColor = if (isSelected) White else ReedTheme.colors.contentSecondary + val countColor = if (isSelected) White else ReedTheme.colors.contentTertiary + val labelStyle = if (isSelected) ReedTheme.typography.label1SemiBold else ReedTheme.typography.label1Medium Box( modifier = modifier @@ -59,13 +61,13 @@ fun FilterChip( Row(verticalAlignment = Alignment.CenterVertically) { Text( text = stringResource(option.getDisplayNameRes()), - color = textColor, - style = ReedTheme.typography.label1SemiBold, + color = labelColor, + style = labelStyle, ) Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing1)) Text( text = "$count", - color = textColor, + color = countColor, style = ReedTheme.typography.label1SemiBold, ) } diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementUi.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementUi.kt index 3d3068d8..f017165f 100644 --- a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementUi.kt +++ b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementUi.kt @@ -59,7 +59,7 @@ internal fun TermsAgreementUi( color = ReedTheme.colors.contentPrimary, style = ReedTheme.typography.title2SemiBold, ) - Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4)) + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing7)) Row( modifier = Modifier .fillMaxWidth() diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt index 2f24a26e..4d5e0857 100644 --- a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt +++ b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt @@ -313,9 +313,13 @@ private fun TextScanResult( LazyColumn( modifier = Modifier .weight(1f) - .padding(horizontal = ReedTheme.spacing.spacing3), + .padding(horizontal = ReedTheme.spacing.spacing5), verticalArrangement = Arrangement.spacedBy(ReedTheme.spacing.spacing2), ) { + item { + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing1)) + } + items(state.sentenceList.size) { index -> SentenceBox( onClick = { diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/component/SentenceBox.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/component/SentenceBox.kt index 2ecdb7a0..07b39d8f 100644 --- a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/component/SentenceBox.kt +++ b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/component/SentenceBox.kt @@ -26,6 +26,7 @@ fun SentenceBox( val bgColor = if (isSelected) ReedTheme.colors.bgTertiary else ReedTheme.colors.bgSecondary val borderColor = if (isSelected) ReedTheme.colors.borderBrand else Color.Transparent val textColor = if (isSelected) ReedTheme.colors.contentBrand else ReedTheme.colors.contentPrimary + val textStyle = if (isSelected) ReedTheme.typography.body1Medium else ReedTheme.typography.body1Regular Box( modifier = modifier @@ -51,7 +52,7 @@ fun SentenceBox( Text( text = sentence, color = textColor, - style = ReedTheme.typography.body1Regular, + style = textStyle, ) } } diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/EmotionStep.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/EmotionStep.kt index 204d2c32..58f22329 100644 --- a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/EmotionStep.kt +++ b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/EmotionStep.kt @@ -74,7 +74,7 @@ fun EmotionStep( ) } item { - Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing10)) + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing6)) } items(emotionPairs) { pair -> @@ -134,7 +134,7 @@ private fun EmotionItem( ) .then( if (isSelected) Modifier.border( - width = 2.dp, + width = ReedTheme.border.border15, color = ReedTheme.colors.borderBrand, shape = RoundedCornerShape(ReedTheme.radius.md), ) diff --git a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/BookSearchUi.kt b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/BookSearchUi.kt index 28b8ea15..eac26cdd 100644 --- a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/BookSearchUi.kt +++ b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/BookSearchUi.kt @@ -104,14 +104,8 @@ internal fun SearchContent( searchIconTint = ReedTheme.colors.contentBrand, ) Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing5)) - - ReedDivider( - modifier = Modifier - .fillMaxWidth() - .height(ReedTheme.spacing.spacing2), - ) - - Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4)) + ReedDivider() + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2)) when (state.uiState) { is UiState.Loading -> { diff --git a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookItem.kt b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookItem.kt index 1c8b1820..59dcdba8 100644 --- a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookItem.kt +++ b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookItem.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import com.ninecraft.booket.core.designsystem.ComponentPreview import com.ninecraft.booket.core.designsystem.component.NetworkImage import com.ninecraft.booket.core.designsystem.theme.ReedTheme @@ -95,10 +96,13 @@ fun BookItem( text = book.title, color = titleColor, overflow = TextOverflow.Ellipsis, - maxLines = 1, - style = ReedTheme.typography.body1SemiBold, + maxLines = 2, + style = ReedTheme.typography.body1SemiBold.copy( + lineHeight = 16.sp * 1.4f, + letterSpacing = 16.sp * 0.01f, + ), ) - Spacer(Modifier.height(ReedTheme.spacing.spacing1)) + Spacer(Modifier.height(ReedTheme.spacing.spacing2)) BoxWithConstraints(modifier = Modifier.fillMaxWidth()) { val authorMaxWidth = maxWidth * 0.7f @@ -141,7 +145,7 @@ private fun BookItemPreview() { ReedTheme { BookItem( book = BookSummaryModel( - title = "여름은 오래 그곳에 남아", + title = "여름은 오래 그곳에 남아 여름은 오래 그곳에 남아 여름은 오래 그곳에 남아 여름은 오래 그곳에 남아", author = "마쓰이에 마사시 마쓰이에 마사시", publisher = "비채", coverImageUrl = "https://example.com/sample-book-cover.jpg", diff --git a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterBottomSheet.kt b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterBottomSheet.kt index ada10a33..cd6cc348 100644 --- a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterBottomSheet.kt +++ b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterBottomSheet.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp import com.ninecraft.booket.core.common.constants.BookStatus import com.ninecraft.booket.core.designsystem.ComponentPreview import com.ninecraft.booket.core.ui.component.ReedBottomSheet @@ -139,7 +140,7 @@ fun RowScope.BookStatusItem( interactionSource = remember { MutableInteractionSource() }, onClick = onClick, ) - .padding(vertical = ReedTheme.spacing.spacing3), + .padding(vertical = 14.dp), contentAlignment = Alignment.Center, ) { Text( diff --git a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterSuccessBottomSheet.kt b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterSuccessBottomSheet.kt index 7235f724..dd34726a 100644 --- a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterSuccessBottomSheet.kt +++ b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterSuccessBottomSheet.kt @@ -51,12 +51,13 @@ fun BookRegisterSuccessBottomSheet( ), horizontalAlignment = Alignment.CenterHorizontally, ) { + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing3)) Image( painter = painterResource(R.drawable.img_book_register_complete), contentDescription = "Book Register Complete Image", modifier = Modifier.height(120.dp), ) - Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing1)) + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing5)) Text( text = stringResource(R.string.book_register_success_title), modifier = Modifier.fillMaxWidth(), diff --git a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/library/LibrarySearchUi.kt b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/library/LibrarySearchUi.kt index b40cb66e..8cbdf99d 100644 --- a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/library/LibrarySearchUi.kt +++ b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/library/LibrarySearchUi.kt @@ -86,12 +86,8 @@ internal fun LibrarySearchContent( borderStroke = null, ) Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing5)) - ReedDivider( - modifier = Modifier - .fillMaxWidth() - .height(ReedTheme.spacing.spacing2), - ) - Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4)) + ReedDivider() + Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2)) when (state.uiState) { is UiState.Loading -> { diff --git a/feature/splash/src/main/kotlin/com/ninecraft/booket/splash/SplashUi.kt b/feature/splash/src/main/kotlin/com/ninecraft/booket/splash/SplashUi.kt index 444165a5..536e66ff 100644 --- a/feature/splash/src/main/kotlin/com/ninecraft/booket/splash/SplashUi.kt +++ b/feature/splash/src/main/kotlin/com/ninecraft/booket/splash/SplashUi.kt @@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.ninecraft.booket.core.designsystem.DevicePreview import com.ninecraft.booket.core.designsystem.theme.ReedTheme @@ -68,6 +69,7 @@ fun SplashUi( Text( text = stringResource(R.string.splash_title), color = ReedTheme.colors.contentInverse, + textAlign = TextAlign.Center, style = ReedTheme.typography.heading2SemiBold, ) Spacer(Modifier.height(ReedTheme.spacing.spacing8))