From 427d6dbca8a37c24f16e3b141ca16d74970549cc Mon Sep 17 00:00:00 2001
From: thecodrr <thecodrr@protonmail.com>
Date: Wed, 29 Sep 2021 14:02:47 +0500
Subject: [PATCH] feat: improve desktop theme switching

---
 apps/web/desktop/config/theme.js               | 10 ++++++----
 apps/web/desktop/electron.js                   |  4 +++-
 apps/web/desktop/ipc/actions/changeAppTheme.js |  3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/web/desktop/config/theme.js b/apps/web/desktop/config/theme.js
index fcb341b6d..144500027 100644
--- a/apps/web/desktop/config/theme.js
+++ b/apps/web/desktop/config/theme.js
@@ -1,17 +1,19 @@
 const storage = require("electron-data-storage").default;
+const { nativeTheme } = require("electron");
 
 function getTheme() {
   return storage.getSync("theme") || "light";
 }
 
 function setTheme(theme) {
+  nativeTheme.themeSource = theme;
+  if (global.win) global.win.setBackgroundColor(getBackgroundColor(theme));
   return storage.set("theme", theme);
 }
 
-function getBackgroundColor() {
-  const theme = getTheme();
-  console.log("THEME", theme);
-  return theme === "dark" ? "#0f0f0f" : "#fff";
+function getBackgroundColor(theme) {
+  if (!theme) theme = getTheme();
+  return theme === "dark" ? "#0f0f0f" : "#ffffff";
 }
 
 module.exports = { getTheme, setTheme, getBackgroundColor };
diff --git a/apps/web/desktop/electron.js b/apps/web/desktop/electron.js
index 87385b142..30c2ec969 100644
--- a/apps/web/desktop/electron.js
+++ b/apps/web/desktop/electron.js
@@ -4,7 +4,7 @@ const os = require("os");
 const { isDevelopment } = require("./utils");
 const { registerProtocol, URL } = require("./protocol");
 const { configureAutoUpdater } = require("./autoupdate");
-const { getBackgroundColor } = require("./config/theme");
+const { getBackgroundColor, getTheme, setTheme } = require("./config/theme");
 const getZoomFactor = require("./ipc/calls/getZoomFactor");
 const { logger } = require("./logger");
 require("./ipc/index.js");
@@ -17,6 +17,7 @@ let mainWindow;
 async function createWindow() {
   mainWindow = new BrowserWindow({
     backgroundColor: getBackgroundColor(),
+    darkTheme: getTheme() === "dark",
     autoHideMenuBar: true,
     icon: path.join(
       __dirname,
@@ -34,6 +35,7 @@ async function createWindow() {
     },
   });
   global.win = mainWindow;
+  setTheme(getTheme());
 
   if (isDevelopment())
     mainWindow.webContents.openDevTools({ mode: "right", activate: true });
diff --git a/apps/web/desktop/ipc/actions/changeAppTheme.js b/apps/web/desktop/ipc/actions/changeAppTheme.js
index deda293b4..c3c4205e1 100644
--- a/apps/web/desktop/ipc/actions/changeAppTheme.js
+++ b/apps/web/desktop/ipc/actions/changeAppTheme.js
@@ -1,8 +1,7 @@
-const { setTheme, getBackgroundColor } = require("../../config/theme");
+const { setTheme } = require("../../config/theme");
 
 module.exports = async (args) => {
   if (!global.win) return;
   const { theme } = args;
   await setTheme(theme);
-  global.win.setBackgroundColor(getBackgroundColor());
 };