Skip to content

Commit

Permalink
add fontawesome.ttf
Browse files Browse the repository at this point in the history
  • Loading branch information
BeepBeepBopBop committed Nov 23, 2024
1 parent 22cb0e9 commit f804b24
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 16 deletions.
5 changes: 2 additions & 3 deletions LM-Kit-Maestro/MauiProgram.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@ public static MauiApp CreateMauiApp()
fonts.AddFont("Segoe UI Bold.ttf", "SegoeBold");

fonts.AddFont("MaterialIcons-Regular.ttf", "Material");
//fonts.AddFont("fontawesome-webfont.ttf", "Material");
//fonts.AddFont("FontAwesome.ttf", "Material");
fonts.AddFont("Font Awesome 6 Free-Solid-900.ttf", "FA");
// FontAwesome
//fonts.AddFont("Font Awesome 6 Free-Regular-400.otf", "FARegular");
//fonts.AddFont("Font Awesome 6 Free-Solid-900.otf", "Material");
//fonts.AddFont("Font Awesome 6 Free-Solid-900.otf", "FA");
})
.ConfigureMauiHandlers(handlers =>
{
Expand Down
Binary file not shown.
8 changes: 4 additions & 4 deletions LM-Kit-Maestro/Resources/Styles/Styles.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<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="FASolid"/>
<Setter Property="FontFamily" Value="FA"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="Padding" Value="8"/>
<Setter Property="BorderWidth" Value="0"/>
Expand Down Expand Up @@ -128,7 +128,7 @@
</Style>

<Style x:Key="SecondaryActionButtonStyle" TargetType="Button">
<Setter Property="FontFamily" Value="FASolid"/>
<Setter Property="FontFamily" Value="FA"/>
<Setter Property="CornerRadius" Value="16"/>
<Setter Property="Padding" Value="8"/>
<Setter Property="FontSize" Value="12"/>
Expand Down Expand Up @@ -278,12 +278,12 @@
</Style>

<Style TargetType="Label" Class="IconSmall">
<Setter Property="FontFamily" Value="FASolid"/>
<Setter Property="FontFamily" Value="FA"/>
<Setter Property="FontSize" Value="9"/>
</Style>

<Style TargetType="Label" Class="Icon">
<Setter Property="FontFamily" Value="FASolid"/>
<Setter Property="FontFamily" Value="FA"/>
<Setter Property="FontSize" Value="12"/>
</Style>

Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/UI/ConversationListItemView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
Grid.Column="2"
FontSize="16"
Clicked="OnShowMoreButtonClicked"
FontFamily="FASolid"
FontFamily="FA"
Text="{StaticResource Ellipsis}">
<Button.IsVisible>
<MultiBinding Converter="{StaticResource AnyTrueConverter}">
Expand Down
3 changes: 1 addition & 2 deletions LM-Kit-Maestro/UI/ModelSelectionButton.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<Setter Property="Padding" Value="0"/>
<Setter Property="ToolTipProperties.Text" Value="Eject model"/>
<Setter Property="TextColor" Value="{StaticResource Primary}"/>
<Setter Property="FontFamily" Value="FASolid"/>
<Setter Property="FontFamily" Value="FA"/>
<Setter Property="FontSize" Value="9"/>
<Setter Property="Text" Value="{StaticResource Eject}"/>
<Setter Property="VisualStateManager.VisualStateGroups">
Expand Down Expand Up @@ -174,7 +174,6 @@
VerticalOptions="Center"
StyleClass="IconSmall"
TextColor="{StaticResource Outline}"
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"/>
Expand Down
4 changes: 2 additions & 2 deletions LM-Kit-Maestro/UI/Pages/ChatPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

<Button
Style="{StaticResource SidebarToggleButtonStyle}"
Text="{StaticResource Comments}"
Text="{StaticResource ChevronDown}"
Command="{Binding ToggleChatsSidebarCommand}"
HorizontalOptions="Start"/>

Expand All @@ -103,7 +103,7 @@
ToolTipProperties.Text="Start a new chat"
Style="{StaticResource SecondaryActionButtonStyle}"
Grid.Column="2"
FontFamily="FASolid"
FontFamily="FA"
Text="{StaticResource Plus}"
Command="{Binding StartNewConversationCommand}"/>
</Grid>
Expand Down
8 changes: 4 additions & 4 deletions LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@
<Border Style="{StaticResource InnerBorderStyle}" Grid.Row="1">
<VerticalStackLayout Margin="8, 0" Spacing="6">
<HorizontalStackLayout Spacing="8">
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FASolid" Text="{StaticResource Folder}"/>
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FA" Text="{StaticResource Folder}"/>
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" Text="Models folder"/>
</HorizontalStackLayout>

<HorizontalStackLayout Margin="20, 0" Spacing="6">
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FASolid" Text="{StaticResource Folder}"/>
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FA" Text="{StaticResource Folder}"/>
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" Text="Publisher"/>
</HorizontalStackLayout>


<HorizontalStackLayout Margin="40, 0" Spacing="6">
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FASolid" Text="{StaticResource Folder}"/>
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FA" Text="{StaticResource Folder}"/>
<Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" Text="Repository"/>
</HorizontalStackLayout>

<HorizontalStackLayout Margin="60, 0" Spacing="0">
<Label TextColor="Transparent" VerticalOptions="Center" FontFamily="FASolid" Text="{StaticResource Folder}"/>
<Label TextColor="Transparent" VerticalOptions="Center" FontFamily="FA" Text="{StaticResource Folder}"/>
<Label TextColor="{StaticResource Primary}" Text=" model file.gguf"/>
</HorizontalStackLayout>

Expand Down

0 comments on commit f804b24

Please sign in to comment.