update community toolkit dependencies

This commit is contained in:
DismissedLight
2023-08-09 23:37:38 +08:00
parent 5b269c7b3d
commit 420bf6ff41
46 changed files with 482 additions and 460 deletions

View File

@@ -2,6 +2,7 @@
x:Class="Snap.Hutao.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cwcw="using:CommunityToolkit.WinUI.Controls"
xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Converters"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
@@ -55,6 +56,8 @@
<!-- Brushes -->
<SolidColorBrush x:Key="AvatarPropertyAddValueBrush" Color="{ThemeResource AvatarPropertyAddValueColor}"/>
<SolidColorBrush x:Key="PurpleBrush" Color="#FFA156E0"/>
<SolidColorBrush x:Key="OrangeBrush" Color="#FFBC6932"/>
<!-- Settings -->
<x:Double x:Key="SettingsCardSpacing">3</x:Double>
<x:Double x:Key="SettingsCardMinHeight">0</x:Double>
@@ -68,7 +71,12 @@
<Setter Property="Margin" Value="1,29,0,5"/>
</Style.Setters>
</Style>
<Style
x:Key="SettingsContentComboBoxStyle"
BasedOn="{StaticResource DefaultComboBoxStyle}"
TargetType="ComboBox">
<Setter Property="MinWidth" Value="120"/>
</Style>
<!-- Uris -->
<x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
<x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
@@ -93,6 +101,8 @@
<x:String x:Key="UI_EmotionIcon272">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon272.png</x:String>
<x:String x:Key="UI_EmotionIcon293">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon293.png</x:String>
<!-- FontIcon Content -->
<x:String x:Key="FontIconContentSetting">&#xE713;</x:String>
<!-- Converters -->
<cwuc:BoolNegationConverter x:Key="BoolNegationConverter"/>
<cwuc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
@@ -478,6 +488,9 @@
<ItemsPanelTemplate x:Key="ItemsStackPanelTemplate">
<ItemsStackPanel/>
</ItemsPanelTemplate>
<ItemsPanelTemplate x:Key="WrapPanelTemplate">
<cwcw:WrapPanel/>
</ItemsPanelTemplate>
<ItemsPanelTemplate x:Key="HorizontalStackPanelTemplate">
<StackPanel Orientation="Horizontal"/>
</ItemsPanelTemplate>

View File

@@ -1,8 +1,8 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI;
using CommunityToolkit.WinUI.UI.Animations;
using CommunityToolkit.WinUI;
using CommunityToolkit.WinUI.Animations;
using Microsoft.UI.Composition;
using System.Numerics;
@@ -21,7 +21,7 @@ internal sealed class ImageZoomInAnimation : ImplicitAnimation<string, Vector3>
{
Duration = AnimationDurations.ImageZoom;
EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseOut;
EasingType = CommunityToolkit.WinUI.UI.Animations.EasingType.Circle;
EasingType = CommunityToolkit.WinUI.Animations.EasingType.Circle;
To = Core.StringLiterals.OnePointOne;
}

View File

@@ -1,8 +1,8 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI;
using CommunityToolkit.WinUI.UI.Animations;
using CommunityToolkit.WinUI;
using CommunityToolkit.WinUI.Animations;
using Microsoft.UI.Composition;
using System.Numerics;
@@ -21,7 +21,7 @@ internal sealed class ImageZoomOutAnimation : ImplicitAnimation<string, Vector3>
{
Duration = AnimationDurations.ImageZoom;
EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseOut;
EasingType = CommunityToolkit.WinUI.UI.Animations.EasingType.Circle;
EasingType = CommunityToolkit.WinUI.Animations.EasingType.Circle;
To = Core.StringLiterals.One;
}

View File

@@ -1,7 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI.Behaviors;
using CommunityToolkit.WinUI.Behaviors;
using Microsoft.UI.Xaml;
namespace Snap.Hutao.Control.Behavior;

View File

@@ -1,7 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI.Behaviors;
using CommunityToolkit.WinUI.Behaviors;
using Microsoft.UI.Xaml;
namespace Snap.Hutao.Control.Behavior;

View File

@@ -2,7 +2,7 @@
// Licensed under the MIT license.
using CommunityToolkit.Mvvm.Messaging;
using CommunityToolkit.WinUI.UI.Behaviors;
using CommunityToolkit.WinUI.Behaviors;
using Microsoft.UI.Xaml.Controls;
namespace Snap.Hutao.Control.Behavior;

View File

@@ -1,7 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI.Behaviors;
using CommunityToolkit.WinUI.Behaviors;
using Microsoft.UI.Xaml;
namespace Snap.Hutao.Control.Behavior;

View File

@@ -1,7 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI.Animations;
using CommunityToolkit.WinUI.Animations;
using Microsoft.UI.Composition;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Hosting;

View File

@@ -1,20 +1,20 @@
<clw:Segmented
<cwc:Segmented
x:Class="Snap.Hutao.Control.Panel.PanelSelector"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
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"
mc:Ignorable="d">
<clw:SegmentedItem
<cwc:SegmentedItem
Icon="{shcm:FontIcon Glyph=&#xE8FD;}"
Tag="List"
ToolTipService.ToolTip="{shcm:ResourceString Name=ControlPanelPanelSelectorDropdownListName}"/>
<clw:SegmentedItem
<cwc:SegmentedItem
Icon="{shcm:FontIcon Glyph=&#xF0E2;}"
Tag="Grid"
ToolTipService.ToolTip="{shcm:ResourceString Name=ControlPanelPanelSelectorDropdownGridName}"/>
</clw:Segmented>
</cwc:Segmented>

View File

@@ -1,7 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.Labs.WinUI;
using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml;
namespace Snap.Hutao.Control.Panel;

View File

@@ -1,4 +1,4 @@
// Copyright (c) DGP Studio. All rights reserved.
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Microsoft.UI.Xaml;
@@ -8,7 +8,7 @@ using Windows.Win32.UI.WindowsAndMessaging;
namespace Snap.Hutao;
/// <summary>
/// ָ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// 指引窗口
/// </summary>
[Injection(InjectAs.Singleton)]
internal sealed partial class GuideWindow : Window, IWindowOptionsSource

View File

@@ -2014,7 +2014,7 @@ namespace Snap.Hutao.Resource.Localization {
}
/// <summary>
/// 查找类似 原粹树脂提醒阈值 的本地化字符串。
/// 查找类似 洞天宝钱提醒阈值 的本地化字符串。
/// </summary>
internal static string ViewDialogDailyNoteNotificationHomeCoinNotifyThreshold {
get {
@@ -2022,6 +2022,15 @@ namespace Snap.Hutao.Resource.Localization {
}
}
/// <summary>
/// 查找类似 原粹树脂提醒阈值 的本地化字符串。
/// </summary>
internal static string ViewDialogDailyNoteNotificationResinNotifyThreshold {
get {
return ResourceManager.GetString("ViewDialogDailyNoteNotificationResinNotifyThreshold", resourceCulture);
}
}
/// <summary>
/// 查找类似 在主页显示卡片 的本地化字符串。
/// </summary>

View File

@@ -800,7 +800,7 @@
<data name="ViewDialogDailyNoteNotificationExpeditionNotify" xml:space="preserve">
<value>Expedition Reward Notification</value>
</data>
<data name="ViewDialogDailyNoteNotificationHomeCoinNotifyThreshold" xml:space="preserve">
<data name="ViewDialogDailyNoteNotificationResinNotifyThreshold" xml:space="preserve">
<value>Realm Currency Alarm Threshold</value>
</data>
<data name="ViewDialogDailyNoteNotificationShowInHomeWidget" xml:space="preserve">

View File

@@ -800,7 +800,7 @@
<data name="ViewDialogDailyNoteNotificationExpeditionNotify" xml:space="preserve">
<value>探検派遣完了のお知らせ</value>
</data>
<data name="ViewDialogDailyNoteNotificationHomeCoinNotifyThreshold" xml:space="preserve">
<data name="ViewDialogDailyNoteNotificationResinNotifyThreshold" xml:space="preserve">
<value>洞天宝銭まもなく満タン</value>
</data>
<data name="ViewDialogDailyNoteNotificationShowInHomeWidget" xml:space="preserve">

View File

@@ -800,7 +800,7 @@
<data name="ViewDialogDailyNoteNotificationExpeditionNotify" xml:space="preserve">
<value>탐색 파견 완료 알림</value>
</data>
<data name="ViewDialogDailyNoteNotificationHomeCoinNotifyThreshold" xml:space="preserve">
<data name="ViewDialogDailyNoteNotificationResinNotifyThreshold" xml:space="preserve">
<value>선계 화폐 한도 알림</value>
</data>
<data name="ViewDialogDailyNoteNotificationShowInHomeWidget" xml:space="preserve">

View File

@@ -824,9 +824,12 @@
<data name="ViewDialogDailyNoteNotificationExpeditionNotify" xml:space="preserve">
<value>探索派遣完成提醒</value>
</data>
<data name="ViewDialogDailyNoteNotificationHomeCoinNotifyThreshold" xml:space="preserve">
<data name="ViewDialogDailyNoteNotificationResinNotifyThreshold" xml:space="preserve">
<value>原粹树脂提醒阈值</value>
</data>
<data name="ViewDialogDailyNoteNotificationHomeCoinNotifyThreshold" xml:space="preserve">
<value>洞天宝钱提醒阈值</value>
</data>
<data name="ViewDialogDailyNoteNotificationShowInHomeWidget" xml:space="preserve">
<value>在主页显示卡片</value>
</data>

View File

@@ -800,7 +800,7 @@
<data name="ViewDialogDailyNoteNotificationExpeditionNotify" xml:space="preserve">
<value>探索派遣完成提醒</value>
</data>
<data name="ViewDialogDailyNoteNotificationHomeCoinNotifyThreshold" xml:space="preserve">
<data name="ViewDialogDailyNoteNotificationResinNotifyThreshold" xml:space="preserve">
<value>洞天寶錢提醒閾值</value>
</data>
<data name="ViewDialogDailyNoteNotificationShowInHomeWidget" xml:space="preserve">

View File

@@ -235,15 +235,18 @@
<ItemGroup>
<!-- 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.SegmentedControl" Version="0.1.230802" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.18" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.230802" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TokenView" Version="0.1.230802" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TransitionHelper" Version="0.1.230802" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2-build.1" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230809-preview" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.230809-preview" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.230809-preview" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.230809-preview" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.230809-preview" />
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.0.230809-preview" />
<PackageReference Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Behaviors" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Core" Version="7.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
<PrivateAssets>all</PrivateAssets>

View File

@@ -148,7 +148,7 @@
</DataTemplate>
</FlipView.ItemTemplate>
</FlipView>
<PipsPager
Height="16"
HorizontalAlignment="Center"

View File

@@ -22,6 +22,10 @@
<shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
</mxi:Interaction.Behaviors>
<Grid>
<Grid.Resources>
<x:Double x:Key="GachaStatisticsCardPullProgressBarMinHeight">40</x:Double>
<Thickness x:Key="GachaStatisticsCardPullProgressHeaderTextMargin">6,0</Thickness>
</Grid.Resources>
<FlipView
x:Name="RootFlipView"
Background="{x:Null}"
@@ -30,12 +34,6 @@
<FlipView.ItemTemplate>
<DataTemplate>
<Grid Margin="12" ColumnSpacing="6">
<Grid.Resources>
<SolidColorBrush x:Key="PurpleBrush" Color="#FFA156E0"/>
<SolidColorBrush x:Key="OrangeBrush" Color="#FFBC6932"/>
<x:Double x:Key="PullProgressOpacity">0.2</x:Double>
</Grid.Resources>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="auto"/>
@@ -62,6 +60,7 @@
Grid.Column="0"
DataContext="{Binding AvatarWish}"
Spacing="6">
<TextBlock
Margin="0,0,0,6"
HorizontalAlignment="Center"
@@ -70,78 +69,78 @@
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
<Border Grid.Column="0" Style="{StaticResource BorderCardStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="40"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource OrangeBrush}"
Maximum="{Binding GuaranteeOrangeThreshold}"
Opacity="{StaticResource PullProgressOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastOrangePull}"/>
<TextBlock
Grid.Column="0"
Margin="6,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastOrangePull}"/>
</Grid>
</Border>
<Border Grid.Column="1" Style="{StaticResource BorderCardStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="40"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource PurpleBrush}"
Maximum="{Binding GuaranteePurpleThreshold}"
Opacity="{StaticResource PullProgressOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastPurplePull}"/>
<TextBlock
Grid.Column="0"
Margin="6,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastPurplePull}"/>
</Grid>
</Border>
<Grid Grid.Column="0" Style="{StaticResource BorderGridStyle}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="{StaticResource GachaStatisticsCardPullProgressBarMinHeight}"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource OrangeBrush}"
Maximum="{Binding GuaranteeOrangeThreshold}"
Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastOrangePull}"/>
<TextBlock
Grid.Column="0"
Margin="{StaticResource GachaStatisticsCardPullProgressHeaderTextMargin}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastOrangePull}"/>
</Grid>
<Grid Grid.Column="1" Style="{StaticResource BorderGridStyle}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="{StaticResource GachaStatisticsCardPullProgressBarMinHeight}"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource PurpleBrush}"
Maximum="{Binding GuaranteePurpleThreshold}"
Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastPurplePull}"/>
<TextBlock
Grid.Column="0"
Margin="{StaticResource GachaStatisticsCardPullProgressHeaderTextMargin}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastPurplePull}"/>
</Grid>
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="1"
DataContext="{Binding WeaponWish}"
Spacing="6">
<TextBlock
Margin="0,0,0,6"
HorizontalAlignment="Center"
@@ -150,73 +149,71 @@
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
<Border Grid.Column="0" Style="{StaticResource BorderCardStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="40"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource OrangeBrush}"
Maximum="{Binding GuaranteeOrangeThreshold}"
Opacity="{StaticResource PullProgressOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastOrangePull}"/>
<TextBlock
Grid.Column="0"
Margin="6,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastOrangePull}"/>
</Grid>
</Border>
<Border Grid.Column="1" Style="{StaticResource BorderCardStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="40"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource PurpleBrush}"
Maximum="{Binding GuaranteePurpleThreshold}"
Opacity="{StaticResource PullProgressOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastPurplePull}"/>
<TextBlock
Grid.Column="0"
Margin="6,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastPurplePull}"/>
</Grid>
</Border>
<Grid Grid.Column="0" Style="{StaticResource BorderGridStyle}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="{StaticResource GachaStatisticsCardPullProgressBarMinHeight}"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource OrangeBrush}"
Maximum="{Binding GuaranteeOrangeThreshold}"
Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastOrangePull}"/>
<TextBlock
Grid.Column="0"
Margin="{StaticResource GachaStatisticsCardPullProgressHeaderTextMargin}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastOrangePull}"/>
</Grid>
<Grid Grid.Column="1" Style="{StaticResource BorderGridStyle}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="{StaticResource GachaStatisticsCardPullProgressBarMinHeight}"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource PurpleBrush}"
Maximum="{Binding GuaranteePurpleThreshold}"
Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastPurplePull}"/>
<TextBlock
Grid.Column="0"
Margin="{StaticResource GachaStatisticsCardPullProgressHeaderTextMargin}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastPurplePull}"/>
</Grid>
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="2"
@@ -229,78 +226,76 @@
Text="{Binding Name}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
<Grid Grid.Column="0" Style="{StaticResource BorderGridStyle}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="{StaticResource GachaStatisticsCardPullProgressBarMinHeight}"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource OrangeBrush}"
Maximum="{Binding GuaranteeOrangeThreshold}"
Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastOrangePull}"/>
<TextBlock
Grid.Column="0"
Margin="{StaticResource GachaStatisticsCardPullProgressHeaderTextMargin}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastOrangePull}"/>
</Grid>
<Border Grid.Column="0" Style="{StaticResource BorderCardStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="40"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource OrangeBrush}"
Maximum="{Binding GuaranteeOrangeThreshold}"
Opacity="{StaticResource PullProgressOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastOrangePull}"/>
<TextBlock
Grid.Column="0"
Margin="6,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource OrangeBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastOrangePull}"/>
</Grid>
</Border>
<Border Grid.Column="1" Style="{StaticResource BorderCardStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="40"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource PurpleBrush}"
Maximum="{Binding GuaranteePurpleThreshold}"
Opacity="{StaticResource PullProgressOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastPurplePull}"/>
<TextBlock
Grid.Column="0"
Margin="6,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastPurplePull}"/>
</Grid>
</Border>
<Grid Grid.Column="1" Style="{StaticResource BorderGridStyle}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
MinHeight="{StaticResource GachaStatisticsCardPullProgressBarMinHeight}"
Background="Transparent"
CornerRadius="{StaticResource CompatCornerRadius}"
Foreground="{StaticResource PurpleBrush}"
Maximum="{Binding GuaranteePurpleThreshold}"
Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
Style="{StaticResource DefaultProgressBarStyle}"
Value="{Binding LastPurplePull}"/>
<TextBlock
Grid.Column="0"
Margin="{StaticResource GachaStatisticsCardPullProgressHeaderTextMargin}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource PurpleBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding LastPurplePull}"/>
</Grid>
</StackPanel>
</Grid>
</DataTemplate>
</FlipView.ItemTemplate>
</FlipView>
<PipsPager
Height="16"
HorizontalAlignment="Center"

View File

@@ -57,7 +57,7 @@
BorderBrush="{x:Null}"
BorderThickness="0"
Command="{Binding NavigateCommand}"
Content="&#xE713;"
Content="{StaticResource FontIconContentSetting}"
FontFamily="{StaticResource SymbolThemeFontFamily}"
ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageHomeLaunchGameSettingAction}"/>
<ComboBox

View File

@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
Loaded="OnLoaded"
mc:Ignorable="d">
<UserControl.Transitions>
<TransitionCollection>

View File

@@ -6,6 +6,8 @@ using Microsoft.Web.WebView2.Core;
using Snap.Hutao.Control;
using Snap.Hutao.Control.Theme;
using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
using System.Text.RegularExpressions;
using Windows.Foundation;
using Windows.System;
namespace Snap.Hutao.View.Control;
@@ -43,17 +45,28 @@ internal sealed partial class AnnouncementContentViewer : Microsoft.UI.Xaml.Cont
}
""";
private readonly RoutedEventHandler loadEventHandler;
private readonly RoutedEventHandler unloadEventHandler;
private readonly TypedEventHandler<CoreWebView2, CoreWebView2WebMessageReceivedEventArgs> webMessageReceivedHandler;
/// <summary>
/// 构造一个新的公告窗体
/// </summary>
public AnnouncementContentViewer()
{
InitializeComponent();
loadEventHandler = OnLoaded;
unloadEventHandler = OnUnloaded;
webMessageReceivedHandler = OnWebMessageReceived;
Loaded += loadEventHandler;
Unloaded += unloadEventHandler;
}
private static string? GenerateHtml(Announcement? announcement, ElementTheme theme)
{
if (announcement == null)
if (announcement is null)
{
return null;
}
@@ -65,9 +78,7 @@ internal sealed partial class AnnouncementContentViewer : Microsoft.UI.Xaml.Cont
return null;
}
content = content
.Replace(@"style=""vertical-align:middle;""", string.Empty)
.Replace(@"style=""border:none;vertical-align:middle;""", string.Empty);
content = StyleRegex().Replace(content, string.Empty);
bool isDarkMode = ThemeHelper.IsDarkMode(theme);
@@ -114,7 +125,10 @@ internal sealed partial class AnnouncementContentViewer : Microsoft.UI.Xaml.Cont
return document;
}
private async Task LoadAnnouncementAsync()
[GeneratedRegex("style=\".*?vertical-align:middle;\"")]
private static partial Regex StyleRegex();
private async ValueTask LoadAnnouncementAsync()
{
try
{
@@ -124,7 +138,7 @@ internal sealed partial class AnnouncementContentViewer : Microsoft.UI.Xaml.Cont
settings.AreBrowserAcceleratorKeysEnabled = false;
settings.AreDefaultContextMenusEnabled = false;
settings.AreDevToolsEnabled = false;
WebView.CoreWebView2.WebMessageReceived += OnWebMessageReceived;
WebView.CoreWebView2.WebMessageReceived += webMessageReceivedHandler;
await WebView.CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync(MihoyoSDKDefinition);
}
@@ -141,6 +155,13 @@ internal sealed partial class AnnouncementContentViewer : Microsoft.UI.Xaml.Cont
LoadAnnouncementAsync().SafeForget();
}
private void OnUnloaded(object sender, RoutedEventArgs e)
{
WebView.CoreWebView2.WebMessageReceived -= webMessageReceivedHandler;
Loaded -= loadEventHandler;
Unloaded -= unloadEventHandler;
}
private void OnWebMessageReceived(CoreWebView2 coreWebView2, CoreWebView2WebMessageReceivedEventArgs args)
{
string url = args.TryGetWebMessageAsString();

View File

@@ -1,8 +1,8 @@
<UserControl
<UserControl
x:Class="Snap.Hutao.View.Control.BaseValueSlider"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
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"
@@ -14,7 +14,7 @@
</UserControl.Resources>
<StackPanel>
<StackPanel VerticalAlignment="Top">
<clw:SettingsCard Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}">
<cwc:SettingsCard Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="8,0"
@@ -38,15 +38,15 @@
StepFrequency="1"
Value="{x:Bind BaseValueInfo.CurrentLevel, Mode=TwoWay}"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
</StackPanel>
<ItemsControl VerticalAlignment="Top" ItemsSource="{x:Bind BaseValueInfo.Values, Mode=OneWay}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<clw:SettingsCard Margin="0,2,0,0" Header="{Binding Name}">
<cwc:SettingsCard Margin="0,2,0,0" Header="{Binding Name}">
<TextBlock Text="{Binding Value}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>

View File

@@ -6,11 +6,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Border
Background="{StaticResource CardBackgroundFillColorDefault}"
BorderBrush="{StaticResource CardStrokeColorDefault}"
BorderThickness="1"
CornerRadius="{StaticResource CompatCornerRadius}">
<Border Style="{StaticResource BorderCardStyle}">
<StackPanel Name="BackgroundStack">
<ContentPresenter Name="ContentHost"/>
<TextBlock

View File

@@ -41,4 +41,4 @@ internal sealed partial class BottomTextControl : ContentControl
{
((BottomTextControl)sender).BackgroundStack.Background = (Brush)args.NewValue;
}
}
}

View File

@@ -2,29 +2,30 @@
x:Class="Snap.Hutao.View.Control.DescParamComboBox"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
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"
mc:Ignorable="d">
<UserControl.Resources>
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="ComboBox">
<Setter Property="MinWidth" Value="120"/>
</Style>
<Thickness x:Key="SettingsCardPadding">16,8</Thickness>
<x:Double x:Key="SettingsCardMinHeight">0</x:Double>
</UserControl.Resources>
<StackPanel>
<StackPanel Margin="0,0,0,0" VerticalAlignment="Top">
<clw:SettingsCard Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}">
<ComboBox x:Name="ItemHost" SelectionChanged="ItemHostSelectionChanged">
<cwc:SettingsCard Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}">
<ComboBox
x:Name="ItemHost"
SelectionChanged="ItemHostSelectionChanged"
Style="{StaticResource SettingsContentComboBoxStyle}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Level}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</clw:SettingsCard>
</cwc:SettingsCard>
</StackPanel>
<ItemsControl x:Name="DetailsHost" VerticalAlignment="Top">
@@ -35,9 +36,9 @@
</ItemsControl.ItemContainerTransitions>
<ItemsControl.ItemTemplate>
<DataTemplate>
<clw:SettingsCard Margin="0,3,0,0" Header="{Binding Description}">
<cwc:SettingsCard Margin="0,3,0,0" Header="{Binding Description}">
<TextBlock Text="{Binding Parameter}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>

View File

@@ -1,22 +1,14 @@
<UserControl
<clw:TokenItem
x:Class="Snap.Hutao.View.Control.Elevation"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Snap.Hutao.View.Control"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:shcm="using:Snap.Hutao.Control.Markup"
VerticalAlignment="Center"
mc:Ignorable="d">
<Border
Padding="10,6"
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
CornerRadius="14"
Style="{StaticResource BorderCardStyle}">
<TextBlock
Foreground="{ThemeResource SystemFillColorCriticalBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlElevationText}"/>
</Border>
</UserControl>
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
Content="{shcm:ResourceString Name=ViewControlElevationText}"
Foreground="{ThemeResource SystemFillColorCriticalBrush}"
Icon="{shcm:FontIcon Glyph=&#xE7BA;}"
mc:Ignorable="d"/>

View File

@@ -1,16 +1,14 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Snap.Hutao.Control;
using CommunityToolkit.Labs.WinUI;
namespace Snap.Hutao.View.Control;
/// <summary>
/// 管理员提示
/// </summary>
internal sealed partial class Elevation : UserControl
internal sealed partial class Elevation : TokenItem
{
/// <summary>
/// 构造一个新的管理员提示

View File

@@ -41,32 +41,27 @@
<RowDefinition Height="auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border
Margin="0,0,0,0"
<Grid
Grid.Row="0"
CornerRadius="{StaticResource CompatCornerRadiusTop}"
Style="{StaticResource BorderCardStyle}">
<Grid>
<shcp:AspectRatio TargetHeight="320" TargetWidth="690"/>
<shci:CachedImage Source="{Binding Event.Banner}"/>
</Grid>
</Border>
Style="{StaticResource BorderGridStyle}">
<shcp:AspectRatio TargetHeight="320" TargetWidth="690"/>
<shci:CachedImage Source="{Binding Event.Banner}"/>
</Grid>
<ScrollViewer Grid.Row="1">
<StackPanel Margin="16,0,16,16">
<TextBlock
Margin="0,16,0,8"
Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardUpText}"/>
<ItemsControl ItemTemplate="{StaticResource GridTemplate}" ItemsSource="{Binding UpItems}">
<ItemsControl ItemTemplate="{StaticResource GridTemplate}" ItemsPanel="{StaticResource WrapPanelTemplate}" ItemsSource="{Binding UpItems}">
<ItemsControl.Transitions>
<TransitionCollection>
<ReorderThemeTransition/>
</TransitionCollection>
</ItemsControl.Transitions>
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<cwucont:WrapPanel/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
<TextBlock

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Dialog.AchievementImportDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
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"
@@ -18,47 +18,47 @@
<RowDefinition Height="auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<cwuc:UniformGrid
<cwc:UniformGrid
Grid.Row="0"
ColumnSpacing="16"
Columns="3"
RowSpacing="16">
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportApp}">
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportApp}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIAF.Info.ExportApp, Mode=OneWay, TargetNullValue=Unknown}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportTime}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportTime}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIAF.Info.ExportDateTime.LocalDateTime, Mode=OneWay, TargetNullValue=Unknown}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportAppVersion}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportAppVersion}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIAF.Info.ExportAppVersion, Mode=OneWay, TargetNullValue=Unknown}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIAFExportUIAFVersion}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIAFExportUIAFVersion}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIAF.Info.UIAFVersion, Mode=OneWay, TargetNullValue=Unknown}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIAFExportListCount}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIAFExportListCount}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIAF.List.Count, Mode=OneWay, TargetNullValue=Unknown}"/>
</cwuc:HeaderedContentControl>
</cwuc:UniformGrid>
</cwc:HeaderedContentControl>
</cwc:UniformGrid>
<RadioButtons
Name="ImportModeSelector"
Grid.Row="1"

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Dialog.DailyNoteNotificationDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:clw="using:CommunityToolkit.WinUI.Controls"
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"
@@ -51,9 +51,6 @@
<clw:SettingsCard Padding="16,8" Header="{shcm:ResourceString Name=ViewDialogDailyNoteNotificationExpeditionNotify}">
<ToggleSwitch IsOn="{Binding ExpeditionNotify, Mode=TwoWay}"/>
</clw:SettingsCard>
<clw:SettingsCard Padding="16,8" Header="{shcm:ResourceString Name=ViewDialogDailyNoteNotificationShowInHomeWidget}">
<ToggleSwitch IsOn="{Binding ShowInHomeWidget, Mode=TwoWay}"/>
</clw:SettingsCard>
</StackPanel>
</ScrollViewer>
</ContentDialog>

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Dialog.GachaLogImportDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
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"
@@ -18,53 +18,53 @@
<RowDefinition Height="auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<cwuc:UniformGrid
<cwc:UniformGrid
Grid.Row="0"
ColumnSpacing="16"
Columns="3"
RowSpacing="16">
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportApp}">
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportApp}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIGF.Info.ExportApp, Mode=OneWay, TargetNullValue=未知}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportTime}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportTime}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIGF.Info.ExportDateTime.LocalDateTime, Mode=OneWay, TargetNullValue=未知}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportAppVersion}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportExportAppVersion}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIGF.Info.ExportAppVersion, Mode=OneWay, TargetNullValue=未知}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIGFExportUIGFVersion}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIGFExportUIGFVersion}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIGF.Info.UIGFVersion, Mode=OneWay, TargetNullValue=未知}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIGFExportListCount}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIGFExportListCount}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIGF.List.Count, Mode=OneWay, TargetNullValue=未知}"/>
</cwuc:HeaderedContentControl>
<cwuc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIGFExportUid}">
</cwc:HeaderedContentControl>
<cwc:HeaderedContentControl Header="{shcm:ResourceString Name=ViewDialogImportUIGFExportUid}">
<TextBlock
Margin="0,4,0,0"
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind UIGF.Info.Uid, Mode=OneWay, TargetNullValue=未知}"/>
</cwuc:HeaderedContentControl>
</cwuc:UniformGrid>
</cwc:HeaderedContentControl>
</cwc:UniformGrid>
</Grid>
</ContentDialog>

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Dialog.GachaLogRefreshProgressDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cwucont="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
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"
@@ -23,19 +23,19 @@
</ContentDialog.Resources>
<StackPanel>
<cwucont:HeaderedItemsControl
<cwc:HeaderedItemsControl
x:Name="GachaItemsPresenter"
Padding="0,8,0,0"
HorizontalAlignment="Left"
ItemTemplate="{StaticResource GachaItemDataTemplate}">
<cwucont:HeaderedItemsControl.ItemsPanel>
<cwc:HeaderedItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<cwucont:UniformGrid
<cwc:UniformGrid
ColumnSpacing="4"
Columns="5"
RowSpacing="4"/>
</ItemsPanelTemplate>
</cwucont:HeaderedItemsControl.ItemsPanel>
</cwucont:HeaderedItemsControl>
</cwc:HeaderedItemsControl.ItemsPanel>
</cwc:HeaderedItemsControl>
</StackPanel>
</ContentDialog>

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Dialog.UserDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
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"
@@ -27,7 +27,7 @@
<x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
<x:Double x:Key="SettingsCardMinHeight">0</x:Double>
</StackPanel.Resources>
<clw:SettingsCard
<cwc:SettingsCard
HorizontalAlignment="Stretch"
Description="{shcm:ResourceString Name=ViewDialogUserDocumentDescription}"
Header="{shcm:ResourceString Name=ViewDialogUserDocumentHeader}"
@@ -37,7 +37,7 @@
Padding="6"
Content="{shcm:ResourceString Name=ViewDialogUserDocumentAction}"
NavigateUri="{StaticResource DocumentLink_MhyAccountSwitch}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
</StackPanel>
</StackPanel>
</ContentDialog>

View File

@@ -2,9 +2,9 @@
x:Class="Snap.Hutao.View.Page.AnnouncementPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cwa="using:CommunityToolkit.WinUI.Animations"
xmlns:cwb="using:CommunityToolkit.WinUI.Behaviors"
xmlns:cwu="using:CommunityToolkit.WinUI.UI"
xmlns:cwua="using:CommunityToolkit.WinUI.UI.Animations"
xmlns:cwub="using:CommunityToolkit.WinUI.UI.Behaviors"
xmlns:cwucont="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -32,7 +32,7 @@
<cwucont:AdaptiveGridView
Margin="16,16,0,-4"
HorizontalAlignment="Stretch"
cwua:ItemsReorderAnimation.Duration="0:0:0.1"
cwa:ItemsReorderAnimation.Duration="0:0:0.1"
DesiredWidth="{StaticResource AdaptiveGridViewDesiredWidth}"
ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
ItemsSource="{Binding List}"
@@ -53,14 +53,14 @@
<mxi:Interaction.Behaviors>
<shcb:AutoHeightBehavior TargetHeight="390" TargetWidth="1080"/>
</mxi:Interaction.Behaviors>
<cwua:Explicit.Animations>
<cwua:AnimationSet x:Name="ImageZoomInAnimation">
<cwa:Explicit.Animations>
<cwa:AnimationSet x:Name="ImageZoomInAnimation">
<shca:ImageZoomInAnimation/>
</cwua:AnimationSet>
<cwua:AnimationSet x:Name="ImageZoomOutAnimation">
</cwa:AnimationSet>
<cwa:AnimationSet x:Name="ImageZoomOutAnimation">
<shca:ImageZoomOutAnimation/>
</cwua:AnimationSet>
</cwua:Explicit.Animations>
</cwa:AnimationSet>
</cwa:Explicit.Animations>
</Border>
</Border>
<!-- Time Description -->
@@ -141,10 +141,10 @@
<shcb:OpenAttachedFlyoutAction/>
</mxic:EventTriggerBehavior>
<mxic:EventTriggerBehavior EventName="PointerEntered">
<cwub:StartAnimationAction Animation="{Binding ElementName=ImageZoomInAnimation}"/>
<cwb:StartAnimationAction Animation="{Binding ElementName=ImageZoomInAnimation}"/>
</mxic:EventTriggerBehavior>
<mxic:EventTriggerBehavior EventName="PointerExited">
<cwub:StartAnimationAction Animation="{Binding ElementName=ImageZoomOutAnimation}"/>
<cwb:StartAnimationAction Animation="{Binding ElementName=ImageZoomOutAnimation}"/>
</mxic:EventTriggerBehavior>
</mxi:Interaction.Behaviors>
</Border>
@@ -165,7 +165,7 @@
<cwucont:AdaptiveGridView
Margin="16,16,0,0"
HorizontalAlignment="Stretch"
cwua:ItemsReorderAnimation.Duration="0:0:0.1"
cwa:ItemsReorderAnimation.Duration="0:0:0.1"
DesiredWidth="{StaticResource AdaptiveGridViewDesiredWidth}"
ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
SelectionMode="None"

View File

@@ -2,9 +2,9 @@
x:Class="Snap.Hutao.View.Page.AvatarPropertyPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwa="using:CommunityToolkit.WinUI.Animations"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:cwu="using:CommunityToolkit.WinUI.UI"
xmlns:cwua="using:CommunityToolkit.WinUI.UI.Animations"
xmlns:cwucont="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:cwuconv="using:CommunityToolkit.WinUI.UI.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -91,7 +91,7 @@
<StackPanel x:Name="GridImageExportPanel" Background="Transparent">
<GridView
Margin="16,16,4,-8"
cwua:ItemsReorderAnimation.Duration="0:0:0.1"
cwa:ItemsReorderAnimation.Duration="0:0:0.1"
ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
ItemsSource="{Binding Summary.Avatars}"
SelectedItem="{Binding SelectedAvatar, Mode=TwoWay}">
@@ -350,18 +350,18 @@
<Button.Flyout>
<Flyout Placement="BottomEdgeAlignedLeft">
<StackPanel>
<clw:SettingsCard
<cwc:SettingsCard
Margin="0,2,0,0"
Padding="12,0"
Header="{Binding MainProperty.Name}">
<TextBlock Text="{Binding MainProperty.Value}"/>
</clw:SettingsCard>
<clw:SettingsCard
</cwc:SettingsCard>
<cwc:SettingsCard
Margin="0,2,0,0"
Padding="12,0"
Header="{Binding SubProperty.Name}">
<TextBlock Text="{Binding SubProperty.Description}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
<shct:DescriptionTextBlock
MaxWidth="320"
Margin="0,12,0,0"
@@ -515,12 +515,12 @@
<ItemsControl Margin="0,12,0,0" ItemsSource="{Binding Info.Parameters}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<clw:SettingsCard
<cwc:SettingsCard
Margin="0,2,0,0"
Padding="12,0"
Header="{Binding Description}">
<TextBlock Margin="0,8" Text="{Binding Parameter}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
@@ -757,19 +757,19 @@
Margin="0,24,0,0"
HorizontalAlignment="Center"
Spacing="{StaticResource SettingsCardSpacing}">
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshAction}"
Command="{Binding RefreshFromEnkaApiCommand}"
Description="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshFromEnkaApiDescription}"
Header="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshFromEnkaApi}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshAction}"
Command="{Binding RefreshFromHoyolabGameRecordCommand}"
Description="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshFromHoyolabGameRecordDescription}"
Header="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshFromHoyolabGameRecord}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshAction}"
Command="{Binding RefreshFromHoyolabCalculateCommand}"
Description="{shcm:ResourceString Name=ViewPageAvatarPropertyRefreshFromHoyolabCalculateDescription}"

View File

@@ -2,8 +2,8 @@
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:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwua="using:CommunityToolkit.WinUI.UI.Animations"
xmlns:cwa="using:CommunityToolkit.WinUI.Animations"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:cwucont="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:cwuconv="using:CommunityToolkit.WinUI.UI.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -90,7 +90,7 @@
<PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationCultivateEntry}">
<cwucont:AdaptiveGridView
Padding="16,16,4,4"
cwua:ItemsReorderAnimation.Duration="0:0:0.1"
cwa:ItemsReorderAnimation.Duration="0:0:0.1"
DesiredWidth="320"
ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
ItemsSource="{Binding CultivateEntries}"
@@ -241,7 +241,7 @@
<PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationMaterialStatistics}">
<cwucont:AdaptiveGridView
Padding="16,16,4,4"
cwua:ItemsReorderAnimation.Duration="0:0:0.1"
cwa:ItemsReorderAnimation.Duration="0:0:0.1"
DesiredWidth="320"
ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
ItemsSource="{Binding StatisticsItems}"
@@ -293,7 +293,7 @@
<x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
<x:Double x:Key="SettingsCardMinHeight">0</x:Double>
</StackPanel.Resources>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageCultivationNavigateAction}"
Command="{Binding NavigateToPageCommand}"
CommandParameter="Snap.Hutao.View.Page.WikiAvatarPage"
@@ -301,7 +301,7 @@
Header="{shcm:ResourceString Name=ViewWikiAvatarHeader}"
HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Icon/UI_BagTabIcon_Avatar.png}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageCultivationNavigateAction}"
Command="{Binding NavigateToPageCommand}"
CommandParameter="Snap.Hutao.View.Page.WikiWeaponPage"
@@ -309,7 +309,7 @@
Header="{shcm:ResourceString Name=ViewWikiWeaponHeader}"
HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Icon/UI_BagTabIcon_Weapon.png}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageCultivationNavigateAction}"
Command="{Binding NavigateToPageCommand}"
CommandParameter="Snap.Hutao.View.Page.AvatarPropertyPage"
@@ -377,7 +377,7 @@
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewPageCultivationAddProjectContinue}"/>
<StackPanel Margin="0,24,0,0" HorizontalAlignment="Center">
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageCultivationAddProjectAction}"
Command="{Binding AddProjectCommand}"
Description="{shcm:ResourceString Name=ViewPageCultivationAddProjectDescription}"

View File

@@ -2,8 +2,8 @@
x:Class="Snap.Hutao.View.Page.DailyNotePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwua="using:CommunityToolkit.WinUI.UI.Animations"
xmlns:cwa="using:CommunityToolkit.WinUI.Animations"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -103,18 +103,18 @@
<x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
</StackPanel.Resources>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageDailyNoteNotificationHeader}"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageDailyNoteSlientModeDescription}"
Header="{shcm:ResourceString Name=ViewPageDailyNoteSlientModeHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE7ED;}">
<ToggleSwitch Margin="24,0,0,0" IsOn="{Binding Options.IsSilentWhenPlayingGame, Mode=TwoWay}"/>
</clw:SettingsCard>
<clw:SettingsCard
</cwc:SettingsCard>
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageDailyNoteReminderDescription}"
Header="{shcm:ResourceString Name=ViewPageDailyNoteReminderHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xEA8F;}">
<ToggleSwitch Margin="24,0,0,0" IsOn="{Binding Options.IsReminderNotification, Mode=TwoWay}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
</StackPanel>
</StackPanel>
</Flyout>
@@ -125,7 +125,7 @@
<ScrollViewer Grid.Row="1">
<cwuc:AdaptiveGridView
Margin="16,16,4,-4"
cwua:ItemsReorderAnimation.Duration="0:0:0.1"
cwa:ItemsReorderAnimation.Duration="0:0:0.1"
DesiredWidth="280"
ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
ItemsSource="{Binding DailyNoteEntries}"

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Page.GachaLogPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mxi="using:Microsoft.Xaml.Interactivity"
@@ -164,12 +164,12 @@
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudNotAllowed}"
TextAlignment="Center"/>
<clw:SettingsCard
<cwc:SettingsCard
Command="{Binding HutaoCloudViewModel.NavigateToSpiralAbyssRecordCommand}"
Description="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudSpiralAbyssActivityDescription}"
Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudSpiralAbyssActivityHeader}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
Command="{Binding HutaoCloudViewModel.NavigateToAfdianSkuCommand}"
Description="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudAfdianPurchaseDescription}"
Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudAfdianPurchaseHeader}"
@@ -627,28 +627,28 @@
Margin="0,24,0,0"
HorizontalAlignment="Center"
Spacing="{StaticResource SettingsCardSpacing}">
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageGachaLogRefreshAction}"
Command="{Binding RefreshBySTokenCommand}"
Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshBySTokenDescription}"
Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshBySToken}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE192;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageGachaLogRefreshAction}"
Command="{Binding RefreshByWebCacheCommand}"
Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshByWebCacheDescription}"
Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshByWebCache}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE81E;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageGachaLogInputAction}"
Command="{Binding RefreshByManualInputCommand}"
Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshByManualInputDescription}"
Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshByManualInput}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE765;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageGachaLogImportAction}"
Command="{Binding ImportFromUIGFJsonCommand}"
Description="{shcm:ResourceString Name=ViewPageGachaLogImportDescription}"

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Page.HutaoDatabasePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -72,11 +72,11 @@
<x:Double x:Key="SettingsCardMinHeight">0</x:Double>
</StackPanel.Resources>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewDataCollect}"/>
<clw:SettingsCard Content="{Binding Overview.RefreshTime}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewRefreshTime}"/>
<clw:SettingsCard Content="{Binding Overview.RecordTotal}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewRecordTotal}"/>
<cwc:SettingsCard Content="{Binding Overview.RefreshTime}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewRefreshTime}"/>
<cwc:SettingsCard Content="{Binding Overview.RecordTotal}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewRecordTotal}"/>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyss}"/>
<clw:SettingsCard Content="{Binding Overview.SpiralAbyssTotal}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssTotal}"/>
<clw:SettingsCard Padding="16,8" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssPassed}">
<cwc:SettingsCard Content="{Binding Overview.SpiralAbyssTotal}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssTotal}"/>
<cwc:SettingsCard Padding="16,8" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssPassed}">
<StackPanel>
<TextBlock Text="{Binding Overview.SpiralAbyssPassedPercent}"/>
<TextBlock
@@ -85,8 +85,8 @@
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Overview.SpiralAbyssPassed}"/>
</StackPanel>
</clw:SettingsCard>
<clw:SettingsCard Padding="16,8" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssFullStar}">
</cwc:SettingsCard>
<cwc:SettingsCard Padding="16,8" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssFullStar}">
<StackPanel>
<TextBlock Text="{Binding Overview.SpiralAbyssFullStarPercent}"/>
<TextBlock
@@ -95,9 +95,9 @@
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Overview.SpiralAbyssFullStar}"/>
</StackPanel>
</clw:SettingsCard>
<clw:SettingsCard Content="{Binding Overview.SpiralAbyssStarAverage}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssStarAverage}"/>
<clw:SettingsCard Content="{Binding Overview.SpiralAbyssBattleAverage}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssBattleAverage}"/>
</cwc:SettingsCard>
<cwc:SettingsCard Content="{Binding Overview.SpiralAbyssStarAverage}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssStarAverage}"/>
<cwc:SettingsCard Content="{Binding Overview.SpiralAbyssBattleAverage}" Header="{shcm:ResourceString Name=ViewPageHutaoDatabaseOverviewSpiralAbyssBattleAverage}"/>
</StackPanel>
</Flyout>
</AppBarButton.Flyout>

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Page.LaunchGamePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mxi="using:Microsoft.Xaml.Interactivity"
@@ -59,7 +59,7 @@
Message="{shcm:ResourceString Name=ViewPageLaunchGameConfigurationSaveHint}"
Severity="Informational"/>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageLaunchGameCommonHeader}"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameSwitchSchemeDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameSwitchSchemeHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE8AB;}"
@@ -71,8 +71,8 @@
ItemsSource="{Binding KnownSchemes}"
SelectedItem="{Binding SelectedScheme, Mode=TwoWay}"/>
</StackPanel>
</clw:SettingsCard>
<clw:SettingsCard
</cwc:SettingsCard>
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageLaunchGameSwitchAccountDetectAction}"
Command="{Binding DetectGameAccountCommand}"
Description="{shcm:ResourceString Name=ViewPageLaunchGameSwitchAccountDescription}"
@@ -162,26 +162,26 @@
</Border>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceHeader}"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceExclusiveDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceExclusiveHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE740;}">
<ToggleSwitch Width="120" IsOn="{Binding Options.IsExclusive, Mode=TwoWay}"/>
</clw:SettingsCard>
<clw:SettingsCard
</cwc:SettingsCard>
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceFullscreenDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceFullscreenHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE740;}">
<ToggleSwitch Width="120" IsOn="{Binding Options.IsFullScreen, Mode=TwoWay}"/>
</clw:SettingsCard>
<clw:SettingsCard
</cwc:SettingsCard>
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceBorderlessDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceBorderlessHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE737;}">
<ToggleSwitch Width="120" IsOn="{Binding Options.IsBorderless, Mode=TwoWay}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
<clw:SettingsCard
<cwc:SettingsCard
Margin="0,6,0,0"
Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenWidthDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenWidthHeader}"
@@ -190,8 +190,8 @@
Width="156"
Padding="10,6,0,0"
Value="{Binding Options.ScreenWidth, Mode=TwoWay}"/>
</clw:SettingsCard>
<clw:SettingsCard
</cwc:SettingsCard>
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenHeightDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenHeightHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE784;}">
@@ -199,9 +199,9 @@
Width="156"
Padding="10,6,0,0"
Value="{Binding Options.ScreenHeight, Mode=TwoWay}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
<clw:SettingsCard
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameMonitorsDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameMonitorsHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE975;}">
@@ -210,11 +210,11 @@
DisplayMemberPath="Name"
ItemsSource="{Binding Options.Monitors}"
SelectedItem="{Binding Options.Monitor, Mode=TwoWay}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
<StackPanel Spacing="{StaticResource SettingsCardSpacing}" Visibility="{Binding AppOptions.IsAdvancedLaunchOptionsEnabled, Converter={StaticResource BoolToVisibilityConverter}}">
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageLaunchGameAdvanceHeader}"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameMultipleInstancesDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameMultipleInstancesHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE7C4;}"
@@ -224,8 +224,8 @@
<ToggleSwitch Width="120" IsOn="{Binding Options.MultipleInstances, Mode=TwoWay}"/>
</StackPanel>
</clw:SettingsCard>
<clw:SettingsCard
</cwc:SettingsCard>
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsDescription}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE785;}"
@@ -245,7 +245,7 @@
OffContent="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsOff}"
OnContent="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsOn}"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
</StackPanel>
</StackPanel>
</Grid>

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Page.SettingPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:shc="using:Snap.Hutao.Control"
@@ -69,17 +69,17 @@
Text="Copyright © 2022 - 2023 DGP Studio. All Rights Reserved."
TextWrapping="Wrap"/>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingAboutHeader}"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{Binding HutaoOptions.Version}"
Header="{shcm:ResourceString Name=AppName}"
HeaderIcon="{shcm:FontIcon Glyph=&#xECAA;}"/>
<clw:SettingsCard
<cwc:SettingsCard
Command="{Binding NavigateToHutaoPassportCommand}"
Description="{Binding UserOptions.UserName}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE716;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xE8C8;}"
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingCopyDeviceIdAction}"
Command="{Binding CopyDeviceIdCommand}"
@@ -87,13 +87,13 @@
Header="{shcm:ResourceString Name=ViewPageSettingDeviceIdHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE975;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{Binding HutaoOptions.WebView2Version}"
Header="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"
HeaderIcon="{shcm:FontIcon Glyph=&#xECAA;}"/>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingApperanceHeader}"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageSettingApperanceLanguageDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingApperanceLanguageHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xF2B7;}">
@@ -101,8 +101,8 @@
DisplayMemberPath="Name"
ItemsSource="{Binding Options.Cultures}"
SelectedItem="{Binding SelectedCulture, Mode=TwoWay}"/>
</clw:SettingsCard>
<clw:SettingsCard
</cwc:SettingsCard>
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageSettingBackdropMaterialDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingBackdropMaterialHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE7F7;}">
@@ -110,10 +110,10 @@
DisplayMemberPath="Name"
ItemsSource="{Binding Options.BackdropTypes}"
SelectedItem="{Binding SelectedBackdropType, Mode=TwoWay}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGachaLogHeader}"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE81C;}">
@@ -121,7 +121,7 @@
IsOn="{Binding Options.IsEmptyHistoryWishVisible, Mode=TwoWay}"
OffContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOff}"
OnContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOn}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGameHeader}"/>
<InfoBar
@@ -129,7 +129,7 @@
IsOpen="True"
Message="{shcm:ResourceString Name=ViewPageSettingSetGamePathHint}"
Severity="Informational"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingSetGamePathAction}"
Command="{Binding SetGamePathCommand}"
@@ -137,7 +137,7 @@
Header="{shcm:ResourceString Name=ViewPageSettingSetGamePathHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE7FC;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingDeleteCacheAction}"
Command="{Binding DeleteGameWebCacheCommand}"
@@ -147,7 +147,7 @@
IsClickEnabled="True"/>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingStorageHeader}"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingStorageOpenAction}"
Command="{Binding Experimental.OpenDataFolderCommand}"
@@ -155,7 +155,7 @@
Header="{shcm:ResourceString Name=ViewPageSettingDataFolderHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xEC25;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingStorageSetAction}"
Command="{Binding SetDataFolderCommand}"
@@ -164,7 +164,7 @@
HeaderIcon="{shcm:FontIcon Glyph=&#xE8DE;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
Margin="0,4,0,0"
ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingStorageOpenAction}"
@@ -173,7 +173,7 @@
Header="{shcm:ResourceString Name=ViewPageSettingCacheFolderHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE8B7;}"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingResetAction}"
Command="{Binding ResetStaticResourceCommand}"
@@ -188,7 +188,7 @@
IsOpen="True"
Message="测试功能是尚未完善,仅用于 Pollyfill 的功能,未来可能会存在更合理的位置放置这些功能"
Severity="Warning"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
ActionIconToolTip="打开签到对话框"
Command="{Binding ShowSignInWebViewDialogCommand}"
@@ -207,7 +207,7 @@
IsOpen="{Binding Options.IsAdvancedLaunchOptionsEnabled}"
Message="{shcm:ResourceString Name=ViewPageSettingFeaturesDangerousHint}"
Severity="Error"/>
<clw:SettingsCard
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE730;}"
@@ -217,7 +217,7 @@
<ToggleSwitch Width="120" IsOn="{Binding Options.IsAdvancedLaunchOptionsEnabled, Mode=TwoWay}"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
<InfoBar
Margin="0,4,0,0"
@@ -225,7 +225,7 @@
IsOpen="True"
Message="{shcm:ResourceString Name=ViewPageSettingDangerousHint}"
Severity="Error"/>
<clw:SettingsCard
<cwc:SettingsCard
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingDangerousAction}"
Command="{Binding Experimental.DeleteUsersCommand}"
Description="{shcm:ResourceString Name=ViewPageSettingDeleteUserDescription}"

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Page.SpiralAbyssRecordPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -72,12 +72,12 @@
<x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
<x:Double x:Key="SettingsCardMinHeight">0</x:Double>
</StackPanel.Resources>
<clw:SettingsCard
<cwc:SettingsCard
Margin="0,16,0,0"
Content="{Binding TotalBattleTimes}"
Header="{shcm:ResourceString Name=ViewSpiralAbyssBattleTimes}"/>
<clw:SettingsCard Content="{Binding TotalStar}" Header="{shcm:ResourceString Name=ViewSpiralAbyssTotalStar}"/>
<clw:SettingsCard Content="{Binding MaxFloor}" Header="{shcm:ResourceString Name=ViewSpiralAbyssMaxFloor}"/>
<cwc:SettingsCard Content="{Binding TotalStar}" Header="{shcm:ResourceString Name=ViewSpiralAbyssTotalStar}"/>
<cwc:SettingsCard Content="{Binding MaxFloor}" Header="{shcm:ResourceString Name=ViewSpiralAbyssMaxFloor}"/>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewSpiralAbyssReveal}"/>
<ItemsControl HorizontalAlignment="Left" ItemsSource="{Binding Reveals}">
@@ -96,7 +96,7 @@
</ItemsControl>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewSpiralAbyssBattleHeader}"/>
<clw:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssDefeat}">
<cwc:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssDefeat}">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,16,0"
@@ -108,9 +108,9 @@
Margin="-8,-24,-8,-8"
Source="{Binding Defeat.SideIcon}"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
<clw:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssDamage}">
<cwc:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssDamage}">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,16,0"
@@ -122,9 +122,9 @@
Margin="-8,-24,-8,-8"
Source="{Binding Damage.SideIcon}"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
<clw:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssTakeDamage}">
<cwc:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssTakeDamage}">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,16,0"
@@ -136,9 +136,9 @@
Margin="-8,-24,-8,-8"
Source="{Binding TakeDamage.SideIcon}"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
<clw:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssNormalSkill}">
<cwc:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssNormalSkill}">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,16,0"
@@ -150,9 +150,9 @@
Margin="-8,-24,-8,-8"
Source="{Binding NormalSkill.SideIcon}"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
<clw:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssEnergySkill}">
<cwc:SettingsCard Header="{shcm:ResourceString Name=ViewSpiralAbyssEnergySkill}">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,16,0"
@@ -164,7 +164,7 @@
Margin="-8,-24,-8,-8"
Source="{Binding EnergySkill.SideIcon}"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
</StackPanel>
</Grid>
@@ -302,7 +302,7 @@
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewSpiralAbyssDefaultDescription}"/>
<StackPanel Margin="0,24,0,0">
<clw:SettingsCard
<cwc:SettingsCard
Command="{Binding RefreshCommand}"
Description="{shcm:ResourceString Name=ViewSpiralAbyssRefreshDescription}"
Header="{shcm:ResourceString Name=ViewSpiralAbyssRefresh}"

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Page.TestPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:shc="using:Snap.Hutao.Control"
@@ -12,22 +12,22 @@
mc:Ignorable="d">
<ScrollViewer>
<StackPanel Margin="16" Spacing="{StaticResource SettingsCardSpacing}">
<clw:SettingsCard
<cwc:SettingsCard
Command="{Binding DangerousLoginMihoyoBbsCommand}"
Header="DangerousLoginMihoyoBbsTest"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
Command="{Binding ShowCommunityGameRecordDialogCommand}"
Header="CommunityGameRecordDialogTest"
IsClickEnabled="True"/>
<clw:SettingsCard
<cwc:SettingsCard
Command="{Binding ShowAdoptCalculatorDialogCommand}"
Header="AdoptCalculatorDialogTest"
IsClickEnabled="True"/>
<clw:SettingsCard Header="RestartTest">
<cwc:SettingsCard Header="RestartTest">
<StackPanel Orientation="Horizontal">
<ToggleSwitch Name="ElevatedSwitch" Style="{StaticResource DefaultToggleSwitchStyle}"/>
<Button
@@ -35,7 +35,7 @@
CommandParameter="{Binding ElementName=ElevatedSwitch, Path=IsOn}"
Content="Restart"/>
</StackPanel>
</clw:SettingsCard>
</cwc:SettingsCard>
</StackPanel>
</ScrollViewer>
</shc:ScopedPage>

View File

@@ -2,7 +2,7 @@
x:Class="Snap.Hutao.View.Page.WikiMonsterPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:clw="using:CommunityToolkit.Labs.WinUI"
xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -148,9 +148,9 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<clw:SettingsCard Header="{Binding Name}">
<cwc:SettingsCard Header="{Binding Name}">
<TextBlock Text="{Binding Value}"/>
</clw:SettingsCard>
</cwc:SettingsCard>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>