Account colors + edit account details. (#592)
* Remove account rename dialog. Implement edit account details page. * Remove unused folder definition. * Adressing theming issues and adding reset button. Changing the UI a bit. * Enable auto indent in initializer. Use service from the application. * Adding color picker to acc setup dialog. Changing UI of edit acc details page.
This commit is contained in:
@@ -13,7 +13,6 @@ using Wino.Core.Domain.Models.Folders;
|
||||
using Wino.Core.Domain.Models.Navigation;
|
||||
using Wino.Messaging.Client.Navigation;
|
||||
using Wino.Messaging.Server;
|
||||
using Wino.Messaging.UI;
|
||||
|
||||
namespace Wino.Mail.ViewModels;
|
||||
|
||||
@@ -23,6 +22,7 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
|
||||
private readonly IAccountService _accountService;
|
||||
private readonly IWinoServerConnectionManager _serverConnectionManager;
|
||||
private readonly IFolderService _folderService;
|
||||
private bool isLoaded = false;
|
||||
|
||||
public MailAccount Account { get; set; }
|
||||
public ObservableCollection<IMailItemFolder> CurrentFolders { get; set; } = [];
|
||||
@@ -78,20 +78,8 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
|
||||
=> _folderService.ChangeFolderShowUnreadCountStateAsync(folderStructure.Id, isEnabled);
|
||||
|
||||
[RelayCommand]
|
||||
private async Task RenameAccount()
|
||||
{
|
||||
if (Account == null)
|
||||
return;
|
||||
|
||||
var updatedAccount = await _dialogService.ShowEditAccountDialogAsync(Account);
|
||||
|
||||
if (updatedAccount != null)
|
||||
{
|
||||
await _accountService.UpdateAccountAsync(updatedAccount);
|
||||
|
||||
ReportUIChange(new AccountUpdatedMessage(updatedAccount));
|
||||
}
|
||||
}
|
||||
private void EditAccountDetails()
|
||||
=> Messenger.Send(new BreadcrumbNavigationRequested(Translator.SettingsEditAccountDetails_Title, WinoPage.EditAccountDetailsPage, Account));
|
||||
|
||||
[RelayCommand]
|
||||
private async Task DeleteAccount()
|
||||
@@ -119,6 +107,9 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public override async void OnNavigatedTo(NavigationMode mode, object parameters)
|
||||
{
|
||||
base.OnNavigatedTo(mode, parameters);
|
||||
@@ -143,6 +134,8 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
|
||||
{
|
||||
CurrentFolders.Add(folder);
|
||||
}
|
||||
|
||||
isLoaded = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,6 +143,8 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
|
||||
{
|
||||
base.OnPropertyChanged(e);
|
||||
|
||||
if (!IsActive || !isLoaded) return;
|
||||
|
||||
switch (e.PropertyName)
|
||||
{
|
||||
case nameof(IsFocusedInboxEnabled) when IsFocusedInboxSupportedForAccount:
|
||||
|
||||
@@ -111,7 +111,8 @@ public partial class AccountManagementViewModel : AccountManagementPageViewModel
|
||||
ProviderType = accountCreationDialogResult.ProviderType,
|
||||
Name = accountCreationDialogResult.AccountName,
|
||||
SpecialImapProvider = accountCreationDialogResult.SpecialImapProviderDetails?.SpecialImapProvider ?? SpecialImapProvider.None,
|
||||
Id = Guid.NewGuid()
|
||||
Id = Guid.NewGuid(),
|
||||
AccountColorHex = accountCreationDialogResult.AccountColorHex
|
||||
};
|
||||
|
||||
await creationDialog.ShowDialogAsync(accountCreationCancellationTokenSource);
|
||||
|
||||
88
Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs
Normal file
88
Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs
Normal file
@@ -0,0 +1,88 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using CommunityToolkit.Mvvm.Messaging;
|
||||
using Wino.Core.Domain.Entities.Shared;
|
||||
using Wino.Core.Domain.Interfaces;
|
||||
using Wino.Core.Domain.Models.Navigation;
|
||||
using Wino.Core.ViewModels.Data;
|
||||
using Wino.Messaging.Client.Navigation;
|
||||
|
||||
namespace Wino.Mail.ViewModels;
|
||||
|
||||
public partial class EditAccountDetailsPageViewModel : MailBaseViewModel
|
||||
{
|
||||
private readonly IAccountService _accountService;
|
||||
private readonly IThemeService _themeService;
|
||||
|
||||
[ObservableProperty]
|
||||
public partial MailAccount Account { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string AccountName { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string SenderName { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial AppColorViewModel SelectedColor { get; set; }
|
||||
|
||||
|
||||
[ObservableProperty]
|
||||
public partial List<AppColorViewModel> AvailableColors { get; set; }
|
||||
|
||||
public EditAccountDetailsPageViewModel(IAccountService accountService, IThemeService themeService)
|
||||
{
|
||||
_accountService = accountService;
|
||||
_themeService = themeService;
|
||||
|
||||
var colorHexList = _themeService.GetAvailableAccountColors();
|
||||
|
||||
AvailableColors = colorHexList.Select(a => new AppColorViewModel(a)).ToList();
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
private async Task SaveChangesAsync()
|
||||
{
|
||||
await UpdateAccountAsync();
|
||||
|
||||
Messenger.Send(new BackBreadcrumNavigationRequested());
|
||||
}
|
||||
|
||||
private Task UpdateAccountAsync()
|
||||
{
|
||||
Account.Name = AccountName;
|
||||
Account.SenderName = SenderName;
|
||||
Account.AccountColorHex = SelectedColor == null ? string.Empty : SelectedColor.Hex;
|
||||
|
||||
return _accountService.UpdateAccountAsync(Account);
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
private void ResetColor()
|
||||
=> SelectedColor = null;
|
||||
|
||||
partial void OnSelectedColorChanged(AppColorViewModel oldValue, AppColorViewModel newValue)
|
||||
{
|
||||
_ = UpdateAccountAsync();
|
||||
}
|
||||
|
||||
public override void OnNavigatedTo(NavigationMode mode, object parameters)
|
||||
{
|
||||
base.OnNavigatedTo(mode, parameters);
|
||||
|
||||
if (parameters is MailAccount account)
|
||||
{
|
||||
Account = account;
|
||||
AccountName = account.Name;
|
||||
SenderName = account.SenderName;
|
||||
|
||||
if (!string.IsNullOrEmpty(account.AccountColorHex))
|
||||
{
|
||||
SelectedColor = AvailableColors.FirstOrDefault(a => a.Hex == account.AccountColorHex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user