Merge pull request #1215 from davotoula/improve-accessibility-add-content-descriptions
Improve accessibility add content descriptions
This commit is contained in:
@@ -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,
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)) },
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
}
|
||||
|
||||
+9
-5
@@ -1300,13 +1300,17 @@ private fun WatchApp(
|
||||
val appState by baseApp.live().metadata.observeAsState()
|
||||
|
||||
var appLogo by remember(baseApp) { mutableStateOf<String?>(null) }
|
||||
var appName by remember(baseApp) { mutableStateOf<String?>(null) }
|
||||
|
||||
LaunchedEffect(key1 = appState) {
|
||||
withContext(Dispatchers.Default) {
|
||||
val newAppLogo =
|
||||
(appState?.note?.event as? AppDefinitionEvent)?.appMetaData()?.picture?.ifBlank { null }
|
||||
if (newAppLogo != appLogo) {
|
||||
appLogo = newAppLogo
|
||||
(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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1321,7 +1325,7 @@ private fun WatchApp(
|
||||
) {
|
||||
AsyncImage(
|
||||
model = appLogo,
|
||||
contentDescription = null,
|
||||
contentDescription = appName,
|
||||
modifier =
|
||||
remember {
|
||||
Modifier
|
||||
|
||||
@@ -834,6 +834,7 @@
|
||||
<string name="accessibility_play_username">Přehrát uživatelské jméno jako audio</string>
|
||||
<string name="accessibility_scan_qr_code">Skenovat QR kód</string>
|
||||
<string name="accessibility_navigate_to_alby">Přejít na poskytovatele peněženky třetí strany Alby</string>
|
||||
<string name="accessibility_pushpin">Připínáček</string>
|
||||
<string name="it_s_not_possible_to_reply_to_a_draft_note">Není možné odpovědět na koncept</string>
|
||||
<string name="it_s_not_possible_to_quote_to_a_draft_note">Není možné citovat koncept</string>
|
||||
<string name="it_s_not_possible_to_react_to_a_draft_note">Není možné reagovat na koncept</string>
|
||||
|
||||
@@ -839,6 +839,7 @@ anz der Bedingungen ist erforderlich</string>
|
||||
<string name="accessibility_play_username">Benutzernamen als Audio abspielen</string>
|
||||
<string name="accessibility_scan_qr_code">QR-Code scannen</string>
|
||||
<string name="accessibility_navigate_to_alby">Navigieren Sie zum Drittanbieter-Wallet-Anbieter Alby</string>
|
||||
<string name="accessibility_pushpin">Reißzwecke</string>
|
||||
<string name="it_s_not_possible_to_reply_to_a_draft_note">Es ist nicht möglich, auf einen Entwurf zu antworten</string>
|
||||
<string name="it_s_not_possible_to_quote_to_a_draft_note">Es ist nicht möglich, einen Entwurf zu zitieren</string>
|
||||
<string name="it_s_not_possible_to_react_to_a_draft_note">Es ist nicht möglich, auf einen Entwurf zu reagieren</string>
|
||||
|
||||
@@ -834,6 +834,7 @@
|
||||
<string name="accessibility_play_username">Reproduzir nome de usuário como áudio</string>
|
||||
<string name="accessibility_scan_qr_code">Escanear código QR</string>
|
||||
<string name="accessibility_navigate_to_alby">Navegar para o provedor de carteira de terceiros Alby</string>
|
||||
<string name="accessibility_pushpin">Piones</string>
|
||||
<string name="it_s_not_possible_to_reply_to_a_draft_note">Não é possível responder uma nota em rascunho</string>
|
||||
<string name="it_s_not_possible_to_quote_to_a_draft_note">Não é possível citar uma nota em rascunho</string>
|
||||
<string name="it_s_not_possible_to_react_to_a_draft_note">Não é possível reagir uma nota em rascunho</string>
|
||||
|
||||
@@ -833,6 +833,7 @@
|
||||
<string name="accessibility_play_username">Spela upp användarnamn som ljud</string>
|
||||
<string name="accessibility_scan_qr_code">Skanna QR-kod</string>
|
||||
<string name="accessibility_navigate_to_alby">Navigera till tredjeparts plånboksleverantören Alby</string>
|
||||
<string name="accessibility_pushpin">Häftstift</string>
|
||||
<string name="it_s_not_possible_to_reply_to_a_draft_note">Det går inte att svara på ett utkast</string>
|
||||
<string name="it_s_not_possible_to_quote_to_a_draft_note">Det går inte att citera ett utkast</string>
|
||||
<string name="it_s_not_possible_to_react_to_a_draft_note">Det går inte att reagera på ett utkast</string>
|
||||
|
||||
@@ -1005,6 +1005,7 @@
|
||||
<string name="accessibility_turn_off_sealed_message">Sealed message on. Click to turn off sealed message</string>
|
||||
<string name="accessibility_send">Send</string>
|
||||
<string name="accessibility_play_username">Play username as audio</string>
|
||||
<string name="accessibility_pushpin">Pushpin</string>
|
||||
<string name="accessibility_scan_qr_code">Scan QR code</string>
|
||||
<string name="accessibility_navigate_to_alby">Navigate to the third-party wallet provider Alby</string>
|
||||
<string name="it_s_not_possible_to_reply_to_a_draft_note">It\'s not possible to reply a draft note</string>
|
||||
|
||||
Reference in New Issue
Block a user