From f64453232bf8776426b5e952094ce00dd0fcb617 Mon Sep 17 00:00:00 2001 From: TheXamlGuy Date: Sat, 8 Jun 2024 21:24:59 +0100 Subject: [PATCH] Added MultilineTextEntryView --- Bitvault.Avalonia/App.axaml.cs | 18 +++--- Bitvault.Avalonia/Bitvault.Avalonia.csproj | 12 ++++ ...ntryView.axaml => DropdownEntryView.axaml} | 4 +- ...ew.axaml.cs => DropdownEntryView.axaml.cs} | 4 +- ...ryView.axaml => MaskedTextEntryView.axaml} | 4 +- ....axaml.cs => MaskedTextEntryView.axaml.cs} | 4 +- .../MultilineTextEntryView.axaml | 64 +++++++++++++++++++ .../MultilineTextEntryView.axaml.cs | 10 +++ ...ntryView.axaml => PasswordEntryView.axaml} | 4 +- ...ew.axaml.cs => PasswordEntryView.axaml.cs} | 4 +- ...extEntryView.axaml => TextEntryView.axaml} | 4 +- ...ryView.axaml.cs => TextEntryView.axaml.cs} | 4 +- ...ViewModel.cs => DropdownEntryViewModel.cs} | 14 ++-- ...er.cs => DropdownEntryViewModelHandler.cs} | 12 ++-- ...ViewModel.cs => DropdownValueViewModel.cs} | 2 +- Bitvault/ItemConfiguration.cs | 11 +++- Bitvault/ItemEntryConfiguration.cs | 1 - ...ewModel.cs => MaskedTextEntryViewModel.cs} | 2 +- ....cs => MaskedTextEntryViewModelHandler.cs} | 6 +- Bitvault/MultilineTextEntryConfiguration.cs | 3 +- Bitvault/MultilineTextEntryViewModel.cs | 15 +++++ .../MultilineTextEntryViewModelHandler.cs | 23 +++++++ Bitvault/NoteEntryConfiguration.cs | 7 -- Bitvault/NoteViewModel.cs | 15 ----- ...ViewModel.cs => PasswordEntryViewModel.cs} | 2 +- ...er.cs => PasswordEntryViewModelHandler.cs} | 6 +- Bitvault/SystemIdleTimer.cs | 3 - ...ntryViewModel.cs => TextEntryViewModel.cs} | 2 +- ...andler.cs => TextEntryViewModelHandler.cs} | 6 +- Bitvault/TextViewModel.cs | 15 ----- 30 files changed, 185 insertions(+), 96 deletions(-) rename Bitvault.Avalonia/{ItemDropdownEntryView.axaml => DropdownEntryView.axaml} (98%) rename Bitvault.Avalonia/{ItemTextEntryView.axaml.cs => DropdownEntryView.axaml.cs} (61%) rename Bitvault.Avalonia/{ItemMaskedTextEntryView.axaml => MaskedTextEntryView.axaml} (96%) rename Bitvault.Avalonia/{ItemMaskedTextEntryView.axaml.cs => MaskedTextEntryView.axaml.cs} (59%) create mode 100644 Bitvault.Avalonia/MultilineTextEntryView.axaml create mode 100644 Bitvault.Avalonia/MultilineTextEntryView.axaml.cs rename Bitvault.Avalonia/{ItemPasswordEntryView.axaml => PasswordEntryView.axaml} (90%) rename Bitvault.Avalonia/{ItemPasswordEntryView.axaml.cs => PasswordEntryView.axaml.cs} (59%) rename Bitvault.Avalonia/{ItemTextEntryView.axaml => TextEntryView.axaml} (97%) rename Bitvault.Avalonia/{ItemDropdownEntryView.axaml.cs => TextEntryView.axaml.cs} (59%) rename Bitvault/{ItemDropdownEntryViewModel.cs => DropdownEntryViewModel.cs} (59%) rename Bitvault/{ItemDropdownEntryViewModelHandler.cs => DropdownEntryViewModelHandler.cs} (56%) rename Bitvault/{ItemDropdownValueViewModel.cs => DropdownValueViewModel.cs} (80%) rename Bitvault/{ItemMaskedTextEntryViewModel.cs => MaskedTextEntryViewModel.cs} (87%) rename Bitvault/{ItemMaskedTextEntryViewModelHandler.cs => MaskedTextEntryViewModelHandler.cs} (63%) create mode 100644 Bitvault/MultilineTextEntryViewModel.cs create mode 100644 Bitvault/MultilineTextEntryViewModelHandler.cs delete mode 100644 Bitvault/NoteEntryConfiguration.cs delete mode 100644 Bitvault/NoteViewModel.cs rename Bitvault/{ItemTextEntryViewModel.cs => PasswordEntryViewModel.cs} (86%) rename Bitvault/{ItemPasswordEntryViewModelHandler.cs => PasswordEntryViewModelHandler.cs} (65%) delete mode 100644 Bitvault/SystemIdleTimer.cs rename Bitvault/{ItemPasswordEntryViewModel.cs => TextEntryViewModel.cs} (84%) rename Bitvault/{ItemTextEntryViewModelHandler.cs => TextEntryViewModelHandler.cs} (65%) delete mode 100644 Bitvault/TextViewModel.cs diff --git a/Bitvault.Avalonia/App.axaml.cs b/Bitvault.Avalonia/App.axaml.cs index 872b829..5264322 100644 --- a/Bitvault.Avalonia/App.axaml.cs +++ b/Bitvault.Avalonia/App.axaml.cs @@ -154,10 +154,11 @@ public partial class App : Application services.AddTemplate(); - services.AddTemplate(); - services.AddTemplate(); - services.AddTemplate(); - services.AddTemplate(); + services.AddTemplate(); + services.AddTemplate(); + services.AddTemplate(); + services.AddTemplate(); + services.AddTemplate(); services.AddTemplate("ItemCommandHeader"); @@ -177,10 +178,11 @@ public partial class App : Application services.AddHandler(); services.AddHandler(); - services.AddHandler(nameof(TextEntryConfiguration)); - services.AddHandler(nameof(PasswordEntryConfiguration)); - services.AddHandler(nameof(MaskedTextEntryConfiguration)); - services.AddHandler(nameof(DropdownEntryConfiguration)); + services.AddHandler(nameof(TextEntryConfiguration)); + services.AddHandler(nameof(MultilineTextEntryConfiguration)); + services.AddHandler(nameof(PasswordEntryConfiguration)); + services.AddHandler(nameof(MaskedTextEntryConfiguration)); + services.AddHandler(nameof(DropdownEntryConfiguration)); services.AddHandler(ServiceLifetime.Singleton); services.AddHandler(ServiceLifetime.Singleton); diff --git a/Bitvault.Avalonia/Bitvault.Avalonia.csproj b/Bitvault.Avalonia/Bitvault.Avalonia.csproj index c5e3ebb..fe9db9d 100644 --- a/Bitvault.Avalonia/Bitvault.Avalonia.csproj +++ b/Bitvault.Avalonia/Bitvault.Avalonia.csproj @@ -67,12 +67,24 @@ DismissItemActionView.axaml + + DropdownEntryView.axaml + ItemHeaderView.axaml ItemContentView.axaml + + TextEntryView.axaml + + + PasswordEntryView.axaml + + + MaskedTextEntryView.axaml + OpenLockerView.axaml diff --git a/Bitvault.Avalonia/ItemDropdownEntryView.axaml b/Bitvault.Avalonia/DropdownEntryView.axaml similarity index 98% rename from Bitvault.Avalonia/ItemDropdownEntryView.axaml rename to Bitvault.Avalonia/DropdownEntryView.axaml index a7e3da0..3340155 100644 --- a/Bitvault.Avalonia/ItemDropdownEntryView.axaml +++ b/Bitvault.Avalonia/DropdownEntryView.axaml @@ -1,9 +1,9 @@ diff --git a/Bitvault.Avalonia/ItemTextEntryView.axaml.cs b/Bitvault.Avalonia/DropdownEntryView.axaml.cs similarity index 61% rename from Bitvault.Avalonia/ItemTextEntryView.axaml.cs rename to Bitvault.Avalonia/DropdownEntryView.axaml.cs index f284bba..8fb2b0e 100644 --- a/Bitvault.Avalonia/ItemTextEntryView.axaml.cs +++ b/Bitvault.Avalonia/DropdownEntryView.axaml.cs @@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia; namespace Bitvault.Avalonia; -public partial class ItemTextEntryView : +public partial class DropdownEntryView : SettingsExpander { - public ItemTextEntryView() => + public DropdownEntryView() => InitializeComponent(); } diff --git a/Bitvault.Avalonia/ItemMaskedTextEntryView.axaml b/Bitvault.Avalonia/MaskedTextEntryView.axaml similarity index 96% rename from Bitvault.Avalonia/ItemMaskedTextEntryView.axaml rename to Bitvault.Avalonia/MaskedTextEntryView.axaml index 2121fb6..481a818 100644 --- a/Bitvault.Avalonia/ItemMaskedTextEntryView.axaml +++ b/Bitvault.Avalonia/MaskedTextEntryView.axaml @@ -1,9 +1,9 @@ diff --git a/Bitvault.Avalonia/ItemMaskedTextEntryView.axaml.cs b/Bitvault.Avalonia/MaskedTextEntryView.axaml.cs similarity index 59% rename from Bitvault.Avalonia/ItemMaskedTextEntryView.axaml.cs rename to Bitvault.Avalonia/MaskedTextEntryView.axaml.cs index 8439e2d..ed45488 100644 --- a/Bitvault.Avalonia/ItemMaskedTextEntryView.axaml.cs +++ b/Bitvault.Avalonia/MaskedTextEntryView.axaml.cs @@ -2,10 +2,10 @@ using Toolkit.UI.Controls.Avalonia; namespace Bitvault.Avalonia { - public partial class ItemMaskedTextEntryView : + public partial class MaskedTextEntryView : SettingsExpander { - public ItemMaskedTextEntryView() => + public MaskedTextEntryView() => InitializeComponent(); } } diff --git a/Bitvault.Avalonia/MultilineTextEntryView.axaml b/Bitvault.Avalonia/MultilineTextEntryView.axaml new file mode 100644 index 0000000..ca92f23 --- /dev/null +++ b/Bitvault.Avalonia/MultilineTextEntryView.axaml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bitvault.Avalonia/MultilineTextEntryView.axaml.cs b/Bitvault.Avalonia/MultilineTextEntryView.axaml.cs new file mode 100644 index 0000000..c619605 --- /dev/null +++ b/Bitvault.Avalonia/MultilineTextEntryView.axaml.cs @@ -0,0 +1,10 @@ +using Toolkit.UI.Controls.Avalonia; + +namespace Bitvault.Avalonia; + +public partial class MultilineTextEntryView : + SettingsExpander +{ + public MultilineTextEntryView() => + InitializeComponent(); +} \ No newline at end of file diff --git a/Bitvault.Avalonia/ItemPasswordEntryView.axaml b/Bitvault.Avalonia/PasswordEntryView.axaml similarity index 90% rename from Bitvault.Avalonia/ItemPasswordEntryView.axaml rename to Bitvault.Avalonia/PasswordEntryView.axaml index fdaa309..a2ec0cb 100644 --- a/Bitvault.Avalonia/ItemPasswordEntryView.axaml +++ b/Bitvault.Avalonia/PasswordEntryView.axaml @@ -1,9 +1,9 @@ + public PasswordEntryView() => InitializeComponent(); } diff --git a/Bitvault.Avalonia/ItemTextEntryView.axaml b/Bitvault.Avalonia/TextEntryView.axaml similarity index 97% rename from Bitvault.Avalonia/ItemTextEntryView.axaml rename to Bitvault.Avalonia/TextEntryView.axaml index 02758c3..a833652 100644 --- a/Bitvault.Avalonia/ItemTextEntryView.axaml +++ b/Bitvault.Avalonia/TextEntryView.axaml @@ -1,9 +1,9 @@ diff --git a/Bitvault.Avalonia/ItemDropdownEntryView.axaml.cs b/Bitvault.Avalonia/TextEntryView.axaml.cs similarity index 59% rename from Bitvault.Avalonia/ItemDropdownEntryView.axaml.cs rename to Bitvault.Avalonia/TextEntryView.axaml.cs index 0f21859..7d14b10 100644 --- a/Bitvault.Avalonia/ItemDropdownEntryView.axaml.cs +++ b/Bitvault.Avalonia/TextEntryView.axaml.cs @@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia; namespace Bitvault.Avalonia; -public partial class ItemDropdownEntryView : +public partial class TextEntryView : SettingsExpander { - public ItemDropdownEntryView() => + public TextEntryView() => InitializeComponent(); } diff --git a/Bitvault/ItemDropdownEntryViewModel.cs b/Bitvault/DropdownEntryViewModel.cs similarity index 59% rename from Bitvault/ItemDropdownEntryViewModel.cs rename to Bitvault/DropdownEntryViewModel.cs index 49bbae9..4bbb41e 100644 --- a/Bitvault/ItemDropdownEntryViewModel.cs +++ b/Bitvault/DropdownEntryViewModel.cs @@ -2,32 +2,32 @@ namespace Bitvault; -public partial class ItemDropdownEntryViewModel : - ItemEntryCollectionViewModel +public partial class DropdownEntryViewModel : + ItemEntryCollectionViewModel { - public ItemDropdownEntryViewModel(IServiceProvider provider, + public DropdownEntryViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, IPublisher publisher, ISubscription subscriber, IDisposer disposer, - IEnumerable items, + IEnumerable items, ItemState state, ItemEntryConfiguration configuration, string key, object value, - ItemDropdownValueViewModel selectedItem) : base(provider, factory, mediator, publisher, subscriber, disposer, items, state, configuration, key, value) + DropdownValueViewModel selectedItem) : base(provider, factory, mediator, publisher, subscriber, disposer, items, state, configuration, key, value) { SelectedItem = selectedItem; } - public ItemDropdownEntryViewModel(IServiceProvider provider, + public DropdownEntryViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, IPublisher publisher, ISubscription subscriber, IDisposer disposer, - IEnumerable items, + IEnumerable items, ItemState state, ItemEntryConfiguration configuration, string key, diff --git a/Bitvault/ItemDropdownEntryViewModelHandler.cs b/Bitvault/DropdownEntryViewModelHandler.cs similarity index 56% rename from Bitvault/ItemDropdownEntryViewModelHandler.cs rename to Bitvault/DropdownEntryViewModelHandler.cs index e2a254e..cf154fc 100644 --- a/Bitvault/ItemDropdownEntryViewModelHandler.cs +++ b/Bitvault/DropdownEntryViewModelHandler.cs @@ -2,7 +2,7 @@ namespace Bitvault; -public class ItemDropdownEntryViewModelHandler(IServiceFactory serviceFactory) : +public class DropdownEntryViewModelHandler(IServiceFactory serviceFactory) : IHandler, IItemEntryViewModel?> { public Task Handle(CreateEventArgs args, @@ -10,19 +10,19 @@ public class ItemDropdownEntryViewModelHandler(IServiceFactory serviceFactory) : { if (args.Value is DropdownEntryConfiguration configuration) { - List values = []; + List values = []; foreach (string item in configuration.Values) { - values.Add(serviceFactory.Create(item)); + values.Add(serviceFactory.Create(item)); } string? label = configuration.Label; object? value = configuration.Value; - ItemDropdownValueViewModel? selected = values.FirstOrDefault(x => x.Value is not null && x.Value.Equals($"{value}")); + DropdownValueViewModel? selected = values.FirstOrDefault(x => x.Value is not null && x.Value.Equals($"{value}")); - if (serviceFactory.Create([values, .. args.Parameters, configuration, label, value ?? "", selected]) - is ItemDropdownEntryViewModel viewModel) + if (serviceFactory.Create([values, .. args.Parameters, configuration, label, value ?? "", selected]) + is DropdownEntryViewModel viewModel) { return Task.FromResult(viewModel); } diff --git a/Bitvault/ItemDropdownValueViewModel.cs b/Bitvault/DropdownValueViewModel.cs similarity index 80% rename from Bitvault/ItemDropdownValueViewModel.cs rename to Bitvault/DropdownValueViewModel.cs index 26a0f95..877261f 100644 --- a/Bitvault/ItemDropdownValueViewModel.cs +++ b/Bitvault/DropdownValueViewModel.cs @@ -2,7 +2,7 @@ namespace Bitvault; -public partial class ItemDropdownValueViewModel(IServiceProvider provider, +public partial class DropdownValueViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, IPublisher publisher, diff --git a/Bitvault/ItemConfiguration.cs b/Bitvault/ItemConfiguration.cs index ce35321..db8cc1e 100644 --- a/Bitvault/ItemConfiguration.cs +++ b/Bitvault/ItemConfiguration.cs @@ -157,7 +157,7 @@ public record ItemConfiguration { Entries = new List { - new NumberEntryConfiguration + new MultilineTextEntryConfiguration { Label = "Notes" } @@ -170,19 +170,24 @@ public record ItemConfiguration { Sections = new List { - new() + new () { Entries = new List { + new TextEntryConfiguration + { + Label = "Description", + }, new AttachmentEntryConfiguration { - Label = "Attachments" + Label = "Attachments", } } } } }; + public static ItemConfiguration DrivingLicence => new() { Sections = new List diff --git a/Bitvault/ItemEntryConfiguration.cs b/Bitvault/ItemEntryConfiguration.cs index 5bf2005..c13da4c 100644 --- a/Bitvault/ItemEntryConfiguration.cs +++ b/Bitvault/ItemEntryConfiguration.cs @@ -4,7 +4,6 @@ namespace Bitvault; [JsonDerivedType(typeof(DropdownEntryConfiguration), typeDiscriminator: "Dropdown")] [JsonDerivedType(typeof(MaskedTextEntryConfiguration), typeDiscriminator: "MaskedText")] -[JsonDerivedType(typeof(NoteEntryConfiguration), typeDiscriminator: "Note")] [JsonDerivedType(typeof(NumberEntryConfiguration), typeDiscriminator: "Number")] [JsonDerivedType(typeof(PasswordEntryConfiguration), typeDiscriminator: "Password")] [JsonDerivedType(typeof(TextEntryConfiguration), typeDiscriminator: "Text")] diff --git a/Bitvault/ItemMaskedTextEntryViewModel.cs b/Bitvault/MaskedTextEntryViewModel.cs similarity index 87% rename from Bitvault/ItemMaskedTextEntryViewModel.cs rename to Bitvault/MaskedTextEntryViewModel.cs index 0f6e436..7e35729 100644 --- a/Bitvault/ItemMaskedTextEntryViewModel.cs +++ b/Bitvault/MaskedTextEntryViewModel.cs @@ -3,7 +3,7 @@ using Toolkit.Foundation; namespace Bitvault; -public partial class ItemMaskedTextEntryViewModel(IServiceProvider provider, +public partial class MaskedTextEntryViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, IPublisher publisher, diff --git a/Bitvault/ItemMaskedTextEntryViewModelHandler.cs b/Bitvault/MaskedTextEntryViewModelHandler.cs similarity index 63% rename from Bitvault/ItemMaskedTextEntryViewModelHandler.cs rename to Bitvault/MaskedTextEntryViewModelHandler.cs index 165f730..360a8a0 100644 --- a/Bitvault/ItemMaskedTextEntryViewModelHandler.cs +++ b/Bitvault/MaskedTextEntryViewModelHandler.cs @@ -2,7 +2,7 @@ namespace Bitvault; -public class ItemMaskedTextEntryViewModelHandler(IServiceFactory serviceFactory) : +public class MaskedTextEntryViewModelHandler(IServiceFactory serviceFactory) : IHandler, IItemEntryViewModel?> { public Task Handle(CreateEventArgs args, @@ -10,8 +10,8 @@ public class ItemMaskedTextEntryViewModelHandler(IServiceFactory serviceFactory) { if (args.Value is MaskedTextEntryConfiguration configuration) { - if (serviceFactory.Create([.. args.Parameters, configuration, configuration.Pattern, configuration.Label, configuration.Value]) - is ItemMaskedTextEntryViewModel viewModel) + if (serviceFactory.Create([.. args.Parameters, configuration, configuration.Pattern, configuration.Label, configuration.Value]) + is MaskedTextEntryViewModel viewModel) { return Task.FromResult(viewModel); } diff --git a/Bitvault/MultilineTextEntryConfiguration.cs b/Bitvault/MultilineTextEntryConfiguration.cs index df56b88..e0b2d99 100644 --- a/Bitvault/MultilineTextEntryConfiguration.cs +++ b/Bitvault/MultilineTextEntryConfiguration.cs @@ -4,5 +4,4 @@ public record MultilineTextEntryConfiguration : ItemEntryConfiguration { - -} +} \ No newline at end of file diff --git a/Bitvault/MultilineTextEntryViewModel.cs b/Bitvault/MultilineTextEntryViewModel.cs new file mode 100644 index 0000000..1b9c367 --- /dev/null +++ b/Bitvault/MultilineTextEntryViewModel.cs @@ -0,0 +1,15 @@ +using Toolkit.Foundation; + +namespace Bitvault; + +public partial class MultilineTextEntryViewModel(IServiceProvider provider, + IServiceFactory factory, + IMediator mediator, + IPublisher publisher, + ISubscription subscriber, + IDisposer disposer, + ItemState state, + ItemEntryConfiguration configuration, + string key, + object value) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value); + diff --git a/Bitvault/MultilineTextEntryViewModelHandler.cs b/Bitvault/MultilineTextEntryViewModelHandler.cs new file mode 100644 index 0000000..9f9c6cb --- /dev/null +++ b/Bitvault/MultilineTextEntryViewModelHandler.cs @@ -0,0 +1,23 @@ +using Toolkit.Foundation; + +namespace Bitvault; + +public class MultilineTextEntryViewModelHandler(IServiceFactory serviceFactory) : + IHandler, IItemEntryViewModel?> +{ + public Task Handle(CreateEventArgs args, + CancellationToken cancellationToken) + { + if (args.Value is MultilineTextEntryConfiguration configuration) + { + if (serviceFactory.Create([.. args.Parameters, configuration, configuration.Label, configuration.Value ?? ""]) + is MultilineTextEntryViewModel viewModel) + { + return Task.FromResult(viewModel); + } + } + + return Task.FromResult(default); + } +} + diff --git a/Bitvault/NoteEntryConfiguration.cs b/Bitvault/NoteEntryConfiguration.cs deleted file mode 100644 index dc12f55..0000000 --- a/Bitvault/NoteEntryConfiguration.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Bitvault; - -public record NoteEntryConfiguration : - ItemEntryConfiguration -{ - -} diff --git a/Bitvault/NoteViewModel.cs b/Bitvault/NoteViewModel.cs deleted file mode 100644 index 39f26a3..0000000 --- a/Bitvault/NoteViewModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Toolkit.Foundation; - -namespace Bitvault; - -public partial class NoteViewModel : Observable -{ - public NoteViewModel(IServiceProvider provider, - IServiceFactory factory, - IMediator mediator, - IPublisher publisher, - ISubscription subscriber, - IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer) - { - } -} \ No newline at end of file diff --git a/Bitvault/ItemTextEntryViewModel.cs b/Bitvault/PasswordEntryViewModel.cs similarity index 86% rename from Bitvault/ItemTextEntryViewModel.cs rename to Bitvault/PasswordEntryViewModel.cs index 7cfe326..08c50bd 100644 --- a/Bitvault/ItemTextEntryViewModel.cs +++ b/Bitvault/PasswordEntryViewModel.cs @@ -2,7 +2,7 @@ namespace Bitvault; -public partial class ItemTextEntryViewModel(IServiceProvider provider, +public partial class PasswordEntryViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, IPublisher publisher, diff --git a/Bitvault/ItemPasswordEntryViewModelHandler.cs b/Bitvault/PasswordEntryViewModelHandler.cs similarity index 65% rename from Bitvault/ItemPasswordEntryViewModelHandler.cs rename to Bitvault/PasswordEntryViewModelHandler.cs index fe8da09..0e55c1a 100644 --- a/Bitvault/ItemPasswordEntryViewModelHandler.cs +++ b/Bitvault/PasswordEntryViewModelHandler.cs @@ -2,7 +2,7 @@ namespace Bitvault; -public class ItemPasswordEntryViewModelHandler(IServiceFactory serviceFactory) : +public class PasswordEntryViewModelHandler(IServiceFactory serviceFactory) : IHandler, IItemEntryViewModel?> { public Task Handle(CreateEventArgs args, @@ -10,8 +10,8 @@ public class ItemPasswordEntryViewModelHandler(IServiceFactory serviceFactory) : { if (args.Value is PasswordEntryConfiguration configuration) { - if (serviceFactory.Create([.. args.Parameters, configuration, configuration.Label, configuration.Value ?? ""]) - is ItemPasswordEntryViewModel viewModel) + if (serviceFactory.Create([.. args.Parameters, configuration, configuration.Label, configuration.Value ?? ""]) + is PasswordEntryViewModel viewModel) { return Task.FromResult(viewModel); } diff --git a/Bitvault/SystemIdleTimer.cs b/Bitvault/SystemIdleTimer.cs deleted file mode 100644 index 9565e78..0000000 --- a/Bitvault/SystemIdleTimer.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Bitvault; - -public class SystemIdleTimer; \ No newline at end of file diff --git a/Bitvault/ItemPasswordEntryViewModel.cs b/Bitvault/TextEntryViewModel.cs similarity index 84% rename from Bitvault/ItemPasswordEntryViewModel.cs rename to Bitvault/TextEntryViewModel.cs index 9cf9c19..0924bdf 100644 --- a/Bitvault/ItemPasswordEntryViewModel.cs +++ b/Bitvault/TextEntryViewModel.cs @@ -2,7 +2,7 @@ namespace Bitvault; -public partial class ItemPasswordEntryViewModel(IServiceProvider provider, +public partial class TextEntryViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, IPublisher publisher, diff --git a/Bitvault/ItemTextEntryViewModelHandler.cs b/Bitvault/TextEntryViewModelHandler.cs similarity index 65% rename from Bitvault/ItemTextEntryViewModelHandler.cs rename to Bitvault/TextEntryViewModelHandler.cs index 4d30ba0..4ab6c7d 100644 --- a/Bitvault/ItemTextEntryViewModelHandler.cs +++ b/Bitvault/TextEntryViewModelHandler.cs @@ -2,7 +2,7 @@ namespace Bitvault; -public class ItemTextEntryViewModelHandler(IServiceFactory serviceFactory) : +public class TextEntryViewModelHandler(IServiceFactory serviceFactory) : IHandler, IItemEntryViewModel?> { public Task Handle(CreateEventArgs args, @@ -10,8 +10,8 @@ public class ItemTextEntryViewModelHandler(IServiceFactory serviceFactory) : { if (args.Value is TextEntryConfiguration configuration) { - if (serviceFactory.Create([.. args.Parameters, configuration, configuration.Label, configuration.Value ?? ""]) - is ItemTextEntryViewModel viewModel) + if (serviceFactory.Create([.. args.Parameters, configuration, configuration.Label, configuration.Value ?? ""]) + is TextEntryViewModel viewModel) { return Task.FromResult(viewModel); } diff --git a/Bitvault/TextViewModel.cs b/Bitvault/TextViewModel.cs deleted file mode 100644 index 23d42b1..0000000 --- a/Bitvault/TextViewModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Toolkit.Foundation; - -namespace Bitvault; - -public partial class TextViewModel : Observable -{ - public TextViewModel(IServiceProvider provider, - IServiceFactory factory, - IMediator mediator, - IPublisher publisher, - ISubscription subscriber, - IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer) - { - } -} \ No newline at end of file