lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make strings translatable

Browse Source
This commit is contained in:
MM20
2023-08-27 00:05:13 +02:00
parent c192b3c1fc
commit e4f5ec4625
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CorePaletteColorPreference.kt
+4 -2
View File
@@ -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))
}
}
}
app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt
+5 -3
View File
@@ -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))
}
}
}
app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeSettingsScreen.kt
+1 -1
View File
@@ -231,7 +231,7 @@ fun ThemeSettingsScreen(themeId: UUID) {
},
)
CorePaletteColorPreference(
title = "NeutralVariant",
title = "Neutral Variant",
value = theme?.corePalette?.neutralVariant,
onValueChange = {
viewModel.updateTheme(
app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemesSettingsScreen.kt
+1 -1
View File
@@ -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