From fa5aac3366901c28a9c056efd5029349e2bea6a3 Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Wed, 15 Nov 2023 16:07:57 +0800
Subject: [PATCH] Revert "remove AttachedCardShadow to fix startup crash"

This reverts commit afbc91abe8d244e22cffe9b4b50735bed32e07a5.
---
 src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml        | 9 ++++++++-
 .../Snap.Hutao/View/Control/HutaoStatisticsCard.xaml     | 1 +
 .../Snap.Hutao/View/Control/StatisticsCard.xaml          | 2 ++
 .../Snap.Hutao/View/Page/AnnouncementPage.xaml           | 3 ++-
 .../Snap.Hutao/View/Page/AvatarPropertyPage.xaml         | 8 ++++++--
 src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml   | 5 ++++-
 src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml    | 6 +++++-
 src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml  | 4 ++++
 src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml     | 3 ++-
 src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml  | 3 ++-
 src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml  | 3 ++-
 11 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
index 1aa2c531..d42eb68e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
@@ -1,4 +1,7 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cwm="using:CommunityToolkit.WinUI.Media">
     <Style x:Key="BorderCardStyle" TargetType="Border">
         <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
@@ -11,4 +14,8 @@
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
     </Style>
+    <cwm:AttachedCardShadow
+        x:Key="CompatCardShadow"
+        Opacity="0.1"
+        Offset="0,4,0"/>
 </ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
index 92519a12..028c986f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
@@ -11,6 +11,7 @@
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shvcont="using:Snap.Hutao.View.Control"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
+    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
     d:DataContext="{d:DesignInstance shvg:HutaoWishSummary}"
     mc:Ignorable="d">
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
index 502461b0..30b344c8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Control.StatisticsCard"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwcont="using:CommunityToolkit.WinUI.Controls"
     xmlns:cwconv="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -14,6 +15,7 @@
     xmlns:shvconv="using:Snap.Hutao.View.Converter"
     xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
+    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
     d:DataContext="{d:DesignInstance shvg:TypedWishSummary}"
     mc:Ignorable="d">
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
index a819a4c9..fa19553b 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwa="using:CommunityToolkit.WinUI.Animations"
+    xmlns:cwb="using:CommunityToolkit.WinUI.Behaviors"
     xmlns:cww="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -28,7 +29,7 @@
         <shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/>
 
         <DataTemplate x:Key="AnnouncementTemplate">
-            <ItemContainer>
+            <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                 <Border Style="{StaticResource BorderCardStyle}">
                     <Grid>
                         <Grid.RowDefinitions>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
index 4e9cd3a7..8e21da28 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
@@ -587,7 +587,7 @@
                                         MaxWidth="800"
                                         HorizontalAlignment="Left">
                                         <!--  卡片面板  -->
-                                        <Border Margin="16">
+                                        <Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                                             <Grid cw:UIElementExtensions.ClipToBounds="True" Style="{ThemeResource GridCardStyle}">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition/>
@@ -623,7 +623,10 @@
                                                             <ColumnDefinition/>
                                                             <ColumnDefinition Width="auto"/>
                                                         </Grid.ColumnDefinitions>
-                                                        <shvcont:ItemIcon Icon="{Binding SelectedAvatar.Icon}" Quality="{Binding SelectedAvatar.Quality}"/>
+                                                        <shvcont:ItemIcon
+                                                            cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
+                                                            Icon="{Binding SelectedAvatar.Icon}"
+                                                            Quality="{Binding SelectedAvatar.Quality}"/>
                                                         <StackPanel Grid.Column="1" Margin="16,0,0,0">
                                                             <TextBlock
                                                                 Foreground="#FFFFFFFF"
@@ -662,6 +665,7 @@
                                                         </Grid.ColumnDefinitions>
                                                         <Button
                                                             Padding="0"
+                                                            cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                                             BorderBrush="{x:Null}"
                                                             BorderThickness="0">
                                                             <Button.Content>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 0cba1ec9..48621191 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -2,10 +2,13 @@
     x:Class="Snap.Hutao.View.Page.DailyNotePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
+    xmlns:mxic="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:mxim="using:Microsoft.Xaml.Interactions.Media"
     xmlns:shc="using:Snap.Hutao.Control"
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shch="using:Snap.Hutao.Control.Helper"
@@ -43,7 +46,7 @@
         </DataTemplate>
 
         <DataTemplate x:Key="DailyNoteEntryTemplate">
-            <ItemContainer>
+            <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                 <ItemContainer.Resources>
                     <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
                     <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
index 2c1ac799..d0178afa 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.GachaLogPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -323,7 +324,10 @@
                             <ScrollViewer>
                                 <StackPanel Margin="16,0,16,0">
 
-                                    <Border Margin="0,16,0,0" HorizontalAlignment="Left">
+                                    <Border
+                                        Margin="0,16,0,0"
+                                        HorizontalAlignment="Left"
+                                        cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                                         <Border HorizontalAlignment="Center" Style="{StaticResource BorderCardStyle}">
                                             <cwc:ConstrainedBox MaxWidth="720" AspectRatio="1080:533">
                                                 <shci:CachedImage
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
index 1e4d9621..8566e7f2 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.LaunchGamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -30,6 +31,7 @@
         <DataTemplate x:Key="GameResourceTemplate">
             <shvc:LaunchGameResourceExpander
                 Margin="16,16,16,0"
+                cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                 DataContext="{Binding Mode=OneWay}"
                 Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
         </DataTemplate>
@@ -303,6 +305,7 @@
                             <StackPanel>
                                 <shvc:LaunchGameResourceExpander
                                     Margin="16,16,16,0"
+                                    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                     DataContext="{Binding GameResource.PreDownloadGame.Latest, Mode=OneWay}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameResourcePreDownloadHeader}"
                                     Visibility="{Binding FallbackValue={StaticResource VisibilityCollapsed}, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
@@ -312,6 +315,7 @@
                                     ItemsSource="{Binding GameResource.PreDownloadGame.Diffs, Mode=OneWay}"/>
                                 <shvc:LaunchGameResourceExpander
                                     Margin="16,16,16,0"
+                                    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                     DataContext="{Binding GameResource.Game.Latest, Mode=OneWay}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceLatestHeader}"/>
                                 <ItemsControl
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index 42780be4..04ad3645 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.SettingPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -19,7 +20,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Margin="16,16,16,16" Spacing="{StaticResource SettingsCardSpacing}">
-                <Border>
+                <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                     <Grid Height="280" Style="{ThemeResource GridCardStyle}">
                         <Border CornerRadius="{ThemeResource ControlCornerRadius}">
                             <Image
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index 88ea41f2..42aaf799 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.WikiAvatarPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -455,7 +456,7 @@
                                             Margin="16,32,0,0"
                                             Style="{StaticResource BaseTextBlockStyle}"
                                             Text="{shcm:ResourceString Name=ViewPageWiKiAvatarMiscHeader}"/>
-                                        <Border Margin="16,16,0,0">
+                                        <Border Margin="16,16,0,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                                             <cwc:ConstrainedBox AspectRatio="2048:1024">
                                                 <Grid Style="{ThemeResource GridCardStyle}">
                                                     <Grid.ColumnDefinitions>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index 8574ecca..5561d904 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.WikiWeaponPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -152,7 +153,7 @@
                                     MaxWidth="800"
                                     Margin="0,0,16,0"
                                     HorizontalAlignment="Left">
-                                    <Border Margin="16,16,0,0">
+                                    <Border Margin="16,16,0,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                                         <Border Style="{ThemeResource BorderCardStyle}">
                                             <Border.Background>
                                                 <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>