NewLife/XCoder

feat(shell): 强调色跟随系统并适配高对比度模式

- 新增 SystemAppearance:读系统强调色推导 Accent 三档颜色,过亮/过暗先拉回可用区间
- 高对比度模式覆盖底色/文字/描边为纯黑白,取消设置后自动回落主题令牌
- 订阅平台颜色与主题变化,运行时即时生效;品牌渐变与控制台令牌保持不动
大石头 authored at 2026-11-12 17:10:45
65d7290
Tree
1 Parent(s) 407987a
Summary: 4 changed files with 319 additions and 0 deletions.
Added +63 -0
Added +104 -0
Modified +1 -0
Added +151 -0
Added +63 -0
diff --git a/Tests/XCoder.App.Tests/SystemAccentTests.cs b/Tests/XCoder.App.Tests/SystemAccentTests.cs
new file mode 100644
index 0000000..0e627af
--- /dev/null
+++ b/Tests/XCoder.App.Tests/SystemAccentTests.cs
@@ -0,0 +1,63 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Media;
+using NewLife.XCoder.Services;
+using Xunit;
+
+namespace XCoder.App.Tests;
+
+/// <summary>系统强调色推导</summary>
+public class SystemAccentTests
+{
+    [Fact]
+    [DisplayName("深色主题的悬停色更亮、浅底色更暗")]
+    public void BuildAccent_Dark()
+    {
+        var accent = Color.Parse("#0B72D9");
+
+        var (baseColor, hover, soft) = SystemAppearance.BuildAccent(accent, true);
+
+        Assert.Equal(accent, baseColor);
+        Assert.True(Luminance(hover) > Luminance(baseColor));
+        Assert.True(Luminance(soft) < 0.25);
+    }
+
+    [Fact]
+    [DisplayName("浅色主题的悬停色更暗、浅底色接近白")]
+    public void BuildAccent_Light()
+    {
+        var accent = Color.Parse("#0B72D9");
+
+        var (baseColor, hover, soft) = SystemAppearance.BuildAccent(accent, false);
+
+        Assert.Equal(accent, baseColor);
+        Assert.True(Luminance(hover) < Luminance(baseColor));
+        Assert.True(Luminance(soft) > 0.85);
+    }
+
+    [Fact]
+    [DisplayName("过亮的强调色在浅色主题自动压暗")]
+    public void BuildAccent_DimsBrightAccentOnLight()
+    {
+        var yellow = Color.Parse("#FFE100");
+
+        var (baseColor, _, _) = SystemAppearance.BuildAccent(yellow, false);
+
+        Assert.True(Luminance(baseColor) <= 0.7);
+        Assert.NotEqual(yellow, baseColor);
+    }
+
+    [Fact]
+    [DisplayName("过暗的强调色在深色主题自动提亮")]
+    public void BuildAccent_BrightensDarkAccentOnDark()
+    {
+        var navy = Color.Parse("#101820");
+
+        var (baseColor, _, _) = SystemAppearance.BuildAccent(navy, true);
+
+        Assert.True(Luminance(baseColor) >= 0.35);
+        Assert.NotEqual(navy, baseColor);
+    }
+
+    private static Double Luminance(Color color) => (0.2126 * color.R + 0.7152 * color.G + 0.0722 * color.B) / 255;
+}
Added +104 -0
diff --git a/Tests/XCoder.App.UiTests/SystemAppearanceTests.cs b/Tests/XCoder.App.UiTests/SystemAppearanceTests.cs
new file mode 100644
index 0000000..ade8607
--- /dev/null
+++ b/Tests/XCoder.App.UiTests/SystemAppearanceTests.cs
@@ -0,0 +1,104 @@
+using System;
+using System.ComponentModel;
+using Avalonia;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Styling;
+using NewLife.XCoder.Services;
+using Xunit;
+
+namespace XCoder.App.UiTests;
+
+/// <summary>系统强调色与高对比度覆盖:写入与回落</summary>
+public class SystemAppearanceTests
+{
+    [Fact]
+    [DisplayName("强调色覆盖令牌,取消后回落到主题默认色")]
+    public Task Accent_OverridesAndFallsBack() => UiSession.Run(() =>
+    {
+        var app = Application.Current!;
+        try
+        {
+            SystemAppearance.Apply(Values(Color.Parse("#C42B1C")), true);
+
+            var brush = Assert.IsType<SolidColorBrush>(app.Resources["Accent"]);
+            Assert.Equal(SystemAppearance.BuildAccent(Color.Parse("#C42B1C"), true).Accent, brush.Color);
+
+            SystemAppearance.Apply(Values(), true);
+
+            Assert.False(app.Resources.ContainsKey("Accent"));
+            Assert.True(app.Resources.TryGetResource("Accent", app.ActualThemeVariant, out var fallback));
+            Assert.IsType<SolidColorBrush>(fallback);
+        }
+        finally
+        {
+            SystemAppearance.Apply(null, app.ActualThemeVariant == ThemeVariant.Dark);
+        }
+
+        return Task.CompletedTask;
+    });
+
+    [Fact]
+    [DisplayName("高对比度启用纯黑底白字,取消后恢复主题底色")]
+    public Task HighContrast_OverridesThenRestores() => UiSession.Run(() =>
+    {
+        var app = Application.Current!;
+        var old = ThemeService.Mode;
+        try
+        {
+            ThemeService.Apply("dark", false);
+
+            SystemAppearance.Apply(Values(contrast: ColorContrastPreference.High), true);
+            Assert.True(SystemAppearance.HighContrast);
+            var page = Assert.IsType<SolidColorBrush>(app.Resources["BgPage"]);
+            Assert.Equal(Colors.Black, page.Color);
+            var text = Assert.IsType<SolidColorBrush>(app.Resources["TextPrimary"]);
+            Assert.Equal(Colors.White, text.Color);
+
+            SystemAppearance.Apply(Values(), true);
+            Assert.False(SystemAppearance.HighContrast);
+            Assert.False(app.Resources.ContainsKey("BgPage"));
+            Assert.True(app.Resources.TryGetResource("BgPage", app.ActualThemeVariant, out var restored));
+            Assert.NotEqual(Colors.Black, Assert.IsType<SolidColorBrush>(restored).Color);
+        }
+        finally
+        {
+            ThemeService.Apply(old, false);
+            SystemAppearance.Apply(null, false);
+        }
+
+        return Task.CompletedTask;
+    });
+
+    [Fact]
+    [DisplayName("高对比度浅色主题使用白底黑字")]
+    public Task HighContrast_Light() => UiSession.Run(() =>
+    {
+        var app = Application.Current!;
+        try
+        {
+            SystemAppearance.Apply(Values(contrast: ColorContrastPreference.High), false);
+
+            var page = Assert.IsType<SolidColorBrush>(app.Resources["BgPage"]);
+            Assert.Equal(Colors.White, page.Color);
+            var text = Assert.IsType<SolidColorBrush>(app.Resources["TextPrimary"]);
+            Assert.Equal(Colors.Black, text.Color);
+        }
+        finally
+        {
+            SystemAppearance.Apply(null, false);
+        }
+
+        return Task.CompletedTask;
+    });
+
+    private static PlatformColorValues Values(Color? accent = null, ColorContrastPreference contrast = ColorContrastPreference.NoPreference) => new()
+    {
+        AccentColor1 = accent ?? Colors.Transparent,
+        ContrastPreference = contrast,
+        ThemeVariant = PlatformThemeVariant.Dark,
+    };
+}
+
+
+
Modified +1 -0
diff --git a/XCoder.App/App.axaml.cs b/XCoder.App/App.axaml.cs
index 8fcae7f..3581a5a 100644
--- a/XCoder.App/App.axaml.cs
+++ b/XCoder.App/App.axaml.cs
@@ -29,6 +29,7 @@ public partial class App : Application
             AppPaths.EnsureCreated();
             ThemeService.Initialize();
             LocalizationService.Initialize();
+            SystemAppearance.Initialize();
 
             desktop.MainWindow = new ShellWindow();
             desktop.ShutdownMode = Avalonia.Controls.ShutdownMode.OnExplicitShutdown;
Added +151 -0
diff --git a/XCoder.App/Services/SystemAppearance.cs b/XCoder.App/Services/SystemAppearance.cs
new file mode 100644
index 0000000..9fc37ef
--- /dev/null
+++ b/XCoder.App/Services/SystemAppearance.cs
@@ -0,0 +1,151 @@
+using System;
+using Avalonia;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Styling;
+using Avalonia.Threading;
+
+namespace NewLife.XCoder.Services;
+
+/// <summary>系统外观适配:跟随系统强调色,并在高对比度模式下强化对比</summary>
+/// <remarks>
+/// 强调色与高对比度都由系统设置决定,不新增主题数量:强调色只覆盖 <c>Accent</c> 系列令牌,
+/// 高对比度只覆盖底色、文字与描边令牌,落在应用资源的最上层,取消设置后自动回落到主题令牌。
+/// 品牌渐变(<c>Hero*</c>)与控制台令牌保持不变,避免浅色强调色破坏白字对比。
+/// </remarks>
+public static class SystemAppearance
+{
+    private const String DarkSurface = "#0E1520";
+
+    private static IPlatformSettings? _settings;
+
+    /// <summary>当前是否处于高对比度模式</summary>
+    public static Boolean HighContrast { get; private set; }
+
+    /// <summary>当前生效的强调色;为空表示沿用主题默认色</summary>
+    public static Color? AccentColor { get; private set; }
+
+    /// <summary>订阅系统外观变化;启动时调用一次</summary>
+    public static void Initialize()
+    {
+        var app = Application.Current;
+        if (app == null) return;
+
+        _settings = app.PlatformSettings;
+        if (_settings != null) _settings.ColorValuesChanged += (s, e) => Refresh();
+
+        // 强调色明暗与高对比度取值都跟深色/浅色相关,主题变化后重新推导
+        ThemeService.Changed += _ => Refresh();
+        app.ActualThemeVariantChanged += (s, e) => Refresh();
+
+        Refresh();
+    }
+
+    /// <summary>按当前系统设置重新应用(界面线程)</summary>
+    public static void Refresh()
+    {
+        if (!Dispatcher.UIThread.CheckAccess())
+        {
+            Dispatcher.UIThread.Post(Refresh);
+            return;
+        }
+
+        var dark = Application.Current?.ActualThemeVariant == ThemeVariant.Dark;
+        Apply(_settings?.GetColorValues(), dark);
+    }
+
+    /// <summary>按系统颜色设置刷新强调色与高对比度覆盖</summary>
+    /// <param name="values">平台颜色设置</param>
+    /// <param name="dark">深色主题下取更亮的强调色</param>
+    public static void Apply(PlatformColorValues? values, Boolean dark)
+    {
+        var resources = Avalonia.Application.Current?.Resources;
+        if (resources == null) return;
+
+        // 强调色:系统未提供(如部分 Linux 桌面)时沿用主题默认色
+        AccentColor = values != null && values.AccentColor1.A > 0 ? values.AccentColor1 : null;
+        if (AccentColor is { } accent)
+        {
+            var palette = BuildAccent(accent, dark);
+            resources["Accent"] = new SolidColorBrush(palette.Accent);
+            resources["AccentHover"] = new SolidColorBrush(palette.Hover);
+            resources["AccentSoft"] = new SolidColorBrush(palette.Soft);
+        }
+        else
+        {
+            resources.Remove("Accent");
+            resources.Remove("AccentHover");
+            resources.Remove("AccentSoft");
+        }
+
+        HighContrast = values?.ContrastPreference == ColorContrastPreference.High;
+        if (HighContrast)
+        {
+            foreach (var item in HighContrastTokens(dark)) resources[item.Key] = new SolidColorBrush(item.Value);
+        }
+        else
+        {
+            foreach (var key in HighContrastKeys) resources.Remove(key);
+        }
+    }
+
+    /// <summary>按强调色推导强调色、悬停色与浅底色</summary>
+    /// <param name="accent">系统强调色</param>
+    /// <param name="dark">是否深色主题</param>
+    /// <returns>三档强调色</returns>
+    public static (Color Accent, Color Hover, Color Soft) BuildAccent(Color accent, Boolean dark)
+    {
+        var baseColor = accent;
+        // 过亮/过暗的强调色直接使用会看不清,先往可用区间拉一把
+        if (dark && Luminance(baseColor) < 0.35) baseColor = Blend(baseColor, Colors.White, 0.3);
+        if (!dark && Luminance(baseColor) > 0.7) baseColor = Blend(baseColor, Colors.Black, 0.35);
+
+        var hover = dark ? Blend(baseColor, Colors.White, 0.18) : Blend(baseColor, Colors.Black, 0.14);
+        var soft = dark ? Blend(baseColor, Color.Parse(DarkSurface), 0.82) : Blend(baseColor, Colors.White, 0.88);
+        return (baseColor, hover, soft);
+    }
+
+    private static readonly String[] HighContrastKeys =
+    [
+        "BgPage", "BgSurface", "BgSurface2", "BgSidebar", "BgSubtle", "BgSidebarActive", "BgHover", "BgPressed",
+        "BorderDefault", "BorderStrong", "TextPrimary", "TextSecondary", "TextTertiary",
+    ];
+
+    private static (String Key, Color Value)[] HighContrastTokens(Boolean dark)
+    {
+        if (dark)
+        {
+            var white = Colors.White;
+            var black = Colors.Black;
+            return
+            [
+                ("BgPage", black), ("BgSurface", black), ("BgSurface2", Color.Parse("#0A0A0A")),
+                ("BgSidebar", black), ("BgSubtle", Color.Parse("#1F1F1F")), ("BgSidebarActive", Color.Parse("#1F1F1F")),
+                ("BgHover", Color.Parse("#1F1F1F")), ("BgPressed", Color.Parse("#333333")),
+                ("BorderDefault", white), ("BorderStrong", white),
+                ("TextPrimary", white), ("TextSecondary", white), ("TextTertiary", Color.Parse("#E6E6E6")),
+            ];
+        }
+
+        var light = Colors.Black;
+        var surface = Colors.White;
+        return
+        [
+            ("BgPage", surface), ("BgSurface", surface), ("BgSurface2", surface),
+            ("BgSidebar", surface), ("BgSubtle", Color.Parse("#E6E6E6")), ("BgSidebarActive", Color.Parse("#E6E6E6")),
+            ("BgHover", Color.Parse("#E6E6E6")), ("BgPressed", Color.Parse("#CCCCCC")),
+            ("BorderDefault", light), ("BorderStrong", light),
+            ("TextPrimary", light), ("TextSecondary", light), ("TextTertiary", Color.Parse("#1A1A1A")),
+        ];
+    }
+
+    private static Double Luminance(Color color) => (0.2126 * color.R + 0.7152 * color.G + 0.0722 * color.B) / 255;
+
+    private static Color Blend(Color from, Color to, Double ratio)
+    {
+        var t = Math.Clamp(ratio, 0, 1);
+        Byte Mix(Byte a, Byte b) => (Byte)Math.Round(a + (b - a) * t);
+
+        return Color.FromArgb(from.A, Mix(from.R, to.R), Mix(from.G, to.G), Mix(from.B, to.B));
+    }
+}