Temp integration branch for state [DO NOT MERGE] #267
Closed
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
tests to verify correctness. Also, added a method to facilitate notifying of DataProvider changes on the UI thread.
…dered initialization.
… it up to the data controller, and start adding tests.
Conflicts: domain/build.gradle domain/src/main/java/org/oppia/domain/exploration/ExplorationDataController.kt Also, migrate the data controller to the retriever.
AnswerClassificationController, and attempted to make ExplorationProgressController thread-safe. The thread-safety led to significant interface changes in the progress controller, and led to discovering some issues with the mediator live data approach to interop coroutines and LiveData. This locking mechanism will need to change since the optimal solution requires resolving #90.
with the current MediatorLiveData implementation (see #90 for more context). Fix existing progress controller tests and add a few more. All current progress controller tests are passing.
…ation support for the second test exploration (about_oppia).
…-controller' into introduce-load-exploration-part-1
…yer-content-interaction
…d NumericInput from dummy data welcome.json ,welcome.json file "init_state_name"modified to "Numeric input",
…d NumericInput from dummy data welcome.json
… numbertextinputlayout onbutton click. on button click listner implemented
… lowfi-number-with-units-input-interaction-view
…ranch-for-state Conflicts: app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
…mp-integration-branch-for-state
…develop Conflicts: app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
Conflicts: app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
…-card-from-develop Conflicts: app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
…-for-state Conflicts: app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
branch (with patch rejections).
…nteraction-from-develop
Conflicts:
app/src/main/java/org/oppia/app/player/state/StateAdapter.kt
…nteraction-from-develop Conflicts: app/src/main/java/org/oppia/app/player/state/StateAdapter.kt app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
…mp-integration-branch-for-state
|
Hi @BenHenning. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks! |
|
Downstream state infrastructure work was completed, so this branch is no longer needed. |
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.
This is a clean snapshot of all remaining state work that needs to be submitted: #205, #263, #245 via (#265), and #258 via (#266).
This will be the base branch for remaining state fragment infrastructure work until the above PRs are submitted and develop contains these changes.