Merge pull request #1082 from benterova/follow-system-theme

Add followSystemTheme config option

app/browser/index.js

@@ -88,5 +88,6 @@ function initializeModules(config, ipcRenderer) {
 	require('./tools/chromeApi')(config);
 	require('./tools/settings').init(config, ipcRenderer);
 	require('./tools/customBackgrounds')(config, ipcRenderer);
+	require('./tools/theme').init(config, ipcRenderer);
 }
 

app/browser/tools/theme.js

@@ -0,0 +1,23 @@
+const instance = require('./instance');
+
+class ThemeManager {
+    /**
+     * @param {object} config
+     * @param {Electron.IpcRenderer} ipcRenderer
+     */
+    init(config, ipcRenderer) {
+        this.ipcRenderer = ipcRenderer;
+        this.config = config;
+        if (config.followSystemTheme) {
+            this.ipcRenderer.on('system-theme-changed', this.applyTheme);
+        }
+    }
+
+    applyTheme = async (event, ...args) => {
+        const theme = args[0] ? 'dark' : 'default';
+        const inst = await instance.whenReady();
+        inst.controller.layoutService.setTheme(theme);
+    }
+}
+
+module.exports = new ThemeManager();

app/config/index.js

@@ -97,6 +97,11 @@ function argv(configPath, appVersion) {
 				describe: 'custom CSS styles file location',
 				type: 'string'
 			},
+			followSystemTheme: {
+				default: false,
+				describe: 'Follow system theme',
+				type: 'boolean'
+			},
 			customUserDir: {
 				default: null,
 				describe: 'Custom User Directory so that you can have multiple profiles',
@@ -126,7 +131,7 @@ function argv(configPath, appVersion) {
 				default: '',
 				describe: 'Default application to be used to open the HTTP URLs',
 				type: 'string'
-			},	 
+			},
 			disableAutogain: {
 				default: false,
 				describe: 'A flag indicates whether to disable mic auto gain or not',

app/mainAppWindow/index.js

@@ -14,7 +14,7 @@ const { execFile, spawn } = require('child_process');
 const TrayIconChooser = require('../browser/tools/trayIconChooser');
 // eslint-disable-next-line no-unused-vars
 const { AppConfiguration } = require('../appConfiguration');
-const connMgr =  require('../connectionManager');
+const connMgr = require('../connectionManager');
 
 /**
  * @type {TrayIconChooser}
@@ -71,7 +71,7 @@ exports.onAppReady = async function onAppReady(mainConfig) {
 	addEventHandlers();
 
 	const url = processArgs(process.argv);
-	connMgr.start(url,{
+	connMgr.start(url, {
 		window: window,
 		config: config
 	});
@@ -155,6 +155,18 @@ function onDidFinishLoad() {
 			tryAgainLink && tryAgainLink.click()
 		`);
 	customCSS.onDidFinishLoad(window.webContents, config);
+	initSystemThemeFollow(config);
+}
+
+function initSystemThemeFollow(config) {
+	if (config.followSystemTheme) {
+		nativeTheme.on('updated', () => {
+			window.webContents.send('system-theme-changed', nativeTheme.shouldUseDarkColors);
+		});
+		setTimeout(() => {
+			window.webContents.send('system-theme-changed', nativeTheme.shouldUseDarkColors);
+		}, 2500);
+	}
 }
 
 function onDidFrameFinishLoad(event, isMainFrame, frameProcessId, frameRoutingId) {
@@ -457,7 +469,7 @@ function assignEventHandlers(newWindow) {
 
 function createNewBrowserWindow(windowState) {
 	return new BrowserWindow({
-		title:'Teams for Linux',
+		title: 'Teams for Linux',
 		x: windowState.x,
 		y: windowState.y,
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",
@@ -126,4 +126,4 @@
     },
     "afterPack": "scripts/afterpack.js"
   }
-}
+}