Fix #379: Collapse past wrong answers #412
Merged
Conversation
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 splits the adapter into two: one for single-type recycler views, and another for multi-type recycler views. The latter has also been updated to require an enum for typing rather than an integer to ensure type safety. Per existing usages, we may want to switch this to a KClass in the future since it seems like we typically convert from class type to enum, anyway.
version of the interaction with a normalized version of the answer.
UserAnswer and submitted answer item replaces this mechanism.
BenHenning
changed the base branch from
develop
to
shorten-submitted-answers
BenHenning
changed the title
rt4914
approved these changes
Nov 19, 2019
app/src/main/java/org/oppia/app/viewmodel/ObservableArrayList.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/app/viewmodel/ObservableArrayList.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt
Outdated
Show resolved
Hide resolved
Conflicts: app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
…-answers Conflicts: app/src/main/res/layout/fraction_interaction_item.xml app/src/main/res/layout/numeric_input_interaction_item.xml app/src/main/res/layout/text_input_interaction_item.xml
Conflicts: app/src/main/java/org/oppia/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/FractionInteractionViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/NumericInputViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/StateItemViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/TextInputViewModel.kt
…wers Conflicts: app/src/main/java/org/oppia/app/player/state/itemviewmodel/StateItemViewModel.kt
This was referenced Nov 20, 2019
jamesxu0
approved these changes
Nov 21, 2019
Conflicts: app/src/main/java/org/oppia/app/testing/InputInteractionViewTestActivity.kt app/src/main/res/layout/item_selection_interaction_items.xml app/src/main/res/layout/multiple_choice_interaction_items.xml
Conflicts: app/src/main/java/org/oppia/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/FractionInteractionViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/InteractionViewModelModule.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/NumericInputViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt app/src/main/java/org/oppia/app/player/state/itemviewmodel/TextInputViewModel.kt app/src/main/java/org/oppia/app/testing/InputInteractionViewTestActivity.kt
BenHenning
changed the base branch from
shorten-submitted-answers
to
develop
|
Thanks! |
BenHenning
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #379.
This change collapses past submitted answers to an expandable bar similar to Oppia web, and tracks the number of wrong answers currently submitted, minus the most recent one (which may be correct). I tried mimicking the exact behavior around when the list re-expands/collapses based on navigating to/from states, and submitting new answers. It's probably worth checking out the branch and playing with it.
There is no mock for this, but I followed @mschanteltc's guidance via chat on text type, size, and color. Otherwise, I tried mimicking the Oppia web version with some small tweaks to make it a bit more Android-esque.
There are no new tests for this, but those should be done as part of #388.