Merge pull request #9 from LM-Kit/icons-refactoring

Icons refactoring
LM-Kit · Nov 22, 2024 · 03f0940 · 03f0940
2 parents e6fdc01 + 729a094
commit 03f0940
Show file tree

Hide file tree

Showing 23 changed files with 1,474 additions and 70 deletions.
diff --git a/LM-Kit-Maestro/App.xaml b/LM-Kit-Maestro/App.xaml
@@ -16,7 +16,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary x:Name="colors" Source="Resources/Styles/Colors.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
-
+                <ResourceDictionary Source="Resources/Styles/Icons.xaml"/>
                 <!--<material:StyleResource ColorsOverride="{x:Reference colors}">
                     <material:StyleResource.Overrides>
                         <ResourceDictionary Source="Resources/Styles/Styles.xaml"/>

diff --git a/LM-Kit-Maestro/LM-Kit-Maestro.csproj b/LM-Kit-Maestro/LM-Kit-Maestro.csproj
@@ -57,10 +57,6 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<None Remove="Resources\Fonts\FontAwesome.otf" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<MauiCss Include="wwwroot\css\font-awesome.css" />
 		<MauiCss Include="wwwroot\css\font-awesome.min.css" />
@@ -89,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>
 
@@ -113,6 +107,9 @@
 		<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>

diff --git a/LM-Kit-Maestro/MauiProgram.cs b/LM-Kit-Maestro/MauiProgram.cs
@@ -31,8 +31,6 @@ public static MauiApp CreateMauiApp()
                 .ConfigureMopups()
                 .ConfigureFonts(fonts =>
                 {
-                    fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-                    fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
                     // Roboto
                     fonts.AddFont("Roboto-Thin.ttf", "RobotoThin");
                     fonts.AddFont("Roboto-Light.ttf", "RobotoLight");
@@ -46,8 +44,9 @@ public static MauiApp CreateMauiApp()
                     fonts.AddFont("Segoe UI.ttf", "Segoe");
                     fonts.AddFont("Segoe UI Bold.ttf", "SegoeBold");
 
-                    fonts.AddFontAwesomeIconFonts();
-                    fonts.AddMaterialIconFonts();
+                    // FontAwesome
+                    fonts.AddFont("Font Awesome 6 Free-Regular-400.otf", "FARegular");
+                    fonts.AddFont("Font Awesome 6 Free-Solid-900.otf", "FASolid");
                 })
                 .ConfigureMauiHandlers(handlers =>
                 {

diff --git a/LM-Kit-Maestro/Resources/Fonts/Font Awesome 6 Free-Regular-400.otf b/LM-Kit-Maestro/Resources/Fonts/Font Awesome 6 Free-Regular-400.otf
diff --git a/LM-Kit-Maestro/Resources/Fonts/Font Awesome 6 Free-Solid-900.otf b/LM-Kit-Maestro/Resources/Fonts/Font Awesome 6 Free-Solid-900.otf
diff --git a/LM-Kit-Maestro/Resources/Fonts/FontAwesome.otf b/LM-Kit-Maestro/Resources/Fonts/FontAwesome.otf
diff --git a/LM-Kit-Maestro/Resources/Styles/Icons.xaml b/LM-Kit-Maestro/Resources/Styles/Icons.xaml
diff --git a/LM-Kit-Maestro/Resources/Styles/Icons.xaml.cs b/LM-Kit-Maestro/Resources/Styles/Icons.xaml.cs
@@ -0,0 +1,9 @@
+namespace LMKitMaestro.Resources.Styles;
+
+public partial class Icons : ResourceDictionary
+{
+	public Icons()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/LM-Kit-Maestro/Resources/Styles/Styles.xaml b/LM-Kit-Maestro/Resources/Styles/Styles.xaml
@@ -96,8 +96,8 @@
         <Setter Property="WidthRequest" Value="{x:Static local:AppConstants.ChatPageToggleButtonWidth}"/>
         <Setter Property="HeightRequest" Value="{x:Static local:AppConstants.ChatPageToggleButtonWidth}"/>
         <Setter Property="VerticalOptions" Value="Center"/>
-        <Setter Property="FontFamily" Value="MaterialRegular"/>
-        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="FontFamily" Value="FASolid"/>
+        <Setter Property="FontSize" Value="12"/>
         <Setter Property="Padding" Value="8"/>
         <Setter Property="BorderWidth" Value="0"/>
         <Setter Property="TextColor" Value="{StaticResource OnBackground}" />
@@ -129,10 +129,10 @@
     </Style>
 
     <Style x:Key="SecondaryActionButtonStyle" TargetType="Button">
-        <Setter Property="FontFamily" Value="MaterialRegular"/>
+        <Setter Property="FontFamily" Value="FASolid"/>
         <Setter Property="CornerRadius" Value="16"/>
         <Setter Property="Padding" Value="8"/>
-        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="FontSize" Value="12"/>
         <Setter Property="WidthRequest" Value="{x:Static local:AppConstants.ChatPageToggleButtonWidth}"/>
         <Setter Property="HeightRequest" Value="{x:Static local:AppConstants.ChatPageToggleButtonWidth}"/>
         <Setter Property="BackgroundColor" Value="{StaticResource Background}"/>
@@ -278,6 +278,16 @@
         </Setter>
     </Style>
 
+    <Style TargetType="Label" Class="IconSmall">
+        <Setter Property="FontFamily" Value="FASolid"/>
+        <Setter Property="FontSize" Value="9"/>
+    </Style>
+
+    <Style TargetType="Label" Class="Icon">
+        <Setter Property="FontFamily" Value="FASolid"/>
+        <Setter Property="FontSize" Value="12"/>
+    </Style>
+
     <Style TargetType="Span">
         <Setter Property="TextColor" Value="{StaticResource OnBackground}" />
     </Style>

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/ChatSettingsView.xaml b/LM-Kit-Maestro/UI/ChatSettingsView.xaml
@@ -10,7 +10,6 @@
              xmlns:controls="clr-namespace:LMKitMaestro.Controls"
              xmlns:plainer="clr-namespace:Plainer.Maui.Controls;assembly=Plainer.Maui"
              xmlns:local="clr-namespace:LMKitMaestro"
-             xmlns:icons="clr-namespace:UraniumUI.Icons.MaterialIcons;assembly=UraniumUI.Icons.MaterialIcons"
              x:DataType="vm:SettingsViewModel"
              x:Name="chatSettingsView"
              >
@@ -166,13 +165,13 @@
                         <Grid RowDefinitions="*, auto">
                             <HorizontalStackLayout Padding="16" Spacing="8">
                                 <Label Text="General settings"/>
-                                <Label VerticalOptions="Center" FontFamily="MaterialRegular">
+                                <Label VerticalOptions="Center" StyleClass="IconSmall">
                                     <Label.Triggers>
                                         <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference generalSettingsExpander}, Path=IsExpanded}" Value="True">
-                                            <Setter Property="Text" Value="{x:Static icons:MaterialRegular.Keyboard_arrow_up}"/>
+                                            <Setter Property="Text" Value="{StaticResource ChevronUp}"/>
                                         </DataTrigger>
                                         <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference generalSettingsExpander}, Path=IsExpanded}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static icons:MaterialRegular.Keyboard_arrow_right}"/>
+                                            <Setter Property="Text" Value="{StaticResource ChevronDown}"/>
                                         </DataTrigger>
                                     </Label.Triggers>
                                 </Label>
@@ -272,13 +271,16 @@
                         <Grid RowDefinitions="*, auto">
                             <HorizontalStackLayout Padding="16" Spacing="8">
                                 <Label Text="Sampling configuration"/>
-                                <Label VerticalOptions="Center" FontFamily="MaterialRegular" Text="{x:Static icons:MaterialRegular.Keyboard_arrow_right}">
+                                <Label 
+                                    VerticalOptions="Center" 
+                                    StyleClass="IconSmall"
+                                    Text="{StaticResource ChevronRight}">
                                     <Label.Triggers>
                                         <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference samplingSettingsExpander}, Path=IsExpanded}" Value="True">
-                                            <Setter Property="Text" Value="{x:Static icons:MaterialRegular.Keyboard_arrow_up}"/>
+                                            <Setter Property="Text" Value="{StaticResource ChevronUp}"/>
                                         </DataTrigger>
                                         <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference samplingSettingsExpander}, Path=IsExpanded}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static icons:MaterialRegular.Keyboard_arrow_right}"/>
+                                            <Setter Property="Text" Value="{StaticResource ChevronDown}"/>
                                         </DataTrigger>
                                     </Label.Triggers>
                                 </Label>

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>
@@ -207,12 +205,12 @@
                         x:Name="reloadIcon"
                         Margin="2, 0"
                         IsVisible="False"
-                        FontSize="13"
                         TranslationX="{Binding Source={x:Reference reloadLabel}, Path=Width}"
-                        FontFamily="MaterialRegular" 
                         VerticalOptions="Center"
                         TextColor="{StaticResource Outline}" 
-                        Text="{x:Static icons:MaterialRegular.Refresh}"/>
+                        StyleClass="Icon"
+                        Text="{StaticResource RotateRight}"
+                        />
                 </Grid>
             </uranium:StatefulContentView>
         </Grid>

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}"
@@ -163,9 +162,10 @@
                     StyleClass="RegularAction"
                     ZIndex="2"
                     Grid.Column="2"
-                    FontSize="20"
+                    FontSize="16"
                     Clicked="OnShowMoreButtonClicked"
-                    Text="{x:Static icons:MaterialRegular.More_horiz}">
+                    FontFamily="FASolid"
+                    Text="{StaticResource Ellipsis}">
                     <Button.IsVisible>
                         <MultiBinding Converter="{StaticResource AnyTrueConverter}">
                             <Binding Path="IsHovered"/>

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"
@@ -39,7 +38,12 @@
         TappedCommand="{Binding Command}"
         Tapped="OnLinkClicked">
         <HorizontalStackLayout Spacing="4" HorizontalOptions="Center">
-            <Label TextColor="{Binding TextColor}" VerticalOptions="Center" Text="{Binding Icon}" FontFamily="MaterialRegular"/>
+            <Label 
+                TextColor="{Binding TextColor}" 
+                VerticalOptions="Center" 
+                StyleClass="Icon"
+                Text="{Binding Icon}" />
+
             <Label 
                 FontSize="{Binding FontSize}"
                 FontFamily="{Binding FontFamily}"

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"
@@ -27,8 +26,8 @@
                 <Setter Property="Padding" Value="0"/>
                 <Setter Property="ToolTipProperties.Text" Value="Eject model"/>
                 <Setter Property="TextColor" Value="{StaticResource Primary}"/>
-                <Setter Property="FontFamily" Value="MaterialSharp"/>
-                <Setter Property="Text" Value="{x:Static icons:MaterialSharp.Eject}"/>
+                <Setter Property="FontFamily" Value="FASolid"/>
+                <Setter Property="Text" Value="{StaticResource Eject}"/>
                 <Setter Property="VisualStateManager.VisualStateGroups">
                     <VisualStateGroupList>
                         <VisualStateGroup x:Name="CommonStates">
@@ -173,9 +172,9 @@
                         HorizontalOptions="End"
                         Grid.Column="2"
                         VerticalOptions="Center"
-                        FontFamily="MaterialRegular"
+                        StyleClass="IconSmall"
                         TextColor="{StaticResource Outline}"
-                        Text="{x:Static icons:MaterialRegular.Keyboard_arrow_down}">
+                        Text="{StaticResource ChevronDown}">
                         <Label.Triggers>
                             <DataTrigger TargetType="Label" Binding="{Binding Source={x:RelativeSource AncestorType={x:Type vm:AppShellViewModel}}, Path=AppIsInitialized}" Value="False">
                                 <Setter Property="IsVisible" Value="False"/>

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"
@@ -44,7 +43,7 @@
                     <Button
                       Margin="12, 0"
                       Style="{StaticResource SidebarToggleButtonStyle}"
-                      Text="{x:Static icons:MaterialRegular.Settings}"
+                      Text="{StaticResource Gear}"
                       Command="{Binding ToggleSettingsSidebarCommand}"
                       HorizontalOptions="End"
                       Grid.Column="2"/>
@@ -90,7 +89,7 @@
 
                 <Button
                     Style="{StaticResource SidebarToggleButtonStyle}"
-                    Text="{x:Static icons:MaterialRegular.Forum}"
+                    Text="{StaticResource Comments}"
                     Command="{Binding ToggleChatsSidebarCommand}"
                     HorizontalOptions="Start"/>
 
@@ -105,8 +104,8 @@
                     ToolTipProperties.Text="Start a new chat"
                     Style="{StaticResource SecondaryActionButtonStyle}"
                     Grid.Column="2" 
-                    FontFamily="MaterialRegular"
-                    Text="{x:Static icons:MaterialRegular.Add}"
+                    FontFamily="FASolid"
+                    Text="{StaticResource Plus}"
                     Command="{Binding StartNewConversationCommand}"/>
             </Grid>
 
@@ -136,7 +135,7 @@
                     HorizontalOptions="Start"
                     ToolTipProperties.Text="Reset default settings"
                     Style="{StaticResource SecondaryActionButtonStyle}"
-                    Text="{x:Static icons:MaterialRegular.Restart_alt}" 
+                    Text="{StaticResource ArrowRotateLeft}"
                     Command="{Binding SettingsViewModel.ResetDefaultValuesCommand}" />
 
                 <Label 
@@ -148,7 +147,7 @@
                 <Button 
                     Grid.Column="2"
                     Style="{StaticResource SidebarToggleButtonStyle}"
-                    Text="{x:Static icons:MaterialRegular.Settings}"
+                    Text="{StaticResource Gear}"
                     Command="{Binding Source={RelativeSource AncestorType={x:Type vm:ChatPageViewModel}}, Path=ToggleSettingsSidebarCommand}"/>
             </Grid>
         </Grid>