diff options
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 2 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index f63fe3717..c61783e88 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -31,6 +31,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
31 | settings, | 31 | settings, |
32 | globalError, | 32 | globalError, |
33 | requests, | 33 | requests, |
34 | darkMode, | ||
34 | } = this.props.stores; | 35 | } = this.props.stores; |
35 | 36 | ||
36 | const { | 37 | const { |
@@ -120,6 +121,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
120 | areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful} | 121 | areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful} |
121 | retryRequiredRequests={retryRequiredRequests} | 122 | retryRequiredRequests={retryRequiredRequests} |
122 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} | 123 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} |
124 | darkMode={settings.all.app.darkMode} | ||
123 | > | 125 | > |
124 | {React.Children.count(children) > 0 ? children : null} | 126 | {React.Children.count(children) > 0 ? children : null} |
125 | </AppLayout> | 127 | </AppLayout> |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 0b3ad0389..df6442eb8 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -39,6 +39,10 @@ const messages = defineMessages({ | |||
39 | id: 'settings.app.form.language', | 39 | id: 'settings.app.form.language', |
40 | defaultMessage: '!!!Language', | 40 | defaultMessage: '!!!Language', |
41 | }, | 41 | }, |
42 | darkMode: { | ||
43 | id: 'settings.app.form.darkMode', | ||
44 | defaultMessage: '!!!Dark Mode', | ||
45 | }, | ||
42 | showDisabledServices: { | 46 | showDisabledServices: { |
43 | id: 'settings.app.form.showDisabledServices', | 47 | id: 'settings.app.form.showDisabledServices', |
44 | defaultMessage: '!!!Display disabled services tabs', | 48 | defaultMessage: '!!!Display disabled services tabs', |
@@ -90,6 +94,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
90 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 94 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
91 | enableGPUAcceleration: settingsData.enableGPUAcceleration, | 95 | enableGPUAcceleration: settingsData.enableGPUAcceleration, |
92 | showDisabledServices: settingsData.showDisabledServices, | 96 | showDisabledServices: settingsData.showDisabledServices, |
97 | darkMode: settingsData.darkMode, | ||
93 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, | 98 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, |
94 | enableSpellchecking: settingsData.enableSpellchecking, | 99 | enableSpellchecking: settingsData.enableSpellchecking, |
95 | beta: settingsData.beta, // we need this info in the main process as well | 100 | beta: settingsData.beta, // we need this info in the main process as well |
@@ -159,6 +164,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
159 | value: settings.all.app.enableSpellchecking, | 164 | value: settings.all.app.enableSpellchecking, |
160 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, | 165 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, |
161 | }, | 166 | }, |
167 | darkMode: { | ||
168 | label: intl.formatMessage(messages.darkMode), | ||
169 | value: settings.all.app.darkMode, | ||
170 | default: DEFAULT_APP_SETTINGS.darkMode, | ||
171 | }, | ||
162 | enableGPUAcceleration: { | 172 | enableGPUAcceleration: { |
163 | label: intl.formatMessage(messages.enableGPUAcceleration), | 173 | label: intl.formatMessage(messages.enableGPUAcceleration), |
164 | value: settings.all.app.enableGPUAcceleration, | 174 | value: settings.all.app.enableGPUAcceleration, |