remove uranium ui icons package reference

LM-Kit · Nov 22, 2024 · a2a7f1e · a2a7f1e
1 parent 8b9fd0b
commit a2a7f1e
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 21 deletions.
diff --git a/LM-Kit-Maestro/LM-Kit-Maestro.csproj b/LM-Kit-Maestro/LM-Kit-Maestro.csproj
@@ -85,8 +85,6 @@
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 		<PackageReference Include="System.Text.Json" Version="9.0.0" />
 		<PackageReference Include="UraniumUI" Version="2.10.2" />
-		<PackageReference Include="UraniumUI.Icons.FontAwesome" Version="2.10.2" />
-		<PackageReference Include="UraniumUI.Icons.MaterialIcons" Version="2.10.2" />
 		<PackageReference Include="UraniumUI.Material" Version="2.10.2" />
 	</ItemGroup>
 

diff --git 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
@@ -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
@@ -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 @@
                         </DataTrigger>
 
                         <DataTrigger TargetType="Button" Binding="{Binding AwaitingResponse}" Value="True">
-                            <Setter Property="Text" Value="{x:Static fa:Solid.Stop}"/>
+                            <Setter Property="Text" Value="{StaticResource Stop}"/>
                             <Setter Property="Command" Value="{Binding CancelCommand}"/>
                             <Setter Property="IsEnabled" Value="True"/>
                         </DataTrigger>

diff --git 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             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.LinkView"
              x:Name="linkView"

diff --git a/LM-Kit-Maestro/UI/ModelSelectionButton.xaml b/LM-Kit-Maestro/UI/ModelSelectionButton.xaml
@@ -9,7 +9,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.ModelSelectionButton"
              x:DataType="vm:ModelListViewModel"

diff --git a/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml b/LM-Kit-Maestro/UI/Pages/AssistantsPage.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:DataType="vm:AssistantsPageViewModel"
              x:Class="LMKitMaestro.UI.AssistantsPage">

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"