From e7daf0d3f4288182bb98e223ace3a9a764beca5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Carr=C3=A8re?= <loic.carrere@gmail.com>
Date: Thu, 21 Nov 2024 16:21:24 +0100
Subject: [PATCH] Code cleanup.

---
 LM-Kit-Maestro/Controls/ChatBoxEditor.cs         |  4 ++--
 LM-Kit-Maestro/Handlers/CustomEntryHandler.cs    |  2 +-
 LM-Kit-Maestro/MauiProgram.cs                    | 14 +++++++-------
 LM-Kit-Maestro/Platforms/Windows/FolderPicker.cs |  2 +-
 LM-Kit-Maestro/Services/LLMFileManager.cs        |  2 +-
 LM-Kit-Maestro/ViewModels/MessageViewModel.cs    |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/LM-Kit-Maestro/Controls/ChatBoxEditor.cs b/LM-Kit-Maestro/Controls/ChatBoxEditor.cs
index f40c596a..fe879c49 100644
--- a/LM-Kit-Maestro/Controls/ChatBoxEditor.cs
+++ b/LM-Kit-Maestro/Controls/ChatBoxEditor.cs
@@ -39,7 +39,7 @@ protected override void OnHandlerChanged()
             AppCompatEditText appCompatEditText = (AppCompatEditText)Handler!.PlatformView!;
             using (var gradientDrawable = new GradientDrawable())
             {
-                gradientDrawable.SetColor(global::Android.Graphics.Color.Transparent);
+                gradientDrawable.SetColor(Android.Graphics.Color.Transparent);
                 appCompatEditText.SetBackground(gradientDrawable);
                 appCompatEditText.BackgroundTintList = Android.Content.Res.ColorStateList.ValueOf(Colors.Transparent.ToAndroid());
             }
@@ -49,7 +49,7 @@ protected override void OnHandlerChanged()
 
 
 #if WINDOWS
-        private void OnKeyUp(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
+        private void OnKeyUp(object sender, KeyRoutedEventArgs e)
         {
             if (e.Key == VirtualKey.Shift)
             {
diff --git a/LM-Kit-Maestro/Handlers/CustomEntryHandler.cs b/LM-Kit-Maestro/Handlers/CustomEntryHandler.cs
index cee26b5a..ce918b89 100644
--- a/LM-Kit-Maestro/Handlers/CustomEntryHandler.cs
+++ b/LM-Kit-Maestro/Handlers/CustomEntryHandler.cs
@@ -35,7 +35,7 @@ protected override AppCompatEditText CreatePlatformView()
 
         using (var gradientDrawable = new GradientDrawable())
         {
-            gradientDrawable.SetColor(global::Android.Graphics.Color.Transparent);
+            gradientDrawable.SetColor(Android.Graphics.Color.Transparent);
             nativeView.SetBackground(gradientDrawable);
             nativeView.BackgroundTintList = Android.Content.Res.ColorStateList.ValueOf(Colors.Transparent.ToAndroid());
         }
diff --git a/LM-Kit-Maestro/MauiProgram.cs b/LM-Kit-Maestro/MauiProgram.cs
index 843ff93c..614cd38a 100644
--- a/LM-Kit-Maestro/MauiProgram.cs
+++ b/LM-Kit-Maestro/MauiProgram.cs
@@ -94,23 +94,23 @@ private static void RegisterViews(this MauiAppBuilder builder)
 
         private static void RegisterServices(this MauiAppBuilder builder)
         {
-            builder.Services.AddSingleton<IPopupNavigation>(MopupService.Instance);
+            builder.Services.AddSingleton(MopupService.Instance);
 
             builder.Services.AddSingleton<AppSettingsService>();
             builder.Services.AddSingleton<ILMKitMaestroDatabase, LMKitMaestroDatabase>();
             builder.Services.AddSingleton<ILLMFileManager, LLMFileManager>();
             builder.Services.AddSingleton<IAppSettingsService, AppSettingsService>();
-            builder.Services.AddSingleton<LMKitMaestro.Services.IPopupService, LMKitMaestro.Services.PopupService>();
-            builder.Services.AddSingleton<LMKitMaestro.Services.ILauncher, LMKitMaestro.Services.Launcher>();
-            builder.Services.AddSingleton<LMKitMaestro.Services.INavigationService, LMKitMaestro.Services.NavigationService>();
-            builder.Services.AddSingleton<LMKitMaestro.Services.IMainThread, LMKitMaestro.Services.MainThread>();
+            builder.Services.AddSingleton<IPopupService, Services.PopupService>();
+            builder.Services.AddSingleton<Services.ILauncher, Services.Launcher>();
+            builder.Services.AddSingleton<INavigationService, NavigationService>();
+            builder.Services.AddSingleton<IMainThread, Services.MainThread>();
             builder.Services.AddSingleton<CommunityToolkit.Maui.Core.IPopupService, CommunityToolkit.Maui.PopupService>();
 
 #if WINDOWS
-            builder.Services.AddSingleton<LMKitMaestro.Services.IFolderPicker, LMKitMaestro.WinUI.FolderPicker>();
+            builder.Services.AddSingleton<IFolderPicker, WinUI.FolderPicker>();
 #endif
 
-            builder.Services.AddSingleton<IPreferences>(Preferences.Default);
+            builder.Services.AddSingleton(Preferences.Default);
             builder.Services.AddSingleton<LMKitService>();
             builder.Services.AddSingleton<LLMFileManager>();
             builder.Services.AddSingleton<HttpClient>();
diff --git a/LM-Kit-Maestro/Platforms/Windows/FolderPicker.cs b/LM-Kit-Maestro/Platforms/Windows/FolderPicker.cs
index 3dba06ae..dd6be472 100644
--- a/LM-Kit-Maestro/Platforms/Windows/FolderPicker.cs
+++ b/LM-Kit-Maestro/Platforms/Windows/FolderPicker.cs
@@ -8,7 +8,7 @@ public async Task<FolderPickerResult> PickAsync(string initialPath, Cancellation
     {
         var result = await CommunityToolkit.Maui.Storage.FolderPicker.PickAsync(initialPath, cancellationToken);
 
-        return new LMKitMaestro.Services.FolderPickerResult(result.IsSuccessful, 
+        return new FolderPickerResult(result.IsSuccessful, 
             result.Folder?.Path, result.Exception);
     }
 }
\ No newline at end of file
diff --git a/LM-Kit-Maestro/Services/LLMFileManager.cs b/LM-Kit-Maestro/Services/LLMFileManager.cs
index b7f566bb..8715a7b6 100644
--- a/LM-Kit-Maestro/Services/LLMFileManager.cs
+++ b/LM-Kit-Maestro/Services/LLMFileManager.cs
@@ -337,7 +337,7 @@ private async void OnModelsFolderPathChanged()
         await CollectModelFilesAsync();
     }
 
-    private void OnAppSettingsServicePropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+    private void OnAppSettingsServicePropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         if (e.PropertyName == nameof(IAppSettingsService.ModelsFolderPath))
         {
diff --git a/LM-Kit-Maestro/ViewModels/MessageViewModel.cs b/LM-Kit-Maestro/ViewModels/MessageViewModel.cs
index 68f2e0ce..2733d201 100644
--- a/LM-Kit-Maestro/ViewModels/MessageViewModel.cs
+++ b/LM-Kit-Maestro/ViewModels/MessageViewModel.cs
@@ -66,7 +66,7 @@ public MessageViewModel(ChatHistory.Message message)
         LmKitMessage = message;
     }
 
-    public MessageViewModel(Models.Message message)
+    public MessageViewModel(Message message)
     {
         MessageModel = message;
         Sender = message.Sender;