Removed useless collectionviewsource

Updated some packages

ModernKeePass.Application/Application.csproj

@@ -83,6 +83,7 @@
     <Compile Include="Common\Interfaces\IFileProxy.cs" />
     <Compile Include="Common\Interfaces\IImportFormat.cs" />
     <Compile Include="Common\Interfaces\ICredentialsProxy.cs" />
+    <Compile Include="Common\Interfaces\ILogger.cs" />
     <Compile Include="Common\Interfaces\INotificationService.cs" />
     <Compile Include="Common\Interfaces\IRecentProxy.cs" />
     <Compile Include="Common\Interfaces\IResourceProxy.cs" />

ModernKeePass.Application/Common/Interfaces/ICryptographyClient.cs

@@ -6,5 +6,6 @@ namespace ModernKeePass.Application.Common.Interfaces
     {
         Task<string> Protect(string value);
         Task<string> UnProtect(string value);
+        byte[] Random(uint length);
     }
 }

ModernKeePass.Application/Common/Interfaces/IDatabaseProxy.cs

@@ -35,7 +35,7 @@ namespace ModernKeePass.Application.Common.Interfaces
         EntryEntity GetEntry(string id);
         Task AddEntry(string parentGroupId, string entryId);
         Task MoveEntry(string parentGroupId, string entryId, int index);
-        void UpdateEntry(string entryId, string fieldName, object fieldValue, bool isProtected);
+        Task UpdateEntry(string entryId, string fieldName, object fieldValue, bool isProtected);
         void DeleteField(string entryId, string fieldName);
         Task RemoveEntry(string parentGroupId, string entryId);
         EntryEntity CreateEntry(string parentGroupId);

ModernKeePass.Application/Common/Interfaces/IFileProxy.cs

@@ -10,6 +10,7 @@ namespace ModernKeePass.Application.Common.Interfaces
         Task<FileInfo> CreateFile(string name, string extension, string description, bool addToRecent);
         Task<byte[]> ReadBinaryFile(string path);
         Task<IList<string>> ReadTextFile(string path);
+        Task WriteToLogFile(IEnumerable<string> data);
         Task WriteBinaryContentsToFile(string path, byte[] contents);
         void ReleaseFile(string path);
     }

ModernKeePass.Application/Common/Interfaces/ILogger.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace ModernKeePass.Application.Common.Interfaces
+{
+    public interface ILogger
+    {
+        Task LogError(Exception exception);
+        void LogTrace(string message, Dictionary<string, string> values);
+    }
+}

ModernKeePass.Application/Database/Commands/CreateDatabase/CreateDatabaseCommand.cs

@@ -64,17 +64,17 @@ namespace ModernKeePass.Application.Database.Commands.CreateDatabase
                     _database.UpdateGroup(internetGroup);
 
                     var sample1 = _database.CreateEntry(_database.RootGroupId);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.Title, "Sample Entry", false);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.UserName, "Username", false);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.Password, "Password", true);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.Url, "https://keepass.info/", false);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.Notes, "You may safely delete this sample", false);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.Title, "Sample Entry", false);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.UserName, "Username", false);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.Password, "Password", true);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.Url, "https://keepass.info/", false);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.Notes, "You may safely delete this sample", false);
 
                     var sample2 = _database.CreateEntry(_database.RootGroupId);
-                    _database.UpdateEntry(sample2.Id, EntryFieldName.Title, "Sample Entry #2", false);
-                    _database.UpdateEntry(sample2.Id, EntryFieldName.UserName, "Michael321", false);
-                    _database.UpdateEntry(sample2.Id, EntryFieldName.Password, "12345", true);
-                    _database.UpdateEntry(sample2.Id, EntryFieldName.Url, "https://keepass.info/help/kb/testform.html", false);
+                    await _database.UpdateEntry(sample2.Id, EntryFieldName.Title, "Sample Entry #2", false);
+                    await _database.UpdateEntry(sample2.Id, EntryFieldName.UserName, "Michael321", false);
+                    await _database.UpdateEntry(sample2.Id, EntryFieldName.Password, "12345", true);
+                    await _database.UpdateEntry(sample2.Id, EntryFieldName.Url, "https://keepass.info/help/kb/testform.html", false);
                 }
             }
         }

ModernKeePass.Application/Database/Commands/SaveDatabase/SaveDatabaseCommand.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using MediatR;
 using System.Threading.Tasks;
 using ModernKeePass.Application.Common.Interfaces;
@@ -14,11 +16,13 @@ namespace ModernKeePass.Application.Database.Commands.SaveDatabase
         {
             private readonly IDatabaseProxy _database;
             private readonly IFileProxy _file;
+            private readonly ILogger _logger;
 
-            public SaveDatabaseCommandHandler(IDatabaseProxy database, IFileProxy file)
+            public SaveDatabaseCommandHandler(IDatabaseProxy database, IFileProxy file, ILogger logger)
             {
                 _database = database;
                 _file = file;
+                _logger = logger;
             }
 
             public async Task Handle(SaveDatabaseCommand message)
@@ -27,6 +31,7 @@ namespace ModernKeePass.Application.Database.Commands.SaveDatabase
 
                 try
                 {
+                    var timeToSave = Stopwatch.StartNew();
                     if (!string.IsNullOrEmpty(message.FilePath))
                     {
                         _database.FileAccessToken = message.FilePath;
@@ -40,6 +45,13 @@ namespace ModernKeePass.Application.Database.Commands.SaveDatabase
 
                     // Transactional write to file
                     await _file.WriteBinaryContentsToFile(_database.FileAccessToken, contents);
+                    timeToSave.Stop();
+
+                    _logger.LogTrace("SaveCommand", new Dictionary<string, string>
+                    {
+                        { "duration", timeToSave.ElapsedMilliseconds.ToString()},
+                        { "size", _database.Size.ToString()}
+                    });
                 }
                 catch (Exception exception)
                 {

ModernKeePass.Application/Entry/Commands/UpsertField/UpsertFieldCommand.cs

@@ -1,4 +1,5 @@
-using MediatR;
+using System.Threading.Tasks;
+using MediatR;
 using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Domain.Exceptions;
 
@@ -11,7 +12,7 @@ namespace ModernKeePass.Application.Entry.Commands.UpsertField
         public object FieldValue { get; set; }
         public bool IsProtected { get; set; } = true;
 
-        public class UpsertFieldCommandHandler : IRequestHandler<UpsertFieldCommand>
+        public class UpsertFieldCommandHandler : IAsyncRequestHandler<UpsertFieldCommand>
         {
             private readonly IDatabaseProxy _database;
 
@@ -20,11 +21,11 @@ namespace ModernKeePass.Application.Entry.Commands.UpsertField
                 _database = database;
             }
 
-            public void Handle(UpsertFieldCommand message)
+            public async Task Handle(UpsertFieldCommand message)
             {
                 if (!_database.IsOpen) throw new DatabaseClosedException();
 
-                _database.UpdateEntry(message.EntryId, message.FieldName, message.FieldValue, message.IsProtected);
+                await _database.UpdateEntry(message.EntryId, message.FieldName, message.FieldValue, message.IsProtected);
             }
         }
     }

ModernKeePass.Application/Entry/Models/EntryVm.cs

@@ -39,29 +39,20 @@ namespace ModernKeePass.Application.Entry.Models
         public void Mapping(Profile profile)
         {
             profile.CreateMap<EntryEntity, EntryVm>()
-                .ForMember(d => d.ParentGroupId, opts => opts.MapFrom(s => s.ParentId))
-                .ForMember(d => d.ParentGroupName, opts => opts.MapFrom(s => s.ParentName))
-                .ForMember(d => d.Id, opts => opts.MapFrom(s => s.Id))
                 .ForMember(d => d.Title, opts => opts.MapFrom(s => s.Fields.FirstOrDefault(f => 
-                    f.Name.Equals(EntryFieldName.Title, StringComparison.OrdinalIgnoreCase)) ?? new FieldEntity { Name = EntryFieldName.Title, IsProtected = true } ))
+                    f.Name.Equals(EntryFieldName.Title, StringComparison.Ordinal)) ?? new FieldEntity { Name = EntryFieldName.Title, IsProtected = false } ))
                 .ForMember(d => d.Username, opts => opts.MapFrom(s => s.Fields.FirstOrDefault(f => 
-                    f.Name.Equals(EntryFieldName.UserName, StringComparison.OrdinalIgnoreCase)) ?? new FieldEntity { Name = EntryFieldName.UserName, IsProtected = true } ))
+                    f.Name.Equals(EntryFieldName.UserName, StringComparison.Ordinal)) ?? new FieldEntity { Name = EntryFieldName.UserName, IsProtected = false } ))
                 .ForMember(d => d.Password, opts => opts.MapFrom(s => s.Fields.FirstOrDefault(f => 
-                    f.Name.Equals(EntryFieldName.Password, StringComparison.OrdinalIgnoreCase)) ?? new FieldEntity { Name = EntryFieldName.Password, IsProtected = true } ))
+                    f.Name.Equals(EntryFieldName.Password, StringComparison.Ordinal)) ?? new FieldEntity { Name = EntryFieldName.Password, IsProtected = true } ))
                 .ForMember(d => d.Url, opts => opts.MapFrom(s => s.Fields.FirstOrDefault(f => 
-                    f.Name.Equals(EntryFieldName.Url, StringComparison.OrdinalIgnoreCase)) ?? new FieldEntity { Name = EntryFieldName.Url, IsProtected = true } ))
+                    f.Name.Equals(EntryFieldName.Url, StringComparison.Ordinal)) ?? new FieldEntity { Name = EntryFieldName.Url, IsProtected = false } ))
                 .ForMember(d => d.Notes, opts => opts.MapFrom(s => s.Fields.FirstOrDefault(f => 
-                    f.Name.Equals(EntryFieldName.Notes, StringComparison.OrdinalIgnoreCase)) ?? new FieldEntity { Name = EntryFieldName.Notes, IsProtected = true } ))
+                    f.Name.Equals(EntryFieldName.Notes, StringComparison.Ordinal)) ?? new FieldEntity { Name = EntryFieldName.Notes, IsProtected = false } ))
                 .ForMember(d => d.AdditionalFields, opts => opts.MapFrom(s => 
-                    s.Fields.Where(f => !EntryFieldName.StandardFieldNames.Contains(f.Name, StringComparer.OrdinalIgnoreCase))))
+                    s.Fields.Where(f => !EntryFieldName.StandardFieldNames.Contains(f.Name, StringComparer.Ordinal))))
                 .ForMember(d => d.History, opts => opts.MapFrom(s => s.History.Reverse()))
-                .ForMember(d => d.HasExpirationDate, opts => opts.MapFrom(s => s.HasExpirationDate))
-                .ForMember(d => d.ExpirationDate, opts => opts.MapFrom(s => s.ExpirationDate))
-                .ForMember(d => d.ModificationDate, opts => opts.MapFrom(s => s.LastModificationDate))
-                .ForMember(d => d.Icon, opts => opts.MapFrom(s => s.HasExpirationDate && s.ExpirationDate < DateTimeOffset.Now ? Icon.ReportHacked : s.Icon))
-                .ForMember(d => d.ForegroundColor, opts => opts.MapFrom(s => s.ForegroundColor))
-                .ForMember(d => d.BackgroundColor, opts => opts.MapFrom(s => s.BackgroundColor))
-                .ForMember(d => d.Attachments, opts => opts.MapFrom(s => s.Attachments));
+                .ForMember(d => d.Icon, opts => opts.MapFrom(s => s.HasExpirationDate && s.ExpirationDate < DateTimeOffset.Now ? Icon.ReportHacked : s.Icon));
         }
     }
 }

ModernKeePass.Application/Group/Commands/CreateGroup/CreateGroupCommand.cs

@@ -29,7 +29,7 @@ namespace ModernKeePass.Application.Group.Commands.CreateGroup
 
                 var group = _database.CreateGroup(message.ParentGroup.Id, message.Name, message.IsRecycleBin);
                 var groupVm = _mapper.Map<GroupVm>(group);
-                message.ParentGroup.SubGroups.Add(groupVm);
+                message.ParentGroup.Groups.Add(groupVm);
                 return groupVm;
             }
         }

ModernKeePass.Application/Group/Commands/MoveGroup/MoveGroupCommand.cs

@@ -26,7 +26,7 @@ namespace ModernKeePass.Application.Group.Commands.MoveGroup
                 if (!_database.IsOpen) throw new DatabaseClosedException();
 
                 await _database.MoveGroup(message.ParentGroup.Id, message.Group.Id, message.Index);
-                message.ParentGroup.SubGroups.Insert(message.Index, message.Group);
+                message.ParentGroup.Groups.Insert(message.Index, message.Group);
             }
         }
     }

ModernKeePass.Application/Group/Commands/SortGroups/SortGroupsCommand.cs

@@ -24,7 +24,7 @@ namespace ModernKeePass.Application.Group.Commands.SortGroups
                 if (!_database.IsOpen) throw new DatabaseClosedException();
 
                 _database.SortSubGroups(message.Group.Id);
-                message.Group.SubGroups = message.Group.SubGroups.OrderBy(g => g.Title).ToList();
+                message.Group.Groups = message.Group.Groups.OrderBy(g => g.Title).ToList();
             }
         }
     }

ModernKeePass.Application/Group/Models/GroupVm.cs

@@ -15,7 +15,7 @@ namespace ModernKeePass.Application.Group.Models
         public string Id { get; set; }
         public string Title { get; set; }
         public Icon Icon { get; set; }
-        public List<GroupVm> SubGroups { get; set; }
+        public List<GroupVm> Groups { get; set; }
         public List<EntryVm> Entries { get; set; }
         
         public override string ToString()
@@ -26,13 +26,7 @@ namespace ModernKeePass.Application.Group.Models
         public void Mapping(Profile profile)
         {
             profile.CreateMap<GroupEntity, GroupVm>()
-                .ForMember(d => d.ParentGroupId, opts => opts.MapFrom(s => s.ParentId))
-                .ForMember(d => d.ParentGroupName, opts => opts.MapFrom(s => s.ParentName))
-                .ForMember(d => d.Id, opts => opts.MapFrom(s => s.Id))
                 .ForMember(d => d.Title, opts => opts.MapFrom(s => s.Name))
-                .ForMember(d => d.Icon, opts => opts.MapFrom(s => s.Icon))
-                .ForMember(d => d.Entries, opts => opts.MapFrom(s => s.Entries))
-                .ForMember(d => d.SubGroups, opts => opts.MapFrom(s => s.SubGroups))
                 .MaxDepth(2);
         }
     }

ModernKeePass.Application/Security/Commands/GenerateKeyFile/GenerateKeyFileCommand.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using MediatR;
 using ModernKeePass.Application.Common.Interfaces;
 
@@ -14,11 +13,13 @@ namespace ModernKeePass.Application.Security.Commands.GenerateKeyFile
         {
             private readonly ICredentialsProxy _security;
             private readonly IFileProxy _file;
+            private readonly ICryptographyClient _cryptography;
 
-            public GenerateKeyFileCommandHandler(ICredentialsProxy security, IFileProxy file)
+            public GenerateKeyFileCommandHandler(ICredentialsProxy security, IFileProxy file, ICryptographyClient cryptography)
             {
                 _security = security;
                 _file = file;
+                _cryptography = cryptography;
             }
 
             public async Task Handle(GenerateKeyFileCommand message)
@@ -26,9 +27,7 @@ namespace ModernKeePass.Application.Security.Commands.GenerateKeyFile
                 byte[] entropy = null;
                 if (message.AddAdditionalEntropy)
                 {
-                    entropy = new byte[10];
-                    var random = new Random();
-                    random.NextBytes(entropy);
+                    entropy = _cryptography.Random(10);
                 }
                 var keyFile = _security.GenerateKeyFile(entropy);
                 await _file.WriteBinaryContentsToFile(message.KeyFilePath, keyFile);

ModernKeePass.Application/project.json

@@ -6,7 +6,7 @@
     "MediatR": "3.0.1",
     "MediatR.Extensions.Microsoft.DependencyInjection": "2.0.0",
     "Microsoft.Extensions.DependencyInjection": "1.1.1",
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.2",
     "NETStandard.Library": "2.0.3",
     "Splat": "3.0.0"
   },

ModernKeePass.Domain/Entities/BaseEntity.cs

@@ -6,8 +6,8 @@ namespace ModernKeePass.Domain.Entities
     {
         public string Id { get; set; }
         public string Name { get; set; }
-        public string ParentId { get; set; }
-        public string ParentName { get; set; }
-        public DateTimeOffset LastModificationDate { get; set; }
+        public string ParentGroupId { get; set; }
+        public string ParentGroupName { get; set; }
+        public DateTimeOffset ModificationDate { get; set; }
     }
 }

ModernKeePass.Domain/Entities/GroupEntity.cs

@@ -5,7 +5,7 @@ namespace ModernKeePass.Domain.Entities
 {
     public class GroupEntity : BaseEntity
     {
-        public List<GroupEntity> SubGroups { get; set; } = new List<GroupEntity>();
+        public List<GroupEntity> Groups { get; set; } = new List<GroupEntity>();
         public List<EntryEntity> Entries { get; set; } = new List<EntryEntity>();
         public Icon Icon { get; set; }
     }

ModernKeePass.Domain/Enums/EntryFieldName.cs

@@ -7,7 +7,7 @@ namespace ModernKeePass.Domain.Enums
         public const string Title = nameof(Title);
         public const string UserName = nameof(UserName);
         public const string Password = nameof(Password);
-        public const string Url = nameof(Url);
+        public const string Url = "URL";
         public const string Notes = nameof(Notes);
         public const string Icon = nameof(Icon);
         public const string ExpirationDate = nameof(ExpirationDate);
@@ -15,7 +15,7 @@ namespace ModernKeePass.Domain.Enums
         public const string BackgroundColor = nameof(BackgroundColor);
         public const string ForegroundColor = nameof(ForegroundColor);
 
-        public static IEnumerable<string> StandardFieldNames = new[]
+        public static IEnumerable<string> StandardFieldNames => new[]
         {
             Title,
             UserName,

ModernKeePass.Domain/project.json

@@ -1,7 +1,7 @@
 {
   "supports": {},
   "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.2",
     "NETStandard.Library": "2.0.3",
     "Splat": "3.0.0"
   },

ModernKeePass.Infrastructure/Infrastructure.csproj

@@ -79,7 +79,6 @@
     <Compile Include="Common\MachineDateTime.cs" />
     <Compile Include="DependencyInjection.cs" />
     <Compile Include="File\CsvImportFormat.cs" />
-    <Compile Include="KeePass\EntryFieldMapper.cs" />
     <Compile Include="KeePass\MappingProfiles.cs" />
     <Compile Include="KeePass\IconMapper.cs" />
     <Compile Include="KeePass\KeePassDatabaseSettingsProxy.cs" />

ModernKeePass.Infrastructure/KeePass/EntryFieldMapper.cs

@@ -1,33 +0,0 @@
-using ModernKeePass.Domain.Enums;
-using ModernKeePassLib;
-
-namespace ModernKeePass.Infrastructure.KeePass
-{
-    public static class EntryFieldMapper
-    {
-        public static string MapPwDefsToField(string value)
-        {
-            switch (value)
-            {
-                case PwDefs.TitleField: return EntryFieldName.Title;
-                case PwDefs.UserNameField: return EntryFieldName.UserName;
-                case PwDefs.PasswordField: return EntryFieldName.Password;
-                case PwDefs.NotesField: return EntryFieldName.Notes;
-                case PwDefs.UrlField: return EntryFieldName.Url;
-                default: return value;
-            }
-        }
-        public static string MapFieldToPwDef(string value)
-        {
-            switch (value)
-            {
-                case EntryFieldName.Title: return PwDefs.TitleField;
-                case EntryFieldName.UserName: return PwDefs.UserNameField;
-                case EntryFieldName.Password: return PwDefs.PasswordField;
-                case EntryFieldName.Notes: return PwDefs.NotesField;
-                case EntryFieldName.Url: return PwDefs.UrlField;
-                default: return value;
-            }
-        }
-    }
-}

ModernKeePass.Infrastructure/KeePass/KeePassDatabaseClient.cs

@@ -25,6 +25,7 @@ namespace ModernKeePass.Infrastructure.KeePass
     {
         private readonly IMapper _mapper;
         private readonly IDateTime _dateTime;
+        private readonly ICryptographyClient _cryptography;
         private readonly PwDatabase _pwDatabase = new PwDatabase();
         private Credentials _credentials;
         // Flag: Has Dispose already been called?
@@ -94,10 +95,11 @@ namespace ModernKeePass.Infrastructure.KeePass
             set { _pwDatabase.Compression = (PwCompressionAlgorithm) Enum.Parse(typeof(PwCompressionAlgorithm), value); }
         }
 
-        public KeePassDatabaseClient(IMapper mapper, IDateTime dateTime)
+        public KeePassDatabaseClient(IMapper mapper, IDateTime dateTime, ICryptographyClient cryptography)
         {
             _mapper = mapper;
             _dateTime = dateTime;
+            _cryptography = cryptography;
         }
 
         public async Task Open(byte[] file, Credentials credentials)
@@ -240,19 +242,12 @@ namespace ModernKeePass.Infrastructure.KeePass
             _pwDatabase.DeletedObjects.Add(new PwDeletedObject(BuildIdFromString(entityId), _dateTime.Now));
         }
 
-        public void UpdateEntry(string entryId, string fieldName, object fieldValue, bool isProtected)
+        public async Task UpdateEntry(string entryId, string fieldName, object fieldValue, bool isProtected)
         {
             var pwEntry = _pwDatabase.RootGroup.FindEntry(BuildIdFromString(entryId), true);
 
             switch (fieldName)
             {
-                case EntryFieldName.Title:
-                case EntryFieldName.UserName:
-                case EntryFieldName.Password:
-                case EntryFieldName.Notes:
-                case EntryFieldName.Url:
-                    pwEntry.Strings.Set(EntryFieldMapper.MapFieldToPwDef(fieldName), new ProtectedString(isProtected, fieldValue.ToString()));
-                    break;
                 case EntryFieldName.HasExpirationDate:
                     pwEntry.Expires = (bool)fieldValue;
                     break;
@@ -268,8 +263,10 @@ namespace ModernKeePass.Infrastructure.KeePass
                 case EntryFieldName.ForegroundColor:
                     pwEntry.ForegroundColor = (Color)fieldValue;
                     break;
-                default: 
-                    pwEntry.Strings.Set(fieldName, new ProtectedString(isProtected, fieldValue.ToString()));
+                default:
+                    var stringValue = fieldValue == null ? string.Empty: fieldValue.ToString();
+                    var unprotectedFieldValue = isProtected ? await _cryptography.UnProtect(stringValue) : stringValue;
+                    pwEntry.Strings.Set(fieldName, new ProtectedString(isProtected, unprotectedFieldValue));
                     break;
             }
         }
@@ -394,7 +391,7 @@ namespace ModernKeePass.Infrastructure.KeePass
             {
                 Id = g.Uuid.ToHexString(),
                 Name = g.Name,
-                ParentName = g.ParentGroup?.Name
+                ParentGroupName = g.ParentGroup?.Name
             });
             return groups;
         }

ModernKeePass.Infrastructure/KeePass/MappingProfiles.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
+using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Domain.Entities;
 using ModernKeePassLib;
 using ModernKeePassLib.Security;
@@ -14,32 +15,42 @@ namespace ModernKeePass.Infrastructure.KeePass
         {
             CreateMap<KeyValuePair<string, ProtectedString>, FieldEntity>()
                 .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Key))
-                .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.Value.ReadString()))
+                .ForMember(dest => dest.Value, opt => opt.ResolveUsing<ProtectedStringResolver>())
                 .ForMember(dest => dest.IsProtected, opt => opt.MapFrom(src => src.Value.IsProtected));
 
             CreateMap<PwEntry, EntryEntity>()
-                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(src => src.ParentGroup.Uuid.ToHexString()))
-                .ForMember(dest => dest.ParentName, opt => opt.MapFrom(src => src.ParentGroup.Name))
+                .ForMember(dest => dest.ParentGroupId, opt => opt.MapFrom(src => src.ParentGroup.Uuid.ToHexString()))
                 .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Uuid.ToHexString()))
                 .ForMember(dest => dest.Fields, opt => opt.MapFrom(src => src.Strings))
-                .ForMember(dest => dest.ForegroundColor, opt => opt.MapFrom(src => src.ForegroundColor))
-                .ForMember(dest => dest.BackgroundColor, opt => opt.MapFrom(src => src.BackgroundColor))
                 .ForMember(dest => dest.ExpirationDate, opt => opt.MapFrom(src => new DateTimeOffset(src.ExpiryTime)))
                 .ForMember(dest => dest.HasExpirationDate, opt => opt.MapFrom(src => src.Expires))
                 .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => IconMapper.MapPwIconToIcon(src.IconId)))
-                .ForMember(dest => dest.LastModificationDate, opt => opt.MapFrom(src => new DateTimeOffset(src.LastModificationTime)))
+                .ForMember(dest => dest.ModificationDate, opt => opt.MapFrom(src => new DateTimeOffset(src.LastModificationTime)))
                 .ForMember(dest => dest.Attachments, opt => opt.MapFrom(src => src.Binaries.Select(b => new KeyValuePair<string, byte[]> (b.Key, b.Value.ReadData()) )));
 
             CreateMap<PwGroup, GroupEntity>()
-                .ForMember(d => d.ParentId, opts => opts.MapFrom(s => s.ParentGroup.Uuid.ToHexString()))
-                .ForMember(d => d.ParentName, opts => opts.MapFrom(s => s.ParentGroup.Name))
+                .ForMember(d => d.ParentGroupId, opts => opts.MapFrom(s => s.ParentGroup.Uuid.ToHexString()))
                 .ForMember(d => d.Id, opts => opts.MapFrom(s => s.Uuid.ToHexString()))
-                .ForMember(d => d.Name, opts => opts.MapFrom(s => s.Name))
                 .ForMember(d => d.Icon, opts => opts.MapFrom(s => IconMapper.MapPwIconToIcon(s.IconId)))
-                .ForMember(d => d.LastModificationDate, opts => opts.MapFrom(s => s.LastModificationTime))
-                .ForMember(d => d.Entries, opts => opts.MapFrom(s => s.Entries))
-                .ForMember(d => d.SubGroups, opts => opts.MapFrom(s => s.Groups))
+                .ForMember(d => d.ModificationDate, opts => opts.MapFrom(s => s.LastModificationTime))
                 .MaxDepth(2);
         }
     }
+
+    public class ProtectedStringResolver : IValueResolver<KeyValuePair<string, ProtectedString>, FieldEntity, string>
+    {
+        private readonly ICryptographyClient _cryptography;
+
+        public ProtectedStringResolver(ICryptographyClient cryptography)
+        {
+            _cryptography = cryptography;
+        }
+        
+        public string Resolve(KeyValuePair<string, ProtectedString> source, FieldEntity destination, string destMember, ResolutionContext context)
+        {
+            // TODO: this variable will contain (temporarily) the decrypted string
+            var decryptedString = source.Value.ReadString();
+            return source.Value.IsProtected ? _cryptography.Protect(decryptedString).GetAwaiter().GetResult() : decryptedString;
+        }
+    }
 }

ModernKeePass.Infrastructure/UWP/StorageFileClient.cs

@@ -74,6 +74,24 @@ namespace ModernKeePass.Infrastructure.UWP
             return result;
         }
 
+        public async Task WriteToLogFile(IEnumerable<string> data)
+        {
+            var local = ApplicationData.Current.LocalFolder;
+            var logFile = await local.CreateFileAsync("LogFile.txt", CreationCollisionOption.OpenIfExists).AsTask();
+
+            if (logFile != null)
+            {
+                try
+                {
+                    await FileIO.AppendLinesAsync(logFile, data);
+                }
+                catch (Exception)
+                { 
+                    // If another option is available to the app to log error(i.e. Azure Mobile Service, etc...) then try that here
+                }
+            }
+        }
+
         public void ReleaseFile(string path)
         {
             StorageApplicationPermissions.FutureAccessList.Remove(path);

ModernKeePass.Infrastructure/UWP/UwpCryptographyClient.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.Security.Cryptography;
 using Windows.Security.Cryptography.DataProtection;
@@ -10,24 +11,28 @@ namespace ModernKeePass.Infrastructure.UWP
     {
         public async Task<string> Protect(string value)
         {
-            // Create a DataProtectionProvider object for the specified descriptor.
-            var provider = new DataProtectionProvider();
+            if (string.IsNullOrEmpty(value)) return value;
 
+            // Create a DataProtectionProvider object for the specified descriptor.
+            var provider = new DataProtectionProvider("LOCAL=user");
+            
             // Encode the plaintext input message to a buffer.
             var buffMsg = CryptographicBuffer.ConvertStringToBinary(value, BinaryStringEncoding.Utf8);
 
             // Encrypt the message.
-            var buffProtected = await provider.ProtectAsync(buffMsg);
+            var buffProtected = await provider.ProtectAsync(buffMsg).AsTask().ConfigureAwait(false);
             
             // Encode buffer to Base64
-            var stringProtected = CryptographicBuffer.EncodeToBase64String(buffProtected);
+            var protectedValue = CryptographicBuffer.EncodeToBase64String(buffProtected);
 
             // Return the encrypted string.
-            return stringProtected;
+            return protectedValue;
         }
 
         public async Task<string> UnProtect(string value)
         {
+            if (string.IsNullOrEmpty(value)) return value;
+
             // Create a DataProtectionProvider object.
             var provider = new DataProtectionProvider();
 
@@ -35,13 +40,18 @@ namespace ModernKeePass.Infrastructure.UWP
             var buffProtected = CryptographicBuffer.DecodeFromBase64String(value);
 
             // Decrypt the protected message specified on input.
-            var buffUnprotected = await provider.UnprotectAsync(buffProtected);
+            var buffUnprotected = await provider.UnprotectAsync(buffProtected).AsTask().ConfigureAwait(false);
             
             // Convert the unprotected message from an IBuffer object to a string.
-            var strClearText = CryptographicBuffer.ConvertBinaryToString(BinaryStringEncoding.Utf8, buffUnprotected);
+            var clearText = CryptographicBuffer.ConvertBinaryToString(BinaryStringEncoding.Utf8, buffUnprotected);
 
             // Return the plaintext string.
-            return strClearText;
+            return clearText;
+        }
+
+        public byte[] Random(uint length)
+        {
+            return CryptographicBuffer.GenerateRandom(length).ToArray();
         }
     }
 }

ModernKeePass.Infrastructure/project.json

@@ -2,7 +2,7 @@
   "supports": {},
   "dependencies": {
     "AutoMapper": "5.2.0",
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.2",
     "ModernKeePassLib": "2.45.1",
     "NETStandard.Library": "2.0.3"
   },

ModernKeePass/App.xaml.cs

@@ -38,11 +38,12 @@ namespace ModernKeePass
         private readonly IMediator _mediator;
         private readonly ISettingsProxy _settings;
         private readonly INavigationService _navigation;
-        private readonly IHockeyClient _hockey;
         private readonly INotificationService _notification;
         private readonly IFileProxy _file;
         private readonly IMessenger _messenger;
-        
+        private readonly ILogger _log;
+        private readonly IHockeyClient _hockey;
+
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
         /// executed, and as such is the logical equivalent of main() or WinMain().
@@ -63,6 +64,7 @@ namespace ModernKeePass
             _settings = Services.GetService<ISettingsProxy>();
             _navigation = Services.GetService<INavigationService>();
             _notification = Services.GetService<INotificationService>();
+            _log = Services.GetService<ILogger>();
             _hockey = Services.GetService<IHockeyClient>();
             _file = Services.GetService<IFileProxy>();
             _messenger = Services.GetService<IMessenger>();
@@ -93,8 +95,7 @@ namespace ModernKeePass
 
         private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            _hockey.TrackException(e.Exception);
-            _hockey.Flush();
+            _log.LogError(e.Exception);
         }
 
         /// <summary>
@@ -209,8 +210,7 @@ namespace ModernKeePass
             }
             catch (Exception ex)
             {
-                _hockey.TrackException(ex);
-                _hockey.Flush();
+                await _log.LogError(ex);
             }
             finally
             {

ModernKeePass/DependencyInjection.cs

@@ -4,8 +4,10 @@ using GalaSoft.MvvmLight.Messaging;
 using GalaSoft.MvvmLight.Views;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.HockeyApp;
+using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Common;
 using ModernKeePass.Views;
+using ModernKeePass.Log;
 
 namespace ModernKeePass
 {
@@ -37,6 +39,7 @@ namespace ModernKeePass
 #endif
                 return HockeyClient.Current;
             });
+            services.AddSingleton(typeof(ILogger), typeof(HockeyAppLog));
 
             return services;
         }

ModernKeePass/Log/HockeyAppLog.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using ModernKeePass.Application.Common.Interfaces;
+using Microsoft.HockeyApp;
+using ModernKeePass.Domain.Interfaces;
+
+namespace ModernKeePass.Log
+{
+    public class HockeyAppLog : ILogger
+    {
+        private readonly IHockeyClient _hockey;
+        private readonly IFileProxy _file;
+        private readonly IDateTime _dateTime;
+
+        public HockeyAppLog(IHockeyClient hockey, IFileProxy file, IDateTime dateTime)
+        {
+            _hockey = hockey;
+            _file = file;
+            _dateTime = dateTime;
+        }
+
+        public async Task LogError(Exception exception)
+        {
+            _hockey.TrackException(exception);
+            _hockey.Flush();
+
+            var time = _dateTime.Now.ToLocalTime();
+            var data = new List<string>
+            {
+                $"{time} - {exception.Message}",
+                $"{time} - {exception.StackTrace}"
+            };
+            await _file.WriteToLogFile(data);
+        }
+
+        public void LogTrace(string message, Dictionary<string, string> values)
+        {
+            _hockey.TrackTrace(message, values);
+            _hockey.Flush();
+        }
+    }
+}

ModernKeePass/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.18.0.12" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.19.0.12" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>

ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml

@@ -8,14 +8,11 @@
         <Setter Property="BorderBrush" Value="{ThemeResource ComboBoxBorderThemeBrush}" />
         <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{ThemeResource SearchBoxContentThemeFontSize}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
         <Setter Property="FontWeight" Value="{ThemeResource SearchBoxContentThemeFontWeight}"/>
         <Setter Property="Foreground" Value="{ThemeResource SearchBoxForegroundThemeBrush}" />
         <Setter Property="Padding" Value="{ThemeResource SearchBoxThemePadding}"/>
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Width" Value="350" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="Typography.StylisticSet20" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -299,7 +296,7 @@
                                         FontSize="{TemplateBinding FontSize}"
                                         Grid.Column="1"
                                         Style="{StaticResource ActionButtonStyle}"
-                                        Content="{TemplateBinding ButtonSymbol}"
+                                        Content="{TemplateBinding ButtonContent}"
                                         Command="{TemplateBinding ButtonCommand}"
                                         CommandParameter="{TemplateBinding ButtonCommandParameter}">
                                     <ToolTipService.ToolTip>

ModernKeePass/Strings/en-US/Resources.resw

@@ -204,8 +204,8 @@
   <data name="EntryPassword.Text" xml:space="preserve">
     <value>Password</value>
   </data>
-  <data name="EntryShowPassword.Content" xml:space="preserve">
-    <value>Show password</value>
+  <data name="EntryShowPassword.OnContent" xml:space="preserve">
+    <value>Hide password</value>
   </data>
   <data name="GroupCreateEntry.Text" xml:space="preserve">
     <value>Create new entry</value>
@@ -564,4 +564,10 @@
   <data name="SettingsCopyExpiration.Text" xml:space="preserve">
     <value>Delete copied value from clipboard after how many seconds ?</value>
   </data>
+  <data name="EntryShowPassword.OffContent" xml:space="preserve">
+    <value>Show password</value>
+  </data>
+  <data name="PasswordGenerationButton.ButtonContent" xml:space="preserve">
+    <value>Random</value>
+  </data>
 </root>

ModernKeePass/Strings/fr-FR/Resources.resw

@@ -204,9 +204,6 @@
   <data name="EntryPassword.Text" xml:space="preserve">
     <value>Mot de passe</value>
   </data>
-  <data name="EntryShowPassword.Content" xml:space="preserve">
-    <value>Afficher le mot de passe</value>
-  </data>
   <data name="GroupCreateEntry.Text" xml:space="preserve">
     <value>Créer une nouvelle entrée</value>
   </data>
@@ -564,4 +561,13 @@
   <data name="EntryAddAdditionalField.Text" xml:space="preserve">
     <value>Ajouter un champ</value>
   </data>
+  <data name="EntryShowPassword.OffContent" xml:space="preserve">
+    <value>Afficher le mot de passe</value>
+  </data>
+  <data name="EntryShowPassword.OnContent" xml:space="preserve">
+    <value>Cacher le mot de passe</value>
+  </data>
+  <data name="PasswordGenerationButton.ButtonContent" xml:space="preserve">
+    <value>Aléatoire</value>
+  </data>
 </root>

ModernKeePass/ViewModels/EntryDetailVm.cs

@@ -26,8 +26,6 @@ using ModernKeePass.Application.Group.Commands.AddEntry;
 using ModernKeePass.Application.Group.Commands.DeleteEntry;
 using ModernKeePass.Application.Group.Commands.RemoveEntry;
 using ModernKeePass.Application.Group.Queries.GetGroup;
-using ModernKeePass.Application.Security.Commands.GeneratePassword;
-using ModernKeePass.Application.Security.Queries.EstimatePasswordComplexity;
 using ModernKeePass.Domain.Enums;
 using ModernKeePass.Application.Group.Models;
 using ModernKeePass.Common;
@@ -42,58 +40,7 @@ namespace ModernKeePass.ViewModels
     public class EntryDetailVm : ViewModelBase
     {
         public bool HasExpired => HasExpirationDate && ExpiryDate < DateTime.Now;
-        public double PasswordComplexityIndicator => _mediator.Send(new EstimatePasswordComplexityQuery {Password = Password}).GetAwaiter().GetResult();
-        public double PasswordLength
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.PasswordLength, 25); }
-            set
-            {
-                _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.PasswordLength, value);
-                RaisePropertyChanged(nameof(PasswordLength));
-            }
-        }
-        public bool UpperCasePatternSelected
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.UpperCasePattern, true); }
-            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.UpperCasePattern, value); }
-        }
-        public bool LowerCasePatternSelected
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.LowerCasePattern, true); }
-            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.LowerCasePattern, value); }
-        }
-        public bool DigitsPatternSelected
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.DigitsPattern, true); }
-            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.DigitsPattern, value); }
-        }
-        public bool MinusPatternSelected
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.MinusPattern, false); }
-            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.MinusPattern, value); }
-        }
-        public bool UnderscorePatternSelected
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.UnderscorePattern, false); }
-            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.UnderscorePattern, value); }
-        }
-        public bool SpacePatternSelected
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.SpacePattern, false); }
-            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.SpacePattern, value); }
-        }
-        public bool SpecialPatternSelected
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.SpecialPattern, true); }
-            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.SpecialPattern, value); }
-        }
-        public bool BracketsPatternSelected
-        {
-            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.BracketsPattern, false); }
-            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.BracketsPattern, value); }
-        }
-        public string CustomChars { get; set; } = string.Empty;
-
+        
         public string Id => SelectedItem.Id;
 
         public string ParentGroupName => _parent.Title;
@@ -126,7 +73,13 @@ namespace ModernKeePass.ViewModels
                 {
                     AdditionalFields =
                         new ObservableCollection<EntryFieldVm>(
-                            SelectedItem.AdditionalFields.Select(f => new EntryFieldVm(f.Name, f.Value, f.IsProtected)));
+                            SelectedItem.AdditionalFields.Select(f =>
+                            {
+                                var field = new EntryFieldVm(_cryptography);
+                                field.Initialize(f.Name, f.Value, f.IsProtected);
+                                return field;
+                            }));
+
                     Attachments = new ObservableCollection<Attachment>(SelectedItem.Attachments.Select(f => new Attachment
                     {
                         Name = f.Key,
@@ -161,15 +114,14 @@ namespace ModernKeePass.ViewModels
                 DeleteAdditionalField.RaiseCanExecuteChanged();
             }
         }
-
-
+        
         public string Title
         {
             get { return SelectedItem.Title.Value; }
             set
             {
                 SelectedItem.Title.Value = value;
-                SetFieldValue(nameof(Title), value, false).Wait();
+                SetFieldValue(SelectedItem.Title.Name, value, false).ConfigureAwait(false).GetAwaiter();
             }
         }
 
@@ -179,20 +131,21 @@ namespace ModernKeePass.ViewModels
             set
             {
                 SelectedItem.Username.Value = value;
-                SetFieldValue(nameof(UserName), value, false).Wait();
+                SetFieldValue(SelectedItem.Username.Name, value, false).ConfigureAwait(false).GetAwaiter();
                 RaisePropertyChanged(nameof(UserName));
             }
         }
 
         public string Password
         {
-            get { return SelectedItem.Password.Value; }
+            get { return _cryptography.UnProtect(SelectedItem.Password.Value).GetAwaiter().GetResult(); }
             set
             {
-                SelectedItem.Password.Value = value;
-                SetFieldValue(nameof(Password), value, true).Wait();
+                var protectedPassword = _cryptography.Protect(value).ConfigureAwait(false).GetAwaiter().GetResult();
+                SelectedItem.Password.Value = protectedPassword;
+                SetFieldValue(SelectedItem.Password.Name, protectedPassword, true).ConfigureAwait(false).GetAwaiter();
+
                 RaisePropertyChanged(nameof(Password));
-                RaisePropertyChanged(nameof(PasswordComplexityIndicator));
             }
         }
         
@@ -202,7 +155,7 @@ namespace ModernKeePass.ViewModels
             set
             {
                 SelectedItem.Url.Value = value;
-                SetFieldValue(nameof(Url), value, false).Wait();
+                SetFieldValue(SelectedItem.Url.Name, value, false).ConfigureAwait(false).GetAwaiter();
                 RaisePropertyChanged(nameof(Url));
             }
         }
@@ -213,7 +166,7 @@ namespace ModernKeePass.ViewModels
             set
             {
                 SelectedItem.Notes.Value = value;
-                SetFieldValue(nameof(Notes), value, false).Wait();
+                SetFieldValue(SelectedItem.Notes.Name, value, false).ConfigureAwait(false).GetAwaiter();
             }
         }
 
@@ -223,7 +176,7 @@ namespace ModernKeePass.ViewModels
             set
             {
                 SelectedItem.Icon = (Icon)Enum.Parse(typeof(Icon), value.ToString());
-                SetFieldValue(nameof(Icon), SelectedItem.Icon, false).Wait();
+                SetFieldValue(EntryFieldName.Icon, SelectedItem.Icon, false).ConfigureAwait(false).GetAwaiter();
             }
         }
 
@@ -235,7 +188,7 @@ namespace ModernKeePass.ViewModels
                 if (!HasExpirationDate) return;
 
                 SelectedItem.ExpirationDate = value.Date;
-                SetFieldValue("ExpirationDate", SelectedItem.ExpirationDate, false).Wait();
+                SetFieldValue(EntryFieldName.ExpirationDate, SelectedItem.ExpirationDate, false).ConfigureAwait(false).GetAwaiter();
             }
         }
 
@@ -247,7 +200,7 @@ namespace ModernKeePass.ViewModels
                 if (!HasExpirationDate) return;
 
                 SelectedItem.ExpirationDate = SelectedItem.ExpirationDate.Date.Add(value);
-                SetFieldValue("ExpirationDate", SelectedItem.ExpirationDate, false).Wait();
+                SetFieldValue(EntryFieldName.ExpirationDate, SelectedItem.ExpirationDate, false).ConfigureAwait(false).GetAwaiter();
             }
         }
         
@@ -257,7 +210,7 @@ namespace ModernKeePass.ViewModels
             set
             {
                 SelectedItem.HasExpirationDate = value;
-                SetFieldValue(nameof(HasExpirationDate), value, false).Wait();
+                SetFieldValue(EntryFieldName.HasExpirationDate, value, false).ConfigureAwait(false).GetAwaiter();
                 RaisePropertyChanged(nameof(HasExpirationDate));
             }
         }
@@ -268,7 +221,7 @@ namespace ModernKeePass.ViewModels
             set
             {
                 SelectedItem.BackgroundColor = value.ToColor();
-                SetFieldValue(nameof(BackgroundColor), SelectedItem.BackgroundColor, false).Wait();
+                SetFieldValue(EntryFieldName.BackgroundColor, SelectedItem.BackgroundColor, false).ConfigureAwait(false).GetAwaiter();
             }
         }
 
@@ -278,7 +231,7 @@ namespace ModernKeePass.ViewModels
             set
             {
                 SelectedItem.ForegroundColor = value.ToColor();
-                SetFieldValue(nameof(ForegroundColor), SelectedItem.ForegroundColor, false).Wait();
+                SetFieldValue(EntryFieldName.ForegroundColor, SelectedItem.ForegroundColor, false).ConfigureAwait(false).GetAwaiter();
             }
         }
         
@@ -288,14 +241,7 @@ namespace ModernKeePass.ViewModels
             set { Set(() => IsEditMode, ref _isEditMode, value); }
         }
         
-        public bool IsRevealPassword
-        {
-            get { return _isRevealPassword; }
-            set { Set(() => IsRevealPassword, ref _isRevealPassword, value); }
-        }
-
         public RelayCommand SaveCommand { get; }
-        public RelayCommand GeneratePasswordCommand { get; }
         public RelayCommand<string> MoveCommand { get; }
         public RelayCommand RestoreCommand { get; }
         public RelayCommand DeleteCommand { get; }
@@ -315,16 +261,15 @@ namespace ModernKeePass.ViewModels
         private readonly IDialogService _dialog;
         private readonly INotificationService _notification;
         private readonly IFileProxy _file;
-        private readonly ISettingsProxy _settings;
+        private readonly ICryptographyClient _cryptography;
         private GroupVm _parent;
         private EntryVm _selectedItem;
         private int _selectedIndex;
         private int _additionalFieldSelectedIndex = -1;
         private bool _isEditMode;
-        private bool _isRevealPassword;
         private bool _isDirty;
 
-        public EntryDetailVm(IMediator mediator, INavigationService navigation, IResourceProxy resource, IDialogService dialog, INotificationService notification, IFileProxy file, ISettingsProxy settings)
+        public EntryDetailVm(IMediator mediator, INavigationService navigation, IResourceProxy resource, IDialogService dialog, INotificationService notification, IFileProxy file, ICryptographyClient cryptography)
         {
             _mediator = mediator;
             _navigation = navigation;
@@ -332,10 +277,9 @@ namespace ModernKeePass.ViewModels
             _dialog = dialog;
             _notification = notification;
             _file = file;
-            _settings = settings;
+            _cryptography = cryptography;
 
             SaveCommand = new RelayCommand(async () => await SaveChanges(), () => Database.IsDirty);
-            GeneratePasswordCommand = new RelayCommand(async () => await GeneratePassword());
             MoveCommand = new RelayCommand<string>(async destination => await Move(destination), destination => _parent != null && !string.IsNullOrEmpty(destination) && destination != _parent.Id);
             RestoreCommand = new RelayCommand(async () => await RestoreHistory());
             DeleteCommand = new RelayCommand(async () => await AskForDelete());
@@ -350,6 +294,7 @@ namespace ModernKeePass.ViewModels
             MessengerInstance.Register<DatabaseSavedMessage>(this, _ => SaveCommand.RaiseCanExecuteChanged());
             MessengerInstance.Register<EntryFieldValueChangedMessage>(this, async message => await SetFieldValue(message.FieldName, message.FieldValue, message.IsProtected));
             MessengerInstance.Register<EntryFieldNameChangedMessage>(this, async message => await UpdateFieldName(message.OldName, message.NewName, message.Value, message.IsProtected));
+            MessengerInstance.Register<PasswordGeneratedMessage>(this, message => Password = message.Password);
         }
 
         public async Task Initialize(string entryId)
@@ -369,26 +314,9 @@ namespace ModernKeePass.ViewModels
             };
         }
 
-        public async Task GeneratePassword()
-        {
-            Password = await _mediator.Send(new GeneratePasswordCommand
-            {
-                BracketsPatternSelected = BracketsPatternSelected,
-                CustomChars = CustomChars,
-                DigitsPatternSelected = DigitsPatternSelected,
-                LowerCasePatternSelected = LowerCasePatternSelected,
-                MinusPatternSelected = MinusPatternSelected,
-                PasswordLength = (int)PasswordLength,
-                SpacePatternSelected = SpacePatternSelected,
-                SpecialPatternSelected = SpecialPatternSelected,
-                UnderscorePatternSelected = UnderscorePatternSelected,
-                UpperCasePatternSelected = UpperCasePatternSelected
-            });
-        }
-
         public async Task AddHistory()
         {
-            if (_isDirty) await _mediator.Send(new AddHistoryCommand { Entry = History[0] });
+            if (_isDirty && Database.IsOpen) await _mediator.Send(new AddHistoryCommand { Entry = History[0] });
         }
         
         public void GoToGroup(string groupId)
@@ -417,7 +345,7 @@ namespace ModernKeePass.ViewModels
         
         private void AddField()
         {
-            AdditionalFields.Add(new EntryFieldVm(string.Empty, string.Empty, false));
+            AdditionalFields.Add(new EntryFieldVm(_cryptography));
             AdditionalFieldSelectedIndex = AdditionalFields.Count - 1;
         }
 

ModernKeePass/ViewModels/GroupDetailVm.cs

@@ -140,7 +140,7 @@ namespace ModernKeePass.ViewModels
 
             Entries = new ObservableCollection<EntryVm>(_group.Entries);
             Entries.CollectionChanged += Entries_CollectionChanged;
-            Groups = new ObservableCollection<GroupVm>(_group.SubGroups);
+            Groups = new ObservableCollection<GroupVm>(_group.Groups);
             Groups.CollectionChanged += Groups_CollectionChanged;
         }
 
@@ -222,7 +222,7 @@ namespace ModernKeePass.ViewModels
             {
                 case NotifyCollectionChangedAction.Remove:
                     var oldIndex = e.OldStartingIndex;
-                    _reorderedGroup = _group.SubGroups[oldIndex];
+                    _reorderedGroup = _group.Groups[oldIndex];
                     break;
                 case NotifyCollectionChangedAction.Add:
                     if (_reorderedGroup == null)
@@ -251,7 +251,7 @@ namespace ModernKeePass.ViewModels
         private async Task SortGroupsAsync()
         {
             await _mediator.Send(new SortGroupsCommand {Group = _group});
-            Groups = new ObservableCollection<GroupVm>(_group.SubGroups);
+            Groups = new ObservableCollection<GroupVm>(_group.Groups);
             RaisePropertyChanged(nameof(Groups));
             SaveCommand.RaiseCanExecuteChanged();
         }

ModernKeePass/Views/EntryDetailPage.xaml

@@ -8,7 +8,7 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:actions="using:ModernKeePass.Actions"
-    xmlns:userControls="using:ModernKeePass.Views.UserControls"
+    xmlns:controls="using:ModernKeePass.Views.UserControls"
     x:Class="ModernKeePass.Views.EntryDetailPage"
     mc:Ignorable="d"
     SizeChanged="EntryDetailPage_OnSizeChanged"
@@ -16,347 +16,6 @@
     <Page.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
-        <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter" />
-        <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToForegroundBrushComplexityConverter" />
-
-        <Style TargetType="local:PasswordBoxWithButton" x:Key="PasswordBoxWithButtonStyle">
-            <Setter Property="Background" Value="{ThemeResource SearchBoxBackgroundThemeBrush}" />
-            <Setter Property="BorderBrush" Value="{ThemeResource ComboBoxBorderThemeBrush}" />
-            <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
-            <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-            <Setter Property="FontSize" Value="{ThemeResource SearchBoxContentThemeFontSize}" />
-            <Setter Property="FontWeight" Value="{ThemeResource SearchBoxContentThemeFontWeight}"/>
-            <Setter Property="Foreground" Value="{ThemeResource SearchBoxForegroundThemeBrush}" />
-            <Setter Property="Padding" Value="{ThemeResource SearchBoxThemePadding}"/>
-            <Setter Property="IsTabStop" Value="False" />
-            <Setter Property="Width" Value="350" />
-            <Setter Property="Height" Value="32" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="Typography.StylisticSet20" Value="True"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="local:PasswordBoxWithButton">
-                        <Grid x:Name="SearchBoxGrid">
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="PointerOver">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxPointerOverBackgroundThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxPointerOverBorderThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxPointerOverTextThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Disabled">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxDisabledBackgroundThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxDisabledBorderThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxDisabledTextThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PasswordBox" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Transparent" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Focused">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBackgroundThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource MainColor}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxButtonForegroundThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBorderThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="FocusedDropDown">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBackgroundThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBorderThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedTextThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                            <Grid.Resources>
-                                <Style x:Key="ActionButtonStyle" TargetType="Button">
-                                    <Setter Property="IsTabStop" Value="False" />
-                                    <Setter Property="VerticalAlignment" Value="Stretch" />
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="Button">
-                                                <Grid Background="Transparent">
-                                                    <VisualStateManager.VisualStateGroups>
-                                                        <VisualStateGroup x:Name="CommonStates">
-                                                            <VisualState x:Name="Normal" />
-                                                            <VisualState x:Name="PointerOver">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchGlyph" Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxButtonPointerOverForegroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButtonBackground" Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxButtonPointerOverBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Pressed">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchGlyph" Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedTextThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButtonBackground" Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Disabled" />
-                                                        </VisualStateGroup>
-                                                        <VisualStateGroup x:Name="FocusStates">
-                                                            <VisualState x:Name="Focused" />
-                                                            <VisualState x:Name="Unfocused" />
-                                                            <VisualState x:Name="PointerFocused" />
-                                                        </VisualStateGroup>
-                                                    </VisualStateManager.VisualStateGroups>
-                                                    <Grid x:Name="ActionButtonBackground" Background="{TemplateBinding Background}">
-                                                        <TextBlock x:Name="SearchGlyph"
-                                                               AutomationProperties.AccessibilityView="Raw"
-                                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                               Foreground="{TemplateBinding Foreground}"
-                                                               HorizontalAlignment="Center"
-                                                               FontStyle="Normal"
-                                                               Padding="4,0,4,0"
-                                                               Text="{TemplateBinding Content}"
-                                                               VerticalAlignment="Center" />
-                                                    </Grid>
-                                                </Grid>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                                <Style x:Key="PasswordBoxStyle" TargetType="PasswordBox">
-                                    <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
-                                    <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
-                                    <Setter Property="Foreground" Value="{ThemeResource TextBoxForegroundThemeBrush}" />
-                                    <Setter Property="Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}" />
-                                    <Setter Property="BorderBrush" Value="{ThemeResource TextBoxBorderThemeBrush}" />
-                                    <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextSelectionHighlightColorThemeBrush}" />
-                                    <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
-                                    <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-                                    <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-                                    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-                                    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
-                                    <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-                                    <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}"/>
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="PasswordBox">
-                                                <Grid>
-                                                    <VisualStateManager.VisualStateGroups>
-                                                        <VisualStateGroup x:Name="CommonStates">
-                                                            <VisualState x:Name="Disabled">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                                               Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                                               Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBorderThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
-                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
-                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Normal">
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="BackgroundElement"
-                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                 Duration="0"
-                                                                                 To="{ThemeResource TextControlBackgroundThemeOpacity}" />
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderElement"
-                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                 Duration="0"
-                                                                                 To="{ThemeResource TextControlBorderThemeOpacity}" />
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="PointerOver">
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="BackgroundElement"
-                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                 Duration="0"
-                                                                                 To="{ThemeResource TextControlPointerOverBackgroundThemeOpacity}" />
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderElement"
-                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                 Duration="0"
-                                                                                 To="{ThemeResource TextControlPointerOverBorderThemeOpacity}" />
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Focused" />
-                                                        </VisualStateGroup>
-                                                        <VisualStateGroup x:Name="ButtonStates" />
-                                                    </VisualStateManager.VisualStateGroups>
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="Auto" />
-                                                        <RowDefinition Height="*" />
-                                                    </Grid.RowDefinitions>
-                                                    <Border x:Name="BackgroundElement"
-                                                        Grid.Row="1"
-                                                        Background="{TemplateBinding Background}"
-                                                        Margin="{TemplateBinding BorderThickness}" />
-                                                    <Border x:Name="BorderElement"
-                                                        Grid.Row="1"
-                                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                                        BorderThickness="{TemplateBinding BorderThickness}" />
-                                                    <ContentPresenter x:Name="HeaderContentPresenter"
-                                                                  Grid.Row="0"
-                                                                  Foreground="{ThemeResource TextBoxForegroundHeaderThemeBrush}"
-                                                                  Margin="0,4,0,4"
-                                                                  Content="{TemplateBinding Header}"
-                                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                                  FontWeight="Semilight" />
-                                                    <ScrollViewer x:Name="ContentElement"
-                                                              Grid.Row="1"
-                                                              HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                                                              HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                                              VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                                                              VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                                              IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
-                                                              IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
-                                                              IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                                                              Margin="{TemplateBinding BorderThickness}"
-                                                              Padding="{TemplateBinding Padding}"
-                                                              IsTabStop="False"
-                                                              AutomationProperties.AccessibilityView="Raw"
-                                                              ZoomMode="Disabled" />
-                                                    <ContentControl x:Name="PlaceholderTextContentPresenter"
-                                                              Grid.Row="1"
-                                                              Foreground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"
-                                                              Margin="{TemplateBinding BorderThickness}"
-                                                              Padding="{TemplateBinding Padding}"
-                                                              IsTabStop="False"
-                                                              Grid.ColumnSpan="2"
-                                                              Content="{TemplateBinding PlaceholderText}"
-                                                              IsHitTestVisible="False" />
-                                                </Grid>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </Grid.Resources>
-                            <Border x:Name="SearchBoxBorder"
-                                Background="Transparent"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <PasswordBox x:Name="PasswordBox"
-                                         BorderThickness="0"
-                                         Background="Transparent"
-                                         FontFamily="{TemplateBinding FontFamily}"
-                                         FontSize="{TemplateBinding FontSize}"
-                                         FontWeight="{TemplateBinding FontWeight}"
-                                         Foreground="{TemplateBinding Foreground}"
-                                         MaxLength="2048"
-                                         MinHeight="{ThemeResource SearchBoxTextBoxThemeMinHeight}"
-                                         Padding="{TemplateBinding Padding}"
-                                         PlaceholderText="{TemplateBinding PlaceholderText}"
-                                         Style="{StaticResource PasswordBoxStyle}"
-                                         VerticalAlignment="Stretch"
-                                         Margin="0"
-                                         Password="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, Path=Password}"
-                                         IsPasswordRevealButtonEnabled="{TemplateBinding IsPasswordRevealEnabled}"/>
-                                    <Button x:Name="ActionButton"
-                                        AutomationProperties.AccessibilityView="Raw"
-                                        Background="Transparent"
-                                        FontWeight="{ThemeResource SearchBoxButtonThemeFontWeight}"
-                                        FontSize="{TemplateBinding FontSize}"
-                                        Grid.Column="1"
-                                        Style="{StaticResource ActionButtonStyle}"
-                                        Content="{TemplateBinding ButtonSymbol}"
-                                        IsEnabled="{TemplateBinding IsButtonEnabled}">
-                                        <Button.Flyout>
-                                            <Flyout>
-                                                <interactivity:Interaction.Behaviors>
-                                                    <core:DataTriggerBehavior Binding="{Binding Password}" ComparisonCondition="NotEqual" Value="" >
-                                                        <!--<actions:CloseFlyoutAction />-->
-                                                        <core:CallMethodAction MethodName="Hide" />
-                                                    </core:DataTriggerBehavior>
-                                                </interactivity:Interaction.Behaviors>
-                                                <StackPanel>
-                                                    <TextBlock>
-                                                        <Run x:Uid="PasswordGeneratorLength" />
-                                                        <Run Text="{Binding PasswordLength}" />
-                                                    </TextBlock>
-                                                    <Slider Value="{Binding PasswordLength, Mode=TwoWay}" Margin="0,-10,0,-20" />
-                                                    <CheckBox IsChecked="{Binding UpperCasePatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorUpper" />
-                                                    <CheckBox IsChecked="{Binding LowerCasePatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorLower" />
-                                                    <CheckBox IsChecked="{Binding DigitsPatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorDigits" />
-                                                    <CheckBox IsChecked="{Binding MinusPatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorMinus" />
-                                                    <CheckBox IsChecked="{Binding UnderscorePatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorUnderscore" />
-                                                    <CheckBox IsChecked="{Binding SpacePatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorSpace" />
-                                                    <CheckBox IsChecked="{Binding SpecialPatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorSpecial" />
-                                                    <CheckBox IsChecked="{Binding BracketsPatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorBrackets" />
-                                                    <TextBlock x:Uid="PasswordGeneratorAlso" Margin="0,5,0,0"/>
-                                                    <TextBox Text="{Binding CustomChars, Mode=TwoWay}" />
-                                                    <Button x:Uid="PasswordGeneratorButton" Command="{Binding GeneratePasswordCommand}" />
-                                                </StackPanel>
-                                            </Flyout>
-                                        </Button.Flyout>
-                                        <ToolTipService.ToolTip>
-                                            <ToolTip x:Uid="PasswordGeneratorTooltip" />
-                                        </ToolTipService.ToolTip>
-                                    </Button>
-                                </Grid>
-                            </Border>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
     </Page.Resources>
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.ChildrenTransitions>
@@ -373,7 +32,7 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <userControls:HamburgerMenuUserControl 
+            <controls:HamburgerMenuUserControl 
                 x:Name="HamburgerMenu"
                 x:Uid="HistoryLeftListView" 
                 ItemsSource="{Binding History}" 
@@ -391,7 +50,7 @@
                     <HubSection x:Uid="EntryHubMain">
                         <DataTemplate>
                             <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                <StackPanel Margin="20,0,0,20" MinWidth="400">
+                                <StackPanel Width="350" Margin="0,0,25,0">
                                     <StackPanel.Resources>
                                         <Style TargetType="CheckBox">
                                             <Setter Property="Margin" Value="0,20,0,0"/>
@@ -399,7 +58,7 @@
                                         </Style>
                                     </StackPanel.Resources>
                                     <TextBlock x:Uid="EntryLogin" Style="{StaticResource EntryTextBlockStyle}" />
-                                    <local:TextBoxWithButton x:Uid="LoginTextBox" Text="{Binding UserName, Mode=TwoWay}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" IsEnabled="{Binding IsCurrentEntry}">
+                                    <local:TextBoxWithButton x:Uid="LoginTextBox" Text="{Binding UserName, Mode=TwoWay}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonContent="&#xE16F;" IsEnabled="{Binding IsCurrentEntry}">
                                         <interactivity:Interaction.Behaviors>
                                             <core:EventTriggerBehavior EventName="ButtonClick">
                                                 <actions:ClipboardAction Text="{Binding UserName}" />
@@ -408,19 +67,9 @@
                                         </interactivity:Interaction.Behaviors>
                                     </local:TextBoxWithButton>
                                     <TextBlock x:Uid="EntryPassword" Style="{StaticResource EntryTextBlockStyle}" />
-                                    <local:PasswordBoxWithButton Password="{Binding Password, Mode=TwoWay}" IsPasswordRevealEnabled="True" Visibility="{Binding IsRevealPassword, Converter={StaticResource InverseBooleanToVisibilityConverter}}" Style="{StaticResource PasswordBoxWithButtonStyle}" IsEnabled="{Binding IsCurrentEntry}" ButtonSymbol="&#xE15E;" />
-                                    <local:TextBoxWithButton x:Uid="PasswordTextBox" Text="{Binding Password, Mode=TwoWay}" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" IsEnabled="{Binding IsCurrentEntry}">
-                                        <interactivity:Interaction.Behaviors>
-                                            <core:EventTriggerBehavior EventName="ButtonClick">
-                                                <actions:ClipboardAction Text="{Binding Password}" />
-                                                <actions:ToastAction x:Uid="ToastCopyPassword" Title="{Binding Title}" />
-                                            </core:EventTriggerBehavior>
-                                        </interactivity:Interaction.Behaviors>
-                                    </local:TextBoxWithButton>
-                                    <ProgressBar Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" Maximum="128" Width="350" HorizontalAlignment="Left" Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroundBrushComplexityConverter}}" />
-                                    <CheckBox x:Uid="EntryShowPassword" HorizontalAlignment="Left" Margin="-3,0,0,0" IsChecked="{Binding IsRevealPassword, Mode=TwoWay}" />
+                                    <controls:PasswordGenerationBox Password="{Binding Password, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" />
                                     <TextBlock Text="URL" Style="{StaticResource EntryTextBlockStyle}"/>
-                                    <local:TextBoxWithButton x:Uid="UrlTextBox" Text="{Binding Url, Mode=TwoWay}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE111;" IsEnabled="{Binding IsCurrentEntry}">
+                                    <local:TextBoxWithButton x:Uid="UrlTextBox" Text="{Binding Url, Mode=TwoWay}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonContent="&#xE111;" IsEnabled="{Binding IsCurrentEntry}">
                                         <interactivity:Interaction.Behaviors>
                                             <core:EventTriggerBehavior EventName="ButtonClick">
                                                 <actions:NavigateToUrlAction Url="{Binding Url}" />
@@ -428,8 +77,8 @@
                                         </interactivity:Interaction.Behaviors>
                                     </local:TextBoxWithButton>
                                     <TextBlock x:Uid="EntryNotes" Style="{StaticResource EntryTextBlockStyle}" />
-                                    <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" IsEnabled="{Binding IsCurrentEntry}" />
-                                    <CheckBox x:Uid="EntryExpirationDate" IsChecked="{Binding HasExpirationDate, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" />
+                                    <TextBox TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" IsEnabled="{Binding IsCurrentEntry}" />
+                                    <CheckBox x:Uid="EntryExpirationDate" Margin="-3,0,0,0" IsChecked="{Binding HasExpirationDate, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" />
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="Auto" />
@@ -471,11 +120,11 @@
                         <DataTemplate>
                             <StackPanel Orientation="Vertical">
                                 <TextBlock x:Uid="EntryIcon" Style="{StaticResource EntryTextBlockStyle}" />
-                                <userControls:SymbolPickerUserControl SelectedSymbol="{Binding Icon, Mode=TwoWay}" HorizontalAlignment="Left" IsEnabled="{Binding IsCurrentEntry}" />
+                                <controls:SymbolPickerUserControl SelectedSymbol="{Binding Icon, Mode=TwoWay}" HorizontalAlignment="Left" IsEnabled="{Binding IsCurrentEntry}" />
                                 <TextBlock x:Uid="EntryBackgroundColor" Style="{StaticResource EntryTextBlockStyle}" />
-                                <userControls:ColorPickerUserControl SelectedColor="{Binding BackgroundColor, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" Width="250" />
+                                <controls:ColorPickerUserControl SelectedColor="{Binding BackgroundColor, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" Width="250" />
                                 <TextBlock x:Uid="EntryForegroundColor" Style="{StaticResource EntryTextBlockStyle}" />
-                                <userControls:ColorPickerUserControl SelectedColor="{Binding ForegroundColor, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" Width="250" />
+                                <controls:ColorPickerUserControl SelectedColor="{Binding ForegroundColor, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" Width="250" />
                             </StackPanel>
                         </DataTemplate>
                     </HubSection>
@@ -520,8 +169,7 @@
                                     <DataTemplate>
                                         <StackPanel Orientation="Vertical" Margin="5">
                                             <TextBlock Text="{Binding Name}" Style="{StaticResource EntryTextBlockStyle}" FontWeight="SemiBold" />
-                                            <TextBlock HorizontalAlignment="Left" MaxLines="3" FontSize="12" Margin="2,0,2,5" Text="*****" Visibility="{Binding IsProtected, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource EntryTextBlockStyle}"/>
-                                            <TextBlock HorizontalAlignment="Left" MaxLines="3" FontSize="12" Margin="2,0,2,5" Text="{Binding Value}" Visibility="{Binding IsProtected, Converter={StaticResource InverseBooleanToVisibilityConverter}}" Style="{StaticResource EntryTextBlockStyle}"/>
+                                            <TextBlock HorizontalAlignment="Left" MaxLines="3" FontSize="12" Margin="2,0,2,5" Text="{Binding DisplayValue}" Style="{StaticResource EntryTextBlockStyle}"/>
                                         </StackPanel>
                                     </DataTemplate>
                                 </local:SelectableTemplateListView.ItemTemplate>
@@ -614,7 +262,7 @@
                     </core:DataTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </TextBox>
-            <userControls:TopMenuUserControl 
+            <controls:TopMenuUserControl 
                 x:Name="TopMenu" Grid.Column="4"
                 IsEditButtonChecked="{Binding IsEditMode, Mode=TwoWay}"
                 MoveButtonVisibility="{Binding IsCurrentEntry, Converter={StaticResource BooleanToVisibilityConverter}}"
@@ -628,7 +276,7 @@
                         <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}"  />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
-            </userControls:TopMenuUserControl>
+            </controls:TopMenuUserControl>
         </Grid>
     </Grid>
 </Page>

ModernKeePass/Views/EntryDetailPage.xaml.cs

@@ -14,7 +14,7 @@ namespace ModernKeePass.Views
     public sealed partial class EntryDetailPage
     {
         public EntryDetailVm Model => (EntryDetailVm) DataContext;
-        
+
         public EntryDetailPage()
         {
             InitializeComponent();
@@ -29,7 +29,6 @@ namespace ModernKeePass.Views
             {
                 await Model.Initialize(args.Id);
                 Model.IsEditMode = args.IsNew;
-                if (args.IsNew) await Model.GeneratePassword();
             }
         }
 

ModernKeePass/Views/GroupDetailPage.xaml

@@ -20,9 +20,6 @@
     </Page.Resources>
     <Grid>
         <Grid.Resources>
-            <CollectionViewSource
-                x:Name="EntriesViewSource"
-                Source="{Binding Entries}" />
             <CollectionViewSource
                 x:Name="EntriesZoomedOutViewSource"
                 Source="{Binding EntriesZoomedOut}" IsSourceGrouped="True" />
@@ -79,7 +76,7 @@
                         <!-- Horizontal scrolling grid -->
                         <GridView
                             x:Name="GridView"
-                            ItemsSource="{Binding Source={StaticResource EntriesViewSource}}"
+                            ItemsSource="{Binding Entries}"
                             AutomationProperties.AutomationId="ItemGridView"
                             AutomationProperties.Name="Entries"
                             TabIndex="1"
@@ -128,7 +125,7 @@
                                                     <MenuFlyoutItem x:Uid="EntryItemCopyPassword">
                                                         <interactivity:Interaction.Behaviors>
                                                             <core:EventTriggerBehavior EventName="Click">
-                                                                <actions:ClipboardAction Text="{Binding Password}" />
+                                                                <actions:ClipboardAction Text="{Binding Password}" IsProtected="True" />
                                                                 <actions:ToastAction x:Uid="ToastCopyPassword" Title="{Binding Title}" />
                                                             </core:EventTriggerBehavior>
                                                         </interactivity:Interaction.Behaviors>
@@ -151,23 +148,26 @@
                     <SemanticZoom.ZoomedOutView>
                         <GridView
                             ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}"
-                            SelectionChanged="groups_SelectionChanged"
                             SelectionMode="None"
                             IsSynchronizedWithCurrentItem="False">
+                            <GridView.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <VariableSizedWrapGrid Orientation="Vertical" ItemWidth="140" />
+                                </ItemsPanelTemplate>
+                            </GridView.ItemsPanel>
                             <GridView.ItemTemplate>
                                 <DataTemplate>
-                                    <StackPanel Orientation="Vertical">
-                                        <TextBlock Width="100" Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
-                                    </StackPanel>
+                                    <TextBlock Width="100" Margin="5,0,0,0" Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
                                 </DataTemplate>
                             </GridView.ItemTemplate>
                             <GridView.GroupStyle>
                                 <GroupStyle HidesIfEmpty="True">
                                     <GroupStyle.HeaderTemplate>
                                         <DataTemplate>
-                                            <Grid Background="LightGray" HorizontalAlignment="Left">
-                                                <TextBlock Text="{Binding Key}" Width="50" Margin="30" Foreground="{StaticResource MainColorBrush}" Style="{StaticResource HeaderTextBlockStyle}" TextAlignment="Center" />
-                                            </Grid>
+                                            <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
+                                                <TextBlock Text="{Binding Key}" Width="50" Margin="20" Foreground="{StaticResource MainColorBrush}" Style="{StaticResource SubheaderTextBlockStyle}" TextAlignment="Center" />
+                                                <Border BorderBrush="DarkGray" BorderThickness="0,0,0,1" />
+                                            </StackPanel>
                                         </DataTemplate>
                                     </GroupStyle.HeaderTemplate>
                                 </GroupStyle>

ModernKeePass/Views/SettingsPageFrames/SettingsGeneralPage.xaml.cs

@@ -17,7 +17,7 @@ namespace ModernKeePass.Views
 
         private void UIElement_OnKeyDown(object sender, KeyRoutedEventArgs e)
         {
-            if ((e.Key < VirtualKey.NumberPad0 || e.Key > VirtualKey.NumberPad9) & (e.Key < VirtualKey.Number0 || e.Key > VirtualKey.Number9))
+            if ((e.Key < VirtualKey.NumberPad0 || e.Key > VirtualKey.NumberPad9) && (e.Key < VirtualKey.Number0 || e.Key > VirtualKey.Number9))
             {
                 e.Handled = true;
             }

ModernKeePass/Views/SettingsPageFrames/SettingsHistoryPage.xaml.cs

@@ -17,7 +17,7 @@ namespace ModernKeePass.Views.SettingsPageFrames
 
         private void UIElement_OnKeyDown(object sender, KeyRoutedEventArgs e)
         {
-            if ((e.Key < VirtualKey.NumberPad0 || e.Key > VirtualKey.NumberPad9) & (e.Key < VirtualKey.Number0 || e.Key > VirtualKey.Number9))
+            if ((e.Key < VirtualKey.NumberPad0 || e.Key > VirtualKey.NumberPad9) && (e.Key < VirtualKey.Number0 || e.Key > VirtualKey.Number9))
             {
                 e.Handled = true;
             }

ModernKeePass/Views/SettingsPageFrames/SettingsRecycleBinPage.xaml.cs

@@ -1,30 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
 namespace ModernKeePass.Views.SettingsPageFrames
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class SettingsRecycleBinPage : Page
+    public sealed partial class SettingsRecycleBinPage
     {
         public SettingsRecycleBinPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
     }
 }

ModernKeePass/Views/UserControls/ColorPickerUserControl.xaml

@@ -6,10 +6,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
     <ComboBox x:Name="ComboBox" 
-              ItemsSource="{Binding Colors, ElementName=UserControl}" 
-              SelectionChanged="Selector_OnSelectionChanged" 
-              Loaded="ComboBox_Loaded" 
-              IsEnabled="{Binding IsEnabled, ElementName=UserControl}">
+        DataContext="{Binding Source={StaticResource Locator}, Path=ColorPicker}"
+        ItemsSource="{Binding Colors}"
+        SelectedItem="{Binding SelectedItem}"
+        SelectedValue="{Binding SelectedColor, ElementName=UserControl}" 
+        SelectedValuePath="ColorBrush"
+        SelectionChanged="ComboBox_OnSelectionChanged"
+        IsEnabled="{Binding IsEnabled, ElementName=UserControl}">
         <ComboBox.ItemTemplate>
             <DataTemplate>
                 <StackPanel Orientation="Horizontal" Margin="0,0,10,0">

ModernKeePass/Views/UserControls/ColorPickerUserControl.xaml.cs

@@ -1,9 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using Windows.UI.Xaml;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
+using ModernKeePass.ViewModels;
 
 // The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
 
@@ -11,14 +9,6 @@ namespace ModernKeePass.Views.UserControls
 {
     public sealed partial class ColorPickerUserControl
     {
-        public struct Color
-        {
-            public string ColorName { get; set; }
-            public SolidColorBrush ColorBrush { get; set; }
-        }
-
-        public List<Color> Colors { get; }
-
         public SolidColorBrush SelectedColor
         {
             get { return (SolidColorBrush)GetValue(SelectedColorProperty); }
@@ -29,33 +19,21 @@ namespace ModernKeePass.Views.UserControls
                 nameof(SelectedColor),
                 typeof(SolidColorBrush),
                 typeof(ColorPickerUserControl),
-                new PropertyMetadata(new SolidColorBrush(), (o, args) => { }));
+                new PropertyMetadata(new SolidColorBrush(), (o, args) =>
+                {
+                    var colorPickerUserControl = o as ColorPickerUserControl;
+                    var vm = colorPickerUserControl?.ComboBox.DataContext as ColorPickerControlVm;
+                    vm?.Initialize(args.NewValue as SolidColorBrush);
+                }));
 
         public ColorPickerUserControl()
         {
             InitializeComponent();
-            Colors = new List<Color>();
-            var type = typeof(Windows.UI.Colors);
-            var properties = type.GetRuntimeProperties().ToArray();
-            foreach (var propertyInfo in properties)
-            {
-                Colors.Add(new Color
-                {
-                    ColorName = propertyInfo.Name,
-                    ColorBrush = new SolidColorBrush((Windows.UI.Color)propertyInfo.GetValue(null, null))
-                });
-            }
         }
 
-        private void ComboBox_Loaded(object sender, RoutedEventArgs e)
+        private void ComboBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            ComboBox.SelectedItem = Colors.Find(c => c.ColorBrush.Color.Equals(SelectedColor.Color));
-        }
-
-        private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            var selectedItem = ComboBox.SelectedItem as Color? ?? new Color();
-            SelectedColor = selectedItem.ColorBrush;
+            SelectedColor = (e.AddedItems[0] as ColorPickerControlVm.Color)?.ColorBrush;
         }
     }
 }

ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml

@@ -142,7 +142,7 @@
                             ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
                             Style="{StaticResource TextBoxWithButtonStyle}"
                             KeyDown="NewGroupTextBox_OnKeyDown"
-                            ButtonSymbol="">
+                            ButtonContent="">
                             <interactivity:Interaction.Behaviors>
                                 <core:EventTriggerBehavior EventName="LostFocus">
                                     <core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupButton}" PropertyName="Visibility" Value="Visible" />

ModernKeePass/Views/UserControls/PasswordGenerationBox.xaml

@@ -0,0 +1,384 @@
+<UserControl x:Name="UserControl"
+    x:Class="ModernKeePass.Views.UserControls.PasswordGenerationBox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    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:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:actions="using:ModernKeePass.Actions"
+    mc:Ignorable="d" 
+    BorderBrush="{ThemeResource ComboBoxBorderThemeBrush}">
+    <StackPanel x:Name="StackPanel" Orientation="Vertical" DataContext="{Binding Source={StaticResource Locator}, Path=PasswordGenerationBox}">
+        <StackPanel.Resources>
+            <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter" />
+            <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToForegroundBrushComplexityConverter" />
+            <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+            <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
+            <Style TargetType="controls:PasswordBoxWithButton" x:Key="PasswordBoxWithButtonStyle">
+                <Setter Property="Background" Value="{ThemeResource SearchBoxBackgroundThemeBrush}" />
+                <Setter Property="BorderBrush" Value="{ThemeResource ComboBoxBorderThemeBrush}" />
+                <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
+                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+                <Setter Property="FontWeight" Value="{ThemeResource SearchBoxContentThemeFontWeight}"/>
+                <Setter Property="Foreground" Value="{ThemeResource SearchBoxForegroundThemeBrush}" />
+                <Setter Property="Padding" Value="{ThemeResource SearchBoxThemePadding}"/>
+                <Setter Property="IsTabStop" Value="False" />
+                <Setter Property="Typography.StylisticSet20" Value="True"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="controls:PasswordBoxWithButton">
+                            <Grid x:Name="SearchBoxGrid">
+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="CommonStates">
+                                        <VisualState x:Name="Normal">
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                        <VisualState x:Name="PointerOver">
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxPointerOverBackgroundThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxPointerOverBorderThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxPointerOverTextThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                        <VisualState x:Name="Disabled">
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxDisabledBackgroundThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxDisabledBorderThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxDisabledTextThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PasswordBox" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="Transparent" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                        <VisualState x:Name="Focused">
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBackgroundThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource MainColor}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxButtonForegroundThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBorderThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                        <VisualState x:Name="FocusedDropDown">
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxGrid" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBackgroundThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchBoxBorder" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBorderThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedTextThemeBrush}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                    </VisualStateGroup>
+                                </VisualStateManager.VisualStateGroups>
+                                <Grid.Resources>
+                                    <Style x:Key="ActionButtonStyle" TargetType="Button">
+                                        <Setter Property="IsTabStop" Value="False" />
+                                        <Setter Property="VerticalAlignment" Value="Stretch" />
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="Button">
+                                                    <Grid Background="Transparent">
+                                                        <VisualStateManager.VisualStateGroups>
+                                                            <VisualStateGroup x:Name="CommonStates">
+                                                                <VisualState x:Name="Normal" />
+                                                                <VisualState x:Name="PointerOver">
+                                                                    <Storyboard>
+                                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchGlyph" Storyboard.TargetProperty="Foreground">
+                                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxButtonPointerOverForegroundThemeBrush}" />
+                                                                        </ObjectAnimationUsingKeyFrames>
+                                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButtonBackground" Storyboard.TargetProperty="Background">
+                                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxButtonPointerOverBackgroundThemeBrush}" />
+                                                                        </ObjectAnimationUsingKeyFrames>
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Pressed">
+                                                                    <Storyboard>
+                                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SearchGlyph" Storyboard.TargetProperty="Foreground">
+                                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedTextThemeBrush}" />
+                                                                        </ObjectAnimationUsingKeyFrames>
+                                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButtonBackground" Storyboard.TargetProperty="Background">
+                                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SearchBoxFocusedBackgroundThemeBrush}" />
+                                                                        </ObjectAnimationUsingKeyFrames>
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Disabled" />
+                                                            </VisualStateGroup>
+                                                            <VisualStateGroup x:Name="FocusStates">
+                                                                <VisualState x:Name="Focused" />
+                                                                <VisualState x:Name="Unfocused" />
+                                                                <VisualState x:Name="PointerFocused" />
+                                                            </VisualStateGroup>
+                                                        </VisualStateManager.VisualStateGroups>
+                                                        <Grid x:Name="ActionButtonBackground" Background="{TemplateBinding Background}">
+                                                            <TextBlock x:Name="SearchGlyph"
+                                                                   AutomationProperties.AccessibilityView="Raw"
+                                                                   FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                                   Foreground="{TemplateBinding Foreground}"
+                                                                   HorizontalAlignment="Center"
+                                                                   FontStyle="Italic"
+                                                                   Padding="4,0,4,0"
+                                                                   Text="{TemplateBinding Content}"
+                                                                   VerticalAlignment="Center" />
+                                                        </Grid>
+                                                    </Grid>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                    <Style x:Key="PasswordBoxStyle" TargetType="PasswordBox">
+                                        <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
+                                        <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
+                                        <Setter Property="Foreground" Value="{ThemeResource TextBoxForegroundThemeBrush}" />
+                                        <Setter Property="Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}" />
+                                        <Setter Property="BorderBrush" Value="{ThemeResource TextBoxBorderThemeBrush}" />
+                                        <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextSelectionHighlightColorThemeBrush}" />
+                                        <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
+                                        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+                                        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+                                        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+                                        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
+                                        <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}"/>
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="PasswordBox">
+                                                    <Grid>
+                                                        <VisualStateManager.VisualStateGroups>
+                                                            <VisualStateGroup x:Name="CommonStates">
+                                                                <VisualState x:Name="Disabled">
+                                                                    <Storyboard>
+                                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
+                                                                                                   Storyboard.TargetProperty="Background">
+                                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBackgroundThemeBrush}" />
+                                                                        </ObjectAnimationUsingKeyFrames>
+                                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                                                   Storyboard.TargetProperty="BorderBrush">
+                                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBorderThemeBrush}" />
+                                                                        </ObjectAnimationUsingKeyFrames>
+                                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
+                                                                                                   Storyboard.TargetProperty="Foreground">
+                                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
+                                                                        </ObjectAnimationUsingKeyFrames>
+                                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
+                                                                                                   Storyboard.TargetProperty="Foreground">
+                                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
+                                                                        </ObjectAnimationUsingKeyFrames>
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Normal">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                                                     Storyboard.TargetProperty="Opacity"
+                                                                                     Duration="0"
+                                                                                     To="{ThemeResource TextControlBackgroundThemeOpacity}" />
+                                                                        <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                                                     Storyboard.TargetProperty="Opacity"
+                                                                                     Duration="0"
+                                                                                     To="{ThemeResource TextControlBorderThemeOpacity}" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="PointerOver">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="BackgroundElement"
+                                                                                     Storyboard.TargetProperty="Opacity"
+                                                                                     Duration="0"
+                                                                                     To="{ThemeResource TextControlPointerOverBackgroundThemeOpacity}" />
+                                                                        <DoubleAnimation Storyboard.TargetName="BorderElement"
+                                                                                     Storyboard.TargetProperty="Opacity"
+                                                                                     Duration="0"
+                                                                                     To="{ThemeResource TextControlPointerOverBorderThemeOpacity}" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Focused" />
+                                                            </VisualStateGroup>
+                                                            <VisualStateGroup x:Name="ButtonStates" />
+                                                        </VisualStateManager.VisualStateGroups>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="*" />
+                                                        </Grid.RowDefinitions>
+                                                        <Border x:Name="BackgroundElement"
+                                                            Grid.Row="1"
+                                                            Background="{TemplateBinding Background}"
+                                                            Margin="{TemplateBinding BorderThickness}" />
+                                                        <Border x:Name="BorderElement"
+                                                            Grid.Row="1"
+                                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                                            BorderThickness="{TemplateBinding BorderThickness}" />
+                                                        <ContentPresenter x:Name="HeaderContentPresenter"
+                                                                      Grid.Row="0"
+                                                                      Foreground="{ThemeResource TextBoxForegroundHeaderThemeBrush}"
+                                                                      Margin="0,4,0,4"
+                                                                      Content="{TemplateBinding Header}"
+                                                                      ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                                      FontWeight="Semilight" />
+                                                        <ScrollViewer x:Name="ContentElement"
+                                                                  Grid.Row="1"
+                                                                  HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                                                  HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                                  VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                                                  VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                                  IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+                                                                  IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+                                                                  IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                                                  Margin="{TemplateBinding BorderThickness}"
+                                                                  Padding="{TemplateBinding Padding}"
+                                                                  IsTabStop="False"
+                                                                  AutomationProperties.AccessibilityView="Raw"
+                                                                  ZoomMode="Disabled" />
+                                                        <ContentControl x:Name="PlaceholderTextContentPresenter"
+                                                                  Grid.Row="1"
+                                                                  Foreground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"
+                                                                  Margin="{TemplateBinding BorderThickness}"
+                                                                  Padding="{TemplateBinding Padding}"
+                                                                  IsTabStop="False"
+                                                                  Grid.ColumnSpan="2"
+                                                                  Content="{TemplateBinding PlaceholderText}"
+                                                                  IsHitTestVisible="False" />
+                                                    </Grid>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Grid.Resources>
+                                <Border x:Name="SearchBoxBorder"
+                                    Background="Transparent"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <PasswordBox x:Name="PasswordBox"
+                                             BorderThickness="0"
+                                             Background="Transparent"
+                                             FontFamily="{TemplateBinding FontFamily}"
+                                             FontSize="{TemplateBinding FontSize}"
+                                             FontWeight="{TemplateBinding FontWeight}"
+                                             Foreground="{TemplateBinding Foreground}"
+                                             MaxLength="2048"
+                                             MinHeight="{ThemeResource SearchBoxTextBoxThemeMinHeight}"
+                                             Padding="{TemplateBinding Padding}"
+                                             PlaceholderText="{TemplateBinding PlaceholderText}"
+                                             Style="{StaticResource PasswordBoxStyle}"
+                                             VerticalAlignment="Stretch"
+                                             Margin="0"
+                                             Password="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, Path=Password, UpdateSourceTrigger=PropertyChanged}"
+                                             IsPasswordRevealButtonEnabled="{TemplateBinding IsPasswordRevealEnabled}"/>
+                                        <Button x:Name="ActionButton"
+                                            AutomationProperties.AccessibilityView="Raw"
+                                            Background="Transparent"
+                                            FontWeight="{ThemeResource SearchBoxButtonThemeFontWeight}"
+                                            FontSize="12"
+                                            Grid.Column="1"
+                                            Style="{StaticResource ActionButtonStyle}"
+                                            Content="{TemplateBinding ButtonContent}"
+                                            IsEnabled="{TemplateBinding IsButtonEnabled}">
+                                            <Button.Flyout>
+                                                <Flyout>
+                                                    <interactivity:Interaction.Behaviors>
+                                                        <core:DataTriggerBehavior Binding="{Binding Password}" ComparisonCondition="NotEqual" Value="" >
+                                                            <core:CallMethodAction MethodName="Hide" />
+                                                        </core:DataTriggerBehavior>
+                                                    </interactivity:Interaction.Behaviors>
+                                                    <StackPanel>
+                                                        <TextBlock>
+                                                            <Run x:Uid="PasswordGeneratorLength" />
+                                                            <Run Text="{Binding PasswordLength}" />
+                                                        </TextBlock>
+                                                        <Slider Value="{Binding PasswordLength, Mode=TwoWay}" Margin="0,-10,0,-20" />
+                                                        <CheckBox IsChecked="{Binding UpperCasePatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorUpper" />
+                                                        <CheckBox IsChecked="{Binding LowerCasePatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorLower" />
+                                                        <CheckBox IsChecked="{Binding DigitsPatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorDigits" />
+                                                        <CheckBox IsChecked="{Binding MinusPatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorMinus" />
+                                                        <CheckBox IsChecked="{Binding UnderscorePatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorUnderscore" />
+                                                        <CheckBox IsChecked="{Binding SpacePatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorSpace" />
+                                                        <CheckBox IsChecked="{Binding SpecialPatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorSpecial" />
+                                                        <CheckBox IsChecked="{Binding BracketsPatternSelected, Mode=TwoWay}" x:Uid="PasswordGeneratorBrackets" />
+                                                        <TextBlock x:Uid="PasswordGeneratorAlso" Margin="0,5,0,0"/>
+                                                        <TextBox Text="{Binding CustomChars, Mode=TwoWay}" />
+                                                        <Button x:Uid="PasswordGeneratorButton" Command="{Binding GeneratePasswordCommand}" />
+                                                    </StackPanel>
+                                                </Flyout>
+                                            </Button.Flyout>
+                                            <ToolTipService.ToolTip>
+                                                <ToolTip x:Uid="PasswordGeneratorTooltip" />
+                                            </ToolTipService.ToolTip>
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </StackPanel.Resources>
+        <controls:PasswordBoxWithButton x:Uid="PasswordGenerationButton"
+            Password="{Binding Password, Mode=TwoWay, ElementName=UserControl}"
+            IsPasswordRevealEnabled="True" 
+            Style="{StaticResource PasswordBoxWithButtonStyle}" 
+            IsEnabled="{Binding IsEnabled, ElementName=UserControl}" 
+            PlaceholderText="{Binding PlaceholderText, ElementName=UserControl}"
+            Visibility="{Binding IsRevealPassword, Converter={StaticResource InverseBooleanToVisibilityConverter}}" 
+            BorderBrush="{Binding BorderBrush, ElementName=UserControl}" />
+        <controls:TextBoxWithButton 
+            x:Uid="PasswordTextBox" 
+            Text="{Binding Password, Mode=TwoWay, ElementName=UserControl}" 
+            Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" 
+            Style="{StaticResource TextBoxWithButtonStyle}" 
+            ButtonContent="&#xE16F;" 
+            IsEnabled="{Binding IsEnabled, ElementName=UserControl}"
+            BorderBrush="{Binding BorderBrush, ElementName=UserControl}" >
+            <interactivity:Interaction.Behaviors>
+                <core:EventTriggerBehavior EventName="ButtonClick">
+                    <actions:ClipboardAction Text="{Binding Password}" />
+                    <actions:ToastAction x:Uid="ToastCopyPassword" Title="Password" />
+                </core:EventTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+        </controls:TextBoxWithButton>
+        <ProgressBar 
+            Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" 
+            Maximum="128" 
+            Width="{Binding ActualWidth, ElementName=UserControl}" 
+            Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroundBrushComplexityConverter}}" />
+        <ToggleSwitch x:Uid="EntryShowPassword" Margin="-3,-10,0,0" IsOn="{Binding IsRevealPassword, Mode=TwoWay}" />
+    </StackPanel>
+</UserControl>

ModernKeePass/Views/UserControls/PasswordGenerationBox.xaml.cs

@@ -0,0 +1,44 @@
+using Windows.UI.Xaml;
+using ModernKeePass.ViewModels;
+
+// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace ModernKeePass.Views.UserControls
+{
+    public sealed partial class PasswordGenerationBox
+    {
+        public string Password
+        {
+            get { return (string)GetValue(PasswordProperty); }
+            set { SetValue(PasswordProperty, value); }
+        }
+        public static readonly DependencyProperty PasswordProperty =
+            DependencyProperty.Register(
+                nameof(Password),
+                typeof(string),
+                typeof(PasswordGenerationBox),
+                new PropertyMetadata(string.Empty, (o, args) =>
+                {
+                    var passwordGenerationBox = o as PasswordGenerationBox;
+                    var vm = passwordGenerationBox?.StackPanel.DataContext as PasswordGenerationBoxControlVm;
+                    if (vm != null) vm.Password = args.NewValue.ToString();
+                }));
+
+        public string PlaceholderText
+        {
+            get { return (string)GetValue(PlaceholderTextProperty); }
+            set { SetValue(PlaceholderTextProperty, value); }
+        }
+        public static readonly DependencyProperty PlaceholderTextProperty =
+            DependencyProperty.Register(
+                nameof(PlaceholderText),
+                typeof(string),
+                typeof(PasswordGenerationBox),
+                new PropertyMetadata(string.Empty, (o, args) => { }));
+
+        public PasswordGenerationBox()
+        {
+            InitializeComponent();
+        }
+    }
+}

ModernKeePass/Views/UserControls/SetCredentialsUserControl.xaml

@@ -7,10 +7,11 @@
      xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
      xmlns:core="using:Microsoft.Xaml.Interactions.Core"
      xmlns:converters="using:ModernKeePass.Converters"
+     xmlns:userControls="using:ModernKeePass.Views.UserControls"
      mc:Ignorable="d">
     <UserControl.Resources>
-        <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
-        <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToSolidColorBrushConverter"/>
+        <!--<converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
+        <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToSolidColorBrushConverter"/>-->
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter"/>
     </UserControl.Resources>
     <Grid DataContext="{Binding Source={StaticResource Locator}, Path=SetCredentials}">
@@ -23,30 +24,36 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="45" />
-            <RowDefinition Height="45" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="40" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" />
-        <PasswordBox Grid.Row="0" Grid.Column="1" Height="30"
+        <!--<PasswordBox Grid.Row="0" Grid.Column="1" Height="30"
             x:Uid="CompositeKeyPassword" 
             x:Name="PasswordBox"
             Password="{Binding Password, Mode=TwoWay}" 
             IsEnabled="{Binding HasPassword}" 
-            IsPasswordRevealButtonEnabled="True" />
-        <PasswordBox Grid.Row="1" Grid.Column="1" Height="30"
+            IsPasswordRevealButtonEnabled="True" />-->
+        <userControls:PasswordGenerationBox Grid.Row="0" Grid.Column="1"
+            x:Uid="CompositeKeyPassword" 
+            x:Name="PasswordBox"
+            Password="{Binding Password, Mode=TwoWay}" 
+            IsEnabled="{Binding HasPassword}" />
+        <PasswordBox Grid.Row="1" Grid.Column="1"
             x:Uid="CompositeKeyConfirmPassword" 
             x:Name="ConfirmPasswordBox"
+            Margin="0,5,0,0"
             Password="{Binding ConfirmPassword, Mode=TwoWay}" 
             IsEnabled="{Binding HasPassword}" 
             IsPasswordRevealButtonEnabled="True" />
-        <ProgressBar  Grid.Row="1" Grid.Column="1"
+        <!--<ProgressBar  Grid.Row="1" Grid.Column="1"
             Maximum="128" VerticalAlignment="Bottom" 
             Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}"
-            Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToSolidColorBrushConverter}}"/>
+            Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToSolidColorBrushConverter}}"/>-->
         <TextBlock  Grid.Row="2" Grid.Column="1"
             FontSize="14" FontWeight="Light" 
             x:Uid="SetCredentialsControlMatchingPasswords"

ModernKeePass/Win81App.csproj

@@ -93,6 +93,7 @@
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="DependencyInjection.cs" />
+    <Compile Include="Log\HockeyAppLog.cs" />
     <Compile Include="Models\NavigationItem.cs" />
     <Compile Include="ViewModels\ViewModelLocator.cs" />
     <Compile Include="Views\MainPageFrames\DonatePage.xaml.cs">
@@ -167,6 +168,9 @@
     <Compile Include="Views\UserControls\HamburgerMenuUserControl.xaml.cs">
       <DependentUpon>HamburgerMenuUserControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\UserControls\PasswordGenerationBox.xaml.cs">
+      <DependentUpon>PasswordGenerationBox.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\UserControls\SymbolPickerUserControl.xaml.cs">
       <DependentUpon>SymbolPickerUserControl.xaml</DependentUpon>
     </Compile>
@@ -316,6 +320,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\UserControls\PasswordGenerationBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\UserControls\SymbolPickerUserControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt

@@ -1,8 +1,5 @@
-Support for additional fields
-Support for attachments
-Add an expiration timer for clipboard data
-Ability to manually reorder groups
-Ability to set max history count and size
-Design changes
-Update to KeePassLib version 2.45
-Bug corrections
+Data is now protected in memory as well as at rest
+Improved zoomed-out Semantic view
+Having a custom entry color doesn't automatically trigger a change
+Fix clipboard copy expiration issue
+Fix a resume bug

ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt

@@ -1,8 +1,5 @@
-Ajout des champs additionnels
-Ajout des pi<70>ces-jointes
-Ajout d'une expiration du presse papier
-Possibilite de reorganiser les groupes manuellement
-Possibilite de parametrer le nombre max et la taille de l'historique
-Quelques changements de design
-Mise a jour de la KeePassLib version 2.45
-Correction de bugs
+Protection des donnees en memoire en plus du chiffrement de la base de donnees
+Amelioration du rendu de la vue Semantique dezoomee
+Avoir une couleur personnalisee ne declenche plus automatiquement un changement
+Correction d'un bug dans l'expiration des donnees copiees
+Correction d'un bug de resume de l'app

ModernKeePass/packages.config

@@ -12,7 +12,7 @@
   <package id="Microsoft.Extensions.DependencyInjection" version="1.1.1" targetFramework="win81" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.1" targetFramework="win81" />
   <package id="Microsoft.NETCore.Platforms" version="2.1.1" targetFramework="win81" />
-  <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.1" targetFramework="win81" />
+  <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.2" targetFramework="win81" />
   <package id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.1.7" targetFramework="win81" />
   <package id="ModernKeePassLib" version="2.45.1" targetFramework="win81" />
   <package id="MvvmLight" version="5.4.1.1" targetFramework="win81" />

ModernKeePassApp.Test/ModernKeePass.AppTest.csproj

@@ -159,8 +159,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.3.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.BouncyCastle.1.8.3\lib\netstandard1.0\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\packages\Portable.BouncyCastle.1.8.5\lib\netstandard1.0\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ModernKeePassLib, Version=2.39.1.22027, Culture=neutral, processorArchitecture=MSIL">

ModernKeePassApp.Test/packages.config

@@ -4,14 +4,14 @@
   <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.2" targetFramework="win81" />
   <package id="ModernKeePassLib" version="2.39.1" targetFramework="win81" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="win81" />
-  <package id="Portable.BouncyCastle" version="1.8.3" targetFramework="win81" />
+  <package id="Portable.BouncyCastle" version="1.8.5" targetFramework="win81" />
   <package id="Splat" version="3.0.0" targetFramework="win81" />
   <package id="System.Diagnostics.Contracts" version="4.3.0" targetFramework="win81" />
   <package id="System.Drawing.Primitives" version="4.3.0" targetFramework="win81" />
   <package id="System.Net.Requests" version="4.3.0" targetFramework="win81" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="win81" />
   <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="win81" />
-  <package id="System.Runtime.WindowsRuntime" version="4.3.0" targetFramework="win81" />
+  <package id="System.Runtime.WindowsRuntime" version="4.7.0" targetFramework="win81" />
   <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="win81" />
   <package id="Validation" version="2.4.18" targetFramework="win81" />
 </packages>

WinAppCommon/Actions/ClipboardAction.cs

@@ -1,5 +1,6 @@
 using System;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Xaml.Interactivity;
@@ -10,7 +11,7 @@ namespace ModernKeePass.Actions
 {
     public class ClipboardAction : DependencyObject, IAction
     {
-        private DispatcherTimer _dispatcher;
+        private bool _isWindowActivated = true;
 
         public string Text
         {
@@ -19,29 +20,45 @@ namespace ModernKeePass.Actions
         }
 
         public static readonly DependencyProperty TextProperty =
-            DependencyProperty.Register("Text", typeof(string), typeof(ClipboardAction), new PropertyMetadata(string.Empty));
+            DependencyProperty.Register(nameof(Text), typeof(string), typeof(ClipboardAction), new PropertyMetadata(string.Empty));
+        public bool IsProtected
+        {
+            get { return (bool)GetValue(IsProtectedProperty); }
+            set { SetValue(IsProtectedProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsProtectedProperty =
+            DependencyProperty.Register(nameof(IsProtected), typeof(bool), typeof(ClipboardAction), new PropertyMetadata(false));
 
         public object Execute(object sender, object parameter)
         {
             if (string.IsNullOrEmpty(Text)) return null;
 
             var settings = App.Services.GetRequiredService<ISettingsProxy>();
+            var cryptography = App.Services.GetRequiredService<ICryptographyClient>();
 
-            _dispatcher = new DispatcherTimer {Interval = TimeSpan.FromSeconds(settings.GetSetting(Constants.Settings.ClipboardTimeout, 10))};
-            _dispatcher.Tick += Dispatcher_Tick;
+            CoreWindow.GetForCurrentThread().Activated += ClipboardAction_Activated;
+
+            var dispatcher = new DispatcherTimer {Interval = TimeSpan.FromSeconds(settings.GetSetting(Constants.Settings.ClipboardTimeout, 10))};
+            dispatcher.Tick += Dispatcher_Tick;
 
             var dataPackage = new DataPackage { RequestedOperation = DataPackageOperation.Copy };
-            dataPackage.SetText(Text);
+            dataPackage.SetText(IsProtected ? cryptography.UnProtect(Text).GetAwaiter().GetResult() : Text);
             Clipboard.SetContent(dataPackage);
-            _dispatcher.Start();
+            Clipboard.Flush();
+            dispatcher.Start();
 
             return null;
         }
 
+        private void ClipboardAction_Activated(CoreWindow sender, WindowActivatedEventArgs args)
+        {
+            _isWindowActivated = args.WindowActivationState != CoreWindowActivationState.Deactivated;
+        }
+
         private void Dispatcher_Tick(object sender, object e)
         {
-            Clipboard.SetContent(null);
-            _dispatcher.Stop();
+            if (_isWindowActivated) Clipboard.SetContent(null);
         }
     }
 }

WinAppCommon/Controls/PasswordBoxWithButton.cs

@@ -8,14 +8,14 @@ namespace ModernKeePass.Controls
     {
         public event EventHandler<RoutedEventArgs> ButtonClick;
 
-        public string ButtonSymbol
+        public string ButtonContent
         {
-            get { return (string)GetValue(ButtonSymbolProperty); }
-            set { SetValue(ButtonSymbolProperty, value); }
+            get { return (string)GetValue(ButtonContentProperty); }
+            set { SetValue(ButtonContentProperty, value); }
         }
-        public static readonly DependencyProperty ButtonSymbolProperty =
+        public static readonly DependencyProperty ButtonContentProperty =
             DependencyProperty.Register(
-                nameof(ButtonSymbol),
+                nameof(ButtonContent),
                 typeof(string),
                 typeof(PasswordBoxWithButton),
                 new PropertyMetadata("&#xE107;", (o, args) => { }));

WinAppCommon/Controls/PasswordGenerationBox.cs

@@ -0,0 +1,87 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace ModernKeePass.Controls
+{
+    public class PasswordGenerationBox : SearchBox
+    {
+        public event EventHandler<RoutedEventArgs> ButtonClick;
+
+        public string ButtonSymbol
+        {
+            get { return (string)GetValue(ButtonSymbolProperty); }
+            set { SetValue(ButtonSymbolProperty, value); }
+        }
+        public static readonly DependencyProperty ButtonSymbolProperty =
+            DependencyProperty.Register(
+                nameof(ButtonSymbol),
+                typeof(string),
+                typeof(PasswordGenerationBox),
+                new PropertyMetadata("&#xE107;", (o, args) => { }));
+
+        public string ButtonTooltip
+        {
+            get { return (string)GetValue(ButtonTooltipProperty); }
+            set { SetValue(ButtonTooltipProperty, value); }
+        }
+        public static readonly DependencyProperty ButtonTooltipProperty =
+            DependencyProperty.Register(
+                nameof(ButtonTooltip),
+                typeof(string),
+                typeof(PasswordGenerationBox),
+                new PropertyMetadata(string.Empty, (o, args) => { }));
+
+        public string Password
+        {
+            get { return (string)GetValue(PasswordProperty); }
+            set { SetValue(PasswordProperty, value); }
+        }
+        public static readonly DependencyProperty PasswordProperty =
+            DependencyProperty.Register(
+                nameof(Password),
+                typeof(string),
+                typeof(PasswordGenerationBox),
+                new PropertyMetadata(string.Empty, (o, args) => { }));
+
+        public bool IsButtonEnabled
+        {
+            get { return (bool)GetValue(IsButtonEnabledProperty); }
+            set { SetValue(IsButtonEnabledProperty, value); }
+        }
+        public static readonly DependencyProperty IsButtonEnabledProperty =
+            DependencyProperty.Register(
+                nameof(IsButtonEnabled),
+                typeof(bool),
+                typeof(PasswordGenerationBox),
+                new PropertyMetadata(true, (o, args) => { }));
+
+        public bool IsPasswordRevealEnabled
+        {
+            get { return (bool)GetValue(IsPasswordRevealEnabledProperty); }
+            set { SetValue(IsPasswordRevealEnabledProperty, value); }
+        }
+        public static readonly DependencyProperty IsPasswordRevealEnabledProperty =
+            DependencyProperty.Register(
+                nameof(IsPasswordRevealEnabled),
+                typeof(bool),
+                typeof(PasswordGenerationBox),
+                new PropertyMetadata(true, (o, args) => { }));
+
+        
+        public PasswordGenerationBox()
+        {
+            DefaultStyleKey = typeof(PasswordGenerationBox);
+        }
+
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            var actionButton = GetTemplateChild("ActionButton") as Button;
+            if (actionButton != null)
+            {
+                actionButton.Click += (sender, e) => ButtonClick?.Invoke(sender, e);
+            }
+        }
+    }
+}

WinAppCommon/Controls/TextBoxWithButton.cs

@@ -9,14 +9,14 @@ namespace ModernKeePass.Controls
     {
         public event EventHandler<RoutedEventArgs> ButtonClick;
 
-        public string ButtonSymbol
+        public string ButtonContent
         {
-            get { return (string)GetValue(ButtonSymbolProperty); }
-            set { SetValue(ButtonSymbolProperty, value); }
+            get { return (string)GetValue(ButtonContentProperty); }
+            set { SetValue(ButtonContentProperty, value); }
         }
-        public static readonly DependencyProperty ButtonSymbolProperty =
+        public static readonly DependencyProperty ButtonContentProperty =
             DependencyProperty.Register(
-                nameof(ButtonSymbol),
+                nameof(ButtonContent),
                 typeof(string),
                 typeof(TextBoxWithButton),
                 new PropertyMetadata("&#xE107;", (o, args) => { }));

WinAppCommon/Messages/PasswordGeneratedMessage.cs

@@ -0,0 +1,7 @@
+namespace Messages
+{
+    public class PasswordGeneratedMessage
+    {
+        public string Password { get; set; }
+    }
+}

WinAppCommon/ViewModels/Items/EntryFieldVm.cs

@@ -1,12 +1,14 @@
 using System.Linq;
 using GalaSoft.MvvmLight;
 using Messages;
+using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Domain.Enums;
 
 namespace ModernKeePass.ViewModels.ListItems
 {
     public class EntryFieldVm: ViewModelBase
     {
+        private readonly ICryptographyClient _cryptography;
         private string _name;
         private string _value;
         private bool _isProtected;
@@ -22,26 +24,39 @@ namespace ModernKeePass.ViewModels.ListItems
             }
         }
 
+        public string DisplayValue => IsProtected? "*****" : _value;
+
         public string Value
         {
-            get { return _value; }
+            get
+            {
+                return IsProtected? _cryptography.UnProtect(_value).GetAwaiter().GetResult() : _value;
+            }
             set
             {
-                MessengerInstance.Send(new EntryFieldValueChangedMessage { FieldName = Name, FieldValue = value, IsProtected = IsProtected });
-                Set(nameof(Value), ref _value, value);
+                var protectedValue = IsProtected ? _cryptography.Protect(value).GetAwaiter().GetResult() : value;
+                MessengerInstance.Send(new EntryFieldValueChangedMessage { FieldName = Name, FieldValue = protectedValue, IsProtected = IsProtected });
+                Set(nameof(Value), ref _value, protectedValue);
+                RaisePropertyChanged(nameof(DisplayValue));
             }
         }
+
         public bool IsProtected
         {
             get { return _isProtected; }
             set
             {
-                MessengerInstance.Send(new EntryFieldValueChangedMessage { FieldName = Name, FieldValue = Value, IsProtected = value });
                 Set(nameof(IsProtected), ref _isProtected, value);
+                if (!string.IsNullOrEmpty(Name)) Value = value ? _value : _cryptography.UnProtect(_value).GetAwaiter().GetResult();
             }
         }
         
-        public EntryFieldVm(string fieldName, string fieldValue, bool isProtected)
+        public EntryFieldVm(ICryptographyClient cryptography)
+        {
+            _cryptography = cryptography;
+        }
+
+        public void Initialize(string fieldName, string fieldValue, bool isProtected)
         {
             _name = fieldName;
             _value = fieldValue;

WinAppCommon/ViewModels/Settings/RecycleBinVm.cs

@@ -51,7 +51,7 @@ namespace ModernKeePass.ViewModels.Settings
             _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);
+            Groups = new ObservableCollection<IEntityVm>(rootGroup.Groups);
         }
     }
 }

WinAppCommon/ViewModels/UserControls/ColorPickerControlVm.cs

@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Windows.UI.Xaml.Media;
+using GalaSoft.MvvmLight;
+
+namespace ModernKeePass.ViewModels
+{
+    public class ColorPickerControlVm: ObservableObject
+    {
+        private Color _selectedItem;
+
+        public sealed class Color
+        {
+            public string ColorName { get; set; }
+            public SolidColorBrush ColorBrush { get; set; }
+
+            public bool Equals(SolidColorBrush color)
+            {
+                return color.Color.R == ColorBrush.Color.R &&
+                       color.Color.G == ColorBrush.Color.G &&
+                       color.Color.B == ColorBrush.Color.B &&
+                       color.Color.A == ColorBrush.Color.A;
+            }
+        }
+
+        public List<Color> Colors { get; }
+
+        public Color SelectedItem
+        {
+            get { return _selectedItem; }
+            set { Set(() => SelectedItem, ref _selectedItem, value); }
+        }
+
+        public ColorPickerControlVm()
+        {
+            Colors = new List<Color>();
+            var type = typeof(Windows.UI.Colors);
+            var properties = type.GetRuntimeProperties().ToArray();
+            foreach (var propertyInfo in properties)
+            {
+                var color = new Color
+                {
+                    ColorName = propertyInfo.Name,
+                    ColorBrush = new SolidColorBrush((Windows.UI.Color) propertyInfo.GetValue(null, null))
+                };
+                Colors.Add(color);
+            }
+        }
+
+        public void Initialize(SolidColorBrush selectedColor)
+        {
+            SelectedItem = Colors.FirstOrDefault(c => c.Equals(selectedColor));
+        }
+    }
+}

WinAppCommon/ViewModels/UserControls/ColorPickerVm.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Windows.UI.Xaml.Media;
+
+namespace ModernKeePass.ViewModels
+{
+    public class ColorPickerVm
+    {
+        public struct Color
+        {
+            public string ColorName { get; set; }
+            public SolidColorBrush ColorBrush { get; set; }
+        }
+
+        public List<Color> Colors { get; }
+
+        public Color SelectedItem { get; set; }
+
+        public ColorPickerVm()
+        {
+            Colors = new List<Color>();
+            var type = typeof(Windows.UI.Colors);
+            var properties = type.GetRuntimeProperties().ToArray();
+            foreach (var propertyInfo in properties)
+            {
+                var color = new Color
+                {
+                    ColorName = propertyInfo.Name,
+                    ColorBrush = new SolidColorBrush((Windows.UI.Color) propertyInfo.GetValue(null, null))
+                };
+                Colors.Add(color);
+                if (color.ColorBrush.Color.Equals(SelectedColor.Color)
+            }
+        }
+    }
+}

WinAppCommon/ViewModels/UserControls/PasswordGenerationBoxControlVm.cs

@@ -0,0 +1,117 @@
+using System.Threading.Tasks;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using MediatR;
+using Messages;
+using ModernKeePass.Application.Common.Interfaces;
+using ModernKeePass.Application.Security.Commands.GeneratePassword;
+using ModernKeePass.Common;
+
+namespace ModernKeePass.ViewModels
+{
+    public class PasswordGenerationBoxControlVm: ViewModelBase
+    {
+        private readonly IMediator _mediator;
+        private readonly ISettingsProxy _settings;
+        private readonly ICredentialsProxy _credentials;
+        private string _password;
+        private bool _isRevealPassword;
+
+        public double PasswordComplexityIndicator => _credentials.EstimatePasswordComplexity(Password);
+        public double PasswordLength
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.PasswordLength, 25); }
+            set
+            {
+                _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.PasswordLength, value);
+                RaisePropertyChanged(() => PasswordLength);
+            }
+        }
+        public bool UpperCasePatternSelected
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.UpperCasePattern, true); }
+            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.UpperCasePattern, value); }
+        }
+        public bool LowerCasePatternSelected
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.LowerCasePattern, true); }
+            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.LowerCasePattern, value); }
+        }
+        public bool DigitsPatternSelected
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.DigitsPattern, true); }
+            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.DigitsPattern, value); }
+        }
+        public bool MinusPatternSelected
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.MinusPattern, false); }
+            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.MinusPattern, value); }
+        }
+        public bool UnderscorePatternSelected
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.UnderscorePattern, false); }
+            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.UnderscorePattern, value); }
+        }
+        public bool SpacePatternSelected
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.SpacePattern, false); }
+            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.SpacePattern, value); }
+        }
+        public bool SpecialPatternSelected
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.SpecialPattern, true); }
+            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.SpecialPattern, value); }
+        }
+        public bool BracketsPatternSelected
+        {
+            get { return _settings.GetSetting(Constants.Settings.PasswordGenerationOptions.BracketsPattern, false); }
+            set { _settings.PutSetting(Constants.Settings.PasswordGenerationOptions.BracketsPattern, value); }
+        }
+        public string CustomChars { get; set; } = string.Empty;
+
+        public string Password
+        {
+            get { return _password; }
+            set
+            {
+                Set(() => Password, ref _password, value);
+                RaisePropertyChanged(() => PasswordComplexityIndicator);
+            }
+        }
+
+        public bool IsRevealPassword
+        {
+            get { return _isRevealPassword; }
+            set { Set(() => IsRevealPassword, ref _isRevealPassword, value); }
+        }
+
+        public RelayCommand GeneratePasswordCommand { get; }
+
+        public PasswordGenerationBoxControlVm(IMediator mediator, ISettingsProxy settings, ICredentialsProxy credentials)
+        {
+            _mediator = mediator;
+            _settings = settings;
+            _credentials = credentials;
+
+            GeneratePasswordCommand = new RelayCommand(async () => await GeneratePassword());
+        }
+
+        private async Task GeneratePassword()
+        {
+            Password = await _mediator.Send(new GeneratePasswordCommand
+            {
+                BracketsPatternSelected = BracketsPatternSelected,
+                CustomChars = CustomChars,
+                DigitsPatternSelected = DigitsPatternSelected,
+                LowerCasePatternSelected = LowerCasePatternSelected,
+                MinusPatternSelected = MinusPatternSelected,
+                PasswordLength = (int)PasswordLength,
+                SpacePatternSelected = SpacePatternSelected,
+                SpecialPatternSelected = SpecialPatternSelected,
+                UnderscorePatternSelected = UnderscorePatternSelected,
+                UpperCasePatternSelected = UpperCasePatternSelected
+            });
+            MessengerInstance.Send(new PasswordGeneratedMessage { Password = Password });
+        }
+    }
+}

WinAppCommon/ViewModels/UserControls/SetCredentialsVm.cs

@@ -13,7 +13,6 @@ namespace ModernKeePass.ViewModels
     public class SetCredentialsVm : ViewModelBase
     {
         private readonly IMediator _mediator;
-        private readonly ICredentialsProxy _credentials;
         private readonly IResourceProxy _resource;
         private readonly IFileProxy _file;
 
@@ -48,10 +47,9 @@ namespace ModernKeePass.ViewModels
             get { return _password; }
             set
             {
-                _password = value;
+                Set(() => Password, ref _password, value);
                 RaisePropertyChanged(nameof(IsPasswordValid));
                 RaisePropertyChanged(nameof(IsValid));
-                RaisePropertyChanged(nameof(PasswordComplexityIndicator));
                 GenerateCredentialsCommand.RaiseCanExecuteChanged();
             }
         }
@@ -60,7 +58,7 @@ namespace ModernKeePass.ViewModels
             get { return _confirmPassword; }
             set
             {
-                _confirmPassword = value;
+                Set(() => ConfirmPassword, ref _confirmPassword, value);
                 RaisePropertyChanged(nameof(IsPasswordValid));
                 RaisePropertyChanged(nameof(IsValid));
                 GenerateCredentialsCommand.RaiseCanExecuteChanged();
@@ -85,8 +83,6 @@ namespace ModernKeePass.ViewModels
             set { Set(() => KeyFileText, ref _keyFileText, value); }
         }
         
-        public double PasswordComplexityIndicator => _credentials.EstimatePasswordComplexity(Password);
-
         public bool IsPasswordValid => HasPassword && Password == ConfirmPassword || !HasPassword;
         public bool IsKeyFileValid => HasKeyFile && !string.IsNullOrEmpty(KeyFilePath) || !HasKeyFile;
         public bool IsValid => HasPassword && Password == ConfirmPassword || HasKeyFile && !string.IsNullOrEmpty(KeyFilePath) && (HasPassword || HasKeyFile);
@@ -102,10 +98,9 @@ namespace ModernKeePass.ViewModels
         private string _keyFilePath;
         private string _keyFileText;
         
-        public SetCredentialsVm(IMediator mediator, ICredentialsProxy credentials, IResourceProxy resource, IFileProxy file)
+        public SetCredentialsVm(IMediator mediator, IResourceProxy resource, IFileProxy file)
         {
             _mediator = mediator;
-            _credentials = credentials;
             _resource = resource;
             _file = file;
 
@@ -114,6 +109,12 @@ namespace ModernKeePass.ViewModels
             GenerateCredentialsCommand = new RelayCommand(GenerateCredentials, () => IsValid);
 
             _keyFileText = resource.GetResourceValue("CompositeKeyDefaultKeyFile");
+
+            MessengerInstance.Register<PasswordGeneratedMessage>(this, message =>
+            {
+                Password = message.Password;
+                ConfirmPassword = message.Password;
+            });
         }
         
         private async Task OpenKeyFile()

WinAppCommon/ViewModels/ViewModelLocatorCommon.cs

@@ -67,6 +67,8 @@ namespace ModernKeePass.ViewModels
             SimpleIoc.Default.Register<OpenDatabaseControlVm>();
             SimpleIoc.Default.Register<SetCredentialsVm>();
             SimpleIoc.Default.Register<TopMenuVm>();
+            SimpleIoc.Default.Register<ColorPickerControlVm>();
+            SimpleIoc.Default.Register<PasswordGenerationBoxControlVm>();
             SimpleIoc.Default.Register<NewVm>();
             SimpleIoc.Default.Register<OpenVm>();
             SimpleIoc.Default.Register<RecentVm>();
@@ -82,6 +84,8 @@ namespace ModernKeePass.ViewModels
         public OpenDatabaseControlVm OpenDatabaseControl => ServiceLocator.Current.GetInstance<OpenDatabaseControlVm>(Guid.NewGuid().ToString());
         public SetCredentialsVm SetCredentials => ServiceLocator.Current.GetInstance<SetCredentialsVm>(Guid.NewGuid().ToString());
         public TopMenuVm TopMenu => ServiceLocator.Current.GetInstance<TopMenuVm>(Guid.NewGuid().ToString());
+        public ColorPickerControlVm ColorPicker => ServiceLocator.Current.GetInstance<ColorPickerControlVm>(Guid.NewGuid().ToString());
+        public PasswordGenerationBoxControlVm PasswordGenerationBox => ServiceLocator.Current.GetInstance<PasswordGenerationBoxControlVm>(Guid.NewGuid().ToString());
         public NewVm New => ServiceLocator.Current.GetInstance<NewVm>(Guid.NewGuid().ToString());
         public OpenVm Open => ServiceLocator.Current.GetInstance<OpenVm>(Guid.NewGuid().ToString());
         public RecentVm Recent => ServiceLocator.Current.GetInstance<RecentVm>(Guid.NewGuid().ToString());

WinAppCommon/WinAppCommon.projitems

@@ -40,6 +40,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Messages\EntryFieldValueChangedMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\FileNotFoundMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\NavigateToPageMessage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Messages\PasswordGeneratedMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\SaveErrorMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\AboutVm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Items\EntryFieldVm.cs" />
@@ -49,6 +50,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Settings\RecycleBinVm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Settings\GeneralVm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Settings\SecurityVm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModels\UserControls\ColorPickerControlVm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModels\UserControls\PasswordGenerationBoxControlVm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\ViewModelLocatorCommon.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Items\ListMenuItemVm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Items\MainMenuItemVm.cs" />