From 3396b2b0431b40cc0fb05b721f098c0062d0c1c2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 17 Jul 2025 16:46:34 +0200
Subject: [PATCH] [a11y] Improve accessibility on avatar when creating a room.

---
 .../impl/configureroom/ConfigureRoomView.kt          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
index 9c468539ab..f639704890 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@@ -30,6 +30,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -213,11 +215,19 @@ private fun RoomNameWithAvatar(
         horizontalArrangement = Arrangement.spacedBy(16.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
+        val a11yAvatar = stringResource(CommonStrings.a11y_room_avatar)
         UnsavedAvatar(
             avatarUri = avatarUri,
             avatarSize = AvatarSize.EditRoomDetails,
             avatarType = AvatarType.Room(),
-            modifier = Modifier.clickable(onClick = onAvatarClick),
+            modifier = Modifier
+                .clickable(
+                    onClick = onAvatarClick,
+                    onClickLabel = stringResource(CommonStrings.action_open_context_menu),
+                )
+                .clearAndSetSemantics {
+                    contentDescription = a11yAvatar
+                },
         )
 
         TextField(