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

Fix #156 & #157: Continue/End Exploration player buttons- low-fi #185

Closed
wants to merge 27 commits into from

Conversation

rt4914
Copy link
Contributor

@rt4914 rt4914 commented Sep 25, 2019

Explanation

This fixes #156 and #157 and introduces following buttons which will be used in state:

  1. Continue
  2. Return to Topic
  3. Learn Again
  4. Submit (inactive)
  5. Submit (active)
  6. Previous Arrow Button
  7. Next Arrow Button

Reference Design Doc: https://docs.google.com/document/d/1iD4sY_hWmWRu4eC8jGoolKQ5hsqpIV5sG1NA4YB2HL4/edit?usp=sharing

This PR was earlier on #178

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.

@rt4914 rt4914 changed the base branch from develop to exploration_proto September 25, 2019 12:43
@rt4914 rt4914 changed the base branch from exploration_proto to develop September 25, 2019 12:43
@rt4914 rt4914 changed the base branch from develop to introduce-exploration-progress-controller September 25, 2019 12:44
@rt4914 rt4914 changed the base branch from introduce-exploration-progress-controller to develop September 25, 2019 12:44
@rt4914
Copy link
Contributor Author

rt4914 commented Sep 26, 2019

@BenHenning PTAL

BenHenning and others added 2 commits September 25, 2019 23:41
tests to verify correctness.

Also, added a method to facilitate notifying of DataProvider changes on
the UI thread.
…-controller' into exploration-player-continue-end-button-2
@rt4914 rt4914 changed the base branch from develop to introduce-exploration-progress-controller September 26, 2019 06:54
@rt4914 rt4914 changed the base branch from introduce-exploration-progress-controller to develop September 26, 2019 06:55
Rajat Talesra and others added 7 commits September 26, 2019 17:30
…-controller' into exploration-player-continue-end-button-2
… 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.
Rajat Talesra and others added 11 commits September 30, 2019 15:25
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).
@rt4914
Copy link
Contributor Author

rt4914 commented Oct 10, 2019

This PR has been reproduced on #222

@rt4914 rt4914 closed this Oct 10, 2019
@rt4914 rt4914 deleted the exploration-player-continue-end-button-2 branch October 10, 2019 11:44
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.

UI Structure: ContinueInteractionView [Blocked: #150]
4 participants