mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
Feat: Adds customizable theme and fix inner gamer theme (#2850)
This commit is contained in:
1 parent
8f34554516
commit
71989b4cdb
38 files changed
+663
-13
No files matched your search
@@ -1534,6 +1534,45 @@ object SessionPrefs {
|
||||
prefs(context).edit().putInt("gradientPrimary", primary).putInt("gradientSecondary", secondary).apply()
|
||||
}
|
||||
|
||||
fun customThemeColors(context: Context): com.droiddeck.launcher.ui.CustomThemeColors =
|
||||
prefs(context).let { p ->
|
||||
val defaults = com.droiddeck.launcher.ui.CustomThemeColors()
|
||||
com.droiddeck.launcher.ui.CustomThemeColors(
|
||||
background = p.getInt("customThemeBackground", defaults.background),
|
||||
surface = p.getInt("customThemeSurface", defaults.surface),
|
||||
surfaceVariant = p.getInt("customThemeSurfaceVariant", defaults.surfaceVariant),
|
||||
line = p.getInt("customThemeLine", defaults.line),
|
||||
line2 = p.getInt("customThemeLine2", defaults.line2),
|
||||
onBackground = p.getInt("customThemeOnBackground", defaults.onBackground),
|
||||
onSurfaceVariant = p.getInt("customThemeOnSurfaceVariant", defaults.onSurfaceVariant),
|
||||
primary = p.getInt("customThemePrimary", defaults.primary),
|
||||
onPrimary = p.getInt("customThemeOnPrimary", defaults.onPrimary),
|
||||
signal = p.getInt("customThemeSignal", defaults.signal),
|
||||
good = p.getInt("customThemeGood", defaults.good),
|
||||
error = p.getInt("customThemeError", defaults.error),
|
||||
)
|
||||
}
|
||||
|
||||
fun setCustomThemeColors(
|
||||
context: Context,
|
||||
colors: com.droiddeck.launcher.ui.CustomThemeColors,
|
||||
) {
|
||||
prefs(context).edit()
|
||||
.putInt("customThemeBackground", colors.background)
|
||||
.putInt("customThemeSurface", colors.surface)
|
||||
.putInt("customThemeSurfaceVariant", colors.surfaceVariant)
|
||||
.putInt("customThemeLine", colors.line)
|
||||
.putInt("customThemeLine2", colors.line2)
|
||||
.putInt("customThemeOnBackground", colors.onBackground)
|
||||
.putInt("customThemeOnSurfaceVariant", colors.onSurfaceVariant)
|
||||
.putInt("customThemePrimary", colors.primary)
|
||||
.putInt("customThemeOnPrimary", colors.onPrimary)
|
||||
.putInt("customThemeSignal", colors.signal)
|
||||
.putInt("customThemeGood", colors.good)
|
||||
.putInt("customThemeError", colors.error)
|
||||
.apply()
|
||||
}
|
||||
|
||||
fun trueBlackHighlight(context: Context): Int =
|
||||
prefs(context).getInt("trueBlackHighlight", com.droiddeck.launcher.ui.Themes.DEFAULT_HIGHLIGHT)
|
||||
|
||||
|
||||
@@ -437,6 +437,7 @@ internal fun SetupPanel(
|
||||
}
|
||||
if (s.theme == Themes.INNER_GAMER) RgbSpeedRow()
|
||||
if (s.theme == Themes.GRADIENT) GradientColorRows()
|
||||
if (s.theme == Themes.CUSTOM) CustomColorRows()
|
||||
if (s.theme == Themes.TRUE_BLACK) HighlightColorRow()
|
||||
ChoiceRow(
|
||||
host, "app-scale", stringResource(R.string.setup_app_scale), stringResource(R.string.setup_app_scale_hint),
|
||||
@@ -1212,3 +1213,42 @@ private fun GradientColorRows() {
|
||||
if (picking == 1) Themes.setGradient(ctx, argb, secondary) else Themes.setGradient(ctx, primary, argb)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun CustomColorRows() {
|
||||
val ctx = androidx.compose.ui.platform.LocalContext.current.applicationContext
|
||||
val colors = Themes.customColors
|
||||
var picking by remember { mutableStateOf<String?>(null) }
|
||||
|
||||
val rows = listOf(
|
||||
Triple("background", stringResource(R.string.theme_custom_background), colors.background),
|
||||
Triple("surface", stringResource(R.string.theme_custom_surface), colors.surface),
|
||||
Triple("surfaceVariant", stringResource(R.string.theme_custom_surface_variant), colors.surfaceVariant),
|
||||
Triple("line", stringResource(R.string.theme_custom_line), colors.line),
|
||||
Triple("line2", stringResource(R.string.theme_custom_line2), colors.line2),
|
||||
Triple("onBackground", stringResource(R.string.theme_custom_on_background), colors.onBackground),
|
||||
Triple("onSurfaceVariant", stringResource(R.string.theme_custom_on_surface_variant), colors.onSurfaceVariant),
|
||||
Triple("primary", stringResource(R.string.theme_custom_primary), colors.primary),
|
||||
Triple("onPrimary", stringResource(R.string.theme_custom_on_primary), colors.onPrimary),
|
||||
Triple("signal", stringResource(R.string.theme_custom_signal), colors.signal),
|
||||
Triple("good", stringResource(R.string.theme_custom_good), colors.good),
|
||||
Triple("error", stringResource(R.string.theme_custom_error), colors.error),
|
||||
)
|
||||
|
||||
rows.forEach { (key, label, argb) ->
|
||||
SettingsRow(label, null) {
|
||||
ColorCube(Color(argb), label) { picking = key }
|
||||
}
|
||||
}
|
||||
|
||||
val selected = rows.firstOrNull { it.first == picking }
|
||||
if (selected != null) {
|
||||
ColorPickerDialog(
|
||||
selected.second,
|
||||
selected.third,
|
||||
onDismiss = { picking = null },
|
||||
) { argb ->
|
||||
Themes.setCustomColor(ctx, selected.first, argb)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -41,6 +41,21 @@ class Palette(
|
||||
val good: Color, val error: Color = Color(0xFFFF8A80),
|
||||
)
|
||||
|
||||
data class CustomThemeColors(
|
||||
val background: Int = 0xFF0A0B0D.toInt(),
|
||||
val surface: Int = 0xFF121417.toInt(),
|
||||
val surfaceVariant: Int = 0xFF1A1D22.toInt(),
|
||||
val line: Int = 0xFF262A31.toInt(),
|
||||
val line2: Int = 0xFF343A43.toInt(),
|
||||
val onBackground: Int = 0xFFF2F4F7.toInt(),
|
||||
val onSurfaceVariant: Int = 0xFF9AA3AF.toInt(),
|
||||
val primary: Int = 0xFF1A9FFF.toInt(),
|
||||
val onPrimary: Int = 0xFF03111F.toInt(),
|
||||
val signal: Int = 0xFF1A9FFF.toInt(),
|
||||
val good: Int = 0xFF4CD37F.toInt(),
|
||||
val error: Int = 0xFFFF8A80.toInt(),
|
||||
)
|
||||
|
||||
object Themes {
|
||||
const val GRAPHITE = "graphite"
|
||||
const val PAPER = "paper"
|
||||
@@ -48,6 +63,7 @@ object Themes {
|
||||
const val ELECTRIC = "electric"
|
||||
const val INNER_GAMER = "inner_gamer"
|
||||
const val GRADIENT = "gradient"
|
||||
const val CUSTOM = "custom"
|
||||
|
||||
const val DEFAULT_PRIMARY = 0xFF8B5CF6.toInt()
|
||||
const val DEFAULT_SECONDARY = 0xFF22D3EE.toInt()
|
||||
@@ -55,6 +71,9 @@ object Themes {
|
||||
var gradientColors by mutableStateOf(DEFAULT_PRIMARY to DEFAULT_SECONDARY)
|
||||
private set
|
||||
|
||||
var customColors by mutableStateOf(CustomThemeColors())
|
||||
private set
|
||||
|
||||
const val RGB_SPEEDS = 10
|
||||
const val DEFAULT_RGB_SPEED = 3
|
||||
const val RGB_HUE_STEP = 3f
|
||||
@@ -87,6 +106,7 @@ object Themes {
|
||||
gradientColors = SessionPrefs.gradientColors(context)
|
||||
rgbSpeed = SessionPrefs.rgbSpeed(context)
|
||||
trueBlackHighlight = SessionPrefs.trueBlackHighlight(context)
|
||||
customColors = SessionPrefs.customThemeColors(context)
|
||||
}
|
||||
|
||||
fun setTrueBlackHighlight(context: Context, highlight: Int) {
|
||||
@@ -104,9 +124,51 @@ object Themes {
|
||||
gradientColors = primary to secondary
|
||||
}
|
||||
|
||||
fun setCustomColors(context: Context, colors: CustomThemeColors) {
|
||||
SessionPrefs.setCustomThemeColors(context, colors)
|
||||
customColors = colors
|
||||
}
|
||||
|
||||
fun setCustomColor(context: Context, key: String, color: Int) {
|
||||
val current = customColors
|
||||
val updated = when (key) {
|
||||
"background" -> current.copy(background = color)
|
||||
"surface" -> current.copy(surface = color)
|
||||
"surfaceVariant" -> current.copy(surfaceVariant = color)
|
||||
"line" -> current.copy(line = color)
|
||||
"line2" -> current.copy(line2 = color)
|
||||
"onBackground" -> current.copy(onBackground = color)
|
||||
"onSurfaceVariant" -> current.copy(onSurfaceVariant = color)
|
||||
"primary" -> current.copy(primary = color)
|
||||
"onPrimary" -> current.copy(onPrimary = color)
|
||||
"signal" -> current.copy(signal = color)
|
||||
"good" -> current.copy(good = color)
|
||||
"error" -> current.copy(error = color)
|
||||
else -> return
|
||||
}
|
||||
setCustomColors(context, updated)
|
||||
}
|
||||
|
||||
private fun customPalette(colors: CustomThemeColors): Palette = Palette(
|
||||
CUSTOM, R.string.theme_custom, R.string.theme_custom_detail,
|
||||
background = Color(colors.background),
|
||||
surface = Color(colors.surface),
|
||||
surfaceVariant = Color(colors.surfaceVariant),
|
||||
line = Color(colors.line),
|
||||
line2 = Color(colors.line2),
|
||||
onBackground = Color(colors.onBackground),
|
||||
onSurfaceVariant = Color(colors.onSurfaceVariant),
|
||||
primary = Color(colors.primary),
|
||||
primary2 = Color(colors.primary),
|
||||
onPrimary = Color(colors.onPrimary),
|
||||
signal = Color(colors.signal),
|
||||
good = Color(colors.good),
|
||||
error = Color(colors.error),
|
||||
)
|
||||
|
||||
fun current(context: Context): Palette {
|
||||
val id = SessionPrefs.theme(context)
|
||||
if (id == GRADIENT || id == INNER_GAMER || id == TRUE_BLACK) loadGradient(context)
|
||||
if (id == GRADIENT || id == INNER_GAMER || id == TRUE_BLACK || id == CUSTOM) loadGradient(context)
|
||||
return byId(id)
|
||||
}
|
||||
|
||||
@@ -149,11 +211,13 @@ object Themes {
|
||||
),
|
||||
innerGamer(0f),
|
||||
ThemeColors.palette(DEFAULT_PRIMARY, DEFAULT_SECONDARY, R.string.theme_gradient, R.string.theme_gradient_detail),
|
||||
customPalette(customColors),
|
||||
)
|
||||
|
||||
fun byId(id: String): Palette {
|
||||
if (id == INNER_GAMER) return innerGamer(rgbHue)
|
||||
if (id == TRUE_BLACK) return ThemeColors.trueBlack(trueBlackHighlight)
|
||||
if (id == CUSTOM) return customPalette(customColors)
|
||||
if (id == GRADIENT) return ThemeColors.palette(gradientColors.first, gradientColors.second, R.string.theme_gradient, R.string.theme_gradient_detail)
|
||||
return all.firstOrNull { it.id == id } ?: all[0]
|
||||
}
|
||||
@@ -203,7 +267,6 @@ private val ContentDirected = Typography().run {
|
||||
|
||||
@Composable
|
||||
private fun InnerGamerHue(speed: Int) {
|
||||
if (Motion.scale == 0f) return
|
||||
key(speed) { InnerGamerCycle(speed) }
|
||||
}
|
||||
|
||||
|
||||
@@ -4262,4 +4262,18 @@
|
||||
<string name="display_scaling_integer">عدد صحيح</string>
|
||||
<string name="display_scaling_fit">ملاءمة</string>
|
||||
<string name="drawer_antialiasing">تنعيم الحواف</string>
|
||||
<string name="theme_custom">مخصص</string>
|
||||
<string name="theme_custom_detail">اختر كل لون في الواجهة بشكل مستقل.</string>
|
||||
<string name="theme_custom_background">الخلفية</string>
|
||||
<string name="theme_custom_surface">اللوحات</string>
|
||||
<string name="theme_custom_surface_variant">اللوحات المرتفعة</string>
|
||||
<string name="theme_custom_line">الفواصل</string>
|
||||
<string name="theme_custom_line2">الحدود</string>
|
||||
<string name="theme_custom_on_background">النص الرئيسي</string>
|
||||
<string name="theme_custom_on_surface_variant">النص الثانوي</string>
|
||||
<string name="theme_custom_primary">الأزرار واللون الأساسي</string>
|
||||
<string name="theme_custom_on_primary">نص الأزرار</string>
|
||||
<string name="theme_custom_signal">الإبرازات</string>
|
||||
<string name="theme_custom_good">نجاح</string>
|
||||
<string name="theme_custom_error">خطأ</string>
|
||||
</resources>
|
||||
@@ -4142,4 +4142,18 @@
|
||||
<string name="display_scaling_integer">Entero</string>
|
||||
<string name="display_scaling_fit">Ajustar</string>
|
||||
<string name="drawer_antialiasing">Antialiasing</string>
|
||||
<string name="theme_custom">Personalizado</string>
|
||||
<string name="theme_custom_detail">Elige cada color de la interfaz por separado.</string>
|
||||
<string name="theme_custom_background">Fondo</string>
|
||||
<string name="theme_custom_surface">Paneles</string>
|
||||
<string name="theme_custom_surface_variant">Paneles elevados</string>
|
||||
<string name="theme_custom_line">Separadores</string>
|
||||
<string name="theme_custom_line2">Bordes</string>
|
||||
<string name="theme_custom_on_background">Texto principal</string>
|
||||
<string name="theme_custom_on_surface_variant">Texto secundario</string>
|
||||
<string name="theme_custom_primary">Botones y color principal</string>
|
||||
<string name="theme_custom_on_primary">Texto de los botones</string>
|
||||
<string name="theme_custom_signal">Destacados</string>
|
||||
<string name="theme_custom_good">Éxito</string>
|
||||
<string name="theme_custom_error">Error</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Цяло число</string>
|
||||
<string name="display_scaling_fit">Побиране</string>
|
||||
<string name="drawer_antialiasing">Заглаждане на ръбовете</string>
|
||||
<string name="theme_custom">Персонализирана</string>
|
||||
<string name="theme_custom_detail">Изберете поотделно всеки цвят на интерфейса.</string>
|
||||
<string name="theme_custom_background">Фон</string>
|
||||
<string name="theme_custom_surface">Панели</string>
|
||||
<string name="theme_custom_surface_variant">Повдигнати панели</string>
|
||||
<string name="theme_custom_line">Разделители</string>
|
||||
<string name="theme_custom_line2">Рамки</string>
|
||||
<string name="theme_custom_on_background">Основен текст</string>
|
||||
<string name="theme_custom_on_surface_variant">Вторичен текст</string>
|
||||
<string name="theme_custom_primary">Бутони и основен акцент</string>
|
||||
<string name="theme_custom_on_primary">Текст на бутоните</string>
|
||||
<string name="theme_custom_signal">Акценти</string>
|
||||
<string name="theme_custom_good">Успех</string>
|
||||
<string name="theme_custom_error">Грешка</string>
|
||||
</resources>
|
||||
@@ -4182,4 +4182,18 @@
|
||||
<string name="display_scaling_integer">Celé číslo</string>
|
||||
<string name="display_scaling_fit">Přizpůsobit</string>
|
||||
<string name="drawer_antialiasing">Vyhlazování hran</string>
|
||||
<string name="theme_custom">Vlastní</string>
|
||||
<string name="theme_custom_detail">Vyberte samostatně každou barvu rozhraní.</string>
|
||||
<string name="theme_custom_background">Pozadí</string>
|
||||
<string name="theme_custom_surface">Panely</string>
|
||||
<string name="theme_custom_surface_variant">Vyvýšené panely</string>
|
||||
<string name="theme_custom_line">Oddělovače</string>
|
||||
<string name="theme_custom_line2">Ohraničení</string>
|
||||
<string name="theme_custom_on_background">Hlavní text</string>
|
||||
<string name="theme_custom_on_surface_variant">Vedlejší text</string>
|
||||
<string name="theme_custom_primary">Tlačítka a hlavní zvýraznění</string>
|
||||
<string name="theme_custom_on_primary">Text tlačítek</string>
|
||||
<string name="theme_custom_signal">Zvýraznění</string>
|
||||
<string name="theme_custom_good">Úspěch</string>
|
||||
<string name="theme_custom_error">Chyba</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Heltal</string>
|
||||
<string name="display_scaling_fit">Tilpas</string>
|
||||
<string name="drawer_antialiasing">Kantudjævning</string>
|
||||
<string name="theme_custom">Tilpasset</string>
|
||||
<string name="theme_custom_detail">Vælg hver grænsefladefarve individuelt.</string>
|
||||
<string name="theme_custom_background">Baggrund</string>
|
||||
<string name="theme_custom_surface">Paneler</string>
|
||||
<string name="theme_custom_surface_variant">Hævede paneler</string>
|
||||
<string name="theme_custom_line">Skillestreger</string>
|
||||
<string name="theme_custom_line2">Kanter</string>
|
||||
<string name="theme_custom_on_background">Primær tekst</string>
|
||||
<string name="theme_custom_on_surface_variant">Sekundær tekst</string>
|
||||
<string name="theme_custom_primary">Knapper og hovedaccent</string>
|
||||
<string name="theme_custom_on_primary">Knaptekst</string>
|
||||
<string name="theme_custom_signal">Fremhævninger</string>
|
||||
<string name="theme_custom_good">Succes</string>
|
||||
<string name="theme_custom_error">Fejl</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Ganzzahlig</string>
|
||||
<string name="display_scaling_fit">Anpassen</string>
|
||||
<string name="drawer_antialiasing">Kantenglättung</string>
|
||||
<string name="theme_custom">Benutzerdefiniert</string>
|
||||
<string name="theme_custom_detail">Wähle jede Farbe der Oberfläche einzeln aus.</string>
|
||||
<string name="theme_custom_background">Hintergrund</string>
|
||||
<string name="theme_custom_surface">Flächen</string>
|
||||
<string name="theme_custom_surface_variant">Erhöhte Flächen</string>
|
||||
<string name="theme_custom_line">Trennlinien</string>
|
||||
<string name="theme_custom_line2">Rahmen</string>
|
||||
<string name="theme_custom_on_background">Haupttext</string>
|
||||
<string name="theme_custom_on_surface_variant">Sekundärtext</string>
|
||||
<string name="theme_custom_primary">Schaltflächen und Hauptakzent</string>
|
||||
<string name="theme_custom_on_primary">Schaltflächentext</string>
|
||||
<string name="theme_custom_signal">Hervorhebungen</string>
|
||||
<string name="theme_custom_good">Erfolg</string>
|
||||
<string name="theme_custom_error">Fehler</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Ακέραιος</string>
|
||||
<string name="display_scaling_fit">Προσαρμογή</string>
|
||||
<string name="drawer_antialiasing">Εξομάλυνση ακμών</string>
|
||||
<string name="theme_custom">Προσαρμοσμένο</string>
|
||||
<string name="theme_custom_detail">Επιλέξτε ξεχωριστά κάθε χρώμα της διεπαφής.</string>
|
||||
<string name="theme_custom_background">Φόντο</string>
|
||||
<string name="theme_custom_surface">Πλαίσια</string>
|
||||
<string name="theme_custom_surface_variant">Ανυψωμένα πλαίσια</string>
|
||||
<string name="theme_custom_line">Διαχωριστικά</string>
|
||||
<string name="theme_custom_line2">Περιγράμματα</string>
|
||||
<string name="theme_custom_on_background">Κύριο κείμενο</string>
|
||||
<string name="theme_custom_on_surface_variant">Δευτερεύον κείμενο</string>
|
||||
<string name="theme_custom_primary">Κουμπιά και κύριο χρώμα έμφασης</string>
|
||||
<string name="theme_custom_on_primary">Κείμενο κουμπιών</string>
|
||||
<string name="theme_custom_signal">Επισημάνσεις</string>
|
||||
<string name="theme_custom_good">Επιτυχία</string>
|
||||
<string name="theme_custom_error">Σφάλμα</string>
|
||||
</resources>
|
||||
@@ -4142,4 +4142,18 @@
|
||||
<string name="display_scaling_integer">Entero</string>
|
||||
<string name="display_scaling_fit">Ajustar</string>
|
||||
<string name="drawer_antialiasing">Suavizado de bordes</string>
|
||||
<string name="theme_custom">Personalizado</string>
|
||||
<string name="theme_custom_detail">Elige cada color de la interfaz por separado.</string>
|
||||
<string name="theme_custom_background">Fondo</string>
|
||||
<string name="theme_custom_surface">Paneles</string>
|
||||
<string name="theme_custom_surface_variant">Paneles elevados</string>
|
||||
<string name="theme_custom_line">Separadores</string>
|
||||
<string name="theme_custom_line2">Bordes</string>
|
||||
<string name="theme_custom_on_background">Texto principal</string>
|
||||
<string name="theme_custom_on_surface_variant">Texto secundario</string>
|
||||
<string name="theme_custom_primary">Botones y color principal</string>
|
||||
<string name="theme_custom_on_primary">Texto de los botones</string>
|
||||
<string name="theme_custom_signal">Destacados</string>
|
||||
<string name="theme_custom_good">Éxito</string>
|
||||
<string name="theme_custom_error">Error</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Kokonaisluku</string>
|
||||
<string name="display_scaling_fit">Sovita</string>
|
||||
<string name="drawer_antialiasing">Reunanpehmennys</string>
|
||||
<string name="theme_custom">Mukautettu</string>
|
||||
<string name="theme_custom_detail">Valitse käyttöliittymän jokainen väri erikseen.</string>
|
||||
<string name="theme_custom_background">Tausta</string>
|
||||
<string name="theme_custom_surface">Paneelit</string>
|
||||
<string name="theme_custom_surface_variant">Korotetut paneelit</string>
|
||||
<string name="theme_custom_line">Erottimet</string>
|
||||
<string name="theme_custom_line2">Reunat</string>
|
||||
<string name="theme_custom_on_background">Pääteksti</string>
|
||||
<string name="theme_custom_on_surface_variant">Toissijainen teksti</string>
|
||||
<string name="theme_custom_primary">Painikkeet ja pääkorostus</string>
|
||||
<string name="theme_custom_on_primary">Painikkeiden teksti</string>
|
||||
<string name="theme_custom_signal">Korostukset</string>
|
||||
<string name="theme_custom_good">Onnistuminen</string>
|
||||
<string name="theme_custom_error">Virhe</string>
|
||||
</resources>
|
||||
@@ -4141,4 +4141,18 @@
|
||||
<string name="display_scaling_integer">Entier</string>
|
||||
<string name="display_scaling_fit">Ajuster</string>
|
||||
<string name="drawer_antialiasing">Anticrénelage</string>
|
||||
<string name="theme_custom">Personnalisé</string>
|
||||
<string name="theme_custom_detail">Choisissez séparément chaque couleur de l’interface.</string>
|
||||
<string name="theme_custom_background">Arrière-plan</string>
|
||||
<string name="theme_custom_surface">Panneaux</string>
|
||||
<string name="theme_custom_surface_variant">Panneaux surélevés</string>
|
||||
<string name="theme_custom_line">Séparateurs</string>
|
||||
<string name="theme_custom_line2">Bordures</string>
|
||||
<string name="theme_custom_on_background">Texte principal</string>
|
||||
<string name="theme_custom_on_surface_variant">Texte secondaire</string>
|
||||
<string name="theme_custom_primary">Boutons et accent principal</string>
|
||||
<string name="theme_custom_on_primary">Texte des boutons</string>
|
||||
<string name="theme_custom_signal">Mises en évidence</string>
|
||||
<string name="theme_custom_good">Succès</string>
|
||||
<string name="theme_custom_error">Erreur</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">पूर्णांक</string>
|
||||
<string name="display_scaling_fit">फ़िट</string>
|
||||
<string name="drawer_antialiasing">एंटी-अलियासिंग</string>
|
||||
<string name="theme_custom">कस्टम</string>
|
||||
<string name="theme_custom_detail">इंटरफ़ेस का हर रंग अलग-अलग चुनें।</string>
|
||||
<string name="theme_custom_background">पृष्ठभूमि</string>
|
||||
<string name="theme_custom_surface">पैनल</string>
|
||||
<string name="theme_custom_surface_variant">उभरे हुए पैनल</string>
|
||||
<string name="theme_custom_line">विभाजक</string>
|
||||
<string name="theme_custom_line2">किनारे</string>
|
||||
<string name="theme_custom_on_background">मुख्य टेक्स्ट</string>
|
||||
<string name="theme_custom_on_surface_variant">द्वितीयक टेक्स्ट</string>
|
||||
<string name="theme_custom_primary">बटन और मुख्य हाइलाइट</string>
|
||||
<string name="theme_custom_on_primary">बटन का टेक्स्ट</string>
|
||||
<string name="theme_custom_signal">हाइलाइट</string>
|
||||
<string name="theme_custom_good">सफलता</string>
|
||||
<string name="theme_custom_error">त्रुटि</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Egész szám</string>
|
||||
<string name="display_scaling_fit">Igazítás</string>
|
||||
<string name="drawer_antialiasing">Élsimítás</string>
|
||||
<string name="theme_custom">Egyéni</string>
|
||||
<string name="theme_custom_detail">Válaszd ki külön a felület minden színét.</string>
|
||||
<string name="theme_custom_background">Háttér</string>
|
||||
<string name="theme_custom_surface">Panelek</string>
|
||||
<string name="theme_custom_surface_variant">Kiemelt panelek</string>
|
||||
<string name="theme_custom_line">Elválasztók</string>
|
||||
<string name="theme_custom_line2">Szegélyek</string>
|
||||
<string name="theme_custom_on_background">Fő szöveg</string>
|
||||
<string name="theme_custom_on_surface_variant">Másodlagos szöveg</string>
|
||||
<string name="theme_custom_primary">Gombok és fő kiemelés</string>
|
||||
<string name="theme_custom_on_primary">Gombok szövege</string>
|
||||
<string name="theme_custom_signal">Kiemelések</string>
|
||||
<string name="theme_custom_good">Siker</string>
|
||||
<string name="theme_custom_error">Hiba</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">Bilangan bulat</string>
|
||||
<string name="display_scaling_fit">Sesuaikan</string>
|
||||
<string name="drawer_antialiasing">Anti-aliasing</string>
|
||||
<string name="theme_custom">Kustom</string>
|
||||
<string name="theme_custom_detail">Pilih setiap warna antarmuka secara terpisah.</string>
|
||||
<string name="theme_custom_background">Latar belakang</string>
|
||||
<string name="theme_custom_surface">Panel</string>
|
||||
<string name="theme_custom_surface_variant">Panel terangkat</string>
|
||||
<string name="theme_custom_line">Pemisah</string>
|
||||
<string name="theme_custom_line2">Batas</string>
|
||||
<string name="theme_custom_on_background">Teks utama</string>
|
||||
<string name="theme_custom_on_surface_variant">Teks sekunder</string>
|
||||
<string name="theme_custom_primary">Tombol dan aksen utama</string>
|
||||
<string name="theme_custom_on_primary">Teks tombol</string>
|
||||
<string name="theme_custom_signal">Sorotan</string>
|
||||
<string name="theme_custom_good">Berhasil</string>
|
||||
<string name="theme_custom_error">Kesalahan</string>
|
||||
</resources>
|
||||
@@ -4141,4 +4141,18 @@
|
||||
<string name="display_scaling_integer">Intero</string>
|
||||
<string name="display_scaling_fit">Adatta</string>
|
||||
<string name="drawer_antialiasing">Antialiasing</string>
|
||||
<string name="theme_custom">Personalizzato</string>
|
||||
<string name="theme_custom_detail">Scegli separatamente ogni colore dell’interfaccia.</string>
|
||||
<string name="theme_custom_background">Sfondo</string>
|
||||
<string name="theme_custom_surface">Pannelli</string>
|
||||
<string name="theme_custom_surface_variant">Pannelli rialzati</string>
|
||||
<string name="theme_custom_line">Separatori</string>
|
||||
<string name="theme_custom_line2">Bordi</string>
|
||||
<string name="theme_custom_on_background">Testo principale</string>
|
||||
<string name="theme_custom_on_surface_variant">Testo secondario</string>
|
||||
<string name="theme_custom_primary">Pulsanti e colore principale</string>
|
||||
<string name="theme_custom_on_primary">Testo dei pulsanti</string>
|
||||
<string name="theme_custom_signal">Evidenziazioni</string>
|
||||
<string name="theme_custom_good">Successo</string>
|
||||
<string name="theme_custom_error">Errore</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">整数</string>
|
||||
<string name="display_scaling_fit">画面に合わせる</string>
|
||||
<string name="drawer_antialiasing">アンチエイリアス</string>
|
||||
<string name="theme_custom">カスタム</string>
|
||||
<string name="theme_custom_detail">インターフェースの各色を個別に選択します。</string>
|
||||
<string name="theme_custom_background">背景</string>
|
||||
<string name="theme_custom_surface">パネル</string>
|
||||
<string name="theme_custom_surface_variant">浮き上がったパネル</string>
|
||||
<string name="theme_custom_line">区切り線</string>
|
||||
<string name="theme_custom_line2">境界線</string>
|
||||
<string name="theme_custom_on_background">メインテキスト</string>
|
||||
<string name="theme_custom_on_surface_variant">サブテキスト</string>
|
||||
<string name="theme_custom_primary">ボタンとメインアクセント</string>
|
||||
<string name="theme_custom_on_primary">ボタンのテキスト</string>
|
||||
<string name="theme_custom_signal">強調表示</string>
|
||||
<string name="theme_custom_good">成功</string>
|
||||
<string name="theme_custom_error">エラー</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">정수</string>
|
||||
<string name="display_scaling_fit">화면에 맞춤</string>
|
||||
<string name="drawer_antialiasing">안티앨리어싱</string>
|
||||
<string name="theme_custom">사용자 지정</string>
|
||||
<string name="theme_custom_detail">인터페이스의 각 색상을 개별적으로 선택하세요.</string>
|
||||
<string name="theme_custom_background">배경</string>
|
||||
<string name="theme_custom_surface">패널</string>
|
||||
<string name="theme_custom_surface_variant">돌출 패널</string>
|
||||
<string name="theme_custom_line">구분선</string>
|
||||
<string name="theme_custom_line2">테두리</string>
|
||||
<string name="theme_custom_on_background">기본 텍스트</string>
|
||||
<string name="theme_custom_on_surface_variant">보조 텍스트</string>
|
||||
<string name="theme_custom_primary">버튼 및 기본 강조색</string>
|
||||
<string name="theme_custom_on_primary">버튼 텍스트</string>
|
||||
<string name="theme_custom_signal">강조 표시</string>
|
||||
<string name="theme_custom_good">성공</string>
|
||||
<string name="theme_custom_error">오류</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">Integer</string>
|
||||
<string name="display_scaling_fit">Muat</string>
|
||||
<string name="drawer_antialiasing">Anti-aliasing</string>
|
||||
<string name="theme_custom">Tersuai</string>
|
||||
<string name="theme_custom_detail">Pilih setiap warna antara muka secara berasingan.</string>
|
||||
<string name="theme_custom_background">Latar belakang</string>
|
||||
<string name="theme_custom_surface">Panel</string>
|
||||
<string name="theme_custom_surface_variant">Panel timbul</string>
|
||||
<string name="theme_custom_line">Pemisah</string>
|
||||
<string name="theme_custom_line2">Sempadan</string>
|
||||
<string name="theme_custom_on_background">Teks utama</string>
|
||||
<string name="theme_custom_on_surface_variant">Teks sekunder</string>
|
||||
<string name="theme_custom_primary">Butang dan aksen utama</string>
|
||||
<string name="theme_custom_on_primary">Teks butang</string>
|
||||
<string name="theme_custom_signal">Sorotan</string>
|
||||
<string name="theme_custom_good">Berjaya</string>
|
||||
<string name="theme_custom_error">Ralat</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Heltall</string>
|
||||
<string name="display_scaling_fit">Tilpass</string>
|
||||
<string name="drawer_antialiasing">Kantutjevning</string>
|
||||
<string name="theme_custom">Egendefinert</string>
|
||||
<string name="theme_custom_detail">Velg hver grensesnittfarge individuelt.</string>
|
||||
<string name="theme_custom_background">Bakgrunn</string>
|
||||
<string name="theme_custom_surface">Paneler</string>
|
||||
<string name="theme_custom_surface_variant">Hevede paneler</string>
|
||||
<string name="theme_custom_line">Skillelinjer</string>
|
||||
<string name="theme_custom_line2">Kanter</string>
|
||||
<string name="theme_custom_on_background">Hovedtekst</string>
|
||||
<string name="theme_custom_on_surface_variant">Sekundærtekst</string>
|
||||
<string name="theme_custom_primary">Knapper og hovedfarge</string>
|
||||
<string name="theme_custom_on_primary">Knappetekst</string>
|
||||
<string name="theme_custom_signal">Uthevinger</string>
|
||||
<string name="theme_custom_good">Suksess</string>
|
||||
<string name="theme_custom_error">Feil</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Geheel getal</string>
|
||||
<string name="display_scaling_fit">Passend</string>
|
||||
<string name="drawer_antialiasing">Anti-aliasing</string>
|
||||
<string name="theme_custom">Aangepast</string>
|
||||
<string name="theme_custom_detail">Kies elke interfacekleur afzonderlijk.</string>
|
||||
<string name="theme_custom_background">Achtergrond</string>
|
||||
<string name="theme_custom_surface">Panelen</string>
|
||||
<string name="theme_custom_surface_variant">Verhoogde panelen</string>
|
||||
<string name="theme_custom_line">Scheidingslijnen</string>
|
||||
<string name="theme_custom_line2">Randen</string>
|
||||
<string name="theme_custom_on_background">Hoofdtekst</string>
|
||||
<string name="theme_custom_on_surface_variant">Secundaire tekst</string>
|
||||
<string name="theme_custom_primary">Knoppen en hoofdkleur</string>
|
||||
<string name="theme_custom_on_primary">Knoptekst</string>
|
||||
<string name="theme_custom_signal">Accenten</string>
|
||||
<string name="theme_custom_good">Geslaagd</string>
|
||||
<string name="theme_custom_error">Fout</string>
|
||||
</resources>
|
||||
@@ -4182,4 +4182,18 @@
|
||||
<string name="display_scaling_integer">Liczba całkowita</string>
|
||||
<string name="display_scaling_fit">Dopasuj</string>
|
||||
<string name="drawer_antialiasing">Wygładzanie krawędzi</string>
|
||||
<string name="theme_custom">Niestandardowy</string>
|
||||
<string name="theme_custom_detail">Wybierz osobno każdy kolor interfejsu.</string>
|
||||
<string name="theme_custom_background">Tło</string>
|
||||
<string name="theme_custom_surface">Panele</string>
|
||||
<string name="theme_custom_surface_variant">Wyniesione panele</string>
|
||||
<string name="theme_custom_line">Separatory</string>
|
||||
<string name="theme_custom_line2">Obramowania</string>
|
||||
<string name="theme_custom_on_background">Tekst główny</string>
|
||||
<string name="theme_custom_on_surface_variant">Tekst dodatkowy</string>
|
||||
<string name="theme_custom_primary">Przyciski i główny akcent</string>
|
||||
<string name="theme_custom_on_primary">Tekst przycisków</string>
|
||||
<string name="theme_custom_signal">Wyróżnienia</string>
|
||||
<string name="theme_custom_good">Sukces</string>
|
||||
<string name="theme_custom_error">Błąd</string>
|
||||
</resources>
|
||||
@@ -1842,6 +1842,20 @@
|
||||
<string name="theme_color_saturation">Saturação</string>
|
||||
<string name="theme_color_brightness">Brilho</string>
|
||||
<string name="theme_color_hex">Cor hexadecimal</string>
|
||||
<string name="theme_custom">Personalizado</string>
|
||||
<string name="theme_custom_detail">Escolha individualmente cada cor da interface.</string>
|
||||
<string name="theme_custom_background">Fundo</string>
|
||||
<string name="theme_custom_surface">Painéis</string>
|
||||
<string name="theme_custom_surface_variant">Painéis elevados</string>
|
||||
<string name="theme_custom_line">Divisórias</string>
|
||||
<string name="theme_custom_line2">Contornos</string>
|
||||
<string name="theme_custom_on_background">Texto principal</string>
|
||||
<string name="theme_custom_on_surface_variant">Texto secundário</string>
|
||||
<string name="theme_custom_primary">Botões e destaque principal</string>
|
||||
<string name="theme_custom_on_primary">Texto dos botões</string>
|
||||
<string name="theme_custom_signal">Destaques e indicadores</string>
|
||||
<string name="theme_custom_good">Sucesso</string>
|
||||
<string name="theme_custom_error">Erro</string>
|
||||
<string name="pckb_key_esc">Esc</string>
|
||||
<string name="pckb_key_ins">Ins</string>
|
||||
<string name="pckb_key_del">Del</string>
|
||||
|
||||
@@ -1850,6 +1850,20 @@
|
||||
<string name="theme_color_saturation">Saturação</string>
|
||||
<string name="theme_color_brightness">Brilho</string>
|
||||
<string name="theme_color_hex">Cor hexadecimal</string>
|
||||
<string name="theme_custom">Personalizado</string>
|
||||
<string name="theme_custom_detail">Escolha individualmente cada cor da interface.</string>
|
||||
<string name="theme_custom_background">Fundo</string>
|
||||
<string name="theme_custom_surface">Painéis</string>
|
||||
<string name="theme_custom_surface_variant">Painéis elevados</string>
|
||||
<string name="theme_custom_line">Divisórias</string>
|
||||
<string name="theme_custom_line2">Bordas</string>
|
||||
<string name="theme_custom_on_background">Texto principal</string>
|
||||
<string name="theme_custom_on_surface_variant">Texto secundário</string>
|
||||
<string name="theme_custom_primary">Botões e destaque principal</string>
|
||||
<string name="theme_custom_on_primary">Texto dos botões</string>
|
||||
<string name="theme_custom_signal">Destaques e indicadores</string>
|
||||
<string name="theme_custom_good">Sucesso</string>
|
||||
<string name="theme_custom_error">Erro</string>
|
||||
<string name="pckb_key_esc">Esc</string>
|
||||
<string name="pckb_key_ins">Ins</string>
|
||||
<string name="pckb_key_del">Del</string>
|
||||
|
||||
@@ -4142,4 +4142,18 @@
|
||||
<string name="display_scaling_integer">Număr întreg</string>
|
||||
<string name="display_scaling_fit">Potrivire</string>
|
||||
<string name="drawer_antialiasing">Antialiasing</string>
|
||||
<string name="theme_custom">Personalizat</string>
|
||||
<string name="theme_custom_detail">Alege separat fiecare culoare a interfeței.</string>
|
||||
<string name="theme_custom_background">Fundal</string>
|
||||
<string name="theme_custom_surface">Panouri</string>
|
||||
<string name="theme_custom_surface_variant">Panouri ridicate</string>
|
||||
<string name="theme_custom_line">Separatoare</string>
|
||||
<string name="theme_custom_line2">Margini</string>
|
||||
<string name="theme_custom_on_background">Text principal</string>
|
||||
<string name="theme_custom_on_surface_variant">Text secundar</string>
|
||||
<string name="theme_custom_primary">Butoane și accent principal</string>
|
||||
<string name="theme_custom_on_primary">Textul butoanelor</string>
|
||||
<string name="theme_custom_signal">Evidențieri</string>
|
||||
<string name="theme_custom_good">Succes</string>
|
||||
<string name="theme_custom_error">Eroare</string>
|
||||
</resources>
|
||||
@@ -4182,4 +4182,18 @@
|
||||
<string name="display_scaling_integer">Целое число</string>
|
||||
<string name="display_scaling_fit">По размеру</string>
|
||||
<string name="drawer_antialiasing">Сглаживание</string>
|
||||
<string name="theme_custom">Пользовательская</string>
|
||||
<string name="theme_custom_detail">Выберите каждый цвет интерфейса отдельно.</string>
|
||||
<string name="theme_custom_background">Фон</string>
|
||||
<string name="theme_custom_surface">Панели</string>
|
||||
<string name="theme_custom_surface_variant">Приподнятые панели</string>
|
||||
<string name="theme_custom_line">Разделители</string>
|
||||
<string name="theme_custom_line2">Границы</string>
|
||||
<string name="theme_custom_on_background">Основной текст</string>
|
||||
<string name="theme_custom_on_surface_variant">Вторичный текст</string>
|
||||
<string name="theme_custom_primary">Кнопки и основной акцент</string>
|
||||
<string name="theme_custom_on_primary">Текст кнопок</string>
|
||||
<string name="theme_custom_signal">Выделения</string>
|
||||
<string name="theme_custom_good">Успех</string>
|
||||
<string name="theme_custom_error">Ошибка</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Heltal</string>
|
||||
<string name="display_scaling_fit">Anpassa</string>
|
||||
<string name="drawer_antialiasing">Kantutjämning</string>
|
||||
<string name="theme_custom">Anpassat</string>
|
||||
<string name="theme_custom_detail">Välj varje gränssnittsfärg separat.</string>
|
||||
<string name="theme_custom_background">Bakgrund</string>
|
||||
<string name="theme_custom_surface">Paneler</string>
|
||||
<string name="theme_custom_surface_variant">Upphöjda paneler</string>
|
||||
<string name="theme_custom_line">Avdelare</string>
|
||||
<string name="theme_custom_line2">Kanter</string>
|
||||
<string name="theme_custom_on_background">Huvudtext</string>
|
||||
<string name="theme_custom_on_surface_variant">Sekundär text</string>
|
||||
<string name="theme_custom_primary">Knappar och huvudaccent</string>
|
||||
<string name="theme_custom_on_primary">Knapptext</string>
|
||||
<string name="theme_custom_signal">Markeringar</string>
|
||||
<string name="theme_custom_good">Lyckades</string>
|
||||
<string name="theme_custom_error">Fel</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">จำนวนเต็ม</string>
|
||||
<string name="display_scaling_fit">พอดีหน้าจอ</string>
|
||||
<string name="drawer_antialiasing">การลบรอยหยัก</string>
|
||||
<string name="theme_custom">กำหนดเอง</string>
|
||||
<string name="theme_custom_detail">เลือกสีแต่ละสีของอินเทอร์เฟซแยกกัน</string>
|
||||
<string name="theme_custom_background">พื้นหลัง</string>
|
||||
<string name="theme_custom_surface">แผง</string>
|
||||
<string name="theme_custom_surface_variant">แผงยกสูง</string>
|
||||
<string name="theme_custom_line">ตัวแบ่ง</string>
|
||||
<string name="theme_custom_line2">เส้นขอบ</string>
|
||||
<string name="theme_custom_on_background">ข้อความหลัก</string>
|
||||
<string name="theme_custom_on_surface_variant">ข้อความรอง</string>
|
||||
<string name="theme_custom_primary">ปุ่มและสีเน้นหลัก</string>
|
||||
<string name="theme_custom_on_primary">ข้อความบนปุ่ม</string>
|
||||
<string name="theme_custom_signal">จุดเน้น</string>
|
||||
<string name="theme_custom_good">สำเร็จ</string>
|
||||
<string name="theme_custom_error">ข้อผิดพลาด</string>
|
||||
</resources>
|
||||
@@ -4102,4 +4102,18 @@
|
||||
<string name="display_scaling_integer">Tam sayı</string>
|
||||
<string name="display_scaling_fit">Sığdır</string>
|
||||
<string name="drawer_antialiasing">Kenar yumuşatma</string>
|
||||
<string name="theme_custom">Özel</string>
|
||||
<string name="theme_custom_detail">Arayüzdeki her rengi ayrı ayrı seçin.</string>
|
||||
<string name="theme_custom_background">Arka plan</string>
|
||||
<string name="theme_custom_surface">Paneller</string>
|
||||
<string name="theme_custom_surface_variant">Yükseltilmiş paneller</string>
|
||||
<string name="theme_custom_line">Ayırıcılar</string>
|
||||
<string name="theme_custom_line2">Kenarlıklar</string>
|
||||
<string name="theme_custom_on_background">Ana metin</string>
|
||||
<string name="theme_custom_on_surface_variant">İkincil metin</string>
|
||||
<string name="theme_custom_primary">Düğmeler ve ana vurgu</string>
|
||||
<string name="theme_custom_on_primary">Düğme metni</string>
|
||||
<string name="theme_custom_signal">Vurgular</string>
|
||||
<string name="theme_custom_good">Başarılı</string>
|
||||
<string name="theme_custom_error">Hata</string>
|
||||
</resources>
|
||||
@@ -4182,4 +4182,18 @@
|
||||
<string name="display_scaling_integer">Ціле число</string>
|
||||
<string name="display_scaling_fit">За розміром</string>
|
||||
<string name="drawer_antialiasing">Згладжування</string>
|
||||
<string name="theme_custom">Власна тема</string>
|
||||
<string name="theme_custom_detail">Виберіть окремо кожен колір інтерфейсу.</string>
|
||||
<string name="theme_custom_background">Тло</string>
|
||||
<string name="theme_custom_surface">Панелі</string>
|
||||
<string name="theme_custom_surface_variant">Підняті панелі</string>
|
||||
<string name="theme_custom_line">Роздільники</string>
|
||||
<string name="theme_custom_line2">Межі</string>
|
||||
<string name="theme_custom_on_background">Основний текст</string>
|
||||
<string name="theme_custom_on_surface_variant">Вторинний текст</string>
|
||||
<string name="theme_custom_primary">Кнопки й основний акцент</string>
|
||||
<string name="theme_custom_on_primary">Текст кнопок</string>
|
||||
<string name="theme_custom_signal">Виділення</string>
|
||||
<string name="theme_custom_good">Успіх</string>
|
||||
<string name="theme_custom_error">Помилка</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">Số nguyên</string>
|
||||
<string name="display_scaling_fit">Vừa màn hình</string>
|
||||
<string name="drawer_antialiasing">Khử răng cưa</string>
|
||||
<string name="theme_custom">Tùy chỉnh</string>
|
||||
<string name="theme_custom_detail">Chọn riêng từng màu của giao diện.</string>
|
||||
<string name="theme_custom_background">Nền</string>
|
||||
<string name="theme_custom_surface">Bảng</string>
|
||||
<string name="theme_custom_surface_variant">Bảng nổi</string>
|
||||
<string name="theme_custom_line">Đường phân cách</string>
|
||||
<string name="theme_custom_line2">Đường viền</string>
|
||||
<string name="theme_custom_on_background">Văn bản chính</string>
|
||||
<string name="theme_custom_on_surface_variant">Văn bản phụ</string>
|
||||
<string name="theme_custom_primary">Nút và màu nhấn chính</string>
|
||||
<string name="theme_custom_on_primary">Văn bản trên nút</string>
|
||||
<string name="theme_custom_signal">Điểm nhấn</string>
|
||||
<string name="theme_custom_good">Thành công</string>
|
||||
<string name="theme_custom_error">Lỗi</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">整数</string>
|
||||
<string name="display_scaling_fit">适应</string>
|
||||
<string name="drawer_antialiasing">抗锯齿</string>
|
||||
<string name="theme_custom">自定义</string>
|
||||
<string name="theme_custom_detail">分别选择界面的每种颜色。</string>
|
||||
<string name="theme_custom_background">背景</string>
|
||||
<string name="theme_custom_surface">面板</string>
|
||||
<string name="theme_custom_surface_variant">凸起面板</string>
|
||||
<string name="theme_custom_line">分隔线</string>
|
||||
<string name="theme_custom_line2">边框</string>
|
||||
<string name="theme_custom_on_background">主要文本</string>
|
||||
<string name="theme_custom_on_surface_variant">次要文本</string>
|
||||
<string name="theme_custom_primary">按钮和主要强调色</string>
|
||||
<string name="theme_custom_on_primary">按钮文字</string>
|
||||
<string name="theme_custom_signal">高亮</string>
|
||||
<string name="theme_custom_good">成功</string>
|
||||
<string name="theme_custom_error">错误</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">整數</string>
|
||||
<string name="display_scaling_fit">配合畫面</string>
|
||||
<string name="drawer_antialiasing">抗鋸齒</string>
|
||||
<string name="theme_custom">自訂</string>
|
||||
<string name="theme_custom_detail">分別選擇介面的每種顏色。</string>
|
||||
<string name="theme_custom_background">背景</string>
|
||||
<string name="theme_custom_surface">面板</string>
|
||||
<string name="theme_custom_surface_variant">凸起面板</string>
|
||||
<string name="theme_custom_line">分隔線</string>
|
||||
<string name="theme_custom_line2">邊框</string>
|
||||
<string name="theme_custom_on_background">主要文字</string>
|
||||
<string name="theme_custom_on_surface_variant">次要文字</string>
|
||||
<string name="theme_custom_primary">按鈕和主要強調色</string>
|
||||
<string name="theme_custom_on_primary">按鈕文字</string>
|
||||
<string name="theme_custom_signal">重點標示</string>
|
||||
<string name="theme_custom_good">成功</string>
|
||||
<string name="theme_custom_error">錯誤</string>
|
||||
</resources>
|
||||
@@ -4072,4 +4072,18 @@
|
||||
<string name="display_scaling_integer">整數</string>
|
||||
<string name="display_scaling_fit">符合畫面</string>
|
||||
<string name="drawer_antialiasing">抗鋸齒</string>
|
||||
<string name="theme_custom">自訂</string>
|
||||
<string name="theme_custom_detail">分別選擇介面的每種顏色。</string>
|
||||
<string name="theme_custom_background">背景</string>
|
||||
<string name="theme_custom_surface">面板</string>
|
||||
<string name="theme_custom_surface_variant">浮起面板</string>
|
||||
<string name="theme_custom_line">分隔線</string>
|
||||
<string name="theme_custom_line2">邊框</string>
|
||||
<string name="theme_custom_on_background">主要文字</string>
|
||||
<string name="theme_custom_on_surface_variant">次要文字</string>
|
||||
<string name="theme_custom_primary">按鈕與主要強調色</string>
|
||||
<string name="theme_custom_on_primary">按鈕文字</string>
|
||||
<string name="theme_custom_signal">醒目標示</string>
|
||||
<string name="theme_custom_good">成功</string>
|
||||
<string name="theme_custom_error">錯誤</string>
|
||||
</resources>
|
||||
@@ -2039,6 +2039,20 @@
|
||||
<string name="theme_color_saturation">Saturation</string>
|
||||
<string name="theme_color_brightness">Brightness</string>
|
||||
<string name="theme_color_hex">Hex color</string>
|
||||
<string name="theme_custom">Custom</string>
|
||||
<string name="theme_custom_detail">Choose each interface color independently.</string>
|
||||
<string name="theme_custom_background">Background</string>
|
||||
<string name="theme_custom_surface">Panels</string>
|
||||
<string name="theme_custom_surface_variant">Raised panels</string>
|
||||
<string name="theme_custom_line">Dividers</string>
|
||||
<string name="theme_custom_line2">Borders</string>
|
||||
<string name="theme_custom_on_background">Main text</string>
|
||||
<string name="theme_custom_on_surface_variant">Secondary text</string>
|
||||
<string name="theme_custom_primary">Buttons and main accent</string>
|
||||
<string name="theme_custom_on_primary">Button text</string>
|
||||
<string name="theme_custom_signal">Highlights</string>
|
||||
<string name="theme_custom_good">Success</string>
|
||||
<string name="theme_custom_error">Error</string>
|
||||
<string name="pckb_key_esc">Esc</string>
|
||||
<string name="pckb_key_ins">Ins</string>
|
||||
<string name="pckb_key_del">Del</string>
|
||||
|
||||
@@ -188,4 +188,45 @@ class ThemeColorsTest {
|
||||
SessionPrefs.setTheme(app, Themes.TRUE_BLACK)
|
||||
assertEquals(Color(0xFFFF8800), Themes.current(app).primary)
|
||||
}
|
||||
|
||||
@Test fun customThemeRestoresIndependentColorsAndUsesASolidAccent() {
|
||||
val chosen = CustomThemeColors(
|
||||
background = 0xFF101112.toInt(),
|
||||
surface = 0xFF202122.toInt(),
|
||||
surfaceVariant = 0xFF303132.toInt(),
|
||||
line = 0xFF404142.toInt(),
|
||||
line2 = 0xFF505152.toInt(),
|
||||
onBackground = 0xFFF1F2F3.toInt(),
|
||||
onSurfaceVariant = 0xFFD1D2D3.toInt(),
|
||||
primary = 0xFF336699.toInt(),
|
||||
onPrimary = 0xFFFFFFFF.toInt(),
|
||||
signal = 0xFFFFAA00.toInt(),
|
||||
good = 0xFF00CC66.toInt(),
|
||||
error = 0xFFFF4433.toInt(),
|
||||
)
|
||||
|
||||
Themes.setCustomColors(app, CustomThemeColors())
|
||||
SessionPrefs.setCustomThemeColors(app, chosen)
|
||||
SessionPrefs.setTheme(app, Themes.CUSTOM)
|
||||
|
||||
assertEquals(chosen, SessionPrefs.customThemeColors(app))
|
||||
|
||||
val palette = Themes.current(app)
|
||||
assertEquals(Themes.CUSTOM, palette.id)
|
||||
assertEquals(Color(chosen.background), palette.background)
|
||||
assertEquals(Color(chosen.surface), palette.surface)
|
||||
assertEquals(Color(chosen.surfaceVariant), palette.surfaceVariant)
|
||||
assertEquals(Color(chosen.line), palette.line)
|
||||
assertEquals(Color(chosen.line2), palette.line2)
|
||||
assertEquals(Color(chosen.onBackground), palette.onBackground)
|
||||
assertEquals(Color(chosen.onSurfaceVariant), palette.onSurfaceVariant)
|
||||
assertEquals(Color(chosen.primary), palette.primary)
|
||||
assertEquals(Color(chosen.primary), palette.primary2)
|
||||
assertEquals(Color(chosen.onPrimary), palette.onPrimary)
|
||||
assertEquals(Color(chosen.signal), palette.signal)
|
||||
assertEquals(Color(chosen.good), palette.good)
|
||||
assertEquals(Color(chosen.error), palette.error)
|
||||
assertTrue(Themes.all.any { it.id == Themes.CUSTOM })
|
||||
}
|
||||
|
||||
}
|
||||
+16
-11
@@ -8,10 +8,7 @@ A theme is a `Palette` (`ui/Theme.kt`): a dark background scale (`background`, `
|
||||
|
||||
## Gradient theme
|
||||
|
||||
`Themes.GRADIENT` is the one theme whose colours the person picks: a primary and a secondary,
|
||||
kept in `SessionPrefs.gradientColors` and in `Themes.gradientColors`, a Compose state, so a change
|
||||
restyles the whole app at once. `App.onCreate` loads the saved colours; code outside a composition
|
||||
uses `Themes.current(context)`.
|
||||
`Themes.GRADIENT` is the one of the theme whose colours the person picks: a primary and a secondary, kept in `SessionPrefs.gradientColors` and in `Themes.gradientColors`, a Compose state, so a change restyles the whole app at once. `App.onCreate` loads the saved colours; code outside a composition uses `Themes.current(context)`.
|
||||
|
||||
`ThemeColors.palette` builds the full palette from the two colours: primary becomes
|
||||
`primary` / `signal`, secondary becomes `primary2`, the background scale is a dark neutral tinted with
|
||||
@@ -24,16 +21,24 @@ square. It opens `ColorPickerDialog`: a wheel (hue and saturation, touch), hue /
|
||||
brightness sliders (they work with a controller) and a hex box, with the old and new colour side by
|
||||
side. OK applies it.
|
||||
|
||||
## Custom theme
|
||||
|
||||
`Themes.CUSTOM` stores a separate preference for every configurable palette colour:
|
||||
background, surfaces, borders, text, accent, button text, signals, success and error.
|
||||
`SessionPrefs.customThemeColors` restores the saved values, while `Themes.customColors`
|
||||
is Compose state so changes update the interface immediately.
|
||||
|
||||
The custom palette does not derive its surfaces from the accent. `primary2` intentionally
|
||||
equals `primary`, keeping components that use the existing two-stop button and launch
|
||||
effects visually solid. The colour picker reused from Gradient supports the wheel, sliders
|
||||
and hexadecimal input.
|
||||
|
||||
## Inner Gamer theme
|
||||
|
||||
`Themes.INNER_GAMER` is an RGB theme: the accent walks round the colour wheel. It sits just above
|
||||
Gradient in the list, and Setup shows a Speed slider (1 to 10, `SessionPrefs.rgbSpeed`) under the
|
||||
theme while it is chosen.
|
||||
Gradient in the list, and Setup shows a Speed slider (1 to 10, `SessionPrefs.rgbSpeed`) under the theme while it is chosen.
|
||||
|
||||
`Themes.innerGamer(hue)` builds the palette for one hue through `ThemeColors.palette`, so button text
|
||||
keeps the same contrast along the gradient at every hue. `DroidDeckTheme` runs one
|
||||
`rememberInfiniteTransition` while Inner Gamer is chosen, so the system's animation clock drives it.
|
||||
Compose applies Android's animator scale to it, and the colour holds still when animations are off
|
||||
in the app (`Motion.scale`) or in Android's own settings. The hue is written to `Themes.rgbHue` in 3° steps, which restyles the
|
||||
`Themes.innerGamer(hue)` builds the palette for one hue through `ThemeColors.palette`, so button text keeps the same contrast along the gradient at every hue. `DroidDeckTheme` runs one `rememberInfiniteTransition` while Inner Gamer is chosen, so the system's animation clock drives it.
|
||||
Compose applies Android's animator scale to it, and the colour holds still when animations are off in the app (`Motion.scale`) or in Android's own settings. The hue is written to `Themes.rgbHue` in 3° steps, which restyles the
|
||||
app only when the colour visibly moves; a slow cycle costs few recompositions.
|
||||
|
||||
Reference in new issue
Block a user