Themes changes to ThemeType

CrackAndDie · Feb 9, 2024 · fc53196 · fc53196
1 parent 85f181c
commit fc53196
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 38 deletions.
diff --git a/Hypocrite.DemoAvalonia/App.axaml.cs b/Hypocrite.DemoAvalonia/App.axaml.cs
@@ -60,13 +60,13 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
  });
  containerRegistry.RegisterSingleton<IBaseWindow, MainWindowView>();
 
- containerRegistry.RegisterInstance<IThemeSwitcherService<Themes>>(new ThemeSwitcherService<Themes>(Themes.Dark)
+ containerRegistry.RegisterInstance<IThemeSwitcherService<ThemeType>>(new ThemeSwitcherService<ThemeType>(ThemeType.Dark)
  {
  NameOfDictionary = "ThemeHolder",
- ThemeSources = new Dictionary<Themes, string>()
+ ThemeSources = new Dictionary<ThemeType, string>()
  {
- { Themes.Dark, "avares:https://Hypocrite.DemoAvalonia/Resources/Themes/DarkTheme.axaml" },
- { Themes.Light, "avares:https://Hypocrite.DemoAvalonia/Resources/Themes/LightTheme.axaml" },
+ { ThemeType.Dark, "avares:https://Hypocrite.DemoAvalonia/Resources/Themes/DarkTheme.axaml" },
+ { ThemeType.Light, "avares:https://Hypocrite.DemoAvalonia/Resources/Themes/LightTheme.axaml" },
  },
  });
 

diff --git a/...e.DemoAvalonia/Resources/Themes/Themes.cs → ...emoAvalonia/Resources/Themes/ThemeType.cs b/...e.DemoAvalonia/Resources/Themes/Themes.cs → ...emoAvalonia/Resources/Themes/ThemeType.cs
@@ -6,7 +6,7 @@
 
 namespace Hypocrite.DemoAvalonia.Resources.Themes
 {
- public enum Themes
+ public enum ThemeType
  {
  Dark,
  Light

diff --git a/Hypocrite.DemoAvalonia/ViewModels/MainPageViewModel.cs b/Hypocrite.DemoAvalonia/ViewModels/MainPageViewModel.cs
@@ -31,7 +31,7 @@ public class MainPageViewModel : ViewModelBase
  public IBrush? BindableBrush { get; set; }
 
  [Injection]
- private IThemeSwitcherService<Themes>? ThemeSwitcherService { get; set; }
+ private IThemeSwitcherService<ThemeType>? ThemeSwitcherService { get; set; }
 
  public string ChangeThemeTag => "MainPage.ChangeTheme";
 
@@ -50,10 +50,10 @@ public override void OnViewAttached()
 
  ChangeThemeCommand = new DelegateCommand(() =>
  {
- if (Container.IsRegistered<IThemeSwitcherService<Themes>>())
+ if (Container.IsRegistered<IThemeSwitcherService<ThemeType>>())
  {
- var service = Container.Resolve<IThemeSwitcherService<Themes>>();
- service.ChangeTheme(service.CurrentTheme == Themes.Light ? Themes.Dark : Themes.Light);
+ var service = Container.Resolve<IThemeSwitcherService<ThemeType>>();
+ service.ChangeTheme(service.CurrentTheme == ThemeType.Light ? ThemeType.Dark : ThemeType.Light);
  LoggingService.Info($"Current theme is {service.CurrentTheme}");
  }
  });
@@ -65,14 +65,14 @@ private void SubscribeToThemeChange()
  {
  SetTheme(ThemeSwitcherService!.CurrentTheme);
 
- EventAggregator.GetEvent<ThemeChangedEvent<Themes>>().Subscribe((a) =>
+ EventAggregator.GetEvent<ThemeChangedEvent<ThemeType>>().Subscribe((a) =>
  {
  SetTheme(a.NewTheme);
  });
 
- void SetTheme(Themes theme)
+ void SetTheme(ThemeType theme)
  {
- BindableBrush = theme == Themes.Dark ? Brushes.Blue : Brushes.BlueViolet;
+ BindableBrush = theme == ThemeType.Dark ? Brushes.Blue : Brushes.BlueViolet;
  }
  }
 

diff --git a/Hypocrite.DemoWpf/App.xaml.cs b/Hypocrite.DemoWpf/App.xaml.cs
@@ -72,13 +72,13 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
  });
  containerRegistry.RegisterSingleton<IBaseWindow, MainWindowView>();
 
- containerRegistry.RegisterInstance<IThemeSwitcherService<Themes>>(new ThemeSwitcherService<Themes>()
+ containerRegistry.RegisterInstance<IThemeSwitcherService<ThemeType>>(new ThemeSwitcherService<ThemeType>()
  {
  NameOfDictionary = "ThemeHolder",
- ThemeSources = new Dictionary<Themes, string>()
+ ThemeSources = new Dictionary<ThemeType, string>()
  {
- { Themes.Dark, "/Hypocrite.DemoWpf;component/Resources/Themes/DarkTheme.xaml" },
- { Themes.Light, "/Hypocrite.DemoWpf;component/Resources/Themes/LightTheme.xaml" },
+ { ThemeType.Dark, "/Hypocrite.DemoWpf;component/Resources/Themes/DarkTheme.xaml" },
+ { ThemeType.Light, "/Hypocrite.DemoWpf;component/Resources/Themes/LightTheme.xaml" },
  },
  });
 

diff --git a/Hypocrite.DemoWpf/Hypocrite.DemoWpf.csproj b/Hypocrite.DemoWpf/Hypocrite.DemoWpf.csproj
@@ -78,7 +78,7 @@
  <Compile Include="Extensions\DialogExtensions.cs" />
  <Compile Include="Modules\HeaderModule.cs" />
  <Compile Include="Modules\MainModule.cs" />
- <Compile Include="Resources\Themes\Themes.cs" />
+ <Compile Include="Resources\Themes\ThemeType.cs" />
  <Compile Include="Styles\Converters\ArcEndPointConverter.cs" />
  <Compile Include="Styles\Converters\ArcSizeConverter.cs" />
  <Compile Include="Styles\Converters\NonZeroConverter.cs" />

diff --git a/Hypocrite.DemoWpf/Resources/Themes/ThemeType.cs b/Hypocrite.DemoWpf/Resources/Themes/ThemeType.cs
@@ -0,0 +1,8 @@
+namespace Hypocrite.DemoWpf.Resources.Themes
+{
+ public enum ThemeType
+ {
+ Dark,
+ Light
+ }
+}
diff --git a/Hypocrite.DemoWpf/Resources/Themes/Themes.cs b/Hypocrite.DemoWpf/Resources/Themes/Themes.cs
diff --git a/Hypocrite.DemoWpf/ViewModels/MainPageViewModel.cs b/Hypocrite.DemoWpf/ViewModels/MainPageViewModel.cs
@@ -37,7 +37,7 @@ public class MainPageViewModel : ViewModelBase
  public SolidColorBrush BindableBrush { get; set; }
 
  [Injection]
- private IThemeSwitcherService<Themes> ThemeSwitcherService { get; set; }
+ private IThemeSwitcherService<ThemeType> ThemeSwitcherService { get; set; }
 
  public string ChangeThemeTag => "MainPage.ChangeTheme";
  public ObservableCollection<Language> Languages => LocalizationManager.Languages;
@@ -55,10 +55,10 @@ public override void OnViewAttached()
 
  ChangeThemeCommand = new DelegateCommand(() =>
  {
- if (Container.IsRegistered<IThemeSwitcherService<Themes>>())
+ if (Container.IsRegistered<IThemeSwitcherService<ThemeType>>())
  {
- var service = Container.Resolve<IThemeSwitcherService<Themes>>();
- service.ChangeTheme(service.CurrentTheme == Themes.Light ? Themes.Dark : Themes.Light);
+ var service = Container.Resolve<IThemeSwitcherService<ThemeType>>();
+ service.ChangeTheme(service.CurrentTheme == ThemeType.Light ? ThemeType.Dark : ThemeType.Light);
  LoggingService.Info($"Current theme is {service.CurrentTheme}");
  }
  });
@@ -70,14 +70,14 @@ private void SubscribeToThemeChange()
  {
  SetTheme(ThemeSwitcherService.CurrentTheme);
 
- EventAggregator.GetEvent<ThemeChangedEvent<Themes>>().Subscribe((a) =>
+ EventAggregator.GetEvent<ThemeChangedEvent<ThemeType>>().Subscribe((a) =>
  {
  SetTheme(a.NewTheme);
  });
 
- void SetTheme(Themes theme)
+ void SetTheme(ThemeType theme)
  {
- BindableBrush = theme == Themes.Dark ? Brushes.Blue : Brushes.BlueViolet;
+ BindableBrush = theme == ThemeType.Dark ? Brushes.Blue : Brushes.BlueViolet;
  }
  }