diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt index 9adf54c5f..b703d162a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt @@ -86,7 +86,7 @@ class Account( var userProfileCache: User? = null fun updateAutomaticallyStartPlayback( - automaticallyStartPlayback: Boolean?, + automaticallyStartPlayback: Boolean? ) { settings.automaticallyStartPlayback = automaticallyStartPlayback live.invalidateData() @@ -94,7 +94,7 @@ class Account( } fun updateAutomaticallyShowUrlPreview( - automaticallyShowUrlPreview: Boolean?, + automaticallyShowUrlPreview: Boolean? ) { settings.automaticallyShowUrlPreview = automaticallyShowUrlPreview live.invalidateData() @@ -102,14 +102,13 @@ class Account( } fun updateAutomaticallyShowImages( - automaticallyShowImages: Boolean?, + automaticallyShowImages: Boolean? ) { settings.automaticallyShowImages = automaticallyShowImages live.invalidateData() saveable.invalidateData() } - fun updateOptOutOptions(warnReports: Boolean, filterSpam: Boolean) { warnAboutPostsWithReports = warnReports filterSpamFromStrangers = filterSpam diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt index a423b1853..4c1f6ce08 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt @@ -55,6 +55,7 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.Placeholder import androidx.compose.ui.text.PlaceholderVerticalAlign @@ -321,7 +322,7 @@ fun LoadImageBox(showImage: MutableState) { contentAlignment = Alignment.Center ) { Text( - text = "Load Image", + text = stringResource(R.string.load_image), style = TextStyle(color = Color.Black, fontSize = 18.sp) ) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt index ab743e3d2..fedfa79bf 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt @@ -50,19 +50,19 @@ class AccountViewModel(val account: Account, private val themeViewModel: ThemeVi } fun updateAutomaticallyStartPlayback( - automaticallyStartPlayback: Boolean?, + automaticallyStartPlayback: Boolean? ) { account.updateAutomaticallyStartPlayback(automaticallyStartPlayback) } fun updateAutomaticallyShowUrlPreview( - automaticallyShowUrlPreview: Boolean?, + automaticallyShowUrlPreview: Boolean? ) { account.updateAutomaticallyShowUrlPreview(automaticallyShowUrlPreview) } fun updateAutomaticallyShowImages( - automaticallyShowImages: Boolean?, + automaticallyShowImages: Boolean? ) { account.updateAutomaticallyShowImages(automaticallyShowImages) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt index a26087ebe..11cdb5464 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt @@ -27,6 +27,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.intl.Locale import androidx.compose.ui.unit.dp @@ -90,7 +91,13 @@ fun SettingsScreen( nav: (String) -> Unit ) { val scope = rememberCoroutineScope() - val selectedItens = persistentListOf("Always", "Wifi-only", "Never") + val selectedItens = persistentListOf( + stringResource(R.string.always), + stringResource(R.string.wifi_only), + stringResource(R.string.never).replaceFirstChar { + it.uppercase() + } + ) val settings = accountViewModel.account.settings val index = if (settings.automaticallyShowImages == null) { 0 } else { if (settings.automaticallyShowImages == true) 1 else 2 @@ -102,7 +109,11 @@ fun SettingsScreen( if (settings.automaticallyShowUrlPreview == true) 1 else 2 } - val themeItens = persistentListOf("System", "Light", "Dark") + val themeItens = persistentListOf( + stringResource(R.string.system), + stringResource(R.string.light), + stringResource(R.string.dark) + ) val themeIndex = accountViewModel.currentTheme() val context = LocalContext.current @@ -116,14 +127,14 @@ fun SettingsScreen( .verticalScroll(rememberScrollState()), horizontalAlignment = Alignment.CenterHorizontally ) { - Section("Application preferences") + Section(stringResource(R.string.application_preferences)) Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth() ) { TextSpinner( - label = "Language", + label = stringResource(R.string.language), placeholder = languageList[languageIndex], options = languageList, onSelect = { @@ -146,7 +157,7 @@ fun SettingsScreen( modifier = Modifier.fillMaxWidth() ) { TextSpinner( - label = "Theme", + label = stringResource(R.string.theme), placeholder = themeItens[themeIndex], options = themeItens, onSelect = { @@ -166,7 +177,7 @@ fun SettingsScreen( modifier = Modifier.fillMaxWidth() ) { TextSpinner( - label = "Automatically load images/gifs", + label = stringResource(R.string.automatically_load_images_gifs), placeholder = selectedItens[index], options = selectedItens, onSelect = { @@ -192,7 +203,7 @@ fun SettingsScreen( modifier = Modifier.fillMaxWidth() ) { TextSpinner( - label = "Automatically play videos", + label = stringResource(R.string.automatically_play_videos), placeholder = selectedItens[videoIndex], options = selectedItens, onSelect = { @@ -218,7 +229,7 @@ fun SettingsScreen( modifier = Modifier.fillMaxWidth() ) { TextSpinner( - label = "Automatically show url preview", + label = stringResource(R.string.automatically_show_url_preview), placeholder = selectedItens[linkIndex], options = selectedItens, onSelect = { @@ -229,7 +240,7 @@ fun SettingsScreen( } scope.launch(Dispatchers.IO) { - accountViewModel.updateAutomaticallyStartPlayback(automaticallyShowUrlPreview) + accountViewModel.updateAutomaticallyShowUrlPreview(automaticallyShowUrlPreview) LocalPreferences.saveToEncryptedStorage(accountViewModel.account) } }, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8babaa30f..eac5f1dee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -484,4 +484,16 @@ Sensitive Content Adds sensitive content warning before showing this content Settings + Always + Wifi-only + System + Light + Dark + Application preferences + Language + Theme + Automatically load images/gifs + Automatically play videos + Automatically show url preview + Load Image