From 38f1bbdab23bc4a6e153704a17c8741c7a66730b Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 31 Jan 2022 19:20:00 +0100
Subject: [PATCH] RTL:  better support for some TextViews

---
 vector/src/main/res/layout/fragment_room_detail.xml            | 2 ++
 .../src/main/res/layout/item_bottom_sheet_message_preview.xml  | 3 +++
 vector/src/main/res/layout/item_room.xml                       | 2 ++
 vector/src/main/res/layout/item_timeline_event_base.xml        | 1 +
 vector/src/main/res/layout/item_timeline_event_base_noinfo.xml | 2 +-
 .../src/main/res/layout/item_timeline_event_default_stub.xml   | 3 +--
 vector/src/main/res/layout/item_timeline_event_notice_stub.xml | 3 +--
 vector/src/main/res/layout/view_message_bubble.xml             | 1 +
 8 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 65c106d6f3..ba28fda9ea 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -91,6 +91,7 @@
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
+                    android:textAlignment="viewStart"
                     android:textAppearance="@style/TextAppearance.Vector.Widget.ActionBarTitle"
                     app:layout_constraintBottom_toTopOf="@id/roomToolbarSubtitleView"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -109,6 +110,7 @@
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
+                    android:textAlignment="viewStart"
                     android:textAppearance="@style/TextAppearance.Vector.Widget.ActionBarSubTitle"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 95e6975803..08a8f5b27f 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -35,6 +35,7 @@
         android:singleLine="true"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toStartOf="@id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
@@ -78,6 +79,7 @@
         android:maxLines="3"
         android:textColor="?vctr_content_secondary"
         android:textIsSelectable="false"
+        android:textAlignment="viewStart"
         app:layout_constraintBottom_toTopOf="@id/bottom_sheet_message_preview_body_details"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
@@ -96,6 +98,7 @@
         android:textColor="?vctr_content_tertiary"
         android:textIsSelectable="false"
         android:visibility="gone"
+        android:textAlignment="viewStart"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/bottom_sheet_message_preview_body"
         app:layout_constraintStart_toStartOf="@id/bottom_sheet_message_preview_body"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 41cc2cb02a..defff5eeeb 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -190,6 +190,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
+        android:textAlignment="viewStart"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="?vctr_content_secondary"
@@ -202,6 +203,7 @@
         android:id="@+id/roomTypingView"
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
+        android:textAlignment="viewStart"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index bc9ed68232..3d0033fe59 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -34,6 +34,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
+        android:textAlignment="viewStart"
         android:layout_toStartOf="@id/messageTimeView"
         android:layout_toEndOf="@id/messageStartGuideline"
         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index 731642cabd..28a79de6bf 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -23,10 +23,10 @@
 
     <FrameLayout
         android:id="@+id/viewStubContainer"
+        style="@style/TimelineContentStubContainerParams"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        style="@style/TimelineContentStubContainerParams"
         android:layout_toEndOf="@id/messageStartGuideline">
 
         <ViewStub
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index 000429cc68..8225f52bb8 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -19,9 +19,8 @@
     <TextView
         android:id="@+id/itemDefaultTextView"
         style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index e6ccdc4256..9d3a3c4098 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -19,9 +19,8 @@
     <TextView
         android:id="@+id/itemNoticeTextView"
         style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
diff --git a/vector/src/main/res/layout/view_message_bubble.xml b/vector/src/main/res/layout/view_message_bubble.xml
index 1ffb358d4e..6e316f7979 100644
--- a/vector/src/main/res/layout/view_message_bubble.xml
+++ b/vector/src/main/res/layout/view_message_bubble.xml
@@ -29,6 +29,7 @@
     <TextView
         android:id="@+id/messageMemberNameView"
         style="@style/Widget.Vector.TextView.Subtitle"
+        android:textAlignment="viewStart"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"