From c0b166b970120710a43edd5fe323bc707a9388b4 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Sat, 6 Jul 2024 22:04:56 +0100
Subject: [PATCH] Tidy

---
 Wallet.Avalonia/DropdownEntryView.axaml   | 17 +++++++++++-----
 Wallet.Avalonia/HyperlinkEntryView.axaml  |  3 +++
 Wallet.Avalonia/MainView.axaml            |  2 +-
 Wallet.Avalonia/MaskedTextEntryView.axaml |  3 +++
 Wallet.Avalonia/TextEntryView.axaml       | 12 ++++++++----
 Wallet/DropdownEntryViewModel.cs          |  8 ++++++--
 Wallet/DropdownEntryViewModelHandler.cs   |  2 +-
 Wallet/ItemEntryCollectionViewModel.cs    | 24 +++++++++++++++++++++++
 Wallet/ItemEntryViewModel.cs              |  3 +--
 9 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/Wallet.Avalonia/DropdownEntryView.axaml b/Wallet.Avalonia/DropdownEntryView.axaml
index 452c1bf..df09066 100644
--- a/Wallet.Avalonia/DropdownEntryView.axaml
+++ b/Wallet.Avalonia/DropdownEntryView.axaml
@@ -7,9 +7,14 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
-        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
-        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+        <Thickness x:Key="TextControlMargin">0</Thickness>
+        <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactPadding">0</Thickness>
+        <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
     </SettingsExpander.Resources>
+    <SettingsExpander.Action>
+        <ItemEntryActionView />
+    </SettingsExpander.Action>
     <SettingsExpander.Footer>
         <Grid>
             <ComboBox
@@ -21,7 +26,7 @@
                 <ComboBox.Styles>
                     <Style Selector="ComboBox.Write">
                         <Setter Property="MaxWidth" Value="{Binding Width}" />
-                        <Setter Property="MinWidth" Value="{Binding Width}" />                        
+                        <Setter Property="MinWidth" Value="{Binding Width}" />
                         <Setter Property="IsVisible" Value="True" />
                     </Style>
                     <Style Selector="ComboBox.Read">
@@ -48,7 +53,8 @@
                 <TextBox.Styles>
                     <Style Selector="TextBox.Write">
                         <Setter Property="IsVisible" Value="False" />
-                        <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
+                        <Setter Property="Margin" Value="{StaticResource TextControlMargin}" />
+                        <Setter Property="Padding" Value="{StaticResource TextControlPadding}" />
                     </Style>
                     <Style Selector="TextBox.Read">
                         <Setter Property="MinWidth" Value="0" />
@@ -56,7 +62,8 @@
                         <Setter Property="BorderBrush" Value="Transparent" />
                         <Setter Property="Background" Value="Transparent" />
                         <Setter Property="IsVisible" Value="True" />
-                        <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                        <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
+                        <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />
                         <Setter Property="MinHeight" Value="0" />
                         <Setter Property="Foreground">
                             <Setter.Value>
diff --git a/Wallet.Avalonia/HyperlinkEntryView.axaml b/Wallet.Avalonia/HyperlinkEntryView.axaml
index fb171fd..0cfe753 100644
--- a/Wallet.Avalonia/HyperlinkEntryView.axaml
+++ b/Wallet.Avalonia/HyperlinkEntryView.axaml
@@ -10,6 +10,9 @@
         <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
     </SettingsExpander.Resources>
+    <SettingsExpander.Action>
+        <ItemEntryActionView />
+    </SettingsExpander.Action>
     <SettingsExpander.Footer>
         <Grid>
             <TextBox Text="{Binding Value}">
diff --git a/Wallet.Avalonia/MainView.axaml b/Wallet.Avalonia/MainView.axaml
index 33dade5..778eea1 100644
--- a/Wallet.Avalonia/MainView.axaml
+++ b/Wallet.Avalonia/MainView.axaml
@@ -31,7 +31,7 @@
                 <TextBlock
                     FontSize="10"
                     Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
-                    Text="BETA PREVIEW 2" />
+                    Text="BETA PREVIEW 3" />
             </Border>
         </NavigationView.PaneHeader>
         <NavigationView.PaneCustomContent>
diff --git a/Wallet.Avalonia/MaskedTextEntryView.axaml b/Wallet.Avalonia/MaskedTextEntryView.axaml
index 5612d25..55893b6 100644
--- a/Wallet.Avalonia/MaskedTextEntryView.axaml
+++ b/Wallet.Avalonia/MaskedTextEntryView.axaml
@@ -10,6 +10,9 @@
         <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
     </SettingsExpander.Resources>
+    <SettingsExpander.Action>
+        <ItemEntryActionView />
+    </SettingsExpander.Action>
     <SettingsExpander.Footer>
         <MaskedTextBox Mask="{Binding Pattern}" Text="{Binding Value}">
             <TextBox.Styles>
diff --git a/Wallet.Avalonia/TextEntryView.axaml b/Wallet.Avalonia/TextEntryView.axaml
index a8b03ea..53690e6 100644
--- a/Wallet.Avalonia/TextEntryView.axaml
+++ b/Wallet.Avalonia/TextEntryView.axaml
@@ -7,8 +7,10 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
-        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
-        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+        <Thickness x:Key="TextControlMargin">0</Thickness>
+        <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactPadding">0</Thickness>
+        <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
@@ -19,7 +21,8 @@
                 <Style Selector="TextBox.Write">
                     <Setter Property="MaxWidth" Value="{Binding Width}" />
                     <Setter Property="MinWidth" Value="{Binding Width}" />
-                    <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
+                    <Setter Property="Margin" Value="{StaticResource TextControlMargin}" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlPadding}" />
                     <Setter Property="TextWrapping" Value="NoWrap" />
                 </Style>
                 <Style Selector="TextBox.Read">
@@ -27,7 +30,8 @@
                     <Setter Property="IsReadOnly" Value="True" />
                     <Setter Property="BorderBrush" Value="Transparent" />
                     <Setter Property="Background" Value="Transparent" />
-                    <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                    <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />                    
                     <Setter Property="MinHeight" Value="0" />
                     <Setter Property="TextWrapping" Value="Wrap" />
                     <Setter Property="Foreground">
diff --git a/Wallet/DropdownEntryViewModel.cs b/Wallet/DropdownEntryViewModel.cs
index 642836a..34e1660 100644
--- a/Wallet/DropdownEntryViewModel.cs
+++ b/Wallet/DropdownEntryViewModel.cs
@@ -16,8 +16,10 @@ public partial class DropdownEntryViewModel :
         ItemEntryConfiguration configuration, 
         string key,
         object value,
+        bool isConcealed,
+        bool isRevealed,
         double width,
-        DropdownValueViewModel selectedItem) : base(provider, factory, mediator, publisher, subscriber, disposer, items, state, configuration, key, value, width)
+        DropdownValueViewModel selectedItem) : base(provider, factory, mediator, publisher, subscriber, disposer, items, state, configuration, key, value, isConcealed, isRevealed, width)
     {
         SelectedItem = selectedItem;
     }
@@ -33,7 +35,9 @@ public partial class DropdownEntryViewModel :
         ItemEntryConfiguration configuration,
         string key,
         object value,
-        double width) : base(provider, factory, mediator, publisher, subscriber, disposer, items, state, configuration, key, value, width)
+        bool isConcealed,
+        bool isRevealed,
+        double width) : base(provider, factory, mediator, publisher, subscriber, disposer, items, state, configuration, key, value, isConcealed, isRevealed, width)
     {
     }
 }
\ No newline at end of file
diff --git a/Wallet/DropdownEntryViewModelHandler.cs b/Wallet/DropdownEntryViewModelHandler.cs
index 1776530..f81ef0e 100644
--- a/Wallet/DropdownEntryViewModelHandler.cs
+++ b/Wallet/DropdownEntryViewModelHandler.cs
@@ -23,7 +23,7 @@ public class DropdownEntryViewModelHandler(IServiceFactory serviceFactory) :
             DropdownValueViewModel? selected = values.FirstOrDefault(x => x.Value is not null && x.Value.Equals($"{value}"));
 
             if (serviceFactory.Create<DropdownEntryViewModel>(args => args.Initialize(),
-                [values, .. args.Parameters, configuration, label, value, width, false, false, selected])
+                [values, .. args.Parameters, configuration, label, value, false, false, width, selected ?? null])
                 is DropdownEntryViewModel viewModel)
             {
                 return Task.FromResult<IItemEntryViewModel?>(viewModel);
diff --git a/Wallet/ItemEntryCollectionViewModel.cs b/Wallet/ItemEntryCollectionViewModel.cs
index 58ac4b1..5ee4355 100644
--- a/Wallet/ItemEntryCollectionViewModel.cs
+++ b/Wallet/ItemEntryCollectionViewModel.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
 namespace Wallet;
@@ -27,14 +28,25 @@ public partial class ItemEntryCollectionViewModel<TItem> :
         ItemEntryConfiguration configuration,
         string key,
         object value,
+        bool isConcealed,
+        bool isRevealed,
         double width) : base(provider, factory, mediator, publisher, subscriber, disposer, key, value)
     {
         this.configuration = configuration;
 
         State = state;
+        IsConcealed = isConcealed;
+        IsRevealed = isRevealed;
         Width = width;
     }
 
+    [ObservableProperty]
+    private bool isConcealed;
+
+    [ObservableProperty]
+    private bool isRevealed;
+
+
     [ObservableProperty]
     private double width;
 
@@ -50,6 +62,8 @@ public partial class ItemEntryCollectionViewModel<TItem> :
         ItemEntryConfiguration configuration,
         string key,
         object value,
+        bool isConcealed,
+        bool isRevealed,
         double width) : base(provider, factory, mediator, publisher, subscriber, disposer, items, key, value)
     {
         this.configuration = configuration;
@@ -84,4 +98,14 @@ public partial class ItemEntryCollectionViewModel<TItem> :
         State = ItemState.Read;
         return Task.CompletedTask;
     }
+
+
+    [RelayCommand]
+    private void Hide() => IsRevealed = false;
+
+    [RelayCommand]
+    private void Reveal() => IsRevealed = true;
+
+    [RelayCommand]
+    private void Copy() => Publisher.Publish(Write.As(new Clipboard<object>($"{Value}")));
 }
\ No newline at end of file
diff --git a/Wallet/ItemEntryViewModel.cs b/Wallet/ItemEntryViewModel.cs
index 51a32cb..4a70695 100644
--- a/Wallet/ItemEntryViewModel.cs
+++ b/Wallet/ItemEntryViewModel.cs
@@ -65,6 +65,5 @@ public partial class ItemEntryViewModel<TValue>(IServiceProvider provider,
     private void Reveal() => IsRevealed = true;
 
     [RelayCommand]
-    private void Copy() => 
-        Publisher.Publish(Write.As(new Clipboard<object>($"{Value}")));
+    private void Copy() =>  Publisher.Publish(Write.As(new Clipboard<object>($"{Value}")));
 }
\ No newline at end of file