From b781f18758ac501f3fc37c667c1bb5b4c098f5e9 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Wed, 2 Oct 2024 17:23:23 +0100
Subject: [PATCH] Added ConfigurationValueViewModel and AddValueTemplate
 extension

---
 .../ConfigurationValueViewModel.cs            | 29 ++++++++++++
 .../IServiceCollectionExtensions.cs           | 45 +++++++++++++------
 Toolkit.Foundation/Toolkit.Foundation.csproj  |  3 --
 3 files changed, 61 insertions(+), 16 deletions(-)
 create mode 100644 Toolkit.Foundation/ConfigurationValueViewModel.cs

diff --git a/Toolkit.Foundation/ConfigurationValueViewModel.cs b/Toolkit.Foundation/ConfigurationValueViewModel.cs
new file mode 100644
index 0000000..2505d70
--- /dev/null
+++ b/Toolkit.Foundation/ConfigurationValueViewModel.cs
@@ -0,0 +1,29 @@
+namespace Toolkit.Foundation;
+
+public partial class ConfigurationValueViewModel<TConfiguration, TValue>(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer,
+    TConfiguration configuration,
+    Func<TConfiguration, TValue> valueDelegate) :
+    ValueViewModel<TValue>(provider, factory, mediator, publisher, subscriber, disposer),
+    INotificationHandler<ChangedEventArgs<TConfiguration>>
+    where TConfiguration : class
+{
+    private readonly TConfiguration configuration = configuration;
+
+    private readonly Func<TConfiguration, TValue> valueDelegate = valueDelegate;
+
+    public Task Handle(ChangedEventArgs<TConfiguration> args)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override Task OnActivated()
+    {
+        Value = valueDelegate(configuration);
+        return base.OnActivated();
+    }
+}
\ No newline at end of file
diff --git a/Toolkit.Foundation/IServiceCollectionExtensions.cs b/Toolkit.Foundation/IServiceCollectionExtensions.cs
index 6b9b822..3e8c6a6 100644
--- a/Toolkit.Foundation/IServiceCollectionExtensions.cs
+++ b/Toolkit.Foundation/IServiceCollectionExtensions.cs
@@ -4,8 +4,16 @@ namespace Toolkit.Foundation;
 
 public static class IServiceCollectionExtensions
 {
+    public static IServiceCollection AddAsyncInitialization<TInitialization>(this IServiceCollection services)
+        where TInitialization : class,
+        IAsyncInitialization
+    {
+        services.AddTransient<IAsyncInitialization, TInitialization>();
+        return services;
+    }
+
     public static IServiceCollection AddCache<TKey, TValue>(this IServiceCollection services)
-        where TKey : notnull
+            where TKey : notnull
         where TValue : notnull
     {
         services.AddScoped<ICache<TKey, TValue>, Cache<TKey, TValue>>();
@@ -97,15 +105,6 @@ public static class IServiceCollectionExtensions
         services.AddTransient<IInitialization, TInitialization>();
         return services;
     }
-
-    public static IServiceCollection AddAsyncInitialization<TInitialization>(this IServiceCollection services)
-        where TInitialization : class,
-        IAsyncInitialization
-    {
-        services.AddTransient<IAsyncInitialization, TInitialization>();
-        return services;
-    }
-
     public static IServiceCollection AddRange(this IServiceCollection services,
         IServiceCollection fromServices)
     {
@@ -124,7 +123,7 @@ public static class IServiceCollectionExtensions
     {
         return AddTemplate<TViewModel, TViewModel, TView>(services, key, serviceLifetime, parameters);
     }
-    
+
     public static IServiceCollection AddTemplate<TViewModel, TViewModelImplementation, TView>(this IServiceCollection services,
         object? key = null,
         ServiceLifetime serviceLifetime = ServiceLifetime.Transient,
@@ -142,7 +141,7 @@ public static class IServiceCollectionExtensions
         }
         else
         {
-            services.Add(new ServiceDescriptor(viewModelImplementationType, provider =>
+            services.Add(new ServiceDescriptor(viewModelType, provider =>
                 provider.GetRequiredService<IServiceFactory>().Create<TViewModelImplementation>(parameters)!, serviceLifetime));
         }
 
@@ -154,7 +153,7 @@ public static class IServiceCollectionExtensions
         }
         else
         {
-            services.Add(new ServiceDescriptor(viewModelImplementationType, key, (provider, key) =>
+            services.Add(new ServiceDescriptor(viewModelType, key, (provider, key) =>
                 provider.GetRequiredService<IServiceFactory>().Create<TViewModelImplementation>(parameters)!, serviceLifetime));
         }
 
@@ -165,4 +164,24 @@ public static class IServiceCollectionExtensions
 
         return services;
     }
+
+    public static IServiceCollection AddValueTemplate<TConfiguration, TValue, TViewModel, TView>(this IServiceCollection services,
+                Func<TConfiguration, TValue> valueDelegate,
+        object? key = null,
+        ServiceLifetime serviceLifetime = ServiceLifetime.Transient,
+        params object[]? parameters)
+    {
+        parameters = [valueDelegate, .. parameters ?? Enumerable.Empty<object?>()];
+        return AddTemplate<TViewModel, TViewModel, TView>(services, key, serviceLifetime, parameters);
+    }
+
+    public static IServiceCollection AddValueTemplate<TConfiguration, TValue, TViewModel, TViewModelImplementation, TView>(this IServiceCollection services,
+        Func<TConfiguration, TValue> valueDelegate,
+        object? key = null,
+        ServiceLifetime serviceLifetime = ServiceLifetime.Transient,
+        params object[]? parameters)
+    {
+        parameters = [valueDelegate, .. parameters ?? Enumerable.Empty<object?>()];
+        return AddTemplate<TViewModel, TViewModelImplementation, TView>(services, key, serviceLifetime, parameters);
+    }
 }
\ No newline at end of file
diff --git a/Toolkit.Foundation/Toolkit.Foundation.csproj b/Toolkit.Foundation/Toolkit.Foundation.csproj
index a4dbcfd..8ff9be3 100644
--- a/Toolkit.Foundation/Toolkit.Foundation.csproj
+++ b/Toolkit.Foundation/Toolkit.Foundation.csproj
@@ -4,9 +4,6 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
-	<ItemGroup>
-	  <Compile Remove="Navigate.cs" />
-	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.1.24431.7" />