WIP

Wallet.Avalonia/App.axaml.cs

@@ -59,7 +59,6 @@ public partial class App : Application
                 }
 
                 services.AddHandler<WalletActivatedHandler>();
-
                 services.AddTransient<IWalletComponent>(provider => Component.Create<WalletComponent>(provider, args =>
                 {
                     args.AddServices(services =>

Wallet/MaskedTextEntryViewModelHandler.cs

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

Wallet/MultilineTextEntryViewModelHandler.cs

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

Wallet/PasswordEntryViewModelHandler.cs

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

Wallet/PinEntryViewModelHandler.cs

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

Wallet/SynchronizeCategoriesNavigationViewModelHandler.cs

@@ -11,7 +11,8 @@ public class SynchronizeCategoriesNavigationViewModelHandler(IItemConfigurationC
     {
         foreach (KeyValuePair<string, Func<ItemConfiguration>> configuration in configurations)
         {
-            if (serviceFactory.Create<CategoryNavigationViewModel>(configuration.Key)
+            if (serviceFactory.Create<CategoryNavigationViewModel>(args => args.Initialize(),
+                configuration.Key)
                 is CategoryNavigationViewModel viewModel)
             {
                 publisher.Publish(Create.As(viewModel), nameof(CategoriesNavigationViewModel));

Wallet/SynchronizeItemCategoryViewModelHandler.cs

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

Wallet/SynchronizeItemCollectionViewModelHandler.cs

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

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>(id)
+                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.Initialize(), 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>(id)
+                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.Initialize(), id)
                             is ItemSectionViewModel sectionViewModel)
                         {
                             publisher.Publish(Create.As(sectionViewModel), nameof(ItemContentViewModel));

Wallet/SynchronizeMainViewModelHandler.cs

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

Wallet/TextEntryViewModelHandler.cs

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