From a7668550ba9e901bb94a1973c2cd6de8a787e0c2 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 18 Mar 2023 10:32:48 +0530 Subject: [PATCH 1/9] Remove unused importantForAccessibility conditions --- app/src/main/res/layout/lessons_in_progress_chapter_view.xml | 4 ++-- app/src/main/res/layout/lessons_locked_chapter_view.xml | 4 ++-- app/src/main/res/layout/lessons_not_started_chapter_view.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/lessons_in_progress_chapter_view.xml b/app/src/main/res/layout/lessons_in_progress_chapter_view.xml index 057e550d1d1..c0933a960dd 100644 --- a/app/src/main/res/layout/lessons_in_progress_chapter_view.xml +++ b/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="yes" 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="yes" android:minHeight="48dp" android:paddingStart="12dp" android:paddingEnd="12dp" diff --git a/app/src/main/res/layout/lessons_locked_chapter_view.xml b/app/src/main/res/layout/lessons_locked_chapter_view.xml index 78a04c5938e..3b0c89339a0 100644 --- a/app/src/main/res/layout/lessons_locked_chapter_view.xml +++ b/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="yes" 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="yes" android:minHeight="48dp" android:paddingStart="12dp" android:paddingEnd="12dp" diff --git a/app/src/main/res/layout/lessons_not_started_chapter_view.xml b/app/src/main/res/layout/lessons_not_started_chapter_view.xml index f2038b60e8f..84cd04cf4fb 100644 --- a/app/src/main/res/layout/lessons_not_started_chapter_view.xml +++ b/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="yes" 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="yes" android:minHeight="48dp" android:paddingStart="12dp" android:paddingEnd="12dp" From b9851221a3a3aa0d9521c35312710e49d080fa63 Mon Sep 17 00:00:00 2001 From: Mohit Gupta Date: Sat, 18 Mar 2023 22:54:52 +0530 Subject: [PATCH 2/9] Fixed review changes. --- app/src/main/res/layout/lessons_not_started_chapter_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/lessons_not_started_chapter_view.xml b/app/src/main/res/layout/lessons_not_started_chapter_view.xml index 84cd04cf4fb..2db54e99d00 100644 --- a/app/src/main/res/layout/lessons_not_started_chapter_view.xml +++ b/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="yes" + 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="yes" + android:importantForAccessibility="no" android:minHeight="48dp" android:paddingStart="12dp" android:paddingEnd="12dp" From bae82e7afc2039cf46f6818ff93ac556a38f0a28 Mon Sep 17 00:00:00 2001 From: Mohit Gupta Date: Sat, 18 Mar 2023 23:05:12 +0530 Subject: [PATCH 3/9] Changes as per review --- app/src/main/res/layout/lessons_locked_chapter_view.xml | 4 ++-- app/src/main/res/layout/lessons_not_started_chapter_view.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/lessons_locked_chapter_view.xml b/app/src/main/res/layout/lessons_locked_chapter_view.xml index 3b0c89339a0..c5d8c7d4f7e 100644 --- a/app/src/main/res/layout/lessons_locked_chapter_view.xml +++ b/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="yes" + 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="yes" + android:importantForAccessibility="no" android:minHeight="48dp" android:paddingStart="12dp" android:paddingEnd="12dp" diff --git a/app/src/main/res/layout/lessons_not_started_chapter_view.xml b/app/src/main/res/layout/lessons_not_started_chapter_view.xml index 2db54e99d00..84cd04cf4fb 100644 --- a/app/src/main/res/layout/lessons_not_started_chapter_view.xml +++ b/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="no" + android:importantForAccessibility="yes" 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="no" + android:importantForAccessibility="yes" android:minHeight="48dp" android:paddingStart="12dp" android:paddingEnd="12dp" From ca66448edade85b250f28cec5b58d95dee0561bc Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Tue, 6 Jun 2023 13:31:23 +0530 Subject: [PATCH 4/9] Fix Lock chapter talkback --- .../android/app/topic/lessons/ChapterSummaryViewModel.kt | 6 +++++- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt index 33a0fb04bc4..d3ff76c3abc 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt +++ b/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( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 90dc477da97..28108ff454d 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -89,7 +89,7 @@ Chapter %s: %s Chapter %s with title %s is completed Chapter %s with title %s is in progress - Complete Chapter %s: %s to unlock this chapter. + Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter. Complete the previous chapter to unlock this chapter. Enter text. Enter a fraction in the form x/x, or a mixed number in the form x x/x. From 317855f605030af6505f22af190b41f4ea4eda1f Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Tue, 6 Jun 2023 23:38:34 +0530 Subject: [PATCH 5/9] Fix one failed test --- .../topic/lessons/TopicLessonsFragmentTest.kt | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt index 3c6c8860742..cfc19744687 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt +++ b/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 @@ -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." ) ) ) From aca1b39ba9e6a57b1f196ca0c26bae2d6f3fc567 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Fri, 16 Jun 2023 00:31:19 +0530 Subject: [PATCH 6/9] Fix duplicate talkbacks --- app/src/main/res/layout/lessons_in_progress_chapter_view.xml | 4 ++-- app/src/main/res/layout/lessons_not_started_chapter_view.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/lessons_in_progress_chapter_view.xml b/app/src/main/res/layout/lessons_in_progress_chapter_view.xml index c0933a960dd..dfd3b226eda 100644 --- a/app/src/main/res/layout/lessons_in_progress_chapter_view.xml +++ b/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="yes" + 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="yes" + android:importantForAccessibility="no" android:minHeight="48dp" android:paddingStart="12dp" android:paddingEnd="12dp" diff --git a/app/src/main/res/layout/lessons_not_started_chapter_view.xml b/app/src/main/res/layout/lessons_not_started_chapter_view.xml index 84cd04cf4fb..2db54e99d00 100644 --- a/app/src/main/res/layout/lessons_not_started_chapter_view.xml +++ b/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="yes" + 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="yes" + android:importantForAccessibility="no" android:minHeight="48dp" android:paddingStart="12dp" android:paddingEnd="12dp" From 2ee7e6ba431c57c524c27bb8f423637a892afe10 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Wed, 21 Jun 2023 00:16:12 +0530 Subject: [PATCH 7/9] Fixed content description test --- .../android/app/topic/lessons/TopicLessonsFragmentTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt index cfc19744687..973604bbd54 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt @@ -374,8 +374,8 @@ class TopicLessonsFragmentTest { .check( matches( withContentDescription( - "Chapter 2: What is a Ratio? is currently locked. Please complete chapter 1: " + - "Exploration to unlock this chapter." + "Chapter 2: Order is important is currently locked. Please complete chapter 1: " + + "What is a Ratio? to unlock this chapter." ) ) ) From 463d3e44be885a2d51a84415f16c1b8e01acfff5 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 1 Jul 2023 13:27:42 -0600 Subject: [PATCH 8/9] Attempt 1 to fix test --- .../oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt | 2 +- app/src/main/res/values/strings.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt index d3ff76c3abc..033620d04a2 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt @@ -33,7 +33,7 @@ class ChapterSummaryViewModel( ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES -> { if (previousChapterTitle != null) { resourceHandler.getStringInLocaleWithWrapping( - R.string.chapter_prerequisite_title_label, + R.string.chapter_lock_prerequisite_title_label, (index + 1).toString(), chapterTitle, index.toString(), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 15489829662..511eea95c43 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -89,7 +89,8 @@ Chapter %s: %s Chapter %s with title %s is completed Chapter %s with title %s is in progress - Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter. + Complete Chapter %s: %s to unlock this chapter. + Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter. Complete the previous chapter to unlock this chapter. Enter text. Enter a fraction in the form x/x, or a mixed number in the form x x/x. From 2a9341aed6b7372896ca8a96f47afdccc4e375d5 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Mon, 3 Jul 2023 17:54:35 -0600 Subject: [PATCH 9/9] Fix some naming --- .../oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt index 033620d04a2..857bf87d91a 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt @@ -33,7 +33,7 @@ class ChapterSummaryViewModel( ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES -> { if (previousChapterTitle != null) { resourceHandler.getStringInLocaleWithWrapping( - R.string.chapter_lock_prerequisite_title_label, + R.string.chapter_locked_prerequisite_title_label, (index + 1).toString(), chapterTitle, index.toString(), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 511eea95c43..ed1a4bca9fd 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,7 +90,7 @@ Chapter %s with title %s is completed Chapter %s with title %s is in progress Complete Chapter %s: %s to unlock this chapter. - Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter. + Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter. Complete the previous chapter to unlock this chapter. Enter text. Enter a fraction in the form x/x, or a mixed number in the form x x/x.