Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions feature/onboarding/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
<string name="next">다음</string>
<string name="onboarding_first_page_title">읽고 있는 책을 등록하고\n바로 기록해보세요</string>
<string name="onboarding_first_page_description">책을 덮기 전, 마음에 남은 문장과\n감정을 간편하게 남길 수 있어요</string>
<string name="onboarding_second_page_title">어떻게 쓸지 막막할땐,\n감상평 가이드가 도와드려요</string>
<string name="onboarding_second_page_description">감정과 생각을 이끌어주는\n문장들이 기록을 자연스럽게 도와줘요</string>
<string name="onboarding_third_page_title">독서 중 느낀 감정은\n씨앗으로 남겨보세요</string>
<string name="onboarding_third_page_description">책마다 쌓인 감정들은\n나만의 독서에 흔적이 됩니다</string>
<string name="onboarding_second_page_title">독서 중 느낀 감정을\n자세히 남겨 보세요</string>
<string name="onboarding_second_page_description">책마다 쌓인 감정들은\n나만의 독서 흔적이 됩니다</string>
<string name="onboarding_third_page_title">기록한 문장을\n카드로 공유해 보세요</string>
<string name="onboarding_third_page_description">감정 캐릭터와 함께\n이미지로 저장하고 공유할 수 있어요</string>
<string name="onboarding_first_highlight_text">기록</string>
<string name="onboarding_second_highlight_text">감상평 가이드</string>
<string name="onboarding_third_highlight_text">씨앗</string>
<string name="onboarding_second_highlight_text">감정</string>
</resources>
Loading