From 13108b669451d1f180e33589a24dfea916a9152a Mon Sep 17 00:00:00 2001
From: qhy040404 <qhy040404@163.com>
Date: Wed, 27 Mar 2024 16:23:30 +0800
Subject: [PATCH] show finished icon if we have enough items

---
 .../Snap.Hutao/View/Page/CultivationPage.xaml | 20 +++++++++++++------
 .../Cultivation/StatisticsCultivateItem.cs    |  6 +++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
index 66ee8de9..2dae3ee1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -174,12 +174,20 @@
                     </ItemContainer.Resources>
                     <shvcp:HorizontalCard>
                         <shvcp:HorizontalCard.Left>
-                            <shvco:ItemIcon
-                                Grid.Column="0"
-                                Width="40"
-                                Height="40"
-                                Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
-                                Quality="{Binding Inner.RankLevel}"/>
+                            <Grid Grid.Column="0">
+                                <shvco:ItemIcon
+                                    Width="40"
+                                    Height="40"
+                                    Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
+                                    Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
+                                    Quality="{Binding Inner.RankLevel}"/>
+                                <FontIcon
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="24"
+                                    Glyph="&#xE73E;"
+                                    Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                            </Grid>
                         </shvcp:HorizontalCard.Left>
                         <shvcp:HorizontalCard.Right>
                             <Grid Margin="16,0">
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs
index 359cb342..118f3f86 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs
@@ -28,7 +28,7 @@ internal sealed class StatisticsCultivateItem
     public Material Inner { get; }
 
     /// <summary>
-    /// 对应背包物品的个数
+    /// 对应需求物品的个数
     /// </summary>
     public uint Count { get; set; }
 
@@ -40,10 +40,10 @@ internal sealed class StatisticsCultivateItem
     /// <summary>
     /// 是否完成
     /// </summary>
-    public bool IsFinished { get => Count >= TotalCount; }
+    public bool IsFinished { get => TotalCount >= Count; }
 
     /// <summary>
     /// 格式化总数
     /// </summary>
-    public string CountFormatted { get => $"{Count}/{TotalCount}"; }
+    public string CountFormatted { get => $"{TotalCount}/{Count}"; }
 }
\ No newline at end of file