Merge branch 'pr/2'

app/view/main/MainController.js

@@ -1,3 +1,5 @@
+const darkreader = require('darkreader');
+
 Ext.define('Rambox.view.main.MainController', {
 	 extend: 'Ext.app.ViewController'
 
@@ -6,6 +8,11 @@ Ext.define('Rambox.view.main.MainController', {
 	,initialize: function( tabPanel ) {
 		const config = ipc.sendSync('getConfig');
 
+		if (config.darkreader) {
+			darkreader.enable();
+		} else {
+			darkreader.disable();
+		}
 		tabPanel.setTabPosition(config.tabbar_location);
 		tabPanel.setTabRotation(0);
 

app/view/preferences/Preferences.js

@@ -147,6 +147,12 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,boxLabel: locale['preferences[4]']
 						,value: config.start_minimized
 					}
+					,{
+						 xtype: 'checkbox'
+						,name: 'darkreader'
+						,boxLabel: locale['preferences[29]']
+						,value: config.darkreader
+					}
 					,{
 						 xtype: 'checkbox'
 						,name: 'hide_menu_bar'

electron/main.js

@@ -34,36 +34,37 @@ if (isDev)
 // Initial Config
 const config = new Config({
 	 defaults: {
-    always_on_top: false,
-    hide_menu_bar: false,
-    tabbar_location: "top",
-    hide_tabbar_labels: false,
-    window_display_behavior: "taskbar_tray",
-    auto_launch: !isDev,
-    flash_frame: true,
-    window_close_behavior: "keep_in_tray",
-    start_minimized: false,
-    systemtray_indicator: true,
-    master_password: false,
-    dont_disturb: false,
-    disable_gpu: process.platform === "linux",
-    proxy: false,
-    proxyHost: "",
-    proxyPort: "",
-    proxyLogin: "",
-    proxyPassword: "",
-    locale: "en",
-    enable_hidpi_support: false,
-    user_agent: "",
-    default_service: "ramboxTab",
-    sendStatistics: false,
-
-    x: undefined,
-    y: undefined,
-    width: 1000,
-    height: 800,
-    maximized: false,
-  },
+		 always_on_top: false
+		,hide_menu_bar: false
+		,tabbar_location: 'top'
+		,hide_tabbar_labels: false
+		,window_display_behavior: 'taskbar_tray'
+		,auto_launch: !isDev
+		,flash_frame: true
+		,window_close_behavior: 'keep_in_tray'
+		,start_minimized: false
+		,darkreader: true
+		,systemtray_indicator: true
+		,master_password: false
+		,dont_disturb: false
+		,disable_gpu: process.platform === 'linux'
+		,proxy: false
+		,proxyHost: ''
+		,proxyPort: ''
+		,proxyLogin: ''
+		,proxyPassword: ''
+		,locale: 'en'
+		,enable_hidpi_support: false
+		,user_agent: ''
+		,default_service: 'ramboxTab'
+		,sendStatistics: false
+
+		,x: undefined
+		,y: undefined
+		,width: 1000
+		,height: 800
+		,maximized: false
+	}
 });
 
 // Fix issues with HiDPI scaling on Windows platform

package.json

@@ -220,11 +220,13 @@
 		"auth0-js": "9.13.2",
 		"auto-launch-patched": "5.0.2",
 		"crypto": "1.0.1",
+		"darkreader": "4.9.17",
+		"diskusage": "1.1.3",
 		"electron-contextmenu-wrapper": "git+https://github.com/ramboxapp/electron-contextmenu-wrapper.git",
-		"electron-is-dev": "1.2.0",
-		"electron-log": "4.3.0",
-		"electron-store": "6.0.1",
-		"electron-updater": "4.3.5",
+		"electron-is-dev": "0.3.0",
+		"electron-log": "2.2.17",
+		"electron-store": "6.0.0",
+		"electron-updater": "4.1.2",
 		"is-online": "8.2.0",
 		"mime": "2.3.1",
 		"mousetrap": "1.6.3",

resources/js/darkreader.js

@@ -0,0 +1,14 @@
+const { ipcRenderer } = require('electron');
+const darkreader = require('darkreader');
+darkreader.setFetchMethod(window.fetch);
+
+
+const getIsEnabled = () => ipcRenderer.sendSync('getConfig').darkreader; 
+const canEnable = () => document.readyState === 'complete' || document.readyState === 'interactive';
+
+document.addEventListener('readystatechange', () => {
+    console.log(document.readyState)
+    if (canEnable()) {
+        getIsEnabled()? darkreader.enable(): darkreader.disable();
+    }
+});

resources/js/rambox-service-api.js

@@ -3,10 +3,9 @@
  */
 
 const { desktopCapturer, ipcRenderer } = require("electron");
-const {
-  ContextMenuBuilder,
-  ContextMenuListener,
-} = require("electron-contextmenu-wrapper");
+require("./darkreader.js")
+const { ipcRenderer } = require('electron');
+const { ContextMenuBuilder, ContextMenuListener } = require('electron-contextmenu-wrapper');
 
 /**
  * Make the Rambox API available via a global "rambox" variable.