refactor

2025-11-19 21:02:53 +08:00 · 2024-06-28 11:58:16 +08:00
parent b90e8d062c
commit 2c58f34c5d
22 changed files with 5 additions and 24 deletions
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -314,7 +314,7 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Snap.Hutao.SourceGeneration" Version="1.0.11">
+    <PackageReference Include="Snap.Hutao.SourceGeneration" Version="1.1.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Card/AchievementCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Card/AchievementCard.xaml
@@ -9,7 +9,6 @@
    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shva="using:Snap.Hutao.ViewModel.Achievement"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    Padding="0"
    HorizontalAlignment="Stretch"
    VerticalAlignment="Stretch"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Card/DailyNoteCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Card/DailyNoteCard.xaml
@@ -10,7 +10,6 @@
    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvd="using:Snap.Hutao.ViewModel.DailyNote"
    Padding="0"
    HorizontalAlignment="Stretch"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Card/GachaStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Card/GachaStatisticsCard.xaml
@@ -9,7 +9,6 @@
    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
    Padding="0"
    HorizontalAlignment="Stretch"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/CultivatePromotionDeltaDialog.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/CultivatePromotionDeltaDialog.xaml
@@ -7,7 +7,6 @@
    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    Title="{shuxm:ResourceString Name=ViewDialogCultivatePromotionDeltaTitle}"
    CloseButtonText="{shuxm:ResourceString Name=ContentDialogCancelCloseButtonText}"
    DefaultButton="Primary"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/AnnouncementPage.xaml
@@ -18,7 +18,6 @@
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxma="using:Snap.Hutao.UI.Xaml.Media.Animation"
    xmlns:shuxvww="using:Snap.Hutao.UI.Xaml.View.Window.WebView2"
-    xmlns:shvco="using:Snap.Hutao.View.Control"
    xmlns:shvh="using:Snap.Hutao.ViewModel.Home"
    d:DataContext="{d:DesignInstance shvh:AnnouncementViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/AvatarPropertyPage.xaml
@@ -18,7 +18,6 @@
    xmlns:shuxdcs="using:Snap.Hutao.UI.Xaml.Data.Converter.Specialized"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shva="using:Snap.Hutao.ViewModel.AvatarProperty"
-    xmlns:shvcont="using:Snap.Hutao.View.Control"
    d:DataContext="{d:DesignInstance shva:AvatarPropertyViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
    mc:Ignorable="d">
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/CultivationPage.xaml
@@ -15,7 +15,6 @@
    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
    xmlns:shuxcl="using:Snap.Hutao.UI.Xaml.Control.Layout"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
-    xmlns:shvco="using:Snap.Hutao.View.Control"
    xmlns:shvcu="using:Snap.Hutao.ViewModel.Cultivation"
    d:DataContext="{d:DesignInstance shvcu:CultivationViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/DailyNotePage.xaml
@@ -18,7 +18,6 @@
    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxvww="using:Snap.Hutao.UI.Xaml.View.Window.WebView2"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvd="using:Snap.Hutao.ViewModel.DailyNote"
    d:DataContext="{d:DesignInstance shvd:DailyNoteViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/GachaLogPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/GachaLogPage.xaml
@@ -17,7 +17,6 @@
    xmlns:shuxcp="using:Snap.Hutao.UI.Xaml.Control.Panel"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxvs="using:Snap.Hutao.UI.Xaml.View.Specialized"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
    d:DataContext="{d:DesignInstance shvg:GachaLogViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/LaunchGamePage.xaml
@@ -13,7 +13,6 @@
    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxvs="using:Snap.Hutao.UI.Xaml.View.Specialized"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvg="using:Snap.Hutao.ViewModel.Game"
    d:DataContext="{d:DesignInstance shvg:LaunchGameViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/SettingPage.xaml
@@ -12,7 +12,6 @@
    xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvs="using:Snap.Hutao.ViewModel.Setting"
    d:DataContext="{d:DesignInstance shvs:SettingViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/SpiralAbyssRecordPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/SpiralAbyssRecordPage.xaml
@@ -17,7 +17,6 @@
    xmlns:shuxct="using:Snap.Hutao.UI.Xaml.Control.TextBlock"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shvcom="using:Snap.Hutao.ViewModel.Complex"
-    xmlns:shvcon="using:Snap.Hutao.View.Control"
    xmlns:shvs="using:Snap.Hutao.ViewModel.SpiralAbyss"
    d:DataContext="{d:DesignInstance shvs:SpiralAbyssRecordViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/TestPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/TestPage.xaml
@@ -12,7 +12,6 @@
    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
    xmlns:shuxvww="using:Snap.Hutao.UI.Xaml.View.Window.WebView2"
    xmlns:shv="using:Snap.Hutao.ViewModel"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    d:DataContext="{d:DesignInstance shv:TestViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
    mc:Ignorable="d">
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/WikiAvatarPage.xaml
@@ -16,7 +16,6 @@
    xmlns:shuxdc="using:Snap.Hutao.UI.Xaml.Data.Converter"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxvs="using:Snap.Hutao.UI.Xaml.View.Specialized"
-    xmlns:shvcont="using:Snap.Hutao.View.Control"
    xmlns:shvw="using:Snap.Hutao.ViewModel.Wiki"
    d:DataContext="{d:DesignInstance Type=shvw:WikiAvatarViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -559,12 +558,12 @@

                                                <!--  天赋  -->
                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <shvcont:SkillPivot ItemTemplate="{StaticResource SkillDataTemplate}" Skills="{Binding Selected.SkillDepot.CompositeSkills}"/>
+                                                    <shuxvs:SkillPivot ItemTemplate="{StaticResource SkillDataTemplate}" Skills="{Binding Selected.SkillDepot.CompositeSkills}"/>
                                                </Border>

                                                <!--  命座  -->
                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <shvcont:SkillPivot ItemTemplate="{StaticResource TalentDataTemplate}" Skills="{Binding Selected.SkillDepot.Talents}"/>
+                                                    <shuxvs:SkillPivot ItemTemplate="{StaticResource TalentDataTemplate}" Skills="{Binding Selected.SkillDepot.Talents}"/>
                                                </Border>

                                                <!--  搭配  -->
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/WikiMonsterPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/WikiMonsterPage.xaml
@@ -15,7 +15,6 @@
    xmlns:shuxct="using:Snap.Hutao.UI.Xaml.Control.TextBlock"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxvs="using:Snap.Hutao.UI.Xaml.View.Specialized"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvw="using:Snap.Hutao.ViewModel.Wiki"
    d:DataContext="{d:DesignInstance Type=shvw:WikiMonsterViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/WikiWeaponPage.xaml
@@ -15,7 +15,6 @@
    xmlns:shuxct="using:Snap.Hutao.UI.Xaml.Control.TextBlock"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxvs="using:Snap.Hutao.UI.Xaml.View.Specialized"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvw="using:Snap.Hutao.ViewModel.Wiki"
    d:DataContext="{d:DesignInstance Type=shvw:WikiWeaponViewModel}"
    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Specialized/HutaoStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Specialized/HutaoStatisticsCard.xaml
@@ -11,7 +11,6 @@
    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.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}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Specialized/SkillPivot.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Specialized/SkillPivot.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Snap.Hutao.View.Control.SkillPivot"
+    x:Class="Snap.Hutao.UI.Xaml.View.Specialized.SkillPivot"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Specialized/SkillPivot.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Specialized/SkillPivot.xaml.cs
@@ -5,7 +5,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Collections;

-namespace Snap.Hutao.View.Control;
+namespace Snap.Hutao.UI.Xaml.View.Specialized;

 /// <summary>
 /// 技能展柜
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Specialized/StatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Specialized/StatisticsCard.xaml
@@ -15,7 +15,6 @@
    xmlns:shuxdcs="using:Snap.Hutao.UI.Xaml.Data.Converter.Specialized"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxvs="using:Snap.Hutao.UI.Xaml.View.Specialized"
-    xmlns:shvcont="using:Snap.Hutao.View.Control"
    xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
    d:DataContext="{d:DesignInstance shvg:TypedWishSummary}"
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/UserView.xaml
@@ -13,7 +13,6 @@
    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
    xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
    xmlns:shuxvww="using:Snap.Hutao.UI.Xaml.View.Window.WebView2"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
    xmlns:shvu="using:Snap.Hutao.ViewModel.User"
    d:DataContext="{d:DesignInstance shvu:UserViewModel}"
    mc:Ignorable="d">