Merge pull request #103 from boostcampwm-2022/improve/createGroup

그룹 생성 페이지 개선
boostcampwm-2022 · Mar 17, 2024 · 96a10bb · 96a10bb
2 parents 551e271 + 9438d26
commit 96a10bb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/...on/src/main/java/com/whyranoid/presentation/community/group/create/CreateGroupFragment.kt b/...on/src/main/java/com/whyranoid/presentation/community/group/create/CreateGroupFragment.kt
@@ -110,6 +110,9 @@ internal class CreateGroupFragment :
                     }
                 }
             }
+            is Event.InvalidRule -> {
+                binding.root.makeSnackBar(getString(R.string.text_invalid_rule)).show()
+            }
         }
     }
 

diff --git a/...n/src/main/java/com/whyranoid/presentation/community/group/create/CreateGroupViewModel.kt b/...n/src/main/java/com/whyranoid/presentation/community/group/create/CreateGroupViewModel.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -42,6 +41,8 @@ class CreateGroupViewModel @Inject constructor(
     fun onDialogConfirm(date: String, hour: String, minute: String) {
         if (date.isNotEmpty() && hour.isNotEmpty() && minute.isNotEmpty()) {
             rules.value = rules.value + listOf("$date-$hour-$minute")
+        } else {
+            emitEvent(Event.InvalidRule)
         }
 
         _showDialog.value = false
@@ -56,8 +57,8 @@ class CreateGroupViewModel @Inject constructor(
     }
 
     val isDoubleCheckButtonEnable: StateFlow<Boolean>
-        get() = groupName.map { name ->
-            name?.trim()?.isNotEmpty() ?: false
+        get() = groupName.combine(isNotDuplicate) { name, isNotDuplicated ->
+            name?.trim()?.isNotEmpty() ?: false && isNotDuplicated.not()
         }.stateIn(
             scope = viewModelScope,
             initialValue = false,
@@ -111,10 +112,9 @@ class CreateGroupViewModel @Inject constructor(
                         _eventFlow.emit(event)
                     }
                 }
-                is Event.WarningButtonClick -> {
-                    _eventFlow.emit(event)
-                }
-                is Event.AddRuleButtonClick -> {
+                is Event.WarningButtonClick,
+                is Event.AddRuleButtonClick,
+                is Event.InvalidRule -> {
                     _eventFlow.emit(event)
                 }
             }

diff --git a/presentation/src/main/java/com/whyranoid/presentation/community/group/create/Event.kt b/presentation/src/main/java/com/whyranoid/presentation/community/group/create/Event.kt
@@ -4,5 +4,6 @@ sealed class Event {
     data class CreateGroupButtonClick(val isSuccess: Boolean = true) : Event()
     object WarningButtonClick : Event()
     object AddRuleButtonClick : Event()
+    object InvalidRule : Event()
     data class DuplicateCheckButtonClick(val isDuplicatedGroupName: Boolean = false) : Event()
 }
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -190,5 +190,6 @@
     <string name="text_minute">분</string>
     <string name="text_confirm">확인</string>
     <string name="text_rule_picker_title">요일 및 시간을 골라주세요!!</string>
+    <string name="text_invalid_rule">유효하지 않은 규칙입니다.</string>
 
 </resources>
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,6 +110,9 @@ internal class CreateGroupFragment : @@
                         }
                     }
                 }
+                is Event.InvalidRule -> {
+                    binding.root.makeSnackBar(getString(R.string.text_invalid_rule)).show()
+                }
             }
         }
@@ Expand Down @@