From 3ec55b24f8f4622282c6ad373f8d32b94d690fdc Mon Sep 17 00:00:00 2001
From: Ahmad Alturki <aimt1@protonmail.com>
Date: Wed, 25 May 2022 10:33:53 +0300
Subject: [PATCH] Fix swapped group title & avatar on rtl layout.

Fixes #12612
---
 .../layout/conversation_settings_toolbar.xml  | 73 ++++++++++---------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/app/src/main/res/layout/conversation_settings_toolbar.xml b/app/src/main/res/layout/conversation_settings_toolbar.xml
index 6ad9134be..5354af3e8 100644
--- a/app/src/main/res/layout/conversation_settings_toolbar.xml
+++ b/app/src/main/res/layout/conversation_settings_toolbar.xml
@@ -27,45 +27,52 @@
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24">
 
-        <FrameLayout
-            android:id="@+id/toolbar_avatar_container"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:alpha="0"
-            android:translationY="56dp"
-            tools:alpha="1"
-            tools:translationY="0dp">
+            android:gravity="start">
 
-            <org.thoughtcrime.securesms.components.AvatarImageView
-                android:id="@+id/toolbar_avatar"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                app:fallbackImageSize="small" />
+            <FrameLayout
+                android:id="@+id/toolbar_avatar_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:alpha="0"
+                android:translationY="56dp"
+                tools:alpha="1"
+                tools:translationY="0dp">
 
-            <org.thoughtcrime.securesms.badges.BadgeImageView
-                android:id="@+id/toolbar_badge"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginStart="20dp"
-                android:layout_marginTop="23dp"
-                app:badge_size="small" />
+                <org.thoughtcrime.securesms.components.AvatarImageView
+                    android:id="@+id/toolbar_avatar"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    app:fallbackImageSize="small" />
 
-        </FrameLayout>
+                <org.thoughtcrime.securesms.badges.BadgeImageView
+                    android:id="@+id/toolbar_badge"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="23dp"
+                    app:badge_size="small" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-            android:id="@+id/toolbar_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:alpha="0"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:textAppearance="@style/Signal.Text.Title"
-            android:translationY="56dp"
-            tools:alpha="1"
-            tools:text="Miles Morales"
-            tools:translationY="0dp" />
+            </FrameLayout>
+
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                    android:id="@+id/toolbar_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="16dp"
+                    android:alpha="0"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:textAppearance="@style/Signal.Text.Title"
+                    android:translationY="56dp"
+                    tools:alpha="1"
+                    tools:text="Miles Morales"
+                    tools:translationY="0dp" />
+
+        </LinearLayout>
 
     </org.thoughtcrime.securesms.util.views.DarkOverflowToolbar>