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

Rename string resources

Browse Source
This commit is contained in:
MM20 2023-08-27 00:09:12 +02:00
parent e4f5ec4625
commit 808a63813c
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CorePaletteColorPreference.kt
View File

@ -3,7 +3,6 @@ package de.mm20.launcher2.ui.settings.colorscheme
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.expandVertically import androidx.compose.animation.expandVertically
import androidx.compose.animation.shrinkVertically import androidx.compose.animation.shrinkVertically
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -70,7 +69,7 @@ fun CorePaletteColorPreference(
) { ) {
SwitchPreference( SwitchPreference(
icon = Icons.Rounded.SettingsSuggest, 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, value = currentValue == null,
onValueChanged = { onValueChanged = {
currentValue = if (it) null else defaultValue currentValue = if (it) null else defaultValue
@ -126,7 +125,7 @@ fun CorePaletteColorPreference(
.padding(ButtonDefaults.IconSpacing) .padding(ButtonDefaults.IconSpacing)
.size(ButtonDefaults.IconSize) .size(ButtonDefaults.IconSize)
) )
Text(stringResource(R.string.custom_color_scheme_autogenerate)) Text(stringResource(R.string.theme_color_scheme_autogenerate))
} }
} }
} }

5
app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt
View File

@ -3,7 +3,6 @@ package de.mm20.launcher2.ui.settings.colorscheme
import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedContent
import androidx.compose.foundation.Canvas import androidx.compose.foundation.Canvas
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@ -121,7 +120,7 @@ fun ThemeColorPreference(
}, },
shape = SegmentedButtonDefaults.shape(position = 0, count = 2) 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( SegmentedButton(
selected = actualValue is StaticColor, selected = actualValue is StaticColor,
@ -142,7 +141,7 @@ fun ThemeColorPreference(
}, },
shape = SegmentedButtonDefaults.shape(position = 1, count = 2) 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( AnimatedContent(

8
core/i18n/src/main/res/values/strings.xml
View File

@ -831,9 +831,9 @@
<string name="note_widget_file_write_error_description">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.</string> <string name="note_widget_file_write_error_description">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.</string>
<string name="confirmation_delete_color_scheme">Do you really want to delete the color scheme %1$s?</string> <string name="confirmation_delete_color_scheme">Do you really want to delete the color scheme %1$s?</string>
<string name="new_color_scheme_name">New color scheme</string> <string name="new_color_scheme_name">New color scheme</string>
<string name="custom_color_scheme_system_default">Use system default</string> <string name="theme_color_scheme_system_default">Use system default</string>
<string name="custom_color_scheme_autogenerate">From primary color</string> <string name="theme_color_scheme_autogenerate">From primary color</string>
<string name="custom_color_scheme_palette_color">Palette</string> <string name="theme_color_scheme_palette_color">Palette</string>
<string name="custom_color_scheme_custom_color">Custom</string> <string name="theme_color_scheme_custom_color">Custom</string>
<string name="preference_restore_default">Restore default</string> <string name="preference_restore_default">Restore default</string>
</resources> </resources>