fix: quiz랑 exam 로직이 같이 적용되는 부분 수정 (#509)

duckie-team · May 28, 2023 · 4079d64 · 4079d64
1 parent 408f6f6
commit 4079d64
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.../main/java/team/duckie/app/android/feature/start/exam/screen/quiz/StartQuizInputScreen.kt b/.../main/java/team/duckie/app/android/feature/start/exam/screen/quiz/StartQuizInputScreen.kt
@@ -47,9 +47,6 @@ internal fun StartQuizInputScreen(modifier: Modifier, viewModel: StartExamViewMo
     val state =
         viewModel.container.stateFlow.collectAsStateWithLifecycle().value as StartExamState.Input
 
-    val certifyingStatement: String = remember(state.certifyingStatement) {
-        state.certifyingStatement
-    }
     val certifyingStatementText: String = remember(state.certifyingStatementInputText) {
         state.certifyingStatementInputText
     }
@@ -94,7 +91,7 @@ internal fun StartQuizInputScreen(modifier: Modifier, viewModel: StartExamViewMo
             ),
             type = QuackLargeButtonType.Fill,
             text = stringResource(id = R.string.start_exam_start_button),
-            enabled = viewModel.startExamValidate(),
+            enabled = certifyingStatementText.isNotEmpty(),
             onClick = viewModel::startSolveProblem,
         )
         ImeSpacer()

diff --git a/.../src/main/java/team/duckie/app/android/feature/start/exam/viewmodel/StartExamViewModel.kt b/.../src/main/java/team/duckie/app/android/feature/start/exam/viewmodel/StartExamViewModel.kt
@@ -33,8 +33,10 @@ internal class StartExamViewModel @Inject constructor(
             val examId = savedStateHandle.getStateFlow(Extras.ExamId, -1).value
             val isQuiz = savedStateHandle.getStateFlow(Extras.IsQuiz, false).value
             if (isQuiz) {
-                val requirementQuestion = savedStateHandle.getOrThrow<String>(Extras.RequirementQuestion)
-                val requirementPlaceholder = savedStateHandle.getOrThrow<String>(Extras.RequirementPlaceholder)
+                val requirementQuestion =
+                    savedStateHandle.getOrThrow<String>(Extras.RequirementQuestion)
+                val requirementPlaceholder =
+                    savedStateHandle.getOrThrow<String>(Extras.RequirementPlaceholder)
                 val timer = savedStateHandle.getOrThrow<Int>(Extras.Timer)
                 reduce {
                     StartExamState.Input(
@@ -46,7 +48,8 @@ internal class StartExamViewModel @Inject constructor(
                     )
                 }
             } else {
-                val certifyingStatement = savedStateHandle.getOrThrow<String>(Extras.CertifyingStatement)
+                val certifyingStatement =
+                    savedStateHandle.getOrThrow<String>(Extras.CertifyingStatement)
                 reduce {
                     StartExamState.Input(
                         examId = examId,
@@ -75,7 +78,11 @@ internal class StartExamViewModel @Inject constructor(
         val inputState = state as StartExamState.Input
         postSideEffect(
             StartExamSideEffect.NavigateToSolveProblem(
-                certified = startExamValidate(),
+                certified = if (inputState.isQuiz) {
+                    true
+                } else {
+                    startExamValidate()
+                },
                 examId = inputState.examId,
                 isQuiz = inputState.isQuiz,
             ),