From 6285bfaae7a6c20bc4badfdf3ab29014c74ba064 Mon Sep 17 00:00:00 2001 From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com> Date: Fri, 28 Apr 2023 08:15:04 -0300 Subject: [PATCH] updated string.xml --- .../vitorpamplona/amethyst/ui/navigation/DrawerContent.kt | 8 ++++---- .../amethyst/ui/screen/loggedOff/LoginScreen.kt | 2 +- app/src/main/res/values/strings.xml | 6 ++++++ 3 files changed, 11 insertions(+), 5 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 696faf20c..f8bb405be 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 @@ -277,7 +277,7 @@ fun ListContent( onClick = { backupDialogOpen = true } ) - var textTorProxy = if (checked) "Disable" else "Enable" + var textTorProxy = if (checked) stringResource(R.string.disable) else stringResource(R.string.enable) IconRow( title = "$textTorProxy Tor", @@ -309,7 +309,7 @@ fun ListContent( if (openDialog.value) { AlertDialog( - text = { Text(text = "Do you really want to disable tor?") }, + text = { Text(text = stringResource(R.string.do_you_really_want_to_disable_tor)) }, onDismissRequest = { }, confirmButton = { TextButton( @@ -319,7 +319,7 @@ fun ListContent( enableTor(account, false, openDialog) } ) { - Text(text = "Yes") + Text(text = stringResource(R.string.yes)) } }, dismissButton = { @@ -328,7 +328,7 @@ fun ListContent( openDialog.value = false } ) { - Text(text = "No") + Text(text = stringResource(R.string.no)) } } ) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt index 6533d1c90..ea229bbdc 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt @@ -228,7 +228,7 @@ fun LoginPage( onCheckedChange = { useProxy.value = it } ) - Text("Enable Tor") + Text(stringResource(R.string.connect_via_tor)) } Spacer(modifier = Modifier.height(20.dp)) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f1878907d..17f760024 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -292,4 +292,10 @@ Create and Add Poll authors can\'t vote in their own polls. #zappoll + Connect via Tor + Do you really want to disable tor? + Disable + Enable + Yes + No