Fix Lint checks

oppia · Sep 3, 2024 · 6566832 · 6566832
1 parent c7536cc
commit 6566832
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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,13 +507,15 @@ class ExplorationActivityPresenter @Inject constructor(
             oldestCheckpointExplorationTitle = it.value.explorationTitle
           }
         }
+
         is AsyncResult.Failure -> {
           oppiaLogger.e(
             "ExplorationActivity",
             "Failed to retrieve oldest saved checkpoint details.",
             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
@@ -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
@@ -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,13 +119,15 @@ class ResumeLessonActivityPresenter @Inject constructor(
         )
         Profile.getDefaultInstance()
       }
+
       is AsyncResult.Pending -> {
         oppiaLogger.d(
           "ResumeLessonActivity",
           "Result is pending"
         )
         Profile.getDefaultInstance()
       }
+
       is AsyncResult.Success -> profileResult.value
     }.readingTextSize
   }