🔀 :: (#85) 회원가입 피드백 반영

Team-SIGNAL · Nov 14, 2023 · 31f934c · 31f934c
2 parents 8379b17 + fec0e00
commit 31f934c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/presentation/src/main/java/com/signal/signal_android/feature/signup/SignUpState.kt b/presentation/src/main/java/com/signal/signal_android/feature/signup/SignUpState.kt
@@ -7,6 +7,7 @@ data class SignUpState(
     val nameError: Boolean,
     val birth: String,
     val phone: String,
+    val phoneError: Boolean,
     val gender: Gender,
     val accountId: String,
     val accountIdError: Boolean,
@@ -22,6 +23,7 @@ data class SignUpState(
             nameError = false,
             birth = "",
             phone = "",
+            phoneError = false,
             accountId = "",
             accountIdError = false,
             gender = Gender.MAN,

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/signup/SignUpUser.kt b/presentation/src/main/java/com/signal/signal_android/feature/signup/SignUpUser.kt
@@ -89,8 +89,9 @@ internal fun SignUpUser(
             showDialog = { isShowDialog = !isShowDialog },
             name = { state.name },
             nameError = { state.nameError },
-            birth = { state.birth.toString() },
+            birth = { state.birth },
             phoneNumber = { state.phone },
+            phoneError = { state.phoneError },
             gender = { state.gender },
             onNameChange = signUpViewModel::setName,
             onPhoneNumberChange = signUpViewModel::setPhone,
@@ -127,6 +128,7 @@ private fun SignUpInputs(
     nameError: () -> Boolean,
     birth: () -> String,
     phoneNumber: () -> String,
+    phoneError: () -> Boolean,
     gender: () -> Gender,
     onNameChange: (String) -> Unit,
     onPhoneNumberChange: (String) -> Unit,
@@ -208,6 +210,8 @@ private fun SignUpInputs(
         hint = stringResource(id = R.string.sign_up_hint_phone_number),
         title = stringResource(id = R.string.phone_number),
         keyboardType = KeyboardType.NumberPassword,
+        error = phoneError(),
+        description = stringResource(id = R.string.sign_up_phone_error),
     )
     Spacer(modifier = Modifier.height(14.dp))
     Column(

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/signup/SignUpViewModel.kt b/presentation/src/main/java/com/signal/signal_android/feature/signup/SignUpViewModel.kt
@@ -1,5 +1,6 @@
 package com.signal.signal_android.feature.signup
 
+import android.telephony.PhoneNumberUtils
 import androidx.lifecycle.viewModelScope
 import com.signal.domain.enums.Gender
 import com.signal.domain.usecase.users.SignUpUseCase
@@ -29,7 +30,12 @@ class SignUpViewModel(
     }
 
     fun setPhone(phone: String) {
-        setState(state.value.copy(phone = phone))
+        setState(
+            state.value.copy(
+                phone = phone,
+                phoneError = phone.length != 11,
+            )
+        )
         setButtonEnabledUser()
     }
 
@@ -76,8 +82,9 @@ class SignUpViewModel(
 
     private fun setButtonEnabledUser() {
         with(state.value) {
+            val isError = nameError || phoneError
             val isBlank = name.isBlank() || phone.isBlank()
-            setState(copy(buttonEnabled = !isBlank && !nameError))
+            setState(copy(buttonEnabled = !isBlank && !isError))
         }
     }
 
@@ -92,10 +99,11 @@ class SignUpViewModel(
     fun signUp() {
         viewModelScope.launch(Dispatchers.IO) {
             with(state.value) {
+                PhoneNumberUtils.formatNumber(phone, "")
                 signUpUseCase(
                     name = name,
                     birth = birth,
-                    phone = phone,
+                    phone = phone.toPhoneNumber(),
                     accountId = accountId,
                     password = password,
                     gender = gender,
@@ -106,3 +114,13 @@ class SignUpViewModel(
         }
     }
 }
+
+private fun String.toPhoneNumber() = StringBuilder().apply {
+    with(this@toPhoneNumber) {
+        append(substring(0..2))
+        append('-')
+        append(substring(3..6))
+        append('-')
+        append(substring(7..10))
+    }
+}.toString()
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -65,6 +65,7 @@
     <string name="sign_up_hint_password_confirm">비밀번호를 다시 입력하세요</string>
 
     <string name="sign_up_name_error">2~20글자로 입력해주세요</string>
+    <string name="sign_up_phone_error">올바른 형식의 전화번호를 입력해주세요</string>
     <string name="sign_up_account_id_error">5~12글자로 입력해주세요</string>
     <string name="sign_up_password_error">8글자 이상 12글자 이하로 문자, 숫자, 특수문자를 포함해주세요</string>
     <string name="sign_up_repeat_password_error">비밀번호가 일치하지 않습니다</string>