Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1627 from DGP-Studio/fix/1608

Browse Source 
fix #1608
This commit is contained in:
DismissedLight
2024-05-21 22:03:48 +08:00
committed by GitHub
parent 2c057458a3 36376f5af6
commit f80a63f557
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
View File

@@ -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>
@@ -3248,4 +3254,4 @@
<data name="WindowIdentifyMonitorHeader" xml:space="preserve">
<value>显示器编号</value>
</data>
</root>
</root>

16
src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs
View File

@@ -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)