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.

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

[IDLE-510] 센터 관리자 휴대폰 인증 텍스트 변경 및 인증 대기 화면에 전화 인증 안내 추가 #153

Merged
merged 2 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 19 additions & 7 deletions core/designresource/src/main/res/drawable/ic_call.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="25dp"
android:viewportWidth="24"
android:viewportHeight="25">
<path
android:fillColor="#383D45"
android:pathData="M7.909,4.967L9.201,4.578C9.627,4.45 10.085,4.481 10.49,4.665C10.895,4.85 11.219,5.176 11.402,5.582L12.307,7.596C12.465,7.945 12.509,8.335 12.433,8.711C12.357,9.086 12.166,9.429 11.885,9.69L10.507,10.974C10.322,11.15 10.462,11.833 11.137,13.003C11.813,14.174 12.335,14.636 12.576,14.564L14.382,14.012C14.748,13.9 15.139,13.906 15.502,14.028C15.865,14.149 16.181,14.382 16.405,14.692L17.692,16.476C17.952,16.836 18.072,17.279 18.031,17.721C17.989,18.163 17.788,18.576 17.466,18.881L16.471,19.823C16.15,20.127 15.753,20.341 15.323,20.442C14.892,20.543 14.442,20.528 14.019,20.399C11.935,19.761 10.004,17.867 8.202,14.744C6.395,11.616 5.713,8.978 6.188,6.823C6.284,6.388 6.494,5.987 6.797,5.661C7.099,5.335 7.483,5.096 7.909,4.967Z" />
android:width="262dp"
android:height="526dp"
android:viewportWidth="262"
android:viewportHeight="526">
<path
android:pathData="M131,224C170.76,224 203,191.76 203,152C203,112.24 170.76,80 131,80C91.24,80 59,112.24 59,152C59,166.6 63.35,180.19 70.82,191.54L63.48,218.93C62.73,221.72 65.28,224.27 68.07,223.52L97.36,215.67C107.4,220.99 118.85,224 131,224Z"
android:fillColor="#FFF7F0"
android:fillType="evenOdd"/>
<path
android:pathData="M139.28,196.54C134.04,196.35 119.19,194.32 103.64,178.91C88.09,163.5 86.04,148.79 85.85,143.6C85.55,135.68 91.68,127.99 98.75,124.99C99.6,124.62 100.53,124.48 101.45,124.58C102.37,124.68 103.25,125.02 104,125.56C109.83,129.76 113.84,136.12 117.29,141.12C118.05,142.22 118.38,143.56 118.21,144.88C118.03,146.2 117.38,147.41 116.36,148.28L109.26,153.51C108.92,153.75 108.68,154.11 108.58,154.52C108.49,154.93 108.54,155.36 108.75,155.73C110.35,158.62 113.21,162.93 116.49,166.18C119.76,169.43 124.32,172.45 127.45,174.22C127.84,174.44 128.3,174.5 128.74,174.39C129.17,174.28 129.55,174.01 129.79,173.64L134.41,166.67C135.26,165.55 136.52,164.8 137.91,164.58C139.31,164.35 140.73,164.67 141.9,165.47C147.01,168.98 152.99,172.89 157.36,178.44C157.95,179.19 158.33,180.08 158.45,181.02C158.57,181.97 158.43,182.92 158.05,183.8C155.01,190.84 147.3,196.83 139.28,196.54Z"
android:fillColor="#F97800"
android:fillType="evenOdd"/>
<path
android:pathData="M127.73,123.61L138.61,134.37L158.49,114.73"
android:strokeLineJoin="round"
android:strokeWidth="7.85455"
android:fillColor="#00000000"
android:strokeColor="#FF9533"
android:strokeLineCap="round"/>
</vector>
11 changes: 6 additions & 5 deletions core/designresource/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<string name="confirm_password_hint">비밀번호를 한번 더 입력해주세요.</string>
<string name="forget_password">비밀번호가 기억나지 않나요?</string>
<string name="change_password">비밀번호 변경</string>
<string name="new_password_title">새로운 비밀번호를 입력해주세요</string>
<string name="new_password_title">새로운 비밀번호를 입력해주세요.</string>
<string name="generate_new_password">신규 비밀번호 발급</string>
<string name="condition_id_length">6자~20자 사이</string>
<string name="condition_password_length">8자~20자 사이</string>
Expand All @@ -36,15 +36,16 @@
<string name="password_description">* 비밀번호는 아래의 조건에 맞추어주세요.</string>
<string name="phone_number">휴대폰 번호</string>
<string name="office_number">전화번호</string>
<string name="phone_number_hint">휴대폰 번호를 입력해주세요</string>
<string name="worker_gender_title">본인의 성별을 선택해주세요</string>
<string name="phone_number_hint">휴대폰 번호를 입력해주세요.</string>
<string name="center_phone_number_hint">센터 관리자님의\n휴대폰 번호를 입력해주세요.</string>
<string name="worker_gender_title">본인의 성별을 선택해주세요.</string>
<string name="verification">인증</string>
<string name="confirm_code">인증번호</string>
<string name="confirm_success">인증이 완료되었습니다.</string>
<string name="confirm_code_error_description">* 인증번호를 다시 확인해주세요.</string>
<string name="worker_signup_complete_message">요양보호사 로그인을\n완료했어요!</string>
<string name="worker_signup_welcome_message">로그인 정보는 마지막 접속일부터\n180일간 유지될 예정이에요.</string>
<string name="worker_name_hint">성함을 입력해주세요</string>
<string name="worker_name_hint">성함을 입력해주세요.</string>
<string name="worker_name_title">본인의 인적사항을 입력해주세요.</string>
<string name="worker_signup">요양보호사 회원가입</string>
<string name="account_withdrawal">계정 삭제</string>
Expand All @@ -57,7 +58,7 @@
<!-- User Registration -->
<string name="start_with_phone">휴대폰 번호로 시작하기</string>
<string name="start_with_signup">회원가입하고 시작하기</string>
<string name="set_id_and_password">아이디와 비밀번호를 설정해주세요</string>
<string name="set_id_and_password">아이디와 비밀번호를 설정해주세요.</string>
<string name="set_id_label">아이디 설정</string>
<string name="id_conditions">(최소 6자 ~ 최대 20자까지 허용)</string>
<string name="id_available">* 사용 가능한 아이디 입니다.</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private fun CenterPendingScreen(
sendVerificationRequest: () -> Unit,
) {
Scaffold(containerColor = CareTheme.colors.white000) { paddingValue ->
val actualPageCount = 3
val actualPageCount = 4
val pageCount = 600
val maxNumOfRounds = 600 / actualPageCount
val pagerState = rememberPagerState(
Expand Down Expand Up @@ -155,6 +155,11 @@ private fun CenterPendingScreen(
headerText = "요양보호사를 즐겨찾기하고\n직접 연락해 능동적으로 구인해요",
imageResId = R.drawable.ic_pending_screen_3
)

3 -> PendingPageContent(
headerText = "더욱 안전한 서비스를 만들기 위해\n마지막으로 전화 인증을 받을게요",
imageResId = com.idle.designresource.R.drawable.ic_call
)
}
}
}
Expand Down Expand Up @@ -211,7 +216,7 @@ private fun PendingPageContent(headerText: String, imageResId: Int) {
text = "센터 관리자 인증 시",
style = CareTheme.typography.heading3,
color = CareTheme.colors.orange500,
modifier = Modifier.padding(bottom = 4.dp),
modifier = Modifier.padding(bottom = 8.dp),
)

Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ internal fun CenterPhoneNumberScreen(
modifier = Modifier.fillMaxSize()
) {
Text(
text = stringResource(id = R.string.phone_number_hint),
text = stringResource(id = R.string.center_phone_number_hint),
style = CareTheme.typography.heading2,
color = CareTheme.colors.black,
modifier = Modifier.padding(bottom = 28.dp),
Expand Down