Merge pull request #172 from depromeet/fix/#104-1st-qa-minseo

[Fix/#158] 모임 수정 4자리 입력 오류 수정
depromeet · Feb 16, 2024 · 83197ae · 83197ae
2 parents c43f4d7 + 5eaca62
commit 83197ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/moim/MoimModifyFragment.kt b/app/src/main/java/com/teumteum/teumteum/presentation/moim/MoimModifyFragment.kt
@@ -62,6 +62,7 @@ class MoimModifyFragment: BindingFragment<FragmentModifyMoimBinding>(R.layout.fr
                     ScreenState.Server -> { context?.defaultToast(getString(R.string.moim_alert_message_server)) }
                     ScreenState.DeleteSuccess -> {context?.defaultToast(getString(R.string.setting_dialog_moim_delete_success))}
                     ScreenState.Success -> {context?.defaultToast(getString(R.string.moim_alert_message_modify_success))}
+                    ScreenState.ModifyFailure -> {context?.defaultToast(getString(R.string.setting_dialog_moim_modify_failure))}
                     else -> {}
                 }
             }

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/moim/MoimViewModel.kt b/app/src/main/java/com/teumteum/teumteum/presentation/moim/MoimViewModel.kt
@@ -299,7 +299,9 @@ class MoimViewModel @Inject constructor(
         return try {
             val currentYear = Year.now().value
             val dateInput = if(_date.value.length == 4) {
-                "${currentYear}${_date.value}"
+                val month = _date.value.substring(0, 2)
+                val day = _date.value.substring(2)
+                "${currentYear}년 ${month}월 ${day}일"
             } else {
                 "${currentYear}년 ${_date.value.substring(0, _date.value.lastIndexOf(" "))}"
             }
@@ -490,7 +492,7 @@ class MoimViewModel @Inject constructor(
                         }
                 }
             } else {
-                _screenState.value = ScreenState.Failure
+                _screenState.value = ScreenState.ModifyFailure
             }
         }
     }
@@ -668,7 +670,7 @@ class MoimViewModel @Inject constructor(
 
 enum class ScreenState {
     Topic, Name, Introduce, DateTime, Address, People, Create, Success, Failure, Server,
-    CancelInit, Cancel, CancelSuccess, Finish, DeleteInit, Delete, DeleteSuccess,
+    CancelInit, Cancel, CancelSuccess, Finish, DeleteInit, Delete, DeleteSuccess, ModifyFailure,
     Modify, Webview, ReportInit, Report, ReportSuccess, BookMarkSuccess, BookMarkDelete,
 }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -208,6 +208,7 @@
     <string name="setting_dialog_delete_row2">수정하기</string>
     <string name="setting_dialog_moim_delete_success">모임 삭제를 성공했습니다</string>
     <string name="setting_dialog_moim_delete_failure">모임 삭제에 오류가 발생했습니다</string>
+    <string name="setting_dialog_moim_modify_failure">모임 수정에 오류가 발생했습니다</string>
 
     <string name="setting_signout_title">탈퇴하는 이유가 무엇인가요?</string>
     <string name="setting_signout_btn1">선택 완료</string>