diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml index d6789e48..a27ffe32 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml +++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml @@ -34,5 +34,6 @@ https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon271.png https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon272.png https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon293.png + https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon433.png https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon445.png diff --git a/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml b/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml index 20c46cb6..694fa10e 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml @@ -2,6 +2,7 @@ x:Class="Snap.Hutao.View.InfoBarView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:cw="using:CommunityToolkit.WinUI" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:shcm="using:Snap.Hutao.Control.Markup" diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml index 1c4885b8..c2f38350 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml @@ -25,7 +25,7 @@ - - - - - - - - - + + + + + @@ -217,22 +213,26 @@ ItemTemplate="{StaticResource HutaoAnnouncementTemplate}" ItemsSource="{Binding HutaoAnnouncements}" Visibility="{Binding HutaoAnnouncements.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/> - - - - - + + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml index 2b0c2c38..03c574f2 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml @@ -2,19 +2,19 @@ x:Class="Snap.Hutao.View.Page.CultivationPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:cw="using:CommunityToolkit.WinUI" xmlns:cwcont="using:CommunityToolkit.WinUI.Controls" xmlns:cwconv="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mxi="using:Microsoft.Xaml.Interactivity" - xmlns:mxic="using:Microsoft.Xaml.Interactions.Core" - xmlns:mxim="using:Microsoft.Xaml.Interactions.Media" xmlns:shc="using:Snap.Hutao.Control" xmlns:shcb="using:Snap.Hutao.Control.Behavior" xmlns:shci="using:Snap.Hutao.Control.Image" xmlns:shcl="using:Snap.Hutao.Control.Layout" xmlns:shcm="using:Snap.Hutao.Control.Markup" xmlns:shvco="using:Snap.Hutao.View.Control" + xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive" xmlns:shvcu="using:Snap.Hutao.ViewModel.Cultivation" d:DataContext="{d:DesignInstance shvcu:CultivationViewModel}" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" @@ -108,12 +108,12 @@ - + - + @@ -172,31 +172,35 @@ - - - - - - - - - - + + + + + + + + + + + + + + + @@ -245,12 +249,7 @@ - - + @@ -261,7 +260,6 @@ SelectedItem="{Binding SelectedProject, Mode=TwoWay}" Style="{ThemeResource CommandBarComboBoxStyle}"/> - - + - + @@ -294,97 +292,129 @@ - - - - - - - + + + + + + + + + + + + - - - 16 - 0 - 0 - 0 - - - - - + + + + + + 16 + 0 + 0 + 0 + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml index 2614bd10..8688fbd7 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml @@ -851,7 +851,7 @@ - +