Skip to content

Commit 1c04144

Browse files
2dust2dust
committed
Code clean
1 parent adf3b95 commit 1c04144

10 files changed

+80
-63
lines changed

‎v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using ReactiveUI;
99
using Splat;
1010
using v2rayN.Desktop.Common;
11-
using static QRCoder.PayloadGenerator;
1211

1312
namespace v2rayN.Desktop.Views;
1413

‎v2rayN/v2rayN/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Application
22
x:Class="v2rayN.App"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
54
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
65
xmlns:conv="clr-namespace:v2rayN.Converters"
6+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
77
ShutdownMode="OnExplicitShutdown"
88
StartupUri="Views/MainWindow.xaml">
99
<Application.Resources>

‎v2rayN/v2rayN/Views/MainWindow.xaml

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<reactiveui:ReactiveWindow
22
x:Class="v2rayN.Views.MainWindow"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:reactiveui="http://reactiveui.net"
6-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
74
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
87
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
xmlns:reactiveui="http://reactiveui.net"
99
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
10-
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
1110
xmlns:view="clr-namespace:v2rayN.Views"
11+
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
1212
Title="v2rayN"
1313
Width="900"
1414
Height="700"
@@ -42,8 +42,7 @@
4242
ClipToBounds="True"
4343
Style="{StaticResource MaterialDesignToolBar}">
4444
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
45-
<MenuItem Padding="8,0"
46-
AutomationProperties.Name="{x:Static resx:ResUI.menuServers}">
45+
<MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuServers}">
4746
<MenuItem.Header>
4847
<StackPanel Orientation="Horizontal">
4948
<materialDesign:PackIcon
@@ -111,8 +110,7 @@
111110
</Menu>
112111
<Separator />
113112
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
114-
<MenuItem Padding="8,0"
115-
AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}">
113+
<MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}">
116114
<MenuItem.Header>
117115
<StackPanel Orientation="Horizontal">
118116
<materialDesign:PackIcon
@@ -147,8 +145,7 @@
147145
</Menu>
148146
<Separator />
149147
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
150-
<MenuItem Padding="8,0"
151-
AutomationProperties.Name="{x:Static resx:ResUI.menuSetting}">
148+
<MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuSetting}">
152149
<MenuItem.Header>
153150
<StackPanel Orientation="Horizontal">
154151
<materialDesign:PackIcon
@@ -214,8 +211,10 @@
214211
</Menu>
215212
<Separator />
216213
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
217-
<MenuItem x:Name="menuReload" Padding="8,0"
218-
AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
214+
<MenuItem
215+
x:Name="menuReload"
216+
Padding="8,0"
217+
AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
219218
<MenuItem.Header>
220219
<StackPanel Orientation="Horizontal">
221220
<materialDesign:PackIcon
@@ -229,8 +228,10 @@
229228
</Menu>
230229
<Separator />
231230
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
232-
<MenuItem Name="menuCheckUpdate" Padding="8,0"
233-
AutomationProperties.Name="{x:Static resx:ResUI.menuCheckUpdate}">
231+
<MenuItem
232+
Name="menuCheckUpdate"
233+
Padding="8,0"
234+
AutomationProperties.Name="{x:Static resx:ResUI.menuCheckUpdate}">
234235
<MenuItem.Header>
235236
<StackPanel Orientation="Horizontal">
236237
<materialDesign:PackIcon
@@ -244,8 +245,10 @@
244245
</Menu>
245246
<Separator />
246247
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
247-
<MenuItem x:Name="menuHelp" Padding="8,0"
248-
AutomationProperties.Name="{x:Static resx:ResUI.menuHelp}">
248+
<MenuItem
249+
x:Name="menuHelp"
250+
Padding="8,0"
251+
AutomationProperties.Name="{x:Static resx:ResUI.menuHelp}">
249252
<MenuItem.Header>
250253
<StackPanel Orientation="Horizontal">
251254
<materialDesign:PackIcon
@@ -259,8 +262,10 @@
259262
</Menu>
260263
<Separator />
261264
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
262-
<MenuItem x:Name="menuPromotion" Padding="8,0"
263-
AutomationProperties.Name="{x:Static resx:ResUI.menuPromotion}">
265+
<MenuItem
266+
x:Name="menuPromotion"
267+
Padding="8,0"
268+
AutomationProperties.Name="{x:Static resx:ResUI.menuPromotion}">
264269
<MenuItem.Header>
265270
<StackPanel Orientation="Horizontal">
266271
<materialDesign:PackIcon
@@ -274,8 +279,10 @@
274279
</Menu>
275280
<Separator />
276281
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
277-
<MenuItem x:Name="menuClose" Padding="8,0"
278-
AutomationProperties.Name="{x:Static resx:ResUI.menuClose}">
282+
<MenuItem
283+
x:Name="menuClose"
284+
Padding="8,0"
285+
AutomationProperties.Name="{x:Static resx:ResUI.menuClose}">
279286
<MenuItem.Header>
280287
<StackPanel Orientation="Horizontal">
281288
<materialDesign:PackIcon

‎v2rayN/v2rayN/Views/ProfilesView.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@
4040
Width="30"
4141
Height="30"
4242
Margin="{StaticResource MarginLeftRight4}"
43+
AutomationProperties.Name="{x:Static resx:ResUI.menuSubEdit}"
4344
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
44-
ToolTip="{x:Static resx:ResUI.menuSubEdit}"
45-
AutomationProperties.Name="{x:Static resx:ResUI.menuSubEdit}">
45+
ToolTip="{x:Static resx:ResUI.menuSubEdit}">
4646
<materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
4747
</Button>
4848
<Button
4949
x:Name="btnAddSub"
5050
Width="30"
5151
Height="30"
5252
Margin="{StaticResource MarginLeftRight4}"
53+
AutomationProperties.Name="{x:Static resx:ResUI.menuSubAdd}"
5354
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
54-
ToolTip="{x:Static resx:ResUI.menuSubAdd}"
55-
AutomationProperties.Name="{x:Static resx:ResUI.menuSubAdd}">
55+
ToolTip="{x:Static resx:ResUI.menuSubAdd}">
5656
<materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
5757
</Button>
5858

@@ -61,9 +61,9 @@
6161
Width="30"
6262
Height="30"
6363
Margin="{StaticResource MarginLeftRight8}"
64+
AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
6465
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
65-
ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
66-
AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
66+
ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
6767
<materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
6868
</Button>
6969
<TextBox
@@ -73,8 +73,8 @@
7373
VerticalContentAlignment="Center"
7474
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
7575
materialDesign:TextFieldAssist.HasClearButton="True"
76-
Style="{StaticResource DefTextBox}"
77-
AutomationProperties.Name="{x:Static resx:ResUI.MsgServerTitle}" />
76+
AutomationProperties.Name="{x:Static resx:ResUI.MsgServerTitle}"
77+
Style="{StaticResource DefTextBox}" />
7878
</WrapPanel>
7979
<DataGrid
8080
x:Name="lstProfiles"

‎v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<reactiveui:ReactiveWindow
22
x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:reactiveui="http://reactiveui.net"
6-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
74
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
87
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
xmlns:reactiveui="http://reactiveui.net"
99
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
1010
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
1111
Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"

‎v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<reactiveui:ReactiveWindow
22
x:Class="v2rayN.Views.RoutingRuleSettingWindow"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:reactiveui="http://reactiveui.net"
6-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
74
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
87
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
xmlns:reactiveui="http://reactiveui.net"
99
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
1010
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
1111
Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"

‎v2rayN/v2rayN/Views/StatusBarView.xaml

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
x:Name="togEnableTun"
6262
Margin="{StaticResource Margin4}"
6363
HorizontalAlignment="Left"
64-
VerticalAlignment="Center" AutomationProperties.Name="{x:Static resx:ResUI.TbEnableTunAs}" />
64+
VerticalAlignment="Center"
65+
AutomationProperties.Name="{x:Static resx:ResUI.TbEnableTunAs}" />
6566
</StackPanel>
6667

6768
<StackPanel
@@ -74,9 +75,9 @@
7475
Width="160"
7576
Margin="{StaticResource MarginLeftRight8}"
7677
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
78+
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemproxy}"
7779
FontSize="{DynamicResource StdFontSize}"
78-
Style="{StaticResource MaterialDesignFloatingHintComboBox}"
79-
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemproxy}">
80+
Style="{StaticResource MaterialDesignFloatingHintComboBox}">
8081
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
8182
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
8283
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
@@ -88,10 +89,10 @@
8889
Width="160"
8990
Margin="{StaticResource MarginLeftRight8}"
9091
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
92+
AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
9193
DisplayMemberPath="Remarks"
9294
FontSize="{DynamicResource StdFontSize}"
93-
Style="{StaticResource MaterialDesignFloatingHintComboBox}"
94-
AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"/>
95+
Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
9596
</StackPanel>
9697

9798
<StackPanel Margin="{StaticResource MarginLeftRight8}" VerticalAlignment="Center">
@@ -109,8 +110,10 @@
109110
ToolTipText="v2rayN">
110111
<tb:TaskbarIcon.ContextMenu>
111112
<ContextMenu Style="{StaticResource DefContextMenu}">
112-
<MenuItem x:Name="menuSystemProxyClear" Height="{StaticResource MenuItemHeight}"
113-
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyClear}">
113+
<MenuItem
114+
x:Name="menuSystemProxyClear"
115+
Height="{StaticResource MenuItemHeight}"
116+
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyClear}">
114117
<MenuItem.Header>
115118
<StackPanel Orientation="Horizontal">
116119
<materialDesign:PackIcon
@@ -122,8 +125,10 @@
122125
</StackPanel>
123126
</MenuItem.Header>
124127
</MenuItem>
125-
<MenuItem x:Name="menuSystemProxySet" Height="{StaticResource MenuItemHeight}"
126-
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxySet}">
128+
<MenuItem
129+
x:Name="menuSystemProxySet"
130+
Height="{StaticResource MenuItemHeight}"
131+
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxySet}">
127132
<MenuItem.Header>
128133
<StackPanel Orientation="Horizontal">
129134
<materialDesign:PackIcon
@@ -135,8 +140,10 @@
135140
</StackPanel>
136141
</MenuItem.Header>
137142
</MenuItem>
138-
<MenuItem x:Name="menuSystemProxyNothing" Height="{StaticResource MenuItemHeight}"
139-
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyNothing}">
143+
<MenuItem
144+
x:Name="menuSystemProxyNothing"
145+
Height="{StaticResource MenuItemHeight}"
146+
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyNothing}">
140147
<MenuItem.Header>
141148
<StackPanel Orientation="Horizontal">
142149
<materialDesign:PackIcon
@@ -148,8 +155,10 @@
148155
</StackPanel>
149156
</MenuItem.Header>
150157
</MenuItem>
151-
<MenuItem x:Name="menuSystemProxyPac" Height="{StaticResource MenuItemHeight}"
152-
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyPac}">
158+
<MenuItem
159+
x:Name="menuSystemProxyPac"
160+
Height="{StaticResource MenuItemHeight}"
161+
AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyPac}">
153162
<MenuItem.Header>
154163
<StackPanel Orientation="Horizontal">
155164
<materialDesign:PackIcon
@@ -162,18 +171,20 @@
162171
</MenuItem.Header>
163172
</MenuItem>
164173
<Separator x:Name="sepRoutings" />
165-
<MenuItem x:Name="menuRoutings" Height="Auto"
166-
AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}">
174+
<MenuItem
175+
x:Name="menuRoutings"
176+
Height="Auto"
177+
AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}">
167178
<MenuItem.Header>
168179
<DockPanel>
169180
<ComboBox
170181
x:Name="cmbRoutings"
171182
MaxWidth="300"
172183
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
184+
AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
173185
DisplayMemberPath="Remarks"
174186
FontSize="{DynamicResource StdFontSize}"
175-
Style="{StaticResource MaterialDesignFilledComboBox}"
176-
AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"/>
187+
Style="{StaticResource MaterialDesignFilledComboBox}" />
177188
</DockPanel>
178189
</MenuItem.Header>
179190
</MenuItem>
@@ -184,10 +195,10 @@
184195
x:Name="cmbServers"
185196
MaxWidth="300"
186197
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuServers}"
198+
AutomationProperties.Name="{x:Static resx:ResUI.menuServers}"
187199
DisplayMemberPath="Text"
188200
FontSize="{DynamicResource StdFontSize}"
189-
Style="{StaticResource MaterialDesignFilledComboBox}"
190-
AutomationProperties.Name="{x:Static resx:ResUI.menuServers}"/>
201+
Style="{StaticResource MaterialDesignFilledComboBox}" />
191202
</DockPanel>
192203
</MenuItem.Header>
193204
</MenuItem>

0 commit comments

Comments
 (0)