From f42ca101c8bfcdf143c5a055c69205f48cd17fbd Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Mon, 8 Mar 2021 10:31:39 +0800
Subject: [PATCH] =?UTF-8?q?toast=E6=8E=A7=E4=BB=B6=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../App.axaml.cs                              |   4 +-
 .../UI/Controls/ToastMessage.axaml            |  23 +--
 .../Application/UI/MainView.axaml             |   2 +-
 .../Application/UI/Pages/DebugPage.axaml      |   3 +-
 .../Application/UI/Styles/Controls.xaml       |   1 +
 .../UI/Styles/Controls/DrawingSvg.xaml        |  15 ++
 ....SteamTools.Client.Desktop.Avalonia.csproj |   4 +
 .../ServiceCollectionExtensions.cs            |   1 +
 .../Implementation/SteamServiceImpl.cs        |  13 +-
 .../Services/Static/ToastService.cs           | 131 ++++++++++--------
 .../UI/Resx/R.cs                              |   7 +-
 .../UI/ViewModels/Base/WindowViewModel.cs     |   7 -
 .../Controls/ToastMessageViewModel.cs         |  42 ------
 .../UI/ViewModels/MainWindowViewModel.cs      |   2 +
 .../UI/ViewModels/Pages/DebugPageViewModel.cs |   4 +-
 .../UI/ViewModels/Windows/MessageWindow.cs    |  14 --
 .../Windows/MessageWindowViewModel.cs         |  20 +++
 .../ServiceCollectionExtensions.cs            |   1 +
 18 files changed, 143 insertions(+), 151 deletions(-)
 create mode 100644 System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/DrawingSvg.xaml
 delete mode 100644 System.Application.SteamTools.Client.Desktop/UI/ViewModels/Controls/ToastMessageViewModel.cs
 delete mode 100644 System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageWindow.cs
 create mode 100644 System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageWindowViewModel.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 43dffe07f..a097c17c2 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -42,7 +42,7 @@ namespace System.Application.UI
         [Obsolete("use AppHelper.ProgramName", true)]
         public string ProgramName => AppHelper.ProgramName;
 
-        AppTheme mTheme;
+        AppTheme mTheme = AppTheme.Dark;
         public AppTheme Theme
         {
             get
@@ -99,9 +99,9 @@ namespace System.Application.UI
             Startup.Init();
 
             #region 启动时加载的资源
-
             SettingsHost.Load();
             compositeDisposable.Add(SettingsHost.Save);
+            Theme = (AppTheme)UISettings.Theme.Value;
             UISettings.Theme.Subscribe(x => Theme = (AppTheme)x);
             UISettings.Language.Subscribe(x => R.ChangeLanguage(x));
 
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 fd73c99e9..d2451bbcb 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
@@ -3,22 +3,23 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              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}"
+             xmlns:service="clr-namespace:System.Application.Services;assembly=System.Application.SteamTools.Client.Desktop"
+             mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="50" Margin="0 0 0 20"
+             Background="Transparent" IsVisible="{Binding Source={x:Static service:ToastService.Current},Path=IsVisible,Mode=OneWay}"
              x:Class="System.Application.UI.Controls.ToastMessage">
     <Design.DataContext>
         <vm:ToastMessageViewModel/>
     </Design.DataContext>
-    <Border Padding="10" Background="{DynamicResource ActiveBackgroundBrushKey}">
-        <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>
+    <Border Background="{DynamicResource ActiveBackgroundBrushKey}" Classes="paper" CornerRadius="3">
+        <StackPanel Orientation="Horizontal">
+            <!--<TextBlock Text="{Binding Title}" FontSize="16"/>-->
+            <Border Padding="10">
+                <TextBlock Text="{Binding Source={x:Static service:ToastService.Current},Path=Message,Mode=OneWay}" FontSize="14" Foreground="{DynamicResource HighlightForegroundColorKey}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+            </Border>
+            <Button Width="40" Height="40" Background="Transparent" Command="{Binding Source={x:Static service:ToastService.Current},Path=CloseBtn_Click}">
+                <Image Width="12">
                     <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>
+                        <DrawingImage Drawing="{DynamicResource CloseDrawing}"></DrawingImage>
                     </Image.Source>
                 </Image>
             </Button>
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 8ec16e3a4..0519cf702 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/MainView.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/MainView.axaml
@@ -63,7 +63,7 @@
                 </DataTemplate>
             </TabControl.ItemTemplate>
         </TabControl>
-        <controls:ToastMessage DataContext="{Binding Toast}" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
+        <controls:ToastMessage 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/DebugPage.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/DebugPage.axaml
index d8be1c724..dd9309027 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/DebugPage.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/DebugPage.axaml
@@ -9,6 +9,7 @@
              x:Class="System.Application.UI.Views.Pages.DebugPage">
 	<Grid RowDefinitions="*,Auto">
         <TextBox Grid.Row="0" Text="{Binding DebugString}"></TextBox>
-        <Button Grid.Row="1" Height="35" MinWidth="200" Content="Debug Button" Command="{Binding DebugButton_Click}"></Button>
+        <Button Grid.Row="1" Height="35" MinWidth="200" Content="Debug Button" Command="{Binding DebugButton_Click}">
+        </Button>
 	</Grid>
 </UserControl>
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml
index a56fc52cb..73981572a 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml
@@ -4,6 +4,7 @@
         <Thickness x:Key="PageMargin">20 0 20 0</Thickness>
         <Thickness x:Key="PageMargin2">30 0 30 0</Thickness>
     </Styles.Resources>
+    <StyleInclude Source="/Application/UI/Styles/Controls/DrawingSvg.xaml" />
     <StyleInclude Source="/Application/UI/Styles/Controls/SideBar.xaml" />
     <StyleInclude Source="/Application/UI/Styles/Controls/TabControl.xaml" />
     <StyleInclude Source="/Application/UI/Styles/Controls/TextBox.xaml" />
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/DrawingSvg.xaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/DrawingSvg.xaml
new file mode 100644
index 000000000..a88c8a8ab
--- /dev/null
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/DrawingSvg.xaml
@@ -0,0 +1,15 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <Border Padding="20" Background="Green" Width="50">
+            <StackPanel Spacing="5">
+                <DrawingPresenter Drawing="{DynamicResource CloseDrawing}"></DrawingPresenter>
+            </StackPanel>
+        </Border>
+    </Design.PreviewWith>
+    <Styles.Resources>
+        <GeometryDrawing x:Key="CloseDrawing" 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" Brush="{DynamicResource HighlightForegroundColorKey}">
+        </GeometryDrawing>
+    </Styles.Resources>
+
+</Styles>
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 212394766..12c38a4bb 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
@@ -23,6 +23,7 @@
     <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\DrawingSvg.xaml" />
     <None Remove="Application\UI\Styles\Controls\TabControl.xaml" />
     <None Remove="Application\UI\Styles\Controls\TextBox.xaml" />
     <None Remove="Application\UI\Styles\ThemeDark.xaml" />
@@ -64,6 +65,9 @@
     <AvaloniaResource Update="Application\UI\Styles\Controls\Border.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaResource>
+    <AvaloniaResource Update="Application\UI\Styles\Controls\DrawingSvg.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaResource>
     <AvaloniaResource Update="Application\UI\Styles\Controls\TextBox.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaResource>
diff --git a/System.Application.SteamTools.Client.Desktop/ServiceCollectionExtensions.cs b/System.Application.SteamTools.Client.Desktop/ServiceCollectionExtensions.cs
index da38f9fa9..bb32678b4 100644
--- a/System.Application.SteamTools.Client.Desktop/ServiceCollectionExtensions.cs
+++ b/System.Application.SteamTools.Client.Desktop/ServiceCollectionExtensions.cs
@@ -90,5 +90,6 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddSingleton<ISteamworksWebApiService, SteamworksWebApiServiceImpl>();
             return services;
         }
+
     }
 }
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamServiceImpl.cs b/System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamServiceImpl.cs
index e6a6e6fda..66d6adfec 100644
--- a/System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamServiceImpl.cs
+++ b/System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamServiceImpl.cs
@@ -30,12 +30,10 @@ namespace System.Application.Services.Implementation
         readonly IDesktopPlatformService platformService;
         readonly string? mSteamDirPath;
         readonly string? mSteamProgramPath;
-        readonly IToast toast;
         readonly string[] steamProcess = new[] { "steam", "steamservice", "steamwebhelper" };
 
-        public SteamServiceImpl(IDesktopPlatformService platformService, IToast toast)
+        public SteamServiceImpl(IDesktopPlatformService platformService)
         {
-            this.toast = toast;
             this.platformService = platformService;
             mSteamDirPath = platformService.GetSteamDirPath();
             mSteamProgramPath = platformService.GetSteamProgramPath();
@@ -92,10 +90,7 @@ namespace System.Application.Services.Implementation
             {
                 Process.Start(SteamProgramPath, arguments);
             }
-            else
-            {
-                toast.Show(SR.SteamInstallPathNotFound);
-            }        }
+        }
 
         public string GetLastLoginUserName() => platformService.GetLastSteamLoginUserName();
 
@@ -212,7 +207,7 @@ namespace System.Application.Services.Implementation
         {
             if (string.IsNullOrWhiteSpace(UserVdfPath) || string.IsNullOrWhiteSpace(SteamDirPath))
             {
-                toast.Show(SR.SteamInstallPathNotFound);
+                return;
             }
             else
             {
@@ -229,7 +224,7 @@ namespace System.Application.Services.Implementation
         {
             if (string.IsNullOrWhiteSpace(UserVdfPath))
             {
-                toast.Show(SR.SteamInstallPathNotFound);
+                return;
             }
             else
             {
diff --git a/System.Application.SteamTools.Client.Desktop/Services/Static/ToastService.cs b/System.Application.SteamTools.Client.Desktop/Services/Static/ToastService.cs
index f50a4c308..f3745acc8 100644
--- a/System.Application.SteamTools.Client.Desktop/Services/Static/ToastService.cs
+++ b/System.Application.SteamTools.Client.Desktop/Services/Static/ToastService.cs
@@ -4,69 +4,86 @@ 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
+    /// <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;
+        private readonly Subject<string> notifier;
+        private string persisitentMessage = "";
+        private string notificationMessage = "";
 
-		#region Message 変更通知
+        #region Message 変更通知
 
-		/// <summary>
-		/// 获取指示当前状态的字符串。
-		/// </summary>
-		public string Message
-		{
-			get { return this.notificationMessage ?? this.persisitentMessage; }
-			set
-			{
-				if (this.persisitentMessage != value)
-				{
-					this.persisitentMessage = value;
-					this.RaisePropertyChanged();
-				}
-			}
-		}
+        /// <summary>
+        /// 获取指示当前状态的字符串。
+        /// </summary>
+        public string Message
+        {
+            get { return this.notificationMessage ?? this.persisitentMessage; }
+            set
+            {
+                this.notificationMessage = value;
+                this.persisitentMessage = value;
+                this.RaisePropertyChanged();
+            }
+        }
 
-		#endregion
+        #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();
-				});
-		}
+        /// <summary>
+        /// 显示状态
+        /// </summary>
+        private bool _IsVisible;
+        public bool IsVisible
+        {
+            get => _IsVisible;
+            set => this.RaiseAndSetIfChanged(ref _IsVisible, value);
+        }
 
-		public void Set(string message)
-		{
-			this.Message = message;
-		}
+        private ToastService()
+        {
+            this.notifier = new Subject<string>();
+            this.notifier
+                .Do(x =>
+                {
+                    this.notificationMessage = x;
+                    this.RaiseMessagePropertyChanged();
+                })
+                .Throttle(TimeSpan.FromMilliseconds(5000))
+                .Subscribe(_ =>
+                {
+                    this.notificationMessage = string.Empty;
+                    this.RaiseMessagePropertyChanged();
+                });
 
-		public void Notify(string message)
-		{
-			this.notifier.OnNext(message);
-		}
+            this.WhenAnyValue(x => x.Message)
+                     .Subscribe(x => IsVisible = !string.IsNullOrEmpty(x));
+        }
 
-		private void RaiseMessagePropertyChanged()
-		{
-			this.RaisePropertyChanged(nameof(this.Message));
-		}
-	}
+        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));
+        }
+
+        public void CloseBtn_Click()
+        {
+            Set("");
+            IsVisible = false;
+        }
+    }
 }
diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/R.cs b/System.Application.SteamTools.Client.Desktop/UI/Resx/R.cs
index 9ec45234c..111a5d5d1 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/Resx/R.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/Resx/R.cs
@@ -71,19 +71,14 @@ namespace System.Application.UI.Resx
         /// <param name="cultureName"></param>
         public static void ChangeLanguage(string cultureName)
         {
-            //void ChangeLanguage()
-            //{
             if (IsMatch(CultureInfo.CurrentUICulture, cultureName)) return;
-            //    CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo(cultureName);
             if (string.IsNullOrWhiteSpace(cultureName))
-                AppResources.Culture = null;
+                AppResources.Culture = DefaultCurrentUICulture;
             else
                 AppResources.Culture = CultureInfo.GetCultureInfo(Languages.SingleOrDefault(x => x.Key == cultureName).Key);
             //AppResources.Culture = CultureInfo.GetCultureInfo(cultureName);
             Current.Res = new AppResources();
             Current.RaisePropertyChanged(nameof(Res));
-            //}
-            //MainThreadDesktop.BeginInvokeOnMainThread(ChangeLanguage);
         }
 
         public static string GetCurrentCultureSteamLanguageName()
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 2513b352c..87e1f9f4b 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs
@@ -11,13 +11,6 @@ namespace System.Application.UI.ViewModels
             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
deleted file mode 100644
index d570f599a..000000000
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Controls/ToastMessageViewModel.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-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/MainWindowViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
index ad94f02b8..f25b8829d 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
@@ -1,4 +1,5 @@
 using ReactiveUI;
+using System.Application.Models;
 using System.Application.Models.Settings;
 using System.Application.UI.Resx;
 using System.Collections.Generic;
@@ -78,6 +79,7 @@ namespace System.Application.UI.ViewModels
 
         public async void Initialize()
         {
+            //AppHelper.Current.Theme = (AppTheme)UISettings.Theme.Value;
             if (!this.IsInitialized)
             {
                 foreach (var item in this.TabItems)
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
index 547bbf47f..5d843f1a0 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
@@ -27,7 +27,9 @@ namespace System.Application.UI.ViewModels
 
         public void DebugButton_Click()
         {
-            DebugString += "Test Command" + Environment.NewLine;
+            Services.ToastService.Current.Notify("Test CommandTest CommandTest CommandTest CommandTest CommandTest Command");
+            DebugString += Services.ToastService.Current.Message + Environment.NewLine;
+            DebugString += Services.ToastService.Current.IsVisible + Environment.NewLine;
         }
     }
 }
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageWindow.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageWindow.cs
deleted file mode 100644
index 4ad8b3158..000000000
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageWindow.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace System.Application.UI.ViewModels.Windows
-{
-    public class MessageWindow : WindowViewModel
-    {
-        public MessageWindow() 
-        {
-            Title = "";
-        }
-    }
-}
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageWindowViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageWindowViewModel.cs
new file mode 100644
index 000000000..97882e1d1
--- /dev/null
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageWindowViewModel.cs
@@ -0,0 +1,20 @@
+using ReactiveUI;
+
+namespace System.Application.UI.ViewModels.Windows
+{
+    public class MessageWindowViewModel : WindowViewModel
+    {
+        public MessageWindowViewModel() 
+        {
+
+        }
+
+        private string _Content;
+        public string Content
+        {
+            get => _Content;
+            set => this.RaiseAndSetIfChanged(ref _Content, value);
+        }
+
+    }
+}
diff --git a/System.Application.SteamTools.Client/ServiceCollectionExtensions.cs b/System.Application.SteamTools.Client/ServiceCollectionExtensions.cs
index 45bba5688..169ca0f01 100644
--- a/System.Application.SteamTools.Client/ServiceCollectionExtensions.cs
+++ b/System.Application.SteamTools.Client/ServiceCollectionExtensions.cs
@@ -33,5 +33,6 @@ namespace Microsoft.Extensions.DependencyInjection
             services.TryAddSingleton<IUserManager, UserManager>();
             return services;
         }
+
     }
 }
\ No newline at end of file