FiraSans font family

src/PixiEditor.AvaloniaUI.Browser/Program.cs

@@ -9,7 +9,6 @@ using PixiEditor.AvaloniaUI;
 internal partial class Program
 {
     private static async Task Main(string[] args) => await BuildAvaloniaApp()
-        .WithInterFont()
         .StartBrowserAppAsync("out");
 
     public static AppBuilder BuildAvaloniaApp()

src/PixiEditor.AvaloniaUI.Desktop/Program.cs

@@ -17,6 +17,5 @@ public class Program
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
-            .WithInterFont()
             .LogToTrace();
 }

src/PixiEditor.AvaloniaUI/PixiEditor.AvaloniaUI.csproj

@@ -59,7 +59,6 @@
     <PackageReference Include="Avalonia.Headless" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="Avalonia.Labs.Lottie" Version="11.0.10.1"/>
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0.18"/>
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
@@ -117,8 +116,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Fonts\" />
-  </ItemGroup>
-
 </Project>

src/PixiEditor.Extensions/FlyUI/Elements/Text.cs

@@ -55,7 +55,7 @@ public class Text : StatelessElement, IPropertyDeserializable
         
         textBlock.Bind(TextBlock.TextProperty, valueBinding);
         textBlock.Bind(TextBlock.TextWrappingProperty, textWrapBinding);
-        textBlock.Bind(TextBlock.FontStyleProperty, fontStyleBinding);
+        textBlock.Bind(TextBlock.FontStyleProperty, fontStyleBinding); //TODO: Inter font doesn't work
         return textBlock;
     }
 

src/PixiEditor.UI.Common/Accents/Base.axaml

@@ -85,8 +85,7 @@
             <SolidColorBrush x:Key="DockThemeControlBackgroundBrush" Color="{DynamicResource ThemeBackground1Color}" />
             <system:Double x:Key="DockFontSizeNormal">12</system:Double>
 
-            <FontFamily x:Key="ContentControlThemeFontFamily">fonts:Inter#Inter, $Default</FontFamily>
-            <FontFamily x:Key="Feather">avares://PixiEditor.UI.Common;/Fonts/feather.ttf</FontFamily>
+            <FontFamily x:Key="ContentControlThemeFontFamily">avares://PixiEditor.UI.Common/Fonts#FiraSans, $Default</FontFamily>
             <system:Double x:Key="FontSizeSmall">10</system:Double>
             <system:Double x:Key="FontSizeNormal">12</system:Double>
             <system:Double x:Key="FontSizeLarge">16</system:Double>

src/PixiEditor.UI.Common/Fonts/FiraSans.axaml

@@ -0,0 +1,8 @@
+<Styles xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <FontFamily x:Key="FiraSans">avares://PixiEditor.UI.Common/Fonts#FiraSans</FontFamily>
+        </ResourceDictionary>
+    </Styles.Resources>
+</Styles>