From eba3a21ff92a89aae888195a8ec52f35052ce011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= <leo.peyronnet@outlook.fr>
Date: Tue, 15 Jun 2021 16:00:18 +0200
Subject: [PATCH] Redesigned "About" section in settings (#13)

---
 ColorPicker/Pages/SettingsPage.xaml    | 31 ++++++++++++++++----------
 ColorPicker/Pages/SettingsPage.xaml.cs |  2 ++
 ColorPicker/Themes/Dark.xaml           |  1 +
 ColorPicker/Themes/Light.xaml          |  1 +
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/ColorPicker/Pages/SettingsPage.xaml b/ColorPicker/Pages/SettingsPage.xaml
index 71db545..81e17bd 100644
--- a/ColorPicker/Pages/SettingsPage.xaml
+++ b/ColorPicker/Pages/SettingsPage.xaml
@@ -11,7 +11,7 @@
       Title="SettingsPage">
 
 	<ScrollViewer HorizontalScrollBarVisibility="Hidden" Template="{DynamicResource ScrollViewerControlTemplate}" CanContentScroll="True" Height="344">
-		<Grid Height="600">
+		<Grid Height="640">
 			<Grid.RowDefinitions>
 				<RowDefinition/>
 				<RowDefinition Height="Auto"/>
@@ -19,20 +19,27 @@
 
 			<StackPanel Margin="10,40,10,10" Grid.Row="0">
 				<TextBlock Text="{x:Static lang:Resources.Settings}" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="16"/>
-
-				<TextBlock Text="{x:Static lang:Resources.Updates}" Foreground="{Binding Source={StaticResource Foreground1}}" FontWeight="Bold" FontSize="20" Margin="0,10,0,0"/>
-				<StackPanel Orientation="Horizontal">
-					<TextBlock x:Name="UpdateStatusTxt" Text="{x:Static lang:Resources.Updates}" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="14" VerticalAlignment="Center" Margin="0,0,15,0"/>
-					<Button x:Name="RefreshInstallBtn" Click="RefreshInstallBtn_Click" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" Padding="10,5,10,5" Style="{StaticResource TabButtonStyle}" FontWeight="Bold" Cursor="Hand" VerticalAlignment="Center">
+				<Border Background="{Binding Source={StaticResource Background3}}" CornerRadius="10" Margin="10" Padding="10" HorizontalAlignment="Left">
+					<Border.Effect>
+						<DropShadowEffect Color="Black" ShadowDepth="0" BlurRadius="10" Opacity="0.4" RenderingBias="Quality"/>
+					</Border.Effect>
+					<StackPanel>
+						<TextBlock Text="{x:Static lang:Resources.ColorPicker}" Foreground="{Binding Source={StaticResource Foreground1}}" FontWeight="Bold" FontSize="28" Margin="0,0,0,0"/>
+						<TextBlock x:Name="VersionTxt" Text="{x:Static lang:Resources.ColorPicker}" Foreground="{Binding Source={StaticResource Foreground1}}" FontWeight="Normal" Margin="0,0,0,5" FontSize="14"/>
 						<StackPanel Orientation="Horizontal">
-							<TextBlock x:Name="InstallIconTxt" Text="&#xF152;" FontWeight="Regular" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Margin="0,0,5,0" VerticalAlignment="Center" FontSize="16"/>
-							<TextBlock x:Name="InstallMsgTxt" Text="{x:Static lang:Resources.Install}" VerticalAlignment="Center"/>
+							<TextBlock x:Name="UpdateStatusTxt" Text="{x:Static lang:Resources.Updates}" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="14" VerticalAlignment="Center" Margin="0,0,15,0"/>
+							<Button x:Name="RefreshInstallBtn" Click="RefreshInstallBtn_Click" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" Padding="10,5,10,5" Style="{StaticResource TabButtonStyle}" FontWeight="Bold" Cursor="Hand" VerticalAlignment="Center">
+								<StackPanel Orientation="Horizontal">
+									<TextBlock x:Name="InstallIconTxt" Text="&#xF152;" FontWeight="Regular" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Margin="0,0,5,0" VerticalAlignment="Center" FontSize="16"/>
+									<TextBlock x:Name="InstallMsgTxt" Text="{x:Static lang:Resources.Install}" VerticalAlignment="Center"/>
+								</StackPanel>
+							</Button>
 						</StackPanel>
-					</Button>
-				</StackPanel>
+						<CheckBox Margin="0 10 0 2" x:Name="CheckUpdatesOnStartChk" Style="{DynamicResource CheckBoxStyle1}" Content="{x:Static lang:Resources.CheckUpdatesOnStart}" BorderThickness="3" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="14" VerticalContentAlignment="Center" Unchecked="CheckUpdatesOnStartChk_Checked" Checked="CheckUpdatesOnStartChk_Checked"/>
+						<CheckBox Margin="0 2 0 2" x:Name="NotifyUpdatesChk" Style="{DynamicResource CheckBoxStyle1}" Content="{x:Static lang:Resources.NotifyUpdates}" BorderThickness="3" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="14" VerticalContentAlignment="Center" Unchecked="NotifyUpdatesChk_Checked" Checked="NotifyUpdatesChk_Checked"/>
 
-				<CheckBox Margin="0 10 0 2" x:Name="CheckUpdatesOnStartChk" Style="{DynamicResource CheckBoxStyle1}" Content="{x:Static lang:Resources.CheckUpdatesOnStart}" BorderThickness="3" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="14" VerticalContentAlignment="Center" Unchecked="CheckUpdatesOnStartChk_Checked" Checked="CheckUpdatesOnStartChk_Checked"/>
-				<CheckBox Margin="0 2 0 2" x:Name="NotifyUpdatesChk" Style="{DynamicResource CheckBoxStyle1}" Content="{x:Static lang:Resources.NotifyUpdates}" BorderThickness="3" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="14" VerticalContentAlignment="Center" Unchecked="NotifyUpdatesChk_Checked" Checked="NotifyUpdatesChk_Checked"/>
+					</StackPanel>
+				</Border>
 
 				<TextBlock Text="{x:Static lang:Resources.Theme}" Foreground="{Binding Source={StaticResource Foreground1}}" FontWeight="Bold" FontSize="20" Margin="0,10,0,0"/>
 				<TextBlock Text="{x:Static lang:Resources.ChangeTheme}" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="14"/>
diff --git a/ColorPicker/Pages/SettingsPage.xaml.cs b/ColorPicker/Pages/SettingsPage.xaml.cs
index febb32e..b6931e4 100644
--- a/ColorPicker/Pages/SettingsPage.xaml.cs
+++ b/ColorPicker/Pages/SettingsPage.xaml.cs
@@ -139,6 +139,8 @@ private async void InitUI()
 					InstallIconTxt.Text = "\uF191"; // Set text 
 				}
 
+				VersionTxt.Text = Global.Version; // Set text
+
 				SettingsManager.Save(); // Save changes
 			}
 			catch (Exception ex)
diff --git a/ColorPicker/Themes/Dark.xaml b/ColorPicker/Themes/Dark.xaml
index 6ef1673..3926cba 100644
--- a/ColorPicker/Themes/Dark.xaml
+++ b/ColorPicker/Themes/Dark.xaml
@@ -4,6 +4,7 @@
 
 	<sys:String x:Key="Background1">#0A0A1E</sys:String>
 	<sys:String x:Key="Background2">#141428</sys:String>
+	<sys:String x:Key="Background3">#141428</sys:String>
 	<sys:String x:Key="Foreground1">#FFFFFF</sys:String>
 	<sys:String x:Key="WindowButtonsHover1">#141428</sys:String>
 	<sys:String x:Key="WindowButtonsPressed1">#1E1E32</sys:String>
diff --git a/ColorPicker/Themes/Light.xaml b/ColorPicker/Themes/Light.xaml
index 0819675..ad7ac78 100644
--- a/ColorPicker/Themes/Light.xaml
+++ b/ColorPicker/Themes/Light.xaml
@@ -4,6 +4,7 @@
 
 	<sys:String x:Key="Background1">#ffffff</sys:String>
 	<sys:String x:Key="Background2">#e9e9e9</sys:String>
+	<sys:String x:Key="Background3">#ffffff</sys:String>
 	<sys:String x:Key="Foreground1">#000000</sys:String>
 	<sys:String x:Key="WindowButtonsHover1">#E5E5E5</sys:String>
 	<sys:String x:Key="WindowButtonsPressed1">#DBDBDB</sys:String>