From c25ae2ad0f5938a38addf649f91bb44937946a7c Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Thu, 12 Jul 2018 15:32:54 +0200
Subject: [PATCH] Group and entry icon is now shown (and editable) on the left
 of the title Added new entry placeholder text in resources Group detail page
 small view triggered on larger width

---
 ModernKeePass/Strings/en-US/Resources.resw  |  3 ++
 ModernKeePass/Strings/fr-FR/Resources.resw  |  3 ++
 ModernKeePass/Views/EntryDetailPage.xaml    | 32 ++++++++++++++-------
 ModernKeePass/Views/GroupDetailPage.xaml    | 27 ++++++++++++-----
 ModernKeePass/Views/GroupDetailPage.xaml.cs |  2 +-
 5 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/ModernKeePass/Strings/en-US/Resources.resw b/ModernKeePass/Strings/en-US/Resources.resw
index 3ac653d..c024d78 100644
--- a/ModernKeePass/Strings/en-US/Resources.resw
+++ b/ModernKeePass/Strings/en-US/Resources.resw
@@ -462,4 +462,7 @@
   <data name="ToastUpdateDatabase.Title" xml:space="preserve">
     <value>Composite Key</value>
   </data>
+  <data name="EntryTitle.PlaceholderText" xml:space="preserve">
+    <value>New entry name...</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernKeePass/Strings/fr-FR/Resources.resw b/ModernKeePass/Strings/fr-FR/Resources.resw
index c32b4be..0163857 100644
--- a/ModernKeePass/Strings/fr-FR/Resources.resw
+++ b/ModernKeePass/Strings/fr-FR/Resources.resw
@@ -462,4 +462,7 @@
   <data name="ToastUpdateDatabase.Title" xml:space="preserve">
     <value>Clé maître</value>
   </data>
+  <data name="EntryTitle.PlaceholderText" xml:space="preserve">
+    <value>Nom de la nouvelle entrée...</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml b/ModernKeePass/Views/EntryDetailPage.xaml
index fa59f5c..03453ed 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml
+++ b/ModernKeePass/Views/EntryDetailPage.xaml
@@ -459,10 +459,6 @@
                                 <TextBlock x:Uid="EntryForegroundColor" />
                                 <userControls:ColorPickerUserControl SelectedColor="{Binding ForegroundColor, Converter={StaticResource ColorToBrushConverter}, Mode=TwoWay}" />
                             </StackPanel>
-                            <StackPanel Width="100" HorizontalAlignment="Left">
-                                <TextBlock x:Uid="EntrySymbol" />
-                                <userControls:SymbolPickerUserControl SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, Mode=TwoWay}" />
-                            </StackPanel>
                         </StackPanel>
                     </StackPanel>
                 </ScrollViewer>
@@ -485,8 +481,22 @@
                     Style="{StaticResource NoBorderButtonStyle}">
                 <SymbolIcon Symbol="Back" />
             </Button>
-            <StackPanel Grid.Column="1" >
-                <TextBox  
+            <Grid Grid.Column="1" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30" />
+                    <RowDefinition Height="20" />
+                </Grid.RowDefinitions>
+                <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, Mode=TwoWay}" />
+                </Viewbox>
+                <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
+                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Width="80" Height="40"  />
+                </Viewbox>
+                <TextBox Grid.Column="1" Grid.Row="0"
                     x:Name="TitleTextBox"
                     Text="{Binding Name, Mode=TwoWay}" 
                     Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
@@ -496,18 +506,18 @@
                     IsEnabled="{Binding IsSelected}"
                     BorderThickness="0" 
                     FontSize="20"
-                    FontWeight="SemiBold"
+                    FontWeight="Light"
                     TextWrapping="NoWrap" 
-                    VerticalAlignment="Center" 
-                    PlaceholderText="New entry name...">
+                    VerticalAlignment="Center"
+                    x:Uid="EntryTitle">
                     <interactivity:Interaction.Behaviors>
                         <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="True">
                             <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}" />
                         </core:DataTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </TextBox>
-                <userControls:BreadCrumbUserControl ItemsSource="{Binding BreadCrumb}" Margin="5,-5,0,0" />
-            </StackPanel>
+                <userControls:BreadCrumbUserControl Grid.Column="1" Grid.Row="1" ItemsSource="{Binding BreadCrumb}" Margin="5,-5,0,0" />
+            </Grid>
             <userControls:TopMenuUserControl 
                 x:Name="TopMenu" Grid.Column="2" 
                 RestoreButtonVisibility="{Binding ParentGroup.IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" 
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index b22cd8c..fdfd779 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -62,7 +62,6 @@
                 </Grid.RowDefinitions>
                 <TextBlock Grid.Column="0" Grid.Row="0" x:Uid="ReorderEntriesLabel" Margin="10,10,0,0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource BodyTextBlockStyle}" />
                 <!--<TextBlock Grid.Column="1" Grid.Row="0" x:Uid="EntrySymbol" Margin="40,20,0,0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource BodyTextBlockStyle}" />-->
-                <userControls:SymbolPickerUserControl Grid.Column="1" Grid.Row="0" Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, Mode=TwoWay}" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}"></userControls:SymbolPickerUserControl>
                 <HyperlinkButton Grid.Column="2" Grid.Row="0" VerticalAlignment="Top" Click="CreateEntry_ButtonClick" Visibility="{Binding IsSelected, Converter={StaticResource InverseBooleanToVisibilityConverter}}" HorizontalAlignment="Right" Foreground="{StaticResource MainColor}" Style="{StaticResource MainColorHyperlinkButton}">
                     <StackPanel Orientation="Horizontal">
                         <SymbolIcon Symbol="Add">
@@ -199,8 +198,22 @@
                     Style="{StaticResource NoBorderButtonStyle}">
                 <SymbolIcon Symbol="Back" />
             </Button>
-            <StackPanel Grid.Column="1" >
-                <TextBox
+            <Grid Grid.Column="1" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30" />
+                    <RowDefinition Height="20" />
+                </Grid.RowDefinitions>
+                <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, Mode=TwoWay}" />
+                </Viewbox>
+                <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
+                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Width="80" Height="40"  />
+                </Viewbox>
+                <TextBox Grid.Column="1" Grid.Row="0"
                     x:Name="TitleTextBox"
                     Text="{Binding Name, Mode=TwoWay}" 
                     Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
@@ -209,7 +222,7 @@
                     IsHitTestVisible="{Binding IsEditMode}" 
                     BorderThickness="0" 
                     FontSize="20"
-                    FontWeight="SemiBold"
+                    FontWeight="Light"
                     TextWrapping="NoWrap" 
                     VerticalAlignment="Center" 
                     x:Uid="GroupTitle">
@@ -219,8 +232,8 @@
                         </core:DataTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </TextBox>
-                <userControls:BreadCrumbUserControl ItemsSource="{Binding BreadCrumb}" Margin="5,-5,0,0" />
-            </StackPanel>
+                <userControls:BreadCrumbUserControl Grid.Column="1" Grid.Row="1" ItemsSource="{Binding BreadCrumb}" Margin="5,-5,0,0" />
+            </Grid>
             <userControls:TopMenuUserControl x:Name="TopMenu" Grid.Column="2" 
                 RestoreButtonVisibility="{Binding ShowRestore, Converter={StaticResource BooleanToVisibilityConverter}}" 
                 DeleteButtonVisibility="{Binding IsSelected, Converter={StaticResource InverseBooleanToVisibilityConverter}}"
@@ -241,7 +254,7 @@
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </userControls:TopMenuUserControl>
-            <Button Grid.Column="3" x:Name="SearchButton" Style="{StaticResource NoBorderButtonStyle}" Height="50">
+            <Button Grid.Column="3" x:Name="SearchButton" Style="{StaticResource NoBorderButtonStyle}" Background="{ThemeResource ToggleButtonBackgroundThemeBrush}" Height="50">
                 <SymbolIcon Symbol="Find" />
                 <Button.Flyout>
                     <Flyout>
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml.cs b/ModernKeePass/Views/GroupDetailPage.xaml.cs
index a8cac34..e239a92 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml.cs
+++ b/ModernKeePass/Views/GroupDetailPage.xaml.cs
@@ -136,7 +136,7 @@ namespace ModernKeePass.Views
 
         private void GroupDetailPage_OnSizeChanged(object sender, SizeChangedEventArgs e)
         {
-            VisualStateManager.GoToState(this, e.NewSize.Width < 700 ? "Small" : "Large", true);
+            VisualStateManager.GoToState(this, e.NewSize.Width < 800 ? "Small" : "Large", true);
         }
 
         #endregion