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

fixed attachments layout and size and added progressbar

Browse Source
This commit is contained in:
Aleh Khantsevich
2024-05-05 02:15:29 +02:00
parent 2cb0db02e3
commit a0002ff97b
2 changed files with 118 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Wino.Mail/Views/ComposePage.xaml
View File

@@ -54,11 +54,14 @@
</DataTemplate> </DataTemplate>
<!-- Attachment Template --> <!-- Attachment Template -->
<!-- Margin -8 0 is used to remove the padding from the ListViewItem-->
<DataTemplate x:Key="ComposerFileAttachmentTemplate" x:DataType="data:MailAttachmentViewModel"> <DataTemplate x:Key="ComposerFileAttachmentTemplate" x:DataType="data:MailAttachmentViewModel">
<Grid <Grid
Height="75" Height="50"
Background="Transparent" Background="Transparent"
ColumnSpacing="3"> ColumnSpacing="3"
Margin="-8 0"
Padding="0,0,5,0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="36" /> <ColumnDefinition Width="36" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
@@ -74,7 +77,7 @@
<!-- Name && Size --> <!-- Name && Size -->
<Grid <Grid
Grid.Column="1" Grid.Column="1"
MaxWidth="250" MaxWidth="200"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -85,7 +88,7 @@
FontSize="13" FontSize="13"
Text="{x:Bind FileName}" Text="{x:Bind FileName}"
MaxLines="2" MaxLines="2"
TextTrimming="None" /> TextTrimming="CharacterEllipsis" />
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
@@ -98,7 +101,7 @@
<SymbolIcon <SymbolIcon
Grid.Column="2" Grid.Column="2"
Margin="6,0" Margin="0,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Symbol="Cancel" Symbol="Cancel"
Foreground="{StaticResource DeleteBrush}" /> Foreground="{StaticResource DeleteBrush}" />
@@ -602,24 +605,25 @@
Text="{x:Bind ViewModel.Subject, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" /> Text="{x:Bind ViewModel.Subject, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<!-- Attachments --> <!-- Attachments -->
<ListView <ListView x:Name="AttachmentsListView"
x:Name="AttachmentsListView"
Grid.Row="6" Grid.Row="6"
Padding="5"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
x:Load="{x:Bind helpers:XamlHelpers.CountToBooleanConverter(ViewModel.IncludedAttachments.Count), Mode=OneWay}" x:Load="{x:Bind helpers:XamlHelpers.CountToBooleanConverter(ViewModel.IncludedAttachments.Count), Mode=OneWay}"
IsItemClickEnabled="True" IsItemClickEnabled="True"
ItemTemplate="{StaticResource ComposerFileAttachmentTemplate}" ItemTemplate="{StaticResource ComposerFileAttachmentTemplate}"
ItemsSource="{x:Bind ViewModel.IncludedAttachments, Mode=OneWay}" ItemsSource="{x:Bind ViewModel.IncludedAttachments, Mode=OneWay}"
ScrollViewer.VerticalScrollBarVisibility="Visible"
ScrollViewer.VerticalScrollMode="Enabled"
ItemClick="AttachmentClicked" ItemClick="AttachmentClicked"
SelectionMode="None"> SelectionMode="None">
<ListView.ItemsPanel> <ListView.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<ItemsStackPanel Orientation="Horizontal" /> <controls1:WrapPanel Orientation="Horizontal" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ListView.ItemsPanel> </ListView.ItemsPanel>
</ListView> </ListView>
<!--Attachments-->
</Grid> </Grid>
<Grid <Grid

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

@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:controls="using:Microsoft.UI.Xaml.Controls"
xmlns:controls2="using:CommunityToolkit.WinUI.Controls"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:selectors="using:Wino.Selectors" xmlns:selectors="using:Wino.Selectors"
IsDarkEditor="{x:Bind ViewModel.IsDarkWebviewRenderer, Mode=TwoWay}" IsDarkEditor="{x:Bind ViewModel.IsDarkWebviewRenderer, Mode=TwoWay}"
@@ -59,11 +60,20 @@
ReplyAll="{StaticResource CommandBarItemReplyAllTemplate}" /> ReplyAll="{StaticResource CommandBarItemReplyAllTemplate}" />
<!-- Attachment Template --> <!-- Attachment Template -->
<!-- Margin -8 0 is used to remove the padding from the ListViewItem-->
<DataTemplate x:Key="FileAttachmentTemplate" x:DataType="viewModelData:MailAttachmentViewModel"> <DataTemplate x:Key="FileAttachmentTemplate" x:DataType="viewModelData:MailAttachmentViewModel">
<Grid Height="51" RowSpacing="0">
<Grid.RowDefinitions>
<RowDefinition Height="50" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid <Grid
Height="75" Grid.Row="0"
Height="50"
Background="Transparent" Background="Transparent"
ColumnSpacing="3"> ColumnSpacing="3"
Padding="0,0,5,0"
Margin="-8 0">
<ToolTipService.ToolTip> <ToolTipService.ToolTip>
<ToolTip Content="{x:Bind FileName}" /> <ToolTip Content="{x:Bind FileName}" />
</ToolTipService.ToolTip> </ToolTipService.ToolTip>
@@ -90,7 +100,6 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="36" /> <ColumnDefinition Width="36" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- Icon --> <!-- Icon -->
@@ -100,7 +109,10 @@
ContentTemplateSelector="{StaticResource FileTypeIconSelector}" /> ContentTemplateSelector="{StaticResource FileTypeIconSelector}" />
<!-- Name && Size --> <!-- Name && Size -->
<Grid Grid.Column="1" VerticalAlignment="Center"> <Grid Grid.Column="1"
VerticalAlignment="Center"
Padding="0,0,5,0"
MaxWidth="250">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
@@ -109,7 +121,7 @@
<TextBlock <TextBlock
FontSize="13" FontSize="13"
Text="{x:Bind FileName}" Text="{x:Bind FileName}"
MaxLines="2" MaxLines="1"
TextWrapping="Wrap" TextWrapping="Wrap"
TextTrimming="CharacterEllipsis" /> TextTrimming="CharacterEllipsis" />
@@ -122,12 +134,18 @@
Foreground="Gray" Foreground="Gray"
Text="{x:Bind ReadableSize}" /> Text="{x:Bind ReadableSize}" />
</Grid> </Grid>
<ProgressRing
Grid.Column="2"
VerticalAlignment="Center"
IsActive="{x:Bind IsBusy, Mode=OneWay}" />
</Grid> </Grid>
<muxc:ProgressBar
Grid.Row="1"
VerticalAlignment="Top"
HorizontalAlignment="Stretch"
Visibility="{x:Bind IsBusy, Mode=OneWay}"
IsIndeterminate="{x:Bind IsBusy, Mode=OneWay}"
ShowPaused="False"
Margin="0, -5, 0,0"
ShowError="False"/>
</Grid>
</DataTemplate> </DataTemplate>
</Page.Resources> </Page.Resources>
@@ -292,20 +310,22 @@
</Grid> </Grid>
</Grid> </Grid>
<GridView <!-- Attachments -->
<ListView x:Name="AttachmentsListView"
Grid.Row="2" Grid.Row="2"
ui:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
x:Name="AttachmentsListView"
x:Load="{x:Bind helpers:XamlHelpers.CountToBooleanConverter(ViewModel.Attachments.Count), Mode=OneWay}" x:Load="{x:Bind helpers:XamlHelpers.CountToBooleanConverter(ViewModel.Attachments.Count), Mode=OneWay}"
IsItemClickEnabled="True" IsItemClickEnabled="True"
MaxHeight="200"
Padding="8,0,0,0"
ItemTemplate="{StaticResource FileAttachmentTemplate}" ItemTemplate="{StaticResource FileAttachmentTemplate}"
ItemsSource="{x:Bind ViewModel.Attachments, Mode=OneWay}" ItemsSource="{x:Bind ViewModel.Attachments, Mode=OneWay}"
ScrollViewer.VerticalScrollBarVisibility="Visible"
ScrollViewer.VerticalScrollMode="Enabled"
ItemClick="AttachmentClicked" ItemClick="AttachmentClicked"
SelectionMode="None" /> SelectionMode="None"
Height="53">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<controls2:WrapPanel Orientation="Horizontal"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ListView>
<muxc:ProgressBar <muxc:ProgressBar
x:Name="DownloadingProgressBar" x:Name="DownloadingProgressBar"