From ec1e7200b40b8a5ae84fe62b913e4475849c903a Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Sun, 7 Mar 2021 17:08:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=AE=BE=E7=BD=AE=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../App.axaml.cs                              | 34 ++++++---
 ...amTools.Client.Desktop.Avalonia.App.csproj | 14 ++--
 .../UI/Controls/ToastMessage.axaml            | 23 ++++--
 .../Application/UI/MainView.axaml             |  4 +-
 .../UI/Pages/Settings/Settings_UI.axaml       |  4 +-
 .../Application/UI/Pages/SettingsPage.axaml   |  4 +-
 .../UI/Pages/SteamAccountPage.axaml           |  2 +-
 .../UI/Windows/MessageWindow.axaml            |  3 +-
 ....SteamTools.Client.Desktop.Avalonia.csproj |  2 +-
 .../Models/Enum/AppTheme.cs                   | 13 ++++
 .../Models/Settings/UISettings.cs             | 28 ++++++--
 .../Services/IDesktopAppService.cs            |  7 +-
 .../Services/Static/ToastService.cs           | 72 +++++++++++++++++++
 .../UI/ViewModels/Base/WindowViewModel.cs     |  8 ++-
 .../Controls/ToastMessageViewModel.cs         | 42 +++++++++++
 .../Pages/Settings/SettingsPageViewModel.cs   |  2 -
 16 files changed, 224 insertions(+), 38 deletions(-)
 create mode 100644 System.Application.SteamTools.Client.Desktop/Models/Enum/AppTheme.cs
 create mode 100644 System.Application.SteamTools.Client.Desktop/Services/Static/ToastService.cs
 create mode 100644 System.Application.SteamTools.Client.Desktop/UI/ViewModels/Controls/ToastMessageViewModel.cs

diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
index 1818cbf64..f1a0b9807 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -21,6 +21,7 @@ using System.Windows.Input;
 using System.Linq;
 using System.Application.Models.Settings;
 using System.Application.UI.Resx;
+using System.Application.Models;
 #if WINDOWS
 using System.Windows.Shell;
 using WpfApplication = System.Windows.Application;
@@ -40,9 +41,8 @@ namespace System.Application.UI
         [Obsolete("use AppHelper.ProgramName", true)]
         public string ProgramName => AppHelper.ProgramName;
 
-        bool mTheme;
-
-        public bool Theme
+        AppTheme mTheme;
+        public AppTheme Theme
         {
             get
             {
@@ -51,10 +51,25 @@ namespace System.Application.UI
             set
             {
                 if (value == mTheme) return;
-
-                var mode = value ? FluentThemeMode.Light : FluentThemeMode.Dark;
-                var uri_0 = new Uri($"avares://Avalonia.Themes.Fluent/Fluent{(value ? "Light" : "Dark")}.xaml");
-                var uri_1 = new Uri($"avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Theme{(value ? "Light" : "Dark")}.xaml");
+                var the = "Dark";
+                var mode = FluentThemeMode.Dark;
+                switch (value)
+                {
+                    case AppTheme.Light:
+                        the = "Light";
+                        mode = mode = FluentThemeMode.Light;
+                        break;
+                    case AppTheme.Dark:
+                        the = "Dark";
+                        mode = mode = FluentThemeMode.Dark;
+                        break;
+                    default:
+                        the = "Dark";
+                        mode = mode = FluentThemeMode.Dark;
+                        break;
+                }
+                var uri_0 = new Uri($"avares://Avalonia.Themes.Fluent/Fluent{the}.xaml");
+                var uri_1 = new Uri($"avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Theme{the}.xaml");
 
                 Styles[0] = new FluentTheme(uri_0)
                 {
@@ -86,6 +101,7 @@ namespace System.Application.UI
 
             SettingsHost.Load();
             compositeDisposable.Add(SettingsHost.Save);
+            UISettings.Theme.Subscribe(x => Theme = (AppTheme)x);
             UISettings.Language.Subscribe(x => R.ChangeLanguage(x));
 
             #endregion
@@ -138,12 +154,12 @@ namespace System.Application.UI
 
                 mNotifyIconMenus.Add("Light", ReactiveCommand.Create(() =>
                 {
-                    Theme = true;
+                    Theme = AppTheme.Light;
                 }));
 
                 mNotifyIconMenus.Add("Dark", ReactiveCommand.Create(() =>
                 {
-                    Theme = false;
+                    Theme = AppTheme.Dark;
                 }));
 
                 mNotifyIconMenus.Add("Show",
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj b/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
index 78d113417..d676264b2 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
@@ -35,21 +35,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Avalonia\System.Application.SteamTools.Client.Desktop.Avalonia.csproj"/>
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop\System.Application.SteamTools.Client.Desktop.csproj"/>
-    <ProjectReference Include="..\System.Common.CoreLib\System.Common.CoreLib.csproj"/>
+    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Avalonia\System.Application.SteamTools.Client.Desktop.Avalonia.csproj" />
+    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop\System.Application.SteamTools.Client.Desktop.csproj" />
+    <ProjectReference Include="..\System.Common.CoreLib\System.Common.CoreLib.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Windows\System.Application.SteamTools.Client.Desktop.Windows.csproj"/>
+    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Windows\System.Application.SteamTools.Client.Desktop.Windows.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`osx`)) Or ('$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' And !$(DefineConstants.Contains(`PUBLISH`))) ">
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Mac\System.Application.SteamTools.Client.Desktop.Mac.csproj"/>
+    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Mac\System.Application.SteamTools.Client.Desktop.Mac.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`linux`)) Or ('$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' And !$(DefineConstants.Contains(`PUBLISH`))) ">
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Linux\System.Application.SteamTools.Client.Desktop.Linux.csproj"/>
+    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Linux\System.Application.SteamTools.Client.Desktop.Linux.csproj" />
   </ItemGroup>
 
   <!--<ItemGroup Condition=" '$(OS)' == 'Windows_NT' And $(RuntimeIdentifier.Contains(`osx`)) And $(DefineConstants.Contains(`PUBLISH`)) ">
@@ -77,7 +77,7 @@
     <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
-    <AvaloniaResource Include="Assets\**"/>
+    <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/ToastMessage.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/ToastMessage.axaml
index 6609b5950..fd73c99e9 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/ToastMessage.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/ToastMessage.axaml
@@ -2,11 +2,26 @@
              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"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
+             mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="50"
+             Background="Transparent" IsVisible="{Binding IsVisible}"
              x:Class="System.Application.UI.Controls.ToastMessage">
+    <Design.DataContext>
+        <vm:ToastMessageViewModel/>
+    </Design.DataContext>
     <Border Padding="10" Background="{DynamicResource ActiveBackgroundBrushKey}">
-        <Panel>
-            <TextBlock Text="Teset Message"></TextBlock>
-        </Panel>
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+            <TextBlock Text="{Binding Title}" FontSize="14"/>
+            <TextBlock Text="{Binding Message}" FontSize="12"/>
+            <Button Width="30" Height="30">
+                <Image>
+                    <Image.Source>
+                        <DrawingImage>
+                            <GeometryDrawing Brush="{DynamicResource HighlightForegroundColorKey}" Geometry="M566.97558594 521.09667969L856.8828125 231.18945312c14.63378906-14.63378906 14.63378906-38.75976563 0-53.39355468l-1.58203125-1.58203125c-14.63378906-14.63378906-38.75976563-14.63378906-53.39355469 0L512 466.51660156 222.09277344 176.21386719c-14.63378906-14.63378906-38.75976563-14.63378906-53.39355469 0l-1.58203125 1.58203125c-15.02929688 14.63378906-15.02929688 38.75976563 0 53.39355469l289.90722656 289.90722656L167.1171875 811.00390625c-14.63378906 14.63378906-14.63378906 38.75976563 0 53.39355469l1.58203125 1.58203125c14.63378906 14.63378906 38.75976563 14.63378906 53.39355469 0L512 576.07226563 801.90722656 865.97949219c14.63378906 14.63378906 38.75976563 14.63378906 53.39355469 0l1.58203125-1.58203125c14.63378906-14.63378906 14.63378906-38.75976563 0-53.39355469L566.97558594 521.09667969z"></GeometryDrawing>
+                        </DrawingImage>
+                    </Image.Source>
+                </Image>
+            </Button>
+        </StackPanel>
     </Border>
 </UserControl>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/MainView.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/MainView.axaml
index 06972183f..8ec16e3a4 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/MainView.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/MainView.axaml
@@ -6,6 +6,7 @@
         xmlns:pages="clr-namespace:System.Application.UI.Views.Pages"
         xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
         xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop"
+        xmlns:controls="clr-namespace:System.Application.UI.Controls"
         x:Class="System.Application.UI.Views.MainView"
         FontSize="14"
         Foreground="{StaticResource SystemBaseHighColor}">
@@ -30,7 +31,7 @@
                 <Label Content="{ReflectionBinding #TabControl.SelectedItem.Name}" Foreground="{DynamicResource HighlightForegroundBrushKey}" Margin="20 10 20 0" FontSize="32"/>
             </ExperimentalAcrylicBorder>
         </DockPanel>
-        <TabControl x:Name="TabControl" 
+        <TabControl x:Name="TabControl"
                     Items="{Binding TabItems}"
                     SelectedItem="{Binding SelectedItem}"
                     Margin="0 30 0 0"
@@ -62,6 +63,7 @@
                 </DataTemplate>
             </TabControl.ItemTemplate>
         </TabControl>
+        <controls:ToastMessage DataContext="{Binding Toast}" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
         <!--<TabControl x:Name="TabControl" Classes="sidebar" Margin="0 30 0 0">
             <TabItem Header="{Binding Path=Res.Welcome,Mode=OneWay,Source={x:Static resx:R.Current}}" VerticalContentAlignment="Center" Margin="0 10 0 0">
             </TabItem>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/Settings/Settings_UI.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/Settings/Settings_UI.axaml
index a2363f99a..85c33fcb1 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/Settings/Settings_UI.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/Settings/Settings_UI.axaml
@@ -26,7 +26,9 @@
                 </StackPanel>
                 <StackPanel Orientation="Vertical">
                     <TextBlock Text="{Binding Path=Res.Settings_Theme,Mode=OneWay,Source={x:Static resx:R.Current}}" Margin="0 0 0 20" Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
-                    <ComboBox x:Name="Themes" SelectedIndex="0" HorizontalAlignment="Stretch">
+                    <ComboBox x:Name="Themes"
+                              SelectedIndex="{Binding Source={x:Static ms:UISettings.Theme},Path=Value, Mode=TwoWay}"
+                              HorizontalAlignment="Stretch">
                         <ComboBoxItem>Light</ComboBoxItem>
                         <ComboBoxItem>Dark</ComboBoxItem>
                     </ComboBox>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml
index ed740355c..920de3ebc 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml
@@ -8,8 +8,6 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="System.Application.UI.Views.Pages.SettingsPage">
         <TabControl Classes="flat" Padding="{StaticResource PageMargin2}">
-            <TabItem Header="{Binding Path=Res.Settings_General,Mode=OneWay,Source={x:Static resx:R.Current}}">
-            </TabItem>
             <TabItem Header="{Binding Path=Res.Settings_UI,Mode=OneWay,Source={x:Static resx:R.Current}}">
                 <pages:Settings_UI>
                     <pages:Settings_UI.DataContext>
@@ -17,6 +15,8 @@
                     </pages:Settings_UI.DataContext>
                 </pages:Settings_UI>
             </TabItem>
+            <TabItem Header="{Binding Path=Res.Settings_General,Mode=OneWay,Source={x:Static resx:R.Current}}">
+            </TabItem>
             <TabItem Header="{Binding Path=Res.Settings_Auth,Mode=OneWay,Source={x:Static resx:R.Current}}">
             </TabItem>
         </TabControl>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SteamAccountPage.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SteamAccountPage.axaml
index b20b0da0d..e94c4f29a 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SteamAccountPage.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SteamAccountPage.axaml
@@ -25,7 +25,7 @@
                         <StackPanel x:Name="panel" Margin="20" Spacing="8" Width="184" Cursor="Hand">
                             <DockPanel LastChildFill="True">
                                 <Border DockPanel.Dock="Top" Classes="paper">
-                                    <Panel Width="{Binding #panel.Width}" x:Name="card">
+                                    <Panel x:Name="card" Width="{Binding #panel.Width}">
                                         <i:Interaction.Behaviors>
                                             <ia:EventTriggerBehavior EventName="PointerEnter" SourceObject="{Binding #card}">
                                                 <ia:ChangePropertyAction TargetObject="{Binding #login_btn}" PropertyName="IsVisible" Value="True"/>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MessageWindow.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MessageWindow.axaml
index 37e44c71b..adac8286b 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MessageWindow.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MessageWindow.axaml
@@ -2,8 +2,9 @@
         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"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="200"
         x:Class="System.Application.UI.Windows.MessageWindow"
         Title="MessageWindow">
     
+    
 </Window>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj b/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
index 8cc8cdb95..212394766 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <None Remove="Application\UI\Assets\AppResources\avater.jpg" />
+    <None Remove="Application\UI\Assets\close.svg" />
     <None Remove="Application\UI\Styles\Controls.xaml" />
     <None Remove="Application\UI\Styles\Controls\Border.xaml" />
     <None Remove="Application\UI\Styles\Controls\TabControl.xaml" />
@@ -43,7 +44,6 @@
     <PackageReference Include="Avalonia" Version="0.10.0" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0" />
-    <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.0" />
     <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.0" />
     <PackageReference Include="MessageBox.Avalonia" Version="1.0.5">
       <Aliases>MessageBox_Avalonia</Aliases>
diff --git a/System.Application.SteamTools.Client.Desktop/Models/Enum/AppTheme.cs b/System.Application.SteamTools.Client.Desktop/Models/Enum/AppTheme.cs
new file mode 100644
index 000000000..e20f56e81
--- /dev/null
+++ b/System.Application.SteamTools.Client.Desktop/Models/Enum/AppTheme.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.Application.Models
+{
+    public enum AppTheme : byte
+    {
+        Light = 0,
+        Dark = 1,
+        Custom = 2,
+    }
+}
diff --git a/System.Application.SteamTools.Client.Desktop/Models/Settings/UISettings.cs b/System.Application.SteamTools.Client.Desktop/Models/Settings/UISettings.cs
index 5fc9e0d37..c90579085 100644
--- a/System.Application.SteamTools.Client.Desktop/Models/Settings/UISettings.cs
+++ b/System.Application.SteamTools.Client.Desktop/Models/Settings/UISettings.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Application.Serialization;
+using System.Application.UI;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -9,19 +10,38 @@ namespace System.Application.Models.Settings
 {
     public static class UISettings
     {
+        static UISettings()
+        {
+            //Theme.ValueChanged += Theme_ValueChanged;
+        }
+
+        private static void Theme_ValueChanged(object sender, ValueChangedEventArgs<short> e)
+        {
+            if (e.NewValue != e.OldValue)
+            {
+                switch (e.NewValue)
+                {
+                    case 0:
+                        AppHelper.Current.Theme = AppTheme.Light;
+                        break;
+                    case 1:
+                        AppHelper.Current.Theme = AppTheme.Dark;
+                        break;
+                }
+            }
+        }
+
         /// <summary>
         /// ����
         /// </summary>
         public static SerializableProperty<short> Theme { get; }
-            = new SerializableProperty<short>(GetKey(), Providers.Local) { AutoSave = true };
+            = new SerializableProperty<short>(GetKey(), Providers.Local, 1) { AutoSave = true };
 
         /// <summary>
         /// ����
         /// </summary>
         public static SerializableProperty<string> Language { get; }
-            = new SerializableProperty<string>(GetKey(), Providers.Local) { AutoSave = true };
-
-
+            = new SerializableProperty<string>(GetKey(), Providers.Local, "") { AutoSave = true };
 
         private static string GetKey([CallerMemberName] string propertyName = "")
         {
diff --git a/System.Application.SteamTools.Client.Desktop/Services/IDesktopAppService.cs b/System.Application.SteamTools.Client.Desktop/Services/IDesktopAppService.cs
index 09396f91f..11b812c74 100644
--- a/System.Application.SteamTools.Client.Desktop/Services/IDesktopAppService.cs
+++ b/System.Application.SteamTools.Client.Desktop/Services/IDesktopAppService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System.Application.Models;
+using System.Collections.Generic;
 using System.Windows.Input;
 
 namespace System.Application.Services
@@ -7,10 +8,8 @@ namespace System.Application.Services
     {
         /// <summary>
         /// 当前桌面应用的主题
-        /// <para><see langword="true"/> Light</para>
-        /// <para><see langword="false"/> Dark</para>
         /// </summary>
-        bool Theme { get; set; }
+        AppTheme Theme { get; set; }
 
         /// <summary>
         /// 退出整个程序
diff --git a/System.Application.SteamTools.Client.Desktop/Services/Static/ToastService.cs b/System.Application.SteamTools.Client.Desktop/Services/Static/ToastService.cs
new file mode 100644
index 000000000..f50a4c308
--- /dev/null
+++ b/System.Application.SteamTools.Client.Desktop/Services/Static/ToastService.cs
@@ -0,0 +1,72 @@
+using ReactiveUI;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+
+namespace System.Application.Services
+{
+	/// <summary>
+	/// 提供对显示在主窗口底部的状态栏的访问。
+	/// </summary>
+	public class ToastService : ReactiveObject
+	{
+		#region static members
+		public static ToastService Current { get; } = new ToastService();
+		#endregion
+
+		private readonly Subject<string> notifier;
+		private string persisitentMessage = "";
+		private string notificationMessage;
+
+		#region Message 変更通知
+
+		/// <summary>
+		/// 获取指示当前状态的字符串。
+		/// </summary>
+		public string Message
+		{
+			get { return this.notificationMessage ?? this.persisitentMessage; }
+			set
+			{
+				if (this.persisitentMessage != value)
+				{
+					this.persisitentMessage = value;
+					this.RaisePropertyChanged();
+				}
+			}
+		}
+
+		#endregion
+
+		private ToastService()
+		{
+			this.notifier = new Subject<string>();
+			this.notifier
+				.Do(x =>
+				{
+					this.notificationMessage = x;
+					this.RaiseMessagePropertyChanged();
+				})
+				.Throttle(TimeSpan.FromMilliseconds(5000))
+				.Subscribe(_ =>
+				{
+					this.notificationMessage = null;
+					this.RaiseMessagePropertyChanged();
+				});
+		}
+
+		public void Set(string message)
+		{
+			this.Message = message;
+		}
+
+		public void Notify(string message)
+		{
+			this.notifier.OnNext(message);
+		}
+
+		private void RaiseMessagePropertyChanged()
+		{
+			this.RaisePropertyChanged(nameof(this.Message));
+		}
+	}
+}
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs
index 3a1b1881e..2513b352c 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs
@@ -5,13 +5,19 @@ namespace System.Application.UI.ViewModels
     public class WindowViewModel : ViewModelBase
     {
         string title = string.Empty;
-
         public string Title
         {
             get => title;
             set => this.RaiseAndSetIfChanged(ref title, value);
         }
 
+        ViewModelBase? _Toast;
+        public ViewModelBase? Toast
+        {
+            get => _Toast;
+            set => this.RaiseAndSetIfChanged(ref _Toast, value);
+        }
+
         public bool IsInitialized { get; set; }
 
         protected void InvokeOnUIDispatcher(Action action)
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Controls/ToastMessageViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Controls/ToastMessageViewModel.cs
new file mode 100644
index 000000000..d570f599a
--- /dev/null
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Controls/ToastMessageViewModel.cs
@@ -0,0 +1,42 @@
+using ReactiveUI;
+using System.Application.UI.Resx;
+
+namespace System.Application.UI.ViewModels
+{
+    public class ToastMessageViewModel : ViewModelBase
+    {
+        /// <summary>
+        /// 吐司消息标题
+        /// </summary>
+        private string? _Title;
+        public string? Title
+        {
+            get => _Title;
+            set => this.RaiseAndSetIfChanged(ref _Title, value);
+        }
+
+        /// <summary>
+        /// 消息
+        /// </summary>
+        private string? _Message;
+        public string? Message
+        {
+            get => _Message;
+            set => this.RaiseAndSetIfChanged(ref _Message, value);
+        }
+
+        /// <summary>
+        /// 显示状态
+        /// </summary>
+        private bool _IsVisible;
+        public bool IsVisible
+        {
+            get => _IsVisible;
+            set => this.RaiseAndSetIfChanged(ref _IsVisible, value);
+        }
+
+
+
+
+    }
+}
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs
index cdf1dbbd0..f2e712987 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs
@@ -26,8 +26,6 @@ namespace System.Application.UI.ViewModels
         public SettingsPageViewModel()
         {
             SelectLanguage = R.Languages.SingleOrDefault(x => x.Key == UISettings.Language.Value);
-            if (SelectLanguage.Key == null)
-                SelectLanguage = R.Languages.First();
             this.WhenAnyValue(x => x.SelectLanguage)
             .Subscribe(x => UISettings.Language.Value = x.Key);
         }