From ca58a04f57a75148ea4fcb28842629ef7aa2487d Mon Sep 17 00:00:00 2001
From: ClaireGizard <claire.1817@hotmail.fr>
Date: Thu, 16 Dec 2021 21:10:03 +0100
Subject: [PATCH] Small UI fix in room member profile hearder (#4700)

Small ui fix on room member profile name

Co-authored-by: Claire Gizard <cgizard>
---
 changelog.d/4700.bugfix                       |  1 +
 .../view_stub_room_member_profile_header.xml  | 54 ++++++++++---------
 2 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 changelog.d/4700.bugfix

diff --git a/changelog.d/4700.bugfix b/changelog.d/4700.bugfix
new file mode 100644
index 0000000000..c8ad7c9b66
--- /dev/null
+++ b/changelog.d/4700.bugfix
@@ -0,0 +1 @@
+Fix name and shield are truncated in the room detail screen
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 6df1010196..40f4bd8515 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -12,8 +12,8 @@
         android:id="@+id/memberProfileInfoContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         app:layout_constraintBottom_toTopOf="@id/memberProfileNameView"
         app:layout_constraintTop_toTopOf="@id/memberProfileNameView">
 
@@ -23,7 +23,7 @@
             android:layout_height="128dp"
             android:layout_marginBottom="16dp"
             android:contentDescription="@string/avatar"
-            app:layout_constraintBottom_toTopOf="@id/memberProfileNameView"
+            app:layout_constraintBottom_toTopOf="@id/memberProfileLinearLayout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -45,30 +45,36 @@
             tools:src="@drawable/ic_presence_offline"
             tools:visibility="visible" />
 
-        <im.vector.app.core.ui.views.ShieldImageView
-            android:id="@+id/memberProfileDecorationImageView"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginEnd="8dp"
-            app:layout_constraintBottom_toBottomOf="@id/memberProfileNameView"
-            app:layout_constraintEnd_toStartOf="@id/memberProfileNameView"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/memberProfileNameView" />
-
-        <TextView
-            android:id="@+id/memberProfileNameView"
-            style="@style/Widget.Vector.TextView.Title"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/memberProfileLinearLayout"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textStyle="bold"
+            android:orientation="horizontal"
             app:layout_constraintBottom_toTopOf="@id/memberProfileIdView"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/memberProfileDecorationImageView"
-            app:layout_constraintTop_toBottomOf="@id/memberProfileAvatarView"
-            tools:text="@sample/users.json/data/displayName" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/memberProfileAvatarView">
+
+            <im.vector.app.core.ui.views.ShieldImageView
+                android:id="@+id/memberProfileDecorationImageView"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="2dp"
+                android:layout_marginEnd="8dp" />
+
+            <TextView
+                android:id="@+id/memberProfileNameView"
+                style="@style/Widget.Vector.TextView.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:gravity="center"
+                android:textStyle="bold"
+                tools:text="@sample/users.json/data/displayName" />
+
+        </LinearLayout>
 
         <TextView
             android:id="@+id/memberProfileIdView"
@@ -82,7 +88,7 @@
             app:layout_constraintBottom_toTopOf="@id/memberProfilePowerLevelView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/memberProfileNameView"
+            app:layout_constraintTop_toBottomOf="@id/memberProfileLinearLayout"
             tools:text="@sample/users.json/data/id" />
 
         <TextView