[fix] ShowNotificationAsync

Author: WuChanging

Ink Canvas/MainWindow_cs/MW_AutoFold.cs

@@ -34,7 +34,7 @@ await Dispatcher.InvokeAsync(() =>
                 {
                     if (foldFloatingBarByUser && inkCanvas.Strokes.Count > 2)
                     {
-                        ShowNotification("正在清空墨迹并收纳至侧边栏，可进入批注模式后通过【撤销】功能来恢复原先墨迹。");
+                        ShowNotificationAsync("正在清空墨迹并收纳至侧边栏，可进入批注模式后通过【撤销】功能来恢复原先墨迹。");
                     }
                 }
                 CursorWithDelIcon_Click(null, null);

Ink Canvas/MainWindow_cs/MW_Notification.cs

@@ -1,7 +1,5 @@
 using Ink_Canvas.Helpers;
-using System;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -14,23 +12,17 @@ public partial class MainWindow : Window
 
         public static void ShowNewMessage(string notice, bool isShowImmediately = true)
         {
-            (Application.Current?.Windows.Cast<Window>().FirstOrDefault(window => window is MainWindow) as MainWindow)?.ShowNotification(notice, isShowImmediately);
+            (Application.Current?.Windows.Cast<Window>().FirstOrDefault(window => window is MainWindow) as MainWindow)?.ShowNotificationAsync(notice, isShowImmediately);
         }
 
-        public void ShowNotification(string notice, bool isShowImmediately = true)
+        public async Task ShowNotificationAsync(string notice, bool isShowImmediately = true)
         {
             try
             {
-                lastNotificationShowTime = Environment.TickCount;
-
                 TextBlockNotice.Text = notice;
                 AnimationsHelper.ShowWithSlideFromBottomAndFade(GridNotifications);
-
-                Task.Run(async () =>
-                {
-                    await Task.Delay(300);
-                    AnimationsHelper.HideWithSlideAndFade(GridNotifications);
-                });
+                await Task.Delay(2000);
+                AnimationsHelper.HideWithSlideAndFade(GridNotifications);
             }
             catch { }
         }

Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs

@@ -48,12 +48,12 @@ private void SaveInkCanvasStrokes(bool newNotice = true, bool saveByUser = false
                 inkCanvas.Strokes.Save(fs);
                 if (newNotice)
                 {
-                    ShowNotification("墨迹成功保存至 " + savePathWithName);
+                    ShowNotificationAsync("墨迹成功保存至 " + savePathWithName);
                 }
             }
             catch (Exception Ex)
             {
-                ShowNotification("墨迹保存失败");
+                ShowNotificationAsync("墨迹保存失败");
                 LogHelper.WriteLogToFile("墨迹保存失败 | " + Ex.ToString(), LogHelper.LogType.Error);
             }
         }
@@ -106,7 +106,7 @@ private void SymbolIconOpenStrokes_MouseUp(object sender, MouseButtonEventArgs e
                 }
                 catch
                 {
-                    ShowNotification("墨迹打开失败");
+                    ShowNotificationAsync("墨迹打开失败");
                 }
             }
         }

Ink Canvas/MainWindow_cs/MW_Screenshot.cs

@@ -29,7 +29,7 @@ private void SaveScreenshot(bool isHideNotification, string fileName = null)
             }
             if (!isHideNotification)
             {
-                ShowNotification("截图成功保存至 " + savePath);
+                ShowNotificationAsync("截图成功保存至 " + savePath);
             }
         }
 
@@ -38,7 +38,7 @@ private void SaveScreenShotToDesktop()
             var bitmap = GetScreenshotBitmap();
             string savePath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
             bitmap.Save(savePath + @"\" + DateTime.Now.ToString("u").Replace(':', '-') + ".png", ImageFormat.Png);
-            ShowNotification("截图成功保存至【桌面" + @"\" + DateTime.Now.ToString("u").Replace(':', '-') + ".png】");
+            ShowNotificationAsync("截图成功保存至【桌面" + @"\" + DateTime.Now.ToString("u").Replace(':', '-') + ".png】");
             if (Settings.Automation.IsAutoSaveStrokesAtScreenshot) SaveInkCanvasStrokes(false, false);
         }
 

Ink Canvas/MainWindow_cs/MW_Settings.cs

@@ -54,7 +54,7 @@ private void BtnResetAutoUpdateProxyToGHProxy_Click(object sender, RoutedEventAr
         private async void BtnCheckAutoUpdateProxyReturnedData_Click(object sender, RoutedEventArgs e)
         {
             string ProxyReturnedData = await AutoUpdateHelper.GetRemoteVersion(Settings.Startup.AutoUpdateProxy + "https://raw.githubusercontent.com/ChangSakura/Ink-Canvas/master/AutomaticUpdateVersionControl.txt");
-            ShowNotification(ProxyReturnedData);
+            ShowNotificationAsync(ProxyReturnedData);
         }
 
         private void AutoUpdateWithSilenceStartTimeComboBox_SelectionChanged(object sender, RoutedEventArgs e)
@@ -718,7 +718,7 @@ private void BtnResetToSuggestion_Click(object sender, RoutedEventArgs e)
                 ToggleSwitchRunAtStartup.IsOn = true;
             }
             catch { }
-            ShowNotification("设置已重置为默认推荐设置~");
+            ShowNotificationAsync("设置已重置为默认推荐设置~");
         }
 
         private async void SpecialVersionResetToSuggestion_Click()

Ink Canvas/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("4.9.1.0")]
+[assembly: AssemblyFileVersion("4.9.1.0")]

Ink Canvas/Windows/YesOrNoNotificationWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
         xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
         mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen" ui:WindowHelper.UseModernWindowStyle="True"
-        ResizeMode="NoResize" Closed="Window_Closed" ui:ThemeManager.RequestedTheme="Light"
+        ResizeMode="NoResize" Closed="Window_Closed"
         Title="演示文档设置 - Ink Canvas Artistry" Height="160" Width="450">
     <Grid Background="{DynamicResource FloatBarBackground}">
         <Grid Margin="10">
@@ -18,7 +18,7 @@
             <Viewbox HorizontalAlignment="Left" Margin="10" Height="30">
                 <ui:FontIcon Height="22" Width="30" FontSize="20" FontFamily="{StaticResource FluentIconFontFamily}" Glyph="&#xe786;" Foreground="{DynamicResource FloatBarForeground}"/>
             </Viewbox>
-            <TextBlock TextWrapping="Wrap" Name="Label" Margin="60,0,10,0" VerticalAlignment="Center"/>
+            <TextBlock TextWrapping="Wrap" Name="Label" Margin="60,0,10,0" VerticalAlignment="Center" Foreground="{DynamicResource FloatBarForeground}"/>
             <ikw:SimpleStackPanel Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Orientation="Horizontal" Spacing="10">
                 <Button Margin="0" Content="是" Width="100" Click="ButtonYes_Click" Foreground="White">
                     <Button.Resources>