From c6a47eb7beb96b0b3b22519875a0d944fd192a97 Mon Sep 17 00:00:00 2001
From: qhy040404 <qhy040404@163.com>
Date: Sat, 18 May 2024 15:59:59 +0800
Subject: [PATCH 1/2] fix #1608

---
 .../Snap.Hutao/Resource/Localization/SH.resx     |  6 ++++++
 .../Cultivation/CultivationViewModel.cs          | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 1914b6b8..faccbd99 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -1568,6 +1568,12 @@
   <data name="ViewModelCultivationProjectInvalidName" xml:space="preserve">
     <value>不能添加名称无效的计划</value>
   </data>
+  <data name="ViewModelCultivationRemoveProjectContent" xml:space="preserve">
+    <value>此操作不可逆，此计划和其内的背包物品会丢失</value>
+  </data>
+  <data name="ViewModelCultivationRemoveProjectTitle" xml:space="preserve">
+    <value>确认要删除当前计划吗？</value>
+  </data>
   <data name="ViewModelDailyNoteConfigWebhookUrlComplete" xml:space="preserve">
     <value>实时便笺 Webhook Url 配置成功</value>
   </data>
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs
index f50fa9ac..e40a57ee 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs
@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.UI.Xaml.Controls;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Service.Cultivation;
@@ -110,10 +111,17 @@ internal sealed partial class CultivationViewModel : Abstraction.ViewModel
             return;
         }
 
-        await cultivationService.RemoveProjectAsync(project).ConfigureAwait(false);
-        await taskContext.SwitchToMainThreadAsync();
-        ArgumentNullException.ThrowIfNull(Projects);
-        SelectedProject = Projects.FirstOrDefault();
+        ContentDialogResult result = await contentDialogFactory
+            .CreateForConfirmCancelAsync(SH.ViewModelCultivationRemoveProjectTitle, SH.ViewModelCultivationRemoveProjectContent)
+            .ConfigureAwait(false);
+
+        if (result is ContentDialogResult.Primary)
+        {
+            await cultivationService.RemoveProjectAsync(project).ConfigureAwait(false);
+            await taskContext.SwitchToMainThreadAsync();
+            ArgumentNullException.ThrowIfNull(Projects);
+            SelectedProject = Projects.FirstOrDefault();
+        }
     }
 
     private async ValueTask UpdateEntryCollectionAsync(CultivateProject? project)

From 36376f5af6dbefd875e0b952657e9e2e59fe98d6 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Tue, 21 May 2024 22:03:10 +0800
Subject: [PATCH 2/2] Update SH.resx

---
 src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index faccbd99..ab91a965 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -1569,7 +1569,7 @@
     <value>不能添加名称无效的计划</value>
   </data>
   <data name="ViewModelCultivationRemoveProjectContent" xml:space="preserve">
-    <value>此操作不可逆，此计划和其内的背包物品会丢失</value>
+    <value>此操作不可逆，此计划的养成物品与背包材料将会丢失</value>
   </data>
   <data name="ViewModelCultivationRemoveProjectTitle" xml:space="preserve">
     <value>确认要删除当前计划吗？</value>
@@ -3254,4 +3254,4 @@
   <data name="WindowIdentifyMonitorHeader" xml:space="preserve">
     <value>显示器编号</value>
   </data>
-</root>
\ No newline at end of file
+</root>