Updated Settings page

Added new settings (history and clipboard)
Renamed and moved Settings Vms

WinAppCommon/ViewModels/Items/SettingsCredentialsVm.cs

@@ -0,0 +1,37 @@
+using System.Threading.Tasks;
+using GalaSoft.MvvmLight;
+using MediatR;
+using Messages;
+using ModernKeePass.Application.Common.Interfaces;
+using ModernKeePass.Application.Database.Commands.UpdateCredentials;
+using ModernKeePass.Application.Database.Queries.GetDatabase;
+
+namespace ModernKeePass.ViewModels.ListItems
+{
+    public class SettingsCredentialsVm: ViewModelBase
+    {
+        private readonly IMediator _mediator;
+        private readonly IResourceProxy _resource;
+        private readonly INotificationService _notification;
+        
+        public SettingsCredentialsVm(IMediator mediator, IResourceProxy resource, INotificationService notification)
+        {
+            _mediator = mediator;
+            _resource = resource;
+            _notification = notification;
+
+            MessengerInstance.Register<CredentialsSetMessage>(this, async message => await UpdateDatabaseCredentials(message));
+        }
+
+        public async Task UpdateDatabaseCredentials(CredentialsSetMessage message)
+        {
+            await _mediator.Send(new UpdateCredentialsCommand
+            {
+                KeyFilePath = message.KeyFilePath,
+                Password = message.Password
+            });
+            var database = await _mediator.Send(new GetDatabaseQuery());
+            _notification.Show(database.Name, _resource.GetResourceValue("CompositeKeyUpdated"));
+        }
+    }
+}

WinAppCommon/ViewModels/Items/SettingsDatabaseVm.cs

@@ -1,91 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using GalaSoft.MvvmLight;
-using MediatR;
-using ModernKeePass.Application.Common.Interfaces;
-using ModernKeePass.Application.Database.Models;
-using ModernKeePass.Application.Database.Queries.GetDatabase;
-using ModernKeePass.Application.Group.Queries.GetGroup;
-using ModernKeePass.Application.Parameters.Commands.SetCipher;
-using ModernKeePass.Application.Parameters.Commands.SetCompression;
-using ModernKeePass.Application.Parameters.Commands.SetHasRecycleBin;
-using ModernKeePass.Application.Parameters.Commands.SetKeyDerivation;
-using ModernKeePass.Application.Parameters.Commands.SetRecycleBin;
-using ModernKeePass.Application.Parameters.Models;
-using ModernKeePass.Application.Parameters.Queries.GetCiphers;
-using ModernKeePass.Application.Parameters.Queries.GetCompressions;
-using ModernKeePass.Application.Parameters.Queries.GetKeyDerivations;
-
-namespace ModernKeePass.ViewModels.ListItems
-{
-    // TODO: implement Kdf settings
-    public class SettingsDatabaseVm: ObservableObject
-    {
-        private readonly IMediator _mediator;
-        private readonly DatabaseVm _database;
-
-        public bool HasRecycleBin
-        {
-            get { return _database.IsRecycleBinEnabled; }
-            set
-            {
-                _mediator.Send(new SetHasRecycleBinCommand {HasRecycleBin = value}).Wait();
-                RaisePropertyChanged(nameof(HasRecycleBin));
-            }
-        }
-
-        public bool IsNewRecycleBin
-        {
-            get { return string.IsNullOrEmpty(_database.RecycleBinId); }
-            set
-            {
-                if (value) _mediator.Send(new SetRecycleBinCommand { RecycleBinId = null }).Wait();
-            }
-        }
-
-        public ObservableCollection<IEntityVm> Groups { get; }
-        public ObservableCollection<CipherVm> Ciphers { get; }
-        public IEnumerable<string> Compressions => _mediator.Send(new GetCompressionsQuery()).GetAwaiter().GetResult();
-        public ObservableCollection<KeyDerivationVm> KeyDerivations { get; }
-
-        public CipherVm SelectedCipher
-        {
-            get { return Ciphers.FirstOrDefault(c => c.Id == _database.CipherId); }
-            set { _mediator.Send(new SetCipherCommand {CipherId = value.Id}).Wait(); }
-        }
-
-        public string SelectedCompression
-        {
-            get { return Compressions.FirstOrDefault(c => c == _database.Compression); }
-            set { _mediator.Send(new SetCompressionCommand {Compression = value}).Wait(); }
-        }
-
-        public KeyDerivationVm SelectedKeyDerivation
-        {
-            get { return KeyDerivations.FirstOrDefault(c => c.Id == _database.KeyDerivationId); }
-            set { _mediator.Send(new SetKeyDerivationCommand {KeyDerivationId = value.Id}).Wait(); }
-        }
-
-        public IEntityVm SelectedRecycleBin
-        {
-            get { return Groups.FirstOrDefault(g => g.Id == _database.RecycleBinId); }
-            set
-            {
-                if (!IsNewRecycleBin) _mediator.Send(new SetRecycleBinCommand { RecycleBinId = value.Id}).Wait();
-            }
-        }
-        
-        public SettingsDatabaseVm(IMediator mediator)
-        {
-            _mediator = mediator;
-            _database = _mediator.Send(new GetDatabaseQuery()).GetAwaiter().GetResult();
-            var rootGroup = _mediator.Send(new GetGroupQuery { Id = _database.RootGroupId }).GetAwaiter().GetResult();
-            Groups = new ObservableCollection<IEntityVm>(rootGroup.SubGroups);
-            var ciphers = _mediator.Send(new GetCiphersQuery()).GetAwaiter().GetResult();
-            Ciphers = new ObservableCollection<CipherVm>(ciphers);
-            var keyDerivations = _mediator.Send(new GetKeyDerivationsQuery()).GetAwaiter().GetResult();
-            KeyDerivations = new ObservableCollection<KeyDerivationVm>(keyDerivations);
-        }
-    }
-}

WinAppCommon/ViewModels/Items/SettingsHistoryVm.cs

@@ -0,0 +1,7 @@
+namespace ModernKeePass.ViewModels.ListItems
+{
+    public class SettingsHistoryVm
+    {
+        
+    }
+}

WinAppCommon/ViewModels/Items/SettingsRecycleBinVm.cs

@@ -0,0 +1,57 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using GalaSoft.MvvmLight;
+using MediatR;
+using ModernKeePass.Application.Common.Interfaces;
+using ModernKeePass.Application.Database.Models;
+using ModernKeePass.Application.Database.Queries.GetDatabase;
+using ModernKeePass.Application.Group.Queries.GetGroup;
+using ModernKeePass.Application.Parameters.Commands.SetHasRecycleBin;
+using ModernKeePass.Application.Parameters.Commands.SetRecycleBin;
+
+namespace ModernKeePass.ViewModels.ListItems
+{
+    public class SettingsRecycleBinVm: ObservableObject
+    {
+        private readonly IMediator _mediator;
+        private readonly DatabaseVm _database;
+
+        public bool HasRecycleBin
+        {
+            get { return _database.IsRecycleBinEnabled; }
+            set
+            {
+                _mediator.Send(new SetHasRecycleBinCommand { HasRecycleBin = value }).Wait();
+                RaisePropertyChanged(nameof(HasRecycleBin));
+            }
+        }
+
+        public bool IsNewRecycleBin
+        {
+            get { return string.IsNullOrEmpty(_database.RecycleBinId); }
+            set
+            {
+                if (value) _mediator.Send(new SetRecycleBinCommand { RecycleBinId = null }).Wait();
+            }
+        }
+
+        public ObservableCollection<IEntityVm> Groups { get; }
+
+        public IEntityVm SelectedRecycleBin
+        {
+            get { return Groups.FirstOrDefault(g => g.Id == _database.RecycleBinId); }
+            set
+            {
+                if (!IsNewRecycleBin) _mediator.Send(new SetRecycleBinCommand { RecycleBinId = value.Id }).Wait();
+            }
+        }
+
+        public SettingsRecycleBinVm(IMediator mediator)
+        {
+            _mediator = mediator;
+            _database = _mediator.Send(new GetDatabaseQuery()).GetAwaiter().GetResult();
+            var rootGroup = _mediator.Send(new GetGroupQuery { Id = _database.RootGroupId }).GetAwaiter().GetResult();
+            Groups = new ObservableCollection<IEntityVm>(rootGroup.SubGroups);
+        }
+    }
+}

WinAppCommon/ViewModels/Items/SettingsSecurityVm.cs

@@ -1,37 +1,57 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
 using GalaSoft.MvvmLight;
 using MediatR;
-using Messages;
-using ModernKeePass.Application.Common.Interfaces;
-using ModernKeePass.Application.Database.Commands.UpdateCredentials;
+using ModernKeePass.Application.Database.Models;
 using ModernKeePass.Application.Database.Queries.GetDatabase;
+using ModernKeePass.Application.Parameters.Commands.SetCipher;
+using ModernKeePass.Application.Parameters.Commands.SetCompression;
+using ModernKeePass.Application.Parameters.Commands.SetKeyDerivation;
+using ModernKeePass.Application.Parameters.Models;
+using ModernKeePass.Application.Parameters.Queries.GetCiphers;
+using ModernKeePass.Application.Parameters.Queries.GetCompressions;
+using ModernKeePass.Application.Parameters.Queries.GetKeyDerivations;
 
 namespace ModernKeePass.ViewModels.ListItems
 {
-    public class SettingsSecurityVm: ViewModelBase
+    // TODO: implement Kdf settings
+    public class SettingsSecurityVm: ObservableObject
     {
         private readonly IMediator _mediator;
-        private readonly IResourceProxy _resource;
-        private readonly INotificationService _notification;
+        private readonly DatabaseVm _database;
+
         
-        public SettingsSecurityVm(IMediator mediator, IResourceProxy resource, INotificationService notification)
+        public ObservableCollection<CipherVm> Ciphers { get; }
+        public IEnumerable<string> Compressions => _mediator.Send(new GetCompressionsQuery()).GetAwaiter().GetResult();
+        public ObservableCollection<KeyDerivationVm> KeyDerivations { get; }
+
+        public CipherVm SelectedCipher
+        {
+            get { return Ciphers.FirstOrDefault(c => c.Id == _database.CipherId); }
+            set { _mediator.Send(new SetCipherCommand {CipherId = value.Id}).Wait(); }
+        }
+
+        public string SelectedCompression
+        {
+            get { return Compressions.FirstOrDefault(c => c == _database.Compression); }
+            set { _mediator.Send(new SetCompressionCommand {Compression = value}).Wait(); }
+        }
+
+        public KeyDerivationVm SelectedKeyDerivation
+        {
+            get { return KeyDerivations.FirstOrDefault(c => c.Id == _database.KeyDerivationId); }
+            set { _mediator.Send(new SetKeyDerivationCommand {KeyDerivationId = value.Id}).Wait(); }
+        }
+
+        public SettingsSecurityVm(IMediator mediator)
         {
             _mediator = mediator;
-            _resource = resource;
-            _notification = notification;
-
-            MessengerInstance.Register<CredentialsSetMessage>(this, async message => await UpdateDatabaseCredentials(message));
-        }
-
-        public async Task UpdateDatabaseCredentials(CredentialsSetMessage message)
-        {
-            await _mediator.Send(new UpdateCredentialsCommand
-            {
-                KeyFilePath = message.KeyFilePath,
-                Password = message.Password
-            });
-            var database = await _mediator.Send(new GetDatabaseQuery());
-            _notification.Show(database.Name, _resource.GetResourceValue("CompositeKeyUpdated"));
+            _database = _mediator.Send(new GetDatabaseQuery()).GetAwaiter().GetResult();
+            var ciphers = _mediator.Send(new GetCiphersQuery()).GetAwaiter().GetResult();
+            Ciphers = new ObservableCollection<CipherVm>(ciphers);
+            var keyDerivations = _mediator.Send(new GetKeyDerivationsQuery()).GetAwaiter().GetResult();
+            KeyDerivations = new ObservableCollection<KeyDerivationVm>(keyDerivations);
         }
     }
-}
+}