v2rayN/ServiceLib/Common/AesUtils.cs

@@ -0,0 +1,100 @@
+using System.Security.Cryptography;
+using System.Text;
+
+namespace ServiceLib.Common;
+
+public class AesUtils
+{
+    private const int KeySize = 256; // AES-256
+    private const int IvSize = 16;   // AES block size
+    private const int Iterations = 10000;
+    private static readonly byte[] Salt = Encoding.ASCII.GetBytes("saltysalt".PadRight(16, ' ')); 
+    private static readonly string DefaultPassword = Utils.GetMd5(Utils.GetHomePath() + "AesUtils");
+
+    /// <summary>
+    /// Encrypt
+    /// </summary>
+    /// <param name="text">Plain text</param>
+    /// <param name="password">Password for key derivation or direct key in ASCII bytes</param>
+    /// <returns>Base64 encoded cipher text with IV</returns>
+    public static string Encrypt(string text, string? password = null)
+    {
+        if (string.IsNullOrEmpty(text))
+            return string.Empty;
+
+        var plaintext = Encoding.UTF8.GetBytes(text);
+        var key = GetKey(password);
+        var iv = GenerateIv();
+
+        using var aes = Aes.Create();
+        aes.Key = key;
+        aes.IV = iv;
+
+        using var ms = new MemoryStream();
+        ms.Write(iv, 0, iv.Length);
+
+        using (var cs = new CryptoStream(ms, aes.CreateEncryptor(), CryptoStreamMode.Write))
+        {
+            cs.Write(plaintext, 0, plaintext.Length);
+            cs.FlushFinalBlock();
+        }
+
+        var cipherTextWithIv = ms.ToArray();
+        return Convert.ToBase64String(cipherTextWithIv);
+    }
+
+    /// <summary>
+    /// Decrypt
+    /// </summary>
+    /// <param name="cipherTextWithIv">Base64 encoded cipher text with IV</param>
+    /// <param name="password">Password for key derivation or direct key in ASCII bytes</param>
+    /// <returns>Plain text</returns>
+    public static string Decrypt(string cipherTextWithIv, string? password = null)
+    {
+        if (string.IsNullOrEmpty(cipherTextWithIv))
+            return string.Empty;
+
+        var cipherTextWithIvBytes = Convert.FromBase64String(cipherTextWithIv);
+        var key = GetKey(password);
+
+        var iv = new byte[IvSize];
+        Buffer.BlockCopy(cipherTextWithIvBytes, 0, iv, 0, IvSize);
+
+        var cipherText = new byte[cipherTextWithIvBytes.Length - IvSize];
+        Buffer.BlockCopy(cipherTextWithIvBytes, IvSize, cipherText, 0, cipherText.Length);
+
+        using var aes = Aes.Create();
+        aes.Key = key;
+        aes.IV = iv;
+
+        using var ms = new MemoryStream();
+        using (var cs = new CryptoStream(ms, aes.CreateDecryptor(), CryptoStreamMode.Write))
+        {
+            cs.Write(cipherText, 0, cipherText.Length);
+            cs.FlushFinalBlock();
+        }
+
+        var plainText = ms.ToArray();
+        return Encoding.UTF8.GetString(plainText);
+    }
+
+    private static byte[] GetKey(string? password)
+    {
+        if (password.IsNullOrEmpty())
+        {
+            password = DefaultPassword;
+        }
+
+        using var pbkdf2 = new Rfc2898DeriveBytes(password, Salt, Iterations, HashAlgorithmName.SHA256);
+        return pbkdf2.GetBytes(KeySize / 8);
+    }
+
+    private static byte[] GenerateIv()
+    {
+        var randomNumber = new byte[IvSize];
+
+        using var rng = RandomNumberGenerator.Create();
+        rng.GetBytes(randomNumber);
+        return randomNumber;
+    }
+}

v2rayN/ServiceLib/Common/DesUtils.cs

@@ -0,0 +1,74 @@
+using System.Security.Cryptography;
+using System.Text;
+
+namespace ServiceLib.Common;
+
+public class DesUtils
+{
+    /// <summary>
+    /// Encrypt
+    /// </summary>
+    /// <param name="text"></param>
+    /// /// <param name="key"></param>
+    /// <returns></returns>
+    public static string Encrypt(string? text, string? key = null)
+    {
+        if (text.IsNullOrEmpty())
+        {
+            return string.Empty;
+        }
+        GetKeyIv(key ?? GetDefaultKey(), out var rgbKey, out var rgbIv);
+        var dsp = DES.Create();
+        using var memStream = new MemoryStream();
+        using var cryStream = new CryptoStream(memStream, dsp.CreateEncryptor(rgbKey, rgbIv), CryptoStreamMode.Write);
+        using var sWriter = new StreamWriter(cryStream);
+        sWriter.Write(text);
+        sWriter.Flush();
+        cryStream.FlushFinalBlock();
+        memStream.Flush();
+        return Convert.ToBase64String(memStream.GetBuffer(), 0, (int)memStream.Length);
+    }
+
+    /// <summary>
+    /// Decrypt
+    /// </summary>
+    /// <param name="encryptText"></param>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    public static string Decrypt(string? encryptText, string? key = null)
+    {
+        if (encryptText.IsNullOrEmpty())
+        {
+            return string.Empty;
+        }
+        GetKeyIv(key ?? GetDefaultKey(), out var rgbKey, out var rgbIv);
+        var dsp = DES.Create();
+        var buffer = Convert.FromBase64String(encryptText);
+
+        using var memStream = new MemoryStream();
+        using var cryStream = new CryptoStream(memStream, dsp.CreateDecryptor(rgbKey, rgbIv), CryptoStreamMode.Write);
+        cryStream.Write(buffer, 0, buffer.Length);
+        cryStream.FlushFinalBlock();
+        return Encoding.UTF8.GetString(memStream.ToArray());
+    }
+
+    private static void GetKeyIv(string key, out byte[] rgbKey, out byte[] rgbIv)
+    {
+        if (key.IsNullOrEmpty())
+        {
+            throw new ArgumentNullException("The key cannot be null");
+        }
+        if (key.Length <= 8)
+        {
+            throw new ArgumentNullException("The key length cannot be less than 8 characters.");
+        }
+
+        rgbKey = Encoding.ASCII.GetBytes(key.Substring(0, 8));
+        rgbIv = Encoding.ASCII.GetBytes(key.Insert(0, "w").Substring(0, 8));
+    }
+
+    private static string GetDefaultKey()
+    {
+        return Utils.GetMd5(Utils.GetHomePath() + "DesUtils");
+    }
+}

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -101,7 +101,6 @@ public class ConfigHandler
             EnableAutoAdjustMainLvColWidth = true
         };
         config.UiItem.MainColumnItem ??= new();
-        config.UiItem.WindowSizeItem ??= new();
 
         if (config.UiItem.CurrentLanguage.IsNullOrEmpty())
         {
@@ -2175,34 +2174,4 @@ public class ConfigHandler
     }
 
     #endregion Regional Presets
-
-    #region UIItem
-
-    public static WindowSizeItem? GetWindowSizeItem(Config config, string typeName)
-    {
-        var sizeItem = config?.UiItem?.WindowSizeItem?.FirstOrDefault(t => t.TypeName == typeName);
-        if (sizeItem == null || sizeItem.Width <= 0 || sizeItem.Height <= 0)
-        {
-            return null;
-        }
-
-        return sizeItem;
-    }
-
-    public static int SaveWindowSizeItem(Config config, string typeName, double width, double height)
-    {
-        var sizeItem = config?.UiItem?.WindowSizeItem?.FirstOrDefault(t => t.TypeName == typeName);
-        if (sizeItem == null)
-        {
-            sizeItem = new WindowSizeItem { TypeName = typeName };
-            config.UiItem.WindowSizeItem.Add(sizeItem);
-        }
-
-        sizeItem.Width = width;
-        sizeItem.Height = height;
-
-        return 0;
-    }
-
-    #endregion UIItem
 }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -89,6 +89,8 @@ public class UIItem
 {
     public bool EnableAutoAdjustMainLvColWidth { get; set; }
     public bool EnableUpdateSubOnlyRemarksExist { get; set; }
+    public double MainWidth { get; set; }
+    public double MainHeight { get; set; }
     public double MainGirdHeight1 { get; set; }
     public double MainGirdHeight2 { get; set; }
     public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
@@ -101,10 +103,9 @@ public class UIItem
     public bool DoubleClick2Activate { get; set; }
     public bool AutoHideStartup { get; set; }
     public bool Hide2TrayWhenClose { get; set; }
+    public List<ColumnItem> MainColumnItem { get; set; }
     public bool ShowInTaskbar { get; set; }
     public bool MacOSShowInDock { get; set; }
-    public List<ColumnItem> MainColumnItem { get; set; }
-    public List<WindowSizeItem> WindowSizeItem { get; set; }
 }
 
 [Serializable]
@@ -245,11 +246,3 @@ public class Fragment4RayItem
     public string? Length { get; set; }
     public string? Interval { get; set; }
 }
-
-[Serializable]
-public class WindowSizeItem
-{
-    public string TypeName { get; set; }
-    public double Width { get; set; }
-    public double Height { get; set; }
-}

v2rayN/ServiceLib/Models/IPAPIInfo.cs

@@ -4,7 +4,7 @@ internal class IPAPIInfo
 {
     public string? ip { get; set; }
     public string? clientIp { get; set; }
-    public string? ip_addr { get; set; }
+    public string? ip_addr { get; set; }    
     public string? query { get; set; }
     public string? country { get; set; }
     public string? country_name { get; set; }

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -4,7 +4,7 @@ using SQLite;
 namespace ServiceLib.Models;
 
 [Serializable]
-public class ProfileItem : ReactiveObject
+public class ProfileItem: ReactiveObject
 {
     public ProfileItem()
     {

v2rayN/v2rayN.Desktop/Base/WindowBase.cs

@@ -1,52 +0,0 @@
-using Avalonia;
-using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
-
-namespace v2rayN.Desktop.Base;
-
-public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewModel : class
-{
-    public WindowBase()
-    {
-        Loaded += OnLoaded;
-    }
-
-    private void ReactiveWindowBase_Closed(object? sender, EventArgs e)
-    {
-        throw new NotImplementedException();
-    }
-
-    protected virtual void OnLoaded(object? sender, RoutedEventArgs e)
-    {
-        try
-        {
-            var sizeItem = ConfigHandler.GetWindowSizeItem(AppHandler.Instance.Config, GetType().Name);
-            if (sizeItem == null)
-            {
-                return;
-            }
-
-            Width = sizeItem.Width;
-            Height = sizeItem.Height;
-
-            var workingArea = (Screens.ScreenFromWindow(this) ?? Screens.Primary).WorkingArea;
-            var scaling = VisualRoot is not null ? VisualRoot.RenderScaling : 1.0;
-
-            var x = workingArea.X + ((workingArea.Width - (Width * scaling)) / 2);
-            var y = workingArea.Y + ((workingArea.Height - (Height * scaling)) / 2);
-
-            Position = new PixelPoint((int)x, (int)y);
-        }
-        catch { }
-    }
-
-    protected override void OnClosed(EventArgs e)
-    {
-        base.OnClosed(e);
-        try
-        {
-            ConfigHandler.SaveWindowSizeItem(AppHandler.Instance.Config, GetType().Name, Width, Height);
-        }
-        catch { }
-    }
-}

v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs

@@ -1,12 +1,12 @@
 using System.Reactive.Disposables;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class AddServer2Window : WindowBase<AddServer2ViewModel>
+public partial class AddServer2Window : ReactiveWindow<AddServer2ViewModel>
 {
     public AddServer2Window()
     {

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -1,12 +1,12 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class AddServerWindow : WindowBase<AddServerViewModel>
+public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
 {
     public AddServerWindow()
     {

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -1,11 +1,11 @@
 using System.Reactive.Disposables;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
+public partial class DNSSettingWindow : ReactiveWindow<DNSSettingViewModel>
 {
     private static Config _config;
 

v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs

@@ -3,13 +3,13 @@ using System.Text;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Handler;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingViewModel>
+public partial class GlobalHotkeySettingWindow : ReactiveWindow<GlobalHotkeySettingViewModel>
 {
     private readonly List<object> _textBoxKeyEventItem = new();
 

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -5,18 +5,18 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using Splat;
-using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Handler;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class MainWindow : WindowBase<MainWindowViewModel>
+public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
 {
     private static Config _config;
     private WindowNotificationManager? _manager;
@@ -154,6 +154,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         }
         menuAddServerViaScan.IsVisible = false;
 
+        RestoreUI();
         AddHelpMenuItem();
         MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
@@ -435,14 +436,14 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         _config.UiItem.ShowInTaskbar = bl;
     }
 
-    protected override void OnLoaded(object? sender, RoutedEventArgs e)
-    {
-        base.OnLoaded(sender, e);
-        RestoreUI();
-    }
-
     private void RestoreUI()
     {
+        if (_config.UiItem.MainWidth > 0 && _config.UiItem.MainHeight > 0)
+        {
+            Width = _config.UiItem.MainWidth;
+            Height = _config.UiItem.MainHeight;
+        }
+
         if (_config.UiItem.MainGirdHeight1 > 0 && _config.UiItem.MainGirdHeight2 > 0)
         {
             if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Horizontal)
@@ -460,7 +461,8 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
 
     private void StorageUI(string? n = null)
     {
-        ConfigHandler.SaveWindowSizeItem(_config, GetType().Name, Width, Height);
+        _config.UiItem.MainWidth = this.Width;
+        _config.UiItem.MainHeight = this.Height;
 
         if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Horizontal)
         {

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -1,11 +1,11 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
+using Avalonia.ReactiveUI;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
+public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel>
 {
     private static Config _config;
 

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

@@ -1,12 +1,12 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsViewModel>
+public partial class RoutingRuleDetailsWindow : ReactiveWindow<RoutingRuleDetailsViewModel>
 {
     public RoutingRuleDetailsWindow()
     {

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs

@@ -2,14 +2,14 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class RoutingRuleSettingWindow : WindowBase<RoutingRuleSettingViewModel>
+public partial class RoutingRuleSettingWindow : ReactiveWindow<RoutingRuleSettingViewModel>
 {
     public RoutingRuleSettingWindow()
     {

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs

@@ -2,14 +2,14 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
+public partial class RoutingSettingWindow : ReactiveWindow<RoutingSettingViewModel>
 {
     private bool _manualClose = false;
 

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs

@@ -1,12 +1,12 @@
 using System.Reactive.Disposables;
 using Avalonia;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class SubEditWindow : WindowBase<SubEditViewModel>
+public partial class SubEditWindow : ReactiveWindow<SubEditViewModel>
 {
     public SubEditWindow()
     {

v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs

@@ -1,16 +1,16 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
 using DialogHostAvalonia;
 using DynamicData;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
-using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
+public partial class SubSettingWindow : ReactiveWindow<SubSettingViewModel>
 {
     private bool _manualClose = false;
 

v2rayN/v2rayN/App.xaml

@@ -215,7 +215,7 @@
                 <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
                 <Setter Property="TextElement.FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
                 <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
-                <Setter Property="ResizeMode" Value="CanResize" />
+                <Setter Property="ResizeMode" Value="NoResize" />
             </Style>
             <Style
                 x:Key="ViewGlobal"

v2rayN/v2rayN/Base/WindowBase.cs

@@ -1,42 +0,0 @@
-using System.Windows;
-using ReactiveUI;
-
-namespace v2rayN.Base;
-
-public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewModel : class
-{
-    public WindowBase()
-    {
-        Loaded += OnLoaded;
-    }
-
-    protected virtual void OnLoaded(object? sender, RoutedEventArgs e)
-    {
-        try
-        {
-            var sizeItem = ConfigHandler.GetWindowSizeItem(AppHandler.Instance.Config, GetType().Name);
-            if (sizeItem == null)
-            {
-                return;
-            }
-
-            Width = Math.Min(sizeItem.Width, SystemParameters.WorkArea.Width);
-            Height = Math.Min(sizeItem.Height, SystemParameters.WorkArea.Height);
-
-            Left = SystemParameters.WorkArea.Left + ((SystemParameters.WorkArea.Width - Width) / 2);
-            Top = SystemParameters.WorkArea.Top + ((SystemParameters.WorkArea.Height - Height) / 2);
-        }
-        catch { }
-    }
-
-    protected override void OnClosed(EventArgs e)
-    {
-        base.OnClosed(e);
-
-        try
-        {
-            ConfigHandler.SaveWindowSizeItem(AppHandler.Instance.Config, GetType().Name, Width, Height);
-        }
-        catch { }
-    }
-}

v2rayN/v2rayN/Views/AddServer2Window.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.AddServer2Window"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -199,4 +198,4 @@
             </Grid>
         </ScrollViewer>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.AddServerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -1072,4 +1071,4 @@
             </Grid>
         </ScrollViewer>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.DNSSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -205,4 +204,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.GlobalHotkeySettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -170,4 +169,4 @@
             </Grid>
         </ScrollViewer>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -41,8 +40,8 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         ClipToBounds="True"
-                        KeyboardNavigation.TabNavigation="Continue"
-                        Style="{StaticResource MaterialDesignToolBar}">
+                        Style="{StaticResource MaterialDesignToolBar}"
+                        KeyboardNavigation.TabNavigation="Continue">
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuServers}">
                                 <MenuItem.Header>
@@ -433,4 +432,4 @@
             </DockPanel>
         </Grid>
     </materialDesign:DialogHost>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -139,6 +139,7 @@ public partial class MainWindow
             RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
         }
 
+        RestoreUI();
         AddHelpMenuItem();
         WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
         MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
@@ -394,14 +395,20 @@ public partial class MainWindow
         _config.UiItem.ShowInTaskbar = bl;
     }
 
-    protected override void OnLoaded(object? sender, RoutedEventArgs e)
-    {
-        base.OnLoaded(sender, e);
-        RestoreUI();
-    }
-
     private void RestoreUI()
     {
+        if (_config.UiItem.MainWidth > 0 && _config.UiItem.MainHeight > 0)
+        {
+            Width = _config.UiItem.MainWidth;
+            Height = _config.UiItem.MainHeight;
+        }
+
+        var maxWidth = SystemParameters.WorkArea.Width;
+        var maxHeight = SystemParameters.WorkArea.Height;
+        if (Width > maxWidth)
+            Width = maxWidth;
+        if (Height > maxHeight)
+            Height = maxHeight;
         if (_config.UiItem.MainGirdHeight1 > 0 && _config.UiItem.MainGirdHeight2 > 0)
         {
             if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Horizontal)
@@ -419,7 +426,8 @@ public partial class MainWindow
 
     private void StorageUI(string? n = null)
     {
-        ConfigHandler.SaveWindowSizeItem(_config, GetType().Name, Width, Height);
+        _config.UiItem.MainWidth = this.Width;
+        _config.UiItem.MainHeight = this.Height;
 
         if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Horizontal)
         {

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.OptionSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -960,6 +959,8 @@
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsChinaUserTip}"
                             TextWrapping="Wrap" />
+
+
                     </Grid>
                 </ScrollViewer>
             </TabItem>
@@ -1230,4 +1231,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -243,4 +242,4 @@
             </GroupBox>
         </Grid>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -335,4 +334,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -221,4 +220,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/StatusBarView.xaml

@@ -92,7 +92,7 @@
                         AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
                         DisplayMemberPath="Remarks"
                         FontSize="{DynamicResource StdFontSize}"
-                        Style="{StaticResource MaterialDesignFloatingHintComboBox}">
+                        Style="{StaticResource MaterialDesignFloatingHintComboBox}">                        
                     </ComboBox>
                 </StackPanel>
 
@@ -185,7 +185,7 @@
                                     AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
                                     DisplayMemberPath="Remarks"
                                     FontSize="{DynamicResource StdFontSize}"
-                                    Style="{StaticResource MaterialDesignFilledComboBox}">
+                                    Style="{StaticResource MaterialDesignFilledComboBox}">                               
                                 </ComboBox>
                             </DockPanel>
                         </MenuItem.Header>
@@ -200,7 +200,7 @@
                                     AutomationProperties.Name="{x:Static resx:ResUI.menuServers}"
                                     DisplayMemberPath="Text"
                                     FontSize="{DynamicResource StdFontSize}"
-                                    Style="{StaticResource MaterialDesignFilledComboBox}">
+                                    Style="{StaticResource MaterialDesignFilledComboBox}">                               
                                 </ComboBox>
                             </DockPanel>
                         </MenuItem.Header>

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -316,4 +315,4 @@
             </Grid>
         </ScrollViewer>
     </DockPanel>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/SubSettingWindow.xaml

@@ -1,8 +1,7 @@
-<base:WindowBase
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -121,4 +120,4 @@
             </DataGrid>
         </DockPanel>
     </materialDesign:DialogHost>
-</base:WindowBase>
+</reactiveui:ReactiveWindow>