Fix #821: Question player toolbar shadow #888
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
empty test suite.
… training controller
…ler-interface Conflicts: domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt model/src/main/proto/question.proto
This includes some basic refactoring of internal structures used by the exploration progress controller to share common functionality between the two progress controllers. There's still some duplication, but this seems like a reasonable split since there's likely to be further differences in the progress controllers in the future. The question assessment progress controller tests pass, but no new ones have yet been added to thoroughly test the implementation.
ExplorationProgressController. They haven't yet been verified as correct.
…terface Conflicts: domain/src/main/assets/sample_questions.json domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt domain/src/main/java/org/oppia/domain/util/JsonAssetRetriever.kt domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt
…duce-nested-data-provider
…-progress-controller-implementation Conflicts: domain/src/main/java/org/oppia/domain/exploration/ExplorationProgressController.kt
…mp-base-branch-for-question-player
…into temp-base-branch-for-question-player Conflicts: domain/src/main/java/org/oppia/domain/exploration/ExplorationProgressController.kt
…estion-player-ui-structure Conflicts: app/src/main/java/org/oppia/app/player/exploration/ExplorationActivityPresenter.kt app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt app/src/main/java/org/oppia/app/player/state/hintsandsolution/HintsAndSolutionAdapter.kt utility/src/main/java/org/oppia/util/parser/UrlImageParser.kt
…duce-nested-data-provider
…-progress-controller-implementation
…into introduce-question-player-ui-structure
behavior graph (and added an actual visual representation of this graph in code to simplify maintaining the solution in the future). Tests will be added as part of solving #1273.
Conflicts: app/src/main/java/org/oppia/app/application/ApplicationComponent.kt app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
BenHenning
changed the base branch from
introduce-question-player-ui-structure
to
develop
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.
Explanation
Question player toolbar shadow duplicate of #822.
Only branch name changed.
Mock
https://xd.adobe.com/view/e8aa4198-3940-47f9-514a-f41cc54457f6-9e9b/screen/8fbb663a-39aa-4be1-83bd-73bde6f85dcc/PM-Q1-Fraction-Input-No-Answer-
Checklist