clean, add backend capability to change theme setting

src/Model/Global/settingsModel.ts

@@ -1,6 +1,5 @@
 // this file is responsible for all settings.
 
-import { Languages } from "../../View/translations";
 import StorageModel, { StorageModelSubPaths, filePaths } from "./storageModel";
 
 export default class SettingsModel {
@@ -10,63 +9,66 @@ export default class SettingsModel {
     username: string;
     firstDayOfWeek: string;
     language: string;
+    theme: string;
 
     // storage
-    setName(newValue: string): void {
+    private storeSetting(pathName: keyof typeof filePaths.settingsModel, value: string): void {
-        this.username = newValue;
         const path = StorageModel.getPath(
             StorageModelSubPaths.SettingsModel,
-            filePaths.settingsModel.username,
+            filePaths.settingsModel[pathName],
         );
-        this.storageModel.write(path, newValue);
+        this.storageModel.write(path, value);
+    }
+
+    setName(newValue: string): void {
+        this.username = newValue;
+        this.storeSetting("username", newValue);
     }
 
     setFirstDayOfWeek(newValue: string): void {
         this.firstDayOfWeek = newValue;
-        const path = StorageModel.getPath(
+        this.storeSetting("firstDayOfWeek", newValue);
-            StorageModelSubPaths.SettingsModel,
-            filePaths.settingsModel.firstDayOfWeek,
-        );
-        this.storageModel.write(path, newValue);
     }
 
     setLanguage(newValue: string): void {
         this.language = newValue;
-        const path = StorageModel.getPath(
+        this.storeSetting("language", newValue);
-            StorageModelSubPaths.SettingsModel,
+    }
-            filePaths.settingsModel.language,
+
-        );
+    setTheme(newValue: string): void {
-        this.storageModel.write(path, newValue);
+        this.theme = newValue;
+        this.storeSetting("theme", newValue);
     }
 
     // load
-    loadUsername(): void {
+    private readSetting(pathName: keyof typeof filePaths.settingsModel): string {
         const path = StorageModel.getPath(
             StorageModelSubPaths.SettingsModel,
-            filePaths.settingsModel.username,
+            filePaths.settingsModel[pathName],
         );
-        const content = this.storageModel.read(path);
+        return this.storageModel.read(path);
+    }
+
+    loadUsername(): void {
+        const content = this.readSetting("username");
         this.username = content ?? "";
     }
 
     loadFirstDayofWeek(): void {
-        const path = StorageModel.getPath(
+        const content = this.readSetting("firstDayOfWeek");
-            StorageModelSubPaths.SettingsModel,
-            filePaths.settingsModel.firstDayOfWeek,
-        );
-        const content = this.storageModel.read(path);
         this.firstDayOfWeek = content ?? "0";
     }
 
     loadLanguage(): void {
-        const path = StorageModel.getPath(
+        const content = this.readSetting("language");
-            StorageModelSubPaths.SettingsModel,
-            filePaths.settingsModel.language,
-        );
-        const content = this.storageModel.read(path);
         this.language = content ?? SettingsModel.getSystemLanguage();
     }
 
+    loadTheme(): void {
+        const content = this.readSetting("theme");
+        this.theme = content ?? ThemeSettings.System;
+    }
+
     // init
     constructor(storageModel: StorageModel) {
         this.storageModel = storageModel;
@@ -87,3 +89,15 @@ export default class SettingsModel {
         }
     }
 }
+
+export enum Languages {
+    English = "en",
+    German = "de",
+    Spanish = "es",
+}
+
+export enum ThemeSettings {
+    Dark = "dark",
+    Light = "light",
+    System = "system",
+}

src/Model/Global/storageModel.ts

@@ -266,5 +266,6 @@ export const filePaths = {
         username: ["user-name"],
         firstDayOfWeek: ["first-day-of-week"],
         language: ["language"],
+        theme: ["theme"],
     },
 };

src/View/Modals/settingsModal.tsx

@@ -1,6 +1,6 @@
 import * as React from "bloatless-react";
 
-import { languageNames, Languages } from "../translations";
+import { languageNames } from "../translations";
 import SettingsViewModel, {
     SettingsModalPages,
 } from "../../ViewModel/Global/settingsViewModel";
@@ -8,6 +8,7 @@ import { SplitModal } from "../Components/splitModal";
 import { InfoTile } from "../Components/infoTile";
 import { Option } from "../Components/option";
 import CoreViewModel from "../../ViewModel/Global/coreViewModel";
+import { Languages } from "../../Model/Global/settingsModel";
 
 export function SettingsModal(
     coreViewModel: CoreViewModel,

src/View/translations.ts

@@ -835,8 +835,3 @@ export const languageNames = {
 }
 
 export type Translations = typeof englishTranslations;
-export enum Languages {
-    English = "en",
-    German = "de",
-    Spanish = "es",
-}