More renaming

Wallet.Avalonia/AllNavigationView.axaml

@@ -11,7 +11,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet">
@@ -21,7 +21,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Left" Route="ItemCollection">

Wallet.Avalonia/ArchiveNavigationView.axaml

@@ -11,7 +11,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet">
@@ -21,7 +21,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Left" Route="ItemCollection">

Wallet.Avalonia/CreateWalletView.axaml

@@ -29,17 +29,31 @@
             <AddClassAction ClassName="Write" RemoveIfExists="True" />
             <RemoveClassAction ClassName="Read" />
         </DataTriggerBehavior>
-        <DataTriggerBehavior Binding="{Binding Active}" Value="True">
+        <DataTriggerBehavior Binding="{Binding IsActive}" Value="True">
+            <ConditionAction>
+                <ConditionAction.Condition>
+                    <ConditionalExpression ForwardChaining="And">
+                        <ComparisonCondition LeftOperand="{Binding IsConfirmed}" RightOperand="False" />
+                    </ConditionalExpression>
+                </ConditionAction.Condition>
                 <AddClassAction ClassName="Active" RemoveIfExists="True" />
+            </ConditionAction>
         </DataTriggerBehavior>
-        <DataTriggerBehavior Binding="{Binding Active}" Value="False">
+        <DataTriggerBehavior Binding="{Binding IsActive}" Value="False">
+            <ConditionAction>
+                <ConditionAction.Condition>
+                    <ConditionalExpression ForwardChaining="And">
+                        <ComparisonCondition LeftOperand="{Binding IsConfirmed}" RightOperand="False" />
+                    </ConditionalExpression>
+                </ConditionAction.Condition>
                 <RemoveClassAction ClassName="Active" />
+            </ConditionAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
     <Grid>
         <StackPanel
             Width="400"
-            IsEnabled="{Binding !Active}"
+            IsEnabled="{Binding !IsActive}"
             Spacing="18">
             <StackPanel>
                 <TextBlock Margin="0,0,0,6" Text="Name" />
@@ -58,7 +72,7 @@
             Height="48"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            IsActive="{Binding Active}"
+            IsActive="{Binding IsActive}"
-            IsVisible="{Binding Active}" />
+            IsVisible="{Binding IsActive}" />
     </Grid>
 </ContentDialog>

Wallet.Avalonia/OpenWalletView.axaml

@@ -7,7 +7,7 @@
     <StackPanel
         HorizontalAlignment="Center"
         VerticalAlignment="Center"
-        IsEnabled="{Binding !Active}"
+        IsEnabled="{Binding !IsActive}"
         Spacing="12">
         <PersonPicture
             Width="144"
@@ -31,6 +31,6 @@
         <ProgressRing
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            IsActive="{Binding Active}" />
+            IsActive="{Binding IsActive}" />
     </StackPanel>
 </UserControl>

Wallet.Avalonia/WalletNavigationView.axaml

@@ -59,7 +59,7 @@
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
                         <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="True" />
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet" />
@@ -81,7 +81,7 @@
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
                         <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="True" />
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <InvokeNavigationViewItemAction />

Wallet/CreateItemViewModelHandler.cs

@@ -29,7 +29,7 @@ public class CreateItemViewModelHandler(IServiceFactory serviceFactory,
 
         itemHeaderConfigurationDecorator.Set(configuration);
 
-        if (serviceFactory.Create<ItemViewModel>(args => args.Initialize(), args.Parameters) is ItemViewModel itemViewModel)
+        if (serviceFactory.Create<ItemViewModel>(args => args.OnInitialize(), args.Parameters) is ItemViewModel itemViewModel)
         {
             itemViewModel.Add<ItemHeaderViewModel>(configuration, state, "", name);
             itemViewModel.Add<ItemContentViewModel>();

Wallet/CreateWalletViewModel.cs

@@ -5,7 +5,8 @@ using Toolkit.Foundation;
 
 namespace Wallet;
 
-public partial class CreateWalletViewModel : Observable,
+public partial class CreateWalletViewModel :
+    Observable,
     IPrimaryConfirmation
 {
     [MaybeNull]
@@ -23,6 +24,9 @@ public partial class CreateWalletViewModel : Observable,
     [ObservableProperty]
     private IValidation validation;
 
+    [ObservableProperty]
+    private bool isConfirmed;
+
     public CreateWalletViewModel(IValidation validation, 
         IServiceProvider provider,
         IServiceFactory factory,
@@ -46,8 +50,10 @@ public partial class CreateWalletViewModel : Observable,
     {
         using (await new ActivityLock(this))
         {
-            return await Mediator.Handle<CreateEventArgs<Wallet<(string, string)>>,
+            IsConfirmed = await Mediator.Handle<CreateEventArgs<Wallet<(string, string)>>,
                 bool>(Create.As(new Wallet<(string, string)>((Name, Password))));
+
+            return IsConfirmed;
         }
     }
 

Wallet/MaskedTextEntryViewModelHandler.cs

@@ -14,7 +14,7 @@ public class MaskedTextEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<MaskedTextEntryViewModel>(args => args.Initialize(), 
+            if (serviceFactory.Create<MaskedTextEntryViewModel>(args => args.OnInitialize(), 
                 [.. args.Parameters, configuration, configuration.Pattern, label, value, width])
                 is MaskedTextEntryViewModel viewModel)
             {

Wallet/MultilineTextEntryViewModelHandler.cs

@@ -14,7 +14,7 @@ public class MultilineTextEntryViewModelHandler(IServiceFactory serviceFactory)
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<MultilineTextEntryViewModel>(args => args.Initialize(), 
+            if (serviceFactory.Create<MultilineTextEntryViewModel>(args => args.OnInitialize(), 
                 [.. args.Parameters, configuration, label, value, width])
                 is MultilineTextEntryViewModel viewModel)
             {

Wallet/PasswordEntryViewModelHandler.cs

@@ -14,7 +14,7 @@ public class PasswordEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<PasswordEntryViewModel>(args => args.Initialize(), 
+            if (serviceFactory.Create<PasswordEntryViewModel>(args => args.OnInitialize(), 
                 [.. args.Parameters, configuration, label, value, width])
                 is PasswordEntryViewModel viewModel)
             {

Wallet/PinEntryViewModelHandler.cs

@@ -14,7 +14,7 @@ public class PinEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<PinEntryViewModel>(args => args.Initialize(), 
+            if (serviceFactory.Create<PinEntryViewModel>(args => args.OnInitialize(), 
                 [.. args.Parameters, configuration, label, value, width])
                 is PinEntryViewModel viewModel)
             {

Wallet/SynchronizeCategoriesNavigationViewModelHandler.cs

@@ -18,7 +18,7 @@ public class SynchronizeCategoriesNavigationViewModelHandler(IMediator mediator,
             int count = counts?.FirstOrDefault(x => x.Name == configuration.Key).Count ?? 0;
             string name = configuration.Key;
 
-            if (serviceFactory.Create<CategoryNavigationViewModel>(args => args.Initialize(), count, name)
+            if (serviceFactory.Create<CategoryNavigationViewModel>(args => args.OnInitialize(), count, name)
                 is CategoryNavigationViewModel viewModel)
             {
                 publisher.Publish(Create.As(viewModel), nameof(CategoriesNavigationViewModel));

Wallet/SynchronizeItemCategoryViewModelHandler.cs

@@ -12,7 +12,7 @@ public class SynchronizeItemCategoryViewModelHandler(IItemConfigurationCollectio
         bool selected = true;
         foreach (KeyValuePair<string, Func<ItemConfiguration>> configuration in configurations)
         {
-            if (serviceFactory.Create<ItemCategoryNavigationViewModel>(args => args.Initialize(), 
+            if (serviceFactory.Create<ItemCategoryNavigationViewModel>(args => args.OnInitialize(), 
                 configuration.Key, selected)
                 is ItemCategoryNavigationViewModel viewModel)
             {

Wallet/SynchronizeItemCollectionViewModelHandler.cs

@@ -31,7 +31,7 @@ public class SynchronizeItemCollectionViewModelHandler(IMediator mediator,
                     IDecoratorService<Item<(Guid, string)>> decoratorService = serviceScope.ServiceProvider
                         .GetRequiredService<IDecoratorService<Item<(Guid, string)>>>();
 
-                    if (serviceFactory.Create<ItemNavigationViewModel>(args => args.Initialize(), 
+                    if (serviceFactory.Create<ItemNavigationViewModel>(args => args.OnInitialize(), 
                         Id, Name, "Description", Category, selected, Favourite, Archived) 
                         is ItemNavigationViewModel viewModel)
                     {

Wallet/SynchronizeItemContentFromCategoryViewModelHandler.cs

@@ -22,7 +22,7 @@ public class SynchronizeItemContentFromCategoryViewModelHandler(IItemConfigurati
                     foreach (ItemSectionConfiguration configurationSection in configuration.Sections)
                     {
                         string id = $"{nameof(ItemSection)}:{Guid.NewGuid()}";
-                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.Initialize(), id)
+                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.OnInitialize(), id)
                             is ItemSectionViewModel sectionViewModel)
                         {
                             publisher.Publish(Create.As(sectionViewModel), nameof(ItemContentViewModel));

Wallet/SynchronizeItemContentViewModelHandler.cs

@@ -25,7 +25,7 @@ public class SynchronizeItemContentViewModelHandler(IDecoratorService<Item<(Guid
                     foreach (ItemSectionConfiguration configurationSection in configuration.Sections)
                     {
                         string id = $"{nameof(ItemSection)}:{Guid.NewGuid()}";
-                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.Initialize(), id)
+                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.OnInitialize(), id)
                             is ItemSectionViewModel sectionViewModel)
                         {
                             publisher.Publish(Create.As(sectionViewModel), nameof(ItemContentViewModel));

Wallet/SynchronizeMainViewModelHandler.cs

@@ -19,7 +19,7 @@ public class SynchronizeMainViewModelHandler(IPublisher publisher,
             {
                 if (Wallet.Services.GetRequiredService<IServiceFactory>() is IServiceFactory factory)
                 {
-                    if (factory.Create<WalletNavigationViewModel>(args => args.Initialize(), descriptor.Name, selected) 
+                    if (factory.Create<WalletNavigationViewModel>(args => args.OnInitialize(), descriptor.Name, selected) 
                         is WalletNavigationViewModel viewModel)
                     {
                         publisher.Publish(Create.As<IMainNavigationViewModel>(viewModel),

Wallet/TextEntryViewModelHandler.cs

@@ -14,7 +14,7 @@ public class TextEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<TextEntryViewModel>(args => args.Initialize(), 
+            if (serviceFactory.Create<TextEntryViewModel>(args => args.OnInitialize(), 
                 [.. args.Parameters, configuration, label, value, width])
                 is TextEntryViewModel viewModel)
             {

Wallet/WalletActivatedHandler.cs

@@ -22,7 +22,7 @@ public class WalletActivatedHandler(IWalletHostCollection Wallets,
             {
                 if (host.Services.GetRequiredService<IServiceFactory>() is IServiceFactory serviceFactory)
                 {
-                    if (serviceFactory.Create<WalletNavigationViewModel>(args => args.Initialize(), 
+                    if (serviceFactory.Create<WalletNavigationViewModel>(args => args.OnInitialize(), 
                         descriptor.Name, false) 
                         is WalletNavigationViewModel viewModel)
                     {

Wallet/WalletInitializer.cs

@@ -4,9 +4,10 @@ namespace Wallet;
 
 public class WalletInitializer(IEnumerable<IConfigurationDescriptor<WalletConfiguration>> configurations,
     IComponentFactory componentFactory,
-    IWalletHostCollection Wallets) : IInitialization
+    IWalletHostCollection Wallets) : 
+    IInitialization
 {
-    public async Task Initialize()
+    public async Task OnInitialize()
     {
         foreach (IConfigurationDescriptor<WalletConfiguration> configuration in configurations)
         {