Fix #387, #1771: Show concept cards

app/build.gradle

@@ -105,8 +105,8 @@ dependencies {
       'androidx.test.espresso:espresso-core:3.2.0',
       'androidx.test.espresso:espresso-intents:3.1.0',
       'androidx.test.ext:junit:1.1.1',
-      'com.google.truth:truth:0.43',
       'com.github.bumptech.glide:mocks:4.11.0',
+      'com.google.truth:truth:0.43',
       'org.robolectric:annotations:4.3',
       'org.robolectric:robolectric:4.3',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
@@ -121,6 +121,7 @@ dependencies {
       'androidx.test.espresso:espresso-core:3.2.0',
       'androidx.test.espresso:espresso-intents:3.1.0',
       'androidx.test.ext:junit:1.1.1',
+      'com.github.bumptech.glide:mocks:4.11.0',
       'com.google.truth:truth:0.43',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
       'org.mockito:mockito-android:2.7.22',

app/src/main/java/org/oppia/app/application/ApplicationComponent.kt

@@ -5,6 +5,7 @@ import android.app.Application
 import dagger.BindsInstance
 import dagger.Component
 import org.oppia.app.activity.ActivityComponent
+import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule
 import org.oppia.app.shim.IntentFactoryShimModule
 import org.oppia.app.shim.ViewBindingShimModule
 import org.oppia.domain.classify.InteractionsModule
@@ -57,7 +58,8 @@ import javax.inject.Singleton
     LogStorageModule::class, IntentFactoryShimModule::class,
     ViewBindingShimModule::class, PrimeTopicAssetsControllerModule::class,
     ExpirationMetaDataRetrieverModule::class, RatioInputModule::class,
-    UncaughtExceptionLoggerModule::class, ApplicationStartupListenerModule::class
+    UncaughtExceptionLoggerModule::class, ApplicationStartupListenerModule::class,
+    HintsAndSolutionConfigModule::class
   ]
 )
 

app/src/main/java/org/oppia/app/player/exploration/ExplorationActivity.kt

@@ -18,6 +18,7 @@ import org.oppia.app.player.state.listener.RouteToHintsAndSolutionListener
 import org.oppia.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.app.player.stopplaying.StopExplorationDialogFragment
 import org.oppia.app.player.stopplaying.StopStatePlayingSessionListener
+import org.oppia.app.topic.conceptcard.ConceptCardListener
 import javax.inject.Inject
 
 private const val TAG_STOP_EXPLORATION_DIALOG = "STOP_EXPLORATION_DIALOG"
@@ -34,7 +35,8 @@ class ExplorationActivity :
   RevealHintListener,
   RevealSolutionInterface,
   DefaultFontSizeStateListener,
-  HintsAndSolutionExplorationManagerListener {
+  HintsAndSolutionExplorationManagerListener,
+  ConceptCardListener {
 
   @Inject
   lateinit var explorationActivityPresenter: ExplorationActivityPresenter
@@ -181,4 +183,6 @@ class ExplorationActivity :
   override fun onExplorationStateLoaded(state: State) {
     this.state = state
   }
+
+  override fun dismissConceptCard() = explorationActivityPresenter.dismissConceptCard()
 }

app/src/main/java/org/oppia/app/player/exploration/ExplorationActivityPresenter.kt

@@ -224,6 +224,10 @@ class ExplorationActivityPresenter @Inject constructor(
     }
   }
 
+  fun dismissConceptCard() {
+    getExplorationFragment()?.dismissConceptCard()
+  }
+
   private fun updateToolbarTitle(explorationId: String) {
     subscribeToExploration(explorationDataController.getExplorationById(explorationId))
   }

app/src/main/java/org/oppia/app/player/exploration/ExplorationFragment.kt

@@ -107,4 +107,6 @@ class ExplorationFragment : InjectableFragment() {
   fun revealSolution(saveUserChoice: Boolean) {
     explorationFragmentPresenter.revealSolution(saveUserChoice)
   }
+
+  fun dismissConceptCard() = explorationFragmentPresenter.dismissConceptCard()
 }

app/src/main/java/org/oppia/app/player/exploration/ExplorationFragmentPresenter.kt

@@ -62,6 +62,8 @@ class ExplorationFragmentPresenter @Inject constructor(
     getStateFragment()?.revealSolution(saveUserChoice)
   }
 
+  fun dismissConceptCard() = getStateFragment()?.dismissConceptCard()
+
   private fun getStateFragment(): StateFragment? {
     return fragment
       .childFragmentManager

app/src/main/java/org/oppia/app/player/state/StateFragment.kt

@@ -129,4 +129,6 @@ class StateFragment :
   fun revealSolution(saveUserChoice: Boolean) {
     stateFragmentPresenter.revealSolution(saveUserChoice)
   }
+
+  fun dismissConceptCard() = stateFragmentPresenter.dismissConceptCard()
 }

app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt

@@ -235,7 +235,9 @@ class StateFragmentPresenter @Inject constructor(
       .addAudioVoiceoverSupport(
         explorationId, viewModel.currentStateName, viewModel.isAudioBarVisible,
         this::getAudioUiManager
-      ).build()
+      )
+      .addConceptCardSupport()
+      .build()
   }
 
   fun revealHint(saveUserChoice: Boolean, hintIndex: Int) {
@@ -461,6 +463,14 @@ class StateFragmentPresenter @Inject constructor(
     subscribeToAnswerOutcome(explorationProgressController.submitAnswer(answer))
   }
 
+  fun dismissConceptCard() {
+    fragment.childFragmentManager.findFragmentByTag(
+      CONCEPT_CARD_DIALOG_FRAGMENT_TAG
+    )?.let { dialogFragment ->
+      fragment.childFragmentManager.beginTransaction().remove(dialogFragment).commitNow()
+    }
+  }
+
   private fun moveToNextState() {
     viewModel.setCanSubmitAnswer(canSubmitAnswer = false)
     explorationProgressController.moveToNextState().observe(
@@ -487,8 +497,6 @@ class StateFragmentPresenter @Inject constructor(
     binding.stateRecyclerView.smoothScrollToPosition(0)
   }
 
-  private fun isAudioShowing(): Boolean = viewModel.isAudioBarVisible.get()!!
-
   /** Updates submit button UI as active if pendingAnswerError null else inactive. */
   fun updateSubmitButton(pendingAnswerError: String?, inputAnswerAvailable: Boolean) {
     if (inputAnswerAvailable) {