diff --git a/Consts/AboutConst.cs b/Consts/AboutConst.cs index 57b556d..7a266ab 100644 --- a/Consts/AboutConst.cs +++ b/Consts/AboutConst.cs @@ -1,9 +1,13 @@ using System.Reflection; +using System.Windows.Media; namespace Sheas_Cealer.Consts; internal abstract class AboutConst : AboutMultilangConst { + public static Color AccentBlueColor => (Color)ColorConverter.ConvertFromString("#2196F3"); + public static Color AccentRedColor => (Color)ColorConverter.ConvertFromString("#F44336"); + public static string DeveloperButtonUrl => "https://www.spacetimee.xyz"; public static string VersionButtonVersionContent => Assembly.GetExecutingAssembly().GetName().Version!.ToString()[..^2]; public static string VersionButtonUrl => "https://spacetime.lanzouu.com/b017hp0lc"; diff --git a/Preses/GlobalPres.cs b/Preses/GlobalPres.cs index a76d084..2cd64cc 100644 --- a/Preses/GlobalPres.cs +++ b/Preses/GlobalPres.cs @@ -1,5 +1,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using MaterialDesignThemes.Wpf; +using Sheas_Cealer.Consts; using Sheas_Cealer.Props; using Sheas_Cealer.Utils; using System.Diagnostics; @@ -39,5 +40,5 @@ internal partial class GlobalPres : ObservableObject } [ObservableProperty] - private static Color accentForegroundColor = (Color)ColorConverter.ConvertFromString("#2196F3"); + private static Color accentForegroundColor = AboutConst.AccentBlueColor; } \ No newline at end of file diff --git a/Utils/ForegroundGenerator.cs b/Utils/ForegroundGenerator.cs index 9f32ce9..3638ee5 100644 --- a/Utils/ForegroundGenerator.cs +++ b/Utils/ForegroundGenerator.cs @@ -1,4 +1,5 @@ -using System; +using Sheas_Cealer.Consts; +using System; using System.Windows.Media; namespace Sheas_Cealer.Utils; @@ -23,7 +24,7 @@ internal static class ForegroundGenerator return (blackContrast >= 5.5 && whiteContrast >= 2.5 ? null : blackContrast >= whiteContrast ? Colors.Black : Colors.White, - (Color)ColorConverter.ConvertFromString(blueContrast >= redContrast ? "#2196F3" : "#F44336")); + blueContrast >= redContrast ? AboutConst.AccentBlueColor : AboutConst.AccentRedColor); } private static double GammaCorrect(double component) => component <= 0.03928 ? component / 12.92 : Math.Pow((component + 0.055) / 1.055, 2.4); diff --git a/Wins/AboutWin.xaml b/Wins/AboutWin.xaml index 22a1f8f..a07f737 100644 --- a/Wins/AboutWin.xaml +++ b/Wins/AboutWin.xaml @@ -23,13 +23,13 @@ -