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 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/member_item.xml b/owncloudApp/src/main/res/layout/member_item.xml index 1f72dd4c956..d7ccea54dfd 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"> 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 @@ 300dp + + + 600dp 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 @@ 50dp 40dp 72dp + + + 600dp 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 @@ 30dp 20dp + + 100dp + 48dp 36dp