wip: use Roboto as the font (not enabled yet)

Raymonf · Oct 15, 2023 · 5dae465 · 5dae465
1 parent f81a570
commit 5dae465
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/BAKKA_Editor.Android/SplashActivity.cs b/BAKKA_Editor.Android/SplashActivity.cs
@@ -14,7 +14,6 @@ public class SplashActivity : AvaloniaSplashActivity<App>
     protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
     {
         return base.CustomizeAppBuilder(builder)
-            .WithInterFont()
             .UseReactiveUI();
     }
 

diff --git a/BAKKA_Editor.Desktop/Program.cs b/BAKKA_Editor.Desktop/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia;
+using Avalonia.Media;
 using Avalonia.ReactiveUI;
 
 namespace BAKKA_Editor.Desktop;
@@ -11,7 +12,8 @@ class Program
     // yet and stuff might break.
     [STAThread]
     public static void Main(string[] args) => BuildAvaloniaApp()
-        .WithInterFont()
+        // TODO: make this platform-specific
+        // .With(new FontManagerOptions { DefaultFamilyName = "avares://BAKKA_Editor/Assets/Roboto-Regular.ttf#Roboto"})
         .StartWithClassicDesktopLifetime(args);
 
     // Avalonia configuration, don't remove; also used by visual designer.

diff --git a/BAKKA_Editor.Web/Program.cs b/BAKKA_Editor.Web/Program.cs
@@ -10,7 +10,6 @@ internal partial class Program
 {
     private static void Main(string[] args) => BuildAvaloniaApp()
         .UseReactiveUI()
-        .WithInterFont()
         .SetupBrowserApp("out");
 
     public static AppBuilder BuildAvaloniaApp()

diff --git a/BAKKA_Editor.iOS/AppDelegate.cs b/BAKKA_Editor.iOS/AppDelegate.cs
@@ -17,7 +17,6 @@ public partial class AppDelegate : AvaloniaAppDelegate<App>
     protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
     {
         return builder
-            .WithInterFont()
             .UseReactiveUI();
     }
 }
diff --git a/BAKKA_Editor/App.axaml b/BAKKA_Editor/App.axaml
@@ -9,8 +9,9 @@
 
     <Application.Resources>
         <!-- FluentAvalonia overrides -->
+        <FontFamily x:Key="Roboto">avares://BAKKA_Editor/Assets/Roboto-Regular.ttf#Roboto</FontFamily>
         <x:Double x:Key="ControlContentThemeFontSize">12</x:Double>
-        <FontFamily x:Key="ContentControlThemeFontFamily">Inter</FontFamily>
+        <FontFamily x:Key="ContentControlThemeFontFamily">Roboto</FontFamily>
     </Application.Resources>
 
     <Application.Styles>

diff --git a/BAKKA_Editor/Assets/Roboto-Regular.ttf b/BAKKA_Editor/Assets/Roboto-Regular.ttf
diff --git a/BAKKA_Editor/BAKKA_Editor.csproj b/BAKKA_Editor/BAKKA_Editor.csproj
@@ -13,7 +13,6 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)"/>