Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI/UX fine tuning

Browse Source
This commit is contained in:
DismissedLight
2023-09-20 23:50:24 +08:00
parent 5a99488582
commit 2a757dce51
7 changed files with 206 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Snap.Hutao/Snap.Hutao/App.xaml
View File

@@ -20,10 +20,12 @@
<ResourceDictionary x:Key="Light"> <ResourceDictionary x:Key="Light">
<Color x:Key="AvatarPropertyAddValueColor">#FF74BF00</Color> <Color x:Key="AvatarPropertyAddValueColor">#FF74BF00</Color>
<Color x:Key="CompatBackgroundColor">#FFF4F4F4</Color> <Color x:Key="CompatBackgroundColor">#FFF4F4F4</Color>
<SolidColorBrush x:Key="DarkOnlyOverlayMaskBrush" Color="#00000000"/>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Key="Dark"> <ResourceDictionary x:Key="Dark">
<Color x:Key="AvatarPropertyAddValueColor">#FF90E800</Color> <Color x:Key="AvatarPropertyAddValueColor">#FF90E800</Color>
<Color x:Key="CompatBackgroundColor">#FF242424</Color> <Color x:Key="CompatBackgroundColor">#FF242424</Color>
<SolidColorBrush x:Key="DarkOnlyOverlayMaskBrush" Color="#60000000"/>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
<!-- Modify Window title bar color --> <!-- Modify Window title bar color -->

63
src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml
View File

@@ -20,15 +20,25 @@
<mxi:Interaction.Behaviors> <mxi:Interaction.Behaviors>
<shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/> <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
</mxi:Interaction.Behaviors> </mxi:Interaction.Behaviors>
<Grid>
<Grid Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}"> <Button.Resources>
<Grid Visibility="{Binding StatisticsList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"> <DataTemplate x:Key="AchievementTempate" x:DataType="shva:AchievementView">
<FlipView <StackPanel Margin="0,4,0,0">
x:Name="RootFlipView" <TextBlock
Background="{x:Null}" Opacity="0.8"
ItemsSource="{Binding StatisticsList}"> Style="{StaticResource SubtitleTextBlockStyle}"
<FlipView.ItemTemplate> Text="{Binding Inner.Title}"
<DataTemplate> TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
<TextBlock
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Time}"
TextWrapping="NoWrap"/>
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="AchievementArchiveTempate" x:DataType="shva:AchievementStatistics">
<Grid Margin="12"> <Grid Margin="12">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
@@ -45,29 +55,22 @@
Margin="0,4,0,0" Margin="0,4,0,0"
Style="{StaticResource TitleTextBlockStyle}" Style="{StaticResource TitleTextBlockStyle}"
Text="{Binding FinishDescription}"/> Text="{Binding FinishDescription}"/>
<ItemsControl Grid.Row="2" ItemsSource="{Binding Achievements}"> <ItemsControl
<ItemsControl.ItemTemplate> Grid.Row="2"
<DataTemplate> ItemTemplate="{StaticResource AchievementTempate}"
<StackPanel Margin="0,4,0,0"> ItemsSource="{Binding Achievements}"/>
<TextBlock
Opacity="0.8"
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{Binding Inner.Title}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
<TextBlock
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Time}"
TextWrapping="NoWrap"/>
</StackPanel>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</FlipView.ItemTemplate> </Button.Resources>
</FlipView>
<Grid>
<Grid Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}">
<Grid Visibility="{Binding StatisticsList.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
<FlipView
x:Name="RootFlipView"
Background="{x:Null}"
ItemTemplate="{StaticResource AchievementArchiveTempate}"
ItemsSource="{Binding StatisticsList}"/>
<PipsPager <PipsPager
Height="16" Height="16"

4
src/Snap.Hutao/Snap.Hutao/View/Card/CardReference.cs
View File

@@ -5,6 +5,10 @@ using Microsoft.UI.Xaml.Controls;
namespace Snap.Hutao.View.Card; namespace Snap.Hutao.View.Card;
/// <summary>
/// 保存对卡片的引用
/// ItemsRepeater 无法直接使用带有 DataContext 属性的类为直接的源
/// </summary>
internal sealed class CardReference internal sealed class CardReference
{ {
public Button? Card { get; set; } public Button? Card { get; set; }

25
src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml
View File

@@ -9,6 +9,7 @@
xmlns:shch="using:Snap.Hutao.Control.Helper" xmlns:shch="using:Snap.Hutao.Control.Helper"
xmlns:shci="using:Snap.Hutao.Control.Image" xmlns:shci="using:Snap.Hutao.Control.Image"
xmlns:shcm="using:Snap.Hutao.Control.Markup" xmlns:shcm="using:Snap.Hutao.Control.Markup"
xmlns:shme="using:Snap.Hutao.Model.Entity"
xmlns:shvc="using:Snap.Hutao.View.Control" xmlns:shvc="using:Snap.Hutao.View.Control"
xmlns:shvd="using:Snap.Hutao.ViewModel.DailyNote" xmlns:shvd="using:Snap.Hutao.ViewModel.DailyNote"
Padding="0" Padding="0"
@@ -23,15 +24,9 @@
<mxi:Interaction.Behaviors> <mxi:Interaction.Behaviors>
<shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/> <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
</mxi:Interaction.Behaviors> </mxi:Interaction.Behaviors>
<Grid>
<Grid Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}"> <Button.Resources>
<Grid Visibility="{Binding DailyNoteEntries.Count, Converter={StaticResource Int32ToVisibilityConverter}}"> <DataTemplate x:Key="DailyNoteTemplate" x:DataType="shme:DailyNoteEntry">
<FlipView
x:Name="RootFlipView"
Background="{x:Null}"
ItemsSource="{Binding DailyNoteEntries}">
<FlipView.ItemTemplate>
<DataTemplate>
<Grid <Grid
Margin="12" Margin="12"
ColumnSpacing="6" ColumnSpacing="6"
@@ -170,8 +165,16 @@
</Grid> </Grid>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</FlipView.ItemTemplate> </Button.Resources>
</FlipView>
<Grid>
<Grid Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}">
<Grid Visibility="{Binding DailyNoteEntries.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
<FlipView
x:Name="RootFlipView"
Background="{x:Null}"
ItemTemplate="{StaticResource DailyNoteTemplate}"
ItemsSource="{Binding DailyNoteEntries}"/>
<PipsPager <PipsPager
Height="16" Height="16"

2
src/Snap.Hutao/Snap.Hutao/View/Control/LoadingView.xaml
View File

@@ -12,7 +12,7 @@
VerticalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <Grid>
<clw:Shimmer IsActive="{x:Bind IsLoading, Mode=OneWay}"/> <clw:Shimmer CornerRadius="0" IsActive="{x:Bind IsLoading, Mode=OneWay}"/>
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<shci:CachedImage <shci:CachedImage
Width="120" Width="120"

5
src/Snap.Hutao/Snap.Hutao/View/Control/LoadingViewSlim.xaml
View File

@@ -10,5 +10,8 @@
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
mc:Ignorable="d"> mc:Ignorable="d">
<clw:Shimmer IsActive="{x:Bind IsLoading}" Duration="0:0:1"/> <clw:Shimmer
CornerRadius="0"
IsActive="{x:Bind IsLoading}"
Duration="0:0:1"/>
</shc:Loading> </shc:Loading>

11
src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
View File

@@ -136,22 +136,17 @@
<mxi:Interaction.Behaviors> <mxi:Interaction.Behaviors>
<shcb:AutoHeightBehavior TargetHeight="1024" TargetWidth="2048"/> <shcb:AutoHeightBehavior TargetHeight="1024" TargetWidth="2048"/>
</mxi:Interaction.Behaviors> </mxi:Interaction.Behaviors>
<Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskBrush}"/>
<ScrollViewer <ScrollViewer
Grid.Column="0" Grid.Column="0"
Margin="16" Margin="16"
VerticalScrollBarVisibility="Hidden"> VerticalScrollBarVisibility="Hidden">
<StackPanel> <StackPanel>
<shvc:BottomTextControl <shvc:BottomTextControl MaxWidth="80" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}">
MaxWidth="80"
RequestedTheme="Light"
Text="{shcm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}">
<shvc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/> <shvc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
</shvc:BottomTextControl> </shvc:BottomTextControl>
<shvc:BottomTextControl <shvc:BottomTextControl Margin="0,16,0,0" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}">
Margin="0,16,0,0"
RequestedTheme="Light"
Text="{shcm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}">
<shvc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/> <shvc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
</shvc:BottomTextControl> </shvc:BottomTextControl>
</StackPanel> </StackPanel>