From e39965dde3be73eb994b90a1f4b1277f4130ca0b Mon Sep 17 00:00:00 2001
From: Jorge Aguado Recio <jorgeagurec@gmail.com>
Date: Mon, 4 May 2026 11:59:20 +0200
Subject: [PATCH 1/4] fix: display role and expiration date correctly when
 space is limited

---
 .../src/main/res/layout-land/member_item.xml  | 141 ++++++++++++++++++
 .../src/main/res/layout/member_item.xml       |   4 +-
 2 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 owncloudApp/src/main/res/layout-land/member_item.xml

diff --git a/owncloudApp/src/main/res/layout-land/member_item.xml b/owncloudApp/src/main/res/layout-land/member_item.xml
new file mode 100644
index 00000000000..5898009957a
--- /dev/null
+++ b/owncloudApp/src/main/res/layout-land/member_item.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ownCloud Android client application
+
+  Copyright (C) 2026 ownCloud GmbH.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:filterTouchesWhenObscured="true"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/member_item_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/standard_quarter_margin"
+        android:orientation="horizontal"
+        android:focusable="true">
+
+        <ImageView
+            android:id="@+id/member_icon"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginStart="@dimen/standard_half_margin"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_user" />
+
+        <LinearLayout
+            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_height="wrap_content"
+                android:layout_marginTop="@dimen/standard_half_margin"
+                android:layout_marginStart="@dimen/standard_half_margin"
+                android:layout_gravity="center_vertical"
+                android:text="@string/placeholder_filename"
+                android:textSize="@dimen/two_line_primary_text_size"
+                android:textColor="@color/textColor"
+                android:textStyle="bold"
+                android:ellipsize="middle"
+                android:maxLines="1"/>
+
+            <LinearLayout
+                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_height="wrap_content"
+                    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"
+                    android:textColor="@color/textColor"
+                    android:ellipsize="middle"
+                    android:maxLines="1"/>
+
+                <ImageView
+                    android:id="@+id/expiration_calendar_icon"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginEnd="@dimen/standard_half_margin"
+                    android:src="@drawable/file_calendar"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
+                <TextView
+                    android:id="@+id/expiration_date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/placeholder_sentence"
+                    android:textSize="13sp"
+                    android:textColor="@color/textColor"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/edit_member_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="@dimen/standard_half_padding"
+            android:background="?android:attr/selectableItemBackground"
+            android:focusable="true"
+            android:src="@drawable/ic_lead_pencil_grey"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <ImageButton
+            android:id="@+id/remove_member_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/standard_half_margin"
+            android:layout_marginEnd="@dimen/standard_half_margin"
+            android:padding="@dimen/standard_half_padding"
+            android:background="?android:attr/selectableItemBackground"
+            android:focusable="true"
+            android:src="@drawable/ic_action_delete_grey"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/standard_quarter_margin"
+        android:background="@android:color/darker_gray"
+        android:alpha="0.5"/>
+
+</LinearLayout>
diff --git a/owncloudApp/src/main/res/layout/member_item.xml b/owncloudApp/src/main/res/layout/member_item.xml
index 1f72dd4c956..7b5684e4ede 100644
--- a/owncloudApp/src/main/res/layout/member_item.xml
+++ b/owncloudApp/src/main/res/layout/member_item.xml
@@ -68,6 +68,7 @@
                     android:id="@+id/member_role"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:maxWidth="100dp"
                     android:layout_marginStart="@dimen/standard_half_margin"
                     android:layout_marginEnd="@dimen/standard_half_margin"
                     android:layout_marginBottom="@dimen/standard_half_margin"
@@ -93,7 +94,8 @@
                     android:text="@string/placeholder_sentence"
                     android:textSize="13sp"
                     android:textColor="@color/textColor"
-                    android:ellipsize="middle"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:visibility="gone"
                     tools:visibility="visible"/>
 

From 47e6b84862a3b1560e90ddb74c47130b539cf455 Mon Sep 17 00:00:00 2001
From: Jorge Aguado Recio <jorgeagurec@gmail.com>
Date: Mon, 4 May 2026 12:07:38 +0200
Subject: [PATCH 2/4] fix: add end margin to member info layout

---
 owncloudApp/src/main/res/layout/member_item.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/owncloudApp/src/main/res/layout/member_item.xml b/owncloudApp/src/main/res/layout/member_item.xml
index 7b5684e4ede..0fbada67c83 100644
--- a/owncloudApp/src/main/res/layout/member_item.xml
+++ b/owncloudApp/src/main/res/layout/member_item.xml
@@ -43,6 +43,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginEnd="@dimen/standard_half_margin"
             android:orientation="vertical">
 
             <TextView

From 61d89c195064a9fc69f90ff2d5eb1081ad46c889 Mon Sep 17 00:00:00 2001
From: Jorge Aguado Recio <jorgeagurec@gmail.com>
Date: Mon, 4 May 2026 12:22:26 +0200
Subject: [PATCH 3/4] chore: add calens file

---
 changelog/unreleased/4728 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog/unreleased/4728 b/changelog/unreleased/4728
index 3e3f53e25b3..e44d58ded3c 100644
--- a/changelog/unreleased/4728
+++ b/changelog/unreleased/4728
@@ -12,3 +12,4 @@ https://github.com/owncloud/android/pull/4765
 https://github.com/owncloud/android/pull/4779
 https://github.com/owncloud/android/pull/4784
 https://github.com/owncloud/android/pull/4809
+https://github.com/owncloud/android/pull/4841

From cb71062cf78832331f635ecddbd471a3e3ef4283 Mon Sep 17 00:00:00 2001
From: Jorge Aguado Recio <jorgeagurec@gmail.com>
Date: Tue, 5 May 2026 11:52:16 +0200
Subject: [PATCH 4/4] fix: ellipsize member role when expiration date is shown
 and there is limited space

---
 .../spaces/members/SpaceMembersAdapter.kt     |   1 +
 .../src/main/res/layout-land/member_item.xml  | 141 ------------------
 .../src/main/res/layout/member_item.xml       |   1 -
 owncloudApp/src/main/res/values-land/dims.xml |   3 +
 .../src/main/res/values-sw720dp/dims.xml      |   3 +
 owncloudApp/src/main/res/values/dims.xml      |   3 +
 6 files changed, 10 insertions(+), 142 deletions(-)
 delete mode 100644 owncloudApp/src/main/res/layout-land/member_item.xml

diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt
index 60ca345fcf9..10f6a0b3913 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt
@@ -94,6 +94,7 @@ class SpaceMembersAdapter(
             expirationCalendarIcon.isVisible = hasExpirationDate
             expirationDate.isVisible = hasExpirationDate
             if (hasExpirationDate) {
+                holder.binding.memberRole.maxWidth = holder.itemView.context.resources.getDimensionPixelSize(R.dimen.member_role_max_width)
                 expirationDate.text = DisplayUtils.displayDateToHumanReadable(member.expirationDateTime)
                 expirationDate.contentDescription =
                     holder.itemView.context.getString(R.string.content_description_member_expiration_date, expirationDate.text)
diff --git a/owncloudApp/src/main/res/layout-land/member_item.xml b/owncloudApp/src/main/res/layout-land/member_item.xml
deleted file mode 100644
index 5898009957a..00000000000
--- a/owncloudApp/src/main/res/layout-land/member_item.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ownCloud Android client application
-
-  Copyright (C) 2026 ownCloud GmbH.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:filterTouchesWhenObscured="true"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <LinearLayout
-        android:id="@+id/member_item_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/standard_quarter_margin"
-        android:orientation="horizontal"
-        android:focusable="true">
-
-        <ImageView
-            android:id="@+id/member_icon"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_marginStart="@dimen/standard_half_margin"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/ic_user" />
-
-        <LinearLayout
-            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_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_half_margin"
-                android:layout_marginStart="@dimen/standard_half_margin"
-                android:layout_gravity="center_vertical"
-                android:text="@string/placeholder_filename"
-                android:textSize="@dimen/two_line_primary_text_size"
-                android:textColor="@color/textColor"
-                android:textStyle="bold"
-                android:ellipsize="middle"
-                android:maxLines="1"/>
-
-            <LinearLayout
-                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_height="wrap_content"
-                    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"
-                    android:textColor="@color/textColor"
-                    android:ellipsize="middle"
-                    android:maxLines="1"/>
-
-                <ImageView
-                    android:id="@+id/expiration_calendar_icon"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginEnd="@dimen/standard_half_margin"
-                    android:src="@drawable/file_calendar"
-                    android:visibility="gone"
-                    tools:visibility="visible"/>
-
-                <TextView
-                    android:id="@+id/expiration_date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/placeholder_sentence"
-                    android:textSize="13sp"
-                    android:textColor="@color/textColor"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:visibility="gone"
-                    tools:visibility="visible"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <ImageButton
-            android:id="@+id/edit_member_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="@dimen/standard_half_padding"
-            android:background="?android:attr/selectableItemBackground"
-            android:focusable="true"
-            android:src="@drawable/ic_lead_pencil_grey"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <ImageButton
-            android:id="@+id/remove_member_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_half_margin"
-            android:layout_marginEnd="@dimen/standard_half_margin"
-            android:padding="@dimen/standard_half_padding"
-            android:background="?android:attr/selectableItemBackground"
-            android:focusable="true"
-            android:src="@drawable/ic_action_delete_grey"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/standard_quarter_margin"
-        android:background="@android:color/darker_gray"
-        android:alpha="0.5"/>
-
-</LinearLayout>
diff --git a/owncloudApp/src/main/res/layout/member_item.xml b/owncloudApp/src/main/res/layout/member_item.xml
index 0fbada67c83..d7ccea54dfd 100644
--- a/owncloudApp/src/main/res/layout/member_item.xml
+++ b/owncloudApp/src/main/res/layout/member_item.xml
@@ -69,7 +69,6 @@
                     android:id="@+id/member_role"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:maxWidth="100dp"
                     android:layout_marginStart="@dimen/standard_half_margin"
                     android:layout_marginEnd="@dimen/standard_half_margin"
                     android:layout_marginBottom="@dimen/standard_half_margin"
diff --git a/owncloudApp/src/main/res/values-land/dims.xml b/owncloudApp/src/main/res/values-land/dims.xml
index 5be04722457..e3396d0fc85 100644
--- a/owncloudApp/src/main/res/values-land/dims.xml
+++ b/owncloudApp/src/main/res/values-land/dims.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="max_height_bottom_sheet">300dp</dimen>
+
+    <!-- Members -->
+    <dimen name="member_role_max_width">600dp</dimen>
 </resources>
diff --git a/owncloudApp/src/main/res/values-sw720dp/dims.xml b/owncloudApp/src/main/res/values-sw720dp/dims.xml
index d7079b54416..84448cd0735 100644
--- a/owncloudApp/src/main/res/values-sw720dp/dims.xml
+++ b/owncloudApp/src/main/res/values-sw720dp/dims.xml
@@ -25,4 +25,7 @@
     <dimen name="spaces_margin_horizontal">50dp</dimen>
     <dimen name="spaces_margin_vertical">40dp</dimen>
     <dimen name="empty_icon_size">72dp</dimen>
+
+    <!-- Members -->
+    <dimen name="member_role_max_width">600dp</dimen>
 </resources>
diff --git a/owncloudApp/src/main/res/values/dims.xml b/owncloudApp/src/main/res/values/dims.xml
index 8886f3fb054..0b1cca71349 100644
--- a/owncloudApp/src/main/res/values/dims.xml
+++ b/owncloudApp/src/main/res/values/dims.xml
@@ -86,6 +86,9 @@
     <dimen name="spaces_margin_horizontal">30dp</dimen>
     <dimen name="spaces_margin_vertical">20dp</dimen>
 
+    <!-- Members -->
+    <dimen name="member_role_max_width">100dp</dimen>
+
     <!-- Accessibility dims -->
     <dimen name="icon_button_size">48dp</dimen>
     <dimen name="empty_icon_size">36dp</dimen>