Code clean

2025-05-11 18:58:20 +00:00 · 2025-04-26 09:53:19 +08:00 · 2025-04-26 09:53:19 +08:00 · 1c04144573
commit 1c04144573
parent adf3b955d6
10 changed files with 80 additions and 63 deletions
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
@ -8,7 +8,6 @@ using DialogHostAvalonia;
 using ReactiveUI;
 using Splat;
 using v2rayN.Desktop.Common;
-using static QRCoder.PayloadGenerator;

 namespace v2rayN.Desktop.Views;

--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@ -1,9 +1,9 @@
 <Application
    x:Class="v2rayN.App"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    ShutdownMode="OnExplicitShutdown"
    StartupUri="Views/MainWindow.xaml">
    <Application.Resources>
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.MainWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    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:ServiceLib.ViewModels;assembly=ServiceLib"
    xmlns:view="clr-namespace:v2rayN.Views"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
    Title="v2rayN"
    Width="900"
    Height="700"
@ -42,8 +42,7 @@
                        ClipToBounds="True"
                        Style="{StaticResource MaterialDesignToolBar}">
                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Padding="8,0"
-                                AutomationProperties.Name="{x:Static resx:ResUI.menuServers}">
+                            <MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuServers}">
                                <MenuItem.Header>
                                    <StackPanel Orientation="Horizontal">
                                        <materialDesign:PackIcon
@ -111,8 +110,7 @@
                        </Menu>
                        <Separator />
                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Padding="8,0"
-                                      AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}">
+                            <MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}">
                                <MenuItem.Header>
                                    <StackPanel Orientation="Horizontal">
                                        <materialDesign:PackIcon
@ -147,8 +145,7 @@
                        </Menu>
                        <Separator />
                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Padding="8,0"
-                                      AutomationProperties.Name="{x:Static resx:ResUI.menuSetting}">
+                            <MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuSetting}">
                                <MenuItem.Header>
                                    <StackPanel Orientation="Horizontal">
                                        <materialDesign:PackIcon
@ -214,8 +211,10 @@
                        </Menu>
                        <Separator />
                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem x:Name="menuReload" Padding="8,0"
-                                      AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
+                            <MenuItem
+                                x:Name="menuReload"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
                                <MenuItem.Header>
                                    <StackPanel Orientation="Horizontal">
                                        <materialDesign:PackIcon
@ -229,8 +228,10 @@
                        </Menu>
                        <Separator />
                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Name="menuCheckUpdate" Padding="8,0"
-                                      AutomationProperties.Name="{x:Static resx:ResUI.menuCheckUpdate}">
+                            <MenuItem
+                                Name="menuCheckUpdate"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuCheckUpdate}">
                                <MenuItem.Header>
                                    <StackPanel Orientation="Horizontal">
                                        <materialDesign:PackIcon
@ -244,8 +245,10 @@
                        </Menu>
                        <Separator />
                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem x:Name="menuHelp" Padding="8,0"
-                                      AutomationProperties.Name="{x:Static resx:ResUI.menuHelp}">
+                            <MenuItem
+                                x:Name="menuHelp"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuHelp}">
                                <MenuItem.Header>
                                    <StackPanel Orientation="Horizontal">
                                        <materialDesign:PackIcon
@ -259,8 +262,10 @@
                        </Menu>
                        <Separator />
                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem x:Name="menuPromotion" Padding="8,0"
-                                      AutomationProperties.Name="{x:Static resx:ResUI.menuPromotion}">
+                            <MenuItem
+                                x:Name="menuPromotion"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuPromotion}">
                                <MenuItem.Header>
                                    <StackPanel Orientation="Horizontal">
                                        <materialDesign:PackIcon
@ -274,8 +279,10 @@
                        </Menu>
                        <Separator />
                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem x:Name="menuClose" Padding="8,0"
-                                      AutomationProperties.Name="{x:Static resx:ResUI.menuClose}">
+                            <MenuItem
+                                x:Name="menuClose"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuClose}">
                                <MenuItem.Header>
                                    <StackPanel Orientation="Horizontal">
                                        <materialDesign:PackIcon
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml
@ -40,9 +40,9 @@
                    Width="30"
                    Height="30"
                    Margin="{StaticResource MarginLeftRight4}"
+                    AutomationProperties.Name="{x:Static resx:ResUI.menuSubEdit}"
                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
-                    ToolTip="{x:Static resx:ResUI.menuSubEdit}"
-                    AutomationProperties.Name="{x:Static resx:ResUI.menuSubEdit}">
+                    ToolTip="{x:Static resx:ResUI.menuSubEdit}">
                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
                </Button>
                <Button
@ -50,9 +50,9 @@
                    Width="30"
                    Height="30"
                    Margin="{StaticResource MarginLeftRight4}"
+                    AutomationProperties.Name="{x:Static resx:ResUI.menuSubAdd}"
                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
-                    ToolTip="{x:Static resx:ResUI.menuSubAdd}"
-                    AutomationProperties.Name="{x:Static resx:ResUI.menuSubAdd}">
+                    ToolTip="{x:Static resx:ResUI.menuSubAdd}">
                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
                </Button>

@ -61,9 +61,9 @@
                    Width="30"
                    Height="30"
                    Margin="{StaticResource MarginLeftRight8}"
+                    AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
-                    ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
-                    AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
+                    ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
                </Button>
                <TextBox
@ -73,8 +73,8 @@
                    VerticalContentAlignment="Center"
                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
                    materialDesign:TextFieldAssist.HasClearButton="True"
-                    Style="{StaticResource DefTextBox}"
-                    AutomationProperties.Name="{x:Static resx:ResUI.MsgServerTitle}" />
+                    AutomationProperties.Name="{x:Static resx:ResUI.MsgServerTitle}"
+                    Style="{StaticResource DefTextBox}" />
            </WrapPanel>
            <DataGrid
                x:Name="lstProfiles"
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    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:ServiceLib.ViewModels;assembly=ServiceLib"
    Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.RoutingRuleSettingWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    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:ServiceLib.ViewModels;assembly=ServiceLib"
    Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml
@ -61,7 +61,8 @@
                        x:Name="togEnableTun"
                        Margin="{StaticResource Margin4}"
                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center" AutomationProperties.Name="{x:Static resx:ResUI.TbEnableTunAs}" />
+                        VerticalAlignment="Center"
+                        AutomationProperties.Name="{x:Static resx:ResUI.TbEnableTunAs}" />
                </StackPanel>

                <StackPanel
@ -74,9 +75,9 @@
                        Width="160"
                        Margin="{StaticResource MarginLeftRight8}"
                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemproxy}"
                        FontSize="{DynamicResource StdFontSize}"
-                        Style="{StaticResource MaterialDesignFloatingHintComboBox}"
-                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemproxy}">
+                        Style="{StaticResource MaterialDesignFloatingHintComboBox}">
                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
@ -88,10 +89,10 @@
                        Width="160"
                        Margin="{StaticResource MarginLeftRight8}"
                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
                        DisplayMemberPath="Remarks"
                        FontSize="{DynamicResource StdFontSize}"
-                        Style="{StaticResource MaterialDesignFloatingHintComboBox}"
-                        AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"/>
+                        Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
                </StackPanel>

                <StackPanel Margin="{StaticResource MarginLeftRight8}" VerticalAlignment="Center">
@ -109,8 +110,10 @@
            ToolTipText="v2rayN">
            <tb:TaskbarIcon.ContextMenu>
                <ContextMenu Style="{StaticResource DefContextMenu}">
-                    <MenuItem x:Name="menuSystemProxyClear" Height="{StaticResource MenuItemHeight}"
-                              AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyClear}">
+                    <MenuItem
+                        x:Name="menuSystemProxyClear"
+                        Height="{StaticResource MenuItemHeight}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyClear}">
                        <MenuItem.Header>
                            <StackPanel Orientation="Horizontal">
                                <materialDesign:PackIcon
@ -122,8 +125,10 @@
                            </StackPanel>
                        </MenuItem.Header>
                    </MenuItem>
-                    <MenuItem x:Name="menuSystemProxySet" Height="{StaticResource MenuItemHeight}"
-                              AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxySet}">
+                    <MenuItem
+                        x:Name="menuSystemProxySet"
+                        Height="{StaticResource MenuItemHeight}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxySet}">
                        <MenuItem.Header>
                            <StackPanel Orientation="Horizontal">
                                <materialDesign:PackIcon
@ -135,8 +140,10 @@
                            </StackPanel>
                        </MenuItem.Header>
                    </MenuItem>
-                    <MenuItem x:Name="menuSystemProxyNothing" Height="{StaticResource MenuItemHeight}"
-                              AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyNothing}">
+                    <MenuItem
+                        x:Name="menuSystemProxyNothing"
+                        Height="{StaticResource MenuItemHeight}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyNothing}">
                        <MenuItem.Header>
                            <StackPanel Orientation="Horizontal">
                                <materialDesign:PackIcon
@ -148,8 +155,10 @@
                            </StackPanel>
                        </MenuItem.Header>
                    </MenuItem>
-                    <MenuItem x:Name="menuSystemProxyPac" Height="{StaticResource MenuItemHeight}"
-                              AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyPac}">
+                    <MenuItem
+                        x:Name="menuSystemProxyPac"
+                        Height="{StaticResource MenuItemHeight}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyPac}">
                        <MenuItem.Header>
                            <StackPanel Orientation="Horizontal">
                                <materialDesign:PackIcon
@ -162,18 +171,20 @@
                        </MenuItem.Header>
                    </MenuItem>
                    <Separator x:Name="sepRoutings" />
-                    <MenuItem x:Name="menuRoutings" Height="Auto"
-                              AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}">
+                    <MenuItem
+                        x:Name="menuRoutings"
+                        Height="Auto"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}">
                        <MenuItem.Header>
                            <DockPanel>
                                <ComboBox
                                    x:Name="cmbRoutings"
                                    MaxWidth="300"
                                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
+                                    AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
                                    DisplayMemberPath="Remarks"
                                    FontSize="{DynamicResource StdFontSize}"
-                                    Style="{StaticResource MaterialDesignFilledComboBox}"
-                                    AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"/>
+                                    Style="{StaticResource MaterialDesignFilledComboBox}" />
                            </DockPanel>
                        </MenuItem.Header>
                    </MenuItem>
@ -184,10 +195,10 @@
                                    x:Name="cmbServers"
                                    MaxWidth="300"
                                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuServers}"
+                                    AutomationProperties.Name="{x:Static resx:ResUI.menuServers}"
                                    DisplayMemberPath="Text"
                                    FontSize="{DynamicResource StdFontSize}"
-                                    Style="{StaticResource MaterialDesignFilledComboBox}"
-                                    AutomationProperties.Name="{x:Static resx:ResUI.menuServers}"/>
+                                    Style="{StaticResource MaterialDesignFilledComboBox}" />
                            </DockPanel>
                        </MenuItem.Header>
                    </MenuItem>
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.SubEditWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    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:ServiceLib.ViewModels;assembly=ServiceLib"
    Title="{x:Static resx:ResUI.menuSubSetting}"
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.SubSettingWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    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:ServiceLib.ViewModels;assembly=ServiceLib"
    Title="{x:Static resx:ResUI.menuSubSetting}"
--- a/v2rayN/v2rayN/Views/ThemeSettingView.xaml
+++ b/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"