refactor: move applyFontFamily to ui.ts

Author: Miodec

frontend/src/ts/commandline/lists/font-family.ts

@@ -1,11 +1,12 @@
 import { Command } from "../types";
 import { buildCommandForConfigKey } from "../util";
 import FileStorage from "../../utils/file-storage";
-import { applyFontFamily } from "../../controllers/theme-controller";
+
 import { updateUI } from "../../elements/settings/custom-font-picker";
 import { showNoticeNotification } from "../../states/notifications";
 import { Config } from "../../config/store";
 import { setConfig } from "../../config/setters";
+import { applyFontFamily } from "../../ui";
 const fromMeta = buildCommandForConfigKey("fontFamily");
 
 if (fromMeta.subgroup) {

frontend/src/ts/controllers/theme-controller.ts

@@ -294,32 +294,6 @@ export async function applyCustomBackground(): Promise<void> {
   }
 }
 
-export async function applyFontFamily(): Promise<void> {
-  let font = Config.fontFamily.replace(/_/g, " ");
-
-  const localFont = await fileStorage.getFile("LocalFontFamilyFile");
-  if (localFont === undefined) {
-    //use config font
-    qs(".customFont")?.empty();
-  } else {
-    font = "LOCALCUSTOM";
-
-    qs(".customFont")?.setHtml(`
-      @font-face{ 
-        font-family: LOCALCUSTOM;
-        src: url(${localFont});
-        font-weight: 400;
-        font-style: normal;
-        font-display: block;
-      }`);
-  }
-
-  document.documentElement.style.setProperty(
-    "--font",
-    `"${font}", "Roboto Mono", "Vazirharf", monospace`,
-  );
-}
-
 window
   .matchMedia?.("(prefers-color-scheme: dark)")
   ?.addEventListener?.("change", (event) => {

frontend/src/ts/elements/settings/custom-font-picker.ts

@@ -1,6 +1,6 @@
 import FileStorage from "../../utils/file-storage";
 import { showNoticeNotification } from "../../states/notifications";
-import { applyFontFamily } from "../../controllers/theme-controller";
+import { applyFontFamily } from "../../ui";
 
 const parentEl = document.querySelector(
   ".pageSettings .section[data-config-name='fontFamily']",

frontend/src/ts/ui.ts

@@ -10,9 +10,9 @@ import { isDevEnvironment } from "./utils/env";
 import { isCustomTextLong } from "./legacy-states/custom-text-name";
 import { canQuickRestart } from "./utils/quick-restart";
 import { FontName } from "@monkeytype/schemas/fonts";
-import { applyFontFamily } from "./controllers/theme-controller";
 import { qs, qsr } from "./utils/dom";
 import { createEffect } from "solid-js";
+import fileStorage from "./utils/file-storage";
 import { convertRemToPixels } from "./utils/numbers";
 
 let isPreviewingFont = false;
@@ -27,6 +27,32 @@ export function previewFontFamily(font: FontName): void {
   isPreviewingFont = true;
 }
 
+export async function applyFontFamily(): Promise<void> {
+  let font = Config.fontFamily.replace(/_/g, " ");
+
+  const localFont = await fileStorage.getFile("LocalFontFamilyFile");
+  if (localFont === undefined) {
+    //use config font
+    qs(".customFont")?.empty();
+  } else {
+    font = "LOCALCUSTOM";
+
+    qs(".customFont")?.setHtml(`
+      @font-face{ 
+        font-family: LOCALCUSTOM;
+        src: url(${localFont});
+        font-weight: 400;
+        font-style: normal;
+        font-display: block;
+      }`);
+  }
+
+  document.documentElement.style.setProperty(
+    "--font",
+    `"${font}", "Roboto Mono", "Vazirharf", monospace`,
+  );
+}
+
 export function clearFontPreview(): void {
   if (!isPreviewingFont) return;
   previewFontFamily(Config.fontFamily);