dan/Hyperbar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A widget should have only one IWidgetViewModel by default... wondering whether if we should go for the first served, or throw if multiple detected, or ignore the widget

Browse Source
This commit is contained in:
TheXamlGuy
2024-01-30 22:30:08 +00:00
parent 215ff81653
commit 858a23c28d
14 changed files with 139 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hyperbar.Widget.Contextual.Windows/ContextualWidget.cs
+5 -2
View File
@@ -4,11 +4,14 @@ public class ContextualWidget :
IWidget
{
public IWidgetBuilder Create() =>
WidgetBuilder<ContextualWidgetConfiguration>.Configure(args =>
WidgetBuilder.Create()
.Configuration<ContextualWidgetConfiguration>(args =>
{
args.Name = "Contextual commands";
}).ConfigureServices(args =>
})
.UseViewModel<ContextualWidgetViewModel>()
.ConfigureServices(args =>
{
args.AddWidgetTemplate<ContextualWidgetViewModel>();
});
Hyperbar.Widget.MediaController.Windows/MediaControllerWidget.cs
+6 -4
View File
@@ -7,13 +7,15 @@ public class MediaControllerWidget :
IWidget
{
public IWidgetBuilder Create() =>
WidgetBuilder<MediaControllerWidgetConfiguration>.Configure(args =>
WidgetBuilder.Create()
.Configuration<MediaControllerWidgetConfiguration>(args =>
{
args.Name = "Media controller";
}).ConfigureServices(args =>
})
.UseViewModelTemplate<MediaControllerWidgetViewModel, MediaControllerWidgetView>()
.ConfigureServices(args =>
{
args.AddWidgetTemplate<MediaControllerWidgetViewModel, MediaControllerWidgetView>()
.AddSingleton<IInitializer, MediaControllerManager>()
args.AddSingleton<IInitializer, MediaControllerManager>()
.AddTransient<IServiceScopeFactory<MediaController>, ServiceScopeFactory<MediaController>>()
.AddTransient<IServiceScopeProvider<MediaController>, ServiceScopeProvider<MediaController>>()
.AddCache<MediaController, IServiceScope>()
Hyperbar.Widget.Primary.Windows/PrimaryWidget.cs
+2 -1
View File
@@ -7,7 +7,8 @@ public class PrimaryWidget :
IWidget
{
public IWidgetBuilder Create() =>
WidgetBuilder<PrimaryWidgetConfiguration>.Configure(args =>
WidgetBuilder.Create()
.Configuration<PrimaryWidgetConfiguration>(args =>
{
args.Name = "Primary commands";
args.Commands =
Hyperbar.Widget.Windows/IServiceCollectionExtensions.cs
+1 -4
View File
@@ -10,7 +10,7 @@ public static class IServiceCollectionExtensions
{
public static IServiceCollection AddWidgetWindows(this IServiceCollection services)
{
services.AddContentTemplate<WidgetBarViewModel, WidgetBarView>();
services.AddContentTemplate<WidgetViewModel, WidgetBarView>();
// We need to feed information to the Widgets about our Windows host,
// so the Windows host can make discussions how to display and interact with the widgets.
@@ -20,8 +20,6 @@ public static class IServiceCollectionExtensions
{
services.AddSingleton(provider.GetRequiredService<IList<IXamlMetadataProvider>>());
services.AddSingleton(provider.GetRequiredService<IDispatcher>());
services.AddTransient<IFactory<IWidgetHost, WidgetContainerViewModel?>,
WidgetContainerFactory>();
services.AddTransient<ITemplateFactory, TemplateFactory>();
@@ -35,7 +33,6 @@ public static class IServiceCollectionExtensions
services.AddTransient<IInitializer, WidgetResourceInitializer>();
services.AddTransient<IInitializer, WidgetXamlMetadataInitializer>();
services.AddContentTemplate<WidgetContainerViewModel, WidgetContainerView>();
services.AddContentTemplate<WidgetButtonViewModel, WidgetButtonView>();
services.AddContentTemplate<WidgetSplitButtonViewModel, WidgetSplitButtonView>();
}));
Hyperbar.Widget.Windows/WidgetContainerView.xaml
-35
View File
@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<UserControl
x:Class="Hyperbar.Widget.Windows.WidgetContainerView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:ui="using:Hyperbar.UI.Windows">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Rectangle
Width="1"
Height="40"
Margin="6,2,6,2"
Fill="Red" />
<ItemsControl
Grid.Column="1"
ItemTemplateSelector="{Binding Converter={ui:DataTemplateConverter}}"
ItemsSource="{Binding}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<interactivity:Interaction.Behaviors>
<interactions:EventTriggerBehavior EventName="Loaded">
<interactions:InvokeCommandAction Command="{Binding Initialize}" />
</interactions:EventTriggerBehavior>
</interactivity:Interaction.Behaviors>
</ItemsControl>
</Grid>
</UserControl>
Hyperbar.Widget.Windows/WidgetContainerView.xaml.cs
-9
View File
@@ -1,9 +0,0 @@
using Microsoft.UI.Xaml.Controls;
namespace Hyperbar.Widget.Windows;
public sealed partial class WidgetContainerView :
UserControl
{
public WidgetContainerView() => InitializeComponent();
}
Hyperbar.Widget/IWidgetBuilder.cs
+11 -7
View File
@@ -6,14 +6,18 @@ public interface IWidgetBuilder
{
IWidgetHost Build();
IWidgetBuilder ConfigureServices(Action<IServiceCollection> configureDelegate);
}
public interface IWidgetBuilder<TConfiguration> :
IWidgetBuilder
IWidgetBuilder Configuration<TConfiguration>(Action<TConfiguration> configurationDelegate)
where TConfiguration :
WidgetConfiguration,
new()
{
new();
IWidgetBuilder ConfigureServices(Action<IServiceCollection> configureDelegate);
IWidgetBuilder UseViewModel<TViewModel>()
where TViewModel :
IWidgetViewModel;
IWidgetBuilder UseViewModelTemplate<TViewModel, TTemplate>()
where TViewModel :
IWidgetViewModel;
}
Hyperbar.Widget/WidgetBarViewModel.cs
+3 -3
View File
@@ -1,11 +1,11 @@
namespace Hyperbar.Widget;
[NotificationHandler(nameof(WidgetBarViewModel))]
public partial class WidgetBarViewModel(ITemplateFactory templateFactory,
[NotificationHandler(nameof(WidgetViewModel))]
public partial class WidgetViewModel(ITemplateFactory templateFactory,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer) :
ObservableCollectionViewModel<WidgetContainerViewModel>(serviceFactory, mediator, disposer),
ObservableCollectionViewModel<IWidgetViewModel>(serviceFactory, mediator, disposer),
ITemplatedViewModel
{
public ITemplateFactory TemplateFactory => templateFactory;
Hyperbar.Widget/WidgetBuilder.cs
+47 -19
View File
@@ -5,13 +5,14 @@ using System.Reflection;
namespace Hyperbar.Widget;
public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
IWidgetBuilder<TConfiguration>
where TConfiguration :
WidgetConfiguration,
new()
public class WidgetBuilder :
IWidgetBuilder
{
private readonly IHostBuilder hostBuilder = new HostBuilder()
private readonly IHostBuilder hostBuilder;
private WidgetBuilder()
{
hostBuilder = new HostBuilder()
.UseContentRoot(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
Assembly.GetEntryAssembly()?.GetName().Name!), true)
.ConfigureAppConfiguration(config =>
@@ -21,31 +22,46 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
.ConfigureServices((context, services) =>
{
services.AddSingleton<IWidgetHost, WidgetHost>();
services.AddScoped<IServiceFactory>(provider =>
new ServiceFactory((type, parameters) =>
ActivatorUtilities.CreateInstance(provider, type, parameters!)));
services.AddScoped<IMediator, Mediator>();
services.AddScoped<IDisposer, Disposer>();
services.AddSingleton<IValue<WidgetAvailability>, Value<WidgetAvailability>>();
});
}
services.AddSingleton<IValue<WidgetAvailability>,
Value<WidgetAvailability>>();
public static IWidgetBuilder Create() => new WidgetBuilder();
public IWidgetBuilder Configuration<TConfiguration>(Action<TConfiguration> configurationDelegate)
where TConfiguration :
WidgetConfiguration,
new()
{
TConfiguration configuration = new TConfiguration();
configurationDelegate(configuration);
hostBuilder.ConfigureServices(services =>
{
services.AddHandler<WidgetConfigurationHandler>();
services.AddConfiguration<WidgetConfiguration>(section: configuration.GetType().Name,
configuration: configuration);
services.AddConfiguration<WidgetConfiguration>(section: configuration.GetType().Name, configuration: configuration);
services.AddConfiguration(configuration);
});
public static IWidgetBuilder Configure(Action<TConfiguration> configurationDelegate)
{
TConfiguration configuration = new();
configurationDelegate(configuration);
return new WidgetBuilder<TConfiguration>(configuration);
return this;
}
public IWidgetBuilder UseViewModelTemplate<TWidgetContent, TWidgetTemplate>()
where TWidgetContent :
IWidgetViewModel
{
hostBuilder.ConfigureServices(services =>
{
services.AddWidgetTemplate<TWidgetContent, TWidgetTemplate>();
});
return this;
}
public IWidgetHost Build()
{
IHost host = hostBuilder.Build();
@@ -54,7 +70,19 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
public IWidgetBuilder ConfigureServices(Action<IServiceCollection> configureDelegate)
{
hostBuilder.ConfigureServices(configureDelegate.Invoke);
hostBuilder.ConfigureServices(configureDelegate);
return this;
}
public IWidgetBuilder UseViewModel<TViewModel>()
where TViewModel :
IWidgetViewModel
{
hostBuilder.ConfigureServices(services =>
{
services.AddWidgetTemplate<TViewModel>();
});
return this;
}
}
Hyperbar.Widget/WidgetContainerFactory.cs
-10
View File
@@ -1,10 +0,0 @@
namespace Hyperbar.Widget;
public class WidgetContainerFactory(IServiceFactory factory) :
IFactory<IWidgetHost, WidgetContainerViewModel?>
{
public WidgetContainerViewModel? Create(IWidgetHost value)
{
return factory.Create<WidgetContainerViewModel>(value.Configuration.Id);
}
}
Hyperbar.Widget/WidgetContainerViewModel.cs
-19
View File
@@ -1,19 +0,0 @@
using CommunityToolkit.Mvvm.ComponentModel;
namespace Hyperbar.Widget;
[NotificationHandler(nameof(WidgetContainerViewModel))]
public partial class WidgetContainerViewModel(ITemplateFactory templateFactory,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
Guid id) :
ObservableCollectionViewModel<IWidgetViewModel>(serviceFactory, mediator, disposer),
ITemplatedViewModel
{
[ObservableProperty]
private Guid id = id;
public ITemplateFactory TemplateFactory => templateFactory;
}
Hyperbar.Widget/WidgetHostHandler.cs
+3 -6
View File
@@ -11,13 +11,10 @@ public class WidgetHostHandler(IMediator mediator) :
{
if (notification.Value is IWidgetHost host)
{
if (host.Services.GetRequiredService<IFactory<IWidgetHost, WidgetContainerViewModel?>>() is { } factory)
if (host.Services.GetService<IWidgetViewModel>() is IWidgetViewModel viewModel)
{
if (factory.Create(host) is WidgetContainerViewModel containerViewModel)
{
await mediator.PublishAsync(new Created<WidgetContainerViewModel>(containerViewModel),
nameof(WidgetBarViewModel), cancellationToken);
}
await mediator.PublishAsync(new Created<IWidgetViewModel>(viewModel),
nameof(WidgetViewModel), cancellationToken);
}
}
}
Hyperbar.Widget/WidgetViewModelEnumerator.cs
+1 -1
View File
@@ -14,7 +14,7 @@ public class WidgetViewModelEnumerator(IWidgetHost host,
foreach (IWidgetViewModel viewModel in viewModels)
{
await mediator.PublishAsync(new Created<IWidgetViewModel>(viewModel),
nameof(WidgetContainerViewModel), cancellationToken);
nameof(WidgetViewModel), cancellationToken);
}
}
}
Hyperbar.Windows/Lifecycles/AppInitializer.cs
+2 -2
View File
@@ -5,8 +5,8 @@ using Microsoft.Extensions.DependencyInjection;
namespace Hyperbar.Windows;
public class AppInitializer([FromKeyedServices(nameof(WidgetBarViewModel))] WidgetBarView view,
[FromKeyedServices(nameof(WidgetBarViewModel))] WidgetBarViewModel viewModel,
public class AppInitializer([FromKeyedServices(nameof(WidgetViewModel))] WidgetBarView view,
[FromKeyedServices(nameof(WidgetViewModel))] WidgetViewModel viewModel,
DesktopBar desktopFlyout,
AppConfiguration configuration) :
IInitializer