Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] 온보딩 뷰 디자인 수정 #210

Merged
merged 3 commits into from
Aug 28, 2024
Merged

[chore] 온보딩 뷰 디자인 수정 #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4254778
[chore] #203 PartialColorText 키워드 수정
t1nm1ksun Aug 27, 2024
891e5ba
[chore] #203 string resource 수정
t1nm1ksun Aug 27, 2024
5013821
[chore] #203 ktlint Format
t1nm1ksun Aug 27, 2024
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
2 changes: 1 addition & 1 deletion app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnboardingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ fun OnboardingScreen(
Text(
text = PartialColorText(
stringResource(id = onboardingType.titleRes),
keywords = listOf("포인트", "데이트코스", "100", "다양한"),
keywords = if (page == 0) { listOf("포인트", "데이트 코스", "100", "다양한") } else listOf("100 포인트", "다양한"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

근데 이거 왜 나눠준 거에요?? 그냥 합치면 안 되나 그냥 진짜 궁금해서

color = DateRoadTheme.colors.purple600
),
style = DateRoadTheme.typography.titleExtra24,
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@

<!-- OnboardingType -->
<string name="onboarding_first_title">데이트로드는 포인트로\n데이트 코스를 열람할 수 있어요</string>
<string name="onboarding_first_description">최초 3회 찬스로 다른 사람의 데이트 코스를 구경해 보세요</string>
<string name="onboarding_first_description">최초 3회 무료 찬스로\n다른 사람의 데이트 코스를 구경하세요!</string>
<string name="onboarding_first_sub_description">(이후에는 50포인트로 코스를 열람할 수 있어요)</string>
<string name="onboarding_second_title">데이트 코스를 등록하면\n100 포인트를 얻을 수 있어요</string>
<string name="onboarding_second_description">내 연인과 함께한 데이트 코스를 자랑하고 포인트를 받아보세요</string>
<string name="onboarding_second_description">내 연인과 함께한 데이트 코스를 자랑하고\n포인트를 받아보세요</string>
<string name="onboarding_second_sub_description"></string>
<string name="onboarding_third_title">쌓인 포인트로\n다양한 데이트 코스를 둘러보세요</string>
<string name="onboarding_third_description">모인 포인트는 데이트 장소를 예약할 때 현금처럼 사용 가능해요</string>
<string name="onboarding_third_description">모인 포인트는 데이트 장소를 예약할 때\n현금처럼 사용 가능해요</string>
<string name="onboarding_third_sub_description">(추후 제공될 기능이에요)</string>

<!-- OneButtonDialogType -->
Expand Down
Loading