wip

Hyperbar.Windows/App.xaml

@@ -2,16 +2,12 @@
 <Application
     x:Class="Hyperbar.Windows.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ui="using:Hyperbar.UI.Windows">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
             </ResourceDictionary.MergedDictionaries>
-            <DataTemplate x:Key="DefaultDataTemplate">
-                <ui:ViewModelTemplatePresenter />
-            </DataTemplate>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

Hyperbar.Windows/ApplicationBarViewModel.cs

@@ -10,8 +10,9 @@ public partial class ApplicationBarViewModel :
     public ApplicationBarViewModel(IViewModelTemplate template, 
         IServiceProvider serviceProvider,
         IServiceFactory serviceFactory,
-        IMediator mediator, 
-        IDisposer disposer) : base(serviceProvider, serviceFactory, mediator, disposer)
+        IPublisher publisher,
+        ISubscriber subscriber,
+        IDisposer disposer) : base(serviceProvider, serviceFactory, publisher, subscriber, disposer)
     {
         Template = template;
 

Hyperbar.Windows/GeneralSettingsNavigationViewModel.cs

@@ -2,9 +2,10 @@
 
 public class GeneralSettingsNavigationViewModel(IServiceProvider serviceProvider,
     IServiceFactory serviceFactory,
-    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
     IDisposer disposer,
     string text) :
-    NavigationViewModel(serviceProvider, serviceFactory, mediator, disposer, text)
+    NavigationViewModel(serviceProvider, serviceFactory, publisher, subscriber, disposer, text)
 {
 }

Hyperbar.Windows/PrimaryViewModel.cs

@@ -7,10 +7,11 @@ namespace Hyperbar.Widget;
 public partial class PrimaryViewModel(IViewModelTemplate template, 
     IServiceProvider serviceProvider,
     IServiceFactory serviceFactory,
-    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
     IDisposer disposer,
     int index) :
-    ObservableCollectionViewModel<IWidgetViewModel>(serviceProvider, serviceFactory, mediator, disposer),
+    ObservableCollectionViewModel<IWidgetViewModel>(serviceProvider, serviceFactory, publisher, subscriber, disposer),
     IWidgetHostViewModel
 {
     [ObservableProperty]

Hyperbar.Windows/SecondaryViewModel.cs

@@ -13,9 +13,10 @@ public partial class SecondaryViewModel :
     public SecondaryViewModel(IViewModelTemplate template, 
         IServiceProvider serviceProvider,
         IServiceFactory serviceFactory,
-        IMediator mediator,
+        IPublisher publisher,
+        ISubscriber subscriber,
         IDisposer disposer,
-        int index) : base(serviceProvider, serviceFactory, mediator, disposer)
+        int index) : base(serviceProvider, serviceFactory, publisher, subscriber, disposer)
     {
         Template = template;
         this.index = index;

Hyperbar.Windows/SettingsButtonViewModel.cs

@@ -5,9 +5,9 @@ namespace Hyperbar.Windows;
 public partial class SettingsButtonViewModel(IViewModelTemplate template, 
     IServiceProvider serviceProvider,
     IServiceFactory serviceFactory,
-    IMediator mediator,
+    IPublisher publisher,
     IDisposer disposer) :
-    ObservableViewModel(serviceProvider, serviceFactory, mediator, disposer)
+    ObservableViewModel(serviceProvider, serviceFactory, publisher, disposer)
 {
     public IViewModelTemplate Template => template;
 }

Hyperbar.Windows/SettingsViewModel.cs

@@ -7,9 +7,10 @@ public partial class SettingsViewModel :
 {
     public SettingsViewModel(IViewModelTemplate template,
         IServiceProvider serviceProvider, 
-        IServiceFactory serviceFactory, 
-        IMediator mediator, 
-        IDisposer disposer) : base(serviceProvider, serviceFactory, mediator, disposer)
+        IServiceFactory serviceFactory,
+        IPublisher publisher,
+        ISubscriber subscriber,
+        IDisposer disposer) : base(serviceProvider, serviceFactory, publisher, subscriber, disposer)
     {
         Template = template;
 

Hyperbar.Windows/WidgetNavigationViewModel.cs

@@ -2,9 +2,10 @@
 
 public class WidgetNavigationViewModel(IServiceProvider serviceProvider,
     IServiceFactory serviceFactory,
-    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
     IDisposer disposer,
     string text) :
-    NavigationViewModel(serviceProvider, serviceFactory, mediator, disposer, text)
+    NavigationViewModel(serviceProvider, serviceFactory, publisher, subscriber, disposer, text)
 {
 }

Hyperbar.Windows/WidgetSettingsNavigationViewModel.cs

@@ -2,10 +2,11 @@
 
 public class WidgetSettingsNavigationViewModel(IServiceProvider serviceProvider,
     IServiceFactory serviceFactory,
-    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
     IDisposer disposer,
     string text) :
-    NavigationViewModel<WidgetNavigationViewModel>(serviceProvider, serviceFactory, mediator, disposer, text)
+    NavigationViewModel<WidgetNavigationViewModel>(serviceProvider, serviceFactory, publisher, subscriber, disposer, text)
 {
 
 }