Merge branch 'develop' into oppia#3843

app/src/main/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerActivityPresenter.kt

@@ -6,6 +6,7 @@ import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.databinding.LicenseTextViewerActivityBinding
+import org.oppia.android.util.accessibility.AccessibilityService
 import javax.inject.Inject
 
 /** The presenter for [LicenseTextViewerActivity]. */
@@ -14,6 +15,7 @@ class LicenseTextViewerActivityPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val resourceHandler: AppLanguageResourceHandler
 ) {
+  @Inject lateinit var accessibilityService: AccessibilityService
 
   /** Handles onCreate() method of the [LicenseTextViewerActivity]. */
   fun handleOnCreate(dependencyIndex: Int, licenseIndex: Int) {
@@ -44,8 +46,10 @@ class LicenseTextViewerActivityPresenter @Inject constructor(
       (activity as LicenseTextViewerActivity).finish()
     }
 
-    binding.licenseTextViewerActivityToolbarTitle.setOnClickListener {
-      binding.licenseTextViewerActivityToolbarTitle.isSelected = true
+    if (!accessibilityService.isScreenReaderEnabled()) {
+      binding.licenseTextViewerActivityToolbarTitle.setOnClickListener {
+        binding.licenseTextViewerActivityToolbarTitle.isSelected = true
+      }
     }
 
     if (getLicenseTextViewerFragment() == null) {

app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt

@@ -38,6 +38,7 @@ import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.survey.SurveyGatingController
 import org.oppia.android.domain.translation.TranslationController
+import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
@@ -61,6 +62,9 @@ class ExplorationActivityPresenter @Inject constructor(
   private val resourceHandler: AppLanguageResourceHandler,
   private val surveyGatingController: SurveyGatingController
 ) {
+  @Inject
+  lateinit var accessibilityService: AccessibilityService
+
   private lateinit var explorationToolbar: Toolbar
   private lateinit var explorationToolbarTitle: TextView
   private lateinit var profileId: ProfileId
@@ -89,7 +93,7 @@ class ExplorationActivityPresenter @Inject constructor(
     parentScreen: ExplorationActivityParams.ParentScreen,
     isCheckpointingEnabled: Boolean
   ) {
-    binding = DataBindingUtil.setContentView<ExplorationActivityBinding>(
+    binding = DataBindingUtil.setContentView(
       activity,
       R.layout.exploration_activity
     )
@@ -102,8 +106,10 @@ class ExplorationActivityPresenter @Inject constructor(
     explorationToolbarTitle = binding.explorationToolbarTitle
     activity.setSupportActionBar(explorationToolbar)
 
-    binding.explorationToolbarTitle.setOnClickListener {
-      binding.explorationToolbarTitle.isSelected = true
+    if (!accessibilityService.isScreenReaderEnabled()) {
+      binding.explorationToolbarTitle.setOnClickListener {
+        binding.explorationToolbarTitle.isSelected = true
+      }
     }
 
     binding.explorationToolbar.setNavigationOnClickListener {
@@ -181,7 +187,11 @@ class ExplorationActivityPresenter @Inject constructor(
       activity.supportFragmentManager.beginTransaction().add(
         R.id.exploration_fragment_placeholder,
         ExplorationFragment.newInstance(
-          profileId, topicId, storyId, explorationId, readingTextSize
+          profileId,
+          topicId,
+          storyId,
+          explorationId,
+          readingTextSize
         ),
         TAG_EXPLORATION_FRAGMENT
       ).commitNow()
@@ -211,7 +221,8 @@ class ExplorationActivityPresenter @Inject constructor(
       }
       R.id.action_help -> {
         val intent = HelpActivity.createHelpActivityIntent(
-          activity, profileId.internalId,
+          activity,
+          profileId.internalId,
           /* isFromNavigationDrawer= */false
         )
         fontScaleConfigurationUtil.adjustFontScale(activity, ReadingTextSize.MEDIUM_TEXT_SIZE)
@@ -266,7 +277,8 @@ class ExplorationActivityPresenter @Inject constructor(
     // without deleting any checkpoints.
     if (::oldestCheckpointExplorationId.isInitialized) {
       explorationDataController.deleteExplorationProgressById(
-        profileId, oldestCheckpointExplorationId
+        profileId,
+        oldestCheckpointExplorationId
       )
     }
     stopExploration(isCompletion = false)
@@ -340,7 +352,8 @@ class ExplorationActivityPresenter @Inject constructor(
     explorationLiveData.observe(activity) {
       explorationToolbarTitle.text =
         translationController.extractString(
-          it.exploration.translatableTitle, it.writtenTranslationContext
+          it.exploration.translatableTitle,
+          it.writtenTranslationContext
         )
     }
   }
@@ -363,7 +376,9 @@ class ExplorationActivityPresenter @Inject constructor(
     return when (ephemeralExpResult) {
       is AsyncResult.Failure -> {
         oppiaLogger.e(
-          "ExplorationActivity", "Failed to retrieve answer outcome", ephemeralExpResult.error
+          "ExplorationActivity",
+          "Failed to retrieve answer outcome",
+          ephemeralExpResult.error
         )
         EphemeralExploration.getDefaultInstance()
       }
@@ -472,7 +487,9 @@ class ExplorationActivityPresenter @Inject constructor(
         }
         is AsyncResult.Failure -> {
           oppiaLogger.e(
-            "ExplorationActivity", "Failed to retrieve oldest saved checkpoint details.", it.error
+            "ExplorationActivity",
+            "Failed to retrieve oldest saved checkpoint details.",
+            it.error
           )
         }
         is AsyncResult.Pending -> {} // Wait for an actual result.
@@ -512,41 +529,40 @@ class ExplorationActivityPresenter @Inject constructor(
   private fun maybeShowSurveyDialog(profileId: ProfileId, topicId: String) {
     surveyGatingController.maybeShowSurvey(profileId, topicId).toLiveData()
       .observe(
-        activity,
-        { gatingResult ->
-          when (gatingResult) {
-            is AsyncResult.Pending -> {
-              oppiaLogger.d("ExplorationActivity", "A gating decision is pending")
-            }
-            is AsyncResult.Failure -> {
-              oppiaLogger.e(
-                "ExplorationActivity",
-                "Failed to retrieve gating decision",
-                gatingResult.error
-              )
+        activity
+      ) { gatingResult ->
+        when (gatingResult) {
+          is AsyncResult.Pending -> {
+            oppiaLogger.d("ExplorationActivity", "A gating decision is pending")
+          }
+          is AsyncResult.Failure -> {
+            oppiaLogger.e(
+              "ExplorationActivity",
+              "Failed to retrieve gating decision",
+              gatingResult.error
+            )
+            backPressActivitySelector()
+          }
+          is AsyncResult.Success -> {
+            if (gatingResult.value) {
+              val dialogFragment =
+                SurveyWelcomeDialogFragment.newInstance(
+                  profileId,
+                  topicId,
+                  explorationId,
+                  SURVEY_QUESTIONS
+                )
+              val transaction = activity.supportFragmentManager.beginTransaction()
+              transaction
+                .add(dialogFragment, TAG_SURVEY_WELCOME_DIALOG)
+                .addToBackStack(null)
+                .commit()
+            } else {
               backPressActivitySelector()
             }
-            is AsyncResult.Success -> {
-              if (gatingResult.value) {
-                val dialogFragment =
-                  SurveyWelcomeDialogFragment.newInstance(
-                    profileId,
-                    topicId,
-                    explorationId,
-                    SURVEY_QUESTIONS
-                  )
-                val transaction = activity.supportFragmentManager.beginTransaction()
-                transaction
-                  .add(dialogFragment, TAG_SURVEY_WELCOME_DIALOG)
-                  .addToBackStack(null)
-                  .commit()
-              } else {
-                backPressActivitySelector()
-              }
-            }
           }
         }
-      )
+      }
   }
 
   companion object {

app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt

@@ -65,16 +65,17 @@ class StoryFragmentPresenter @Inject constructor(
   private lateinit var linearSmoothScroller: RecyclerView.SmoothScroller
   private lateinit var profileId: ProfileId
 
-  @Inject lateinit var storyViewModel: StoryViewModel
   @Inject lateinit var accessibilityService: AccessibilityService
 
+  @Inject lateinit var storyViewModel: StoryViewModel
+
   fun handleCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
     internalProfileId: Int,
     topicId: String,
     storyId: String
-  ): View? {
+  ): View {
     binding = StoryFragmentBinding.inflate(
       inflater,
       container,
@@ -89,9 +90,10 @@ class StoryFragmentPresenter @Inject constructor(
     binding.storyToolbar.setNavigationOnClickListener {
       (activity as StoryActivity).finish()
     }
-
-    binding.storyToolbarTitle.setOnClickListener {
-      binding.storyToolbarTitle.isSelected = true
+    if (!accessibilityService.isScreenReaderEnabled()) {
+      binding.storyToolbarTitle.setOnClickListener {
+        binding.storyToolbarTitle.isSelected = true
+      }
     }
 
     linearLayoutManager = LinearLayoutManager(activity.applicationContext)
@@ -274,11 +276,17 @@ class StoryFragmentPresenter @Inject constructor(
     // one.
     val startPlayingProvider = if (canHavePartialProgressSaved) {
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId,
+        topicId,
+        storyId,
+        explorationId
       )
     } else {
       explorationDataController.replayExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId,
+        topicId,
+        storyId,
+        explorationId
       )
     }
     startPlayingProvider.toLiveData().observe(fragment) { result ->

app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt

@@ -20,6 +20,7 @@ import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.databinding.TopicFragmentBinding
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
+import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
@@ -35,6 +36,9 @@ class TopicFragmentPresenter @Inject constructor(
   @EnableExtraTopicTabsUi private val enableExtraTopicTabsUi: PlatformParameterValue<Boolean>,
   private val resourceHandler: AppLanguageResourceHandler
 ) {
+  @Inject
+  lateinit var accessibilityService: AccessibilityService
+
   private lateinit var tabLayout: TabLayout
   private var internalProfileId: Int = -1
   private lateinit var topicId: String
@@ -48,7 +52,7 @@ class TopicFragmentPresenter @Inject constructor(
     topicId: String,
     storyId: String,
     isConfigChanged: Boolean
-  ): View? {
+  ): View {
     val binding = TopicFragmentBinding.inflate(
       inflater,
       container,
@@ -64,11 +68,11 @@ class TopicFragmentPresenter @Inject constructor(
     binding.topicToolbar.setNavigationOnClickListener {
       (activity as TopicActivity).finish()
     }
-
-    binding.topicToolbar.setOnClickListener {
-      binding.topicToolbarTitle.isSelected = true
+    if (!accessibilityService.isScreenReaderEnabled()) {
+      binding.topicToolbarTitle.setOnClickListener {
+        binding.topicToolbarTitle.isSelected = true
+      }
     }
-
     viewModel.setInternalProfileId(internalProfileId)
     viewModel.setTopicId(topicId)
     binding.viewModel = viewModel
@@ -152,7 +156,8 @@ class TopicFragmentPresenter @Inject constructor(
       TopicTab.REVISION -> oppiaLogger.createOpenRevisionTabContext(topicId)
     }
     analyticsController.logImportantEvent(
-      eventContext, ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
+      eventContext,
+      ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
     )
   }
 }

app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt

@@ -5,7 +5,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
 import androidx.lifecycle.Transformations
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
@@ -19,6 +18,7 @@ import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.topic.TopicController
 import org.oppia.android.domain.translation.TranslationController
+import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
@@ -32,6 +32,7 @@ class RevisionCardActivityPresenter @Inject constructor(
   private val topicController: TopicController,
   private val translationController: TranslationController
 ) {
+  @Inject lateinit var accessibilityService: AccessibilityService
 
   private lateinit var revisionCardToolbar: Toolbar
   private lateinit var revisionCardToolbarTitle: TextView
@@ -66,9 +67,12 @@ class RevisionCardActivityPresenter @Inject constructor(
     binding.revisionCardToolbar.setNavigationOnClickListener {
       (activity as ReturnToTopicClickListener).onReturnToTopicRequested()
     }
-    binding.revisionCardToolbarTitle.setOnClickListener {
-      binding.revisionCardToolbarTitle.isSelected = true
+    if (!accessibilityService.isScreenReaderEnabled()) {
+      binding.revisionCardToolbarTitle.setOnClickListener {
+        binding.revisionCardToolbarTitle.isSelected = true
+      }
     }
+
     subscribeToSubtopicTitle()
 
     binding.actionBottomSheetOptionsMenu.setOnClickListener {
@@ -89,14 +93,18 @@ class RevisionCardActivityPresenter @Inject constructor(
     return when (itemId) {
       R.id.action_options -> {
         val intent = OptionsActivity.createOptionsActivity(
-          activity, profileId.internalId, isFromNavigationDrawer = false
+          activity,
+          profileId.internalId,
+          isFromNavigationDrawer = false
         )
         activity.startActivity(intent)
         true
       }
       R.id.action_help -> {
         val intent = HelpActivity.createHelpActivityIntent(
-          activity, profileId.internalId, isFromNavigationDrawer = false
+          activity,
+          profileId.internalId,
+          isFromNavigationDrawer = false
         )
         activity.startActivity(intent)
         true
@@ -117,11 +125,10 @@ class RevisionCardActivityPresenter @Inject constructor(
 
   private fun subscribeToSubtopicTitle() {
     subtopicLiveData.observe(
-      activity,
-      Observer<String> {
-        revisionCardToolbarTitle.text = it
-      }
-    )
+      activity
+    ) {
+      revisionCardToolbarTitle.text = it
+    }
   }
 
   private val subtopicLiveData: LiveData<String> by lazy {
@@ -143,7 +150,9 @@ class RevisionCardActivityPresenter @Inject constructor(
       when (revisionCardResult) {
         is AsyncResult.Failure -> {
           oppiaLogger.e(
-            "RevisionCardActivity", "Failed to retrieve Revision Card", revisionCardResult.error
+            "RevisionCardActivity",
+            "Failed to retrieve Revision Card",
+            revisionCardResult.error
           )
           EphemeralRevisionCard.getDefaultInstance()
         }