Skip to content

Commit cb71062

Browse files
committed
fix: ellipsize member role when expiration date is shown and there is limited space
1 parent 61d89c1 commit cb71062

6 files changed

Lines changed: 10 additions & 142 deletions

File tree

‎owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class SpaceMembersAdapter(
9494
expirationCalendarIcon.isVisible = hasExpirationDate
9595
expirationDate.isVisible = hasExpirationDate
9696
if (hasExpirationDate) {
97+
holder.binding.memberRole.maxWidth = holder.itemView.context.resources.getDimensionPixelSize(R.dimen.member_role_max_width)
9798
expirationDate.text = DisplayUtils.displayDateToHumanReadable(member.expirationDateTime)
9899
expirationDate.contentDescription =
99100
holder.itemView.context.getString(R.string.content_description_member_expiration_date, expirationDate.text)

‎owncloudApp/src/main/res/layout-land/member_item.xml‎

Lines changed: 0 additions & 141 deletions
This file was deleted.

‎owncloudApp/src/main/res/layout/member_item.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
android:id="@+id/member_role"
7070
android:layout_width="wrap_content"
7171
android:layout_height="wrap_content"
72-
android:maxWidth="100dp"
7372
android:layout_marginStart="@dimen/standard_half_margin"
7473
android:layout_marginEnd="@dimen/standard_half_margin"
7574
android:layout_marginBottom="@dimen/standard_half_margin"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<dimen name="max_height_bottom_sheet">300dp</dimen>
4+
5+
<!-- Members -->
6+
<dimen name="member_role_max_width">600dp</dimen>
47
</resources>

‎owncloudApp/src/main/res/values-sw720dp/dims.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@
2525
<dimen name="spaces_margin_horizontal">50dp</dimen>
2626
<dimen name="spaces_margin_vertical">40dp</dimen>
2727
<dimen name="empty_icon_size">72dp</dimen>
28+
29+
<!-- Members -->
30+
<dimen name="member_role_max_width">600dp</dimen>
2831
</resources>

‎owncloudApp/src/main/res/values/dims.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
<dimen name="spaces_margin_horizontal">30dp</dimen>
8787
<dimen name="spaces_margin_vertical">20dp</dimen>
8888

89+
<!-- Members -->
90+
<dimen name="member_role_max_width">100dp</dimen>
91+
8992
<!-- Accessibility dims -->
9093
<dimen name="icon_button_size">48dp</dimen>
9194
<dimen name="empty_icon_size">36dp</dimen>

0 commit comments

Comments
 (0)