pull/1224/head^2
Tyrrrz 11 months ago
parent 7a69c87b56
commit b12be796c7

@ -59,13 +59,9 @@ public class App : Application, IDisposable
{ {
RequestedThemeVariant = _settingsService.Theme switch RequestedThemeVariant = _settingsService.Theme switch
{ {
ThemeVariant.System => Avalonia.Styling.ThemeVariant.Default,
ThemeVariant.Light => Avalonia.Styling.ThemeVariant.Light, ThemeVariant.Light => Avalonia.Styling.ThemeVariant.Light,
ThemeVariant.Dark => Avalonia.Styling.ThemeVariant.Dark, ThemeVariant.Dark => Avalonia.Styling.ThemeVariant.Dark,
_ _ => Avalonia.Styling.ThemeVariant.Default
=> throw new InvalidOperationException(
$"Unknown theme '{_settingsService.Theme}'."
)
}; };
InitializeTheme(); InitializeTheme();
@ -91,17 +87,13 @@ public class App : Application, IDisposable
{ {
"Light" => PlatformThemeVariant.Light, "Light" => PlatformThemeVariant.Light,
"Dark" => PlatformThemeVariant.Dark, "Dark" => PlatformThemeVariant.Dark,
_ => PlatformSettings?.GetColorValues().ThemeVariant _ => PlatformSettings?.GetColorValues().ThemeVariant ?? PlatformThemeVariant.Light
}; };
this.LocateMaterialTheme<MaterialThemeBase>().CurrentTheme = actualTheme switch this.LocateMaterialTheme<MaterialThemeBase>().CurrentTheme =
{ actualTheme == PlatformThemeVariant.Light
PlatformThemeVariant.Light ? Theme.Create(Theme.Light, Color.Parse("#343838"), Color.Parse("#F9A825"))
=> Theme.Create(Theme.Light, Color.Parse("#343838"), Color.Parse("#F9A825")), : Theme.Create(Theme.Dark, Color.Parse("#E8E8E8"), Color.Parse("#F9A825"));
PlatformThemeVariant.Dark
=> Theme.Create(Theme.Dark, Color.Parse("#E8E8E8"), Color.Parse("#F9A825")),
_ => throw new InvalidOperationException($"Unknown theme '{actualTheme}'.")
};
} }
public override void OnFrameworkInitializationCompleted() public override void OnFrameworkInitializationCompleted()

Loading…
Cancel
Save