Fix merge conflicts

This commit is contained in:
Aleh Khantsevich
2024-06-13 01:42:19 +02:00
31 changed files with 484 additions and 33 deletions

View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Threading;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.Messaging;
@@ -353,5 +354,15 @@ namespace Wino.Services
return result == ContentDialogResult.Primary ? signatureEditorDialog.Result : null;
}
public async Task ShowAccountReorderDialogAsync(ObservableCollection<IAccountProviderDetailViewModel> availableAccounts)
{
var accountReorderDialog = new AccountReorderDialog(availableAccounts)
{
RequestedTheme = _themeService.RootTheme.ToWindowsElementTheme()
};
await HandleDialogPresentationAsync(accountReorderDialog);
}
}
}