Update font loading

sotasan · Sep 6, 2023 · 36badec · 36badec
1 parent 04cce66
commit 36badec
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 196 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,8 +25,9 @@ dependencies {
     implementation("com.fifesoft:rsyntaxtextarea:3.3.4")
     implementation("com.formdev:flatlaf:3.2.1")
     implementation("com.formdev:flatlaf-extras:3.2.1")
+    implementation("com.formdev:flatlaf-fonts-inter:3.19")
+    implementation("com.formdev:flatlaf-fonts-jetbrains-mono:2.242")
     implementation("com.miglayout:miglayout:3.7.4")
-    implementation("io.github.classgraph:classgraph:4.8.162")
     implementation("org.benf:cfr:0.152")
     implementation("org.bitbucket.mstrobel:procyon-compilertools:0.6.0")
     implementation("org.jetbrains:annotations:24.0.1")

diff --git a/src/main/java/com/sotasan/decompiler/Main.java b/src/main/java/com/sotasan/decompiler/Main.java
@@ -3,16 +3,14 @@
 import com.formdev.flatlaf.FlatDarkLaf;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.extras.FlatInspector;
+import com.formdev.flatlaf.fonts.inter.FlatInterFont;
+import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
 import com.sotasan.decompiler.controllers.WindowController;
 import com.sotasan.decompiler.services.LoaderService;
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.Resource;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
-import java.awt.*;
 import java.io.File;
-import java.util.Objects;
 
 @UtilityClass
 public class Main {
@@ -23,9 +21,9 @@ public static void main(String @NotNull [] args) {
         System.setProperty("apple.awt.application.name", "Decompiler");
         System.setProperty("apple.awt.application.appearance", "NSAppearanceNameDarkAqua");
 
-        for (Resource font : new ClassGraph().acceptPaths("fonts").scan().getResourcesWithExtension("ttf"))
-            GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont(Font.createFont(Font.PLAIN, Objects.requireNonNull(Main.class.getClassLoader().getResourceAsStream(font.getPath()))));
-
+        FlatInterFont.install();
+        FlatJetBrainsMonoFont.install();
+        FlatLaf.setPreferredFontFamily(FlatInterFont.FAMILY);
         FlatLaf.registerCustomDefaultsSource("themes");
         FlatDarkLaf.setup();
         FlatInspector.install("meta shift I");

diff --git a/src/main/resources/fonts/Inter/Inter.ttf b/src/main/resources/fonts/Inter/Inter.ttf
diff --git a/src/main/resources/fonts/Inter/LICENSE.txt b/src/main/resources/fonts/Inter/LICENSE.txt
diff --git a/src/main/resources/fonts/JetBrainsMono/JetBrainsMono-Italic.ttf b/src/main/resources/fonts/JetBrainsMono/JetBrainsMono-Italic.ttf
diff --git a/src/main/resources/fonts/JetBrainsMono/JetBrainsMono.ttf b/src/main/resources/fonts/JetBrainsMono/JetBrainsMono.ttf
diff --git a/src/main/resources/fonts/JetBrainsMono/LICENSE.txt b/src/main/resources/fonts/JetBrainsMono/LICENSE.txt
diff --git a/src/main/resources/themes/FlatLaf.properties b/src/main/resources/themes/FlatLaf.properties
@@ -1,4 +1,3 @@
-defaultFont=Inter
 @accentColor=#D08770
 @background=#3B4252
 @componentBackground=#4C566A