Migrate from QuestionPlayerActivityPresenter

oppia · Sep 5, 2024 · 789dd1c · 789dd1c
1 parent 763f1a7
commit 789dd1c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
@@ -3,6 +3,7 @@ package org.oppia.android.app.topic.questionplayer
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
 import org.oppia.android.app.hintsandsolution.HintsAndSolutionListener
@@ -56,11 +57,17 @@ class QuestionPlayerActivity :
     val profileId =
       intent.extractCurrentUserProfileId()
     questionPlayerActivityPresenter.handleOnCreate(profileId)
-  }
 
-  override fun onBackPressed() {
-    showStopExplorationDialogFragment()
-    questionPlayerActivityPresenter.setReadingTextSizeNormal()
+    onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(/* enabled = */ true) {
+        override fun handleOnBackPressed() {
+          showStopExplorationDialogFragment()
+          questionPlayerActivityPresenter.setReadingTextSizeNormal()
+          finish()
+        }
+      }
+    )
   }
 
   override fun restartSession() = questionPlayerActivityPresenter.restartSession()

diff --git a/...c/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/...c/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
@@ -61,8 +61,7 @@ class QuestionPlayerActivityPresenter @Inject constructor(
     activity.setSupportActionBar(binding.questionPlayerToolbar)
 
     binding.questionPlayerToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      activity.onBackPressed()
+      activity.onBackPressedDispatcher.onBackPressed()
     }
 
     retrieveReadingTextSize().observe(