diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/App.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/App.axaml.cs index 2f613447d17..8ed4f31f7b2 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/App.axaml.cs +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/App.axaml.cs @@ -115,11 +115,13 @@ public void SetThemeNotChangeValue(AppTheme value) case AppTheme.Light: themeName = FluentAvaloniaTheme.LightModeString; //mode = FluentThemeMode.Light; + //LiveCharts.CurrentSettings.AddLightTheme(); break; case AppTheme.Dark: default: themeName = FluentAvaloniaTheme.DarkModeString; //mode = FluentThemeMode.Dark; + //LiveCharts.CurrentSettings.AddDarkTheme(); break; } @@ -231,20 +233,24 @@ public override void Initialize() }, isTrace: isTrace); LiveCharts.Configure(config => + { config // registers SkiaSharp as the library backend // REQUIRED unless you build your own - .AddSkiaSharp() - - // adds the default supported types - // OPTIONAL but highly recommend - //.AddDefaultMappers() + .AddSkiaSharp(); + // adds the default supported types + // OPTIONAL but highly recommend + //.AddDefaultMappers() - // select a theme, default is Light - // OPTIONAL - //.AddDarkTheme() - .AddDarkTheme()); + // select a theme, default is Light + // OPTIONAL + //.AddDarkTheme() + if (Theme == AppTheme.Light) + config.AddLightTheme(); + else + config.AddDarkTheme(); + }); #if WINDOWS InitWebView2(); #endif diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/UserCenter/AccountPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/UserCenter/AccountPage.axaml index d914710384a..ea2a794e139 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/UserCenter/AccountPage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/UserCenter/AccountPage.axaml @@ -45,7 +45,7 @@ - diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/UserCenter/UserItem.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/UserCenter/UserItem.axaml index 5b1583729b2..c9b15f517b2 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/UserCenter/UserItem.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/UserCenter/UserItem.axaml @@ -63,17 +63,36 @@ Classes="h8" VerticalAlignment="Center" HorizontalAlignment="Center"/>--> - -