diff --git a/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/OnboardingUi.kt b/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/OnboardingUi.kt index 525d8a51a..d2bcc436c 100644 --- a/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/OnboardingUi.kt +++ b/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/OnboardingUi.kt @@ -71,7 +71,6 @@ internal fun OnboardingUi( OnboardingPage( imageRes = R.drawable.img_onboarding_third, titleRes = R.string.onboarding_third_page_title, - highlightTextRes = R.string.onboarding_third_highlight_text, descriptionRes = R.string.onboarding_third_page_description, ) } diff --git a/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/component/OnboardingPage.kt b/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/component/OnboardingPage.kt index 0d451bd05..546858620 100644 --- a/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/component/OnboardingPage.kt +++ b/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/component/OnboardingPage.kt @@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.ninecraft.booket.core.common.utils.HighlightedText @@ -25,10 +26,21 @@ import com.ninecraft.booket.feature.onboarding.R internal fun OnboardingPage( imageRes: Int, titleRes: Int, - highlightTextRes: Int, + highlightTextRes: Int? = null, descriptionRes: Int, modifier: Modifier = Modifier, ) { + val titleText = + if (highlightTextRes != null) { + HighlightedText( + fullText = stringResource(titleRes), + highlightText = stringResource(highlightTextRes), + highlightColor = ReedTheme.colors.bgPrimary, + ) + } else { + AnnotatedString(stringResource(titleRes)) + } + Column( modifier = modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, @@ -44,11 +56,7 @@ internal fun OnboardingPage( ) Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing8)) Text( - text = HighlightedText( - fullText = stringResource(titleRes), - highlightText = stringResource(highlightTextRes), - highlightColor = ReedTheme.colors.bgPrimary, - ), + text = titleText, color = Black, textAlign = TextAlign.Center, style = ReedTheme.typography.heading1Bold, diff --git a/feature/onboarding/src/main/res/drawable/img_onboarding_second.webp b/feature/onboarding/src/main/res/drawable/img_onboarding_second.webp index 2e88d60d8..0bebce7a5 100644 Binary files a/feature/onboarding/src/main/res/drawable/img_onboarding_second.webp and b/feature/onboarding/src/main/res/drawable/img_onboarding_second.webp differ diff --git a/feature/onboarding/src/main/res/drawable/img_onboarding_third.webp b/feature/onboarding/src/main/res/drawable/img_onboarding_third.webp index d401228d4..5d4a02752 100644 Binary files a/feature/onboarding/src/main/res/drawable/img_onboarding_third.webp and b/feature/onboarding/src/main/res/drawable/img_onboarding_third.webp differ diff --git a/feature/onboarding/src/main/res/values/strings.xml b/feature/onboarding/src/main/res/values/strings.xml index c065465fa..ba210b0fc 100644 --- a/feature/onboarding/src/main/res/values/strings.xml +++ b/feature/onboarding/src/main/res/values/strings.xml @@ -3,11 +3,10 @@ 다음 읽고 있는 책을 등록하고\n바로 기록해보세요 책을 덮기 전, 마음에 남은 문장과\n감정을 간편하게 남길 수 있어요 - 어떻게 쓸지 막막할땐,\n감상평 가이드가 도와드려요 - 감정과 생각을 이끌어주는\n문장들이 기록을 자연스럽게 도와줘요 - 독서 중 느낀 감정은\n씨앗으로 남겨보세요 - 책마다 쌓인 감정들은\n나만의 독서에 흔적이 됩니다 + 독서 중 느낀 감정을\n자세히 남겨 보세요 + 책마다 쌓인 감정들은\n나만의 독서 흔적이 됩니다 + 기록한 문장을\n카드로 공유해 보세요 + 감정 캐릭터와 함께\n이미지로 저장하고 공유할 수 있어요 기록 - 감상평 가이드 - 씨앗 + 감정