From ce1b9a53bec5f9b27181b7a6d8ef8f630b277e8c Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 19 Nov 2022 19:01:51 +0100
Subject: [PATCH] fix buttons and usernames overlapping in follow requests
 (#2862)

---
 .../main/res/layout/item_follow_request.xml   | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/item_follow_request.xml b/app/src/main/res/layout/item_follow_request.xml
index 0116a2722..8fe743d91 100644
--- a/app/src/main/res/layout/item_follow_request.xml
+++ b/app/src/main/res/layout/item_follow_request.xml
@@ -13,7 +13,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:drawableStart="@drawable/ic_person_add_24dp"
         android:drawablePadding="10dp"
         android:ellipsize="end"
         android:gravity="center_vertical"
@@ -21,6 +20,7 @@
         android:paddingStart="28dp"
         android:textColor="?android:textColorSecondary"
         android:textSize="?attr/status_text_medium"
+        app:drawableStartCompat="@drawable/ic_person_add_24dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Someone requested to follow you" />
@@ -32,13 +32,13 @@
         android:layout_centerVertical="true"
         android:layout_marginTop="10dp"
         android:contentDescription="@string/action_view_profile"
-        tools:src="@drawable/avatar_default"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/notificationTextView" />
+        app:layout_constraintTop_toBottomOf="@id/notificationTextView"
+        tools:src="@drawable/avatar_default" />
 
     <TextView
         android:id="@+id/displayNameTextView"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="14dp"
         android:ellipsize="end"
@@ -46,23 +46,25 @@
         android:textColor="?android:textColorPrimary"
         android:textSize="?attr/status_text_large"
         android:textStyle="normal|bold"
+        app:layout_constraintBottom_toTopOf="@id/usernameTextView"
+        app:layout_constraintEnd_toStartOf="@id/acceptButton"
         app:layout_constraintStart_toEndOf="@id/avatar"
         app:layout_constraintTop_toTopOf="@id/avatar"
-        app:layout_constraintBottom_toTopOf="@id/usernameTextView"
         tools:text="Display name" />
 
     <TextView
         android:id="@+id/usernameTextView"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         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="@id/avatar"
+        app:layout_constraintEnd_toStartOf="@id/acceptButton"
         app:layout_constraintStart_toEndOf="@id/avatar"
         app:layout_constraintTop_toBottomOf="@id/displayNameTextView"
-        app:layout_constraintBottom_toBottomOf="@id/avatar"
         tools:text="\@username" />
 
     <ImageButton
@@ -76,9 +78,10 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_accept"
         android:padding="4dp"
-        app:layout_constraintEnd_toStartOf="@id/rejectButton"
-        app:layout_constraintTop_toTopOf="@id/avatar"
         app:layout_constraintBottom_toBottomOf="@id/avatar"
+        app:layout_constraintEnd_toStartOf="@id/rejectButton"
+        app:layout_constraintStart_toEndOf="@id/displayNameTextView"
+        app:layout_constraintTop_toTopOf="@id/avatar"
         app:srcCompat="@drawable/ic_check_24dp" />
 
     <ImageButton
@@ -91,9 +94,9 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_reject"
         android:padding="4dp"
+        app:layout_constraintBottom_toBottomOf="@id/avatar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/avatar"
-        app:layout_constraintBottom_toBottomOf="@id/avatar"
         app:srcCompat="@drawable/ic_reject_24dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>