From b7df968ea756d46e2f6f5ef4e7a5ce49391e6f39 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Thu, 12 Oct 2023 21:33:35 +0800
Subject: [PATCH] fix #1008

---
 src/Snap.Hutao/Snap.Hutao/App.xaml            | 22 +++++++++++++++-
 .../Snap.Hutao/Control/Theme/FontStyle.xaml   |  3 +++
 .../Control/Theme/ItemContainerStyle.xaml     | 25 -------------------
 src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj   |  7 ------
 .../View/Page/SpiralAbyssRecordPage.xaml      | 17 ++++++++-----
 5 files changed, 35 insertions(+), 39 deletions(-)
 delete mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemContainerStyle.xaml

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index e2ad5be8..dd980061 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -15,7 +15,6 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/FontStyle.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Glyph.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/InfoBarOverride.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/ItemContainerStyle.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/ItemsPanelTemplate.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/NumericValue.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/PageOverride.xaml"/>
@@ -25,6 +24,27 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Uri.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/WindowOverride.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+
+            <Style
+                x:Key="LargeGridViewItemStyle"
+                BasedOn="{StaticResource DefaultGridViewItemStyle}"
+                TargetType="GridViewItem">
+                <Setter Property="Margin" Value="0,0,12,12"/>
+            </Style>
+            <Style
+                x:Name="NoneSelectionListViewItemStyle"
+                BasedOn="{StaticResource DefaultListViewItemStyle}"
+                TargetType="ListViewItem">
+                <Setter Property="Padding" Value="0"/>
+                <Setter Property="Margin" Value="0,4,0,0"/>
+            </Style>
+            <Style
+                x:Name="NoneSelectionGridViewItemStyle"
+                BasedOn="{StaticResource DefaultGridViewItemStyle}"
+                TargetType="GridViewItem">
+                <Setter Property="Padding" Value="0"/>
+                <Setter Property="Margin" Value="0,0,2,4"/>
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml
index 3d7f052c..df613a0d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.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.MergedDictionaries>
+        <XamlControlsResources/>
+    </ResourceDictionary.MergedDictionaries>
     <FontFamily x:Key="MiSans">ms-appx:///Resource/Font/MiSans-Regular.ttf#MiSans</FontFamily>
     <FontFamily x:Key="CascadiaMonoAndMiSans">ms-appx:///Resource/Font/CascadiaMono.ttf#Cascadia Mono, ms-appx:///Resource/Font/MiSans-Regular.ttf#MiSans</FontFamily>
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemContainerStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemContainerStyle.xaml
deleted file mode 100644
index d2a12ec4..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemContainerStyle.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <XamlControlsResources/>
-    </ResourceDictionary.MergedDictionaries>
-    <Style
-        x:Key="LargeGridViewItemStyle"
-        BasedOn="{StaticResource DefaultGridViewItemStyle}"
-        TargetType="GridViewItem">
-        <Setter Property="Margin" Value="0,0,12,12"/>
-    </Style>
-    <Style
-        x:Name="NoneSelectionListViewItemStyle"
-        BasedOn="{StaticResource DefaultListViewItemStyle}"
-        TargetType="ListViewItem">
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Margin" Value="0,4,0,0"/>
-    </Style>
-    <Style
-        x:Name="NoneSelectionGridViewItemStyle"
-        BasedOn="{StaticResource DefaultGridViewItemStyle}"
-        TargetType="GridViewItem">
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Margin" Value="0,0,2,4"/>
-    </Style>
-</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index 93573a54..bdf870c4 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -82,7 +82,6 @@
     <None Remove="Control\Theme\FontStyle.xaml" />
     <None Remove="Control\Theme\Glyph.xaml" />
     <None Remove="Control\Theme\InfoBarOverride.xaml" />
-    <None Remove="Control\Theme\ItemContainerStyle.xaml" />
     <None Remove="Control\Theme\ItemsPanelTemplate.xaml" />
     <None Remove="Control\Theme\NumericValue.xaml" />
     <None Remove="Control\Theme\PageOverride.xaml" />
@@ -337,12 +336,6 @@
     </Page>
   </ItemGroup>
 
-  <ItemGroup>
-    <Page Update="Control\Theme\ItemContainerStyle.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-
   <ItemGroup>
     <Page Update="Control\Image\CachedImage.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
index e15d40a2..167943ae 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
@@ -504,7 +504,7 @@
 
                     <Grid.Resources>
                         <DataTemplate x:Key="TeamItemTemplate" d:DataType="shvcom:Team">
-                            <Border Margin="0,0,0,8" Style="{StaticResource BorderCardStyle}">
+                            <Border Margin="0,0,16,8" Style="{StaticResource BorderCardStyle}">
                                 <Viewbox Stretch="Uniform">
                                     <Grid Margin="6">
                                         <Grid.ColumnDefinitions>
@@ -530,11 +530,13 @@
                                                 </DataTemplate>
                                             </ItemsControl.ItemTemplate>
                                         </ItemsControl>
-                                        <TextBlock
-                                            Grid.Column="1"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding Rate}"/>
+                                        <Viewbox Grid.Column="1" Stretch="Uniform">
+                                            <TextBlock
+                                                Margin="16,8"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Text="{Binding Rate}"/>
+                                        </Viewbox>
                                     </Grid>
                                 </Viewbox>
                             </Border>
@@ -675,6 +677,7 @@
 
                                 <Grid
                                     Grid.Row="1"
+                                    Margin="16,0,0,0"
                                     ColumnSpacing="8"
                                     DataContext="{Binding SelectedTeamAppearance}">
                                     <Grid.ColumnDefinitions>
@@ -684,12 +687,14 @@
                                     <ListView
                                         Grid.Column="0"
                                         Padding="0,8,0,0"
+                                        ItemContainerStyle="{ThemeResource NoneSelectionListViewItemStyle}"
                                         ItemTemplate="{StaticResource TeamItemTemplate}"
                                         ItemsSource="{Binding Up}"
                                         SelectionMode="None"/>
                                     <ListView
                                         Grid.Column="1"
                                         Padding="0,8,0,0"
+                                        ItemContainerStyle="{ThemeResource NoneSelectionListViewItemStyle}"
                                         ItemTemplate="{StaticResource TeamItemTemplate}"
                                         ItemsSource="{Binding Down}"
                                         SelectionMode="None"/>