Update UI

HMBSbige · HMBSbige · commit 36161a01fd3d · 2021-07-14T15:09:24.000+08:00
diff --git a/BilibiliLiveRecordDownLoader/App.xaml b/BilibiliLiveRecordDownLoader/App.xaml
@@ -33,6 +33,11 @@
                 <!-- ModernWPF controls resources -->
                 <ui:XamlControlsResources />
             </ResourceDictionary.MergedDictionaries>
+            <!-- Override Colors -->
+            <SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="Transparent" />
+            <SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent" />
+            <SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="Transparent" />
+            <!-- Converters -->
             <valueConverters:LiveStatusToBrushConverter x:Key="LiveStatusToBrushConverter" />
             <valueConverters:DanmuClientTypeToIntConverter x:Key="DanmuClientTypeToIntConverter" />
             <valueConverters:QnToStringConverter x:Key="QnToStringConverter" />
diff --git a/BilibiliLiveRecordDownLoader/MainWindow.xaml b/BilibiliLiveRecordDownLoader/MainWindow.xaml
@@ -38,7 +38,7 @@
         <ui:NavigationView
             x:Name="NavigationView"
             IsBackButtonVisible="Collapsed"
-            PaneDisplayMode="Auto"
+            PaneDisplayMode="Left"
             IsTabStop="False"
             IsPaneOpen="False">
             <ui:NavigationView.MenuItems>
@@ -49,13 +49,15 @@
                 <ui:NavigationViewItem Icon="Message" Content="日志" Tag="3" />
                 <ui:NavigationViewItem Icon="61272" Content="用户设置" Tag="5" />
             </ui:NavigationView.MenuItems>
-            <reactiveUi:RoutedViewHost
-                x:Name="RoutedViewHost"
-                HorizontalContentAlignment="Stretch"
-                VerticalContentAlignment="Stretch"
-                Transition="Fade"
-                Direction="Up"
-                Duration="0:0:0.3" />
+            <Border Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
+                <reactiveUi:RoutedViewHost
+                    x:Name="RoutedViewHost"
+                    HorizontalContentAlignment="Stretch"
+                    VerticalContentAlignment="Stretch"
+                    Transition="Fade"
+                    Direction="Up"
+                    Duration="0:0:0.3" />
+            </Border>
         </ui:NavigationView>
     </Grid>
 </reactiveUi:ReactiveWindow>
diff --git a/BilibiliLiveRecordDownLoader/MainWindow.xaml.cs b/BilibiliLiveRecordDownLoader/MainWindow.xaml.cs
@@ -42,7 +42,7 @@ public MainWindow(
 				{
 					if (args.EventArgs.IsSettingsSelected)
 					{
-						ViewModel.Router.Navigate.Execute(settings);
+						ViewModel.Router.NavigateAndReset.Execute(settings);
 						return;
 					}
 
@@ -55,32 +55,32 @@ public MainWindow(
 					{
 						case @"1":
 						{
-							ViewModel.Router.Navigate.Execute(liveRecordList);
+							ViewModel.Router.NavigateAndReset.Execute(liveRecordList);
 							break;
 						}
 						case @"2":
 						{
-							ViewModel.Router.Navigate.Execute(taskList);
+							ViewModel.Router.NavigateAndReset.Execute(taskList);
 							break;
 						}
 						case @"3":
 						{
-							ViewModel.Router.Navigate.Execute(log);
+							ViewModel.Router.NavigateAndReset.Execute(log);
 							break;
 						}
 						case @"4":
 						{
-							ViewModel.Router.Navigate.Execute(streamRecord);
+							ViewModel.Router.NavigateAndReset.Execute(streamRecord);
 							break;
 						}
 						case @"5":
 						{
-							ViewModel.Router.Navigate.Execute(userSettings);
+							ViewModel.Router.NavigateAndReset.Execute(userSettings);
 							break;
 						}
 						case @"6":
 						{
-							ViewModel.Router.Navigate.Execute(ffmpegCommand);
+							ViewModel.Router.NavigateAndReset.Execute(ffmpegCommand);
 							break;
 						}
 					}
diff --git a/BilibiliLiveRecordDownLoader/Views/FFmpegCommandView.xaml b/BilibiliLiveRecordDownLoader/Views/FFmpegCommandView.xaml
@@ -10,7 +10,8 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:wpfMaskedTextBox="clr-namespace:WPFMaskedTextBox;assembly=WPFMaskedTextBox"
     mc:Ignorable="d"
-    d:DesignHeight="550" d:DesignWidth="800" Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
+    d:DesignHeight="550" d:DesignWidth="800"
+    d:Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
     <Grid Margin="20,25,0,0">
         <ScrollViewer>
             <ui:SimpleStackPanel Spacing="0" Margin="0,0,20,0">
diff --git a/BilibiliLiveRecordDownLoader/Views/LiveRecordListView.xaml b/BilibiliLiveRecordDownLoader/Views/LiveRecordListView.xaml
@@ -10,7 +10,8 @@
     xmlns:controls="http://schemas.modernwpf.com/2019"
     xmlns:models="clr-namespace:BilibiliLiveRecordDownLoader.Models"
     mc:Ignorable="d"
-    d:DesignHeight="450" d:DesignWidth="800" Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
+    d:DesignHeight="450" d:DesignWidth="800"
+    d:Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
     <Grid Margin="10,15,0,0">
         <DockPanel>
             <controls:SimpleStackPanel
diff --git a/BilibiliLiveRecordDownLoader/Views/LogView.xaml b/BilibiliLiveRecordDownLoader/Views/LogView.xaml
@@ -8,7 +8,8 @@
     xmlns:reactiveUi="http://reactiveui.net"
     xmlns:viewModels="clr-namespace:BilibiliLiveRecordDownLoader.ViewModels"
     mc:Ignorable="d"
-    d:DesignHeight="450" d:DesignWidth="800" Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
+    d:DesignHeight="450" d:DesignWidth="800"
+    d:Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
     <Grid Margin="0,30,0,0">
         <TextBox x:Name="LogTextBox"
                  IsReadOnly="True"
diff --git a/BilibiliLiveRecordDownLoader/Views/SettingView.xaml b/BilibiliLiveRecordDownLoader/Views/SettingView.xaml
@@ -9,7 +9,8 @@
     xmlns:viewModels="clr-namespace:BilibiliLiveRecordDownLoader.ViewModels"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     mc:Ignorable="d"
-    d:DesignHeight="1200" d:DesignWidth="800" Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
+    d:DesignHeight="1200" d:DesignWidth="800"
+    d:Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
     <Grid Margin="20,25,0,0">
         <ScrollViewer>
             <ui:SimpleStackPanel Spacing="0" Margin="0,0,20,0">
diff --git a/BilibiliLiveRecordDownLoader/Views/StreamRecordView.xaml b/BilibiliLiveRecordDownLoader/Views/StreamRecordView.xaml
@@ -11,7 +11,7 @@
     xmlns:controls="http://schemas.modernwpf.com/2019"
     mc:Ignorable="d"
     d:DesignHeight="450" d:DesignWidth="800"
-    Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
+    d:Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
     <Grid Margin="0,30,0,0">
         <DataGrid
             x:Name="RoomListDataGrid"
diff --git a/BilibiliLiveRecordDownLoader/Views/TaskListView.xaml b/BilibiliLiveRecordDownLoader/Views/TaskListView.xaml
@@ -10,7 +10,8 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:taskViewModels="clr-namespace:BilibiliLiveRecordDownLoader.Models.TaskViewModels"
     mc:Ignorable="d"
-    d:DesignHeight="450" d:DesignWidth="800" Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
+    d:DesignHeight="450" d:DesignWidth="800"
+    d:Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
     <Grid Margin="0,30,0,0">
         <DataGrid
             x:Name="TaskListDataGrid"
diff --git a/BilibiliLiveRecordDownLoader/Views/UserSettingsView.xaml b/BilibiliLiveRecordDownLoader/Views/UserSettingsView.xaml
@@ -10,7 +10,8 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:constants="clr-namespace:BilibiliLiveRecordDownLoader.Shared.Utils;assembly=BilibiliLiveRecordDownLoader.Shared"
     mc:Ignorable="d"
-    d:DesignHeight="600" d:DesignWidth="800" Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
+    d:DesignHeight="600" d:DesignWidth="800"
+    d:Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
     <Grid Margin="20,25,0,0">
         <ScrollViewer>
             <ui:SimpleStackPanel Spacing="0" Margin="0,0,20,0">

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public MainWindow(`
`42`	`42`	`{`
`43`	`43`	`if (args.EventArgs.IsSettingsSelected)`
`44`	`44`	`{`
`45`		`- ViewModel.Router.Navigate.Execute(settings);`
	`45`	`+ ViewModel.Router.NavigateAndReset.Execute(settings);`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`
`@@ -55,32 +55,32 @@ public MainWindow(`
`55`	`55`	`{`
`56`	`56`	`case @"1":`
`57`	`57`	`{`
`58`		`- ViewModel.Router.Navigate.Execute(liveRecordList);`
	`58`	`+ ViewModel.Router.NavigateAndReset.Execute(liveRecordList);`
`59`	`59`	`break;`
`60`	`60`	`}`
`61`	`61`	`case @"2":`
`62`	`62`	`{`
`63`		`- ViewModel.Router.Navigate.Execute(taskList);`
	`63`	`+ ViewModel.Router.NavigateAndReset.Execute(taskList);`
`64`	`64`	`break;`
`65`	`65`	`}`
`66`	`66`	`case @"3":`
`67`	`67`	`{`
`68`		`- ViewModel.Router.Navigate.Execute(log);`
	`68`	`+ ViewModel.Router.NavigateAndReset.Execute(log);`
`69`	`69`	`break;`
`70`	`70`	`}`
`71`	`71`	`case @"4":`
`72`	`72`	`{`
`73`		`- ViewModel.Router.Navigate.Execute(streamRecord);`
	`73`	`+ ViewModel.Router.NavigateAndReset.Execute(streamRecord);`
`74`	`74`	`break;`
`75`	`75`	`}`
`76`	`76`	`case @"5":`
`77`	`77`	`{`
`78`		`- ViewModel.Router.Navigate.Execute(userSettings);`
	`78`	`+ ViewModel.Router.NavigateAndReset.Execute(userSettings);`
`79`	`79`	`break;`
`80`	`80`	`}`
`81`	`81`	`case @"6":`
`82`	`82`	`{`
`83`		`- ViewModel.Router.Navigate.Execute(ffmpegCommand);`
	`83`	`+ ViewModel.Router.NavigateAndReset.Execute(ffmpegCommand);`
`84`	`84`	`break;`
`85`	`85`	`}`
`86`	`86`	`}`