Initial Settings UI work

src/main/index.ts

@@ -1,17 +1,13 @@
 import { app, BrowserWindow } from 'electron';
-import { createMainWindow } from "./mainWindow";
-import { createSplashWindow } from "./splash";
-
 import { join } from "path";
-
-import { DATA_DIR, VENCORD_FILES_DIR } from "./constants";
-
-import { once } from "../shared/utils/once";
-import { ensureVencordFiles } from "./utils/vencordLoader";
-
 import { ICON_PATH } from "../shared/paths";
+import { once } from "../shared/utils/once";
+import { DATA_DIR, VENCORD_FILES_DIR } from "./constants";
 import "./ipc";
+import { createMainWindow } from "./mainWindow";
 import { Settings } from "./settings";
+import { createSplashWindow } from "./splash";
+import { ensureVencordFiles } from "./utils/vencordLoader";
 
 // Make the Vencord files use our DATA_DIR
 process.env.VENCORD_USER_DATA_DIR = DATA_DIR;

src/main/settings.ts

@@ -1,23 +1,12 @@
 import { readFileSync, writeFileSync } from "fs";
 import { join } from "path";
+import type { Settings as TSettings } from "shared/settings";
+import { makeChangeListenerProxy } from "shared/utils/makeChangeListenerProxy";
 import { DATA_DIR } from "./constants";
 
 const SETTINGS_FILE = join(DATA_DIR, "settings.json");
 
-interface Settings {
-    maximized?: boolean;
-    minimized?: boolean;
-    windowBounds?: {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    };
-    discordBranch?: "stable" | "canary" | "ptb";
-    openLinksWithElectron?: boolean;
-}
-
-export let PlainSettings = {} as Settings;
+export let PlainSettings = {} as TSettings;
 try {
     const content = readFileSync(SETTINGS_FILE, "utf8");
     try {
@@ -27,21 +16,14 @@ try {
     }
 } catch { }
 
-function makeSettingsProxy(settings: Settings) {
-    return new Proxy(settings, {
-        set(target, prop, value) {
-            Reflect.set(target, prop, value);
-
-            writeFileSync(SETTINGS_FILE, JSON.stringify(target, null, 4));
-
-            return true;
-        }
-    });
-}
+const makeSettingsProxy = (settings: TSettings) => makeChangeListenerProxy(
+    settings,
+    target => writeFileSync(SETTINGS_FILE, JSON.stringify(target, null, 4))
+);
 
 export let Settings = makeSettingsProxy(PlainSettings);
 
-export function setSettings(settings: Settings) {
+export function setSettings(settings: TSettings) {
     writeFileSync(SETTINGS_FILE, JSON.stringify(settings, null, 4));
     PlainSettings = settings;
     Settings = makeSettingsProxy(settings);