From 808a63813c5b1207d17a48990aebb9ca501f252b Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 27 Aug 2023 00:09:12 +0200 Subject: [PATCH] Rename string resources --- .../ui/settings/colorscheme/CorePaletteColorPreference.kt | 5 ++--- .../ui/settings/colorscheme/ThemeColorPreference.kt | 5 ++--- core/i18n/src/main/res/values/strings.xml | 8 ++++---- 3 files changed, 8 insertions(+), 10 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 d98acf65..79a18bb9 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 @@ -3,7 +3,6 @@ package de.mm20.launcher2.ui.settings.colorscheme import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically import androidx.compose.animation.shrinkVertically -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -70,7 +69,7 @@ fun CorePaletteColorPreference( ) { SwitchPreference( icon = Icons.Rounded.SettingsSuggest, - title = stringResource(R.string.custom_color_scheme_system_default), + title = stringResource(R.string.theme_color_scheme_system_default), value = currentValue == null, onValueChanged = { currentValue = if (it) null else defaultValue @@ -126,7 +125,7 @@ fun CorePaletteColorPreference( .padding(ButtonDefaults.IconSpacing) .size(ButtonDefaults.IconSize) ) - Text(stringResource(R.string.custom_color_scheme_autogenerate)) + Text(stringResource(R.string.theme_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 fc14f496..4045e20a 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 @@ -3,7 +3,6 @@ package de.mm20.launcher2.ui.settings.colorscheme import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.Canvas import androidx.compose.foundation.background -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -121,7 +120,7 @@ fun ThemeColorPreference( }, shape = SegmentedButtonDefaults.shape(position = 0, count = 2) ) { - Text(stringResource(R.string.custom_color_scheme_palette_color)) + Text(stringResource(R.string.theme_color_scheme_palette_color)) } SegmentedButton( selected = actualValue is StaticColor, @@ -142,7 +141,7 @@ fun ThemeColorPreference( }, shape = SegmentedButtonDefaults.shape(position = 1, count = 2) ) { - Text(stringResource(R.string.custom_color_scheme_custom_color)) + Text(stringResource(R.string.theme_color_scheme_custom_color)) } } AnimatedContent( diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml index 0dfe2a3a..76b1bd26 100644 --- a/core/i18n/src/main/res/values/strings.xml +++ b/core/i18n/src/main/res/values/strings.xml @@ -831,9 +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 + Use system default + From primary color + Palette + Custom Restore default \ No newline at end of file