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

Fix custom themes and drag/drop

Browse Source
This commit is contained in:
Aleh Khantsevich
2024-06-23 23:04:42 +02:00
parent dccf55d57a
commit 1e12ddd8e2
12 changed files with 53 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Wino.Mail/AppThemes/Acrylic.xaml
View File

@@ -1,43 +1,37 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Microsoft.UI.Xaml.Media" xmlns:local="using:Microsoft.UI.Xaml.Media"
xmlns:xaml="using:Windows.UI.Xaml" xmlns:xaml="using:Windows.UI.Xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<x:String x:Key="ThemeName">Acrylic</x:String> <x:String x:Key="ThemeName">Acrylic</x:String>
<x:Boolean x:Key="UseMica">False</x:Boolean> <x:Boolean x:Key="UseMica">False</x:Boolean>
<SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush> <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
<Thickness x:Key="RendererGridMargin">0,0,4,0</Thickness>
<xaml:CornerRadius x:Key="MailListGridCornerRadius">6,6,6,6</xaml:CornerRadius>
<!-- Acrylic Template --> <!-- Acrylic Template -->
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Name="Light"> <ResourceDictionary x:Name="Light">
<!-- Reading Pane Background -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">white</SolidColorBrush>
<!-- Reading Page Date/Name Group Header Background --> <!-- Reading Page Date/Name Group Header Background -->
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#ecf0f1</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#ecf0f1</SolidColorBrush>
<local:AcrylicBrush <local:AcrylicBrush
x:Key="WinoApplicationBackgroundColor" x:Key="WinoApplicationBackgroundColor"
TintColor="#FCFCFC" BackgroundSource="HostBackdrop"
TintOpacity="0.75"
FallbackColor="#F9F9F9" FallbackColor="#F9F9F9"
BackgroundSource="HostBackdrop" /> TintColor="#FCFCFC"
TintOpacity="0.75" />
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Name="Dark"> <ResourceDictionary x:Name="Dark">
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">Transparent</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#2C2C2C</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#2C2C2C</SolidColorBrush>
<local:AcrylicBrush <local:AcrylicBrush
x:Key="WinoApplicationBackgroundColor" x:Key="WinoApplicationBackgroundColor"
TintColor="#2C2C2C" BackgroundSource="HostBackdrop"
TintOpacity="0.30"
FallbackColor="#2C2C2C" FallbackColor="#2C2C2C"
BackgroundSource="HostBackdrop" /> TintColor="#2C2C2C"
TintOpacity="0.30" />
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
</ResourceDictionary> </ResourceDictionary>

14
Wino.Mail/AppThemes/Clouds.xaml
View File

@@ -1,7 +1,7 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:xaml="using:Windows.UI.Xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:xaml="using:Windows.UI.Xaml">
<x:String x:Key="ThemeName">Clouds</x:String> <x:String x:Key="ThemeName">Clouds</x:String>
<x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Clouds.jpg</x:String> <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Clouds.jpg</x:String>
@@ -9,19 +9,13 @@
<ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" /> <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
<SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush> <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
<Thickness x:Key="RendererGridMargin">4,0,4,0</Thickness>
<xaml:CornerRadius x:Key="MailListGridCornerRadius">6,6,6,6</xaml:CornerRadius>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Name="Light"> <ResourceDictionary x:Name="Light">
<!-- Brushes --> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#b2dffc</SolidColorBrush>
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3FFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#FFFFFF</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Name="Dark"> <ResourceDictionary x:Name="Dark">
<!-- Brushes --> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#b2dffc</SolidColorBrush>
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3262626</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#5413191F</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
</ResourceDictionary> </ResourceDictionary>

14
Wino.Mail/AppThemes/Custom.xaml
View File

@@ -1,7 +1,7 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:xaml="using:Windows.UI.Xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:xaml="using:Windows.UI.Xaml">
<x:String x:Key="ThemeName">Custom</x:String> <x:String x:Key="ThemeName">Custom</x:String>
<x:String x:Key="ThemeBackgroundImage">ms-appdata:///local/CustomWallpaper.jpg</x:String> <x:String x:Key="ThemeBackgroundImage">ms-appdata:///local/CustomWallpaper.jpg</x:String>
@@ -9,11 +9,8 @@
<ImageBrush <ImageBrush
x:Key="WinoApplicationBackgroundColor" x:Key="WinoApplicationBackgroundColor"
Stretch="UniformToFill" ImageSource="{StaticResource ThemeBackgroundImage}"
ImageSource="{StaticResource ThemeBackgroundImage}" /> Stretch="UniformToFill" />
<Thickness x:Key="RendererGridMargin">0,0,0,0</Thickness>
<xaml:CornerRadius x:Key="MailListGridCornerRadius">0,6,6,0</xaml:CornerRadius>
<!-- Navigation View Settings --> <!-- Navigation View Settings -->
<xaml:CornerRadius x:Key="NavigationViewContentGridCornerRadius">0,0,0,0</xaml:CornerRadius> <xaml:CornerRadius x:Key="NavigationViewContentGridCornerRadius">0,0,0,0</xaml:CornerRadius>
@@ -27,9 +24,6 @@
<Color x:Key="MainCustomThemeColor">#D9FFFFFF</Color> <Color x:Key="MainCustomThemeColor">#D9FFFFFF</Color>
<!-- Reading Pane Background -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush" Color="{StaticResource MainCustomThemeColor}" />
<SolidColorBrush x:Key="AppBarBackgroundColor" Color="{StaticResource MainCustomThemeColor}" /> <SolidColorBrush x:Key="AppBarBackgroundColor" Color="{StaticResource MainCustomThemeColor}" />
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" /> <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="{StaticResource MainCustomThemeColor}" /> <SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="{StaticResource MainCustomThemeColor}" />

10
Wino.Mail/AppThemes/Forest.xaml
View File

@@ -1,7 +1,7 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:xaml="using:Windows.UI.Xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:xaml="using:Windows.UI.Xaml">
<x:String x:Key="ThemeName">Forest</x:String> <x:String x:Key="ThemeName">Forest</x:String>
<x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Forest.jpg</x:String> <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Forest.jpg</x:String>
@@ -9,18 +9,12 @@
<ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" /> <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
<SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush> <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
<Thickness x:Key="RendererGridMargin">4,0,4,0</Thickness>
<xaml:CornerRadius x:Key="MailListGridCornerRadius">6,6,6,6</xaml:CornerRadius>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Name="Light"> <ResourceDictionary x:Name="Light">
<!-- Brushes -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#2900F00A</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#A800D608</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#A800D608</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Name="Dark"> <ResourceDictionary x:Name="Dark">
<!-- Brushes -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3262626</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#59001C01</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#59001C01</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>

14
Wino.Mail/AppThemes/Garden.xaml
View File

@@ -1,7 +1,7 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:xaml="using:Windows.UI.Xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:xaml="using:Windows.UI.Xaml">
<x:String x:Key="ThemeName">Garden</x:String> <x:String x:Key="ThemeName">Garden</x:String>
<x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Garden.jpg</x:String> <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Garden.jpg</x:String>
@@ -9,19 +9,13 @@
<ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" /> <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
<SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush> <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
<Thickness x:Key="RendererGridMargin">4,0,4,0</Thickness>
<xaml:CornerRadius x:Key="MailListGridCornerRadius">6,6,6,6</xaml:CornerRadius>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Name="Light"> <ResourceDictionary x:Name="Light">
<!-- Brushes --> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#dcfad8</SolidColorBrush>
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3FFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#FFFFFF</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Name="Dark"> <ResourceDictionary x:Name="Dark">
<!-- Brushes --> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#dcfad8</SolidColorBrush>
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3262626</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#5413191F</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
</ResourceDictionary> </ResourceDictionary>

6
Wino.Mail/AppThemes/Mica.xaml
View File

@@ -8,20 +8,14 @@
<SolidColorBrush x:Key="WinoApplicationBackgroundColor">Transparent</SolidColorBrush> <SolidColorBrush x:Key="WinoApplicationBackgroundColor">Transparent</SolidColorBrush>
<SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush> <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
<Thickness x:Key="RendererGridMargin">0,0,4,0</Thickness>
<xaml:CornerRadius x:Key="MailListGridCornerRadius">6,6,6,6</xaml:CornerRadius>
<!-- Mica Template --> <!-- Mica Template -->
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Name="Light"> <ResourceDictionary x:Name="Light">
<!-- Reading Pane Background -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">white</SolidColorBrush>
<!-- Reading Page Date/Name Group Header Background --> <!-- Reading Page Date/Name Group Header Background -->
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#ecf0f1</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#ecf0f1</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Name="Dark"> <ResourceDictionary x:Name="Dark">
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">Transparent</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#1f1f1f</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#1f1f1f</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>

8
Wino.Mail/AppThemes/Nighty.xaml
View File

@@ -1,7 +1,7 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:xaml="using:Windows.UI.Xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:xaml="using:Windows.UI.Xaml">
<x:String x:Key="ThemeName">Nighty</x:String> <x:String x:Key="ThemeName">Nighty</x:String>
<x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Nighty.jpg</x:String> <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Nighty.jpg</x:String>
@@ -9,18 +9,14 @@
<ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" /> <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
<SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush> <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
<Thickness x:Key="RendererGridMargin">4,0,4,0</Thickness>
<xaml:CornerRadius x:Key="MailListGridCornerRadius">6,6,6,6</xaml:CornerRadius>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Name="Light"> <ResourceDictionary x:Name="Light">
<!-- Brushes --> <!-- Brushes -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3FFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#fdcb6e</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#fdcb6e</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Name="Dark"> <ResourceDictionary x:Name="Dark">
<!-- Brushes --> <!-- Brushes -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3262626</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#5413191F</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#5413191F</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>

12
Wino.Mail/AppThemes/Snowflake.xaml
View File

@@ -1,7 +1,7 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:xaml="using:Windows.UI.Xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:xaml="using:Windows.UI.Xaml">
<x:String x:Key="ThemeName">Snowflake</x:String> <x:String x:Key="ThemeName">Snowflake</x:String>
<x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Snowflake.jpg</x:String> <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Snowflake.jpg</x:String>
@@ -9,19 +9,15 @@
<ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" /> <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
<SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush> <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
<Thickness x:Key="RendererGridMargin">4,0,4,0</Thickness>
<xaml:CornerRadius x:Key="MailListGridCornerRadius">6,6,6,6</xaml:CornerRadius>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Name="Light"> <ResourceDictionary x:Name="Light">
<!-- Brushes --> <!-- Brushes -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3FFFFFF</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#b0c6dd</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#FFFFFF</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Name="Dark"> <ResourceDictionary x:Name="Dark">
<!-- Brushes --> <!-- Brushes -->
<SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3262626</SolidColorBrush> <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#b0c6dd</SolidColorBrush>
<SolidColorBrush x:Key="MailListHeaderBackgroundColor">#5413191F</SolidColorBrush>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
</ResourceDictionary> </ResourceDictionary>

4
Wino.Mail/Styles/Colors.xaml
View File

@@ -13,13 +13,13 @@
<ResourceDictionary x:Name="Light"> <ResourceDictionary x:Name="Light">
<SolidColorBrush x:Key="AttachmentBrush">#fdcb6e</SolidColorBrush> <SolidColorBrush x:Key="AttachmentBrush">#fdcb6e</SolidColorBrush>
<SolidColorBrush x:Key="SettingsPaneBorderBrush">#636e72</SolidColorBrush> <SolidColorBrush x:Key="SettingsPaneBorderBrush">#636e72</SolidColorBrush>
<SolidColorBrush x:Key="WorkZoneBackground" Color="White" /> <SolidColorBrush x:Key="WinoContentZoneBackgroud" Color="White" />
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Name="Dark"> <ResourceDictionary x:Name="Dark">
<SolidColorBrush x:Key="AttachmentBrush">#fdcb6e</SolidColorBrush> <SolidColorBrush x:Key="AttachmentBrush">#fdcb6e</SolidColorBrush>
<SolidColorBrush x:Key="SettingsPaneBorderBrush">#2d3436</SolidColorBrush> <SolidColorBrush x:Key="SettingsPaneBorderBrush">#2d3436</SolidColorBrush>
<local:AcrylicBrush <local:AcrylicBrush
x:Key="WorkZoneBackground" x:Key="WinoContentZoneBackgroud"
BackgroundSource="Backdrop" BackgroundSource="Backdrop"
FallbackColor="#2C2C2C" FallbackColor="#2C2C2C"
TintColor="#2C2C2C" TintColor="#2C2C2C"

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

@@ -107,7 +107,12 @@
</DataTemplate> </DataTemplate>
</Page.Resources> </Page.Resources>
<Grid Padding="7,0,7,7"> <Grid
Padding="7,0,7,7"
AllowDrop="True"
DragLeave="OnComposeGridDragLeave"
DragOver="OnComposeGridDragOver"
RowSpacing="7">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
@@ -115,17 +120,11 @@
<Border <Border
Grid.Row="0" Grid.Row="0"
Margin="0,0,0,7" Background="{ThemeResource WinoContentZoneBackgroud}"
Background="{ThemeResource WorkZoneBackground}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}" BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="7"> CornerRadius="7">
<Grid <Grid>
Grid.Row="0"
AllowDrop="True"
Background="{ThemeResource AppBarBackgroundColor}"
DragLeave="OnComposeGridDragLeave"
DragOver="OnComposeGridDragOver">
<Grid.Resources> <Grid.Resources>
<SolidColorBrush x:Key="AutoSuggestBoxBorderThemeBrush">Transparent</SolidColorBrush> <SolidColorBrush x:Key="AutoSuggestBoxBorderThemeBrush">Transparent</SolidColorBrush>
</Grid.Resources> </Grid.Resources>
@@ -467,7 +466,7 @@
<!-- Mime Info --> <!-- Mime Info -->
<Grid <Grid
Grid.Row="2" Grid.Row="2"
Padding="16,0" Padding="16,0,16,10"
ColumnSpacing="12" ColumnSpacing="12"
RowSpacing="3"> RowSpacing="3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -477,7 +476,6 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@@ -509,14 +507,14 @@
<!-- To --> <!-- To -->
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="1"
Margin="0,4,0,0" Margin="0,4,0,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Bind domain:Translator.ComposerTo}" /> Text="{x:Bind domain:Translator.ComposerTo}" />
<Grid <Grid
Grid.Row="2" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@@ -559,7 +557,7 @@
<!-- CC BCC --> <!-- CC BCC -->
<TextBlock <TextBlock
x:Name="CCTextBlock" x:Name="CCTextBlock"
Grid.Row="3" Grid.Row="2"
Margin="0,4,0,0" Margin="0,4,0,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -568,7 +566,7 @@
<controls1:TokenizingTextBox <controls1:TokenizingTextBox
x:Name="CCBox" x:Name="CCBox"
Grid.Row="3" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
LostFocus="AddressBoxLostFocus" LostFocus="AddressBoxLostFocus"
@@ -582,7 +580,7 @@
<TextBlock <TextBlock
x:Name="BccTextBlock" x:Name="BccTextBlock"
Grid.Row="4" Grid.Row="3"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="Bcc: " Text="Bcc: "
@@ -590,7 +588,7 @@
<controls1:TokenizingTextBox <controls1:TokenizingTextBox
x:Name="BccBox" x:Name="BccBox"
Grid.Row="4" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
LostFocus="AddressBoxLostFocus" LostFocus="AddressBoxLostFocus"
@@ -604,14 +602,14 @@
<!-- Subject --> <!-- Subject -->
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="4"
Margin="0,4,0,0" Margin="0,4,0,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Bind domain:Translator.ComposerSubject}" /> Text="{x:Bind domain:Translator.ComposerSubject}" />
<TextBox <TextBox
Grid.Row="5" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Margin="0,4,0,0" Margin="0,4,0,0"
BorderThickness="0" BorderThickness="0"
@@ -620,7 +618,7 @@
<!-- Attachments --> <!-- Attachments -->
<ListView <ListView
x:Name="AttachmentsListView" x:Name="AttachmentsListView"
Grid.Row="6" Grid.Row="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"
@@ -645,10 +643,7 @@
DragOver="OnFileDropGridDragOver" DragOver="OnFileDropGridDragOver"
Drop="OnFileDropGridFileDropped" Drop="OnFileDropGridFileDropped"
Visibility="{x:Bind ViewModel.IsDraggingOverComposerGrid, Mode=OneWay}"> Visibility="{x:Bind ViewModel.IsDraggingOverComposerGrid, Mode=OneWay}">
<Grid <Grid Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}" CornerRadius="9">
Margin="0,7,5,0"
Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
CornerRadius="9">
<Rectangle <Rectangle
x:Name="DropZoneBorder" x:Name="DropZoneBorder"
Fill="Transparent" Fill="Transparent"
@@ -704,7 +699,7 @@
</Border> </Border>
<Border <Border
Grid.Row="1" Grid.Row="1"
Background="{ThemeResource WorkZoneBackground}" Background="{ThemeResource WinoContentZoneBackgroud}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}" BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="10"> CornerRadius="10">

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

@@ -415,7 +415,7 @@
Grid.Column="0" Grid.Column="0"
Margin="0,0,0,7" Margin="0,0,0,7"
Padding="5,0,0,0" Padding="5,0,0,0"
Background="{ThemeResource WorkZoneBackground}" Background="{ThemeResource WinoContentZoneBackgroud}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}" BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="7"> CornerRadius="7">

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

@@ -158,7 +158,7 @@
<Border <Border
Grid.Row="0" Grid.Row="0"
Margin="0,0,0,7" Margin="0,0,0,7"
Background="{ThemeResource WorkZoneBackground}" Background="{ThemeResource WinoContentZoneBackgroud}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}" BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="7"> CornerRadius="7">
@@ -363,7 +363,7 @@
<Border <Border
Grid.Row="1" Grid.Row="1"
Background="{ThemeResource WorkZoneBackground}" Background="{ThemeResource WinoContentZoneBackgroud}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}" BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="10"> CornerRadius="10">