Fixes #4586: Improve text scaling according to screen reader

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

@@ -27,8 +27,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/force_network_type_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -42,8 +42,7 @@
         </asia.ivity.android.marqueeview.MarqueeView>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-
-
+
     <FrameLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent">

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

@@ -33,6 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/component_color_mark_chapters_completed_primary_toolbar_color"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -33,6 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/component_color_mark_stories_completed_primary_toolbar_color"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -33,6 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/component_color_mark_topics_completed_primary_toolbar_color"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -30,8 +30,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/math_expression_parser_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -21,6 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/my_downloads_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance"

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

@@ -109,6 +109,7 @@
               android:layout_height="wrap_content"
               android:layout_marginTop="2dp"
               android:hint="@{viewModel.profile.isAdmin ? @string/input_pin_password_as_admin : @string/input_pin_password_as_user}"
+              app:errorMessage="@{viewModel.errorMessage}"
               android:minHeight="56dp"
               app:layout_constraintEnd_toStartOf="@id/show_pin"
               app:layout_constraintStart_toStartOf="parent"

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

@@ -19,6 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="@drawable/ic_arrow_back_white_24dp"

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

@@ -21,6 +21,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@color/oppia_primary"
+      android:minHeight="?attr/actionBarSize"
       android:textSize="20sp"
       app:navigationContentDescription="@string/navigate_up"
       app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -20,6 +20,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@color/oppia_primary"
+      android:minHeight="?attr/actionBarSize"
       android:textSize="20sp"
       app:navigationContentDescription="@string/navigate_up"
       app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -29,6 +29,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -98,6 +98,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
+          android:minWidth="60dp"
           android:text="@{Integer.toString(viewModel.ongoingTopicCount)}"
           android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
           android:textSize="24sp" />

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

@@ -32,7 +32,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:importantForAccessibility="no"
-        android:minWidth="280sp"
         app:entityId="@{viewModel.promotedStory.storyId}"
         app:entityType="@{viewModel.entityType}"
         app:layout_constraintDimensionRatio="H, 16:9"
@@ -42,7 +41,7 @@
         app:lessonThumbnail="@{viewModel.promotedStory.lessonThumbnail}" />
 
       <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/bottom_rounded_rect_white_background"
         android:orientation="vertical"

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

@@ -27,8 +27,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/view_event_logs_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"

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

@@ -541,9 +541,9 @@
   <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>
+  <dimen name="promoted_story_card_layout_width">280dp</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_width">280dp</dimen>
   <dimen name="promoted_story_card_text_size">16sp</dimen>
   <dimen name="promoted_story_card_margin_top">8dp</dimen>
 

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

@@ -410,14 +410,11 @@
   </style>
   <!-- Start Over Lesson Button -->
   <style name="StartOverLessonButton" parent="TextAppearance.AppCompat.Widget.Button">
-    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_width">144dp</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:paddingEnd">12dp</item>
     <item name="android:paddingStart">12dp</item>
-    <item name="android:paddingTop">8dp</item>
-    <item name="android:paddingBottom">8dp</item>
-    <item name="android:minWidth">48dp</item>
-    <item name="android:minHeight">@dimen/clickable_item_min_height</item>
+    <item name="android:minWidth">144dp</item>
     <item name="android:background">@drawable/start_over_button_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="drawableStartCompat">@drawable/ic_start_over_24dp</item>
@@ -429,14 +426,12 @@
   </style>
   <!-- Continue Lesson Button -->
   <style name="ContinueLessonButton" parent="TextAppearance.AppCompat.Widget.Button">
-    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_width">144dp</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:drawablePadding">4dp</item>
     <item name="android:paddingEnd">12dp</item>
     <item name="android:paddingStart">12dp</item>
-    <item name="android:paddingTop">8dp</item>
-    <item name="android:paddingBottom">8dp</item>
-    <item name="android:minWidth">48dp</item>
+    <item name="android:minWidth">144dp</item>
     <item name="android:background">@drawable/state_button_primary_background</item>
     <item name="drawableEndCompat">@drawable/ic_arrow_right_alt_24dp</item>
     <item name="drawableTint">@color/color_def_white</item>

app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt

@@ -904,26 +904,24 @@ class HomeActivityTest {
     )
     logIntoUserTwice()
     launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
-      it.onActivity { activity ->
-        testCoroutineDispatchers.runCurrent()
-        scrollToPosition(position = 1)
-        onView(
-          atPositionOnView(
-            recyclerViewId = R.id.home_recycler_view,
-            position = 0,
-            targetViewId = R.id.promoted_story_list_recycler_view
-          )
-        ).check { _, _ ->
-          val promotedStoryCard =
-            activity.findViewById<LessonThumbnailImageView>(R.id.lesson_thumbnail)
-          val pixels = promotedStoryCard?.width?.toFloat()
-          val expectedSize = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_SP,
-            280F,
-            context.resources.displayMetrics
-          )
-          assertThat(pixels).isEqualTo(expectedSize)
-        }
+      testCoroutineDispatchers.runCurrent()
+      scrollToPosition(position = 1)
+      onView(
+        atPositionOnView(
+          recyclerViewId = R.id.home_recycler_view,
+          position = 1,
+          targetViewId = R.id.promoted_story_list_recycler_view
+        )
+      ).check { view, _ ->
+        val promotedStoryCard =
+          view.findViewById<LessonThumbnailImageView>(R.id.lesson_thumbnail)
+        val promotedStoryCardWidth = promotedStoryCard?.width?.toFloat()
+        val expectedWidthInSP = TypedValue.applyDimension(
+          TypedValue.COMPLEX_UNIT_SP,
+          280F,
+          context.resources.displayMetrics
+        )
+        assertThat(promotedStoryCardWidth).isWithin(1e-5f).of(expectedWidthInSP)
       }
     }
   }