Merge branch 'feature/dark-theme' into develop

2 files changed, 30 insertions, 3 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 38edff1b4..76d9bfa53 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -17,7 +17,7 @@ import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '..
 
 const debug = require('debug')('AppStore');
 
-const { app } = remote;
+const { app, systemPreferences } = remote;
 
 const mainWindow = remote.getCurrentWindow();
 
@@ -50,6 +50,8 @@ export default class AppStore extends Store {
 
   @observable isSystemMuteOverridden = false;
 
+  @observable isSystemDarkModeEnabled = false;
+
   @observable isClearingAllCache = false;
 
   @observable isFullScreen = mainWindow.isFullScreen();
@@ -159,6 +161,8 @@ export default class AppStore extends Store {
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
+
+    this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
   }
 
   @computed get cacheSize() {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 9270a6481..4b5715628 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,3 +1,4 @@
+import { remote } from 'electron';
 import { action, computed, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
@@ -6,6 +7,7 @@ import SettingsModel from '../models/Settings';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 
+const { systemPreferences } = remote;
 const debug = require('debug')('SettingsStore');
 
 export default class SettingsStore extends Store {
@@ -23,7 +25,7 @@ export default class SettingsStore extends Store {
   async setup() {
     // We need to wait until `appSettingsRequest` has been executed once, otherwise we can't patch the result. If we don't wait we'd run into an issue with mobx not reacting to changes of previously not existing keys
     await this.appSettingsRequest._promise;
-    this._migrate();
+    await this._migrate();
   }
 
   @computed get all() {
@@ -67,7 +69,7 @@ export default class SettingsStore extends Store {
   }
 
   // Helper
-  _migrate() {
+  async _migrate() {
     const legacySettings = localStorage.getItem('app') || {};
 
     if (!this.all.migration['5.0.0-beta.17-settings']) {
@@ -104,5 +106,26 @@ export default class SettingsStore extends Store {
 
       debug('Migrated settings to split stores');
     }
+
+    // Enable dark mode once
+    if (!this.all.migration['5.0.0-beta.19-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          darkMode: systemPreferences.isDarkMode(),
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.19-settings': true,
+        },
+      });
+
+      localStorage.removeItem('app');
+
+      debug('Set up dark mode');
+    }
   }
 }