Make TalkBack inform about the selected item

SRGSSR · Dec 10, 2024 · c51a6ab · c51a6ab
1 parent 3fbbb5b
commit c51a6ab
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/MainNavigation.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/MainNavigation.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.semantics.CollectionInfo
 import androidx.compose.ui.semantics.CollectionItemInfo
 import androidx.compose.ui.semantics.collectionInfo
 import androidx.compose.ui.semantics.collectionItemInfo
+import androidx.compose.ui.semantics.selected
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpOffset
@@ -239,6 +240,7 @@ private fun ListsMenu(
                         isMenuVisible = false
                     },
                     modifier = Modifier.semantics {
+                        selected = isSelected
                         collectionItemInfo = CollectionItemInfo(
                             rowIndex = (index * servers.size) + envIndex,
                             rowSpan = 1,

diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/search/SearchHome.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/search/SearchHome.kt
@@ -62,6 +62,7 @@ import androidx.compose.ui.semantics.CollectionItemInfo
 import androidx.compose.ui.semantics.collectionInfo
 import androidx.compose.ui.semantics.collectionItemInfo
 import androidx.compose.ui.semantics.onClick
+import androidx.compose.ui.semantics.selected
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
@@ -304,21 +305,24 @@ private fun SearchInput(
                         )
                     ) {
                         bus.forEachIndexed { index, bu ->
+                            val isSelected = selectedBu == bu
+
                             DropdownMenuItem(
                                 text = { BuLabel(bu) },
                                 onClick = {
                                     onBuChange(bu)
                                     showBuSelector = false
                                 },
                                 modifier = Modifier.semantics {
+                                    selected = isSelected
                                     collectionItemInfo = CollectionItemInfo(
                                         rowIndex = index,
                                         rowSpan = 1,
                                         columnIndex = 1,
                                         columnSpan = 1,
                                     )
                                 },
-                                trailingIcon = if (selectedBu == bu) {
+                                trailingIcon = if (isSelected) {
                                     {
                                         Icon(
                                             imageVector = Icons.Default.Check,

diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/settings/AppSettingsView.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/settings/AppSettingsView.kt
@@ -50,6 +50,7 @@ import androidx.compose.ui.semantics.collectionInfo
 import androidx.compose.ui.semantics.collectionItemInfo
 import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.semantics.role
+import androidx.compose.ui.semantics.selected
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpOffset
@@ -298,13 +299,16 @@ private fun <T> DropdownSetting(
             offset = dropdownOffset,
         ) {
             entries.forEachIndexed { index, entry ->
+                val isSelected = entry == selectedEntry
+
                 DropdownMenuItem(
                     text = { Text(text = entry.toString()) },
                     onClick = {
                         onEntrySelected(entry)
                         showDropdownMenu = false
                     },
                     modifier = Modifier.semantics {
+                        selected = isSelected
                         collectionItemInfo = CollectionItemInfo(
                             rowIndex = index,
                             rowSpan = 1,
@@ -313,7 +317,7 @@ private fun <T> DropdownSetting(
                         )
                     },
                     leadingIcon = {
-                        AnimatedVisibility(entry == selectedEntry) {
+                        AnimatedVisibility(isSelected) {
                             Icon(
                                 imageVector = Icons.Default.Check,
                                 contentDescription = null,

diff --git a/...in/java/ch/srgssr/pillarbox/demo/ui/showcases/playlists/CustomPlaybackSettingsShowcase.kt b/...in/java/ch/srgssr/pillarbox/demo/ui/showcases/playlists/CustomPlaybackSettingsShowcase.kt
@@ -42,6 +42,7 @@ import androidx.compose.ui.semantics.CollectionInfo
 import androidx.compose.ui.semantics.CollectionItemInfo
 import androidx.compose.ui.semantics.collectionInfo
 import androidx.compose.ui.semantics.collectionItemInfo
+import androidx.compose.ui.semantics.selected
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.DpOffset
 import androidx.lifecycle.compose.LifecycleResumeEffect
@@ -142,6 +143,8 @@ fun CustomPlaybackSettingsShowcase(
                 offset = menuOffset,
             ) {
                 repeatModes.forEachIndexed { index, (repeatMode, repeatModeLabel) ->
+                    val isSelected = index == selectedRepeatModeIndex
+
                     DropdownMenuItem(
                         text = { Text(text = repeatModeLabel) },
                         onClick = {
@@ -150,6 +153,7 @@ fun CustomPlaybackSettingsShowcase(
                             showRepeatModeMenu = false
                         },
                         modifier = Modifier.semantics {
+                            selected = isSelected
                             collectionItemInfo = CollectionItemInfo(
                                 rowIndex = index,
                                 rowSpan = 1,
@@ -158,7 +162,7 @@ fun CustomPlaybackSettingsShowcase(
                             )
                         },
                         leadingIcon = {
-                            AnimatedVisibility(index == selectedRepeatModeIndex) {
+                            AnimatedVisibility(isSelected) {
                                 Icon(
                                     imageVector = Icons.Default.Check,
                                     contentDescription = null,