javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundand command bar classes

Browse Source
This commit is contained in:
Aleh Khantsevich
2024-09-01 01:28:36 +02:00
parent cb05e58f1e
commit 51626dfd04
7 changed files with 2 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Wino.Mail/Views/MailListPage.xaml
View File

@@ -33,28 +33,6 @@
IsSourceGrouped="True"
Source="{x:Bind ViewModel.MailCollection.MailItems, Mode=OneWay}" />
<selectors:RendererCommandBarItemTemplateSelector
x:Key="RendererCommandBarItemTemplateSelector"
Archive="{StaticResource CommandBarItemArchiveTemplate}"
ClearFlag="{StaticResource CommandBarItemClearFlagTemplate}"
DarkEditor="{StaticResource CommandBarItemDarkEditorTemplate}"
Delete="{StaticResource CommandBarItemDeleteTemplate}"
Find="{StaticResource CommandBarItemFindTemplate}"
Forward="{StaticResource CommandBarItemForwardTemplate}"
LightEditor="{StaticResource CommandBarItemLightEditorTemplate}"
MarkAsRead="{StaticResource CommandBarItemMarkReadTemplate}"
MarkAsUnread="{StaticResource CommandBarItemMarkUnreadTemplate}"
Move="{StaticResource CommandBarItemMoveTemplate}"
MoveToJunk="{StaticResource CommandBarItemMoveToJunkTemplate}"
Print="{StaticResource CommandBarItemPrintTemplate}"
Reply="{StaticResource CommandBarItemReplyTemplate}"
ReplyAll="{StaticResource CommandBarItemReplyAllTemplate}"
SaveAs="{StaticResource CommandBarItemSaveTemplate}"
SeperatorTemplate="{StaticResource CommandBarItemSeperatorTemplate}"
SetFlag="{StaticResource CommandBarItemSetFlagTemplate}"
Unarchive="{StaticResource CommandBarItemUnarchiveTemplate}"
Zoom="{StaticResource CommandBarItemZoomTemplate}" />
<Thickness x:Key="ExpanderHeaderPadding">0,0,0,0</Thickness>
<Thickness x:Key="ExpanderChevronMargin">0,0,12,0</Thickness>
<Thickness x:Key="ExpanderHeaderBorderThickness">0,0,0,0</Thickness>
@@ -284,10 +262,7 @@
IsEnabled="{x:Bind helpers:XamlHelpers.CountToBooleanConverter(ViewModel.SelectedItemCount), Mode=OneWay}"
OverflowButtonVisibility="Auto">
<interactivity:Interaction.Behaviors>
<local:BindableCommandBarBehavior
ItemClickedCommand="{x:Bind ViewModel.ExecuteTopBarActionCommand}"
ItemTemplateSelector="{StaticResource RendererCommandBarItemTemplateSelector}"
PrimaryCommands="{x:Bind ViewModel.ActionItems, Mode=OneWay}" />
<local:BindableCommandBarBehavior ItemClickedCommand="{x:Bind ViewModel.ExecuteTopBarActionCommand}" PrimaryCommands="{x:Bind ViewModel.ActionItems, Mode=OneWay}" />
</interactivity:Interaction.Behaviors>
</CommandBar>
</Grid>

27
Wino.Mail/Views/MailRenderingPage.xaml
View File

@@ -38,28 +38,6 @@
Content="{x:Bind DisplayName}" />
</DataTemplate>
<selectors:RendererCommandBarItemTemplateSelector
x:Key="RendererCommandBarItemTemplateSelector"
Archive="{StaticResource CommandBarItemArchiveTemplate}"
ClearFlag="{StaticResource CommandBarItemClearFlagTemplate}"
DarkEditor="{StaticResource CommandBarItemDarkEditorTemplate}"
Delete="{StaticResource CommandBarItemDeleteTemplate}"
Find="{StaticResource CommandBarItemFindTemplate}"
Forward="{StaticResource CommandBarItemForwardTemplate}"
LightEditor="{StaticResource CommandBarItemLightEditorTemplate}"
MarkAsRead="{StaticResource CommandBarItemMarkReadTemplate}"
MarkAsUnread="{StaticResource CommandBarItemMarkUnreadTemplate}"
Move="{StaticResource CommandBarItemMoveTemplate}"
MoveToJunk="{StaticResource CommandBarItemMoveToJunkTemplate}"
Print="{StaticResource CommandBarItemPrintTemplate}"
Reply="{StaticResource CommandBarItemReplyTemplate}"
ReplyAll="{StaticResource CommandBarItemReplyAllTemplate}"
SaveAs="{StaticResource CommandBarItemSaveTemplate}"
SeperatorTemplate="{StaticResource CommandBarItemSeperatorTemplate}"
SetFlag="{StaticResource CommandBarItemSetFlagTemplate}"
Unarchive="{StaticResource CommandBarItemUnarchiveTemplate}"
Zoom="{StaticResource CommandBarItemZoomTemplate}" />
<!-- Attachment Template -->
<!-- Margin -8 0 is used to remove the padding from the ListViewItem -->
<DataTemplate x:Key="FileAttachmentTemplate" x:DataType="viewModelData:MailAttachmentViewModel">
@@ -208,10 +186,7 @@
IsDynamicOverflowEnabled="True"
OverflowButtonVisibility="Auto">
<interactivity:Interaction.Behaviors>
<local:BindableCommandBarBehavior
ItemClickedCommand="{x:Bind ViewModel.OperationClickedCommand}"
ItemTemplateSelector="{StaticResource RendererCommandBarItemTemplateSelector}"
PrimaryCommands="{x:Bind ViewModel.MenuItems, Mode=OneWay}" />
<local:BindableCommandBarBehavior ItemClickedCommand="{x:Bind ViewModel.OperationClickedCommand}" PrimaryCommands="{x:Bind ViewModel.MenuItems, Mode=OneWay}" />
</interactivity:Interaction.Behaviors>
<CommandBar.Content>
<Grid Padding="0,5">