From 70f30edd7c49e584f741ac7fbe6cf257d8a2e221 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Wed, 1 Nov 2023 17:03:00 +0800 Subject: [PATCH] xaml style rework --- .../Snap.Hutao/Control/Theme/FlyoutStyle.xaml | 10 +- .../Control/Theme/ItemsPanelTemplate.xaml | 6 + .../Control/Theme/TransitionCollection.xaml | 6 + .../Snap.Hutao/Resource/Localization/SH.resx | 3 + .../Snap.Hutao/View/InfoBarView.xaml | 6 +- src/Snap.Hutao/Snap.Hutao/View/MainView.xaml | 13 +- .../Snap.Hutao/View/Page/WikiAvatarPage.xaml | 326 ++++++++---------- .../Snap.Hutao/View/Page/WikiMonsterPage.xaml | 108 +++--- .../Snap.Hutao/View/Page/WikiWeaponPage.xaml | 137 ++++---- src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml | 3 +- 10 files changed, 300 insertions(+), 318 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml index 74d9ca6f..bd38511d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml +++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml @@ -3,10 +3,16 @@ - - diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml index a7e91aa2..28a32452 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml +++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml @@ -17,6 +17,12 @@ + + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 3393d0f8..ceda545a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -2489,6 +2489,9 @@ 上传数据 + + 自动连点 + 工具 diff --git a/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml b/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml index c2b4e239..cb5f495f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml @@ -12,11 +12,9 @@ MaxWidth="640" Margin="32,48,32,32" VerticalAlignment="Bottom" + ItemContainerTransitions="{StaticResource RepositionThemeTransition}" ItemsSource="{x:Bind InfoBars}" - Visibility="{Binding ElementName=VisibilityButton, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}}"> - - - + Visibility="{x:Bind VisibilityButton.IsChecked, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"> diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml index a652374d..0b2f163c 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml @@ -17,7 +17,7 @@ - - - - - - - + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml index 1fa863ef..3b929193 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml @@ -58,6 +58,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + 1 + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,12 +226,10 @@ Icon="{shcm:FontIcon Glyph=}" Label="{shcm:ResourceString Name=ViewPageWiKiGeneralAddToDevPlanButtonLabel}"/> - - - - - - + - - - - - - - - - - - - @@ -290,16 +394,9 @@ Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/> - - - - - - - - + SelectionMode="None"/> - - - - - - - - + SelectionMode="None"/> - - - - - - - - + SelectionMode="None"/> - - - - - - - 0 - - - - - - - - 1 - - - - - - - - 2 - - - - - - - - - - - - + SelectionMode="None"/> - @@ -513,35 +543,10 @@ HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Header="{shcm:ResourceString Name=ViewPageWiKiAvatarCostumeHeader}"> - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - - - + @@ -597,23 +582,16 @@ HorizontalAlignment="Stretch" HorizontalContentAlignment="Left" ItemContainerStyle="{StaticResource LargeGridViewItemStyle}" + ItemTemplate="{StaticResource AvatarGridTemplate}" ItemsSource="{Binding Avatars}" SelectedItem="{Binding Selected, Mode=TwoWay}" SelectionMode="Single"> - - - - - - - - diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml index f9434cd6..9624fac5 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml @@ -22,6 +22,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -66,33 +107,13 @@ - - - - - - - - - - - - @@ -126,27 +147,16 @@ HorizontalContentAlignment="Stretch" BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}" IsPromoteVisible="False"/> - + 0 0 0 - - - - - - - - - - - - - - - - - - - - + Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/> @@ -179,24 +182,13 @@ HorizontalAlignment="Stretch" HorizontalContentAlignment="Left" ItemContainerStyle="{StaticResource LargeGridViewItemStyle}" + ItemTemplate="{StaticResource MonsterGridTemplate}" ItemsSource="{Binding Monsters}" SelectedItem="{Binding Selected, Mode=TwoWay}" SelectionMode="Single"> - - - - - - - - - - - - diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml index b02bcd8c..683c7c0d 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml @@ -30,6 +30,58 @@ PreferredSelectedIndex="13" Source="{Binding Converter={StaticResource PropertyDescriptor}}"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -70,12 +122,10 @@ Icon="{shcm:FontIcon Glyph=}" Label="{shcm:ResourceString Name=ViewPageWiKiGeneralAddToDevPlanButtonLabel}"/> - - - - - - + - - - - - - - - - - - - - @@ -186,39 +215,18 @@ Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/> - - - - - - - - + SelectionMode="None"/> - - - - - - - - - - - - - - - - + - - - - - - - - + SelectionMode="None"/> @@ -251,19 +252,13 @@ HorizontalAlignment="Stretch" HorizontalContentAlignment="Left" ItemContainerStyle="{StaticResource LargeGridViewItemStyle}" + ItemTemplate="{StaticResource WeaponGridTemplate}" ItemsSource="{Binding Weapons}" SelectedItem="{Binding Selected, Mode=TwoWay}" SelectionMode="Single"> - - - - - - - diff --git a/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml b/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml index fc883379..b7b25758 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml @@ -4,6 +4,7 @@ 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" + xmlns:shcm="using:Snap.Hutao.Control.Markup" Height="44" VerticalAlignment="Top" mc:Ignorable="d"> @@ -38,7 +39,7 @@ + Text="{shcm:ResourceString Name=ViewTitleAutoClicking}"/>