Fix #4909 : Remove the unused condition from various lessons_chapters_view for Accessibility

app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt

@@ -33,7 +33,11 @@ class ChapterSummaryViewModel(
       ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES -> {
         if (previousChapterTitle != null) {
           resourceHandler.getStringInLocaleWithWrapping(
-            R.string.chapter_prerequisite_title_label, index.toString(), previousChapterTitle
+            R.string.chapter_prerequisite_title_label,
+            (index + 1).toString(),
+            chapterTitle,
+            index.toString(),
+            previousChapterTitle
           )
         } else {
           resourceHandler.getStringInLocaleWithWrapping(

app/src/main/res/layout/lessons_in_progress_chapter_view.xml

@@ -34,7 +34,7 @@
         android:layout_gravity="center"
         android:layout_marginStart="10dp"
         android:fontFamily="sans-serif"
-        android:importantForAccessibility="@{viewModel.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? View.IMPORTANT_FOR_ACCESSIBILITY_YES : View.IMPORTANT_FOR_ACCESSIBILITY_NO}"
+        android:importantForAccessibility="no"
         android:minWidth="20dp"
         android:minHeight="20dp"
         android:text="@{viewModel.computePlayChapterIndexText()}"
@@ -59,7 +59,7 @@
         android:background="@drawable/chapter_white_bg_with_bright_green_border"
         android:fontFamily="sans-serif"
         android:gravity="center|start"
-        android:importantForAccessibility="@{viewModel.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? View.IMPORTANT_FOR_ACCESSIBILITY_YES : View.IMPORTANT_FOR_ACCESSIBILITY_NO}"
+        android:importantForAccessibility="no"
         android:minHeight="48dp"
         android:paddingStart="12dp"
         android:paddingEnd="12dp"

app/src/main/res/layout/lessons_locked_chapter_view.xml

@@ -35,7 +35,7 @@
         android:layout_gravity="center"
         android:layout_marginStart="10dp"
         android:fontFamily="sans-serif"
-        android:importantForAccessibility="@{viewModel.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? View.IMPORTANT_FOR_ACCESSIBILITY_YES : View.IMPORTANT_FOR_ACCESSIBILITY_NO}"
+        android:importantForAccessibility="no"
         android:minWidth="20dp"
         android:minHeight="20dp"
         android:text="@{viewModel.computePlayChapterIndexText()}"
@@ -65,7 +65,7 @@
         android:background="@color/component_color_lessons_tab_activity_lessons_locked_chapter_name_background_color"
         android:fontFamily="sans-serif"
         android:gravity="center|start"
-        android:importantForAccessibility="@{viewModel.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? View.IMPORTANT_FOR_ACCESSIBILITY_YES : View.IMPORTANT_FOR_ACCESSIBILITY_NO}"
+        android:importantForAccessibility="no"
         android:minHeight="48dp"
         android:paddingStart="12dp"
         android:paddingEnd="12dp"

app/src/main/res/layout/lessons_not_started_chapter_view.xml

@@ -30,7 +30,7 @@
       android:background="@drawable/chapter_dark_green_bg_with_bright_green_border"
       android:fontFamily="sans-serif"
       android:gravity="center"
-      android:importantForAccessibility="@{viewModel.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? View.IMPORTANT_FOR_ACCESSIBILITY_YES : View.IMPORTANT_FOR_ACCESSIBILITY_NO}"
+      android:importantForAccessibility="no"
       android:minWidth="60dp"
       android:minHeight="48dp"
       android:paddingStart="8dp"
@@ -48,7 +48,7 @@
       android:layout_height="0dp"
       android:fontFamily="sans-serif"
       android:gravity="center|start"
-      android:importantForAccessibility="@{viewModel.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? View.IMPORTANT_FOR_ACCESSIBILITY_YES : View.IMPORTANT_FOR_ACCESSIBILITY_NO}"
+      android:importantForAccessibility="no"
       android:minHeight="48dp"
       android:paddingStart="12dp"
       android:paddingEnd="12dp"

app/src/main/res/values/strings.xml

@@ -89,7 +89,7 @@
   <string name="chapter_name">Chapter %s: %s</string>
   <string name="chapter_completed">Chapter %s with title %s is completed</string>
   <string name="chapter_in_progress">Chapter %s with title %s is in progress</string>
-  <string name="chapter_prerequisite_title_label">Complete Chapter %s: %s to unlock this chapter.</string>
+  <string name="chapter_prerequisite_title_label">Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter.</string>
   <string name="chapter_prerequisite_title_label_without_chapter_title">Complete the previous chapter to unlock this chapter.</string>
   <string name="text_input_default_content_description">Enter text.</string>
   <string name="fractions_default_hint_text">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>

app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt

@@ -151,16 +151,25 @@ import javax.inject.Singleton
   qualifiers = "port-xxhdpi"
 )
 class TopicLessonsFragmentTest {
-  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
-  @get:Rule val oppiaTestRule = OppiaTestRule()
-
-  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-  @Inject lateinit var storyProgressTestHelper: StoryProgressTestHelper
-  @Inject lateinit var fakeOppiaClock: FakeOppiaClock
-  @Inject lateinit var fakeAccessibilityService: FakeAccessibilityService
-  @Inject lateinit var spotlightStateController: SpotlightStateController
-  @Inject lateinit var explorationCheckpointTestHelper: ExplorationCheckpointTestHelper
-  @Inject lateinit var fakeExplorationRetriever: FakeExplorationRetriever
+  @get:Rule
+  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule
+  val oppiaTestRule = OppiaTestRule()
+
+  @Inject
+  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject
+  lateinit var storyProgressTestHelper: StoryProgressTestHelper
+  @Inject
+  lateinit var fakeOppiaClock: FakeOppiaClock
+  @Inject
+  lateinit var fakeAccessibilityService: FakeAccessibilityService
+  @Inject
+  lateinit var spotlightStateController: SpotlightStateController
+  @Inject
+  lateinit var explorationCheckpointTestHelper: ExplorationCheckpointTestHelper
+  @Inject
+  lateinit var fakeExplorationRetriever: FakeExplorationRetriever
 
   @field:[Inject EnableExtraTopicTabsUi]
   lateinit var enableExtraTopicTabsUiValue: PlatformParameterValue<Boolean>
@@ -365,7 +374,8 @@ class TopicLessonsFragmentTest {
         .check(
           matches(
             withContentDescription(
-              "Complete Chapter 1: What is a Ratio? to unlock this chapter."
+              "Chapter 2: What is a Ratio? is currently locked. Please complete chapter 1: " +
+                "Exploration to unlock this chapter."
             )
           )
         )