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

Revert "Get rid of additional progress bar loading in list page under the command bar."

Browse Source 
This reverts commit cfdd32708a.
This commit is contained in:
Burak Kaan Köse
2024-06-21 22:39:44 +02:00
parent 150bf124a9
commit ad5c134887
1 changed files with 144 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,10 +403,7 @@
<Grid x:Name="RootGrid"> <Grid x:Name="RootGrid">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition <ColumnDefinition x:Name="ReaderColumn" Width="*" MaxWidth="{x:Bind ViewModel.StatePersistanceService.MailListPaneLength, Mode=OneWay}"/>
x:Name="ReaderColumn"
Width="*"
MaxWidth="{x:Bind ViewModel.StatePersistanceService.MailListPaneLength, Mode=OneWay}" />
<ColumnDefinition x:Name="RendererColumn" Width="*" /> <ColumnDefinition x:Name="RendererColumn" Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@@ -437,147 +434,160 @@
<!-- Top Commands --> <!-- Top Commands -->
<Grid <Grid
Grid.Row="0" Grid.Row="0"
Padding="4" Padding="2,0"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
CornerRadius="8"> CornerRadius="8">
<Grid.RowDefinitions>
<RowDefinition Height="48" />
<RowDefinition Height="2" />
</Grid.RowDefinitions>
<!-- Commands --> <!-- Commands -->
<Grid.ColumnDefinitions> <Grid>
<ColumnDefinition Width="*" /> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Button <Button
Style="{StaticResource TopCommandBarButtonStyle}" Style="{StaticResource TopCommandBarButtonStyle}"
Command="{x:Bind ViewModel.SyncFolderCommand}" Command="{x:Bind ViewModel.SyncFolderCommand}"
IsEnabled="{x:Bind ViewModel.CanSynchronize, Mode=OneWay}"> IsEnabled="{x:Bind ViewModel.CanSynchronize, Mode=OneWay}">
<Button.Content> <Button.Content>
<controls:WinoFontIcon Icon="Sync" FontSize="16" /> <controls:WinoFontIcon Icon="Sync" FontSize="16" />
</Button.Content> </Button.Content>
</Button> </Button>
<ToggleButton <ToggleButton
x:Name="SelectionModeToggle" x:Name="SelectionModeToggle"
Grid.Column="1" Grid.Column="1"
Style="{StaticResource TopCommandBarToggleButtonStyle}" Style="{StaticResource TopCommandBarToggleButtonStyle}"
Checked="SelectionModeToggleChecked" Checked="SelectionModeToggleChecked"
Unchecked="SelectionModeToggleUnchecked"> Unchecked="SelectionModeToggleUnchecked">
<ToggleButton.Content> <ToggleButton.Content>
<controls:WinoFontIcon FontSize="18" Icon="MultiSelect" /> <controls:WinoFontIcon FontSize="18" Icon="MultiSelect" />
</ToggleButton.Content> </ToggleButton.Content>
</ToggleButton> </ToggleButton>
<AppBarSeparator Grid.Column="2" Margin="2,0" /> <AppBarSeparator Grid.Column="2" Margin="2,0" />
<Button <Button
x:Name="ArchiveAppBarButton" x:Name="ArchiveAppBarButton"
Grid.Column="3" Grid.Column="3"
x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsArchiveSpecialFolder), Mode=OneWay}" x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsArchiveSpecialFolder), Mode=OneWay}"
Style="{StaticResource TopCommandBarButtonStyle}" Style="{StaticResource TopCommandBarButtonStyle}"
Command="{x:Bind ViewModel.MailOperationCommand}" Command="{x:Bind ViewModel.MailOperationCommand}"
IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}" IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Archive}"> ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Archive}">
<Button.Content> <Button.Content>
<controls:WinoFontIcon FontSize="18" Icon="Archive" /> <controls:WinoFontIcon FontSize="18" Icon="Archive" />
</Button.Content> </Button.Content>
<Button.CommandParameter> <Button.CommandParameter>
<enums:MailOperation>Archive</enums:MailOperation> <enums:MailOperation>Archive</enums:MailOperation>
</Button.CommandParameter> </Button.CommandParameter>
</Button> </Button>
<Button <Button
x:Name="UnarchiveAppBarButton" x:Name="UnarchiveAppBarButton"
Grid.Column="3" Grid.Column="3"
x:Load="{x:Bind ViewModel.IsArchiveSpecialFolder, Mode=OneWay}" x:Load="{x:Bind ViewModel.IsArchiveSpecialFolder, Mode=OneWay}"
Style="{StaticResource TopCommandBarButtonStyle}" Style="{StaticResource TopCommandBarButtonStyle}"
Command="{x:Bind ViewModel.MailOperationCommand}" Command="{x:Bind ViewModel.MailOperationCommand}"
IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}" IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Unarchive}"> ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Unarchive}">
<Button.Content> <Button.Content>
<controls:WinoFontIcon FontSize="18" Icon="UnArchive" /> <controls:WinoFontIcon FontSize="18" Icon="UnArchive" />
</Button.Content> </Button.Content>
<Button.CommandParameter> <Button.CommandParameter>
<enums:MailOperation>UnArchive</enums:MailOperation> <enums:MailOperation>UnArchive</enums:MailOperation>
</Button.CommandParameter> </Button.CommandParameter>
</Button> </Button>
<Button <Button
Grid.Column="4" Grid.Column="4"
Style="{StaticResource TopCommandBarButtonStyle}" Style="{StaticResource TopCommandBarButtonStyle}"
Command="{x:Bind ViewModel.MailOperationCommand}" Command="{x:Bind ViewModel.MailOperationCommand}"
IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}" IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Delete}"> ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Delete}">
<Button.CommandParameter> <Button.CommandParameter>
<enums:MailOperation>SoftDelete</enums:MailOperation> <enums:MailOperation>SoftDelete</enums:MailOperation>
</Button.CommandParameter> </Button.CommandParameter>
<Button.Content> <Button.Content>
<controls:WinoFontIcon FontSize="18" Icon="Delete" /> <controls:WinoFontIcon FontSize="18" Icon="Delete" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button <Button
x:Name="MoveButtonAppBarButton" x:Name="MoveButtonAppBarButton"
Grid.Column="5" Grid.Column="5"
Command="{x:Bind ViewModel.MailOperationCommand}" Command="{x:Bind ViewModel.MailOperationCommand}"
IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}" IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
Style="{StaticResource TopCommandBarButtonStyle}" Style="{StaticResource TopCommandBarButtonStyle}"
ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Move}"> ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Move}">
<Button.CommandParameter> <Button.CommandParameter>
<enums:MailOperation>Move</enums:MailOperation> <enums:MailOperation>Move</enums:MailOperation>
</Button.CommandParameter> </Button.CommandParameter>
<Button.Content> <Button.Content>
<controls:WinoFontIcon FontSize="18" Icon="Move" /> <controls:WinoFontIcon FontSize="18" Icon="Move" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button <Button
Grid.Column="6" Grid.Column="6"
Style="{StaticResource TopCommandBarButtonStyle}" Style="{StaticResource TopCommandBarButtonStyle}"
IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"> IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}">
<Button.Content> <Button.Content>
<controls:WinoFontIcon FontSize="20" Icon="More" /> <controls:WinoFontIcon FontSize="20" Icon="More" />
</Button.Content> </Button.Content>
<Button.Flyout> <Button.Flyout>
<MenuFlyout AreOpenCloseAnimationsEnabled="False" Placement="BottomEdgeAlignedLeft"> <MenuFlyout AreOpenCloseAnimationsEnabled="False" Placement="BottomEdgeAlignedLeft">
<MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_SetFlag}"> <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_SetFlag}">
<MenuFlyoutItem.CommandParameter> <MenuFlyoutItem.CommandParameter>
<enums:MailOperation>SetFlag</enums:MailOperation> <enums:MailOperation>SetFlag</enums:MailOperation>
</MenuFlyoutItem.CommandParameter> </MenuFlyoutItem.CommandParameter>
<MenuFlyoutItem.Icon> <MenuFlyoutItem.Icon>
<controls:WinoFontIcon Icon="Flag" /> <controls:WinoFontIcon Icon="Flag" />
</MenuFlyoutItem.Icon> </MenuFlyoutItem.Icon>
</MenuFlyoutItem> </MenuFlyoutItem>
<MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_ClearFlag}"> <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_ClearFlag}">
<MenuFlyoutItem.CommandParameter> <MenuFlyoutItem.CommandParameter>
<enums:MailOperation>ClearFlag</enums:MailOperation> <enums:MailOperation>ClearFlag</enums:MailOperation>
</MenuFlyoutItem.CommandParameter> </MenuFlyoutItem.CommandParameter>
<MenuFlyoutItem.Icon> <MenuFlyoutItem.Icon>
<controls:WinoFontIcon Icon="ClearFlag" /> <controls:WinoFontIcon Icon="ClearFlag" />
</MenuFlyoutItem.Icon> </MenuFlyoutItem.Icon>
</MenuFlyoutItem> </MenuFlyoutItem>
<MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsRead}"> <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsRead}">
<MenuFlyoutItem.CommandParameter> <MenuFlyoutItem.CommandParameter>
<enums:MailOperation>MarkAsRead</enums:MailOperation> <enums:MailOperation>MarkAsRead</enums:MailOperation>
</MenuFlyoutItem.CommandParameter> </MenuFlyoutItem.CommandParameter>
<MenuFlyoutItem.Icon> <MenuFlyoutItem.Icon>
<controls:WinoFontIcon Icon="MarkRead" /> <controls:WinoFontIcon Icon="MarkRead" />
</MenuFlyoutItem.Icon> </MenuFlyoutItem.Icon>
</MenuFlyoutItem> </MenuFlyoutItem>
<MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsUnread}"> <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsUnread}">
<MenuFlyoutItem.CommandParameter> <MenuFlyoutItem.CommandParameter>
<enums:MailOperation>MarkAsUnread</enums:MailOperation> <enums:MailOperation>MarkAsUnread</enums:MailOperation>
</MenuFlyoutItem.CommandParameter> </MenuFlyoutItem.CommandParameter>
<MenuFlyoutItem.Icon> <MenuFlyoutItem.Icon>
<controls:WinoFontIcon Icon="MarkUnread" /> <controls:WinoFontIcon Icon="MarkUnread" />
</MenuFlyoutItem.Icon> </MenuFlyoutItem.Icon>
</MenuFlyoutItem> </MenuFlyoutItem>
</MenuFlyout> </MenuFlyout>
</Button.Flyout> </Button.Flyout>
</Button> </Button>
</Grid>
<muxc:ProgressBar
x:Name="LoadingProgressBar"
Grid.Row="1"
IsIndeterminate="True"
x:Load="{x:Bind ViewModel.IsInitializingFolder, Mode=OneWay}" />
</Grid> </Grid>
<!-- Pivot + Sync + Multi Select --> <!-- Pivot + Sync + Multi Select -->