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

lots of tidying up

Browse Source
This commit is contained in:
TheXamlGuy
2024-01-25 20:33:55 +00:00
parent 5e26e97f6b
commit a322893166
20 changed files with 115 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hyperbar.Widget/IServiceCollectionExtensions.cs
+1 -3
View File
@@ -10,13 +10,11 @@ public static class IServiceCollectionExtensions
services.AddTransient<IInitializer, WidgetInitializer>();
services.AddTransient<IFactory<Type, IWidget>, WidgetFactory>();
services.AddHandler<WidgetEnumeratorHandler>();
services.AddHandler<WidgetEnumerator>();
services.AddHandler<WidgetAssemblyHandler>();
services.AddHandler<WidgetHandler>();
services.AddHandler<WidgetHostHandler>();
services.AddTransient<IFactory<IWidgetHost, WidgetContainerViewModel?>, WidgetContainerFactory>();
return services;
}
Hyperbar.Widget/WidgetBuilder.cs
+3 -2
View File
@@ -20,6 +20,8 @@ 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!)));
@@ -50,8 +52,7 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
public IWidgetHost Build()
{
IHost host = hostBuilder.Build();
return (IWidgetHost)ActivatorUtilities.CreateInstance(host.Services,
typeof(WidgetHost), host);
return host.Services.GetRequiredService<IWidgetHost>();
}
public IWidgetBuilder ConfigureServices(Action<IServiceCollection> configureDelegate)
Hyperbar.Widget/WidgetContainerFactory.cs
+1 -8
View File
@@ -1,17 +1,10 @@
using Microsoft.Extensions.DependencyInjection;
namespace Hyperbar.Widget;
namespace Hyperbar.Widget;
public class WidgetContainerFactory(IServiceFactory factory) :
IFactory<IWidgetHost, WidgetContainerViewModel?>
{
public WidgetContainerViewModel? Create(IWidgetHost value)
{
if (value.Services.GetServices<IWidgetViewModel>() is
IEnumerable<IWidgetViewModel> viewModels)
{
return factory.Create<WidgetContainerViewModel>(value.Configuration.Id);
}
return default;
}
}
Hyperbar.Widget/WidgetContainerViewModel.cs
+1
View File
@@ -3,6 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
namespace Hyperbar.Widget;
[NotificationHandler(nameof(WidgetContainerViewModel))]
public partial class WidgetContainerViewModel(ITemplateFactory templateFactory,
IServiceFactory serviceFactory,
IMediator mediator,
Hyperbar.Widget/WidgetEnumeratorHandler.cs → Hyperbar.Widget/WidgetEnumerator.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using System.Runtime.Loader;
namespace Hyperbar.Widget;
public class WidgetEnumeratorHandler(IHostEnvironment hostEnvironment,
public class WidgetEnumerator(IHostEnvironment hostEnvironment,
IMediator mediator) :
INotificationHandler<Enumerate<IWidget>>
{
Hyperbar.Widget/WidgetHost.cs
+5 -6
View File
@@ -1,5 +1,4 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
namespace Hyperbar.Widget;
@@ -8,18 +7,18 @@ public class WidgetHost :
IWidgetHost
{
private readonly IConfigurationInitializer<WidgetConfiguration> configurationInitializer;
private readonly IHost host;
private readonly IServiceProvider services;
private readonly IEnumerable<IInitializer> initializers;
private readonly IMediator mediator;
private readonly IProxyService<IMediator> proxyMediator;
public WidgetHost(IHost host,
public WidgetHost(IServiceProvider services,
IMediator mediator,
IEnumerable<IInitializer> initializers,
IProxyService<IMediator> proxyMediator,
IConfigurationInitializer<WidgetConfiguration> configurationInitializer)
{
this.host = host;
this.services = services;
this.mediator = mediator;
this.initializers = initializers;
this.proxyMediator = proxyMediator;
@@ -28,9 +27,9 @@ public class WidgetHost :
mediator.Subscribe(this);
}
public WidgetConfiguration Configuration => host.Services.GetRequiredService<WidgetConfiguration>();
public WidgetConfiguration Configuration => services.GetRequiredService<WidgetConfiguration>();
public IServiceProvider Services => host.Services;
public IServiceProvider Services => services;
public async Task Handle(Changed<WidgetAvailability> notification,
CancellationToken cancellationToken)
Hyperbar.Widget/WidgetHostHandler.cs
+7 -3
View File
@@ -1,7 +1,8 @@
namespace Hyperbar.Widget;
using Microsoft.Extensions.DependencyInjection;
public class WidgetHostHandler(IMediator mediator,
IFactory<IWidgetHost, WidgetContainerViewModel?> factory) :
namespace Hyperbar.Widget;
public class WidgetHostHandler(IMediator mediator) :
INotificationHandler<Started<IWidgetHost>>,
INotificationHandler<Stopped<IWidgetHost>>
{
@@ -9,6 +10,8 @@ public class WidgetHostHandler(IMediator mediator,
CancellationToken cancellationToken)
{
if (notification.Value is IWidgetHost host)
{
if (host.Services.GetRequiredService<IFactory<IWidgetHost, WidgetContainerViewModel?>>() is { } factory)
{
if (factory.Create(host) is WidgetContainerViewModel containerViewModel)
{
@@ -17,6 +20,7 @@ public class WidgetHostHandler(IMediator mediator,
}
}
}
}
public Task Handle(Stopped<IWidgetHost> notification,
CancellationToken cancellationToken)
Hyperbar.Widget/WidgetViewModelEnumerator.cs
+14 -4
View File
@@ -1,11 +1,21 @@
namespace Hyperbar.Widget;
using Microsoft.Extensions.DependencyInjection;
public class WidgetViewModelEnumerator :
namespace Hyperbar.Widget;
public class WidgetViewModelEnumerator(IWidgetHost host,
IMediator mediator) :
INotificationHandler<Enumerate<IWidgetViewModel>>
{
public Task Handle(Enumerate<IWidgetViewModel> notification,
public async Task Handle(Enumerate<IWidgetViewModel> notification,
CancellationToken cancellationToken)
{
throw new NotImplementedException();
if (host.Services.GetServices<IWidgetViewModel>() is IEnumerable<IWidgetViewModel> viewModels)
{
foreach (IWidgetViewModel viewModel in viewModels)
{
await mediator.PublishAsync(new Created<IWidgetViewModel>(viewModel),
nameof(WidgetContainerViewModel), cancellationToken);
}
}
}
}
Hyperbar.Windows.MediaController/Views/MediaInformationViewModel.cs
+1 -6
View File
@@ -1,7 +1,5 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Hyperbar.Widget;
using System.Windows.Input;
namespace Hyperbar.Windows.MediaController;
@@ -19,9 +17,6 @@ public partial class MediaInformationViewModel(IServiceFactory serviceFactory,
[ObservableProperty]
private string? title;
public ICommand Initialize =>
new AsyncRelayCommand(InitializeAsync);
public Task Handle(Changed<MediaInformation> notification,
CancellationToken cancellationToken)
{
@@ -34,6 +29,6 @@ public partial class MediaInformationViewModel(IServiceFactory serviceFactory,
return Task.CompletedTask;
}
public async Task InitializeAsync() =>
public override async Task InitializeAsync() =>
await Mediator.PublishAsync<Request<MediaInformation>>();
}
Hyperbar.Windows.Primary/PrimaryWidget.cs
+1 -1
View File
@@ -27,8 +27,8 @@ public class PrimaryWidget :
.AddCache<Guid, IWidgetComponentViewModel>()
.AddTransient<IProvider<PrimaryCommandConfiguration, IWidgetComponentViewModel?>, WidgetComponentProvider>()
.AddTransient<IFactory<PrimaryCommandConfiguration, IWidgetComponentViewModel?>, WidgetComponentFactory>()
.AddTransient<IEnumerator<IWidgetComponentViewModel>, WidgetComponentEnumerationHandler>()
.AddWidgetTemplate<PrimaryWidgetViewModel>()
.AddHandler<WidgetComponentViewModelEnumerator>()
.AddHandler<PrimaryWidgetConfigurationHandler>();
});
}
Hyperbar.Windows.Primary/PrimaryWidgetViewModel.cs
+2 -3
View File
@@ -6,9 +6,8 @@ namespace Hyperbar.Windows.Primary;
public class PrimaryWidgetViewModel(ITemplateFactory templateFactory,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
IEnumerator<IWidgetComponentViewModel> enumerator) :
ObservableCollectionViewModel<IWidgetComponentViewModel>(serviceFactory, mediator, disposer, enumerator),
IDisposer disposer) :
ObservableCollectionViewModel<IWidgetComponentViewModel>(serviceFactory, mediator, disposer),
IWidgetViewModel,
ITemplatedViewModel
{
Hyperbar.Windows.Primary/WidgetComponentEnumerationHandler.cs → Hyperbar.Windows.Primary/WidgetComponentViewModelEnumerator.cs
+9 -4
View File
@@ -2,12 +2,13 @@
namespace Hyperbar.Windows.Primary;
public class WidgetComponentEnumerationHandler(PrimaryWidgetConfiguration configuration,
public class WidgetComponentViewModelEnumerator(PrimaryWidgetConfiguration configuration,
IMediator mediator,
IFactory<PrimaryCommandConfiguration, IWidgetComponentViewModel?> factory,
ICache<(Guid ParentId, Guid Id), PrimaryCommandConfiguration> cache) :
IEnumerator<IWidgetComponentViewModel>
INotificationHandler<Enumerate<IWidgetComponentViewModel>>
{
public IEnumerable<IWidgetComponentViewModel?> Get()
public async Task Handle(Enumerate<IWidgetComponentViewModel> notification, CancellationToken cancellationToken)
{
Stack<(Guid, List<PrimaryCommandConfiguration>)> stack = new();
stack.Push((Guid.Empty, configuration.Commands));
@@ -27,7 +28,11 @@ public class WidgetComponentEnumerationHandler(PrimaryWidgetConfiguration config
foreach (PrimaryCommandConfiguration item in configuration.Commands.OrderBy(x => x.Order))
{
yield return factory.Create(item);
if (factory.Create(item) is IWidgetComponentViewModel viewModel)
{
await mediator.PublishAsync(new Created<IWidgetComponentViewModel>(viewModel), nameof(PrimaryWidgetViewModel),
cancellationToken);
}
}
}
}
Hyperbar.Windows/App.xaml.cs
+13 -7
View File
@@ -6,6 +6,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using System;
using System.Reflection;
@@ -21,7 +22,6 @@ public partial class App :
protected override async void OnLaunched(LaunchActivatedEventArgs args)
{
base.OnLaunched(args);
IHost? host = new HostBuilder()
.UseContentRoot(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
Assembly.GetEntryAssembly()?.GetName().Name!), true)
@@ -32,10 +32,10 @@ public partial class App :
.ConfigureServices((context, services) =>
{
services.AddDefault();
services.AddWidget();
services.AddHostedService<AppService>();
services.AddSingleton<IDispatcher, Dispatcher>();
services.AddSingleton<IDispatcher>(new Dispatcher(DispatcherQueue.GetForCurrentThread()));
services.AddTransient<ITemplateFactory, TemplateFactory>();
services.AddHandler<AppConfigurationChangedHandler>();
@@ -48,20 +48,26 @@ public partial class App :
services.AddSingleton<DesktopBar>();
services.AddContentTemplate<WidgetBarViewModel, WidgetBarView>();
services.AddContentTemplate<WidgetContainerViewModel, WidgetContainerView>();
services.AddTransient<IProxyServiceCollection<IWidgetBuilder>>(provider =>
new ProxyServiceCollection<IWidgetBuilder>(services =>
{
services.AddSingleton<IDispatcher, Dispatcher>();
services.AddTransient<ITemplateFactory, TemplateFactory>();
services.AddScoped<IVirtualKeyboard, VirtualKeyboard>();
services.AddSingleton<IDispatcher>(new Dispatcher(DispatcherQueue.GetForCurrentThread()));
services.AddTransient<IFactory<IWidgetHost, WidgetContainerViewModel?>,
WidgetContainerFactory>();
services.AddTransient<ITemplateFactory, TemplateFactory>();
services.AddScoped<IVirtualKeyboard, VirtualKeyboard>();
services.AddHandler<KeyAcceleratorHandler>();
services.AddHandler<StartProcessHandler>();
services.AddHandler<WidgetViewModelEnumerator>();
services.AddTransient<IWidgetView, WidgetView>();
services.AddContentTemplate<WidgetContainerViewModel, WidgetContainerView>();
services.AddContentTemplate<WidgetButtonViewModel, WidgetButtonView>();
services.AddContentTemplate<WidgetSplitButtonViewModel, WidgetSplitButtonView>();
}));
Hyperbar.Windows/Lifecycles/Dispatcher.cs
+3 -6
View File
@@ -3,12 +3,9 @@ using Microsoft.UI.Dispatching;
namespace Hyperbar.Windows;
public class Dispatcher :
public class Dispatcher(DispatcherQueue dispatcherQueue) :
IDispatcher
{
private DispatcherQueue dispatcherQueue;
public Dispatcher() => dispatcherQueue = DispatcherQueue.GetForCurrentThread();
public async Task InvokeAsync(Action action) => await dispatcherQueue.EnqueueAsync(action.Invoke);
public async Task InvokeAsync(Action action) =>
await dispatcherQueue.EnqueueAsync(action.Invoke);
}
Hyperbar.Windows/Views/WidgetContainerView.xaml
+8 -1
View File
@@ -3,6 +3,8 @@
x:Class="Hyperbar.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.Windows.UI">
<Grid>
<Grid.ColumnDefinitions>
@@ -10,7 +12,7 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Rectangle
Width="10"
Width="1"
Height="40"
Margin="6,2,6,2"
Fill="Red" />
@@ -23,6 +25,11 @@
<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.Windows/Views/WidgetView.xaml
+10 -1
View File
@@ -3,8 +3,11 @@
x:Class="Hyperbar.Windows.WidgetView"
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.Windows.UI">
<ItemsControl ItemTemplateSelector="{Binding Converter={ui:DataTemplateConverter}}" ItemsSource="{Binding}">
<Grid>
<ItemsControl ItemTemplateSelector="{Binding Converter={ui:DataTemplateConverter}}" ItemsSource="{Binding Mode=TwoWay}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" Spacing="8" />
@@ -15,5 +18,11 @@
<AddDeleteThemeTransition />
</TransitionCollection>
</ItemsControl.ItemContainerTransitions>
<interactivity:Interaction.Behaviors>
<interactions:EventTriggerBehavior EventName="Loaded">
<interactions:InvokeCommandAction Command="{Binding Initialize}" />
</interactions:EventTriggerBehavior>
</interactivity:Interaction.Behaviors>
</ItemsControl>
</Grid>
</UserControl>
Hyperbar/Configuration/ConfigurationInitializer.cs
-8
View File
@@ -9,16 +9,8 @@ public class ConfigurationInitializer<TConfiguration>(IConfigurationMonitor<TCon
where TConfiguration :
class
{
public bool isInitilized;
public async Task InitializeAsync()
{
if (isInitilized)
{
return;
}
isInitilized = true;
if (!reader.TryRead(out TConfiguration? _))
{
if (factory.Create() is object defaultConfiguration)
Hyperbar/Lifecycles/ObservableCollectionViewModel.cs
+12 -34
View File
@@ -1,8 +1,10 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using System.Collections;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Reactive.Disposables;
using System.Windows.Input;
namespace Hyperbar;
@@ -17,8 +19,7 @@ public partial class ObservableCollectionViewModel<TItem> :
where TItem :
IDisposable
{
public ObservableCollection<TItem> collection = [];
private readonly IEnumerator<TItem>? enumerator;
private readonly ObservableCollection<TItem> collection = new();
public ObservableCollectionViewModel(IServiceFactory serviceFactory,
IMediator mediator,
@@ -33,33 +34,6 @@ public partial class ObservableCollectionViewModel<TItem> :
collection.CollectionChanged += OnCollectionChanged;
}
public ObservableCollectionViewModel(IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
IEnumerator<TItem> enumerator)
{
ServiceFactory = serviceFactory;
Mediator = mediator;
Disposer = disposer;
this.enumerator = enumerator;
mediator.Subscribe(this);
collection.CollectionChanged += OnCollectionChanged;
if (enumerator is not null)
{
foreach (TItem? item in enumerator.Get())
{
if (item is not null)
{
Add(item);
}
}
}
}
public ObservableCollectionViewModel(IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
@@ -80,6 +54,9 @@ public partial class ObservableCollectionViewModel<TItem> :
public int Count => collection.Count;
public ICommand Initialize =>
new AsyncRelayCommand(InitializeAsync);
bool IList.IsFixedSize => false;
bool ICollection<TItem>.IsReadOnly => false;
@@ -101,10 +78,7 @@ public partial class ObservableCollectionViewModel<TItem> :
public TItem this[int index]
{
get => collection[index];
set
{
SetItem(index, value);
}
set => SetItem(index, value);
}
object? IList.this[int index]
@@ -199,7 +173,8 @@ public partial class ObservableCollectionViewModel<TItem> :
void ICollection.CopyTo(Array array, int index) =>
collection.CopyTo((TItem[])array, index);
public void Dispose() => Disposer.Dispose(this);
public void Dispose() =>
Disposer.Dispose(this);
public System.Collections.Generic.IEnumerator<TItem> GetEnumerator() =>
collection.GetEnumerator();
@@ -267,6 +242,9 @@ public partial class ObservableCollectionViewModel<TItem> :
IsCompatibleObject(value) ?
IndexOf((TItem)value!) : -1;
public virtual async Task InitializeAsync() =>
await Mediator.PublishAsync<Enumerate<TItem>>();
public void Insert(int index, TItem item) =>
InsertItem(index, item);
Hyperbar/Lifecycles/ObservableViewModel.cs
+1 -3
View File
@@ -2,9 +2,7 @@
namespace Hyperbar;
public class ObservableViewModel(IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer) :
public class ObservableViewModel(IDisposer disposer) :
ObservableObject,
IDisposable
{