From 799b896bfe3847238c2217204a25f71fd10ee73d Mon Sep 17 00:00:00 2001 From: BONNEVILLE Geoffroy Date: Thu, 14 Jun 2018 10:50:16 +0200 Subject: [PATCH] Breadcrumb finished and working --- ModernKeePass/Services/DatabaseService.cs | 1 - ModernKeePass/ViewModels/CompositeKeyVm.cs | 3 +-- ModernKeePass/ViewModels/EntryVm.cs | 2 +- ModernKeePass/Views/EntryDetailPage.xaml | 2 +- ModernKeePass/Views/GroupDetailPage.xaml | 2 +- ModernKeePass/Views/UserControls/BreadCrumbUserControl.xaml | 6 +++--- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ModernKeePass/Services/DatabaseService.cs b/ModernKeePass/Services/DatabaseService.cs index 035e427..910c6ae 100644 --- a/ModernKeePass/Services/DatabaseService.cs +++ b/ModernKeePass/Services/DatabaseService.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using Windows.Storage; -using Windows.UI.Xaml.Controls; using Microsoft.HockeyApp; using ModernKeePass.Exceptions; using ModernKeePass.Interfaces; diff --git a/ModernKeePass/ViewModels/CompositeKeyVm.cs b/ModernKeePass/ViewModels/CompositeKeyVm.cs index 09711c0..f293ccb 100644 --- a/ModernKeePass/ViewModels/CompositeKeyVm.cs +++ b/ModernKeePass/ViewModels/CompositeKeyVm.cs @@ -99,8 +99,7 @@ namespace ModernKeePass.ViewModels public GroupVm RootGroup { get; set; } public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password?.ToCharArray()); - - + private bool _hasPassword; private bool _hasKeyFile; private bool _hasUserAccount; diff --git a/ModernKeePass/ViewModels/EntryVm.cs b/ModernKeePass/ViewModels/EntryVm.cs index ee91e3a..a5ca84f 100644 --- a/ModernKeePass/ViewModels/EntryVm.cs +++ b/ModernKeePass/ViewModels/EntryVm.cs @@ -155,7 +155,7 @@ namespace ModernKeePass.ViewModels PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } - public EntryVm(): this(null, null) { } + public EntryVm() { } internal EntryVm(PwEntry entry, GroupVm parent) : this(entry, parent, DatabaseService.Instance) { } diff --git a/ModernKeePass/Views/EntryDetailPage.xaml b/ModernKeePass/Views/EntryDetailPage.xaml index 6bba140..73fde7e 100644 --- a/ModernKeePass/Views/EntryDetailPage.xaml +++ b/ModernKeePass/Views/EntryDetailPage.xaml @@ -521,7 +521,7 @@ - + diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml index ddfd191..923231d 100644 --- a/ModernKeePass/Views/GroupDetailPage.xaml +++ b/ModernKeePass/Views/GroupDetailPage.xaml @@ -344,7 +344,7 @@ - +