From 2ff8d6d7f4d47dfe1b0d8bbdbab071baa243deb5 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Tue, 12 Sep 2023 22:14:40 +0800
Subject: [PATCH] achievement versioning

---
 .../Model/Metadata/Achievement/Achievement.cs |  5 ++++
 .../Resource/Localization/SH.Designer.cs      |  2 +-
 .../Snap.Hutao/Resource/Localization/SH.resx  |  2 +-
 .../Snap.Hutao/View/Page/AchievementPage.xaml | 26 ++++++++++++++++---
 .../Achievement/AchievementViewModel.cs       | 23 +++++++++++-----
 5 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Achievement/Achievement.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Achievement/Achievement.cs
index 54ed3441..ba2e8cbf 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Achievement/Achievement.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Achievement/Achievement.cs
@@ -50,4 +50,9 @@ internal sealed class Achievement
     /// 图标
     /// </summary>
     public string? Icon { get; set; }
+
+    /// <summary>
+    /// 版本
+    /// </summary>
+    public string Version { get; set; } = default!;
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
index f5fe92d6..e171df65 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
@@ -3679,7 +3679,7 @@ namespace Snap.Hutao.Resource.Localization {
         }
         
         /// <summary>
-        ///   查找类似 搜索成就名称，描述或编号 的本地化字符串。
+        ///   查找类似 搜索成就名称，描述，版本或编号 的本地化字符串。
         /// </summary>
         internal static string ViewPageAchievementSearchPlaceholder {
             get {
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index b2a94458..1e705ef7 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -1380,7 +1380,7 @@
     <value>删除当前存档</value>
   </data>
   <data name="ViewPageAchievementSearchPlaceholder" xml:space="preserve">
-    <value>搜索成就名称，描述或编号</value>
+    <value>搜索成就名称，描述，版本或编号</value>
   </data>
   <data name="ViewPageAchievementSortIncompletedItemsFirst" xml:space="preserve">
     <value>优先未完成</value>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
index 434094f1..19f20d64 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
@@ -32,7 +32,10 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <Grid Background="{StaticResource CardBackgroundFillColorDefaultBrush}">
+            <Grid
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="0,0,0,1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="{StaticResource CompatGridLength2}"/>
                     <ColumnDefinition/>
@@ -53,7 +56,7 @@
                     DefaultLabelPosition="Right">
                     <CommandBar.Content>
                         <AutoSuggestBox
-                            Width="240"
+                            Width="300"
                             Height="36"
                             Margin="3,6,6,0"
                             HorizontalAlignment="Stretch"
@@ -218,7 +221,24 @@
                                                         <ColumnDefinition Width="32"/>
                                                     </Grid.ColumnDefinitions>
                                                     <StackPanel>
-                                                        <TextBlock Text="{Binding Inner.Title}"/>
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <TextBlock Text="{Binding Inner.Title}"/>
+                                                            <Border
+                                                                Margin="4,0,0,0"
+                                                                Padding="4,1"
+                                                                VerticalAlignment="Center"
+                                                                CornerRadius="2">
+                                                                <Border.Background>
+                                                                    <SolidColorBrush Opacity="0.6" Color="{ThemeResource SystemAccentColor}"/>
+                                                                </Border.Background>
+                                                                <TextBlock
+                                                                    FontSize="10"
+                                                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                                                    Text="{Binding Inner.Version}"/>
+                                                            </Border>
+
+                                                        </StackPanel>
+
                                                         <TextBlock
                                                             Margin="0,2,0,0"
                                                             Style="{StaticResource SecondaryTextStyle}"
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
index 4ffa0ff2..bec2c6f5 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
@@ -13,6 +13,7 @@ using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.View.Dialog;
 using System.Collections.ObjectModel;
+using System.Text.RegularExpressions;
 using Windows.Storage.Pickers;
 using EntityAchievementArchive = Snap.Hutao.Model.Entity.AchievementArchive;
 using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement;
@@ -378,16 +379,21 @@ internal sealed partial class AchievementViewModel : Abstraction.ViewModel, INav
                 if (uint.TryParse(search, out uint achievementId))
                 {
                     Achievements.Filter = obj => ((AchievementView)obj).Inner.Id == achievementId;
+                    return;
                 }
-                else
+
+                if (VersionRegex().IsMatch(search))
                 {
-                    Achievements.Filter = obj =>
-                    {
-                        AchievementView view = (AchievementView)obj;
-                        return view.Inner.Title.Contains(search, StringComparison.CurrentCultureIgnoreCase)
-                            || view.Inner.Description.Contains(search, StringComparison.CurrentCultureIgnoreCase);
-                    };
+                    Achievements.Filter = obj => ((AchievementView)obj).Inner.Version == search;
+                    return;
                 }
+
+                Achievements.Filter = obj =>
+                {
+                    AchievementView view = (AchievementView)obj;
+                    return view.Inner.Title.Contains(search, StringComparison.CurrentCultureIgnoreCase)
+                        || view.Inner.Description.Contains(search, StringComparison.CurrentCultureIgnoreCase);
+                };
             }
         }
     }
@@ -407,4 +413,7 @@ internal sealed partial class AchievementViewModel : Abstraction.ViewModel, INav
             UpdateAchievementsFinishPercent();
         }
     }
+
+    [GeneratedRegex("\\d\\.\\d")]
+    private static partial Regex VersionRegex();
 }
\ No newline at end of file