update ui

ProxySuper.Core/ProxySuper.Core.csproj

@@ -65,6 +65,7 @@
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>

ProxySuper.WPF/Controls/V2raySettingsControl.xaml

@@ -11,24 +11,27 @@
         <convert:VisibleConverter x:Key="VisibleConverter" />
     </UserControl.Resources>
 
+    <StackPanel Orientation="Vertical" Margin="10,0,20,20">
+        <!--节点类型-->
+        <GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
             <StackPanel Orientation="Horizontal">
-        <StackPanel Width="220">
+                <WrapPanel Orientation="Vertical">
                     <!--TCP-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                               VerticalContentAlignment="Center"
                               IsChecked="{Binding Path=Checked_VLESS_TCP}">
                         <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
                     </CheckBox>
 
                     <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                               VerticalContentAlignment="Center"
                               IsChecked="{Binding Path=Checked_VLESS_WS}">
                         <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
                     </CheckBox>
 
                     <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                               VerticalContentAlignment="Center"
                               Foreground="LimeGreen"
                               IsChecked="{Binding Path=Checked_VLESS_KCP}">
@@ -36,85 +39,71 @@
                     </CheckBox>
 
                     <!--gRPC-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                               VerticalContentAlignment="Center"
                               Foreground="LimeGreen"
                               IsChecked="{Binding Path=Checked_VLESS_gRPC}">
-                <Label  Content="VLESS gRPC&#x0a;基于http2，多路复用。" FontSize="13" Foreground="LimeGreen" />
+                        <Label  Content="{DynamicResource VlessRpcDesc}" FontSize="13" Foreground="LimeGreen" />
                     </CheckBox>
+                </WrapPanel>
 
-            <!--TCP-->
+                <WrapPanel Orientation="Vertical">
-            <!--<CheckBox Content="VMESS over TCP with TLS&#x0a;不推荐" 
-                    Margin="0,15,0,0"
-                    FontSize="13"
-                    Style="{StaticResource MahApps.Styles.CheckBox}"
-                    IsChecked="{Binding Path=Checked_VMESS_TCP}" />-->
-
                     <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                               VerticalContentAlignment="Center"
                               IsChecked="{Binding Path=Checked_VMESS_WS}">
                         <Label Content="{DynamicResource VmessWsDesc}"  FontSize="13" Foreground="Blue" />
                     </CheckBox>
 
                     <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                               VerticalContentAlignment="Center"
                               IsChecked="{Binding Path=Checked_VMESS_KCP}">
                         <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
                     </CheckBox>
+                </WrapPanel>
 
+                <WrapPanel Orientation="Vertical">
                     <!--ss-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                               VerticalContentAlignment="Center"
                               IsChecked="{Binding Path=CheckedShadowSocks}">
                         <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
                     </CheckBox>
 
                     <!--Trojan-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                               Foreground="CadetBlue"
                               VerticalContentAlignment="Center"
                               IsChecked="{Binding Path=Checked_Trojan_TCP}">
                         <Label Content="{DynamicResource TrojanDesc}"  FontSize="13" Foreground="CadetBlue" />
                     </CheckBox>
-
+                </WrapPanel>
             </StackPanel>
+        </GroupBox>
 
         <!--************************** 参数 **************************-->
 
+        <!--参数设置-->
+        <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
             <StackPanel>
-
                 <!--Domain-->
-            <StackPanel Margin="30,15,0,0"
+                <StackPanel Orientation="Horizontal">
-                    Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayDomain}" Width="120"  />
                     <TextBox Text="{Binding Path=Domain}" Width="200"  />
                 </StackPanel>
 
                 <!--Mask Domain-->
-            <StackPanel Margin="30,15,0,0"
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                    Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
                     <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
                 </StackPanel>
 
-            <StackPanel Margin="30,15,0,0"
-                        Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
-                <CheckBox IsChecked="{Binding Path=WithTLS}" 
-                          Content="{DynamicResource XrayWithTLSDesc}"
-                          VerticalContentAlignment="Center"
-                          VerticalAlignment="Center" />
-            </StackPanel>
-
                 <!--UUID-->
-            <StackPanel Margin="30,10,0,0"
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                        Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayUUID}" Width="120" />
 
-                <TextBox Text="{Binding Path=UUID}"
+                    <TextBox Text="{Binding Path=UUID}" Width="200" />
-                            Width="200" />
 
                     <Button Margin="5,0,0,0"
                             Padding="12,3"
@@ -122,20 +111,36 @@
                             Content="{DynamicResource Random}" />
                 </StackPanel>
 
+                <!--more params-->
+                <Expander ExpandDirection="Down" Margin="0,10,0,0">
+                    <Expander.Header>
+                        <TextBlock Text="更多参数" FontWeight="Bold" />
+                    </Expander.Header>
+
+                    <Expander.Content>
+                        <StackPanel>
+                            <!--证书-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource XrayWithTLS}" Width="120" />
+                                <CheckBox IsChecked="{Binding Path=WithTLS}" 
+                              Content="{DynamicResource XrayWithTLSDesc}"
+                              VerticalContentAlignment="Center"
+                              VerticalAlignment="Center" />
+                            </StackPanel>
+
                             <!--WebSocket Path-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0"
                                 Orientation="Horizontal"
                                 Visibility="{
                                     Binding Path=Checked_VLESS_WS,
                                     Converter={StaticResource VisibleConverter}
                                 }">
                                 <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
-                <TextBox Text="{Binding Path=VLESS_WS_Path}"
+                                <TextBox Text="{Binding Path=VLESS_WS_Path}" Width="200" />
-                        Width="200" />
                             </StackPanel>
 
                             <!--seed-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0"
                                 Orientation="Horizontal"
                                 Visibility="{
                                     Binding Path=Checked_VLESS_KCP,
@@ -146,12 +151,12 @@
                             </StackPanel>
 
                             <!--kcp type-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0"
                                 Visibility="{
                                     Binding Path=Checked_VLESS_KCP,
                                     Converter={StaticResource VisibleConverter}
-                }" Orientation="Horizontal">
+                                }"
-
+                                Orientation="Horizontal">
                                 <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
                                 <ComboBox Width="200" 
                                   ItemsSource="{Binding Path=KcpTypes}"
@@ -160,7 +165,7 @@
                             </StackPanel>
 
                             <!--kcp port-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0"
                                 Visibility="{
                                     Binding Path=Checked_VLESS_KCP,
                                     Converter={StaticResource VisibleConverter}
@@ -171,7 +176,7 @@
                             </StackPanel>
 
                             <!--gRPC Port-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0"
                                 Orientation="Horizontal"
                                 Visibility="{
                                     Binding Path=Checked_VLESS_gRPC,
@@ -181,7 +186,7 @@
                                 <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
                             </StackPanel>
 
-            <StackPanel Margin="30,15,0,0" 
+                            <StackPanel Margin="0,15,0,0" 
                                         Orientation="Horizontal" 
                                         Visibility="{
                                             Binding Path=Checked_VLESS_gRPC,
@@ -191,21 +196,8 @@
                                 <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
                             </StackPanel>
 
-            <!--Tcp Path
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_TCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="VMESS WS路径" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_TCP_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="200" />
-            </StackPanel>-->
-
                             <!--WebSocket Path-->
-            <StackPanel Margin="30,15,0,0" 
+                            <StackPanel Margin="0,15,0,0" 
                                         Orientation="Horizontal"
                                         Visibility="{
                                             Binding Path=Checked_VMESS_WS,
@@ -218,7 +210,7 @@
                             </StackPanel>
 
                             <!--seed-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0"
                                 Orientation="Horizontal"
                                 Visibility="{
                                     Binding Path=Checked_VMESS_KCP,
@@ -229,7 +221,7 @@
                             </StackPanel>
 
                             <!--kcp type-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0"
                                 Orientation="Horizontal"
                                 Visibility="{
                                     Binding Path=Checked_VMESS_KCP,
@@ -244,7 +236,7 @@
                             </StackPanel>
 
                             <!--kcp port-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0"
                                 Orientation="Horizontal"
                                 Visibility="{
                                     Binding Path=Checked_VMESS_KCP,
@@ -255,19 +247,18 @@
                             </StackPanel>
 
                             <!--ss密码-->
-            <StackPanel Margin="30,15,0,0" 
+                            <StackPanel Margin="0,15,0,0" 
                                 Orientation="Horizontal" 
                                 Visibility="{
                                     Binding Path=CheckedShadowSocks,
                                     Converter={StaticResource VisibleConverter}
                                 }">
                                 <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
-                <TextBox Text="{Binding Path=ShadowSocksPassword}"
+                                <TextBox Text="{Binding Path=ShadowSocksPassword}" Width="200"/>
-                        Width="200"/>
                             </StackPanel>
 
                             <!--ss加密方式-->
-            <StackPanel Margin="30,15,0,0" 
+                            <StackPanel Margin="0,15,0,0" 
                                 Orientation="Horizontal" 
                                 Visibility="{
                                     Binding Path=CheckedShadowSocks,
@@ -281,7 +272,7 @@
                             </StackPanel>
 
                             <!--ss端口-->
-            <StackPanel Margin="30,15,0,0" 
+                            <StackPanel Margin="0,15,0,0" 
                                 Orientation="Horizontal" 
                                 Visibility="{
                                     Binding Path=CheckedShadowSocks,
@@ -292,28 +283,25 @@
                             </StackPanel>
 
                             <!--Trojan密码-->
-            <StackPanel Margin="30,15,0,0" 
+                            <StackPanel Margin="0,15,0,0" 
                                 Orientation="Horizontal" 
                                 Visibility="{
                                     Binding Path=Checked_Trojan_TCP,
                                     Converter={StaticResource VisibleConverter}
                                 }">
                                 <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
-                <TextBox Text="{Binding Path=TrojanPassword}" 
+                                <TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
-                                Width="200" />
                             </StackPanel>
 
                             <!--xray prot-->
-            <StackPanel Margin="30,15,0,0"
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                    Orientation="Horizontal">
                                 <Label Content="{DynamicResource XrayPort}" Foreground="Gray" Width="120"  />
                                 <TextBox Text="{Binding Path=Port}" Width="120"  />
                                 <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
                             </StackPanel>
 
                             <!--多用户-->
-            <StackPanel Margin="30,10,0,0"
+                            <StackPanel Margin="0,15,0,0" Orientation="Vertical">
-                        Orientation="Vertical">
                                 <StackPanel Orientation="Horizontal">
                                     <Label Content="{DynamicResource MultiUser}" Width="120" />
 
@@ -327,6 +315,10 @@
                                 </StackPanel>
                             </StackPanel>
                         </StackPanel>
+                    </Expander.Content>
+                </Expander>
+            </StackPanel>
+        </GroupBox>
     </StackPanel>
 
 </UserControl>

ProxySuper.WPF/Controls/XraySettingsControl.xaml

@@ -94,14 +94,13 @@
         <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
             <StackPanel>
                 <!--Domain-->
-                <StackPanel Margin="0,15,0,0"
+                <StackPanel Orientation="Horizontal">
-                    Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayDomain}" Width="120" />
                     <TextBox Text="{Binding Path=Domain}" Width="260"  />
                 </StackPanel>
 
                 <!--UUID-->
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayUUID}" Width="120" />
 
                     <TextBox Text="{Binding Path=UUID}"

ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml

@@ -24,8 +24,7 @@
         </StackPanel>
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
  
-        <StackPanel Grid.Column="2">
+        <Grid Margin="10,10,0,0" Grid.Column="2">
-            <Grid Margin="10">
             <Grid.RowDefinitions>
                 <RowDefinition Height="36" />
                 <RowDefinition Height="36" />
@@ -33,11 +32,13 @@
                 <RowDefinition Height="36" />
                 <RowDefinition Height="36" />
                 <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="50" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="120" />
                 <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
             <Label Content="{DynamicResource TrojanGoDomain}" Grid.Row="0" Grid.Column="0" />
@@ -63,14 +64,13 @@
                         Content="{DynamicResource XrayWithTLSDesc}"
                         VerticalContentAlignment="Center"
                         VerticalAlignment="Center" />
-            </Grid>
 
-
+            <Border Grid.Row="7"
-            <Border Grid.Row="1"
+                    Grid.ColumnSpan="3"
                     BorderBrush="#eee"
                     BorderThickness="0,1,0,0">
                 <StackPanel Orientation="Horizontal" 
-                            Margin="0,20,0,0"
+                            Height="50"
                             HorizontalAlignment="Right">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
@@ -86,6 +86,6 @@
                             Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
-        </StackPanel>
+        </Grid>
     </Grid>
 </views:MvxWindow>

ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml

@@ -11,7 +11,7 @@
         Icon="/Resources/ProxySU.ico"
         BorderThickness="0,1,0,0"
         BorderBrush="#EEE"
-        Title="V2ray编辑配置" Height="610" Width="1015">
+        Title="V2ray编辑配置" Height="640" Width="1015">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
@@ -25,16 +25,15 @@
 
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <StackPanel Grid.Column="2">
+        <Grid Grid.Column="2">
-            <Grid>
             <Grid.RowDefinitions>
-                    <RowDefinition Height="500" />
+                <RowDefinition Height="*" />
-                    <RowDefinition Height="80" />
+                <RowDefinition Height="50" />
             </Grid.RowDefinitions>
 
             <ScrollViewer Name="scroll" 
                             Padding="10" 
-                              Height="500"
+                            Height="auto"
                             Grid.Row="0"
                             HorizontalScrollBarVisibility="Auto" 
                             VerticalScrollBarVisibility="Auto" >
@@ -44,7 +43,7 @@
             <Border Grid.Row="1"
                     BorderBrush="#eee"
                     BorderThickness="0,1,0,0">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Height="50">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
                             HorizontalAlignment="Right"
@@ -60,6 +59,5 @@
                 </StackPanel>
             </Border>
         </Grid> 
-        </StackPanel>
     </Grid>
 </views:MvxWindow>

ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,6 +19,7 @@ namespace ProxySuper.WPF.Views.V2ray
     /// <summary>
     /// V2rayEditorView.xaml 的交互逻辑
     /// </summary>
+    [MvxWindowPresentation]
     public partial class V2rayEditorView : MvxWindow
     {
         public V2rayEditorView()

ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs

@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
 using MvvmCross.Platforms.Wpf.Views;
 using ProxySuper.Core.Models.Projects;
 using ProxySuper.Core.ViewModels;
@@ -15,6 +16,7 @@ namespace ProxySuper.WPF.Views
     /// <summary>
     /// XrayInfoView.xaml 的交互逻辑
     /// </summary>
+    [MvxWindowPresentation()]
     public partial class XrayConfigView : MvxWindow
     {
         public XrayConfigView()
@@ -116,16 +118,16 @@ namespace ProxySuper.WPF.Views
             }
 
 
-            QRCodeGenerator qrGenerator = new QRCodeGenerator();
+            var qrGenerator = new QRCodeGenerator();
-            QRCodeData qrCodeData = qrGenerator.CreateQrCode(shareLink, QRCodeGenerator.ECCLevel.Q);
+            var qrCodeData = qrGenerator.CreateQrCode(shareLink, QRCodeGenerator.ECCLevel.Q);
-            QRCode qrCode = new QRCode(qrCodeData);
+            var qrCode = new QRCode(qrCodeData);
 
-            Bitmap qrCodeImage = qrCode.GetGraphic(20);
+            var qrCodeImage = qrCode.GetGraphic(20);
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
             qrCodeImage.Save(ms, System.Drawing.Imaging.ImageFormat.Bmp);
             byte[] bytes = ms.GetBuffer();
             ms.Close();
-            BitmapImage image = new BitmapImage();
+            var image = new BitmapImage();
             image.BeginInit();
             image.StreamSource = new MemoryStream(bytes);
             image.EndInit();

ProxySuper.WPF/Views/Xray/XrayEditorView.xaml

@@ -34,8 +34,8 @@
 
             <ScrollViewer Name="scroll" 
                           Padding="10"  
-                          Grid.Row="0"
                           Height="auto"
+                          Grid.Row="0"
                           HorizontalScrollBarVisibility="Auto" 
                           VerticalScrollBarVisibility="Auto" >
                 <ctrl:XraySettingsControl />

ProxySuper.WPF/Views/Xray/XrayEditorView.xaml.cs

@@ -7,7 +7,7 @@ namespace ProxySuper.WPF.Views
     /// <summary>
     /// XrayEditorView.xaml 的交互逻辑
     /// </summary>
-    [MvxWindowPresentation(Identifier = nameof(XrayEditorView), Modal = false)]
+    [MvxWindowPresentation()]
     public partial class XrayEditorView : MvxWindow
     {
         public XrayEditorView()

ProxySuper.WPF/Views/Xray/XrayInstallView.xaml.cs

@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Wpf.Views;
+using MvvmCross.Platforms.Wpf.Presenters.Attributes;
+using MvvmCross.Platforms.Wpf.Views;
 using MvvmCross.ViewModels;
 using ProxySuper.Core.ViewModels;
 using System;
@@ -20,6 +21,7 @@ namespace ProxySuper.WPF.Views
     /// <summary>
     /// XrayInstallView.xaml 的交互逻辑
     /// </summary>
+    [MvxWindowPresentation()]
     public partial class XrayInstallView : MvxWindow
     {
         public XrayInstallView()