diff options
author | 2019-10-17 21:48:38 +0200 | |
---|---|---|
committer | 2019-10-17 21:48:38 +0200 | |
commit | c44cb8dc2203262b4ad52210adf40e0d022671eb (patch) | |
tree | 8a3a15a161a048f06203b9ee66763df63ab3c3ba /src/containers | |
parent | Merge pull request #124 from getferdi/l10n_develop (diff) | |
download | ferdium-app-c44cb8dc2203262b4ad52210adf40e0d022671eb.tar.gz ferdium-app-c44cb8dc2203262b4ad52210adf40e0d022671eb.tar.zst ferdium-app-c44cb8dc2203262b4ad52210adf40e0d022671eb.zip |
Add toggle to disable universal dark mode
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 7b0633f79..e5dd2d4fc 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -98,6 +98,10 @@ const messages = defineMessages({ | |||
98 | id: 'settings.app.form.darkMode', | 98 | id: 'settings.app.form.darkMode', |
99 | defaultMessage: '!!!Dark Mode', | 99 | defaultMessage: '!!!Dark Mode', |
100 | }, | 100 | }, |
101 | universalDarkMode: { | ||
102 | id: 'settings.app.form.universalDarkMode', | ||
103 | defaultMessage: '!!!Enable universal Dark Mode', | ||
104 | }, | ||
101 | accentColor: { | 105 | accentColor: { |
102 | id: 'settings.app.form.accentColor', | 106 | id: 'settings.app.form.accentColor', |
103 | defaultMessage: '!!!Accent color', | 107 | defaultMessage: '!!!Accent color', |
@@ -176,6 +180,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
176 | enableGPUAcceleration: settingsData.enableGPUAcceleration, | 180 | enableGPUAcceleration: settingsData.enableGPUAcceleration, |
177 | showDisabledServices: settingsData.showDisabledServices, | 181 | showDisabledServices: settingsData.showDisabledServices, |
178 | darkMode: settingsData.darkMode, | 182 | darkMode: settingsData.darkMode, |
183 | universalDarkMode: settingsData.universalDarkMode, | ||
179 | accentColor: settingsData.accentColor, | 184 | accentColor: settingsData.accentColor, |
180 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, | 185 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, |
181 | enableSpellchecking: settingsData.enableSpellchecking, | 186 | enableSpellchecking: settingsData.enableSpellchecking, |
@@ -345,6 +350,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
345 | value: settings.all.app.darkMode, | 350 | value: settings.all.app.darkMode, |
346 | default: DEFAULT_APP_SETTINGS.darkMode, | 351 | default: DEFAULT_APP_SETTINGS.darkMode, |
347 | }, | 352 | }, |
353 | universalDarkMode: { | ||
354 | label: intl.formatMessage(messages.universalDarkMode), | ||
355 | value: settings.all.app.universalDarkMode, | ||
356 | default: DEFAULT_APP_SETTINGS.universalDarkMode, | ||
357 | }, | ||
348 | accentColor: { | 358 | accentColor: { |
349 | label: intl.formatMessage(messages.accentColor), | 359 | label: intl.formatMessage(messages.accentColor), |
350 | value: settings.all.app.accentColor, | 360 | value: settings.all.app.accentColor, |
@@ -435,6 +445,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
435 | lockingFeatureEnabled={lockingFeatureEnabled} | 445 | lockingFeatureEnabled={lockingFeatureEnabled} |
436 | noUpdates={this.props.stores.settings.app.noUpdates} | 446 | noUpdates={this.props.stores.settings.app.noUpdates} |
437 | hibernationEnabled={this.props.stores.settings.app.hibernate} | 447 | hibernationEnabled={this.props.stores.settings.app.hibernate} |
448 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} | ||
438 | openProcessManager={() => this.openProcessManager()} | 449 | openProcessManager={() => this.openProcessManager()} |
439 | /> | 450 | /> |
440 | </ErrorBoundary> | 451 | </ErrorBoundary> |