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.

Sign up for GitHub

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 #1737: Singleton for exploration to handle input for configuration changes #2514

Closed
wants to merge 17 commits into from
Closed

Fix #1737: Singleton for exploration to handle input for configuration changes #2514

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5cf09d0
issue 2098
FareesHussain Nov 11, 2020
d3696f2
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
FareesHussain Dec 3, 2020
f3483f8
test commit
FareesHussain Dec 31, 2020
e970871
Merge branch 'develop' of https://github.com/FareesHussain/oppia-andr…
FareesHussain Dec 31, 2020
2110cdf
Update gradle.xml
FareesHussain Dec 31, 2020
e09a602
Update misc.xml
FareesHussain Dec 31, 2020
38fb39f
Fix gradle.xml
FareesHussain Jan 1, 2021
4c4d22e
Merge branch 'develop' of https://github.com/FareesHussain/oppia-andr…
FareesHussain Jan 1, 2021
1abdd4c
Merge branch 'develop' of https://github.com/FareesHussain/oppia-andr…
FareesHussain Jan 1, 2021
ce05cf7
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
FareesHussain Jan 16, 2021
28dee8e
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
FareesHussain Jan 18, 2021
b2ce885
Initial implementation
FareesHussain Jan 18, 2021
bcfc580
Updated singleton title
FareesHussain Jan 18, 2021
5c60875
Added support for FractionInteractionViewModel.kt
FareesHussain Feb 6, 2021
3205455
Using notifyChange()
FareesHussain Feb 10, 2021
baec3c8
Merge branch 'develop' into singleton-for-exploration
BenHenning Feb 24, 2021
a3e3da3
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
FareesHussain May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/src/main/java/org/oppia/android/app/player/state/StateFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,14 @@ class StateFragment :
fun revealSolution() = stateFragmentPresenter.revealSolution()

fun dismissConceptCard() = stateFragmentPresenter.dismissConceptCard()

override fun onResume() {
super.onResume()
stateFragmentPresenter.handleOnResume()
}

override fun onDestroyView() {
super.onDestroyView()
stateFragmentPresenter.handleDestroyView()
}
}
16 changes: 16 additions & 0 deletions app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.oppia.android.app.player.state

import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
Expand Down Expand Up @@ -32,6 +33,7 @@ import org.oppia.android.app.utility.SplitScreenManager
import org.oppia.android.app.viewmodel.ViewModelProvider
import org.oppia.android.databinding.StateFragmentBinding
import org.oppia.android.domain.exploration.ExplorationProgressController
import org.oppia.android.domain.state.RetriveUserAnswer
import org.oppia.android.domain.topic.StoryProgressController
import org.oppia.android.util.data.AsyncResult
import org.oppia.android.util.data.DataProviders.Companion.toLiveData
Expand Down Expand Up @@ -154,6 +156,7 @@ class StateFragmentPresenter @Inject constructor(
viewModel.setHintBulbVisibility(false)
hideKeyboard()
moveToNextState()
RetriveUserAnswer.clearUserAnswer()
}

fun onNextButtonClicked() = moveToNextState()
Expand Down Expand Up @@ -521,4 +524,17 @@ class StateFragmentPresenter @Inject constructor(
Date().time
)
}

fun handleOnResume() {
RetriveUserAnswer.getUserAnswer()?.let {
Log.d("testSingleton", "userAnswer -> ${it.answer}")
Log.d("testSingleton", "userAnswer -> $it")
}
}

fun handleDestroyView() {
RetriveUserAnswer.setUserAnswer(
viewModel.getPendingAnswer(recyclerViewAssembler::getPendingAnswerHandler)
)
}
}
25 changes: 25 additions & 0 deletions domain/src/main/java/org/oppia/android/domain/state/RetriveUserAnswer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package org.oppia.android.domain.state

import org.oppia.android.app.model.UserAnswer

object RetriveUserAnswer {
Copy link
Member

Choose a reason for hiding this comment

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

This should be a Dagger singleton (see other @Singleton marked classes in the codebase).

// text and error message for fraction [FractionInteractionView.kt]
// list of check boxes as a string and back to check box [SelectionInteractionView.kt]
// text and error msg for [NumericInputInteractionView.kt]
// text and error message for [RatioInputInteractionView.kt]
// text for [TextInputInteractionView.kt]
// list for drag & drop [DragDropSortInteractionView.kt]
// list for drag & drop with merging [DragDropSortInteractionView.kt]
// selected img in the [ImageRegionSelectionInteractionView.kt]

private var userAnswer: UserAnswer? = null

fun setUserAnswer(solution: UserAnswer) {
this.userAnswer = solution
}
fun getUserAnswer(): UserAnswer? = userAnswer

fun clearUserAnswer() {
userAnswer = null
}
}