diff options
Diffstat (limited to 'src/stores/UIStore.js')
-rw-r--r-- | src/stores/UIStore.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js index d37ebe4c7..a95a8e1e0 100644 --- a/src/stores/UIStore.js +++ b/src/stores/UIStore.js | |||
@@ -1,8 +1,7 @@ | |||
1 | import { action, observable, computed } from 'mobx'; | 1 | import { action, observable, computed } from 'mobx'; |
2 | import { theme } from '@meetfranz/theme'; | ||
2 | 3 | ||
3 | import Store from './lib/Store'; | 4 | import Store from './lib/Store'; |
4 | import * as themeDefault from '../theme/default'; | ||
5 | import * as themeDark from '../theme/dark'; | ||
6 | 5 | ||
7 | export default class UIStore extends Store { | 6 | export default class UIStore extends Store { |
8 | @observable showServicesUpdatedInfoBar = false; | 7 | @observable showServicesUpdatedInfoBar = false; |
@@ -22,12 +21,13 @@ export default class UIStore extends Store { | |||
22 | return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted; | 21 | return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted; |
23 | } | 22 | } |
24 | 23 | ||
25 | @computed get theme() { | 24 | @computed get isDarkThemeActive() { |
26 | if (this.stores.settings.all.app.darkMode) { | 25 | return this.stores.settings.all.app.darkMode; |
27 | return Object.assign({}, themeDefault, themeDark); | 26 | } |
28 | } | ||
29 | 27 | ||
30 | return themeDefault; | 28 | @computed get theme() { |
29 | if (this.isDarkThemeActive) return theme('dark'); | ||
30 | return theme('default'); | ||
31 | } | 31 | } |
32 | 32 | ||
33 | // Actions | 33 | // Actions |