up 7.2.0

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,11 +4,11 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.1.3</Version>
+	<Version>7.2.0</Version>
   </PropertyGroup>
  
 	<ItemGroup>
-		<PackageReference Include="Downloader" Version="3.2.1" />
+		<PackageReference Include="Downloader" Version="3.3.0" />
 		<PackageReference Include="ReactiveUI" Version="20.1.63" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -13,6 +13,7 @@ namespace v2rayN.Desktop.ViewModels
     public class ThemeSettingViewModel : MyReactiveObject
     {
         [Reactive] public bool ColorModeDark { get; set; }
+        [Reactive] public bool FollowSystemTheme { get; set; }
 
         [Reactive] public int CurrentFontSize { get; set; }
 
@@ -28,13 +29,14 @@ namespace v2rayN.Desktop.ViewModels
 
         private void RestoreUI()
         {
-            ModifyTheme(_config.UiItem.ColorModeDark);
+            ModifyTheme();
             ModifyFontFamily();
         }
 
         private void BindingUI()
         {
             ColorModeDark = _config.UiItem.ColorModeDark;
+            FollowSystemTheme = _config.UiItem.FollowSystemTheme;
             CurrentFontSize = _config.UiItem.CurrentFontSize;
             CurrentLanguage = _config.UiItem.CurrentLanguage;
 
@@ -44,7 +46,18 @@ namespace v2rayN.Desktop.ViewModels
                     if (_config.UiItem.ColorModeDark != ColorModeDark)
                     {
                         _config.UiItem.ColorModeDark = ColorModeDark;
-                        ModifyTheme(ColorModeDark);
+                        ModifyTheme();
+                        ConfigHandler.SaveConfig(_config);
+                    }
+                });
+            this.WhenAnyValue(x => x.FollowSystemTheme,
+                    y => y == true)
+                .Subscribe(c =>
+                {
+                    if (_config.UiItem.FollowSystemTheme != FollowSystemTheme)
+                    {
+                        _config.UiItem.FollowSystemTheme = FollowSystemTheme;
+                        ModifyTheme();
                         ConfigHandler.SaveConfig(_config);
                     }
                 });
@@ -59,7 +72,6 @@ namespace v2rayN.Desktop.ViewModels
                         _config.UiItem.CurrentFontSize = CurrentFontSize;
                         double size = CurrentFontSize;
                         ModifyFontSize(size);
-
                         ConfigHandler.SaveConfig(_config);
                     }
                 });
@@ -79,12 +91,12 @@ namespace v2rayN.Desktop.ViewModels
                 });
         }
 
-        private void ModifyTheme(bool isDarkTheme)
+        private void ModifyTheme()
         {
             var app = Application.Current;
             if (app is not null)
             {
-                app.RequestedThemeVariant = isDarkTheme ? ThemeVariant.Dark : ThemeVariant.Light;
+                app.RequestedThemeVariant = FollowSystemTheme ? ThemeVariant.Default : (ColorModeDark ? ThemeVariant.Dark : ThemeVariant.Light);
             }
         }
 

v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml

@@ -33,7 +33,14 @@
                             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" />
+                    </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             Width="100"

v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs

@@ -29,6 +29,7 @@ namespace v2rayN.Desktop.Views
             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.CurrentFontSize, v => v.cmbCurrentFontSize.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentLanguage, v => v.cmbCurrentLanguage.SelectedValue).DisposeWith(disposables);
             });

v2rayN/v2rayN/Common/WindowsUtils.cs

@@ -62,11 +62,12 @@ namespace v2rayN
                 BitmapSizeOptions.FromEmptyOptions());
         }
 
-        public static bool IsLightTheme()
+        public static bool IsDarkTheme()
         {
             using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
-            var value = key?.GetValue("AppsUseLightTheme");
+            var obj = key?.GetValue("AppsUseLightTheme");
-            return value is int i && i > 0;
+            int.TryParse(obj?.ToString(), out var value);
+            return value == 0;
         }
 
         public static void RemoveTunDevice()

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -38,7 +38,7 @@ namespace v2rayN.ViewModels
         {
             _config = AppHandler.Instance.Config;
 
-            RegisterSystemColorSet(_config, Application.Current.MainWindow, (bool bl) => { ModifyTheme(bl); });
+            RegisterSystemColorSet(_config, Application.Current.MainWindow, ModifyTheme);
 
             BindingUI();
             RestoreUI();
@@ -46,15 +46,7 @@ namespace v2rayN.ViewModels
 
         private void RestoreUI()
         {
-            if (FollowSystemTheme)
+            ModifyTheme();
-            {
-                ModifyTheme(!WindowsUtils.IsLightTheme());
-            }
-            else
-            {
-                ModifyTheme(_config.UiItem.ColorModeDark);
-            }
-
             if (!_config.UiItem.ColorPrimaryName.IsNullOrEmpty())
             {
                 var swatch = new SwatchesProvider().Swatches.FirstOrDefault(t => t.Name == _config.UiItem.ColorPrimaryName);
@@ -87,7 +79,7 @@ namespace v2rayN.ViewModels
                           if (_config.UiItem.ColorModeDark != ColorModeDark)
                           {
                               _config.UiItem.ColorModeDark = ColorModeDark;
-                              ModifyTheme(ColorModeDark);
+                              ModifyTheme();
                               ConfigHandler.SaveConfig(_config);
                           }
                       });
@@ -99,15 +91,8 @@ namespace v2rayN.ViewModels
                         if (_config.UiItem.FollowSystemTheme != FollowSystemTheme)
                         {
                             _config.UiItem.FollowSystemTheme = FollowSystemTheme;
+                            ModifyTheme();
                             ConfigHandler.SaveConfig(_config);
-                            if (FollowSystemTheme)
-                            {
-                                ModifyTheme(!WindowsUtils.IsLightTheme());
-                            }
-                            else
-                            {
-                                ModifyTheme(ColorModeDark);
-                            }
                         }
                     });
 
@@ -163,10 +148,11 @@ namespace v2rayN.ViewModels
                 });
         }
 
-        public void ModifyTheme(bool isDarkTheme)
+        public void ModifyTheme()
         {
             var theme = _paletteHelper.GetTheme();
 
+            var isDarkTheme = FollowSystemTheme ? WindowsUtils.IsDarkTheme() : ColorModeDark;
             theme.SetBaseTheme(isDarkTheme ? BaseTheme.Dark : BaseTheme.Light);
             _paletteHelper.SetTheme(theme);
             WindowsUtils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
@@ -183,7 +169,7 @@ namespace v2rayN.ViewModels
             _paletteHelper.SetTheme(theme);
         }
 
-        public void RegisterSystemColorSet(Config config, Window window, Action<bool> updateFunc)
+        public void RegisterSystemColorSet(Config config, Window window, Action updateFunc)
         {
             var helper = new WindowInteropHelper(window);
             var hwndSource = HwndSource.FromHwnd(helper.EnsureHandle());
@@ -196,7 +182,7 @@ namespace v2rayN.ViewModels
                     {
                         if (wParam == IntPtr.Zero && Marshal.PtrToStringUni(lParam) == "ImmersiveColorSet")
                         {
-                            updateFunc?.Invoke(!WindowsUtils.IsLightTheme());
+                            updateFunc?.Invoke();
                         }
                     }
                 }

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -34,7 +34,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.EditServerCmd, v => v.btnEdit).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SaveServerCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -220,7 +220,7 @@ namespace v2rayN.Views
             });
 
             this.Title = $"{profileItem.ConfigType}";
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -50,7 +50,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCmd, v => v.btnImportDefConfig4V2ray).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCmd, v => v.btnImportDefConfig4Singbox).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -30,7 +30,7 @@ namespace v2rayN.Views
 
             HotkeyHandler.Instance.IsPause = true;
             this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
-            WindowsUtils.SetDarkBorder(this, _config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : _config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, _config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : _config.UiItem.ColorModeDark);
             InitData();
         }
 

v2rayN/v2rayN/Views/MsgView.xaml

@@ -76,8 +76,10 @@
             HorizontalScrollBarVisibility="Auto"
             IsReadOnly="True"
             IsReadOnlyCaretVisible="True"
+            IsUndoEnabled="False"
             TextAlignment="Left"
             TextWrapping="Wrap"
+            UndoLimit="0"
             VerticalScrollBarVisibility="Visible">
             <TextBox.ContextMenu>
                 <ContextMenu Style="{StaticResource DefContextMenu}">

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -175,7 +175,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -58,7 +58,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -60,7 +60,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -52,7 +52,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/SubEditWindow.xaml.cs

@@ -38,7 +38,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -31,7 +31,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.SubEditCmd, v => v.menuSubEdit).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SubShareCmd, v => v.menuSubShare).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/ThemeSettingView.xaml

@@ -1,10 +1,10 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ThemeSettingView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     d:DesignHeight="450"
@@ -44,7 +44,7 @@
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
             <ToggleButton
-                x:Name="followSystemTheme"
+                x:Name="togFollowSystemTheme"
                 Grid.Row="1"
                 Grid.Column="1"
                 Margin="{StaticResource Margin8}" />

v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs

@@ -27,7 +27,7 @@ namespace v2rayN.Views
             this.WhenActivated(disposables =>
             {
                 this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.followSystemTheme.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.togFollowSystemTheme.IsChecked).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.Swatches, v => v.cmbSwatches.ItemsSource).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSwatch, v => v.cmbSwatches.SelectedItem).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentFontSize, v => v.cmbCurrentFontSize.Text).DisposeWith(disposables);