Merge branch 'develop' into oppia#4419

XichengSpencer · Oct 4, 2024 · 455134c · 455134c
2 parents 4da3aa1 + 20c4cad
commit 455134c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 17 deletions.
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
@@ -3,6 +3,7 @@ package org.oppia.android.app.settings.profile
 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.model.ProfileEditActivityParams
@@ -43,17 +44,25 @@ class ProfileEditActivity : InjectableAutoLocalizedAppCompatActivity() {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
     profileEditActivityPresenter.handleOnCreate()
+
+    onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(/* enabled = */ true) {
+        override fun handleOnBackPressed() {
+          this@ProfileEditActivity.handleBackPress()
+        }
+      }
+    )
   }
 
-  override fun onBackPressed() {
+  private fun handleBackPress() {
     val args = intent.getProtoExtra(
       PROFILE_EDIT_ACTIVITY_PARAMS_KEY,
       ProfileEditActivityParams.getDefaultInstance()
     )
     val isMultipane = args?.isMultipane ?: false
     if (isMultipane) {
-      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-      super.onBackPressed()
+      finish()
     } else {
       val intent = Intent(this, ProfileListActivity::class.java)
       intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)

diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt
@@ -31,8 +31,7 @@ class ProfileEditActivityPresenter @Inject constructor(
 
     toolbar.setNavigationOnClickListener {
       if (isMultipane) {
-        @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-        activity.onBackPressed()
+        activity.onBackPressedDispatcher.onBackPressed()
       } else {
         val intent = Intent(activity, ProfileListActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)

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,16 @@ 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()
+        }
+      }
+    )
   }
 
   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(

diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivity.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivity.kt
@@ -3,6 +3,7 @@ package org.oppia.android.app.walkthrough
 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.model.ProfileId
@@ -22,6 +23,15 @@ class WalkthroughActivity :
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
     walkthroughActivityPresenter.handleOnCreate()
+
+    onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(/* enabled = */ true) {
+        override fun handleOnBackPressed() {
+          walkthroughActivityPresenter.handleSystemBack()
+        }
+      }
+    )
   }
 
   override fun currentPage(walkthroughPage: Int) {
@@ -33,10 +43,6 @@ class WalkthroughActivity :
     walkthroughActivityPresenter.changePage(walkthroughPage)
   }
 
-  override fun onBackPressed() {
-    walkthroughActivityPresenter.handleSystemBack()
-  }
-
   companion object {
 
     fun createWalkthroughActivityIntent(context: Context, internalProfileId: Int): Intent {

diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt
@@ -103,7 +103,6 @@ class WalkthroughFinalFragmentPresenter @Inject constructor(
   }
 
   override fun goBack() {
-    @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
-    activity.onBackPressed()
+    activity.onBackPressedDispatcher.onBackPressed()
   }
 }