Open file from Explorer with association works

Major code refactor in Open, Save and Recent pages and VM
Main page automatically opens a sub page depending on context

ModernKeePass/Pages/OpenDatabasePage.xaml

@@ -5,16 +5,20 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:local="using:ModernKeePass.Controls"
+    xmlns:converters="using:ModernKeePass.Converters"
     x:Class="ModernKeePass.Pages.OpenDatabasePage"
     mc:Ignorable="d">
+    <Page.Resources>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+    </Page.Resources>
     <Page.DataContext>
-        <viewModels:DatabaseVm/>
+        <viewModels:OpenVm/>
     </Page.DataContext>
 
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <HyperlinkButton Content="Browse files..." Click="ButtonBase_OnClick" />
         <HyperlinkButton Content="From Url..." IsEnabled="False" />
         <TextBlock TextWrapping="Wrap" Text="{Binding Name}" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
-        <local:OpenDatabaseUserControl Visibility="{Binding SelectedVisibility}" ValidationChecked="PasswordUserControl_PasswordChecked" />
+        <local:OpenDatabaseUserControl Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecked="PasswordUserControl_PasswordChecked" />
     </StackPanel>
-</Page>
+</Page>

ModernKeePass/Pages/OpenDatabasePage.xaml.cs

@@ -1,14 +1,10 @@
 using System;
 using Windows.Storage.Pickers;
-using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Navigation;
-using ModernKeePass.Common;
+using ModernKeePass.Events;
 using ModernKeePass.ViewModels;
-using Windows.Storage.AccessCache;
-using Windows.Storage;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -41,34 +37,15 @@ namespace ModernKeePass.Pages
                     SuggestedStartLocation = PickerLocationId.DocumentsLibrary
                 };
             picker.FileTypeFilter.Add(".kdbx");
-
-            var file = await picker.PickSingleFileAsync();
+            
+            var viewModel = DataContext as OpenVm;
             // Application now has read/write access to the picked file
-            if (file == null) return;
-            // Initialize KDBX database
-            ((App)Application.Current).Database = new DatabaseHelper(file);
-            AddToRecentFiles(file);
-            ShowPassword(file);
+            viewModel.OpenFile(await picker.PickSingleFileAsync());
         }
 
-        private void AddToRecentFiles(StorageFile file)
+        private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e)
         {
-            var mru = StorageApplicationPermissions.MostRecentlyUsedList;
-            mru.Add(file, file.DisplayName);
-        }
-
-        private void ShowPassword(StorageFile file)
-        {
-            var databaseVm = DataContext as DatabaseVm;
-            if (databaseVm == null) return;
-            databaseVm.SelectedVisibility = Visibility.Visible;
-            databaseVm.Name = file.Name;
-        }
-
-        private void PasswordUserControl_PasswordChecked(object sender, EventArgs e)
-        {
-            var app = (App)Application.Current;
-            if (app.Database.IsOpen) _mainFrame.Navigate(typeof(GroupDetailPage), app.Database.RootGroup);
+            _mainFrame.Navigate(typeof(GroupDetailPage), e.RootGroup);
         }
     }
 }

ModernKeePass/Pages/RecentDatabasesPage.xaml

@@ -18,7 +18,6 @@
     <ListView 
         Background="{StaticResource ApplicationPageBackgroundThemeBrush}"
         ItemsSource="{Binding Source={StaticResource RecentItemsSource}}"
-        SelectionChanged="RecentListView_SelectionChanged"
         SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
         <ListView.ItemTemplate>
             <DataTemplate>

ModernKeePass/Pages/RecentDatabasesPage.xaml.cs

@@ -6,6 +6,7 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 using ModernKeePass.Common;
+using ModernKeePass.Events;
 using ModernKeePass.ViewModels;
 
 // Pour en savoir plus sur le modèle d'élément Page vierge, consultez la page http://go.microsoft.com/fwlink/?LinkId=234238
@@ -29,23 +30,10 @@ namespace ModernKeePass.Pages
             base.OnNavigatedTo(e);
             _mainFrame = e.Parameter as Frame;
         }
-
-        private async void RecentListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        
+        private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e)
         {
-            var recentVm = DataContext as RecentVm;
-            if (recentVm.SelectedItem == null) return;
-            var mru = StorageApplicationPermissions.MostRecentlyUsedList;
-            var file = await mru.GetFileAsync(recentVm.SelectedItem.Token);
-
-            // TODO: this closes the current opened database
-            var app = (App)Application.Current;
-            app.Database = new DatabaseHelper(file);
-        }
-
-        private void PasswordUserControl_PasswordChecked(object sender, EventArgs e)
-        {
-            var app = (App)Application.Current;
-            if (app.Database.IsOpen) _mainFrame.Navigate(typeof(GroupDetailPage), app.Database.RootGroup);
+            _mainFrame.Navigate(typeof(GroupDetailPage), e.RootGroup);
         }
     }
 }

ModernKeePass/Pages/SaveDatabasePage.xaml

@@ -8,11 +8,11 @@
     mc:Ignorable="d">
 
     <Page.DataContext>
-        <viewModels:DatabaseVm/>
+        <viewModels:SaveVm/>
     </Page.DataContext>
 
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <HyperlinkButton x:Name="SaveButton" Content="Save and close" Click="SaveButton_OnClick" VerticalAlignment="Top" IsEnabled="{Binding IsOpen}" />
+        <HyperlinkButton x:Name="SaveButton" Content="Save and close" Click="SaveButton_OnClick" VerticalAlignment="Top" IsEnabled="{Binding IsSaveEnabled}" />
         <HyperlinkButton x:Name="SaveAsButton" Content="Save as..." VerticalAlignment="Top" IsEnabled="False" />
     </StackPanel>
 </Page>

ModernKeePass/Pages/SaveDatabasePage.xaml.cs

@@ -22,25 +22,13 @@ namespace ModernKeePass.Pages
         {
             base.OnNavigatedTo(e);
             _mainFrame = e.Parameter as Frame;
-            var app = (App)Application.Current;
-            if (app.Database == null) return;
-            var databaseVm = DataContext as DatabaseVm;
-            if (databaseVm == null) return;
-            UpdateDatabaseStatus(app, databaseVm);
         }
 
         private void SaveButton_OnClick(object sender, RoutedEventArgs e)
         {
-            var app = (App) Application.Current;
-            app.Database.Save();
-            app.Database.Close();
-            UpdateDatabaseStatus(app, DataContext as DatabaseVm);
+            var viewModel = DataContext as SaveVm;
+            viewModel.Save();
             _mainFrame.Navigate(typeof(MainPage));
         }
-
-        private void UpdateDatabaseStatus(App app, DatabaseVm databaseVm)
-        {
-            databaseVm.IsOpen = app.Database.IsOpen;
-        }
     }
 }