bunch ov fixes

This commit is contained in:
TheXamlGuy
2024-01-28 14:57:56 +00:00
parent 9f6cc35bc1
commit 6d40220412
28 changed files with 238 additions and 249 deletions
@@ -12,7 +12,6 @@ public static class IServiceCollectionExtensions
services.AddHandler<WidgetExtensionEnumerator>();
services.AddHandler<WidgetExtensionHandler>();
services.AddHandler<WidgetExtensionHandler>();
services.AddHandler<WidgetHostHandler>();
return services;
-3
View File
@@ -25,9 +25,6 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
services.AddScoped<IServiceFactory>(provider =>
new ServiceFactory((type, parameters) =>
ActivatorUtilities.CreateInstance(provider, type, parameters!)));
services.AddHostedService<WidgetService>();
services.AddScoped<IMediator, Mediator>();
services.AddScoped<IDisposer, Disposer>();
+6
View File
@@ -16,6 +16,9 @@ public partial class WidgetButtonViewModel(IServiceFactory serviceFactory,
[ObservableProperty]
private IRelayCommand? click = command;
[ObservableProperty]
private bool enabled;
[ObservableProperty]
private string? icon = icon;
@@ -24,4 +27,7 @@ public partial class WidgetButtonViewModel(IServiceFactory serviceFactory,
[ObservableProperty]
private string? text = text;
[ObservableProperty]
private bool visible;
}
+1 -3
View File
@@ -1,6 +1,4 @@
using CommunityToolkit.Mvvm.ComponentModel;
namespace Hyperbar.Widget;
namespace Hyperbar.Widget;
public partial class WidgetComponentViewModel :
ObservableCollectionViewModel<IWidgetComponentViewModel>,
@@ -12,7 +12,6 @@ public class WidgetExtensionHandler(IProxyServiceCollection<IWidgetBuilder> type
if(notification.Value is WidgetExtension widgetExtension)
{
IWidgetBuilder builder = widgetExtension.Widget.Create();
builder.ConfigureServices(args =>
{
args.AddSingleton(widgetExtension.Assembly);
-17
View File
@@ -1,17 +0,0 @@
using Microsoft.Extensions.Hosting;
namespace Hyperbar.Widget;
public sealed class WidgetService(IEnumerable<IInitializer> initializers) :
IHostedService
{
public async Task StartAsync(CancellationToken cancellationToken)
{
foreach (IInitializer initializer in initializers)
{
await initializer.InitializeAsync();
}
}
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}