From 1fe09f3069529ce163387a0d6bbe849822d45ce3 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Sun, 28 Jan 2024 17:44:15 +0800
Subject: [PATCH] impl #1279
---
.../Snap.Hutao/Control/Theme/Card.xaml | 10 +-
.../Control/Theme/NumericValue.xaml | 2 +
.../Control/Theme/PivotOverride.xaml | 382 ++++++++++++++-
.../Control/Theme/SettingsStyle.xaml | 5 +-
.../Snap.Hutao/Properties/launchSettings.json | 2 +-
.../Snap.Hutao/Resource/Localization/SH.resx | 2 +-
.../Control/LaunchGameResourceExpander.xaml | 134 +++---
.../LaunchGameResourceExpander.xaml.cs | 4 +-
src/Snap.Hutao/Snap.Hutao/View/MainView.xaml | 13 +-
.../Snap.Hutao/View/Page/FeedbackPage.xaml | 11 +-
.../Snap.Hutao/View/Page/LaunchGamePage.xaml | 436 ++++++++++--------
src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml | 2 +-
12 files changed, 705 insertions(+), 298 deletions(-)
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
index 2467859a..7bddc678 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
@@ -29,6 +29,7 @@
x:Key="AcrylicBorderCardStyle"
BasedOn="{StaticResource BorderCardStyle}"
TargetType="Border">
+
@@ -43,14 +44,15 @@
x:Key="AcrylicGridCardStyle"
BasedOn="{StaticResource GridCardStyle}"
TargetType="Grid">
+
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/NumericValue.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/NumericValue.xaml
index 89cef2a7..38e574a7 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/NumericValue.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/NumericValue.xaml
@@ -9,6 +9,8 @@
64
100
+ 50
+
0.2
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/PivotOverride.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/PivotOverride.xaml
index 59b2f422..68e1548c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/PivotOverride.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/PivotOverride.xaml
@@ -1,5 +1,385 @@
-
+
16
16,0,0,0
0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
index 2a36d3ef..f94f8c52 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
@@ -1,4 +1,7 @@
-
+
3
0
diff --git a/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json b/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
index 36a6b395..a5fb2a14 100644
--- a/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
+++ b/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
@@ -2,7 +2,7 @@
"profiles": {
"Snap.Hutao": {
"commandName": "MsixPackage",
- "nativeDebugging": true,
+ "nativeDebugging": false,
"doNotLaunchApp": false,
"allowLocalNetworkLoopbackProperty": true
},
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index c2094ee5..bd3106a6 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -2220,7 +2220,7 @@
资源下载
- 客户端
+ 完整包
预下载
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/LaunchGameResourceExpander.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/LaunchGameResourceExpander.xaml
index 0ae5e77a..771446fb 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/LaunchGameResourceExpander.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/LaunchGameResourceExpander.xaml
@@ -1,24 +1,78 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/LaunchGameResourceExpander.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/LaunchGameResourceExpander.xaml.cs
index f687448f..3d81a8fb 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/LaunchGameResourceExpander.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/LaunchGameResourceExpander.xaml.cs
@@ -1,14 +1,14 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
-using Microsoft.UI.Xaml.Controls;
+using CommunityToolkit.WinUI.Controls;
namespace Snap.Hutao.View.Control;
///
/// 启动游戏资源 Expander
///
-internal sealed partial class LaunchGameResourceExpander : Expander
+internal sealed partial class LaunchGameResourceExpander : SettingsExpander
{
///
/// 构造一个新的启动游戏资源 Expander
diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
index dee8ba3a..47438c24 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
@@ -13,9 +13,10 @@
0,44,0,0
24
-
-
- 0
+
+
+
+ 0,1,0,0
@@ -35,12 +36,6 @@
PaneDisplayMode="Left"
UseLayoutRounding="False">
-
-
- 0
- 0
-
-
-
+
-
+
-
+
-
+
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
index f957e7da..b8134ef6 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -28,11 +28,14 @@
Collapsed
-
+
+
+
+
+
@@ -111,14 +114,8 @@
-
-
+
+
@@ -144,211 +141,242 @@
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml b/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml
index 4c702ff2..464fec62 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml
@@ -25,7 +25,7 @@