From 267d9f25c297ef6449adcf3f84ceaa7f92655d4a Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <geogeob@hotmail.com>
Date: Mon, 2 Oct 2017 18:40:54 +0200
Subject: [PATCH] Implement add and delete entries and groups New command bar
 Some layout changes Some refactoring

---
 ModernKeePass/Common/DatabaseHelper.cs        |  10 +-
 ModernKeePass/ModernKeePass.csproj            |   8 +-
 .../ModernKeePass.csproj.DotSettings          |   3 +-
 ModernKeePass/Pages/EntryDetailPage.xaml      |   9 +-
 ModernKeePass/Pages/EntryDetailPage.xaml.cs   |   7 +
 ModernKeePass/Pages/GroupDetailPage.xaml      | 168 ++++++++++--------
 ModernKeePass/Pages/GroupDetailPage.xaml.cs   |  49 +++--
 ModernKeePass/Pages/OpenDatabasePage.xaml.cs  |   8 +-
 ModernKeePass/Properties/AssemblyInfo.cs      |   4 +-
 ModernKeePass/ViewModels/EntryVm.cs           |  45 +++--
 ModernKeePass/ViewModels/GroupVm.cs           |  62 ++++---
 .../ViewModels/{ => Items}/MainMenuItemVm.cs  |   0
 .../ViewModels/{ => Items}/RecentItemVm.cs    |   0
 13 files changed, 228 insertions(+), 145 deletions(-)
 rename ModernKeePass/ViewModels/{ => Items}/MainMenuItemVm.cs (100%)
 rename ModernKeePass/ViewModels/{ => Items}/RecentItemVm.cs (100%)

diff --git a/ModernKeePass/Common/DatabaseHelper.cs b/ModernKeePass/Common/DatabaseHelper.cs
index ad4d0e9..8e05e15 100644
--- a/ModernKeePass/Common/DatabaseHelper.cs
+++ b/ModernKeePass/Common/DatabaseHelper.cs
@@ -22,7 +22,7 @@ namespace ModernKeePass.Common
 
         public DatabaseHelper(StorageFile databaseFile)
         {
-            this._databaseFile = databaseFile;
+            _databaseFile = databaseFile;
         }
         public string Open(string password)
         {
@@ -31,9 +31,8 @@ namespace ModernKeePass.Common
             {
                 key.AddUserKey(new KcpPassword(password));
                 _pwDatabase.Open(IOConnectionInfo.FromFile(_databaseFile), key, new NullStatusLogger());
-                //_pwDatabase.Open(IOConnectionInfo.FromPath(databaseFile.Path), key, new NullStatusLogger());
 
-                if (IsOpen) RootGroup = new GroupVm(_pwDatabase.RootGroup);
+                if (IsOpen) RootGroup = new GroupVm(_pwDatabase.RootGroup, null);
             }
             catch (ArgumentNullException)
             {
@@ -47,11 +46,6 @@ namespace ModernKeePass.Common
             {
                 return ex.Message;
             }
-            /*finally
-            {
-                // TODO: move this when implementing write mode
-                _pwDatabase.Close();
-            }*/
             return string.Empty;
         }
 
diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj
index 3c210fb..2176b1b 100644
--- a/ModernKeePass/ModernKeePass.csproj
+++ b/ModernKeePass/ModernKeePass.csproj
@@ -125,8 +125,8 @@
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Mappings\PwIconToSegoeMapping.cs" />
-    <Compile Include="ViewModels\MainMenuItemVm.cs" />
-    <Compile Include="ViewModels\RecentItemVm.cs" />
+    <Compile Include="ViewModels\Items\MainMenuItemVm.cs" />
+    <Compile Include="ViewModels\Items\RecentItemVm.cs" />
     <Compile Include="Pages\EntryDetailPage.xaml.cs">
       <DependentUpon>EntryDetailPage.xaml</DependentUpon>
     </Compile>
@@ -216,9 +216,7 @@
       <Private>True</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Content Include="Assets\Logo.scale-100.png" />
     <Content Include="Assets\Logo.scale-140.png" />
diff --git a/ModernKeePass/ModernKeePass.csproj.DotSettings b/ModernKeePass/ModernKeePass.csproj.DotSettings
index c54c126..50dd80d 100644
--- a/ModernKeePass/ModernKeePass.csproj.DotSettings
+++ b/ModernKeePass/ModernKeePass.csproj.DotSettings
@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=viewmodels_005Citems/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml b/ModernKeePass/Pages/EntryDetailPage.xaml
index cbab525..2142368 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -48,15 +48,20 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="120"/>
                 <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="200"/>
             </Grid.ColumnDefinitions>
-            <Button x:Name="backButton" Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
+            <Button Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
                         Style="{StaticResource NavigationBackButtonNormalStyle}"
                         VerticalAlignment="Top"
                         AutomationProperties.Name="Back"
                         AutomationProperties.AutomationId="BackButton"
                         AutomationProperties.ItemType="Navigation Button"/>
-            <TextBlock x:Name="pageTitle" Text="{Binding Title}" Style="{StaticResource HeaderTextBlockStyle}" Grid.Column="1" 
+            <TextBlock Text="{Binding Title}" Style="{StaticResource HeaderTextBlockStyle}" Grid.Column="1" 
                         IsHitTestVisible="false" TextWrapping="NoWrap" VerticalAlignment="Bottom" Margin="0,0,30,40"/>
+            <CommandBar Grid.Column="2" Margin="0,40,0,0" Background="Transparent" IsOpen="True">
+                <AppBarButton Icon="Edit" Label="Edit" />
+                <AppBarButton Icon="Delete" Label="Delete" Click="AppBarButton_Click" />
+            </CommandBar>
         </Grid>
     </Grid>
 </Page>
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml.cs b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
index ccc6b8b..6d89d31 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
@@ -83,5 +83,12 @@ namespace ModernKeePass.Pages
             passwordBox.Visibility = Visibility.Visible;
             passwordTextBox.Visibility = Visibility.Collapsed;
         }
+
+        private void AppBarButton_Click(object sender, RoutedEventArgs e)
+        {
+            var entry = DataContext as EntryVm;
+            entry?.RemoveEntry();
+            if (Frame.CanGoBack) Frame.GoBack();
+        }
     }
 }
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index 764dfb9..3c74c2c 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -1,29 +1,27 @@
 <Page
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ModernKeePass.Pages"
-    xmlns:common="using:ModernKeePass.Common"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ViewModels="using:ModernKeePass.ViewModels"
-    xmlns:Converters="using:ModernKeePass.Converters"
-    x:Name="pageRoot"
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
+    xmlns:converters="using:ModernKeePass.Converters"
+    x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.GroupDetailPage"
     mc:Ignorable="d" >
     <Page.Resources>
-        <Converters:PluralizationConverter x:Key="PluralizationConverter"/>
+        <converters:PluralizationConverter x:Key="PluralizationConverter"/>
     </Page.Resources>
     <Page.DataContext>
-        <ViewModels:GroupVm />
+        <viewModels:GroupVm />
     </Page.DataContext>
 
     <Grid>
         <Grid.Resources>
             <CollectionViewSource
-                x:Name="groupsViewSource"
+                x:Name="GroupsViewSource"
                 Source="{Binding Groups}"/>
             <CollectionViewSource
-                x:Name="entriesViewSource"
+                x:Name="EntriesViewSource"
                 Source="{Binding Entries}"/>
         </Grid.Resources>
         <Grid.ChildrenTransitions>
@@ -36,88 +34,116 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <!-- Horizontal scrolling grid -->
-        <GridView
-            x:Name="groupsGridView"
-            AutomationProperties.AutomationId="ItemGridView"
-            AutomationProperties.Name="Groups"
+        <SemanticZoom
             Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-            TabIndex="1"
             Grid.RowSpan="2"
-            Padding="120,126,120,50"
-            ItemsSource="{Binding Source={StaticResource groupsViewSource}}"
-            IsSwipeEnabled="false" 
-            SelectionChanged="groupsGridView_SelectionChanged"
-            IsSynchronizedWithCurrentItem="False" >
-            <GridView.ItemTemplate>
-                <DataTemplate>
-                    <Border BorderThickness="2" BorderBrush="DimGray" Background="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}" 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" />
-                            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
-                                <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
-                                <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"/>
-                            </StackPanel>
-                        </Grid>
-                    </Border>
-                </DataTemplate>
-            </GridView.ItemTemplate>
-            <GridView.Header>
-                <ListView 
-                    x:Name="entriesListView" 
-                    Height="auto" 
-                    Width="480" 
-                    ItemsSource="{Binding Source={StaticResource entriesViewSource}}" 
-                    Margin="10,0,0,0" 
-                    SelectionChanged="entriesListView_SelectionChanged"
+            Padding="20,126,20,50">
+            <SemanticZoom.ZoomedInView>
+                <GridView
+                    AutomationProperties.AutomationId="ItemGridView"
+                    AutomationProperties.Name="Groups"
+                    TabIndex="1"
+                    ItemsSource="{Binding Source={StaticResource GroupsViewSource}}"
+                    IsSwipeEnabled="false" 
+                    SelectionChanged="groups_SelectionChanged"
+                    IsSynchronizedWithCurrentItem="False" >
+                    <GridView.ItemTemplate>
+                        <DataTemplate>
+                            <Border 
+                                BorderThickness="2" 
+                                BorderBrush="DimGray" 
+                                Background="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}" 
+                                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" />
+                                    <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0" Visibility="{Binding DetailsVisibility}" >
+                                        <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
+                                        <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" />
+                                    </StackPanel>
+                                    <TextBlock Grid.Column="1" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Visibility="{Binding NewVisibility}" VerticalAlignment="Center" Margin="13,0,0,5"/>
+                                </Grid>
+                            </Border>
+                        </DataTemplate>
+                    </GridView.ItemTemplate>
+                    <GridView.Header>
+                        <ListView 
+                            Height="auto" 
+                            Width="480" 
+                            ItemsSource="{Binding Source={StaticResource EntriesViewSource}}" 
+                            Margin="10,0,0,0" 
+                            SelectionChanged="entriesListView_SelectionChanged"
+                            IsSwipeEnabled="false" 
+                            IsSynchronizedWithCurrentItem="False" >
+                            <ListView.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal" Background="{Binding BackgroundColor}">
+                                        <SymbolIcon Symbol="{Binding IconSymbol}" />
+                                        <TextBlock Text="{Binding Title}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Foreground="{Binding ForegroundColor}"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+                            <ListView.HeaderTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding EntryCount, ConverterParameter=entry\,entries, Converter={StaticResource PluralizationConverter}}" FontSize="20" Margin="0,20,0,20" />
+                                </DataTemplate>
+                            </ListView.HeaderTemplate>
+                            <ListView.ItemContainerStyle>
+                                <Style TargetType="ListViewItem">
+                                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                                </Style>
+                            </ListView.ItemContainerStyle>
+                        </ListView>
+                    </GridView.Header>
+                    <GridView.ItemContainerStyle>
+                        <Style TargetType="FrameworkElement">
+                            <Setter Property="Margin" Value="52,0,0,2"/>
+                        </Style>
+                    </GridView.ItemContainerStyle>
+                </GridView>
+            </SemanticZoom.ZoomedInView>
+
+            <SemanticZoom.ZoomedOutView>
+                <ListView
+                    ItemsSource="{Binding Source={StaticResource GroupsViewSource}}"
+                    IsSwipeEnabled="false" 
+                    SelectionChanged="groups_SelectionChanged"
                     IsSynchronizedWithCurrentItem="False" >
                     <ListView.ItemTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Horizontal" Background="{Binding BackgroundColor}">
-                                <SymbolIcon Symbol="{Binding IconSymbol}" Margin="0,5,0,0"/>
-                                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,10" Foreground="{Binding ForegroundColor}"/>
-                            </StackPanel>
+                            <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
                         </DataTemplate>
                     </ListView.ItemTemplate>
-                    <ListView.HeaderTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="Entries" FontSize="20" Margin="0,20,0,20" />
-                        </DataTemplate>
-                    </ListView.HeaderTemplate>
-                    <ListView.ItemContainerStyle>
-                        <Style TargetType="ListViewItem">
-                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                            <Setter Property="VerticalContentAlignment" Value="Stretch" />
-                        </Style>
-                    </ListView.ItemContainerStyle>
                 </ListView>
-            </GridView.Header>
-            <GridView.ItemContainerStyle>
-                <Style TargetType="FrameworkElement">
-                    <Setter Property="Margin" Value="52,0,0,2"/>
-                </Style>
-            </GridView.ItemContainerStyle>
-        </GridView>
+            </SemanticZoom.ZoomedOutView>
+        </SemanticZoom>
+        
 
         <!-- Back button and page title -->
-        <Grid>
+        <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="120"/>
                 <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="200"/>
             </Grid.ColumnDefinitions>
-            <Button x:Name="backButton" Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
+            <Button Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
                         Style="{StaticResource NavigationBackButtonNormalStyle}"
                         VerticalAlignment="Top"
                         AutomationProperties.Name="Back"
                         AutomationProperties.AutomationId="BackButton"
                         AutomationProperties.ItemType="Navigation Button"/>
-            <TextBlock x:Name="pageTitle" Text="{Binding Name}" Style="{StaticResource HeaderTextBlockStyle}" Grid.Column="1" 
+            <TextBlock Text="{Binding Name}" Style="{StaticResource HeaderTextBlockStyle}" Grid.Column="1" 
                         IsHitTestVisible="false" TextWrapping="NoWrap" VerticalAlignment="Bottom" Margin="0,0,30,40"/>
+            <CommandBar Grid.Column="2" Margin="0,40,0,0" Background="Transparent" IsOpen="True">
+                <AppBarButton Icon="Edit" Label="Edit" />
+                <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="AppBarButton_Click" />
+            </CommandBar>
         </Grid>
     </Grid>
 </Page>
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml.cs b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
index c93c36a..558b782 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
@@ -14,20 +14,18 @@ namespace ModernKeePass.Pages
     /// </summary>
     public sealed partial class GroupDetailPage : Page
     {
-        private NavigationHelper navigationHelper;
-        
         /// <summary>
         /// NavigationHelper is used on each page to aid in navigation and 
         /// process lifetime management
         /// </summary>
-        public NavigationHelper NavigationHelper => navigationHelper;
+        public NavigationHelper NavigationHelper { get; }
 
 
         public GroupDetailPage()
         {
             InitializeComponent();
-            navigationHelper = new NavigationHelper(this);
-            navigationHelper.LoadState += navigationHelper_LoadState;
+            NavigationHelper = new NavigationHelper(this);
+            NavigationHelper.LoadState += navigationHelper_LoadState;
         }
 
         /// <summary>
@@ -58,7 +56,7 @@ namespace ModernKeePass.Pages
         /// 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            navigationHelper.OnNavigatedTo(e);
+            NavigationHelper.OnNavigatedTo(e);
 
             if (!(e.Parameter is GroupVm)) return;
             DataContext = (GroupVm) e.Parameter;
@@ -66,22 +64,53 @@ namespace ModernKeePass.Pages
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
         {
-            navigationHelper.OnNavigatedFrom(e);
+            NavigationHelper.OnNavigatedFrom(e);
         }
 
         #endregion
 
-        private void groupsGridView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void groups_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            var gridView = sender as GridView;
-            Frame.Navigate(typeof(GroupDetailPage), gridView?.SelectedItem as GroupVm);
+            GroupVm selectedItem = null;
+            if (sender is GridView)
+            {
+                var gridView = (GridView) sender;
+                if (gridView.SelectedIndex == 0)
+                {
+                    var currentGroup = DataContext as GroupVm;
+                    currentGroup?.CreateNewGroup();
+                    gridView.SelectedIndex = -1;
+                    // TODO: Navigate to new group?
+                    return;
+                }
+                selectedItem = gridView.SelectedItem as GroupVm;
+            }
+            if (sender is ListView) selectedItem = ((ListView) sender).SelectedItem as GroupVm;
+            if (selectedItem == null) return;
+            Frame.Navigate(typeof(GroupDetailPage), selectedItem);
         }
         
 
         private void entriesListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             var listView = sender as ListView;
+            if (listView != null && listView.SelectedIndex == -1) return;
+            if (listView.SelectedIndex == 0)
+            {
+                var currentGroup = DataContext as GroupVm;
+                currentGroup?.CreateNewEntry();
+                listView.SelectedIndex = -1;
+                // TODO: Navigate to new entry?
+                return;
+            }
             Frame.Navigate(typeof(EntryDetailPage), listView?.SelectedItem as EntryVm);
         }
+
+        private void AppBarButton_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            var group = DataContext as GroupVm;
+            group?.RemoveGroup();
+            if (Frame.CanGoBack) Frame.GoBack();
+        }
     }
 }
diff --git a/ModernKeePass/Pages/OpenDatabasePage.xaml.cs b/ModernKeePass/Pages/OpenDatabasePage.xaml.cs
index 3486b37..12c49e5 100644
--- a/ModernKeePass/Pages/OpenDatabasePage.xaml.cs
+++ b/ModernKeePass/Pages/OpenDatabasePage.xaml.cs
@@ -54,13 +54,7 @@ namespace ModernKeePass.Pages
         private void AddToRecentFiles(StorageFile file)
         {
             var mru = StorageApplicationPermissions.MostRecentlyUsedList;
-            var mruToken = mru.Add(file, file.DisplayName);
-
-            /*var localSettings = ApplicationData.Current.LocalSettings;
-            if (!localSettings.Containers.ContainsKey("Recent"))
-                localSettings.CreateContainer("Recent", ApplicationDataCreateDisposition.Always);
-
-            localSettings.Containers["Recent"].Values[file.DisplayName] = mruToken;*/
+            mru.Add(file, file.DisplayName);
         }
 
         private void ShowPassword(StorageFile file)
diff --git a/ModernKeePass/Properties/AssemblyInfo.cs b/ModernKeePass/Properties/AssemblyInfo.cs
index d29775c..96f1f61 100644
--- a/ModernKeePass/Properties/AssemblyInfo.cs
+++ b/ModernKeePass/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/ModernKeePass/ViewModels/EntryVm.cs b/ModernKeePass/ViewModels/EntryVm.cs
index a47391d..abdca24 100644
--- a/ModernKeePass/ViewModels/EntryVm.cs
+++ b/ModernKeePass/ViewModels/EntryVm.cs
@@ -1,19 +1,25 @@
-using System.ComponentModel;
-using System.Drawing;
-using Windows.UI.Xaml.Controls;
+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
 {
     public class EntryVm
     {
+        public GroupVm ParentGroup { get; }
+        public PwEntry Entry => _pwEntry;
         public string Title
         {
-            get { return GetEntryValue(PwDefs.TitleField); }
+            get
+            {
+                var title = GetEntryValue(PwDefs.TitleField);
+                return title == null ? "New entry" : title;
+            }
             set { SetEntryValue(PwDefs.TitleField, value); }
         }
         public string UserName
@@ -37,14 +43,17 @@ namespace ModernKeePass.ViewModels
             set { SetEntryValue(PwDefs.NotesField, value); }
         }
 
-        public SolidColorBrush BackgroundColor => CreateFromColor(_pwEntry.BackgroundColor, Colors.Transparent);
+        public SolidColorBrush BackgroundColor => CreateFromColor(_pwEntry?.BackgroundColor, Colors.Transparent);
 
-        public SolidColorBrush ForegroundColor => CreateFromColor(_pwEntry.ForegroundColor, Colors.White);
+        public SolidColorBrush ForegroundColor => CreateFromColor(_pwEntry?.ForegroundColor, Colors.White);
+
+        public FontWeight FontWeight => _pwEntry == null ? FontWeights.Bold : FontWeights.Normal;
 
         public Symbol IconSymbol
         {
             get
             {
+                if (_pwEntry == null) return Symbol.Add;
                 var result = PwIconToSegoeMapping.GetSymbolFromIcon(_pwEntry.IconId);
                 return result == Symbol.More ? Symbol.Permissions : result;
             }
@@ -53,29 +62,35 @@ namespace ModernKeePass.ViewModels
         private readonly PwEntry _pwEntry;
 
         public EntryVm() { }
-        public EntryVm(PwEntry entry)
+        public EntryVm(PwEntry entry, GroupVm parent)
         {
             _pwEntry = entry;
+            ParentGroup = parent;
+        }
+
+        public void RemoveEntry()
+        {
+            ParentGroup.RemoveEntry(this);
         }
 
         private string GetEntryValue(string key)
         {
-            return _pwEntry.Strings.GetSafe(key).ReadString();
+            return _pwEntry?.Strings.GetSafe(key).ReadString();
         }
         
         private void SetEntryValue(string key, string newValue)
         {
-            _pwEntry.Strings.Set(key, new ProtectedString(true, newValue));
+            _pwEntry?.Strings.Set(key, new ProtectedString(true, newValue));
         }
 
-        private SolidColorBrush CreateFromColor(System.Drawing.Color color, Windows.UI.Color defaultValue)
+        private SolidColorBrush CreateFromColor(System.Drawing.Color? color, Windows.UI.Color defaultValue)
         {
-            if (color == System.Drawing.Color.Empty) return new SolidColorBrush(defaultValue);
+            if (!color.HasValue || color.Value == System.Drawing.Color.Empty) return new SolidColorBrush(defaultValue);
             return new SolidColorBrush(Windows.UI.Color.FromArgb(
-                color.A,
-                color.R,
-                color.G,
-                color.B));
+                color.Value.A,
+                color.Value.R,
+                color.Value.G,
+                color.Value.B));
         }
     }
 }
diff --git a/ModernKeePass/ViewModels/GroupVm.cs b/ModernKeePass/ViewModels/GroupVm.cs
index ce40844..e1005c8 100644
--- a/ModernKeePass/ViewModels/GroupVm.cs
+++ b/ModernKeePass/ViewModels/GroupVm.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using ModernKeePass.Mappings;
 using ModernKeePassLib;
@@ -9,63 +10,76 @@ namespace ModernKeePass.ViewModels
 {
     public class GroupVm : INotifyPropertyChanged
     {
-        private PwGroup _pwGroup;
+        public GroupVm ParentGroup { get; }
+        public ObservableCollection<EntryVm> Entries { get; set; } = new ObservableCollection<EntryVm>();
+        public ObservableCollection<GroupVm> Groups { get; set; } = new ObservableCollection<GroupVm>();
+        public string Name => _pwGroup == null ? "New group" : _pwGroup.Name;
 
-        public ObservableCollection<EntryVm> Entries { get; set; }
-        public ObservableCollection<GroupVm> Groups { get; set; }
-        public string Name { get; set; }
+        public int EntryCount => Entries.Count - 1;
 
-        public int EntryCount => Entries.Count;
+        public int GroupCount => Groups.Count - 1;
 
-        public int GroupCount => Groups.Count;
+        public Visibility DetailsVisibility => _pwGroup == null ? Visibility.Collapsed : Visibility.Visible;
+        public Visibility NewVisibility => _pwGroup == null ? Visibility.Visible : Visibility.Collapsed;
 
         public Symbol IconSymbol
         {
             get
             {
+                if (_pwGroup == null) return Symbol.Add;
                 var result = PwIconToSegoeMapping.GetSymbolFromIcon(_pwGroup.IconId);
                 return result == Symbol.More ? Symbol.Folder : result;
             }
         }
 
-        public GroupVm()
-        {
-            Name = "GroupName";
-            Entries = new ObservableCollection<EntryVm>();
-            Groups = new ObservableCollection<GroupVm>();
-        }
+        public bool IsNotRoot => ParentGroup != null;
 
-        public GroupVm(PwGroup pwGroup)
+        private readonly PwGroup _pwGroup;
+        public GroupVm() {}
+
+        public GroupVm(PwGroup pwGroup, GroupVm parent)
         {
             _pwGroup = pwGroup;
-            Name = pwGroup.Name;
-            Entries = new ObservableCollection<EntryVm>(pwGroup.Entries.Select(e => new EntryVm(e)));
-            //Entries.Insert(0, new EntryVm { Title = " + New entry" });
-            Groups = new ObservableCollection<GroupVm>(pwGroup.Groups.Select(g => new GroupVm(g)));
+            ParentGroup = parent;
+            Entries = new ObservableCollection<EntryVm>(pwGroup.Entries.Select(e => new EntryVm(e, this)));
+            Entries.Insert(0, new EntryVm ());
+            //Entries.Add(new EntryVm { Title = " New entry" });
+            Groups = new ObservableCollection<GroupVm>(pwGroup.Groups.Select(g => new GroupVm(g, this)));
             //Groups.Insert(0, new GroupVm { Name = " + New group" });
+            Groups.Insert(0, new GroupVm ());
         }
 
-        public void CreateNewGroup(string title)
+        public void CreateNewGroup()
         {
-            var pwGroup = new PwGroup(true, true, title, PwIcon.Folder);
+            var pwGroup = new PwGroup(true, true, "New group", PwIcon.Folder);
             _pwGroup.AddGroup(pwGroup, true);
-            Groups.Add(new GroupVm(pwGroup));
-            NotifyPropertyChanged("Groups");
+            Groups.Add(new GroupVm(pwGroup, this));
         }
         
-        public void CreateNewEntry(string title)
+        public void CreateNewEntry()
         {
             var pwEntry = new PwEntry(true, true);
             _pwGroup.AddEntry(pwEntry, true);
-            Entries.Add(new EntryVm(pwEntry));
-            NotifyPropertyChanged("Entries");
+            Entries.Add(new EntryVm(pwEntry, this));
+        }
+
+        public void RemoveGroup()
+        {
+            _pwGroup.ParentGroup.Groups.Remove(_pwGroup);
+            ParentGroup.Groups.Remove(this);
         }
         
+        public void RemoveEntry(EntryVm entry)
+        {
+            _pwGroup.Entries.Remove(entry.Entry);
+            Entries.Remove(entry);
+        }
         public event PropertyChangedEventHandler PropertyChanged;
 
         public void NotifyPropertyChanged(string propertyName)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
+
     }
 }
diff --git a/ModernKeePass/ViewModels/MainMenuItemVm.cs b/ModernKeePass/ViewModels/Items/MainMenuItemVm.cs
similarity index 100%
rename from ModernKeePass/ViewModels/MainMenuItemVm.cs
rename to ModernKeePass/ViewModels/Items/MainMenuItemVm.cs
diff --git a/ModernKeePass/ViewModels/RecentItemVm.cs b/ModernKeePass/ViewModels/Items/RecentItemVm.cs
similarity index 100%
rename from ModernKeePass/ViewModels/RecentItemVm.cs
rename to ModernKeePass/ViewModels/Items/RecentItemVm.cs