style/renaming

This commit is contained in:
Aleh Khantsevich
2024-08-31 13:56:31 +02:00
parent ebf196ec73
commit d3ddf7b191
3 changed files with 6 additions and 7 deletions

View File

@@ -62,8 +62,7 @@ namespace Wino.Mail.ViewModels
public ObservableCollection<MailItemViewModel> SelectedItems { get; set; } = []; public ObservableCollection<MailItemViewModel> SelectedItems { get; set; } = [];
public ObservableCollection<FolderPivotViewModel> PivotFolders { get; set; } = []; public ObservableCollection<FolderPivotViewModel> PivotFolders { get; set; } = [];
public ObservableCollection<MailOperationMenuItem> ActionItems { get; set; } = [];
public ObservableCollection<MailOperationMenuItem> ActionItems { get; set; } = new ObservableCollection<MailOperationMenuItem>();
private readonly SemaphoreSlim listManipulationSemepahore = new SemaphoreSlim(1); private readonly SemaphoreSlim listManipulationSemepahore = new SemaphoreSlim(1);
private CancellationTokenSource listManipulationCancellationTokenSource = new CancellationTokenSource(); private CancellationTokenSource listManipulationCancellationTokenSource = new CancellationTokenSource();
@@ -424,7 +423,7 @@ namespace Wino.Mail.ViewModels
public Task ExecuteHoverAction(MailOperationPreperationRequest request) => ExecuteMailOperationAsync(request); public Task ExecuteHoverAction(MailOperationPreperationRequest request) => ExecuteMailOperationAsync(request);
[RelayCommand] [RelayCommand]
private async Task OperationClicked(MailOperationMenuItem menuItem) private async Task ExecuteTopBarAction(MailOperationMenuItem menuItem)
{ {
if (menuItem == null || !SelectedItems.Any()) return; if (menuItem == null || !SelectedItems.Any()) return;
@@ -436,7 +435,7 @@ namespace Wino.Mail.ViewModels
/// </summary> /// </summary>
/// <param name="operation">Action to execute for selected items.</param> /// <param name="operation">Action to execute for selected items.</param>
[RelayCommand] [RelayCommand]
private async Task MailOperationAsync(MailOperation mailOperation) private async Task ExecuteMailOperation(MailOperation mailOperation)
{ {
if (!SelectedItems.Any()) return; if (!SelectedItems.Any()) return;

View File

@@ -285,7 +285,7 @@
OverflowButtonVisibility="Auto"> OverflowButtonVisibility="Auto">
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<local:BindableCommandBarBehavior <local:BindableCommandBarBehavior
ItemClickedCommand="{x:Bind ViewModel.OperationClickedCommand}" ItemClickedCommand="{x:Bind ViewModel.ExecuteTopBarActionCommand}"
ItemTemplateSelector="{StaticResource RendererCommandBarItemTemplateSelector}" ItemTemplateSelector="{StaticResource RendererCommandBarItemTemplateSelector}"
PrimaryCommands="{x:Bind ViewModel.ActionItems, Mode=OneWay}" /> PrimaryCommands="{x:Bind ViewModel.ActionItems, Mode=OneWay}" />
</interactivity:Interaction.Behaviors> </interactivity:Interaction.Behaviors>
@@ -466,7 +466,7 @@
ui:ListViewExtensions.ItemContainerStretchDirection="Horizontal" ui:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
ui:ScrollViewerExtensions.EnableMiddleClickScrolling="True" ui:ScrollViewerExtensions.EnableMiddleClickScrolling="True"
ui:ScrollViewerExtensions.VerticalScrollBarMargin="0" ui:ScrollViewerExtensions.VerticalScrollBarMargin="0"
ItemDeletedCommand="{x:Bind ViewModel.MailOperationCommand}" ItemDeletedCommand="{x:Bind ViewModel.ExecuteMailOperationCommand}"
ItemTemplateSelector="{StaticResource MailItemDisplaySelector}" ItemTemplateSelector="{StaticResource MailItemDisplaySelector}"
ItemsSource="{x:Bind MailCollectionViewSource.View, Mode=OneWay}" ItemsSource="{x:Bind MailCollectionViewSource.View, Mode=OneWay}"
LoadMoreCommand="{x:Bind ViewModel.LoadMoreItemsCommand}" LoadMoreCommand="{x:Bind ViewModel.LoadMoreItemsCommand}"

View File

@@ -375,7 +375,7 @@ namespace Wino.Views
{ {
args.Handled = true; args.Handled = true;
ViewModel?.MailOperationCommand?.Execute(MailOperation.SoftDelete); ViewModel?.ExecuteMailOperationCommand?.Execute(MailOperation.SoftDelete);
} }
} }