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
oppia · Aug 13, 2021 · a43e743 · a43e743
1 parent cfed5fe
commit a43e743
Show file tree

Hide file tree

Showing 13 changed files with 173 additions and 85 deletions.
diff --git 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
@@ -26,58 +26,58 @@
 
       <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"
         android:layout_marginEnd="72dp"
         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"
         android:layout_marginEnd="72dp"
         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
@@ -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
@@ -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
@@ -26,57 +26,55 @@
 
         <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"
           android:layout_marginEnd="64dp"
           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"
           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="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
@@ -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
@@ -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"