fix: T-486, T-484 (#277)

* fix: T-486 정보수정제안의 화면에 스크롤이 끝까지 안가는 문제 * fix: T-484 닉네임 변경시 400: invalid paramter 로 내려오는 문제 * chore: app version up
Wedemy · Apr 23, 2024 · a32337d · a32337d
1 parent b6e2c81
commit a32337d
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 63 deletions.
diff --git a/build-logic/src/main/kotlin/internal/Constants.kt b/build-logic/src/main/kotlin/internal/Constants.kt
@@ -11,8 +11,8 @@ internal object ApplicationConstants {
   const val MinSdk = 24
   const val TargetSdk = 34
   const val CompileSdk = 34
-  const val VersionCode = 5
-  const val VersionName = "0.0.4"
+  const val VersionCode = 6
+  const val VersionName = "0.0.5"
   val JavaVersion = org.gradle.api.JavaVersion.VERSION_17
   const val JavaVersionAsInt = 17
 }
diff --git a/common/src/main/kotlin/us/wedemy/eggeum/android/common/util/TextInputError.kt b/common/src/main/kotlin/us/wedemy/eggeum/android/common/util/TextInputError.kt
@@ -12,4 +12,5 @@ enum class TextInputError {
   TOO_SHORT,
   ALREADY_EXIST,
   CONTAINS_WHITESPACE,
+  INVALID_CHARACTER,
 }
diff --git a/main/src/main/kotlin/us/wedemy/eggeum/android/main/ui/myaccount/EditMyInfoFragment.kt b/main/src/main/kotlin/us/wedemy/eggeum/android/main/ui/myaccount/EditMyInfoFragment.kt
@@ -146,6 +146,7 @@ class EditMyInfoFragment : BaseFragment<FragmentEditMyInfoBinding>() {
       TextInputError.TOO_SHORT -> setTooShortTextError()
       TextInputError.ALREADY_EXIST -> setAlreadyExistTextError()
       TextInputError.CONTAINS_WHITESPACE -> setContainsWhitespaceError()
+      TextInputError.INVALID_CHARACTER -> setContainsInvalidCharacterError()
     }
   }
 
@@ -195,6 +196,19 @@ class EditMyInfoFragment : BaseFragment<FragmentEditMyInfoBinding>() {
     }
   }
 
+  private fun setContainsInvalidCharacterError() {
+    binding.tilEditNickname.apply {
+      error = getString(R.string.contains_invalid_character_error)
+      setEndIconDrawable(us.wedemy.eggeum.android.design.R.drawable.ic_close_filled_16)
+      val color = ContextCompat.getColor(requireContext(), us.wedemy.eggeum.android.design.R.color.gray_400)
+      setEndIconTintList(ColorStateList.valueOf(color))
+      setEndIconOnClickListener {
+        binding.tietEditNickname.text?.clear()
+        viewModel.setNickname("")
+      }
+    }
+  }
+
   private fun setValid() {
     binding.tilEditNickname.apply {
       error = null

diff --git a/main/src/main/kotlin/us/wedemy/eggeum/android/main/viewmodel/EditMyInfoViewModel.kt b/main/src/main/kotlin/us/wedemy/eggeum/android/main/viewmodel/EditMyInfoViewModel.kt
@@ -118,6 +118,9 @@ class EditMyInfoViewModel @Inject constructor(
       containsWhitespace(nickname) -> {
         _nicknameState.value = EditTextState.Error(TextInputError.CONTAINS_WHITESPACE)
       }
+      containsInvalidCharacter(nickname) -> {
+        _nicknameState.value = EditTextState.Error(TextInputError.INVALID_CHARACTER)
+      }
       else -> {
         viewModelScope.launch {
           checkNicknameExistUseCase(nickname)
@@ -186,10 +189,14 @@ class EditMyInfoViewModel @Inject constructor(
     //
   }
 
-  fun containsWhitespace(text: String): Boolean {
+  private fun containsWhitespace(text: String): Boolean {
     return text.matches(Regex(".*\\s.*"))
   }
 
+  private fun containsInvalidCharacter(text: String): Boolean {
+    return !text.matches(Regex("^[a-zA-Z가-힣0-9]{2,20}$"))
+  }
+
   override fun handleRefreshTokenExpired() {
     viewModelScope.launch {
       logoutUseCase()

diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
@@ -93,6 +93,7 @@
   <!--  EditMyInfo-->
   <string name="already_exist_text_error">이미 있는 닉네임 입니다.</string>
   <string name="contains_whitespace_error">닉네임에 띄어쓰기를 포함할 수 없습니다.</string>
+  <string name="contains_invalid_character_error">닉네임은 영문, 숫자, 완성된 한글의 조합만 사용할 수 있습니다.\n한글의 자음이나 모음만의 조합은 허용되지 않습니다.</string>
   <string name="ic_bottom_sheet_handle">ic_bottom_sheet_handle</string>
 
   <!--  NetworkError-->

diff --git a/onboard/src/main/kotlin/us/wedemy/eggeum/android/onboard/ui/RegisterNicknameFragment.kt b/onboard/src/main/kotlin/us/wedemy/eggeum/android/onboard/ui/RegisterNicknameFragment.kt
@@ -109,6 +109,7 @@ class RegisterNicknameFragment : BaseFragment<FragmentRegisterNicknameBinding>()
       TextInputError.TOO_SHORT -> setTooShortTextError()
       TextInputError.ALREADY_EXIST -> setAlreadyExistTextError()
       TextInputError.CONTAINS_WHITESPACE -> setContainsWhitespaceError()
+      TextInputError.INVALID_CHARACTER -> setContainsInvalidCharacterError()
     }
   }
 
@@ -158,6 +159,19 @@ class RegisterNicknameFragment : BaseFragment<FragmentRegisterNicknameBinding>()
     }
   }
 
+  private fun setContainsInvalidCharacterError() {
+    binding.tilRegisterNickname.apply {
+      error = getString(R.string.contains_invalid_character_error)
+      setEndIconDrawable(us.wedemy.eggeum.android.design.R.drawable.ic_close_filled_16)
+      val color = ContextCompat.getColor(requireContext(), us.wedemy.eggeum.android.design.R.color.gray_400)
+      setEndIconTintList(ColorStateList.valueOf(color))
+      setEndIconOnClickListener {
+        binding.tietRegisterNickname.text?.clear()
+        viewModel.setNickname("")
+      }
+    }
+  }
+
   private fun setValid() {
     binding.tilRegisterNickname.apply {
       error = null

diff --git a/onboard/src/main/kotlin/us/wedemy/eggeum/android/onboard/viewmodel/OnBoardViewModel.kt b/onboard/src/main/kotlin/us/wedemy/eggeum/android/onboard/viewmodel/OnBoardViewModel.kt
@@ -153,6 +153,9 @@ class OnBoardViewModel @Inject constructor(
       containsWhitespace(nickname) -> {
         _nicknameState.value = EditTextState.Error(TextInputError.CONTAINS_WHITESPACE)
       }
+      containsInvalidCharacter(nickname) -> {
+        _nicknameState.value = EditTextState.Error(TextInputError.INVALID_CHARACTER)
+      }
       else -> {
         viewModelScope.launch {
           checkNicknameExistUseCase(nickname)
@@ -204,10 +207,14 @@ class OnBoardViewModel @Inject constructor(
     //
   }
 
-  fun containsWhitespace(text: String): Boolean {
+  private fun containsWhitespace(text: String): Boolean {
     return text.matches(Regex(".*\\s.*"))
   }
 
+  private fun containsInvalidCharacter(text: String): Boolean {
+    return !text.matches(Regex("^[a-zA-Z가-힣0-9]{2,20}$"))
+  }
+
   override fun handleRefreshTokenExpired() {
     viewModelScope.launch {
       logoutUseCase()

diff --git a/onboard/src/main/res/values/strings.xml b/onboard/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
   <string name="empty_text_error">닉네임을 입력해주세요.</string>
   <string name="already_exist_text_error">이미 있는 닉네임 입니다.</string>
   <string name="contains_whitespace_error">닉네임에 띄어쓰기를 포함할 수 없습니다.</string>
+  <string name="contains_invalid_character_error">닉네임은 영문, 숫자, 완성된 한글의 조합만 사용할 수 있습니다.\n한글의 자음이나 모음만의 조합은 허용되지 않습니다.</string>
   <string name="finish">완료</string>
   <string name="sign_up_complete">회원가입이 완료되었습니다.</string>
 </resources>