From 8cd3801897c8b78b161fafa8724acb6e47ad010e Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <geogeob@hotmail.com>
Date: Tue, 24 Oct 2017 18:43:46 +0200
Subject: [PATCH] Bigger database password textbox Wrong password sets the
 password box border to red Typing text removes the error Implemented real
 command bar at the bottom in Groups Search box is always present

---
 ModernKeePass/BundleArtifacts/neutral.txt     |  8 ++---
 .../Controls/OpenDatabaseUserControl.xaml     | 22 ++++++++++----
 .../Controls/OpenDatabaseUserControl.xaml.cs  |  9 ++++++
 .../Converters/TextToFontStyleConverter.cs    | 24 +++++++++++++++
 ModernKeePass/ModernKeePass.csproj            |  1 +
 ModernKeePass/Package.appxmanifest            |  2 +-
 ModernKeePass/Pages/GroupDetailPage.xaml      | 29 +++++++++----------
 ModernKeePass/Pages/GroupDetailPage.xaml.cs   | 16 ++++++++++
 ModernKeePass/Pages/OpenDatabasePage.xaml     |  2 +-
 ModernKeePass/Pages/RecentDatabasesPage.xaml  |  9 +++---
 10 files changed, 90 insertions(+), 32 deletions(-)
 create mode 100644 ModernKeePass/Converters/TextToFontStyleConverter.cs

diff --git a/ModernKeePass/BundleArtifacts/neutral.txt b/ModernKeePass/BundleArtifacts/neutral.txt
index 47e3628..ec956f7 100644
--- a/ModernKeePass/BundleArtifacts/neutral.txt
+++ b/ModernKeePass/BundleArtifacts/neutral.txt
@@ -1,4 +1,4 @@
-MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.4.0.19_AnyCPU.appx
-SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePass_1.4.0.19_Test\ModernKeePass_1.4.0.19_AnyCPU.appxsym
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.4.0.19_scale-140.appx
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.4.0.19_scale-180.appx
+MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.20_AnyCPU.appx
+SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePass_1.5.0.20_Test\ModernKeePass_1.5.0.20_AnyCPU.appxsym
+ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.20_scale-140.appx
+ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.20_scale-180.appx
diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
index 209a681..c2ec99d 100644
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
+++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
@@ -6,8 +6,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     d:DesignHeight="60"
-    d:DesignWidth="335" Loaded="UserControl_Loaded">
+    d:DesignWidth="550" 
+    Loaded="UserControl_Loaded">
     <UserControl.Resources>
+        <SolidColorBrush x:Key="ErrorColorBrush" Color="Red"/>
         <Style TargetType="PasswordBox" x:Name="PasswordBoxWithButtonStyle">
             <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
             <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
@@ -49,12 +51,12 @@
                                                             <VisualState x:Name="Pressed">
                                                                 <Storyboard>
                                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                                               Storyboard.TargetProperty="BorderBrush">
+                                                                                                   Storyboard.TargetProperty="BorderBrush">
                                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
                                                                     </ObjectAnimationUsingKeyFrames>
                                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
-                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedForegroundThemeBrush}" />
+                                                                                                   Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverForegroundThemeBrush}" />
                                                                     </ObjectAnimationUsingKeyFrames>
                                                                 </Storyboard>
                                                             </VisualState>
@@ -230,6 +232,14 @@
                                                          To="{ThemeResource TextControlPointerOverBorderThemeOpacity}" />
                                         </Storyboard>
                                     </VisualState>
+                                    <VisualState x:Name="Error">
+                                        <Storyboard>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                           Storyboard.TargetProperty="BorderBrush">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ErrorColorBrush}" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
                                     <VisualState x:Name="Focused" />
                                 </VisualStateGroup>
                                 <VisualStateGroup x:Name="ButtonStates">
@@ -325,7 +335,7 @@
         </Style>
     </UserControl.Resources>
     <StackPanel>
-        <PasswordBox x:Name="PasswordBox" Password="{Binding Password, ElementName=UserControl, Mode=TwoWay}" Width="300" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" PlaceholderText="Password" Style="{StaticResource PasswordBoxWithButtonStyle}"/>
-        <TextBlock x:Name="StatusTextBlock" Margin="20,0" Height="28" Foreground="#FFBF6969" FontSize="14" FontWeight="SemiBold" TextWrapping="WrapWholeWords" />
+        <PasswordBox x:Name="PasswordBox" Password="{Binding Password, ElementName=UserControl, Mode=TwoWay}" Width="500" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" PlaceholderText="Password" Style="{StaticResource PasswordBoxWithButtonStyle}"/>
+        <TextBlock x:Name="StatusTextBlock" Height="28" Foreground="{ThemeResource ErrorColorBrush}" FontSize="14" FontWeight="SemiBold" TextWrapping="WrapWholeWords" />
     </StackPanel>
 </UserControl>
diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
index 3f96e98..4ebfb66 100644
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
+++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
@@ -56,11 +56,20 @@ namespace ModernKeePass.Controls
             {
                 ValidationChecked?.Invoke(this, new PasswordEventArgs(app.Database.RootGroup));
             }
+            else
+            {
+                VisualStateManager.GoToState(PasswordBox, "Error", true);
+            }
         }
 
         private void PasswordBox_KeyDown(object sender, KeyRoutedEventArgs e)
         {
             if (e.Key == VirtualKey.Enter) OpenButton_OnClick(null, null);
+            else
+            {
+                VisualStateManager.GoToState(PasswordBox, "Normal", true);
+                StatusTextBlock.Text = string.Empty;
+            }
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
diff --git a/ModernKeePass/Converters/TextToFontStyleConverter.cs b/ModernKeePass/Converters/TextToFontStyleConverter.cs
new file mode 100644
index 0000000..6cb62fb
--- /dev/null
+++ b/ModernKeePass/Converters/TextToFontStyleConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.UI.Text;
+using Windows.UI.Xaml.Data;
+
+namespace ModernKeePass.Converters
+{
+    public class TextToFontStyleConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var compareValue = parameter as string;
+            var text = value as string;
+            return string.Compare(text, compareValue, StringComparison.OrdinalIgnoreCase) == 0
+                ? FontStyle.Italic
+                : FontStyle.Normal;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj
index 3d8481c..9f7f218 100644
--- a/ModernKeePass/ModernKeePass.csproj
+++ b/ModernKeePass/ModernKeePass.csproj
@@ -129,6 +129,7 @@
     <Compile Include="Converters\ColorToBrushConverter.cs" />
     <Compile Include="Converters\DoubleToForegroungBrushComplexityConverter.cs" />
     <Compile Include="Converters\InverseBooleanToVisibilityConverter.cs" />
+    <Compile Include="Converters\TextToFontStyleConverter.cs" />
     <Compile Include="Converters\PluralizationConverter.cs" />
     <Compile Include="Converters\ProgressBarLegalValuesConverter.cs" />
     <Compile Include="Converters\TextToWidthConverter.cs" />
diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest
index 1c69bb4..edc0bd6 100644
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.5.0.19" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.5.0.20" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index 64ded5b..fcacb07 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -15,13 +15,20 @@
         <SolidColorBrush x:Key="Transparent" Color="Transparent"/>
         <SolidColorBrush x:Key="SystemColor" Color="{StaticResource SystemColorButtonFaceColor}" />
         <converters:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
-        <converters:PluralizationConverter x:Key="PluralizationConverter"/>
-        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-        <converters:TextToWidthConverter x:Key="TextToWidthConverter"/>
+        <converters:TextToFontStyleConverter x:Key="TextToFontStyleConverter"/>
     </Page.Resources>
     <Page.DataContext>
         <viewModels:GroupVm />
     </Page.DataContext>
+    <Page.BottomAppBar>
+        <CommandBar VerticalAlignment="Center" >
+            <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}" Click="EditButton_Click" />
+            <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="DeleteButton_Click" />
+            <CommandBar.SecondaryCommands>
+                <AppBarButton Icon="Setting" Label="Settings" />
+            </CommandBar.SecondaryCommands>
+        </CommandBar>
+    </Page.BottomAppBar>
     <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
         <Grid.Resources>
             <CollectionViewSource
@@ -140,7 +147,7 @@
                                 <DataTemplate x:Name="Expanded">
                                     <StackPanel Orientation="Horizontal">
                                         <SymbolIcon Symbol="{Binding IconSymbol}" />
-                                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" />
+                                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" FontStyle="{Binding Name, Converter={StaticResource TextToFontStyleConverter}, ConverterParameter=Recycle\ Bin}" />
                                         <!--<TextBlock Text="{Binding EntryCount}" HorizontalAlignment="Right" VerticalAlignment="Center" />-->
                                     </StackPanel>
                                 </DataTemplate>
@@ -212,7 +219,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="120"/>
                 <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="300"/>
+                <ColumnDefinition Width="400"/>
             </Grid.ColumnDefinitions>
             <Button Margin="39,0,39,0" 
                     Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
@@ -232,17 +239,7 @@
                 VerticalAlignment="Center" 
                 Margin="0,0,30,0"
                 PlaceholderText="New group name..."/>
-            <CommandBar Grid.Column="2" Background="Transparent" IsOpen="True" VerticalAlignment="Center" Margin="0,20,0,0">
-                <AppBarButton Icon="Find" Label="Search">
-                    <AppBarButton.Flyout>
-                        <Flyout>
-                            <SearchBox PlaceholderText="Search..." Width="350" SuggestionsRequested="SearchBox_OnSuggestionsRequested" SearchHistoryEnabled="False"  ResultSuggestionChosen="SearchBox_OnResultSuggestionChosen" />
-                        </Flyout>
-                    </AppBarButton.Flyout>
-                </AppBarButton>
-                <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}" />
-                <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="DeleteButton_Click" />
-            </CommandBar>
+            <SearchBox Grid.Column="2" PlaceholderText="Search..." Width="350" Height="40" SuggestionsRequested="SearchBox_OnSuggestionsRequested" SearchHistoryEnabled="False" ResultSuggestionChosen="SearchBox_OnResultSuggestionChosen" />
         </Grid>
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml.cs b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
index 18aff69..b280f92 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
@@ -165,5 +165,21 @@ namespace ModernKeePass.Pages
 
         #endregion
 
+        private void EditButton_Click(object sender, RoutedEventArgs e)
+        {
+            BottomAppBar.IsOpen = false;
+            if (Model.IsEditMode)
+            {
+                Task.Factory.StartNew(
+                    () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+                        () => TitleTextBox.Focus(FocusState.Programmatic)));
+            }
+            else
+            {
+                Task.Factory.StartNew(
+                    () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+                        () => PageRoot.Focus(FocusState.Programmatic)));
+            }
+        }
     }
 }
diff --git a/ModernKeePass/Pages/OpenDatabasePage.xaml b/ModernKeePass/Pages/OpenDatabasePage.xaml
index b5bd8c9..1f192b5 100644
--- a/ModernKeePass/Pages/OpenDatabasePage.xaml
+++ b/ModernKeePass/Pages/OpenDatabasePage.xaml
@@ -21,7 +21,7 @@
         <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Open an existing password database from your PC.</TextBlock>
         <HyperlinkButton Content="From Url..." IsEnabled="False" />
         <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Open an existing password database from an Internet location (not yet implemented).</TextBlock>
-        <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="350" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
+        <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
             <StackPanel>
                 <TextBlock Margin="25,10,0,10" Text="{Binding Name}" />
                 <local:OpenDatabaseUserControl ValidationChecked="PasswordUserControl_PasswordChecked" />
diff --git a/ModernKeePass/Pages/RecentDatabasesPage.xaml b/ModernKeePass/Pages/RecentDatabasesPage.xaml
index 8597782..6b0b55c 100644
--- a/ModernKeePass/Pages/RecentDatabasesPage.xaml
+++ b/ModernKeePass/Pages/RecentDatabasesPage.xaml
@@ -19,19 +19,20 @@
         <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Margin="0,-20,0,20">Recent</TextBlock>
         <ListView 
             ItemsSource="{Binding Source={StaticResource RecentItemsSource}}"
-            SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
+            SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+            Width="600" >
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Margin="10,0,10,0">
-                        <TextBlock Text="{Binding Name}" Width="350" Padding="5,0,0,0" />
-                        <TextBlock Text="{Binding Path}" Width="350" Padding="5,0,0,0" FontSize="10" />
+                        <TextBlock Text="{Binding Name}" Padding="5,0,0,0" />
+                        <TextBlock Text="{Binding Path}" Padding="5,0,0,0" FontSize="10" />
                         <local:OpenDatabaseUserControl Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecking="OpenDatabaseUserControl_OnValidationChecking" ValidationChecked="PasswordUserControl_PasswordChecked" />
                     </StackPanel>
                 </DataTemplate>
             </ListView.ItemTemplate>
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListViewItem">
-                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                    <Setter Property="HorizontalContentAlignment" Value="Left" />
                     <Setter Property="VerticalContentAlignment" Value="Stretch" />
                 </Style>
             </ListView.ItemContainerStyle>