M2.90: MIUIx 风格包落地 + ui.style 一键切换闭环
- meow_ui_theme.c: 为 MEOW_STYLE_MIUIX 实现整套 light/dark 配色(暖基面+小米橙 primary 0xF57200/0xFF8C4A+蓝 tertiary;圆角 20/卡片 28、间距 12、细描边 1),与 MD3 可感知差异 - display.background 随 style×mode 派生 MIUIx 色板(bg_surfaces 增 style 参;图片背景保持各 style 默认面) - meow_settings.c g_defs: ui.style 值域 'md3,miui'→'md3,miuix'(label Material You,MIUIx); apply_value SET_ENUM 对存量 'miui' 兼容映射为 miuix - settings_page s_commit: ui.style 分支 → meow_ui_set_style + paint_sb_right + meow_dirty_full 即时换肤 - font_theme s_ui_theme() 接 ui.style + MIUIx dark/light 表;main_menu 背景签名含 ui.style + 纯色底随 style 换族 - 宿主编译 -Wall -Wextra 0 warning;test_meow_ui_theme 四套 s×m 渲染全 PASS; test_meow_ui_widgets/test_sdk_fixes 全 PASS(MD3 行为一致) - 产物 md5: meow_ui.a a4231296 / launcher 9f97af1b(未部署走固件)/ hello e5527578 / files 993e41ca / ncm 6b9eeb0f(三 App 已 .new+mv 热更到卡, 设备 md5 已核一致) - 待后续: 状态栏图标集仍 MD3 一套(sb_icons.h 无 per-style 换集接口, MIUIx 仅换配色); App 进程 SDK 主题缓存 g_loaded 不随 settings 外部改写重读, 运行中 App 下次启动才换肤
This commit is contained in:
1 parent
f23720f934
commit
4e3f41a5a3
13 files changed
+250
-42
No files matched your search
@@ -746,6 +746,18 @@ static const meow_ui_theme_t meow_ui_theme_light = {
|
||||
0x4A4F5A, 0x9AA4C8, 0xB3261E, 0x2A5A8A
|
||||
};
|
||||
|
||||
/* MIUIx 族(§8.1.3 定案):暖色基面 + 小米橙 primary,供 launcher 主界面/设置页/通知中心/
|
||||
* 电源菜单(s_ui_theme())在 ui.style=miuix 时使用(与 SDK meow_theme MIUIx 同色系)。 */
|
||||
static const meow_ui_theme_t meow_ui_theme_miui_dark = {
|
||||
0x181310, 0x2A231C, 0x2E2620, 0xFF8C4A, 0xEDE5DC,
|
||||
0xAB9884, 0x4A3F35, 0xFFB4AB, 0xFF8C4A
|
||||
};
|
||||
|
||||
static const meow_ui_theme_t meow_ui_theme_miui_light = {
|
||||
0xF7F3EE, 0xE9DFD0, 0xF4EDE3, 0xF57200, 0x251A10,
|
||||
0x7D6A5A, 0xCBBFB2, 0xB3261E, 0xF57200
|
||||
};
|
||||
|
||||
/* 获取当前本地时刻的「当天第几分钟」(tm_hour*60+tm_min);供时段判定用 */
|
||||
static int s_now_min_of_day(void)
|
||||
{
|
||||
@@ -768,13 +780,18 @@ static int theme_should_dark(int now_min, int start, int end)
|
||||
return (now_min >= start || now_min < end) ? 1 : 0; /* 跨午夜 */
|
||||
}
|
||||
|
||||
/* 当前主题(dark/light 两套;接 display.theme_mode + display.theme)。
|
||||
/* 当前主题(style×明暗 两套;接 ui.style + display.theme_mode + display.theme)。
|
||||
* style(§8.1.1):ui.style 的 md3/miuix → 返回对应体系(MD3 tonal / MIUIx 暖色+橙)。
|
||||
* manual(mode==THEME_MODE_MANUAL):直读 display.theme(dark/light),保持原有行为。
|
||||
* auto(mode==THEME_MODE_AUTO):读深色时段两键 + 当前本地分钟;start==end 未配置 →
|
||||
* 回退 manual(读 display.theme,避免误判全天深色)。
|
||||
* 读取失败一律回退 dark。 */
|
||||
const meow_ui_theme_t *s_ui_theme(void)
|
||||
{
|
||||
int style = 0; /* ui.style:0=md3 / 1=miuix */
|
||||
if (meow_settings_get_enum("ui.style", &style) != 0) style = 0;
|
||||
const meow_ui_theme_t *light = (style == 1) ? &meow_ui_theme_miui_light : &meow_ui_theme_light;
|
||||
const meow_ui_theme_t *dark = (style == 1) ? &meow_ui_theme_miui_dark : &meow_ui_theme_dark;
|
||||
int mode = THEME_MODE_MANUAL;
|
||||
if (meow_settings_get_enum("display.theme_mode", &mode) != 0) mode = THEME_MODE_MANUAL;
|
||||
int v = 0; /* display.theme(manual)当前索引 */
|
||||
@@ -785,13 +802,13 @@ const meow_ui_theme_t *s_ui_theme(void)
|
||||
meow_settings_get_int("display.theme_dark_end", &end);
|
||||
int d = theme_should_dark(s_now_min_of_day(), start, end);
|
||||
if (d < 0) { /* 未配置:回退 manual(display.theme) */
|
||||
if (have_manual && v == 1) return &meow_ui_theme_light;
|
||||
return &meow_ui_theme_dark;
|
||||
if (have_manual && v == 1) return light;
|
||||
return dark;
|
||||
}
|
||||
return d ? &meow_ui_theme_dark : &meow_ui_theme_light;
|
||||
return d ? dark : light;
|
||||
}
|
||||
/* manual:照旧读 display.theme */
|
||||
if (have_manual && v == 1) return &meow_ui_theme_light;
|
||||
return &meow_ui_theme_dark;
|
||||
if (have_manual && v == 1) return light;
|
||||
return dark;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user