Select a theme during startup depending on settings

GH-102

Author: TolikPylypchuk

src/KeyboardSwitch.Settings/App.axaml

@@ -1,8 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:sys="using:System"
-             xmlns:ui="using:FluentAvalonia.UI.Controls"
-             xmlns:uis="using:FluentAvalonia.Styling"
              xmlns:l="using:KeyboardSwitch.Settings.Localization"
              xmlns:local="using:KeyboardSwitch.Settings"
              x:Class="KeyboardSwitch.Settings.App">
@@ -11,8 +9,6 @@
     </Application.DataTemplates>
 
     <Application.Styles>
-        <uis:FluentAvaloniaTheme PreferUserAccentColor="True" PreferSystemTheme="True" />
-
         <Style Selector="TextBlock.Error">
             <Setter Property="Foreground" Value="{DynamicResource SystemFillColorCriticalBrush}" />
             <Setter Property="Margin" Value="10 2" />
@@ -35,15 +31,13 @@
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
 
-        <Style Selector="ui|NumberBox.FormControl">
-            <Setter Property="Width" Value="150" />
-            <Setter Property="SpinButtonPlacementMode" Value="Inline" />
+        <Style Selector="NumericUpDown.FormControl">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Setter Property="ToolTip.Tip" Value="{l:Translate NumberBoxHint}" />
-            <Setter Property="ValidationMode" Value="InvalidInputOverwritten" />
             <Setter Property="Margin" Value="0 0 10 0" />
         </Style>
 
-        <Style Selector="ui|NumberBox.FormControl /template/ TextBox#InputBox">
+        <Style Selector="NumericUpDown.FormControl /template/ TextBox#InputBox">
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
 

src/KeyboardSwitch.Settings/App.axaml.cs

@@ -2,9 +2,13 @@
 using System.Reflection;
 
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Styling;
+
+using FluentAvalonia.Styling;
 
 using KeyboardSwitch.Core.Exceptions;
 using KeyboardSwitch.Core.Logging;
+using KeyboardSwitch.Settings.Themes;
 
 #if WINDOWS
 using KeyboardSwitch.Windows;
@@ -76,6 +80,8 @@ private async Task<MainViewModel> InitializeApp()
             var mainViewModel = new MainViewModel(appSettings);
             openExternally.InvokeCommand(mainViewModel.OpenExternally);
 
+            this.SetTheme(appSettings);
+
             return mainViewModel;
         } catch (IncompatibleAppVersionException e)
         {
@@ -193,6 +199,28 @@ private async Task<MainWindow> CreateMainWindow(MainViewModel viewModel)
         return window;
     }
 
+    private void SetTheme(AppSettings appSettings)
+    {
+        if (appSettings.AppTheme == AppTheme.MacOS)
+        {
+            this.Styles.Insert(0, new MacOSTheme());
+        } else
+        {
+            this.Styles.Insert(0, new FluentAvaloniaTheme
+            {
+                PreferUserAccentColor = true,
+                PreferSystemTheme = true
+            });
+        }
+
+        this.RequestedThemeVariant = appSettings.AppThemeVariant switch
+        {
+            AppThemeVariant.Light => ThemeVariant.Light,
+            AppThemeVariant.Dark => ThemeVariant.Dark,
+            _ => ThemeVariant.Default
+        };
+    }
+
     private void SaveAppState()
     {
         if (this.desktop.MainWindow == null)

src/KeyboardSwitch.Settings/KeyboardSwitch.Settings.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Avalonia.Desktop" Version="11.3.1" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.3.1" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.1" />
-    <PackageReference Include="Devolutions.AvaloniaTheme.MacOS" Version="2025.6.10" />
+    <PackageReference Include="Devolutions.AvaloniaTheme.MacOS" Version="2025.6.12" />
     <PackageReference Include="DynamicData" Version="9.4.1" />
     <PackageReference Include="FluentAvaloniaUI" Version="2.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
@@ -42,7 +42,6 @@
     <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
     <PackageReference Include="System.Text.Json" Version="9.0.6" />
-    <PackageReference Include="ThemeManager" Version="11.3.0" />
   </ItemGroup>
 
   <ItemGroup>

src/KeyboardSwitch.Settings/Themes/MacOSTheme.axaml

@@ -0,0 +1,5 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="KeyboardSwitch.Settings.Themes.MacOSTheme">
+    <StyleInclude Source="avares://Devolutions.AvaloniaTheme.MacOS/MacOSTheme.axaml" />
+</Styles>

src/KeyboardSwitch.Settings/Themes/MacOSTheme.axaml.cs

@@ -0,0 +1,6 @@
+using Avalonia.Styling;
+
+namespace KeyboardSwitch.Settings.Themes;
+
+public class MacOSTheme : Styles
+{ }

src/KeyboardSwitch.Settings/Views/PreferencesView.axaml

@@ -1,6 +1,5 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:c="using:KeyboardSwitch.Settings.Controls"
              xmlns:l="using:KeyboardSwitch.Settings.Localization"
              x:Class="KeyboardSwitch.Settings.Views.PreferencesView">
@@ -44,8 +43,8 @@
                               Classes="FormControl ModifierKey" />
 
                     <TextBlock Grid.Row="0" Grid.Column="6" Text="{l:Translate PressCount}" Classes="Label" />
-                    <ui:NumberBox x:Name="PressCountBox" Grid.Row="0" Grid.Column="7" Classes="FormControl"
-                                  Minimum="1" Maximum="10" />
+                    <NumericUpDown x:Name="PressCountBox" Grid.Row="0" Grid.Column="7" Classes="FormControl"
+                                   Minimum="1" Maximum="10" FormatString="N0" />
 
                     <TextBlock Grid.Row="2" Grid.Column="0" Text="{l:Translate Backward}" Classes="Label" />
                     <ComboBox x:Name="BackwardFirstComboBox" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch"
@@ -58,8 +57,8 @@
                               Classes="FormControl ModifierKey" />
 
                     <TextBlock Grid.Row="2" Grid.Column="6" Text="{l:Translate WaitMilliseconds}" Classes="Label" />
-                    <ui:NumberBox x:Name="WaitMillisecondsBox" Grid.Row="2" Grid.Column="7" Classes="FormControl"
-                                  Minimum="100" Maximum="1000" />
+                    <NumericUpDown x:Name="WaitMillisecondsBox" Grid.Row="2" Grid.Column="7" Classes="FormControl"
+                                   Minimum="100" Maximum="1000" Increment="50" FormatString="N0" />
                 </Grid>
 
                 <StackPanel Orientation="Horizontal" Margin="10 10 0 0">

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

@@ -86,10 +86,10 @@ private void BindControls(CompositeDisposable disposables)
         this.Bind(this.ViewModel, vm => vm.BackwardModifierThird, v => v.BackwardThirdComboBox.SelectedItem)
             .DisposeWith(disposables);
 
-        this.Bind(this.ViewModel, vm => vm.PressCount, v => v.PressCountBox.Value)
+        this.Bind(this.ViewModel, vm => vm.PressCount, v => v.PressCountBox.Value, v => v, v => (int)(v ?? 0M))
             .DisposeWith(disposables);
 
-        this.Bind(this.ViewModel, vm => vm.WaitMilliseconds, v => v.WaitMillisecondsBox.Value)
+        this.Bind(this.ViewModel, vm => vm.WaitMilliseconds, v => v.WaitMillisecondsBox.Value, v => v, v => (int)(v ?? 0M))
             .DisposeWith(disposables);
 
         this.Bind(this.ViewModel, vm => vm.AppTheme, v => v.AppThemeComboBox.SelectedItem)