Merge branch 'text-view-script' of github.com:manas-yu/oppia-android …

…into text-view-script
oppia · Jan 22, 2025 · e32a8d3 · e32a8d3
2 parents c9af6ad + a82826d
commit e32a8d3
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 3 deletions.
diff --git a/app/BUILD.bazel b/app/BUILD.bazel
@@ -215,6 +215,7 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt",
     "src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt",
     "src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt",
+    "src/main/java/org/oppia/android/app/options/AudioLanguageItemViewModel.kt",
     "src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt",
     "src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt",
     "src/main/java/org/oppia/android/app/parser/FractionParsingUiError.kt",
@@ -310,7 +311,6 @@ VIEW_MODELS = [
     "src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListViewModel.kt",
     "src/main/java/org/oppia/android/app/options/AppLanguageItemViewModel.kt",
     "src/main/java/org/oppia/android/app/options/AppLanguageSelectionViewModel.kt",
-    "src/main/java/org/oppia/android/app/options/AudioLanguageItemViewModel.kt",
     "src/main/java/org/oppia/android/app/options/AudioLanguageSelectionViewModel.kt",
     "src/main/java/org/oppia/android/app/options/OptionControlsViewModel.kt",
     "src/main/java/org/oppia/android/app/options/OptionsAppLanguageViewModel.kt",

diff --git a/app/src/main/java/org/oppia/android/app/options/AudioLanguageItemViewModel.kt b/app/src/main/java/org/oppia/android/app/options/AudioLanguageItemViewModel.kt
@@ -2,7 +2,9 @@ package org.oppia.android.app.options
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
+import org.oppia.android.R
 import org.oppia.android.app.model.AudioLanguage
+import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.viewmodel.ObservableViewModel
 
 /**
@@ -20,7 +22,8 @@ class AudioLanguageItemViewModel(
   val language: AudioLanguage,
   val languageDisplayName: String,
   private val currentSelectedLanguage: LiveData<AudioLanguage>,
-  val audioLanguageRadioButtonListener: AudioLanguageRadioButtonListener
+  val audioLanguageRadioButtonListener: AudioLanguageRadioButtonListener,
+  private val appLanguageResourceHandler: AppLanguageResourceHandler
 ) : ObservableViewModel() {
   /**
    * Indicates whether the language corresponding to this view model is _currently_ selected in the
@@ -29,4 +32,16 @@ class AudioLanguageItemViewModel(
   val isLanguageSelected: LiveData<Boolean> by lazy {
     Transformations.map(currentSelectedLanguage) { it == language }
   }
+  /**
+   * Returns the content description for the current language. This is used for accessibility
+   * purposes to provide a readable description of the language in the UI.
+   */
+  fun languageContentDescription(): String {
+    return when (language) {
+      AudioLanguage.ARABIC_LANGUAGE -> appLanguageResourceHandler.getStringInLocaleWithWrapping(
+        R.string.arabic_language_display_name_content_description
+      )
+      else -> languageDisplayName
+    }
+  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/options/AudioLanguageSelectionViewModel.kt b/app/src/main/java/org/oppia/android/app/options/AudioLanguageSelectionViewModel.kt
@@ -128,7 +128,8 @@ class AudioLanguageSelectionViewModel @Inject constructor(
       language,
       appLanguageResourceHandler.computeLocalizedDisplayName(language),
       selectedLanguage,
-      fragment as AudioLanguageRadioButtonListener
+      fragment as AudioLanguageRadioButtonListener,
+      appLanguageResourceHandler
     )
   }
 

diff --git a/app/src/main/res/layout/audio_language_item.xml b/app/src/main/res/layout/audio_language_item.xml
@@ -38,6 +38,7 @@
       android:layout_height="wrap_content"
       android:layout_marginEnd="24dp"
       android:fontFamily="sans-serif"
+      android:contentDescription="@{viewModel.languageContentDescription()}"
       android:text="@{viewModel.languageDisplayName}"
       android:textColor="@color/component_color_shared_primary_text_color"
       android:textSize="16sp" />

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -686,4 +686,8 @@
   <string name="audio_language_fragment_text">In %s, you can listen to lessons!</string>
   <string name="audio_language_fragment_subtitle">Select the audio language to listen to lessons</string>
   <string name="onboarding_step_count_five">STEP 5 OF 5</string>
+
+  <!-- AudioLanguageFragment -->
+  <string name="arabic_language_display_name_content_description">Arabic</string>
+
 </resources>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt
@@ -17,6 +17,7 @@ import androidx.test.espresso.matcher.RootMatchers.withDecorView
 import androidx.test.espresso.matcher.ViewMatchers.Visibility
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -499,6 +500,32 @@ class AudioLanguageFragmentTest {
     }
   }
 
+  @Test
+  fun testFragment_withEnglish_verifyContentDescriptionReadsArabicLanguage() {
+    initializeTestApplicationComponent(enableOnboardingFlowV2 = false)
+    launchActivityWithLanguage(ENGLISH_AUDIO_LANGUAGE).use {
+      verifyEnglishIsSelected()
+
+      onView(
+        atPositionOnView(
+          R.id.audio_language_recycler_view,
+          3,
+          R.id.language_text_view
+        )
+      ).check(matches(withText(R.string.arabic_localized_language_name)))
+
+      onView(
+        atPositionOnView(
+          R.id.audio_language_recycler_view,
+          3,
+          R.id.language_text_view
+        )
+      ).check(
+        matches(withContentDescription(R.string.arabic_language_display_name_content_description))
+      )
+    }
+  }
+
   private fun launchActivityWithLanguage(
     audioLanguage: AudioLanguage
   ): ActivityScenario<AppLanguageActivity> {