fix(a11y): Ensure images always have a contentDescription, or null in case it is decorative

AndyScherzinger · AndyScherzinger · commit eb37805eb6a2 · 2026-01-25T17:47:53.000+01:00
Signed-off-by: Andy Scherzinger &lt;info@andy-scherzinger.de&gt;
diff --git a/app/src/main/java/com/nextcloud/client/assistant/AssistantScreen.kt b/app/src/main/java/com/nextcloud/client/assistant/AssistantScreen.kt
@@ -315,7 +315,7 @@ private fun InputBar(sessionId: Long?, selectedTaskType: TaskTypeData?, viewMode
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_send),
-                        contentDescription = "Send message",
+                        contentDescription = stringResource(R.string.assistant_screen_send_message),
                         tint = MaterialTheme.colorScheme.primary
                     )
                 }
diff --git a/app/src/main/java/com/nextcloud/client/assistant/conversation/ConversationScreen.kt b/app/src/main/java/com/nextcloud/client/assistant/conversation/ConversationScreen.kt
@@ -88,7 +88,9 @@ fun ConversationScreen(viewModel: ConversationViewModel, close: () -> Unit, open
                 ) {
                     Icon(
                         imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
-                        contentDescription = "go back to assistant page"
+                        contentDescription = stringResource(
+                            R.string.assistant_screen_conversations_go_back_to_assistant
+                        )
                     )
                 }
                 Spacer(modifier = Modifier.width(8.dp))
diff --git a/app/src/main/java/com/nextcloud/client/assistant/extensions/TaskExtensions.kt b/app/src/main/java/com/nextcloud/client/assistant/extensions/TaskExtensions.kt
@@ -10,6 +10,7 @@
 package com.nextcloud.client.assistant.extensions
 
 import android.content.Context
+import androidx.compose.ui.res.stringResource
 import com.nextcloud.utils.date.DateFormatPattern
 import com.nextcloud.utils.date.DateFormatter
 import com.owncloud.android.R
@@ -46,6 +47,13 @@ fun Task.getStatusIcon(capability: OCCapability): Int =
         getStatusIconV1()
     }
 
+fun Task.getStatusIconDescription(capability: OCCapability): Int =
+    if (capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_30)) {
+        getStatusIconDescriptionV2()
+    } else {
+        getStatusIconDescriptionV1()
+    }
+
 private fun Task.getStatusIconV1(): Int = when (status) {
     "0" -> {
         R.drawable.ic_unknown
@@ -67,6 +75,27 @@ private fun Task.getStatusIconV1(): Int = when (status) {
     }
 }
 
+private fun Task.getStatusIconDescriptionV1(): Int = when (status) {
+    "0" -> {
+        R.string.assistant_task_status_unknown
+    }
+    "1" -> {
+        R.string.assistant_task_status_scheduled
+    }
+    "2" -> {
+        R.string.assistant_task_status_running
+    }
+    "3" -> {
+        R.string.assistant_task_status_successful
+    }
+    "4" -> {
+        R.string.assistant_task_status_failed
+    }
+    else -> {
+        R.string.assistant_task_status_unknown
+    }
+}
+
 private fun Task.getStatusIconV2(): Int = when (status) {
     "STATUS_UNKNOWN" -> {
         R.drawable.ic_unknown
@@ -88,6 +117,27 @@ private fun Task.getStatusIconV2(): Int = when (status) {
     }
 }
 
+private fun Task.getStatusIconDescriptionV2(): Int = when (status) {
+    "STATUS_UNKNOWN" -> {
+        R.string.assistant_task_status_unknown
+    }
+    "STATUS_SCHEDULED" -> {
+        R.string.assistant_task_status_scheduled
+    }
+    "STATUS_RUNNING" -> {
+        R.string.assistant_task_status_running
+    }
+    "STATUS_SUCCESSFUL" -> {
+        R.string.assistant_task_status_successful
+    }
+    "STATUS_FAILED" -> {
+        R.string.assistant_task_status_failed
+    }
+    else -> {
+        R.string.assistant_task_status_unknown
+    }
+}
+
 @Suppress("MagicNumber")
 fun Task.getModifiedAtRepresentation(context: Context): String? {
     if (lastUpdated == null) {
diff --git a/app/src/main/java/com/nextcloud/client/assistant/task/TaskStatusView.kt b/app/src/main/java/com/nextcloud/client/assistant/task/TaskStatusView.kt
@@ -24,10 +24,12 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.nextcloud.client.assistant.extensions.getModifiedAtRepresentation
 import com.nextcloud.client.assistant.extensions.getStatusIcon
+import com.nextcloud.client.assistant.extensions.getStatusIconDescription
 import com.owncloud.android.R
 import com.owncloud.android.lib.resources.assistant.v2.model.Task
 import com.owncloud.android.lib.resources.assistant.v2.model.TaskInput
@@ -46,13 +48,17 @@ fun TaskStatusView(task: Task, capability: OCCapability) {
         verticalAlignment = Alignment.CenterVertically
     ) {
         val iconId = task.getStatusIcon(capability)
+        val iconDescriptionId = task.getStatusIconDescription(capability)
         val description = task.getModifiedAtRepresentation(context)
 
         Image(
             painter = painterResource(id = iconId),
             modifier = Modifier.size(16.dp),
             colorFilter = ColorFilter.tint(color = colorResource(R.color.text_color)),
-            contentDescription = "status icon"
+            contentDescription = stringResource(
+                R.string.assistant_task_status_text,
+                stringResource(iconDescriptionId)
+            )
         )
 
         description?.let {
diff --git a/app/src/main/java/com/nextcloud/client/assistant/task/TaskView.kt b/app/src/main/java/com/nextcloud/client/assistant/task/TaskView.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -112,7 +113,7 @@ fun TaskView(task: Task, capability: OCCapability, showTaskActions: () -> Unit)
         ) {
             Icon(
                 imageVector = Icons.Filled.MoreVert,
-                contentDescription = "More button",
+                contentDescription = stringResource(R.string.overflow_menu),
                 tint = colorResource(R.color.text_color)
             )
         }
diff --git a/app/src/main/java/com/nextcloud/client/assistant/taskDetail/TaskDetailBottomSheet.kt b/app/src/main/java/com/nextcloud/client/assistant/taskDetail/TaskDetailBottomSheet.kt
@@ -77,7 +77,7 @@ fun TaskDetailBottomSheet(task: Task, showTaskActions: () -> Unit, dismiss: () -
                         IconButton(onClick = showTaskActions) {
                             Icon(
                                 imageVector = Icons.Filled.MoreVert,
-                                contentDescription = "More button",
+                                contentDescription = stringResource(R.string.overflow_menu),
                                 tint = colorResource(R.color.text_color)
                             )
                         }
@@ -99,7 +99,7 @@ fun TaskDetailBottomSheet(task: Task, showTaskActions: () -> Unit, dismiss: () -
             ) {
                 Image(
                     painter = painterResource(R.drawable.ic_assistant),
-                    contentDescription = "assistant icon",
+                    contentDescription = null,
                     modifier = Modifier.size(12.dp)
                 )
 
diff --git a/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt b/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt
@@ -24,6 +24,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.owncloud.android.R
@@ -55,7 +56,7 @@ fun TaskTypesRow(
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_history_back_arrow),
-                    contentDescription = "open conversation list button",
+                    contentDescription = stringResource(R.string.assistant_screen_task_bar_open_conversation_list),
                     tint = colorResource(R.color.text_color)
                 )
             }
diff --git a/app/src/main/java/com/nextcloud/ui/ClientIntegrationScreen.kt b/app/src/main/java/com/nextcloud/ui/ClientIntegrationScreen.kt
@@ -28,6 +28,7 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.nextcloud.android.lib.resources.clientintegration.ClientIntegrationUI
 import com.nextcloud.android.lib.resources.clientintegration.Element
@@ -38,6 +39,7 @@ import com.nextcloud.android.lib.resources.clientintegration.LayoutRow
 import com.nextcloud.android.lib.resources.clientintegration.LayoutText
 import com.nextcloud.android.lib.resources.clientintegration.LayoutURL
 import com.nextcloud.utils.extensions.getActivity
+import com.owncloud.android.R
 import com.owncloud.android.lib.resources.status.OCCapability
 import com.owncloud.android.utils.DisplayUtils
 
@@ -51,7 +53,7 @@ fun ClientIntegrationScreen(clientIntegrationUI: ClientIntegrationUI, baseUrl: S
             IconButton(onClick = { activity?.finish() }) {
                 Icon(
                     imageVector = Icons.Filled.Close,
-                    contentDescription = "Close"
+                    contentDescription = stringResource(R.string.dialog_close)
                 )
             }
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -68,8 +68,17 @@
     <string name="assistant_screen_task_create_fail_message">An error occurred while creating the task</string>
     <string name="assistant_screen_task_delete_success_message">Task successfully deleted</string>
     <string name="assistant_screen_task_delete_fail_message">An error occurred while deleting the task</string>
+    <string name="assistant_screen_task_bar_open_conversation_list">Open conversation list</string>
+    <string name="assistant_screen_conversations_go_back_to_assistant">Go back to assistant page</string>
+    <string name="assistant_screen_send_message">Send message</string>
     <string name="assistant_task_detail_screen_input_button_title">Input</string>
     <string name="assistant_task_detail_screen_output_button_title">Output</string>
+    <string name="assistant_task_status_text">Task status: %1$s</string>
+    <string name="assistant_task_status_unknown">unknown</string>
+    <string name="assistant_task_status_scheduled">scheduled</string>
+    <string name="assistant_task_status_running">running</string>
+    <string name="assistant_task_status_successful">successful</string>
+    <string name="assistant_task_status_failed">failed</string>
 
     <!-- Conversation Screen -->
     <string name="conversation_screen_title">Conversations</string>

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ private fun InputBar(sessionId: Long?, selectedTaskType: TaskTypeData?, viewMode`
`315`	`315`	`) {`
`316`	`316`	`Icon(`
`317`	`317`	`painter = painterResource(id = R.drawable.ic_send),`
`318`		`- contentDescription = "Send message",`
	`318`	`+ contentDescription = stringResource(R.string.assistant_screen_send_message),`
`319`	`319`	`tint = MaterialTheme.colorScheme.primary`
`320`	`320`	`)`
`321`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,9 @@ fun ConversationScreen(viewModel: ConversationViewModel, close: () -> Unit, open`
`88`	`88`	`) {`
`89`	`89`	`Icon(`
`90`	`90`	`imageVector = Icons.AutoMirrored.Outlined.ArrowBack,`
`91`		`- contentDescription = "go back to assistant page"`
	`91`	`+ contentDescription = stringResource(`
	`92`	`+ R.string.assistant_screen_conversations_go_back_to_assistant`
	`93`	`+ )`
`92`	`94`	`)`
`93`	`95`	`}`
`94`	`96`	`Spacer(modifier = Modifier.width(8.dp))`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ fun TaskDetailBottomSheet(task: Task, showTaskActions: () -> Unit, dismiss: () -`
`77`	`77`	`IconButton(onClick = showTaskActions) {`
`78`	`78`	`Icon(`
`79`	`79`	`imageVector = Icons.Filled.MoreVert,`
`80`		`- contentDescription = "More button",`
	`80`	`+ contentDescription = stringResource(R.string.overflow_menu),`
`81`	`81`	`tint = colorResource(R.color.text_color)`
`82`	`82`	`)`
`83`	`83`	`}`
`@@ -99,7 +99,7 @@ fun TaskDetailBottomSheet(task: Task, showTaskActions: () -> Unit, dismiss: () -`
`99`	`99`	`) {`
`100`	`100`	`Image(`
`101`	`101`	`painter = painterResource(R.drawable.ic_assistant),`
`102`		`- contentDescription = "assistant icon",`
	`102`	`+ contentDescription = null,`
`103`	`103`	`modifier = Modifier.size(12.dp)`
`104`	`104`	`)`
`105`	`105`