5395 fixed concept card not closing

oppia · Jun 25, 2024 · 7ea73d1 · 7ea73d1
1 parent 9a2e627
commit 7ea73d1
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt
@@ -26,6 +26,7 @@ class ConceptCardFragment : InjectableDialogFragment() {
   companion object {
 
     const val CONCEPT_CARD_FRAGMENT_ARGUMENTS_KEY = "ConceptCardFragment.arguments"
+    private var conceptCardFragment: ConceptCardFragment? = null
 
     /** The fragment tag corresponding to the concept card dialog fragment. */
     private const val CONCEPT_CARD_DIALOG_FRAGMENT_TAG = "CONCEPT_CARD_FRAGMENT"
@@ -82,11 +83,15 @@ class ConceptCardFragment : InjectableDialogFragment() {
     fun dismissAll(fragmentManager: FragmentManager) {
       val toDismiss = fragmentManager.fragments.filterIsInstance<ConceptCardFragment>()
       if (toDismiss.isNotEmpty()) {
-        val transaction = fragmentManager.beginTransaction()
-        for (fragment in toDismiss) {
-          transaction.remove(fragment)
+        fragmentManager.beginTransaction().apply {
+          for (fragment in toDismiss) {
+            remove(fragment)
+          }
+          commitNow()
         }
-        transaction.commitNow()
+      } else {
+        conceptCardFragment?.dismiss()
+        conceptCardFragment = null
       }
     }
 
@@ -97,6 +102,7 @@ class ConceptCardFragment : InjectableDialogFragment() {
     ): ConceptCardFragment {
       val conceptCardFragment = newInstance(skillId, profileId)
       conceptCardFragment.showNow(fragmentManager, CONCEPT_CARD_DIALOG_FRAGMENT_TAG)
+      this.conceptCardFragment = conceptCardFragment
       return conceptCardFragment
     }
   }