Skip to content

Commit cb10366

Browse files
committed
feat: improve content descriptions for space members (names and expiration dates)
1 parent 3245c2f commit cb10366

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,20 @@ class SpaceMembersAdapter: RecyclerView.Adapter<SpaceMembersAdapter.SpaceMembers
5151
val roleNames = member.roles.mapNotNull { rolesMap[it] }
5252

5353
holder.binding.apply {
54-
memberIcon.setImageResource(if (member.id.startsWith(GROUP_PREFIX)) R.drawable.ic_group else R.drawable.ic_user)
54+
val isGroup = member.id.startsWith(GROUP_PREFIX)
55+
memberIcon.setImageResource(if (isGroup) R.drawable.ic_group else R.drawable.ic_user)
5556
memberName.text = member.displayName
57+
memberName.contentDescription = holder.itemView.context.getString(
58+
if (isGroup) R.string.content_description_member_group else R.string.content_description_member_user, member.displayName
59+
)
5660
memberRole.text = roleNames.joinToString(", ")
5761

5862
member.expirationDateTime?.let {
5963
expirationCalendarIcon.visibility = View.VISIBLE
6064
expirationDate.visibility = View.VISIBLE
6165
expirationDate.text = DisplayUtils.displayDateToHumanReadable(it)
66+
expirationDate.contentDescription =
67+
holder.itemView.context.getString(R.string.content_description_member_expiration_date, expirationDate.text)
6268
}
6369
}
6470
}

owncloudApp/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,9 @@
827827
<string name="content_description_create_button">Create button</string>
828828
<string name="content_description_cancel_button">Cancel button</string>
829829
<string name="content_description_quota_switch">Space quota</string>
830+
<string name="content_description_member_user">User %1$s</string>
831+
<string name="content_description_member_group">Group %1$s</string>
832+
<string name="content_description_member_expiration_date">Expires %1$s</string>
830833

831834
<string name="create_shortcut_dialog_title">Create a shortcut</string>
832835
<string name="create_shortcut_dialog_url">URL</string>

0 commit comments

Comments
 (0)