From 625c656f21b27413ad5571bf0bd9cb1fdda95f23 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Mon, 26 Aug 2024 20:31:43 +0530 Subject: [PATCH 01/17] Migrate from onBackPressed in ResumeLessonActivity --- .../app/resumelesson/ResumeLessonActivity.kt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt index fc63898ac40..3450d5f2a6f 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt @@ -3,6 +3,11 @@ package org.oppia.android.app.resumelesson import android.content.Context import android.content.Intent import android.os.Bundle +import android.window.OnBackInvokedDispatcher +import androidx.activity.OnBackPressedCallback +import androidx.activity.OnBackPressedDispatcher +import androidx.core.content.ContextCompat.startActivity +import androidx.core.os.BuildCompat import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity import org.oppia.android.app.home.RouteToExplorationListener @@ -41,6 +46,11 @@ class ResumeLessonActivity : params.parentScreen, params.checkpoint ) + onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true){ + override fun handleOnBackPressed() { + resumeLessonActivityPresenter.setReadingTextSizeNormal() + } + }) } // TODO(#1655): Re-restrict access to fields in tests post-Gradle. @@ -114,8 +124,4 @@ class ResumeLessonActivity : resumeLessonActivityPresenter.loadResumeLessonFragment(readingTextSize) } - override fun onBackPressed() { - resumeLessonActivityPresenter.setReadingTextSizeNormal() - finish() - } -} + From 207bf0f18c001f7d402cf8bfd673b7dacf28f74a Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Mon, 26 Aug 2024 21:41:03 +0530 Subject: [PATCH 02/17] Fix code Formatting --- .../app/resumelesson/ResumeLessonActivity.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt index 3450d5f2a6f..a86ae5b11ce 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt @@ -46,11 +46,12 @@ class ResumeLessonActivity : params.parentScreen, params.checkpoint ) - onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true){ - override fun handleOnBackPressed() { - resumeLessonActivityPresenter.setReadingTextSizeNormal() - } - }) + onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + resumeLessonActivityPresenter.setReadingTextSizeNormal() + finish() + } + }) } // TODO(#1655): Re-restrict access to fields in tests post-Gradle. @@ -123,5 +124,4 @@ class ResumeLessonActivity : override fun onDefaultFontSizeLoaded(readingTextSize: ReadingTextSize) { resumeLessonActivityPresenter.loadResumeLessonFragment(readingTextSize) } - - +} From a372d56f9a27f5015849e3310f410db9ddd04e02 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Tue, 27 Aug 2024 09:48:05 +0530 Subject: [PATCH 03/17] Fix back button error --- .../org/oppia/android/app/resumelesson/ResumeLessonActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt index a86ae5b11ce..dfaad1c5682 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt @@ -46,7 +46,7 @@ class ResumeLessonActivity : params.parentScreen, params.checkpoint ) - onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(/* enabled = */ true) { + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { override fun handleOnBackPressed() { resumeLessonActivityPresenter.setReadingTextSizeNormal() finish() From 94b2909cb5870f93a9fe88f8359964452fbd4e3a Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Tue, 27 Aug 2024 10:25:03 +0530 Subject: [PATCH 04/17] Migrate from onBackPressed in AppVersionActivity --- .../appversion/AppVersionActivity.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt index e41600bb929..44d70450b46 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.MenuItem +import androidx.activity.OnBackPressedCallback import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity import org.oppia.android.app.model.ScreenName.APP_VERSION_ACTIVITY @@ -19,12 +20,17 @@ class AppVersionActivity : InjectableAutoLocalizedAppCompatActivity() { super.onCreate(savedInstanceState) (activityComponent as ActivityComponentImpl).inject(this) appVersionActivityPresenter.handleOnCreate() + + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } + }) } override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - onBackPressed() + onBackPressedDispatcher.onBackPressed() } return super.onOptionsItemSelected(item) } From 2c8e7d847938714d5d46f5688ebfd280adb77f25 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Tue, 27 Aug 2024 11:03:43 +0530 Subject: [PATCH 05/17] Migrate from onBackPressed in AdministratorControlsActivity --- .../AdministratorControlsActivity.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt index 2cda2286d02..76f29d40b99 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt @@ -3,6 +3,7 @@ package org.oppia.android.app.administratorcontrols import android.content.Context import android.content.Intent import android.os.Bundle +import androidx.activity.OnBackPressedCallback import org.oppia.android.R import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity @@ -83,6 +84,12 @@ class AdministratorControlsActivity : isProfileDeletionDialogVisible ) title = resourceHandler.getStringInLocale(R.string.administrator_controls) + + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + this@AdministratorControlsActivity.handleTheOnBackPressed() + } + }) } override fun routeToAppVersion() { @@ -121,7 +128,7 @@ class AdministratorControlsActivity : } } - override fun onBackPressed() { + private fun handleTheOnBackPressed() { val fragment = supportFragmentManager.findFragmentById( R.id.administrator_controls_fragment_multipane_placeholder @@ -134,8 +141,7 @@ class AdministratorControlsActivity : if (fragment is ProfileEditFragment) { administratorControlsActivityPresenter.handleOnBackPressed() } else { - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - super.onBackPressed() + finish() } } From a78dce3f7997c902fffa0e803b1e95109bb0693c Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Tue, 27 Aug 2024 12:38:42 +0530 Subject: [PATCH 06/17] Migrate from onBackPressed in ProfileAndDeviceIdActivity --- .../learneranalytics/ProfileAndDeviceIdActivity.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt index cf6fb025db6..9bd5f1c07b1 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.MenuItem +import androidx.activity.OnBackPressedCallback import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity import org.oppia.android.app.model.ScreenName.PROFILE_AND_DEVICE_ID_ACTIVITY @@ -24,12 +25,17 @@ class ProfileAndDeviceIdActivity : InjectableAutoLocalizedAppCompatActivity() { super.onCreate(savedInstanceState) (activityComponent as ActivityComponentImpl).inject(this) profileAndDeviceIdActivityPresenter.handleOnCreate() + + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } + }) } override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - onBackPressed() + onBackPressedDispatcher.onBackPressed() } return super.onOptionsItemSelected(item) } From ff133fe6dbf9505e4d09c8e187755e583b35428f Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Wed, 28 Aug 2024 09:04:25 +0530 Subject: [PATCH 07/17] Migrate from onBackPressed in MarkChaptersCompletedActivity --- .../MarkChaptersCompletedActivity.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt index ec8979dad41..c1375a714f5 100644 --- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt +++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.MenuItem +import androidx.activity.OnBackPressedCallback import org.oppia.android.R import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity @@ -37,12 +38,17 @@ class MarkChaptersCompletedActivity : InjectableAutoLocalizedAppCompatActivity() val showConfirmationNotice = args?.showConfirmationNotice ?: false markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId, showConfirmationNotice) title = resourceHandler.getStringInLocale(R.string.mark_chapters_completed_activity_title) + + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } + }) } override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - onBackPressed() + onBackPressedDispatcher.onBackPressed() } return super.onOptionsItemSelected(item) } From 15e869855dfc6396dfdadd842a5d8991e98c4024 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Wed, 28 Aug 2024 09:05:16 +0530 Subject: [PATCH 08/17] Migrate from onBackPressed in MarkStoriesCompletedActivity --- .../MarkStoriesCompletedActivity.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt index e3373fc7df6..363b9e32dd4 100644 --- a/app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt +++ b/app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.MenuItem +import androidx.activity.OnBackPressedCallback import org.oppia.android.R import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity @@ -34,12 +35,17 @@ class MarkStoriesCompletedActivity : InjectableAutoLocalizedAppCompatActivity() internalProfileId = profileId?.internalId ?: -1 markStoriesCompletedActivityPresenter.handleOnCreate(internalProfileId) title = resourceHandler.getStringInLocale(R.string.mark_stories_completed_activity_title) + + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } + }) } override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - onBackPressed() + onBackPressedDispatcher.onBackPressed() } return super.onOptionsItemSelected(item) } From 3ccd36384593978fc52e5d875324bfbb077f1bb9 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Wed, 28 Aug 2024 09:05:54 +0530 Subject: [PATCH 09/17] Migrate from onBackPressed in MarkTopicsCompletedActivity --- .../marktopicscompleted/MarkTopicsCompletedActivity.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt index a891de3a059..1712ca38227 100644 --- a/app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt +++ b/app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.MenuItem +import androidx.activity.OnBackPressedCallback import org.oppia.android.R import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity @@ -34,12 +35,17 @@ class MarkTopicsCompletedActivity : InjectableAutoLocalizedAppCompatActivity() { internalProfileId = profileId?.internalId ?: -1 markTopicsCompletedActivityPresenter.handleOnCreate(internalProfileId) title = resourceHandler.getStringInLocale(R.string.mark_topics_completed_activity_title) + + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } + }) } override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - onBackPressed() + onBackPressedDispatcher.onBackPressed() } return super.onOptionsItemSelected(item) } From 0df380134f5a40e4f15624a5cfcd380ff39aee8b Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Wed, 28 Aug 2024 21:17:30 +0530 Subject: [PATCH 10/17] Migrate from onBackPressed in ResumeLessonActivityPresenter --- .../android/app/resumelesson/ResumeLessonActivityPresenter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt index 210d49c887c..45dee2203d0 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt @@ -1,5 +1,6 @@ package org.oppia.android.app.resumelesson +import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment @@ -73,8 +74,7 @@ class ResumeLessonActivityPresenter @Inject constructor( context = activity, ReadingTextSize.MEDIUM_TEXT_SIZE ) - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - activity.onBackPressed() + activity.onBackPressedDispatcher.onBackPressed() } } From 99e474f400a6696c4870e295a686d3f15ed647d9 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Wed, 28 Aug 2024 21:18:20 +0530 Subject: [PATCH 11/17] Migrate from onBackPressed in ReadingTextSizeActivityPresenter --- .../app/options/ReadingTextSizeActivity.kt | 25 +++++++++++-------- .../ReadingTextSizeActivityPresenter.kt | 4 +-- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt index e88525841b5..c4268767be1 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt @@ -3,6 +3,7 @@ package org.oppia.android.app.options 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.ReadingTextSize @@ -34,6 +35,19 @@ class ReadingTextSizeActivity : InjectableAutoLocalizedAppCompatActivity() { savedInstanceState?.retrieveStateBundle()?.selectedReadingTextSize ?: retrieveActivityParams().readingTextSize readingTextSizeActivityPresenter.handleOnCreate(readingTextSize) + + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + val resultBundle = ReadingTextSizeActivityResultBundle.newBuilder().apply { + selectedReadingTextSize = readingTextSizeActivityPresenter.getSelectedReadingTextSize() + }.build() + val intent = Intent().apply { + putProtoExtra(MESSAGE_READING_TEXT_SIZE_RESULTS_KEY, resultBundle) + } + setResult(RESULT_OK, intent) + finish() + } + }) } companion object { @@ -60,17 +74,6 @@ class ReadingTextSizeActivity : InjectableAutoLocalizedAppCompatActivity() { outState.putProto(ACTIVITY_SAVED_STATE_KEY, stateBundle) } - override fun onBackPressed() { - val resultBundle = ReadingTextSizeActivityResultBundle.newBuilder().apply { - selectedReadingTextSize = readingTextSizeActivityPresenter.getSelectedReadingTextSize() - }.build() - val intent = Intent().apply { - putProtoExtra(MESSAGE_READING_TEXT_SIZE_RESULTS_KEY, resultBundle) - } - setResult(RESULT_OK, intent) - finish() - } - private fun retrieveActivityParams() = intent.getProtoExtra(ACTIVITY_PARAMS_KEY, ReadingTextSizeActivityParams.getDefaultInstance()) diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt index 85eedd9d379..1cafc3e2f1a 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt @@ -1,5 +1,6 @@ package org.oppia.android.app.options +import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import org.oppia.android.R @@ -28,8 +29,7 @@ class ReadingTextSizeActivityPresenter @Inject constructor( private fun setToolbar() { val readingTextSizeToolbar: Toolbar = activity.findViewById(R.id.reading_text_size_toolbar) readingTextSizeToolbar.setNavigationOnClickListener { - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - activity.onBackPressed() + activity.onBackPressedDispatcher.onBackPressed() } } From 8867ca45ff01f63aa3a12f1980aee0debab500c4 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Wed, 28 Aug 2024 21:19:05 +0530 Subject: [PATCH 12/17] Migrate from onBackPressed in ExplorationActivityPresenter --- .../app/player/exploration/ExplorationActivity.kt | 11 +++++++---- .../exploration/ExplorationActivityPresenter.kt | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt index b95785bf2d0..99688e1b125 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt @@ -3,6 +3,7 @@ package org.oppia.android.app.player.exploration 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.HintsAndSolutionDialogFragment @@ -67,6 +68,12 @@ class ExplorationActivity : params.parentScreen, params.isCheckpointingEnabled ) + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + explorationActivityPresenter.backButtonPressed() + finish() + } + }) } // TODO(#1655): Re-restrict access to fields in tests post-Gradle. @@ -114,10 +121,6 @@ class ExplorationActivity : getProtoExtra(PARAMS_KEY, ExplorationActivityParams.getDefaultInstance()) } - override fun onBackPressed() { - explorationActivityPresenter.backButtonPressed() - } - override fun deleteCurrentProgressAndStopSession(isCompletion: Boolean) { explorationActivityPresenter.deleteCurrentProgressAndStopExploration(isCompletion) } diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt index 9d1c50ec2ea..d88f02b6614 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt @@ -4,6 +4,7 @@ import android.content.Context import android.view.View import android.view.inputmethod.EditorInfo import android.widget.TextView +import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.core.view.doOnPreDraw @@ -113,8 +114,7 @@ class ExplorationActivityPresenter @Inject constructor( } binding.explorationToolbar.setNavigationOnClickListener { - @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher. - activity.onBackPressed() + activity.onBackPressedDispatcher.onBackPressed() } binding.actionAudioPlayer.setOnClickListener { From 6123a6d3907e1e2210db0389d0c4abad36d3236c Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Wed, 28 Aug 2024 21:45:44 +0530 Subject: [PATCH 13/17] Fix ExplorationActivity Callback --- .../oppia/android/app/player/exploration/ExplorationActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt index 99688e1b125..82c7e625d6b 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt @@ -71,7 +71,6 @@ class ExplorationActivity : onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { override fun handleOnBackPressed() { explorationActivityPresenter.backButtonPressed() - finish() } }) } From 2ae2eec26e14a5d7496cb20606f513b0515257fb Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Fri, 30 Aug 2024 19:35:34 +0530 Subject: [PATCH 14/17] Refactor function name --- .../administratorcontrols/AdministratorControlsActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt index 76f29d40b99..505e355afe5 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt @@ -87,7 +87,7 @@ class AdministratorControlsActivity : onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { override fun handleOnBackPressed() { - this@AdministratorControlsActivity.handleTheOnBackPressed() + this@AdministratorControlsActivity.handleBackPress() } }) } @@ -128,7 +128,7 @@ class AdministratorControlsActivity : } } - private fun handleTheOnBackPressed() { + private fun handleBackPress() { val fragment = supportFragmentManager.findFragmentById( R.id.administrator_controls_fragment_multipane_placeholder From c7536ccbeb1f75268b8ba48632b0403cbbf7e5d7 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Tue, 3 Sep 2024 21:45:57 +0530 Subject: [PATCH 15/17] Fix Lint checks --- .../AdministratorControlsActivity.kt | 11 +++++++---- .../appversion/AppVersionActivity.kt | 11 +++++++---- .../learneranalytics/ProfileAndDeviceIdActivity.kt | 14 +++++++++----- .../MarkChaptersCompletedActivity.kt | 11 +++++++---- .../MarkStoriesCompletedActivity.kt | 11 +++++++---- .../MarkTopicsCompletedActivity.kt | 11 +++++++---- 6 files changed, 44 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt index 505e355afe5..64beda78f53 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt @@ -85,11 +85,14 @@ class AdministratorControlsActivity : ) title = resourceHandler.getStringInLocale(R.string.administrator_controls) - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - this@AdministratorControlsActivity.handleBackPress() + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + this@AdministratorControlsActivity.handleBackPress() + } } - }) + ) } override fun routeToAppVersion() { diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt index 44d70450b46..f78d770df1d 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt @@ -21,11 +21,14 @@ class AppVersionActivity : InjectableAutoLocalizedAppCompatActivity() { (activityComponent as ActivityComponentImpl).inject(this) appVersionActivityPresenter.handleOnCreate() - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - finish() + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } } - }) + ) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt index 9bd5f1c07b1..45a27fac5b8 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt @@ -19,18 +19,22 @@ import javax.inject.Inject * a particular user or group. */ class ProfileAndDeviceIdActivity : InjectableAutoLocalizedAppCompatActivity() { - @Inject lateinit var profileAndDeviceIdActivityPresenter: ProfileAndDeviceIdActivityPresenter + @Inject + lateinit var profileAndDeviceIdActivityPresenter: ProfileAndDeviceIdActivityPresenter override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) (activityComponent as ActivityComponentImpl).inject(this) profileAndDeviceIdActivityPresenter.handleOnCreate() - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - finish() + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } } - }) + ) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt index c1375a714f5..cc1a7897150 100644 --- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt +++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt @@ -39,11 +39,14 @@ class MarkChaptersCompletedActivity : InjectableAutoLocalizedAppCompatActivity() markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId, showConfirmationNotice) title = resourceHandler.getStringInLocale(R.string.mark_chapters_completed_activity_title) - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - finish() + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } } - }) + ) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt index 363b9e32dd4..86bb96b2f8d 100644 --- a/app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt +++ b/app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt @@ -36,11 +36,14 @@ class MarkStoriesCompletedActivity : InjectableAutoLocalizedAppCompatActivity() markStoriesCompletedActivityPresenter.handleOnCreate(internalProfileId) title = resourceHandler.getStringInLocale(R.string.mark_stories_completed_activity_title) - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - finish() + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } } - }) + ) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt index 1712ca38227..606c4f70bd0 100644 --- a/app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt +++ b/app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt @@ -36,11 +36,14 @@ class MarkTopicsCompletedActivity : InjectableAutoLocalizedAppCompatActivity() { markTopicsCompletedActivityPresenter.handleOnCreate(internalProfileId) title = resourceHandler.getStringInLocale(R.string.mark_topics_completed_activity_title) - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - finish() + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + finish() + } } - }) + ) } override fun onOptionsItemSelected(item: MenuItem): Boolean { From 65668325712eb07c95bbe7cbc258f7eec9ec37e8 Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Tue, 3 Sep 2024 22:11:04 +0530 Subject: [PATCH 16/17] Fix Lint checks --- .../app/options/ReadingTextSizeActivity.kt | 23 +++++++++++-------- .../ReadingTextSizeActivityPresenter.kt | 1 - .../player/exploration/ExplorationActivity.kt | 14 +++++++---- .../ExplorationActivityPresenter.kt | 13 ++++++++++- .../app/resumelesson/ResumeLessonActivity.kt | 17 +++++++------- .../ResumeLessonActivityPresenter.kt | 3 ++- 6 files changed, 44 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt index c4268767be1..054a4d8e54b 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt @@ -36,18 +36,21 @@ class ReadingTextSizeActivity : InjectableAutoLocalizedAppCompatActivity() { ?: retrieveActivityParams().readingTextSize readingTextSizeActivityPresenter.handleOnCreate(readingTextSize) - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - val resultBundle = ReadingTextSizeActivityResultBundle.newBuilder().apply { - selectedReadingTextSize = readingTextSizeActivityPresenter.getSelectedReadingTextSize() - }.build() - val intent = Intent().apply { - putProtoExtra(MESSAGE_READING_TEXT_SIZE_RESULTS_KEY, resultBundle) + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + val resultBundle = ReadingTextSizeActivityResultBundle.newBuilder().apply { + selectedReadingTextSize = readingTextSizeActivityPresenter.getSelectedReadingTextSize() + }.build() + val intent = Intent().apply { + putProtoExtra(MESSAGE_READING_TEXT_SIZE_RESULTS_KEY, resultBundle) + } + setResult(RESULT_OK, intent) + finish() } - setResult(RESULT_OK, intent) - finish() } - }) + ) } companion object { diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt index 1cafc3e2f1a..491ad80fb11 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt @@ -1,6 +1,5 @@ package org.oppia.android.app.options -import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import org.oppia.android.R diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt index 82c7e625d6b..a3d1da29105 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt @@ -49,7 +49,8 @@ class ExplorationActivity : BottomSheetOptionsMenuItemClickListener, RequestVoiceOverIconSpotlightListener { - @Inject lateinit var explorationActivityPresenter: ExplorationActivityPresenter + @Inject + lateinit var explorationActivityPresenter: ExplorationActivityPresenter private lateinit var state: State private lateinit var writtenTranslationContext: WrittenTranslationContext @@ -68,11 +69,14 @@ class ExplorationActivity : params.parentScreen, params.isCheckpointingEnabled ) - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - explorationActivityPresenter.backButtonPressed() + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + explorationActivityPresenter.backButtonPressed() + } } - }) + ) } // TODO(#1655): Re-restrict access to fields in tests post-Gradle. diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt index d88f02b6614..4975bd21b5a 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt @@ -4,7 +4,6 @@ import android.content.Context import android.view.View import android.view.inputmethod.EditorInfo import android.widget.TextView -import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.core.view.doOnPreDraw @@ -222,6 +221,7 @@ class ExplorationActivityPresenter @Inject constructor( context.startActivity(intent) true } + R.id.action_help -> { val intent = HelpActivity.createHelpActivityIntent( activity, @@ -232,6 +232,7 @@ class ExplorationActivityPresenter @Inject constructor( context.startActivity(intent) true } + else -> false } } @@ -293,11 +294,13 @@ class ExplorationActivityPresenter @Inject constructor( when (it) { is AsyncResult.Pending -> oppiaLogger.d("ExplorationActivity", "Stopping exploration") + is AsyncResult.Failure -> { oppiaLogger.e("ExplorationActivity", "Failed to stop exploration", it.error) // Allow the user to always exit if they get into a broken state. backPressActivitySelector() } + is AsyncResult.Success -> { oppiaLogger.d("ExplorationActivity", "Successfully stopped exploration") maybeShowSurveyDialog(profileId, topicId) @@ -377,6 +380,7 @@ class ExplorationActivityPresenter @Inject constructor( ) EphemeralExploration.getDefaultInstance() } + is AsyncResult.Pending -> EphemeralExploration.getDefaultInstance() is AsyncResult.Success -> ephemeralExpResult.value } @@ -386,6 +390,7 @@ class ExplorationActivityPresenter @Inject constructor( when (parentScreen) { ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB, ExplorationActivityParams.ParentScreen.STORY_SCREEN -> activity.finish() + ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED, ExplorationActivityParams.ParentScreen.UNRECOGNIZED -> { // Default to the topic activity. @@ -502,6 +507,7 @@ class ExplorationActivityPresenter @Inject constructor( oldestCheckpointExplorationTitle = it.value.explorationTitle } } + is AsyncResult.Failure -> { oppiaLogger.e( "ExplorationActivity", @@ -509,6 +515,7 @@ class ExplorationActivityPresenter @Inject constructor( it.error ) } + is AsyncResult.Pending -> {} // Wait for an actual result. } } @@ -536,10 +543,12 @@ class ExplorationActivityPresenter @Inject constructor( learnerAnalyticsLogger.explorationAnalyticsLogger.value?.logLessonSavedAdvertently() stopExploration(isCompletion = false) } + CheckpointState.CHECKPOINT_SAVED_DATABASE_EXCEEDED_LIMIT -> { learnerAnalyticsLogger.explorationAnalyticsLogger.value?.logLessonSavedAdvertently() showProgressDatabaseFullDialogFragment() } + else -> showUnsavedExplorationDialogFragment() } } @@ -555,6 +564,7 @@ class ExplorationActivityPresenter @Inject constructor( null, is AsyncResult.Pending -> { oppiaLogger.d("ExplorationActivity", "A gating decision is pending") } + is AsyncResult.Failure -> { oppiaLogger.e( "ExplorationActivity", @@ -563,6 +573,7 @@ class ExplorationActivityPresenter @Inject constructor( ) backPressActivitySelector() } + is AsyncResult.Success -> { if (gatingResult.value) { val dialogFragment = diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt index dfaad1c5682..4e268b486c2 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt @@ -3,11 +3,7 @@ package org.oppia.android.app.resumelesson import android.content.Context import android.content.Intent import android.os.Bundle -import android.window.OnBackInvokedDispatcher import androidx.activity.OnBackPressedCallback -import androidx.activity.OnBackPressedDispatcher -import androidx.core.content.ContextCompat.startActivity -import androidx.core.os.BuildCompat import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity import org.oppia.android.app.home.RouteToExplorationListener @@ -46,12 +42,15 @@ class ResumeLessonActivity : params.parentScreen, params.checkpoint ) - onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(/* enabled = */ true) { - override fun handleOnBackPressed() { - resumeLessonActivityPresenter.setReadingTextSizeNormal() - finish() + onBackPressedDispatcher.addCallback( + this, + object : OnBackPressedCallback(/* enabled = */ true) { + override fun handleOnBackPressed() { + resumeLessonActivityPresenter.setReadingTextSizeNormal() + finish() + } } - }) + ) } // TODO(#1655): Re-restrict access to fields in tests post-Gradle. diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt index 45dee2203d0..ab63038024b 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt @@ -1,6 +1,5 @@ package org.oppia.android.app.resumelesson -import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment @@ -120,6 +119,7 @@ class ResumeLessonActivityPresenter @Inject constructor( ) Profile.getDefaultInstance() } + is AsyncResult.Pending -> { oppiaLogger.d( "ResumeLessonActivity", @@ -127,6 +127,7 @@ class ResumeLessonActivityPresenter @Inject constructor( ) Profile.getDefaultInstance() } + is AsyncResult.Success -> profileResult.value }.readingTextSize } From d6b60f97f627279fa168a4b33dbb0895fe2a677d Mon Sep 17 00:00:00 2001 From: Sneha Datta Date: Thu, 5 Sep 2024 12:32:25 +0530 Subject: [PATCH 17/17] Remove empty lines --- .../exploration/ExplorationActivityPresenter.kt | 12 ------------ .../resumelesson/ResumeLessonActivityPresenter.kt | 2 -- 2 files changed, 14 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt index 4975bd21b5a..530b208e897 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt @@ -221,7 +221,6 @@ class ExplorationActivityPresenter @Inject constructor( context.startActivity(intent) true } - R.id.action_help -> { val intent = HelpActivity.createHelpActivityIntent( activity, @@ -232,7 +231,6 @@ class ExplorationActivityPresenter @Inject constructor( context.startActivity(intent) true } - else -> false } } @@ -294,13 +292,11 @@ class ExplorationActivityPresenter @Inject constructor( when (it) { is AsyncResult.Pending -> oppiaLogger.d("ExplorationActivity", "Stopping exploration") - is AsyncResult.Failure -> { oppiaLogger.e("ExplorationActivity", "Failed to stop exploration", it.error) // Allow the user to always exit if they get into a broken state. backPressActivitySelector() } - is AsyncResult.Success -> { oppiaLogger.d("ExplorationActivity", "Successfully stopped exploration") maybeShowSurveyDialog(profileId, topicId) @@ -380,7 +376,6 @@ class ExplorationActivityPresenter @Inject constructor( ) EphemeralExploration.getDefaultInstance() } - is AsyncResult.Pending -> EphemeralExploration.getDefaultInstance() is AsyncResult.Success -> ephemeralExpResult.value } @@ -390,7 +385,6 @@ class ExplorationActivityPresenter @Inject constructor( when (parentScreen) { ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB, ExplorationActivityParams.ParentScreen.STORY_SCREEN -> activity.finish() - ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED, ExplorationActivityParams.ParentScreen.UNRECOGNIZED -> { // Default to the topic activity. @@ -507,7 +501,6 @@ class ExplorationActivityPresenter @Inject constructor( oldestCheckpointExplorationTitle = it.value.explorationTitle } } - is AsyncResult.Failure -> { oppiaLogger.e( "ExplorationActivity", @@ -515,7 +508,6 @@ class ExplorationActivityPresenter @Inject constructor( it.error ) } - is AsyncResult.Pending -> {} // Wait for an actual result. } } @@ -543,12 +535,10 @@ class ExplorationActivityPresenter @Inject constructor( learnerAnalyticsLogger.explorationAnalyticsLogger.value?.logLessonSavedAdvertently() stopExploration(isCompletion = false) } - CheckpointState.CHECKPOINT_SAVED_DATABASE_EXCEEDED_LIMIT -> { learnerAnalyticsLogger.explorationAnalyticsLogger.value?.logLessonSavedAdvertently() showProgressDatabaseFullDialogFragment() } - else -> showUnsavedExplorationDialogFragment() } } @@ -564,7 +554,6 @@ class ExplorationActivityPresenter @Inject constructor( null, is AsyncResult.Pending -> { oppiaLogger.d("ExplorationActivity", "A gating decision is pending") } - is AsyncResult.Failure -> { oppiaLogger.e( "ExplorationActivity", @@ -573,7 +562,6 @@ class ExplorationActivityPresenter @Inject constructor( ) backPressActivitySelector() } - is AsyncResult.Success -> { if (gatingResult.value) { val dialogFragment = diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt index ab63038024b..b09e77fdfce 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt @@ -119,7 +119,6 @@ class ResumeLessonActivityPresenter @Inject constructor( ) Profile.getDefaultInstance() } - is AsyncResult.Pending -> { oppiaLogger.d( "ResumeLessonActivity", @@ -127,7 +126,6 @@ class ResumeLessonActivityPresenter @Inject constructor( ) Profile.getDefaultInstance() } - is AsyncResult.Success -> profileResult.value }.readingTextSize }