From c43bddf22d0be79fd503ebd3d56011bbefd4e65a Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Sun, 17 Oct 2021 04:57:50 +0800
Subject: [PATCH] UI New Style

---
 .../App.axaml.cs                              |  5 --
 .../UI/Styles/Controls/Border.xaml            |  4 +-
 .../Application/UI/Styles/Settings.xaml       | 24 ++++++-
 .../Application/UI/Views/MainView.axaml       | 22 ++++--
 .../UI/Views/Pages/About/AboutPage.axaml      |  6 +-
 .../UI/Views/Pages/DebugPage.axaml            |  3 +-
 .../UI/Views/Pages/GameListPage.axaml         |  2 +-
 .../Views/Pages/Settings/SettingsPage.axaml   |  7 +-
 .../ArchiSteamFarmPlus/ASF_AddBotWindow.axaml |  1 -
 .../ProxySettingsWindow.axaml                 | 67 +++++++------------
 src/ST.Client/Settings/UISettings.cs          |  6 ++
 11 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
index 5f4009860..4dddade77 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -1,14 +1,10 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using ReactiveUI;
 using System.Application.Mvvm;
 using System.Application.UI.ViewModels;
 using System.Application.UI.Views;
 using System.Collections.Generic;
-using System.IO;
-using System.Properties;
-using System.Windows;
 using AvaloniaApplication = Avalonia.Application;
 using ShutdownMode = Avalonia.Controls.ShutdownMode;
 using Window = Avalonia.Controls.Window;
@@ -21,7 +17,6 @@ using System.Linq;
 using System.Application.Settings;
 using System.Application.UI.Resx;
 using System.Application.Models;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Application.UI.Views.Windows;
 using System.Application.Services.Implementation;
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml
index b67232179..7bc2e57ab 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml
@@ -14,8 +14,8 @@
     </Border>
   </Design.PreviewWith>
   <Styles.Resources>
-    <CornerRadius x:Key="PaperRadius">9</CornerRadius>
-    <CornerRadius x:Key="PaperRadiusLeft">9 0 0 9</CornerRadius>
+    <CornerRadius x:Key="PaperRadius">8</CornerRadius>
+    <CornerRadius x:Key="PaperRadiusLeft">8 0 0 8</CornerRadius>
   </Styles.Resources>
 
   <Style Selector="Border.card">
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Settings.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Settings.xaml
index 64216fdca..c64b1755a 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Settings.xaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Settings.xaml
@@ -52,6 +52,11 @@
   </Design.PreviewWith>
   <Styles.Resources>
     <sys:Double x:Key="SettingsRightContentWidth">250</sys:Double>
+
+    <SolidColorBrush  x:Key="ExpanderBorderPointerOverBrush"
+              Color="{DynamicResource CardStrokeColorDefault}" />
+    <SolidColorBrush  x:Key="ExpanderBorderBrush"
+                    Color="{DynamicResource CardStrokeColorDefault}" />
   </Styles.Resources>
 
   <Style Selector="StackPanel.Settings">
@@ -80,7 +85,7 @@
   </Style>
 
   <Style Selector="Border.Item:pointerover">
-    <Setter Property="Background" Value="{DynamicResource ControlStrokeColorSecondaryBrush}" />
+    <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}" />
   </Style>
 
   <Style Selector="StackPanel.Settings Expander">
@@ -93,6 +98,10 @@
     <Setter Property="VerticalContentAlignment" Value="Center"/>
   </Style>
 
+  <Style Selector="StackPanel.Settings Expander ToggleButton.ExpanderToggleButton /template/ ContentPresenter#ContentPresenter > TextBlock">
+    <Setter Property="VerticalAlignment" Value="Center"/>
+  </Style>
+
   <Style Selector="StackPanel.Settings TextBlock">
     <Setter Property="FontSize" Value="{StaticResource FontSizeH7}"/>
     <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrushKey}" />
@@ -112,6 +121,12 @@
     <Setter Property="TextWrapping" Value="Wrap" />
   </Style>
 
+  <Style Selector="StackPanel.Settings DockPanel > Label">
+    <Setter Property="Margin" Value="0 0 20 0" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="(DockPanel.Dock)"  Value="Left" />
+  </Style>
+
   <Style Selector="StackPanel.Settings DockPanel > TextBlock">
     <Setter Property="Margin" Value="0 0 20 0" />
     <Setter Property="VerticalAlignment" Value="Center" />
@@ -150,6 +165,13 @@
     <Setter Property="(DockPanel.Dock)"  Value="Right" />
   </Style>
 
+  <Style Selector="StackPanel.Settings DockPanel > NumericUpDown">
+    <!--<Setter Property="Width" Value="{StaticResource SettingsRightContentWidth}" />-->
+    <Setter Property="VerticalAlignment" Value="Center"/>
+    <Setter Property="HorizontalAlignment"  Value="Right" />
+    <Setter Property="(DockPanel.Dock)"  Value="Right" />
+  </Style>
+
   <Style Selector="StackPanel.Settings DockPanel > Slider">
     <Setter Property="Width" Value="{StaticResource SettingsRightContentWidth}" />
     <Setter Property="Margin" Value="0 -15 0 0" />
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
index 183560d6d..8f24083c6 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
@@ -31,22 +31,22 @@
                                        TintOpacity="1"/>
         </ExperimentalAcrylicBorder.Material>
       </ExperimentalAcrylicBorder>
-      <!--<ExperimentalAcrylicBorder IsHitTestVisible="False"
+      <ExperimentalAcrylicBorder IsHitTestVisible="False"
                                  DockPanel.Dock="Right">
         <ExperimentalAcrylicBorder.Material>
           <ExperimentalAcrylicMaterial TintColor="{DynamicResource BackgroundColorKey}"
                                        MaterialOpacity="{ReflectionBinding Value,Source={x:Static ms:UISettings.AcrylicOpacity},Mode=OneWay}"
                                        TintOpacity="1"/>
         </ExperimentalAcrylicBorder.Material>
-      </ExperimentalAcrylicBorder>-->
-      <ExperimentalAcrylicBorder IsHitTestVisible="False"
+      </ExperimentalAcrylicBorder>
+      <!--<ExperimentalAcrylicBorder IsHitTestVisible="False"
                                  DockPanel.Dock="Right">
           <ExperimentalAcrylicBorder.Material>
             <ExperimentalAcrylicMaterial TintColor="{DynamicResource ThemeColorKey}"
                                          MaterialOpacity="{ReflectionBinding Value,Source={x:Static ms:UISettings.AcrylicOpacity},Mode=OneWay}"
                                          TintOpacity="1"/>
           </ExperimentalAcrylicBorder.Material>
-        </ExperimentalAcrylicBorder>
+        </ExperimentalAcrylicBorder>-->
     </DockPanel>
 
     <!--Content-->
@@ -54,8 +54,8 @@
                        Margin="{StaticResource TitleBarAfterMargin}"
                        Background="Transparent"
                        PaneDisplayMode="Left"
-                       IsPaneOpen="False"
-                       AlwaysShowHeader="False"
+                       IsPaneOpen="{ReflectionBinding Source={x:Static ms:UISettings.MainMenuExpandedState},Path=Value,Mode=TwoWay}"
+                       AlwaysShowHeader="True"
                        IsSettingsVisible="False"
                        OpenPaneLength="240"
                        MenuItems="{Binding TabItems}"
@@ -63,6 +63,14 @@
                        IsBackButtonVisible="False"
                        IsBackEnabled="{Binding #frame.CanGoBack}"
                        SelectedItem="{Binding SelectedItem}">
+      <!--<ui:NavigationView.Styles>
+        <Style Selector="ui|NavigationView:minimal /template/ SplitView Rectangle#ContentLeftPadding">
+          <Setter Property="Grid.Row" Value="0" />
+        </Style>
+        <Style Selector="ui|NavigationView:minimal /template/ SplitView Rectangle#ContentTopPadding">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+      </ui:NavigationView.Styles>-->
       <!--<ui:NavigationView.PaneHeader>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="110" VerticalAlignment="Top">
           <Image Source="/Application/UI/Assets/Icon.ico" Height="64" Width="64" VerticalAlignment="Center" Margin="-8,0,0,0"/>
@@ -71,7 +79,7 @@
       </ui:NavigationView.PaneHeader>-->
 
       <ui:NavigationView.Content>
-        <ui:Frame x:Name="frame" DataContext="{Binding SelectedItem}">
+        <ui:Frame x:Name="frame" DataContext="{Binding SelectedItem}" Margin="-10 0 0 0">
           <ui:Frame.DataTemplates>
             <DataTemplate DataType="vm:ProxyScriptManagePageViewModel">
               <pages:ProxyScriptManagePage/>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/AboutPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/AboutPage.axaml
index 65045ccd2..3558d4589 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/AboutPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/AboutPage.axaml
@@ -9,10 +9,8 @@
              mc:Ignorable="d"
              d:DesignWidth="800" d:DesignHeight="450"
              x:Class="System.Application.UI.Views.Pages.AboutPage">
-  <Border Classes="paper"
-        Margin="10"
-        Padding="0 10"
-        Background="{DynamicResource ThemeBrushKey}">
+  <Border 
+        Padding="0 10">
     <TabControl Classes="flat">
       <TabItem Header="{ReflectionBinding Path=Res.About_ThisSoft,Mode=OneWay,Source={x:Static resx:R.Current}}">
         <pages:About_SoftwarePage>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml
index 6ba1fd850..3b7a22b33 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml
@@ -10,7 +10,8 @@
              mc:Ignorable="d"
              d:DesignWidth="800" d:DesignHeight="450"
              x:Class="System.Application.UI.Views.Pages.DebugPage">
-  <Grid RowDefinitions="*,Auto">
+  <Grid RowDefinitions="*,Auto"
+        Margin="10">
     <TextBox Grid.Row="0" Text="{Binding DebugString}" AcceptsReturn="True" />
     <StackPanel Grid.Row="1" Orientation="Horizontal">
       <Button Height="35" MinWidth="200" Content="Debug Button"
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
index d8d8cca07..a9b36d672 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
@@ -431,7 +431,7 @@
                           <ia:InvokeCommandAction Command="{ReflectionBinding #u.DataContext.AppClick}" CommandParameter="{Binding}"/>
                         </ia:EventTriggerBehavior>
                       </i:Interaction.Behaviors>-->
-                      <Border CornerRadius="9"
+                      <Border CornerRadius="{DynamicResource ControlCornerRadius}"
                               ClipToBounds="True">
                         <Panel 
                           Width="{ReflectionBinding Value,Source={x:Static ms:UISettings.AppGridSize},Mode=OneWay}">
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/SettingsPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/SettingsPage.axaml
index 613fbae31..4782a0fe8 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/SettingsPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/SettingsPage.axaml
@@ -7,10 +7,9 @@
              xmlns:pages="using:System.Application.UI.Views.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="System.Application.UI.Views.Pages.SettingsPage">
-  <Border Classes="paper"
-      Margin="10"
-      Padding="0 10"
-      Background="{DynamicResource ThemeBrushKey}">
+  <Border 
+      Margin="0"
+      Padding="0 10">
     <TabControl Classes="flat">
       <TabControl.Styles>
         <Style Selector="ScrollViewer.tabscroll">
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ArchiSteamFarmPlus/ASF_AddBotWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ArchiSteamFarmPlus/ASF_AddBotWindow.axaml
index 5b66745db..d3509863b 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ArchiSteamFarmPlus/ASF_AddBotWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ArchiSteamFarmPlus/ASF_AddBotWindow.axaml
@@ -22,7 +22,6 @@
             Margin="{StaticResource TitleBarAfterMargin}">
       <DockPanel LastChildFill="True">
         <Button Content="保存"
-                Classes="action"
                 Margin="10"
                 Height="40"
                 FontSize="16"
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/CommunityProxyPage/ProxySettingsWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/CommunityProxyPage/ProxySettingsWindow.axaml
index 9796a631e..9df33acdd 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/CommunityProxyPage/ProxySettingsWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/CommunityProxyPage/ProxySettingsWindow.axaml
@@ -17,43 +17,10 @@
         x:CompileBindings="True">
   <Panel>
     <controls:TitleBar DockPanel.Dock="Top"></controls:TitleBar>
-    <Border Classes="paper"
-            Background="{DynamicResource ThemeBrushKey}"
+    <Border Background="{DynamicResource ThemeBrushKey}"
             Margin="{StaticResource TitleBarAfterMargin}">
       <ScrollViewer Padding="10">
-        <StackPanel Spacing="20">
-          <StackPanel.Styles>
-            <Style Selector="Expander">
-              <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            </Style>
-            <Style Selector="DockPanel > Label">
-              <Setter Property="Padding" Value="0" />
-              <Setter Property="Margin" Value="0 0 0 5" />
-              <Setter Property="VerticalAlignment" Value="Center" />
-              <Setter Property="(DockPanel.Dock)" Value="Top"></Setter>
-            </Style>
-            <Style Selector="DockPanel > TextBox">
-              <Setter Property="VerticalAlignment" Value="Center" />
-              <Setter Property="(DockPanel.Dock)" Value="Bottom"></Setter>
-            </Style>
-            <Style Selector="DockPanel > ui|ComboBox">
-              <Setter Property="VerticalAlignment" Value="Center" />
-              <Setter Property="HorizontalAlignment" Value="Stretch" />
-              <Setter Property="(DockPanel.Dock)" Value="Bottom"></Setter>
-            </Style>
-            <Style Selector="DockPanel > TextBlock">
-              <Setter Property="Margin" Value="0 0 20 0" />
-              <Setter Property="VerticalAlignment" Value="Center" />
-              <Setter Property="(DockPanel.Dock)"  Value="Left" />
-            </Style>
-            <Style Selector="DockPanel > ToggleSwitch">
-              <Setter Property="Margin" Value="0 0 -12 0" />
-              <Setter Property="HorizontalAlignment" Value="Right" />
-              <Setter Property="VerticalAlignment" Value="Center" />
-              <Setter Property="OnContent" Value="{x:Null}" />
-              <Setter Property="OffContent" Value="{x:Null}" />
-            </Style>
-          </StackPanel.Styles>
+        <StackPanel Spacing="20" Classes="Settings">
           <Expander Header="加速设置" IsExpanded="True">
             <StackPanel Spacing="10">
               <DockPanel>
@@ -69,7 +36,8 @@
               </DockPanel>
               <DockPanel>
                 <Label Content="监听端口"></Label>
-                <TextBox Text="{ReflectionBinding Source={x:Static ms:ProxySettings.HostProxyPortId},Path=Value, Mode=TwoWay}"></TextBox>
+                <NumericUpDown Value="{ReflectionBinding Source={x:Static ms:ProxySettings.HostProxyPortId},Path=Value, Mode=TwoWay}" 
+                               Maximum="65535"/>
               </DockPanel>
               <DockPanel>
                 <TextBlock Text="{ReflectionBinding Path=Res.CommunityFix_AutoRunProxy,Mode=OneWay,Source={x:Static resx:R.Current}}" ></TextBlock>
@@ -94,13 +62,19 @@
             </StackPanel>
           </Expander>
 
-          <Expander Header="Socks5本地代理" IsExpanded="True">
+          <Expander IsExpanded="True">
+            <Expander.Header>
+              <DockPanel HorizontalAlignment="Stretch">
+                <TextBlock Text="Socks5本地代理"/>
+                <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.Socks5ProxyEnable},Path=Value, Mode=TwoWay}"/>
+              </DockPanel>
+            </Expander.Header>
             <StackPanel Spacing="10">
-              <DockPanel>
+              <!--<DockPanel>
                 <TextBlock Text="启用" ></TextBlock>
                 <ToggleSwitch
                             IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.Socks5ProxyEnable},Path=Value, Mode=TwoWay}"/>
-              </DockPanel>
+              </DockPanel>-->
               <DockPanel>
                 <Label Content="监听端口"></Label>
                 <NumericUpDown Maximum="65535"
@@ -109,18 +83,23 @@
             </StackPanel>
           </Expander>
 
-          <Expander Header="二级代理" IsExpanded="True">
+          <Expander IsExpanded="True">
+            <Expander.Header>
+              <DockPanel HorizontalAlignment="Stretch">
+                <TextBlock Text="二级代理"/>
+                <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.TwoLevelAgentEnable},Path=Value, Mode=TwoWay}"/>
+              </DockPanel>
+            </Expander.Header>
             <StackPanel Spacing="10">
-              <DockPanel>
+              <!--<DockPanel>
                 <TextBlock Text="启用" ></TextBlock>
                 <ToggleSwitch
                             IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.TwoLevelAgentEnable},Path=Value, Mode=TwoWay}"/>
-              </DockPanel>
+              </DockPanel>-->
 
               <DockPanel>
                 <Label Content="代理类型"></Label>
-                <ComboBox HorizontalAlignment="Stretch"
-                          Items="{Binding ProxyTypes}"
+                <ComboBox Items="{Binding ProxyTypes}"
                           SelectedIndex="{ReflectionBinding Source={x:Static ms:ProxySettings.TwoLevelAgentProxyType},Path=Value, Mode=TwoWay}"/>
               </DockPanel>
 
diff --git a/src/ST.Client/Settings/UISettings.cs b/src/ST.Client/Settings/UISettings.cs
index 1420f253c..ea1dd9a06 100644
--- a/src/ST.Client/Settings/UISettings.cs
+++ b/src/ST.Client/Settings/UISettings.cs
@@ -139,5 +139,11 @@ namespace System.Application.Settings
         /// </summary>
         public static SerializableProperty<bool> GetUserThemeAccent { get; }
             = GetProperty(defaultValue: true, autoSave: true);
+
+        /// <summary>
+        /// 主菜单展开状态
+        /// </summary>
+        public static SerializableProperty<bool> MainMenuExpandedState { get; }
+            = GetProperty(defaultValue: false, autoSave: true);
     }
 }