From b2f92bc166c64913131675d33ad2f176fce9c5e8 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Thu, 19 Oct 2023 13:32:34 +1030
Subject: [PATCH] Add contentDescriptions to radio buttons

---
 .../java/org/thoughtcrime/securesms/ui/Components.kt   | 10 ++++++++++
 app/src/main/res/values/strings.xml                    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
index f0810ea61f..19d82bddc0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
@@ -40,7 +40,10 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -150,6 +153,7 @@ fun <T> TitledRadioButton(option: RadioOption<T>, onClick: () -> Unit) {
             .clickable { if (!option.selected) onClick() }
             .heightIn(min = 60.dp)
             .padding(horizontal = 32.dp)
+            .contentDescription(option.contentDescription)
     ) {
         Column(modifier = Modifier
             .weight(1f)
@@ -180,6 +184,12 @@ fun <T> TitledRadioButton(option: RadioOption<T>, onClick: () -> Unit) {
     }
 }
 
+@Composable
+fun Modifier.contentDescription(text: GetString): Modifier {
+    val context = LocalContext.current
+    return semantics { contentDescription = text(context) }
+}
+
 @Composable
 fun OutlineButton(text: String, modifier: Modifier = Modifier, onClick: () -> Unit) {
     OutlinedButton(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e8ad843a18..0395f76d3a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -159,7 +159,7 @@
     <string name="AccessibilityId_disappearing_messages_timer">Disappearing messages timer</string>
     <string name="AccessibilityId_set_button">Set button</string>
     <string name="AccessibilityId_time_option">Time option</string>
-    <string name="AccessibilityId_disable_disappearing_messages">Disable disappearing messages (Off option)</string>
+    <string name="AccessibilityId_disable_disappearing_messages">Disable disappearing messages</string>
     <string name="AccessibilityId_configuration_message">Configuration message</string>
     <string name="AccessibilityId_disappearing_messages_type_and_time">Disappearing messages type and time</string>
     <string name="AccessibilityId_conversation_header_name">Conversation header name</string>