修复桌面快捷方式的创建

Author: nahida-mouo

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Core/Shell/IShellLinkInterop.cs

@@ -5,5 +5,5 @@ namespace Snap.Hutao.Remastered.Core.Shell;
 
 internal interface IShellLinkInterop
 {
-    bool TryCreateDesktopShortcutForElevatedLaunch();
+    bool TryCreateDesktopShortcut();
 }

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Core/Shell/ShellLinkInterop.cs

@@ -3,25 +3,26 @@
 
 using Snap.Hutao.Remastered.Core.IO;
 using System.IO;
+using Windows.ApplicationModel;
 
 namespace Snap.Hutao.Remastered.Core.Shell;
 
 [Service(ServiceLifetime.Transient, typeof(IShellLinkInterop))]
 internal sealed class ShellLinkInterop : IShellLinkInterop
 {
-    public bool TryCreateDesktopShortcutForElevatedLaunch()
+    public bool TryCreateDesktopShortcut()
     {
         string targetLogoPath = HutaoRuntime.GetDataDirectoryFile("ShellLinkLogo.ico");
-        string elevatedLauncherPath = HutaoRuntime.GetDataDirectoryFile("Snap.Hutao.Remastered.Elevated.Launcher.exe");
 
         try
         {
             InstalledLocation.CopyFileFromApplicationUri("ms-appx:///Assets/Logo.ico", targetLogoPath);
-            InstalledLocation.CopyFileFromApplicationUri("ms-appx:///Snap.Hutao.Remastered.Elevated.Launcher.exe", elevatedLauncherPath);
 
             string desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
             string target = Path.Combine(desktop, $"{SH.FormatAppNameAndVersion(HutaoRuntime.Version)}.lnk");
-            FileSystem.CreateLink(elevatedLauncherPath, HutaoRuntime.FamilyName, targetLogoPath, target);
+
+            FileSystem.CreateLink("hutao://", "", targetLogoPath, target);
+
             return true;
         }
         catch

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Resource/Localization/SH.en.resx

@@ -3180,7 +3180,7 @@ Space Available: {2}</value>
     <value>Create</value>
   </data>
   <data name="ViewPageSettingCreateDesktopShortcutDescription" xml:space="preserve">
-    <value>Create desktop shortcut with administrator privilege</value>
+    <value>Create desktop shortcut</value>
   </data>
   <data name="ViewPageSettingCreateDesktopShortcutHeader" xml:space="preserve">
     <value>Create Desktop Shortcut</value>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Resource/Localization/SH.resx

@@ -3211,7 +3211,7 @@
     <value>创建</value>
   </data>
   <data name="ViewPageSettingCreateDesktopShortcutDescription" xml:space="preserve">
-    <value>在桌面上创建默认以管理员身份启动的快捷方式</value>
+    <value>在桌面上创建快捷方式</value>
   </data>
   <data name="ViewPageSettingCreateDesktopShortcutHeader" xml:space="preserve">
     <value>创建快捷方式</value>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Snap.Hutao.Remastered.csproj

@@ -270,10 +270,6 @@
     <PackageReference Include="Snap.HPatch" Version="0.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Snap.Hutao.Remastered.Elevated.Launcher" Version="1.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
 	<PackageReference Include="Snap.Hutao.Remastered.Native" Version="1.0.2">
 	 <PrivateAssets>all</PrivateAssets>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/Page/SettingPage.xaml

@@ -134,8 +134,7 @@
                                         <StackPanel
                                             Grid.Row="0"
                                             Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Spacing="12">
+                                            VerticalAlignment="Center">
                                             <cwc:UniformGrid
                                                 VerticalAlignment="Center"
                                                 ColumnSpacing="8"
@@ -178,17 +177,18 @@
                                     HeaderIcon="{shuxm:FontIcon Glyph=&#xE895;}"
                                     IsClickEnabled="True"/>
 
+                                <cwc:SettingsCard
+                                    ActionIconToolTip="{shuxm:ResourceString Name=ViewPageSettingCreateDesktopShortcutAction}"
+                                    Command="{Binding CreateDesktopShortcutCommand}"
+                                    Description="{shuxm:ResourceString Name=ViewPageSettingCreateDesktopShortcutDescription}"
+                                    Header="{shuxm:ResourceString Name=ViewPageSettingCreateDesktopShortcutHeader}"
+                                    IsClickEnabled="True"/>
+
                                 <cwc:SettingsExpander
                                     Header="{shuxm:ResourceString Name=ViewPageSettingElevatedModeHeader}"
                                     HeaderIcon="{shuxm:FontIcon Glyph=&#xE7EF;}"
                                     IsExpanded="True">
                                     <cwc:SettingsExpander.Items>
-                                        <cwc:SettingsCard
-                                            ActionIconToolTip="{shuxm:ResourceString Name=ViewPageSettingCreateDesktopShortcutAction}"
-                                            Command="{Binding CreateDesktopShortcutCommand}"
-                                            Description="{shuxm:ResourceString Name=ViewPageSettingCreateDesktopShortcutDescription}"
-                                            Header="{shuxm:ResourceString Name=ViewPageSettingCreateDesktopShortcutHeader}"
-                                            IsClickEnabled="True"/>
                                         <cwc:SettingsCard
                                             Description="{shuxm:ResourceString Name=ViewPageSettingAutoRestartAsAdminDescription}"
                                             Header="{shuxm:ResourceString Name=ViewPageSettingAutoRestartAsAdminHeader}"

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/ViewModel/Setting/SettingViewModel.cs

@@ -117,7 +117,7 @@ private void CreateDesktopShortcutForElevatedLaunchAsync()
     {
         SentrySdk.AddBreadcrumb(BreadcrumbFactory.CreateUI("Create desktop shortcut for elevated launch", "SettingViewModel.Command"));
 
-        _ = shellLinkInterop.TryCreateDesktopShortcutForElevatedLaunch()
+        _ = shellLinkInterop.TryCreateDesktopShortcut()
             ? messenger.Send(InfoBarMessage.Success(SH.ViewModelSettingActionComplete))
             : messenger.Send(InfoBarMessage.Warning(SH.ViewModelSettingCreateDesktopShortcutFailed));
     }