support blank input

oppia · Jan 22, 2024 · f828c6b · f828c6b
1 parent bb69b22
commit f828c6b
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 14 deletions.
diff --git a/...a/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt b/...a/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt
@@ -105,12 +105,17 @@ class MathExpressionInteractionsViewModel private constructor(
         override fun onPropertyChanged(sender: Observable, propertyId: Int) {
           errorOrAvailabilityCheckReceiver.onPendingAnswerErrorOrAvailabilityCheck(
             pendingAnswerError,
-            answerText.isNotEmpty()
+            true
           )
         }
       }
     errorMessage.addOnPropertyChangedCallback(callback)
     isAnswerAvailable.addOnPropertyChangedCallback(callback)
+
+    errorOrAvailabilityCheckReceiver.onPendingAnswerErrorOrAvailabilityCheck(
+      null,
+      true
+    )
   }
 
   override fun getPendingAnswer(): UserAnswer = UserAnswer.newBuilder().apply {
@@ -147,18 +152,18 @@ class MathExpressionInteractionsViewModel private constructor(
   }.build()
 
   override fun checkPendingAnswerError(category: AnswerErrorCategory): String? {
-    if (answerText.isNotEmpty()) {
-      pendingAnswerError = when (category) {
-        // There's no support for real-time errors.
-        AnswerErrorCategory.REAL_TIME -> null
-        AnswerErrorCategory.SUBMIT_TIME -> {
-          interactionType.computeSubmitTimeError(
-            answerText.toString(), allowedVariables, resourceHandler
-          )
-        }
+
+    pendingAnswerError = when (category) {
+      // There's no support for real-time errors.
+      AnswerErrorCategory.REAL_TIME -> null
+      AnswerErrorCategory.SUBMIT_TIME -> {
+        interactionType.computeSubmitTimeError(
+          answerText.toString(), allowedVariables, resourceHandler, interactionType
+        )
       }
-      errorMessage.set(pendingAnswerError)
     }
+    errorMessage.set(pendingAnswerError)
+
     return pendingAnswerError
   }
 
@@ -290,7 +295,7 @@ class MathExpressionInteractionsViewModel private constructor(
   }
 
   private companion object {
-    private enum class InteractionType(
+    enum class InteractionType(
       val viewType: ViewType,
       @StringRes val defaultHintTextStringId: Int,
       val hasPlaceholder: Boolean,
@@ -418,8 +423,29 @@ class MathExpressionInteractionsViewModel private constructor(
       fun computeSubmitTimeError(
         answerText: String,
         allowedVariables: List<String>,
-        appLanguageResourceHandler: AppLanguageResourceHandler
+        appLanguageResourceHandler: AppLanguageResourceHandler,
+        interactionType: InteractionType
       ): String? {
+
+        if (answerText.isBlank()) {
+          return when (interactionType) {
+            NUMERIC_EXPRESSION -> {
+              appLanguageResourceHandler.getStringInLocale(
+                interactionType.defaultHintTextStringId
+              )
+            }
+            ALGEBRAIC_EXPRESSION -> {
+              appLanguageResourceHandler.getStringInLocale(
+                interactionType.defaultHintTextStringId
+              )
+            }
+            MATH_EQUATION -> {
+              appLanguageResourceHandler.getStringInLocale(
+                interactionType.defaultHintTextStringId
+              )
+            }
+          }
+        }
         return when (val parseResult = parseAnswer(answerText, allowedVariables)) {
           is MathParsingResult.Failure -> when (val error = parseResult.error) {
             is DisabledVariablesInUseError -> {

diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
@@ -474,8 +474,9 @@ class ExplorationProgressController @Inject constructor(
                 break
               }
             }
-            is ControllerMessage.SubmitAnswer ->
+            is ControllerMessage.SubmitAnswer -> {
               controllerState.submitAnswerImpl(message.callbackFlow, message.userAnswer)
+            }
             is ControllerMessage.HintIsRevealed -> {
               controllerState.submitHintIsRevealedImpl(message.callbackFlow, message.hintIndex)
             }