From 4897c28ed31f4b1d34242f60824ca7c2caf16908 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Mon, 4 Mar 2024 14:38:48 +0000 Subject: [PATCH 01/13] New Crowdin translations by GitHub Action --- app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 2 ++ app/src/main/res/values-sv-rSE/strings.xml | 2 ++ 4 files changed, 6 insertions(+) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index af9e6a1cb..a69d7c860 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -670,6 +670,7 @@ Git repositář: %1$s Internet: Klon: + OTS: %1$s Důkaz časového razítka Existuje důkaz, že tento příspěvek byl podepsán někdy před %1$s. Důkaz byl označen v Bitcoin blockchainu v tomto datu a čase. Upravit příspěvek diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9105a7ebe..b25d451b9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -675,6 +675,7 @@ anz der Bedingungen ist erforderlich Git Repository: %1$s Internet: Klonen: + OTS: %1$s Zeitstempel Beweis Es gibt einen Beweis, dass dieser Beitrag irgendwann vor %1$s signiert wurde. Der Beweis wurde zu diesem Datum und Uhrzeit in der Bitcoin-Blockchain gestempelt. Beitrag bearbeiten diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 07b8500ce..86b394ff3 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -50,6 +50,7 @@ impulsionado editado edição #%1$s + original Citar Garfo Propor uma Edição @@ -669,6 +670,7 @@ Repositório Git: %1$s Site: Clonar: + OTS: %1$s Prova de Carimbo de data/hora Há prova de que esta postagem foi assinada antes de %1$s. A prova foi carimbada no blockchain do Bitcoin naquela data e hora. Editar postagem diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 7ec253d25..5e2aa6db5 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -50,6 +50,7 @@ boostad redigerat redigering #%1$s + original Citera Förgrening Föreslå en redigering @@ -668,6 +669,7 @@ Git Repository: %1$s Webbplats: Klona: + OTS: %1$s Tidsstämpel Bevis Det finns bevis på att detta inlägg signerades någon gång före %1$s. Beviset stämplades i Bitcoin-blockchainen vid det datumet och den tiden. Redigera inlägg From 08a103d332a6123ee83ca19ce2489edcd563e6be Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 13:05:26 +0000 Subject: [PATCH 02/13] updated some icons with content descriptions --- .../com/vitorpamplona/amethyst/ui/note/Icons.kt | 14 +++++++------- app/src/main/res/values/strings.xml | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 1e0616bd3..1168f4de8 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.ui.note import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Bolt import androidx.compose.material.icons.filled.Cancel import androidx.compose.material.icons.filled.Clear @@ -81,7 +81,7 @@ fun FollowingIcon(iconSize: Dp) { @Composable fun ArrowBackIcon() { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back), tint = MaterialTheme.colorScheme.grayText, ) @@ -104,7 +104,7 @@ fun DownloadForOfflineIcon( ) { Icon( imageVector = Icons.Default.DownloadForOffline, - null, + contentDescription = stringResource(id = R.string.accessibility_download_for_offline), modifier = remember(iconSize) { Modifier.size(iconSize) }, tint = tint, ) @@ -320,7 +320,7 @@ fun RegularPostIcon() { fun CancelIcon() { Icon( imageVector = Icons.Default.Cancel, - null, + contentDescription = stringResource(id = R.string.cancel), modifier = Size30Modifier, tint = MaterialTheme.colorScheme.placeholderText, ) @@ -375,7 +375,7 @@ fun PlayIcon( ) { Icon( imageVector = Icons.Outlined.PlayCircle, - contentDescription = null, + contentDescription = "Play", modifier = modifier, tint = tint, ) @@ -401,7 +401,7 @@ fun LyricsIcon( ) { Icon( painter = painterResource(id = R.drawable.lyrics_on), - contentDescription = null, + contentDescription = stringResource(id = R.string.accessibility_lyrics_on), modifier = modifier, tint = tint, ) @@ -414,7 +414,7 @@ fun LyricsOffIcon( ) { Icon( painter = painterResource(id = R.drawable.lyrics_off), - contentDescription = null, + contentDescription = stringResource(id = R.string.accessibility_lyrics_off), modifier = modifier, tint = tint, ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d21e60ae0..bb391ed93 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -802,4 +802,8 @@ Quick fixes… Accept the Suggestion + + Download + Lyrics on + Lyrics off From 2158e36032329f0cc699264960df5d9b87def2b6 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 13:08:28 +0000 Subject: [PATCH 03/13] Correct spelling --- .../java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt | 2 +- .../amethyst/ui/screen/loggedIn/NotificationScreen.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt index 2d24b634c..8bea5062e 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt @@ -58,7 +58,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.theme.FeedPadding @Composable -fun RefresheableCardView( +fun RefreshableCardView( viewModel: CardFeedViewModel, accountViewModel: AccountViewModel, nav: (String) -> Unit, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt index 99269225e..6e6e5bc81 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt @@ -78,7 +78,7 @@ import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel import com.vitorpamplona.amethyst.ui.note.showAmount import com.vitorpamplona.amethyst.ui.note.showCount import com.vitorpamplona.amethyst.ui.screen.NotificationViewModel -import com.vitorpamplona.amethyst.ui.screen.RefresheableCardView +import com.vitorpamplona.amethyst.ui.screen.RefreshableCardView import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys import com.vitorpamplona.amethyst.ui.screen.SharedPreferencesViewModel import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange @@ -121,7 +121,7 @@ fun NotificationScreen( model = userReactionsStatsModel, ) - RefresheableCardView( + RefreshableCardView( viewModel = notifFeedViewModel, accountViewModel = accountViewModel, nav = nav, From 708bd00d0db4e97c214e9045dec6e766173a36d2 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 14:00:46 +0000 Subject: [PATCH 04/13] updated vertical dots with content descriptions --- .../java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt | 2 +- app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt | 4 ++-- .../com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt | 2 +- .../amethyst/ui/screen/loggedIn/ChatroomListScreen.kt | 2 +- .../vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt | 4 +++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt index c37701b43..30e2c7759 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt @@ -162,7 +162,7 @@ fun BadgeCompose( ) { Icon( imageVector = Icons.Default.MoreVert, - null, + contentDescription = stringResource(id = R.string.more_options), modifier = Size15Modifier, tint = MaterialTheme.colorScheme.placeholderText, ) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 1168f4de8..32bfb7439 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.ui.note import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.OpenInNew import androidx.compose.material.icons.filled.Bolt import androidx.compose.material.icons.filled.Cancel import androidx.compose.material.icons.filled.Clear @@ -33,7 +34,6 @@ import androidx.compose.material.icons.filled.ExpandLess import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.Link import androidx.compose.material.icons.filled.MoreVert -import androidx.compose.material.icons.filled.OpenInNew import androidx.compose.material.icons.filled.PushPin import androidx.compose.material.icons.filled.Report import androidx.compose.material.icons.filled.VolumeOff @@ -237,7 +237,7 @@ fun OpenInNewIcon( tint: Color = Color.Unspecified, ) { Icon( - imageVector = Icons.Default.OpenInNew, + imageVector = Icons.AutoMirrored.Filled.OpenInNew, stringResource(id = R.string.copy_to_clipboard), tint = tint, modifier = modifier, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt index 97b2c8258..a4d829f0a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt @@ -435,7 +435,7 @@ fun NoteMaster( ) { Icon( imageVector = Icons.Default.MoreVert, - null, + contentDescription = stringResource(id = R.string.more_options), modifier = Size15Modifier, tint = MaterialTheme.colorScheme.placeholderText, ) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt index 94d4fa306..d5c0b5985 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt @@ -269,7 +269,7 @@ fun ChatroomListScreenOnlyList( ) { Icon( imageVector = Icons.Default.MoreVert, - contentDescription = null, + contentDescription = stringResource(id = R.string.more_options), tint = MaterialTheme.colorScheme.placeholderText, ) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt index 0e5b4eeb4..06fb614be 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt @@ -57,11 +57,13 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.service.NostrVideoDataSource import com.vitorpamplona.amethyst.ui.actions.NewPostView @@ -398,7 +400,7 @@ private fun VideoUserOptionAction( ) { Icon( imageVector = Icons.Default.MoreVert, - null, + contentDescription = stringResource(id = R.string.more_options), modifier = remember { Modifier.size(20.dp) }, tint = MaterialTheme.colorScheme.placeholderText, ) From 2bef5f015de0b59f7c15624e6bad252a1a029473 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 15:09:51 +0000 Subject: [PATCH 05/13] change ArrowForwardIos to AutoMirrored --- .../amethyst/ui/actions/NewMediaView.kt | 4 ++-- .../amethyst/ui/actions/NewPostView.kt | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt index dcb217e38..f68a9fd3d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt @@ -88,7 +88,7 @@ fun NewMediaView( val resolver = LocalContext.current.contentResolver val context = LocalContext.current - val scroolState = rememberScrollState() + val scrollState = rememberScrollState() LaunchedEffect(uri) { val mediaType = resolver.getType(uri) ?: "" @@ -173,7 +173,7 @@ fun NewMediaView( modifier = Modifier.fillMaxWidth().weight(1f), ) { Column( - modifier = Modifier.fillMaxWidth().verticalScroll(scroolState), + modifier = Modifier.fillMaxWidth().verticalScroll(scrollState), ) { ImageVideoPost(postViewModel, accountViewModel) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt index 20efa29bf..1518064a0 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt @@ -56,7 +56,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowForwardIos +import androidx.compose.material.icons.automirrored.filled.ArrowForwardIos +import androidx.compose.material.icons.automirrored.outlined.ArrowForwardIos import androidx.compose.material.icons.filled.Bolt import androidx.compose.material.icons.filled.CurrencyBitcoin import androidx.compose.material.icons.filled.LocationOff @@ -65,7 +66,6 @@ import androidx.compose.material.icons.filled.Sell import androidx.compose.material.icons.filled.ShowChart import androidx.compose.material.icons.filled.Visibility import androidx.compose.material.icons.filled.VisibilityOff -import androidx.compose.material.icons.outlined.ArrowForwardIos import androidx.compose.material.icons.outlined.Bolt import androidx.compose.material.icons.rounded.Warning import androidx.compose.material3.Button @@ -1087,7 +1087,7 @@ fun FowardZapTo( tint = BitcoinOrange, ) Icon( - imageVector = Icons.Outlined.ArrowForwardIos, + imageVector = Icons.AutoMirrored.Outlined.ArrowForwardIos, contentDescription = stringResource(id = R.string.zaps), modifier = Modifier @@ -1451,7 +1451,7 @@ private fun ForwardZapTo( tint = MaterialTheme.colorScheme.onBackground, ) Icon( - imageVector = Icons.Default.ArrowForwardIos, + imageVector = Icons.AutoMirrored.Filled.ArrowForwardIos, contentDescription = null, modifier = Modifier @@ -1470,7 +1470,7 @@ private fun ForwardZapTo( tint = BitcoinOrange, ) Icon( - imageVector = Icons.Outlined.ArrowForwardIos, + imageVector = Icons.AutoMirrored.Outlined.ArrowForwardIos, contentDescription = null, modifier = Modifier @@ -1534,7 +1534,7 @@ private fun MarkAsSensitive( ) Icon( imageVector = Icons.Rounded.Warning, - contentDescription = null, + contentDescription = stringResource(R.string.add_content_warning), modifier = Modifier .size(10.dp) @@ -1553,7 +1553,7 @@ private fun MarkAsSensitive( ) Icon( imageVector = Icons.Rounded.Warning, - contentDescription = null, + contentDescription = stringResource(id = R.string.remove_content_warning), modifier = Modifier .size(10.dp) From bbf0d36cdf6cb26be6dd2810b088339e87963512 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 15:42:55 +0000 Subject: [PATCH 06/13] Sealed message button on send message --- .../vitorpamplona/amethyst/ui/note/Icons.kt | 28 +++++++++++++++++++ .../ui/screen/loggedIn/ChatroomScreen.kt | 17 +++-------- app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 32bfb7439..397a18db9 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -20,6 +20,7 @@ */ package com.vitorpamplona.amethyst.ui.note +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack @@ -49,6 +50,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange import com.vitorpamplona.amethyst.ui.theme.Size18Modifier @@ -480,3 +482,29 @@ fun NIP05FailedVerification(modifier: Modifier) { tint = Color.Red, ) } + +@Composable +fun IncognitoIconOn() { + Icon( + painter = painterResource(id = R.drawable.incognito), + contentDescription = stringResource(id = R.string.accessibility_turn_off_sealed_message), + modifier = + Modifier + .padding(top = 2.dp) + .size(18.dp), + tint = MaterialTheme.colorScheme.primary, + ) +} + +@Composable +fun IncognitoIconOff() { + Icon( + painter = painterResource(id = R.drawable.incognito_off), + contentDescription = stringResource(id = R.string.accessibility_turn_on_sealed_message), + modifier = + Modifier + .padding(top = 2.dp) + .size(18.dp), + tint = MaterialTheme.colorScheme.placeholderText, + ) +} diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt index c7537ddba..5850c5cba 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt @@ -68,7 +68,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLifecycleOwner -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardCapitalization @@ -98,6 +97,8 @@ import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture import com.vitorpamplona.amethyst.ui.note.DisplayRoomSubject import com.vitorpamplona.amethyst.ui.note.DisplayUserSetAsSubject +import com.vitorpamplona.amethyst.ui.note.IncognitoIconOff +import com.vitorpamplona.amethyst.ui.note.IncognitoIconOn import com.vitorpamplona.amethyst.ui.note.LoadUser import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures import com.vitorpamplona.amethyst.ui.note.QuickActionAlertDialog @@ -441,19 +442,9 @@ fun PrivateMessageEditFieldRow( }, ) { if (channelScreenModel.nip24) { - Icon( - painter = painterResource(id = R.drawable.incognito), - null, - modifier = Modifier.padding(top = 2.dp).size(18.dp), - tint = MaterialTheme.colorScheme.primary, - ) + IncognitoIconOn() } else { - Icon( - painter = painterResource(id = R.drawable.incognito_off), - null, - modifier = Modifier.padding(top = 2.dp).size(18.dp), - tint = MaterialTheme.colorScheme.placeholderText, - ) + IncognitoIconOff() } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bb391ed93..16c97a3d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -806,4 +806,6 @@ Download Lyrics on Lyrics off + Sealed message off. Click to turn on sealed message + Sealed message on. Click to turn off sealed message From 4cbdf11ecb7b0133c6e23f8ddf045822363e0667 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 16:34:09 +0000 Subject: [PATCH 07/13] Send message button --- .../vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt index 5850c5cba..59f052a0d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt @@ -525,7 +525,7 @@ fun ThinSendButton( ) { Icon( imageVector = Icons.Default.Send, - null, + contentDescription = stringResource(id = R.string.accessibility_send), modifier = Size20Modifier, ) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 16c97a3d4..8cebec4ad 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -808,4 +808,5 @@ Lyrics off Sealed message off. Click to turn on sealed message Sealed message on. Click to turn off sealed message + Send From 75934b5b98027782332923632418a493241a1e36 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 17:03:45 +0000 Subject: [PATCH 08/13] Relay list screeen --- .../amethyst/ui/actions/NewRelayListView.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt index 2e809ae02..f1ae54813 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt @@ -45,8 +45,8 @@ import androidx.compose.material.icons.filled.SyncProblem import androidx.compose.material.icons.filled.Upload import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.Divider import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -272,9 +272,7 @@ fun ServerConfigHeader() { } } - Divider( - thickness = DividerThickness, - ) + HorizontalDivider(thickness = DividerThickness) } } @@ -459,9 +457,7 @@ fun ServerConfigClickableLine( } } - Divider( - thickness = DividerThickness, - ) + HorizontalDivider(thickness = DividerThickness) } } @@ -839,7 +835,7 @@ private fun FirstLine( ) { Icon( imageVector = Icons.Default.Cancel, - null, + contentDescription = stringResource(id = R.string.remove), modifier = Modifier.padding(start = 10.dp).size(15.dp), tint = WarningColor, ) @@ -875,7 +871,7 @@ fun EditableServerConfig( IconButton(onClick = { read = !read }) { Icon( imageVector = Icons.Default.Download, - null, + contentDescription = stringResource(id = R.string.read_from_relay), modifier = Modifier.size(Size35dp).padding(horizontal = 5.dp), tint = if (read) { @@ -889,7 +885,7 @@ fun EditableServerConfig( IconButton(onClick = { write = !write }) { Icon( imageVector = Icons.Default.Upload, - null, + contentDescription = stringResource(id = R.string.write_to_relay), modifier = Modifier.size(Size35dp).padding(horizontal = 5.dp), tint = if (write) { From 2f3df616f37a42f1f36aa50d63580031dcccc0f2 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 17:19:47 +0000 Subject: [PATCH 09/13] QR code icon --- .../com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt | 2 +- .../vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt | 4 ++-- app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt index 4471144f1..3062595c4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt @@ -768,7 +768,7 @@ fun BottomContent( ) { Icon( painter = painterResource(R.drawable.ic_qrcode), - null, + contentDescription = stringResource(id = R.string.show_npub_as_a_qr_code), modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.primary, ) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt index e81d9bee4..a38762655 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt @@ -445,7 +445,7 @@ fun UpdateZapAmountDialog( ) { Icon( painter = painterResource(R.drawable.alby), - null, + contentDescription = stringResource(id = R.string.accessibility_navigate_to_alby), modifier = Modifier.size(24.dp), tint = Color.Unspecified, ) @@ -454,7 +454,7 @@ fun UpdateZapAmountDialog( IconButton(onClick = { qrScanning = true }) { Icon( painter = painterResource(R.drawable.ic_qrcode), - null, + contentDescription = stringResource(id = R.string.accessibility_scan_qr_code), modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.primary, ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8cebec4ad..ff396b1d3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -809,4 +809,6 @@ Sealed message off. Click to turn on sealed message Sealed message on. Click to turn off sealed message Send + Scan QR code + Navigate to the third-party wallet provider Alby From e507e0bb6a07ed077c2f38d6ac17d55a084d0151 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 19:01:47 +0000 Subject: [PATCH 10/13] update Play text --- app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 397a18db9..9d2d4cb5a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -377,7 +377,7 @@ fun PlayIcon( ) { Icon( imageVector = Icons.Outlined.PlayCircle, - contentDescription = "Play", + contentDescription = stringResource(id = R.string.accessibility_play_username), modifier = modifier, tint = tint, ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ff396b1d3..296eb4049 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -809,6 +809,7 @@ Sealed message off. Click to turn on sealed message Sealed message on. Click to turn off sealed message Send + Play username as audio Scan QR code Navigate to the third-party wallet provider Alby From 8c5aea46f1a532aea2f5ccdf6defe023c6247d0e Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 19:10:42 +0000 Subject: [PATCH 11/13] refactor incognito button icon --- .../vitorpamplona/amethyst/ui/note/Icons.kt | 34 +++++++++---------- .../ui/screen/loggedIn/ChatroomScreen.kt | 16 +++++++-- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 9d2d4cb5a..2dc80c964 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -20,11 +20,12 @@ */ package com.vitorpamplona.amethyst.ui.note -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons 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.Bolt import androidx.compose.material.icons.filled.Cancel import androidx.compose.material.icons.filled.Clear @@ -37,8 +38,6 @@ import androidx.compose.material.icons.filled.Link import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material.icons.filled.PushPin import androidx.compose.material.icons.filled.Report -import androidx.compose.material.icons.filled.VolumeOff -import androidx.compose.material.icons.filled.VolumeUp import androidx.compose.material.icons.outlined.BarChart import androidx.compose.material.icons.outlined.PlayCircle import androidx.compose.material3.Icon @@ -50,7 +49,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange import com.vitorpamplona.amethyst.ui.theme.Size18Modifier @@ -340,7 +338,7 @@ fun CloseIcon() { @Composable fun MutedIcon() { Icon( - imageVector = Icons.Default.VolumeOff, + imageVector = Icons.AutoMirrored.Filled.VolumeOff, contentDescription = stringResource(id = R.string.muted_button), tint = MaterialTheme.colorScheme.onBackground, modifier = Size30Modifier, @@ -350,7 +348,7 @@ fun MutedIcon() { @Composable fun MuteIcon() { Icon( - imageVector = Icons.Default.VolumeUp, + imageVector = Icons.AutoMirrored.Filled.VolumeUp, contentDescription = stringResource(id = R.string.mute_button), tint = MaterialTheme.colorScheme.onBackground, modifier = Size30Modifier, @@ -484,27 +482,27 @@ fun NIP05FailedVerification(modifier: Modifier) { } @Composable -fun IncognitoIconOn() { +fun IncognitoIconOn( + modifier: Modifier, + tint: Color, +) { Icon( painter = painterResource(id = R.drawable.incognito), contentDescription = stringResource(id = R.string.accessibility_turn_off_sealed_message), - modifier = - Modifier - .padding(top = 2.dp) - .size(18.dp), - tint = MaterialTheme.colorScheme.primary, + modifier = modifier, + tint = tint, ) } @Composable -fun IncognitoIconOff() { +fun IncognitoIconOff( + modifier: Modifier, + tint: Color, +) { Icon( painter = painterResource(id = R.drawable.incognito_off), contentDescription = stringResource(id = R.string.accessibility_turn_on_sealed_message), - modifier = - Modifier - .padding(top = 2.dp) - .size(18.dp), - tint = MaterialTheme.colorScheme.placeholderText, + modifier = modifier, + tint = tint, ) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt index 59f052a0d..1e621e109 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt @@ -442,9 +442,21 @@ fun PrivateMessageEditFieldRow( }, ) { if (channelScreenModel.nip24) { - IncognitoIconOn() + IncognitoIconOn( + modifier = + Modifier + .padding(top = 2.dp) + .size(18.dp), + tint = MaterialTheme.colorScheme.primary, + ) } else { - IncognitoIconOff() + IncognitoIconOff( + modifier = + Modifier + .padding(top = 2.dp) + .size(18.dp), + tint = MaterialTheme.colorScheme.placeholderText, + ) } } } From f0c53efebd280d6f49a7d75e912941bd8c570e06 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sun, 3 Mar 2024 09:38:13 +0000 Subject: [PATCH 12/13] app logo --- app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 2dc80c964..4f714d59d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -62,7 +62,7 @@ import com.vitorpamplona.amethyst.ui.theme.subtleButton fun AmethystIcon(iconSize: Dp) { Icon( painter = painterResource(R.drawable.amethyst), - null, + contentDescription = stringResource(id = R.string.app_logo), modifier = Modifier.size(iconSize), tint = Color.Unspecified, ) From 875d5385818ec728da372fe3ac0d55ab0443f750 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Mon, 4 Mar 2024 15:03:36 +0000 Subject: [PATCH 13/13] added accessibility translations for CS, DE, SV, PT --- app/src/main/res/values-cs/strings.xml | 9 +++++++++ app/src/main/res/values-de/strings.xml | 9 +++++++++ app/src/main/res/values-pt-rBR/strings.xml | 9 +++++++++ app/src/main/res/values-sv-rSE/strings.xml | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a69d7c860..1fbfee90c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -678,4 +678,13 @@ Souhrn změn Rychlé opravy… Přijmout návrhy + Stáhnout + Text písně zapnuto + Text písně vypnuto + Zapečetěná zpráva vypnuta. Klikněte pro zapnutí zapečetěné zprávy + Zapečetěná zpráva zapnuta. Klikněte pro vypnutí zapečetěné zprávy + Odeslat + Přehrát uživatelské jméno jako audio + Skenovat QR kód + Přejít na poskytovatele peněženky třetí strany Alby diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b25d451b9..cd528fecc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -683,4 +683,13 @@ anz der Bedingungen ist erforderlich Zusammenfassung der Änderungen Schnelle Korrekturen… Den Vorschlag annehmen + Herunterladen + Liedtext an + Liedtext aus + Versiegelte Nachricht aus. Klicken Sie, um die versiegelte Nachricht einzuschalten + Versiegelte Nachricht an. Klicken Sie, um die versiegelte Nachricht auszuschalten + Senden + Benutzernamen als Audio abspielen + QR-Code scannen + Navigieren Sie zum Drittanbieter-Wallet-Anbieter Alby diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 86b394ff3..d7484c17d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -678,4 +678,13 @@ Resumo das alterações Correções rápidas… Aceitar a Sugestão + Baixar + Letras ligadas + Letras desligadas + Mensagem selada desligada. Clique para ligar a mensagem selada + Mensagem selada ligada. Clique para desligar a mensagem selada + Enviar + Reproduzir nome de usuário como áudio + Escanear código QR + Navegar para o provedor de carteira de terceiros Alby diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 5e2aa6db5..0378413f2 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -677,4 +677,13 @@ Sammanfattning av ändringar Snabba fixar… Acceptera förslaget + Ladda ner + Undertexter på + Undertexter av + Förseglat meddelande av. Klicka för att slå på förseglat meddelande + Förseglat meddelande på. Klicka för att stänga av förseglat meddelande + Skicka + Spela upp användarnamn som ljud + Skanna QR-kod + Navigera till tredjeparts plånboksleverantören Alby