From 47104bf2cf88e28b70fff63d9307ce637afb078e Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Fri, 10 May 2019 20:08:36 +0200
Subject: [PATCH] fix item_account layout for rtl locales (#1252)

---
 app/src/main/res/layout/item_account.xml | 68 ++++++++++++------------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index e19ebab31..628f5d0b7 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/account_container"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
 
     <com.keylesspalace.tusky.view.RoundedImageView
         android:id="@+id/account_avatar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:foregroundGravity="center_vertical"
         android:layout_marginEnd="24dp"
-        app:layout_constraintLeft_toLeftOf="parent"
+        android:foregroundGravity="center_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/avatar_default" />
 
     <com.keylesspalace.tusky.view.RoundedImageView
         android:id="@+id/account_avatar_inset"
@@ -31,36 +31,34 @@
         tools:src="@color/accent"
         tools:visibility="visible" />
 
-
-    <LinearLayout
+    <androidx.emoji.widget.EmojiTextView
+        android:id="@+id/account_display_name"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        app:layout_constraintStart_toEndOf="@id/account_avatar"
-        android:gravity="center_vertical"
+        android:layout_height="wrap_content"
         android:layout_marginStart="14dp"
-        android:orientation="vertical">
+        android:ellipsize="end"
+        android:maxLines="1"
+        app:layout_constraintVertical_chainStyle="packed"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="?attr/status_text_large"
+        android:textStyle="normal|bold"
+        app:layout_constraintBottom_toTopOf="@id/account_username"
+        app:layout_constraintStart_toEndOf="@id/account_avatar"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Display name" />
 
-        <androidx.emoji.widget.EmojiTextView
-            android:id="@+id/account_display_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="?attr/status_text_large"
-            android:textStyle="normal|bold"
-            tools:text="Display name" />
-
-        <TextView
-            android:id="@+id/account_username"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="?attr/status_text_medium"
-            tools:text="\@username" />
-
-    </LinearLayout>
+    <TextView
+        android:id="@+id/account_username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="14dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="?attr/status_text_medium"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/account_avatar"
+        app:layout_constraintTop_toBottomOf="@id/account_display_name"
+        tools:text="\@username" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file