From 0154e219cb6bfc418177523e14f1e8def26cbcab Mon Sep 17 00:00:00 2001
From: Martin Fetzel <U01K1RM@post.at>
Date: Sat, 6 Apr 2024 15:58:56 +0200
Subject: [PATCH] first draft

---
 KeyboardMouseWin/KeyboardMouseWin.csproj | 11 ++++
 KeyboardMouseWin/MainWindow.xaml.cs      |  1 +
 KeyboardMouseWin/Program.cs              | 65 ++++++++++++++++++------
 KeyboardMouseWin/WelcomeWindow.xaml      | 42 ++++++++++-----
 KeyboardMouseWin/appsettings.json        | 14 +++++
 5 files changed, 104 insertions(+), 29 deletions(-)
 create mode 100644 KeyboardMouseWin/appsettings.json

diff --git a/KeyboardMouseWin/KeyboardMouseWin.csproj b/KeyboardMouseWin/KeyboardMouseWin.csproj
index 8647f25..bf6936e 100644
--- a/KeyboardMouseWin/KeyboardMouseWin.csproj
+++ b/KeyboardMouseWin/KeyboardMouseWin.csproj
@@ -11,9 +11,20 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="appsettings.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="FlaUI.UIA3" Version="4.0.0" />
     <PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageReference Include="SharpHook" Version="5.2.0" />
     <PackageReference Include="System.Reactive.Async" Version="6.0.0-alpha.18" />
diff --git a/KeyboardMouseWin/MainWindow.xaml.cs b/KeyboardMouseWin/MainWindow.xaml.cs
index caab084..b9ea656 100644
--- a/KeyboardMouseWin/MainWindow.xaml.cs
+++ b/KeyboardMouseWin/MainWindow.xaml.cs
@@ -20,6 +20,7 @@ namespace KeyboardMouseWin
     /// </summary>
     public partial class MainWindow : Window
     {
+
         public MainWindow()
         {
             InitializeComponent();
diff --git a/KeyboardMouseWin/Program.cs b/KeyboardMouseWin/Program.cs
index dd093af..3a2ccec 100644
--- a/KeyboardMouseWin/Program.cs
+++ b/KeyboardMouseWin/Program.cs
@@ -1,25 +1,58 @@
 using KeyboardMouseWin.Utils;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using SharpHook;
 using System.Windows;
 
-namespace KeyboardMouseWin
+namespace KeyboardMouseWin;
+
+public static class Program
 {
-    public static class Program
+    [STAThread]
+    public static void Main(string[] args)
     {
-        [STAThread]
-        public static void Main(string[] args)
+        var hostbuilder = new HostBuilder()
+        .ConfigureAppConfiguration((context, configurationBuilder) =>
+        {
+            configurationBuilder.SetBasePath(context.HostingEnvironment.ContentRootPath);
+            configurationBuilder.AddJsonFile("appsettings.json", optional: false);
+        })
+        .ConfigureServices((context, services) =>
+        {
+            services.Configure<Settings>(context.Configuration);
+
+            services.AddSingleton<TaskPoolGlobalHook>();
+            services.AddSingleton<MainWindow>();
+            services.AddSingleton<CaptionService>();
+            services.AddSingleton(sp => 
+                new CaptionViewModel(sp.GetRequiredService<CaptionService>(), new FlauiProvider(), sp.GetRequiredService<MainWindow>().Dispatcher));
+        })
+        .ConfigureLogging(logging =>
         {
-            var hook = new TaskPoolGlobalHook();
-            hook.RunAsync();
-            var service = new CaptionService();
-            var window = new MainWindow();
-            var viewModel = new CaptionViewModel(service, new FlauiProvider(), window.Dispatcher);
-            hook.KeyPressed += async (_, e) => await viewModel.HandleKeyDown(SharpHookConverter.ToKey(e.Data.KeyCode), e);
-            hook.KeyReleased += (_, e) => viewModel.HandleKeyUp(SharpHookConverter.ToKey(e.Data.KeyCode));
-            window.DataContext = viewModel;
-            var application = new Application();
-            Task.Run(() => window.Dispatcher.Invoke(() => window.Hide()));
-            application.Run(window);
-        }
+            logging.AddConsole();
+        });
+
+        var host = hostbuilder.Build();
+
+        host.Start();
+
+
+
+        var hook = host.Services.GetRequiredService<TaskPoolGlobalHook>();
+        hook.RunAsync();
+
+        var viewModel = host.Services.GetRequiredService< CaptionViewModel>();
+        hook.KeyPressed += async (_, e) => await viewModel.HandleKeyDown(SharpHookConverter.ToKey(e.Data.KeyCode), e);
+        hook.KeyReleased += (_, e) => viewModel.HandleKeyUp(SharpHookConverter.ToKey(e.Data.KeyCode));
+
+        var window = host.Services.GetRequiredService<MainWindow>();
+        window.DataContext = viewModel;
+
+
+        var application = new Application();
+        Task.Run(() => window.Dispatcher.Invoke(() => window.Hide()));
+        application.Run(window);
     }
 }
diff --git a/KeyboardMouseWin/WelcomeWindow.xaml b/KeyboardMouseWin/WelcomeWindow.xaml
index b4b8876..3e6d294 100644
--- a/KeyboardMouseWin/WelcomeWindow.xaml
+++ b/KeyboardMouseWin/WelcomeWindow.xaml
@@ -7,9 +7,12 @@
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance local:WelcomeWindowViewModel}"
         Title="Welcome" Height="450" Width="800">
+    <Window.Icon>
+        <DrawingImage />
+    </Window.Icon>
     <Window.Resources>
         <Viewbox x:Key="KeyboardShortcut" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Width="1006.11" Height="1009.31">
-            <Canvas Width="1006.11" Height="1009.31">
+            <Canvas Width="640" Height="480">
                 <Polyline Points="961.89,152.12 961.89,965.09 148.92,965.09" Stroke="#33af83" StrokeThickness="88.44" StrokeLineJoin="Round"/>
                 <Polyline Points="857.19,44.22 44.22,44.22 44.22,857.19" Stroke="#33af83" StrokeThickness="88.44" StrokeLineJoin="Round"/>
                 <Polyline Points="644.99,549.11 645.75,285.72 370.59,286.46" Stroke="#e53f7b" StrokeThickness="88.44"  StrokeLineJoin="Round"/>
@@ -19,26 +22,38 @@
     </Window.Resources>
     <Window.Content>
         <DockPanel>
+            <DockPanel DockPanel.Dock="Left" 
+                       VerticalAlignment="Bottom" 
+                       MinHeight="200" 
+                       MinWidth="200">
+                <DockPanel.Background>
+                    <VisualBrush Visual="{StaticResource KeyboardShortcut}" 
+                             Stretch="Uniform" 
+                             AutoLayoutContent="True" 
+                             AlignmentX="Left" 
+                             AlignmentY="Top" />
+                </DockPanel.Background>
+            </DockPanel>
             <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" FontWeight="Bold" Text="Welcome"/>
 
             <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16">
-                <Run Text="To show possible Keyboards please Press: "/>
-                <Run FontWeight="Bold" Text="{Binding Settings.CaptionKeyCombination}" />
+    <Run Text="To show possible Keyboards please Press: "/>
+    <Run FontWeight="Bold" Text="{Binding Settings.CaptionKeyCombination}" />
             </TextBlock>
 
             <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16">
-                <Run Text="To exit from the Shortcuts Press: "/>
-                <Run FontWeight="Bold" Text="{Binding Settings.ClearKeyCombiantion}" />
+    <Run Text="To exit from the Shortcuts Press: "/>
+    <Run FontWeight="Bold" Text="{Binding Settings.ClearKeyCombiantion}" />
             </TextBlock>
 
             <StackPanel DockPanel.Dock="Bottom" 
-                    HorizontalAlignment="Right" VerticalAlignment="Bottom" 
-                    Orientation="Horizontal"
-                    Margin="10">
+        HorizontalAlignment="Right" VerticalAlignment="Bottom" 
+        Orientation="Horizontal"
+        Margin="10">
                 <TextBlock Text="Please restart the app after changing the config" />
                 <Button Content="Change Shortcuts"
-                    Command="{Binding Path=EditShortCuts}"
-                    Margin="10,0,0,0">
+        Command="{Binding Path=EditShortCuts}"
+        Margin="10,0,0,0">
                     <Button.ToolTip>
                         <ToolTip>
                             <TextBlock Text="Please restart the application to reload the configuration."/>
@@ -47,10 +62,11 @@
                 </Button>
             </StackPanel>
             <Button DockPanel.Dock="Bottom" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10" 
-                Content="Exit Keyboard Shortcut"
-                Command="{Binding Path=CloseWindow}"
-                CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
+    Content="Exit Keyboard Shortcut"
+    Command="{Binding Path=CloseWindow}"
+    CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
             </Button>
+
         </DockPanel>
     </Window.Content>
 </Window>
diff --git a/KeyboardMouseWin/appsettings.json b/KeyboardMouseWin/appsettings.json
new file mode 100644
index 0000000..cae1649
--- /dev/null
+++ b/KeyboardMouseWin/appsettings.json
@@ -0,0 +1,14 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Trace"
+    },
+    "Console": {
+      "LogLevel": {
+        "Default": "Trace"
+      },
+      "IncludeScopes": true,
+      "TimestampFormat": "HH:mm:ss"
+    }
+  }
+}
\ No newline at end of file