diff --git a/ModernKeePass/ResourceDictionaries/ListViewLeftIndicatorStyle.xaml b/ModernKeePass/ResourceDictionaries/ListViewLeftIndicatorStyle.xaml
index dc2e1e1..476c8c4 100644
--- a/ModernKeePass/ResourceDictionaries/ListViewLeftIndicatorStyle.xaml
+++ b/ModernKeePass/ResourceDictionaries/ListViewLeftIndicatorStyle.xaml
@@ -191,7 +191,7 @@
To="1" />
-
+
@@ -358,13 +358,13 @@
-
+
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml b/ModernKeePass/Views/EntryDetailPage.xaml
index 5e648ca..880ca28 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml
+++ b/ModernKeePass/Views/EntryDetailPage.xaml
@@ -474,9 +474,9 @@
-
+
-
+
diff --git a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
index cfc6286..0f05d91 100644
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
@@ -138,7 +138,7 @@
ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
Style="{StaticResource TextBoxWithButtonStyle}"
KeyDown="NewGroupTextBox_OnKeyDown"
- ButtonSymbol="">
+ ButtonSymbol="">
diff --git a/README.md b/README.md
index 195f5d8..affec3f 100644
--- a/README.md
+++ b/README.md
@@ -21,12 +21,14 @@ You can get it [here](https://www.microsoft.com/en-us/store/p/modernkeepass/9mwq
- View, delete and restore from entry history
- Use Semantic Zoom to see your entries in a grouped mode
- List recently opened databases
-- Open database from Windows Explorer
+- Open a database from Windows Explorer
- Change database encryption
- Change database compression
- Change database key derivation
- Displays and change entry colors and icons
-- Move entries from a group to another
+- Move entries and groups from a group to another
+- Entry custom fields (view, add, update, delete)
+- Entry attachments (view, add, delete)
# Build and Test
1. Clone the repository
@@ -36,8 +38,6 @@ You can get it [here](https://www.microsoft.com/en-us/store/p/modernkeepass/9mwq
# Contribute
I'm not the best at creating nice assets, so if anyone would like to contribute some nice icons, it would be awesome :)
Otherwise, there are still many things left to implement:
-- Entry custom fields
-- Entry attachments
- Multi entry selection (for delete, or move)
- Import existing data from CSV, JSON, or XML
- Open database from URL (and maybe some clouds?)
diff --git a/WinAppCommon/Converters/PluralizationConverter.cs b/WinAppCommon/Converters/PluralizationConverter.cs
deleted file mode 100644
index e870363..0000000
--- a/WinAppCommon/Converters/PluralizationConverter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using Windows.UI.Xaml.Data;
-
-namespace ModernKeePass.Converters
-{
- public class PluralizationConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, string language)
- {
- var pluralizationOptionString = parameter as string;
- var pluralizationOptions = pluralizationOptionString?.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
- if (pluralizationOptions == null || pluralizationOptions.Length != 2) return string.Empty;
- var count = value is int ? (int) value : 0;
- var text = count == 1 ? pluralizationOptions[0] : pluralizationOptions[1];
- return $"{count} {text}";
- }
-
- // No need to implement this
- public object ConvertBack(object value, Type targetType, object parameter, string language)
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/WinAppCommon/Converters/TextToWidthConverter.cs b/WinAppCommon/Converters/TextToWidthConverter.cs
deleted file mode 100644
index c3f1b24..0000000
--- a/WinAppCommon/Converters/TextToWidthConverter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using Windows.UI.Xaml.Data;
-
-namespace ModernKeePass.Converters
-{
- public class TextToWidthConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, string language)
- {
- var fontSize = double.Parse(parameter as string);
- var text = value as string;
- return text?.Length * fontSize ?? 0;
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, string language)
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/WinAppCommon/ViewModels/Items/RecentItemVm.cs b/WinAppCommon/ViewModels/Items/RecentItemVm.cs
index aeaf6ed..17f5564 100644
--- a/WinAppCommon/ViewModels/Items/RecentItemVm.cs
+++ b/WinAppCommon/ViewModels/Items/RecentItemVm.cs
@@ -1,12 +1,10 @@
using GalaSoft.MvvmLight;
using ModernKeePass.Domain.Dtos;
-using ModernKeePass.Domain.Interfaces;
namespace ModernKeePass.ViewModels.ListItems
{
- public class RecentItemVm: ObservableObject, ISelectableModel
+ public class RecentItemVm: ObservableObject
{
- private bool _isSelected;
private string _name;
private string _token;
private string _path;
@@ -29,12 +27,6 @@ namespace ModernKeePass.ViewModels.ListItems
set { Set(() => Path, ref _path, value); }
}
- public bool IsSelected
- {
- get { return _isSelected; }
- set { Set(() => IsSelected, ref _isSelected, value); }
- }
-
public RecentItemVm(FileInfo file)
{
Token = file.Id;
diff --git a/WinAppCommon/WinAppCommon.projitems b/WinAppCommon/WinAppCommon.projitems
index 1230735..ff44b0a 100644
--- a/WinAppCommon/WinAppCommon.projitems
+++ b/WinAppCommon/WinAppCommon.projitems
@@ -27,9 +27,7 @@
-
-