From 79e39e7e4fc67caa962d523f9510510739579a9e Mon Sep 17 00:00:00 2001 From: davotoula Date: Mon, 2 Mar 2026 16:52:50 +0000 Subject: [PATCH 1/5] unrelated code cleanup --- .../nip51Lists/favoriteRelays/FavoriteRelayListState.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/favoriteRelays/FavoriteRelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/favoriteRelays/FavoriteRelayListState.kt index d3f78e344..ac7cfe9bd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/favoriteRelays/FavoriteRelayListState.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/favoriteRelays/FavoriteRelayListState.kt @@ -97,18 +97,18 @@ class FavoriteRelayListState( return saveRelayList(current) } - suspend fun saveRelayList(FavoriteRelays: List): FavoriteRelayListEvent { + suspend fun saveRelayList(favoriteRelays: List): FavoriteRelayListEvent { val relayListForFavorite = getFavoriteRelayList() return if (relayListForFavorite != null && relayListForFavorite.tags.isNotEmpty()) { FavoriteRelayListEvent.updateRelayList( earlierVersion = relayListForFavorite, - relays = FavoriteRelays, + relays = favoriteRelays, signer = signer, ) } else { FavoriteRelayListEvent.create( - relays = FavoriteRelays, + relays = favoriteRelays, signer = signer, ) } From 434a7dcf52b8b7a46170c3c5023c9088070b526d Mon Sep 17 00:00:00 2001 From: davotoula Date: Mon, 2 Mar 2026 16:53:40 +0000 Subject: [PATCH 2/5] correct pause button accessibility label --- .../service/playback/composable/controls/PlayPauseButton.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/PlayPauseButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/PlayPauseButton.kt index 0160cf2cc..ae4682787 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/PlayPauseButton.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/PlayPauseButton.kt @@ -122,7 +122,7 @@ fun PlayPauseButton( Icon( imageVector = Icons.Default.Pause, modifier = Size50Modifier, - contentDescription = stringRes(R.string.play), + contentDescription = stringRes(R.string.pause), ) } } From 937f30b48dc8ee4a04ed2da25addb5d518de2df6 Mon Sep 17 00:00:00 2001 From: davotoula Date: Mon, 2 Mar 2026 16:54:24 +0000 Subject: [PATCH 3/5] add content description to poll deadline date icon --- .../amethyst/ui/note/creators/polls/PollDeadlinePicker.kt | 2 +- amethyst/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/polls/PollDeadlinePicker.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/polls/PollDeadlinePicker.kt index 538735cda..f67671f58 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/polls/PollDeadlinePicker.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/polls/PollDeadlinePicker.kt @@ -99,7 +99,7 @@ fun PollDeadlinePicker(model: ShortNotePostViewModel) { modifier = Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically, ) { - Icon(Icons.Default.DateRange, contentDescription = null) + Icon(Icons.Default.DateRange, contentDescription = stringResource(R.string.accessibility_select_date)) Spacer(Modifier.width(12.dp)) if (model.closedAt < TimeUtils.oneMinuteFromNow()) { diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index 7b0ec85e7..7a30c3b25 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -1375,6 +1375,7 @@ Pushpin Scan QR code Navigate to the third-party wallet provider Alby + Select date It\'s not possible to reply a draft note It\'s not possible to quote a draft note It\'s not possible to react a draft note From daebea262a9b77249764ae207fe281f111562220 Mon Sep 17 00:00:00 2001 From: davotoula Date: Mon, 2 Mar 2026 16:56:28 +0000 Subject: [PATCH 4/5] add user avatar content descriptions in shared components --- commons/src/commonMain/composeResources/values/strings.xml | 3 +++ .../vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt | 5 +++++ .../amethyst/commons/ui/components/UserSearchCard.kt | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/commons/src/commonMain/composeResources/values/strings.xml b/commons/src/commonMain/composeResources/values/strings.xml index 7403080ba..2ba92eb3b 100644 --- a/commons/src/commonMain/composeResources/values/strings.xml +++ b/commons/src/commonMain/composeResources/values/strings.xml @@ -50,4 +50,7 @@ Your encrypted direct messages will appear here. Notifications Mentions, replies, and reactions will appear here. + + + User avatar diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt index df25cb8c7..021b7530f 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt @@ -35,9 +35,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.commons.model.User +import com.vitorpamplona.amethyst.commons.resources.Res +import com.vitorpamplona.amethyst.commons.resources.accessibility_user_avatar import com.vitorpamplona.amethyst.commons.ui.components.UserAvatar import com.vitorpamplona.amethyst.commons.ui.theme.ChatSize34dp import com.vitorpamplona.amethyst.commons.ui.theme.ChatStdPadding +import org.jetbrains.compose.resources.stringResource /** * Shared chatroom header for a single-user conversation. @@ -67,6 +70,7 @@ fun ChatroomHeader( userHex = user.pubkeyHex, pictureUrl = user.profilePicture(), size = ChatSize34dp, + contentDescription = stringResource(Res.string.accessibility_user_avatar), ) Column(modifier = Modifier.padding(start = 10.dp)) { @@ -114,6 +118,7 @@ fun GroupChatroomHeader( userHex = firstUser.pubkeyHex, pictureUrl = firstUser.profilePicture(), size = ChatSize34dp, + contentDescription = stringResource(Res.string.accessibility_user_avatar), ) } diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt index eb2b0d51d..2092ebd63 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt @@ -39,6 +39,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.commons.model.User +import com.vitorpamplona.amethyst.commons.resources.Res +import com.vitorpamplona.amethyst.commons.resources.accessibility_user_avatar +import org.jetbrains.compose.resources.stringResource /** * A card displaying user search result with avatar, name, and nip05/pubkey. @@ -69,7 +72,7 @@ fun UserSearchCard( userHex = user.pubkeyHex, pictureUrl = user.profilePicture(), size = 40.dp, - contentDescription = "Profile picture", + contentDescription = stringResource(Res.string.accessibility_user_avatar), ) Column(modifier = Modifier.weight(1f)) { From 49ea2a9a5a7b85a88c8edec02f39b3f4f90229ba Mon Sep 17 00:00:00 2001 From: davotoula Date: Mon, 2 Mar 2026 16:57:12 +0000 Subject: [PATCH 5/5] localize hardcoded Navigate string in UserSearchCard --- commons/src/commonMain/composeResources/values/strings.xml | 1 + .../amethyst/commons/ui/components/UserSearchCard.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/commons/src/commonMain/composeResources/values/strings.xml b/commons/src/commonMain/composeResources/values/strings.xml index 2ba92eb3b..ef99a2aa0 100644 --- a/commons/src/commonMain/composeResources/values/strings.xml +++ b/commons/src/commonMain/composeResources/values/strings.xml @@ -53,4 +53,5 @@ User avatar + Navigate diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt index 2092ebd63..14e41bbce 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt @@ -40,6 +40,7 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.commons.model.User import com.vitorpamplona.amethyst.commons.resources.Res +import com.vitorpamplona.amethyst.commons.resources.accessibility_navigate import com.vitorpamplona.amethyst.commons.resources.accessibility_user_avatar import org.jetbrains.compose.resources.stringResource @@ -100,7 +101,7 @@ fun UserSearchCard( Icon( Icons.AutoMirrored.Filled.ArrowForward, - contentDescription = "Navigate", + contentDescription = stringResource(Res.string.accessibility_navigate), tint = MaterialTheme.colorScheme.onSurfaceVariant, ) }