From 273f572968a952e6ea7b90210f9e059d09a54065 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 4 May 2026 16:18:08 +0300 Subject: [PATCH] chore: update translations --- .../openstore/ui/screen/results/ResultsScreen.kt | 8 ++++---- .../openstore/ui/screen/results/ResultsViewModel.kt | 4 ++-- .../openstore/ui/screen/settings/SettingsScreen.kt | 6 +++--- app/src/main/res/values-en/strings.xml | 13 +++++++++---- app/src/main/res/values/strings.xml | 13 +++++++++---- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/results/ResultsScreen.kt b/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/results/ResultsScreen.kt index a84fd15..9e26e5f 100644 --- a/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/results/ResultsScreen.kt +++ b/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/results/ResultsScreen.kt @@ -75,15 +75,15 @@ fun ResultsScreen( actions = { val platforms = remember { listOf( - Platform("Mobile", "mobile", R.drawable.ic_mobile_24px), - Platform("TV", "tv", R.drawable.ic_tv_gen_24px) + Platform(R.string.mobile_label, "mobile", R.drawable.ic_mobile_24px), + Platform(R.string.tv_label, "tv", R.drawable.ic_tv_gen_24px) ) } TextButton({platformSelectorExpanded = true}) { Icon(painterResource(state.selectedPlatform.icon), null) Spacer(Modifier.size(8.dp)) - Text(state.selectedPlatform.label) + Text(stringResource(state.selectedPlatform.label)) } DropdownMenu( expanded = platformSelectorExpanded, @@ -92,7 +92,7 @@ fun ResultsScreen( platforms.forEach { DropdownMenuItem( leadingIcon = {Icon(painterResource(it.icon), null)}, - text = { Text(it.label) }, + text = { Text(stringResource(it.label)) }, onClick = { viewModel.selectPlatform(it); platformSelectorExpanded=false } ) } diff --git a/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/results/ResultsViewModel.kt b/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/results/ResultsViewModel.kt index 95866d2..5bfbf0b 100644 --- a/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/results/ResultsViewModel.kt +++ b/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/results/ResultsViewModel.kt @@ -17,12 +17,12 @@ import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.update data class Platform( - val label: String, + val label: Int, val value: String, val icon: Int ) data class ResultsState( - val selectedPlatform: Platform = Platform("Mobile", "mobile", R.drawable.ic_mobile_24px), + val selectedPlatform: Platform = Platform(R.string.mobile_label, "mobile", R.drawable.ic_mobile_24px), ) class ResultsViewModel(private val query: String) : ViewModel() { diff --git a/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/settings/SettingsScreen.kt b/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/settings/SettingsScreen.kt index b4a0946..ff30435 100644 --- a/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/settings/SettingsScreen.kt +++ b/app/src/main/java/dev/mi6e4ka/openstore/ui/screen/settings/SettingsScreen.kt @@ -127,15 +127,15 @@ fun SettingsScreen( defaultVal = "auto", select = listOf( SettingsSectionSelect( - title = "Auto", + title = context.getString(R.string.theme_auto_label), value = "auto" ), SettingsSectionSelect( - title = "Dark", + title = context.getString(R.string.theme_dark_label), value = "dark" ), SettingsSectionSelect( - title = "Light", + title = context.getString(R.string.theme_light_label), value = "light" ), ) diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 366395e..16d0b51 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -44,10 +44,10 @@ Settings Installer If there are problems installing applications - Source updates whitelist - Sources allowed to check for updates - Check all installed applications - Do not limit update checks to the whitelist. RuStore will get access to the entire list of installed applications. + Tracked sources + Updates will be checked for applications from selected sources + Check all applications + Do not limit the update check to selected sources. RuStore will get access to the entire list of applications on device Save Updates Check for updates @@ -68,4 +68,9 @@ Manual Installed Unknown (ADB/Other) Provided by developer + Mobile + TV + Auto + Dark + Light \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b3c4b5c..9224639 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,10 +45,9 @@ Настройки Установщик Если есть проблемы при установке приложений - Белый список источников обновлений - Источники, для которых разрешена проверка обновлений - Проверять все установленные приложения - Не ограничивать проверку обновлений белым списком. RuStore получит доступ ко всему списку установленных приложений. + Отслеживаемые источники + Проверять все приложения + Не ограничивать проверку обновлений выбранными источниками. RuStore получит доступ ко всему списку приложений на устройстве Сохранить Обновления Проверить обновления @@ -68,4 +67,10 @@ Установлено вручную Неизвестно (ADB/Другое) Установлено из другого источника + Телефон + ТВ + Системная + Тёмная + Светлая + Обновления будут проверяться для приложений из выбранных источников \ No newline at end of file