From 4aa3b17398f74ecf384889c47b5a623df879f08e Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <geogeob@hotmail.com>
Date: Thu, 5 Oct 2017 18:40:24 +0200
Subject: [PATCH] Some layout enhancements Changed controls to use static or
 theme resources Switch to light theme (mainly for testing)

---
 .gitignore                               |  2 +-
 ModernKeePass/App.xaml                   |  8 +--
 ModernKeePass/Pages/GroupDetailPage.xaml | 87 ++++++++++++------------
 ModernKeePass/ViewModels/EntryVm.cs      | 13 ++--
 4 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/.gitignore b/.gitignore
index fcf4cce..e871643 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,7 @@ _ReSharper*/
 Translation/TrlUtil.vshost.exe.manifest
 *.nupkg
 .vs/
-/UpgradeLog.htm
+/UpgradeLog*.htm
 packages/
 project.lock.json
 AppPackages/
\ No newline at end of file
diff --git a/ModernKeePass/App.xaml b/ModernKeePass/App.xaml
index 86fd33e..9866df7 100644
--- a/ModernKeePass/App.xaml
+++ b/ModernKeePass/App.xaml
@@ -2,7 +2,7 @@
     x:Class="ModernKeePass.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008">
+    RequestedTheme="Light">
     <Application.Resources>
         <Style TargetType="ToggleButton" x:Name="HamburgerToggleButton">
             <Setter Property="Template">
@@ -18,13 +18,13 @@
                                         <Canvas.Projection>
                                             <PlaneProjection/>
                                         </Canvas.Projection>
-                                        <Path x:Name="path" Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="#FF362D2D" StrokeStartLineCap="Square" StrokeEndLineCap="Square" RenderTransformOrigin="0.5,0.5">
+                                        <Path x:Name="path" Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="{ThemeResource DefaultTextForegroundThemeBrush}" StrokeStartLineCap="Square" StrokeEndLineCap="Square" RenderTransformOrigin="0.5,0.5">
                                             <Path.RenderTransform>
                                                 <CompositeTransform/>
                                             </Path.RenderTransform>
                                         </Path>
-                                        <Path Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="#FF362D2D" StrokeStartLineCap="Square" StrokeEndLineCap="Square" Canvas.Top="7"/>
-                                        <Path x:Name="path1" Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="#FF362D2D" StrokeStartLineCap="Square" StrokeEndLineCap="Square" Canvas.Top="14" RenderTransformOrigin="0.5,0.5">
+                                        <Path Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="{ThemeResource DefaultTextForegroundThemeBrush}" StrokeStartLineCap="Square" StrokeEndLineCap="Square" Canvas.Top="7"/>
+                                        <Path x:Name="path1" Data="M0,12.997 L30,12.997" Height="3" Stretch="Fill" StrokeThickness="3" Width="28" Stroke="{ThemeResource DefaultTextForegroundThemeBrush}" StrokeStartLineCap="Square" StrokeEndLineCap="Square" Canvas.Top="14" RenderTransformOrigin="0.5,0.5">
                                             <Path.RenderTransform>
                                                 <CompositeTransform/>
                                             </Path.RenderTransform>
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index 61465b8..f2b8059 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -6,21 +6,21 @@
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:converters="using:ModernKeePass.Converters"
     xmlns:local="using:ModernKeePass.Controls"
-    xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" 
-    xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.GroupDetailPage"
     mc:Ignorable="d" >
     <Page.Resources>
         <SolidColorBrush x:Key="Transparent" Color="Transparent"/>
-        <SolidColorBrush x:Key="White" Color="White"/>
+        <SolidColorBrush x:Key="SystemColor" Color="{StaticResource SystemColorButtonFaceColor}" />
         <converters:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
         <converters:PluralizationConverter x:Key="PluralizationConverter"/>
     </Page.Resources>
     <Page.DataContext>
         <viewModels:GroupVm />
     </Page.DataContext>
-    <Grid>
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
         <Grid.Resources>
             <CollectionViewSource
                 x:Name="GroupsViewSource"
@@ -29,17 +29,17 @@
                 x:Name="EntriesViewSource"
                 Source="{Binding Entries}"/>
         </Grid.Resources>
-        <!--<Grid.ChildrenTransitions>
+        <Grid.ChildrenTransitions>
             <TransitionCollection>
                 <EntranceThemeTransition/>
             </TransitionCollection>
-        </Grid.ChildrenTransitions>-->
+        </Grid.ChildrenTransitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="140"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <!-- Horizontal scrolling grid -->
-        <SemanticZoom Grid.RowSpan="2" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Padding="0,140,0,0">
+        <SemanticZoom Grid.Row="1" >
             <SemanticZoom.ZoomedInView>
                 <GridView
                     x:Name="GridView"
@@ -48,30 +48,30 @@
                     TabIndex="1"
                     IsSwipeEnabled="false" 
                     SelectionChanged="entries_SelectionChanged"
-                    IsSynchronizedWithCurrentItem="False" >
+                    IsSynchronizedWithCurrentItem="False">
                     <GridView.Resources>
                         <DataTemplate x:Name="GroupFirstItem">
                             <Border 
                                 BorderThickness="2" 
-                                BorderBrush="DimGray" 
-                                Background="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}" 
+                                BorderBrush="{StaticResource ListViewItemFocusBorderThemeBrush}" 
+                                Background="{StaticResource HubSectionHeaderPressedForegroundThemeBrush}" 
+                                Margin="0,10,0,0" >
+                                <Grid Height="110" Width="480">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" />
+                                    <TextBlock Grid.Column="1" Text="{Binding Title}" FontWeight="Bold" Style="{ThemeResource TitleTextBlockStyle}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="13,0,0,5"/>
+                                </Grid>
+                            </Border>
+                        </DataTemplate>
+                        <DataTemplate x:Name="GroupOtherItem">
+                            <Border 
+                                BorderThickness="2" 
+                                BorderBrush="{StaticResource ListViewItemFocusBorderThemeBrush}"
+                                Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}" 
                                 Margin="0,10,0,0" >
-                                <Grid Height="110" Width="480" >
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" />
-                                    <TextBlock Grid.Column="1" Text="{Binding Title}" FontWeight="{Binding FontWeight}"  Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="13,0,0,5"/>
-                                </Grid>
-                            </Border>
-                        </DataTemplate>
-                        <DataTemplate x:Name="GroupOtherItem">
-                            <Border 
-                                    BorderThickness="2" 
-                                    BorderBrush="DimGray" 
-                                    Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}" 
-                                    Margin="0,10,0,0" >
                                 <Grid Height="110" Width="480" >
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"/>
@@ -79,7 +79,7 @@
                                     </Grid.ColumnDefinitions>
                                     <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" />
                                     <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0" >
-                                        <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource White}, Converter={StaticResource ColorToBrushConverter}}"/>
+                                        <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource TextBoxForegroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}"/>
                                         <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
                                         <!--<TextBlock Text="{Binding EntryCount, ConverterParameter=entry\,entries, Converter={StaticResource PluralizationConverter}}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
                                         <TextBlock Text="{Binding GroupCount, ConverterParameter=group\,groups, Converter={StaticResource PluralizationConverter}}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />-->
@@ -109,23 +109,22 @@
                     <GridView.Header>
                         <ListView 
                             x:Name="LeftListView"
-                            Height="auto" 
-                            Width="auto"
-                            Background="LightGray"
-                            Foreground="DarkSlateGray"
                             SelectionChanged="groups_SelectionChanged"
                             IsSwipeEnabled="false"
                             IsSynchronizedWithCurrentItem="False"
-                            DataContext="{Binding DataContext, ElementName=PageRoot}">
+                            DataContext="{Binding DataContext, ElementName=PageRoot}" 
+                            RequestedTheme="Dark"
+                            Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+                            Foreground="{ThemeResource DefaultTextForegroundThemeBrush}">
                             <ListView.Resources>
                                 <DataTemplate x:Name="Collapsed">
-                                    <StackPanel Margin="10,0,0,0" Width="30" Orientation="Horizontal" >
+                                    <StackPanel Width="30" Orientation="Horizontal" Margin="20,0,0,0" >
                                         <SymbolIcon Symbol="{Binding IconSymbol}" />
                                     </StackPanel>
                                 </DataTemplate>
                                 <DataTemplate x:Name="Expanded">
-                                    <StackPanel Margin="10,0,0,0" Width="200" Orientation="Horizontal" >
-                                        <SymbolIcon Symbol="{Binding IconSymbol}" />
+                                    <StackPanel Width="200" Orientation="Horizontal" >
+                                        <SymbolIcon Symbol="{Binding IconSymbol}" Margin="20,0,0,0" />
                                         <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,0,0" />
                                         <!--<TextBlock Text="{Binding EntryCount}" HorizontalAlignment="Right" VerticalAlignment="Center" />-->
                                     </StackPanel>
@@ -136,7 +135,7 @@
                             </ListView.ItemsSource>
                             <ListView.ItemContainerStyle>
                                 <Style TargetType="ListViewItem">
-                                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                    <!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />-->
                                     <Setter Property="VerticalContentAlignment" Value="Stretch" />
                                 </Style>
                             </ListView.ItemContainerStyle>
@@ -145,14 +144,14 @@
                                     <ToggleButton IsChecked="{Binding IsLeftPaneOpen, Mode=TwoWay}" Style="{StaticResource HamburgerToggleButton}" Margin="0" />
                                 </DataTemplate>
                             </ListView.HeaderTemplate>
-                            <Interactivity:Interaction.Behaviors>
-                                <Core:DataTriggerBehavior Binding="{Binding IsLeftPaneOpen}" Value="True">
-                                    <Core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Expanded}"/>
-                                </Core:DataTriggerBehavior>
-                                <Core:DataTriggerBehavior Binding="{Binding IsLeftPaneOpen}" Value="False">
-                                    <Core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}"/>
-                                </Core:DataTriggerBehavior>
-                            </Interactivity:Interaction.Behaviors>
+                            <interactivity:Interaction.Behaviors>
+                                <core:DataTriggerBehavior Binding="{Binding IsLeftPaneOpen}" Value="True">
+                                    <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Expanded}"/>
+                                </core:DataTriggerBehavior>
+                                <core:DataTriggerBehavior Binding="{Binding IsLeftPaneOpen}" Value="False">
+                                    <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}"/>
+                                </core:DataTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
                         </ListView>
                     </GridView.Header>
                 </GridView>
diff --git a/ModernKeePass/ViewModels/EntryVm.cs b/ModernKeePass/ViewModels/EntryVm.cs
index 19c09ad..0e89a64 100644
--- a/ModernKeePass/ViewModels/EntryVm.cs
+++ b/ModernKeePass/ViewModels/EntryVm.cs
@@ -1,11 +1,8 @@
-using Windows.UI.Xaml.Controls;
+using Windows.UI.Text;
+using Windows.UI.Xaml.Controls;
 using ModernKeePass.Mappings;
 using ModernKeePassLib;
 using ModernKeePassLib.Security;
-using Windows.UI.Xaml.Media;
-using Windows.UI;
-using Windows.UI.Text;
-using Windows.UI.Xaml;
 
 namespace ModernKeePass.ViewModels
 {
@@ -13,6 +10,9 @@ namespace ModernKeePass.ViewModels
     {
         public GroupVm ParentGroup { get; }
         public PwEntry Entry => _pwEntry;
+        public System.Drawing.Color? BackgroundColor => _pwEntry?.BackgroundColor;
+        public System.Drawing.Color? ForegroundColor => _pwEntry?.ForegroundColor;
+
         public string Title
         {
             get
@@ -42,10 +42,7 @@ namespace ModernKeePass.ViewModels
             get { return GetEntryValue(PwDefs.NotesField); }
             set { SetEntryValue(PwDefs.NotesField, value); }
         }
-        public System.Drawing.Color? BackgroundColor => _pwEntry?.BackgroundColor;
 
-        public System.Drawing.Color? ForegroundColor => _pwEntry?.ForegroundColor;
-        
         public Symbol IconSymbol
         {
             get