From cfce93c26bd3a22bcb80313908b36bb26f8aabae Mon Sep 17 00:00:00 2001
From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com>
Date: Fri, 22 Sep 2023 12:21:13 -0400
Subject: [PATCH 01/32] Fix #3843 Split Concatenated TextView (#5151)

## Explanation
Fix #3843 Instead of using 1 textview to display a concatenated string,
now have 1 textview for story progress, 1 for bar separator, and 1 for
topic progress.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

|LTR|RTL|
|---|---|

|![Screenshot_20230913_170309](https://github.com/oppia/oppia-android/assets/74568012/5d10ee41-41cb-46f1-b37d-b368e247c108)|![Screenshot_20230913_170148](https://github.com/oppia/oppia-android/assets/74568012/d5ee32ce-1899-4e5c-825c-3070f5e132ad)|

|![Screenshot_20230913_165312](https://github.com/oppia/oppia-android/assets/74568012/4435074e-41b3-4b0b-9dd1-7cfc1b3bfd72)|![Screenshot_20230913_170218](https://github.com/oppia/oppia-android/assets/74568012/476060ea-15b8-4636-afa0-89fdb130d05b)|




## Tests
![Screenshot 2023-09-15
101749](https://github.com/oppia/oppia-android/assets/74568012/2ee79906-22e8-42a0-b3b6-b71676b50f92)

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../drawer/NavigationDrawerHeaderViewModel.kt | 37 ++++++++------
 .../layout/nav_header_navigation_drawer.xml   | 51 +++++++++++++++----
 .../NavigationDrawerActivityProdTest.kt       | 30 +++++++++--
 3 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt
index b46e7a63275..d75c0d03287 100644
--- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt
@@ -22,7 +22,10 @@ class NavigationDrawerHeaderViewModel @Inject constructor(
   val profile = ObservableField(Profile.getDefaultInstance())
   private var ongoingTopicCount = DEFAULT_ONGOING_TOPIC_COUNT
   private var completedStoryCount = DEFAULT_COMPLETED_STORY_COUNT
-  val profileProgressText: ObservableField<String> = ObservableField(computeProfileProgressText())
+  val profileTopicProgressText: ObservableField<String> =
+    ObservableField(computeProfileTopicProgressText())
+  val profileStoryProgressText: ObservableField<String> =
+    ObservableField(computeProfileStoryProgressText())
 
   fun onHeaderClicked() {
     routeToProfileProgressListener.routeToProfileProgress(profile.get()!!.id.internalId)
@@ -30,25 +33,29 @@ class NavigationDrawerHeaderViewModel @Inject constructor(
 
   fun setOngoingTopicProgress(ongoingTopicCount: Int) {
     this.ongoingTopicCount = ongoingTopicCount
-    profileProgressText.set(computeProfileProgressText())
+    profileTopicProgressText.set(computeProfileTopicProgressText())
   }
 
   fun setCompletedStoryProgress(completedStoryCount: Int) {
     this.completedStoryCount = completedStoryCount
-    profileProgressText.set(computeProfileProgressText())
+    profileStoryProgressText.set(computeProfileStoryProgressText())
   }
 
-  private fun computeProfileProgressText(): String {
-    // TODO(#3843): Either combine these strings into one or use separate views to display them.
-    val completedStoryCountText =
-      resourceHandler.getQuantityStringInLocaleWithWrapping(
-        R.plurals.completed_story_count, completedStoryCount, completedStoryCount.toString()
-      )
-    val ongoingTopicCountText =
-      resourceHandler.getQuantityStringInLocaleWithWrapping(
-        R.plurals.ongoing_topic_count, ongoingTopicCount, ongoingTopicCount.toString()
-      )
-    val barSeparator = resourceHandler.getStringInLocale(R.string.bar_separator)
-    return "$completedStoryCountText$barSeparator$ongoingTopicCountText"
+  private fun computeProfileStoryProgressText(): String {
+    return resourceHandler.getQuantityStringInLocaleWithWrapping(
+      R.plurals.completed_story_count,
+      completedStoryCount,
+      completedStoryCount.toString()
+    )
+  }
+
+  fun getBarSeparator() = resourceHandler.getStringInLocale(R.string.bar_separator)
+
+  private fun computeProfileTopicProgressText(): String {
+    return resourceHandler.getQuantityStringInLocaleWithWrapping(
+      R.plurals.ongoing_topic_count,
+      ongoingTopicCount,
+      ongoingTopicCount.toString()
+    )
   }
 }
diff --git a/app/src/main/res/layout/nav_header_navigation_drawer.xml b/app/src/main/res/layout/nav_header_navigation_drawer.xml
index eb9d9a0ccad..d85e97e337b 100644
--- a/app/src/main/res/layout/nav_header_navigation_drawer.xml
+++ b/app/src/main/res/layout/nav_header_navigation_drawer.xml
@@ -27,10 +27,10 @@
     <com.google.android.material.imageview.ShapeableImageView
       android:layout_width="64dp"
       android:layout_height="64dp"
-      app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.RoundedShape"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
+      app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.RoundedShape"
       profile:src="@{viewModel.profile.avatar}" />
 
     <TextView
@@ -44,16 +44,47 @@
       android:textColor="@color/component_color_shared_secondary_4_text_color"
       android:textSize="14sp" />
 
-    <TextView
-      android:id="@+id/profile_progress_text_view"
-      style="@style/TextViewStart"
+    <LinearLayout
+      android:id="@+id/progress_linear_layout"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="4dp"
-      android:layout_marginBottom="8dp"
-      android:fontFamily="sans-serif"
-      android:text="@{viewModel.profileProgressText}"
-      android:textColor="@color/component_color_shared_secondary_4_text_color"
-      android:textSize="14sp" />
+      android:orientation="horizontal">
+
+      <TextView
+        android:id="@+id/profile_story_progress_text_view"
+        style="@style/TextViewStart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="8dp"
+        android:fontFamily="sans-serif"
+        android:text="@{viewModel.profileStoryProgressText}"
+        android:textColor="@color/component_color_shared_secondary_4_text_color"
+        android:textSize="14sp" />
+
+      <TextView
+        android:id="@+id/profile_topic_separator"
+        style="@style/TextViewStart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="8dp"
+        android:fontFamily="sans-serif"
+        android:text="@{viewModel.getBarSeparator()}"
+        android:textColor="@color/component_color_shared_secondary_4_text_color"
+        android:textSize="14sp" />
+
+      <TextView
+        android:id="@+id/profile_topic_progress_text_view"
+        style="@style/TextViewStart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="8dp"
+        android:fontFamily="sans-serif"
+        android:text="@{viewModel.profileTopicProgressText}"
+        android:textColor="@color/component_color_shared_secondary_4_text_color"
+        android:textSize="14sp" />
+    </LinearLayout>
   </LinearLayout>
 </layout>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
index bce54aac8a1..08512202fb7 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
@@ -256,7 +256,7 @@ class NavigationDrawerActivityProdTest {
   }
 
   @Test
-  fun testNavDrawer_openNavDrawer_oneTopicInProgress_profileProgressIsDisplayedCorrectly() {
+  fun testNavDrawer_openNavDrawer_oneTopicInProgress_profileStoryProgressIsDisplayedCorrectly() {
     storyProfileTestHelper.markCompletedRatiosStory1Exp0(
       ProfileId.newBuilder().setInternalId(
         internalProfileId
@@ -270,10 +270,32 @@ class NavigationDrawerActivityProdTest {
       it.openNavigationDrawer()
       onView(
         allOf(
-          withId(R.id.profile_progress_text_view),
-          isDescendantOfA(withId(R.id.header_linear_layout))
+          withId(R.id.profile_story_progress_text_view),
+          isDescendantOfA(withId(R.id.progress_linear_layout))
+        )
+      ).check(matches(withText("1 Story Completed")))
+    }
+  }
+
+  @Test
+  fun testNavDrawer_openNavDrawer_oneTopicInProgress_profileTopicProgressIsDisplayedCorrectly() {
+    storyProfileTestHelper.markCompletedRatiosStory1Exp0(
+      ProfileId.newBuilder().setInternalId(
+        internalProfileId
+      ).build(),
+      timestampOlderThanOneWeek = false
+    )
+    launch<NavigationDrawerTestActivity>(
+      createNavigationDrawerActivityIntent(internalProfileId)
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      it.openNavigationDrawer()
+      onView(
+        allOf(
+          withId(R.id.profile_topic_progress_text_view),
+          isDescendantOfA(withId(R.id.progress_linear_layout))
         )
-      ).check(matches(withText("1 Story Completed | 1 Topic in Progress")))
+      ).check(matches(withText("1 Topic in Progress")))
     }
   }
 

From 08981272a8136b8da0be7c4197480790c36bf100 Mon Sep 17 00:00:00 2001
From: aayushimathur6 <92685651+aayushimathur6@users.noreply.github.com>
Date: Sun, 24 Sep 2023 09:28:47 +0530
Subject: [PATCH 02/32] Fix #3841: Combine time and quantity plurals (#5153)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->Fixes #3841

This PR involves Combining plurals and quantity strings from:
` <string name="time_ago">%s ago</string>`

and

```
<plurals name="minutes">
  <item quantity="one">a minute</item>
  <item quantity="other">%s minutes</item>
</plurals>
```

to

```
 <plurals name="minutes_ago">
    <item quantity="one">a minute ago</item>
    <item quantity="other">%s minutes ago</item>
  </plurals>
```

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

| BEFORE  | AFTER |
| ------------- | ------------- |
|
![Before](https://github.com/oppia/oppia-android/assets/92685651/f3daf711-b96d-4ca7-8e49-d13c14769fb4)|
![after](https://github.com/oppia/oppia-android/assets/92685651/e303564a-9961-49fb-8258-75743bc5fb51)
|
|
![arabicbefore](https://github.com/oppia/oppia-android/assets/92685651/9c9d5c34-9ebb-42c3-9176-f69775f28e58)
|![afterarabic](https://github.com/oppia/oppia-android/assets/92685651/471799da-10e9-4691-beb5-3b87edea1e8f)
|

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../databinding/TextViewBindingAdapters.java  | 14 +++++--------
 app/src/main/res/values/strings.xml           | 20 +++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
index 349c680f221..591e8c88738 100644
--- a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
+++ b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
@@ -83,13 +83,13 @@ private static String getTimeAgo(View view, long lastVisitedTimestamp) {
     } else if (timeDifferenceMillis < TimeUnit.MINUTES.toMillis(50)) {
       return getPluralString(
               resourceHandler,
-          R.plurals.minutes,
+          R.plurals.minutes_ago,
           (int) TimeUnit.MILLISECONDS.toMinutes(timeDifferenceMillis)
       );
     } else if (timeDifferenceMillis < TimeUnit.DAYS.toMillis(1)) {
       return getPluralString(
               resourceHandler,
-          R.plurals.hours,
+          R.plurals.hours_ago,
           (int) TimeUnit.MILLISECONDS.toHours(timeDifferenceMillis)
       );
     } else if (timeDifferenceMillis < TimeUnit.DAYS.toMillis(2)) {
@@ -97,7 +97,7 @@ private static String getTimeAgo(View view, long lastVisitedTimestamp) {
     }
     return getPluralString(
             resourceHandler,
-        R.plurals.days,
+        R.plurals.days_ago,
         (int) TimeUnit.MILLISECONDS.toDays(timeDifferenceMillis)
     );
   }
@@ -107,13 +107,9 @@ private static String getPluralString(
       @PluralsRes int pluralsResId,
       int count
   ) {
-    // TODO(#3841): Combine these strings together.
-    return resourceHandler.getStringInLocaleWithWrapping(
-        R.string.time_ago,
-        resourceHandler.getQuantityStringInLocaleWithWrapping(
+    return resourceHandler.getQuantityStringInLocaleWithWrapping(
             pluralsResId, count, String.valueOf(count)
-        )
-    );
+        );
   }
 
   private static long ensureTimestampIsInMilliseconds(long lastVisitedTimestamp) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 408a4095aca..3f48fef86cc 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -468,7 +468,6 @@
   <!-- TextViewBindingAdapters -->
   <string name="just_now">just now</string>
   <string name="last_logged_in_recently">recently</string>
-  <string name="time_ago">%s ago</string>
   <string name="yesterday">yesterday</string>
   <string name="return_to_topic">Return to topic</string>
   <string name="return_to_lesson">Return to lesson</string>
@@ -481,17 +480,18 @@
   <string name="up_button_disabled">Up</string>
   <string name="down_button_disabled">Down</string>
   <string name="profile_last_visited">%s %s</string>
-  <plurals name="minutes">
-    <item quantity="one">a minute</item>
-    <item quantity="other">%s minutes</item>
+  <plurals name="minutes_ago">
+    <item quantity="zero">0 minutes ago</item>
+    <item quantity="one">a minute ago</item>
+    <item quantity="other">%s minutes ago</item>
   </plurals>
-  <plurals name="hours">
-    <item quantity="one">an hour</item>
-    <item quantity="other">%s hours</item>
+  <plurals name="hours_ago">
+    <item quantity="one">an hour ago</item>
+    <item quantity="other">%s hours ago</item>
   </plurals>
-  <plurals name="days">
-    <item quantity="one">a day</item>
-    <item quantity="other">%s days</item>
+  <plurals name="days_ago">
+    <item quantity="one">a day ago</item>
+    <item quantity="other">%s days ago</item>
   </plurals>
   <!-- ViewTags -->
   <string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>

From 42ee1bdf74de28f79d9424c3ee90b3713198f332 Mon Sep 17 00:00:00 2001
From: masclot <103062089+masclot@users.noreply.github.com>
Date: Thu, 28 Sep 2023 02:51:48 +0200
Subject: [PATCH 03/32] Fixes #4539: Replace CaseSensitiveEquals by Equals in
 dev assets (#5154)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fixes #4539: Replace the rule type CaseSensitiveEquals by Equals in dev
assets. This only affects the topics used in dev environment. The rule
type CaseSensitiveEquals is no longer supported.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing


**Videos**

|current|new|
|-|-|

|[fix_for_CaseSensitiveEquals_current.webm](https://github.com/oppia/oppia-android/assets/103062089/0ad9f1e9-a991-4908-8576-1aba964fadcb)|[fix_for_CaseSensitiveEquals_new.webm](https://github.com/oppia/oppia-android/assets/103062089/298270d9-6af2-4cb8-a9f0-6445e5abfdd6)|

**Screenshots**

|current|new|
|-|-|
|![Screenshot
fix_for_CaseSensitiveEquals_current](https://github.com/oppia/oppia-android/assets/103062089/b135fce1-270e-46d9-b819-82833011988d)|![Screenshot
fix_for_CaseSensitiveEquals_new](https://github.com/oppia/oppia-android/assets/103062089/443f966f-717b-4fab-b17a-11d52e817737)|

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 domain/src/main/assets/2mzzFVDLuAj8.json      | 6 +++---
 domain/src/main/assets/2mzzFVDLuAj8.textproto | 6 +++---
 domain/src/main/assets/5NWuolNcwH6e.json      | 4 ++--
 domain/src/main/assets/5NWuolNcwH6e.textproto | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/domain/src/main/assets/2mzzFVDLuAj8.json b/domain/src/main/assets/2mzzFVDLuAj8.json
index 9a7eed87bb2..4e5fa088efd 100644
--- a/domain/src/main/assets/2mzzFVDLuAj8.json
+++ b/domain/src/main/assets/2mzzFVDLuAj8.json
@@ -2463,7 +2463,7 @@
                 }
               }
             }, {
-              "rule_type": "CaseSensitiveEquals",
+              "rule_type": "Equals",
               "inputs": {
                 "x": {
                   "contentId": "14186351-eee4-40fa-8f20-960306cfe465",
@@ -2818,7 +2818,7 @@
                 }
               }
             }, {
-              "rule_type": "CaseSensitiveEquals",
+              "rule_type": "Equals",
               "inputs": {
                 "x": {
                   "contentId": "c78bf24e-b510-4bac-a107-28a03dfa1c22",
@@ -2826,7 +2826,7 @@
                 }
               }
             }, {
-              "rule_type": "CaseSensitiveEquals",
+              "rule_type": "Equals",
               "inputs": {
                 "x": {
                   "contentId": "338cb82a-5e6f-460a-8fa0-5a2510c1a31e",
diff --git a/domain/src/main/assets/2mzzFVDLuAj8.textproto b/domain/src/main/assets/2mzzFVDLuAj8.textproto
index dcd355095d0..f8cdd2299d4 100644
--- a/domain/src/main/assets/2mzzFVDLuAj8.textproto
+++ b/domain/src/main/assets/2mzzFVDLuAj8.textproto
@@ -3011,7 +3011,7 @@ states {
               }
             }
           }
-          rule_type: "CaseSensitiveEquals"
+          rule_type: "Equals"
         }
       }
       answer_groups {
@@ -3472,7 +3472,7 @@ states {
               }
             }
           }
-          rule_type: "CaseSensitiveEquals"
+          rule_type: "Equals"
         }
         rule_specs {
           input {
@@ -3484,7 +3484,7 @@ states {
               }
             }
           }
-          rule_type: "CaseSensitiveEquals"
+          rule_type: "Equals"
         }
       }
       answer_groups {
diff --git a/domain/src/main/assets/5NWuolNcwH6e.json b/domain/src/main/assets/5NWuolNcwH6e.json
index d334766c022..dcf1da3fe0f 100644
--- a/domain/src/main/assets/5NWuolNcwH6e.json
+++ b/domain/src/main/assets/5NWuolNcwH6e.json
@@ -861,7 +861,7 @@
                 }
               }
             }, {
-              "rule_type": "CaseSensitiveEquals",
+              "rule_type": "Equals",
               "inputs": {
                 "x": {
                   "contentId": "947c6855-b9e6-459d-a8f6-2b239e51d37f",
@@ -2176,7 +2176,7 @@
                 }
               }
             }, {
-              "rule_type": "CaseSensitiveEquals",
+              "rule_type": "Equals",
               "inputs": {
                 "x": {
                   "contentId": "5d0d1769-2754-4f6a-9690-ba3675ce953d",
diff --git a/domain/src/main/assets/5NWuolNcwH6e.textproto b/domain/src/main/assets/5NWuolNcwH6e.textproto
index cac4f82089f..3b8c323fd19 100644
--- a/domain/src/main/assets/5NWuolNcwH6e.textproto
+++ b/domain/src/main/assets/5NWuolNcwH6e.textproto
@@ -1121,7 +1121,7 @@ states {
               }
             }
           }
-          rule_type: "CaseSensitiveEquals"
+          rule_type: "Equals"
         }
       }
       default_outcome {
@@ -2807,7 +2807,7 @@ states {
               }
             }
           }
-          rule_type: "CaseSensitiveEquals"
+          rule_type: "Equals"
         }
         rule_specs {
           input {

From 41f74fc2bbc1d6f909d38ab3e6ee4da0f322bd06 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Fri, 29 Sep 2023 20:32:05 +0530
Subject: [PATCH 04/32] Fix #5079: Gradle Build Failed - Task
 :utility:kaptGenerateStubsDebugKotlin FAILED (#5162)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

Fixes #5079

The error message indicates that there's a compatibility issue with the
Java version being used for the project. The `Unsupported class file
major version 59` suggests that the code in the model.jar (project
:model) file is compiled with a Java version higher than the one being
used by the project.

This PR explicitly set the source and target compatibility to Java 8 for
the project. This ensures that the project uses Java 8, which is
compatible with class files compiled with major version 59 (Java 15).

By making this change, we ensure that the project's Java version aligns
with the Java version used to compile the model.jar file, thus resolving
the compatibility issue and allowing the build process to proceed
without errors.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
---
 model/build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/model/build.gradle b/model/build.gradle
index 619f1237d8b..f68c303c551 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -38,3 +38,8 @@ sourceSets {
     }
   }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

From 9bbf94aa3ca4a775f658c5dfe7f3e38fca402cc6 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Sat, 30 Sep 2023 09:27:29 +0530
Subject: [PATCH 05/32] Fix #5136: Modifies all caps buttons to sentence case
 (#5157)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->
Fixes #5136

This PR changes all caps buttons to sentence case. All buttons mentioned
in this
[comment](https://github.com/oppia/oppia-android/issues/5136#issuecomment-1731446317)
are changed either by directly changing its `android:textAllCaps` to
`false` in the layout files or by changing its style in the `styles.xml`
file.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

## Screenshots

### _layout_

|Screen / Dialog|Button ID|Screenshots|
|--|--|--|
|`activity_input_interaction_view_test.xml`|`submit_button`|
|`add_profile_activity.xml`|`add_profile_activity_create_button`|
|`admin_auth_activity.xml`|`admin_auth_submit_button`|
|`admin_pin_activity.xml`|`submit_button`|
|`concept_card_fragment_test_activity.xml`|`open_dialog_0`
`open_dialog_1`|
|`exploration_test_activity.xml`|`play_exploration_button`|

|`hint_summary.xml`|`reveal_hint_button`|![image](https://github.com/oppia/oppia-android/assets/84731134/fa55e84f-df00-47fc-9064-6ba57dc91337)|

|`math_expression_parser_fragment.xml`|`parse_math_expression_button`|![image](https://github.com/oppia/oppia-android/assets/84731134/97678f0a-294f-40e9-a057-cd59843a07c9)|

|`onboarding_slide_final.xml`|`get_started_button`|![image](https://github.com/oppia/oppia-android/assets/84731134/44dab2e5-af61-42b6-a9be-977f0c3487a3)|

|`profile_list_control_buttons.xml`|`learner_analytics_share_ids_and_events_button`
`learner_analytics_upload_logs_now_button`|

|`profile_rename_fragment.xml`|`profile_rename_save_button`|![image](https://github.com/oppia/oppia-android/assets/84731134/6834670a-6225-45a1-a845-f41bc464a711)|
|`profile_reset_pin_fragment.xml`|`profile_reset_save_button`|
|`replay_button_item.xml`|`replay_button`|

|`return_to_lesson_button_item.xml`|`return_to_lesson_button`|![image](https://github.com/oppia/oppia-android/assets/84731134/fa55e84f-df00-47fc-9064-6ba57dc91337)|
|`return_to_topic_button_item.xml`|`return_to_topic_button`|
|`solution_summary.xml`|`show_solution_button`|
|`state_fragment_test_activity.xml`|`play_test_exploration_button`|

|`submit_button_item.xml`|`submit_answer_button`|![image](https://github.com/oppia/oppia-android/assets/84731134/eed9fb84-b4d8-4d65-a665-813c641debc5)|
|`topic_practice_footer_view.xml`|`topic_practice_start_button`|
|`walkthrough_welcome_fragment.xml`|`walkthrough_welcome_next_button`|

### _layout-land_
|Screen / Dialog|Button ID|Screenshots|
|--|--|--|

|`onboarding_slide_final.xml`|`get_started_button`|![image](https://github.com/oppia/oppia-android/assets/84731134/ce6df192-62ee-481b-83ea-49a56a4dfbe3)|
|`walkthrough_welcome_fragment.xml`|`walkthrough_welcome_next_button`|

### _layout-sw600dp-land_
|Screen / Dialog|Button ID|
|--|--|
|`onboarding_slide_final.xml`|`get_started_button`|

### _layout-sw600dp-port_
|Screen / Dialog|Button ID|
|--|--|
|`onboarding_slide_final.xml`|`get_started_button`|

<img
src="https://github.com/oppia/oppia-android/assets/84731134/23e8ebbb-386d-4dfa-bf4a-6e8354734245"
width="300"/>
<img
src="https://github.com/oppia/oppia-android/assets/84731134/e1358ff6-9e5e-4ae6-a9bc-44490f48d022"
width="300"/>
<img
src="https://github.com/oppia/oppia-android/assets/84731134/10c06098-0e4a-47a5-b7c3-988fc97073f2"
width="300"/>
<img
src="https://github.com/oppia/oppia-android/assets/84731134/08d9c601-8c46-430c-ba17-f7dbcd131d4a"
width="300"/>

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 app/src/main/res/layout-land/onboarding_slide_final.xml   | 1 +
 app/src/main/res/layout-land/resume_lesson_fragment.xml   | 4 ++--
 .../res/layout-sw600dp-land/onboarding_slide_final.xml    | 1 +
 .../res/layout-sw600dp-land/resume_lesson_fragment.xml    | 4 ++--
 .../res/layout-sw600dp-port/onboarding_slide_final.xml    | 1 +
 app/src/main/res/layout/add_profile_activity.xml          | 1 -
 .../res/layout/concept_card_fragment_test_activity.xml    | 6 ++++--
 app/src/main/res/layout/exploration_test_activity.xml     | 3 ++-
 app/src/main/res/layout/hint_summary.xml                  | 1 +
 .../main/res/layout/math_expression_parser_fragment.xml   | 1 -
 app/src/main/res/layout/onboarding_slide_final.xml        | 1 +
 app/src/main/res/layout/profile_rename_fragment.xml       | 1 -
 app/src/main/res/layout/profile_reset_pin_fragment.xml    | 1 -
 app/src/main/res/layout/resume_lesson_fragment.xml        | 4 ++--
 app/src/main/res/layout/solution_summary.xml              | 1 +
 app/src/main/res/layout/state_fragment_test_activity.xml  | 1 +
 app/src/main/res/values-v21/themes.xml                    | 1 +
 app/src/main/res/values/strings.xml                       | 8 ++++----
 app/src/main/res/values/styles.xml                        | 6 +++---
 app/src/main/res/values/themes.xml                        | 2 ++
 .../oppia/android/app/player/audio/AudioFragmentTest.kt   | 2 +-
 .../app/player/exploration/ExplorationActivityTest.kt     | 2 +-
 .../android/app/player/state/StateFragmentLocalTest.kt    | 2 +-
 23 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/app/src/main/res/layout-land/onboarding_slide_final.xml b/app/src/main/res/layout-land/onboarding_slide_final.xml
index 6881cdcbcce..a62021edc69 100644
--- a/app/src/main/res/layout-land/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-land/onboarding_slide_final.xml
@@ -79,6 +79,7 @@
         android:text="@string/get_started"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="14sp"
+        android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/slide_image_view"
         app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
diff --git a/app/src/main/res/layout-land/resume_lesson_fragment.xml b/app/src/main/res/layout-land/resume_lesson_fragment.xml
index 41675fc3d42..e317a2eff27 100644
--- a/app/src/main/res/layout-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-land/resume_lesson_fragment.xml
@@ -81,7 +81,7 @@
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
           android:text="@string/start_over_lesson_button"
-          android:textAllCaps="true"
+          android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
           android:textSize="14sp"
           app:backgroundTint="@null"
@@ -100,7 +100,7 @@
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
           android:text="@string/resume_lesson_button"
-          android:textAllCaps="true"
+          android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="14sp"
           app:backgroundTint="@null"
diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
index 2877085c736..b33f3480486 100644
--- a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
@@ -73,6 +73,7 @@
         android:text="@string/get_started"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="14sp"
+        android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="@+id/slide_title_text_view"
         app:layout_constraintStart_toStartOf="@+id/slide_title_text_view"
         app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
diff --git a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
index bd3bad52c20..5997f1069a4 100644
--- a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
@@ -111,7 +111,7 @@
             android:minWidth="144dp"
             android:minHeight="@dimen/clickable_item_min_height"
             android:text="@string/start_over_lesson_button"
-            android:textAllCaps="true"
+            android:textAllCaps="false"
             android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
             android:textSize="14sp"
             app:backgroundTint="@null"
@@ -130,7 +130,7 @@
             android:minWidth="144dp"
             android:minHeight="@dimen/clickable_item_min_height"
             android:text="@string/resume_lesson_button"
-            android:textAllCaps="true"
+            android:textAllCaps="false"
             android:textColor="@color/component_color_shared_secondary_4_text_color"
             android:textSize="14sp"
             app:backgroundTint="@null"
diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
index ce4f739f08d..7d56635942f 100644
--- a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
@@ -80,6 +80,7 @@
         android:text="@string/get_started"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="20sp"
+        android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml
index 6a0c53c3282..417092d77a1 100644
--- a/app/src/main/res/layout/add_profile_activity.xml
+++ b/app/src/main/res/layout/add_profile_activity.xml
@@ -237,7 +237,6 @@
             android:enabled="@{viewModel.isButtonActive()}"
             android:gravity="center"
             android:text="@string/add_profile_create_btn"
-            android:textAllCaps="true"
             android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_pin_constraint_layout" />
diff --git a/app/src/main/res/layout/concept_card_fragment_test_activity.xml b/app/src/main/res/layout/concept_card_fragment_test_activity.xml
index 9fbbdcb7b6f..4894aac319d 100644
--- a/app/src/main/res/layout/concept_card_fragment_test_activity.xml
+++ b/app/src/main/res/layout/concept_card_fragment_test_activity.xml
@@ -7,11 +7,13 @@
     android:id="@+id/open_dialog_0"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="Concept Card 1" />
+    android:text="Concept Card 1"
+    android:textAllCaps="false"/>
 
   <Button
     android:id="@+id/open_dialog_1"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="Concept Card 2" />
+    android:text="Concept Card 2"
+    android:textAllCaps="false" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/exploration_test_activity.xml b/app/src/main/res/layout/exploration_test_activity.xml
index 3ecfb09afe5..d693b80a73c 100644
--- a/app/src/main/res/layout/exploration_test_activity.xml
+++ b/app/src/main/res/layout/exploration_test_activity.xml
@@ -10,7 +10,8 @@
     android:id="@+id/play_exploration_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="Play exploration" />
+    android:text="Play exploration"
+    android:textAllCaps="false"/>
 
   <FrameLayout
     android:id="@+id/exploration_test_fragment_placeholder"
diff --git a/app/src/main/res/layout/hint_summary.xml b/app/src/main/res/layout/hint_summary.xml
index 1c622352582..f25a4fa3774 100644
--- a/app/src/main/res/layout/hint_summary.xml
+++ b/app/src/main/res/layout/hint_summary.xml
@@ -80,6 +80,7 @@
             android:text="@string/reveal_hint"
             android:textColor="@color/component_color_hints_and_solution_summary_button_text_color"
             android:textSize="14sp"
+            android:textAllCaps="false"
             android:visibility="@{viewModel.isHintRevealed? View.GONE : View.VISIBLE}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/math_expression_parser_fragment.xml b/app/src/main/res/layout/math_expression_parser_fragment.xml
index eb89dbe458a..b69a79c2ad9 100644
--- a/app/src/main/res/layout/math_expression_parser_fragment.xml
+++ b/app/src/main/res/layout/math_expression_parser_fragment.xml
@@ -79,7 +79,6 @@
           android:enabled="true"
           android:onClick="@{(v) -> viewModel.onParseButtonClicked()}"
           android:text="@string/math_expression_parse_button_label"
-          android:textAllCaps="true"
           android:textSize="14sp"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/onboarding_slide_final.xml b/app/src/main/res/layout/onboarding_slide_final.xml
index ea11c502df8..ee4bc712c2b 100644
--- a/app/src/main/res/layout/onboarding_slide_final.xml
+++ b/app/src/main/res/layout/onboarding_slide_final.xml
@@ -81,6 +81,7 @@
         android:text="@string/get_started"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="14sp"
+        android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
diff --git a/app/src/main/res/layout/profile_rename_fragment.xml b/app/src/main/res/layout/profile_rename_fragment.xml
index a295c823615..2c78c153a4b 100644
--- a/app/src/main/res/layout/profile_rename_fragment.xml
+++ b/app/src/main/res/layout/profile_rename_fragment.xml
@@ -61,7 +61,6 @@
         android:clickable="@{viewModel.inputName.length > 0}"
         android:enabled="@{viewModel.inputName.length > 0}"
         android:text="@string/profile_rename_save"
-        android:textAllCaps="true"
         android:textColor="@{viewModel.inputName.length > 0 ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/profile_reset_pin_fragment.xml b/app/src/main/res/layout/profile_reset_pin_fragment.xml
index 98a19bb8e75..009f5ca5388 100644
--- a/app/src/main/res/layout/profile_reset_pin_fragment.xml
+++ b/app/src/main/res/layout/profile_reset_pin_fragment.xml
@@ -105,7 +105,6 @@
           android:clickable="@{viewModel.isButtonActive()}"
           android:enabled="@{viewModel.isButtonActive()}"
           android:text="@string/profile_rename_save"
-          android:textAllCaps="true"
           android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toBottomOf="@id/profile_reset_input_confirm_pin" />
diff --git a/app/src/main/res/layout/resume_lesson_fragment.xml b/app/src/main/res/layout/resume_lesson_fragment.xml
index 4a2ee1e4fd6..9b07c7743ba 100644
--- a/app/src/main/res/layout/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout/resume_lesson_fragment.xml
@@ -96,7 +96,7 @@
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
           android:text="@string/start_over_lesson_button"
-          android:textAllCaps="true"
+          android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
           android:textSize="14sp"
           app:backgroundTint="@null"
@@ -114,7 +114,7 @@
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
           android:text="@string/resume_lesson_button"
-          android:textAllCaps="true"
+          android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="14sp"
           app:backgroundTint="@null"
diff --git a/app/src/main/res/layout/solution_summary.xml b/app/src/main/res/layout/solution_summary.xml
index 4c71087fc2f..9a6e50ed026 100644
--- a/app/src/main/res/layout/solution_summary.xml
+++ b/app/src/main/res/layout/solution_summary.xml
@@ -80,6 +80,7 @@
             android:text="@string/show_solution"
             android:textColor="@color/component_color_hints_and_solution_summary_button_text_color"
             android:textSize="14sp"
+            android:textAllCaps="false"
             android:visibility="@{viewModel.isSolutionRevealed()? View.GONE : View.VISIBLE}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/state_fragment_test_activity.xml b/app/src/main/res/layout/state_fragment_test_activity.xml
index ed973f239e2..168334e4845 100644
--- a/app/src/main/res/layout/state_fragment_test_activity.xml
+++ b/app/src/main/res/layout/state_fragment_test_activity.xml
@@ -32,6 +32,7 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="16dp"
       android:text="Play exploration"
+      android:textAllCaps="false"
       android:visibility="@{viewModel.hasExplorationStarted ? View.GONE : View.VISIBLE}" />
   </FrameLayout>
 </layout>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index dea4baa8df3..4b80e568427 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -42,5 +42,6 @@
     <item name="android:textColorPrimary">@color/component_color_shared_primary_dark_text_color</item>
     <item name="android:buttonBarNegativeButtonStyle">@style/textAllCaps</item>
     <item name="android:buttonBarPositiveButtonStyle">@style/textAllCaps</item>
+    <item name="android:textAllCaps">false</item>
   </style>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f48fef86cc..91bddd9bb59 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,13 +15,13 @@
   <string name="audio_play_description">Play audio</string>
   <string name="audio_pause_description">Pause audio</string>
   <string name="audio_unavailable_in_selected_language">%s audio is unavailable.</string>
-  <string name="audio_language_select_dialog_okay_button">OK</string>
+  <string name="audio_language_select_dialog_okay_button">Ok</string>
   <string name="audio_language_select_dialog_cancel_button">Cancel</string>
   <string name="audio_language_select_dialog_title">Audio Language</string>
   <string name="audio_dialog_offline_title">Currently Offline</string>
   <string name="audio_dialog_offline_message">Make sure Wi-Fi or cellular data is turned on, then try again.</string>
-  <string name="audio_dialog_offline_positive">OK</string>
-  <string name="cellular_data_alert_dialog_okay_button">OK</string>
+  <string name="audio_dialog_offline_positive">Ok</string>
+  <string name="cellular_data_alert_dialog_okay_button">Ok</string>
   <string name="cellular_data_alert_dialog_cancel_button">Cancel</string>
   <string name="cellular_data_alert_dialog_title">Currently on Cellular Data</string>
   <string name="cellular_data_alert_dialog_description">Streaming audio may use a lot of cellular data.</string>
@@ -376,7 +376,7 @@
   <!-- ProfileRenameActivity -->
   <string name="profile_rename_activity_title">Rename Profile</string>
   <string name="profile_rename_label">New Name</string>
-  <string name="profile_rename_save">save</string>
+  <string name="profile_rename_save">Save</string>
   <!-- ProfileResetPinActivity -->
   <string name="profile_reset_pin_activity_title">Reset PIN</string>
   <string name="profile_reset_pin_main">Enter a new PIN for the user to enter when accessing their profile.</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 149d87fd1d1..815ceccc4b7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -68,7 +68,7 @@
     <item name="android:background">@drawable/state_button_primary_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
-    <item name="android:textAllCaps">true</item>
+    <item name="android:textAllCaps">false</item>
     <item name="android:textColor">@color/component_color_shared_secondary_4_text_color</item>
     <item name="android:textSize">14sp</item>
   </style>
@@ -125,7 +125,7 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:padding">8dp</item>
-    <item name="android:textAllCaps">true</item>
+    <item name="android:textAllCaps">false</item>
     <item name="android:background">@android:color/transparent</item>
     <item name="android:textColor">#56000000</item>
     <item name="android:textSize">14sp</item>
@@ -418,7 +418,7 @@
     <item name="android:minWidth">144dp</item>
     <item name="android:drawablePadding">4dp</item>
     <item name="drawableTint">@color/component_color_shared_secondary_button_background_trim_color</item>
-    <item name="android:textAllCaps">true</item>
+    <item name="android:textAllCaps">false</item>
     <item name="android:textColor">@color/component_color_shared_secondary_button_background_trim_color</item>
     <item name="android:textSize">14sp</item>
   </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 133c3165692..53afcd7a7db 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -38,6 +38,7 @@
     <item name="textColorAlertDialogListItem">@color/component_color_shared_primary_dark_text_color</item>
     <item name="colorControlNormal">@color/component_color_shared_dialogs_radio_button_unchecked_color</item>
     <item name="colorControlActivated">@color/component_color_shared_dialogs_radio_button_checked_color</item>
+    <item name="android:textAllCaps">false</item>
   </style>
 
   <style name="OppiaSwitchCompatTheme" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
@@ -50,6 +51,7 @@
     <item name="colorAccent">@color/component_color_shared_dialogs_primary_color</item>
     <item name="colorBackgroundFloating">@color/component_color_shared_item_background_solid_color</item>
     <item name="android:textColorPrimary">@color/component_color_shared_primary_dark_text_color</item>
+    <item name="android:textAllCaps">false</item>
   </style>
 
   <style name="DeprecationAlertDialogTheme" parent="OppiaAlertDialogTheme">
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt
index 48353183d5c..bf224018f5e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt
@@ -334,7 +334,7 @@ class AudioFragmentTest {
         .perform(click())
 
       testCoroutineDispatchers.runCurrent()
-      onView(withText("OK")).inRoot(isDialog()).perform(click())
+      onView(withText("Ok")).inRoot(isDialog()).perform(click())
 
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.play_pause_audio_icon))
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index bb97f37ed2c..27c75850e7d 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1062,7 +1062,7 @@ class ExplorationActivityTest {
       onView(withId(R.id.cellular_data_dialog_checkbox))
         .inRoot(isDialog())
         .perform(click())
-      onView(withText(context.getString(R.string.audio_language_select_dialog_okay_button)))
+      onView(withText(context.getString(R.string.cellular_data_alert_dialog_okay_button)))
         .inRoot(isDialog())
         .perform(click())
 
diff --git a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
index cdf8b5bd772..1153c881562 100644
--- a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
@@ -1409,7 +1409,7 @@ class StateFragmentLocalTest {
       showRevealSolutionDialog()
       clickCancelInRevealSolutionDialog(scenario)
 
-      onView(withText("SHOW SOLUTION"))
+      onView(withText("Show solution"))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
     }

From 716d3a0b413473c14e5d3aa97f0b71d68cec6f6d Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Sun, 1 Oct 2023 18:04:11 +0530
Subject: [PATCH 06/32] Fix #4649: Updates audio option name (#5165)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

Fixes #4649

This PR changes the `audio_language` & `audio_language_activity_title`
string in `strings.xml` file to `Preferred Audio Language`.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

<img
src="https://github.com/oppia/oppia-android/assets/84731134/ee45c13d-5181-4cc8-991c-73a204884eae"
width="300"/>
<img
src="https://github.com/oppia/oppia-android/assets/84731134/b4cc6942-43fa-45f5-8dd0-081eeae7b064"
width="300"/>
---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 91bddd9bb59..d05ee30706f 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -413,12 +413,12 @@
   <string name="app_version_activity_title">App Version</string>
   <!-- OptionsActivity -->
   <string name="app_language_activity_title">App Language</string>
-  <string name="audio_language_activity_title">Default Audio Language</string>
+  <string name="audio_language_activity_title">Preferred Audio Language</string>
   <string name="reading_text_size_activity_title">Reading Text Size</string>
   <string name="title_reading_text_size">Reading Text Size</string>
   <string name="story_text_will_look_like_this">Story text will look like this.</string>
   <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language">Default Audio</string>
+  <string name="audio_language">Preferred Audio Language</string>
   <string name="app_language">App Language</string>
   <string name="reading_text_size">Reading Text Size</string>
   <string name="reading_text_size_small">Small</string>

From 590ecdf7356524d1b1412167c03040bfff35de8f Mon Sep 17 00:00:00 2001
From: Vishwajith Shettigar
 <76042077+Vishwajith-Shettigar@users.noreply.github.com>
Date: Sun, 1 Oct 2023 23:54:29 +0530
Subject: [PATCH 07/32] Fix #5164 Format strings.xml(values-en) so that string
 tags are on one line (#5166)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fix #5164 , format the strings.xml(values-en).
Because some strings are multiline, they are parsed with newlines on
translatewiki which cascades down to the translated strings. This causes
a problem with display. So formatted them to single line
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 app/src/main/res/values/strings.xml | 88 ++++++++---------------------
 1 file changed, 22 insertions(+), 66 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d05ee30706f..76818825418 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -164,21 +164,11 @@
   <string name="number_error_starting_with_floating_point">Please begin your answer with a number (e.g.,”0” in 0.5).</string>
   <string name="number_error_invalid_format">Please enter a valid number.</string>
   <string name="number_error_larger_than_fifteen_characters">The answer can contain at most 15 digits (0–9) or symbols (. or -).</string>
-  <string name="ratio_error_invalid_chars" description="The error message for ratio when there is any other character used than 0123456789:. ">
-    Please write a ratio that consists of digits separated by colons (e.g. 1:2 or 1:2:3).
-  </string>
-  <string name="ratio_error_invalid_format" description="The error message for ratio when the format is invalid. For e.g. 1:2:3: or 1:2 3:4 ">
-    Please enter a valid ratio (e.g. 1:2 or 1:2:3).
-  </string>
-  <string name="ratio_error_invalid_colons" description="The error message for ratio when there is colons next to each other.">
-    Your answer has two colons (:) next to each other.
-  </string>
-  <string name="ratio_error_invalid_size" description="The error message for ratio when there is less number of terms than the creator has specified in customization arg.">
-    Number of terms is not equal to the required terms.
-  </string>
-  <string name="ratio_error_includes_zero" description="The error message for ratio when there is 0 term in the ratio.">
-    Ratios cannot have 0 as an element.
-  </string>
+  <string name="ratio_error_invalid_chars" description="The error message for ratio when there is any other character used than 0123456789:. ">Please write a ratio that consists of digits separated by colons (e.g. 1:2 or 1:2:3).</string>
+  <string name="ratio_error_invalid_format" description="The error message for ratio when the format is invalid. For e.g. 1:2:3: or 1:2 3:4 ">Please enter a valid ratio (e.g. 1:2 or 1:2:3).</string>
+  <string name="ratio_error_invalid_colons" description="The error message for ratio when there is colons next to each other.">Your answer has two colons (:) next to each other.</string>
+  <string name="ratio_error_invalid_size" description="The error message for ratio when there is less number of terms than the creator has specified in customization arg.">Number of terms is not equal to the required terms.</string>
+  <string name="ratio_error_includes_zero" description="The error message for ratio when there is 0 term in the ratio.">Ratios cannot have 0 as an element.</string>
   <string name="unknown_size">Unknown size</string>
   <string name="size_bytes">%s Bytes</string>
   <string name="size_kb">%s KB</string>
@@ -188,54 +178,30 @@
   <string name="topic_prefix">Topic: %s</string>
   <string name="welcome_profile_name">%s!</string>
   <plurals name="chapter_count">
-    <item quantity="one">
-      1 Chapter
-    </item>
-    <item quantity="other">
-      %s Chapters
-    </item>
+    <item quantity="one">1 Chapter</item>
+    <item quantity="other">%s Chapters</item>
   </plurals>
   <plurals name="story_count">
-    <item quantity="one">
-      1 Story
-    </item>
-    <item quantity="other">
-      %s Stories
-    </item>
+    <item quantity="one">1 Story</item>
+    <item quantity="other">%s Stories</item>
   </plurals>
   <plurals name="story_total_chapters">
     <item quantity="one">%s of %s Chapter Completed</item>
     <item quantity="other">%s of %s Chapters Completed</item>
   </plurals>
   <plurals name="lesson_count">
-    <item quantity="one">
-      1 Lesson
-    </item>
-    <item quantity="other">
-      %s Lessons
-    </item>
+    <item quantity="one">1 Lesson</item>
+    <item quantity="other">%s Lessons</item>
   </plurals>
   <plurals name="completed_story_count">
-    <item quantity="one">
-      1 Story Completed
-    </item>
-    <item quantity="other">
-      %s Stories Completed
-    </item>
-    <item quantity="zero">
-      %s Stories Completed
-    </item>
+    <item quantity="one">1 Story Completed</item>
+    <item quantity="other">%s Stories Completed</item>
+    <item quantity="zero">%s Stories Completed</item>
   </plurals>
   <plurals name="ongoing_topic_count">
-    <item quantity="one">
-      1 Topic in Progress
-    </item>
-    <item quantity="other">
-      %s Topics in Progress
-    </item>
-    <item quantity="zero">
-      %s Topics in Progress
-    </item>
+    <item quantity="one">1 Topic in Progress</item>
+    <item quantity="other">%s Topics in Progress</item>
+    <item quantity="zero">%s Topics in Progress</item>
   </plurals>
   <string name="bar_separator">\u0020|\u0020</string>
   <!-- ProfileChooserFragment -->
@@ -499,15 +465,9 @@
   <string name="completed_story_list_recyclerview_tag">completed_story_list_recyclerview_tag</string>
   <string name="item_selection_text">Please select all correct choices.</string>
   <!-- SplashActivity -->
-  <string name="unsupported_app_version_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">
-    Unsupported app version
-  </string>
-  <string name="unsupported_app_version_dialog_message" description="The main message of the dialog shown when a user's pre-release app has expired.">
-    This version of the app is no longer supported. Please update it through the Play Store.
-  </string>
-  <string name="unsupported_app_version_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">
-    Close app
-  </string>
+  <string name="unsupported_app_version_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">Unsupported app version</string>
+  <string name="unsupported_app_version_dialog_message" description="The main message of the dialog shown when a user's pre-release app has expired.">This version of the app is no longer supported. Please update it through the Play Store.</string>
+  <string name="unsupported_app_version_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">Close app</string>
   <string name="splash_screen_developer_label">Developer Build</string>
   <string name="splash_screen_alpha_label">Alpha</string>
   <string name="splash_screen_beta_label">Beta</string>
@@ -519,12 +479,8 @@
   <string name="general_availability_notice_dialog_message">Hello! Your app is now being updated to the General Availability version. If you experience problems while using the app, or have questions, please contact us at android-feedback@oppia.org.</string>
   <string name="general_availability_notice_dialog_do_not_show_again_text">Don\'t show this message again</string>
   <string name="general_availability_notice_dialog_close_button_text">OK</string>
-  <string name="ratio_content_description_separator" description="The separator that would be used to build the text that would be read out for ratio interaction.For e.g if the input is 1:2:3 the read out text would be 1 to 2 to 3">
-    \u0020to\u0020
-  </string>
-  <string name="ratio_default_hint_text" description="The default hint text for the ratio interaction if the placeholder text is not available.">
-    Enter a ratio in the form x:y.
-  </string>
+  <string name="ratio_content_description_separator" description="The separator that would be used to build the text that would be read out for ratio interaction.For e.g if the input is 1:2:3 the read out text would be 1 to 2 to 3">\u0020to\u0020</string>
+  <string name="ratio_default_hint_text" description="The default hint text for the ratio interaction if the placeholder text is not available.">Enter a ratio in the form x:y.</string>
   <string name="text_input_default_hint_text">Tap here to enter text.</string>
   <string name="smallest_text_size_content_description">Smallest text size</string>
   <string name="largest_text_size_content_description">Largest text size</string>

From 3103b0c01ae1552f8f8f44361821937c19a45745 Mon Sep 17 00:00:00 2001
From: aayushimathur6 <92685651+aayushimathur6@users.noreply.github.com>
Date: Thu, 5 Oct 2023 14:15:13 +0530
Subject: [PATCH 08/32] Fixes #2399: Reformatting required in dimension file
 for better structure (#5168)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  --> Fixes #2399
This PR has restructured the dimens.xml files. The file is too large so
just rearranged the dimensions to form the groups on the base of their
name, so that we find all the the dimensions related to a particular
category at once with ease.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 app/src/main/res/values/dimens.xml | 474 ++++++++++++++---------------
 1 file changed, 222 insertions(+), 252 deletions(-)

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f14ef3f518e..11592246d65 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,348 +18,324 @@
   <dimen name="bottom_white_space">160dp</dimen>
   <dimen name="text_input_layout_corner_radius">4dp</dimen>
   <dimen name="text_input_layout_stroke_width">1dp</dimen>
+  <dimen name="default_reading_text_size">18sp</dimen>
 
-  <dimen name="clickable_item_min_height">48dp</dimen>
+  <dimen name="space_0dp">0dp</dimen>
+  <dimen name="dot_width_height">12dp</dimen>
+  <dimen name="dot_gap">12dp</dimen>
 
+  <!-- Ongoing Story Card View -->
   <dimen name="ongoing_story_card_view_is_tablet_margin_top">28dp</dimen>
   <dimen name="ongoing_story_card_view_margin_top_portrait_story_grid_greater_then_2">28dp</dimen>
   <dimen name="ongoing_story_card_view_margin_top_landscape">28dp</dimen>
+  <dimen name="ongoing_story_card_view_margin_top_portrait">16dp</dimen>
+
+  <!-- Font Scale -->
   <dimen name="font_scale_content_extra_large_text_view_size">28dp</dimen>
-  <dimen name="state_fragment_non_split_view_margin_end">28dp</dimen>
-  <dimen name="state_fragment_non_split_view_margin_start">28dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_bottom_profile_not_added">28dp</dimen>
+  <dimen name="font_scale_content_small_text_view_size">16dp</dimen>
+  <dimen name="font_scale_content_large_text_view_size">24dp</dimen>
+  <dimen name="font_scale_content_text_size">20dp</dimen>
+
+  <!-- Profile Chooser Fragment -->
+  <dimen name="profile_chooser_fragment_profile_select_text_margin_top">64dp</dimen>
+  <dimen name="profile_chooser_fragment_profile_recycler_view_margin_top">36dp</dimen>
+  <dimen name="profile_chooser_fragment_margin_top_profile_already_added">24dp</dimen>
+
+  <!--  Profile Chooser Profile View -->
+  <dimen name="profile_chooser_profile_view_view_margin_top">60dp</dimen>
   <dimen name="profile_chooser_profile_view_margin_bottom_profile_not_added">28dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_start_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_top_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_bottom_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_start">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_end">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_end_profile_already_added">24dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_top_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_start_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_end_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_profile_view_divider_margin_top">40dp</dimen>
+  <dimen name="profile_chooser_profile_view_name_margin_top_profile_already_added">8dp</dimen>
+  <dimen name="profile_chooser_profile_view_circular_image_margin_top_profile_already_added">48dp</dimen>
+  <dimen name="profile_chooser_profile_view_parent_margin_start_profile_not_added">298dp</dimen>
+  <dimen name="profile_chooser_profile_view_parent_margin_end_profile_not_added">298dp</dimen>
+  <dimen name="profile_chooser_profile_view_parent_padding">4dp</dimen>
+  <dimen name="profile_chooser_profile_view_is_admin_margin_top_profile_already_added">8dp</dimen>
+  <dimen name="profile_chooser_profile_view_is_admin_margin_top">4dp</dimen>
+  <dimen name="profile_chooser_profile_view_last_visited_margin_top_profile_not_added">4dp</dimen>
+  <dimen name="profile_chooser_profile_view_last_visited_margin_start_profile_not_added">12dp</dimen>
+  <dimen name="profile_chooser_profile_view_last_visited_margin_top_profile_already_added">8dp</dimen>
 
+  <!-- Profile Chooser Margin -->
+  <dimen name="profile_chooser_margin_start_profile_already_added">72dp</dimen>
+  <dimen name="profile_chooser_margin_end_profile_already_added">72dp</dimen>
+  <dimen name="profile_chooser_margin_top_profile_already_added">0dp</dimen>
+  <dimen name="profile_chooser_margin_top_profile_not_added">84dp</dimen>
+  <dimen name="profile_chooser_setting_icon_margin_end">96dp</dimen>
+  <dimen name="profile_chooser_profile_select_text_margin_start">96dp</dimen>
+  <dimen name="profile_chooser_padding_bottom_profile_already_added">224dp</dimen>
+  <dimen name="profile_chooser_administrator_controls_margin_bottom">28dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_bottom_profile_not_added">28dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_start_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_end_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_top_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_top_profile_not_added">60dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_end_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_start_profile_not_added">24dp</dimen>
   <dimen name="profile_chooser_add_view_parent_margin_start_profile_not_added">298dp</dimen>
   <dimen name="profile_chooser_add_view_parent_margin_end_profile_not_added">298dp</dimen>
-  <dimen name="profile_chooser_profile_view_parent_margin_start_profile_not_added">298dp</dimen>
-  <dimen name="profile_chooser_profile_view_parent_margin_end_profile_not_added">298dp</dimen>
+  <dimen name="profile_chooser_add_view_circular_image_margin_top_profile_already_added">48dp</dimen>
+  <dimen name="profile_chooser_description_margin_start_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_description_margin_end_profile_not_added">24dp</dimen>
 
+  <!-- DragAndDrop -->
   <dimen name="drag_drop_item_exploration_split_view_margin_end">40dp</dimen>
+  <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
+  <dimen name="drag_drop_item_exploration_split_view_margin_top">32dp</dimen>
   <dimen name="drag_drop_item_exploration_view_margin_start">40dp</dimen>
+  <dimen name="drag_drop_item_exploration_view_margin_top">24dp</dimen>
+  <dimen name="drag_drop_item_exploration_view_margin_end">24dp</dimen>
+  <dimen name="drag_drop_item_question_split_view_margin_end">32dp</dimen>
+  <dimen name="drag_drop_item_question_split_view_margin_start">32dp</dimen>
   <dimen name="drag_drop_item_question_split_view_margin_top">40dp</dimen>
+  <dimen name="drag_drop_item_question_view_margin_end">32dp</dimen>
+  <dimen name="drag_drop_item_question_view_margin_start">32dp</dimen>
+  <dimen name="drag_drop_item_question_view_margin_top">24dp</dimen>
+  <dimen name="drag_drop_interaction_item_padding_start">16dp</dimen>
+  <dimen name="drag_drop_interaction_item_padding_top">16dp</dimen>
+  <dimen name="drag_drop_interaction_item_padding_end">16dp</dimen>
+  <dimen name="drag_drop_interaction_item_padding_bottom">16dp</dimen>
+  <dimen name="drag_drop_interaction_item_recycler_view_margin_top">4dp</dimen>
+  <dimen name="drag_drop_interaction_items_margin_top">4dp</dimen>
+  <dimen name="drag_drop_interaction_items_margin_bottom">4dp</dimen>
+  <dimen name="drag_drop_interaction_item_exploration_view_margin_start">80dp</dimen>
+  <dimen name="drag_drop_grouping_hint_split_text_view_margin_top">16dp</dimen>
+  <dimen name="drag_drop_grouping_hint_split_text_view_margin_start">16dp</dimen>
+  <dimen name="drag_drop_grouping_hint_non_split_text_view_margin_start">12dp</dimen>
+  <dimen name="drag_drop_grouping_hint_non_split_text_view_margin_top">8dp</dimen>
+  <dimen name="drag_drop_container_parent_non_split_margin_end">8dp</dimen>
+  <dimen name="drag_drop_container_parent_non_split_margin_start">8dp</dimen>
+  <dimen name="drag_drop_content_group_item_margin">8dp</dimen>
+
+  <!-- State Fragment -->
+  <dimen name="state_fragment_with_audio_bar_visible_padding_top">72dp</dimen>
+  <dimen name="state_fragment_padding_top_audio_bar_visible">48dp</dimen>
+  <dimen name="state_fragment_split_view_margin_start">32dp</dimen>
+  <dimen name="state_fragment_split_view_margin_end">32dp</dimen>
+  <dimen name="state_fragment_non_split_view_margin_end">28dp</dimen>
+  <dimen name="state_fragment_non_split_view_margin_start">28dp</dimen>
+
+  <!-- Input Interaction Item Conversation View -->
   <dimen name="numeric_input_interaction_item_conversation_view_margin_start">40dp</dimen>
+  <dimen name="numeric_input_interaction_item_conversation_view_margin_end">24dp</dimen>
   <dimen name="ratio_input_interaction_item_conversation_view_margin_start">40dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_start">40dp</dimen>
-  <dimen name="submitted_answer_exploration_view_margin_start">40dp</dimen>
+  <dimen name="ratio_input_interaction_item_conversation_view_margin_end">24dp</dimen>
   <dimen name="text_input_interaction_item_conversation_view_margin_start">40dp</dimen>
+  <dimen name="text_input_interaction_item_conversation_view_margin_end">24dp</dimen>
+  <dimen name="text_input_interaction_item_margin_start">80dp</dimen>
+
+  <!-- Submitted Answer -->
+  <dimen name="submitted_answer_exploration_split_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_end">24dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_top">24dp</dimen>
   <dimen name="submitted_answer_exploration_split_view_margin_start_no_extra_interaction_answer">40dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_end_no_extra_interaction_answer">24dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer">24dp</dimen>
   <dimen name="submitted_answer_exploration_split_view_margin_top_extra_interaction_answer">40dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_end_extra_interaction_answer">64dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_start_extra_interaction_answer">64dp</dimen>
+  <dimen name="submitted_answer_exploration_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_exploration_view_margin_end">24dp</dimen>
+  <dimen name="submitted_answer_exploration_view_margin_top">24dp</dimen>
   <dimen name="submitted_answer_question_split_view_margin_start_no_extra_interaction_answer">40dp</dimen>
   <dimen name="submitted_answer_question_split_view_margin_top_extra_interaction_answer">40dp</dimen>
-  <dimen name="profile_chooser_profile_view_divider_margin_top">40dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_end_no_extra_interaction_answer">24dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_top_no_extra_interaction_answer">24dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_end_extra_interaction_answer">64dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_start_extra_interaction_answer">64dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_question_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_question_view_margin_end">64dp</dimen>
+  <dimen name="submitted_answer_question_view_margin_start">64dp</dimen>
+  <dimen name="submitted_answer_text_conversation_view_padding_bottom">16dp</dimen>
+  <dimen name="submitted_answer_text_conversation_view_padding_top">16dp</dimen>
+  <dimen name="submitted_answer_text_non_conversation_view_padding_top">8dp</dimen>
+  <dimen name="submitted_answer_text_non_conversation_view_padding_bottom">8dp</dimen>
 
   <!-- Profile List Profile View -->
   <dimen name="profile_list_profile_view_margin_start">28dp</dimen>
 
-  <dimen name="profile_chooser_profile_view_parent_padding">4dp</dimen>
-  <dimen name="profile_chooser_profile_view_is_admin_margin_top">4dp</dimen>
-  <dimen name="profile_chooser_profile_view_last_visited_margin_top_profile_not_added">4dp</dimen>
-  <dimen name="space_0dp">0dp</dimen>
-  <dimen name="dot_width_height">12dp</dimen>
-  <dimen name="dot_gap">12dp</dimen>
+  <!-- Profile View -->
+  <dimen name="profile_view_already_added_margin">20dp</dimen>
+  <dimen name="profile_view_already_added_description_parent_margin_top">8dp</dimen>
+  <dimen name="profile_view_not_added_margin">20dp</dimen>
+
+  <!-- Enter Text View -->
   <dimen name="enter_text_view_padding_start">60dp</dimen>
   <dimen name="enter_text_view_padding_end">60dp</dimen>
-  <dimen name="home_padding_end">20dp</dimen>
-  <dimen name="home_padding_start">20dp</dimen>
-  <dimen name="home_outer_margin">28dp</dimen>
-  <dimen name="home_welcome_outer_padding">28dp</dimen>
-  <dimen name="home_welcome_text_view_margin_end">4dp</dimen>
-  <dimen name="home_inner_margin">8dp</dimen>
-  <dimen name="recently_played_margin_max">28dp</dimen>
-  <dimen name="recently_played_margin_min">8dp</dimen>
-  <dimen name="coming_soon_padding_end">16dp</dimen>
-  <dimen name="coming_soon_padding_start">12dp</dimen>
 
-  <dimen name="default_reading_text_size">18sp</dimen>
-  <dimen name="font_scale_content_text_size">20dp</dimen>
-  <dimen name="profile_view_already_added_margin">20dp</dimen>
-  <dimen name="profile_view_not_added_margin">20dp</dimen>
+  <!-- Walkthrough Fragment -->
   <dimen name="walkthrough_topic_summary_container_margin">20dp</dimen>
+  <dimen name="walkthrough_final_fragment_card_content_padding">24dp</dimen>
+  <dimen name="walkthrough_final_no_button_margin_end">8dp</dimen>
+  <dimen name="walkthrough_final_yes_button_margin_start">8dp</dimen>
 
-  <dimen name="ongoing_story_card_view_margin_top_portrait">16dp</dimen>
-  <dimen name="font_scale_content_small_text_view_size">16dp</dimen>
+  <!-- Continue Interaction Item -->
   <dimen name="continue_interaction_item_exploration_view_margin_top">16dp</dimen>
+  <dimen name="continue_interaction_item_exploration_view_margin_end">24dp</dimen>
+  <dimen name="continue_interaction_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_padding_bottom">16dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_padding_end">16dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_padding_start">16dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_padding_top">16dp</dimen>
   <dimen name="continue_interaction_item_question_view_margin_top">16dp</dimen>
+  <dimen name="continue_interaction_item_question_view_margin_end">24dp</dimen>
+  <dimen name="continue_interaction_item_question_view_margin_start">24dp</dimen>
   <dimen name="continue_interaction_item_question_view_padding_bottom">16dp</dimen>
   <dimen name="continue_interaction_item_question_view_padding_end">16dp</dimen>
   <dimen name="continue_interaction_item_question_view_padding_start">16dp</dimen>
   <dimen name="continue_interaction_item_question_view_padding_top">16dp</dimen>
+
+  <!-- Continue Navigation Item -->
   <dimen name="continue_navigation_item_exploration_view_margin_top">16dp</dimen>
+  <dimen name="continue_navigation_item_exploration_view_margin_end">24dp</dimen>
+  <dimen name="continue_navigation_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="continue_navigation_item_exploration_view_padding_bottom">16dp</dimen>
   <dimen name="continue_navigation_item_exploration_view_padding_end">16dp</dimen>
   <dimen name="continue_navigation_item_exploration_view_padding_start">16dp</dimen>
   <dimen name="continue_navigation_item_exploration_view_padding_top">16dp</dimen>
   <dimen name="continue_navigation_item_question_view_margin_top">16dp</dimen>
+  <dimen name="continue_navigation_item_question_view_margin_end">24dp</dimen>
+  <dimen name="continue_navigation_item_question_view_margin_start">24dp</dimen>
   <dimen name="continue_navigation_item_question_view_padding_bottom">16dp</dimen>
   <dimen name="continue_navigation_item_question_view_padding_end">16dp</dimen>
   <dimen name="continue_navigation_item_question_view_padding_start">16dp</dimen>
   <dimen name="continue_navigation_item_question_view_padding_top">16dp</dimen>
-  <dimen name="drag_drop_grouping_hint_split_text_view_margin_top">16dp</dimen>
-  <dimen name="drag_drop_grouping_hint_split_text_view_margin_start">16dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_start_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_end_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_top_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_start_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_top_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_bottom_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_start">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_end">16dp</dimen>
-  <dimen name="submitted_answer_text_conversation_view_padding_bottom">16dp</dimen>
-  <dimen name="submitted_answer_text_conversation_view_padding_top">16dp</dimen>
-
-  <dimen name="topic_list_item_margin_top_bottom">12dp</dimen>
-  <dimen name="drag_drop_grouping_hint_non_split_text_view_margin_start">12dp</dimen>
-  <dimen name="profile_chooser_profile_view_last_visited_margin_start_profile_not_added">12dp</dimen>
-
-  <dimen name="font_scale_content_large_text_view_size">24dp</dimen>
-  <dimen name="continue_interaction_item_exploration_view_margin_end">24dp</dimen>
-  <dimen name="continue_interaction_item_exploration_view_margin_start">24dp</dimen>
-  <dimen name="continue_interaction_item_question_view_margin_end">24dp</dimen>
-  <dimen name="continue_interaction_item_question_view_margin_start">24dp</dimen>
-  <dimen name="continue_navigation_item_question_view_margin_end">24dp</dimen>
-  <dimen name="continue_navigation_item_question_view_margin_start">24dp</dimen>
-  <dimen name="continue_navigation_item_exploration_view_margin_end">24dp</dimen>
-  <dimen name="continue_navigation_item_exploration_view_margin_start">24dp</dimen>
-  <dimen name="drag_drop_item_exploration_view_margin_top">24dp</dimen>
-  <dimen name="drag_drop_item_exploration_view_margin_end">24dp</dimen>
-  <dimen name="drag_drop_item_question_view_margin_top">24dp</dimen>
-  <dimen name="numeric_input_interaction_item_conversation_view_margin_end">24dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_top_profile_not_added">60dp</dimen>
-  <dimen name="profile_chooser_description_margin_start_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_description_margin_end_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_end_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_start_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_end_profile_already_added">24dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_top_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_start_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_end_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_fragment_margin_top_profile_already_added">24dp</dimen>
-  <dimen name="ratio_input_interaction_item_conversation_view_margin_end">24dp</dimen>
-  <dimen name="submitted_answer_exploration_view_margin_end">24dp</dimen>
-  <dimen name="submitted_answer_exploration_view_margin_top">24dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_end">24dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_top">24dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_top">24dp</dimen>
-  <dimen name="submitted_answer_question_view_margin_top">24dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_end_no_extra_interaction_answer">24dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer">24dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_end_no_extra_interaction_answer">24dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_top_no_extra_interaction_answer">24dp</dimen>
-  <dimen name="text_input_interaction_item_conversation_view_margin_end">24dp</dimen>
-  <dimen name="walkthrough_final_fragment_card_content_padding">24dp</dimen>
-
-  <dimen name="admin_auth_input_pin_label_margin">8dp</dimen>
-  <dimen name="drag_drop_grouping_hint_non_split_text_view_margin_top">8dp</dimen>
-  <dimen name="drag_drop_container_parent_non_split_margin_end">8dp</dimen>
-  <dimen name="drag_drop_container_parent_non_split_margin_start">8dp</dimen>
-  <dimen name="profile_chooser_profile_view_name_margin_top_profile_already_added">8dp</dimen>
-  <dimen name="profile_chooser_profile_view_last_visited_margin_top_profile_already_added">8dp</dimen>
-  <dimen name="profile_chooser_profile_view_is_admin_margin_top_profile_already_added">8dp</dimen>
-  <dimen name="profile_view_already_added_description_parent_margin_top">8dp</dimen>
-  <dimen name="submitted_answer_text_non_conversation_view_padding_top">8dp</dimen>
-  <dimen name="submitted_answer_text_non_conversation_view_padding_bottom">8dp</dimen>
-  <dimen name="drag_drop_content_group_item_margin">8dp</dimen>
-  <dimen name="walkthrough_final_no_button_margin_end">8dp</dimen>
-  <dimen name="walkthrough_final_yes_button_margin_start">8dp</dimen>
 
   <!-- AdminAuthActivity -->
   <dimen name="admin_auth_activity_layout_width">0dp</dimen>
+  <dimen name="admin_auth_activity_input_width">0dp</dimen>
+  <dimen name="admin_auth_input_pin_label_margin">8dp</dimen>
   <dimen name="admin_auth_activity_margin_start">28dp</dimen>
   <dimen name="admin_auth_activity_margin_end">28dp</dimen>
   <dimen name="admin_auth_activity_padding_top">32dp</dimen>
   <dimen name="admin_auth_activity_padding_bottom">96dp</dimen>
   <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
   <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
-  <dimen name="admin_auth_activity_input_width">0dp</dimen>
 
   <!-- AdminPinActivity -->
   <dimen name="admin_pin_activity_layout_width">@dimen/match_parent</dimen>
+  <dimen name="admin_pin_activity_input_width">0dp</dimen>
   <dimen name="admin_pin_activity_margin_start">28dp</dimen>
   <dimen name="admin_pin_activity_margin_end">28dp</dimen>
   <dimen name="admin_pin_activity_padding_top">32dp</dimen>
   <dimen name="admin_pin_activity_padding_bottom">96dp</dimen>
   <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
   <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
-  <dimen name="admin_pin_activity_input_width">0dp</dimen>
 
   <!-- PinPasswordActivity -->
   <dimen name="pin_password_activity_layout_width">0dp</dimen>
+  <!-- -1px is equivalent to match_parent (https://stackoverflow.com/a/37971851/12314934) -->
+  <dimen name="pin_password_activity_input_with_icon_width">-1px</dimen>
   <dimen name="pin_password_activity_margin_start">28dp</dimen>
   <dimen name="pin_password_activity_margin_end">28dp</dimen>
   <dimen name="pin_password_activity_padding_top">40dp</dimen>
   <dimen name="pin_password_activity_hello_text_view_margin_start">0dp</dimen>
   <dimen name="pin_password_activity_hello_text_view_margin_end">0dp</dimen>
-  <!-- -1px is equivalent to match_parent (https://stackoverflow.com/a/37971851/12314934) -->
-  <dimen name="pin_password_activity_input_with_icon_width">-1px</dimen>
-
-  <dimen name="submitted_answer_question_view_margin_end">64dp</dimen>
-  <dimen name="submitted_answer_question_view_margin_start">64dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_end_extra_interaction_answer">64dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_start_extra_interaction_answer">64dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_end_extra_interaction_answer">64dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_start_extra_interaction_answer">64dp</dimen>
 
+  <!-- Story Chapter Card -->
   <dimen name="story_chapter_card_playable_state_elevation">4dp</dimen>
-  <dimen name="ongoing_topic_card_elevation">4dp</dimen>
   <dimen name="story_chapter_card_not_playable_state_elevation">2dp</dimen>
-  <dimen name="profile_chooser_padding_bottom_profile_already_added">224dp</dimen>
-
-  <dimen name="state_fragment_with_audio_bar_visible_padding_top">72dp</dimen>
-  <dimen name="profile_chooser_margin_start_profile_already_added">72dp</dimen>
-  <dimen name="profile_chooser_margin_end_profile_already_added">72dp</dimen>
 
-  <dimen name="drag_drop_interaction_item_exploration_view_margin_start">80dp</dimen>
-  <dimen name="text_input_interaction_item_margin_start">80dp</dimen>
-
-  <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
-  <dimen name="drag_drop_item_exploration_split_view_margin_top">32dp</dimen>
-  <dimen name="drag_drop_item_question_split_view_margin_end">32dp</dimen>
-  <dimen name="drag_drop_item_question_split_view_margin_start">32dp</dimen>
-  <dimen name="drag_drop_item_question_view_margin_end">32dp</dimen>
-  <dimen name="drag_drop_item_question_view_margin_start">32dp</dimen>
-  <dimen name="state_fragment_split_view_margin_start">32dp</dimen>
-  <dimen name="state_fragment_split_view_margin_end">32dp</dimen>
-
-  <dimen name="profile_chooser_add_view_circular_image_margin_top_profile_already_added">48dp</dimen>
-  <dimen name="profile_chooser_profile_view_circular_image_margin_top_profile_already_added">48dp</dimen>
-  <dimen name="state_fragment_padding_top_audio_bar_visible">48dp</dimen>
+  <!-- Ongoing Topic Card -->
+  <dimen name="ongoing_topic_card_elevation">4dp</dimen>
 
-  <!-- Content Item: Exploration Split View -->
+  <!-- Content Item -->
   <dimen name="content_item_exploration_split_view_margin_start">24dp</dimen>
   <dimen name="content_item_exploration_split_view_margin_top">24dp</dimen>
   <dimen name="content_item_exploration_split_view_margin_end">40dp</dimen>
-
   <dimen name="content_item_exploration_split_view_padding_start">12dp</dimen>
   <dimen name="content_item_exploration_split_view_padding_top">16dp</dimen>
   <dimen name="content_item_exploration_split_view_padding_end">12dp</dimen>
   <dimen name="content_item_exploration_split_view_padding_bottom">16dp</dimen>
-
-  <!-- Content Item: Exploration View -->
   <dimen name="content_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="content_item_exploration_view_margin_top">24dp</dimen>
   <dimen name="content_item_exploration_view_margin_end">40dp</dimen>
-
   <dimen name="content_item_exploration_view_padding_start">12dp</dimen>
   <dimen name="content_item_exploration_view_padding_top">16dp</dimen>
   <dimen name="content_item_exploration_view_padding_end">12dp</dimen>
   <dimen name="content_item_exploration_view_padding_bottom">16dp</dimen>
-
-  <!-- Content Item: Question Split View -->
   <dimen name="content_item_question_split_view_margin_start">32dp</dimen>
   <dimen name="content_item_question_split_view_margin_top">24dp</dimen>
   <dimen name="content_item_question_split_view_margin_end">32dp</dimen>
   <dimen name="content_item_question_split_view_margin_bottom">8dp</dimen>
-
-  <!-- Content Item: Question View -->
   <dimen name="content_item_question_view_margin_start">32dp</dimen>
   <dimen name="content_item_question_view_margin_top">32dp</dimen>
   <dimen name="content_item_question_view_margin_end">32dp</dimen>
   <dimen name="content_item_question_view_margin_bottom">8dp</dimen>
 
-  <!-- Feedback Item: Exploration Split View -->
+  <!-- Feedback Item -->
   <dimen name="feedback_item_exploration_split_view_margin_start">24dp</dimen>
   <dimen name="feedback_item_exploration_split_view_margin_top">24dp</dimen>
   <dimen name="feedback_item_exploration_split_view_margin_end">40dp</dimen>
-
   <dimen name="feedback_item_exploration_split_view_padding_start">12dp</dimen>
   <dimen name="feedback_item_exploration_split_view_padding_top">16dp</dimen>
   <dimen name="feedback_item_exploration_split_view_padding_end">12dp</dimen>
   <dimen name="feedback_item_exploration_split_view_padding_bottom">16dp</dimen>
-
-  <!-- Feedback Item: Exploration View -->
   <dimen name="feedback_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="feedback_item_exploration_view_margin_top">24dp</dimen>
   <dimen name="feedback_item_exploration_view_margin_end">40dp</dimen>
-
   <dimen name="feedback_item_exploration_view_padding_start">12dp</dimen>
   <dimen name="feedback_item_exploration_view_padding_top">16dp</dimen>
   <dimen name="feedback_item_exploration_view_padding_end">12dp</dimen>
   <dimen name="feedback_item_exploration_view_padding_bottom">16dp</dimen>
-
-  <!-- Feedback Item: Question Split View -->
   <dimen name="feedback_item_question_split_view_margin_start">32dp</dimen>
   <dimen name="feedback_item_question_split_view_margin_top">24dp</dimen>
   <dimen name="feedback_item_question_split_view_margin_end">32dp</dimen>
-
-  <!-- Feedback Item: Question View -->
   <dimen name="feedback_item_question_view_margin_start">32dp</dimen>
   <dimen name="feedback_item_question_view_margin_top">24dp</dimen>
   <dimen name="feedback_item_question_view_margin_end">32dp</dimen>
 
-  <!-- Interaction Item: Exploration View -->
+  <!-- Interaction Item -->
   <dimen name="interaction_item_exploration_view_margin_start">40dp</dimen>
   <dimen name="interaction_item_exploration_view_margin_top">24dp</dimen>
   <dimen name="interaction_item_exploration_view_margin_end">24dp</dimen>
   <dimen name="interaction_item_exploration_view_padding_start">40dp</dimen>
   <dimen name="interaction_item_exploration_view_padding_end">24dp</dimen>
-
-  <!-- Interaction Item: Question View -->
   <dimen name="interaction_item_question_view_margin_start">32dp</dimen>
   <dimen name="interaction_item_question_view_margin_top">24dp</dimen>
   <dimen name="interaction_item_question_view_margin_end">32dp</dimen>
   <dimen name="interaction_item_question_view_padding_start">32dp</dimen>
   <dimen name="interaction_item_question_view_padding_end">32dp</dimen>
-
-
-  <!-- Interaction Item: Exploration/Question Split View -->
   <dimen name="interaction_item_split_view_margin_start">32dp</dimen>
   <dimen name="interaction_item_split_view_margin_top">24dp</dimen>
   <dimen name="interaction_item_split_view_margin_end">32dp</dimen>
 
-  <!-- DragAndDrop Interaction Item -->
-  <dimen name="drag_drop_interaction_item_padding_start">16dp</dimen>
-  <dimen name="drag_drop_interaction_item_padding_top">16dp</dimen>
-  <dimen name="drag_drop_interaction_item_padding_end">16dp</dimen>
-  <dimen name="drag_drop_interaction_item_padding_bottom">16dp</dimen>
-
-  <dimen name="drag_drop_interaction_item_recycler_view_margin_top">4dp</dimen>
-
-  <dimen name="drag_drop_interaction_items_margin_top">4dp</dimen>
-  <dimen name="drag_drop_interaction_items_margin_bottom">4dp</dimen>
-
   <!-- Selection Interaction Item -->
   <dimen name="selection_interaction_item_padding_start">16dp</dimen>
   <dimen name="selection_interaction_item_padding_end">16dp</dimen>
 
-  <!-- Submitted Answer Item: Exploration Split View -->
+  <!-- Submitted Answer Item -->
   <dimen name="submitted_answer_item_exploration_split_view_margin_start">40dp</dimen>
   <dimen name="submitted_answer_item_exploration_split_view_margin_top">24dp</dimen>
   <dimen name="submitted_answer_item_exploration_split_view_margin_end">24dp</dimen>
-
-  <!-- Submitted Answer Item: Exploration View -->
   <dimen name="submitted_answer_item_exploration_view_margin_start">40dp</dimen>
   <dimen name="submitted_answer_item_exploration_view_margin_top">24dp</dimen>
   <dimen name="submitted_answer_item_exploration_view_margin_end">24dp</dimen>
-
-  <!-- Submitted Answer Item: Question Split View -->
   <dimen name="submitted_answer_item_question_split_view_margin_start">32dp</dimen>
   <dimen name="submitted_answer_item_question_split_view_margin_top">24dp</dimen>
   <dimen name="submitted_answer_item_question_split_view_margin_end">32dp</dimen>
-
-  <!-- Submitted Answer Item: Question View -->
   <dimen name="submitted_answer_item_question_view_margin_start">32dp</dimen>
   <dimen name="submitted_answer_item_question_view_margin_top">24dp</dimen>
   <dimen name="submitted_answer_item_question_view_margin_end">32dp</dimen>
 
-  <!-- Previous Responses Item: Exploration Split View -->
+  <!-- Previous Responses Item -->
   <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen>
   <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen>
-
-  <!-- Previous Responses Item: Exploration View -->
   <dimen name="previous_responses_item_exploration_view_margin_start">36dp</dimen>
   <dimen name="previous_responses_item_exploration_view_margin_end">52dp</dimen>
-
-  <!-- Previous Responses Item: Question Split View -->
   <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen>
   <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen>
-
-  <!-- Previous Responses Item: Question View -->
   <dimen name="previous_responses_item_question_view_margin_start">44dp</dimen>
   <dimen name="previous_responses_item_question_view_margin_end">44dp</dimen>
 
@@ -369,44 +345,33 @@
     the shadows are clearly visible around the buttons.
   -->
 
-  <!-- General Button Item: Common Margin Top -->
+  <!-- General Button Item -->
   <dimen name="general_button_item_split_view_margin_top_left">20dp</dimen>
   <dimen name="general_button_item_split_view_margin_top_right">68dp</dimen>
   <dimen name="general_button_item_margin_top">20dp</dimen>
-
-  <!-- General Button Item: Exploration Split View -->
   <dimen name="general_button_item_exploration_split_view_margin_start">44dp</dimen>
   <dimen name="general_button_item_exploration_split_view_margin_end">44dp</dimen>
-
-  <!-- General Button: Exploration View -->
   <dimen name="general_button_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="general_button_item_exploration_view_margin_end">24dp</dimen>
   <dimen name="general_button_item_exploration_view_padding_start">24dp</dimen>
   <dimen name="general_button_item_exploration_view_padding_end">24dp</dimen>
-
-  <!-- General Button: Question Split View -->
   <dimen name="general_button_item_question_split_view_margin_start">44dp</dimen>
   <dimen name="general_button_item_question_split_view_margin_end">44dp</dimen>
-
-  <!-- General Button: Question View -->
   <dimen name="general_button_item_question_view_margin_start">24dp</dimen>
   <dimen name="general_button_item_question_view_margin_end">24dp</dimen>
   <dimen name="general_button_item_question_view_padding_start">24dp</dimen>
   <dimen name="general_button_item_question_view_padding_end">24dp</dimen>
 
-  <!-- Return to Topic Button: Exploration View -->
+  <!-- Return to Topic Button -->
   <dimen name="return_to_topic_button_item_exploration_view_margin_top">44dp</dimen>
-
-  <!-- Return to Topic Button: Question View -->
   <dimen name="return_to_topic_button_item_question_view_margin_top">8dp</dimen>
 
-  <!-- Replay Button: Question View -->
+  <!-- Replay Button -->
   <dimen name="replay_button_item_question_view_margin_top">44dp</dimen>
 
   <!-- Question Player ProgressBar -->
   <dimen name="question_player_progress_bar_margin_start">32dp</dimen>
   <dimen name="question_player_progress_bar_margin_end">32dp</dimen>
-
   <dimen name="question_player_progress_bar_text_margin_bottom">12dp</dimen>
   <dimen name="question_player_progress_bar_text_margin_end">32dp</dimen>
   <dimen name="question_player_progress_bar_text_margin_top">8dp</dimen>
@@ -419,11 +384,18 @@
   <!-- KonfettiView height -->
   <dimen name="konfetti_view_height">124dp</dimen>
 
-  <!-- Audio Player: Non Split View -->
+  <!-- Clickable Item Min height -->
+  <dimen name="clickable_item_min_height">48dp</dimen>
+
+  <!-- Topic List Item -->
+  <dimen name="topic_list_item_margin_top_bottom">12dp</dimen>
+
+  <!-- Master Skills Text View -->
+  <dimen name="master_skills_text_view_margin_end">88dp</dimen>
+
+  <!-- Audio Player -->
   <dimen name="audio_player_non_split_view_margin_start">28dp</dimen>
   <dimen name="audio_player_non_split_view_margin_end">28dp</dimen>
-
-  <!-- Audio Player: Split View -->
   <dimen name="audio_player_split_view_margin_start">32dp</dimen>
   <dimen name="audio_player_split_view_margin_end">32dp</dimen>
 
@@ -438,18 +410,22 @@
   <dimen name="faq_single_padding_bottom">60dp</dimen>
   <dimen name="faq_single_activity_scroll_padding_bottom">80dp</dimen>
 
-  <!-- Privacy Policy -->
+  <!-- Privacy Policy Fragment -->
   <dimen name="policies_fragment_page_padding_start">24dp</dimen>
   <dimen name="policies_fragment_page_padding_top">22dp</dimen>
   <dimen name="policies_fragment_page_padding_end">28dp</dimen>
   <dimen name="policies_fragment_page_padding_bottom">60dp</dimen>
   <dimen name="policies_fragment_page_scroll_padding_bottom">80dp</dimen>
 
-  <!-- FAQ -->
+  <!-- FAQ List -->
   <dimen name="faq_list_scroll_padding_bottom">80dp</dimen>
   <dimen name="faq_list_padding_bottom">60dp</dimen>
+
+  <!-- FAQ Content -->
   <dimen name="faq_content_margin_start">28dp</dimen>
   <dimen name="faq_content_margin_end">28dp</dimen>
+
+  <!-- FAQ Item Header -->
   <dimen name="faq_item_header_margin_start">24dp</dimen>
   <dimen name="faq_item_header_margin_top">24dp</dimen>
   <dimen name="faq_item_header_margin_end">24dp</dimen>
@@ -461,13 +437,15 @@
   <!-- General Bottom Padding -->
   <dimen name="general_screen_padding_bottom">128dp</dimen>
 
-  <!-- Profile Edit -->
+  <!-- Profile Edit Delete -->
   <dimen name="profile_edit_delete_margin_bottom">12dp</dimen>
 
-  <!-- Concept Card Fragment -->
+  <!-- Concept Card: Heading Text -->
   <dimen name="concept_card_heading_text_margin_start">28dp</dimen>
   <dimen name="concept_card_heading_text_margin_top">40dp</dimen>
   <dimen name="concept_card_heading_text_margin_end">28dp</dimen>
+
+  <!-- Concept Card: Explanation Text -->
   <dimen name="concept_card_explanation_text_margin_start">40dp</dimen>
   <dimen name="concept_card_explanation_text_margin_top">28dp</dimen>
   <dimen name="concept_card_explanation_text_margin_end">40dp</dimen>
@@ -478,17 +456,9 @@
   <dimen name="all_topics_text_margin_end">32dp</dimen>
   <dimen name="all_topics_text_margin_bottom">12dp</dimen>
 
-  <!-- Profile Chooser Fragment -->
-  <dimen name="profile_chooser_fragment_profile_select_text_margin_top">64dp</dimen>
-  <dimen name="profile_chooser_fragment_profile_recycler_view_margin_top">36dp</dimen>
-  <dimen name="profile_chooser_profile_view_view_margin_top">60dp</dimen>
-  <dimen name="profile_chooser_profile_select_text_margin_start">96dp</dimen>
-  <dimen name="profile_chooser_margin_top_profile_already_added">0dp</dimen>
-  <dimen name="profile_chooser_margin_top_profile_not_added">84dp</dimen>
-  <dimen name="profile_chooser_administrator_controls_margin_bottom">28dp</dimen>
-  <dimen name="profile_chooser_setting_icon_margin_end">96dp</dimen>
-
-  <!-- Coming Soon Topic List -->
+  <!-- Coming Soon -->
+  <dimen name="coming_soon_padding_end">16dp</dimen>
+  <dimen name="coming_soon_padding_start">12dp</dimen>
   <dimen name="coming_soon_topic_list_constraint_layout_padding_start">0dp</dimen>
   <dimen name="coming_soon_topic_list_constraint_layout_padding_end">0dp</dimen>
   <dimen name="coming_soon_topic_list_constraint_layout_margin_top">24dp</dimen>
@@ -498,7 +468,7 @@
   <dimen name="coming_soon_topic_promoted_list_view_padding_start">28dp</dimen>
   <dimen name="coming_soon_topic_Promoted_list_view_padding_end">28dp</dimen>
 
-  <!-- Topic Practice Footer View -->
+  <!-- Topic Practice -->
   <dimen name="topic_practice_footer_view_margin_top">36dp</dimen>
   <dimen name="topic_practice_footer_view_margin_bottom">108dp</dimen>
 
@@ -519,7 +489,7 @@
   <dimen name="completed_story_list_fragment_recyclerview_padding_end">20dp</dimen>
   <dimen name="completed_story_list_fragment_recyclerview_padding_bottom">144dp</dimen>
 
-  <!-- App Version -->
+  <!-- App Version Text/Image View -->
   <dimen name="app_version_text_view_padding_start">16dp</dimen>
   <dimen name="app_version_text_view_padding_end">16dp</dimen>
   <dimen name="app_version_image_view_margin_start">24dp</dimen>
@@ -532,18 +502,35 @@
   <dimen name="add_profile_pin_checkbox_margin_top">32dp</dimen>
   <dimen name="add_profile_confirm_pin_margin_top">24dp</dimen>
 
+  <!-- Home Fragment -->
   <dimen name="home_fragment_padding_top">36dp</dimen>
   <dimen name="home_fragment_padding_bottom">148dp</dimen>
+  <dimen name="home_padding_end">20dp</dimen>
+  <dimen name="home_padding_start">20dp</dimen>
+  <dimen name="home_inner_margin">8dp</dimen>
+  <dimen name="home_outer_margin">28dp</dimen>
+  <dimen name="home_welcome_outer_padding">28dp</dimen>
+  <dimen name="home_welcome_text_view_margin_end">4dp</dimen>
+
+  <!-- These values are getting used only in tablet mode and therefore mentioned as 0dp here -->
+  <!-- Profile Progress Header -->
+  <dimen name="profile_edit_image_layout_margin_start">0dp</dimen>
+  <dimen name="profile_name_text_view_layout_margin_end">0dp</dimen>
+  <dimen name="view_all_text_view_margin_end">0dp</dimen>
+  <dimen name="recently_played_stories_text_view_layout_margin_start">0dp</dimen>
 
-  <!-- Recently Played -->
+  <!-- Recently Played Fragment -->
   <dimen name="recently_played_fragment_padding_top">8dp</dimen>
   <dimen name="recently_played_fragment_padding_bottom">168dp</dimen>
 
+  <dimen name="recently_played_margin_max">28dp</dimen>
+  <dimen name="recently_played_margin_min">8dp</dimen>
+
+  <!-- Promoted Story Card -->
   <dimen name="promoted_story_card_layout_margin_end">8dp</dimen>
   <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
   <!-- The width is set to sp so that it will scale according to the device screen -->
   <dimen name="promoted_story_card_layout_width">280sp</dimen>
-  <!-- The width is set to sp so that it will scale according to the device screen -->
   <dimen name="promoted_story_card_width">280sp</dimen>
   <dimen name="promoted_story_card_text_size">16sp</dimen>
   <dimen name="promoted_story_card_margin_top">8dp</dimen>
@@ -563,13 +550,6 @@
   <dimen name="story_header_view_layout_margin_start">32dp</dimen>
   <dimen name="story_header_view_layout_margin_end">32dp</dimen>
 
-  <!-- These values are getting used only in tablet mode and therefore mentioned as 0dp here -->
-  <!-- Profile Progress Header -->
-  <dimen name="profile_edit_image_layout_margin_start">0dp</dimen>
-  <dimen name="profile_name_text_view_layout_margin_end">0dp</dimen>
-  <dimen name="recently_played_stories_text_view_layout_margin_start">0dp</dimen>
-  <dimen name="view_all_text_view_margin_end">0dp</dimen>
-
   <!-- Ongoing Topic List Fragment -->
   <dimen name="ongoing_topic_list_fragment_padding_start">20dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_top">20dp</dimen>
@@ -589,6 +569,7 @@
   <dimen name="topic_revision_fragment_padding_top">20dp</dimen>
   <dimen name="topic_revision_fragment_padding_end">20dp</dimen>
   <dimen name="topic_revision_fragment_padding_bottom">144dp</dimen>
+
   <dimen name="topic_revision_summary_view_container_margin_start">8dp</dimen>
   <dimen name="topic_revision_summary_view_container_margin_top">12dp</dimen>
   <dimen name="topic_revision_summary_view_container_margin_end">8dp</dimen>
@@ -597,28 +578,27 @@
   <dimen name="topic_revision_summary_view_subtopic_title_text_view_padding_end">8dp</dimen>
 
   <!-- Solution Summary -->
-  <dimen name="solution_summary_margin_top_linear_layout_first">32dp</dimen>
-  <dimen name="solution_summary_margin_top_solution_title">12dp</dimen>
   <dimen name="solution_summary_margin_start">28dp</dimen>
   <dimen name="solution_summary_margin_end">28dp</dimen>
   <dimen name="solution_summary_margin_bottom">20dp</dimen>
+  <dimen name="solution_summary_margin_top_linear_layout">8dp</dimen>
+  <dimen name="solution_summary_margin_top_linear_layout_first">32dp</dimen>
+  <dimen name="solution_summary_margin_start_linear_layout">40dp</dimen>
+  <dimen name="solution_summary_margin_end_linear_layout">40dp</dimen>
+  <dimen name="solution_summary_margin_bottom_linear_layout">32dp</dimen>
+  <dimen name="solution_summary_margin_top_solution_summary_label">12dp</dimen>
   <dimen name="solution_summary_margin_bottom_solution_title">12dp</dimen>
+  <dimen name="solution_summary_margin_top_solution_title">12dp</dimen>
   <dimen name="solution_summary_margin_top_reveal_solution_button">28dp</dimen>
   <dimen name="solution_summary_margin_bottom_reveal_solution_button">32dp</dimen>
   <dimen name="solution_summary_margin_start_expand_list_icon">8dp</dimen>
+  <dimen name="solution_summary_margin_top_expand_list_icon">0dp</dimen>
   <dimen name="solution_summary_margin_end_expand_list_icon">8dp</dimen>
+  <dimen name="solution_summary_margin_bottom_expand_list_icon">8dp</dimen>
   <dimen name="solution_summary_min_width_expand_list_icon">48dp</dimen>
   <dimen name="solution_summary_min_height_expand_list_icon">48dp</dimen>
-  <dimen name="solution_summary_margin_top_expand_list_icon">0dp</dimen>
-  <dimen name="solution_summary_margin_start_linear_layout">40dp</dimen>
-  <dimen name="solution_summary_margin_end_linear_layout">40dp</dimen>
-  <dimen name="solution_summary_margin_top_linear_layout">8dp</dimen>
-  <dimen name="solution_summary_margin_bottom_linear_layout">32dp</dimen>
-  <dimen name="solution_summary_margin_bottom_expand_list_icon">8dp</dimen>
-  <dimen name="solution_summary_margin_top_solution_summary_label">12dp</dimen>
 
   <!-- Profile Reset Pin Activity -->
-  <dimen name="profile_reset_pin_activity_scroll_view_padding_bottom">0dp</dimen>
   <dimen name="profile_reset_pin_activity_constraint_layout_padding_bottom">32dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_pin_main_padding_start">28dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_pin_main_padding_end">28dp</dimen>
@@ -629,6 +609,7 @@
   <dimen name="profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_top">28dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_end">28dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_save_button_margin_end">28dp</dimen>
+  <dimen name="profile_reset_pin_activity_scroll_view_padding_bottom">0dp</dimen>
 
   <!-- Profile Rename Activity -->
   <dimen name="profile_rename_activity_constraint_layout">32dp</dimen>
@@ -679,11 +660,10 @@
 
   <!-- TopicPracticeHeader -->
   <dimen name="topic_practice_header_child_constraint_layout_margin_start">32dp</dimen>
-  <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
   <dimen name="topic_practice_header_child_constraint_layout_margin_end">24dp</dimen>
-  <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">24dp</dimen>
-  <dimen name="master_skills_text_view_margin_end">88dp</dimen>
   <dimen name="topic_practice_header_child_constraint_layout_width">0dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">24dp</dimen>
 
   <!-- ProfileProgressRecentlyPlayedStoryCard -->
   <dimen name="profile_progress_recently_played_story_card_layout_margin_start">8dp</dimen>
@@ -698,7 +678,7 @@
   <dimen name="hints_and_solution_summary_card_margin_start">16dp</dimen>
   <dimen name="hints_and_solution_summary_card_margin_end">16dp</dimen>
 
-  <!-- AdministratorControlDownloadPermissionsView -->
+  <!-- AdministratorControls-->
   <dimen name="administrator_controls_download_permissions_view_download_permissions_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_download_permissions_text_view_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_topic_update_on_wifi_constraint_layout_padding_start">16dp</dimen>
@@ -707,34 +687,24 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
-
-  <!-- AdministratorControlAccountActionsView -->
-  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_start">16dp</dimen>
-  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_end">16dp</dimen>
-  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_start">16dp</dimen>
-  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_end">16dp</dimen>
-
-  <!-- AdministratorControlsAppInformationView -->
   <dimen name="administrator_controls_app_information_view_app_information_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_app_information_view_app_information_text_view_padding_end">16dp</dimen>
   <dimen name="administrator_controls_app_information_view_app_version_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_app_information_view_app_version_text_view_padding_end">16dp</dimen>
-
-  <!-- AdministratorControlsFragment -->
   <dimen name="administrator_controls_fragment_recycler_view_padding_bottom">80dp</dimen>
-
-  <!-- AdministratorControlsGeneralView -->
   <dimen name="administrator_controls_general_view_general_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_general_view_general_text_view_padding_top">20dp</dimen>
   <dimen name="administrator_controls_general_view_general_text_view_padding_end">16dp</dimen>
   <dimen name="administrator_controls_general_view_edit_account_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_general_view_edit_account_text_view_padding_end">16dp</dimen>
-
-  <!-- AdministratorControlsProfileView -->
   <dimen name="administrator_controls_profile_view_profile_management_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_profile_view_profile_management_text_view_padding_end">16dp</dimen>
   <dimen name="administrator_controls_profile_view_edit_profiles_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_profile_view_edit_profiles_text_view_padding_end">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_end">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_end">16dp</dimen>
 
   <!-- OptionAudioLanguage -->
   <dimen name="option_audio_language_padding_start">16dp</dimen>
@@ -770,10 +740,10 @@
   <dimen name="spotlight_done_button_corner_radius">4dp</dimen>
 
   <!-- Survey -->
+  <dimen name="survey_text_margin">28dp</dimen>
   <dimen name="survey_progress_text_margin_start">12dp</dimen>
   <dimen name="survey_progress_text_margin_end">20dp</dimen>
   <dimen name="survey_progress_bar_height">12dp</dimen>
-  <dimen name="survey_text_margin">28dp</dimen>
   <dimen name="survey_question_text_margin">28dp</dimen>
   <dimen name="survey_question_recycler_view_margin">28dp</dimen>
   <dimen name="survey_navigation_buttons_margin">28dp</dimen>

From 8aefb0564bdaf8d859e1fb0ebcab8565ddb43d95 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Fri, 6 Oct 2023 01:44:14 +0530
Subject: [PATCH 09/32] Fix #5171: Fixes all warnings in "Accessibility"
 category (#5173)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

Fixes #5171

Under this category, the warnings are mainly of 3 types:

1. Warning: Image without contentDescription.
Fix: Add a `contentDescription` to each of those `ImageView`, or mark as
not important for accessibility.

2. Warning: 'onTouch' lambda should call 'View#performClick' when a
click is detected
Fix: Call `customView.performClick( )`.

3. Warning: 'clickable' attribute found, please also add 'focusable'.
Fix: Set `android:focusable="true"` as its necessary if
`android:clickable="true"`.


![image](https://github.com/oppia/oppia-android/assets/84731134/894a6fb3-632b-4397-bc80-16b60d06f5f2)

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../state/ImageRegionSelectionInteractionView.kt  |  4 ++++
 .../android/app/utility/ClickableAreasImage.kt    |  4 +++-
 .../res/layout-land/profile_chooser_fragment.xml  |  6 ++++--
 .../main/res/layout-land/topic_info_fragment.xml  |  3 ++-
 .../layout-land/walkthrough_final_fragment.xml    |  3 ++-
 .../layout-land/walkthrough_welcome_fragment.xml  |  3 ++-
 .../layout-sw600dp-land/topic_info_fragment.xml   |  3 ++-
 .../layout-sw600dp-port/topic_info_fragment.xml   |  3 ++-
 .../layout-sw600dp/profile_chooser_fragment.xml   |  6 ++++--
 .../res/layout-sw600dp/story_chapter_view.xml     |  3 ++-
 .../activity_view_binding_adapters_test.xml       |  3 ++-
 app/src/main/res/layout/app_version_fragment.xml  |  3 ++-
 app/src/main/res/layout/bottom_left_overlay.xml   |  6 ++++--
 app/src/main/res/layout/bottom_right_overlay.xml  |  6 ++++--
 .../main/res/layout/continue_interaction_item.xml |  3 ++-
 .../layout/continue_navigation_button_item.xml    |  3 ++-
 app/src/main/res/layout/drawer_fragment.xml       |  6 ++++--
 app/src/main/res/layout/exploration_activity.xml  |  3 ++-
 .../layout/math_expression_parser_fragment.xml    |  1 +
 app/src/main/res/layout/next_button_item.xml      |  6 ++++--
 app/src/main/res/layout/previous_button_item.xml  |  3 ++-
 .../main/res/layout/profile_chooser_fragment.xml  |  6 ++++--
 .../main/res/layout/profile_picture_activity.xml  |  3 ++-
 .../res/layout/return_to_topic_button_item.xml    |  3 ++-
 .../main/res/layout/revision_card_activity.xml    |  3 ++-
 app/src/main/res/layout/story_chapter_view.xml    |  3 ++-
 app/src/main/res/layout/submit_button_item.xml    |  3 ++-
 .../test_drawable_binding_adapter_activity.xml    |  3 ++-
 .../test_image_view_bindable_adapter_activity.xml |  3 ++-
 .../main/res/layout/test_url_parser_activity.xml  |  3 ++-
 .../res/layout/text_input_interaction_item.xml    |  8 +++++---
 app/src/main/res/layout/top_left_overlay.xml      |  6 ++++--
 app/src/main/res/layout/top_right_overlay.xml     |  6 ++++--
 app/src/main/res/layout/topic_info_fragment.xml   |  3 ++-
 .../res/layout/walkthrough_final_fragment.xml     |  3 ++-
 .../res/layout/walkthrough_welcome_fragment.xml   |  3 ++-
 app/src/main/res/values/strings.xml               | 15 +++++++++++++++
 37 files changed, 110 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt b/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt
index d94b853f1ef..53cb5fd3b1b 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt
@@ -91,6 +91,10 @@ class ImageRegionSelectionInteractionView @JvmOverloads constructor(
     maybeInitializeClickableAreas()
   }
 
+  override fun performClick(): Boolean {
+    return super.performClick()
+  }
+
   fun setOnRegionClicked(onRegionClicked: OnClickableAreaClickedListener) {
     this.onRegionClicked = onRegionClicked
     maybeInitializeClickableAreas()
diff --git a/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt b/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
index 69d599fd2de..5093290768b 100644
--- a/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
+++ b/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
@@ -30,6 +30,7 @@ class ClickableAreasImage(
       if (motionEvent.action == MotionEvent.ACTION_DOWN) {
         onPhotoTap(motionEvent.x, motionEvent.y)
       }
+      view.performClick()
       return@setOnTouchListener false
     }
   }
@@ -110,10 +111,11 @@ class ClickableAreasImage(
       newView.isFocusable = true
       newView.isFocusableInTouchMode = true
       newView.tag = clickableArea.label
-      newView.setOnTouchListener { _, event ->
+      newView.setOnTouchListener { view, event ->
         if (event.action == MotionEvent.ACTION_DOWN) {
           showOrHideRegion(newView, clickableArea)
         }
+        view.performClick()
         return@setOnTouchListener true
       }
       if (isAccessibilityEnabled) {
diff --git a/app/src/main/res/layout-land/profile_chooser_fragment.xml b/app/src/main/res/layout-land/profile_chooser_fragment.xml
index 71ab34ea13a..661da1b5244 100644
--- a/app/src/main/res/layout-land/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout-land/profile_chooser_fragment.xml
@@ -36,7 +36,8 @@
           android:visibility="gone"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
-          app:srcCompat="@drawable/ic_language_icon_grey_24dp" />
+          app:srcCompat="@drawable/ic_language_icon_grey_24dp"
+          android:contentDescription="@string/language_icon_content_description" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
@@ -115,7 +116,8 @@
         android:paddingTop="12dp"
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
-        app:srcCompat="@drawable/ic_settings_grey_48dp" />
+        app:srcCompat="@drawable/ic_settings_grey_48dp"
+        android:contentDescription="@string/setting_icon_content_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout-land/topic_info_fragment.xml b/app/src/main/res/layout-land/topic_info_fragment.xml
index 18502150884..6ebd9c406d1 100644
--- a/app/src/main/res/layout-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-land/topic_info_fragment.xml
@@ -105,7 +105,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
         app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
-        app:tint="@color/component_color_topic_info_fragment_download_status_image_color" />
+        app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
+        android:contentDescription="@string/download_status_image_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout-land/walkthrough_final_fragment.xml b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
index 1ae0bbbaed0..4cc89c8fc26 100644
--- a/app/src/main/res/layout-land/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
@@ -26,7 +26,8 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_portrait_onboarding_0" />
+      app:srcCompat="@drawable/ic_portrait_onboarding_0"
+      android:importantForAccessibility="no" />
 
     <LinearLayout
       android:id="@+id/walkthrough_button_container"
diff --git a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
index 7ac43a97c01..06c4ed0447f 100644
--- a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
@@ -61,7 +61,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_portrait_onboarding_0" />
+        app:srcCompat="@drawable/ic_portrait_onboarding_0"
+        android:importantForAccessibility="no" />
 
       <Button
         android:id="@+id/walkthrough_welcome_next_button"
diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
index 83c153ae9a0..2f4129184af 100644
--- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
@@ -99,7 +99,8 @@
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
           app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
-          app:tint="@color/component_color_topic_info_fragment_download_status_image_color" />
+          app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
+          android:contentDescription="@string/download_status_image_content_description" />
 
         <TextView
           android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
index e1c7aff2967..e683f6b64e3 100644
--- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
@@ -119,7 +119,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
         app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
-        app:tint="@color/component_color_topic_info_fragment_download_status_image_color" />
+        app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
+        android:contentDescription="@string/download_status_image_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml b/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
index a6ac88ce249..e1cda79e5df 100644
--- a/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
@@ -40,7 +40,8 @@
           android:visibility="gone"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
-          app:srcCompat="@drawable/ic_language_icon_grey_24dp" />
+          app:srcCompat="@drawable/ic_language_icon_grey_24dp"
+          android:contentDescription="@string/language_icon_content_description" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
@@ -119,7 +120,8 @@
         android:layout_height="48dp"
         android:layout_marginEnd="@dimen/profile_chooser_setting_icon_margin_end"
         android:padding="8dp"
-        app:srcCompat="@drawable/ic_settings_grey_48dp" />
+        app:srcCompat="@drawable/ic_settings_grey_48dp"
+        android:contentDescription="@string/setting_icon_content_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout-sw600dp/story_chapter_view.xml b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
index b4d65ef1c45..64800254214 100644
--- a/app/src/main/res/layout-sw600dp/story_chapter_view.xml
+++ b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
@@ -115,7 +115,8 @@
             app:layout_constraintEnd_toEndOf="@id/chapter_thumbnail"
             app:layout_constraintStart_toStartOf="@id/chapter_thumbnail"
             app:layout_constraintTop_toTopOf="@id/chapter_thumbnail"
-            app:srcCompat="@drawable/ic_baseline_lock_24" />
+            app:srcCompat="@drawable/ic_baseline_lock_24"
+            android:contentDescription="@string/lock_icon_content_description" />
 
           <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_view_binding_adapters_test.xml b/app/src/main/res/layout/activity_view_binding_adapters_test.xml
index 1ea2f715569..e6e4470802d 100644
--- a/app/src/main/res/layout/activity_view_binding_adapters_test.xml
+++ b/app/src/main/res/layout/activity_view_binding_adapters_test.xml
@@ -16,6 +16,7 @@
       android:layout_height="48dp"
       android:layout_gravity="center_vertical"
       android:padding="8dp"
-      app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp" />
+      app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
+      android:importantForAccessibility="no" />
   </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/app_version_fragment.xml b/app/src/main/res/layout/app_version_fragment.xml
index 4577da4eed2..32ddf6d236f 100644
--- a/app/src/main/res/layout/app_version_fragment.xml
+++ b/app/src/main/res/layout/app_version_fragment.xml
@@ -40,7 +40,8 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="@id/app_last_update_date_text_view"
       app:srcCompat="@drawable/ic_info_icon_gray_24dp"
-      app:tint="@color/component_color_app_version_activity_info_icon_color" />
+      app:tint="@color/component_color_app_version_activity_info_icon_color"
+      android:contentDescription="@string/app_info_icon_content_description" />
 
     <TextView
       android:id="@+id/app_last_update_date_text_view"
diff --git a/app/src/main/res/layout/bottom_left_overlay.xml b/app/src/main/res/layout/bottom_left_overlay.xml
index fd54dfb04a8..d716c007616 100644
--- a/app/src/main/res/layout/bottom_left_overlay.xml
+++ b/app/src/main/res/layout/bottom_left_overlay.xml
@@ -25,7 +25,8 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_rounded_arrow_up_right"
-      app:tint="@color/component_color_shared_spotlight_overlay_arrow_color" />
+      app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
+      android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -70,7 +71,8 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
-          app:tint="@color/component_color_shared_close_spotlight_button_color" />
+          app:tint="@color/component_color_shared_close_spotlight_button_color"
+          android:contentDescription="@string/close_spotlight_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/bottom_right_overlay.xml b/app/src/main/res/layout/bottom_right_overlay.xml
index d93caa2ad2c..9e300abdf98 100644
--- a/app/src/main/res/layout/bottom_right_overlay.xml
+++ b/app/src/main/res/layout/bottom_right_overlay.xml
@@ -26,7 +26,8 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_rounded_arrow_up_right"
-      app:tint="@color/component_color_shared_spotlight_overlay_arrow_color" />
+      app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
+      android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -71,7 +72,8 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
-          app:tint="@color/component_color_shared_close_spotlight_button_color" />
+          app:tint="@color/component_color_shared_close_spotlight_button_color"
+          android:contentDescription="@string/close_spotlight_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/continue_interaction_item.xml b/app/src/main/res/layout/continue_interaction_item.xml
index 1b8d40a5dd7..5ebab739f3d 100644
--- a/app/src/main/res/layout/continue_interaction_item.xml
+++ b/app/src/main/res/layout/continue_interaction_item.xml
@@ -46,7 +46,8 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+      app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+      android:contentDescription="@string/previous_state_navigation_button_content_description" />
 
     <org.oppia.android.app.customview.ContinueButtonView
       android:id="@+id/continue_interaction_button"
diff --git a/app/src/main/res/layout/continue_navigation_button_item.xml b/app/src/main/res/layout/continue_navigation_button_item.xml
index 687f2edafea..c8f5f736e5f 100644
--- a/app/src/main/res/layout/continue_navigation_button_item.xml
+++ b/app/src/main/res/layout/continue_navigation_button_item.xml
@@ -45,7 +45,8 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+      app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+      android:contentDescription="@string/previous_state_navigation_button_content_description" />
 
     <org.oppia.android.app.customview.ContinueButtonView
       android:id="@+id/continue_navigation_button"
diff --git a/app/src/main/res/layout/drawer_fragment.xml b/app/src/main/res/layout/drawer_fragment.xml
index 0dd6b44dd8d..31558550a83 100644
--- a/app/src/main/res/layout/drawer_fragment.xml
+++ b/app/src/main/res/layout/drawer_fragment.xml
@@ -67,7 +67,8 @@
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             app:srcCompat="@drawable/ic_baseline_code_24"
-            android:tint="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_image_color : @color/component_color_shared_primary_dark_text_color}" />
+            android:tint="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_image_color : @color/component_color_shared_primary_dark_text_color}"
+            android:contentDescription="@string/developer_options_icon_content_description" />
 
           <TextView
             android:layout_width="match_parent"
@@ -98,7 +99,8 @@
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:tint="@{footerViewModel.isAdministratorControlsSelected ? @color/component_color_drawer_fragment_admin_controls_selected_image_color : @color/component_color_shared_primary_dark_text_color}"
-            app:srcCompat="@drawable/ic_admin_settings_icon_brown_24dp" />
+            app:srcCompat="@drawable/ic_admin_settings_icon_brown_24dp"
+            android:contentDescription="@string/administrator_controls_icon_content_description" />
 
           <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/exploration_activity.xml b/app/src/main/res/layout/exploration_activity.xml
index 8dd9b645d25..39d0e3356dc 100755
--- a/app/src/main/res/layout/exploration_activity.xml
+++ b/app/src/main/res/layout/exploration_activity.xml
@@ -64,7 +64,8 @@
             android:layout_gravity="end"
             android:minWidth="48dp"
             android:minHeight="48dp"
-            android:scaleType="center" />
+            android:scaleType="center"
+            android:contentDescription="@string/options_menu_content_description" />
         </LinearLayout>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/math_expression_parser_fragment.xml b/app/src/main/res/layout/math_expression_parser_fragment.xml
index b69a79c2ad9..ce6208c4ddf 100644
--- a/app/src/main/res/layout/math_expression_parser_fragment.xml
+++ b/app/src/main/res/layout/math_expression_parser_fragment.xml
@@ -77,6 +77,7 @@
           android:background="@drawable/state_button_primary_background"
           android:clickable="true"
           android:enabled="true"
+          android:focusable="true"
           android:onClick="@{(v) -> viewModel.onParseButtonClicked()}"
           android:text="@string/math_expression_parse_button_label"
           android:textSize="14sp"
diff --git a/app/src/main/res/layout/next_button_item.xml b/app/src/main/res/layout/next_button_item.xml
index f64cf696616..4bf8c53f2fe 100644
--- a/app/src/main/res/layout/next_button_item.xml
+++ b/app/src/main/res/layout/next_button_item.xml
@@ -45,7 +45,8 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+      app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+      android:contentDescription="@string/previous_button_content_description" />
 
     <ImageButton
       android:id="@+id/next_state_navigation_button"
@@ -55,6 +56,7 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+      app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+      android:contentDescription="@string/next_button_content_description" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/previous_button_item.xml b/app/src/main/res/layout/previous_button_item.xml
index 96ea50345f7..38865b2aac9 100644
--- a/app/src/main/res/layout/previous_button_item.xml
+++ b/app/src/main/res/layout/previous_button_item.xml
@@ -44,6 +44,7 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+      app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+      android:contentDescription="@string/previous_button_content_description" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/profile_chooser_fragment.xml b/app/src/main/res/layout/profile_chooser_fragment.xml
index febeed2e886..c9d667ec8e0 100644
--- a/app/src/main/res/layout/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout/profile_chooser_fragment.xml
@@ -36,7 +36,8 @@
           android:visibility="gone"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
-          app:srcCompat="@drawable/ic_language_icon_grey_24dp" />
+          app:srcCompat="@drawable/ic_language_icon_grey_24dp"
+          android:contentDescription="@string/language_icon_content_description" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
@@ -115,7 +116,8 @@
         android:paddingTop="12dp"
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
-        app:srcCompat="@drawable/ic_settings_grey_48dp" />
+        app:srcCompat="@drawable/ic_settings_grey_48dp"
+        android:contentDescription="@string/setting_icon_content_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/profile_picture_activity.xml b/app/src/main/res/layout/profile_picture_activity.xml
index fcdc2deb08b..82932006341 100644
--- a/app/src/main/res/layout/profile_picture_activity.xml
+++ b/app/src/main/res/layout/profile_picture_activity.xml
@@ -48,7 +48,8 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/profile_picture_activity_app_bar_layout"
       profile:src="@{viewModel.profileAvatar}"
-      tools:src="@drawable/ic_default_avatar" />
+      tools:src="@drawable/ic_default_avatar"
+      android:contentDescription="@string/profile_picture_image_view_content_description" />
 
     <View
       android:id="@+id/app_version_shadow_view"
diff --git a/app/src/main/res/layout/return_to_topic_button_item.xml b/app/src/main/res/layout/return_to_topic_button_item.xml
index c6e20c3302c..1ac496459a9 100644
--- a/app/src/main/res/layout/return_to_topic_button_item.xml
+++ b/app/src/main/res/layout/return_to_topic_button_item.xml
@@ -27,7 +27,8 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+      app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+      android:contentDescription="@string/previous_button_content_description" />
 
     <Button
       android:id="@+id/return_to_topic_button"
diff --git a/app/src/main/res/layout/revision_card_activity.xml b/app/src/main/res/layout/revision_card_activity.xml
index c085eab2b6f..be55a492996 100644
--- a/app/src/main/res/layout/revision_card_activity.xml
+++ b/app/src/main/res/layout/revision_card_activity.xml
@@ -37,7 +37,8 @@
           android:layout_gravity="end"
           android:minWidth="48dp"
           android:minHeight="48dp"
-          android:scaleType="center" />
+          android:scaleType="center"
+          android:contentDescription="@string/options_menu_content_description" />
 
         <TextView
           android:id="@+id/revision_card_toolbar_title"
diff --git a/app/src/main/res/layout/story_chapter_view.xml b/app/src/main/res/layout/story_chapter_view.xml
index 769f7c8b94e..e606cc13c39 100644
--- a/app/src/main/res/layout/story_chapter_view.xml
+++ b/app/src/main/res/layout/story_chapter_view.xml
@@ -73,7 +73,8 @@
           app:layout_constraintEnd_toEndOf="@id/chapter_thumbnail"
           app:layout_constraintStart_toStartOf="@id/chapter_thumbnail"
           app:layout_constraintTop_toTopOf="@id/chapter_thumbnail"
-          app:srcCompat="@drawable/ic_baseline_lock_24" />
+          app:srcCompat="@drawable/ic_baseline_lock_24"
+          android:contentDescription="@string/lock_icon_content_description" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
           android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/submit_button_item.xml b/app/src/main/res/layout/submit_button_item.xml
index 9a54fb33a0e..b8788118fcb 100644
--- a/app/src/main/res/layout/submit_button_item.xml
+++ b/app/src/main/res/layout/submit_button_item.xml
@@ -45,7 +45,8 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+      app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+      android:contentDescription="@string/previous_button_content_description" />
 
     <Button
       android:id="@+id/submit_answer_button"
diff --git a/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml b/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
index 278f8477e76..3c855b206ea 100644
--- a/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
+++ b/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
@@ -7,5 +7,6 @@
   <ImageView
     android:id="@+id/view_for_drawable_binding_adapters_test"
     android:layout_width="match_parent"
-    android:layout_height="320dp" />
+    android:layout_height="320dp"
+    android:importantForAccessibility="no" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/test_image_view_bindable_adapter_activity.xml b/app/src/main/res/layout/test_image_view_bindable_adapter_activity.xml
index 296d60643d7..ef6de32b761 100644
--- a/app/src/main/res/layout/test_image_view_bindable_adapter_activity.xml
+++ b/app/src/main/res/layout/test_image_view_bindable_adapter_activity.xml
@@ -2,5 +2,6 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/image_view_for_data_binding"
   android:layout_width="32dp"
-  android:layout_height="32dp"/>
+  android:layout_height="32dp"
+  android:importantForAccessibility="no" />
 
diff --git a/app/src/main/res/layout/test_url_parser_activity.xml b/app/src/main/res/layout/test_url_parser_activity.xml
index eaa0e758a6c..9b0db340bf8 100644
--- a/app/src/main/res/layout/test_url_parser_activity.xml
+++ b/app/src/main/res/layout/test_url_parser_activity.xml
@@ -6,5 +6,6 @@
   <ImageView
     android:id="@+id/test_url_parser_image_view"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
+    android:layout_height="wrap_content"
+    android:importantForAccessibility="no" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/text_input_interaction_item.xml b/app/src/main/res/layout/text_input_interaction_item.xml
index 23c087a6323..e204f674cf6 100644
--- a/app/src/main/res/layout/text_input_interaction_item.xml
+++ b/app/src/main/res/layout/text_input_interaction_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:tools="http://schemas.android.com/tools"
+  xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <data>
@@ -21,14 +22,15 @@
     <org.oppia.android.app.customview.interaction.TextInputInteractionView
       android:id="@+id/text_input_interaction_view"
       style="@style/InputInteractionEditText"
-      android:contentDescription="@{viewModel.hintText.length() == 0 ? @string/text_input_default_content_description : ``}"
       android:hint="@{viewModel.hintText}"
+      android:contentDescription="@{viewModel.hintText.length() == 0 ? @string/text_input_default_content_description : ``}"
       android:inputType="text"
       android:text="@={viewModel.answerText}"
       android:textColorHint="@color/component_color_shared_edit_text_hint_color"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:textChangedListener="@{viewModel.answerTextWatcher}" />
+      app:textChangedListener="@{viewModel.answerTextWatcher}"
+      tools:ignore="ContentDescription" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/top_left_overlay.xml b/app/src/main/res/layout/top_left_overlay.xml
index fba00994436..d005ea8287c 100644
--- a/app/src/main/res/layout/top_left_overlay.xml
+++ b/app/src/main/res/layout/top_left_overlay.xml
@@ -24,7 +24,8 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_rounded_arrow_up_right"
-      app:tint="@color/component_color_shared_spotlight_overlay_arrow_color" />
+      app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
+      android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -67,7 +68,8 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
-          app:tint="@color/component_color_shared_close_spotlight_button_color" />
+          app:tint="@color/component_color_shared_close_spotlight_button_color"
+          android:contentDescription="@string/close_spotlight_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/top_right_overlay.xml b/app/src/main/res/layout/top_right_overlay.xml
index 13d17e7c942..9043b9bd3d8 100644
--- a/app/src/main/res/layout/top_right_overlay.xml
+++ b/app/src/main/res/layout/top_right_overlay.xml
@@ -25,7 +25,8 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_rounded_arrow_up_right"
-      app:tint="@color/component_color_shared_spotlight_overlay_arrow_color" />
+      app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
+      android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -70,7 +71,8 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
-          app:tint="@color/component_color_shared_close_spotlight_button_color" />
+          app:tint="@color/component_color_shared_close_spotlight_button_color"
+          android:contentDescription="@string/close_spotlight_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml
index a25f86330d4..47eccc08b25 100644
--- a/app/src/main/res/layout/topic_info_fragment.xml
+++ b/app/src/main/res/layout/topic_info_fragment.xml
@@ -126,7 +126,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
         app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
-        app:tint="@color/component_color_topic_info_fragment_download_status_image_color" />
+        app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
+        android:contentDescription="@string/download_status_image_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout/walkthrough_final_fragment.xml b/app/src/main/res/layout/walkthrough_final_fragment.xml
index bc7a49109b2..a393fc72813 100644
--- a/app/src/main/res/layout/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_final_fragment.xml
@@ -30,7 +30,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/walkthrough_final_title_text_view"
-        app:srcCompat="@drawable/ic_portrait_onboarding_0" />
+        app:srcCompat="@drawable/ic_portrait_onboarding_0"
+        android:importantForAccessibility="no" />
 
       <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/walkthrough_welcome_fragment.xml b/app/src/main/res/layout/walkthrough_welcome_fragment.xml
index 50233acdcb8..9543ab9a2e1 100644
--- a/app/src/main/res/layout/walkthrough_welcome_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_welcome_fragment.xml
@@ -61,7 +61,8 @@
         app:srcCompat="@drawable/ic_portrait_onboarding_0"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/walkthrough_welcome_description_text_view" />
+        app:layout_constraintTop_toBottomOf="@+id/walkthrough_welcome_description_text_view"
+        android:importantForAccessibility="no" />
 
       <Button
         android:id="@+id/walkthrough_welcome_next_button"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76818825418..0f02760b7ae 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -581,4 +581,19 @@
   <string name="nps_score_question">On a scale from 0–10, how likely are you to recommend %s to a friend or colleague?</string>
   <string name="previous_subtopic_talkback_text">The previous subtopic is %s</string>
   <string name="next_subtopic_talkback_text">The next subtopic is %s</string>
+
+  <string name="app_info_icon_content_description">App Info</string>
+  <string name="spotlight_overlay_arrow_content_description">Spotlight Overlay Arrow</string>
+  <string name="close_spotlight_button_content_description">Close Spotlight Button</string>
+  <string name="previous_state_navigation_button_content_description">Previous State Navigation Button</string>
+  <string name="developer_options_icon_content_description">Developer Options Icon</string>
+  <string name="administrator_controls_icon_content_description">Administrator Controls Icon</string>
+  <string name="options_menu_content_description">Options Menu</string>
+  <string name="previous_button_content_description">Previous Button</string>
+  <string name="next_button_content_description">Next Button</string>
+  <string name="language_icon_content_description">Language Icon</string>
+  <string name="setting_icon_content_description">Setting Icon</string>
+  <string name="profile_picture_image_view_content_description">Profile Picture Image View</string>
+  <string name="lock_icon_content_description">Lock Icon</string>
+  <string name="download_status_image_content_description">Download Status</string>
 </resources>

From 190294619435af4ad83f13a5fb0037c6255edcb7 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Fri, 6 Oct 2023 20:32:26 +0530
Subject: [PATCH 10/32] Localisation updates from https://translatewiki.net.
 (#5172)

Translation updates

Co-authored-by: Sean Lip <sean@seanlip.org>
---
 app/src/main/res/values-ar/strings.xml      |  67 +++------
 app/src/main/res/values-pcm-rNG/strings.xml |  55 +++----
 app/src/main/res/values-pt-rBR/strings.xml  | 158 +++++++++++++-------
 app/src/main/res/values-sw/strings.xml      |  51 +++----
 4 files changed, 163 insertions(+), 168 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 938f0dbc081..5cf88b6abee 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -23,13 +23,13 @@
   <string name="audio_play_description">تشغيل الصوت</string>
   <string name="audio_pause_description">إيقاف الصوت مؤقتًا</string>
   <string name="audio_unavailable_in_selected_language">صوت %s غير متوفر.</string>
-  <string name="audio_language_select_dialog_okay_button">موافق</string>
+  <string name="audio_language_select_dialog_okay_button" fuzzy="true">موافق</string>
   <string name="audio_language_select_dialog_cancel_button">إلغاء</string>
   <string name="audio_language_select_dialog_title">لغة الصوت</string>
   <string name="audio_dialog_offline_title">غير متصل بالإنترنت</string>
   <string name="audio_dialog_offline_message">من فضلك تأكد من وجود اتصال بالإنترنت عن طريق شبكة الوايفاي أو بيانات الهاتف، ثم حاول مرة أخرى.</string>
-  <string name="audio_dialog_offline_positive">حسنًا</string>
-  <string name="cellular_data_alert_dialog_okay_button">موافق</string>
+  <string name="audio_dialog_offline_positive" fuzzy="true">حسنًا</string>
+  <string name="cellular_data_alert_dialog_okay_button" fuzzy="true">موافق</string>
   <string name="cellular_data_alert_dialog_cancel_button">إلغاء</string>
   <string name="cellular_data_alert_dialog_title">متصل بالإنترنت عن طريق بيانات الهاتف</string>
   <string name="cellular_data_alert_dialog_description">تشغيل الصوت عبر الإنترنت قد يستخدم الكثير من بيانات الهاتف.</string>
@@ -168,11 +168,11 @@
   <string name="number_error_starting_with_floating_point">من فضلك إبدأ إجابتك برقم (0 او 0.5 على سبيل المثال)</string>
   <string name="number_error_invalid_format">من فضلك قم بإدخال رقم صالح.</string>
   <string name="number_error_larger_than_fifteen_characters">يمكن أن تحتوي الإجابة على 15 رقمًا (0-9) على الأكثر أو الرموز (. أو -)</string>
-  <string name="ratio_error_invalid_chars">من فضلك قم بكتابة نسبة تتكون من أرقام مفصولة بنقطتين رأسيتين (1:2 أو 1:2:3 على سبيل المثال).</string>
-  <string name="ratio_error_invalid_format">من فضلك أدخل نسبة صحيحة (1:2 أو 1:2:3 على سبيل المثال)</string>
-  <string name="ratio_error_invalid_colons">إجابتك تحتوي على نقطتين رأسيتين (:) متتاليتين.</string>
-  <string name="ratio_error_invalid_size">عدد الحدود لا يساوي العدد المطلوب.</string>
-  <string name="ratio_error_includes_zero">لا يمكن أن تحتوي النسب على 0 كعنصر.</string>
+  <string name="ratio_error_invalid_chars" fuzzy="true">من فضلك قم بكتابة نسبة تتكون من أرقام مفصولة بنقطتين رأسيتين (1:2 أو 1:2:3 على سبيل المثال).</string>
+  <string name="ratio_error_invalid_format" fuzzy="true">من فضلك أدخل نسبة صحيحة (1:2 أو 1:2:3 على سبيل المثال)</string>
+  <string name="ratio_error_invalid_colons" fuzzy="true">إجابتك تحتوي على نقطتين رأسيتين (:) متتاليتين.</string>
+  <string name="ratio_error_invalid_size" fuzzy="true">عدد الحدود لا يساوي العدد المطلوب.</string>
+  <string name="ratio_error_includes_zero" fuzzy="true">لا يمكن أن تحتوي النسب على 0 كعنصر.</string>
   <string name="unknown_size">الحجم مجهول</string>
   <string name="size_bytes">%s بايت</string>
   <string name="size_kb">%s ك.ب</string>
@@ -180,7 +180,7 @@
   <string name="size_gb">%s ج.ب</string>
   <string name="correct">صحيح!</string>
   <string name="topic_prefix">الموضوع: %s</string>
-  <plurals name="chapter_count">
+  <plurals name="chapter_count" fuzzy="true">
     <item quantity="zero">و لا فصل</item>
     <item quantity="one">فصلًا واحدًا</item>
     <item quantity="two">فصلان</item>
@@ -188,7 +188,7 @@
     <item quantity="many">%s من الفصول</item>
     <item quantity="other">%s من الفصول</item>
   </plurals>
-  <plurals name="story_count">
+  <plurals name="story_count" fuzzy="true">
     <item quantity="zero">و لا قصة</item>
     <item quantity="one">قصة واحدة</item>
     <item quantity="two">قصتان</item>
@@ -204,7 +204,7 @@
     <item quantity="many">%s فصول مكتملة من %s</item>
     <item quantity="other">%s فصول مكتملة من %s</item>
   </plurals>
-  <plurals name="lesson_count">
+  <plurals name="lesson_count" fuzzy="true">
     <item quantity="zero">و لا درس</item>
     <item quantity="one">درسًا واحدًا</item>
     <item quantity="two">درسان</item>
@@ -212,7 +212,7 @@
     <item quantity="many">%s درس</item>
     <item quantity="other">%s درس</item>
   </plurals>
-  <plurals name="completed_story_count">
+  <plurals name="completed_story_count" fuzzy="true">
     <item quantity="zero">و لا قصة مكتملة</item>
     <item quantity="one">قصة واحدة مكتملة</item>
     <item quantity="two">قصتان مكتملتان</item>
@@ -220,7 +220,7 @@
     <item quantity="many">%s قصة مكتملة</item>
     <item quantity="other">%s قصة مكتملة</item>
   </plurals>
-  <plurals name="ongoing_topic_count">
+  <plurals name="ongoing_topic_count" fuzzy="true">
     <item quantity="zero">و لا موضوع في تقدم</item>
     <item quantity="one">موضوع واحد في تقدم</item>
     <item quantity="two">موضوعان في تقدم</item>
@@ -350,7 +350,7 @@
   <string name="profile_picture_edit_alert_dialog_choose_from_library">اختيار من المعرض</string>
   <string name="profile_rename_activity_title">إعادة تسمية الملف الشخصي</string>
   <string name="profile_rename_label">الاسم الجديد</string>
-  <string name="profile_rename_save">حفظ</string>
+  <string name="profile_rename_save" fuzzy="true">حفظ</string>
   <string name="profile_reset_pin_activity_title">إعادة ضبط رقم التعريف الشخصي</string>
   <string name="profile_reset_pin_main">أدخل رقم تعريف شخصي جديد للمستخدم كي يستخدمه عند الدخول إلى ملفه الشخصي.</string>
   <string name="profile_reset_pin_user_pin_label">رقم تعريف شخصي مكون من 3 أرقام</string>
@@ -383,12 +383,12 @@
   <string name="app_last_update_date">تم تثبيت آخر إصدار في %s. قم باستخدام رقم الإصدار في الأعلى للإبلاغ عن أعطال التطبيق.</string>
   <string name="app_version_activity_title">إصدار التطبيق</string>
   <string name="app_language_activity_title">لغة التطبيق</string>
-  <string name="audio_language_activity_title">لغة الصوت الافتراضية</string>
+  <string name="audio_language_activity_title" fuzzy="true">لغة الصوت الافتراضية</string>
   <string name="reading_text_size_activity_title">حجم النص المقروء</string>
   <string name="title_reading_text_size">حجم النص المقروء</string>
   <string name="story_text_will_look_like_this">سيظهر نص القصة بهذا الشكل.</string>
   <string name="constant_string_for_text_size">أ</string>
-  <string name="audio_language">الصوت الافتراضي</string>
+  <string name="audio_language" fuzzy="true">الصوت الافتراضي</string>
   <string name="app_language">لغة التطبيق</string>
   <string name="reading_text_size">حجم النص المقروء</string>
   <string name="reading_text_size_small">صغير</string>
@@ -432,7 +432,6 @@
   <string name="reveal">إظهار</string>
   <string name="just_now">الآن</string>
   <string name="last_logged_in_recently">حديثاً</string>
-  <string name="time_ago">منذ %s</string>
   <string name="yesterday">أمس</string>
   <string name="return_to_topic">العودة إلى الموضوع</string>
   <string name="return_to_lesson">العودة إلى الدرس</string>
@@ -445,36 +444,12 @@
   <string name="up_button_disabled">أعلى</string>
   <string name="down_button_disabled">أسفل</string>
   <string name="profile_last_visited">%s %s</string>
-  <plurals name="minutes">
-    <item quantity="zero">و لا دقيقة</item>
-    <item quantity="one">دقيقة واحدة</item>
-    <item quantity="two">دقيقتان</item>
-    <item quantity="few">%s دقيقة</item>
-    <item quantity="many">%s دقيقة</item>
-    <item quantity="other">%s دقيقة</item>
-  </plurals>
-  <plurals name="hours">
-    <item quantity="zero">و لا ساعة</item>
-    <item quantity="one">ساعة واحدة</item>
-    <item quantity="two">ساعتان</item>
-    <item quantity="few">%s ساعة</item>
-    <item quantity="many">%s ساعة</item>
-    <item quantity="other">%s ساعة</item>
-  </plurals>
-  <plurals name="days">
-    <item quantity="zero">و لا يوم</item>
-    <item quantity="one">يوم واحدة</item>
-    <item quantity="two">يومان</item>
-    <item quantity="few">%s يوم</item>
-    <item quantity="many">%s يوم</item>
-    <item quantity="other">%s يوم</item>
-  </plurals>
   <string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
   <string name="ongoing_recycler_view_tag">ongoing_recycler_view_tag</string>
   <string name="item_selection_text">برجاء اختيار خيار واحد على الأقل.</string>
-  <string name="unsupported_app_version_dialog_title">إصدار تطبيق غير مدعوم</string>
-  <string name="unsupported_app_version_dialog_message">هذا الإصدار من التطبيق لم يعد مدعومًا. من فضلك قم بتحديث التطبيق من خلال متجر بلاي (Play Store)</string>
-  <string name="unsupported_app_version_dialog_close_button_text">إغلاق التطبيق</string>
+  <string name="unsupported_app_version_dialog_title" fuzzy="true">إصدار تطبيق غير مدعوم</string>
+  <string name="unsupported_app_version_dialog_message" fuzzy="true">هذا الإصدار من التطبيق لم يعد مدعومًا. من فضلك قم بتحديث التطبيق من خلال متجر بلاي (Play Store)</string>
+  <string name="unsupported_app_version_dialog_close_button_text" fuzzy="true">إغلاق التطبيق</string>
   <string name="splash_screen_developer_label">بناء المطور</string>
   <string name="splash_screen_alpha_label">ألفا</string>
   <string name="splash_screen_beta_label">بيتا</string>
@@ -486,8 +461,8 @@
   <string name="general_availability_notice_dialog_message">مرحبًا! يتم الآن تحديث تطبيقك إلى إصدار التوفر العام. إذا واجهت مشاكل أثناء استخدام التطبيق ، أو كانت لديك أسئلة ، فيرجى الاتصال بنا على android-feedback@oppia.org.</string>
   <string name="general_availability_notice_dialog_do_not_show_again_text">لا تظهر هذه الرسالة مرة أخرى</string>
   <string name="general_availability_notice_dialog_close_button_text">نعم</string>
-  <string name="ratio_content_description_separator">إلى</string>
-  <string name="ratio_default_hint_text">أدخل نسبة في الصيغة س:ص.</string>
+  <string name="ratio_content_description_separator" fuzzy="true">إلى</string>
+  <string name="ratio_default_hint_text" fuzzy="true">أدخل نسبة في الصيغة س:ص.</string>
   <string name="text_input_default_hint_text">انقر هنا لإدخال نص.</string>
   <string name="smallest_text_size_content_description">أصغر حجمًا للنص</string>
   <string name="largest_text_size_content_description">أكبر حجمًا للنص</string>
diff --git a/app/src/main/res/values-pcm-rNG/strings.xml b/app/src/main/res/values-pcm-rNG/strings.xml
index 616d6e03f76..26c2a9af024 100644
--- a/app/src/main/res/values-pcm-rNG/strings.xml
+++ b/app/src/main/res/values-pcm-rNG/strings.xml
@@ -19,13 +19,13 @@
   <string name="audio_play_description">Play di audio</string>
   <string name="audio_pause_description">Pause di audio</string>
   <string name="audio_unavailable_in_selected_language">%s audio no dey available.</string>
-  <string name="audio_language_select_dialog_okay_button">OK</string>
+  <string name="audio_language_select_dialog_okay_button" fuzzy="true">OK</string>
   <string name="audio_language_select_dialog_cancel_button">Cancel am</string>
   <string name="audio_language_select_dialog_title">Audio Language</string>
   <string name="audio_dialog_offline_title">You dey offline</string>
   <string name="audio_dialog_offline_message">Make sure sey Wi-Fi or mobile data dey on, den try am again.</string>
-  <string name="audio_dialog_offline_positive">OK</string>
-  <string name="cellular_data_alert_dialog_okay_button">OK</string>
+  <string name="audio_dialog_offline_positive" fuzzy="true">OK</string>
+  <string name="cellular_data_alert_dialog_okay_button" fuzzy="true">OK</string>
   <string name="cellular_data_alert_dialog_cancel_button">Cancel am</string>
   <string name="cellular_data_alert_dialog_title">Na your data you dey use now</string>
   <string name="cellular_data_alert_dialog_description">Playing di audio go use plenti mobile data.</string>
@@ -164,11 +164,11 @@
   <string name="number_error_starting_with_floating_point">Abeg start your ansa with nomba (e.g.,”0” for 0.5).</string>
   <string name="number_error_invalid_format">Abeg put correct nomba.</string>
   <string name="number_error_larger_than_fifteen_characters">Di ansa fit get at most 15 digits (0–9) or sign (. or -).</string>
-  <string name="ratio_error_invalid_chars">Abeg write a ratio wey get nomba separated by colons (e.g. 1:2 or 1:2:3).</string>
-  <string name="ratio_error_invalid_format">Abeg enter a valid ratio (e.g. 1:2 or 1:2:3).</string>
-  <string name="ratio_error_invalid_colons">Your ansa get two colons (:) next to each other.</string>
-  <string name="ratio_error_invalid_size">Nomba of terms no dey equal to di required terms.</string>
-  <string name="ratio_error_includes_zero">Ratios no suppose get 0 as an element.</string>
+  <string name="ratio_error_invalid_chars" fuzzy="true">Abeg write a ratio wey get nomba separated by colons (e.g. 1:2 or 1:2:3).</string>
+  <string name="ratio_error_invalid_format" fuzzy="true">Abeg enter a valid ratio (e.g. 1:2 or 1:2:3).</string>
+  <string name="ratio_error_invalid_colons" fuzzy="true">Your ansa get two colons (:) next to each other.</string>
+  <string name="ratio_error_invalid_size" fuzzy="true">Nomba of terms no dey equal to di required terms.</string>
+  <string name="ratio_error_includes_zero" fuzzy="true">Ratios no suppose get 0 as an element.</string>
   <string name="unknown_size">Size wey dey no know</string>
   <string name="size_bytes">%s Bytes</string>
   <string name="size_kb">%s KB</string>
@@ -176,11 +176,11 @@
   <string name="size_gb">%s GB</string>
   <string name="correct">You get am!</string>
   <string name="topic_prefix">Topic: %s</string>
-  <plurals name="chapter_count">
+  <plurals name="chapter_count" fuzzy="true">
     <item quantity="one">1 Chapter</item>
     <item quantity="other">%s Chapters</item>
   </plurals>
-  <plurals name="story_count">
+  <plurals name="story_count" fuzzy="true">
     <item quantity="one">1 Story</item>
     <item quantity="other">%s Stories</item>
   </plurals>
@@ -188,16 +188,16 @@
     <item quantity="one">%s of %s Chapter Completed</item>
     <item quantity="other">%s of %s Chapters Completed</item>
   </plurals>
-  <plurals name="lesson_count">
+  <plurals name="lesson_count" fuzzy="true">
     <item quantity="one">1 Lesson</item>
     <item quantity="other">%s Lessons</item>
   </plurals>
-  <plurals name="completed_story_count">
+  <plurals name="completed_story_count" fuzzy="true">
     <item quantity="one">1 Story Completed</item>
     <item quantity="zero">%s Stories Completed</item>
     <item quantity="other">%s Stories Completed</item>
   </plurals>
-  <plurals name="ongoing_topic_count">
+  <plurals name="ongoing_topic_count" fuzzy="true">
     <item quantity="one">1 Topic in Progress</item>
     <item quantity="zero">%s Topics in Progress</item>
     <item quantity="other">%s Topics in Progress</item>
@@ -324,7 +324,7 @@
   <string name="profile_picture_edit_alert_dialog_choose_from_library">Choose From Library</string>
   <string name="profile_rename_activity_title">Rename Profile</string>
   <string name="profile_rename_label">New Name</string>
-  <string name="profile_rename_save">save</string>
+  <string name="profile_rename_save" fuzzy="true">save</string>
   <string name="profile_reset_pin_activity_title">Reset PIN</string>
   <string name="profile_reset_pin_main">Put new PIN for di user to put wan dey wan enter deir profile.</string>
   <string name="profile_reset_pin_user_pin_label">3-Digit PIN</string>
@@ -357,12 +357,12 @@
   <string name="app_last_update_date">Di last update install on %s. Use di version nomba for up to send feedback about bugs.</string>
   <string name="app_version_activity_title">App Version</string>
   <string name="app_language_activity_title">App Language</string>
-  <string name="audio_language_activity_title">Default Audio Language</string>
+  <string name="audio_language_activity_title" fuzzy="true">Default Audio Language</string>
   <string name="reading_text_size_activity_title">Reading Text Size</string>
   <string name="title_reading_text_size">Reading Text Size</string>
   <string name="story_text_will_look_like_this">Story text go look like dis.</string>
   <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language">Default Audio</string>
+  <string name="audio_language" fuzzy="true">Default Audio</string>
   <string name="app_language">App Language</string>
   <string name="reading_text_size">Reading Text Size</string>
   <string name="reading_text_size_small">Small</string>
@@ -406,7 +406,6 @@
   <string name="reveal">Show</string>
   <string name="just_now">just now</string>
   <string name="last_logged_in_recently">recently</string>
-  <string name="time_ago">%s ago</string>
   <string name="yesterday">yesterday</string>
   <string name="return_to_topic">Go back to topic</string>
   <string name="return_to_lesson">Go back to lesson</string>
@@ -419,24 +418,12 @@
   <string name="up_button_disabled">Up</string>
   <string name="down_button_disabled">Down</string>
   <string name="profile_last_visited">%s %s</string>
-  <plurals name="minutes">
-    <item quantity="one">a minute</item>
-    <item quantity="other">%s minutes</item>
-  </plurals>
-  <plurals name="hours">
-    <item quantity="one">an hour</item>
-    <item quantity="other">%s hours</item>
-  </plurals>
-  <plurals name="days">
-    <item quantity="one">a day</item>
-    <item quantity="other">%s days</item>
-  </plurals>
   <string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
   <string name="ongoing_recycler_view_tag">ongoing_recycler_view_tag</string>
   <string name="item_selection_text">Abeg select all di correct choices.</string>
-  <string name="unsupported_app_version_dialog_title">Unsupported app version</string>
-  <string name="unsupported_app_version_dialog_message">Dis version of di app no longer dey supported. Abeg update am from di Play Store.</string>
-  <string name="unsupported_app_version_dialog_close_button_text">Close app</string>
+  <string name="unsupported_app_version_dialog_title" fuzzy="true">Unsupported app version</string>
+  <string name="unsupported_app_version_dialog_message" fuzzy="true">Dis version of di app no longer dey supported. Abeg update am from di Play Store.</string>
+  <string name="unsupported_app_version_dialog_close_button_text" fuzzy="true">Close app</string>
   <string name="splash_screen_developer_label">Developer Build</string>
   <string name="splash_screen_alpha_label">Alpha</string>
   <string name="splash_screen_beta_label">Beta</string>
@@ -448,8 +435,8 @@
   <string name="general_availability_notice_dialog_message">Hello! Your app don dey update to di General Availability version. If you experience any problems while you dey use di app, or get any questions, abeg contact us at android-feedback@oppia.org.</string>
   <string name="general_availability_notice_dialog_do_not_show_again_text">No show dis message again</string>
   <string name="general_availability_notice_dialog_close_button_text">OK</string>
-  <string name="ratio_content_description_separator">to</string>
-  <string name="ratio_default_hint_text">Enter a ratio in di form x:y.</string>
+  <string name="ratio_content_description_separator" fuzzy="true">to</string>
+  <string name="ratio_default_hint_text" fuzzy="true">Enter a ratio in di form x:y.</string>
   <string name="text_input_default_hint_text">Tap here to put text.</string>
   <string name="smallest_text_size_content_description">Smallest text size</string>
   <string name="largest_text_size_content_description">Largest text size</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9cb7c841127..03ef6e1b366 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -2,6 +2,7 @@
 <!-- Authors:
 * Carolintaschi
 * Eduardoaddad
+* Felipe L. Ewald
 * Jfalarini
 * Leosls
 * Re demz
@@ -19,19 +20,19 @@
   <string name="bottom_sheet_options_menu_close">Fechar</string>
   <string name="menu_switch_profile">Trocar Perfil</string>
   <string name="developer_options">Opções de Desenvolvedor</string>
-  <string name="administrator_controls">Controles de Administrador</string>
+  <string name="administrator_controls">Controles do administrador</string>
   <string name="drawer_open_content_description">Menu de Navegação Aberto</string>
   <string name="drawer_close_content_description">Fechar Menu de Navegação</string>
   <string name="audio_play_description">Tocar áudio</string>
   <string name="audio_pause_description">Pausar áudio</string>
-  <string name="audio_unavailable_in_selected_language">%s áudio está indisponível.</string>
-  <string name="audio_language_select_dialog_okay_button">OK</string>
+  <string name="audio_unavailable_in_selected_language">%s o áudio não está disponível.</string>
+  <string name="audio_language_select_dialog_okay_button" fuzzy="true">OK</string>
   <string name="audio_language_select_dialog_cancel_button">Cancelar</string>
   <string name="audio_language_select_dialog_title">Idioma de Áudio</string>
   <string name="audio_dialog_offline_title">Atualmente Offline</string>
   <string name="audio_dialog_offline_message">Certifique-se de que o Wi-Fi ou os dados móveis estejam ativados e tente novamente.</string>
-  <string name="audio_dialog_offline_positive">OK</string>
-  <string name="cellular_data_alert_dialog_okay_button">OK</string>
+  <string name="audio_dialog_offline_positive" fuzzy="true">OK</string>
+  <string name="cellular_data_alert_dialog_okay_button" fuzzy="true">OK</string>
   <string name="cellular_data_alert_dialog_cancel_button">Cancelar</string>
   <string name="cellular_data_alert_dialog_title">Atualmente em Dados Móveis</string>
   <string name="cellular_data_alert_dialog_description">O streaming de áudio pode usar muitos dados móveis.</string>
@@ -46,6 +47,9 @@
   <string name="stop_exploration_dialog_description">Seu progresso não será salvo.</string>
   <string name="stop_exploration_dialog_cancel_button">Cancelar</string>
   <string name="stop_exploration_dialog_leave_button">Sair</string>
+  <string name="exploration_exit_button_spotlight_hint">Saia a qualquer momento usando este botão. Nós salvaremos seu progresso.</string>
+  <string name="voiceover_icon_spotlight_hint">Gostaria que %s lesse para você? Toque neste botão para experimentar!</string>
+  <string name="voiceover_language_icon_spotlight_hint">Toque para alterar o idioma da narração.</string>
   <string name="progress_database_full_dialog_title">Capacidade máxima de armazenamento atingida</string>
   <string name="progress_database_full_dialog_description">O progresso salvo para a lição \"%s\" será excluído.</string>
   <string name="progress_database_full_dialog_continue_button">Continuar</string>
@@ -55,6 +59,13 @@
   <string name="topic_name_text_view">Razão e Proporção</string>
   <string name="topic_practice_skills_description">Selecione as habilidades que você gostaria de praticar.</string>
   <string name="topic_practice_start">Começar</string>
+  <string name="info_tab_content_description">Detalhes sobre o tópico.</string>
+  <string name="revision_tab_content_description">Revise os conceitos aprendidos nas lições concluídas aqui.</string>
+  <string name="practice_tab_content_description">Pratique os conceitos aprendidos nas lições concluídas.</string>
+  <string name="lessons_tab_content_description">Toque aqui para começar a tocar uma lição.</string>
+  <string name="topic_lessons_tab_spotlight_hint">Encontre todas as suas lições aqui.</string>
+  <string name="topic_revision_tab_spotlight_hint">Revise os conceitos aprendidos nas lições concluídas aqui.</string>
+  <string name="first_chapter_spotlight_hint">Toque aqui para começar a tocar uma lição.</string>
   <string name="state_continue_button">Continuar</string>
   <string name="state_continue_submit">Enviar</string>
   <string name="previous_state_description">Voltar ao cartão anterior</string>
@@ -78,7 +89,7 @@
   <string name="lessons">Lições</string>
   <string name="practice">Prática</string>
   <string name="revision">Revisão</string>
-  <string name="administrator_controls_title">Controles do Administrador</string>
+  <string name="administrator_controls_title">Controles do administrador</string>
   <string name="topic_page">Página do tópico</string>
   <string name="topic_name">Tópico: %s</string>
   <string name="topic">Tópico</string>
@@ -87,6 +98,8 @@
   <string name="chapter_completed">O capítulo %s com o título %s foi concluído</string>
   <string name="chapter_in_progress">O capítulo %s com o título %s está em andamento</string>
   <string name="chapter_prerequisite_title_label">Conclua o capítulo %s: %s para desbloquear este capítulo.</string>
+  <string name="chapter_locked_prerequisite_title_label">O capítulo %s: %s está bloqueado no momento. Conclua o capítulo %s: %s para desbloquear esse capítulo.</string>
+  <string name="chapter_prerequisite_title_label_without_chapter_title">Conclua o capítulo anterior para desbloquear este capítulo.</string>
   <string name="text_input_default_content_description">Inserir texto.</string>
   <string name="fractions_default_hint_text">Insira uma fração na forma x/x, ou um número misto na forma x x/x.</string>
   <string name="fractions_default_hint_text_no_integer">Insira uma fração no formato x/x.</string>
@@ -159,11 +172,11 @@
   <string name="number_error_starting_with_floating_point">Comece sua resposta com um número (por exemplo, \"0\" em 0,5)</string>
   <string name="number_error_invalid_format">Por favor, insira um número válido.</string>
   <string name="number_error_larger_than_fifteen_characters">A resposta pode conter no máximo 15 dígitos (0–9) ou símbolos (. ou -).</string>
-  <string name="ratio_error_invalid_chars">Escreva uma proporção que consista em dígitos separados por dois pontos (por exemplo, 1:2 ou 1:2:3).</string>
-  <string name="ratio_error_invalid_format">Insira uma proporção válida (por exemplo, 1:2 ou 1:2:3).</string>
-  <string name="ratio_error_invalid_colons">Sua resposta tem dois dois-pontos (:) do lado um do outro.</string>
-  <string name="ratio_error_invalid_size">O número de termos não é igual ao exigido.</string>
-  <string name="ratio_error_includes_zero">Proporções não podem ter 0 como elemento.</string>
+  <string name="ratio_error_invalid_chars" fuzzy="true">Escreva uma proporção que consista em dígitos separados por dois pontos (por exemplo, 1:2 ou 1:2:3).</string>
+  <string name="ratio_error_invalid_format" fuzzy="true">Insira uma proporção válida (por exemplo, 1:2 ou 1:2:3).</string>
+  <string name="ratio_error_invalid_colons" fuzzy="true">Sua resposta tem dois dois-pontos (:) do lado um do outro.</string>
+  <string name="ratio_error_invalid_size" fuzzy="true">O número de termos não é igual ao exigido.</string>
+  <string name="ratio_error_includes_zero" fuzzy="true">Proporções não podem ter 0 como elemento.</string>
   <string name="unknown_size">Tamanho desconhecido</string>
   <string name="size_bytes">%s Bytes</string>
   <string name="size_kb">%s KB</string>
@@ -171,11 +184,11 @@
   <string name="size_gb">%s GB</string>
   <string name="correct">Correto!</string>
   <string name="topic_prefix">Tópico: %s</string>
-  <plurals name="chapter_count">
+  <plurals name="chapter_count" fuzzy="true">
     <item quantity="one">1 Capítulo\n    </item>
     <item quantity="other">\n      %s Capítulos\n    </item>
   </plurals>
-  <plurals name="story_count">
+  <plurals name="story_count" fuzzy="true">
     <item quantity="one">1 História\n    </item>
     <item quantity="other">\n      %s Histórias\n    </item>
   </plurals>
@@ -183,24 +196,24 @@
     <item quantity="one">%s de %s Capítulo Concluído</item>
     <item quantity="other">%s de %s Capítulos Concluídos</item>
   </plurals>
-  <plurals name="lesson_count">
+  <plurals name="lesson_count" fuzzy="true">
     <item quantity="one">1 Lição\n    </item>
     <item quantity="other">\n      %s Lições\n    </item>
   </plurals>
-  <plurals name="completed_story_count">
-    <item quantity="one">1 História Concluída\n    </item>
-    <item quantity="zero">%s Histórias Concluídas\n    </item>
-    <item quantity="other">\n      %s Histórias Concluídas\n    </item>
+  <plurals name="completed_story_count" fuzzy="true">
+    <item quantity="one">1 história concluída</item>
+    <item quantity="zero">%s Histórias concluídas</item>
+    <item quantity="other">%s Histórias concluídas</item>
   </plurals>
-  <plurals name="ongoing_topic_count">
-    <item quantity="one">1 Tópico em Andamento\n    </item>
-    <item quantity="zero">%s Tópicos em Andamento\n    </item>
-    <item quantity="other">\n      %s Tópicos em Andamento\n    </item>
+  <plurals name="ongoing_topic_count" fuzzy="true">
+    <item quantity="one">1 Tópico em andamento</item>
+    <item quantity="zero">%s Tópicos em andamento</item>
+    <item quantity="other">%s Tópicos em andamento</item>
   </plurals>
   <string name="profile_chooser_activity_label">Página de seleção de perfil</string>
   <string name="profile_chooser_admin">Administrador</string>
   <string name="profile_chooser_select">Selecione seu perfil</string>
-  <string name="profile_chooser_add">Adicionar Perfil</string>
+  <string name="profile_chooser_add">Novo Perfil</string>
   <string name="set_up_multiple_profiles">Configurar Múltiplos Perfis</string>
   <string name="set_up_multiple_profiles_description">Adicione até 10 usuários à sua conta. Perfeito para famílias e salas de aula.</string>
   <string name="profile_chooser_administrator_controls">Controles do Administrador</string>
@@ -208,7 +221,7 @@
   <string name="admin_auth_toolbar">Controles do Administrador</string>
   <string name="admin_auth_activity_add_profiles_title">Autorize para adicionar perfis</string>
   <string name="admin_auth_activity_access_controls_title">Autorize para acessar os Controles do Administrador</string>
-  <string name="admin_auth_heading">Autorização do Administrador Necessária</string>
+  <string name="admin_auth_heading">Autorização do administrador necessária</string>
   <string name="admin_auth_sub">Insira o PIN do administrador para criar uma nova conta.</string>
   <string name="admin_auth_admin_controls_sub">Insira o PIN do administrador para acessar os Controles do Administrador.</string>
   <string name="admin_auth_pin">PIN do Administrador</string>
@@ -216,7 +229,7 @@
   <string name="admin_auth_null">Insira o PIN do administrador.</string>
   <string name="admin_auth_submit">Enviar</string>
   <string name="admin_auth_close">Fechar</string>
-  <string name="admin_pin_requirement_description" fuzzy="true">Antes de adicionarmos perfis, precisamos proteger sua conta criando um PIN. Isso dá a você a capacidade de autorizar downloads e gerenciar perfis no dispositivo.</string>
+  <string name="admin_pin_requirement_description">Antes de adicionarmos perfis, precisamos proteger sua conta criando um PIN. Isso lhe dá a capacidade de autorizar o gerenciamento de perfis no dispositivo.</string>
   <string name="admin_pin_pin_description">Use um PIN que você definiu para contas pessoais, como bancos ou previdência social.</string>
   <string name="admin_pin_new_pin">Novo PIN de 5 dígitos</string>
   <string name="admin_pin_new_confirm">Confirmar PIN de 5 dígitos</string>
@@ -224,11 +237,11 @@
   <string name="admin_pin_error_pin_confirm_wrong">Certifique-se de que os dois PINs coincidam.</string>
   <string name="save">Salvar</string>
   <string name="admin_pin_activity_title">Autorize para adicionar perfis</string>
-  <string name="add_profile_activity_label">Adicionar Perfil</string>
-  <string name="add_profile_title">Adicionar Perfil</string>
+  <string name="add_profile_activity_label">Novo Perfil</string>
+  <string name="add_profile_title">Novo Perfil</string>
   <string name="add_profile_input_name">Nome</string>
-  <string name="add_profile_input_pin" fuzzy="true">PIN de 3 Dígitos</string>
-  <string name="add_profile_input_confirm_pin" fuzzy="true">Confirmar PIN de 3 Dígitos</string>
+  <string name="add_profile_input_pin">PIN de 3 dígitos</string>
+  <string name="add_profile_input_confirm_pin">Confirmar PIN de 3 dígitos</string>
   <string name="add_profile_allow_download_heading">Permitir Acesso a Download</string>
   <string name="add_profile_allow_download_sub">O usuário pode baixar e excluir conteúdo sem o PIN do administrador.</string>
   <string name="add_profile_create_btn">Criar</string>
@@ -236,8 +249,8 @@
   <string name="add_profile_pin_info">Com um PIN, ninguém mais pode acessar um perfil além deste usuário atribuído.</string>
   <string name="add_profile_error_image_failed_store">Falha ao armazenar sua imagem de avatar. Por favor, tente novamente.</string>
   <string name="add_profile_error_name_not_unique">Este nome já está em uso por outro perfil.</string>
-  <string name="add_profile_error_name_empty" fuzzy="true">Por favor, insira um nome válido para este perfil.</string>
-  <string name="add_profile_error_name_only_letters" fuzzy="true">Por favor, escolha um nome de perfil que não inclua números ou símbolos.</string>
+  <string name="add_profile_error_name_empty">Digite um nome válido para esse perfil.</string>
+  <string name="add_profile_error_name_only_letters">Escolha um nome de perfil que não inclua números ou símbolos.</string>
   <string name="add_profile_error_pin_length">Seu PIN deve ter 3 dígitos.</string>
   <string name="add_profile_error_pin_confirm_wrong">Certifique-se de que os dois PINs coincidam.</string>
   <string name="add_profile_info_content_description">Mais informações sobre PINs de 3 dígitos.</string>
@@ -279,13 +292,14 @@
   <string name="enter_your_pin">Insira seu PIN</string>
   <string name="pin_password_toolbar_title">Insira o PIN</string>
   <string name="admin_settings_label">PIN do Administrador</string>
-  <string name="admin_settings_heading">Acesso às Configurações do Administrador</string>
+  <string name="admin_settings_heading">Acesso às configurações do administrador</string>
   <string name="admin_settings_sub">PIN do administrador necessário para alterar o PIN do usuário</string>
   <string name="admin_settings_cancel">Cancelar</string>
   <string name="admin_settings_submit">Enviar</string>
   <string name="admin_settings_incorrect">PIN do administrador incorreto. Por favor, tente novamente.</string>
   <string name="admin_settings_enter_user_new_pin">Novo PIN de %1$s</string>
   <string name="reset_pin_enter">Insira um Novo Pin</string>
+  <string name="reset_pin_enter_dialog_message">Esse PIN será o novo PIN de %s e será necessário ao fazer login.</string>
   <string name="my_downloads_activity_title">Meus Downloads</string>
   <string name="tab_downloads">Downloads</string>
   <string name="tab_updates">Atualizações (2)</string>
@@ -293,12 +307,17 @@
   <string name="home_activity_back_dialog_cancel">Cancelar</string>
   <string name="home_activity_back_dialog_exit">Sair</string>
   <string name="home_activity_title">Início</string>
+  <string name="promoted_story_spotlight_hint">A partir de agora, você pode ver as lições recomendadas para você aqui.</string>
   <string name="select_a_topic_to_start">Selecione um Tópico para começar</string>
   <string name="profile_list_activity_title">Perfis</string>
+  <string name="profile_edit_activity_title">Editar Perfil</string>
   <string name="profile_edit_created">Criado em %s</string>
   <string name="profile_last_used">Usado por último</string>
   <string name="profile_edit_rename">Renomear</string>
   <string name="profile_edit_reset">Redefinir PIN</string>
+  <string name="profile_edit_mark_chapter_completion">Marcar capítulos concluídos</string>
+  <string name="profile_edit_enable_quick_lesson_language_switching_label">Ativar a troca rápida de idioma</string>
+  <string name="profile_edit_enable_quick_lesson_language_switching_explanation">Permita que esse usuário alterne rapidamente entre inglês e suaíli em uma lição.</string>
   <string name="profile_edit_delete">Exclusão de Perfil</string>
   <string name="profile_edit_delete_dialog_title">Apagar este perfil permanentemente?</string>
   <string name="profile_edit_delete_dialog_message">Todo o progresso será apagado e não pode ser recuperado.</string>
@@ -313,7 +332,7 @@
   <string name="profile_picture_edit_alert_dialog_choose_from_library">Escolha da Biblioteca</string>
   <string name="profile_rename_activity_title">Renomear Perfil</string>
   <string name="profile_rename_label">Novo Nome</string>
-  <string name="profile_rename_save">salvar</string>
+  <string name="profile_rename_save" fuzzy="true">salvar</string>
   <string name="profile_reset_pin_activity_title">Redefinir PIN</string>
   <string name="profile_reset_pin_main">Insira um novo PIN para o usuário usar ao acessar seu perfil.</string>
   <string name="profile_reset_pin_user_pin_label">PIN de 3 Dígitos</string>
@@ -346,12 +365,12 @@
   <string name="app_last_update_date">A última atualização foi instalada em %s. Use o número da versão acima para enviar feedback sobre erros.</string>
   <string name="app_version_activity_title">Versão do Aplicativo</string>
   <string name="app_language_activity_title">Idioma do Aplicativo</string>
-  <string name="audio_language_activity_title">Idioma Padrão de Áudio</string>
+  <string name="audio_language_activity_title" fuzzy="true">Idioma Padrão de Áudio</string>
   <string name="reading_text_size_activity_title">Tamanho do Texto de Leitura</string>
   <string name="title_reading_text_size">Tamanho do Texto de Leitura</string>
   <string name="story_text_will_look_like_this">O texto da história ficará assim.</string>
   <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language">Áudio Padrão</string>
+  <string name="audio_language" fuzzy="true">Áudio Padrão</string>
   <string name="app_language">Idioma do Aplicativo</string>
   <string name="reading_text_size">Tamanho do Texto de Leitura</string>
   <string name="reading_text_size_small">Pequeno</string>
@@ -380,17 +399,21 @@
   <string name="new_hint_available">Nova dica disponível</string>
   <string name="no_new_hint_available">Nova dica disponível</string>
   <string name="show_hints_and_solution">Mostrar dicas e solução</string>
-  <string name="hints_and_solution_close_icon_description" fuzzy="true">Navegar para cima</string>
+  <string name="hint_list_item_number">Dica %s</string>
+  <string name="hints_and_solution_close_icon_description">Fechar</string>
   <string name="hints_toolbar_title">Dicas</string>
-  <string name="show_solution" fuzzy="true">Exibir</string>
-  <string name="reveal_solution" fuzzy="true">Revelar Solução</string>
+  <string name="show_solution">Mostrar solução</string>
+  <string name="reveal_solution">Mostrar solução</string>
+  <string name="hint_list_solution_title">Solução</string>
   <string name="reveal_hint">Revelar Dica</string>
+  <string name="hide_hint">Ocultar dica</string>
+  <string name="hide_solution">Ocultar solução</string>
   <string name="hints_list_exclusive_solution_text">A única solução é: %s</string>
+  <string name="hints_list_possible_solution_text">Uma solução é: %s</string>
   <string name="this_will_reveal_the_solution">Isso revelará a solução. Tem certeza?</string>
-  <string name="reveal" fuzzy="true">Revelar</string>
+  <string name="reveal">Mostrar</string>
   <string name="just_now">Agora</string>
   <string name="last_logged_in_recently">recentemente</string>
-  <string name="time_ago">%s atrás</string>
   <string name="yesterday">ontem</string>
   <string name="return_to_topic">Voltar ao tópico</string>
   <string name="return_to_lesson">Voltar para a lição</string>
@@ -403,22 +426,10 @@
   <string name="up_button_disabled">Para cima</string>
   <string name="down_button_disabled">Para baixo</string>
   <string name="profile_last_visited">%s %s</string>
-  <plurals name="minutes">
-    <item quantity="one">um minuto</item>
-    <item quantity="other">%s minutos</item>
-  </plurals>
-  <plurals name="hours">
-    <item quantity="one">uma hora</item>
-    <item quantity="other">%s horas</item>
-  </plurals>
-  <plurals name="days">
-    <item quantity="one">um dia</item>
-    <item quantity="other">%s dias</item>
-  </plurals>
   <string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
   <string name="ongoing_recycler_view_tag">ongoing_recycler_view_tag</string>
   <string name="item_selection_text">Por favor, selecione todas as alternativas corretas.</string>
-  <string name="unsupported_app_version_dialog_title">Versão do aplicativo não suportada</string>
+  <string name="unsupported_app_version_dialog_title" fuzzy="true">Versão do aplicativo não suportada</string>
   <string name="unsupported_app_version_dialog_message">Esta versão do aplicativo não é mais suportada. Atualize-a na Play Store.</string>
   <string name="unsupported_app_version_dialog_close_button_text">Fechar aplicativo</string>
   <string name="splash_screen_developer_label">Versão do desenvolvedor</string>
@@ -432,8 +443,8 @@
   <string name="general_availability_notice_dialog_message">Olá! Seu aplicativo está sendo atualizado para a versão de disponibilidade geral. Se você tiver problemas ao usar o aplicativo ou tiver dúvidas, entre em contato conosco em android-feedback@oppia.org.</string>
   <string name="general_availability_notice_dialog_do_not_show_again_text">Não exibir esta mensagem novamente</string>
   <string name="general_availability_notice_dialog_close_button_text">OK</string>
-  <string name="ratio_content_description_separator">para</string>
-  <string name="ratio_default_hint_text">Insira uma razão no formato x:y.</string>
+  <string name="ratio_content_description_separator" fuzzy="true"> para</string>
+  <string name="ratio_default_hint_text" fuzzy="true">Insira uma razão no formato x:y.</string>
   <string name="text_input_default_hint_text">Clique aqui para inserir texto.</string>
   <string name="smallest_text_size_content_description">Menor tamanho de texto</string>
   <string name="largest_text_size_content_description">Maior tamanho de texto</string>
@@ -481,13 +492,48 @@
   <string name="faq_answer_2">&lt;p&gt;Depois que um perfil é deletado:&lt;/p&gt; &lt;ol&gt;&lt;li&gt;O perfil não pode ser recuperado. &lt;/li&gt; &lt;li&gt; As informações do perfil, como nome, fotos e progresso, serão excluídas permanentemente. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;Para deletar um perfil(excluindo o do &lt;u&gt;Administrador&lt;/u&gt;):&lt;/p&gt; &lt;ol&gt;&lt;li&gt;Na página inicial do administrador, toque no botão de menu no canto superior esquerdo.&lt;/li&gt; &lt;li&gt;Toque em &lt;strong&gt;Controles do Administrador&lt;/strong&gt;.&lt;/li&gt; &lt;li&gt;3. Toque em &lt;strong&gt;Editar Perfis&lt;/strong&gt;.&lt;/li&gt; &lt;li&gt;4. Toque no perfil que deseja excluir.&lt;/li&gt; &lt;li&gt;5. Na parte inferior da tela, toque em &lt;strong&gt;Exclusão de Perfil&lt;/strong&gt;.&lt;/li&gt; &lt;li&gt;6. Toque em &lt;strong&gt;Deletar&lt;/strong&gt; para confirmar a exclusão.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Nota: Apenas o &lt;u&gt;Administrador&lt;/u&gt; pode gerenciar perfis.&lt;/p&gt;</string>
   <string name="faq_answer_3">&lt;p&gt;Para alterar seu e-mail/número de telefone:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Na página inicial do administrador, toque no botão de menu no canto superior esquerdo.&lt;/li&gt;&lt;li&gt;Toque em &lt;strong&gt;Controles do Administrador&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Toque em &lt;strong&gt;Editar Conta&lt;/strong&gt;.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt; &lt;p&gt;Se você deseja alterar seu e-mail:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Digite seu novo e-mail e toque em &lt;strong&gt;Salvar&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Um link de confirmação será enviado para confirmar seu novo e-mail. O link irá expirar após 24 horas e deve ser clicado para ser associado à sua conta. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt; &lt;p&gt;Se mudar seu número de telefone:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Digite seu novo número de telefone e toque em &lt;strong&gt;Verificar&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Um código será enviado para confirmar seu novo número. O código expira após 5 minutos e deve ser inserido na nova tela para ser associado à sua conta.&lt;/li&gt;&lt;/ol&gt;</string>
   <string name="faq_answer_4">&lt;p&gt;%1$s &lt;i&gt;\"O-pee-yah\"&lt;/i&gt; (Finnish) - \"aprender\"&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;%1$s tem a missão de ajudar qualquer pessoa a aprender o que quiser de uma forma eficaz e agradável.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Ao criar um conjunto de aulas gratuitas, de alta qualidade e comprovadamente eficazes com a ajuda de educadores de todo o mundo, %1$s visa proporcionar aos alunos uma educação de qualidade - independentemente de onde estejam ou a quais recursos tradicionais tenham acesso.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Como estudante, você pode começar sua aventura de aprendizado navegando pelos tópicos listados na página inicial!&lt;/p&gt;</string>
-  <string name="faq_answer_5" fuzzy="true">&lt;p&gt;Um administrador é o usuário principal que gerencia perfis e configurações para cada perfil em sua conta. Provavelmente, eles são seus pais, professores ou responsáveis ​​que criaram este perfil para você.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Os administradores podem gerenciar perfis, atribuir PINs e alterar outras configurações em suas contas. Dependendo do seu perfil, as permissões de administrador podem ser necessárias para determinados recursos, como download de tópicos, alteração do PIN e muito mais. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Para ver quem é o seu administrador, vá para o Seletor de perfil. O primeiro perfil listado e com \"Administrador\" escrito em seu nome é o Administrador. &lt;/p&gt;</string>
+  <string name="faq_answer_5">&lt;p&gt;Um administrador é o usuário principal que gerencia perfis e configurações para cada perfil em sua conta. Provavelmente, eles são seus pais, professores ou responsáveis ​​que criaram este perfil para você.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Os administradores podem gerenciar perfis, atribuir PINs e alterar outras configurações em suas contas. Dependendo do seu perfil, as permissões de administrador podem ser necessárias para determinados recursos, como download de tópicos, alteração do PIN e mais. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Para ver quem é o seu administrador, vá para o Seletor de perfil. O primeiro perfil listado e com \"Administrador\" escrito em seu nome é o Administrador. &lt;/p&gt;</string>
   <string name="faq_answer_6">&lt;p&gt;Se a exploração não estiver carregando&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique se o aplicativo está atualizado:&lt;/p&gt;&lt;p&gt; &lt;ul&gt; &lt;li&gt; Acesse a Play Store e certifique-se de que o aplicativo esteja atualizado com a versão mais recente &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique sua conexão com a internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Se sua conexão com a Internet estiver lenta, tente se reconectar à rede Wi-Fi ou conectar-se a uma rede diferente. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Peça ao administrador para verificar o dispositivo e a conexão com a Internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Peça ao administrador para solucionar o problema usando as etapas acima &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Informe-nos se você ainda tiver problemas com o carregamento::&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Relate um problema entrando em contato conosco em admin@oppia.org. &lt;/li&gt; &lt;/ul&gt;</string>
   <string name="faq_answer_7">&lt;p&gt;Se o seu áudio não estiver tocando&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique se o aplicativo está atualizado:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Acesse a Play Store e certifique-se de que o aplicativo esteja atualizado com a versão mais recente &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique sua conexão com a internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Se sua conexão com a Internet estiver lenta, tente se reconectar à rede Wi-Fi ou conectar-se a uma rede diferente. A Internet lenta pode fazer com que o áudio carregue irregularmente, dificultando a reprodução. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Peça ao administrador para verificar o dispositivo e a conexão com a Internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Peça ao administrador para solucionar o problema usando as etapas acima&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Informe-nos se você ainda tiver problemas com o carregamento:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Relate um problema entrando em contato conosco em admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
   <string name="faq_answer_9">&lt;p&gt;Se você não consegue encontrar sua pergunta ou gostaria de relatar um problema, entre em contato conosco em admin@oppia.org.&lt;/p&gt;</string>
   <string name="profile_edit_fragment_test_activity_label">Atividade de Teste de Fragmento de Edição de Perfil</string>
   <string name="administrator_controls_fragment_test_activity_label">Controle Administrativo da Atividade de Teste de Fragmento</string>
+  <string name="revision_navigation_cards_header">Continuar estudando</string>
+  <string name="state_fragment_hint_bar_forced_announcement_text">Vá até a parte inferior da tela para obter uma dica.</string>
   <string name="state_fragment_item_selection_no_items_selected_hint_text">Por favor, selecione todas as alternativas corretas.</string>
   <string name="state_fragment_item_selection_some_items_selected_hint_text">Pode selecionar outras opções.</string>
   <string name="state_fragment_item_selection_max_items_selected_hint_text">Mais do que %s opções podem ser selecionadas.</string>
+  <string name="survey_activity_title">Pesquisa</string>
+  <string name="survey_previous_button">Anterior</string>
+  <string name="survey_submit_button">Enviar</string>
+  <string name="survey_free_form_text_hint">Deixe seu feedback aqui</string>
+  <string name="survey_continue_survey_button">Continuar a pesquisa</string>
+  <string name="survey_exit_button">Sair</string>
+  <string name="survey_exit_button_description">Pesquisa de saída</string>
+  <string name="survey_exit_confirmation_text">Tem certeza de que deseja sair da pesquisa?</string>
+  <string name="survey_onboarding_message_text">Seu feedback nos ajuda a atender melhor alunos como você. Gostaria de responder a uma breve pesquisa sobre sua experiência?</string>
+  <string name="survey_begin_survey_button">Iniciar pesquisa</string>
+  <string name="survey_maybe_later_button">Talvez mais tarde</string>
+  <string name="survey_thank_you_message_text">Obrigado por responder à pesquisa. Esperamos que você tenha gostado de usar o %s!</string>
+  <string name="survey_exit_survey_button">Pesquisa de saída</string>
+  <string name="survey_onboarding_title_text">Gostaríamos muito de receber seu feedback!</string>
+  <string name="survey_thank_you_title_text">Obrigado</string>
+  <string name="survey_nps_not_at_all_likely_label">0 - Pouco provável</string>
+  <string name="survey_nps_extremely_likely_label">10 - Extremamente provável</string>
+  <string name="user_type_question">Selecione uma das opções a seguir:</string>
+  <string name="user_type_answer_learner">Eu sou um formando</string>
+  <string name="user_type_answer_teacher">Eu sou um professor</string>
+  <string name="user_type_answer_parent">Eu sou um pai</string>
+  <string name="user_type_answer_other">Outro</string>
+  <string name="market_fit_question">Como você se sentiria se não pudesse mais usar %s?</string>
+  <string name="market_fit_answer_very_disappointed">Muito decepcionado</string>
+  <string name="market_fit_answer_somewhat_disappointed">Um pouco decepcionado</string>
+  <string name="market_fit_answer_not_disappointed">Não fiquei desapontado</string>
+  <string name="market_fit_answer_wont_use_oppia">N/A - Não uso mais %s</string>
+  <string name="nps_promoter_feedback_question">Ficamos felizes que tenha gostado de sua experiência com a %s. Compartilhe o que mais o ajudou:</string>
+  <string name="nps_passive_feedback_question">Obrigado por responder! Como podemos proporcionar uma experiência melhor?</string>
+  <string name="nps_detractor_feedback_question">Ajude-nos a melhorar sua experiência! Compartilhe o principal motivo da sua pontuação:</string>
+  <string name="nps_score_question">Em uma escala de 0 a 10, qual é a probabilidade de você recomendar %s a um amigo ou colega?</string>
+  <string name="previous_subtopic_talkback_text">O subtópico anterior é %s</string>
+  <string name="next_subtopic_talkback_text">O próximo subtópico é %s</string>
 </resources>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 1cf7fc4433c..758c513d8e0 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -18,13 +18,13 @@
   <string name="drawer_close_content_description">Orodha ya Uelekezaji Funga</string>
   <string name="audio_play_description">Cheza Sauti</string>
   <string name="audio_pause_description">Sitisha sauti</string>
-  <string name="audio_language_select_dialog_okay_button">sawa</string>
+  <string name="audio_language_select_dialog_okay_button" fuzzy="true">sawa</string>
   <string name="audio_language_select_dialog_cancel_button">futa</string>
   <string name="audio_language_select_dialog_title">Lugha ya Sauti</string>
   <string name="audio_dialog_offline_title">Nje ya Mtandao kwa sasa</string>
   <string name="audio_dialog_offline_message">Hakikisha kuwa Wi-Fi au data ya mtandao wa simu imewashwa, kisha ujaribu tena.</string>
-  <string name="audio_dialog_offline_positive">sawa</string>
-  <string name="cellular_data_alert_dialog_okay_button">sawa</string>
+  <string name="audio_dialog_offline_positive" fuzzy="true">sawa</string>
+  <string name="cellular_data_alert_dialog_okay_button" fuzzy="true">sawa</string>
   <string name="cellular_data_alert_dialog_cancel_button">futa</string>
   <string name="cellular_data_alert_dialog_title">Kwa sasa ipo kwenye Data ya Simu</string>
   <string name="cellular_data_alert_dialog_description">Kutiririsha sauti kunaweza kutumia data nyingi ya mtandao wa simu.</string>
@@ -152,11 +152,11 @@
   <string name="number_error_starting_with_floating_point">Tafadhali anza jibu lako kwa nambari (k.m.,”0” katika 0.5).</string>
   <string name="number_error_invalid_format">Tafadhali weka nambari halali.</string>
   <string name="number_error_larger_than_fifteen_characters">Jibu linaweza kuwa na tarakimu zisizozidi 15 (0–9) au alama (. au -).</string>
-  <string name="ratio_error_invalid_chars">Tafadhali andika uwiano unaojumuisha tarakimu zilizotenganishwa na koloni(k.m. 1:2 au 1:2:3).</string>
-  <string name="ratio_error_invalid_format">Tafadhali weka uwiano sahihi (k.m. 1:2 au 1:2:3).</string>
-  <string name="ratio_error_invalid_colons">Jibu lako lina koloni mbili (:) karibu na kila moja.</string>
-  <string name="ratio_error_invalid_size">Idadi ya masharti si sawa na masharti yanayohitajika.</string>
-  <string name="ratio_error_includes_zero">Uwiano hauwezi kuwa na 0 kama kipengele.</string>
+  <string name="ratio_error_invalid_chars" fuzzy="true">Tafadhali andika uwiano unaojumuisha tarakimu zilizotenganishwa na koloni(k.m. 1:2 au 1:2:3).</string>
+  <string name="ratio_error_invalid_format" fuzzy="true">Tafadhali weka uwiano sahihi (k.m. 1:2 au 1:2:3).</string>
+  <string name="ratio_error_invalid_colons" fuzzy="true">Jibu lako lina koloni mbili (:) karibu na kila moja.</string>
+  <string name="ratio_error_invalid_size" fuzzy="true">Idadi ya masharti si sawa na masharti yanayohitajika.</string>
+  <string name="ratio_error_includes_zero" fuzzy="true">Uwiano hauwezi kuwa na 0 kama kipengele.</string>
   <string name="unknown_size">Ukubwa usiojulikana</string>
   <string name="size_bytes">Baiti %s</string>
   <string name="size_kb">%s KB</string>
@@ -164,11 +164,11 @@
   <string name="size_gb">%s GB</string>
   <string name="correct">Sahihi!</string>
   <string name="topic_prefix">Mada: %s</string>
-  <plurals name="chapter_count">
+  <plurals name="chapter_count" fuzzy="true">
     <item quantity="one">Sura 1</item>
     <item quantity="other">Sura %s</item>
   </plurals>
-  <plurals name="story_count">
+  <plurals name="story_count" fuzzy="true">
     <item quantity="one">Hadithi 1</item>
     <item quantity="other">Hadithi %s</item>
   </plurals>
@@ -176,7 +176,7 @@
     <item quantity="one">%s kati ya Sura %s Imekamilika</item>
     <item quantity="other">%s ya Sura %s Imekamilika</item>
   </plurals>
-  <plurals name="lesson_count">
+  <plurals name="lesson_count" fuzzy="true">
     <item quantity="one">Somo 1</item>
     <item quantity="other">Masomo %s</item>
   </plurals>
@@ -290,7 +290,7 @@
   <string name="profile_picture_edit_alert_dialog_choose_from_library">Chagua Kutoka kwa Maktaba</string>
   <string name="profile_rename_activity_title">Badilisha Jina la Wasifu</string>
   <string name="profile_rename_label">Jina Jipya</string>
-  <string name="profile_rename_save">Hifadhi</string>
+  <string name="profile_rename_save" fuzzy="true">Hifadhi</string>
   <string name="profile_reset_pin_activity_title">Weka upya Nambari ya Siri</string>
   <string name="profile_reset_pin_main">Weka Nambari mpya ya Siri ili mtumiaji aiweke anapofikia wasifu wake.</string>
   <string name="profile_reset_pin_user_pin_label">Nambari ya Siri ya tarakimu 3*</string>
@@ -323,12 +323,12 @@
   <string name="app_last_update_date">Sasisho la mwisho lilisakinishwa kwenye %s. Tumia nambari ya toleo iliyo hapo juu kutuma maoni kuhusu hitilafu.</string>
   <string name="app_version_activity_title">Toleo la Programu</string>
   <string name="app_language_activity_title">Lugha ya Programu</string>
-  <string name="audio_language_activity_title">Lugha chaguomsingi ya Sauti</string>
+  <string name="audio_language_activity_title" fuzzy="true">Lugha chaguomsingi ya Sauti</string>
   <string name="reading_text_size_activity_title">Ukubwa wa Maandishi ya Kusoma</string>
   <string name="title_reading_text_size">Ukubwa wa Maandishi ya Kusoma</string>
   <string name="story_text_will_look_like_this">Nakala ya hadithi itaonekana hivi.</string>
   <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language">Sauti Chaguomsingi</string>
+  <string name="audio_language" fuzzy="true">Sauti Chaguomsingi</string>
   <string name="app_language">Lugha ya Programu</string>
   <string name="reading_text_size">Ukubwa wa Maandishi ya Kusoma</string>
   <string name="reading_text_size_small">Ndogo</string>
@@ -364,7 +364,6 @@
   <string name="reveal" fuzzy="true">Fichua</string>
   <string name="just_now">sasa hivi</string>
   <string name="last_logged_in_recently">hivi karibuni</string>
-  <string name="time_ago">%s iliyopita</string>
   <string name="yesterday">jana</string>
   <string name="return_to_topic">Rudi kwenye mada</string>
   <string name="explanation">Ufafanuzi:</string>
@@ -376,26 +375,14 @@
   <string name="up_button_disabled">Juu</string>
   <string name="down_button_disabled">Chini</string>
   <string name="profile_last_visited">%s %s</string>
-  <plurals name="minutes">
-    <item quantity="one">dakika</item>
-    <item quantity="other">dakika %s</item>
-  </plurals>
-  <plurals name="hours">
-    <item quantity="one">saa</item>
-    <item quantity="other">saa %s</item>
-  </plurals>
-  <plurals name="days">
-    <item quantity="one">siku</item>
-    <item quantity="other">siku %s</item>
-  </plurals>
   <string name="topic_revision_recyclerview_tag">mada_marudio_mtazamo wa kuchakata tena_tag</string>
   <string name="ongoing_recycler_view_tag">Inaendelea_kuchakata tena_mtazamo_tag</string>
   <string name="item_selection_text" fuzzy="true">Tafadhali chagua angalau chaguo moja.</string>
-  <string name="unsupported_app_version_dialog_title">Toleo la programu lisilotumika</string>
-  <string name="unsupported_app_version_dialog_message">Toleo hili la programu halitumiki tena. Tafadhali isasishe kupitia hifadhi ya michezo.</string>
-  <string name="unsupported_app_version_dialog_close_button_text">Funga programu</string>
-  <string name="ratio_content_description_separator">kwa</string>
-  <string name="ratio_default_hint_text">Weka uwiano katika fomu x:y.</string>
+  <string name="unsupported_app_version_dialog_title" fuzzy="true">Toleo la programu lisilotumika</string>
+  <string name="unsupported_app_version_dialog_message" fuzzy="true">Toleo hili la programu halitumiki tena. Tafadhali isasishe kupitia hifadhi ya michezo.</string>
+  <string name="unsupported_app_version_dialog_close_button_text" fuzzy="true">Funga programu</string>
+  <string name="ratio_content_description_separator" fuzzy="true">kwa</string>
+  <string name="ratio_default_hint_text" fuzzy="true">Weka uwiano katika fomu x:y.</string>
   <string name="smallest_text_size_content_description">Maandishi madogo zaidi</string>
   <string name="largest_text_size_content_description">Maandishi kubwa zaidi</string>
   <string name="coming_soon">Inakuja Hivi Karibuni</string>

From 4680a5dce695014e2d2e8861966e424976ad3340 Mon Sep 17 00:00:00 2001
From: masclot <103062089+masclot@users.noreply.github.com>
Date: Fri, 6 Oct 2023 18:08:29 +0200
Subject: [PATCH 11/32] Update the wiki bazel instructions to add some tips
 around python and jdk8 (#5159)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Update the bazel setup instructions wiki to add some tips/workarounds
from my recent experience. Also, I added the instructions for Linux and
Mac to the side panel, since Windows was already there.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [ ] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [ ] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 wiki/Bazel-Setup-Instructions-for-Linux.md | 6 ++++++
 wiki/_Sidebar.md                           | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/wiki/Bazel-Setup-Instructions-for-Linux.md b/wiki/Bazel-Setup-Instructions-for-Linux.md
index df69862fa88..37648fda40d 100644
--- a/wiki/Bazel-Setup-Instructions-for-Linux.md
+++ b/wiki/Bazel-Setup-Instructions-for-Linux.md
@@ -25,10 +25,16 @@ Oppia Android also requires OpenJDK 8. The Bazel installation instructions above
 
    You can confirm that this is set up using the command `java -version`, which should result in three lines being printed out with the first one showing "openjdk version "1.8.0_292".
 
+> **Tip:** Newer linux distributions may not have openjdk-8 anymore. This has been reported for Debian and Ubuntu. If this is your case, **openjdk-11** has been tested as a viable alternative.
+
 ### 3. Install Python 2
 
 Ensure that you have Python 2 installed and make sure that it is currently active on your environment. You can do this by using the ``python --version`` command which should show Python 2.X.X. If it doesn’t, click [here](https://linuxconfig.org/install-python-2-on-ubuntu-20-04-focal-fossa-linux) for a resource on how to install and update Linux to use Python 2.
 
+> **Tip:** Newer linux distributions may not have the python command and instead use python2 and python3. Bazel <5 requires `python` and that [cannot be configured](https://stackoverflow.com/questions/62802126/how-to-stop-bazel-from-relying-on-python2). Creating an alias won't solve the problem, you'll need a symlink. To create one, you can run the following:
+>
+> `sudo apt install python-is-python2`
+
 ### 4. Set up the ANDROID_HOME environment variable
 
 Ensure that your `ANDROID_HOME` environment variable is set to the location of your Android SDK. To do this, find the path to the installed SDK using Android Studio’s SDK Manager (install SDK 28). Assuming the SDK is installed to default locations, you can use the following commands to set the `ANDROID_HOME` variable:<br>
diff --git a/wiki/_Sidebar.md b/wiki/_Sidebar.md
index 7a43d1a78f1..92a57f04bb6 100644
--- a/wiki/_Sidebar.md
+++ b/wiki/_Sidebar.md
@@ -15,6 +15,8 @@
     * [Overview of the Oppia Android codebase and architecture](https://github.com/oppia/oppia-android/wiki/Overview-of-the-Oppia-Android-codebase-and-architecture)
   * Bazel
     * [Bazel setup instructions](https://github.com/oppia/oppia-android/wiki/Oppia-Bazel-Setup-Instructions)
+    * [Bazel Setup Instructions for Linux](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Linux)
+    * [Bazel Setup Instructions for Mac](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Mac)
     * [Bazel Setup Instructions for Windows](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Windows)
   * Key Workflows
     * [Guidance on submitting a PR](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR)

From 7d0a594f6254715f36bd1404787cf3195a49b2a0 Mon Sep 17 00:00:00 2001
From: Shubhadeep Karmakar
 <99060332+ShubhadeepKarmakar@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:33:33 +0530
Subject: [PATCH 12/32] Fix #3930 Greeting text on home screen should be a
 single TextView (#5131)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->
 - Fix #3930

Removes `profile_name_text_view` and combines the greeting text and
profile name using one string template, `welcome_profile_name` in
`WelcomeViewModel.computeWelcomeText()`

In the `testHomeActivity_initialArabicContext_displaysStringsInArabic`
test, unicode characters `\u200F\u202A...\u202C\u200F!` are introduced
to allow bidirectional reading.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))

### RTL:
![arabic
rtl](https://github.com/oppia/oppia-android/assets/99060332/df2d28ab-edd0-491f-9426-6c3ef69b135b)

### LTR:

![ltr](https://github.com/oppia/oppia-android/assets/99060332/1bab89aa-430d-4129-a9ae-0b34d8536f05)

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../android/app/home/WelcomeViewModel.kt      | 13 +++--
 app/src/main/res/layout/welcome.xml           | 11 +---
 app/src/main/res/values/strings.xml           |  2 +-
 .../android/app/home/HomeActivityTest.kt      | 53 ++++++++-----------
 4 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt b/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt
index 181f7465bfa..40cf74ec589 100644
--- a/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt
@@ -13,15 +13,18 @@ class WelcomeViewModel(
   dateTimeUtil: DateTimeUtil
 ) : HomeItemViewModel() {
 
-  /** Text [String] to greet the learner and display on-screen when launching the home activity. */
+  /** Text [String] to greet the learner. */
   val greeting: String = dateTimeUtil.getGreetingMessage()
 
   /**
-   * Returns the user-readable portion of the welcome screen greeting that contains the user's name.
+   *  Returns the string which contains greeting message with user's name and
+   *  display on-screen when launching the home activity.
    */
-  fun computeProfileNameText(): String {
-    return resourceHandler.getStringInLocaleWithWrapping(R.string.welcome_profile_name, profileName)
-  }
+  fun computeWelcomeText(): String = resourceHandler.getStringInLocaleWithWrapping(
+    R.string.welcome_profile_name,
+    greeting,
+    profileName
+  )
 
   // Overriding equals is needed so that DataProvider combine functions used in the HomeViewModel
   // will only rebind when the actual data in the data list changes, rather than when the ViewModel
diff --git a/app/src/main/res/layout/welcome.xml b/app/src/main/res/layout/welcome.xml
index e4a87b27e94..8fcc751ec56 100644
--- a/app/src/main/res/layout/welcome.xml
+++ b/app/src/main/res/layout/welcome.xml
@@ -33,16 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/home_welcome_text_view_margin_end"
         android:fontFamily="sans-serif"
-        android:text="@{viewModel.greeting}"
-        android:textColor="@color/component_color_shared_primary_text_color"
-        android:textSize="24sp" />
-
-      <TextView
-        android:id="@+id/profile_name_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:text="@{viewModel.computeProfileNameText()}"
+        android:text="@{viewModel.computeWelcomeText}"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="24sp" />
     </com.google.android.flexbox.FlexboxLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f02760b7ae..081bea57539 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -176,7 +176,7 @@
   <string name="size_gb">%s GB</string>
   <string name="correct">Correct!</string>
   <string name="topic_prefix">Topic: %s</string>
-  <string name="welcome_profile_name">%s!</string>
+  <string name="welcome_profile_name">%s %s!</string>
   <plurals name="chapter_count">
     <item quantity="one">1 Chapter</item>
     <item quantity="other">%s Chapters</item>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
index 55a31dd8066..a0e79d44c34 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
@@ -246,19 +246,6 @@ class HomeActivityTest {
     assertThat(screenName).isEqualTo(ScreenName.HOME_ACTIVITY)
   }
 
-  @Test
-  fun testHomeActivity_withAdminProfile_profileNameIsDisplayed() {
-    launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
-      testCoroutineDispatchers.runCurrent()
-      scrollToPosition(position = 0)
-      verifyExactTextOnHomeListItemAtPosition(
-        itemPosition = 0,
-        targetViewId = R.id.profile_name_text_view,
-        stringToMatch = "Admin!"
-      )
-    }
-  }
-
   @Test
   fun testHomeActivity_hasCorrectActivityLabel() {
     launch(HomeActivity::class.java).use { scenario ->
@@ -271,59 +258,61 @@ class HomeActivityTest {
 
   @Test
   fun testHomeActivity_withAdminProfile_configChange_profileNameIsDisplayed() {
+    fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
+    fakeOppiaClock.setCurrentTimeToSameDateTime(EVENING_TIMESTAMP)
     launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       scrollToPosition(position = 0)
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 0,
-        targetViewId = R.id.profile_name_text_view,
-        stringToMatch = "Admin!"
+        targetViewId = R.id.welcome_text_view,
+        stringToMatch = "Good evening, Admin!"
       )
     }
   }
 
   @Test
-  fun testHomeActivity_morningTimestamp_goodMorningMessageIsDisplayed() {
+  fun testHomeActivity_morningTimestamp_goodMorningMessageIsDisplayed_withAdminProfileName() {
     fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
     fakeOppiaClock.setCurrentTimeToSameDateTime(MORNING_TIMESTAMP)
-    launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
+    launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 0)
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.welcome_text_view,
-        stringToMatch = "Good morning,"
+        stringToMatch = "Good morning, Admin!"
       )
     }
   }
 
   @Test
-  fun testHomeActivity_afternoonTimestamp_goodAfternoonMessageIsDisplayed() {
+  fun testHomeActivity_afternoonTimestamp_goodAfternoonMessageIsDisplayed_withAdminProfileName() {
     fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
     fakeOppiaClock.setCurrentTimeToSameDateTime(AFTERNOON_TIMESTAMP)
-    launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
+    launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 0)
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.welcome_text_view,
-        stringToMatch = "Good afternoon,"
+        stringToMatch = "Good afternoon, Admin!"
       )
     }
   }
 
   @Test
-  fun testHomeActivity_eveningTimestamp_goodEveningMessageIsDisplayed() {
+  fun testHomeActivity_eveningTimestamp_goodEveningMessageIsDisplayed_withAdminProfileName() {
     fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
     fakeOppiaClock.setCurrentTimeToSameDateTime(EVENING_TIMESTAMP)
-    launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
+    launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 0)
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.welcome_text_view,
-        stringToMatch = "Good evening,"
+        stringToMatch = "Good evening, Admin!"
       )
     }
   }
@@ -1094,7 +1083,7 @@ class HomeActivityTest {
         atPositionOnView(
           R.id.home_recycler_view,
           0,
-          R.id.profile_name_text_view
+          R.id.welcome_text_view
         )
       ).check(matches(not(isEllipsized())))
     }
@@ -1113,7 +1102,7 @@ class HomeActivityTest {
         atPositionOnView(
           R.id.home_recycler_view,
           0,
-          R.id.profile_name_text_view
+          R.id.welcome_text_view
         )
       ).check(matches(not(isEllipsized())))
     }
@@ -1131,7 +1120,7 @@ class HomeActivityTest {
         atPositionOnView(
           R.id.home_recycler_view,
           0,
-          R.id.profile_name_text_view
+          R.id.welcome_text_view
         )
       ).check(matches(not(isEllipsized())))
     }
@@ -1150,7 +1139,7 @@ class HomeActivityTest {
         atPositionOnView(
           R.id.home_recycler_view,
           0,
-          R.id.profile_name_text_view
+          R.id.welcome_text_view
         )
       ).check(matches(not(isEllipsized())))
     }
@@ -1574,7 +1563,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.welcome_text_view,
-        stringToMatch = "Good morning,"
+        stringToMatch = "Good morning, Admin!"
       )
     }
   }
@@ -1634,7 +1623,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.welcome_text_view,
-        stringToMatch = "Bom dia,"
+        stringToMatch = "Bom dia, Admin!"
       )
       assertThat(testActivityRecreator.getRecreateCount()).isEqualTo(1)
       // Verify that the display locale is set up correctly (for string formatting).
@@ -1664,7 +1653,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.welcome_text_view,
-        stringToMatch = "صباح الخير"
+        stringToMatch = "صباح الخير \u200F\u202AAdmin\u202C\u200F!"
       )
     }
   }
@@ -1734,7 +1723,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.welcome_text_view,
-        stringToMatch = "Bom dia,"
+        stringToMatch = "Bom dia, Admin!"
       )
     }
   }

From 783f8dbc4a1584c1a76f096df8a069d74b375191 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Sat, 7 Oct 2023 00:39:13 +0530
Subject: [PATCH 13/32] Fix #3691: Adds Resume Lesson Tablet Portrait UI
 (#5175)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

Fixes #3691

Adds layout file for tablet portrait mode for resume lesson screen.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

|Before|After|
|--|--|
|<img
src="https://github.com/oppia/oppia-android/assets/84731134/00eb5bd2-eb6c-4c83-8f89-9b7f1f47290d"
width="400"/>|<img
src="https://github.com/oppia/oppia-android/assets/84731134/170808c4-0a5b-45df-b2a4-7bd312216010"
width="400"/>|
|<img
src="https://github.com/oppia/oppia-android/assets/84731134/f8c7cfd2-fff4-42e4-b1e8-c1f021a6c730"
width="400"/>|<img
src="https://github.com/oppia/oppia-android/assets/84731134/078b9960-53f4-4bb6-805d-aba62ec9f7dd"
width="400"/>|

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../resume_lesson_fragment.xml                | 126 ++++++++++++++++++
 .../main/res/values-sw600dp-port/dimens.xml   |  13 ++
 app/src/main/res/values/dimens.xml            |  13 ++
 3 files changed, 152 insertions(+)
 create mode 100644 app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml

diff --git a/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
new file mode 100644
index 00000000000..44454b975c0
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <data>
+
+    <import type="android.view.View" />
+
+    <variable
+      name="viewModel"
+      type="org.oppia.android.app.resumelesson.ResumeLessonViewModel" />
+  </data>
+
+  <ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/component_color_shared_screen_primary_background_color"
+    android:overScrollMode="never"
+    android:scrollbars="none">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingBottom="24dp">
+
+      <org.oppia.android.app.customview.LessonThumbnailImageView
+        android:id="@+id/resume_lesson_chapter_thumbnail_image_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:adjustViewBounds="true"
+        app:entityId="@{viewModel.chapterSummary.explorationId}"
+        app:entityType="@{viewModel.entityType}"
+        app:layout_constraintDimensionRatio="16:9"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:lessonThumbnail="@{viewModel.chapterSummary.chapterThumbnail}" />
+
+      <TextView
+        android:id="@+id/resume_lesson_chapter_title_text_view"
+        style="@style/TextViewStart"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/resume_lesson_chapter_title_text_margin_start"
+        android:layout_marginTop="@dimen/resume_lesson_chapter_title_text_margin_top"
+        android:layout_marginEnd="@dimen/resume_lesson_chapter_title_text_margin_end"
+        android:layout_marginBottom="@dimen/resume_lesson_chapter_title_text_margin_bottom"
+        android:fontFamily="sans-serif"
+        android:text="@{viewModel.chapterTitle}"
+        android:textColor="@color/component_color_shared_primary_text_color"
+        android:textDirection="locale"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/resume_lesson_chapter_thumbnail_image_view" />
+
+      <TextView
+        android:id="@+id/resume_lesson_chapter_description_text_view"
+        style="@style/Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/resume_lesson_chapter_description_text_margin_start"
+        android:layout_marginTop="@dimen/resume_lesson_chapter_description_text_margin_top"
+        android:layout_marginEnd="@dimen/resume_lesson_chapter_description_text_margin_end"
+        android:ellipsize="end"
+        android:textColor="@color/component_color_shared_secondary_1_text_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/resume_lesson_chapter_title_text_view" />
+
+      <com.google.android.flexbox.FlexboxLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/resume_lesson_chapter_flexbox_margin_start"
+        android:layout_marginTop="@dimen/resume_lesson_chapter_flexbox_margin_top"
+        android:layout_marginEnd="@dimen/resume_lesson_chapter_flexbox_margin_end"
+        app:alignContent="flex_start"
+        app:alignItems="center"
+        app:flexDirection="row"
+        app:flexWrap="wrap"
+        app:justifyContent="space_evenly"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/resume_lesson_chapter_description_text_view">
+
+        <com.google.android.material.button.MaterialButton
+          android:id="@+id/resume_lesson_start_over_button"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/resume_lesson_start_over_button_margin"
+          android:background="@drawable/secondary_button_background"
+          android:fontFamily="sans-serif-medium"
+          android:gravity="center"
+          android:minWidth="144dp"
+          android:minHeight="@dimen/clickable_item_min_height"
+          android:text="@string/start_over_lesson_button"
+          android:textAllCaps="false"
+          android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
+          android:textSize="14sp"
+          app:backgroundTint="@null"
+          app:icon="@drawable/ic_start_over_24dp"
+          app:iconGravity="textStart"
+          app:iconTint="@color/component_color_shared_secondary_button_background_trim_color" />
+
+        <com.google.android.material.button.MaterialButton
+          android:id="@+id/resume_lesson_continue_button"
+          android:layout_width="wrap_content"
+          android:layout_height="match_parent"
+          android:background="@drawable/state_button_primary_background"
+          android:fontFamily="sans-serif-medium"
+          android:gravity="center"
+          android:minWidth="144dp"
+          android:minHeight="@dimen/clickable_item_min_height"
+          android:text="@string/resume_lesson_button"
+          android:textAllCaps="false"
+          android:textColor="@color/component_color_shared_secondary_4_text_color"
+          android:textSize="14sp"
+          app:backgroundTint="@null"
+          app:icon="@drawable/ic_arrow_right_alt_24dp"
+          app:iconGravity="textEnd" />
+      </com.google.android.flexbox.FlexboxLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+  </ScrollView>
+</layout>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index e74fb00df51..681f7e8b90e 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -511,4 +511,17 @@
   <dimen name="profile_chooser_margin_top_profile_not_added">124dp</dimen>
   <dimen name="profile_chooser_administrator_controls_margin_bottom">32dp</dimen>
   <dimen name="profile_chooser_setting_icon_margin_end">64dp</dimen>
+  
+  <!--  ResumeLessonFragment-->
+  <dimen name="resume_lesson_chapter_title_text_margin_start">72dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_end">72dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_top">32dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_bottom">16dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_start">72dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_end">72dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_top">16dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_start">72dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_end">72dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_top">32dp</dimen>
+  <dimen name="resume_lesson_start_over_button_margin">8dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 11592246d65..4361dce5674 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -756,4 +756,17 @@
   <dimen name="survey_nps_options_margin">8dp</dimen>
   <dimen name="survey_nps_hint_text_margin">16dp</dimen>
   <dimen name="survey_button_corner_radius">4dp</dimen>
+
+  <!--  ResumeLessonFragment-->
+  <dimen name="resume_lesson_chapter_title_text_margin_start">32dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_end">32dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_top">32dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_bottom">16dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_start">32dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_end">32dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_top">16dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_start">28dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_end">28dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_top">32dp</dimen>
+  <dimen name="resume_lesson_start_over_button_margin">8dp</dimen>
 </resources>

From 4cad1940c721c42c7e463a4736e7e6b5b1306fb6 Mon Sep 17 00:00:00 2001
From: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
Date: Mon, 9 Oct 2023 14:24:25 +0300
Subject: [PATCH 14/32] Fix #5073, #5062, #5099, and part of #1723: Improve
 Onboarding Documentation (#5174)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation

Fix #5073:  Add instructions to the wiki for how to assign a reviewer.
Fix #5062:  Add wiki documentation for how to pick the emulator/android
version when running Espresso tests.
Fix #5099:  Reorganize the Project Setup Documentation
Fix part of #1723: ensure the onboarding flow leads into follow-up
documentation: architecture overview, code style, submission guidelines,
how to make UX changes, how to contribute large projects (which should
tie into design documents), and best practices
Fix part of #1723: Known issues that have come up in discussions

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).
---
 .github/PULL_REQUEST_TEMPLATE.md             |  1 +
 wiki/Bazel-Setup-Instructions-for-Windows.md |  2 +
 wiki/Guidance-on-submitting-a-PR.md          |  1 +
 wiki/Installing-Oppia-Android.md             | 83 ++++++++++++++++----
 wiki/Oppia-Bazel-Setup-Instructions.md       | 12 +--
 wiki/_Sidebar.md                             |  6 +-
 6 files changed, 83 insertions(+), 22 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 53f6d452828..980c25f6096 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,4 +21,5 @@ If your PR includes UI-related changes, then:
 - Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes
 - For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see [RTL guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
 - Add a video showing the full UX flow with a screen reader enabled (see [accessibility guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
+- For PRs introducing new UI elements or color changes, both light and dark mode screenshots must be included
 - Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing
diff --git a/wiki/Bazel-Setup-Instructions-for-Windows.md b/wiki/Bazel-Setup-Instructions-for-Windows.md
index ebf203356df..42c564c51fb 100644
--- a/wiki/Bazel-Setup-Instructions-for-Windows.md
+++ b/wiki/Bazel-Setup-Instructions-for-Windows.md
@@ -66,6 +66,8 @@ sudo dnf install java-1.8.0-openjdk
 ```
 - Set the default Java version to jdk-8 by running the following command `sudo update-alternatives --config java` and selecting the number with jdk-8.
 
+#### Follow [these instructions](https://www.java.com/en/download/help/path.html) to correctly set up $JAVA_HOME.
+
 **Python 2**
 
 Unfortunately, some of the Bazel build actions in the Android pipeline require Python 2 to be installed:
diff --git a/wiki/Guidance-on-submitting-a-PR.md b/wiki/Guidance-on-submitting-a-PR.md
index d8bf7ef23b9..5f7541e70f9 100644
--- a/wiki/Guidance-on-submitting-a-PR.md
+++ b/wiki/Guidance-on-submitting-a-PR.md
@@ -153,6 +153,7 @@ You have successfully created a pull request! Now, wait for your code to get rev
 ### Clarification regarding **Assignees** and **Reviewers** section.
 1. **Reviewers**: This section is generally ignored by anyone who looks at the PR. It will be filled automatically by Oppiabot. Once this section is filled out, it generally should not change throughout the timeline of the PR.  
 2. **Assignees**: The main section to look at is the 'Assignees' field, which indicates the person(s) whom the PR is currently blocked on. Specifically:
+   - When a PR is created, the assignees section is blank. You can assign a reviewer by leaving a comment on the PR mentioning the reviewer, e.g "@Reviewer, PTAL". **Oppiabot** will assign the reviewer for you.
    - Initially, when the PR is submitted, the **Assignees** and **Reviewers** sections should be the same. 
    - Once a reviewer has reviewed the PR, they should de-assign themselves and assign it back to the PR author.
    - Similarly, once the author has made the requested changes, they should assign it back to the appropriate reviewer and de-assign themselves.
diff --git a/wiki/Installing-Oppia-Android.md b/wiki/Installing-Oppia-Android.md
index b4674bf7f91..309a9f3b274 100644
--- a/wiki/Installing-Oppia-Android.md
+++ b/wiki/Installing-Oppia-Android.md
@@ -7,22 +7,25 @@ This wiki page explains how to install Oppia Android on your local machine. If y
 - [Prepare developer environment](#prepare-developer-environment)
 - [Install oppia-android](#install-oppia-android)
 - [Run the app from Android Studio](#run-the-app-from-android-studio)
+- [Run the tests](#set-up-and-run-tests)
 
 
 ## Prepare developer environment
 
-1. Download/Install the latest version of [Android Studio](https://developer.android.com/studio/?gclid=EAIaIQobChMI8fX3n5Lb6AIVmH8rCh24JQsxEAAYASAAEgL4L_D_BwE&gclsrc=aw.ds#downloads). 
+1. Download/Install [Android Studio](https://developer.android.com/studio/?gclid=EAIaIQobChMI8fX3n5Lb6AIVmH8rCh24JQsxEAAYASAAEgL4L_D_BwE&gclsrc=aw.ds#downloads). 
+   
+   **Note**: We recommend installing **Android Studio Bumblebee** because newer versions of Android Studio[ do not support running tests where shared source sets are used](https://issuetracker.google.com/issues/232007221#comment18), a configuration we use at Oppia.
+   
+   **Direct download Url**: [Windows](https://redirector.gvt1.com/edgedl/android/studio/install/2021.1.1.23/android-studio-2021.1.1.23-windows.exe) | [Linux](https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2021.1.1.23/android-studio-2021.1.1.23-linux.tar.gz) | [Intel Mac](https://redirector.gvt1.com/edgedl/android/studio/install/2021.1.1.23/android-studio-2021.1.1.23-mac.dmg) | [Apple Silicon Mac](https://redirector.gvt1.com/edgedl/android/studio/install/2021.1.1.23/android-studio-2021.1.1.23-mac_arm.dmg)
 
-2. Download and Install **Java 8** using the links from [the Java website](https://www.java.com/en/download/).
-   - **Note for Windows users:** Make sure to also set up the PATH system variable correctly for `Java`, following [these instructions](https://www.java.com/en/download/help/path.html).
-   - [Instructions](https://www.java.com/en/download/help/linux_install.html) for Linux users.
-   - [Instructions](https://www.java.com/en/download/help/mac_install.html) for Mac users.
+   You can have multiple versions of Android Studio installed on your machine at the same time.
 
-3. In Android Studio, open Tools > SDK Manager.
-   - In the "SDK Platforms" tab (which is the default), select `API Level 28` and also `API Level 31` (for Bazel support).
-   - Also, navigate to the "SDK Tools" tab, click the "Show Package Details" checkbox at the bottom right, then click on "Android SDK Build-Tools 34-rc1" and select 29.0.2 (this is needed for Bazel support).
+2. Configure your Android Studio
+   - In Android Studio, open Tools > SDK Manager.
+     - In the "SDK Platforms" tab (which is the default), select `API Level 28` and also `API Level 31` (for Bazel support).
+     - Also, navigate to the "SDK Tools" tab, click the "Show Package Details" checkbox at the bottom right, then click on "Android SDK Build-Tools 34-rc1" and select 29.0.2 (this is needed for Bazel support).
 
-   Then, click "Apply" to download and install these two SDKs/Tools.
+   - Then, click "Apply" to download and install these two SDKs/Tools.
 
 ## Install oppia-android
 
@@ -32,7 +35,7 @@ Please follow these steps to set up Oppia Android on your local machine.
 
    **Note**: Please keep the folder name as `oppia-android`. Changing the project folder name might lead to future issues with running the pre-push checks on your machine.
 
-2. Run the setup script, which adds some development tools for Oppia Android (ktlint, checkstyle, etc.):
+2. Run the `bash scripts/setup.sh` script, which adds some development tools for Oppia Android (ktlint, checkstyle, etc.): These tools perform pre-push checks to ensure that your code is properly formatted as per Oppia standards.
 
     - For Mac or Linux
        1. Open a terminal and navigate to `opensource/oppia-android/`.
@@ -47,19 +50,25 @@ Please follow these steps to set up Oppia Android on your local machine.
 
     - For Windows
        1. Install [Git Bash Command Line](https://gitforwindows.org/)
+          
+          **Note**: When installing Git bash, check the option to add it to powershell, so that you can run bash commands from within powershell. 
        2. Open Git Bash Command Line.
-       3. Navigate to `opensource/oppia-android/`.
+       3. Navigate to `opensource\oppia-android\`.
        4. Run the script `bash scripts/setup.sh`.
-       5. Download the [google_checks.xml](https://github.com/checkstyle/checkstyle/blob/14005e371803bd52dff429904b354dc3e72638c0/src/main/resources/google_checks.xml) file. To do this, you can simply right-click on the `Raw` button and click on `Save Link as`.
+       5. Download the [google_checks.xml](https://github.com/checkstyle/checkstyle/blob/14005e371803bd52dff429904b354dc3e72638c0/src/main/resources/google_checks.xml) file. To do this, you can simply right-click on the download button at the top-right of the file.
        6. Copy this file to the directory where Git is installed (usually C:/Program Files/Git/).
 
 3. In Android Studio, select `File > Open`, navigate to `opensource/oppia-android/`, and click `OK` to load the project.
 
-4. Click the elephant icon in the toolbar ("Sync Gradle") to ensure that all the correct dependencies are downloaded. (In general, you'll want to do this step any time you update your dependencies.)
+4. Select the Compile JDK version
+   - Go to Android Studio > Settings > Build, Execution, Deployment > Build Tools > Gradle
+   - Under "**Gradle JDK**", select Android Studio Default JDK 11.
+   - Then, click "Apply" and "OK" to complete your setup.
+5. Click the elephant icon in the toolbar ("Sync Gradle") to ensure that all the correct dependencies are downloaded. (In general, you'll want to do this step any time you update your dependencies.)
 
 ## Run the app from Android Studio
 
-1. Go to Tools > Device manager, click "Create Virtual Device...". Then:
+1. Go to Tools > AVD Manager, click "Create Virtual Device...". Then:
 
    - Select a preferred device definition. In general, any device is fine, but you can use Pixel 3a as a default (if you're developing for phones) or Nexus 7 (if you're developing for tablets). After selecting a device, click "Next" at the bottom right to continue.
    - Select a system image (in general, API Level 28, unless you're an M1 Mac user, in which case use API Level 29). Then click "Next".
@@ -68,3 +77,49 @@ Please follow these steps to set up Oppia Android on your local machine.
 2. To run the app, select the emulator device you want from the dropdown menu to the left of the "Run" button in the toolbar.
 
 3. Finally, click the "Run" button.
+
+## Set up and run tests
+Testing the app is an integral part of our development process. You will need to test all code changes to ensure that the app works correctly, therefore it is important to ensure that your test configuration works.
+
+We run tests in either Espresso(`app` module tests) or Robolectric(non-app module tests), meaning tests will run in either the emulator or on Gradle/Bazel via the terminal.
+
+### Configure Emulator Tests
+1. In Android Studio, open the desired test file, e.g., `HomeActivityTest`.
+2. In the Android Studio toolbar, click on the `Available Devices` option. Select an emulator that has between API 28-30.
+
+   **Note**: If you don't have any available devices in this list, please follow [these instructions](#run-the-app-from-android-studio) to create one.
+3. In the test file, to the left of the class name, click on the orange and green arrow, and select **Run 'HomeActivityTest'**.
+![](https://user-images.githubusercontent.com/59600948/272657131-96e5354b-13a9-4709-969a-b9494a65c30f.png)
+4. An "**Edit Configuration**" dialog will show up, and you should add the following settings under the general tab:
+   - For module, select **oppia-android.app**
+   - For Test, select **Class**
+   - For Instrumentation class, **org.oppia.android.testing.OppiaTestRunner**, will be selected by default.
+   - For target, select the **Use the device/snapshot dropdown** option.
+   - Verify that your setup looks like below:
+   -![](https://user-images.githubusercontent.com/59600948/272657260-2e654891-61be-467a-8ebd-c997aa2abda6.png)
+- Finally, Click the "Apply" and "Okay" buttons.
+- You may need to repeat step (3) above to run the test with the new configuration.
+- Subsequent runs of any app module tests will not require editing the configuration.
+- This configuration will run all the tests in that class.
+5. To run only a specific test in a file:
+   - Search or scroll down to the desired test name, to the left of the test name, click on the run icon and select **Run '`test name`''**.
+
+### Configure Robolectric Tests
+These are tests that are in non-app modules, such as **domain** or **utility**.
+1. In Android Studio, open the desired test file, e.g., `AnalyticsControllerTest`.
+2. In the test file, to the left of the class name, click on the orange and green arrow, and select **Run 'AnalyticsControllerTest'**.
+   - You will notice that the emulator is greyed out, but the run window will open to show the running tests:
+   - ![](https://user-images.githubusercontent.com/59600948/272657015-158117e5-47d2-40fc-a38b-5dee6c347556.png)
+
+### Next Steps
+- Congratulations, you are ready to work on your first issue! Take a look at our [good first issues](https://github.com/oppia/oppia-android/wiki/Oppia-Android-Testing) and leave a comment with your suggested fix. A maintainer will assign you the issue and provide any necessary guidance.
+
+- When you are ready to submit a PR, please follow [these instructions](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR) on submitting a PR.
+
+- To learn about how we write tests at oppia-android, please refer to: [Oppia Android Testing](https://github.com/oppia/oppia-android/wiki/Oppia-Android-Testing).
+
+- To get started with Bazel, please see [Oppia-Bazel-Setup-Instructions](https://github.com/oppia/oppia-android/wiki/Oppia-Bazel-Setup-Instructions) and follow the instructions appropriate to your OS.
+
+- If you run into any issues during your setup, search our [discussions](https://github.com/oppia/oppia-android/discussions) forum or start a new discussion.
+
+- Please see  [Troubleshooting-Installation](https://github.com/oppia/oppia-android/wiki/Troubleshooting-Installation) for solutions to some common setup issues.
diff --git a/wiki/Oppia-Bazel-Setup-Instructions.md b/wiki/Oppia-Bazel-Setup-Instructions.md
index fe23884521e..2ea14441319 100644
--- a/wiki/Oppia-Bazel-Setup-Instructions.md
+++ b/wiki/Oppia-Bazel-Setup-Instructions.md
@@ -12,15 +12,17 @@
 ## Overview
 Bazel is an open-source build and test tool similar to Make, Maven, and Gradle. It uses a human-readable, high-level build language.
 
+**WARNING: We recommend to not use the Android Studio Bazel plugin since it currently has compatibility issues with the project.**
+
 ### Installation
 
-**WARNING: We recommend to not use the Android Studio Bazel plugin since it currently has compatibility issues with the project.**
+1. Download and Install Java 8 using the links from the [Java website](https://www.java.com/en/download/).
 
-**Instructions for setting up Bazel on different Operating Systems:**
+2. **Select your Operating System for instructions on setting up Bazel:**
 
-- [For Windows/Ubuntu/Fedora](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Windows)
-- [For Mac including M1/M2](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Mac)
-- [For Linux](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Linux)
+   - [For Windows/Ubuntu/Fedora](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Windows)
+   - [For Mac including M1/M2](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Mac)
+   - [For Linux](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Linux)
 
 ### Building the app
 
diff --git a/wiki/_Sidebar.md b/wiki/_Sidebar.md
index 92a57f04bb6..870ea9e38ce 100644
--- a/wiki/_Sidebar.md
+++ b/wiki/_Sidebar.md
@@ -15,9 +15,9 @@
     * [Overview of the Oppia Android codebase and architecture](https://github.com/oppia/oppia-android/wiki/Overview-of-the-Oppia-Android-codebase-and-architecture)
   * Bazel
     * [Bazel setup instructions](https://github.com/oppia/oppia-android/wiki/Oppia-Bazel-Setup-Instructions)
-    * [Bazel Setup Instructions for Linux](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Linux)
-    * [Bazel Setup Instructions for Mac](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Mac)
-    * [Bazel Setup Instructions for Windows](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Windows)
+      * [Bazel Setup Instructions for Linux](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Linux)
+      * [Bazel Setup Instructions for Mac](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Mac)
+      * [Bazel Setup Instructions for Windows](https://github.com/oppia/oppia-android/wiki/Bazel-Setup-Instructions-for-Windows)
   * Key Workflows
     * [Guidance on submitting a PR](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR)
     * [Creating a screenshot](https://github.com/oppia/oppia-android/wiki/Creating-a-screenshot)

From c3bb6013df78f75f038117cbf9c361cbe9f7ba74 Mon Sep 17 00:00:00 2001
From: MOHIT GUPTA <76530270+MohitGupta121@users.noreply.github.com>
Date: Mon, 9 Oct 2023 18:48:38 +0530
Subject: [PATCH 15/32] Fix #630 : Oppia Terminology Wiki (#5177)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation

Fix #630 : Oppia Terminology Wiki

I have introduced new terminology in the Oppia wiki file to clarify the
meaning of commonly used terms such as Topics, Story, Promoted Story,
Skill, Chapter, Exploration, Question, and Concept card within the Oppia
and Oppia-Android codebase. Additionally, I have included a visual
flowchart that illustrates the interrelationships among these terms.

<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [ ] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).
---
 wiki/Terminology-in-Oppia.md | 41 ++++++++++++++++++++++++++++++++++++
 wiki/_Sidebar.md             |  3 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 wiki/Terminology-in-Oppia.md

diff --git a/wiki/Terminology-in-Oppia.md b/wiki/Terminology-in-Oppia.md
new file mode 100644
index 00000000000..d458333dcc7
--- /dev/null
+++ b/wiki/Terminology-in-Oppia.md
@@ -0,0 +1,41 @@
+## Table of Contents
+
+- [Overview of entities](#overview-of-entities)
+- [Key terms](#key-terms)
+
+## Overview of entities
+
+This diagram outlines the various entities in Oppia and how they relate
+to each other:
+
+```mermaid
+flowchart TD
+T("Topic") --> S1("Story-1")
+T --> S2("Story-2")
+S1 --> C1("Chapter-1/Exploration")
+C1 --> c1("Card-1")
+C1 --> c2("card-2")
+S1 --> C2("chapter-2")
+C2 --> c3("Card-3")
+c3 --> co("Content")
+c3 ----> in("Interaction")
+in --> mc("Multiple-choice")
+in --> is("Image Selection")
+in --> fi("Fraction-input")
+in --> oqt("other question types")
+S2 --> C3("Chapter-3")
+S2 --> C4("Chapter-4")
+C3 --> c4("Card-4")
+C4 --> c5("Card-5")
+C4 --> c6("Card-6")
+```
+
+## Key terms
+
+1. **Topic**: A topic is a broad term that refers to the subject content being taught (e.g. Addition/Subtraction). A list of available topics appears on the Home screen of app.
+2. **Story**: Stories are situations/scenarios that are meant to help users understand the topic. For example, if the topic is addition, then one of the stories could be about a kid going to a shop and to buy 3 pens and 4 pencils. A list of stories is shown in the "Lessons" tab when you open a topic from the home screen.
+3. **Promoted Story**: Promoted Story is mainly the recent Story/Chapter you played. It is shown on the "home screen" with heading text "Stories For You".
+4. **Skill**: This is a concrete learning outcome that describes something that a learner should be able to do. It is usually stated in the form “Given X, compute/calculate/draw/etc. Y.” For example: “Given a fraction, identify its numerator.”
+5. **Exploration/Chapter**: This is a structured learning experience that is part of a story, and provides the learner with an active way to learn new concepts, as well as targeted feedback. It is the core unit of learning in Oppia. The flow/screen that appears when any story is started is known as the Exploration/Chapter.
+6. **Concept Card**: This is a non-story-based explanation of how to perform a particular skill. It serves as a reference/reminder for students who may have encountered the skill before but forgotten how to carry it out. These can be accessed from  the "Revision" tab or are linked within the chapter you are playing.
+7. **Question/QuestionPlayer**: This is a standalone question that may be used by students as part of a practice session.
\ No newline at end of file
diff --git a/wiki/_Sidebar.md b/wiki/_Sidebar.md
index 870ea9e38ce..16a5e8e93a1 100644
--- a/wiki/_Sidebar.md
+++ b/wiki/_Sidebar.md
@@ -56,7 +56,8 @@
   * Bazel
     * [Gradle Bazel Migration Best Practices and FAQ](https://github.com/oppia/oppia-android/wiki/Gradle--Bazel-Migration-Best-Practices-and-FAQ)    
     * [Updating Maven Dependencies](https://github.com/oppia/oppia-android/wiki/Updating-Maven-Dependencies)
-  * [Internationalization](https://github.com/oppia/oppia-android/wiki/Internationalization) 
+  * [Internationalization](https://github.com/oppia/oppia-android/wiki/Internationalization)
+  * [Terminology in Oppia](https://github.com/oppia/oppia-android/wiki/Terminology-in-Oppia)
   * Past Events
     * Google Summer of Code (note: links are to oppia/oppia): [2021](https://github.com/oppia/oppia/wiki/Google-Summer-of-Code-2021), [2020](https://github.com/oppia/oppia/wiki/Google-Summer-of-Code-2020)
     * [SLoP 2020](https://github.com/oppia/oppia-android/wiki/SLoP-2020)
\ No newline at end of file

From 1496445243f78e9da1c3206574d930941a4dc1ab Mon Sep 17 00:00:00 2001
From: Vishwajith Shettigar
 <76042077+Vishwajith-Shettigar@users.noreply.github.com>
Date: Sat, 14 Oct 2023 18:27:44 +0530
Subject: [PATCH 16/32] Fix #5170 [Feature Request]: Display some kind of
 loading animation/graphic when topics are loading in Home Page (#5167)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation

Fix oppia/oppia-android#5170. Added progressbar to the home fragment to
show loading.
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only

Light mode


https://github.com/oppia/oppia-android/assets/76042077/d7ac57cb-47e0-43a1-b80c-7c64eaa67ddd

Darkmode


https://github.com/oppia/oppia-android/assets/76042077/1a13dd22-df4d-4dbd-bd06-19882a123d98




<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
---
 .../oppia/android/app/home/HomeViewModel.kt   | 15 ++++++++++-
 app/src/main/res/layout/home_fragment.xml     | 12 +++++++--
 app/src/main/res/values/component_colors.xml  |  1 +
 .../android/app/home/HomeActivityTest.kt      | 27 +++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/home/HomeViewModel.kt b/app/src/main/java/org/oppia/android/app/home/HomeViewModel.kt
index c8734e43845..1696cf74ca9 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeViewModel.kt
@@ -1,6 +1,7 @@
 package org.oppia.android.app.home
 
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.ObservableField
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
@@ -58,6 +59,15 @@ class HomeViewModel(
     R.integer.promoted_story_list_limit
   )
 
+/**
+   * A Boolean property indicating the visibility state of a progress bar.
+   * This property is used to control the visibility of a progress bar in a user interface.
+   * When set to true, the progress bar is made visible, indicating that an ongoing task
+   * or operation is in progress or pending or failed. When set to false, the progress bar is hidden, indicating
+   * that the operation has completed.
+   */
+  val isProgressBarVisible = ObservableField(true)
+
   private val profileDataProvider: DataProvider<Profile> by lazy {
     profileManagementController.getProfile(profileId)
   }
@@ -111,7 +121,10 @@ class HomeViewModel(
           listOf()
         }
         is AsyncResult.Pending -> listOf()
-        is AsyncResult.Success -> itemListResult.value
+        is AsyncResult.Success -> {
+          isProgressBarVisible.set(false)
+          itemListResult.value
+        }
       }
     }
   }
diff --git a/app/src/main/res/layout/home_fragment.xml b/app/src/main/res/layout/home_fragment.xml
index 80561b46581..d7dfe561d70 100644
--- a/app/src/main/res/layout/home_fragment.xml
+++ b/app/src/main/res/layout/home_fragment.xml
@@ -3,9 +3,8 @@
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <data>
-
     <import type="org.oppia.android.R" />
-
+    <import type="android.view.View" />
     <variable
       name="viewModel"
       type="org.oppia.android.app.home.HomeViewModel" />
@@ -17,6 +16,15 @@
     android:background="@color/component_color_shared_screen_primary_background_color"
     android:gravity="center">
 
+    <ProgressBar
+      android:id="@+id/home_fragment_progress_bar"
+      android:layout_width="60dp"
+      android:layout_height="60dp"
+      android:layout_gravity="center"
+      android:indeterminateTint="@color/component_color_home_activity_progressbar_color"
+      android:visibility="@{viewModel.isProgressBarVisible?View.VISIBLE:View.GONE}"
+      />
+
     <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/home_recycler_view"
       android:layout_width="match_parent"
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 2ea45c834a7..9c312ee2ed0 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -223,6 +223,7 @@
   <!-- Home Activity -->
   <color name="component_color_home_activity_view_all_text_color">@color/color_palette_view_all_text_color</color>
   <color name="component_color_home_activity_layout_greeting_text_line_color">@color/color_palette_layout_below_greeting_text_color</color>
+  <color name="component_color_home_activity_progressbar_color">@color/color_palette_progress_bar_solid_color</color>
   <!-- CONFETTI COLORS -->
   <color name="component_color_confetti_red_color">@color/color_palette_confetti_red_color</color>
   <color name="component_color_confetti_yellow_color">@color/color_palette_confetti_yellow_color</color>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
index a0e79d44c34..8e7bf121487 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
@@ -246,6 +246,33 @@ class HomeActivityTest {
     assertThat(screenName).isEqualTo(ScreenName.HOME_ACTIVITY)
   }
 
+  @Test
+  fun testHomeActivity_loadingItemsPending_progressbarIsDisplayed() {
+    fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
+    launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
+      onView(withId(R.id.home_fragment_progress_bar)).check(
+        matches(
+          isDisplayed()
+        )
+      )
+    }
+  }
+
+  @Test
+  fun testHomeActivity_loadingItemsSuccess_checkProgressbarIsNotDisplayed() {
+    fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
+    launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.home_fragment_progress_bar)).check(
+        matches(
+          not(
+            isDisplayed()
+          )
+        )
+      )
+    }
+  }
+
   @Test
   fun testHomeActivity_hasCorrectActivityLabel() {
     launch(HomeActivity::class.java).use { scenario ->

From e060e2ff265ce35c92f1b969f6d7ad002d1a62ad Mon Sep 17 00:00:00 2001
From: RD Rama Devi <122200035+Rd4dev@users.noreply.github.com>
Date: Sat, 14 Oct 2023 20:33:15 +0530
Subject: [PATCH 17/32] Fixed #5182 - All warnings in "Internationalization"
 (#5183)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->
Fix #5182 [part of #5169]

Fixes All warnings in "Internationalization" caused by
- hardcoded text : Fixed by assigning `string resource` values
- padding/margins : Fixed by setting `padding end` values

## ScreenShot:
![Lint Issues Internationalization Before
After](https://github.com/oppia/oppia-android/assets/122200035/a2f04893-b670-499b-980b-5151097b47c0)

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

<!--
## For UI-specific PRs only
Delete these section if this PR does not include UI-related changes.
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
-->
<br>

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../main/res/layout-land/profile_progress_header.xml   |  1 +
 .../administrator_controls_learner_analytics_view.xml  |  2 +-
 .../res/layout-sw600dp/profile_progress_header.xml     |  1 +
 .../layout/activity_input_interaction_view_test.xml    |  6 +++---
 app/src/main/res/layout/add_profile_activity.xml       |  1 +
 .../administrator_controls_learner_analytics_view.xml  |  2 +-
 .../res/layout/concept_card_fragment_test_activity.xml |  4 ++--
 app/src/main/res/layout/exploration_test_activity.xml  |  2 +-
 app/src/main/res/layout/font_scale_test_activity.xml   |  2 +-
 app/src/main/res/layout/profile_progress_header.xml    |  1 +
 .../res/layout/spotlight_fragment_test_activity.xml    |  2 +-
 .../main/res/layout/state_fragment_test_activity.xml   |  2 +-
 app/src/main/res/values/strings.xml                    | 10 ++++++++++
 13 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layout-land/profile_progress_header.xml b/app/src/main/res/layout-land/profile_progress_header.xml
index dda7af7e0ef..994327f7beb 100644
--- a/app/src/main/res/layout-land/profile_progress_header.xml
+++ b/app/src/main/res/layout-land/profile_progress_header.xml
@@ -42,6 +42,7 @@
       android:contentDescription="@string/edit_profile_picture_content_description"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
       android:paddingStart="12dp"
+      android:paddingEnd="0dp"
       android:paddingTop="12dp"
       android:elevation="4dp"
       app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml
index a2f180b75b1..a9ba3c2c885 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml
@@ -26,7 +26,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="Learner Study Analytics"
+      android:text="@string/learner_analytics_label_text"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/profile_and_device_id_text_view"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/profile_progress_header.xml b/app/src/main/res/layout-sw600dp/profile_progress_header.xml
index eaf9b8db55c..9ca97de20d1 100644
--- a/app/src/main/res/layout-sw600dp/profile_progress_header.xml
+++ b/app/src/main/res/layout-sw600dp/profile_progress_header.xml
@@ -42,6 +42,7 @@
       android:elevation="4dp"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
       android:paddingStart="12dp"
+      android:paddingEnd="0dp"
       android:paddingTop="12dp"
       app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
       app:layout_constraintEnd_toEndOf="@+id/profile_edit_image"
diff --git a/app/src/main/res/layout/activity_input_interaction_view_test.xml b/app/src/main/res/layout/activity_input_interaction_view_test.xml
index 94fabcd6f7e..dba00bfb1e8 100644
--- a/app/src/main/res/layout/activity_input_interaction_view_test.xml
+++ b/app/src/main/res/layout/activity_input_interaction_view_test.xml
@@ -122,7 +122,7 @@
         android:layout_margin="8dp"
         android:background="@drawable/edit_text_background"
         android:focusable="true"
-        android:hint="Write the digit here."
+        android:hint="@string/test_number_input_interaction_hint"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textColorHint="@color/component_color_shared_edit_text_hint_color"
         android:longClickable="false"
@@ -154,7 +154,7 @@
         android:layout_margin="8dp"
         android:background="@drawable/edit_text_background"
         android:focusable="true"
-        android:hint="Write here."
+        android:hint="@string/test_text_input_interaction_hint"
         android:inputType="text"
         android:longClickable="false"
         android:maxLength="200"
@@ -181,7 +181,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:onClick="getPendingAnswerErrorOnSubmitClick"
-        android:text="Submit"
+        android:text="@string/submit_button_text"
         android:textColor="@color/component_color_shared_secondary_4_text_color" />
     </LinearLayout>
   </ScrollView>
diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml
index 417092d77a1..a3c2adc51e9 100644
--- a/app/src/main/res/layout/add_profile_activity.xml
+++ b/app/src/main/res/layout/add_profile_activity.xml
@@ -67,6 +67,7 @@
             android:contentDescription="@string/edit_profile_picture_content_description"
             android:elevation="4dp"
             android:paddingStart="12dp"
+            android:paddingEnd="0dp"
             android:paddingTop="12dp"
             app:layout_constraintBottom_toBottomOf="@+id/add_profile_activity_user_image_view"
             app:layout_constraintEnd_toEndOf="@+id/add_profile_activity_user_image_view"
diff --git a/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml b/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml
index cef8061d1cc..2a761c6b17a 100644
--- a/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml
+++ b/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml
@@ -22,7 +22,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="Learner Study Analytics"
+      android:text="@string/learner_analytics_label_text"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/profile_and_device_id_text_view"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/concept_card_fragment_test_activity.xml b/app/src/main/res/layout/concept_card_fragment_test_activity.xml
index 4894aac319d..9f8586d5570 100644
--- a/app/src/main/res/layout/concept_card_fragment_test_activity.xml
+++ b/app/src/main/res/layout/concept_card_fragment_test_activity.xml
@@ -7,13 +7,13 @@
     android:id="@+id/open_dialog_0"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="Concept Card 1"
+    android:text="@string/concept_card_one_button_text"
     android:textAllCaps="false"/>
 
   <Button
     android:id="@+id/open_dialog_1"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="Concept Card 2"
+    android:text="@string/concept_card_two_button_text"
     android:textAllCaps="false" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/exploration_test_activity.xml b/app/src/main/res/layout/exploration_test_activity.xml
index d693b80a73c..19a0bc3a9c5 100644
--- a/app/src/main/res/layout/exploration_test_activity.xml
+++ b/app/src/main/res/layout/exploration_test_activity.xml
@@ -10,7 +10,7 @@
     android:id="@+id/play_exploration_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="Play exploration"
+    android:text="@string/play_exploration_button_text"
     android:textAllCaps="false"/>
 
   <FrameLayout
diff --git a/app/src/main/res/layout/font_scale_test_activity.xml b/app/src/main/res/layout/font_scale_test_activity.xml
index 359a8529b7b..78de85f97cf 100644
--- a/app/src/main/res/layout/font_scale_test_activity.xml
+++ b/app/src/main/res/layout/font_scale_test_activity.xml
@@ -12,7 +12,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:fontFamily="sans-serif"
-    android:text="html Content"
+    android:text="@string/font_scale_html_content_text"
     android:textColor="@color/component_color_shared_primary_text_color"
     android:textSize="20sp" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/profile_progress_header.xml b/app/src/main/res/layout/profile_progress_header.xml
index 00f32b61e2b..b00c0202333 100644
--- a/app/src/main/res/layout/profile_progress_header.xml
+++ b/app/src/main/res/layout/profile_progress_header.xml
@@ -44,6 +44,7 @@
       android:elevation="4dp"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
       android:paddingStart="8dp"
+      android:paddingEnd="0dp"
       android:paddingTop="8dp"
       app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
       app:layout_constraintEnd_toEndOf="@+id/profile_edit_image"
diff --git a/app/src/main/res/layout/spotlight_fragment_test_activity.xml b/app/src/main/res/layout/spotlight_fragment_test_activity.xml
index 37125d9d9ee..371d51c0430 100644
--- a/app/src/main/res/layout/spotlight_fragment_test_activity.xml
+++ b/app/src/main/res/layout/spotlight_fragment_test_activity.xml
@@ -15,7 +15,7 @@
       android:id="@+id/sample_spotlight_target"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="This is a sample text view"
+      android:text="@string/sample_text_view_text"
       style="@style/TextViewStart"
       android:layout_marginTop="80dp"
       android:layout_marginStart="80dp"
diff --git a/app/src/main/res/layout/state_fragment_test_activity.xml b/app/src/main/res/layout/state_fragment_test_activity.xml
index 168334e4845..300bfc41478 100644
--- a/app/src/main/res/layout/state_fragment_test_activity.xml
+++ b/app/src/main/res/layout/state_fragment_test_activity.xml
@@ -31,7 +31,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="16dp"
-      android:text="Play exploration"
+      android:text="@string/play_exploration_button_text"
       android:textAllCaps="false"
       android:visibility="@{viewModel.hasExplorationStarted ? View.GONE : View.VISIBLE}" />
   </FrameLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 081bea57539..79ec1534ff1 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,6 +5,7 @@
   <string name="menu_my_downloads">My Downloads</string>
   <string name="menu_help">Help</string>
   <string name="exploration_activity_title">Exploration Player</string>
+  <string name="play_exploration_button_text">Play exploration</string>
   <string name="help_activity_title">Help</string>
   <string name="bottom_sheet_options_menu_close">Close</string>
   <string name="menu_switch_profile">Switch Profile</string>
@@ -27,6 +28,8 @@
   <string name="cellular_data_alert_dialog_description">Streaming audio may use a lot of cellular data.</string>
   <string name="cellular_data_alert_dialog_checkbox">Don\'t show this message again</string>
   <string name="concept_card_toolbar_title">Concept Card</string>
+  <string name="concept_card_one_button_text">Concept Card 1</string>
+  <string name="concept_card_two_button_text">Concept Card 2</string>
   <string name="revision_card_toolbar_title">Revision Card</string>
   <string name="unsaved_exploration_dialog_title">Leave to Topic Page?</string>
   <string name="unsaved_exploration_dialog_description">Your progress will not be saved.</string>
@@ -60,6 +63,7 @@
   <string name="previous_state_description">Navigate to the previous card</string>
   <string name="next_state_description">Navigate to the next card</string>
   <string name="state_submit_button">Submit</string>
+  <string name="submit_button_text">Submit</string>
   <string name="lesson_replay_button_text">Replay</string>
   <string name="state_end_exploration_button">Return To Topic</string>
   <string name="previous_responses_header">Previous Responses (%s)</string>
@@ -68,6 +72,7 @@
   <string name="topic_download_text">(%s)</string>
   <string name="see_more">See More</string>
   <string name="see_less">See Less</string>
+  <string name="sample_text_view_text">This is a sample text view</string>
   <string name="FAQs">FAQs</string>
   <string name="featured_questions">Featured Questions</string>
   <string name="frequently_asked_questions">Frequently Asked Questions</string>
@@ -356,6 +361,8 @@
   <string name="add_profile_required">Required</string>
   <string name="back_button">Back Button</string>
   <string name="next">Next</string>
+  <!-- ProfileAndDeviceIDsActivity -->
+  <string name="learner_analytics_label_text">Learner Study Analytics</string>
   <!-- AdministratorControlsFragment -->
   <string name="administrator_controls_general_label">General</string>
   <string name="administrator_controls_edit_account">Edit account</string>
@@ -482,6 +489,8 @@
   <string name="ratio_content_description_separator" description="The separator that would be used to build the text that would be read out for ratio interaction.For e.g if the input is 1:2:3 the read out text would be 1 to 2 to 3">\u0020to\u0020</string>
   <string name="ratio_default_hint_text" description="The default hint text for the ratio interaction if the placeholder text is not available.">Enter a ratio in the form x:y.</string>
   <string name="text_input_default_hint_text">Tap here to enter text.</string>
+  <string name="test_number_input_interaction_hint">Write the digit here.</string>
+  <string name="test_text_input_interaction_hint">Write here.</string>
   <string name="smallest_text_size_content_description">Smallest text size</string>
   <string name="largest_text_size_content_description">Largest text size</string>
   <string name="coming_soon">Coming Soon</string>
@@ -596,4 +605,5 @@
   <string name="profile_picture_image_view_content_description">Profile Picture Image View</string>
   <string name="lock_icon_content_description">Lock Icon</string>
   <string name="download_status_image_content_description">Download Status</string>
+  <string name="font_scale_html_content_text">html Content</string>
 </resources>

From a565cc76024b30bd6f214e4b011f124df4104672 Mon Sep 17 00:00:00 2001
From: Vishwajith Shettigar
 <76042077+Vishwajith-Shettigar@users.noreply.github.com>
Date: Thu, 19 Oct 2023 04:12:48 +0530
Subject: [PATCH 18/32] Fix #5187  Textview contrast issue in locked lesson
 (#5189)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->
Fixes #5187, changing the background color of the locked lessons'
TextView fixed the contrast ratio issue.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only

Before Fix

| Light Mode| Dark Mode|
|--------|--------|
|
![textcontrast](https://github.com/oppia/oppia-android/assets/76042077/01ffdf6c-3a20-4ce5-ab20-54ff7a82fedee)|![testdark](https://github.com/oppia/oppia-android/assets/76042077/d3f1fb3a-f267-4ced-9a00-3bdd67d4192a)|

After Fix

| Light Mode| Dark Mode|
|--------|--------|
|
![afterlight](https://github.com/oppia/oppia-android/assets/76042077/7d00b264-0bfb-4b35-8b99-b0b44ff7149d)|![lockbackground](https://github.com/oppia/oppia-android/assets/76042077/9147686c-e573-4285-aced-0af599d68d67)|

<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
---
 app/src/main/res/values-night/color_palette.xml | 4 ++--
 app/src/main/res/values/color_palette.xml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index 610b29c2ac1..36917970d4f 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -171,9 +171,9 @@
   <color name="color_palette_shared_card_border_stroke_color">@color/color_def_accessible_light_grey_2</color>
   <color name="color_palette_lesson_in_progress_chapter_index_background_color">@color/color_def_oppia_green</color>
   <color name="color_palette_lesson_in_progress_chapter_name_background_color">@color/color_def_accessible_grey</color>
-  <color name="color_palette_lessons_locked_chapter_container_background_color">@color/color_def_accessible_light_grey_2</color>
+  <color name="color_palette_lessons_locked_chapter_container_background_color">@color/color_def_accessible_light_grey</color>
   <color name="color_palette_lesson_locked_chapter_name_text_color">@color/color_def_white_80</color>
-  <color name="color_palette_lesson_locked_chapter_name_background_color">@color/color_def_accessible_light_grey_2</color>
+  <color name="color_palette_lesson_locked_chapter_name_background_color">@color/color_def_accessible_light_grey</color>
   <color name="color_palette_lessons_locked_vertical_divider_color">@color/color_def_dark_silver</color>
   <color name="color_palette_lesson_not_started_stroke_color">@color/color_def_white</color>
   <color name="color_palette_lesson_not_started_chapter_name_background_color">@color/color_def_oppia_green</color>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
index a542be65211..f5202bb9365 100644
--- a/app/src/main/res/values/color_palette.xml
+++ b/app/src/main/res/values/color_palette.xml
@@ -178,7 +178,7 @@
   <color name="color_palette_lesson_in_progress_chapter_name_background_color">@color/color_def_light_green</color>
   <color name="color_palette_lessons_locked_chapter_container_background_color">@color/color_def_accessible_light_grey_2</color>
   <color name="color_palette_lesson_locked_chapter_name_text_color">@color/color_def_accessible_light_grey_2</color>
-  <color name="color_palette_lesson_locked_chapter_name_background_color">@color/color_def_grey</color>
+  <color name="color_palette_lesson_locked_chapter_name_background_color">@color/color_def_oppia_grey_background</color>
   <color name="color_palette_lessons_locked_vertical_divider_color">@color/color_def_transparent</color>
   <color name="color_palette_lesson_not_started_stroke_color">@color/color_def_bright_green</color>
   <color name="color_palette_lesson_not_started_chapter_name_background_color">@color/color_def_white</color>

From 089ddf03a7ca9d17cea7341ae8ae3389d044b1f8 Mon Sep 17 00:00:00 2001
From: Sergei Shchurov <71126152+sichchurov@users.noreply.github.com>
Date: Thu, 19 Oct 2023 11:58:26 +0300
Subject: [PATCH 19/32] Fix part of #5195: Changed method for compatibility
 with API < 26 (#5190)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fix part of #5195: For providing compatibility with API < 26, I added
the else-if operator. If API 26 and higher use java.util.Base64 class
else use android.util.Base64 class

**Lint report before**

<img
src="https://github.com/oppia/oppia-android/assets/71126152/6a20722d-71af-4c2f-815a-390d6b8a5e09"
width="50%" height="50%" alt="callingNewApiBefore">

 **Lint report after**

<img
src="https://github.com/oppia/oppia-android/assets/71126152/7f52d35d-344f-405a-bb57-3f4fd073b1c3"
width="50%" height="50%" alt="callingNewApAfter">


<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
---
 .../learneranalytics/ControlButtonsViewModel.kt            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
index 5a2970e9652..7bfc41a7ffe 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
@@ -3,6 +3,7 @@ package org.oppia.android.app.administratorcontrols.learneranalytics
 import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -228,7 +229,11 @@ class ControlButtonsViewModel private constructor(
       val compressedMessage = ByteArrayOutputStream().also { byteOutputStream ->
         GZIPOutputStream(byteOutputStream).use(::writeTo)
       }.toByteArray()
-      return Base64.getEncoder().encodeToString(compressedMessage)
+      return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        Base64.getEncoder().encodeToString(compressedMessage)
+      } else {
+        android.util.Base64.encodeToString(compressedMessage, 0)
+      }
     }
 
     private fun String.computeSha1Hash(machineLocale: OppiaLocale.MachineLocale): String {

From 4fb9b585aa0bbd8c118a1856d365a78b528ca49a Mon Sep 17 00:00:00 2001
From: Vishwajith Shettigar
 <76042077+Vishwajith-Shettigar@users.noreply.github.com>
Date: Thu, 19 Oct 2023 17:07:54 +0530
Subject: [PATCH 20/32] Fix #4739 Talkback does not read the expected text
 (#5152)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fix #4739, edittext requesting focus only when reader is off will
resolve this issue.
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
Before fix


https://github.com/oppia/oppia-android/assets/76042077/41bc96b4-3fe1-4688-a77b-02bfdbd22782


After fix

  Talkback On


https://github.com/oppia/oppia-android/assets/76042077/a01da3dc-8848-4632-a8c0-17ce3e409beb


Talkback Off



https://github.com/oppia/oppia-android/assets/76042077/beac309e-16d8-496f-bc09-af8de634536b







<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
---
 .../profile/PinPasswordActivityPresenter.kt   | 10 ++++++++-
 .../app/profile/PinPasswordActivityTest.kt    | 21 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
index a3e262baf63..57c999e2586 100644
--- a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
@@ -15,6 +15,7 @@ import org.oppia.android.app.utility.lifecycle.LifecycleSafeTimerFactory
 import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.PinPasswordActivityBinding
 import org.oppia.android.domain.profile.ProfileManagementController
+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
@@ -31,6 +32,7 @@ class PinPasswordActivityPresenter @Inject constructor(
   private val viewModelProvider: ViewModelProvider<PinPasswordViewModel>,
   private val resourceHandler: AppLanguageResourceHandler
 ) {
+  @Inject lateinit var accessibilityService: AccessibilityService
   private val pinViewModel by lazy {
     getPinPasswordViewModel()
   }
@@ -69,7 +71,13 @@ class PinPasswordActivityPresenter @Inject constructor(
         )
       }
     }
-    binding.pinPasswordInputPinEditText.requestFocus()
+
+    // If the screen reader is off, the EditText will receive focus.
+    // If the screen reader is on, the EditText won't receive focus.
+    // This is needed because requesting focus on the EditText when the screen reader is on gives TalkBack priority over other views in the screen, ignoring view hierachy.
+    if (!accessibilityService.isScreenReaderEnabled())
+      binding.pinPasswordInputPinEditText.requestFocus()
+
     // [onTextChanged] is a extension function defined at [TextInputEditTextHelper]
     binding.pinPasswordInputPinEditText.onTextChanged { pin ->
       pin?.let { inputtedPin ->
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
index f1afe3b1393..16ce38b184e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
@@ -98,6 +98,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.testing.CachingTestModule
 import org.oppia.android.util.gcsresource.GcsResourceModule
@@ -147,6 +148,9 @@ class PinPasswordActivityTest {
   @Inject
   lateinit var editTextInputAction: EditTextInputAction
 
+  @Inject
+  lateinit var fakeAccessibilityService: FakeAccessibilityService
+
   private val adminPin = "12345"
   private val adminId = 0
   private val userId = 1
@@ -181,7 +185,8 @@ class PinPasswordActivityTest {
   }
 
   @Test
-  fun testPinPassword_withAdmin_keyboardIsVisibleByDefault() {
+  fun testPinPassword_withAdmin_screenReaderOff_keyboardIsVisible() {
+    fakeAccessibilityService.setScreenReaderEnabled(false)
     ActivityScenario.launch<PinPasswordActivity>(
       PinPasswordActivity.createPinPasswordActivityIntent(
         context = context,
@@ -193,6 +198,20 @@ class PinPasswordActivityTest {
     }
   }
 
+  @Test
+  fun testPinPassword_withAdmin_screenReaderOn_keyboardIsNotVisible() {
+    fakeAccessibilityService.setScreenReaderEnabled(true)
+    ActivityScenario.launch<PinPasswordActivity>(
+      PinPasswordActivity.createPinPasswordActivityIntent(
+        context = context,
+        adminPin = adminPin,
+        profileId = adminId
+      )
+    ).use {
+      onView(withId(R.id.pin_password_input_pin_edit_text)).check(matches(not(hasFocus())))
+    }
+  }
+
   @Test
   fun testPinPassword_withAdmin_inputCorrectPin_opensHomeActivity() {
     ActivityScenario.launch<PinPasswordActivity>(

From ff0dffc4addb9c20f3d07fc7ddd74b382a522a2b Mon Sep 17 00:00:00 2001
From: MOHIT GUPTA <76530270+MohitGupta121@users.noreply.github.com>
Date: Fri, 20 Oct 2023 18:21:28 +0530
Subject: [PATCH 21/32] Fix #5192, #4610 : [Developer Video] Understanding CI
 check failures & Replace wiki broken links (#5199)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation

Fix #5192, #4610 : [Developer Video] Understanding CI check failures &
Replace Wiki broken links

This PR include developer video that explains how to handle failures in
our Continuous Integration (CI) checks in oppia-android. It also
includes the replacement of broken links in our Wiki, improving the
documentation for a smoother developer experience.

<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [ ] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).
---
 scripts/assets/todo_open_exemptions.textproto | 24 +++++++++----------
 wiki/Accessibility-A11y-Guide.md              |  2 +-
 wiki/Bazel-Setup-Instructions-for-Windows.md  |  2 +-
 wiki/Buf-Guide.md                             |  2 +-
 wiki/Developing-skills.md                     |  4 ++--
 wiki/Guidance-on-submitting-a-PR.md           |  2 +-
 wiki/Instructions-for-making-a-code-change.md |  6 ++---
 wiki/Interpreting-CI-Results.md               |  8 +++++++
 wiki/Ktlint-Guide.md                          |  2 +-
 wiki/RTL-Guidelines.md                        |  1 -
 wiki/Static-Analysis-Checks.md                |  4 ++++
 wiki/Troubleshooting-Installation.md          |  2 +-
 wiki/Updating-Maven-Dependencies.md           |  2 +-
 wiki/Work-Manager.md                          |  6 ++---
 14 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/scripts/assets/todo_open_exemptions.textproto b/scripts/assets/todo_open_exemptions.textproto
index 0fa81fd297d..cb81317adae 100644
--- a/scripts/assets/todo_open_exemptions.textproto
+++ b/scripts/assets/todo_open_exemptions.textproto
@@ -294,16 +294,16 @@ todo_open_exemption {
 
 todo_open_exemption {
   exempted_file_path: "wiki/Static-Analysis-Checks.md"
-  line_number: 170
-  line_number: 178
-  line_number: 183
-  line_number: 187
-  line_number: 191
-  line_number: 193
-  line_number: 208
-  line_number: 218
-  line_number: 221
-  line_number: 224
-  line_number: 227
-  line_number: 230
+  line_number: 171
+  line_number: 179
+  line_number: 184
+  line_number: 188
+  line_number: 192
+  line_number: 194
+  line_number: 209
+  line_number: 219
+  line_number: 222
+  line_number: 225
+  line_number: 228
+  line_number: 231
 }
diff --git a/wiki/Accessibility-A11y-Guide.md b/wiki/Accessibility-A11y-Guide.md
index 54e713469f4..a9e01c6c59e 100644
--- a/wiki/Accessibility-A11y-Guide.md
+++ b/wiki/Accessibility-A11y-Guide.md
@@ -95,7 +95,7 @@ TalkBack is the Google **screen reader** included on Android devices. TalkBack g
   * [Presentation Slides](https://docs.google.com/presentation/d/17SeKJLKT-rUNa_Yupe97bMFSsjTNzp83jX-lZPKEtnQ/edit?usp=sharing)
 
 ## Using AccessibilityTestRule in Espresso Tests
-[AccessibilityTestRule](https://github.com/oppia/oppia-android/blob/develop/testing/src/main/java/org/oppia/android/testing/AccessibilityTestRule.kt) is a JUnit rule to enable `AccessibilityChecks` in all Espresso Tests. This rule covers all errors shown by Accessibility Scanner and more but only for all those UI elements which are getting used in the test case.
+[AccessibilityTestRule](https://github.com/oppia/oppia-android/blob/develop/testing/src/main/java/org/oppia/android/testing/OppiaTestRule.kt) is a JUnit rule to enable `AccessibilityChecks` in all Espresso Tests. This rule covers all errors shown by Accessibility Scanner and more but only for all those UI elements which are getting used in the test case.
 
 (**Note: If this file is not available then it has been merged with OppiaTestRule as per #3351**)
 
diff --git a/wiki/Bazel-Setup-Instructions-for-Windows.md b/wiki/Bazel-Setup-Instructions-for-Windows.md
index 42c564c51fb..7a72fa86c34 100644
--- a/wiki/Bazel-Setup-Instructions-for-Windows.md
+++ b/wiki/Bazel-Setup-Instructions-for-Windows.md
@@ -14,7 +14,7 @@
 
 ## Overview & Disclaimer
 
-This page outlines one way to allow Bazel to be used in CLI form on Windows. Please note that **this support is currently experimental**. You may run into some problems--we suggest that you [file an issue](https://github.com/oppia/oppia-android/issues/new/choose) ior contact us at [gitter](https://gitter.im/oppia/oppia-android).
+This page outlines one way to allow Bazel to be used in CLI form on Windows. Please note that **this support is currently experimental**. You may run into some problems--we suggest that you [file an issue](https://github.com/oppia/oppia-android/issues/new/choose) or contact us at [github-discussions](https://github.com/oppia/oppia-android/discussions).
 
 Unlike Unix-based systems where Bazel runs natively without issue, the current solution on Windows is to install an Ubuntu-based subsystem. Windows currently only supports a terminal experience in this subsystem (though there is a prerelease version of the software with GUI support) which means Android Studio will not be supported. You will need to continue using the Windows version of Android Studio and only use the Linux subsystem for building & running Robolectric or JUnit-based tests.
 
diff --git a/wiki/Buf-Guide.md b/wiki/Buf-Guide.md
index 895e2de625a..184c747e033 100644
--- a/wiki/Buf-Guide.md
+++ b/wiki/Buf-Guide.md
@@ -5,7 +5,7 @@
   - [Configuration File](#configuration-file)
 
 # Installation
-Once you had completed all the [installation steps](https://github.com/oppia/oppia-android/wiki#prerequisites), you will be having a `buf` file in your `opensource/oppia-android-tools` folder.<br>
+Once you have completed all the [installation steps](https://github.com/oppia/oppia-android/wiki/Installing-Oppia-Android), you will have a `buf` file in your `opensource/oppia-android-tools` folder.<br>
 **Note: Currently, Buf is not available for windows.**
 
 ## Commands
diff --git a/wiki/Developing-skills.md b/wiki/Developing-skills.md
index 562b07e321e..fab285b222c 100644
--- a/wiki/Developing-skills.md
+++ b/wiki/Developing-skills.md
@@ -7,11 +7,11 @@ That said, we strongly recommend that you be open to learning new things. If you
       - [Learning Branching Git](https://learngitbranching.js.org/) helps explain how git works. Try the levels below:
         - Levels 1, 2, and 3 from the Introduction sequence.
         - Levels 1, 2, 3, 4, 5, and 6 from Push and Pull Git Remotes.
-      - [Introduction to GitHub](https://lab.github.com/githubtraining/introduction-to-github) covers how to use GitHub.
+      - [Introduction to GitHub](https://learn.microsoft.com/en-us/training/modules/introduction-to-github/) covers how to use GitHub.
     - More advanced:
       - The other levels from [Learn Branching Git](https://learngitbranching.js.org/) cover git in more depth.
       - You may find this [git visualizer](https://git-school.github.io/visualizing-git/) helpful for understanding more advanced git operations. It can be helpful for simple ones too!
-      - GitHub's [managing merge conflicts page](https://lab.github.com/githubtraining/managing-merge-conflicts) explains how to address merge conflicts.
+      - GitHub's [managing merge conflicts page](https://github.com/skills/resolve-merge-conflicts) explains how to address merge conflicts.
  - Kotlin is used for Android in oppia. You can learn the basics of kotlin from Udacity -- [Kotlin bootcamp for programmers](https://www.udacity.com/course/kotlin-bootcamp-for-programmers--ud9011) by Google.
  - Learn the basics of android to understand the project structure and the libraries that are used in most common apps from the Udacity -- [Developing Android Apps with Kotlin](https://www.udacity.com/course/developing-android-apps-with-kotlin--ud9012) course.
  - To learn the advanced topics like Dependency Injection and Testing in Android check out Udacity -- [Advanced Android with Kotlin](https://www.udacity.com/course/advanced-android-with-kotlin--ud940) course.
diff --git a/wiki/Guidance-on-submitting-a-PR.md b/wiki/Guidance-on-submitting-a-PR.md
index 5f7541e70f9..0124b44eb90 100644
--- a/wiki/Guidance-on-submitting-a-PR.md
+++ b/wiki/Guidance-on-submitting-a-PR.md
@@ -1,5 +1,5 @@
 **Working on your first pull request?** Pull requests (PRs) can be tricky to understand at first, so if the instructions on this page don't make sense to you, check out these resources:
-- The free series [How to Contribute to an Open Source Project on GitHub](https://app.egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
+- The free series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github)
 - [Atlassian's tutorial on pull requests](https://www.atlassian.com/git/tutorials/making-a-pull-request).
 
 Here are the steps for making a PR to the Oppia Android codebase:
diff --git a/wiki/Instructions-for-making-a-code-change.md b/wiki/Instructions-for-making-a-code-change.md
index ca91ee920ff..850f252220c 100644
--- a/wiki/Instructions-for-making-a-code-change.md
+++ b/wiki/Instructions-for-making-a-code-change.md
@@ -1,12 +1,12 @@
 **Important:** Please read the [Oppia Android coding style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide) before making any code changes.
 
-**Working on your first Pull Request?** You can learn how from this free series: [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github).
+**Working on your first Pull Request?** You can learn how from this free series: [How to Contribute to an Open Source Project on GitHub](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github).
 
-*If your change isn't trivial, please [talk to us](https://gitter.im/oppia/oppia-android) before you start working on it -- this helps avoid duplication of effort, and allows us to offer advice and suggestions. For larger changes, it may be better to first create a short doc outlining a suggested implementation plan, and send it to the Android dev team for feedback.*
+*If your change isn't trivial, please talk to us via [github-discussions](https://github.com/oppia/oppia-android/discussions) before you start working on it -- this helps avoid duplication of effort, and allows us to offer advice and suggestions. For larger changes, it may be better to first create a short doc outlining a suggested implementation plan, and send it to the Android dev team for feedback.*
 
 The following instructions describe how to make a one-off code change using a feature branch. (In case you're interested, we mainly use the [Gitflow workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).) Please follow them carefully, otherwise your code review may be delayed.
 
-You might also find this reference for the [Android Studio UI-based Github workflow](https://github.com/oppia/oppia-android/wiki/Android-Studio-UI-based-Github-workflow) helpful.
+You might also find this reference for the [Android Studio UI-based Github workflow](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#making-a-local-code-change-using-android-studios-ui-based-github-workflow) helpful.
 
 1. **Choose a descriptive branch name.** It should be lowercase and hyphen-separated, such as `splash-screen`. Also, it shouldn't start with `hotfix` or `release`.
 2. **Before coding anything, create a new branch with this name, starting from 'develop'.** I.e., run:
diff --git a/wiki/Interpreting-CI-Results.md b/wiki/Interpreting-CI-Results.md
index b0135d27293..2adf2685b53 100644
--- a/wiki/Interpreting-CI-Results.md
+++ b/wiki/Interpreting-CI-Results.md
@@ -1,3 +1,8 @@
+## Table of Contents
+
+- [How to find the error message for a Failing CI check](#how-to-find-error-message-for-failing-ci-checks)
+- [Developer Video - Understanding CI check failures](#developer-video---understanding-ci-check-failures)
+
 ## How to find error message for Failing CI checks
 
 Creating a pr or updating a pr runs all the CI checks, which can sometimes fail if the code changes have affected some other part of the app or if the code changes don’t need some reformatting and docs. In these cases understanding the error and fixing it requires how to find the error.
@@ -14,3 +19,6 @@ Example in the below check the second job has some error or failure
 
 
 Navigate to logs or search the keyword ‘error’ to find the error message to understand what might have caused the failure in the checks.
+
+### Developer Video - Understanding CI check failures
+Learn how to interpret and troubleshoot oppia-android CI check failures in this insightful [developer video](https://youtu.be/I2bRf6fvgJ0?si=35sAagbUFSk6bOBA).
\ No newline at end of file
diff --git a/wiki/Ktlint-Guide.md b/wiki/Ktlint-Guide.md
index 9c1b4c11549..83f27e8dd0c 100644
--- a/wiki/Ktlint-Guide.md
+++ b/wiki/Ktlint-Guide.md
@@ -7,7 +7,7 @@
 - [How to fix the most common issues?](#how-to-fix-the-most-common-issues) 
 
 # Installation
-Once you had completed all the [installation steps](https://github.com/oppia/oppia-android/wiki#prerequisites), you will be having a `ktlint` file in your `opensource/oppia-android-tools` folder. 
+Once you have completed all the [installation steps](https://github.com/oppia/oppia-android/wiki/Installing-Oppia-Android), you will have a `ktlint` file in your `opensource/oppia-android-tools` folder.
 
 # Commands 
 
diff --git a/wiki/RTL-Guidelines.md b/wiki/RTL-Guidelines.md
index dc004760827..cd16760ecd4 100644
--- a/wiki/RTL-Guidelines.md
+++ b/wiki/RTL-Guidelines.md
@@ -51,5 +51,4 @@ The screen will look something like this:
 
 # Reference Documentation
 * [Oppia-Android RTL Issues](https://docs.google.com/document/d/1Fl1ar5vcdLvay7ZIJLUFQro1wEf1yUEicwF-CKcvwJ0/edit#)
-* [RTL Support Milestone](https://github.com/oppia/oppia-android/milestone/40) 
 * [Guidelines for RTL](https://material.io/design/usability/bidirectionality.html)
diff --git a/wiki/Static-Analysis-Checks.md b/wiki/Static-Analysis-Checks.md
index a3d350fedf9..e4252c7c445 100644
--- a/wiki/Static-Analysis-Checks.md
+++ b/wiki/Static-Analysis-Checks.md
@@ -12,6 +12,7 @@
     - [TODO open checks](#todo-open-checks)
     - [TODO issue resolved check](#todo-issue-resolved-check)
     - [How to run static checks locally](#how-to-run-static-checks-locally)
+    - [Developer Video - Understanding CI check failures](#developer-video---understanding-ci-check-failures)
 
 # Background
 Static analysis is a method of debugging by examining source code before a program is run. It’s done by analyzing a set of code against a set (or multiple sets) of coding rules.
@@ -241,3 +242,6 @@ To fix failing tests from GitHub CI individually, follow the steps below.
 - You can also go to scripts/static_checks.sh to view the failing check and run it locally.
 
 Note: Before running the script command in your local terminal, make sure you have Bazel installed. To learn how to set up Bazel for Oppia Android, follow these [instructions](https://github.com/oppia/oppia-android/wiki/Oppia-Bazel-Setup-Instructions). Also make sure you have oppia-android-tools installed since static checks rely on these tools to be able to perform some of the checks. To install oppia-android-tools, run `bash scripts/setup.sh` in the oppia-android directory.
+
+### Developer Video - Understanding CI check failures
+Learn how to interpret and troubleshoot oppia-android CI check failures in this insightful [developer video](https://youtu.be/I2bRf6fvgJ0?si=35sAagbUFSk6bOBA).
\ No newline at end of file
diff --git a/wiki/Troubleshooting-Installation.md b/wiki/Troubleshooting-Installation.md
index d88c4bf01ad..a05144fa2ed 100644
--- a/wiki/Troubleshooting-Installation.md
+++ b/wiki/Troubleshooting-Installation.md
@@ -14,7 +14,7 @@ Here are some general troubleshooting tips for oppia-android. The specific platf
 2. If you find any error which says `java: command not found`, please check you have Java installed correctly in your machine and the [environment path variable](https://www.java.com/en/download/help/path.html) is also set up correctly.
 
 
-3. If you find any error related to Kotlin or Java/Checkstyle while pushing the code, please check [this link](https://github.com/oppia/oppia-android/wiki/Android-Studio-UI-based-Github-workflow#how-to-fix-push-failures).
+3. If you find any error related to Kotlin or Java/Checkstyle while pushing the code, please check [this link](https://github.com/oppia/oppia-android/wiki/Frequent-Errors-and-Solutions#push-failed).
 
 
 4. If you see the error
diff --git a/wiki/Updating-Maven-Dependencies.md b/wiki/Updating-Maven-Dependencies.md
index cb08415d296..6e0653f844b 100644
--- a/wiki/Updating-Maven-Dependencies.md
+++ b/wiki/Updating-Maven-Dependencies.md
@@ -70,7 +70,7 @@ If the link does point to a valid license then choose the most appropriate categ
 1. scrapable_link: If the license text is plain text and the URL mentioned can be scraped directly from the original_link of the license. 
                    e.g - https://www.apache.org/licenses/LICENSE-2.0.txt
 2. extracted_copy_link: If the license text is plain text but can not be scraped directly from the original_link of the license.
-                        e.g - https://www.opensource.org/licenses/bsd-license
+                        e.g - https://opensource.org/license/bsd-3-clause
 3. direct_link_only: If the license text is not plain text, it's best to display only the link of the license.
                      e.g - https://developer.android.com/studio/terms.html
 
diff --git a/wiki/Work-Manager.md b/wiki/Work-Manager.md
index bcede9e03f2..2547ee7b457 100644
--- a/wiki/Work-Manager.md
+++ b/wiki/Work-Manager.md
@@ -34,8 +34,8 @@ There are a few WorkManager classes you need to know about:
 
 
 In Oppia we are using WorkManager in two scenarios :
-- To upload cached Logs (for Analytics) over FirebaseAnalytics whenever data connection and battery requirements are met. This was implemented by @Sarthak2601 during GSoC'20, for more details you can go through the [proposal idea](https://github.com/oppia/oppia/wiki/pdfs/GSoC2020SarthakAgarwal.pdf) 
-- To sync up the PlatformParameters from OppiaBackend whenever the app starts and the data + battery requirements are met. This was implemented by @ARJUPTA during GSoC'21, for more details you can go through the [proposal idea](https://github.com/oppia/oppia/wiki/pdfs/GSoC2021ArjunGupta.pdf)
+- To upload cached Logs (for Analytics) over FirebaseAnalytics whenever data connection and battery requirements are met. This was implemented by @Sarthak2601 during GSoC'20, for more details you can go through the [proposal idea](https://github.com/oppia/oppia-web-developer-docs/blob/develop/pdfs/GSoC2020SarthakAgarwal.pdf) 
+- To sync up the PlatformParameters from OppiaBackend whenever the app starts and the data + battery requirements are met. This was implemented by @ARJUPTA during GSoC'21, for more details you can go through the [proposal idea](https://github.com/oppia/oppia-web-developer-docs/blob/develop/pdfs/GSoC2021ArjunGupta.pdf)
 
 # How to use WorkManager
 If you want to introduce a new feature or any change to the existing WorkManager implementation in oppia-android, here is the basic structure of files you need to keep in mind :
@@ -168,4 +168,4 @@ In Oppia we write tests for both the Worker and its Initializer class. You can t
 
 Worker Tests - *[PlatformParameterSyncUpWorkerTest](https://github.com/oppia/oppia-android/blob/develop/domain/src/test/java/org/oppia/android/domain/platformparameter/syncup/PlatformParameterSyncUpWorkerTest.kt) OR [LogUploadWorkerTest](https://github.com/oppia/oppia-android/blob/develop/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt)*
 
-Initializer Tests - *[PlatformParameterSyncUpWorkManagerInitializerTest](https://github.com/oppia/oppia-android/blob/develop/domain/src/test/java/org/oppia/android/domain/platformparameter/syncup/PlatformParameterSyncUpWorkManagerInitializerTest.kt) OR [LogUploadWorkManagerInitializerTest](https://github.com/oppia/oppia-android/blob/develop/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkManagerInitializerTest.kt)*
\ No newline at end of file
+Initializer Tests - *[PlatformParameterSyncUpWorkManagerInitializerTest](https://github.com/oppia/oppia-android/blob/develop/domain/src/test/java/org/oppia/android/domain/platformparameter/syncup/PlatformParameterSyncUpWorkManagerInitializerTest.kt) OR [LogUploadWorkManagerInitializerTest](https://github.com/oppia/oppia-android/blob/develop/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt)*
\ No newline at end of file

From e151bbd06b21d2b8211b4f56cde3cb4a6c2673c4 Mon Sep 17 00:00:00 2001
From: Sergei Shchurov <71126152+sichchurov@users.noreply.github.com>
Date: Fri, 20 Oct 2023 21:10:46 +0300
Subject: [PATCH 22/32] Fix part of #5195: RestrictedApi. Using a private API
 (#5198)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fix part of #5195: I have modified method setButtonTint to avoid an
error due to using a restricted API.
This method(bindingAdapter) is not set in any of the layouts. Only test
is written for it.
So it is safety to modify the test also. If not modify a test - it is
failed then.

**Lint report before**
<img
src="https://github.com/oppia/oppia-android/assets/71126152/fe9d691b-1bd0-45e9-9f14-7daa73839069"
width="70%" height="70%" alt="callingNewApiBefore">

**Lint report after**
<img
src="https://github.com/oppia/oppia-android/assets/71126152/5689d095-d4ed-4e60-b431-790037b240c3"
width="50%" height="50%" alt="callingNewApiBefore">


<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
---
 .../app/databinding/AppCompatCheckBoxBindingAdapters.java      | 3 ++-
 .../app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdapters.java
index b704faa86e2..4e7f59b0bb3 100644
--- a/app/src/main/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdapters.java
+++ b/app/src/main/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdapters.java
@@ -4,6 +4,7 @@
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.core.widget.CompoundButtonCompat;
 import androidx.databinding.BindingAdapter;
 
 /**
@@ -13,6 +14,6 @@ public final class AppCompatCheckBoxBindingAdapters {
   /** Sets the button tint for the specified checkbox, via data-binding. */
   @BindingAdapter("app:buttonTint")
   public static void setButtonTint(@NonNull AppCompatCheckBox checkBox, @ColorInt int colorRgb) {
-    checkBox.setSupportButtonTintList(ColorStateList.valueOf(colorRgb));
+    CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(colorRgb));
   }
 }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt
index 57586237166..9fcf2bd1e47 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt
@@ -127,7 +127,7 @@ class AppCompatCheckBoxBindingAdaptersTest {
     activityRule.scenario.onActivity {
       val appCompatCheckBox: AppCompatCheckBox = getAppCompatCheckBox(it)
       setButtonTint(appCompatCheckBox, colorRgb)
-      assertThat(appCompatCheckBox.supportButtonTintList?.defaultColor).isEqualTo(colorRgb)
+      assertThat(appCompatCheckBox.buttonTintList?.defaultColor).isEqualTo(colorRgb)
     }
   }
 

From d471d79e7bcce6de8351cf045458af23711fcdb2 Mon Sep 17 00:00:00 2001
From: Kenneth Murerwa <xwaxes@gmail.com>
Date: Tue, 24 Oct 2023 04:34:57 +0300
Subject: [PATCH 23/32] Fix part of #5025: App and OS Deprecation Milestone 3 -
 Add New Deprecation Dialog Fragments (#5096)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->
Fix part of #5025
When this PR is merged, it will;
- Add fragments and fragment presenters for the Forced, Optional, and OS
deprecation dialogs.
- Add strings for the new deprecation dialogs.

## Screenshots of the introduced dialog fragments

Forced Deprecation Dialog | Optional Deprecation Dialog | OS Deprecation
Dialog

:-------------------------:|:-------------------------:|:-------------------------:
![A screenshot of the forced deprecation
dialog](https://github.com/oppia/oppia-android/assets/18438114/33808235-7867-458b-aa99-bb1166511121)
| ![A screenshot of the optional deprecation
dialog](https://github.com/oppia/oppia-android/assets/18438114/84e0ffc1-f1ea-49e0-a997-1871aed0134f)
| ![A screenshot of the OS deprecation
dialog](https://github.com/oppia/oppia-android/assets/18438114/fe4fd5dc-5461-4d12-99d7-8eb3c9160aaf)


## Videos of the dialogs in action
### Forced Deprecation Dialog

https://github.com/oppia/oppia-android/assets/18438114/45e8319b-89dd-479a-a41d-5c458707ea50

### Optional Deprecation Dialog

https://github.com/oppia/oppia-android/assets/18438114/32343ff1-34be-4c53-bb64-a4624a15ea86

### OS Deprecation Dialog

https://github.com/oppia/oppia-android/assets/18438114/7d289d25-b7ba-4362-8c4f-a2f8a27f8e63


## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

---------

Co-authored-by: Kenneth Murerwa <kkmurerwa@Kenneths-MacBook-Air.local>
Co-authored-by: Ben Henning <ben@oppia.org>
---
 app/src/main/AndroidManifest.xml              |  12 +
 .../app/fragment/FragmentComponentImpl.kt     |  11 +-
 .../notice/DeprecationNoticeActionListener.kt |   9 +
 ...orcedAppDeprecationNoticeDialogFragment.kt |  29 ++
 ...eprecationNoticeDialogFragmentPresenter.kt |  47 +++
 ...ionalAppDeprecationNoticeDialogFragment.kt |  30 ++
 ...eprecationNoticeDialogFragmentPresenter.kt |  47 +++
 .../OsDeprecationNoticeDialogFragment.kt      |  33 +++
 ...eprecationNoticeDialogFragmentPresenter.kt |  42 +++
 .../android/app/notice/testing/BUILD.bazel    |  39 +++
 ...ecationNoticeDialogFragmentTestActivity.kt |  30 ++
 ...ecationNoticeDialogFragmentTestActivity.kt |  30 ++
 ...ecationNoticeDialogFragmentTestActivity.kt |  30 ++
 .../android/app/splash/SplashActivity.kt      |  16 +-
 .../app/splash/SplashActivityPresenter.kt     |  39 ++-
 app/src/main/res/values/strings.xml           |  45 ++-
 .../org/oppia/android/app/notice/BUILD.bazel  |  84 ++++++
 ...dAppDeprecationNoticeDialogFragmentTest.kt | 274 +++++++++++++++++
 ...lAppDeprecationNoticeDialogFragmentTest.kt | 276 ++++++++++++++++++
 .../OsDeprecationNoticeDialogFragmentTest.kt  | 258 ++++++++++++++++
 scripts/assets/test_file_exemptions.textproto |   7 +
 21 files changed, 1381 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/DeprecationNoticeActionListener.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragment.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentPresenter.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragment.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentPresenter.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragment.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentPresenter.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/testing/ForcedAppDeprecationNoticeDialogFragmentTestActivity.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/testing/OptionalAppDeprecationNoticeDialogFragmentTestActivity.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/notice/testing/OsDeprecationNoticeDialogFragmentTestActivity.kt
 create mode 100644 app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt
 create mode 100644 app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt
 create mode 100644 app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 897fc034879..c324a1a7119 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -92,6 +92,18 @@
       android:name=".app.notice.testing.GeneralAvailabilityUpgradeNoticeDialogFragmentTestActivity"
       android:label="@string/test_activity_label"
       android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.notice.testing.ForcedAppDeprecationNoticeDialogFragmentTestActivity"
+      android:label="@string/test_activity_label"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.notice.testing.OptionalAppDeprecationNoticeDialogFragmentTestActivity"
+      android:label="@string/test_activity_label"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.notice.testing.OsDeprecationNoticeDialogFragmentTestActivity"
+      android:label="@string/test_activity_label"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.onboarding.OnboardingActivity"
       android:label="@string/onboarding_activity_title"
diff --git a/app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt b/app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt
index d89e5b1297b..029d214a41a 100644
--- a/app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt
+++ b/app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt
@@ -31,7 +31,10 @@ import org.oppia.android.app.mydownloads.MyDownloadsFragment
 import org.oppia.android.app.mydownloads.UpdatesTabFragment
 import org.oppia.android.app.notice.AutomaticAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.BetaNoticeDialogFragment
+import org.oppia.android.app.notice.ForcedAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.GeneralAvailabilityUpgradeNoticeDialogFragment
+import org.oppia.android.app.notice.OptionalAppDeprecationNoticeDialogFragment
+import org.oppia.android.app.notice.OsDeprecationNoticeDialogFragment
 import org.oppia.android.app.onboarding.OnboardingFragment
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListFragment
 import org.oppia.android.app.options.AppLanguageFragment
@@ -113,7 +116,10 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(appVersionFragment: AppVersionFragment)
   fun inject(audioFragment: AudioFragment)
   fun inject(audioLanguageFragment: AudioLanguageFragment)
-  fun inject(autoAppDeprecationNoticeDialogFragment: AutomaticAppDeprecationNoticeDialogFragment)
+  fun inject(
+    automaticAppDeprecationNoticeDialogFragment:
+      AutomaticAppDeprecationNoticeDialogFragment
+  )
   fun inject(betaNoticeDialogFragment: BetaNoticeDialogFragment)
   fun inject(cellularAudioDialogFragment: CellularAudioDialogFragment)
   fun inject(completedStoryListFragment: CompletedStoryListFragment)
@@ -127,6 +133,7 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(explorationTestActivityTestFragment: ExplorationTestActivityPresenter.TestFragment)
   fun inject(faqListFragment: FAQListFragment)
   fun inject(forceNetworkTypeFragment: ForceNetworkTypeFragment)
+  fun inject(forcedAppDeprecationNoticeDialogFragment: ForcedAppDeprecationNoticeDialogFragment)
   fun inject(fragment: GeneralAvailabilityUpgradeNoticeDialogFragment)
   fun inject(helpFragment: HelpFragment)
   fun inject(hintsAndSolutionDialogFragment: HintsAndSolutionDialogFragment)
@@ -146,7 +153,9 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(navigationDrawerFragment: NavigationDrawerFragment)
   fun inject(onboardingFragment: OnboardingFragment)
   fun inject(ongoingTopicListFragment: OngoingTopicListFragment)
+  fun inject(optionalAppDeprecationNoticeDialogFragment: OptionalAppDeprecationNoticeDialogFragment)
   fun inject(optionFragment: OptionsFragment)
+  fun inject(osDeprecationNoticeDialogFragment: OsDeprecationNoticeDialogFragment)
   fun inject(policiesFragment: PoliciesFragment)
   fun inject(profileAndDeviceIdFragment: ProfileAndDeviceIdFragment)
   fun inject(profileChooserFragment: ProfileChooserFragment)
diff --git a/app/src/main/java/org/oppia/android/app/notice/DeprecationNoticeActionListener.kt b/app/src/main/java/org/oppia/android/app/notice/DeprecationNoticeActionListener.kt
new file mode 100644
index 00000000000..b9edef60fcc
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/DeprecationNoticeActionListener.kt
@@ -0,0 +1,9 @@
+package org.oppia.android.app.notice
+
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+
+/** Listener for when an option on any deprecation dialog is clicked. */
+interface DeprecationNoticeActionListener {
+  /** Called when a dialog button is clicked. */
+  fun onActionButtonClicked(noticeType: DeprecationNoticeActionType)
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragment.kt b/app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragment.kt
new file mode 100644
index 00000000000..887a3ef11fa
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragment.kt
@@ -0,0 +1,29 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import org.oppia.android.app.fragment.FragmentComponentImpl
+import org.oppia.android.app.fragment.InjectableDialogFragment
+import javax.inject.Inject
+
+/** Dialog fragment that informs the user of an app deprecation. */
+class ForcedAppDeprecationNoticeDialogFragment : InjectableDialogFragment() {
+  companion object {
+    /** Returns a new instance of [ForcedAppDeprecationNoticeDialogFragment]. */
+    fun newInstance(): ForcedAppDeprecationNoticeDialogFragment {
+      return ForcedAppDeprecationNoticeDialogFragment()
+    }
+  }
+
+  @Inject lateinit var presenter: ForcedAppDeprecationNoticeDialogFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return presenter.handleOnCreateDialog()
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentPresenter.kt
new file mode 100644
index 00000000000..265670fb3be
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentPresenter.kt
@@ -0,0 +1,47 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.R
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import javax.inject.Inject
+
+/** Presenter class responsible for showing an app deprecation dialog to the user. */
+class ForcedAppDeprecationNoticeDialogFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
+  private val resourceHandler: AppLanguageResourceHandler
+) {
+  private val deprecationNoticeActionListener by lazy {
+    activity as DeprecationNoticeActionListener
+  }
+
+  /** Handles dialog creation for the forced app deprecation notice. */
+  fun handleOnCreateDialog(): Dialog {
+    val appName = resourceHandler.getStringInLocale(R.string.app_name)
+
+    val dialog = AlertDialog.Builder(activity, R.style.DeprecationAlertDialogTheme)
+      .setTitle(R.string.forced_app_update_dialog_title)
+      .setMessage(
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.forced_app_update_dialog_message,
+          appName
+        )
+      )
+      .setPositiveButton(R.string.forced_app_update_dialog_update_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.UPDATE
+        )
+      }
+      .setNegativeButton(R.string.forced_app_update_dialog_close_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.CLOSE
+        )
+      }
+      .setCancelable(false)
+      .create()
+    dialog.setCanceledOnTouchOutside(false)
+    return dialog
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragment.kt b/app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragment.kt
new file mode 100644
index 00000000000..29eb21fd005
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragment.kt
@@ -0,0 +1,30 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import org.oppia.android.app.fragment.FragmentComponentImpl
+import org.oppia.android.app.fragment.InjectableDialogFragment
+import javax.inject.Inject
+
+/** Dialog fragment that informs the user that a new app version is available for download. */
+class OptionalAppDeprecationNoticeDialogFragment : InjectableDialogFragment() {
+  companion object {
+    /** Returns a new instance of [OptionalAppDeprecationNoticeDialogFragment]. */
+    fun newInstance(): OptionalAppDeprecationNoticeDialogFragment {
+      return OptionalAppDeprecationNoticeDialogFragment()
+    }
+  }
+
+  @Inject lateinit var optionalAppDeprecationNoticeDialogFragmentPresenter:
+    OptionalAppDeprecationNoticeDialogFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return optionalAppDeprecationNoticeDialogFragmentPresenter.handleOnCreateDialog()
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentPresenter.kt
new file mode 100644
index 00000000000..be4b938c522
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentPresenter.kt
@@ -0,0 +1,47 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.R
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import javax.inject.Inject
+
+/** Presenter class responsible for showing an optional update dialog to the user. */
+class OptionalAppDeprecationNoticeDialogFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
+  private val resourceHandler: AppLanguageResourceHandler
+) {
+  private val deprecationNoticeActionListener by lazy {
+    activity as DeprecationNoticeActionListener
+  }
+
+  /** Handles dialog creation for the optional app deprecation notice. */
+  fun handleOnCreateDialog(): Dialog {
+    val appName = resourceHandler.getStringInLocale(R.string.app_name)
+
+    val dialog = AlertDialog.Builder(activity, R.style.DeprecationAlertDialogTheme)
+      .setTitle(R.string.optional_app_update_dialog_title)
+      .setMessage(
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.optional_app_update_dialog_message,
+          appName
+        )
+      )
+      .setPositiveButton(R.string.optional_app_update_dialog_update_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.UPDATE
+        )
+      }
+      .setNegativeButton(R.string.optional_app_update_dialog_dismiss_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.DISMISS
+        )
+      }
+      .setCancelable(false)
+      .create()
+    dialog.setCanceledOnTouchOutside(false)
+    return dialog
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragment.kt b/app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragment.kt
new file mode 100644
index 00000000000..48e5fb59181
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragment.kt
@@ -0,0 +1,33 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import org.oppia.android.app.fragment.FragmentComponentImpl
+import org.oppia.android.app.fragment.InjectableDialogFragment
+import javax.inject.Inject
+
+/**
+ * Dialog fragment that informs the user that their phone OS is no longer supported by Oppia and
+ * they will no longer be able to update their app to the latest version.
+ */
+class OsDeprecationNoticeDialogFragment : InjectableDialogFragment() {
+  companion object {
+    /** Returns a new instance of [OsDeprecationNoticeDialogFragment]. */
+    fun newInstance(): OsDeprecationNoticeDialogFragment {
+      return OsDeprecationNoticeDialogFragment()
+    }
+  }
+
+  @Inject lateinit var osDeprecationNoticeDialogFragmentPresenter:
+    OsDeprecationNoticeDialogFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return osDeprecationNoticeDialogFragmentPresenter.handleOnCreateDialog()
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentPresenter.kt
new file mode 100644
index 00000000000..efcfc84ed20
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentPresenter.kt
@@ -0,0 +1,42 @@
+package org.oppia.android.app.notice
+
+import android.app.Dialog
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.R
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import javax.inject.Inject
+
+/** Presenter class responsible for showing an OS deprecation dialog to the user. */
+class OsDeprecationNoticeDialogFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
+  private val resourceHandler: AppLanguageResourceHandler
+) {
+  private val deprecationNoticeActionListener by lazy {
+    activity as DeprecationNoticeActionListener
+  }
+
+  /** Handles dialog creation for the OS deprecation notice. */
+  fun handleOnCreateDialog(): Dialog {
+    val appName = resourceHandler.getStringInLocale(R.string.app_name)
+
+    val dialog = AlertDialog.Builder(activity, R.style.DeprecationAlertDialogTheme)
+      .setTitle(R.string.os_deprecation_dialog_title)
+      .setMessage(
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.os_deprecation_dialog_message,
+          appName
+        )
+      )
+      .setNegativeButton(R.string.os_deprecation_dialog_dismiss_button_text) { _, _ ->
+        deprecationNoticeActionListener.onActionButtonClicked(
+          DeprecationNoticeActionType.DISMISS
+        )
+      }
+      .setCancelable(false)
+      .create()
+    dialog.setCanceledOnTouchOutside(false)
+    return dialog
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel b/app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel
index 92f1a0ae62b..00ba0065c2b 100644
--- a/app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel
+++ b/app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel
@@ -18,6 +18,19 @@ kt_android_library(
     ],
 )
 
+kt_android_library(
+    name = "forced_app_deprecation_notice_dialog_fragment_test_activity",
+    testonly = True,
+    srcs = [
+        "ForcedAppDeprecationNoticeDialogFragmentTestActivity.kt",
+    ],
+    visibility = ["//app:app_testing_visibility"],
+    deps = [
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
+    ],
+)
+
 kt_android_library(
     name = "general_availability_upgrade_notice_dialog_fragment_test_activity",
     testonly = True,
@@ -31,4 +44,30 @@ kt_android_library(
     ],
 )
 
+kt_android_library(
+    name = "optional_app_deprecation_notice_dialog_fragment_test_activity",
+    testonly = True,
+    srcs = [
+        "OptionalAppDeprecationNoticeDialogFragmentTestActivity.kt",
+    ],
+    visibility = ["//app:app_testing_visibility"],
+    deps = [
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
+    ],
+)
+
+kt_android_library(
+    name = "os_deprecation_notice_dialog_fragment_test_activity",
+    testonly = True,
+    srcs = [
+        "OsDeprecationNoticeDialogFragmentTestActivity.kt",
+    ],
+    visibility = ["//app:app_testing_visibility"],
+    deps = [
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
+    ],
+)
+
 dagger_rules()
diff --git a/app/src/main/java/org/oppia/android/app/notice/testing/ForcedAppDeprecationNoticeDialogFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/notice/testing/ForcedAppDeprecationNoticeDialogFragmentTestActivity.kt
new file mode 100644
index 00000000000..e6b223af14d
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/testing/ForcedAppDeprecationNoticeDialogFragmentTestActivity.kt
@@ -0,0 +1,30 @@
+package org.oppia.android.app.notice.testing
+
+import android.os.Bundle
+import org.oppia.android.app.notice.DeprecationNoticeActionListener
+import org.oppia.android.app.notice.ForcedAppDeprecationNoticeDialogFragment
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.testing.activity.TestActivity
+
+/** [TestActivity] for setting up a test environment for testing the beta notice dialog. */
+class ForcedAppDeprecationNoticeDialogFragmentTestActivity :
+  TestActivity(),
+  DeprecationNoticeActionListener {
+  /**
+   * [DeprecationNoticeActionListener] that must be initialized by the test, and is presumed to be a
+   * Mockito mock (though this is not, strictly speaking, required).
+   *
+   * This listener will be used as the callback for the dialog in response to UI operations.
+   */
+  lateinit var mockCallbackListener: DeprecationNoticeActionListener
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    ForcedAppDeprecationNoticeDialogFragment.newInstance()
+      .showNow(supportFragmentManager, "forced_app_deprecation_dialog")
+  }
+
+  override fun onActionButtonClicked(noticeType: DeprecationNoticeActionType) {
+    mockCallbackListener.onActionButtonClicked(noticeType)
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/testing/OptionalAppDeprecationNoticeDialogFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/notice/testing/OptionalAppDeprecationNoticeDialogFragmentTestActivity.kt
new file mode 100644
index 00000000000..d3ffd8b519e
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/testing/OptionalAppDeprecationNoticeDialogFragmentTestActivity.kt
@@ -0,0 +1,30 @@
+package org.oppia.android.app.notice.testing
+
+import android.os.Bundle
+import org.oppia.android.app.notice.DeprecationNoticeActionListener
+import org.oppia.android.app.notice.OptionalAppDeprecationNoticeDialogFragment
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.testing.activity.TestActivity
+
+/** [TestActivity] for setting up a test environment for testing the beta notice dialog. */
+class OptionalAppDeprecationNoticeDialogFragmentTestActivity :
+  TestActivity(),
+  DeprecationNoticeActionListener {
+  /**
+   * [DeprecationNoticeActionListener] that must be initialized by the test, and is presumed to be a
+   * Mockito mock (though this is not, strictly speaking, required).
+   *
+   * This listener will be used as the callback for the dialog in response to UI operations.
+   */
+  lateinit var mockCallbackListener: DeprecationNoticeActionListener
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    OptionalAppDeprecationNoticeDialogFragment.newInstance()
+      .showNow(supportFragmentManager, "optional_app_deprecation_dialog")
+  }
+
+  override fun onActionButtonClicked(noticeType: DeprecationNoticeActionType) {
+    mockCallbackListener.onActionButtonClicked(noticeType)
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/notice/testing/OsDeprecationNoticeDialogFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/notice/testing/OsDeprecationNoticeDialogFragmentTestActivity.kt
new file mode 100644
index 00000000000..13923f43fd8
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/notice/testing/OsDeprecationNoticeDialogFragmentTestActivity.kt
@@ -0,0 +1,30 @@
+package org.oppia.android.app.notice.testing
+
+import android.os.Bundle
+import org.oppia.android.app.notice.DeprecationNoticeActionListener
+import org.oppia.android.app.notice.OsDeprecationNoticeDialogFragment
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.testing.activity.TestActivity
+
+/** [TestActivity] for setting up a test environment for testing the beta notice dialog. */
+class OsDeprecationNoticeDialogFragmentTestActivity :
+  TestActivity(),
+  DeprecationNoticeActionListener {
+  /**
+   * [DeprecationNoticeActionListener] that must be initialized by the test, and is presumed to be a
+   * Mockito mock (though this is not, strictly speaking, required).
+   *
+   * This listener will be used as the callback for the dialog in response to UI operations.
+   */
+  lateinit var mockCallbackListener: DeprecationNoticeActionListener
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    OsDeprecationNoticeDialogFragment.newInstance()
+      .showNow(supportFragmentManager, "os_deprecation_dialog")
+  }
+
+  override fun onActionButtonClicked(noticeType: DeprecationNoticeActionType) {
+    mockCallbackListener.onActionButtonClicked(noticeType)
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt b/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt
index 1952e72ae3b..f9310821ddb 100644
--- a/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt
@@ -16,6 +16,16 @@ import org.oppia.android.app.notice.GeneralAvailabilityUpgradeNoticeClosedListen
 import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
 import javax.inject.Inject
 
+/** Enum class for the various deprecation notice actions available to the user. */
+enum class DeprecationNoticeActionType {
+  /** Action for when the user presses the 'Close' option on a deprecation dialog. */
+  CLOSE,
+  /** Action for when the user presses the 'Dismiss' option on a deprecation dialog. */
+  DISMISS,
+  /** Action for when the user presses the 'Update' option on a deprecation dialog. */
+  UPDATE
+}
+
 /**
  * An activity that shows a temporary loading page until the app is fully loaded then navigates to
  * the profile selection screen.
@@ -47,10 +57,12 @@ class SplashActivity :
 
   override fun createFragmentComponent(fragment: Fragment): FragmentComponent {
     val builderInjector = activityComponent as FragmentComponentBuilderInjector
-    return builderInjector.getFragmentComponentBuilderProvider().get().setFragment(fragment).build()
+    return builderInjector.getFragmentComponentBuilderProvider().get()
+      .setFragment(fragment).build()
   }
 
-  override fun onCloseAppButtonClicked() = splashActivityPresenter.handleOnCloseAppButtonClicked()
+  override fun onCloseAppButtonClicked() = splashActivityPresenter
+    .handleOnDeprecationNoticeCloseAppButtonClicked()
 
   override fun onBetaNoticeOkayButtonClicked(permanentlyDismiss: Boolean) =
     splashActivityPresenter.handleOnBetaNoticeOkayButtonClicked(permanentlyDismiss)
diff --git a/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt
index cfdf37874bf..dd926f56612 100644
--- a/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt
@@ -1,5 +1,8 @@
 package org.oppia.android.app.splash
 
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.DialogFragment
@@ -64,12 +67,46 @@ class SplashActivityPresenter @Inject constructor(
     subscribeToOnboardingFlow()
   }
 
-  fun handleOnCloseAppButtonClicked() {
+  /** Handles cases where the user clicks the close app option on a deprecation notice dialog. */
+  fun handleOnDeprecationNoticeCloseAppButtonClicked() {
     // If the app close button is clicked for the deprecation notice, finish the activity to close
     // the app.
     activity.finish()
   }
 
+  /** Handles cases where the user clicks the update option on a deprecation notice dialog. */
+  fun handleOnDeprecationNoticeUpdateButtonClicked() {
+    // If the Update button is clicked for the deprecation notice, launch the Play Store and open
+    // the Oppia app's page.
+    val packageName = activity.packageName
+
+    try {
+      activity.startActivity(
+        Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageName"))
+      )
+    } catch (e: ActivityNotFoundException) {
+      activity.startActivity(
+        Intent(
+          Intent.ACTION_VIEW,
+          Uri.parse(
+            "https://play.google.com/store/apps/details?id=$packageName"
+          )
+        )
+      )
+    }
+
+    // Finish splash activity to close the app in anticipation of an update.
+    activity.finish()
+  }
+
+  /** Handles cases where the user dismisses the deprecation notice dialog. */
+  fun handleOnDeprecationNoticeDialogDismissed() {
+    // If the Dismiss button is clicked for the deprecation notice, the dialog is automatically
+    // dismissed. Navigate to profile chooser activity.
+    activity.startActivity(ProfileChooserActivity.createProfileChooserActivity(activity))
+    activity.finish()
+  }
+
   /** Handles cases when the user dismisses the beta notice dialog. */
   fun handleOnBetaNoticeOkayButtonClicked(permanentlyDismiss: Boolean) {
     if (permanentlyDismiss) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79ec1534ff1..97547bc1638 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -472,9 +472,48 @@
   <string name="completed_story_list_recyclerview_tag">completed_story_list_recyclerview_tag</string>
   <string name="item_selection_text">Please select all correct choices.</string>
   <!-- SplashActivity -->
-  <string name="unsupported_app_version_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">Unsupported app version</string>
-  <string name="unsupported_app_version_dialog_message" description="The main message of the dialog shown when a user's pre-release app has expired.">This version of the app is no longer supported. Please update it through the Play Store.</string>
-  <string name="unsupported_app_version_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">Close app</string>
+  <string name="unsupported_app_version_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">
+    Unsupported app version
+  </string>
+  <string name="unsupported_app_version_dialog_message" description="The main message of the dialog shown when a user's pre-release app has expired.">
+    This version of the app is no longer supported. Please update it through the Play Store.
+  </string>
+  <string name="unsupported_app_version_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">
+    Close app
+  </string>
+  <string name="forced_app_update_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">
+    App update required
+  </string>
+  <string name="forced_app_update_dialog_message" description="The main message of the dialog shown when a user's app has expired.">
+    A new version of %s is now available. The new version is more secure, and improves your learning experience.\n\nThis version is no longer supported. To continue using the app, please update to the latest version.
+  </string>
+  <string name="forced_app_update_dialog_update_button_text" description="The update button text of the dialog shown when a user's pre-release app has expired.">
+    Update
+  </string>
+  <string name="forced_app_update_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">
+    Close app
+  </string>
+  <string name="optional_app_update_dialog_title" description="The title of the dialog shown when an optional app update is available.">
+    New update available
+  </string>
+  <string name="optional_app_update_dialog_message" description="The main message of the dialog shown when an optional app update is available.">
+    A new version of %s is now available. We recommend that you update the app for bug fixes and a better learning experience.
+  </string>
+  <string name="optional_app_update_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an optional app update is available.">
+    Dismiss
+  </string>
+  <string name="optional_app_update_dialog_update_button_text" description="The update button text of the dialog shown when an optional app update is available.">
+    Update
+  </string>
+  <string name="os_deprecation_dialog_title" description="The title of the dialog shown when an the OS the user is using is no longer supported.">
+    Update your Android OS
+  </string>
+  <string name="os_deprecation_dialog_message" description="The main message of the dialog shown when an the OS the user is using is no longer supported.">
+    We recommend updating your Android OS to take advantage of %s\'s new features and lessons.\n\nVisit your phone\'s Settings app to update your OS.
+  </string>
+  <string name="os_deprecation_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an the OS the user is using is no longer supported.">
+    Dismiss
+  </string>
   <string name="splash_screen_developer_label">Developer Build</string>
   <string name="splash_screen_alpha_label">Alpha</string>
   <string name="splash_screen_beta_label">Beta</string>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel
index 20d4828910e..d0733552b3b 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel
+++ b/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel
@@ -80,4 +80,88 @@ app_test(
     ],
 )
 
+app_test(
+    name = "ForcedAppDeprecationNoticeDialogFragmentTest",
+    processed_src = test_with_resources("ForcedAppDeprecationNoticeDialogFragmentTest.kt"),
+    test_class = "org.oppia.android.app.notice.ForcedAppDeprecationNoticeDialogFragmentTest",
+    deps = [
+        ":dagger",
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/application:application_component",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector_provider",
+        "//app/src/main/java/org/oppia/android/app/application:common_application_modules",
+        "//app/src/main/java/org/oppia/android/app/application/testing:testing_build_flavor_module",
+        "//app/src/main/java/org/oppia/android/app/notice/testing:forced_app_deprecation_notice_dialog_fragment_test_activity",
+        "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_espresso_espresso-core",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
+        "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module",
+        "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
+
+app_test(
+    name = "OptionalAppDeprecationNoticeDialogFragmentTest",
+    processed_src = test_with_resources("OptionalAppDeprecationNoticeDialogFragmentTest.kt"),
+    test_class = "org.oppia.android.app.notice.OptionalAppDeprecationNoticeDialogFragmentTest",
+    deps = [
+        ":dagger",
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/application:application_component",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector_provider",
+        "//app/src/main/java/org/oppia/android/app/application:common_application_modules",
+        "//app/src/main/java/org/oppia/android/app/application/testing:testing_build_flavor_module",
+        "//app/src/main/java/org/oppia/android/app/notice/testing:optional_app_deprecation_notice_dialog_fragment_test_activity",
+        "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_espresso_espresso-core",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
+        "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module",
+        "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
+
+app_test(
+    name = "OsDeprecationNoticeDialogFragmentTest",
+    processed_src = test_with_resources("OsDeprecationNoticeDialogFragmentTest.kt"),
+    test_class = "org.oppia.android.app.notice.OsDeprecationNoticeDialogFragmentTest",
+    deps = [
+        ":dagger",
+        "//app",
+        "//app/src/main/java/org/oppia/android/app/application:application_component",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector_provider",
+        "//app/src/main/java/org/oppia/android/app/application:common_application_modules",
+        "//app/src/main/java/org/oppia/android/app/application/testing:testing_build_flavor_module",
+        "//app/src/main/java/org/oppia/android/app/notice/testing:os_deprecation_notice_dialog_fragment_test_activity",
+        "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_espresso_espresso-core",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
+        "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module",
+        "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
+
 dagger_rules()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt
new file mode 100644
index 00000000000..d0b1aa4fc7e
--- /dev/null
+++ b/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt
@@ -0,0 +1,274 @@
+package org.oppia.android.app.notice
+
+import android.app.Application
+import android.content.Context
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import dagger.BindsInstance
+import dagger.Component
+import org.hamcrest.Matcher
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.verify
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import org.oppia.android.R
+import org.oppia.android.app.activity.ActivityComponent
+import org.oppia.android.app.activity.ActivityComponentFactory
+import org.oppia.android.app.activity.route.ActivityRouterModule
+import org.oppia.android.app.application.ApplicationComponent
+import org.oppia.android.app.application.ApplicationInjector
+import org.oppia.android.app.application.ApplicationInjectorProvider
+import org.oppia.android.app.application.ApplicationModule
+import org.oppia.android.app.application.ApplicationStartupListenerModule
+import org.oppia.android.app.application.testing.TestingBuildFlavorModule
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
+import org.oppia.android.app.notice.testing.ForcedAppDeprecationNoticeDialogFragmentTestActivity
+import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
+import org.oppia.android.app.shim.ViewBindingShimModule
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
+import org.oppia.android.data.backends.gae.NetworkConfigProdModule
+import org.oppia.android.data.backends.gae.NetworkModule
+import org.oppia.android.domain.classify.InteractionsModule
+import org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputModule
+import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule
+import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule
+import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule
+import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule
+import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule
+import org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputModule
+import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule
+import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule
+import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputModule
+import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
+import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
+import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.exploration.ExplorationProgressModule
+import org.oppia.android.domain.exploration.ExplorationStorageModule
+import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigFastShowTestModule
+import org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModule
+import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule
+import org.oppia.android.domain.oppialogger.LogStorageModule
+import org.oppia.android.domain.oppialogger.LoggingIdentifierModule
+import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
+import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModule
+import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule
+import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule
+import org.oppia.android.domain.platformparameter.PlatformParameterModule
+import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
+import org.oppia.android.domain.question.QuestionModule
+import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
+import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
+import org.oppia.android.testing.OppiaTestRule
+import org.oppia.android.testing.TestImageLoaderModule
+import org.oppia.android.testing.TestLogReportingModule
+import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
+import org.oppia.android.testing.robolectric.RobolectricModule
+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.caching.AssetModule
+import org.oppia.android.util.caching.testing.CachingTestModule
+import org.oppia.android.util.gcsresource.GcsResourceModule
+import org.oppia.android.util.locale.LocaleProdModule
+import org.oppia.android.util.logging.EventLoggingConfigurationModule
+import org.oppia.android.util.logging.LoggerModule
+import org.oppia.android.util.logging.SyncStatusModule
+import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
+import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule
+import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
+import org.oppia.android.util.parser.html.HtmlParserEntityTypeModule
+import org.oppia.android.util.parser.image.ImageParsingModule
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.LooperMode
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/** Tests for [ForcedAppDeprecationNoticeDialogFragment]. */
+// FunctionName: test names are conventionally named with underscores.
+@Suppress("FunctionName")
+@RunWith(AndroidJUnit4::class)
+@Config(
+  application = ForcedAppDeprecationNoticeDialogFragmentTest.TestApplication::class,
+  qualifiers = "port-xxhdpi"
+)
+@LooperMode(LooperMode.Mode.PAUSED)
+class ForcedAppDeprecationNoticeDialogFragmentTest {
+  @get:Rule
+  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+
+  @get:Rule
+  val oppiaTestRule = OppiaTestRule()
+
+  @field:[Rule JvmField] val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+  @Inject
+  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+
+  @Mock
+  lateinit var mockDeprecationNoticeActionListener: DeprecationNoticeActionListener
+
+  @Inject
+  lateinit var context: Context
+
+  @Before
+  fun setUp() {
+    setUpTestApplicationComponent()
+  }
+
+  @Test
+  fun testFragment_hasExpectedTitle() {
+    launchForcedAppDeprecationNoticeDialogFragmentTestActivity {
+      onDialogView(withText(R.string.forced_app_update_dialog_title)).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_hasExpectedContentMessageTextUnderTitle() {
+    launchForcedAppDeprecationNoticeDialogFragmentTestActivity {
+      val appName = context.resources.getString(R.string.app_name)
+      val expectedString = context.resources.getString(
+        R.string.forced_app_update_dialog_message,
+        appName
+      )
+      onDialogView(withText(expectedString)).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_hasUpdateButton() {
+    launchForcedAppDeprecationNoticeDialogFragmentTestActivity {
+      onDialogView(withText(R.string.forced_app_update_dialog_update_button_text))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_clickOnUpdateButton_callsCallbackListener_withUpdateDeprecationActionType() {
+    launchForcedAppDeprecationNoticeDialogFragmentTestActivity {
+      clickOnDialogView(withText(R.string.forced_app_update_dialog_update_button_text))
+
+      verify(mockDeprecationNoticeActionListener)
+        .onActionButtonClicked(DeprecationNoticeActionType.UPDATE)
+    }
+  }
+
+  @Test
+  fun testFragment_hasCloseAppButton() {
+    launchForcedAppDeprecationNoticeDialogFragmentTestActivity {
+      onDialogView(withText(R.string.forced_app_update_dialog_close_button_text))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_clockOnCloseAppButton_callsCallbackListener_withCloseDeprecationActionType() {
+    launchForcedAppDeprecationNoticeDialogFragmentTestActivity {
+      clickOnDialogView(withText(R.string.forced_app_update_dialog_close_button_text))
+
+      verify(mockDeprecationNoticeActionListener)
+        .onActionButtonClicked(DeprecationNoticeActionType.CLOSE)
+    }
+  }
+
+  private fun launchForcedAppDeprecationNoticeDialogFragmentTestActivity(
+    testBlock: () -> Unit
+  ) {
+    // Launch the test activity, but make sure that it's properly set up & time is given for it to
+    // initialize.
+    ActivityScenario.launch(
+      ForcedAppDeprecationNoticeDialogFragmentTestActivity::class.java
+    ).use { scenario ->
+      scenario.onActivity { it.mockCallbackListener = mockDeprecationNoticeActionListener }
+      testCoroutineDispatchers.runCurrent()
+      testBlock()
+    }
+  }
+
+  private fun clickOnDialogView(matcher: Matcher<View>) {
+    onDialogView(matcher).perform(ViewActions.click())
+    testCoroutineDispatchers.runCurrent()
+  }
+
+  private fun setUpTestApplicationComponent() {
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
+  }
+
+  private companion object {
+    private fun onDialogView(matcher: Matcher<View>) = onView(matcher).inRoot(isDialog())
+  }
+
+  @Singleton
+  @Component(
+    modules = [
+      RobolectricModule::class, PlatformParameterModule::class,
+      TestDispatcherModule::class, ApplicationModule::class, LoggerModule::class,
+      ContinueModule::class, FractionInputModule::class, ItemSelectionInputModule::class,
+      MultipleChoiceInputModule::class, NumberWithUnitsRuleModule::class,
+      NumericInputRuleModule::class, TextInputRuleModule::class, DragDropSortInputModule::class,
+      ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class,
+      TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class,
+      QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class,
+      LogStorageModule::class, PrimeTopicAssetsControllerModule::class,
+      ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class,
+      RatioInputModule::class, ApplicationStartupListenerModule::class,
+      HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class,
+      WorkManagerConfigurationModule::class, LogReportWorkerModule::class,
+      FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
+      DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
+      ExplorationStorageModule::class, NetworkConnectionUtilDebugModule::class,
+      NetworkConnectionDebugUtilModule::class, NetworkModule::class, NetworkConfigProdModule::class,
+      AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
+      PlatformParameterSingletonModule::class, NumericExpressionInputModule::class,
+      AlgebraicExpressionInputModule::class, MathEquationInputModule::class,
+      SplitScreenInteractionModule::class, LoggingIdentifierModule::class,
+      ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class,
+      CachingTestModule::class, MetricLogSchedulerModule::class,
+      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
+      CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class
+    ]
+  )
+
+  interface TestApplicationComponent : ApplicationComponent {
+    @Component.Builder
+    interface Builder {
+      @BindsInstance
+      fun setApplication(application: Application): Builder
+
+      fun build(): TestApplicationComponent
+    }
+
+    fun inject(test: ForcedAppDeprecationNoticeDialogFragmentTest)
+  }
+
+  class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
+    private val component: TestApplicationComponent by lazy {
+      DaggerForcedAppDeprecationNoticeDialogFragmentTest_TestApplicationComponent.builder()
+        .setApplication(this)
+        .build()
+    }
+
+    fun inject(test: ForcedAppDeprecationNoticeDialogFragmentTest) = component.inject(test)
+
+    override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent {
+      return component.getActivityComponentBuilderProvider().get().setActivity(activity).build()
+    }
+
+    override fun getApplicationInjector(): ApplicationInjector = component
+  }
+}
diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt
new file mode 100644
index 00000000000..c9545e4e324
--- /dev/null
+++ b/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt
@@ -0,0 +1,276 @@
+package org.oppia.android.app.notice
+
+import android.app.Application
+import android.content.Context
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import dagger.BindsInstance
+import dagger.Component
+import org.hamcrest.Matcher
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.verify
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import org.oppia.android.R
+import org.oppia.android.app.activity.ActivityComponent
+import org.oppia.android.app.activity.ActivityComponentFactory
+import org.oppia.android.app.activity.route.ActivityRouterModule
+import org.oppia.android.app.application.ApplicationComponent
+import org.oppia.android.app.application.ApplicationInjector
+import org.oppia.android.app.application.ApplicationInjectorProvider
+import org.oppia.android.app.application.ApplicationModule
+import org.oppia.android.app.application.ApplicationStartupListenerModule
+import org.oppia.android.app.application.testing.TestingBuildFlavorModule
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
+import org.oppia.android.app.notice.testing.OptionalAppDeprecationNoticeDialogFragmentTestActivity
+import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
+import org.oppia.android.app.shim.ViewBindingShimModule
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
+import org.oppia.android.data.backends.gae.NetworkConfigProdModule
+import org.oppia.android.data.backends.gae.NetworkModule
+import org.oppia.android.domain.classify.InteractionsModule
+import org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputModule
+import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule
+import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule
+import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule
+import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule
+import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule
+import org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputModule
+import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule
+import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule
+import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputModule
+import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
+import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
+import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.exploration.ExplorationProgressModule
+import org.oppia.android.domain.exploration.ExplorationStorageModule
+import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigFastShowTestModule
+import org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModule
+import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule
+import org.oppia.android.domain.oppialogger.LogStorageModule
+import org.oppia.android.domain.oppialogger.LoggingIdentifierModule
+import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
+import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModule
+import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule
+import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule
+import org.oppia.android.domain.platformparameter.PlatformParameterModule
+import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
+import org.oppia.android.domain.question.QuestionModule
+import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
+import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
+import org.oppia.android.testing.OppiaTestRule
+import org.oppia.android.testing.TestImageLoaderModule
+import org.oppia.android.testing.TestLogReportingModule
+import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
+import org.oppia.android.testing.robolectric.RobolectricModule
+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.caching.AssetModule
+import org.oppia.android.util.caching.testing.CachingTestModule
+import org.oppia.android.util.gcsresource.GcsResourceModule
+import org.oppia.android.util.locale.LocaleProdModule
+import org.oppia.android.util.logging.EventLoggingConfigurationModule
+import org.oppia.android.util.logging.LoggerModule
+import org.oppia.android.util.logging.SyncStatusModule
+import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
+import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule
+import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
+import org.oppia.android.util.parser.html.HtmlParserEntityTypeModule
+import org.oppia.android.util.parser.image.ImageParsingModule
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.LooperMode
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/** Tests for [ForcedAppDeprecationNoticeDialogFragment]. */
+// FunctionName: test names are conventionally named with underscores.
+@Suppress("FunctionName")
+@RunWith(AndroidJUnit4::class)
+@Config(
+  application = OptionalAppDeprecationNoticeDialogFragmentTest.TestApplication::class,
+  qualifiers = "port-xxhdpi"
+)
+@LooperMode(LooperMode.Mode.PAUSED)
+class OptionalAppDeprecationNoticeDialogFragmentTest {
+  @get:Rule
+  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+
+  @get:Rule
+  val oppiaTestRule = OppiaTestRule()
+
+  @field:[Rule JvmField] val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+  @Inject
+  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+
+  @Mock
+  lateinit var mockDeprecationNoticeActionListener: DeprecationNoticeActionListener
+
+  @Inject
+  lateinit var context: Context
+
+  @Before
+  fun setUp() {
+    setUpTestApplicationComponent()
+  }
+
+  @Test
+  fun testFragment_hasExpectedTitle() {
+    launchOptionalAppDeprecationNoticeDialogFragmentTestActivity {
+      onDialogView(withText(R.string.optional_app_update_dialog_title))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_hasExpectedContentMessageTextUnderTitle() {
+    launchOptionalAppDeprecationNoticeDialogFragmentTestActivity {
+      val appName = context.resources.getString(R.string.app_name)
+      val expectedString = context.resources.getString(
+        R.string.optional_app_update_dialog_message,
+        appName
+      )
+      onDialogView(withText(expectedString)).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_hasUpdateButton() {
+    launchOptionalAppDeprecationNoticeDialogFragmentTestActivity {
+      onDialogView(withText(R.string.optional_app_update_dialog_update_button_text))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_clickOnUpdateButton_callsCallbackListener_withUpdateDeprecationActionType() {
+    launchOptionalAppDeprecationNoticeDialogFragmentTestActivity {
+      clickOnDialogView(withText(R.string.optional_app_update_dialog_update_button_text))
+
+      verify(mockDeprecationNoticeActionListener)
+        .onActionButtonClicked(DeprecationNoticeActionType.UPDATE)
+    }
+  }
+
+  @Test
+  fun testFragment_hasDismissButton() {
+    launchOptionalAppDeprecationNoticeDialogFragmentTestActivity {
+      onDialogView(withText(R.string.optional_app_update_dialog_dismiss_button_text))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_clickOnDismissButton_callsCallbackListener_withDismissDeprecationActionType() {
+    launchOptionalAppDeprecationNoticeDialogFragmentTestActivity {
+      clickOnDialogView(withText(R.string.optional_app_update_dialog_dismiss_button_text))
+
+      verify(mockDeprecationNoticeActionListener)
+        .onActionButtonClicked(DeprecationNoticeActionType.DISMISS)
+    }
+  }
+
+  private fun launchOptionalAppDeprecationNoticeDialogFragmentTestActivity(
+    testBlock: () -> Unit
+  ) {
+    // Launch the test activity, but make sure that it's properly set up & time is given for it to
+    // initialize.
+    ActivityScenario.launch(
+      OptionalAppDeprecationNoticeDialogFragmentTestActivity::class.java
+    ).use { scenario ->
+      scenario.onActivity { it.mockCallbackListener = mockDeprecationNoticeActionListener }
+      testCoroutineDispatchers.runCurrent()
+      testBlock()
+    }
+  }
+
+  private fun clickOnDialogView(matcher: Matcher<View>) {
+    onDialogView(matcher).perform(ViewActions.click())
+    testCoroutineDispatchers.runCurrent()
+  }
+
+  private fun setUpTestApplicationComponent() {
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
+  }
+
+  private companion object {
+    private fun onDialogView(matcher: Matcher<View>) = Espresso.onView(matcher)
+      .inRoot(isDialog())
+  }
+
+  @Singleton
+  @Component(
+    modules = [
+      RobolectricModule::class, PlatformParameterModule::class,
+      TestDispatcherModule::class, ApplicationModule::class, LoggerModule::class,
+      ContinueModule::class, FractionInputModule::class, ItemSelectionInputModule::class,
+      MultipleChoiceInputModule::class, NumberWithUnitsRuleModule::class,
+      NumericInputRuleModule::class, TextInputRuleModule::class, DragDropSortInputModule::class,
+      ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class,
+      TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class,
+      QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class,
+      LogStorageModule::class, PrimeTopicAssetsControllerModule::class,
+      ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class,
+      RatioInputModule::class, ApplicationStartupListenerModule::class,
+      HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class,
+      WorkManagerConfigurationModule::class, LogReportWorkerModule::class,
+      FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
+      DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
+      ExplorationStorageModule::class, NetworkConnectionUtilDebugModule::class,
+      NetworkConnectionDebugUtilModule::class, NetworkModule::class, NetworkConfigProdModule::class,
+      AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
+      PlatformParameterSingletonModule::class, NumericExpressionInputModule::class,
+      AlgebraicExpressionInputModule::class, MathEquationInputModule::class,
+      SplitScreenInteractionModule::class, LoggingIdentifierModule::class,
+      ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class,
+      CachingTestModule::class, MetricLogSchedulerModule::class,
+      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
+      CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class
+    ]
+  )
+
+  interface TestApplicationComponent : ApplicationComponent {
+    @Component.Builder
+    interface Builder {
+      @BindsInstance
+      fun setApplication(application: Application): Builder
+
+      fun build(): TestApplicationComponent
+    }
+
+    fun inject(test: OptionalAppDeprecationNoticeDialogFragmentTest)
+  }
+
+  class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
+    private val component: TestApplicationComponent by lazy {
+      DaggerOptionalAppDeprecationNoticeDialogFragmentTest_TestApplicationComponent.builder()
+        .setApplication(this)
+        .build()
+    }
+
+    fun inject(test: OptionalAppDeprecationNoticeDialogFragmentTest) = component.inject(test)
+
+    override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent {
+      return component.getActivityComponentBuilderProvider().get().setActivity(activity).build()
+    }
+
+    override fun getApplicationInjector(): ApplicationInjector = component
+  }
+}
diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt
new file mode 100644
index 00000000000..becd031ecdb
--- /dev/null
+++ b/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt
@@ -0,0 +1,258 @@
+package org.oppia.android.app.notice
+
+import android.app.Application
+import android.content.Context
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import dagger.BindsInstance
+import dagger.Component
+import org.hamcrest.Matcher
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.verify
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import org.oppia.android.R
+import org.oppia.android.app.activity.ActivityComponent
+import org.oppia.android.app.activity.ActivityComponentFactory
+import org.oppia.android.app.activity.route.ActivityRouterModule
+import org.oppia.android.app.application.ApplicationComponent
+import org.oppia.android.app.application.ApplicationInjector
+import org.oppia.android.app.application.ApplicationInjectorProvider
+import org.oppia.android.app.application.ApplicationModule
+import org.oppia.android.app.application.ApplicationStartupListenerModule
+import org.oppia.android.app.application.testing.TestingBuildFlavorModule
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
+import org.oppia.android.app.notice.testing.OsDeprecationNoticeDialogFragmentTestActivity
+import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
+import org.oppia.android.app.shim.ViewBindingShimModule
+import org.oppia.android.app.splash.DeprecationNoticeActionType
+import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
+import org.oppia.android.data.backends.gae.NetworkConfigProdModule
+import org.oppia.android.data.backends.gae.NetworkModule
+import org.oppia.android.domain.classify.InteractionsModule
+import org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputModule
+import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule
+import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule
+import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule
+import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule
+import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule
+import org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputModule
+import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule
+import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule
+import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputModule
+import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
+import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
+import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.exploration.ExplorationProgressModule
+import org.oppia.android.domain.exploration.ExplorationStorageModule
+import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigFastShowTestModule
+import org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModule
+import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule
+import org.oppia.android.domain.oppialogger.LogStorageModule
+import org.oppia.android.domain.oppialogger.LoggingIdentifierModule
+import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
+import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModule
+import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule
+import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule
+import org.oppia.android.domain.platformparameter.PlatformParameterModule
+import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
+import org.oppia.android.domain.question.QuestionModule
+import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
+import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
+import org.oppia.android.testing.OppiaTestRule
+import org.oppia.android.testing.TestImageLoaderModule
+import org.oppia.android.testing.TestLogReportingModule
+import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
+import org.oppia.android.testing.robolectric.RobolectricModule
+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.caching.AssetModule
+import org.oppia.android.util.caching.testing.CachingTestModule
+import org.oppia.android.util.gcsresource.GcsResourceModule
+import org.oppia.android.util.locale.LocaleProdModule
+import org.oppia.android.util.logging.EventLoggingConfigurationModule
+import org.oppia.android.util.logging.LoggerModule
+import org.oppia.android.util.logging.SyncStatusModule
+import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
+import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule
+import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
+import org.oppia.android.util.parser.html.HtmlParserEntityTypeModule
+import org.oppia.android.util.parser.image.ImageParsingModule
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.LooperMode
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/** Tests for [ForcedAppDeprecationNoticeDialogFragment]. */
+// FunctionName: test names are conventionally named with underscores.
+@Suppress("FunctionName")
+@RunWith(AndroidJUnit4::class)
+@Config(
+  application = OsDeprecationNoticeDialogFragmentTest.TestApplication::class,
+  qualifiers = "port-xxhdpi"
+)
+@LooperMode(LooperMode.Mode.PAUSED)
+class OsDeprecationNoticeDialogFragmentTest {
+  @get:Rule
+  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+
+  @get:Rule
+  val oppiaTestRule = OppiaTestRule()
+
+  @field:[Rule JvmField] val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+  @Inject
+  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+
+  @Mock
+  lateinit var mockDeprecationNoticeActionListener: DeprecationNoticeActionListener
+
+  @Inject
+  lateinit var context: Context
+
+  @Before
+  fun setUp() {
+    setUpTestApplicationComponent()
+  }
+
+  @Test
+  fun testFragment_hasExpectedTitle() {
+    launchOsDeprecationNoticeDialogFragmentTestActivity {
+      onDialogView(withText(R.string.os_deprecation_dialog_title))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_hasExpectedContentMessageTextUnderTitle() {
+    launchOsDeprecationNoticeDialogFragmentTestActivity {
+      val appName = context.resources.getString(R.string.app_name)
+      val expectedString = context.resources.getString(
+        R.string.os_deprecation_dialog_message,
+        appName
+      )
+      onDialogView(withText(expectedString)).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_hasDismissButton() {
+    launchOsDeprecationNoticeDialogFragmentTestActivity {
+      onDialogView(withText(R.string.os_deprecation_dialog_dismiss_button_text))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_clickOnDismissButton_callsCallbackListener_withDismissDeprecationActionType() {
+    launchOsDeprecationNoticeDialogFragmentTestActivity {
+      clickOnDialogView(withText(R.string.os_deprecation_dialog_dismiss_button_text))
+
+      verify(mockDeprecationNoticeActionListener)
+        .onActionButtonClicked(DeprecationNoticeActionType.DISMISS)
+    }
+  }
+
+  private fun launchOsDeprecationNoticeDialogFragmentTestActivity(
+    testBlock: () -> Unit
+  ) {
+    // Launch the test activity, but make sure that it's properly set up & time is given for it to
+    // initialize.
+    ActivityScenario.launch(
+      OsDeprecationNoticeDialogFragmentTestActivity::class.java
+    ).use { scenario ->
+      scenario.onActivity { it.mockCallbackListener = mockDeprecationNoticeActionListener }
+      testCoroutineDispatchers.runCurrent()
+      testBlock()
+    }
+  }
+
+  private fun clickOnDialogView(matcher: Matcher<View>) {
+    onDialogView(matcher).perform(ViewActions.click())
+    testCoroutineDispatchers.runCurrent()
+  }
+
+  private fun setUpTestApplicationComponent() {
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
+  }
+
+  private companion object {
+    private fun onDialogView(matcher: Matcher<View>) = Espresso.onView(matcher)
+      .inRoot(isDialog())
+  }
+
+  @Singleton
+  @Component(
+    modules = [
+      RobolectricModule::class, PlatformParameterModule::class,
+      TestDispatcherModule::class, ApplicationModule::class, LoggerModule::class,
+      ContinueModule::class, FractionInputModule::class, ItemSelectionInputModule::class,
+      MultipleChoiceInputModule::class, NumberWithUnitsRuleModule::class,
+      NumericInputRuleModule::class, TextInputRuleModule::class, DragDropSortInputModule::class,
+      ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class,
+      TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class,
+      QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class,
+      LogStorageModule::class, PrimeTopicAssetsControllerModule::class,
+      ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class,
+      RatioInputModule::class, ApplicationStartupListenerModule::class,
+      HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class,
+      WorkManagerConfigurationModule::class, LogReportWorkerModule::class,
+      FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
+      DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
+      ExplorationStorageModule::class, NetworkConnectionUtilDebugModule::class,
+      NetworkConnectionDebugUtilModule::class, NetworkModule::class, NetworkConfigProdModule::class,
+      AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
+      PlatformParameterSingletonModule::class, NumericExpressionInputModule::class,
+      AlgebraicExpressionInputModule::class, MathEquationInputModule::class,
+      SplitScreenInteractionModule::class, LoggingIdentifierModule::class,
+      ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class,
+      CachingTestModule::class, MetricLogSchedulerModule::class,
+      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
+      CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class
+    ]
+  )
+
+  interface TestApplicationComponent : ApplicationComponent {
+    @Component.Builder
+    interface Builder {
+      @BindsInstance
+      fun setApplication(application: Application): Builder
+
+      fun build(): TestApplicationComponent
+    }
+
+    fun inject(test: OsDeprecationNoticeDialogFragmentTest)
+  }
+
+  class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
+    private val component: TestApplicationComponent by lazy {
+      DaggerOsDeprecationNoticeDialogFragmentTest_TestApplicationComponent.builder()
+        .setApplication(this)
+        .build()
+    }
+
+    fun inject(test: OsDeprecationNoticeDialogFragmentTest) = component.inject(test)
+
+    override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent {
+      return component.getActivityComponentBuilderProvider().get().setActivity(activity).build()
+    }
+
+    override fun getApplicationInjector(): ApplicationInjector = component
+  }
+}
diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto
index 699f8b9a9cd..382bd7c1efa 100644
--- a/scripts/assets/test_file_exemptions.textproto
+++ b/scripts/assets/test_file_exemptions.textproto
@@ -235,8 +235,15 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/mydownloads/MyDownl
 exempted_file_path: "app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsViewPagerAdapter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragment.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragmentPresenter.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/DeprecationNoticeActionListener.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentPresenter.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentPresenter.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/testing/BetaNoticeDialogFragmentTestActivity.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/testing/ForcedAppDeprecationNoticeDialogFragmentTestActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/testing/GeneralAvailabilityUpgradeNoticeDialogFragmentTestActivity.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/testing/OptionalAppDeprecationNoticeDialogFragmentTestActivity.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/testing/OsDeprecationNoticeDialogFragmentTestActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivityPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt"

From 1ecd033612568611901d160628fe487543de6805 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Thu, 26 Oct 2023 17:44:20 +0530
Subject: [PATCH 24/32] Localisation updates from https://translatewiki.net.
 (#5209)

Translation updates
---
 app/src/main/res/values-pcm-rNG/strings.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pcm-rNG/strings.xml b/app/src/main/res/values-pcm-rNG/strings.xml
index 26c2a9af024..85133c883a0 100644
--- a/app/src/main/res/values-pcm-rNG/strings.xml
+++ b/app/src/main/res/values-pcm-rNG/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
 * Busayo
+* Confidence
 * Osetiemoria
 -->
 <resources>
@@ -9,6 +10,7 @@
   <string name="menu_my_downloads">My Downloads</string>
   <string name="menu_help">Help</string>
   <string name="exploration_activity_title">Lesson Player</string>
+  <string name="play_exploration_button_text">play exploration</string>
   <string name="help_activity_title">Help</string>
   <string name="bottom_sheet_options_menu_close">Close</string>
   <string name="menu_switch_profile">Change Profile</string>
@@ -19,18 +21,19 @@
   <string name="audio_play_description">Play di audio</string>
   <string name="audio_pause_description">Pause di audio</string>
   <string name="audio_unavailable_in_selected_language">%s audio no dey available.</string>
-  <string name="audio_language_select_dialog_okay_button" fuzzy="true">OK</string>
+  <string name="audio_language_select_dialog_okay_button">OK</string>
   <string name="audio_language_select_dialog_cancel_button">Cancel am</string>
   <string name="audio_language_select_dialog_title">Audio Language</string>
   <string name="audio_dialog_offline_title">You dey offline</string>
   <string name="audio_dialog_offline_message">Make sure sey Wi-Fi or mobile data dey on, den try am again.</string>
-  <string name="audio_dialog_offline_positive" fuzzy="true">OK</string>
-  <string name="cellular_data_alert_dialog_okay_button" fuzzy="true">OK</string>
+  <string name="audio_dialog_offline_positive">OK</string>
+  <string name="cellular_data_alert_dialog_okay_button">OK</string>
   <string name="cellular_data_alert_dialog_cancel_button">Cancel am</string>
   <string name="cellular_data_alert_dialog_title">Na your data you dey use now</string>
   <string name="cellular_data_alert_dialog_description">Playing di audio go use plenti mobile data.</string>
   <string name="cellular_data_alert_dialog_checkbox">No show this message again</string>
   <string name="concept_card_toolbar_title">Concept Card</string>
+  <string name="concept_card_one_button_text">Concept Card 1</string>
   <string name="revision_card_toolbar_title">Revision Card</string>
   <string name="unsaved_exploration_dialog_title">Comot go the topic page?</string>
   <string name="unsaved_exploration_dialog_description">Wetin you don do before no go save</string>

From 5502682b9ffd21f000c21ba114ce8d8acaa94e3e Mon Sep 17 00:00:00 2001
From: Long Wei <Bontrey@gmail.com>
Date: Sat, 28 Oct 2023 10:54:20 +0200
Subject: [PATCH 25/32] Fixes #4708: Don't submit answer if it's invalid
 according to the input (#5205)

## Explanation
Fixes #4708: Don't submit answer if it's invalid according to the input
or else after submitting the recycler view will not restore items on
configuration change. See #4708 for more details

Video demo:

[before](https://drive.google.com/file/d/1bLgo-AYro0UbffR6X8nWo8Xv7oUuNJFa/view?usp=sharing)

[after](https://drive.google.com/file/d/1Oek7j6dgjJmgasyyd9FHtQo4E7zTvEBd/view?usp=sharing)

Continuation of PR #5202 since that one's no longer viable due to being
force pushed in a repo sync through GitHub UI.

## Essential Checklist
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [ ] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

Change unrelated to concerns like dark mode, RTL, accessibility. PR
#5202 had passing test checks for these changes, so that'll be my
demonstration of tests passing.

---------

Co-authored-by: Long Wei <longwei@google.com>
Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../app/player/state/StateFragmentPresenter.kt | 10 ++++++++--
 .../android/app/player/state/StateViewModel.kt |  4 ++--
 .../app/player/state/StateFragmentTest.kt      | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
index d13a5dca065..9aabc25f075 100755
--- a/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
@@ -202,7 +202,10 @@ class StateFragmentPresenter @Inject constructor(
 
   fun onSubmitButtonClicked() {
     hideKeyboard()
-    handleSubmitAnswer(viewModel.getPendingAnswer(recyclerViewAssembler::getPendingAnswerHandler))
+    val answer = viewModel.getPendingAnswer(recyclerViewAssembler::getPendingAnswerHandler)
+    if (answer != null) {
+      handleSubmitAnswer(answer)
+    }
   }
 
   fun onResponsesHeaderClicked() {
@@ -215,7 +218,10 @@ class StateFragmentPresenter @Inject constructor(
   fun handleKeyboardAction() {
     hideKeyboard()
     if (viewModel.getCanSubmitAnswer().get() == true) {
-      handleSubmitAnswer(viewModel.getPendingAnswer(recyclerViewAssembler::getPendingAnswerHandler))
+      val answer = viewModel.getPendingAnswer(recyclerViewAssembler::getPendingAnswerHandler)
+      if (answer != null) {
+        handleSubmitAnswer(answer)
+      }
     }
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
index 54109859994..82071abed1f 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
@@ -101,12 +101,12 @@ class StateViewModel @Inject constructor(
 
   fun getPendingAnswer(
     retrieveAnswerHandler: (List<StateItemViewModel>) -> InteractionAnswerHandler?
-  ): UserAnswer {
+  ): UserAnswer? {
     return getPendingAnswerWithoutError(
       retrieveAnswerHandler(
         getAnswerItemList()
       )
-    ) ?: UserAnswer.getDefaultInstance()
+    )
   }
 
   fun canQuicklyToggleBetweenSwahiliAndEnglish(
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
index d1d1fb3814c..02dfe4b1731 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
@@ -442,6 +442,24 @@ class StateFragmentTest {
     }
   }
 
+  @Test
+  @RunOn(TestPlatform.ESPRESSO) // Robolectric tests don't rotate like this to recreate activity
+  fun testStateFragment_loadExp_invalidAnswer_changeConfiguration_submitButtonIsDisplayed() {
+    setUpTestWithLanguageSwitchingFeatureOff()
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+      clickContinueInteractionButton()
+
+      typeFractionText("1/")
+
+      clickSubmitAnswerButton()
+
+      rotateToLandscape()
+
+      onView(withId(R.id.submit_answer_button)).check(matches(isDisplayed()))
+    }
+  }
+
   @Test
   fun testStateFragment_loadExp_secondState_invalidAnswer_updated_submitAnswerIsEnabled() {
     setUpTestWithLanguageSwitchingFeatureOff()

From 6ac4f9c8ccc60287a0d43c8dc822ff23823ebaa5 Mon Sep 17 00:00:00 2001
From: Sergei Shchurov <71126152+sichchurov@users.noreply.github.com>
Date: Sun, 29 Oct 2023 22:57:49 +0300
Subject: [PATCH 26/32] Fix part of #5195: using viewLifecycleOwner (#5207)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
#### Fix part of #5195: using viewLifecycleOwner.
It is not a good idea to use a fragment as a lifecycle owner when
subscribing to liveData objects. It would be correct to use
viewLifecycleOwner.

Lint report before:
<img
src="https://github.com/oppia/oppia-android/assets/71126152/ad482fd4-d3b0-46c7-b7de-febe7a48c07b"
width="70%" height="70%" />

Lint report after
<img
src="https://github.com/oppia/oppia-android/assets/71126152/fe7a26cf-1fcd-4cd5-ae3a-3cb7dcf2659c"
width="70%" height="70%" />

<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
---
 .../oppia/android/app/survey/SurveyFragmentPresenter.kt  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt
index 2d2b1ccca0f..88789ee130d 100644
--- a/app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt
@@ -175,11 +175,10 @@ class SurveyFragmentPresenter @Inject constructor(
 
   private fun subscribeToCurrentQuestion() {
     ephemeralQuestionLiveData.observe(
-      fragment,
-      {
-        processEphemeralQuestionResult(it)
-      }
-    )
+      fragment.viewLifecycleOwner
+    ) {
+      processEphemeralQuestionResult(it)
+    }
   }
 
   private fun processEphemeralQuestionResult(result: AsyncResult<EphemeralSurveyQuestion>) {

From 7272dc7e88f6c0c2ea737a7c23659e1f66acff08 Mon Sep 17 00:00:00 2001
From: Vishwajith Shettigar
 <76042077+Vishwajith-Shettigar@users.noreply.github.com>
Date: Tue, 31 Oct 2023 21:26:20 +0530
Subject: [PATCH 27/32] Fix #5032 Images in Arabic (RTL) lessons are
 right-aligned rather than center-aligned. (#5212)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fixes #5032, To make the image center-aligned, we are adding styling to
the HTML content image and removing the left margin by setting
drawableLeft bound to 0 in RTL.
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [ ] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only

### Before
LTR Potrait


![beforeLTRpotrait](https://github.com/oppia/oppia-android/assets/76042077/298fc2c0-7512-40dc-8d56-444fe55f4998)

LTR Landscape


![LTRlandscape](https://github.com/oppia/oppia-android/assets/76042077/94e16ccb-052c-4723-b26e-00fa0591270d)

RTL Potrait


![beforeRTLpotrait](https://github.com/oppia/oppia-android/assets/76042077/59efc1c5-c695-442a-9549-8aa353d61aed)

RTL Landscape


![RTLlandscape](https://github.com/oppia/oppia-android/assets/76042077/dae3c7b8-ce4e-4968-8dea-c4bc23eaf75f)



### After

RTL Potrait



![Potrait_after](https://github.com/oppia/oppia-android/assets/76042077/d5115f63-f71c-44fa-bb60-639e8f8abcef)

RTL Landscape


![landscapeafter](https://github.com/oppia/oppia-android/assets/76042077/9a37d6d1-dc80-489e-827c-8b208fa33d67)

LTR Potrait


![LTRpotraitafter](https://github.com/oppia/oppia-android/assets/76042077/4d51cf7c-68eb-4924-aaaa-64cb44391081)

LTR Landscape


![LTRLandscape](https://github.com/oppia/oppia-android/assets/76042077/802dcd37-5adb-4f5d-8a30-cfa110d76885)


<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
---
 .../org/oppia/android/util/parser/html/HtmlParser.kt | 12 +++++++++++-
 .../android/util/parser/image/UrlImageParser.kt      | 10 +++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/HtmlParser.kt b/utility/src/main/java/org/oppia/android/util/parser/html/HtmlParser.kt
index ca7b8c0b661..cb37742ff19 100755
--- a/utility/src/main/java/org/oppia/android/util/parser/html/HtmlParser.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/html/HtmlParser.kt
@@ -75,16 +75,26 @@ class HtmlParser private constructor(
     supportsLinks: Boolean = false,
     supportsConceptCards: Boolean = false
   ): Spannable {
+
+    var htmlContent = rawString
+
     // Canvas does not support RTL, it always starts from left to right in RTL due to which compound drawables are
     // not center aligned. To avoid this situation check if RTL is enabled and set the textDirection.
     if (isRtl) {
       htmlContentTextView.textDirection = View.TEXT_DIRECTION_RTL
+
+      val regex = Regex("""<oppia-noninteractive-image [^>]*>.*?</oppia-noninteractive-image>""")
+      val modifiedHtmlContent = rawString.replace(regex) {
+        val oppiaImageTag = it.value
+        """<div style="text-align: center;">$oppiaImageTag</div>"""
+      }
+      htmlContent = modifiedHtmlContent
     } else {
       htmlContentTextView.textDirection = View.TEXT_DIRECTION_LTR
     }
+
     htmlContentTextView.invalidate()
 
-    var htmlContent = rawString
     if ("\n\t" in htmlContent) {
       htmlContent = htmlContent.replace("\n\t", "")
     }
diff --git a/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt b/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
index b8dd69868a8..b18934a1897 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
@@ -15,6 +15,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.widget.TextView
+import androidx.core.view.ViewCompat
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
 import org.oppia.android.util.R
@@ -234,6 +235,11 @@ class UrlImageParser private constructor(
       private val autoResizeImage: Boolean
     ) : AutoAdjustingImageTarget<T, D>(targetConfiguration) {
 
+      private fun isRTLMode(): Boolean {
+        return ViewCompat.getLayoutDirection(htmlContentTextView) == ViewCompat
+          .LAYOUT_DIRECTION_RTL
+      }
+
       override fun computeBounds(
         context: Context,
         drawable: D,
@@ -304,11 +310,13 @@ class UrlImageParser private constructor(
             drawableWidth *= multipleFactor
           }
         }
-        val drawableLeft = if (imageCenterAlign) {
+
+        val drawableLeft = if (imageCenterAlign && !isRTLMode()) {
           calculateInitialMargin(maxAvailableWidth, drawableWidth)
         } else {
           0f
         }
+
         val drawableTop = 0f
         val drawableRight = drawableLeft + drawableWidth
         val drawableBottom = drawableTop + drawableHeight

From f496e0e8046066e1b395a5c3bbf8c8901a0406d4 Mon Sep 17 00:00:00 2001
From: Kenneth Murerwa <xwaxes@gmail.com>
Date: Tue, 31 Oct 2023 20:13:47 +0300
Subject: [PATCH 28/32] fix: Fix Translate Wiki Issues with Splash Activity
 Screen Strings (#5219)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->
When merged, this PR will:
- Remove white spaces and new lines that were added to Splash Activity
Screen strings by the [App/OS Deprecation Milestone 3
PR](https://github.com/oppia/oppia-android/pull/5096). This will allow
TranslateWiki to translate them. See related [comment on the
PR](https://github.com/oppia/oppia-android/commit/d471d79e7bcce6de8351cf045458af23711fcdb2#r130759117).

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 app/src/main/res/values/strings.xml | 56 ++++++++---------------------
 1 file changed, 14 insertions(+), 42 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 97547bc1638..9b924f81a97 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -472,48 +472,20 @@
   <string name="completed_story_list_recyclerview_tag">completed_story_list_recyclerview_tag</string>
   <string name="item_selection_text">Please select all correct choices.</string>
   <!-- SplashActivity -->
-  <string name="unsupported_app_version_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">
-    Unsupported app version
-  </string>
-  <string name="unsupported_app_version_dialog_message" description="The main message of the dialog shown when a user's pre-release app has expired.">
-    This version of the app is no longer supported. Please update it through the Play Store.
-  </string>
-  <string name="unsupported_app_version_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">
-    Close app
-  </string>
-  <string name="forced_app_update_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">
-    App update required
-  </string>
-  <string name="forced_app_update_dialog_message" description="The main message of the dialog shown when a user's app has expired.">
-    A new version of %s is now available. The new version is more secure, and improves your learning experience.\n\nThis version is no longer supported. To continue using the app, please update to the latest version.
-  </string>
-  <string name="forced_app_update_dialog_update_button_text" description="The update button text of the dialog shown when a user's pre-release app has expired.">
-    Update
-  </string>
-  <string name="forced_app_update_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">
-    Close app
-  </string>
-  <string name="optional_app_update_dialog_title" description="The title of the dialog shown when an optional app update is available.">
-    New update available
-  </string>
-  <string name="optional_app_update_dialog_message" description="The main message of the dialog shown when an optional app update is available.">
-    A new version of %s is now available. We recommend that you update the app for bug fixes and a better learning experience.
-  </string>
-  <string name="optional_app_update_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an optional app update is available.">
-    Dismiss
-  </string>
-  <string name="optional_app_update_dialog_update_button_text" description="The update button text of the dialog shown when an optional app update is available.">
-    Update
-  </string>
-  <string name="os_deprecation_dialog_title" description="The title of the dialog shown when an the OS the user is using is no longer supported.">
-    Update your Android OS
-  </string>
-  <string name="os_deprecation_dialog_message" description="The main message of the dialog shown when an the OS the user is using is no longer supported.">
-    We recommend updating your Android OS to take advantage of %s\'s new features and lessons.\n\nVisit your phone\'s Settings app to update your OS.
-  </string>
-  <string name="os_deprecation_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an the OS the user is using is no longer supported.">
-    Dismiss
-  </string>
+  <string name="unsupported_app_version_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">Unsupported app version</string>
+  <string name="unsupported_app_version_dialog_message" description="The main message of the dialog shown when a user's pre-release app has expired.">This version of the app is no longer supported. Please update it through the Play Store.</string>
+  <string name="unsupported_app_version_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">Close app</string>
+  <string name="forced_app_update_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">App update required</string>
+  <string name="forced_app_update_dialog_message" description="The main message of the dialog shown when a user's app has expired.">A new version of %s is now available. The new version is more secure, and improves your learning experience.\n\nThis version is no longer supported. To continue using the app, please update to the latest version.</string>
+  <string name="forced_app_update_dialog_update_button_text" description="The update button text of the dialog shown when a user's pre-release app has expired.">Update</string>
+  <string name="forced_app_update_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">Close app</string>
+  <string name="optional_app_update_dialog_title" description="The title of the dialog shown when an optional app update is available.">New update available</string>
+  <string name="optional_app_update_dialog_message" description="The main message of the dialog shown when an optional app update is available.">A new version of %s is now available. We recommend that you update the app for bug fixes and a better learning experience.</string>
+  <string name="optional_app_update_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an optional app update is available.">Dismiss</string>
+  <string name="optional_app_update_dialog_update_button_text" description="The update button text of the dialog shown when an optional app update is available.">Update</string>
+  <string name="os_deprecation_dialog_title" description="The title of the dialog shown when an the OS the user is using is no longer supported.">Update your Android OS</string>
+  <string name="os_deprecation_dialog_message" description="The main message of the dialog shown when an the OS the user is using is no longer supported.">We recommend updating your Android OS to take advantage of %s\'s new features and lessons.\n\nVisit your phone\'s Settings app to update your OS.</string>
+  <string name="os_deprecation_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an the OS the user is using is no longer supported.">Dismiss</string>
   <string name="splash_screen_developer_label">Developer Build</string>
   <string name="splash_screen_alpha_label">Alpha</string>
   <string name="splash_screen_beta_label">Beta</string>

From 094d4a344a54a50413a506f99613787195d29c8d Mon Sep 17 00:00:00 2001
From: MOHIT GUPTA <76530270+MohitGupta121@users.noreply.github.com>
Date: Wed, 1 Nov 2023 00:54:51 +0530
Subject: [PATCH 29/32] Fix #5214, Fix Part of #1723 : Fix onboarding issue
 faced by new contributors (#5210)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fix #5214 : Wiki link not redirect to correct destination (
good-first-issue link)
Fix Part of #1723 : Fix onboarding issue faced by new contributors.

1. Tell contributors firmly to use "Android Studio Bumblebee | 2021.1.1
Patch 3."
2. In the wiki, make sure to mention that you need to have JDK 11 to use
oppia-android.
3. Concentrate on using robolectric instead of espresso and provide
clear instructions for setting up tests.


<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [ ] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).
---
 wiki/Installing-Oppia-Android.md | 62 ++++++++++++++++++++++++--------
 wiki/Oppia-Android-Testing.md    | 27 ++++++++------
 2 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/wiki/Installing-Oppia-Android.md b/wiki/Installing-Oppia-Android.md
index 309a9f3b274..8e37749c5f6 100644
--- a/wiki/Installing-Oppia-Android.md
+++ b/wiki/Installing-Oppia-Android.md
@@ -8,13 +8,15 @@ This wiki page explains how to install Oppia Android on your local machine. If y
 - [Install oppia-android](#install-oppia-android)
 - [Run the app from Android Studio](#run-the-app-from-android-studio)
 - [Run the tests](#set-up-and-run-tests)
+  - [Step-by-Step guidance for setting up and running app modules robolectric test](#step-by-step-guidance-for-setting-up-and-running-app-modules-robolectric-test)
+  - [For tests that are in non-app modules, such as **domain** or **utility**:](#for-tests-that-are-in-non-app-modules-such-as-domain-or-utility)
 
 
 ## Prepare developer environment
 
-1. Download/Install [Android Studio](https://developer.android.com/studio/?gclid=EAIaIQobChMI8fX3n5Lb6AIVmH8rCh24JQsxEAAYASAAEgL4L_D_BwE&gclsrc=aw.ds#downloads). 
+1. Download/Install [Android Studio Bumblebee | Patch 3](https://developer.android.com/studio/archive). 
    
-   **Note**: We recommend installing **Android Studio Bumblebee** because newer versions of Android Studio[ do not support running tests where shared source sets are used](https://issuetracker.google.com/issues/232007221#comment18), a configuration we use at Oppia.
+   **Note**: We recommend installing **Android Studio Bumblebee | 2021.1.1 Patch 3** because newer versions of Android Studio[ do not support running tests where shared source sets are used](https://issuetracker.google.com/issues/232007221#comment18), a configuration we use at Oppia.
    
    **Direct download Url**: [Windows](https://redirector.gvt1.com/edgedl/android/studio/install/2021.1.1.23/android-studio-2021.1.1.23-windows.exe) | [Linux](https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2021.1.1.23/android-studio-2021.1.1.23-linux.tar.gz) | [Intel Mac](https://redirector.gvt1.com/edgedl/android/studio/install/2021.1.1.23/android-studio-2021.1.1.23-mac.dmg) | [Apple Silicon Mac](https://redirector.gvt1.com/edgedl/android/studio/install/2021.1.1.23/android-studio-2021.1.1.23-mac_arm.dmg)
 
@@ -22,10 +24,13 @@ This wiki page explains how to install Oppia Android on your local machine. If y
 
 2. Configure your Android Studio
    - In Android Studio, open Tools > SDK Manager.
-     - In the "SDK Platforms" tab (which is the default), select `API Level 28` and also `API Level 31` (for Bazel support).
+     - In the "SDK Platforms" tab (which is the default), select `API Level 28` and also `API Level 30` (for Bazel support).
      - Also, navigate to the "SDK Tools" tab, click the "Show Package Details" checkbox at the bottom right, then click on "Android SDK Build-Tools 34-rc1" and select 29.0.2 (this is needed for Bazel support).
 
    - Then, click "Apply" to download and install these two SDKs/Tools.
+   
+   - Must have **JDK 11** selected:
+     - In Android Studio, open Settings > Build, Execution, Deployment > Build Tools > Gradle and edit the Gradle JDK field.
 
 ## Install oppia-android
 
@@ -81,38 +86,65 @@ Please follow these steps to set up Oppia Android on your local machine.
 ## Set up and run tests
 Testing the app is an integral part of our development process. You will need to test all code changes to ensure that the app works correctly, therefore it is important to ensure that your test configuration works.
 
-We run tests in either Espresso(`app` module tests) or Robolectric(non-app module tests), meaning tests will run in either the emulator or on Gradle/Bazel via the terminal.
+We strongly recommend running tests on Robolectric which is faster because it does not require a physical device or emulator setup.
+
+### Configure Robolectric Tests
+
+#### Step-by-Step guidance for setting up and running app modules robolectric test:
+
+1. Go to **Edit Configuration** in Android Studio (Bumblebee | 2021.1.1 Patch 3)
+   ![](https://user-images.githubusercontent.com/9396084/79109714-83525980-7d96-11ea-99d7-f83ea81a8a50.png)
+
+2. Click on Add(+) -> **JUnit**
+   ![](https://github.com/oppia/oppia-android/assets/76530270/87caf3fc-37d9-472d-92fd-b8ec49fb6b49)
+
+3. Enter following information:
+   - a) Name of test. Example: In my case "SplashActivityTest"
+   - b) Make sure select "java 11" and oppia-android.app
+   - c) Class path of Test class. Example: In my case "org.oppia.android.app.splash.
+   SplashActivityTest"
+   - d) Press `OK` to select the test.
+   ![](https://github.com/oppia/oppia-android/assets/76530270/5901624a-df76-4b27-8f31-6077a68fcb89)
+
+4. Click on "Run" button to run robolectric test. (In my case "SplashActivityTest")
+   ![](https://github.com/oppia/oppia-android/assets/76530270/75a6b998-90c5-4f0a-8886-78f96970be90)
+
+#### For tests that are in non-app modules, such as **domain** or **utility**::
+
+1. In Android Studio, open the desired test file, e.g., `AnalyticsControllerTest`.
+2. In the test file, to the left of the class name, click on the orange and green arrow, and select **Run 'AnalyticsControllerTest'**.
+   - You will notice that the emulator is greyed out, but the run window will open to show the running tests:
+   ![](https://user-images.githubusercontent.com/59600948/272657015-158117e5-47d2-40fc-a38b-5dee6c347556.png)
 
 ### Configure Emulator Tests
+
+**Espresso is slower for running tests, so we recommend using Robolectric.**
+
 1. In Android Studio, open the desired test file, e.g., `HomeActivityTest`.
 2. In the Android Studio toolbar, click on the `Available Devices` option. Select an emulator that has between API 28-30.
 
    **Note**: If you don't have any available devices in this list, please follow [these instructions](#run-the-app-from-android-studio) to create one.
+
 3. In the test file, to the left of the class name, click on the orange and green arrow, and select **Run 'HomeActivityTest'**.
-![](https://user-images.githubusercontent.com/59600948/272657131-96e5354b-13a9-4709-969a-b9494a65c30f.png)
+   ![](https://user-images.githubusercontent.com/59600948/272657131-96e5354b-13a9-4709-969a-b9494a65c30f.png)
+
 4. An "**Edit Configuration**" dialog will show up, and you should add the following settings under the general tab:
    - For module, select **oppia-android.app**
    - For Test, select **Class**
    - For Instrumentation class, **org.oppia.android.testing.OppiaTestRunner**, will be selected by default.
    - For target, select the **Use the device/snapshot dropdown** option.
    - Verify that your setup looks like below:
-   -![](https://user-images.githubusercontent.com/59600948/272657260-2e654891-61be-467a-8ebd-c997aa2abda6.png)
+   
+     ![](https://user-images.githubusercontent.com/59600948/272657260-2e654891-61be-467a-8ebd-c997aa2abda6.png)
 - Finally, Click the "Apply" and "Okay" buttons.
 - You may need to repeat step (3) above to run the test with the new configuration.
 - Subsequent runs of any app module tests will not require editing the configuration.
 - This configuration will run all the tests in that class.
 5. To run only a specific test in a file:
    - Search or scroll down to the desired test name, to the left of the test name, click on the run icon and select **Run '`test name`''**.
-
-### Configure Robolectric Tests
-These are tests that are in non-app modules, such as **domain** or **utility**.
-1. In Android Studio, open the desired test file, e.g., `AnalyticsControllerTest`.
-2. In the test file, to the left of the class name, click on the orange and green arrow, and select **Run 'AnalyticsControllerTest'**.
-   - You will notice that the emulator is greyed out, but the run window will open to show the running tests:
-   - ![](https://user-images.githubusercontent.com/59600948/272657015-158117e5-47d2-40fc-a38b-5dee6c347556.png)
-
+   
 ### Next Steps
-- Congratulations, you are ready to work on your first issue! Take a look at our [good first issues](https://github.com/oppia/oppia-android/wiki/Oppia-Android-Testing) and leave a comment with your suggested fix. A maintainer will assign you the issue and provide any necessary guidance.
+- Congratulations, you are ready to work on your first issue! Take a look at our [good first issues](https://github.com/oppia/oppia-android/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+no%3Aassignee) and leave a comment with your suggested fix. A maintainer will assign you the issue and provide any necessary guidance.
 
 - When you are ready to submit a PR, please follow [these instructions](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR) on submitting a PR.
 
diff --git a/wiki/Oppia-Android-Testing.md b/wiki/Oppia-Android-Testing.md
index de1519730a7..757d83975bf 100644
--- a/wiki/Oppia-Android-Testing.md
+++ b/wiki/Oppia-Android-Testing.md
@@ -112,17 +112,22 @@ public class MyActivityTest {
 ```
 
 ### Running Robolectric tests
-1. Go to **Edit Configuration** in Android Studio
-<img width="425" alt="Screenshot 2020-04-13 at 2 51 02 PM" src="https://user-images.githubusercontent.com/9396084/79109714-83525980-7d96-11ea-99d7-f83ea81a8a50.png">
-
-2. Add **Android JUnit** 
-<img width="1070" alt="Screenshot 2020-04-13 at 2 51 31 PM" src="https://user-images.githubusercontent.com/9396084/79109717-851c1d00-7d96-11ea-92c1-2e8a9c6ef88f.png">
-
-3. Enter following information - (a.) **Name** (Normally class name) (b.)**Use classpath of module** (c.) **Class**
-<img width="1074" alt="Screenshot 2020-04-13 at 3 18 39 PM" src="https://user-images.githubusercontent.com/9396084/79111450-307aa100-7d9a-11ea-8b9d-81aac26e104d.png">
-
-
-4. Press `OK` to run the test cases in robolectric.
+1. Go to **Edit Configuration** in Android Studio (Bumblebee | 2021.1.1 Patch 3)
+   ![](https://user-images.githubusercontent.com/9396084/79109714-83525980-7d96-11ea-99d7-f83ea81a8a50.png)
+
+2. Click on Add(+) -> **JUnit**
+   ![](https://github.com/oppia/oppia-android/assets/76530270/87caf3fc-37d9-472d-92fd-b8ec49fb6b49)
+
+3. Enter following information:
+   - a) Name of test. Example: In my case "SplashActivityTest"
+   - b) Make sure select "java 11" and oppia-android.app [**Note:** For "app module test" select `oppia-android.app` similarly for "utility tests" select `oppia-android.utility`, for "domain test" select `oppia-android.domain`, for "model test" select `oppia-android.model`, for "testing" select `oppia-android.testing`]
+   - c) Class path of Test class. Example: In my case "org.oppia.android.app.splash.
+   SplashActivityTest"
+   - d) Press `OK` to select the test.
+   ![](https://github.com/oppia/oppia-android/assets/76530270/5901624a-df76-4b27-8f31-6077a68fcb89)
+
+4. Click on "Run" button to run robolectric test. (In my case "SplashActivityTest")
+   ![](https://github.com/oppia/oppia-android/assets/76530270/75a6b998-90c5-4f0a-8886-78f96970be90)
 
 ## Espresso
 

From 913cf5fba3ccce8e8befcd3684d612aed66a36a4 Mon Sep 17 00:00:00 2001
From: RD Rama Devi <122200035+Rd4dev@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:51:26 +0530
Subject: [PATCH 30/32] Fix #5204 - Inconsistent Layout Lint Warning (#5218)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->
Fix #5204 - [Part of #5169]

To address the lint warnings, two potential solutions were considered.
1. Initially, there was an option to include the missing IDs, ensuring
consistency across different layout configurations
[[**Link**](https://github.com/Rd4dev/oppia-android/commit/f8977e686fcbbf362aea4a8d1a472c487bafeb0f)].
However, it was observed that implementing this solution led to
functional disruptions within the current working application, as
confirmed through comprehensive testing procedures (refer to the
attached assets for a detailed overview).



https://github.com/oppia/oppia-android/assets/122200035/82172eaf-a555-4e76-b1ae-8f0db7ddb924



2. The second option was to suppress the lint warnings for the specific
views in the layout-sw600dp configuration files
[[**Link**](https://github.com/Rd4dev/oppia-android/commit/a0f5b1ed9100ecc0f578c6c4a38f4df6566724ec)]
to maintain the seamless functionality of the application . This was
achieved by incorporating the attribute
**`tools:ignore="InconsistentLayout"`** for relevant views, without
impacting the current operational stability of the application.




https://github.com/oppia/oppia-android/assets/122200035/93a65422-3526-4d76-873f-c08d24abc3ee



Taking the necessary action, I proceeded to implement the suppression of
lint warnings by submitting a pull request.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [ ] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../layout-sw600dp/administrator_controls_activity.xml   | 3 ++-
 app/src/main/res/layout-sw600dp/help_activity.xml        | 9 ++++++---
 app/src/main/res/layout-sw600dp/option_activity.xml      | 6 ++++--
 .../layout-sw600dp/options_without_drawer_activity.xml   | 7 +++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml b/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml
index c3602b0e946..9b778df86f3 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml
@@ -85,7 +85,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/administrator_controls_guideline"
-        app:layout_constraintTop_toBottomOf="@id/extra_controls_title" />
+        app:layout_constraintTop_toBottomOf="@id/extra_controls_title"
+        tools:ignore="InconsistentLayout" />
 
       <View
         android:id="@+id/administrator_controls_toolbar_shadow_view"
diff --git a/app/src/main/res/layout-sw600dp/help_activity.xml b/app/src/main/res/layout-sw600dp/help_activity.xml
index 03bb720fe6c..da08b27f68d 100644
--- a/app/src/main/res/layout-sw600dp/help_activity.xml
+++ b/app/src/main/res/layout-sw600dp/help_activity.xml
@@ -47,7 +47,8 @@
         android:visibility="gone"
         app:layout_constraintStart_toEndOf="@id/multipane_guideline"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_arrow_back_black_24_dp" />
+        app:srcCompat="@drawable/ic_arrow_back_black_24_dp"
+        tools:ignore="InconsistentLayout" />
 
       <TextView
         android:id="@+id/help_multipane_options_title_textview"
@@ -61,7 +62,8 @@
         android:textColor="@color/component_color_shared_primary_text_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/help_multipane_options_back_button"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="InconsistentLayout" />
 
       <FrameLayout
         android:id="@+id/multipane_options_container"
@@ -71,7 +73,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/multipane_guideline"
-        app:layout_constraintTop_toBottomOf="@id/help_multipane_options_title_textview" />
+        app:layout_constraintTop_toBottomOf="@id/help_multipane_options_title_textview"
+        tools:ignore="InconsistentLayout" />
 
       <androidx.constraintlayout.widget.Guideline
         android:id="@+id/multipane_guideline"
diff --git a/app/src/main/res/layout-sw600dp/option_activity.xml b/app/src/main/res/layout-sw600dp/option_activity.xml
index c00e25a3e01..e1c7205a067 100644
--- a/app/src/main/res/layout-sw600dp/option_activity.xml
+++ b/app/src/main/res/layout-sw600dp/option_activity.xml
@@ -45,7 +45,8 @@
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/multipane_guideline"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="InconsistentLayout" />
 
       <FrameLayout
         android:id="@+id/multipane_options_container"
@@ -55,7 +56,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/multipane_guideline"
-        app:layout_constraintTop_toBottomOf="@id/options_activity_selected_options_title" />
+        app:layout_constraintTop_toBottomOf="@id/options_activity_selected_options_title"
+        tools:ignore="InconsistentLayout" />
 
       <androidx.constraintlayout.widget.Guideline
         android:id="@+id/multipane_guideline"
diff --git a/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml b/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml
index c28d196ca3f..3f94428a4e9 100644
--- a/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml
+++ b/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml
@@ -1,5 +1,6 @@
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/options_activity_drawer_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -44,7 +45,8 @@
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/multipane_guideline"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="InconsistentLayout" />
 
       <FrameLayout
         android:id="@+id/multipane_options_container"
@@ -54,7 +56,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/multipane_guideline"
-        app:layout_constraintTop_toBottomOf="@id/options_activity_selected_options_title" />
+        app:layout_constraintTop_toBottomOf="@id/options_activity_selected_options_title"
+        tools:ignore="InconsistentLayout" />
 
       <androidx.constraintlayout.widget.Guideline
         android:id="@+id/multipane_guideline"

From 642a7786081e3aff1f64275e4b818ec7a998f5d0 Mon Sep 17 00:00:00 2001
From: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
Date: Tue, 14 Nov 2023 13:04:14 +0300
Subject: [PATCH 31/32] Fix #5112: Rendering Inline SVGs (#5208)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fixes #5112

We discovered that `mathImg_` dimesions are in **ex**, and not **px**,
and this unit is not natively rendered on android.

This PR introduces a method that will convert ex to px and use the
resulting dimesions to compute the rendering size of a math image to be
rendered inline. The formula is based on the [androidSvg
library](https://github.com/oppia/androidsvg/blob/5bc9c7553e94c3476e8ea32baea3c77567228fcd/androidsvg/src/main/java/com/caverock/androidsvg/androidrendering/SVGAndroidRenderer.java#L5018)
that is also based on CSS3 specs.

To preserve the size computation of block SVGs, we have created a
seperate method that handles the calculation of rendering dimensions for
inline SVGs.

We have only tested these changes through visual observation, and
confirming that the images scale correctly when reading text size is
changed.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
|Before|After|
|--|--|

|![IMG_0705](https://github.com/oppia/oppia-android/assets/99066793/62e00542-091c-48b1-9e63-aa1ca3c9abff)|![Screenshot_1698283405](https://github.com/oppia/oppia-android/assets/59600948/e1c534ee-b379-461c-bc39-7854fe57dc70)|

|![Screenshot_1698284125](https://github.com/oppia/oppia-android/assets/59600948/3f47014d-f4e3-4430-9e1e-d4b4609014e7)|![Screenshot_1698283411](https://github.com/oppia/oppia-android/assets/59600948/786445ec-0b75-41af-882b-ae93e2da9b4d)|

|![Screenshot_1697714168](https://github.com/oppia/oppia-android/assets/59600948/9fa8daeb-25ca-4b90-ac66-a6228c81f120)|![Screenshot_1698284519](https://github.com/oppia/oppia-android/assets/59600948/0b39d37d-1471-4ecf-8626-13a01ec35c3e)|

|![Screenshot_1697745323](https://github.com/oppia/oppia-android/assets/59600948/8152c286-8845-4f3b-8ecf-93acd03dbc3e)|![Screenshot_1698284666](https://github.com/oppia/oppia-android/assets/59600948/dbff75ba-bb08-4855-b49a-0e4d337c478b)|

|![Screenshot_1697714820](https://github.com/oppia/oppia-android/assets/59600948/65b7eadc-c8b0-4963-8dbf-d4cd19590e98)|![Screenshot_1698284933](https://github.com/oppia/oppia-android/assets/59600948/9b517dc5-fc75-43f8-b6af-a4e24b1cde28)|

Images scaled to Largest text and display size, and dark mode
||||
|--|--|--|

|![image](https://github.com/oppia/oppia-android/assets/59600948/cedd58b2-a16f-4ed7-9856-df9371242d3a)|![image](https://github.com/oppia/oppia-android/assets/59600948/acf79348-72cb-4732-b91a-1f934861d9f0)|![image](https://github.com/oppia/oppia-android/assets/59600948/fa07209d-fb54-4f21-a267-cc9bd7d26177)|

|![image](https://github.com/oppia/oppia-android/assets/59600948/241f8501-21ce-488f-be6e-a6f2b4bde198)|![image](https://github.com/oppia/oppia-android/assets/59600948/82d0a270-e486-4553-96ae-559ad7b784a2)|![image](https://github.com/oppia/oppia-android/assets/59600948/6080aff6-aff0-46ad-b30c-88e086aeeac7)|

---------

Co-authored-by: Ben Henning <ben@oppia.org>
---
 WORKSPACE                                     |  4 +-
 utility/build.gradle                          |  2 +-
 .../util/parser/svg/ScalableVectorGraphic.kt  | 60 +++++++++++++++----
 .../util/parser/svg/SvgPictureDrawable.kt     | 14 +++--
 4 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 0c20dcd36a1..231078d0d6e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -125,9 +125,9 @@ git_repository(
 # to correctly size in-line SVGs (such as those needed for LaTeX-based math expressions).
 git_repository(
     name = "androidsvg",
-    commit = "1265eb1087056cf3fc2e10442e5545bc65c109ce",
+    commit = "5bc9c7553e94c3476e8ea32baea3c77567228fcd",
     remote = "https://github.com/oppia/androidsvg",
-    shallow_since = "1686302944 -0700",
+    shallow_since = "1686304726 -0700",
 )
 
 git_repository(
diff --git a/utility/build.gradle b/utility/build.gradle
index 52164f42b34..5039f921dd3 100644
--- a/utility/build.gradle
+++ b/utility/build.gradle
@@ -82,7 +82,7 @@ dependencies {
       'androidx.appcompat:appcompat:1.0.2',
       'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03',
       'androidx.work:work-runtime-ktx:2.4.0',
-      'com.github.oppia:androidsvg:1265eb1087056cf3fc2e10442e5545bc65c109ce',
+      'com.github.oppia:androidsvg:5bc9c7553e94c3476e8ea32baea3c77567228fcd',
       'com.github.oppia:kotlitex:43139c140833c7120f351d63d74b42c253d2b213',
       'com.github.bumptech.glide:glide:4.11.0',
       'com.google.dagger:dagger:2.24',
diff --git a/utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt b/utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt
index 06dc224ad89..6692d90d875 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt
@@ -3,9 +3,9 @@ package org.oppia.android.util.parser.svg
 import android.graphics.Picture
 import android.graphics.RectF
 import android.text.TextPaint
-import com.caverock.androidsvg.RenderOptions
-import com.caverock.androidsvg.SVG
-import com.caverock.androidsvg.utils.RenderOptionsBase
+import com.caverock.androidsvg.androidrendering.RenderOptions
+import com.caverock.androidsvg.androidrendering.RenderOptionsBase
+import com.caverock.androidsvg.androidrendering.SVG
 import org.oppia.android.util.parser.image.ImageTransformation
 
 /**
@@ -39,18 +39,14 @@ class ScalableVectorGraphic {
   }
 
   /**
-   * Returns the [SvgSizeSpecs] corresponding to this SVG, based on the specified [textPaint]. If a
-   * [TextPaint] is supplied, the returns specs will include text-based adjustments (for in-line
-   * images). Otherwise, the returned specs will be arranged for rendering the SVG in a standalone
-   * manner.
+   * Returns the [SvgSizeSpecs] corresponding to this SVG.
+   *
+   * The returned specs will be arranged for rendering the SVG in a standalone manner.
    */
-  fun computeSizeSpecs(textPaint: TextPaint?): SvgSizeSpecs {
-    val options = RenderOptionsBase().also { if (textPaint != null) it.textPaint(textPaint) }
+  fun computeSizeSpecs(): SvgSizeSpecs {
+    val options = RenderOptionsBase()
     val documentWidth = parsedSvg.value.getDocumentWidthOrNull(options)
     val documentHeight = parsedSvg.value.getDocumentHeightOrNull(options)
-    val verticalAlignment = if (textPaint != null) {
-      adjustAlignmentForAndroid(parsedSvg.value.getVerticalAlignment(options))
-    } else 0f
 
     val viewBox: RectF? = parsedSvg.value.documentViewBox
     val viewBoxWidth = viewBox?.width()
@@ -75,16 +71,54 @@ class ScalableVectorGraphic {
       intrinsicHeight,
       renderedWidth = imageFileNameWidth ?: intrinsicWidth,
       renderedHeight = imageFileNameHeight ?: intrinsicHeight,
+      verticalAlignment = 0f
+    )
+  }
+
+  /**
+   * Returns the [SvgSizeSpecs] corresponding to this SVG, based on the specified [textPaint].
+   * Based on the supplied [TextPaint], the returned specs will include text-based adjustments
+   * (for in-line images).
+   */
+  fun computeSizeSpecsForTextPicture(textPaint: TextPaint?): SvgSizeSpecs {
+    val options = textPaint?.let { RenderOptionsBase().textPaint(it) } ?: RenderOptionsBase()
+    val documentWidth = parsedSvg.value.getDocumentWidthOrNull(options)
+    val documentHeight = parsedSvg.value.getDocumentHeightOrNull(options)
+
+    val imageFileNameWidth = extractedWidth?.toFloat()
+    val imageFileNameHeight = extractedHeight?.toFloat()
+
+    val fontMetrics = textPaint?.fontMetrics
+    val fontHeight = fontMetrics?.descent?.minus(fontMetrics.ascent) ?: 0f
+
+    val adjustedWidth =
+      imageFileNameWidth?.convertExToPx(fontHeight) ?: documentWidth ?: DEFAULT_SIZE_PX
+    val adjustedHeight =
+      imageFileNameHeight?.convertExToPx(fontHeight) ?: documentHeight ?: DEFAULT_SIZE_PX
+
+    val verticalAlignment = textPaint?.let {
+      adjustAlignmentForAndroid(parsedSvg.value.getVerticalAlignment(options))
+    } ?: 0f
+
+    return SvgSizeSpecs(
+      adjustedWidth,
+      adjustedHeight,
+      renderedWidth = adjustedWidth,
+      renderedHeight = adjustedHeight,
       verticalAlignment
     )
   }
 
+  private fun Float.convertExToPx(fontHeight: Float): Float {
+    return this * fontHeight * 0.5f
+  }
+
   /**
    * Returns an Android [Picture] including the draw instructions for rendering this SVG within a
    * line of text whose size and style is configured by the provided [textPaint].
    */
   fun renderToTextPicture(textPaint: TextPaint): Picture {
-    return computeSizeSpecs(textPaint).let { (width, height, _) ->
+    return computeSizeSpecsForTextPicture(textPaint).let { (width, height, _) ->
       val options =
         RenderOptions().textPaint(textPaint).viewPort(0f, 0f, width, height) as RenderOptions
       parsedSvg.value.renderToPicture(options)
diff --git a/utility/src/main/java/org/oppia/android/util/parser/svg/SvgPictureDrawable.kt b/utility/src/main/java/org/oppia/android/util/parser/svg/SvgPictureDrawable.kt
index 8178e745dca..2197ba013aa 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/svg/SvgPictureDrawable.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/svg/SvgPictureDrawable.kt
@@ -100,11 +100,17 @@ abstract class SvgPictureDrawable(
    * when [textPaint] is null and text rendering when otherwise.
    */
   protected fun reinitialize(textPaint: TextPaint?) {
-    picture = textPaint?.let {
-      scalableVectorGraphic.renderToTextPicture(it)
-    } ?: scalableVectorGraphic.renderToBlockPicture()
+    val newPicture = if (textPaint != null) {
+      intrinsicSize = scalableVectorGraphic.computeSizeSpecsForTextPicture(textPaint)
+      scalableVectorGraphic.renderToTextPicture(textPaint)
+    } else {
+      intrinsicSize = scalableVectorGraphic.computeSizeSpecs()
+      scalableVectorGraphic.renderToBlockPicture()
+    }
+
+    picture = newPicture
+
     // TODO(#4246): Fix both SVG rendering performance and upscaling to ensure images aren't blurry.
-    intrinsicSize = scalableVectorGraphic.computeSizeSpecs(textPaint)
     if (scalableVectorGraphic.shouldBeRenderedAsBitmap()) {
       recomputeBitmap()
     }

From 87c6fb2812caca3bb1fe54e2e35ee8434aadf23c Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Tue, 14 Nov 2023 22:43:45 +0530
Subject: [PATCH 32/32] Fix #3596: Adds Audio Loading UI (#5179)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

Fixes #3596

This PR adds an indeterminate progress bar when the audio is loading,
before it starts playing.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing


https://github.com/oppia/oppia-android/assets/84731134/5c6fe393-5d89-4bda-a144-57bdc42a9c57

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 app/src/main/res/layout/audio_fragment.xml    | 15 +++++++
 app/src/main/res/values/component_colors.xml  |  1 +
 app/src/main/res/values/dimens.xml            |  8 +++-
 .../exploration/ExplorationActivityTest.kt    | 39 ++++++++++++++++++-
 4 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/audio_fragment.xml b/app/src/main/res/layout/audio_fragment.xml
index d849e51c03c..20ca0081c0e 100755
--- a/app/src/main/res/layout/audio_fragment.xml
+++ b/app/src/main/res/layout/audio_fragment.xml
@@ -36,6 +36,20 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent">
 
+      <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/audio_fragment_voiceover_progressbar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="@{viewModel.playStatusLiveData == UiAudioPlayStatus.LOADING ? View.VISIBLE : View.GONE}"
+        app:indicatorColor="@color/component_color_audio_fragment_voiceover_progressbar_color"
+        app:indicatorSize="@dimen/audio_fragment_progress_indicator_size"
+        app:trackThickness="@dimen/audio_fragment_progress_indicator_track_thickness"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/play_pause_audio_icon"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
       <ImageView
         android:id="@+id/play_pause_audio_icon"
         android:layout_width="52dp"
@@ -44,6 +58,7 @@
         android:clickable="@{viewModel.playStatusLiveData != UiAudioPlayStatus.LOADING}"
         android:contentDescription="@{viewModel.playStatusLiveData == UiAudioPlayStatus.PLAYING ? @string/audio_pause_description : @string/audio_play_description}"
         android:onClick="@{(v) -> viewModel.togglePlayPause(viewModel.playStatusLiveData)}"
+        android:visibility="@{viewModel.playStatusLiveData != UiAudioPlayStatus.LOADING ? View.VISIBLE : View.INVISIBLE}"
         android:padding="12dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 9c312ee2ed0..35df91176ed 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -245,6 +245,7 @@
   <color name="component_color_concept_card_fragment_toolbar_color">@color/color_palette_concept_card_toolbar_color</color>
   <!-- Audio Fragment -->
   <color name="component_color_audio_fragment_background_color">@color/color_palette_audio_fragment_background_color</color>
+  <color name="component_color_audio_fragment_voiceover_progressbar_color">@color/color_palette_icon_background_secondary_color</color>
   <color name="component_color_audio_fragment_seekbar_progress_color">@color/color_palette_icon_background_secondary_color</color>
   <color name="component_color_audio_fragment_seekbar_color">@color/color_palette_seekbar_progress_background_color</color>
   <color name="component_color_audio_fragment_seekbar_thumb_shadow_color">@color/color_palette_seekbar_thumb_shadow_color</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4361dce5674..65e5ca43e22 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,8 +8,6 @@
   <dimen name="answer_tick_margin">12dp</dimen>
   <integer name="fade_in_duration_ms">1000</integer>
   <integer name="fade_out_duration_ms">1000</integer>
-  <dimen name="audio_fragment_corner_radius">8dp</dimen>
-  <dimen name="audio_fragment_margin">28dp</dimen>
   <dimen name="cellular_data_dialog_padding">24dp</dimen>
   <dimen name="state_previous_next_button_radius">4dp</dimen>
   <dimen name="train_checkbox_padding">18dp</dimen>
@@ -769,4 +767,10 @@
   <dimen name="resume_lesson_chapter_flexbox_margin_end">28dp</dimen>
   <dimen name="resume_lesson_chapter_flexbox_margin_top">32dp</dimen>
   <dimen name="resume_lesson_start_over_button_margin">8dp</dimen>
+
+  <!--  AudioFragment-->
+  <dimen name="audio_fragment_corner_radius">8dp</dimen>
+  <dimen name="audio_fragment_margin">28dp</dimen>
+  <dimen name="audio_fragment_progress_indicator_size">20dp</dimen>
+  <dimen name="audio_fragment_progress_indicator_track_thickness">3dp</dimen>
 </resources>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 27c75850e7d..165f250bde4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1071,7 +1071,7 @@ class ExplorationActivityTest {
       onView(withId(R.id.action_audio_player)).perform(click())
 
       testCoroutineDispatchers.runCurrent()
-      onView(withId(R.id.play_pause_audio_icon)).check(matches(isDisplayed()))
+      onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed()))
       onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
         .check(doesNotExist())
     }
@@ -1295,6 +1295,43 @@ class ExplorationActivityTest {
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
 
+  @Test
+  fun testExplorationActivity_loadingAudio_progressbarIsDisplayed() {
+    markAllSpotlightsSeen()
+    setUpAudio()
+    launch<ExplorationActivity>(
+      createExplorationActivityIntent(
+        internalProfileId,
+        RATIOS_TOPIC_ID,
+        RATIOS_STORY_ID_0,
+        RATIOS_EXPLORATION_ID_0,
+        shouldSavePartialProgress = false
+      )
+    ).use {
+      explorationDataController.startPlayingNewExploration(
+        internalProfileId,
+        RATIOS_TOPIC_ID,
+        RATIOS_STORY_ID_0,
+        RATIOS_EXPLORATION_ID_0
+      )
+      networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.action_audio_player)).perform(click())
+
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed()))
+      onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed()))
+
+      waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp))
+      onView(withId(R.id.play_pause_audio_icon)).check(
+        matches(
+          withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)
+        )
+      )
+    }
+    explorationDataController.stopPlayingExploration(isCompletion = false)
+  }
+
   // TODO(#89): Check this test case too. It works in pair with below test cases.
   @Test
   fun testExpActivity_showUnsavedExpDialog_cancel_dismissesDialog() {