Skip to content

Commit 159104e

Browse files
authored
Merge pull request #282 from YAPP-Github/BOOK-510-fix/#279
fix: 온보딩 디자인 QA 반영
2 parents a536f75 + f616688 commit 159104e

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ 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,
7475
descriptionRes = R.string.onboarding_third_page_description,
7576
)
7677
}
@@ -85,7 +86,7 @@ internal fun OnboardingUi(
8586
onClick = {
8687
state.eventSink(OnboardingUiEvent.OnNextButtonClick(state.pagerState.currentPage))
8788
},
88-
text = stringResource(R.string.next),
89+
text = stringResource(R.string.start),
8990
sizeStyle = largeButtonStyle,
9091
colorStyle = ReedButtonColorStyle.PRIMARY,
9192
modifier = Modifier

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import androidx.compose.ui.res.painterResource
1515
import androidx.compose.ui.res.stringResource
1616
import androidx.compose.ui.text.AnnotatedString
1717
import androidx.compose.ui.text.style.TextAlign
18-
import androidx.compose.ui.unit.dp
1918
import com.ninecraft.booket.core.common.utils.HighlightedText
2019
import com.ninecraft.booket.core.designsystem.ComponentPreview
2120
import com.ninecraft.booket.core.designsystem.theme.Black
@@ -50,9 +49,7 @@ internal fun OnboardingPage(
5049
painter = painterResource(imageRes),
5150
contentDescription = "Onboarding Graphic",
5251
contentScale = ContentScale.FillWidth,
53-
modifier = Modifier
54-
.fillMaxWidth()
55-
.height(274.dp),
52+
modifier = Modifier.fillMaxWidth(),
5653
)
5754
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing8))
5855
Text(
-123 KB
Loading
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="next">다음</string>
3+
<string name="start">시작하기</string>
44
<string name="onboarding_first_page_title">읽고 있는 책을 등록하고\n바로 기록해보세요</string>
55
<string name="onboarding_first_page_description">책을 덮기 전, 마음에 남은 문장과\n감정을 간편하게 남길 수 있어요</string>
66
<string name="onboarding_second_page_title">독서 중 느낀 감정을\n자세히 남겨 보세요</string>
@@ -9,4 +9,5 @@
99
<string name="onboarding_third_page_description">감정 캐릭터와 함께\n이미지로 저장하고 공유할 수 있어요</string>
1010
<string name="onboarding_first_highlight_text">기록</string>
1111
<string name="onboarding_second_highlight_text">감정</string>
12+
<string name="onboarding_third_highlight_text">공유</string>
1213
</resources>

0 commit comments

Comments
 (0)