Skip to content

Commit 865b0ee

Browse files
committed
Fixing TalkBack duplication
1 parent f8dc40e commit 865b0ee

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/AIBotConversationDetailScreen.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import androidx.compose.runtime.snapshotFlow
4040
import androidx.compose.ui.Alignment
4141
import androidx.compose.ui.Modifier
4242
import androidx.compose.ui.res.stringResource
43+
import androidx.compose.ui.semantics.clearAndSetSemantics
4344
import androidx.compose.ui.semantics.contentDescription
4445
import androidx.compose.ui.semantics.heading
4546
import androidx.compose.ui.semantics.semantics
@@ -206,7 +207,7 @@ private fun WelcomeHeader(userName: String) {
206207
modifier = Modifier
207208
.fillMaxWidth()
208209
.padding(vertical = 8.dp)
209-
.semantics(mergeDescendants = true) {
210+
.clearAndSetSemantics {
210211
contentDescription = welcomeDescription
211212
},
212213
colors = CardDefaults.cardColors(
@@ -293,7 +294,7 @@ private fun ChatInputBar(
293294
@Composable
294295
private fun MessageBubble(message: BotMessage, resources: android.content.res.Resources) {
295296
val timestamp = formatRelativeTime(message.date, resources)
296-
val author = stringResource(if (message.isWrittenByUser) R.string.ai_bot_you else R.string.ai_bot_odie)
297+
val author = stringResource(if (message.isWrittenByUser) R.string.ai_bot_you else R.string.ai_bot_support_bot)
297298
val messageDescription = "$author, $timestamp. ${message.formattedText}"
298299

299300
Row(
@@ -321,7 +322,7 @@ private fun MessageBubble(message: BotMessage, resources: android.content.res.Re
321322
)
322323
)
323324
.padding(12.dp)
324-
.semantics(mergeDescendants = true) {
325+
.clearAndSetSemantics {
325326
contentDescription = messageDescription
326327
}
327328
) {

WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import androidx.compose.ui.Modifier
4646
import androidx.compose.ui.platform.LocalResources
4747
import androidx.compose.ui.res.painterResource
4848
import androidx.compose.ui.res.stringResource
49+
import androidx.compose.ui.semantics.clearAndSetSemantics
4950
import androidx.compose.ui.semantics.contentDescription
5051
import androidx.compose.ui.semantics.heading
5152
import androidx.compose.ui.semantics.semantics
@@ -202,7 +203,7 @@ private fun ConversationHeader(
202203
modifier = Modifier
203204
.fillMaxWidth()
204205
.padding(vertical = 8.dp)
205-
.semantics(mergeDescendants = true) {
206+
.clearAndSetSemantics {
206207
contentDescription = headerDescription
207208
},
208209
horizontalArrangement = Arrangement.SpaceBetween,
@@ -273,7 +274,7 @@ private fun MessageItem(
273274
shape = RoundedCornerShape(8.dp)
274275
)
275276
.padding(16.dp)
276-
.semantics(mergeDescendants = true) {
277+
.clearAndSetSemantics {
277278
contentDescription = messageDescription
278279
}
279280
) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5131,7 +5131,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
51315131
<string name="ai_bot_empty_conversations_message">Start a new conversation to get help with your WordPress site or account.</string>
51325132
<string name="ai_bot_empty_conversations_button">Start conversation</string>
51335133
<string name="ai_bot_you">You</string>
5134-
<string name="ai_bot_odie" translatable="false">Odie</string>
5134+
<string name="ai_bot_support_bot">Support Bot</string>
51355135

51365136
<!-- AI Bot Support - Conversation Detail Screen -->
51375137
<string name="ai_bot_send_button_content_description">Send</string>

0 commit comments

Comments
 (0)