Fix #3907: [A11Y] Output Congratulations for screenreader

app/src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt

@@ -17,7 +17,7 @@ import org.oppia.android.app.recyclerview.OnItemDragListener
 import org.oppia.android.app.shim.ViewBindingShim
 import org.oppia.android.app.view.ViewComponentFactory
 import org.oppia.android.app.view.ViewComponentImpl
-import org.oppia.android.util.accessibility.AccessibilityChecker
+import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.gcsresource.DefaultResourceBucketName
 import org.oppia.android.util.parser.html.ExplorationHtmlParserEntityType
 import org.oppia.android.util.parser.html.HtmlParser
@@ -40,7 +40,7 @@ class DragDropSortInteractionView @JvmOverloads constructor(
  lateinit var htmlParserFactory: HtmlParser.Factory
 
  @Inject
- lateinit var accessibilityChecker: AccessibilityChecker
+ lateinit var accessibilityService: AccessibilityService
 
  @Inject
  @field:ExplorationHtmlParserEntityType
@@ -64,7 +64,7 @@ class DragDropSortInteractionView @JvmOverloads constructor(
  val viewComponent = viewComponentFactory.createViewComponent(this) as ViewComponentImpl
  viewComponent.inject(this)
 
- isAccessibilityEnabled = accessibilityChecker.isScreenReaderEnabled()
+ isAccessibilityEnabled = accessibilityService.isScreenReaderEnabled()
  }
 
  fun allowMultipleItemsInSamePosition(isAllowed: Boolean) {

app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt

@@ -14,7 +14,7 @@ import org.oppia.android.app.utility.ClickableAreasImage
 import org.oppia.android.app.utility.OnClickableAreaClickedListener
 import org.oppia.android.app.view.ViewComponentFactory
 import org.oppia.android.app.view.ViewComponentImpl
-import org.oppia.android.util.accessibility.AccessibilityChecker
+import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.gcsresource.DefaultResourceBucketName
 import org.oppia.android.util.locale.OppiaLocale
 import org.oppia.android.util.parser.html.ExplorationHtmlParserEntityType
@@ -43,7 +43,7 @@ class ImageRegionSelectionInteractionView @JvmOverloads constructor(
  private lateinit var listener: OnClickableAreaClickedListener
 
  @Inject
- lateinit var accessibilityChecker: AccessibilityChecker
+ lateinit var accessibilityService: AccessibilityService
 
  @Inject
  lateinit var imageLoader: ImageLoader
@@ -141,7 +141,7 @@ class ImageRegionSelectionInteractionView @JvmOverloads constructor(
  val viewComponent = viewComponentFactory.createViewComponent(this) as ViewComponentImpl
  viewComponent.inject(this)
 
- isAccessibilityEnabled = accessibilityChecker.isScreenReaderEnabled()
+ isAccessibilityEnabled = accessibilityService.isScreenReaderEnabled()
  }
 
  fun setOnRegionClicked(onRegionClicked: OnClickableAreaClickedListener) {

app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt

@@ -368,7 +368,7 @@ class StateFragmentPresenter @Inject constructor(
  moveToNextState()
  } else {
  if (result.labelledAsCorrectAnswer) {
- recyclerViewAssembler.showCelebrationOnCorrectAnswer()
+ recyclerViewAssembler.showCelebrationOnCorrectAnswer(result.feedback)
  } else {
  viewModel.setCanSubmitAnswer(canSubmitAnswer = false)
  }

app/src/main/java/org/oppia/android/app/player/state/StatePlayerRecyclerViewAssembler.kt

@@ -18,6 +18,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import kotlinx.coroutines.CoroutineDispatcher
 import nl.dionsegijn.konfetti.KonfettiView
+import org.oppia.android.R
 import org.oppia.android.app.model.AnswerAndResponse
 import org.oppia.android.app.model.EphemeralState
 import org.oppia.android.app.model.EphemeralState.StateTypeCase
@@ -87,6 +88,7 @@ import org.oppia.android.databinding.SubmittedAnswerListItemBinding
 import org.oppia.android.databinding.SubmittedHtmlAnswerItemBinding
 import org.oppia.android.databinding.TextInputInteractionItemBinding
 import org.oppia.android.domain.translation.TranslationController
+import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.parser.html.HtmlParser
 import org.oppia.android.util.threading.BackgroundDispatcher
 import javax.inject.Inject
@@ -119,6 +121,7 @@ private const val CONGRATULATIONS_TEXT_VIEW_VISIBLE_MILLIS: Long = 800
  * - [ReturnToTopicNavigationButtonListener] if the return to topic button is enabled
  */
 class StatePlayerRecyclerViewAssembler private constructor(
+ private val accessibilityService: AccessibilityService,
  val adapter: BindableAdapter<StateItemViewModel>,
  val rhsAdapter: BindableAdapter<StateItemViewModel>,
  private val playerFeatureSet: PlayerFeatureSet,
@@ -457,8 +460,11 @@ class StatePlayerRecyclerViewAssembler private constructor(
  /**
  * Shows a celebratory animation with a congratulations message and confetti when the learner submits
  * a correct answer.
+ *
+ * @param feedback Oppia's feedback to the learner's most recent answer. If the feedback is empty,
+ * talkback confirms correct answers by a separate announcement.
  */
- fun showCelebrationOnCorrectAnswer() {
+ fun showCelebrationOnCorrectAnswer(feedback: SubtitledHtml) {
  check(playerFeatureSet.showCelebrationOnCorrectAnswer) {
  "Cannot show congratulations message for assembler that doesn't support it"
  }
@@ -471,9 +477,15 @@ class StatePlayerRecyclerViewAssembler private constructor(
  val confettiConfig = checkNotNull(congratulationsTextConfettiConfig) {
  "Expected non-null reference to confetti animation configuration"
  }
-
  createBannerConfetti(confettiView, confettiConfig)
  animateCongratulationsTextView(textView)
+
+ if (feedback.html.isBlank()) {
+ accessibilityService.announceForAccessibilityForView(
+ textView,
+ resourceHandler.getStringInLocale(R.string.correct)
+ )
+ }
  }
 
  /** Shows confetti when the learner reaches the end of an exploration session. */
@@ -864,6 +876,7 @@ class StatePlayerRecyclerViewAssembler private constructor(
  * using its injectable [Factory].
  */
  class Builder private constructor(
+ private var accessibilityService: AccessibilityService,
  private val htmlParserFactory: HtmlParser.Factory,
  private val resourceBucketName: String,
  private val entityType: String,
@@ -1317,6 +1330,7 @@ class StatePlayerRecyclerViewAssembler private constructor(
  fun build(): StatePlayerRecyclerViewAssembler {
  val playerFeatureSet = featureSets.reduce(PlayerFeatureSet::union)
  val assembler = StatePlayerRecyclerViewAssembler(
+ accessibilityService,
  /* adapter= */ adapterBuilder.build(),
  /* rhsAdapter= */ adapterBuilder.build(),
  playerFeatureSet,
@@ -1347,6 +1361,7 @@ class StatePlayerRecyclerViewAssembler private constructor(
 
  /** Fragment injectable factory to create new [Builder]s. */
  class Factory @Inject constructor(
+ private val accessibilityService: AccessibilityService,
  private val htmlParserFactory: HtmlParser.Factory,
  private val fragment: Fragment,
  private val context: Context,
@@ -1362,6 +1377,7 @@ class StatePlayerRecyclerViewAssembler private constructor(
  */
  fun create(resourceBucketName: String, entityType: String, profileId: ProfileId): Builder {
  return Builder(
+ accessibilityService,
  htmlParserFactory,
  resourceBucketName,
  entityType,

app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt

@@ -269,7 +269,7 @@ class QuestionPlayerFragmentPresenter @Inject constructor(
  recyclerViewAssembler.isCorrectAnswer.set(result.isCorrectAnswer)
  if (result.isCorrectAnswer) {
  questionViewModel.setHintBulbVisibility(false)
- recyclerViewAssembler.showCelebrationOnCorrectAnswer()
+ recyclerViewAssembler.showCelebrationOnCorrectAnswer(result.feedback)
  } else {
  questionViewModel.setCanSubmitAnswer(canSubmitAnswer = false)
  }

app/src/test/java/org/oppia/android/app/accessibility/FakeAccessibilityServiceTest.kt

@@ -0,0 +1,96 @@
+package org.oppia.android.app.accessibility
+
+import android.app.Application
+import android.view.View
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import dagger.BindsInstance
+import dagger.Component
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.oppia.android.util.accessibility.AccessibilityTestModule
+import org.oppia.android.util.accessibility.FakeAccessibilityService
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.LooperMode
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/** Tests for [FakeAccessibilityService]. */
+@RunWith(AndroidJUnit4::class)
+@LooperMode(LooperMode.Mode.PAUSED)
+@Config(application = FakeAccessibilityServiceTest.TestApplication::class)
+class FakeAccessibilityServiceTest {
+ @Inject
+ lateinit var accessibilityService: FakeAccessibilityService
+
+ @Before
+ fun setUp() {
+ setUpTestApplicationComponent()
+ }
+
+ @Test
+ fun testFakeAccessibilityService_initialState_isScreenReaderEnabled_isFalse() {
+ assertThat(accessibilityService.isScreenReaderEnabled()).isFalse()
+ }
+
+ @Test
+ fun testFakeAccessibilityService_initialState_getLatestAnnouncement_isNull() {
+ assertThat(accessibilityService.getLatestAnnouncement()).isNull()
+ }
+
+ @Test
+ fun testFakeAccessibilityService_setScreenReaderEnabledTrue_isTrue() {
+ accessibilityService.setScreenReaderEnabled(true)
+ assertThat(accessibilityService.isScreenReaderEnabled()).isTrue()
+ }
+
+ @Test
+ fun testFakeAccessibilityService_setScreenReaderEnabledFalse_isFalse() {
+ accessibilityService.setScreenReaderEnabled(false)
+ assertThat(accessibilityService.isScreenReaderEnabled()).isFalse()
+ }
+
+ @Test
+ fun testFakeAccessibilityService_announceForAccessibilityForView_latestAnnouncementIsSet() {
+ accessibilityService.announceForAccessibilityForView(mock(View::class.java), "test")
+ assertThat(accessibilityService.getLatestAnnouncement()).isEqualTo("test")
+ }
+
+ @Test
+ fun testFakeAccessibilityService_resetLatestAnnouncement_latestAnnouncementIsNull() {
+ accessibilityService.resetLatestAnnouncement()
+ assertThat(accessibilityService.getLatestAnnouncement()).isNull()
+ }
+
+ private fun setUpTestApplicationComponent() {
+ ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
+ }
+
+ @Singleton
+ @Component(modules = [AccessibilityTestModule::class])
+ interface TestApplicationComponent {
+ @Component.Builder
+ interface Builder {
+ @BindsInstance
+ fun setApplication(application: Application): Builder
+ fun build(): TestApplicationComponent
+ }
+
+ fun inject(fakeAccessibilityServiceTest: FakeAccessibilityServiceTest)
+ }
+
+ class TestApplication : Application() {
+ private val component: TestApplicationComponent by lazy {
+ DaggerFakeAccessibilityServiceTest_TestApplicationComponent.builder()
+ .setApplication(ApplicationProvider.getApplicationContext())
+ .build()
+ }
+
+ fun inject(fakeAccessibilityServiceTest: FakeAccessibilityServiceTest) {
+ component.inject(fakeAccessibilityServiceTest)
+ }
+ }
+}

app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt

@@ -131,6 +131,7 @@ import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
+import org.oppia.android.util.accessibility.FakeAccessibilityService
 import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.caching.CacheAssetsLocally
 import org.oppia.android.util.caching.LoadImagesFromAssets
@@ -191,6 +192,9 @@ class StateFragmentLocalTest {
  @Inject
  lateinit var editTextInputAction: EditTextInputAction
 
+ @Inject
+ lateinit var accessibilityManager: FakeAccessibilityService
+
  @Inject
  lateinit var translationController: TranslationController
 
@@ -216,7 +220,6 @@ class StateFragmentLocalTest {
  .setAnimationExecutor(executorService)
  .setSourceExecutor(executorService)
  )
-
  profileTestHelper.initializeProfiles()
  ShadowMediaPlayer.addException(audioDataSource1, IOException("Test does not have networking"))
  }
@@ -352,6 +355,58 @@ class StateFragmentLocalTest {
  }
  }
 
+ @Test
+ @Config(qualifiers = "+port")
+ fun testStateFragment_portrait_submitCorrectAnswerWithFeedback_correctIsNotAnnounced() {
+ launchForExploration(FRACTIONS_EXPLORATION_ID_1).use {
+ startPlayingExploration()
+ playThroughFractionsState1()
+ playThroughFractionsState2()
+ accessibilityManager.resetLatestAnnouncement()
+ playThroughFractionsState3()
+
+ assertThat(accessibilityManager.getLatestAnnouncement()).isNull()
+ }
+ }
+
+ @Test
+ @Config(qualifiers = "+land")
+ fun testStateFragment_landscape_submitCorrectAnswerWithFeedback_correctIsNotAnnounced() {
+ launchForExploration(FRACTIONS_EXPLORATION_ID_1).use {
+ startPlayingExploration()
+ playThroughFractionsState1()
+ playThroughFractionsState2()
+ accessibilityManager.resetLatestAnnouncement()
+ playThroughFractionsState3()
+
+ assertThat(accessibilityManager.getLatestAnnouncement()).isNull()
+ }
+ }
+
+ @Test
+ @Config(qualifiers = "+port")
+ fun testStateFragment_portrait_submitCorrectAnswer_correctIsAnnounced() {
+ launchForExploration(FRACTIONS_EXPLORATION_ID_1).use {
+ startPlayingExploration()
+ playThroughFractionsState1()
+ playThroughFractionsState2()
+
+ assertThat(accessibilityManager.getLatestAnnouncement()).isEqualTo("Correct!")
+ }
+ }
+
+ @Test
+ @Config(qualifiers = "+land")
+ fun testStateFragment_landscape_submitCorrectAnswer_correctIsAnnounced() {
+ launchForExploration(FRACTIONS_EXPLORATION_ID_1).use {
+ startPlayingExploration()
+ playThroughFractionsState1()
+ playThroughFractionsState2()
+
+ assertThat(accessibilityManager.getLatestAnnouncement()).isEqualTo("Correct!")
+ }
+ }
+
  @Test
  @Config(qualifiers = "+port")
  fun testStateFragment_portrait_submitCorrectAnswer_confettiIsActive() {

app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt

@@ -69,7 +69,7 @@ import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
-import org.oppia.android.util.accessibility.FakeAccessibilityChecker
+import org.oppia.android.util.accessibility.FakeAccessibilityService
 import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.caching.testing.CachingTestModule
 import org.oppia.android.util.gcsresource.GcsResourceModule
@@ -105,7 +105,7 @@ class StateFragmentAccessibilityTest {
  lateinit var context: Context
 
  @Inject
- lateinit var fakeAccessibilityManager: FakeAccessibilityChecker
+ lateinit var fakeAccessibilityManager: FakeAccessibilityService
 
  private val internalProfileId: Int = 1