Skip to content

Commit

Permalink
Adjusted namespaces (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
lcarrere authored Nov 23, 2024
1 parent 6c3a748 commit 50690a8
Show file tree
Hide file tree
Showing 137 changed files with 580 additions and 580 deletions.
6 changes: 3 additions & 3 deletions LM-Kit-Maestro/App.xaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version = "1.0" encoding = "UTF-8" ?>
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:LMKitMaestro"
xmlns:local="clr-namespace:LMKit.Maestro"
xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="LMKitMaestro.App">
x:Class="LMKit.Maestro.App">
<Application.Resources>
<ResourceDictionary>
<!--<StyleSheet Source="Resources/CSS/LmKitMaestro.css"/>
<!--<StyleSheet Source="Resources/CSS/LMKitMaestro.css"/>
<StyleSheet Source="Resources/CSS/font-awesome.css"/>-->
<mct:VariableMultiValueConverter x:Key="AllTrueConverter" ConditionType="All"/>
<mct:VariableMultiValueConverter x:Key="AllFalseConverter" ConditionType="None"/>
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using LMKitMaestro.ViewModels;
using LMKit.Maestro.ViewModels;
using Microsoft.AspNetCore.Components.WebView.Maui;

namespace LMKitMaestro
namespace LMKit.Maestro
{
public partial class App : Application
{
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/AppConstants.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
namespace LMKitMaestro;
namespace LMKit.Maestro;

internal static class AppConstants
{
public const string DatabaseFilename = "LMKitMaestroSQLite.db3";
public const string DatabaseFilename = "MaestroSQLite.db3";

public const SQLite.SQLiteOpenFlags Flags =
// open the database in read/write mode
Expand Down
14 changes: 7 additions & 7 deletions LM-Kit-Maestro/AppShell.xaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
<shell:SimpleShell
x:Class="LMKitMaestro.AppShell"
x:Class="LMKit.Maestro.AppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:ui="clr-namespace:LMKitMaestro.UI"
xmlns:vm="clr-namespace:LMKitMaestro.ViewModels"
xmlns:local="clr-namespace:LMKitMaestro"
xmlns:ui="clr-namespace:LMKit.Maestro.UI"
xmlns:vm="clr-namespace:LMKit.Maestro.ViewModels"
xmlns:local="clr-namespace:LMKit.Maestro"
xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
xmlns:shell="clr-namespace:SimpleToolkit.SimpleShell;assembly=SimpleToolkit.SimpleShell"
xmlns:converters="clr-namespace:LMKitMaestro.Converters"
xmlns:converters="clr-namespace:LMKit.Maestro.Converters"
Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False"
Title="LM-Kit Maestro"
Title="Maestro"
x:DataType="vm:AppShellViewModel"
x:Name="thisShell"
>
Expand Down Expand Up @@ -64,7 +64,7 @@
BindableLayout.ItemsSource="{Binding Tabs}"
Spacing="12">
<BindableLayout.ItemTemplate>
<DataTemplate x:DataType="vm:LMKitMaestroTabViewModel">
<DataTemplate x:DataType="vm:MaestroTabViewModel">
<ui:LinkView
Command="{Binding Source={RelativeSource AncestorType={x:Type vm:AppShellViewModel}}, Path=NavigateCommand}"
CommandParameter="{Binding}"
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/AppShell.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using SimpleToolkit.SimpleShell;
using LMKitMaestro.ViewModels;
using LMKit.Maestro.ViewModels;

namespace LMKitMaestro
namespace LMKit.Maestro
{
public partial class AppShell : SimpleShell
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Controls/ChatBoxEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Microsoft.Maui.Controls.Compatibility.Platform.Android;
#endif

namespace LMKitMaestro.Controls
namespace LMKit.Maestro.Controls
{
internal class ChatBoxEditor : Editor
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Controls/CustomCollectionView.xaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<ScrollView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="LMKitMaestro.Controls.CustomCollectionView"
x:Class="LMKit.Maestro.Controls.CustomCollectionView"
x:Name="customCollectionView">

<VerticalStackLayout
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Controls/CustomCollectionView.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections;

namespace LMKitMaestro.Controls;
namespace LMKit.Maestro.Controls;

public partial class CustomCollectionView : ScrollView
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Controls/CustomEditor.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace LMKitMaestro.Controls;
namespace LMKit.Maestro.Controls;

class CustomEditor : Editor
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Controls/CustomEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Windows.System;
#endif

namespace LMKitMaestro.Controls;
namespace LMKit.Maestro.Controls;

class CustomEntry : Entry
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Controls/StatefulContentView.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Windows.Input;

namespace LMKitMaestro.Controls
namespace LMKit.Maestro.Controls
{
public class StatefulContentView : ContentView
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Converters/EqualToZeroConverter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Globalization;

namespace LMKitMaestro.Converters;
namespace LMKit.Maestro.Converters;

internal sealed class EqualToZeroConverter : IValueConverter
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Converters/FileNameConverter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Globalization;

namespace LMKitMaestro.Converters;
namespace LMKit.Maestro.Converters;

internal sealed class FileNameConverter : IValueConverter
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Converters/FileSizeConverter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Globalization;

namespace LMKitMaestro.Converters;
namespace LMKit.Maestro.Converters;

internal sealed class FileSizeConverter : IValueConverter
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Converters/GreaterThanZeroConverter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Globalization;

namespace LMKitMaestro.Converters;
namespace LMKit.Maestro.Converters;

internal sealed class GreaterThanZeroConverter : IValueConverter
{
Expand Down
8 changes: 4 additions & 4 deletions LM-Kit-Maestro/Data/ChatPlaygroundDatabase.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using LMKitMaestro.Models;
using LMKit.Maestro.Models;
using SQLite;

namespace LMKitMaestro.Data
namespace LMKit.Maestro.Data
{
public sealed class LMKitMaestroDatabase : ILMKitMaestroDatabase
public sealed class MaestroDatabase : IMaestroDatabase
{
public static string DatabasePath => Path.Combine(FileSystem.AppDataDirectory, "LMKitMaestroSQLite.db3");
public static string DatabasePath => Path.Combine(FileSystem.AppDataDirectory, "MaestroSQLite.db3");

private SQLiteAsyncConnection? _sqlDatabase;

Expand Down
6 changes: 3 additions & 3 deletions LM-Kit-Maestro/Data/IChatPlaygroundDatabase.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using LMKitMaestro.Models;
using LMKit.Maestro.Models;

namespace LMKitMaestro.Data;
namespace LMKit.Maestro.Data;

public interface ILMKitMaestroDatabase
public interface IMaestroDatabase
{
Task<List<ConversationLog>> GetConversations();
Task<int> SaveConversation(ConversationLog conversationLog);
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Handlers/CustomEditorHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
using Microsoft.UI.Xaml.Controls;
#endif

namespace LMKitMaestro.Handlers;
namespace LMKit.Maestro.Handlers;

public partial class CustomEditorHandler : EditorHandler
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Handlers/CustomEntryHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
using Windows.UI.Notifications;
#endif

namespace LMKitMaestro.Handlers;
namespace LMKit.Maestro.Handlers;

public partial class CustomEntryHandler : EntryHandler
{
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/Handlers/MauiHandlerCollectionExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using LMKitMaestro.Controls;
using LMKit.Maestro.Controls;

namespace LMKitMaestro.Handlers;
namespace LMKit.Maestro.Handlers;

public static class MauiHandlerCollectionExtensions
{
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Android.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#if ANDROID
using Android.Views;
using LMKitMaestro.Controls;
using LMKit.Maestro.Controls;
using Microsoft.Maui.Platform;
using static Microsoft.Maui.Controls.VisualStateManager;

namespace LMKitMaestro.Handlers;
namespace LMKit.Maestro.Handlers;

public partial class StatefulContentViewHandler
{
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Apple.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#if IOS || MACCATALYST
using Foundation;
using LMKitMaestro.Controls;
using LMKit.Maestro.Controls;
using System.Diagnostics;
using UIKit;
using static Microsoft.Maui.Controls.VisualStateManager;

namespace LMKitMaestro.Handlers;
namespace LMKit.Maestro.Handlers;

public partial class StatefulContentViewHandler
{
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/Handlers/StatefulContentViewHandler.Windows.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#if WINDOWS
using LMKitMaestro.Controls;
using LMKit.Maestro.Controls;
using Microsoft.Maui.Platform;
using Microsoft.UI.Xaml.Input;
using static Microsoft.Maui.Controls.VisualStateManager;

namespace LMKitMaestro.Handlers;
namespace LMKit.Maestro.Handlers;

public partial class StatefulContentViewHandler
{
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/Handlers/StatefulContentViewHandler.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using static Microsoft.Maui.Controls.VisualStateManager;
using Microsoft.Maui.Handlers;
using System.Windows.Input;
using LMKitMaestro.Controls;
using LMKit.Maestro.Controls;

#if ANDROID
using Android.Views;
Expand All @@ -14,7 +14,7 @@
using UIKit;
#endif

namespace LMKitMaestro.Handlers;
namespace LMKit.Maestro.Handlers;

/// <summary>
/// A handler for <see cref="StatefulContentView"/>.
Expand Down
8 changes: 4 additions & 4 deletions LM-Kit-Maestro/Helpers/ChatPlaygroundHelpers.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using LMKitMaestro.Services;
using LMKitMaestro.ViewModels;
using LMKit.Maestro.Services;
using LMKit.Maestro.ViewModels;

namespace LMKitMaestro.Helpers
namespace LMKit.Maestro.Helpers
{
internal static class LMKitMaestroHelpers
internal static class MaestroHelpers
{
public static ModelInfoViewModel? TryGetExistingModelInfoViewModel(ICollection<ModelInfoViewModel> modelInfoViewModels, ModelInfo modelInfo)
{
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/Helpers/FileHelpers.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using LMKitMaestro.Services;
using LMKit.Maestro.Services;
using System.Web;

namespace LMKitMaestro.Helpers;
namespace LMKit.Maestro.Helpers;

public static class FileHelpers
{
Expand Down
8 changes: 4 additions & 4 deletions LM-Kit-Maestro/LM-Kit-Maestro.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- For example: <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->

<OutputType Condition="'$(TargetFramework)' != 'net9.0'">Exe</OutputType>
<RootNamespace>LMKitMaestro</RootNamespace>
<RootNamespace>LMKit.Maestro</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -22,7 +22,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!-- Display name -->
<ApplicationTitle>LM-Kit Maestro</ApplicationTitle>
<ApplicationTitle>Maestro</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.companyname.lm-kit-maestro</ApplicationId>
Expand Down Expand Up @@ -66,8 +66,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="LM-Kit.NET" Version="2024.11.4" />
<PackageReference Include="LM-Kit.NET.Backend.Cuda12.Windows" Version="2024.11.4" />
<PackageReference Include="LM-Kit.NET" Version="2024.11.5" />
<PackageReference Include="LM-Kit.NET.Backend.Cuda12.Windows" Version="2024.11.5" />
<PackageReference Include="Majorsoft.Blazor.Components.Common.JsInterop" Version="1.5.0" />
<PackageReference Include="Markdig" Version="0.38.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.10" />
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/MauiExceptions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace LMKitMaestro;
namespace LMKit.Maestro;

public static class MauiExceptions
{
Expand Down
14 changes: 7 additions & 7 deletions LM-Kit-Maestro/MauiProgram.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
using CommunityToolkit.Maui;
using Microsoft.Extensions.Logging;
using LMKitMaestro.UI;
using LMKitMaestro.ViewModels;
using LMKitMaestro.Services;
using LMKitMaestro.Data;
using LMKit.Maestro.UI;
using LMKit.Maestro.ViewModels;
using LMKit.Maestro.Services;
using LMKit.Maestro.Data;
using SimpleToolkit.SimpleShell;
using LMKitMaestro.Handlers;
using LMKit.Maestro.Handlers;
using MetroLog.MicrosoftExtensions;
using MetroLog.Operators;
using Majorsoft.Blazor.Components.Common.JsInterop;
using Mopups.Hosting;
using Mopups.Services;

namespace LMKitMaestro
namespace LMKit.Maestro
{
public static class MauiProgram
{
Expand Down Expand Up @@ -90,7 +90,7 @@ private static void RegisterServices(this MauiAppBuilder builder)
builder.Services.AddSingleton(MopupService.Instance);

builder.Services.AddSingleton<AppSettingsService>();
builder.Services.AddSingleton<ILMKitMaestroDatabase, LMKitMaestroDatabase>();
builder.Services.AddSingleton<IMaestroDatabase, MaestroDatabase>();
builder.Services.AddSingleton<ILLMFileManager, LLMFileManager>();
builder.Services.AddSingleton<IAppSettingsService, AppSettingsService>();
builder.Services.AddSingleton<IPopupService, Services.PopupService>();
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Models/ConversationLog.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using SQLite;

namespace LMKitMaestro.Models;
namespace LMKit.Maestro.Models;

public sealed class ConversationLog
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Models/Message.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

namespace LMKitMaestro.Models;
namespace LMKit.Maestro.Models;

public sealed class Message
{
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Platforms/Android/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Android.Content.PM;
using Android.OS;

namespace LMKitMaestro
namespace LMKit.Maestro
{
[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
public class MainActivity : MauiAppCompatActivity
Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/Platforms/Android/MainApplication.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Android.App;
using Android.Runtime;

namespace LMKitMaestro
namespace LMKit.Maestro
{
[Application]
public class MainApplication : MauiApplication
Expand Down
Loading

0 comments on commit 50690a8

Please sign in to comment.