From 5c1aeaca015088272afa12ca76ebbdd78832ea60 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 16 Nov 2018 20:47:22 +0100 Subject: use native electron.systemPreferences.isDarkMode() --- src/stores/AppStore.js | 7 +++---- src/stores/SettingsStore.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index e24160b4c..d1ed2596b 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js @@ -1,11 +1,10 @@ -import { remote, ipcRenderer, shell } from 'electron'; +import { remote, ipcRenderer, shell, systemPreferences } from 'electron'; import { action, computed, observable } from 'mobx'; import moment from 'moment'; import key from 'keymaster'; import { getDoNotDisturb } from '@meetfranz/electron-notification-state'; import AutoLaunch from 'auto-launch'; import prettyBytes from 'pretty-bytes'; -import isDarkMode from '@adlk/mojave-isdarkmode'; import Store from './lib/Store'; import Request from './lib/Request'; @@ -80,7 +79,7 @@ export default class AppStore extends Store { ]); } - async setup() { + setup() { this._appStartsCounter(); // Focus the active service window.addEventListener('focus', this.actions.service.focusActiveService); @@ -163,7 +162,7 @@ export default class AppStore extends Store { this._healthCheck(); - this.isSystemDarkModeEnabled = await isDarkMode(); + this.isSystemDarkModeEnabled = systemPreferences.isDarkMode(); } @computed get cacheSize() { diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 019ec12bb..31165053d 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -1,6 +1,6 @@ +import { systemPreferences } from 'electron'; import { action, computed, observable } from 'mobx'; import localStorage from 'mobx-localstorage'; -import isDarkMode from '@adlk/mojave-isdarkmode'; import Store from './lib/Store'; import SettingsModel from '../models/Settings'; @@ -111,7 +111,7 @@ export default class SettingsStore extends Store { this.actions.settings.update({ type: 'app', data: { - darkMode: await isDarkMode(), + darkMode: systemPreferences.isDarkMode(), }, }); -- cgit v1.2.3-70-g09d2