From c3efd8d806b2e43ed8fa8f17d46faf3e668bd225 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Wed, 10 Jul 2024 16:52:50 +0800
Subject: [PATCH] infobar view optimization

---
 .../Service/Notification/InfoBarService.cs    |  2 +-
 src/Snap.Hutao/Snap.Hutao/UI/Bgra32.cs        |  2 +-
 src/Snap.Hutao/Snap.Hutao/UI/Rgba32.cs        |  4 +-
 .../Snap.Hutao/UI/Xaml/View/InfoBarView.xaml  | 51 +------------------
 .../UI/Xaml/View/InfoBarView.xaml.cs          |  2 +-
 5 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarService.cs
index aebd2adb..8bcccabe 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarService.cs
@@ -45,6 +45,6 @@ internal sealed class InfoBarService : IInfoBarService
         await taskContext.SwitchToMainThreadAsync();
 
         ArgumentNullException.ThrowIfNull(collection);
-        collection.Add(builder.Options);
+        collection.Insert(0, builder.Options);
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Bgra32.cs b/src/Snap.Hutao/Snap.Hutao/UI/Bgra32.cs
index 061a433c..d8b3ad2b 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Bgra32.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Bgra32.cs
@@ -21,7 +21,7 @@ internal struct Bgra32
         A = a;
     }
 
-    public readonly double Luminance { get => ((0.299 * R) + (0.587 * G) + (0.114 * B)) / 255; }
+    public readonly double Luminance { get => ((0.2126 * R) + (0.7152 * G) + (0.0722 * B)) / 255; }
 
     public static unsafe implicit operator Bgra32(Color color)
     {
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Rgba32.cs b/src/Snap.Hutao/Snap.Hutao/UI/Rgba32.cs
index 7e250cee..4221c4d2 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Rgba32.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Rgba32.cs
@@ -37,9 +37,9 @@ internal struct Rgba32
         A = a;
     }
 
-    public readonly double Luminance { get => ((0.299 * R) + (0.587 * G) + (0.114 * B)) / 255; }
+    public readonly double Luminance { get => Luminance255 / 255; }
 
-    public readonly double Luminance255 { get => (0.299 * R) + (0.587 * G) + (0.114 * B); }
+    public readonly double Luminance255 { get => (0.2126 * R) + (0.7152 * G) + (0.0722 * B); }
 
     public static unsafe implicit operator Color(Rgba32 rgba32)
     {
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/InfoBarView.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/InfoBarView.xaml
index a3385f30..63bc6137 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/InfoBarView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/InfoBarView.xaml
@@ -18,53 +18,6 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <AcrylicBrush
-                        x:Key="InfoBarErrorSeverityBackgroundBrush"
-                        FallbackColor="#FDE7E9"
-                        TintColor="#FDE7E9"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarWarningSeverityBackgroundBrush"
-                        FallbackColor="#FFF4CE"
-                        TintColor="#FFF4CE"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarSuccessSeverityBackgroundBrush"
-                        FallbackColor="#DFF6DD"
-                        TintColor="#DFF6DD"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarInformationalSeverityBackgroundBrush"
-                        FallbackColor="#80F6F6F6"
-                        TintColor="#80F6F6F6"
-                        TintOpacity="0.6"/>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <AcrylicBrush
-                        x:Key="InfoBarErrorSeverityBackgroundBrush"
-                        FallbackColor="#442726"
-                        TintColor="#442726"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarWarningSeverityBackgroundBrush"
-                        FallbackColor="#433519"
-                        TintColor="#433519"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarSuccessSeverityBackgroundBrush"
-                        FallbackColor="#393D1B"
-                        TintColor="#393D1B"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarInformationalSeverityBackgroundBrush"
-                        FallbackColor="#34424d"
-                        TintColor="#34424d"
-                        TintOpacity="0.6"/>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
             <DataTemplate x:Key="InfoBarTemplate" x:DataType="shsn:InfoBarOptions">
                 <InfoBar
                     Title="{Binding Title}"
@@ -212,14 +165,14 @@
                         </StackPanel>
                     </Grid>
 
-                    <ScrollViewer Grid.Row="1">
+                    <ScrollView Grid.Row="1">
                         <ItemsControl
                             MaxWidth="480"
                             ItemContainerTransitions="{StaticResource AddDeleteThemeTransitions}"
                             ItemTemplateSelector="{StaticResource InfoBarTemplateSelector}"
                             ItemsPanel="{StaticResource StackPanelSpacing8Template}"
                             ItemsSource="{Binding InfoBars, Mode=OneWay}"/>
-                    </ScrollViewer>
+                    </ScrollView>
                 </Grid>
             </Border>
         </Border>
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/InfoBarView.xaml.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/InfoBarView.xaml.cs
index c0c42396..1f68dea7 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/InfoBarView.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/InfoBarView.xaml.cs
@@ -77,7 +77,7 @@ internal sealed partial class InfoBarView : UserControl
             while (InfoBars.Count > 0)
             {
                 InfoBars.RemoveAt(0);
-                await Task.Delay(150).ConfigureAwait(true);
+                await Task.Delay(100).ConfigureAwait(true);
             }
         }
     }