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 #153/#154 : MultipleChoice/ItemSelection Interaction #258

Closed
wants to merge 75 commits into from

Conversation

veena14cs
Copy link
Contributor

@veena14cs veena14cs commented Oct 22, 2019

Explanation

This PR is based on content-card #245 , as it contains Html parser implementation and it is used in MultipleChoice/ItemSelection Input interaction.

This PR is duplicate of #225. It contains UI structure for Multiple choice and item selection interactions, and fixes #153 and #154.

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

@veena14cs veena14cs changed the base branch from merge-fix to customization-args-fixes October 22, 2019 10:23
@veena14cs veena14cs changed the base branch from customization-args-fixes to develop October 22, 2019 10:23
@veena14cs veena14cs changed the base branch from develop to sample-exploration-player October 22, 2019 10:33
@veena14cs veena14cs changed the base branch from sample-exploration-player to merge-fix October 22, 2019 10:34
@veena14cs veena14cs changed the base branch from merge-fix to content-card October 22, 2019 12:03
@@ -52,6 +53,7 @@ class HomeFragmentPresenter @Inject constructor(
}

fun playExplorationButton(v: View) {
explorationDataController.stopPlayingExploration()
Copy link
Contributor Author

@veena14cs veena14cs Oct 25, 2019

Choose a reason for hiding this comment

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

stopPlayingExploration() is added to test with different exploration.

@@ -30,7 +31,7 @@ class ExplorationRetriever @Inject constructor(private val context: Context) {
internal suspend fun loadExploration(explorationId: String): Exploration {
return when (explorationId) {
TEST_EXPLORATION_ID_5 -> loadExplorationFromAsset("welcome.json")
TEST_EXPLORATION_ID_6 -> loadExplorationFromAsset("about_oppia.json")
TEST_EXPLORATION_ID_6 -> loadExplorationFromAsset("oppia_exploration.json")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added new exploration for testing ItemSelectionInput Interaction.

@veena14cs
Copy link
Contributor Author

Duplicate of this PR is created #276 .

@veena14cs veena14cs closed this Oct 30, 2019
@veena14cs veena14cs deleted the multiple-single-input-interaction branch October 30, 2019 08:01
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