Merge pull request #25 from TheEightBot/feature/updated-builders

Author: michaelstonis

Stellar.Avalonia/Extensions/AppBuilderExtensions.cs

@@ -8,27 +8,13 @@ namespace Stellar.Avalonia;
 
 public static class AppBuilderExtensions
 {
-    public static AppBuilder UseStellarComponents<TStellarAssembly>(this AppBuilder appBuilder)
+    public static AppBuilder UseStellarComponents(this AppBuilder appBuilder)
     {
         PlatformRegistrationManager.SetRegistrationNamespaces(RegistrationNamespace.Avalonia);
         Locator.CurrentMutable.InitializeSplat();
         Locator.CurrentMutable.InitializeReactiveUI();
         RxApp.TaskpoolScheduler = Schedulers.ShortTermThreadPoolScheduler;
 
-/*
-        services.ConfigureStellarComponents(typeof(TStellarAssembly).GetTypeInfo().Assembly);
-
-        services
-            .AddSingleton(
-                sp =>
-                {
-                    var instance = StellarDependencyResolver.Instance;
-
-                    instance.RegisterResolver((Type type) => sp.GetService(type));
-
-                    return instance;
-                });
-*/
         return appBuilder;
     }
 

Stellar.AvaloniaSample/Program.cs

@@ -21,9 +21,9 @@ public static AppBuilder BuildAvaloniaApp() =>
             .UsePlatformDetect()
             .WithInterFont()
             .LogToTrace()
-            .UseStellarComponents<App>()
+            .UseStellarComponents()
 #if DEBUG
             .EnableHotReload()
 #endif
             .UseReactiveUI();
-}
+}

Stellar.Blazor/Extensions/BuilderExtensions.cs

@@ -7,14 +7,21 @@ namespace Stellar.Blazor;
 public static class BuilderExtensions
 {
     public static IServiceCollection UseStellarComponents<TStellarAssembly>(this IServiceCollection services)
+    {
+        UseStellarComponents(services);
+
+        services.ConfigureStellarComponents(typeof(TStellarAssembly).GetTypeInfo().Assembly);
+
+        return services;
+    }
+
+    public static IServiceCollection UseStellarComponents(this IServiceCollection services)
     {
         PlatformRegistrationManager.SetRegistrationNamespaces(RegistrationNamespace.Blazor);
         Locator.CurrentMutable.InitializeSplat();
         Locator.CurrentMutable.InitializeReactiveUI();
         RxApp.TaskpoolScheduler = Schedulers.ShortTermThreadPoolScheduler;
 
-        services.ConfigureStellarComponents(typeof(TStellarAssembly).GetTypeInfo().Assembly);
-
         return services;
     }
 }

Stellar.Maui/Extensions/MauiAppBuilderExtensions.cs

@@ -18,6 +18,17 @@ public static MauiAppBuilder PreCacheComponents<TStellarAssembly>(this MauiAppBu
     }
 
     public static MauiAppBuilder UseStellarComponents<TStellarAssembly>(this MauiAppBuilder mauiAppBuilder, bool useCustomMauiScheduler = true, bool useShortTermThreadPoolScheduler = true)
+    {
+        UseStellarComponents(mauiAppBuilder, useCustomMauiScheduler, useShortTermThreadPoolScheduler);
+
+        mauiAppBuilder
+            .Services
+                .ConfigureStellarComponents(typeof(TStellarAssembly).GetTypeInfo().Assembly);
+
+        return mauiAppBuilder;
+    }
+
+    public static MauiAppBuilder UseStellarComponents(this MauiAppBuilder mauiAppBuilder, bool useCustomMauiScheduler = true, bool useShortTermThreadPoolScheduler = true)
     {
         UseCustomMauiScheduler = useCustomMauiScheduler;
         UseShortTermThreadPoolScheduler = useShortTermThreadPoolScheduler;
@@ -26,12 +37,11 @@ public static MauiAppBuilder UseStellarComponents<TStellarAssembly>(this MauiApp
         Locator.CurrentMutable.InitializeSplat();
         Locator.CurrentMutable.InitializeReactiveUI();
 
+        mauiAppBuilder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IMauiInitializeScopedService, MauiSchedulerInitializer>());
+
         mauiAppBuilder
             .Services
-                .AddSingleton(serviceProvider => new MauiScheduler(serviceProvider.GetRequiredService<IDispatcher>()))
-                .ConfigureStellarComponents(typeof(TStellarAssembly).GetTypeInfo().Assembly);
-
-        mauiAppBuilder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IMauiInitializeScopedService, MauiSchedulerInitializer>());
+            .AddSingleton(serviceProvider => new MauiScheduler(serviceProvider.GetRequiredService<IDispatcher>()));
 
         return mauiAppBuilder;
     }

Stellar.MauiSample/MauiProgram.cs

@@ -24,7 +24,7 @@ public static MauiApp CreateMauiApp()
 #if DEBUG
                 .EnableHotReload()
 #endif
-                .UseStellarComponents<App>();
+                .UseStellarComponents();
 
         appBuilder.Services.AddRegisteredServicesForStellarMauiSample();