From 96f503d30c91c8295dcdbea5fbb499ecde8d6245 Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Wed, 17 May 2023 20:58:40 +0800
Subject: [PATCH] Introducing Elevation Badge

---
 src/Snap.Hutao/Snap.Hutao/Control/Property.cs | 13 +++++++++++
 .../Resource/Localization/SH.Designer.cs      |  9 ++++++++
 .../Snap.Hutao/Resource/Localization/SH.resx  |  3 +++
 src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj   |  7 ++++++
 .../Snap.Hutao/View/Control/Elevation.xaml    | 22 +++++++++++++++++++
 .../Snap.Hutao/View/Control/Elevation.xaml.cs | 22 +++++++++++++++++++
 .../View/Page/AnnouncementPage.xaml           |  8 ++++---
 .../Snap.Hutao/View/Page/CultivationPage.xaml |  9 +++++---
 .../Snap.Hutao/View/Page/DailyNotePage.xaml   |  3 ++-
 .../Snap.Hutao/View/Page/LaunchGamePage.xaml  | 18 ++++++++++-----
 10 files changed, 102 insertions(+), 12 deletions(-)
 create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Control/Elevation.xaml
 create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Control/Elevation.xaml.cs

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Property.cs b/src/Snap.Hutao/Snap.Hutao/Control/Property.cs
index 113981e3..9e5eebcd 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Property.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Property.cs
@@ -47,6 +47,19 @@ internal static class Property<TOwner>
         return DependencyProperty.Register(name, typeof(TProperty), typeof(TOwner), new(defaultValue));
     }
 
+    /// <summary>
+    /// 注册依赖属性
+    /// </summary>
+    /// <typeparam name="TProperty">属性的类型</typeparam>
+    /// <param name="name">属性名称</param>
+    /// <param name="defaultValue">封装的默认值</param>
+    /// <param name="callback">属性更改回调</param>
+    /// <returns>注册的依赖属性</returns>
+    public static DependencyProperty DependBoxed<TProperty>(string name, object defaultValue, Action<DependencyObject, DependencyPropertyChangedEventArgs> callback)
+    {
+        return DependencyProperty.Register(name, typeof(TProperty), typeof(TOwner), new(defaultValue, new(callback)));
+    }
+
     /// <summary>
     /// 注册依赖属性
     /// </summary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
index 5993673a..48c653e2 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
@@ -1590,6 +1590,15 @@ namespace Snap.Hutao.Resource.Localization {
             }
         }
         
+        /// <summary>
+        ///   查找类似 需要管理员权限 的本地化字符串。
+        /// </summary>
+        internal static string ViewControlElevationText {
+            get {
+                return ResourceManager.GetString("ViewControlElevationText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 加载中，请稍候 的本地化字符串。
         /// </summary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 3a67ed7d..4a873d70 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -2013,4 +2013,7 @@
   <data name="ViewInfoBarToggleTitle" xml:space="preserve">
     <value>有新的通知</value>
   </data>
+  <data name="ViewControlElevationText" xml:space="preserve">
+    <value>需要管理员权限</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index 2959d796..a093e214 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -115,6 +115,7 @@
     <None Remove="View\Control\BaseValueSlider.xaml" />
     <None Remove="View\Control\BottomTextControl.xaml" />
     <None Remove="View\Control\DescParamComboBox.xaml" />
+    <None Remove="View\Control\Elevation.xaml" />
     <None Remove="View\Control\ItemIcon.xaml" />
     <None Remove="View\Control\LaunchGameResourceExpander.xaml" />
     <None Remove="View\Control\LoadingView.xaml" />
@@ -302,6 +303,12 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Update="View\Control\Elevation.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
   <ItemGroup>
     <Page Update="View\InfoBarView.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/Elevation.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/Elevation.xaml
new file mode 100644
index 00000000..e3ba229e
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/Elevation.xaml
@@ -0,0 +1,22 @@
+<UserControl
+    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: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>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/Elevation.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/Elevation.xaml.cs
new file mode 100644
index 00000000..a718b718
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/Elevation.xaml.cs
@@ -0,0 +1,22 @@
+// 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;
+
+namespace Snap.Hutao.View.Control;
+
+/// <summary>
+/// 管理员提示
+/// </summary>
+internal sealed partial class Elevation : UserControl
+{
+    /// <summary>
+    /// 构造一个新的管理员提示
+    /// </summary>
+    public Elevation()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
index 21818e85..fae2b66b 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
@@ -25,6 +25,7 @@
         <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
     </mxi:Interaction.Behaviors>
     <shc:ScopedPage.Resources>
+        <x:Double x:Key="AdaptiveGridViewDesiredWidth">300</x:Double>
         <shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/>
 
         <DataTemplate x:Key="AnnouncementTemplate">
@@ -32,7 +33,7 @@
                 Margin="16,16,0,-4"
                 HorizontalAlignment="Stretch"
                 cwua:ItemsReorderAnimation.Duration="0:0:0.1"
-                DesiredWidth="300"
+                DesiredWidth="{StaticResource AdaptiveGridViewDesiredWidth}"
                 ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
                 ItemsSource="{Binding List}"
                 SelectionMode="None">
@@ -165,9 +166,10 @@
                         Margin="16,16,0,0"
                         HorizontalAlignment="Stretch"
                         cwua:ItemsReorderAnimation.Duration="0:0:0.1"
-                        DesiredWidth="300"
+                        DesiredWidth="{StaticResource AdaptiveGridViewDesiredWidth}"
                         ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
-                        SelectionMode="None">
+                        SelectionMode="None"
+                        StretchContentForSingleRow="False">
                         <shvca:LaunchGameCard Height="{StaticResource HomeAdaptiveCardHeight}"/>
                         <shvca:GachaStatisticsCard/>
                         <shvca:AchievementCard/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
index 5d354213..f1ed9269 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -94,7 +94,8 @@
                                     DesiredWidth="320"
                                     ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
                                     ItemsSource="{Binding CultivateEntries}"
-                                    SelectionMode="None">
+                                    SelectionMode="None"
+                                    StretchContentForSingleRow="False">
                                     <cwucont:AdaptiveGridView.ItemTemplate>
                                         <DataTemplate>
                                             <Border Style="{StaticResource BorderCardStyle}">
@@ -244,7 +245,8 @@
                                     DesiredWidth="320"
                                     ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
                                     ItemsSource="{Binding StatisticsItems}"
-                                    SelectionMode="None">
+                                    SelectionMode="None"
+                                    StretchContentForSingleRow="False">
                                     <cwucont:AdaptiveGridView.Resources>
                                         <x:Double x:Key="GridViewItemMinHeight">0</x:Double>
                                     </cwucont:AdaptiveGridView.Resources>
@@ -323,7 +325,8 @@
                         Padding="16,16,4,4"
                         ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
                         ItemsSource="{Binding InventoryItems}"
-                        SelectionMode="None">
+                        SelectionMode="None"
+                        StretchContentForSingleRow="False">
                         <cwucont:AdaptiveGridView.ItemTemplate>
                             <DataTemplate>
                                 <Button
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 59e1ac81..971f854f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -129,7 +129,8 @@
                 DesiredWidth="280"
                 ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
                 ItemsSource="{Binding DailyNoteEntries}"
-                SelectionMode="None">
+                SelectionMode="None"
+                StretchContentForSingleRow="False">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <Border Padding="8" Style="{StaticResource BorderCardStyle}">
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
index bb102bce..0e0a29b6 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -64,10 +64,13 @@
                                 Header="{shcm:ResourceString Name=ViewPageLaunchGameSwitchSchemeHeader}"
                                 HeaderIcon="{shcm:FontIcon Glyph=&#xE8AB;}"
                                 IsEnabled="{Binding HutaoOptions.IsElevated}">
-                                <ComboBox
-                                    DisplayMemberPath="DisplayName"
-                                    ItemsSource="{Binding KnownSchemes}"
-                                    SelectedItem="{Binding SelectedScheme, Mode=TwoWay}"/>
+                                <StackPanel Orientation="Horizontal">
+                                    <shvc:Elevation Margin="0,0,36,0" Visibility="{Binding HutaoOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                    <ComboBox
+                                        DisplayMemberPath="DisplayName"
+                                        ItemsSource="{Binding KnownSchemes}"
+                                        SelectedItem="{Binding SelectedScheme, Mode=TwoWay}"/>
+                                </StackPanel>
                             </clw:SettingsCard>
                             <clw:SettingsCard
                                 ActionIconToolTip="{shcm:ResourceString Name=ViewPageLaunchGameSwitchAccountDetectAction}"
@@ -216,7 +219,11 @@
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameMultipleInstancesHeader}"
                                     HeaderIcon="{shcm:FontIcon Glyph=&#xE7C4;}"
                                     IsEnabled="{Binding HutaoOptions.IsElevated}">
-                                    <ToggleSwitch Width="120" IsOn="{Binding Options.MultipleInstances, Mode=TwoWay}"/>
+                                    <StackPanel Orientation="Horizontal">
+                                        <shvc:Elevation Visibility="{Binding HutaoOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                        <ToggleSwitch Width="120" IsOn="{Binding Options.MultipleInstances, Mode=TwoWay}"/>
+                                    </StackPanel>
+
                                 </clw:SettingsCard>
                                 <clw:SettingsCard
                                     Description="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsDescription}"
@@ -224,6 +231,7 @@
                                     HeaderIcon="{shcm:FontIcon Glyph=&#xE785;}"
                                     IsEnabled="{Binding HutaoOptions.IsElevated}">
                                     <StackPanel Orientation="Horizontal">
+                                        <shvc:Elevation Margin="0,0,36,0" Visibility="{Binding HutaoOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
                                         <NumberBox
                                             MinWidth="156"
                                             Padding="10,8,0,0"