From e0a630f82b8a801db420ef77f7c2760032d5a36f Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Sun, 4 Feb 2024 15:06:17 +0000
Subject: [PATCH] Wire up secondary commands for settings etc

---
 .../MediaButtonView.xaml                      |  8 +++---
 Hyperbar.Windows/App.xaml.cs                  |  2 ++
 Hyperbar.Windows/ApplicationBarView.xaml      | 13 +++++++++-
 Hyperbar.Windows/Hyperbar.Windows.csproj      |  6 +++++
 Hyperbar.Windows/SecondaryView.xaml           | 19 +++++++-------
 Hyperbar.Windows/SecondaryViewModel.cs        | 25 +++++++++++++------
 Hyperbar.Windows/SettingsButtonView.xaml      |  7 ++++++
 Hyperbar.Windows/SettingsButtonView.xaml.cs   | 10 ++++++++
 Hyperbar.Windows/SettingsButtonViewModel.cs   | 11 ++++++++
 Hyperbar/Lifecycles/ObservableViewModel.cs    |  8 +++++-
 10 files changed, 85 insertions(+), 24 deletions(-)
 create mode 100644 Hyperbar.Windows/SettingsButtonView.xaml
 create mode 100644 Hyperbar.Windows/SettingsButtonView.xaml.cs
 create mode 100644 Hyperbar.Windows/SettingsButtonViewModel.cs

diff --git a/Hyperbar.Widget.MediaController.Windows/MediaButtonView.xaml b/Hyperbar.Widget.MediaController.Windows/MediaButtonView.xaml
index 8a88320..a7f6759 100644
--- a/Hyperbar.Widget.MediaController.Windows/MediaButtonView.xaml
+++ b/Hyperbar.Widget.MediaController.Windows/MediaButtonView.xaml
@@ -19,11 +19,11 @@
     </UserControl.Resources>
     <Button
         x:Name="Button"
-        Width="{StaticResource ButtonWidth}"
-        Height="{StaticResource ButtonHeight}"
-        Padding="{StaticResource ButtonPadding}"
+        Width="{ThemeResource ButtonWidth}"
+        Height="{ThemeResource ButtonHeight}"
+        Padding="{ThemeResource ButtonPadding}"
         Command="{x:Bind ViewModel.InvokeCommand}"
-        FontFamily="{StaticResource SymbolThemeFontFamily}"
+        FontFamily="{ThemeResource SymbolThemeFontFamily}"
         FontSize="16"
         IsEnabled="False">
         <interactivity:Interaction.Behaviors>
diff --git a/Hyperbar.Windows/App.xaml.cs b/Hyperbar.Windows/App.xaml.cs
index 24af633..9eb8074 100644
--- a/Hyperbar.Windows/App.xaml.cs
+++ b/Hyperbar.Windows/App.xaml.cs
@@ -51,6 +51,8 @@ public partial class App :
                 services.AddContentTemplate<PrimaryViewModel, PrimaryView>();
                 services.AddContentTemplate<SecondaryViewModel, SecondaryView>();
 
+                services.AddContentTemplate<SettingsButtonViewModel, SettingsButtonView>();
+
                 services.AddTransient<IInitializer, AppInitializer>();
             })
         .Build();
diff --git a/Hyperbar.Windows/ApplicationBarView.xaml b/Hyperbar.Windows/ApplicationBarView.xaml
index d54d8cf..e9fd547 100644
--- a/Hyperbar.Windows/ApplicationBarView.xaml
+++ b/Hyperbar.Windows/ApplicationBarView.xaml
@@ -4,13 +4,24 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:windows="using:Hyperbar.UI.Windows">
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="ButtonBackground" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBorderBrush" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBackgroundDisabled" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="Transparent" />
+        <Thickness x:Key="ButtonPadding">0</Thickness>
+        <x:Double x:Key="ButtonWidth">40</x:Double>
+        <x:Double x:Key="ButtonHeight">40</x:Double>
+    </UserControl.Resources>
     <ItemsControl ItemTemplateSelector="{Binding Converter={windows:DataTemplateConverter}}" ItemsSource="{Binding}">
         <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="400" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                 </Grid>
             </ItemsPanelTemplate>
diff --git a/Hyperbar.Windows/Hyperbar.Windows.csproj b/Hyperbar.Windows/Hyperbar.Windows.csproj
index 19536b3..a276e2a 100644
--- a/Hyperbar.Windows/Hyperbar.Windows.csproj
+++ b/Hyperbar.Windows/Hyperbar.Windows.csproj
@@ -17,6 +17,7 @@
 	  <None Remove="ApplicationBarView.xaml" />
 	  <None Remove="PrimaryView.xaml" />
 	  <None Remove="SecondaryView.xaml" />
+	  <None Remove="SettingsButtonView.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Include="Assets\SplashScreen.scale-200.png" />
@@ -53,6 +54,11 @@
 		<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
 		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="SettingsButtonView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="SecondaryView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
diff --git a/Hyperbar.Windows/SecondaryView.xaml b/Hyperbar.Windows/SecondaryView.xaml
index 87ccd0e..c3ed12b 100644
--- a/Hyperbar.Windows/SecondaryView.xaml
+++ b/Hyperbar.Windows/SecondaryView.xaml
@@ -4,14 +4,13 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:windows="using:Hyperbar.UI.Windows">
-    <ItemsControl
-        HorizontalAlignment="Center"
-        ItemTemplateSelector="{Binding Converter={windows:DataTemplateConverter}}"
-        ItemsSource="{Binding}">
-        <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-                <ItemsStackPanel Orientation="Horizontal" />
-            </ItemsPanelTemplate>
-        </ItemsControl.ItemsPanel>
-    </ItemsControl>
+    <Grid Width="300" Background="red">
+        <ItemsControl ItemTemplateSelector="{Binding Converter={windows:DataTemplateConverter}}" ItemsSource="{Binding}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <ItemsStackPanel Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </Grid>
 </UserControl>
diff --git a/Hyperbar.Windows/SecondaryViewModel.cs b/Hyperbar.Windows/SecondaryViewModel.cs
index a8beb69..7c81b46 100644
--- a/Hyperbar.Windows/SecondaryViewModel.cs
+++ b/Hyperbar.Windows/SecondaryViewModel.cs
@@ -1,17 +1,26 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using Hyperbar.Windows;
 
 namespace Hyperbar.Widget;
 
-public partial class SecondaryViewModel(ITemplateFactory templateFactory,
-    IServiceFactory serviceFactory,
-    IMediator mediator,
-    IDisposer disposer,
-    int index) :
-    ObservableCollectionViewModel<IDisposable>(serviceFactory, mediator, disposer),
+public partial class SecondaryViewModel :
+    ObservableCollectionViewModel<IDisposable>,
     ITemplatedViewModel
 {
     [ObservableProperty]
-    private int index = index;
+    private int index;
 
-    public ITemplateFactory TemplateFactory => templateFactory;
+    public SecondaryViewModel(ITemplateFactory templateFactory,
+        IServiceFactory serviceFactory,
+        IMediator mediator,
+        IDisposer disposer,
+        int index) : base(serviceFactory, mediator, disposer)
+    {
+        this.index = index;
+        this.TemplateFactory = templateFactory;
+
+        Add<SettingsButtonViewModel>();
+    }
+
+    public ITemplateFactory TemplateFactory { get; }
 }
\ No newline at end of file
diff --git a/Hyperbar.Windows/SettingsButtonView.xaml b/Hyperbar.Windows/SettingsButtonView.xaml
new file mode 100644
index 0000000..134ca6d
--- /dev/null
+++ b/Hyperbar.Windows/SettingsButtonView.xaml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Hyperbar.Windows.SettingsButtonView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Button Content="dfffffff" />
+</UserControl>
diff --git a/Hyperbar.Windows/SettingsButtonView.xaml.cs b/Hyperbar.Windows/SettingsButtonView.xaml.cs
new file mode 100644
index 0000000..e8e3380
--- /dev/null
+++ b/Hyperbar.Windows/SettingsButtonView.xaml.cs
@@ -0,0 +1,10 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Hyperbar.Windows;
+
+public sealed partial class SettingsButtonView : 
+    UserControl
+{
+    public SettingsButtonView() => 
+        this.InitializeComponent();
+}
diff --git a/Hyperbar.Windows/SettingsButtonViewModel.cs b/Hyperbar.Windows/SettingsButtonViewModel.cs
new file mode 100644
index 0000000..3e734ae
--- /dev/null
+++ b/Hyperbar.Windows/SettingsButtonViewModel.cs
@@ -0,0 +1,11 @@
+namespace Hyperbar.Windows;
+
+public class SettingsButtonViewModel(ITemplateFactory templateFactory,
+    IServiceFactory serviceFactory,
+    IMediator mediator,
+    IDisposer disposer) :
+    ObservableViewModel(serviceFactory, mediator, disposer),
+    ITemplatedViewModel
+{
+    public ITemplateFactory TemplateFactory => templateFactory;
+}
diff --git a/Hyperbar/Lifecycles/ObservableViewModel.cs b/Hyperbar/Lifecycles/ObservableViewModel.cs
index ed78950..eba77dd 100644
--- a/Hyperbar/Lifecycles/ObservableViewModel.cs
+++ b/Hyperbar/Lifecycles/ObservableViewModel.cs
@@ -2,9 +2,15 @@
 
 namespace Hyperbar;
 
-public class ObservableViewModel(IDisposer disposer) : 
+public class ObservableViewModel(IServiceFactory serviceFactory,
+    IMediator mediator,
+    IDisposer disposer) : 
     ObservableObject,
     IDisposable
 {
+    public IServiceFactory ServiceFactory => serviceFactory;
+
+    public IMediator Mediator => mediator;
+
     public void Dispose() => disposer.Dispose(this);
 }