Skip to content

Commit 8964168

Browse files
authored
Merge pull request #91 from Nexters/feature/onboarding-design-fix
온보딩 화면 변경된 디자인 적용
2 parents acf19bf + 89b072a commit 8964168

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

feature/onboarding/src/main/java/com/goalpanzi/mission_mate/feature/onboarding/screen/OnboardingScreen.kt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,21 +150,16 @@ fun OnboardingScreen(
150150
.navigationBarsPadding(),
151151
horizontalAlignment = Alignment.CenterHorizontally
152152
) {
153-
MissionMateTopAppBar(
154-
modifier = modifier,
155-
navigationType = NavigationType.NONE,
156-
containerColor = Color.Transparent,
157-
)
158153
Text(
159-
modifier = Modifier.padding(bottom = 52.dp),
154+
modifier = Modifier.padding(top = 48.dp, bottom = 40.dp),
160155
text = stringResource(id = R.string.onboarding_ready_title),
161156
textAlign = TextAlign.Center,
162157
style = MissionMateTypography.heading_sm_bold,
163158
color = ColorGray1_FF404249
164159
)
165160
OutlinedTextChip(
166-
text = stringResource(id = R.string.onboarding_level_1),
167-
modifier = Modifier.padding(bottom = 23.dp)
161+
text = stringResource(id = R.string.onboarding_land_1),
162+
modifier = Modifier.padding(bottom = 24.dp)
168163
)
169164
Box(
170165
modifier = Modifier

feature/onboarding/src/main/java/com/goalpanzi/mission_mate/feature/onboarding/screen/boardsetup/BoardSetupSuccessScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fun BoardSetupSuccessScreen(
6262
textAlign = TextAlign.Center
6363
)
6464
OutlinedTextChip(
65-
text = stringResource(id = R.string.onboarding_level_1),
65+
text = stringResource(id = R.string.onboarding_land_1),
6666
modifier = Modifier.padding(bottom = 12.dp)
6767
)
6868
Box(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<string name="onboarding_code_title">초대코드\n입력하기</string>
1010
<string name="onboarding_code_desription">초대받고 왔지~</string>
1111

12-
<string name="onboarding_level_1">LV1. 제주도</string>
12+
<string name="onboarding_land_1">LAND 1. 제주도</string>
1313

1414
<string name="onboarding_board_setup_mission_title">미션 설정</string>
1515
<string name="onboarding_board_setup_mission_description">경쟁인원은\n최소 2명에서 최대 10명이에요!</string>
@@ -60,4 +60,4 @@
6060

6161
<string name="check_ok">맞아요</string>
6262
<string name="check_no">아니에요</string>
63-
</resources>
63+
</resources>

0 commit comments

Comments
 (0)