-
Notifications
You must be signed in to change notification settings - Fork 527
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix part of #5070: Display empty answer message in Math expressions i…
…nput interaction. (#5317) <!-- READ ME FIRST: Please fill in the explanation section below and check off every point from the Essential Checklist! --> ## Explanation Fix part of #5070, In Math expressions Interaction UI, leave submit button enabled when answer is empty. Show an error on submitting an empty answer. MathExpressionInteractionsViewTestActivity added to accessibility_label_exemptions and test_file_exemptions files. ### Numeric expression [numerix_expression.webm](https://github.com/oppia/oppia-android/assets/76042077/ce7e3e2a-e209-4197-ac3b-4a4ab281ac53) ### Algebraic expression [algebraic_expression.webm](https://github.com/oppia/oppia-android/assets/76042077/62222fe4-9cef-49cf-a86d-d74a0908d0a0) ### Math equation [math_equation.webm](https://github.com/oppia/oppia-android/assets/76042077/fb097e88-c8b2-4159-bdcf-2b4e64386d78) <!-- - Explain what your PR does. If this PR fixes an existing bug, please include - "Fixes #bugnum:" in the explanation so that GitHub can auto-close the issue - when this PR is merged. --> ## Essential Checklist <!-- Please tick the relevant boxes by putting an "x" in them. --> - [x] The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".) - [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). ## For UI-specific PRs only <!-- Delete these section if this PR does not include UI-related changes. --> If your PR includes UI-related changes, then: - Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes - For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see [RTL guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines)) - Add a video showing the full UX flow with a screen reader enabled (see [accessibility guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide)) - For PRs introducing new UI elements or color changes, both light and dark mode screenshots must be included - Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing
- Loading branch information
1 parent
59a41ab
commit b763b6a
Showing
13 changed files
with
389 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
147 changes: 147 additions & 0 deletions
147
...src/main/java/org/oppia/android/app/testing/MathExpressionInteractionsViewTestActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| package org.oppia.android.app.testing | ||
|
|
||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import android.view.View | ||
| import androidx.databinding.DataBindingUtil | ||
| import org.oppia.android.R | ||
| import org.oppia.android.app.activity.ActivityComponentImpl | ||
| import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity | ||
| import org.oppia.android.app.model.Interaction | ||
| import org.oppia.android.app.model.MathExpressionInteractionsViewTestActivityParams | ||
| import org.oppia.android.app.model.MathExpressionInteractionsViewTestActivityParams.MathInteractionType | ||
| import org.oppia.android.app.model.UserAnswer | ||
| import org.oppia.android.app.model.WrittenTranslationContext | ||
| import org.oppia.android.app.player.state.answerhandling.AnswerErrorCategory | ||
| import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver | ||
| import org.oppia.android.app.player.state.answerhandling.InteractionAnswerReceiver | ||
| import org.oppia.android.app.player.state.itemviewmodel.MathExpressionInteractionsViewModel | ||
| import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel | ||
| import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener | ||
| import org.oppia.android.databinding.ActivityMathExpressionInteractionViewTestBinding | ||
| import org.oppia.android.util.extensions.getProtoExtra | ||
| import org.oppia.android.util.extensions.putProtoExtra | ||
| import javax.inject.Inject | ||
|
|
||
| /** | ||
| * This is a dummy activity to test input interaction views. | ||
| * It contains [MathExpressionInteractionsView]. | ||
| */ | ||
| class MathExpressionInteractionsViewTestActivity : | ||
| InjectableAutoLocalizedAppCompatActivity(), | ||
| StateKeyboardButtonListener, | ||
| InteractionAnswerErrorOrAvailabilityCheckReceiver, | ||
| InteractionAnswerReceiver { | ||
|
|
||
| private lateinit var binding: | ||
| ActivityMathExpressionInteractionViewTestBinding | ||
|
|
||
| /** | ||
| * Injects the [MathExpressionInteractionsViewModel.FactoryImpl] for creating | ||
| * [MathExpressionInteractionsViewModel] instances. | ||
| */ | ||
| @Inject | ||
| lateinit var mathExpViewModelFactoryFactory: | ||
| MathExpressionInteractionsViewModel.FactoryImpl.FactoryFactoryImpl | ||
|
|
||
| /** The [MathExpressionInteractionsViewModel] instance. */ | ||
| lateinit var mathExpressionViewModel: MathExpressionInteractionsViewModel | ||
|
|
||
| /** Gives access to the translation context. */ | ||
| lateinit var writtenTranslationContext: WrittenTranslationContext | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| (activityComponent as ActivityComponentImpl).inject(this) | ||
| binding = DataBindingUtil.setContentView<ActivityMathExpressionInteractionViewTestBinding>( | ||
| this, R.layout.activity_math_expression_interaction_view_test | ||
| ) | ||
| val params = | ||
| intent.getProtoExtra( | ||
| TEST_ACTIVITY_PARAMS_ARGUMENT_KEY, | ||
| MathExpressionInteractionsViewTestActivityParams.getDefaultInstance() | ||
| ) | ||
| writtenTranslationContext = params.writtenTranslationContext | ||
| when (params.mathInteractionType) { | ||
| MathInteractionType.NUMERIC_EXPRESSION -> { | ||
| mathExpressionViewModel = | ||
| mathExpViewModelFactoryFactory | ||
| .createFactoryForNumericExpression() | ||
| .create(interaction = params.interaction) | ||
| } | ||
| MathInteractionType.ALGEBRAIC_EXPRESSION -> { | ||
| mathExpressionViewModel = | ||
| mathExpViewModelFactoryFactory | ||
| .createFactoryForAlgebraicExpression() | ||
| .create(interaction = params.interaction) | ||
| } | ||
| MathInteractionType.MATH_EQUATION -> { | ||
| mathExpressionViewModel = | ||
| mathExpViewModelFactoryFactory | ||
| .createFactoryForMathEquation() | ||
| .create(interaction = params.interaction) | ||
| } | ||
| MathInteractionType.MATH_INTERACTION_TYPE_UNSPECIFIED, | ||
| MathInteractionType.UNRECOGNIZED, null -> { | ||
| // Default to numeric expression arbitrarily (since something needs to be defined). | ||
| mathExpressionViewModel = | ||
| mathExpViewModelFactoryFactory | ||
| .createFactoryForNumericExpression() | ||
| .create(interaction = params.interaction) | ||
| } | ||
| } | ||
|
|
||
| binding.mathExpressionInteractionsViewModel = mathExpressionViewModel | ||
| } | ||
|
|
||
| /** Checks submit-time errors. */ | ||
| fun getPendingAnswerErrorOnSubmitClick(v: View) { | ||
| mathExpressionViewModel.checkPendingAnswerError(AnswerErrorCategory.SUBMIT_TIME) | ||
| } | ||
|
|
||
| override fun onPendingAnswerErrorOrAvailabilityCheck( | ||
| pendingAnswerError: String?, | ||
| inputAnswerAvailable: Boolean | ||
| ) { | ||
| binding.submitButton.isEnabled = pendingAnswerError == null | ||
| } | ||
|
|
||
| override fun onAnswerReadyForSubmission(answer: UserAnswer) { | ||
| } | ||
|
|
||
| override fun onEditorAction(actionCode: Int) { | ||
| } | ||
|
|
||
| private inline fun <reified T : StateItemViewModel> StateItemViewModel | ||
| .InteractionItemFactory.create( | ||
| interaction: Interaction = Interaction.getDefaultInstance() | ||
| ): T { | ||
| return create( | ||
| entityId = "fake_entity_id", | ||
| hasConversationView = false, | ||
| interaction = interaction, | ||
| interactionAnswerReceiver = this@MathExpressionInteractionsViewTestActivity, | ||
| answerErrorReceiver = this@MathExpressionInteractionsViewTestActivity, | ||
| hasPreviousButton = false, | ||
| isSplitView = false, | ||
| writtenTranslationContext, | ||
| timeToStartNoticeAnimationMs = null | ||
| ) as T | ||
| } | ||
|
|
||
| companion object { | ||
| private const val TEST_ACTIVITY_PARAMS_ARGUMENT_KEY = | ||
| "MathExpressionInteractionsViewTestActivity.params" | ||
|
|
||
| /** Function to create intent for MathExpressionInteractionsViewTestActivity. */ | ||
| fun createIntent( | ||
| context: Context, | ||
| extras: MathExpressionInteractionsViewTestActivityParams | ||
| ): Intent { | ||
| return Intent(context, MathExpressionInteractionsViewTestActivity::class.java).also { | ||
| it.putProtoExtra(TEST_ACTIVITY_PARAMS_ARGUMENT_KEY, extras) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.