Skip to content

Commit

Permalink
Merge pull request #12 from LM-Kit/loic/project-update
Browse files Browse the repository at this point in the history
Loic/project update
  • Loading branch information
lcarrere authored Nov 22, 2024
2 parents 7013d29 + 42d264c commit 01f83ff
Show file tree
Hide file tree
Showing 23 changed files with 334 additions and 398 deletions.
78 changes: 33 additions & 45 deletions LM-Kit-Maestro.sln
Original file line number Diff line number Diff line change
@@ -1,45 +1,33 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.11.35327.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LM-Kit-Maestro", "LM-Kit-Maestro\LM-Kit-Maestro.csproj", "{CA06766A-A00F-4496-8992-0944994AFB9F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LM-Kit-Maestro.Tests", "tests\LM-Kit-Maestro.Tests.csproj", "{37E609B0-C258-406F-B596-771B757667C6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release_Dev|Any CPU = Release_Dev|Any CPU
Release_Pub|Any CPU = Release_Pub|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CA06766A-A00F-4496-8992-0944994AFB9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release_Dev|Any CPU.ActiveCfg = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release_Dev|Any CPU.Build.0 = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release_Dev|Any CPU.Deploy.0 = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release_Pub|Any CPU.ActiveCfg = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release_Pub|Any CPU.Build.0 = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release_Pub|Any CPU.Deploy.0 = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release|Any CPU.Build.0 = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Release_Dev|Any CPU.ActiveCfg = Release|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Release_Dev|Any CPU.Build.0 = Release|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Release_Pub|Any CPU.ActiveCfg = Release|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Release_Pub|Any CPU.Build.0 = Release|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {416A0EEC-3B05-40E2-AB90-DC69F9E18DDE}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.11.35327.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LM-Kit-Maestro", "LM-Kit-Maestro\LM-Kit-Maestro.csproj", "{CA06766A-A00F-4496-8992-0944994AFB9F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LM-Kit-Maestro.Tests", "tests\LM-Kit-Maestro.Tests.csproj", "{37E609B0-C258-406F-B596-771B757667C6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CA06766A-A00F-4496-8992-0944994AFB9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release|Any CPU.Build.0 = Release|Any CPU
{CA06766A-A00F-4496-8992-0944994AFB9F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{37E609B0-C258-406F-B596-771B757667C6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {416A0EEC-3B05-40E2-AB90-DC69F9E18DDE}
EndGlobalSection
EndGlobal
46 changes: 4 additions & 42 deletions LM-Kit-Maestro/LM-Kit-Maestro.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
Expand Down Expand Up @@ -32,6 +31,8 @@
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>

<WindowsPackageType>None</WindowsPackageType>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
Expand All @@ -42,7 +43,7 @@

<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<MauiIcon Include="Resources\AppIcon\appicon.svg" BaseSize="128,128" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
Expand Down Expand Up @@ -84,43 +85,4 @@
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<Compile Update="UI\Popups\AlertPopup.xaml.cs">
<DependentUpon>AlertPopup.xaml</DependentUpon>
</Compile>
<Compile Update="UI\Popups\ChatConversationActionPopup.xaml.cs">
<DependentUpon>ChatConversationActionPopup.xaml</DependentUpon>
</Compile>
<Compile Update="UI\Popups\ModelSelectionPopup.xaml.cs">
<DependentUpon>ModelSelectionPopup.xaml</DependentUpon>
</Compile>
<Compile Update="UI\Popups\PopupView.xaml.cs">
<DependentUpon>PopupView.xaml</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<MauiXaml Update="Controls\CustomCollectionView.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Resources\Styles\Icons.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="UI\ModelSelectionButton.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="UI\Pages\AssistantsPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="UI\Popups\ChatConversationActionPopup.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="UI\Popups\ModelSelectionPopup.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="UI\Popups\PopupView.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>

</Project>
</Project>
10 changes: 5 additions & 5 deletions LM-Kit-Maestro/Platforms/Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
19 changes: 10 additions & 9 deletions LM-Kit-Maestro/Platforms/Android/MainActivity.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using Android.App;
using Android.Content.PM;

using Android.App;
using Android.Content.PM;
using Android.OS;

namespace LMKitMaestro
{
[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
public class MainActivity : MauiAppCompatActivity
{
}
}
{
[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
{
}
}
30 changes: 15 additions & 15 deletions LM-Kit-Maestro/Platforms/Android/MainApplication.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
using Android.App;
using Android.Runtime;

using Android.App;
using Android.Runtime;

namespace LMKitMaestro
{
[Application]
public class MainApplication : MauiApplication
{
public MainApplication(IntPtr handle, JniHandleOwnership ownership)
: base(handle, ownership)
{
}

protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
}
}
{
[Application]
public class MainApplication : MauiApplication
{
public MainApplication(IntPtr handle, JniHandleOwnership ownership)
: base(handle, ownership)
{
}

protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
}
}
10 changes: 5 additions & 5 deletions LM-Kit-Maestro/Platforms/Android/Resources/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#512BD4</color>
<color name="colorPrimaryDark">#2B0B98</color>
<color name="colorAccent">#2B0B98</color>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#512BD4</color>
<color name="colorPrimaryDark">#2B0B98</color>
<color name="colorAccent">#2B0B98</color>
</resources>
20 changes: 10 additions & 10 deletions LM-Kit-Maestro/Platforms/MacCatalyst/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Foundation;

namespace LMKitMaestro
{
[Register("AppDelegate")]
public class AppDelegate : MauiUIApplicationDelegate
{
protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
}
}
using Foundation;

namespace LMKitMaestro
{
[Register("AppDelegate")]
public class AppDelegate : MauiUIApplicationDelegate
{
protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
}
}
28 changes: 14 additions & 14 deletions LM-Kit-Maestro/Platforms/MacCatalyst/Entitlements.plist
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
<dict>
<!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
<key>com.apple.security.app-sandbox</key>
<true/>
<!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>

<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
<dict>
<!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
<key>com.apple.security.app-sandbox</key>
<true/>
<!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>

76 changes: 38 additions & 38 deletions LM-Kit-Maestro/Platforms/MacCatalyst/Info.plist
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<!-- The Mac App Store requires you specify if the app uses encryption. -->
<!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
<!-- <key>ITSAppUsesNonExemptEncryption</key> -->
<!-- Please indicate <true/> or <false/> here. -->

<!-- Specify the category for your app here. -->
<!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype -->
<!-- <key>LSApplicationCategoryType</key> -->
<!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> -->
<key>UIDeviceFamily</key>
<array>
<integer>2</integer>
</array>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/appicon.appiconset</string>
</dict>
</plist>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<!-- The Mac App Store requires you specify if the app uses encryption. -->
<!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
<!-- <key>ITSAppUsesNonExemptEncryption</key> -->
<!-- Please indicate <true/> or <false/> here. -->

<!-- Specify the category for your app here. -->
<!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype -->
<!-- <key>LSApplicationCategoryType</key> -->
<!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> -->
<key>UIDeviceFamily</key>
<array>
<integer>2</integer>
</array>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/appicon.appiconset</string>
</dict>
</plist>
31 changes: 16 additions & 15 deletions LM-Kit-Maestro/Platforms/MacCatalyst/Program.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
using UIKit;

namespace LMKitMaestro
{
public class Program
{
// This is the main entry point of the application.
static void Main(string[] args)
{
// if you want to use a different Application Delegate class from "AppDelegate"
// you can specify it here.
UIApplication.Main(args, null, typeof(AppDelegate));
}
}
}
using ObjCRuntime;
using UIKit;

namespace LMKitMaestro
{
public class Program
{
// This is the main entry point of the application.
static void Main(string[] args)
{
// if you want to use a different Application Delegate class from "AppDelegate"
// you can specify it here.
UIApplication.Main(args, null, typeof(AppDelegate));
}
}
}
Loading

0 comments on commit 01f83ff

Please sign in to comment.