diff --git a/Wino.Mail.ViewModels/MailListPageViewModel.cs b/Wino.Mail.ViewModels/MailListPageViewModel.cs index c5eb2e1c..47dedbd2 100644 --- a/Wino.Mail.ViewModels/MailListPageViewModel.cs +++ b/Wino.Mail.ViewModels/MailListPageViewModel.cs @@ -62,8 +62,7 @@ namespace Wino.Mail.ViewModels public ObservableCollection SelectedItems { get; set; } = []; public ObservableCollection PivotFolders { get; set; } = []; - - public ObservableCollection ActionItems { get; set; } = new ObservableCollection(); + public ObservableCollection ActionItems { get; set; } = []; private readonly SemaphoreSlim listManipulationSemepahore = new SemaphoreSlim(1); private CancellationTokenSource listManipulationCancellationTokenSource = new CancellationTokenSource(); @@ -424,7 +423,7 @@ namespace Wino.Mail.ViewModels public Task ExecuteHoverAction(MailOperationPreperationRequest request) => ExecuteMailOperationAsync(request); [RelayCommand] - private async Task OperationClicked(MailOperationMenuItem menuItem) + private async Task ExecuteTopBarAction(MailOperationMenuItem menuItem) { if (menuItem == null || !SelectedItems.Any()) return; @@ -436,7 +435,7 @@ namespace Wino.Mail.ViewModels /// /// Action to execute for selected items. [RelayCommand] - private async Task MailOperationAsync(MailOperation mailOperation) + private async Task ExecuteMailOperation(MailOperation mailOperation) { if (!SelectedItems.Any()) return; diff --git a/Wino.Mail/Views/MailListPage.xaml b/Wino.Mail/Views/MailListPage.xaml index 4bbbff69..87b26e77 100644 --- a/Wino.Mail/Views/MailListPage.xaml +++ b/Wino.Mail/Views/MailListPage.xaml @@ -285,7 +285,7 @@ OverflowButtonVisibility="Auto"> @@ -466,7 +466,7 @@ ui:ListViewExtensions.ItemContainerStretchDirection="Horizontal" ui:ScrollViewerExtensions.EnableMiddleClickScrolling="True" ui:ScrollViewerExtensions.VerticalScrollBarMargin="0" - ItemDeletedCommand="{x:Bind ViewModel.MailOperationCommand}" + ItemDeletedCommand="{x:Bind ViewModel.ExecuteMailOperationCommand}" ItemTemplateSelector="{StaticResource MailItemDisplaySelector}" ItemsSource="{x:Bind MailCollectionViewSource.View, Mode=OneWay}" LoadMoreCommand="{x:Bind ViewModel.LoadMoreItemsCommand}" diff --git a/Wino.Mail/Views/MailListPage.xaml.cs b/Wino.Mail/Views/MailListPage.xaml.cs index 0f939c77..740d4d32 100644 --- a/Wino.Mail/Views/MailListPage.xaml.cs +++ b/Wino.Mail/Views/MailListPage.xaml.cs @@ -375,7 +375,7 @@ namespace Wino.Views { args.Handled = true; - ViewModel?.MailOperationCommand?.Execute(MailOperation.SoftDelete); + ViewModel?.ExecuteMailOperationCommand?.Execute(MailOperation.SoftDelete); } }