From 8b5366f9e26fffd47490de3f1a456b8ce6d9b404 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 7 Dec 2024 14:11:09 +0100 Subject: [PATCH 1/8] Add description to relay list selector in NewMediaView --- .../java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt index 499359526..c4dc90027 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt @@ -148,7 +148,7 @@ fun NewMediaView( ) { Icon( painter = painterResource(R.drawable.relays), - contentDescription = null, + contentDescription = stringRes(id = R.string.relay_list_selector), modifier = Modifier.height(25.dp), tint = MaterialTheme.colorScheme.onBackground, ) From 6faab55a55e4b96b59f7b0991aa533a06dbf1a2b Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 7 Dec 2024 14:35:26 +0100 Subject: [PATCH 2/8] Add content description to pushpin icon (just in case) --- .../main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt | 7 +++---- amethyst/src/main/res/values/strings.xml | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 73e3acfbd..9bbd04720 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -31,7 +31,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.OpenInNew import androidx.compose.material.icons.automirrored.filled.VolumeOff import androidx.compose.material.icons.automirrored.filled.VolumeUp -import androidx.compose.material.icons.filled.AddReaction +import androidx.compose.material.icons.automirrored.outlined.ArrowForwardIos import androidx.compose.material.icons.filled.Bolt import androidx.compose.material.icons.filled.Cancel import androidx.compose.material.icons.filled.Clear @@ -46,7 +46,6 @@ import androidx.compose.material.icons.filled.PushPin import androidx.compose.material.icons.filled.Report import androidx.compose.material.icons.filled.Share import androidx.compose.material.icons.outlined.AddReaction -import androidx.compose.material.icons.outlined.ArrowForwardIos import androidx.compose.material.icons.outlined.Bolt import androidx.compose.material.icons.outlined.PlayCircle import androidx.compose.material3.Icon @@ -469,7 +468,7 @@ fun PinIcon( ) { Icon( imageVector = Icons.Default.PushPin, - contentDescription = null, + contentDescription = stringRes(id = R.string.accessibility_pushpin), modifier = modifier, tint = tint, ) @@ -620,7 +619,7 @@ fun ZapSplitPreview() { tint = BitcoinOrange, ) Icon( - imageVector = Icons.Outlined.ArrowForwardIos, + imageVector = Icons.AutoMirrored.Outlined.ArrowForwardIos, contentDescription = stringRes(id = R.string.zaps), modifier = Modifier diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index 938353738..139e40195 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -1005,6 +1005,7 @@ Sealed message on. Click to turn off sealed message Send Play username as audio + Pushpin Scan QR code Navigate to the third-party wallet provider Alby It\'s not possible to reply a draft note From 54d0ec806d49a6958a200156d1edab70c3f64a0c Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 7 Dec 2024 15:10:24 +0100 Subject: [PATCH 3/8] Add content description to recommended apps icons --- .../amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt index 0712b337f..cd110952d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt @@ -1300,6 +1300,7 @@ private fun WatchApp( val appState by baseApp.live().metadata.observeAsState() var appLogo by remember(baseApp) { mutableStateOf(null) } + var appName by remember(baseApp) { mutableStateOf(null) } LaunchedEffect(key1 = appState) { withContext(Dispatchers.Default) { @@ -1308,6 +1309,12 @@ private fun WatchApp( if (newAppLogo != appLogo) { appLogo = newAppLogo } + + val newAppName = + (appState?.note?.event as? AppDefinitionEvent)?.appMetaData()?.name?.ifBlank { null } + if (newAppName != appName) { + appName = newAppName + } } } @@ -1321,7 +1328,7 @@ private fun WatchApp( ) { AsyncImage( model = appLogo, - contentDescription = null, + contentDescription = appName, modifier = remember { Modifier From 314cbe1a32f848c97f9beded76897835b1de5a73 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 7 Dec 2024 15:14:46 +0100 Subject: [PATCH 4/8] Add content description to recommended apps icons - refactored --- .../screen/loggedIn/profile/ProfileScreen.kt | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt index cd110952d..1b345f55b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt @@ -1302,18 +1302,15 @@ private fun WatchApp( var appLogo by remember(baseApp) { mutableStateOf(null) } var appName by remember(baseApp) { mutableStateOf(null) } - LaunchedEffect(key1 = appState) { + LaunchedEffect(appState) { withContext(Dispatchers.Default) { - val newAppLogo = - (appState?.note?.event as? AppDefinitionEvent)?.appMetaData()?.picture?.ifBlank { null } - if (newAppLogo != appLogo) { - appLogo = newAppLogo - } - - val newAppName = - (appState?.note?.event as? AppDefinitionEvent)?.appMetaData()?.name?.ifBlank { null } - if (newAppName != appName) { - appName = newAppName + (appState?.note?.event as? AppDefinitionEvent)?.appMetaData()?.let { metaData -> + metaData.picture?.ifBlank { null }?.let { newLogo -> + if (newLogo != appLogo) appLogo = newLogo + } + metaData.name?.ifBlank { null }?.let { newName -> + if (newName != appName) appName = newName + } } } } From 39a7d986511bba8a02e240419abb2f11a78d5609 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 7 Dec 2024 16:56:24 +0100 Subject: [PATCH 5/8] Add content description to icon in app definition --- .../vitorpamplona/amethyst/ui/note/types/AppDefinition.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt index f5f91715f..ec7a3a63c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt @@ -147,10 +147,10 @@ fun RenderAppDefinition( var zoomImageDialogOpen by remember { mutableStateOf(false) } Box(Modifier.size(100.dp)) { - it.picture?.let { + it.picture?.let { picture -> AsyncImage( - model = it, - contentDescription = null, + model = picture, + contentDescription = it.name, contentScale = ContentScale.FillWidth, modifier = Modifier @@ -163,7 +163,7 @@ fun RenderAppDefinition( .background(MaterialTheme.colorScheme.background) .combinedClickable( onClick = { zoomImageDialogOpen = true }, - onLongClick = { clipboardManager.setText(AnnotatedString(it)) }, + onLongClick = { clipboardManager.setText(AnnotatedString(picture)) }, ), ) } From 1972cdeafb5e1f36bc9bb92e0d63b2db1afa55f5 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 7 Dec 2024 21:06:21 +0100 Subject: [PATCH 6/8] Add content description to custom emojis --- .../java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt index 30034f7cf..3dcc749af 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt @@ -137,7 +137,7 @@ public fun RenderEmojiPack( IconButton(onClick = { onClick(emoji) }, modifier = Size35Modifier) { AsyncImage( model = emoji.url, - contentDescription = null, + contentDescription = emoji.code, modifier = Size35Modifier, ) } @@ -148,7 +148,7 @@ public fun RenderEmojiPack( ) { AsyncImage( model = emoji.url, - contentDescription = null, + contentDescription = emoji.code, modifier = Size35Modifier, ) } From 46b70b719acdaae9806b7dda046c6dfeb107b82a Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 7 Dec 2024 21:21:47 +0100 Subject: [PATCH 7/8] re-add key to LaunchedEffect --- .../amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt index 1b345f55b..4c2b4c252 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt @@ -1302,7 +1302,7 @@ private fun WatchApp( var appLogo by remember(baseApp) { mutableStateOf(null) } var appName by remember(baseApp) { mutableStateOf(null) } - LaunchedEffect(appState) { + LaunchedEffect(key1 = appState) { withContext(Dispatchers.Default) { (appState?.note?.event as? AppDefinitionEvent)?.appMetaData()?.let { metaData -> metaData.picture?.ifBlank { null }?.let { newLogo -> From 1b0ff52c617070fa1e11aff101881331fc8c6817 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 7 Dec 2024 21:29:34 +0100 Subject: [PATCH 8/8] translations --- amethyst/src/main/res/values-cs/strings.xml | 1 + amethyst/src/main/res/values-de/strings.xml | 1 + amethyst/src/main/res/values-pt-rBR/strings.xml | 1 + amethyst/src/main/res/values-sv-rSE/strings.xml | 1 + 4 files changed, 4 insertions(+) diff --git a/amethyst/src/main/res/values-cs/strings.xml b/amethyst/src/main/res/values-cs/strings.xml index f6ec8d37b..f61bdbad8 100644 --- a/amethyst/src/main/res/values-cs/strings.xml +++ b/amethyst/src/main/res/values-cs/strings.xml @@ -834,6 +834,7 @@ Přehrát uživatelské jméno jako audio Skenovat QR kód Přejít na poskytovatele peněženky třetí strany Alby + Připínáček Není možné odpovědět na koncept Není možné citovat koncept Není možné reagovat na koncept diff --git a/amethyst/src/main/res/values-de/strings.xml b/amethyst/src/main/res/values-de/strings.xml index aaff2fcb7..3ac66502a 100644 --- a/amethyst/src/main/res/values-de/strings.xml +++ b/amethyst/src/main/res/values-de/strings.xml @@ -839,6 +839,7 @@ anz der Bedingungen ist erforderlich Benutzernamen als Audio abspielen QR-Code scannen Navigieren Sie zum Drittanbieter-Wallet-Anbieter Alby + Reißzwecke Es ist nicht möglich, auf einen Entwurf zu antworten Es ist nicht möglich, einen Entwurf zu zitieren Es ist nicht möglich, auf einen Entwurf zu reagieren diff --git a/amethyst/src/main/res/values-pt-rBR/strings.xml b/amethyst/src/main/res/values-pt-rBR/strings.xml index da514a9e8..af7559137 100644 --- a/amethyst/src/main/res/values-pt-rBR/strings.xml +++ b/amethyst/src/main/res/values-pt-rBR/strings.xml @@ -834,6 +834,7 @@ Reproduzir nome de usuário como áudio Escanear código QR Navegar para o provedor de carteira de terceiros Alby + Piones Não é possível responder uma nota em rascunho Não é possível citar uma nota em rascunho Não é possível reagir uma nota em rascunho diff --git a/amethyst/src/main/res/values-sv-rSE/strings.xml b/amethyst/src/main/res/values-sv-rSE/strings.xml index 7cb8ff863..e908b2c16 100644 --- a/amethyst/src/main/res/values-sv-rSE/strings.xml +++ b/amethyst/src/main/res/values-sv-rSE/strings.xml @@ -833,6 +833,7 @@ Spela upp användarnamn som ljud Skanna QR-kod Navigera till tredjeparts plånboksleverantören Alby + Häftstift Det går inte att svara på ett utkast Det går inte att citera ett utkast Det går inte att reagera på ett utkast