1 files changed, 169 insertions, 5 deletions

diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 698b5a3d9..ddee82e45 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -1,3 +1,4 @@
+import { ipcRenderer } from 'electron';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
@@ -9,7 +10,7 @@ import UserStore from '../../stores/UserStore';
 import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
-import { DEFAULT_APP_SETTINGS } from '../../config';
+import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
@@ -17,6 +18,8 @@ import { getSelectOptions } from '../../helpers/i18n-helpers';
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
+import { API, TODOS_FRONTEND } from '../../environment';
+
 import globalMessages from '../../i18n/globalMessages';
 import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos';
 import WorkspacesStore from '../../features/workspaces/store';
@@ -25,7 +28,7 @@ import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/works
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
-    defaultMessage: '!!!Launch Franz on start',
+    defaultMessage: '!!!Launch Ferdi on start',
   },
   autoLaunchInBackground: {
     id: 'settings.app.form.autoLaunchInBackground',
@@ -33,15 +36,59 @@ const messages = defineMessages({
   },
   runInBackground: {
     id: 'settings.app.form.runInBackground',
-    defaultMessage: '!!!Keep Franz in background when closing the window',
+    defaultMessage: '!!!Keep Ferdi in background when closing the window',
   },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
-    defaultMessage: '!!!Show Franz in system tray',
+    defaultMessage: '!!!Show Ferdi in system tray',
   },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
-    defaultMessage: '!!!Minimize Franz to system tray',
+    defaultMessage: '!!!Minimize Ferdi to system tray',
+  },
+  privateNotifications: {
+    id: 'settings.app.form.privateNotifications',
+    defaultMessage: '!!!Don\'t show message content in notifications',
+  },
+  showServiceNavigationBar: {
+    id: 'settings.app.form.showServiceNavigationBar',
+    defaultMessage: '!!!Always show service navigation bar',
+  },
+  hibernate: {
+    id: 'settings.app.form.hibernate',
+    defaultMessage: '!!!Enable service hibernation',
+  },
+  hibernationStrategy: {
+    id: 'settings.app.form.hibernationStrategy',
+    defaultMessage: '!!!Hibernation strategy',
+  },
+  server: {
+    id: 'settings.app.form.server',
+    defaultMessage: '!!!Server',
+  },
+  todoServer: {
+    id: 'settings.app.form.todoServer',
+    defaultMessage: '!!!Todo Server',
+  },
+  enableLock: {
+    id: 'settings.app.form.enableLock',
+    defaultMessage: '!!!Enable Ferdi password lock',
+  },
+  lockPassword: {
+    id: 'settings.app.form.lockPassword',
+    defaultMessage: '!!!Ferdi Lock password',
+  },
+  scheduledDNDEnabled: {
+    id: 'settings.app.form.scheduledDNDEnabled',
+    defaultMessage: '!!!Enable scheduled Do-not-Disturb',
+  },
+  scheduledDNDStart: {
+    id: 'settings.app.form.scheduledDNDStart',
+    defaultMessage: '!!!From',
+  },
+  scheduledDNDEnd: {
+    id: 'settings.app.form.scheduledDNDEnd',
+    defaultMessage: '!!!To',
   },
   language: {
     id: 'settings.app.form.language',
@@ -51,6 +98,14 @@ const messages = defineMessages({
     id: 'settings.app.form.darkMode',
     defaultMessage: '!!!Dark Mode',
   },
+  universalDarkMode: {
+    id: 'settings.app.form.universalDarkMode',
+    defaultMessage: '!!!Enable universal Dark Mode',
+  },
+  accentColor: {
+    id: 'settings.app.form.accentColor',
+    defaultMessage: '!!!Accent color',
+  },
   showDisabledServices: {
     id: 'settings.app.form.showDisabledServices',
     defaultMessage: '!!!Display disabled services tabs',
@@ -71,6 +126,10 @@ const messages = defineMessages({
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
   },
+  noUpdates: {
+    id: 'settings.app.form.noUpdates',
+    defaultMessage: '!!!Disable updates',
+  },
   enableTodos: {
     id: 'settings.app.form.enableTodos',
     defaultMessage: '!!!Enable Franz Todos',
@@ -107,19 +166,34 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        privateNotifications: settingsData.privateNotifications,
+        showServiceNavigationBar: settingsData.showServiceNavigationBar,
+        hibernate: settingsData.hibernate,
+        hibernationStrategy: settingsData.hibernationStrategy,
+        server: settingsData.server,
+        todoServer: settingsData.todoServer,
+        lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
+        lockedPassword: settingsData.lockedPassword,
+        scheduledDNDEnabled: settingsData.scheduledDNDEnabled,
+        scheduledDNDStart: settingsData.scheduledDNDStart,
+        scheduledDNDEnd: settingsData.scheduledDNDEnd,
         enableGPUAcceleration: settingsData.enableGPUAcceleration,
         showDisabledServices: settingsData.showDisabledServices,
         darkMode: settingsData.darkMode,
+        universalDarkMode: settingsData.universalDarkMode,
+        accentColor: settingsData.accentColor,
         showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
         enableSpellchecking: settingsData.enableSpellchecking,
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
         beta: settingsData.beta, // we need this info in the main process as well
+        noUpdates: settingsData.noUpdates, // we need this info in the main process as well
         locale: settingsData.locale, // we need this info in the main process as well
       },
     });
 
     user.update({
       userData: {
+        noUpdates: settingsData.noUpdates,
         beta: settingsData.beta,
         locale: settingsData.locale,
       },
@@ -140,6 +214,10 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
     }
   }
 
+  openProcessManager() {
+    ipcRenderer.send('openProcessManager');
+  }
+
   prepareForm() {
     const {
       app, settings, user, todos, workspaces,
@@ -150,6 +228,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       locales: APP_LOCALES,
     });
 
+    const hibernationStrategies = getSelectOptions({
+      locales: HIBERNATION_STRATEGIES,
+      sort: false,
+    });
+
     const spellcheckingLanguages = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
       automaticDetectionText: this.context.intl.formatMessage(globalMessages.spellcheckerAutomaticDetection),
@@ -182,6 +265,65 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.minimizeToSystemTray,
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
+        privateNotifications: {
+          label: intl.formatMessage(messages.privateNotifications),
+          value: settings.all.app.privateNotifications,
+          default: DEFAULT_APP_SETTINGS.privateNotifications,
+        },
+        showServiceNavigationBar: {
+          label: intl.formatMessage(messages.showServiceNavigationBar),
+          value: settings.all.app.showServiceNavigationBar,
+          default: DEFAULT_APP_SETTINGS.showServiceNavigationBar,
+        },
+        hibernate: {
+          label: intl.formatMessage(messages.hibernate),
+          value: settings.all.app.hibernate,
+          default: DEFAULT_APP_SETTINGS.hibernate,
+        },
+        hibernationStrategy: {
+          label: intl.formatMessage(messages.hibernationStrategy),
+          value: settings.all.app.hibernationStrategy,
+          options: hibernationStrategies,
+          default: DEFAULT_APP_SETTINGS.hibernationStrategy,
+        },
+        server: {
+          label: intl.formatMessage(messages.server),
+          value: settings.all.app.server || API,
+          default: API,
+        },
+        todoServer: {
+          label: intl.formatMessage(messages.todoServer),
+          value: settings.all.app.todoServer,
+          default: TODOS_FRONTEND,
+        },
+        lockingFeatureEnabled: {
+          label: intl.formatMessage(messages.enableLock),
+          value: settings.all.app.lockingFeatureEnabled || false,
+          default: false,
+        },
+        lockedPassword: {
+          label: intl.formatMessage(messages.lockPassword),
+          value: settings.all.app.lockedPassword,
+          default: DEFAULT_LOCK_PASSWORD,
+          type: 'password',
+        },
+        scheduledDNDEnabled: {
+          label: intl.formatMessage(messages.scheduledDNDEnabled),
+          value: settings.all.app.scheduledDNDEnabled || false,
+          default: false,
+        },
+        scheduledDNDStart: {
+          label: intl.formatMessage(messages.scheduledDNDStart),
+          value: settings.all.app.scheduledDNDStart,
+          default: '17:00',
+          type: 'time',
+        },
+        scheduledDNDEnd: {
+          label: intl.formatMessage(messages.scheduledDNDEnd),
+          value: settings.all.app.scheduledDNDEnd,
+          default: '09:00',
+          type: 'time',
+        },
         showDisabledServices: {
           label: intl.formatMessage(messages.showDisabledServices),
           value: settings.all.app.showDisabledServices,
@@ -208,6 +350,16 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.darkMode,
           default: DEFAULT_APP_SETTINGS.darkMode,
         },
+        universalDarkMode: {
+          label: intl.formatMessage(messages.universalDarkMode),
+          value: settings.all.app.universalDarkMode,
+          default: DEFAULT_APP_SETTINGS.universalDarkMode,
+        },
+        accentColor: {
+          label: intl.formatMessage(messages.accentColor),
+          value: settings.all.app.accentColor,
+          default: DEFAULT_APP_SETTINGS.accentColor,
+        },
         enableGPUAcceleration: {
           label: intl.formatMessage(messages.enableGPUAcceleration),
           value: settings.all.app.enableGPUAcceleration,
@@ -224,6 +376,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: user.data.beta,
           default: DEFAULT_APP_SETTINGS.beta,
         },
+        noUpdates: {
+          label: intl.formatMessage(messages.noUpdates),
+          value: settings.app.noUpdates,
+          default: DEFAULT_APP_SETTINGS.noUpdates,
+        },
       },
     };
 
@@ -257,6 +414,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       cacheSize,
       updateStatusTypes,
       isClearingAllCache,
+      lockingFeatureEnabled,
     } = app;
     const {
       checkForUpdates,
@@ -282,6 +440,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
           isTodosEnabled={todos.isFeatureActive}
           isWorkspaceEnabled={workspaces.isFeatureActive}
+          server={this.props.stores.settings.app.server}
+          lockingFeatureEnabled={lockingFeatureEnabled}
+          noUpdates={this.props.stores.settings.app.noUpdates}
+          hibernationEnabled={this.props.stores.settings.app.hibernate}
+          isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
+          openProcessManager={() => this.openProcessManager()}
         />
       </ErrorBoundary>
     );