From b54fff25024db6badb3943dc84750321e3c0527f Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <geogeob@hotmail.com>
Date: Fri, 15 Sep 2017 15:58:51 +0200
Subject: [PATCH] Main page now allows password input Group nesting works

---
 .vs/ModernKeePass/v14/.suo                  | Bin 186880 -> 323072 bytes
 ModernKeePass/MainPage.xaml                 |  37 +++++++++++++--
 ModernKeePass/MainPage.xaml.cs              |  14 ++++--
 ModernKeePass/Pages/GroupDetailPage.xaml    |  16 +++----
 ModernKeePass/Pages/GroupDetailPage.xaml.cs |   9 +++-
 ModernKeePass/ViewModels/DatabaseVm.cs      |  48 ++++++++++++++++----
 ModernKeePass/ViewModels/GroupVm.cs         |   8 +++-
 7 files changed, 103 insertions(+), 29 deletions(-)

diff --git a/.vs/ModernKeePass/v14/.suo b/.vs/ModernKeePass/v14/.suo
index 799715a5258c5644c1c0d3358d0b0fd5ad654c3a..e3b23680bfe7b61ed867fbedbe9941e3588c207c 100644
GIT binary patch
delta 15373
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

delta 6320
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

diff --git a/ModernKeePass/MainPage.xaml b/ModernKeePass/MainPage.xaml
index bd209e2..bc4d1f4 100644
--- a/ModernKeePass/MainPage.xaml
+++ b/ModernKeePass/MainPage.xaml
@@ -1,14 +1,41 @@
 <Page
-    x:Class="ModernKeePass.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:ModernKeePass"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+    xmlns:ViewModels="using:ModernKeePass.ViewModels"
+    x:Class="ModernKeePass.MainPage"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" >
+    <Page.DataContext>
+        <ViewModels:DatabaseVm/>
+    </Page.DataContext>
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Button Content="Open password database" HorizontalAlignment="Center" VerticalAlignment="Center" Click="Button_Click" />
-        <TextBlock Name="textBlock" HorizontalAlignment="Center" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Center" Margin="0,100,0,0" />
+    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="50" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Button Grid.Column="0" Grid.Row="0" x:Name="selectButton" Content="Select password database" Click="Button_Click" HorizontalAlignment="Center" />
+        <Grid Grid.Column="0" Grid.Row="2" HorizontalAlignment="Center" Height="auto" VerticalAlignment="Top" Width="auto" Visibility="{Binding Visibility}" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100" />
+                <ColumnDefinition Width="150" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <TextBlock Grid.Column="0" Grid.Row="0" x:Name="passwordTextBlock" HorizontalAlignment="Left" TextWrapping="Wrap" Text="Password" VerticalAlignment="Center" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
+            <PasswordBox Grid.Column="1" Grid.Row="0" x:Name="passwordBox" VerticalAlignment="Top" HorizontalAlignment="Right" Width="130" Password="{Binding Password, Mode=TwoWay}" IsPasswordRevealButtonEnabled="True" Margin="0,0,10,0"/>
+            <Button Grid.Column="1" Grid.Row="1" x:Name="openBbutton" Content="Open" HorizontalAlignment="Right" VerticalAlignment="Top" Click="openBbutton_Click" Margin="0,0,7,0" Width="auto"/>
+            <TextBlock Grid.Column="1" Grid.Row="2" x:Name="errorTextBlock" TextWrapping="Wrap" Text="{Binding ErrorMessage}" HorizontalAlignment="Right" Height="auto" Width="auto" Foreground="#FF9E0909" Margin="0,0,10,0"/>
+        </Grid>
     </Grid>
 </Page>
diff --git a/ModernKeePass/MainPage.xaml.cs b/ModernKeePass/MainPage.xaml.cs
index 06eb43f..d7d2302 100644
--- a/ModernKeePass/MainPage.xaml.cs
+++ b/ModernKeePass/MainPage.xaml.cs
@@ -31,15 +31,19 @@ namespace ModernKeePass
             if (file != null)
             {
                 // Application now has read/write access to the picked file
-                textBlock.Text = "Opened database: " + file.Name;
-                var database = new DatabaseVm();
-                database.Open(file, "test");
-                Frame.Navigate(typeof(GroupDetailPage), database.RootGroup);
+                DataContext = new DatabaseVm(file);
             }
             else
             {
-                textBlock.Text = "Operation cancelled.";
             }
         }
+        
+        private void openBbutton_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            var database = DataContext as DatabaseVm;
+            database.Open();
+            if (database.IsOpen)
+                Frame.Navigate(typeof(GroupDetailPage), database.RootGroup);
+        }
     }
 }
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index 23a1618..eec0fb8 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -26,20 +26,21 @@
 
         <Grid.Resources>
             <CollectionViewSource
-                x:Name="itemsViewSource"
+                x:Name="groupsViewSource"
                 Source="{Binding Groups}"/>
         </Grid.Resources>
         <!-- Horizontal scrolling grid -->
         <GridView
-            x:Name="itemGridView"
+            x:Name="groupGridView"
             AutomationProperties.AutomationId="ItemGridView"
             AutomationProperties.Name="Groups"
             TabIndex="1"
             Grid.RowSpan="2"
             Padding="120,126,120,50"
-            ItemsSource="{Binding Source={StaticResource itemsViewSource}}"
-            SelectionMode="None"
-            IsSwipeEnabled="false">
+            ItemsSource="{Binding Source={StaticResource groupsViewSource}}"
+            IsSwipeEnabled="false" 
+            SelectionChanged="itemGridView_SelectionChanged"
+            SelectedIndex="-1" >
             <GridView.ItemTemplate>
                 <DataTemplate>
                     <Grid Height="110" Width="480" Margin="10">
@@ -54,15 +55,14 @@
                             <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
                             <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
                             <TextBlock Text="{Binding EntryCount}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60"/>
+                            <TextBlock Text="{Binding GroupCount}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60"/>
                         </StackPanel>
                     </Grid>
                 </DataTemplate>
             </GridView.ItemTemplate>
             <GridView.Header>
                 <StackPanel Width="480" Margin="0,4,14,0">
-                    <TextBlock Margin="0,0,0,20" Style="{StaticResource SubheaderTextBlockStyle}" MaxHeight="60" Text="{Binding Entries.Count}"/>
-                    <Image Height="400" Margin="0,0,0,20" Stretch="UniformToFill" AutomationProperties.Name="{Binding Title}"/>
-                    <TextBlock Margin="0,0,0,0" Style="{StaticResource BodyTextBlockStyle}"/>
+                    <ListView x:Name="listView" Height="100"/>
                 </StackPanel>
             </GridView.Header>
             <GridView.ItemContainerStyle>
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml.cs b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
index 353c6fa..c086112 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
@@ -47,8 +47,6 @@ namespace ModernKeePass.Pages
         /// session.  The state will be null the first time a page is visited.</param>
         private void navigationHelper_LoadState(object sender, LoadStateEventArgs e)
         {
-            // TODO: Assign a bindable group to this.DefaultViewModel["Group"]
-            // TODO: Assign a collection of bindable items to this.DefaultViewModel["Items"]
         }
 
         #region NavigationHelper registration
@@ -69,6 +67,7 @@ namespace ModernKeePass.Pages
             if (e.Parameter is GroupVm)
             {
                 DataContext = e.Parameter as GroupVm;
+                groupGridView.SelectedIndex = -1;
             }
         }
 
@@ -78,5 +77,11 @@ namespace ModernKeePass.Pages
         }
 
         #endregion
+
+        private void itemGridView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var gridView = sender as GridView;
+            Frame.Navigate(typeof(GroupDetailPage), gridView.SelectedItem as GroupVm);
+        }
     }
 }
diff --git a/ModernKeePass/ViewModels/DatabaseVm.cs b/ModernKeePass/ViewModels/DatabaseVm.cs
index 6ec1e75..d5ec026 100644
--- a/ModernKeePass/ViewModels/DatabaseVm.cs
+++ b/ModernKeePass/ViewModels/DatabaseVm.cs
@@ -5,33 +5,65 @@ using ModernKeePassLib;
 using ModernKeePassLib.Keys;
 using ModernKeePassLib.Serialization;
 using ModernKeePassLib.Interfaces;
+using Windows.UI.Xaml;
+using System;
 
 namespace ModernKeePass.ViewModels
 {
     public class DatabaseVm : INotifyPropertyChanged
     {
-        private PwDatabase _database = new PwDatabase();
+        private PwDatabase database = new PwDatabase();
+        private StorageFile databaseFile;
 
+        public string Password { get; set; }
+        public bool IsOpen { get; set; }
+        public Visibility Visibility { get; private set; }
+        public string ErrorMessage { get; set; }
         public string Name { get; set; }
         public GroupVm RootGroup { get; set; }
 
-        public event PropertyChangedEventHandler PropertyChanged;
 
-        public async void Open(StorageFile databaseFile, string password)
+        public DatabaseVm()
+        {
+            Visibility = Visibility.Collapsed;
+        }
+        public DatabaseVm(StorageFile databaseFile)
+        {
+            this.databaseFile = databaseFile;
+            Visibility = Visibility.Visible;
+        }
+        public async void Open()
         {
             var key = new CompositeKey();
-            key.AddUserKey(new KcpPassword(password));
             try
             {
-                await _database.Open(IOConnectionInfo.FromFile(databaseFile), key, new NullStatusLogger());
-                if (!_database.IsOpen) return;
+                key.AddUserKey(new KcpPassword(Password));
+                await database.Open(IOConnectionInfo.FromFile(databaseFile), key, new NullStatusLogger());
+                IsOpen = database.IsOpen;
                 Name = databaseFile.DisplayName;
-                RootGroup = new GroupVm (_database.RootGroup);
+                RootGroup = new GroupVm (database.RootGroup);
+            }
+            catch (ArgumentNullException)
+            {
+                ErrorMessage = "Password cannot be empty";
+                NotifyPropertyChanged("ErrorMessage");
+            }
+            catch (InvalidCompositeKeyException)
+            {
+                ErrorMessage = "Wrong password";
+                NotifyPropertyChanged("ErrorMessage");
             }
             finally
             {
-                _database.Close();
+                // TODO: move this when implementing write mode
+                database.Close();
             }
         }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        public void NotifyPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
     }
 }
diff --git a/ModernKeePass/ViewModels/GroupVm.cs b/ModernKeePass/ViewModels/GroupVm.cs
index 4ca44ed..06a534e 100644
--- a/ModernKeePass/ViewModels/GroupVm.cs
+++ b/ModernKeePass/ViewModels/GroupVm.cs
@@ -17,6 +17,13 @@ namespace ModernKeePass.ViewModels
                 return $"{Entries?.Count} entries.";
             }
         }
+        public string GroupCount
+        {
+            get
+            {
+                return $"{Groups?.Count} groups.";
+            }
+        }
 
         public GroupVm()
         {
@@ -39,6 +46,5 @@ namespace ModernKeePass.ViewModels
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
-
     }
 }