From e4f5ec4625eaf888bbf8045a948dd33770381d3c Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 27 Aug 2023 00:05:13 +0200 Subject: [PATCH] Make strings translatable --- .../ui/settings/colorscheme/CorePaletteColorPreference.kt | 6 ++++-- .../ui/settings/colorscheme/ThemeColorPreference.kt | 8 +++++--- .../ui/settings/colorscheme/ThemeSettingsScreen.kt | 2 +- .../ui/settings/colorscheme/ThemesSettingsScreen.kt | 2 +- core/i18n/src/main/res/values/strings.xml | 6 ++++++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CorePaletteColorPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CorePaletteColorPreference.kt index 90b67a29..d98acf65 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CorePaletteColorPreference.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CorePaletteColorPreference.kt @@ -28,7 +28,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.BottomSheetDialog import de.mm20.launcher2.ui.component.colorpicker.HctColorPicker import de.mm20.launcher2.ui.component.colorpicker.rememberHctColorPickerState @@ -68,7 +70,7 @@ fun CorePaletteColorPreference( ) { SwitchPreference( icon = Icons.Rounded.SettingsSuggest, - title = "Use system default", + title = stringResource(R.string.custom_color_scheme_system_default), value = currentValue == null, onValueChanged = { currentValue = if (it) null else defaultValue @@ -124,7 +126,7 @@ fun CorePaletteColorPreference( .padding(ButtonDefaults.IconSpacing) .size(ButtonDefaults.IconSize) ) - Text("From primary color") + Text(stringResource(R.string.custom_color_scheme_autogenerate)) } } } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt index 68e50939..fc14f496 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt @@ -45,6 +45,7 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.drawscope.Fill import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import de.mm20.launcher2.themes.ColorRef @@ -53,6 +54,7 @@ import de.mm20.launcher2.themes.FullCorePalette import de.mm20.launcher2.themes.StaticColor import de.mm20.launcher2.themes.atTone import de.mm20.launcher2.themes.get +import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.BottomSheetDialog import de.mm20.launcher2.ui.component.colorpicker.HctColorPicker import de.mm20.launcher2.ui.component.colorpicker.rememberHctColorPickerState @@ -119,7 +121,7 @@ fun ThemeColorPreference( }, shape = SegmentedButtonDefaults.shape(position = 0, count = 2) ) { - Text("From palette") + Text(stringResource(R.string.custom_color_scheme_palette_color)) } SegmentedButton( selected = actualValue is StaticColor, @@ -140,7 +142,7 @@ fun ThemeColorPreference( }, shape = SegmentedButtonDefaults.shape(position = 1, count = 2) ) { - Text("Custom") + Text(stringResource(R.string.custom_color_scheme_custom_color)) } } AnimatedContent( @@ -412,7 +414,7 @@ fun ThemeColorPreference( .padding(ButtonDefaults.IconSpacing) .size(ButtonDefaults.IconSize) ) - Text("Restore default") + Text(stringResource(R.string.preference_restore_default)) } } } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeSettingsScreen.kt index baea05fd..901d8c72 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeSettingsScreen.kt @@ -231,7 +231,7 @@ fun ThemeSettingsScreen(themeId: UUID) { }, ) CorePaletteColorPreference( - title = "NeutralVariant", + title = "Neutral Variant", value = theme?.corePalette?.neutralVariant, onValueChange = { viewModel.updateTheme( diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemesSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemesSettingsScreen.kt index 747b2364..b2716659 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemesSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemesSettingsScreen.kt @@ -108,7 +108,7 @@ fun ThemesSettingsScreen() { leadingIcon = { Icon(Icons.Rounded.Edit, null) }, - text = { Text("Edit") }, + text = { Text(stringResource(R.string.edit)) }, onClick = { navController?.navigate("settings/appearance/themes/${theme.id}") showMenu = false diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml index 41fff3ac..0dfe2a3a 100644 --- a/core/i18n/src/main/res/values/strings.xml +++ b/core/i18n/src/main/res/values/strings.xml @@ -248,6 +248,7 @@ Close Save Duplicate + Edit Skip Continue Next @@ -830,4 +831,9 @@ The note could not be written to the linked file. Possibly, it has been moved or deleted. A copy has been saved to the launcher\'s internal storage. Do you really want to delete the color scheme %1$s? New color scheme + Use system default + From primary color + Palette + Custom + Restore default \ No newline at end of file