From d68cdabbbd942a448f76aa49359d5c1edec62a33 Mon Sep 17 00:00:00 2001 From: TheXamlGuy Date: Sat, 6 Jul 2024 20:59:23 +0100 Subject: [PATCH] Tweaks --- Wallet/DateEntryViewModel.cs | 3 +-- Wallet/HyperlinkEntryViewModel.cs | 3 +-- Wallet/ItemEntryViewModel.cs | 4 ++-- Wallet/MaskedTextEntryViewModel.cs | 3 +-- Wallet/MultilineTextEntryViewModel.cs | 3 +-- Wallet/PasswordEntryViewModel.cs | 3 +-- Wallet/PinEntryViewModel.cs | 3 +-- Wallet/TextEntryViewModel.cs | 3 +-- 8 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Wallet/DateEntryViewModel.cs b/Wallet/DateEntryViewModel.cs index 35d65cf..fdeaa3c 100644 --- a/Wallet/DateEntryViewModel.cs +++ b/Wallet/DateEntryViewModel.cs @@ -8,11 +8,10 @@ public partial class DateEntryViewModel(IServiceProvider provider, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, - IClipboardWriter clipboardWriter, ItemState state, ItemEntryConfiguration configuration, string key, DateTimeOffset value, bool isConcealed, bool isRevealed, - double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, clipboardWriter, state, configuration, key, value, isConcealed, isRevealed, width); + double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value, isConcealed, isRevealed, width); diff --git a/Wallet/HyperlinkEntryViewModel.cs b/Wallet/HyperlinkEntryViewModel.cs index 715a0de..59cb385 100644 --- a/Wallet/HyperlinkEntryViewModel.cs +++ b/Wallet/HyperlinkEntryViewModel.cs @@ -9,14 +9,13 @@ public partial class HyperlinkEntryViewModel(IServiceProvider provider, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, - IClipboardWriter clipboardWriter, ItemState state, ItemEntryConfiguration configuration, string key, string value, double width, bool isConcealed, - bool isRevealed) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, clipboardWriter, state, configuration, key, value, isConcealed, isRevealed, width) + bool isRevealed) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value, isConcealed, isRevealed, width) { [RelayCommand] private void Invoke() => Publisher.Publish(Create.As(new Hyperlink(Value))); diff --git a/Wallet/ItemEntryViewModel.cs b/Wallet/ItemEntryViewModel.cs index afd93d1..51a32cb 100644 --- a/Wallet/ItemEntryViewModel.cs +++ b/Wallet/ItemEntryViewModel.cs @@ -10,7 +10,6 @@ public partial class ItemEntryViewModel(IServiceProvider provider, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, - IClipboardWriter clipboardWriter, ItemState state, ItemEntryConfiguration configuration, string key, @@ -66,5 +65,6 @@ public partial class ItemEntryViewModel(IServiceProvider provider, private void Reveal() => IsRevealed = true; [RelayCommand] - private void Copy() => clipboardWriter.Write($"{Value}"); + private void Copy() => + Publisher.Publish(Write.As(new Clipboard($"{Value}"))); } \ No newline at end of file diff --git a/Wallet/MaskedTextEntryViewModel.cs b/Wallet/MaskedTextEntryViewModel.cs index 7e6b7ae..ffe713f 100644 --- a/Wallet/MaskedTextEntryViewModel.cs +++ b/Wallet/MaskedTextEntryViewModel.cs @@ -9,7 +9,6 @@ public partial class MaskedTextEntryViewModel(IServiceProvider provider, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, - IClipboardWriter clipboardWriter, ItemState state, ItemEntryConfiguration configuration, string pattern, @@ -17,7 +16,7 @@ public partial class MaskedTextEntryViewModel(IServiceProvider provider, string value, bool isConcealed, bool isRevealed, - double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, clipboardWriter, state, configuration, key, value, isConcealed, isRevealed, width) + double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value, isConcealed, isRevealed, width) { [ObservableProperty] private string pattern = pattern; diff --git a/Wallet/MultilineTextEntryViewModel.cs b/Wallet/MultilineTextEntryViewModel.cs index 1df8288..654f553 100644 --- a/Wallet/MultilineTextEntryViewModel.cs +++ b/Wallet/MultilineTextEntryViewModel.cs @@ -8,12 +8,11 @@ public partial class MultilineTextEntryViewModel(IServiceProvider provider, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, - IClipboardWriter clipboardWriter, ItemState state, ItemEntryConfiguration configuration, string key, string value, bool isConcealed, bool isRevealed, - double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, clipboardWriter, state, configuration, key, value, isConcealed, isRevealed, width); + double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value, isConcealed, isRevealed, width); diff --git a/Wallet/PasswordEntryViewModel.cs b/Wallet/PasswordEntryViewModel.cs index f89e80f..f6bfa79 100644 --- a/Wallet/PasswordEntryViewModel.cs +++ b/Wallet/PasswordEntryViewModel.cs @@ -8,11 +8,10 @@ public partial class PasswordEntryViewModel(IServiceProvider provider, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, - IClipboardWriter clipboardWriter, ItemState state, ItemEntryConfiguration configuration, string key, string value, bool isConcealed, bool isRevealed, - double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, clipboardWriter, state, configuration, key, value, isConcealed, isRevealed, width); \ No newline at end of file + double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value, isConcealed, isRevealed, width); \ No newline at end of file diff --git a/Wallet/PinEntryViewModel.cs b/Wallet/PinEntryViewModel.cs index 8101717..049771e 100644 --- a/Wallet/PinEntryViewModel.cs +++ b/Wallet/PinEntryViewModel.cs @@ -8,11 +8,10 @@ public partial class PinEntryViewModel(IServiceProvider provider, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, - IClipboardWriter clipboardWriter, ItemState state, ItemEntryConfiguration configuration, string key, string value, double width, bool isConcealed, - bool isRevealed) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, clipboardWriter, state, configuration, key, value, isConcealed, isRevealed, width); \ No newline at end of file + bool isRevealed) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value, isConcealed, isRevealed, width); \ No newline at end of file diff --git a/Wallet/TextEntryViewModel.cs b/Wallet/TextEntryViewModel.cs index 4b85ed8..7e3955a 100644 --- a/Wallet/TextEntryViewModel.cs +++ b/Wallet/TextEntryViewModel.cs @@ -8,11 +8,10 @@ public partial class TextEntryViewModel(IServiceProvider provider, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, - IClipboardWriter clipboardWriter, ItemState state, ItemEntryConfiguration configuration, string key, string value, bool isConcealed, bool isRevealed, - double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, clipboardWriter, state, configuration, key, value, isConcealed, isRevealed, width); + double width) : ItemEntryViewModel(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value, isConcealed, isRevealed, width);