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() --- package-lock.json | 23 ----------------------- package.json | 1 - src/stores/AppStore.js | 7 +++---- src/stores/SettingsStore.js | 4 ++-- 4 files changed, 5 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index d75356409..1311b2369 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,29 +82,6 @@ } } }, - "@adlk/mojave-isdarkmode": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@adlk/mojave-isdarkmode/-/mojave-isdarkmode-1.0.1.tgz", - "integrity": "sha512-vNecc2GQfSYZ5znFBbgDTc/VJezg6Rpe/jesTtcBv2ojgAppg9HllxWSrnriWFuSlYmsNI3/WKfvD0ag2768vw==", - "requires": { - "debug": "^4.1.0" - }, - "dependencies": { - "debug": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" - } - } - }, "@babel/code-frame": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", diff --git a/package.json b/package.json index f12cb6001..259e42bda 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "author": "Stefan Malzner ", "license": "Apache-2.0", "dependencies": { - "@adlk/mojave-isdarkmode": "^1.0.1", "@babel/polyfill": "^7.0.0", "@babel/runtime": "^7.0.0", "@meetfranz/electron-notification-state": "^1.0.0", 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