Skip to content

Commit 25c1f6b

Browse files
authored
Merge pull request #238 from YAPP-Github/BOOK-478-feature/#237
feat: 2차 고도화 온보딩 화면 그래픽 및 문구 수정
2 parents 194d574 + 9ddd667 commit 25c1f6b

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/OnboardingUi.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ internal fun OnboardingUi(
7171
OnboardingPage(
7272
imageRes = R.drawable.img_onboarding_third,
7373
titleRes = R.string.onboarding_third_page_title,
74-
highlightTextRes = R.string.onboarding_third_highlight_text,
7574
descriptionRes = R.string.onboarding_third_page_description,
7675
)
7776
}

feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/component/OnboardingPage.kt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.layout.ContentScale
1414
import androidx.compose.ui.res.painterResource
1515
import androidx.compose.ui.res.stringResource
16+
import androidx.compose.ui.text.AnnotatedString
1617
import androidx.compose.ui.text.style.TextAlign
1718
import androidx.compose.ui.unit.dp
1819
import com.ninecraft.booket.core.common.utils.HighlightedText
@@ -25,10 +26,21 @@ import com.ninecraft.booket.feature.onboarding.R
2526
internal fun OnboardingPage(
2627
imageRes: Int,
2728
titleRes: Int,
28-
highlightTextRes: Int,
29+
highlightTextRes: Int? = null,
2930
descriptionRes: Int,
3031
modifier: Modifier = Modifier,
3132
) {
33+
val titleText =
34+
if (highlightTextRes != null) {
35+
HighlightedText(
36+
fullText = stringResource(titleRes),
37+
highlightText = stringResource(highlightTextRes),
38+
highlightColor = ReedTheme.colors.bgPrimary,
39+
)
40+
} else {
41+
AnnotatedString(stringResource(titleRes))
42+
}
43+
3244
Column(
3345
modifier = modifier.fillMaxSize(),
3446
horizontalAlignment = Alignment.CenterHorizontally,
@@ -44,11 +56,7 @@ internal fun OnboardingPage(
4456
)
4557
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing8))
4658
Text(
47-
text = HighlightedText(
48-
fullText = stringResource(titleRes),
49-
highlightText = stringResource(highlightTextRes),
50-
highlightColor = ReedTheme.colors.bgPrimary,
51-
),
59+
text = titleText,
5260
color = Black,
5361
textAlign = TextAlign.Center,
5462
style = ReedTheme.typography.heading1Bold,
319 KB
Loading
712 KB
Loading

feature/onboarding/src/main/res/values/strings.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
<string name="next">다음</string>
44
<string name="onboarding_first_page_title">읽고 있는 책을 등록하고\n바로 기록해보세요</string>
55
<string name="onboarding_first_page_description">책을 덮기 전, 마음에 남은 문장과\n감정을 간편하게 남길 수 있어요</string>
6-
<string name="onboarding_second_page_title">어떻게 쓸지 막막할땐,\n감상평 가이드가 도와드려요</string>
7-
<string name="onboarding_second_page_description">감정과 생각을 이끌어주는\n문장들이 기록을 자연스럽게 도와줘요</string>
8-
<string name="onboarding_third_page_title">독서 중 느낀 감정은\n씨앗으로 남겨보세요</string>
9-
<string name="onboarding_third_page_description">책마다 쌓인 감정들은\n나만의 독서에 흔적이 됩니다</string>
6+
<string name="onboarding_second_page_title">독서 중 느낀 감정을\n자세히 남겨 보세요</string>
7+
<string name="onboarding_second_page_description">책마다 쌓인 감정들은\n나만의 독서 흔적이 됩니다</string>
8+
<string name="onboarding_third_page_title">기록한 문장을\n카드로 공유해 보세요</string>
9+
<string name="onboarding_third_page_description">감정 캐릭터와 함께\n이미지로 저장하고 공유할 수 있어요</string>
1010
<string name="onboarding_first_highlight_text">기록</string>
11-
<string name="onboarding_second_highlight_text">감상평 가이드</string>
12-
<string name="onboarding_third_highlight_text">씨앗</string>
11+
<string name="onboarding_second_highlight_text">감정</string>
1312
</resources>

0 commit comments

Comments
 (0)