From a2a7f1ea95ce4c5f5fa3f43c9dc436e05b0ebe5e Mon Sep 17 00:00:00 2001 From: BeepBeepBopBop Date: Fri, 22 Nov 2024 10:34:45 +0100 Subject: [PATCH] remove uranium ui icons package reference --- LM-Kit-Maestro/LM-Kit-Maestro.csproj | 2 -- LM-Kit-Maestro/MauiProgram.cs | 3 --- LM-Kit-Maestro/UI/ChatConversationsView.xaml | 1 - LM-Kit-Maestro/UI/ChatView.xaml | 6 ++---- LM-Kit-Maestro/UI/ConversationListItemView.xaml | 1 - LM-Kit-Maestro/UI/LinkView.xaml | 1 - LM-Kit-Maestro/UI/ModelSelectionButton.xaml | 1 - LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml | 1 - LM-Kit-Maestro/UI/Pages/ChatPage.xaml | 1 - LM-Kit-Maestro/UI/Pages/ModelsPage.xaml | 1 - LM-Kit-Maestro/UI/Popups/AlertPopup.xaml | 1 - LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml | 1 - LM-Kit-Maestro/UI/Popups/ModelSelectionPopup.xaml | 1 - LM-Kit-Maestro/UI/Popups/PopupView.xaml | 1 - LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml | 1 - 15 files changed, 2 insertions(+), 21 deletions(-) diff --git a/LM-Kit-Maestro/LM-Kit-Maestro.csproj b/LM-Kit-Maestro/LM-Kit-Maestro.csproj index ab6f8e4..c4bf988 100644 --- a/LM-Kit-Maestro/LM-Kit-Maestro.csproj +++ b/LM-Kit-Maestro/LM-Kit-Maestro.csproj @@ -85,8 +85,6 @@ - - diff --git a/LM-Kit-Maestro/MauiProgram.cs b/LM-Kit-Maestro/MauiProgram.cs index 7d3c502..37472fc 100644 --- a/LM-Kit-Maestro/MauiProgram.cs +++ b/LM-Kit-Maestro/MauiProgram.cs @@ -47,9 +47,6 @@ public static MauiApp CreateMauiApp() // FontAwesome fonts.AddFont("Font Awesome 6 Free-Regular-400.otf", "FARegular"); fonts.AddFont("Font Awesome 6 Free-Solid-900.otf", "FASolid"); - - fonts.AddFontAwesomeIconFonts(); - fonts.AddMaterialIconFonts(); }) .ConfigureMauiHandlers(handlers => { diff --git a/LM-Kit-Maestro/UI/ChatConversationsView.xaml b/LM-Kit-Maestro/UI/ChatConversationsView.xaml index a6cfc2d..6688493 100644 --- a/LM-Kit-Maestro/UI/ChatConversationsView.xaml +++ b/LM-Kit-Maestro/UI/ChatConversationsView.xaml @@ -6,7 +6,6 @@ xmlns:models="clr-namespace:LMKitMaestro.Models" xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" xmlns:controls="clr-namespace:LMKitMaestro.Controls" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit" xmlns:plainer="clr-namespace:Plainer.Maui.Controls;assembly=Plainer.Maui" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" diff --git a/LM-Kit-Maestro/UI/ChatView.xaml b/LM-Kit-Maestro/UI/ChatView.xaml index 644c855..0f96f04 100644 --- a/LM-Kit-Maestro/UI/ChatView.xaml +++ b/LM-Kit-Maestro/UI/ChatView.xaml @@ -11,8 +11,6 @@ xmlns:converters="clr-namespace:LMKitMaestro.Converters" xmlns:services="clr-namespace:LMKitMaestro.Services" xmlns:plainer="clr-namespace:Plainer.Maui.Controls;assembly=Plainer.Maui" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" - xmlns:fa="clr-namespace:UraniumUI.Icons.FontAwesome;assembly=UraniumUI.Icons.FontAwesome" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" x:Class="LMKitMaestro.UI.ChatView" x:DataType="vm:ConversationViewModel" @@ -110,7 +108,7 @@ FontFamily="FASolid" FontSize="14" Margin="0, 0, 0, 10" - Text="{x:Static fa:Solid.ArrowUp}" + Text="{StaticResource ArrowUp}" Style="{StaticResource SendButtonStyle}" > @@ -125,7 +123,7 @@ - + diff --git a/LM-Kit-Maestro/UI/ConversationListItemView.xaml b/LM-Kit-Maestro/UI/ConversationListItemView.xaml index 22a23e4..8f474bd 100644 --- a/LM-Kit-Maestro/UI/ConversationListItemView.xaml +++ b/LM-Kit-Maestro/UI/ConversationListItemView.xaml @@ -7,7 +7,6 @@ xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" xmlns:controls="clr-namespace:LMKitMaestro.Controls" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" xmlns:plainer="clr-namespace:Plainer.Maui.Controls;assembly=Plainer.Maui" x:DataType="vm:ConversationViewModel" ToolTipProperties.Text="{Binding Title}" diff --git a/LM-Kit-Maestro/UI/LinkView.xaml b/LM-Kit-Maestro/UI/LinkView.xaml index c043958..5b157c5 100644 --- a/LM-Kit-Maestro/UI/LinkView.xaml +++ b/LM-Kit-Maestro/UI/LinkView.xaml @@ -1,7 +1,6 @@ diff --git a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml index 4a55b86..9c4d97d 100644 --- a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml +++ b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml @@ -10,7 +10,6 @@ xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" xmlns:razor="clr-namespace:LMKitMaestro.UI.Razor.Components" xmlns:services="clr-namespace:LMKitMaestro.Services" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" x:Class="LMKitMaestro.UI.ChatPage" x:DataType="vm:ChatPageViewModel" diff --git a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml b/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml index 8eb617b..9867aa3 100644 --- a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml +++ b/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml @@ -7,7 +7,6 @@ xmlns:local="clr-namespace:LMKitMaestro" xmlns:models="clr-namespace:LMKitMaestro.Models" xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" xmlns:plainer="clr-namespace:Plainer.Maui.Controls;assembly=Plainer.Maui" xmlns:converters="clr-namespace:LMKitMaestro.Converters" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" diff --git a/LM-Kit-Maestro/UI/Popups/AlertPopup.xaml b/LM-Kit-Maestro/UI/Popups/AlertPopup.xaml index 43ebeb5..d350607 100644 --- a/LM-Kit-Maestro/UI/Popups/AlertPopup.xaml +++ b/LM-Kit-Maestro/UI/Popups/AlertPopup.xaml @@ -10,7 +10,6 @@ xmlns:models="clr-namespace:LMKitMaestro.Models" xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" xmlns:services="clr-namespace:LMKitMaestro.Services" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" x:DataType="vm:AlertPopupViewModel" ShowOkButton="True" diff --git a/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml b/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml index 34ea648..35224d0 100644 --- a/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml +++ b/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml @@ -7,7 +7,6 @@ xmlns:models="clr-namespace:LMKitMaestro.Models" xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" xmlns:plainer="clr-namespace:Plainer.Maui.Controls;assembly=Plainer.Maui" x:DataType="vm:ChatConversationActionPopupViewModel" x:Class="LMKitMaestro.UI.ChatConversationActionPopup"> diff --git a/LM-Kit-Maestro/UI/Popups/ModelSelectionPopup.xaml b/LM-Kit-Maestro/UI/Popups/ModelSelectionPopup.xaml index d8a66e9..35cb92a 100644 --- a/LM-Kit-Maestro/UI/Popups/ModelSelectionPopup.xaml +++ b/LM-Kit-Maestro/UI/Popups/ModelSelectionPopup.xaml @@ -10,7 +10,6 @@ xmlns:models="clr-namespace:LMKitMaestro.Models" xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" xmlns:services="clr-namespace:LMKitMaestro.Services" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" BodyVerticalOptions="Start" ShowOkButton="False" diff --git a/LM-Kit-Maestro/UI/Popups/PopupView.xaml b/LM-Kit-Maestro/UI/Popups/PopupView.xaml index f483db5..1092aa5 100644 --- a/LM-Kit-Maestro/UI/Popups/PopupView.xaml +++ b/LM-Kit-Maestro/UI/Popups/PopupView.xaml @@ -10,7 +10,6 @@ xmlns:models="clr-namespace:LMKitMaestro.Models" xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" xmlns:services="clr-namespace:LMKitMaestro.Services" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" xmlns:uranium="http://schemas.enisn-projects.io/dotnet/maui/uraniumui" x:Class="LMKitMaestro.UI.PopupView" x:Name="popupView"> diff --git a/LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml b/LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml index f150dd1..4f415d4 100644 --- a/LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml +++ b/LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml @@ -5,7 +5,6 @@ xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit" xmlns:ui="clr-namespace:LMKitMaestro.UI" xmlns:vm="clr-namespace:LMKitMaestro.ViewModels" - xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons" x:DataType="vm:UnsortedModelFilesPopupViewModel" ShowOkButton="True" ShowCloseButton="False"