wrapped custom widget items in containers so we have more control of the surrounding, i.e. divider

Hyperbar.Windows/Views/CommandView.xaml.cs

@@ -1,15 +0,0 @@
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-
-namespace Hyperbar.Windows;
-
-public sealed partial class CommandView :
-    UserControl
-{
-    public CommandView() => InitializeComponent();
-
-    protected override void OnKeyDown(KeyRoutedEventArgs e)
-    {
-        base.OnKeyDown(e);
-    }
-}

Hyperbar.Windows/Views/CommandViewModel.cs

@@ -1,17 +0,0 @@
-
-namespace Hyperbar.Windows;
-
-public partial class CommandViewModel :
-    ObservableCollectionViewModel<IWidgetViewModel>,
-    ITemplatedViewModel
-{
-    public CommandViewModel(ITemplateFactory templateFactory, 
-        IServiceFactory serviceFactory,
-        IMediator mediator,
-        IEnumerable<IWidgetViewModel> items) : base(serviceFactory, mediator, items)
-    {
-        TemplateFactory = templateFactory;
-    }
-
-    public ITemplateFactory TemplateFactory { get; }
-}

Hyperbar.Windows/Views/WidgetBarView.xaml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <UserControl
-    x:Class="Hyperbar.Windows.CommandView"
+    x:Class="Hyperbar.Windows.WidgetBarView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:windows="using:Hyperbar.Windows">
-    <ItemsControl ItemTemplateSelector="{Binding Mode=TwoWay, Converter={windows:DataTemplateConverter}}" ItemsSource="{Binding}">
+    xmlns:ui="using:Hyperbar.Windows.UI">
+    <ItemsControl ItemTemplateSelector="{Binding Converter={ui:DataTemplateConverter}}" ItemsSource="{Binding}">
         <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" />

Hyperbar.Windows/Views/WidgetBarView.xaml.cs

@@ -0,0 +1,9 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Hyperbar.Windows;
+
+public sealed partial class WidgetBarView :
+    UserControl
+{
+    public WidgetBarView() => InitializeComponent();
+}

Hyperbar.Windows/Views/WidgetContainerView.xaml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Hyperbar.Windows.WidgetContainerView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="using:Hyperbar.Windows.UI">
+    <ItemsControl ItemTemplateSelector="{Binding Converter={ui:DataTemplateConverter}}" ItemsSource="{Binding}">
+        <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+                <StackPanel Orientation="Horizontal" />
+            </ItemsPanelTemplate>
+        </ItemsControl.ItemsPanel>
+    </ItemsControl>
+</UserControl>

Hyperbar.Windows/Views/WidgetContainerView.xaml.cs

@@ -0,0 +1,9 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Hyperbar.Windows;
+
+public sealed partial class WidgetContainerView : 
+    UserControl
+{
+    public WidgetContainerView() => InitializeComponent();
+}

Hyperbar.Windows/Views/WidgetView.xaml

@@ -3,8 +3,8 @@
     x:Class="Hyperbar.Windows.WidgetView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:windows="using:Hyperbar.Windows">
-    <ItemsControl ItemTemplateSelector="{Binding Mode=TwoWay, Converter={windows:DataTemplateConverter}}" ItemsSource="{Binding}">
+    xmlns:ui="using:Hyperbar.Windows.UI">
+    <ItemsControl ItemTemplateSelector="{Binding Converter={ui:DataTemplateConverter}}" ItemsSource="{Binding}">
         <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" Spacing="8" />