Skip to content

[FIX] Members with expiration date and long permission name are not correctly displayed #4841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joragua wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[FIX] Members with expiration date and long permission name are not correctly displayed #4841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e39965d
fix: display role and expiration date correctly when space is limited
joragua May 4, 2026
47e6b84
fix: add end margin to member info layout
joragua May 4, 2026
61d89c1
chore: add calens file
joragua May 4, 2026
cb71062
fix: ellipsize member role when expiration date is shown and there is…
joragua May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/unreleased/4728
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions ...App/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion owncloudApp/src/main/res/layout/member_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"/>

Expand Down
3 changes: 3 additions & 0 deletions owncloudApp/src/main/res/values-land/dims.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 3 additions & 0 deletions owncloudApp/src/main/res/values-sw720dp/dims.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 3 additions & 0 deletions owncloudApp/src/main/res/values/dims.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading