Skip to content

Commit

Permalink
[fix/#126] 취업준비생 유저 직업명 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
blueme0 committed Feb 1, 2024
1 parent 32a4122 commit ada9358
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ class SignUpViewModel @Inject constructor(
readyJobDetailClass.value
)
STATUS_TRAINEE -> JobEntity(
null,
TRAINEE_NAME,
false,
readyJobClass.value,
readyJobDetailClass.value
Expand Down Expand Up @@ -387,6 +387,7 @@ class SignUpViewModel @Inject constructor(

companion object {
private const val REGEX_ID_PATTERN = "^([A-Za-z0-9_.]*)\$"
private const val TRAINEE_NAME = "준비중"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class CardCompleteFragment
"lv.1층", "${preferredArea.value}에 사는", mbtiText.value.toUpperCase(Locale.ROOT), it)
STATUS_STUDENT -> FrontCard(userName.value, "@${schoolName.value}", readyJobDetailClass.value,
"lv.1층", "${preferredArea.value}에 사는", mbtiText.value.toUpperCase(Locale.ROOT), it)
STATUS_TRAINEE -> FrontCard(userName.value, "@준비 중", readyJobDetailClass.value,
STATUS_TRAINEE -> FrontCard(userName.value, "@${getText(R.string.signup_tv_card_trainee_job)}", readyJobDetailClass.value,
"lv.1층", "${preferredArea.value}에 사는", mbtiText.value.toUpperCase(Locale.ROOT), it)
else -> FrontCard()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class CardFixFragment
"lv.1층", "${preferredArea.value}에 사는", mbtiText.value.toUpperCase(Locale.ROOT), it)
STATUS_STUDENT -> FrontCard(userName.value, "@${schoolName.value}", readyJobDetailClass.value,
"lv.1층", "${preferredArea.value}에 사는", mbtiText.value.toUpperCase(Locale.ROOT), it)
STATUS_TRAINEE -> FrontCard(userName.value, "@준비 중", readyJobDetailClass.value,
STATUS_TRAINEE -> FrontCard(userName.value, "@${getText(R.string.signup_tv_card_trainee_job)}", readyJobDetailClass.value,
"lv.1층", "${preferredArea.value}에 사는", mbtiText.value.toUpperCase(Locale.ROOT), it)
else -> FrontCard()
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
<string name="signup_tv_finish_title">가입을 완료했어요</string>
<string name="signup_tv_finish_subtitle">또래와 함께하는 맞춤형 모임을 추천해드려요</string>
<string name="signup_tv_go_home">홈으로 가기</string>
<string name="signup_tv_card_trainee_job">준비중</string>

<string name="alert_back_pressed_finish">\'뒤로\' 버튼을 두 번 누르면 종료됩니다</string>
<string name="alert_back_pressed_signup">\'뒤로\' 버튼을 두 번 누르면 회원가입을 종료합니다</string>
Expand Down

0 comments on commit ada9358

Please sign in to comment.