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

1.7.0 RC 3

Browse Source
This commit is contained in:
Lightczx
2023-08-29 15:12:14 +08:00
parent 5fdbcfc2e8
commit 088f915a54
5 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs generated
View File

@@ -3669,6 +3669,15 @@ namespace Snap.Hutao.Resource.Localization {
} }
} }
/// <summary>
/// 查找类似 刷新时间 的本地化字符串。
/// </summary>
internal static string ViewPageAvatarPropertyRefreshTimeToggle {
get {
return ResourceManager.GetString("ViewPageAvatarPropertyRefreshTimeToggle", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 评分 的本地化字符串。 /// 查找类似 评分 的本地化字符串。
/// </summary> /// </summary>

3
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
View File

@@ -1376,6 +1376,9 @@
<data name="ViewPageAvatarPropertyRefreshFromHoyolabGameRecordDescription" xml:space="preserve"> <data name="ViewPageAvatarPropertyRefreshFromHoyolabGameRecordDescription" xml:space="preserve">
<value>同步角色天赋外的大部分信息</value> <value>同步角色天赋外的大部分信息</value>
</data> </data>
<data name="ViewPageAvatarPropertyRefreshTimeToggle" xml:space="preserve">
<value>刷新时间</value>
</data>
<data name="ViewPageAvatarPropertyScore" xml:space="preserve"> <data name="ViewPageAvatarPropertyScore" xml:space="preserve">
<value>评分</value> <value>评分</value>
</data> </data>

9
src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
View File

@@ -231,10 +231,11 @@
<!-- Packages --> <!-- Packages -->
<ItemGroup> <ItemGroup>
<!-- https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json --> <!-- https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json -->
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.DataTable" Version="0.1.230802" /> <PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.DataTable" Version="0.1.230809" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.230802" /> <PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230809" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TokenView" Version="0.1.230802" /> <PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.230809" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TransitionHelper" Version="0.1.230802" /> <PackageReference Include="CommunityToolkit.Labs.WinUI.TokenView" Version="0.1.230809" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TransitionHelper" Version="0.1.230809" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2-build.1" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2-build.1" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230828-rc" /> <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230828-rc" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.230828-rc" /> <PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.230828-rc" />

5
src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml
View File

@@ -195,7 +195,10 @@
</cwc:SwitchPresenter> </cwc:SwitchPresenter>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<cwc:Segmented Margin="16" SelectedIndex="{Binding State, Mode=TwoWay}"> <cwc:Segmented
Margin="16"
IsHitTestVisible="False"
SelectedIndex="{Binding State, Mode=TwoWay}">
<cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepLanguage}" Icon="{shcm:FontIcon Glyph=&#xF2B7;}"/> <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepLanguage}" Icon="{shcm:FontIcon Glyph=&#xF2B7;}"/>
<cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepDocument}" Icon="{shcm:FontIcon Glyph=&#xF28B;}"/> <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepDocument}" Icon="{shcm:FontIcon Glyph=&#xF28B;}"/>
<cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepEnvironment}" Icon="{shcm:FontIcon Glyph=&#xE81E;}"/> <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepEnvironment}" Icon="{shcm:FontIcon Glyph=&#xE81E;}"/>

32
src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
View File

@@ -75,7 +75,13 @@
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
DefaultLabelPosition="Right"> DefaultLabelPosition="Right">
<CommandBar.Content> <CommandBar.Content>
<StackPanel Orientation="Horizontal">
<shcp:PanelSelector x:Name="ItemsPanelSelector" Margin="6,8,0,0"/> <shcp:PanelSelector x:Name="ItemsPanelSelector" Margin="6,8,0,0"/>
<ToggleButton
x:Name="RefreshTimeToggle"
Margin="8,8,0,0"
Content="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshTimeToggle}"/>
</StackPanel>
</CommandBar.Content> </CommandBar.Content>
<AppBarButton <AppBarButton
Command="{Binding ExportAsImageCommand}" Command="{Binding ExportAsImageCommand}"
@@ -99,7 +105,7 @@
</AppBarButton> </AppBarButton>
</CommandBar> </CommandBar>
<cwucont:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current}"> <cwucont:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current, Mode=OneWay}">
<cwucont:SwitchPresenter.ContentTransitions> <cwucont:SwitchPresenter.ContentTransitions>
<TransitionCollection> <TransitionCollection>
<ContentThemeTransition/> <ContentThemeTransition/>
@@ -227,7 +233,7 @@
Grid.Row="1" Grid.Row="1"
DisplayMode="Inline" DisplayMode="Inline"
IsPaneOpen="True" IsPaneOpen="True"
OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength3}" OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength2}"
PaneBackground="Transparent"> PaneBackground="Transparent">
<SplitView.Pane> <SplitView.Pane>
<ListView ItemsSource="{Binding Summary.Avatars}" SelectedItem="{Binding SelectedAvatar, Mode=TwoWay}"> <ListView ItemsSource="{Binding Summary.Avatars}" SelectedItem="{Binding SelectedAvatar, Mode=TwoWay}">
@@ -255,24 +261,36 @@
Margin="12,0,0,0" Margin="12,0,0,0"
Opacity="0.7" Opacity="0.7"
Style="{StaticResource CaptionTextBlockStyle}" Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Level}"/> Text="{Binding Level}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Column="2" Grid.Column="2"
VerticalAlignment="Center" VerticalAlignment="Center"
Opacity="0.7"> Opacity="0.7"
Visibility="{Binding ElementName=RefreshTimeToggle, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
<TextBlock <TextBlock
HorizontalAlignment="Right"
FontSize="11" FontSize="11"
Style="{StaticResource CaptionTextBlockStyle}" Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding ShowcaseRefreshTimeFormat}"/> Text="{Binding ShowcaseRefreshTimeFormat}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
<TextBlock <TextBlock
HorizontalAlignment="Right"
FontSize="11" FontSize="11"
Style="{StaticResource CaptionTextBlockStyle}" Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding GameRecordRefreshTimeFormat}"/> Text="{Binding GameRecordRefreshTimeFormat}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
<TextBlock <TextBlock
HorizontalAlignment="Right"
FontSize="11" FontSize="11"
Style="{StaticResource CaptionTextBlockStyle}" Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding CalculatorRefreshTimeFormat}"/> Text="{Binding CalculatorRefreshTimeFormat}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</DataTemplate> </DataTemplate>