From d94add17f94189c71b93e6cb66559000f57aacd2 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Thu, 4 Jan 2024 23:02:51 +0000
Subject: [PATCH] Added primaey commands extenion/plugin

---
 .../ContextualCommandBuilder.cs               |  3 +-
 .../ContextualCommandView.xaml                |  8 +--
 .../ContextualCommandView.xaml.cs             |  2 +-
 .../ContextualCommandViewModel.cs             |  9 +---
 .../Hyperbar.Desktop.Contextual.csproj        | 53 +++++++++----------
 .../Hyperbar.Desktop.Primary.csproj           | 26 +++++++++
 .../PrimaryCommandBuilder.cs                  | 13 +++++
 .../PrimaryCommandView.xaml                   |  9 ++++
 .../PrimaryCommandView.xaml.cs                |  8 +++
 .../PrimaryCommandViewModel.cs                |  9 ++++
 Hyperbar.Desktop.Win32/KeyIntrop.cs           |  2 +-
 Hyperbar.Desktop/App.xaml.cs                  |  6 ++-
 Hyperbar.Desktop/Hyperbar.Desktop.csproj      |  1 +
 Hyperbar.sln                                  | 18 +++++++
 14 files changed, 120 insertions(+), 47 deletions(-)
 create mode 100644 Hyperbar.Desktop.Primary/Hyperbar.Desktop.Primary.csproj
 create mode 100644 Hyperbar.Desktop.Primary/PrimaryCommandBuilder.cs
 create mode 100644 Hyperbar.Desktop.Primary/PrimaryCommandView.xaml
 create mode 100644 Hyperbar.Desktop.Primary/PrimaryCommandView.xaml.cs
 create mode 100644 Hyperbar.Desktop.Primary/PrimaryCommandViewModel.cs

diff --git a/Hyperbar.Desktop.Contextual/ContextualCommandBuilder.cs b/Hyperbar.Desktop.Contextual/ContextualCommandBuilder.cs
index da53c81..e53992f 100644
--- a/Hyperbar.Desktop.Contextual/ContextualCommandBuilder.cs
+++ b/Hyperbar.Desktop.Contextual/ContextualCommandBuilder.cs
@@ -2,7 +2,8 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace Hyperbar.Desktop.Contextual;
 
-public class ContextualCommandBuilder : ICommandBuilder
+public class ContextualCommandBuilder : 
+    ICommandBuilder
 {
     public void Create(IServiceCollection services)
     {
diff --git a/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml b/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml
index 1c78ee6..ad58c7c 100644
--- a/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml
+++ b/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml
@@ -2,13 +2,7 @@
 <Page
     x:Class="Hyperbar.Desktop.Contextual.ContextualCommandView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Hyperbar.Desktop.Contextual"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-    mc:Ignorable="d">
-
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Grid>
         <Button Content="This is a test" Click="Button_Click"/>
     </Grid>
diff --git a/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml.cs b/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml.cs
index c2d217e..1adf492 100644
--- a/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml.cs
+++ b/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml.cs
@@ -10,6 +10,6 @@ public sealed partial class ContextualCommandView : Page
 
     private void Button_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
-        KeyInterop.Type((VirtualKey)186, VirtualKey.LeftWindows);
+        KeyInterop.Type(VirtualKey.L, VirtualKey.LeftWindows, VirtualKey.Control);
     }
 }
diff --git a/Hyperbar.Desktop.Contextual/ContextualCommandViewModel.cs b/Hyperbar.Desktop.Contextual/ContextualCommandViewModel.cs
index fee2451..61c5371 100644
--- a/Hyperbar.Desktop.Contextual/ContextualCommandViewModel.cs
+++ b/Hyperbar.Desktop.Contextual/ContextualCommandViewModel.cs
@@ -1,13 +1,8 @@
 namespace Hyperbar.Desktop.Contextual;
 
-public class ContextualCommandViewModel :
+public class ContextualCommandViewModel(ITemplateFactory templateFactory) :
     ICommandViewModel,
     ITemplatedViewModel
 {
-    public ContextualCommandViewModel(ITemplateFactory templateFactory)
-    {
-        TemplateFactory = templateFactory;
-    }
-
-    public ITemplateFactory TemplateFactory { get; }
+    public ITemplateFactory TemplateFactory { get; } = templateFactory;
 }
diff --git a/Hyperbar.Desktop.Contextual/Hyperbar.Desktop.Contextual.csproj b/Hyperbar.Desktop.Contextual/Hyperbar.Desktop.Contextual.csproj
index 0059503..f238d6e 100644
--- a/Hyperbar.Desktop.Contextual/Hyperbar.Desktop.Contextual.csproj
+++ b/Hyperbar.Desktop.Contextual/Hyperbar.Desktop.Contextual.csproj
@@ -1,30 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>Hyperbar.Desktop.Contextual</RootNamespace>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <UseWinUI>true</UseWinUI>
-	  <UseRidGraph>true</UseRidGraph>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="ContextualCommandView.xaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-	  <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-	  <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.231202003-experimental1" />
-	  <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Hyperbar.Desktop.Win32\Hyperbar.Desktop.Win32.csproj" />
-    <ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="ContextualCommandView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RootNamespace>Hyperbar.Desktop.Contextual</RootNamespace>
+		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+		<UseWinUI>true</UseWinUI>
+		<UseRidGraph>true</UseRidGraph>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="ContextualCommandView.xaml" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.231202003-experimental1" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Hyperbar.Desktop.Win32\Hyperbar.Desktop.Win32.csproj" />
+		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="ContextualCommandView.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
 </Project>
diff --git a/Hyperbar.Desktop.Primary/Hyperbar.Desktop.Primary.csproj b/Hyperbar.Desktop.Primary/Hyperbar.Desktop.Primary.csproj
new file mode 100644
index 0000000..d00105c
--- /dev/null
+++ b/Hyperbar.Desktop.Primary/Hyperbar.Desktop.Primary.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RootNamespace>Hyperbar.Desktop.Primary</RootNamespace>
+		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+		<UseWinUI>true</UseWinUI>
+		<UseRidGraph>true</UseRidGraph>
+	</PropertyGroup>
+	<ItemGroup>
+	  <None Remove="PrimaryCommandView.xaml" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.231202003-experimental1" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="PrimaryCommandView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+</Project>
diff --git a/Hyperbar.Desktop.Primary/PrimaryCommandBuilder.cs b/Hyperbar.Desktop.Primary/PrimaryCommandBuilder.cs
new file mode 100644
index 0000000..80ae121
--- /dev/null
+++ b/Hyperbar.Desktop.Primary/PrimaryCommandBuilder.cs
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Hyperbar.Desktop.Primary;
+
+public class PrimaryCommandBuilder :
+    ICommandBuilder
+{
+    public void Create(IServiceCollection services)
+    {
+        services.AddCommandTemplate<PrimaryCommandViewModel, PrimaryCommandView>();
+    }
+}
+
diff --git a/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml b/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml
new file mode 100644
index 0000000..a02d28a
--- /dev/null
+++ b/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+    x:Class="Hyperbar.Desktop.Primary.PrimaryCommandView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Grid>
+        <Button Content="Primary commands" />
+    </Grid>
+</Page>
diff --git a/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml.cs b/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml.cs
new file mode 100644
index 0000000..a4dbd6e
--- /dev/null
+++ b/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml.cs
@@ -0,0 +1,8 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Hyperbar.Desktop.Primary;
+
+public sealed partial class PrimaryCommandView : Page
+{
+    public PrimaryCommandView() => InitializeComponent();
+}
diff --git a/Hyperbar.Desktop.Primary/PrimaryCommandViewModel.cs b/Hyperbar.Desktop.Primary/PrimaryCommandViewModel.cs
new file mode 100644
index 0000000..7eaa290
--- /dev/null
+++ b/Hyperbar.Desktop.Primary/PrimaryCommandViewModel.cs
@@ -0,0 +1,9 @@
+namespace Hyperbar.Desktop.Primary;
+
+public class PrimaryCommandViewModel(ITemplateFactory templateFactory) :
+    ICommandViewModel,
+    ITemplatedViewModel
+{
+    public ITemplateFactory TemplateFactory { get; } = templateFactory;
+}
+
diff --git a/Hyperbar.Desktop.Win32/KeyIntrop.cs b/Hyperbar.Desktop.Win32/KeyIntrop.cs
index 9969be8..c2c5f3b 100644
--- a/Hyperbar.Desktop.Win32/KeyIntrop.cs
+++ b/Hyperbar.Desktop.Win32/KeyIntrop.cs
@@ -11,7 +11,7 @@ public class KeyInterop
 {
     private static readonly VirtualKey[] extendedKeys = [
         VirtualKey.Menu,
-        VirtualKey.Menu,
+        VirtualKey.LeftMenu,
         VirtualKey.NumberKeyLock,
         VirtualKey.Insert,
         VirtualKey.Delete,
diff --git a/Hyperbar.Desktop/App.xaml.cs b/Hyperbar.Desktop/App.xaml.cs
index 69c427b..09b6058 100644
--- a/Hyperbar.Desktop/App.xaml.cs
+++ b/Hyperbar.Desktop/App.xaml.cs
@@ -1,5 +1,6 @@
 using Hyperbar.Desktop.Contextual;
 using Hyperbar.Desktop.Controls;
+using Hyperbar.Desktop.Primary;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.UI.Xaml;
@@ -33,10 +34,11 @@ public partial class App :
 
                 // Commands
                 services.AddSomething<ContextualCommandBuilder>();
- 
+                services.AddSomething<PrimaryCommandBuilder>();
+
                 services.AddTransient(provider =>
                 {
-                    IEnumerable<ICommandViewModel> Resolve(IServiceProvider services)
+                    static IEnumerable<ICommandViewModel> Resolve(IServiceProvider services)
                     {
                         foreach (ICommandContext commandContext in services.GetServices<ICommandContext>())
                         {
diff --git a/Hyperbar.Desktop/Hyperbar.Desktop.csproj b/Hyperbar.Desktop/Hyperbar.Desktop.csproj
index a88a7ad..44c7805 100644
--- a/Hyperbar.Desktop/Hyperbar.Desktop.csproj
+++ b/Hyperbar.Desktop/Hyperbar.Desktop.csproj
@@ -43,6 +43,7 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\Hyperbar.Desktop.Contextual\Hyperbar.Desktop.Contextual.csproj" />
 	  <ProjectReference Include="..\Hyperbar.Desktop.Controls\Hyperbar.Desktop.Controls.csproj" />
+	  <ProjectReference Include="..\Hyperbar.Desktop.Primary\Hyperbar.Desktop.Primary.csproj" />
 	  <ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/Hyperbar.sln b/Hyperbar.sln
index 464d92a..5240bbc 100644
--- a/Hyperbar.sln
+++ b/Hyperbar.sln
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar", "Hyperbar\Hyperb
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyperbar.Desktop.Contextual", "Hyperbar.Desktop.Contextual\Hyperbar.Desktop.Contextual.csproj", "{C32D4073-2A9B-4257-8895-09951FAD8E7A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyperbar.Desktop.Primary", "Hyperbar.Desktop.Primary\Hyperbar.Desktop.Primary.csproj", "{AFB8A3EB-8831-4041-AE05-3E0EF672887C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -113,6 +115,22 @@ Global
 		{C32D4073-2A9B-4257-8895-09951FAD8E7A}.Release|x64.Build.0 = Release|Any CPU
 		{C32D4073-2A9B-4257-8895-09951FAD8E7A}.Release|x86.ActiveCfg = Release|Any CPU
 		{C32D4073-2A9B-4257-8895-09951FAD8E7A}.Release|x86.Build.0 = Release|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Debug|x86.Build.0 = Debug|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Release|ARM64.Build.0 = Release|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Release|x64.Build.0 = Release|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFB8A3EB-8831-4041-AE05-3E0EF672887C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE