From 38f36bbb82510ba05e563f694b2cd4e70b8af705 Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Fri, 15 Mar 2024 14:21:38 +0800
Subject: [PATCH] fix gachalog page closing crash

---
 src/Snap.Hutao/Snap.Hutao/App.xaml            |  1 +
 .../Snap.Hutao/Control/ScopedPage.cs          |  6 +-
 .../View/Card/GachaStatisticsCard.xaml        |  2 +-
 ...ProgressBar.xaml.cs => CardProgressBar.cs} |  5 +-
 .../View/Card/Primitive/CardProgressBar.xaml  | 82 +++++++++++--------
 5 files changed, 54 insertions(+), 42 deletions(-)
 rename src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/{CardProgressBar.xaml.cs => CardProgressBar.cs} (66%)

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index 3cda18bc..02dd4b50 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -29,6 +29,7 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/TransitionCollection.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Uri.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/WindowOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///View/Card/Primitive/CardProgressBar.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Style
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs b/src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs
index 06db70e8..226884c5 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs
@@ -72,7 +72,11 @@ internal class ScopedPage : Page
             DisposeViewModel();
         }
 
-        DataContext = null;
+        if (this.IsDisposed())
+        {
+            return;
+        }
+
         Unloaded -= unloadEventHandler;
     }
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
index d2f76544..a773211b 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
@@ -70,7 +70,7 @@
                         Maximum="{Binding GuaranteeOrangeThreshold}"
                         ProgressForeground="{StaticResource OrangeColorBrush}"
                         TextForeground="{StaticResource OrangeColorBrush}"
-                        Value="{Binding LastOrangePull}"/>
+                        Value="{Binding LastOrangePull, Mode=OneWay}"/>
                     <shvcp:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastPurplePull}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.cs
similarity index 66%
rename from src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml.cs
rename to src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.cs
index f5af0651..a4da71e4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.cs
@@ -13,12 +13,9 @@ namespace Snap.Hutao.View.Card.Primitive;
 [DependencyProperty("Value", typeof(double))]
 [DependencyProperty("Header", typeof(string))]
 [DependencyProperty("Description", typeof(string))]
-internal sealed partial class CardProgressBar : Grid
+internal sealed partial class CardProgressBar : ContentControl
 {
     public CardProgressBar()
     {
-        IAppResourceProvider appResourceProvider = Ioc.Default.GetRequiredService<IAppResourceProvider>();
-        TextForeground = appResourceProvider.GetResource<Brush>("TextFillColorPrimaryBrush");
-        InitializeComponent();
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
index 8c622def..baf105b4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
@@ -1,39 +1,49 @@
-<Grid
-    x:Class="Snap.Hutao.View.Card.Primitive.CardProgressBar"
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    MinHeight="40"
-    Style="{ThemeResource GridCardStyle}"
-    mc:Ignorable="d">
+    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive">
 
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="auto"/>
-        <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <ProgressBar
-        Grid.ColumnSpan="2"
-        MinHeight="{x:Bind MinHeight, Mode=OneWay}"
-        Background="Transparent"
-        CornerRadius="{StaticResource ControlCornerRadius}"
-        Foreground="{x:Bind ProgressForeground, Mode=OneWay}"
-        Maximum="{x:Bind Maximum, Mode=OneWay}"
-        Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-        Value="{x:Bind Value, Mode=OneWay}"/>
-    <TextBlock
-        Grid.Column="0"
-        Margin="6,0"
-        HorizontalAlignment="Center"
-        VerticalAlignment="Center"
-        Foreground="{x:Bind TextForeground, Mode=OneWay}"
-        Style="{StaticResource CaptionTextBlockStyle}"
-        Text="{x:Bind Header, Mode=OneWay}"/>
-    <TextBlock
-        Grid.Column="1"
-        HorizontalAlignment="Center"
-        VerticalAlignment="Center"
-        Foreground="{x:Bind TextForeground, Mode=OneWay}"
-        Style="{StaticResource CaptionTextBlockStyle}"
-        Text="{x:Bind Description, Mode=OneWay}"/>
-</Grid>
+    <Style BasedOn="{StaticResource DefaultCardProgressBarStyle}" TargetType="shvcp:CardProgressBar"/>
+
+    <Style x:Key="DefaultCardProgressBarStyle" TargetType="shvcp:CardProgressBar">
+        <Setter Property="TextForeground" Value="{ThemeResource TextFillColorPrimaryBrush}"/>
+        <Setter Property="MinHeight" Value="40"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Grid MinHeight="{TemplateBinding MinHeight}" Style="{ThemeResource GridCardStyle}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="auto"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <ProgressBar
+                            Grid.ColumnSpan="2"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            Background="Transparent"
+                            CornerRadius="{StaticResource ControlCornerRadius}"
+                            Foreground="{Binding ProgressForeground, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Maximum="{Binding Maximum, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                            Value="{Binding Value, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="6,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="{Binding TextForeground, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding Header, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
+                        <TextBlock
+                            Grid.Column="1"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="{Binding TextForeground, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding Description, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file