Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce load exploration part 1 #213

Merged
merged 21 commits into from
Oct 9, 2019
Merged

Conversation

rt4914
Copy link
Contributor

@rt4914 rt4914 commented Oct 7, 2019

Explanation

This branch does not fix any particular issue but plays an important role for many issues related to ExplorationPlayer.

This PR mainly loads the exploration and opens the ExplorationActivity following which you can find the currentState in StateFragmentPresenter using getCurrentState method.

Also, this PR will be base PR for upcoming work in ExplorationPlayer related low-fi.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is assigned to an appropriate reviewer.

BenHenning and others added 14 commits September 24, 2019 23:47
tests to verify correctness.

Also, added a method to facilitate notifying of DataProvider changes on
the UI thread.
… 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
@rt4914 rt4914 changed the base branch from develop to introduce-exploration-progress-controller October 7, 2019 11:02
@rt4914 rt4914 changed the base branch from introduce-exploration-progress-controller to develop October 7, 2019 11:02
@rt4914
Copy link
Contributor Author

rt4914 commented Oct 7, 2019

@veena14cs @nikitamarysolomanpvt you can use this branch for working with interactions in StateFragment.

@rt4914 rt4914 changed the base branch from develop to introduce-observable-view-model October 7, 2019 12:21
@rt4914 rt4914 changed the title Introduce load exploration part 1 Introduce load exploration part 1 (Merge after #211 is merged) Oct 8, 2019
@BenHenning
Copy link
Member

@rt4914 I'm skipping this review for now. Please re-add me once this is updated to base off of develop (now that #211 is merged in).

@BenHenning BenHenning assigned rt4914 and unassigned BenHenning Oct 9, 2019
@rt4914 rt4914 changed the title Introduce load exploration part 1 (Merge after #211 is merged) Introduce load exploration part 1 Oct 9, 2019
@rt4914 rt4914 changed the base branch from introduce-observable-view-model to develop October 9, 2019 03:14
@rt4914 rt4914 assigned BenHenning and unassigned rt4914 Oct 9, 2019
@rt4914
Copy link
Contributor Author

rt4914 commented Oct 9, 2019

@BenHenning Ready for your review.

Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rt4914!

@BenHenning BenHenning assigned rt4914 and unassigned BenHenning Oct 9, 2019
@rt4914 rt4914 merged commit 3db1aae into develop Oct 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants