Merge pull request #145 from kitUIN/mvvm-settings

[Refactor] Mvvm settings

Author: kitUIN

FluentFlyoutWPF/Classes/Settings/SettingsManager.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Xml.Serialization;
+using FluentFlyoutWPF.ViewModels;
 
 namespace FluentFlyout.Classes.Settings;
 

FluentFlyoutWPF/Classes/Settings/UserSettings.cs

@@ -96,7 +96,7 @@ public static void UpdateTrayIcon()
         {
             if (Application.Current.MainWindow.FindName("nIcon") is NotifyIcon nIcon)
             {
-                if (SettingsManager.Current.nIconSymbol == true)
+                if (SettingsManager.Current.NIconSymbol == true)
                 {
                     var iconUri = new Uri(WindowsThemeHelper.GetCurrentWindowsTheme() == WindowsTheme.Dark
                         ? "pack://application:,,,/Resources/TrayIcons/FluentFlyoutWhite.png"

FluentFlyoutWPF/Classes/ThemeManager.cs

@@ -6,11 +6,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>False</UseWindowsForms>
+    <RootNamespace>FluentFlyoutWPF</RootNamespace>
     <StartupObject>FluentFlyoutWPF.App</StartupObject>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <PlatformTarget>x64</PlatformTarget>
     <Platforms>x64</Platforms>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Content Remove="C:\Users\hu8go\.nuget\packages\dubya.windowsmediacontroller\2.5.5\contentFiles\any\net6.0-windows10.0.22000\Icon.ico" />
@@ -30,6 +32,7 @@
     <PackageReference Include="System.Drawing.Common" Version="9.0.2" />
     <PackageReference Include="WPF-UI" Version="4.0.3" />
     <PackageReference Include="WPF-UI.Tray" Version="4.0.3" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview3" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\TrayIcons\FluentFlyoutBlack.png">

FluentFlyoutWPF/FluentFlyout.csproj

@@ -1049,14 +1049,14 @@ private void MicaWindow_Loaded(object sender, RoutedEventArgs e)
 
     private void nIcon_LeftClick(Wpf.Ui.Tray.Controls.NotifyIcon sender, RoutedEventArgs e) // change the behavior of the tray icon
     {
-        if (SettingsManager.Current.nIconLeftClick == 0)
+        if (SettingsManager.Current.NIconLeftClick == 0)
         {
             openSettings(sender, e);
             //Wpf.Ui.Appearance.ApplicationThemeManager.Apply(ApplicationTheme.Light, WindowBackdropType.Mica); // to change the theme
             //ThemeService themeService = new ThemeService();
             //themeService.ChangeTheme(MicaWPF.Core.Enums.WindowsTheme.Light);
         }
-        else if (SettingsManager.Current.nIconLeftClick == 1) ShowMediaFlyout();
+        else if (SettingsManager.Current.NIconLeftClick == 1) ShowMediaFlyout();
     }
 
     private Task PauseOtherSessions(MediaSession currentMediaSession)

FluentFlyoutWPF/MainWindow.xaml.cs

@@ -0,0 +1,9 @@
+namespace FluentFlyoutWPF.Models;
+
+
+/// <summary>
+/// LanguageOption
+/// </summary>
+/// <param name="DisplayName"></param>
+/// <param name="Tag"></param>
+public record LanguageOption(string DisplayName, string Tag);