From f1df6634a1020126f225826f5178aaeb8f43589a Mon Sep 17 00:00:00 2001
From: ROHAN JADHAV <rj8342368@gmail.com>
Date: Fri, 6 Mar 2026 05:45:51 +0530
Subject: [PATCH 1/3] fix: add margin in members list for long display names

---
 changelog/unreleased/4781                       |  4 ++++
 owncloudApp/src/main/res/layout/member_item.xml | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 changelog/unreleased/4781

diff --git a/changelog/unreleased/4781 b/changelog/unreleased/4781
new file mode 100644
index 00000000000..9279fad8bb6
--- /dev/null
+++ b/changelog/unreleased/4781
@@ -0,0 +1,4 @@
+Bugfix: Add margin in members list for long display names 
+The right margin was missing in the list of members when the display name is long, causing the text to overflow. 
+https://github.com/owncloud/android/issues/4781 
+https://github.com/owncloud/android/pull/4800 
diff --git a/owncloudApp/src/main/res/layout/member_item.xml b/owncloudApp/src/main/res/layout/member_item.xml
index 1f72dd4c956..5dafba7156c 100644
--- a/owncloudApp/src/main/res/layout/member_item.xml
+++ b/owncloudApp/src/main/res/layout/member_item.xml
@@ -43,14 +43,16 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginEnd="@dimen/standard_half_margin"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/member_name"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/standard_half_margin"
                 android:layout_marginStart="@dimen/standard_half_margin"
+                android:layout_marginBottom="@dimen/standard_quarter_margin"
                 android:layout_gravity="center_vertical"
                 android:text="@string/placeholder_filename"
                 android:textSize="@dimen/two_line_primary_text_size"
@@ -60,16 +62,16 @@
                 android:maxLines="1"/>
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/member_role"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:layout_marginStart="@dimen/standard_half_margin"
-                    android:layout_marginEnd="@dimen/standard_half_margin"
                     android:layout_marginBottom="@dimen/standard_half_margin"
                     android:text="@string/placeholder_sentence"
                     android:textSize="13sp"
@@ -136,4 +138,4 @@
         android:background="@android:color/darker_gray"
         android:alpha="0.5"/>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file

From 6788ba5e189e3922f14fbf646554184247d37fe5 Mon Sep 17 00:00:00 2001
From: ROHAN JADHAV <rj8342368@gmail.com>
Date: Mon, 9 Mar 2026 19:47:09 +0530
Subject: [PATCH 2/3] fix: add changelog entry for margin fix in members list

---
 changelog/unreleased/4781 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/changelog/unreleased/4781 b/changelog/unreleased/4781
index 9279fad8bb6..7eab9ea9c4d 100644
--- a/changelog/unreleased/4781
+++ b/changelog/unreleased/4781
@@ -1,4 +1,6 @@
-Bugfix: Add margin in members list for long display names 
-The right margin was missing in the list of members when the display name is long, causing the text to overflow. 
-https://github.com/owncloud/android/issues/4781 
-https://github.com/owncloud/android/pull/4800 
+Bugfix: Add margin in members list for long display names in all cases
+
+An extra margin has been added to the right side in the list of members when the display name is long, preventing the text from overflowing.
+
+https://github.com/owncloud/android/issues/4781
+https://github.com/owncloud/android/pull/4800
\ No newline at end of file

From 9e53c460f481303e28edbf73c0bd4f5688180ee6 Mon Sep 17 00:00:00 2001
From: ROHAN JADHAV <rj8342368@gmail.com>
Date: Wed, 11 Mar 2026 19:08:15 +0530
Subject: [PATCH 3/3] chore: add changelog entry for margin fix in members list

---
 changelog/unreleased/{4781 => 4800} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename changelog/unreleased/{4781 => 4800} (85%)

diff --git a/changelog/unreleased/4781 b/changelog/unreleased/4800
similarity index 85%
rename from changelog/unreleased/4781
rename to changelog/unreleased/4800
index 7eab9ea9c4d..3a7e17b270b 100644
--- a/changelog/unreleased/4781
+++ b/changelog/unreleased/4800
@@ -3,4 +3,4 @@ Bugfix: Add margin in members list for long display names in all cases
 An extra margin has been added to the right side in the list of members when the display name is long, preventing the text from overflowing.
 
 https://github.com/owncloud/android/issues/4781
-https://github.com/owncloud/android/pull/4800
\ No newline at end of file
+https://github.com/owncloud/android/pull/4800