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>

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

File diff suppressed because one or more lines are too long

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

@@ -4,44 +4,51 @@
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">
<Grid <Border
MaxWidth="900" Margin="0,0,7,7"
Padding="20" Background="{ThemeResource WinoContentZoneBackgroud}"
HorizontalAlignment="Stretch" BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
RowSpacing="20"> BorderThickness="1"
<Grid.RowDefinitions> CornerRadius="7">
<RowDefinition Height="Auto" /> <Grid
<RowDefinition Height="*" /> MaxWidth="900"
</Grid.RowDefinitions> Padding="20"
HorizontalAlignment="Stretch"
RowSpacing="20">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<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">
<winuiControls:BreadcrumbBarItem.ContentTemplate> <winuiControls:BreadcrumbBarItem.ContentTemplate>
<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>
</DataTemplate> </DataTemplate>
</winuiControls:BreadcrumbBar.ItemTemplate> </winuiControls:BreadcrumbBar.ItemTemplate>
</winuiControls:BreadcrumbBar> </winuiControls:BreadcrumbBar>
<Frame x:Name="AccountPagesFrame" Grid.Row="1" /> <Frame x:Name="AccountPagesFrame" Grid.Row="1" />
</Grid> </Grid>
</Border>
</abstract:NewAccountManagementPageAbstract> </abstract:NewAccountManagementPageAbstract>

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

@@ -4,44 +4,51 @@
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">
<Grid <Border
MaxWidth="900" Margin="0,0,7,7"
Padding="20" Background="{ThemeResource WinoContentZoneBackgroud}"
HorizontalAlignment="Stretch" BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
RowSpacing="20"> BorderThickness="1"
<Grid.RowDefinitions> CornerRadius="7">
<RowDefinition Height="Auto" /> <Grid
<RowDefinition Height="*" /> MaxWidth="900"
</Grid.RowDefinitions> Padding="20"
HorizontalAlignment="Stretch"
RowSpacing="20">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<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">
<winuiControls:BreadcrumbBarItem.ContentTemplate> <winuiControls:BreadcrumbBarItem.ContentTemplate>
<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>
</DataTemplate> </DataTemplate>
</winuiControls:BreadcrumbBar.ItemTemplate> </winuiControls:BreadcrumbBar.ItemTemplate>
</winuiControls:BreadcrumbBar> </winuiControls:BreadcrumbBar>
<Frame x:Name="SettingsFrame" Grid.Row="1" /> <Frame x:Name="SettingsFrame" Grid.Row="1" />
</Grid> </Grid>
</Border>
</abstract:SettingsPageAbstract> </abstract:SettingsPageAbstract>

45
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">
<Grid Padding="24"> <Border
<ScrollViewer> Margin="0,0,7,7"
<controls:MarkdownTextBlock Background="{ThemeResource WinoContentZoneBackgroud}"
x:Name="MarkdownControl" BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
LinkClicked="HyperlinkClicked" BorderThickness="1"
Background="Transparent" CornerRadius="7">
ImageStretch="UniformToFill" <Grid Padding="24">
Text="{x:Bind ViewModel.CurrentVersionNotes, Mode=OneWay}" <ScrollViewer>
ListBulletSpacing="10" <controls:MarkdownTextBlock
Header1FontSize="30" x:Name="MarkdownControl"
CharacterSpacing="12" Background="Transparent"
FontSize="16" CharacterSpacing="12"
Header2FontSize="22" /> FontSize="16"
</ScrollViewer> Header1FontSize="30"
</Grid> Header2FontSize="22"
ImageStretch="UniformToFill"
LinkClicked="HyperlinkClicked"
ListBulletSpacing="10"
Text="{x:Bind ViewModel.CurrentVersionNotes, Mode=OneWay}" />
</ScrollViewer>
</Grid>
</Border>
</abstract:WelcomePageAbstract> </abstract:WelcomePageAbstract>