Skip to content

Commit

Permalink
[FIX]#111: 성별 출력 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
flash159483 committed Aug 19, 2024
1 parent 546acac commit fba99f0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 2 additions & 0 deletions designsystem/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
<string name="reported_message_title">\n신고 처리된 쪽지입니다</string>
<string name="has_profanity">비속어가 포함되어 있어요</string>
<string name="close">닫기</string>
<string name="male_student">남학생</string>
<string name="female_student">여학생</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ fun EditScreen(
EditField(
title = stringResource(id = R.string.gender),
value = if (state.gender == "MALE") {
stringResource(id = R.string.male_student)
stringResource(id = com.bff.wespot.designsystem.R.string.male_student)
} else {
stringResource(id = R.string.female_student)
stringResource(id = com.bff.wespot.designsystem.R.string.female_student)
},
) {
action(AuthAction.Navigation(NavigationAction.NavigateToGenderScreen(true)))
Expand Down Expand Up @@ -233,9 +233,9 @@ private fun ConfirmBottomSheetContent(
Text(
text = "$name (${
if (gender == "MALE") {
stringResource(id = R.string.male_student)
stringResource(id = com.bff.wespot.designsystem.R.string.male_student)
} else {
stringResource(id = R.string.female_student)
stringResource(id = com.bff.wespot.designsystem.R.string.female_student)
}
})",
style = StaticTypeScale.Default.header1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ fun GenderScreen(
horizontalArrangement = Arrangement.spacedBy(10.dp),
) {
GenderBox(
title = stringResource(id = R.string.male_student),
title = stringResource(id = com.bff.wespot.designsystem.R.string.male_student),
icon = painterResource(
id = com.bff.wespot.ui.R.drawable.male_student,
),
Expand All @@ -92,7 +92,7 @@ fun GenderScreen(
},
)
GenderBox(
title = stringResource(id = R.string.female_student),
title = stringResource(id = com.bff.wespot.designsystem.R.string.female_student),
icon = painterResource(
id = com.bff.wespot.ui.R.drawable.female_student,
),
Expand Down
2 changes: 0 additions & 2 deletions feature/auth/src/main/res/values/string.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="gender">성별</string>
<string name="cannot_change_gender_after_register">회원가입 이후에는 성별을 변경할 수 없어요</string>
<string name="gender_icon">성별 아이콘</string>
<string name="male_student">남학생</string>
<string name="female_student">여학생</string>
<string name="name">이름</string>
<string name="cannot_change_name_after_register">회원가입 이후에는 이름을 변경할 수 없어요</string>
<string name="enter_name">실명을 입력해 주세요</string>
Expand Down

0 comments on commit fba99f0

Please sign in to comment.