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

[FIX/#118] 모임 생성 오류 수정
depromeet · Feb 1, 2024 · 3f161f6 · 3f161f6
2 parents f8a91b9 + 94afe1f
commit 3f161f6
Show file tree

Hide file tree

Showing 33 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/moim/MoimFragment.kt b/app/src/main/java/com/teumteum/teumteum/presentation/moim/MoimFragment.kt
@@ -54,7 +54,13 @@ class MoimFragment :
             viewModel.getGroup(meetingId)
             viewModel.updateSheetEvent(ScreenState.CancelInit)
         } else {
-            setupUI()
+            if(viewModel.screenState.value == ScreenState.Address) {
+                setupUI()
+            } else {
+                viewModel.updateSheetEvent(ScreenState.Topic)
+                setupUI()
+                viewModel.initializeState()
+            }
         }
 
         lifecycleScope.launchWhenStarted {
@@ -128,7 +134,6 @@ class MoimFragment :
     }
 
     private fun setupUI() {
-        viewModel.updateSheetEvent(ScreenState.Topic)
         lifecycleScope.launchWhenStarted {
             viewModel.currentStep.collect {currentStep ->
                 animateProgressBar(currentStep)
@@ -173,7 +178,7 @@ class MoimFragment :
                     ScreenState.Success -> {
                         delay(1000)
                         (activity as MainActivity).showBottomNavi()
-                        delay(5000)
+                        delay(2000)
                         viewModel.initializeState()
                     }
                     ScreenState.DeleteSuccess -> {

diff --git a/build-logic/convention/build/classes/kotlin/main/Constants.class b/build-logic/convention/build/classes/kotlin/main/Constants.class
diff --git a/...ention/build/classes/kotlin/main/ext/application/DefaultConfigKt$configureDefault$1.class b/...ention/build/classes/kotlin/main/ext/application/DefaultConfigKt$configureDefault$1.class
diff --git a/...ic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab b/...ic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
diff --git a/...ion/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at b/...ion/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/...onvention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab b/...onvention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
diff --git a/...build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/...build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
diff --git a/...on/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/...on/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/...otlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/...otlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/...logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab b/...logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab
diff --git a/...ention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at b/...ention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at
diff --git a/...on/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/...on/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/...otlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/...otlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/...c/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab b/...c/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab
diff --git a/...on/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/...on/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at
diff --git a/build-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab b/build-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
diff --git a/...convention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at b/...convention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/...nvention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab b/...nvention/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/...uild/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/...uild/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/build-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab b/build-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-12
+14
 0
diff --git a/...d-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab b/...d-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
diff --git a/...nvention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at b/...nvention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/...d-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab b/...d-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
diff --git a/...nvention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream b/...nvention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/...tion/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len b/...tion/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/...gic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len b/...gic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
diff --git a/...nvention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at b/...nvention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/...logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i b/...logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
diff --git a/build-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab b/build-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab
diff --git a/.../convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at b/.../convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build-logic/convention/build/kotlin/compileKotlin/cacheable/last-build.bin b/build-logic/convention/build/kotlin/compileKotlin/cacheable/last-build.bin
diff --git a/build-logic/convention/build/kotlin/compileKotlin/local-state/build-history.bin b/build-logic/convention/build/kotlin/compileKotlin/local-state/build-history.bin
diff --git a/build-logic/convention/build/libs/convention.jar b/build-logic/convention/build/libs/convention.jar