From 0ded991673d950d6a0b4e8cc9c7ff8af3c283d2e Mon Sep 17 00:00:00 2001 From: Geoffroy Bonneville Date: Thu, 12 Oct 2017 17:45:37 +0200 Subject: [PATCH] Code cleanup --- ModernKeePass/Controls/OpenDatabaseUserControl.xaml | 5 ----- ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs | 3 +-- ModernKeePass/MainPage.xaml.cs | 4 ++-- ModernKeePass/Pages/EntryDetailPage.xaml.cs | 2 +- ModernKeePass/Pages/GroupDetailPage.xaml.cs | 6 +++--- ModernKeePass/Pages/NewDatabasePage.xaml | 4 ++-- ModernKeePass/Pages/NewDatabasePage.xaml.cs | 4 ++-- ModernKeePass/Pages/OpenDatabasePage.xaml.cs | 7 ++----- ModernKeePass/Pages/RecentDatabasesPage.xaml.cs | 4 ++-- ModernKeePass/Pages/SaveDatabasePage.xaml.cs | 6 +++--- 10 files changed, 18 insertions(+), 27 deletions(-) diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml index 22b388b..04044a9 100644 --- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml +++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml @@ -334,11 +334,6 @@ - diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs index ce99f2c..727e76e 100644 --- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs +++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Windows.System; using Windows.UI.Core; using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Input; using ModernKeePass.Common; using ModernKeePass.Events; @@ -12,7 +11,7 @@ using ModernKeePass.Events; namespace ModernKeePass.Controls { - public sealed partial class OpenDatabaseUserControl : UserControl + public sealed partial class OpenDatabaseUserControl { public bool CreateNew { diff --git a/ModernKeePass/MainPage.xaml.cs b/ModernKeePass/MainPage.xaml.cs index 57409a1..b8360b6 100644 --- a/ModernKeePass/MainPage.xaml.cs +++ b/ModernKeePass/MainPage.xaml.cs @@ -9,7 +9,7 @@ namespace ModernKeePass /// /// An empty page that can be used on its own or navigated to within a Frame. /// - public sealed partial class MainPage : Page + public sealed partial class MainPage { public MainPage() { @@ -25,7 +25,7 @@ namespace ModernKeePass private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e) { var mainVm = DataContext as MainVm; - mainVm.SelectedItem?.Destination.Navigate(mainVm.SelectedItem.PageType, mainVm.SelectedItem.Parameter); + mainVm?.SelectedItem?.Destination.Navigate(mainVm.SelectedItem.PageType, mainVm.SelectedItem.Parameter); } } } diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml.cs b/ModernKeePass/Pages/EntryDetailPage.xaml.cs index c15b01f..54d2221 100644 --- a/ModernKeePass/Pages/EntryDetailPage.xaml.cs +++ b/ModernKeePass/Pages/EntryDetailPage.xaml.cs @@ -14,7 +14,7 @@ namespace ModernKeePass.Pages /// Page affichant les détails d'un élément au sein d'un groupe, offrant la possibilité de /// consulter les autres éléments qui appartiennent au même groupe. /// - public sealed partial class EntryDetailPage : Page + public sealed partial class EntryDetailPage { private NavigationHelper navigationHelper; diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml.cs b/ModernKeePass/Pages/GroupDetailPage.xaml.cs index 2f2b686..be8edec 100644 --- a/ModernKeePass/Pages/GroupDetailPage.xaml.cs +++ b/ModernKeePass/Pages/GroupDetailPage.xaml.cs @@ -15,7 +15,7 @@ namespace ModernKeePass.Pages /// A page that displays an overview of a single group, including a preview of the items /// within the group. /// - public sealed partial class GroupDetailPage : Page + public sealed partial class GroupDetailPage { /// /// NavigationHelper is used on each page to aid in navigation and @@ -139,7 +139,7 @@ namespace ModernKeePass.Pages { var viewModel = DataContext as GroupVm; var imageUri = RandomAccessStreamReference.CreateFromUri(new Uri("ms-appx://Assets/Logo.scale-80.png")); - var results = viewModel.Entries.Skip(1).Where(e => e.Title.IndexOf(args.QueryText, StringComparison.OrdinalIgnoreCase) >= 0).Take(5); + var results = viewModel?.Entries.Skip(1).Where(e => e.Title.IndexOf(args.QueryText, StringComparison.OrdinalIgnoreCase) >= 0).Take(5); foreach (var result in results) { args.Request.SearchSuggestionCollection.AppendResultSuggestion(result.Title, result.ParentGroup.Name, result.Id, imageUri, string.Empty); @@ -149,7 +149,7 @@ namespace ModernKeePass.Pages private void SearchBox_OnResultSuggestionChosen(SearchBox sender, SearchBoxResultSuggestionChosenEventArgs args) { var viewModel = DataContext as GroupVm; - var entry = viewModel.Entries.Skip(1).FirstOrDefault(e => e.Id == args.Tag); + var entry = viewModel?.Entries.Skip(1).FirstOrDefault(e => e.Id == args.Tag); Frame.Navigate(typeof(EntryDetailPage), entry); } diff --git a/ModernKeePass/Pages/NewDatabasePage.xaml b/ModernKeePass/Pages/NewDatabasePage.xaml index 0ce15df..ad2f32d 100644 --- a/ModernKeePass/Pages/NewDatabasePage.xaml +++ b/ModernKeePass/Pages/NewDatabasePage.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:ModernKeePass.Controls" + xmlns:local="using:ModernKeePass.Controls" xmlns:converters="using:ModernKeePass.Converters" xmlns:viewModels="using:ModernKeePass.ViewModels" mc:Ignorable="d"> @@ -18,6 +18,6 @@ - + diff --git a/ModernKeePass/Pages/NewDatabasePage.xaml.cs b/ModernKeePass/Pages/NewDatabasePage.xaml.cs index 6805a8f..ea0e750 100644 --- a/ModernKeePass/Pages/NewDatabasePage.xaml.cs +++ b/ModernKeePass/Pages/NewDatabasePage.xaml.cs @@ -14,7 +14,7 @@ namespace ModernKeePass.Pages /// /// An empty page that can be used on its own or navigated to within a Frame. /// - public sealed partial class NewDatabasePage : Page + public sealed partial class NewDatabasePage { private Frame _mainFrame; @@ -41,7 +41,7 @@ namespace ModernKeePass.Pages var file = await savePicker.PickSaveFileAsync(); if (file == null) return; var viewModel = DataContext as OpenVm; - viewModel.OpenFile(file); + viewModel?.OpenFile(file); } private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e) diff --git a/ModernKeePass/Pages/OpenDatabasePage.xaml.cs b/ModernKeePass/Pages/OpenDatabasePage.xaml.cs index 9019c03..caa6b45 100644 --- a/ModernKeePass/Pages/OpenDatabasePage.xaml.cs +++ b/ModernKeePass/Pages/OpenDatabasePage.xaml.cs @@ -1,11 +1,8 @@ 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; @@ -16,7 +13,7 @@ namespace ModernKeePass.Pages /// /// An empty page that can be used on its own or navigated to within a Frame. /// - public sealed partial class OpenDatabasePage : Page + public sealed partial class OpenDatabasePage { private Frame _mainFrame; @@ -43,7 +40,7 @@ namespace ModernKeePass.Pages var viewModel = DataContext as OpenVm; // Application now has read/write access to the picked file - viewModel.OpenFile(await picker.PickSingleFileAsync()); + viewModel?.OpenFile(await picker.PickSingleFileAsync()); } private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e) diff --git a/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs b/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs index e74df14..84f39b9 100644 --- a/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs +++ b/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs @@ -12,7 +12,7 @@ namespace ModernKeePass.Pages /// /// Une page vide peut être utilisée seule ou constituer une page de destination au sein d'un frame. /// - public sealed partial class RecentDatabasesPage : Page + public sealed partial class RecentDatabasesPage { private Frame _mainFrame; @@ -37,7 +37,7 @@ namespace ModernKeePass.Pages //throw new NotImplementedException(); var viewModel = DataContext as RecentVm; var app = (App)Application.Current; - app.Database.DatabaseFile = viewModel.SelectedItem.DatabaseFile; + app.Database.DatabaseFile = viewModel?.SelectedItem.DatabaseFile; } } } diff --git a/ModernKeePass/Pages/SaveDatabasePage.xaml.cs b/ModernKeePass/Pages/SaveDatabasePage.xaml.cs index 72343c5..e93ae73 100644 --- a/ModernKeePass/Pages/SaveDatabasePage.xaml.cs +++ b/ModernKeePass/Pages/SaveDatabasePage.xaml.cs @@ -13,7 +13,7 @@ namespace ModernKeePass.Pages /// /// An empty page that can be used on its own or navigated to within a Frame. /// - public sealed partial class SaveDatabasePage : Page + public sealed partial class SaveDatabasePage { private Frame _mainFrame; public SaveDatabasePage() @@ -30,7 +30,7 @@ namespace ModernKeePass.Pages private void SaveButton_OnClick(object sender, RoutedEventArgs e) { var viewModel = DataContext as SaveVm; - viewModel.Save(); + viewModel?.Save(); _mainFrame.Navigate(typeof(MainPage)); } @@ -46,7 +46,7 @@ namespace ModernKeePass.Pages var file = await savePicker.PickSaveFileAsync(); if (file == null) return; var viewModel = DataContext as SaveVm; - viewModel.Save(file); + viewModel?.Save(file); _mainFrame.Navigate(typeof(MainPage)); }