feat: Add Accessibility strings to WhatsNew #WPB-9835 🍒

app/src/main/kotlin/com/wire/android/ui/common/AppExtensions.kt

@@ -30,8 +30,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.selected
 import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.stateDescription
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.flowWithLifecycle
@@ -59,17 +59,22 @@ import kotlin.coroutines.EmptyCoroutineContext
 
 @SuppressLint("ComposeComposableModifier")
 @Composable
-fun Modifier.selectableBackground(isSelected: Boolean, onClick: () -> Unit): Modifier {
+fun Modifier.selectableBackground(
+    isSelected: Boolean,
+    onClickDescription: String = stringResource(id = R.string.content_description_select_label),
+    onClick: () -> Unit
+): Modifier {
     val onItemClick = Clickable(
         enabled = !isSelected,
         onClick = onClick,
-        onClickDescription = stringResource(id = R.string.content_description_select_label)
+        onClickDescription = onClickDescription
     )
-    val selectedDescription = stringResource(id = R.string.content_description_selected_label)
 
     return this
         .clickable(onItemClick)
-        .semantics { stateDescription = if (isSelected) selectedDescription else "" }
+        .semantics {
+            if (isSelected) selected = true // So TalkBack ignores selection when it's not selected
+        }
 }
 
 @Composable

app/src/main/kotlin/com/wire/android/ui/common/Logo.kt

@@ -24,14 +24,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import com.wire.android.R
 
 @Composable
 fun Logo(modifier: Modifier = Modifier) {
     Image(
         painter = painterResource(id = R.drawable.ic_wire_logo),
-        contentDescription = stringResource(id = R.string.content_description_app_logo),
+        contentDescription = null,
         contentScale = ContentScale.Fit,
         modifier = modifier,
         colorFilter = ColorFilter.tint(colorsScheme().onSurface)

app/src/main/kotlin/com/wire/android/ui/common/avatar/UserProfileAvatar.kt

@@ -270,7 +270,8 @@ private fun UserAvatar(
             nameBasedAvatar = avatarData.nameBasedAvatar!!,
             type = type,
             size = size,
-            modifier = modifier
+            modifier = modifier,
+            contentDescription = contentDescription
         )
     } else {
         val painter = painter(avatarData, showPlaceholderIfNoAsset, withCrossfadeAnimation)
@@ -290,12 +291,12 @@ private fun DefaultInitialsAvatar(
     type: UserProfileAvatarType,
     size: Dp,
     modifier: Modifier = Modifier,
+    contentDescription: String? = stringResource(R.string.content_description_user_avatar),
 ) {
-    val contentDescription = stringResource(R.string.content_description_user_avatar)
     Box(
         contentAlignment = Alignment.Center,
         modifier = modifier
-            .semantics { this.contentDescription = contentDescription }
+            .semantics { this.contentDescription = contentDescription ?: "" }
             .size(size)
             .clip(CircleShape)
             .background(

app/src/main/kotlin/com/wire/android/ui/home/conversations/search/InternalContactSearchResultItem.kt

@@ -26,10 +26,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.selected
 import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.stateDescription
-import com.wire.android.R
 import com.wire.android.appLogger
 import com.wire.android.model.Clickable
 import com.wire.android.model.ItemActionType
@@ -63,7 +61,6 @@ fun InternalContactSearchResultItem(
     actionType: ItemActionType,
     modifier: Modifier = Modifier
 ) {
-    val selectedDescription = stringResource(id = R.string.content_description_selected_label)
     RowItemTemplate(
         leadingIcon = { UserProfileAvatar(avatarData) },
         titleStartPadding = dimensions().spacing0x,
@@ -112,7 +109,7 @@ fun InternalContactSearchResultItem(
         modifier = modifier
             .padding(start = dimensions().spacing8x)
             .semantics {
-                if (actionType.checkable && isSelected) stateDescription = selectedDescription
+                if (actionType.checkable && isSelected) selected = true
             }
     )
 }

app/src/main/kotlin/com/wire/android/ui/home/drawer/HomeDrawer.kt

@@ -43,6 +43,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.wire.android.R
 import com.wire.android.navigation.HomeDestination
 import com.wire.android.ui.common.Logo
 import com.wire.android.ui.common.dimensions
@@ -122,11 +123,11 @@ fun DrawerItem(destination: HomeDestination, selected: Boolean, unreadCount: Int
             .fillMaxWidth()
             .height(40.dp)
             .background(backgroundColor)
-            .selectableBackground(selected) { onItemClick() },
+            .selectableBackground(selected, stringResource(R.string.content_description_open_label), onItemClick),
     ) {
         Image(
             painter = painterResource(id = destination.icon),
-            contentDescription = stringResource(destination.title),
+            contentDescription = null,
             colorFilter = ColorFilter.tint(contentColor),
             contentScale = ContentScale.Fit,
             modifier = Modifier.padding(start = dimensions().spacing16x, end = dimensions().spacing16x)

app/src/main/kotlin/com/wire/android/ui/home/whatsnew/WhatsNewItem.kt

@@ -30,6 +30,8 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
 import com.ramcosta.composedestinations.spec.Direction
 import com.wire.android.R
 import com.wire.android.model.Clickable
@@ -51,6 +53,7 @@ fun WhatsNewItem(
     title: String? = null,
     boldTitle: Boolean = false,
     text: String? = null,
+    contentDescription: String = "${title ?: ""} ${text ?: ""}",
     @DrawableRes trailingIcon: Int? = null,
     onRowPressed: Clickable = Clickable(false),
     isLoading: Boolean = false,
@@ -84,7 +87,7 @@ fun WhatsNewItem(
             trailingIcon?.let {
                 Icon(
                     painter = painterResource(id = trailingIcon),
-                    contentDescription = "",
+                    contentDescription = null,
                     tint = MaterialTheme.wireColorScheme.onSecondaryButtonEnabled,
                     modifier = Modifier
                         .defaultMinSize(dimensions().wireIconButtonSize)
@@ -94,7 +97,9 @@ fun WhatsNewItem(
             } ?: Icons.Filled.ChevronRight
         },
         clickable = onRowPressed,
-        modifier = modifier.padding(vertical = dimensions().spacing4x)
+        modifier = modifier
+            .padding(vertical = dimensions().spacing4x)
+            .clearAndSetSemantics { this.contentDescription = contentDescription }
     )
 }
 

app/src/main/kotlin/com/wire/android/ui/home/whatsnew/WhatsNewScreen.kt

@@ -27,6 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 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 androidx.hilt.navigation.compose.hiltViewModel
 import com.wire.android.BuildConfig
@@ -70,6 +71,7 @@ fun WhatsNewScreenContent(
     lazyListState: LazyListState = rememberLazyListState()
 ) {
     val context = LocalContext.current
+    val openLinkLabel = stringResource(R.string.content_description_open_link_label)
     LazyColumn(
         state = lazyListState,
         modifier = modifier.fillMaxSize()
@@ -80,6 +82,7 @@ fun WhatsNewScreenContent(
                     add(WhatsNewItem.WelcomeToNewAndroidApp)
                 },
                 onItemClicked = onItemClicked,
+                onItemClickedDescription = openLinkLabel,
                 isLoading = false,
             )
         }
@@ -119,6 +122,7 @@ fun WhatsNewScreenContent(
                 }
             },
             onItemClicked = onItemClicked,
+            onItemClickedDescription = openLinkLabel,
             isLoading = state.isLoading,
         )
     }
@@ -128,17 +132,30 @@ private fun LazyListScope.folderWithElements(
     header: String? = null,
     items: List<WhatsNewItem>,
     onItemClicked: (WhatsNewItem) -> Unit,
+    onItemClickedDescription: String,
     isLoading: Boolean,
 ) {
     folderWithElements(
         header = header?.uppercase(),
         items = items.associateBy { it.id }
     ) { item ->
+        val contentDescription = when (item) {
+            WhatsNewItem.WelcomeToNewAndroidApp -> stringResource(R.string.content_description_whats_new_welcome_item)
+            is WhatsNewItem.AllAndroidReleaseNotes -> stringResource(R.string.content_description_whats_new_all_releases_item)
+            is WhatsNewItem.AndroidReleaseNotes ->
+                stringResource(R.string.content_description_whats_new_release_item, item.title.asString(), item.text?.asString() ?: "")
+        }
         WhatsNewItem(
             title = item.title.asString(),
             boldTitle = item.boldTitle,
             text = item.text?.asString(),
-            onRowPressed = remember(isLoading) { Clickable(enabled = !isLoading) { onItemClicked(item) } },
+            onRowPressed = remember(isLoading) {
+                Clickable(
+                    enabled = !isLoading,
+                    onClickDescription = onItemClickedDescription
+                ) { onItemClicked(item) }
+            },
+            contentDescription = contentDescription,
             trailingIcon = R.drawable.ic_arrow_right,
             isLoading = isLoading,
         )

app/src/main/res/values-es/strings.xml

@@ -77,7 +77,6 @@
     <string name="label_and">y</string>
     <string name="label_retry">Reintentar</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Logo de la aplicación</string>
     <string name="content_description_reveal_password">Mostrar contraseña</string>
     <string name="content_description_hide_password">Ocultar contraseña</string>
     <string name="content_description_search_back">Icono de búsqueda atrás</string>

app/src/main/res/values-et/strings.xml

@@ -59,7 +59,6 @@
     <string name="label_and">ja</string>
     <string name="label_retry">Proovi uuesti</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Rakenduse logo</string>
     <string name="content_description_reveal_password">Kuva parool</string>
     <string name="content_description_hide_password">Peida parool</string>
     <string name="content_description_search_back">Otsi tagasi ikoon</string>

app/src/main/res/values-fr/strings.xml

@@ -78,7 +78,6 @@
     <string name="label_retry">Réessayer</string>
     <string name="label_draft">Brouillons</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Logo de l\'application</string>
     <string name="content_description_reveal_password">Afficher le mot de passe</string>
     <string name="content_description_hide_password">Cacher le mot de passe</string>
     <string name="content_description_search_back">Icône de retour de recherche</string>

app/src/main/res/values-hr/strings.xml

@@ -76,7 +76,6 @@
     <string name="label_and">i</string>
     <string name="label_retry">Pokušaj ponovo</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Logotip aplikacije</string>
     <string name="content_description_reveal_password">Prikaži lozinku</string>
     <string name="content_description_hide_password">Sakrij lozinku</string>
     <string name="content_description_search_back">Ikona za povratak</string>

app/src/main/res/values-hu/strings.xml

@@ -83,7 +83,6 @@
     <string name="label_retry">Újra</string>
     <string name="label_draft">*Piszkozat*</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">App logó</string>
     <string name="content_description_reveal_password">Jelszó megjelenítése</string>
     <string name="content_description_hide_password">Jelszó elrejtése</string>
     <string name="content_description_search_back">Keresés vissza ikon</string>

app/src/main/res/values-it/strings.xml

@@ -81,7 +81,6 @@
     <string name="label_and">e</string>
     <string name="label_retry">Riprova</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Logo dell\'app</string>
     <string name="content_description_reveal_password">Mostra la password</string>
     <string name="content_description_hide_password">Nascondi la password</string>
     <string name="content_description_search_back">Icona di ricerca all\'indietro</string>

app/src/main/res/values-ja/strings.xml

@@ -80,7 +80,6 @@
     <string name="label_and">と</string>
     <string name="label_retry">再試行</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">アプリのロゴ</string>
     <string name="content_description_reveal_password">パスワードを表示</string>
     <string name="content_description_hide_password">パスワードを非表示</string>
     <string name="content_description_search_back">検索に戻るアイコン</string>

app/src/main/res/values-pl/strings.xml

@@ -60,7 +60,6 @@
     <string name="label_and">i</string>
     <string name="label_retry">Pon&#243;w pr&#243;b&#281;</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Logo aplikacji</string>
     <string name="content_description_reveal_password">Poka&#380; has&#322;o</string>
     <string name="content_description_hide_password">Ukryj has&#322;o</string>
     <string name="content_description_search_back">Ikona wyszukiwania wstecz</string>

app/src/main/res/values-pt/strings.xml

@@ -78,7 +78,6 @@
     <string name="label_retry">Tentar novamente</string>
     <string name="label_draft">*Rascunho*</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Logo do aplicativo</string>
     <string name="content_description_reveal_password">Mostrar senha</string>
     <string name="content_description_hide_password">Ocultar senha</string>
     <string name="content_description_search_back">Ícone de busca</string>

app/src/main/res/values-ru/strings.xml

@@ -85,7 +85,6 @@
     <string name="label_retry">Повторить</string>
     <string name="label_draft">*Черновик*</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Логотип приложения</string>
     <string name="content_description_reveal_password">Показать пароль</string>
     <string name="content_description_hide_password">Скрыть пароль</string>
     <string name="content_description_search_back">Значок возврата поиска</string>

app/src/main/res/values-si/strings.xml

@@ -82,7 +82,6 @@
     <string name="label_retry">නැවත</string>
     <string name="label_draft">*කටුපිටපත*</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">යෙදුමේ ලාංඡනය</string>
     <string name="content_description_reveal_password">මුරපදය පෙන්වන්න</string>
     <string name="content_description_hide_password">මුරපදය සඟවන්න</string>
     <string name="content_description_search_back">ආපසු සොයන්න නිරූපකය</string>

app/src/main/res/values-sv/strings.xml

@@ -69,7 +69,6 @@
     <string name="label_retry">Försök igen</string>
     <string name="label_draft">*Utkast*</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Appens logga</string>
     <string name="content_description_reveal_password">Visa lösenord</string>
     <string name="content_description_hide_password">Dölj lösenord</string>
     <string name="content_description_clear_content">Rensa bort innehåll</string>

app/src/main/res/values-tr/strings.xml

@@ -81,7 +81,6 @@
     <string name="label_retry">Yeniden Dene</string>
     <string name="label_draft">Taslaklar</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Uygulama Simgesi</string>
     <string name="content_description_reveal_password">Şifreyi göster</string>
     <string name="content_description_hide_password">Parolayı gizle</string>
     <string name="content_description_search_back">Geri arama simgesi</string>

app/src/main/res/values-uk/strings.xml

@@ -67,7 +67,6 @@
     <string name="label_and">і</string>
     <string name="label_retry">Повторити</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">Логотип додатка</string>
     <string name="content_description_reveal_password">Показати пароль</string>
     <string name="content_description_hide_password">Приховати пароль</string>
     <string name="content_description_clear_content">Видалити вміст</string>

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

@@ -87,7 +87,6 @@
     <string name="label_retry">Retry</string>
     <string name="label_draft">*Draft*</string>
     <!-- Content descriptions https://wearezeta.atlassian.net/wiki/spaces/AR/pages/122520039/Code+Style+Guideline#Content-description-strings -->
-    <string name="content_description_app_logo">App Logo</string>
     <string name="content_description_reveal_password">Show password</string>
     <string name="content_description_hide_password">Hide password</string>
     <string name="content_description_search_back">Search back icon</string>
@@ -238,6 +237,9 @@
     <string name="content_description_login_email_field">enter your email or username</string>
     <string name="content_description_login_password_field">enter your password</string>
     <string name="content_description_login_sso_code_field">enter your SSO code or Wire email</string>
+    <string name="content_description_whats_new_welcome_item">Welcome to Wire\'s New Android App, link to support page</string>
+    <string name="content_description_whats_new_all_releases_item">All Android release notes, link to release note overview</string>
+    <string name="content_description_whats_new_release_item">%1$s, %2$s, link to release details</string>
     <string name="content_description_empty"> </string>
     <!-- Non translatable strings-->
     <string name="url_android_release_notes" translatable="false">https://medium.com/wire-news/android-updates/home</string>