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

Fix backgrounds

Browse Source
This commit is contained in:
Aleh Khantsevich
2024-06-25 00:37:09 +02:00
parent bb418e51d4
commit 0b96f69a1d
5 changed files with 167 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,12 +18,7 @@
<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 <StaticResource x:Key="WinoContentZoneBackgroud" ResourceKey="LayerFillColorDefaultBrush" />
x:Key="WinoContentZoneBackgroud"
BackgroundSource="Backdrop"
FallbackColor="#2C2C2C"
TintColor="#2C2C2C"
TintOpacity="0.30" />
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
</ResourceDictionary> </ResourceDictionary>

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

File diff suppressed because one or more lines are too long

19
Wino.Mail/Views/NewAccountManagementPage.xaml
View File

@@ -4,13 +4,19 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:abstract="using:Wino.Views.Abstract" xmlns:abstract="using:Wino.Views.Abstract"
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:winuiControls="using:Microsoft.UI.Xaml.Controls"
xmlns:helpers="using:Wino.Helpers" xmlns:helpers="using:Wino.Helpers"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModelData="using:Wino.Mail.ViewModels.Data" xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
xmlns:winuiControls="using:Microsoft.UI.Xaml.Controls"
Style="{StaticResource PageStyle}" Style="{StaticResource PageStyle}"
mc:Ignorable="d"> mc:Ignorable="d">
<Border
Margin="0,0,7,7"
Background="{ThemeResource WinoContentZoneBackgroud}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="7">
<Grid <Grid
MaxWidth="900" MaxWidth="900"
Padding="20" Padding="20"
@@ -23,8 +29,8 @@
<winuiControls:BreadcrumbBar <winuiControls:BreadcrumbBar
x:Name="Breadcrumb" x:Name="Breadcrumb"
ItemsSource="{x:Bind PageHistory, Mode=OneWay}" ItemClicked="BreadItemClicked"
ItemClicked="BreadItemClicked"> ItemsSource="{x:Bind PageHistory, Mode=OneWay}">
<winuiControls:BreadcrumbBar.ItemTemplate> <winuiControls:BreadcrumbBar.ItemTemplate>
<DataTemplate> <DataTemplate>
<winuiControls:BreadcrumbBarItem Margin="0,0,8,0"> <winuiControls:BreadcrumbBarItem Margin="0,0,8,0">
@@ -32,9 +38,9 @@
<DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel"> <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
<TextBlock <TextBlock
Margin="0,0,8,10" Margin="0,0,8,10"
Text="{Binding Title, Mode=OneWay}"
FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsActive), Mode=OneWay}" FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsActive), Mode=OneWay}"
Style="{StaticResource TitleTextBlockStyle}" /> Style="{StaticResource TitleTextBlockStyle}"
Text="{Binding Title, Mode=OneWay}" />
</DataTemplate> </DataTemplate>
</winuiControls:BreadcrumbBarItem.ContentTemplate> </winuiControls:BreadcrumbBarItem.ContentTemplate>
</winuiControls:BreadcrumbBarItem> </winuiControls:BreadcrumbBarItem>
@@ -44,4 +50,5 @@
<Frame x:Name="AccountPagesFrame" Grid.Row="1" /> <Frame x:Name="AccountPagesFrame" Grid.Row="1" />
</Grid> </Grid>
</Border>
</abstract:NewAccountManagementPageAbstract> </abstract:NewAccountManagementPageAbstract>

19
Wino.Mail/Views/SettingsPage.xaml
View File

@@ -4,13 +4,19 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:abstract="using:Wino.Views.Abstract" xmlns:abstract="using:Wino.Views.Abstract"
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:winuiControls="using:Microsoft.UI.Xaml.Controls"
xmlns:helpers="using:Wino.Helpers" xmlns:helpers="using:Wino.Helpers"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModelData="using:Wino.Mail.ViewModels.Data" xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
xmlns:winuiControls="using:Microsoft.UI.Xaml.Controls"
Style="{StaticResource PageStyle}" Style="{StaticResource PageStyle}"
mc:Ignorable="d"> mc:Ignorable="d">
<Border
Margin="0,0,7,7"
Background="{ThemeResource WinoContentZoneBackgroud}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="7">
<Grid <Grid
MaxWidth="900" MaxWidth="900"
Padding="20" Padding="20"
@@ -23,8 +29,8 @@
<winuiControls:BreadcrumbBar <winuiControls:BreadcrumbBar
x:Name="Breadcrumb" x:Name="Breadcrumb"
ItemsSource="{x:Bind PageHistory, Mode=OneWay}" ItemClicked="BreadItemClicked"
ItemClicked="BreadItemClicked"> ItemsSource="{x:Bind PageHistory, Mode=OneWay}">
<winuiControls:BreadcrumbBar.ItemTemplate> <winuiControls:BreadcrumbBar.ItemTemplate>
<DataTemplate> <DataTemplate>
<winuiControls:BreadcrumbBarItem Margin="0,0,8,0"> <winuiControls:BreadcrumbBarItem Margin="0,0,8,0">
@@ -32,9 +38,9 @@
<DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel"> <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
<TextBlock <TextBlock
Margin="0,0,8,10" Margin="0,0,8,10"
Text="{Binding Title}"
FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsActive), Mode=OneWay}" FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsActive), Mode=OneWay}"
Style="{StaticResource TitleTextBlockStyle}" /> Style="{StaticResource TitleTextBlockStyle}"
Text="{Binding Title}" />
</DataTemplate> </DataTemplate>
</winuiControls:BreadcrumbBarItem.ContentTemplate> </winuiControls:BreadcrumbBarItem.ContentTemplate>
</winuiControls:BreadcrumbBarItem> </winuiControls:BreadcrumbBarItem>
@@ -44,4 +50,5 @@
<Frame x:Name="SettingsFrame" Grid.Row="1" /> <Frame x:Name="SettingsFrame" Grid.Row="1" />
</Grid> </Grid>
</Border>
</abstract:SettingsPageAbstract> </abstract:SettingsPageAbstract>

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

@@ -1,28 +1,35 @@
<abstract:WelcomePageAbstract <abstract:WelcomePageAbstract
xmlns:abstract="using:Wino.Views.Abstract"
x:Class="Wino.Views.WelcomePage" x:Class="Wino.Views.WelcomePage"
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:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Wino.Views" xmlns:abstract="using:Wino.Views.Abstract"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Wino.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"> mc:Ignorable="d">
<Border
Margin="0,0,7,7"
Background="{ThemeResource WinoContentZoneBackgroud}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="7">
<Grid Padding="24"> <Grid Padding="24">
<ScrollViewer> <ScrollViewer>
<controls:MarkdownTextBlock <controls:MarkdownTextBlock
x:Name="MarkdownControl" x:Name="MarkdownControl"
LinkClicked="HyperlinkClicked"
Background="Transparent" Background="Transparent"
ImageStretch="UniformToFill"
Text="{x:Bind ViewModel.CurrentVersionNotes, Mode=OneWay}"
ListBulletSpacing="10"
Header1FontSize="30"
CharacterSpacing="12" CharacterSpacing="12"
FontSize="16" FontSize="16"
Header2FontSize="22" /> Header1FontSize="30"
Header2FontSize="22"
ImageStretch="UniformToFill"
LinkClicked="HyperlinkClicked"
ListBulletSpacing="10"
Text="{x:Bind ViewModel.CurrentVersionNotes, Mode=OneWay}" />
</ScrollViewer> </ScrollViewer>
</Grid> </Grid>
</Border>
</abstract:WelcomePageAbstract> </abstract:WelcomePageAbstract>