refactor: 精简主题模板为设置页主题二选一

去掉之前多余的6套模板配色(ocean/sunset/forest/mono等),
只保留一个清晰的二选一功能:

- 动物岛风 (默认) — 当前 Animal Island 固定配色,不变
- 系统莫奈色 — 设置页 UI 使用系统 Monet 色系,与主面板一致

改动:
- THEME_TEMPLATE → SETTINGS_THEME (animal/monet)
- 删除 th_04_theme.js 的 getThemeTemplate/applyThemeTemplate
- buildSettingsGroupPanelView 直接根据 SETTINGS_THEME 用
  ui.colors 的 Monet 色构造 T 结构
- setPendingValue 中 SETTINGS_THEME 切换时重建设置页
This commit is contained in:
7015725
2026-05-15 02:24:28 +08:00
parent cb01591369
commit 32a30babcc
6 changed files with 43 additions and 132 deletions

View File

@@ -83,7 +83,7 @@ var ConfigValidator = {
PANEL_PADDING_DP: { type: "int", min: 8, max: 32, default: 12 },
// 主题配置
THEME_TEMPLATE: { type: "enum", values: ["system", "animal", "ocean", "sunset", "forest", "mono"], default: "system" },
SETTINGS_THEME: { type: "enum", values: ["animal", "monet"], default: "animal" },
THEME_MODE: { type: "enum", values: [0, 1, 2], default: 1 },
THEME_ACCENT_LIGHT: { type: "string", default: "#FF3A86FF" },
THEME_ACCENT_DARK: { type: "string", default: "#FF90CAF9" },
@@ -755,7 +755,7 @@ var ConfigManager = {
PANEL_LABEL_TOP_MARGIN_DP: 4,
PANEL_BG_FALLBACK_HEX: "#EE1E1E1E",
PANEL_BG_ALPHA: 0.85,
THEME_TEMPLATE: "system",
SETTINGS_THEME: "animal",
THEME_MODE: 1,
THEME_DAY_BG_HEX: null,
THEME_DAY_TEXT_HEX: null,
@@ -772,13 +772,9 @@ var ConfigManager = {
],
defaultSchema: [
{ type: "section", name: "外观" },
{ key: "THEME_TEMPLATE", name: "主题模板", type: "single_choice", options: [
{ label: "系统莫奈色", value: "system" },
{ label: "动物岛(绿)", value: "animal" },
{ label: "海洋(蓝)", value: "ocean" },
{ label: "日落(橙)", value: "sunset" },
{ label: "森林(绿)", value: "forest" },
{ label: "黑白(极简)", value: "mono" }
{ key: "SETTINGS_THEME", name: "设置页主题", type: "single_choice", options: [
{ label: "动物岛风", value: "animal" },
{ label: "系统莫奈色", value: "monet" }
]},
{ key: "THEME_MODE", name: "主题(0跟随/1白/2黑)", type: "int", min: 0, max: 2, step: 1 },
{ key: "THEME_DAY_BG_HEX", name: "日间背景色(#RRGGBB)", type: "text" },
@@ -874,7 +870,7 @@ var ConfigManager = {
var needReset = false;
if (s) {
var sStr = JSON.stringify(s);
if (sStr.indexOf("ENABLE_SNAP_TO_EDGE") < 0 || sStr.indexOf("ENABLE_ANIMATIONS") < 0 || sStr.indexOf("BALL_IDLE_ALPHA") < 0 || sStr.indexOf("PANEL_POS_GRAVITY") < 0 || sStr.indexOf("single_choice") < 0 || sStr.indexOf("ball_shortx_icon") < 0 || sStr.indexOf("ball_color") < 0 || sStr.indexOf("THEME_TEMPLATE") < 0) {
if (sStr.indexOf("ENABLE_SNAP_TO_EDGE") < 0 || sStr.indexOf("ENABLE_ANIMATIONS") < 0 || sStr.indexOf("BALL_IDLE_ALPHA") < 0 || sStr.indexOf("PANEL_POS_GRAVITY") < 0 || sStr.indexOf("single_choice") < 0 || sStr.indexOf("ball_shortx_icon") < 0 || sStr.indexOf("ball_color") < 0 || sStr.indexOf("SETTINGS_THEME") < 0) {
needReset = true;
}
} else {