Update the theme variant dynamically

Updating the theme dynamically leaves remnants of the previous theme, so
it's not implemented.

GH-102

Author: TolikPylypchuk

src/KeyboardSwitch.Core/KeyboardSwitch.Core.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="System.Interactive.Async" Version="6.0.3" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
     <PackageReference Include="System.Text.Json" Version="9.0.6" />
-    <PackageReference Include="TestableIO.System.IO.Abstractions.Extensions" Version="22.0.3" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions.Extensions" Version="22.0.4" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.0.14" />
   </ItemGroup>
 </Project>

src/KeyboardSwitch.Settings.Core/ViewModels/MainContentViewModel.cs

@@ -26,7 +26,7 @@ public MainContentViewModel(
 
         this.SaveCharMappingSettings = ReactiveCommand.CreateFromTask<CharMappingModel>(
             this.SaveCharMappingSettingsAsync);
-        this.SavePreferences = ReactiveCommand.CreateFromTask<PreferencesModel>(
+        this.SavePreferences = ReactiveCommand.CreateFromTask<PreferencesModel, PreferencesModel>(
             this.SavePreferencesAsync);
         this.OpenAboutTab = ReactiveCommand.Create(() => { });
 
@@ -43,7 +43,7 @@ public MainContentViewModel(
     public AboutViewModel AboutViewModel { get; }
 
     public ReactiveCommand<CharMappingModel, Unit> SaveCharMappingSettings { get; }
-    public ReactiveCommand<PreferencesModel, Unit> SavePreferences { get; }
+    public ReactiveCommand<PreferencesModel, PreferencesModel> SavePreferences { get; }
     public ReactiveCommand<Unit, Unit> OpenAboutTab { get; }
 
     private async Task SaveCharMappingSettingsAsync(CharMappingModel charMappingModel)
@@ -70,7 +70,7 @@ private async Task SaveCharMappingSettingsAsync(CharMappingModel charMappingMode
         await this.appSettingsService.SaveAppSettings(newSettings);
     }
 
-    private async Task SavePreferencesAsync(PreferencesModel preferencesModel)
+    private async Task<PreferencesModel> SavePreferencesAsync(PreferencesModel preferencesModel)
     {
         var settings = await this.appSettingsService.GetAppSettings();
 
@@ -91,5 +91,7 @@ private async Task SavePreferencesAsync(PreferencesModel preferencesModel)
         {
             this.startupService.ConfigureStartup(preferencesModel.Startup);
         }
+
+        return preferencesModel;
     }
 }

src/KeyboardSwitch.Settings.Core/ViewModels/MainViewModel.cs

@@ -1,21 +1,21 @@
+using KeyboardSwitch.Core.Keyboard;
+
 namespace KeyboardSwitch.Settings.Core.ViewModels;
 
 public class MainViewModel : ReactiveObject
 {
-    private readonly AppSettings appSettings;
-    private readonly ILayoutService layoutService;
+    private readonly Subject<PreferencesModel> preferencesSaved = new();
 
     public MainViewModel(
         AppSettings appSettings,
         ILayoutService? layoutService = null,
         IStartupService? startupService = null)
     {
-        this.appSettings = appSettings;
-        this.layoutService = layoutService ?? GetRequiredService<ILayoutService>();
+        layoutService ??= GetRequiredService<ILayoutService>();
         startupService ??= GetRequiredService<IStartupService>();
 
         this.MainContentViewModel = new MainContentViewModel(
-            this.CreateCharMappingModel(),
+            this.CreateCharMappingModel(appSettings, layoutService.GetKeyboardLayouts()),
             new PreferencesModel(appSettings, startupService.IsStartupConfigured()));
 
         this.ServiceViewModel = new ServiceViewModel();
@@ -28,7 +28,11 @@ public MainViewModel(
             .Merge(this.MainContentViewModel.SavePreferences.Discard())
             .InvokeCommand(this.ServiceViewModel.ReloadSettings);
 
+        this.MainContentViewModel.SavePreferences.Subscribe(this.preferencesSaved);
+
         this.OpenAboutTab.InvokeCommand(this.MainContentViewModel.OpenAboutTab);
+
+        this.PreferencesSaved = this.preferencesSaved.AsObservable();
     }
 
     public MainContentViewModel MainContentViewModel { get; }
@@ -37,11 +41,11 @@ public MainViewModel(
     public ReactiveCommand<Unit, Unit> OpenExternally { get; }
     public ReactiveCommand<Unit, Unit> OpenAboutTab { get; }
 
-    private CharMappingModel CreateCharMappingModel()
-    {
-        var layouts = this.layoutService.GetKeyboardLayouts();
+    public IObservable<PreferencesModel> PreferencesSaved { get; }
 
-        var charsByLayoutId = this.appSettings.CharsByKeyboardLayoutId;
+    private CharMappingModel CreateCharMappingModel(AppSettings appSettings, IReadOnlyList<KeyboardLayout> layouts)
+    {
+        var charsByLayoutId = appSettings.CharsByKeyboardLayoutId;
 
         var layoutModels = layouts
             .Select((layout, index) => new LayoutModel

src/KeyboardSwitch.Settings/App.axaml.cs

@@ -77,10 +77,17 @@ private async Task<MainViewModel> InitializeApp()
         try
         {
             var appSettings = await this.serviceProvider.GetRequiredService<IAppSettingsService>().GetAppSettings();
+
+            this.SetTheme(appSettings.AppTheme);
+
             var mainViewModel = new MainViewModel(appSettings);
             openExternally.InvokeCommand(mainViewModel.OpenExternally);
 
-            this.SetTheme(appSettings);
+            mainViewModel.PreferencesSaved
+                .Select(p => p.AppThemeVariant)
+                .StartWith(appSettings.AppThemeVariant)
+                .DistinctUntilChanged()
+                .Subscribe(this.SetThemeVariant);
 
             return mainViewModel;
         } catch (IncompatibleAppVersionException e)
@@ -199,21 +206,22 @@ private async Task<MainWindow> CreateMainWindow(MainViewModel viewModel)
         return window;
     }
 
-    private void SetTheme(AppSettings appSettings)
+    private void SetTheme(AppTheme appTheme)
     {
-        if (appSettings.AppTheme == AppTheme.MacOS)
+        this.Styles.Insert(0, appTheme switch
         {
-            this.Styles.Insert(0, new MacOSTheme());
-        } else
-        {
-            this.Styles.Insert(0, new FluentAvaloniaTheme
+            AppTheme.MacOS => new MacOSTheme(),
+            _ => new FluentAvaloniaTheme
             {
                 PreferUserAccentColor = true,
                 PreferSystemTheme = true
-            });
-        }
+            }
+        });
+    }
 
-        this.RequestedThemeVariant = appSettings.AppThemeVariant switch
+    private void SetThemeVariant(AppThemeVariant appThemeVariant)
+    {
+        this.RequestedThemeVariant = appThemeVariant switch
         {
             AppThemeVariant.Light => ThemeVariant.Light,
             AppThemeVariant.Dark => ThemeVariant.Dark,

src/KeyboardSwitch.Settings/Views/PreferencesView.axaml.cs

@@ -38,9 +38,9 @@ public PreferencesView()
             this.BindValidations(disposables);
             this.BindCommands(disposables);
 
-            if (this.ViewModel?.ShowUseXsel == false)
+            if (this.ViewModel?.ShowUseXsel == true)
             {
-                this.UseXselCheckBox.IsVisible = false;
+                this.UseXselCheckBox.IsVisible = true;
             }
         });
     }