From a43e74350fbb6c644ae1789da5d8497417e6dd31 Mon Sep 17 00:00:00 2001
From: Veena <veena14cs@gmail.com>
Date: Fri, 13 Aug 2021 21:02:59 +0530
Subject: [PATCH] Fix #3665: [RTL] High-fi Remove textdirection attribute from
 all the TextViews and fix text alignment (#3666)

* Update selection_interaction_item.xml

* Update selection_interaction_item.xml

* Update return_to_topic_button_item.xml

* Update return_to_topic_button_item.xml

* removed textdirection

* fixed textview rtl

* added tablet portrait for topic summary and fixed rtl

* Fixed text alignment

* done formatting
---
 .../res/layout-land/promoted_story_card.xml   |  6 +-
 .../res/layout-land/topic_info_fragment.xml   | 24 ++---
 .../res/layout-land/topic_summary_view.xml    | 15 ++--
 .../promoted_story_card.xml                   |  6 +-
 .../topic_info_fragment.xml                   | 23 +++--
 .../topic_summary_view.xml                    | 14 +--
 .../promoted_story_card.xml                   |  6 +-
 .../topic_info_fragment.xml                   | 23 +++--
 .../topic_summary_view.xml                    | 90 +++++++++++++++++++
 .../main/res/layout/concept_card_fragment.xml |  6 +-
 .../main/res/layout/promoted_story_card.xml   |  6 +-
 .../main/res/layout/topic_info_fragment.xml   | 24 ++---
 .../main/res/layout/topic_summary_view.xml    | 15 ++--
 13 files changed, 173 insertions(+), 85 deletions(-)
 create mode 100644 app/src/main/res/layout-sw600dp-port/topic_summary_view.xml

diff --git a/app/src/main/res/layout-land/promoted_story_card.xml b/app/src/main/res/layout-land/promoted_story_card.xml
index d56c620016c..4b9951015cf 100755
--- a/app/src/main/res/layout-land/promoted_story_card.xml
+++ b/app/src/main/res/layout-land/promoted_story_card.xml
@@ -56,7 +56,7 @@
 
         <TextView
           android:id="@+id/chapter_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="8dp"
@@ -70,7 +70,7 @@
 
         <TextView
           android:id="@+id/story_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="4dp"
@@ -84,7 +84,7 @@
 
         <TextView
           android:id="@+id/topic_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="8dp"
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 bbcb9177e8d..2bece9d9539 100644
--- a/app/src/main/res/layout-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-land/topic_info_fragment.xml
@@ -26,7 +26,7 @@
 
       <TextView
         android:id="@+id/topic_name_text_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="72dp"
         android:layout_marginTop="8dp"
@@ -34,15 +34,15 @@
         android:fontFamily="sans-serif"
         android:text="@{viewModel.topic.name}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
       <TextView
         android:id="@+id/story_count_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="72dp"
         android:layout_marginTop="8dp"
@@ -50,34 +50,34 @@
         android:fontFamily="sans-serif"
         android:text="@{@plurals/story_count(viewModel.topic.storyCount, viewModel.topic.storyCount)}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topic_name_text_view" />
 
       <TextView
         android:id="@+id/topic_description_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="72dp"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="72dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif"
         android:gravity="start"
         android:maxLines="@{viewModel.isDescriptionExpanded() ? @integer/topic_description_expanded : @integer/topic_description_collapsed}"
+        android:paddingStart="72dp"
+        android:paddingEnd="72dp"
         android:text="@{viewModel.topicDescription}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/story_count_text_view" />
 
       <TextView
         android:id="@+id/see_more_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="72dp"
         android:layout_marginEnd="72dp"
@@ -88,11 +88,11 @@
         android:paddingTop="8dp"
         android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
         android:textColor="@color/colorPrimary"
-        android:textDirection="locale"
         android:textSize="16sp"
         android:textStyle="bold"
         android:visibility="@{viewModel.isSeeMoreVisible() ? View.VISIBLE : View.GONE}"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topic_description_text_view" />
 
@@ -118,9 +118,9 @@
         android:gravity="center_vertical"
         android:text="@string/topic_downloaded"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/download_status_image_view"
         app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />
 
@@ -133,10 +133,10 @@
         android:fontFamily="sans-serif"
         android:text="@{String.format(@string/topic_download_text, viewModel.topicSize)}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="18sp"
         android:textStyle="italic"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/download_story_count_text_view"
         app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/topic_summary_view.xml b/app/src/main/res/layout-land/topic_summary_view.xml
index 3972ba72c02..fde7469f3da 100755
--- a/app/src/main/res/layout-land/topic_summary_view.xml
+++ b/app/src/main/res/layout-land/topic_summary_view.xml
@@ -13,11 +13,11 @@
     android:id="@+id/topic_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:layoutMarginTop="@{@dimen/topic_list_item_margin_top_bottom}"
+    app:cardCornerRadius="4dp"
     app:layoutMarginBottom="@{@dimen/topic_list_item_margin_top_bottom}"
-    app:layoutMarginStart="@{viewModel.computeStartMargin()}"
     app:layoutMarginEnd="@{viewModel.computeEndMargin()}"
-    app:cardCornerRadius="4dp">
+    app:layoutMarginStart="@{viewModel.computeStartMargin()}"
+    app:layoutMarginTop="@{@dimen/topic_list_item_margin_top_bottom}">
 
     <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
@@ -51,26 +51,27 @@
 
         <TextView
           android:id="@+id/topic_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginStart="8dp"
           android:layout_marginTop="8dp"
-          android:layout_marginEnd="8dp"
           android:ellipsize="end"
           android:fontFamily="sans-serif"
           android:gravity="top"
           android:maxLines="2"
           android:minLines="2"
+          android:paddingStart="8dp"
+          android:paddingEnd="8dp"
           android:text="@{viewModel.name}"
           android:textColor="@color/white"
           android:textSize="14sp"
           android:textStyle="bold"
+          app:layout_constraintHorizontal_bias="0"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
           android:id="@+id/lesson_count_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="8dp"
           android:layout_marginTop="4dp"
diff --git a/app/src/main/res/layout-sw600dp-land/promoted_story_card.xml b/app/src/main/res/layout-sw600dp-land/promoted_story_card.xml
index 4f4f6775a62..f8ff4daf685 100644
--- a/app/src/main/res/layout-sw600dp-land/promoted_story_card.xml
+++ b/app/src/main/res/layout-sw600dp-land/promoted_story_card.xml
@@ -55,7 +55,7 @@
 
         <TextView
           android:id="@+id/chapter_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="8dp"
@@ -69,7 +69,7 @@
 
         <TextView
           android:id="@+id/story_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="4dp"
@@ -83,7 +83,7 @@
 
         <TextView
           android:id="@+id/topic_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="4dp"
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 ba1678055d2..29e245a6494 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
@@ -26,22 +26,22 @@
 
         <TextView
           android:id="@+id/topic_name_text_view"
-          android:layout_width="0dp"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="64dp"
           android:layout_marginEnd="64dp"
           android:fontFamily="sans-serif"
           android:text="@{viewModel.topic.name}"
           android:textColor="@color/oppiaPrimaryText"
-          android:textDirection="locale"
           android:textSize="24sp"
           app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintHorizontal_bias="0.0"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
           android:id="@+id/story_count_text_view"
-          android:layout_width="0dp"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="64dp"
           android:layout_marginTop="8dp"
@@ -49,26 +49,24 @@
           android:fontFamily="sans-serif"
           android:text="@{@plurals/story_count(viewModel.topic.storyCount, viewModel.topic.storyCount)}"
           android:textColor="@color/oppiaPrimaryText"
-          android:textDirection="locale"
           android:textSize="16sp"
           app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintHorizontal_bias="0.0"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@+id/topic_name_text_view" />
 
         <TextView
           android:id="@+id/topic_description_text_view"
-          android:layout_width="0dp"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginStart="64dp"
           android:layout_marginTop="16dp"
-          android:layout_marginEnd="64dp"
           android:ellipsize="end"
           android:fontFamily="sans-serif"
-          android:gravity="start"
           android:maxLines="@{viewModel.isDescriptionExpanded() ? @integer/topic_description_expanded : @integer/topic_description_collapsed}"
+          android:paddingStart="64dp"
+          android:paddingEnd="64dp"
           android:text="@{viewModel.topicDescription}"
           android:textColor="@color/oppiaPrimaryText"
-          android:textDirection="locale"
           android:textSize="16sp"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
@@ -76,7 +74,7 @@
 
         <TextView
           android:id="@+id/see_more_text_view"
-          android:layout_width="0dp"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="64dp"
           android:layout_marginEnd="64dp"
@@ -87,11 +85,11 @@
           android:paddingTop="8dp"
           android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
           android:textColor="@color/colorPrimary"
-          android:textDirection="locale"
           android:textSize="16sp"
           android:textStyle="bold"
           android:visibility="@{viewModel.isSeeMoreVisible() ? View.VISIBLE : View.GONE}"
           app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintHorizontal_bias="0.0"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@+id/topic_description_text_view" />
 
@@ -117,6 +115,7 @@
           android:textColor="@color/oppiaPrimaryText"
           android:textSize="18sp"
           app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
+          app:layout_constraintHorizontal_bias="0.0"
           app:layout_constraintStart_toEndOf="@+id/download_status_image_view"
           app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />
 
@@ -129,10 +128,10 @@
           android:fontFamily="sans-serif"
           android:text="@{String.format(@string/topic_download_text, viewModel.topicSize)}"
           android:textColor="@color/oppiaPrimaryText"
-          android:textDirection="locale"
           android:textSize="18sp"
           android:textStyle="italic"
           app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
+          app:layout_constraintHorizontal_bias="0.0"
           app:layout_constraintStart_toEndOf="@+id/download_story_count_text_view"
           app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />
       </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw600dp-land/topic_summary_view.xml b/app/src/main/res/layout-sw600dp-land/topic_summary_view.xml
index 9af2a3d0c3e..e65849af4ea 100644
--- a/app/src/main/res/layout-sw600dp-land/topic_summary_view.xml
+++ b/app/src/main/res/layout-sw600dp-land/topic_summary_view.xml
@@ -13,11 +13,11 @@
     android:id="@+id/topic_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:layoutMarginTop="@{@dimen/topic_list_item_margin_top_bottom}"
+    app:cardCornerRadius="4dp"
     app:layoutMarginBottom="@{@dimen/topic_list_item_margin_top_bottom}"
-    app:layoutMarginStart="@{viewModel.computeStartMargin()}"
     app:layoutMarginEnd="@{viewModel.computeEndMargin()}"
-    app:cardCornerRadius="4dp">
+    app:layoutMarginStart="@{viewModel.computeStartMargin()}"
+    app:layoutMarginTop="@{@dimen/topic_list_item_margin_top_bottom}">
 
     <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
@@ -52,16 +52,16 @@
 
         <TextView
           android:id="@+id/topic_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginStart="8dp"
           android:layout_marginTop="8dp"
-          android:layout_marginEnd="8dp"
           android:ellipsize="end"
           android:fontFamily="sans-serif"
           android:gravity="top"
           android:maxLines="2"
           android:minLines="2"
+          android:paddingStart="8dp"
+          android:paddingEnd="8dp"
           android:text="@{viewModel.name}"
           android:textColor="@color/white"
           android:textSize="14sp"
@@ -71,7 +71,7 @@
 
         <TextView
           android:id="@+id/lesson_count_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="8dp"
           android:layout_marginTop="4dp"
diff --git a/app/src/main/res/layout-sw600dp-port/promoted_story_card.xml b/app/src/main/res/layout-sw600dp-port/promoted_story_card.xml
index 8163277eddc..34780cdd4a4 100644
--- a/app/src/main/res/layout-sw600dp-port/promoted_story_card.xml
+++ b/app/src/main/res/layout-sw600dp-port/promoted_story_card.xml
@@ -55,7 +55,7 @@
 
         <TextView
           android:id="@+id/chapter_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="8dp"
@@ -69,7 +69,7 @@
 
         <TextView
           android:id="@+id/story_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="4dp"
@@ -83,7 +83,7 @@
 
         <TextView
           android:id="@+id/topic_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="4dp"
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 40246529878..c5ffe85d3a2 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
@@ -44,7 +44,7 @@
 
       <TextView
         android:id="@+id/topic_name_text_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="120dp"
         android:layout_marginTop="12dp"
@@ -52,15 +52,15 @@
         android:fontFamily="sans-serif"
         android:text="@{viewModel.topic.name}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="24sp"
         app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent" />
 
       <TextView
         android:id="@+id/story_count_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="120dp"
         android:layout_marginTop="8dp"
@@ -68,26 +68,24 @@
         android:fontFamily="sans-serif"
         android:text="@{@plurals/story_count(viewModel.topic.storyCount, viewModel.topic.storyCount)}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topic_name_text_view" />
 
       <TextView
         android:id="@+id/topic_description_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="120dp"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="120dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif"
-        android:gravity="start"
         android:maxLines="@{viewModel.isDescriptionExpanded() ? @integer/topic_description_expanded : @integer/topic_description_collapsed}"
+        android:paddingStart="120dp"
+        android:paddingEnd="120dp"
         android:text="@{viewModel.topicDescription}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -95,7 +93,7 @@
 
       <TextView
         android:id="@+id/see_more_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="120dp"
         android:layout_marginEnd="120dp"
@@ -106,11 +104,11 @@
         android:paddingTop="8dp"
         android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
         android:textColor="@color/colorPrimary"
-        android:textDirection="locale"
         android:textSize="16sp"
         android:textStyle="bold"
         android:visibility="@{viewModel.isSeeMoreVisible() ? View.VISIBLE : View.GONE}"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topic_description_text_view" />
 
@@ -132,9 +130,9 @@
         android:fontFamily="sans-serif"
         android:text="@string/topic_downloaded"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/download_status_image_view"
         app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />
 
@@ -150,6 +148,7 @@
         android:textSize="18sp"
         android:textStyle="italic"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/download_story_count_text_view"
         app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw600dp-port/topic_summary_view.xml b/app/src/main/res/layout-sw600dp-port/topic_summary_view.xml
new file mode 100644
index 00000000000..fde7469f3da
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-port/topic_summary_view.xml
@@ -0,0 +1,90 @@
+<?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>
+
+    <variable
+      name="viewModel"
+      type="org.oppia.android.app.home.topiclist.TopicSummaryViewModel" />
+  </data>
+
+  <com.google.android.material.card.MaterialCardView
+    android:id="@+id/topic_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="4dp"
+    app:layoutMarginBottom="@{@dimen/topic_list_item_margin_top_bottom}"
+    app:layoutMarginEnd="@{viewModel.computeEndMargin()}"
+    app:layoutMarginStart="@{viewModel.computeStartMargin()}"
+    app:layoutMarginTop="@{@dimen/topic_list_item_margin_top_bottom}">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:clickable="true"
+      android:focusable="true"
+      android:onClick="@{(v) -> viewModel.clickOnSummaryTile()}">
+
+      <org.oppia.android.app.customview.LessonThumbnailImageView
+        android:id="@+id/topic_thumbnail_image_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:importantForAccessibility="no"
+        app:entityId="@{viewModel.topicSummary.topicId}"
+        app:entityType="@{viewModel.entityType}"
+        app:layout_constraintDimensionRatio="4:3"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:lessonThumbnail="@{viewModel.topicSummary.topicThumbnail}" />
+
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/topicTitleBackground"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/topic_thumbnail_image_view">
+
+        <TextView
+          android:id="@+id/topic_name_text_view"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="8dp"
+          android:ellipsize="end"
+          android:fontFamily="sans-serif"
+          android:gravity="top"
+          android:maxLines="2"
+          android:minLines="2"
+          android:paddingStart="8dp"
+          android:paddingEnd="8dp"
+          android:text="@{viewModel.name}"
+          android:textColor="@color/white"
+          android:textSize="14sp"
+          android:textStyle="bold"
+          app:layout_constraintHorizontal_bias="0"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+          android:id="@+id/lesson_count_text_view"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="8dp"
+          android:layout_marginTop="4dp"
+          android:layout_marginEnd="8dp"
+          android:fontFamily="sans-serif-light"
+          android:paddingBottom="8dp"
+          android:text="@{@plurals/lesson_count(viewModel.totalChapterCount, viewModel.totalChapterCount)}"
+          android:textColor="@color/white_80"
+          android:textSize="14sp"
+          android:textStyle="italic"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@+id/topic_name_text_view" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+  </com.google.android.material.card.MaterialCardView>
+</layout>
diff --git a/app/src/main/res/layout/concept_card_fragment.xml b/app/src/main/res/layout/concept_card_fragment.xml
index 5776bad901f..1d0ec5619ff 100644
--- a/app/src/main/res/layout/concept_card_fragment.xml
+++ b/app/src/main/res/layout/concept_card_fragment.xml
@@ -49,7 +49,7 @@
 
           <TextView
             android:id="@+id/concept_card_heading_text"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/concept_card_heading_text_margin_start"
             android:layout_marginTop="@dimen/concept_card_heading_text_margin_top"
@@ -57,19 +57,17 @@
             android:fontFamily="sans-serif-medium"
             android:text="@{viewModel.conceptCardLiveData.skillDescription}"
             android:textColor="@color/oppiaPrimaryText"
-            android:textDirection="locale"
             android:textSize="20sp" />
 
           <TextView
             android:id="@+id/concept_card_explanation_text"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/concept_card_explanation_text_margin_start"
             android:layout_marginTop="@dimen/concept_card_explanation_text_margin_top"
             android:layout_marginEnd="@dimen/concept_card_explanation_text_margin_end"
             android:fontFamily="sans-serif"
             android:textColor="@color/oppiaPrimaryText"
-            android:textDirection="locale"
             android:textSize="16sp" />
         </LinearLayout>
         <!--TODO(#352): Show worked examples in Concept Card.-->
diff --git a/app/src/main/res/layout/promoted_story_card.xml b/app/src/main/res/layout/promoted_story_card.xml
index 7a9f4180c1c..b0d418b0917 100755
--- a/app/src/main/res/layout/promoted_story_card.xml
+++ b/app/src/main/res/layout/promoted_story_card.xml
@@ -56,7 +56,7 @@
 
         <TextView
           android:id="@+id/chapter_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="8dp"
@@ -70,7 +70,7 @@
 
         <TextView
           android:id="@+id/story_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="4dp"
@@ -84,7 +84,7 @@
 
         <TextView
           android:id="@+id/topic_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
           android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml
index 0d52995d43a..b01eed3fadc 100644
--- a/app/src/main/res/layout/topic_info_fragment.xml
+++ b/app/src/main/res/layout/topic_info_fragment.xml
@@ -48,7 +48,7 @@
 
       <TextView
         android:id="@+id/topic_name_text_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:layout_marginEnd="32dp"
@@ -56,15 +56,15 @@
         android:fontFamily="sans-serif"
         android:text="@{viewModel.topic.name}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="24sp"
         app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent" />
 
       <TextView
         android:id="@+id/story_count_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:layout_marginTop="8dp"
@@ -72,34 +72,34 @@
         android:fontFamily="sans-serif"
         android:text="@{@plurals/story_count(viewModel.topic.storyCount, viewModel.topic.storyCount)}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topic_name_text_view" />
 
       <TextView
         android:id="@+id/topic_description_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="32dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif"
         android:gravity="start"
         android:maxLines="@{viewModel.isDescriptionExpanded() ? @integer/topic_description_expanded : @integer/topic_description_collapsed}"
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp"
         android:text="@{viewModel.topicDescription}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/story_count_text_view" />
 
       <TextView
         android:id="@+id/see_more_text_view"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:layout_marginEnd="32dp"
@@ -110,11 +110,11 @@
         android:paddingTop="8dp"
         android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
         android:textColor="@color/colorPrimary"
-        android:textDirection="locale"
         android:textSize="16sp"
         android:textStyle="bold"
         android:visibility="@{viewModel.isSeeMoreVisible() ? View.VISIBLE : View.GONE}"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topic_description_text_view" />
 
@@ -139,9 +139,9 @@
         android:gravity="center_vertical"
         android:text="@string/topic_downloaded"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/download_status_image_view"
         app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />
 
@@ -154,10 +154,10 @@
         android:fontFamily="sans-serif"
         android:text="@{String.format(@string/topic_download_text, viewModel.topicSize)}"
         android:textColor="@color/oppiaPrimaryText"
-        android:textDirection="locale"
         android:textSize="18sp"
         android:textStyle="italic"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/download_story_count_text_view"
         app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/topic_summary_view.xml b/app/src/main/res/layout/topic_summary_view.xml
index 3972ba72c02..fde7469f3da 100755
--- a/app/src/main/res/layout/topic_summary_view.xml
+++ b/app/src/main/res/layout/topic_summary_view.xml
@@ -13,11 +13,11 @@
     android:id="@+id/topic_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:layoutMarginTop="@{@dimen/topic_list_item_margin_top_bottom}"
+    app:cardCornerRadius="4dp"
     app:layoutMarginBottom="@{@dimen/topic_list_item_margin_top_bottom}"
-    app:layoutMarginStart="@{viewModel.computeStartMargin()}"
     app:layoutMarginEnd="@{viewModel.computeEndMargin()}"
-    app:cardCornerRadius="4dp">
+    app:layoutMarginStart="@{viewModel.computeStartMargin()}"
+    app:layoutMarginTop="@{@dimen/topic_list_item_margin_top_bottom}">
 
     <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
@@ -51,26 +51,27 @@
 
         <TextView
           android:id="@+id/topic_name_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginStart="8dp"
           android:layout_marginTop="8dp"
-          android:layout_marginEnd="8dp"
           android:ellipsize="end"
           android:fontFamily="sans-serif"
           android:gravity="top"
           android:maxLines="2"
           android:minLines="2"
+          android:paddingStart="8dp"
+          android:paddingEnd="8dp"
           android:text="@{viewModel.name}"
           android:textColor="@color/white"
           android:textSize="14sp"
           android:textStyle="bold"
+          app:layout_constraintHorizontal_bias="0"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
           android:id="@+id/lesson_count_text_view"
-          android:layout_width="match_parent"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="8dp"
           android:layout_marginTop="4dp"