Add theme options for desktop

2dust · Jan 10, 2025 · edbd168 · edbd168
1 parent 127858d
commit edbd168
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 37 deletions.
diff --git a/v2rayN/ServiceLib/Enums/ETheme.cs b/v2rayN/ServiceLib/Enums/ETheme.cs
@@ -0,0 +1,13 @@
+namespace ServiceLib.Enums
+{
+    public enum ETheme
+    {
+        FollowSystem,
+        Dark,
+        Light,
+        Aquatic,
+        Desert,
+        Dusk,
+        NightSky
+    }
+}
diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -105,6 +105,7 @@ public class UIItem
         public bool ColorModeDark { get; set; }
         public bool FollowSystemTheme { get; set; }
         public string? ColorPrimaryName { get; set; }
+        public string? CurrentTheme { get; set; }
         public string CurrentLanguage { get; set; }
         public string CurrentFontFamily { get; set; }
         public int CurrentFontSize { get; set; }

diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1402,4 +1402,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks:پورت محلی، socks2: پورت دوم محلی، socks3: پورت LAN</value>
   </data>
-</root>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+</root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1402,4 +1402,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1402,4 +1402,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1402,4 +1402,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1399,4 +1399,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks：本地端口，socks2：第二个本地端口，socks3：局域网端口</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>主题</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1400,4 +1400,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks：本地端口，socks2：第二個本地端口，socks3：區域網路端口</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>主題</value>
+  </data>
 </root>
diff --git a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
@@ -6,14 +6,14 @@
 using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using Semi.Avalonia;
 using System.Reactive.Linq;
 
 namespace v2rayN.Desktop.ViewModels
 {
     public class ThemeSettingViewModel : MyReactiveObject
     {
-        [Reactive] public bool ColorModeDark { get; set; }
-        [Reactive] public bool FollowSystemTheme { get; set; }
+        [Reactive] public string CurrentTheme { get; set; }
 
         [Reactive] public int CurrentFontSize { get; set; }
 
@@ -36,28 +36,16 @@ private void RestoreUI()
 
         private void BindingUI()
         {
-            ColorModeDark = _config.UiItem.ColorModeDark;
-            FollowSystemTheme = _config.UiItem.FollowSystemTheme;
+            CurrentTheme = _config.UiItem.CurrentTheme;
             CurrentFontSize = _config.UiItem.CurrentFontSize;
             CurrentLanguage = _config.UiItem.CurrentLanguage;
 
-            this.WhenAnyValue(x => x.ColorModeDark)
+            this.WhenAnyValue(x => x.CurrentTheme)
                 .Subscribe(c =>
                 {
-                    if (_config.UiItem.ColorModeDark != ColorModeDark)
+                    if (_config.UiItem.CurrentTheme != CurrentTheme)
                     {
-                        _config.UiItem.ColorModeDark = ColorModeDark;
-                        ModifyTheme();
-                        ConfigHandler.SaveConfig(_config);
-                    }
-                });
-            this.WhenAnyValue(x => x.FollowSystemTheme,
-                    y => y == true)
-                .Subscribe(c =>
-                {
-                    if (_config.UiItem.FollowSystemTheme != FollowSystemTheme)
-                    {
-                        _config.UiItem.FollowSystemTheme = FollowSystemTheme;
+                        _config.UiItem.CurrentTheme = CurrentTheme;
                         ModifyTheme();
                         ConfigHandler.SaveConfig(_config);
                     }
@@ -96,7 +84,16 @@ private void ModifyTheme()
             var app = Application.Current;
             if (app is not null)
             {
-                app.RequestedThemeVariant = FollowSystemTheme ? ThemeVariant.Default : (ColorModeDark ? ThemeVariant.Dark : ThemeVariant.Light);
+                app.RequestedThemeVariant = CurrentTheme switch
+                {
+                    nameof(ETheme.Dark) => ThemeVariant.Dark,
+                    nameof(ETheme.Light) => ThemeVariant.Light,
+                    nameof(ETheme.Aquatic) => SemiTheme.Aquatic,
+                    nameof(ETheme.Desert) => SemiTheme.Desert,
+                    nameof(ETheme.Dusk) => SemiTheme.Dusk,
+                    nameof(ETheme.NightSky) => SemiTheme.NightSky,
+                    _ => ThemeVariant.Default,
+                };
             }
         }
 

diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
@@ -10,6 +10,15 @@
     d:DesignWidth="800"
     x:DataType="vms:ThemeSettingViewModel"
     mc:Ignorable="d">
+    <UserControl.Styles>
+        <Style Selector="TextBlock">
+            <Setter Property="Width" Value="100" />
+        </Style>
+        <Style Selector="ComboBox">
+            <Setter Property="Width" Value="150" />
+        </Style>
+    </UserControl.Styles>
+
     <Button
         Width="30"
         Height="30"
@@ -27,40 +36,32 @@
                 <StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
-                            Text="{x:Static resx:ResUI.TbSettingsColorMode}" />
-                        <ToggleSwitch x:Name="togDarkMode" Classes="Margin8" />
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Width="100"
-                            VerticalAlignment="Center"
-                            Classes="Margin8"
-                            Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
-                        <ToggleSwitch x:Name="togFollowSystemTheme" Classes="Margin8" />
+                            Text="{x:Static resx:ResUI.TbSettingsTheme}" />
+                        <ComboBox
+                            x:Name="cmbCurrentTheme"
+                            HorizontalAlignment="Center"
+                            Classes="Margin8" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
                         <ComboBox
                             x:Name="cmbCurrentFontSize"
-                            Width="100"
+                            HorizontalAlignment="Center"
                             Classes="Margin8" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
                         <ComboBox
                             x:Name="cmbCurrentLanguage"
-                            Width="100"
+                            HorizontalAlignment="Center"
                             Classes="Margin8" />
                     </StackPanel>
                 </StackPanel>

diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs
@@ -16,6 +16,11 @@ public ThemeSettingView()
             InitializeComponent();
             ViewModel = new ThemeSettingViewModel();
 
+            foreach (ETheme it in Enum.GetValues(typeof(ETheme)))
+            {
+                cmbCurrentTheme.Items.Add(it.ToString());
+            }
+
             for (int i = Global.MinFontSize; i <= Global.MinFontSize + 10; i++)
             {
                 cmbCurrentFontSize.Items.Add(i);
@@ -28,8 +33,7 @@ public ThemeSettingView()
 
             this.WhenActivated(disposables =>
             {
-                this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.togFollowSystemTheme.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentTheme, v => v.cmbCurrentTheme.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentFontSize, v => v.cmbCurrentFontSize.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentLanguage, v => v.cmbCurrentLanguage.SelectedValue).DisposeWith(disposables);
             });