diff options
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 3 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 0d566525d..6b6f97e46 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -122,6 +122,9 @@ class AppLayoutContainer extends Component { | |||
122 | showMessageBadgeWhenMutedSetting={ | 122 | showMessageBadgeWhenMutedSetting={ |
123 | settings.all.app.showMessageBadgeWhenMuted | 123 | settings.all.app.showMessageBadgeWhenMuted |
124 | } | 124 | } |
125 | showServiceNameSetting={ | ||
126 | settings.all.app.showServiceName | ||
127 | } | ||
125 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 128 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
126 | isTodosServiceActive={services.isTodosServiceActive || false} | 129 | isTodosServiceActive={services.isTodosServiceActive || false} |
127 | /> | 130 | /> |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index de0714870..76c525045 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -197,6 +197,10 @@ const messages = defineMessages({ | |||
197 | id: 'settings.app.form.showDisabledServices', | 197 | id: 'settings.app.form.showDisabledServices', |
198 | defaultMessage: 'Display disabled services tabs', | 198 | defaultMessage: 'Display disabled services tabs', |
199 | }, | 199 | }, |
200 | showServiceName: { | ||
201 | id: 'settings.app.form.showServiceName', | ||
202 | defaultMessage: 'Display service name under the icon', | ||
203 | }, | ||
200 | showMessageBadgeWhenMuted: { | 204 | showMessageBadgeWhenMuted: { |
201 | id: 'settings.app.form.showMessagesBadgesWhenMuted', | 205 | id: 'settings.app.form.showMessagesBadgesWhenMuted', |
202 | defaultMessage: 'Show unread message badge when notifications are disabled', | 206 | defaultMessage: 'Show unread message badge when notifications are disabled', |
@@ -301,6 +305,7 @@ class EditSettingsScreen extends Component { | |||
301 | settingsData.enableGlobalHideShortcut, | 305 | settingsData.enableGlobalHideShortcut, |
302 | ), | 306 | ), |
303 | showDisabledServices: Boolean(settingsData.showDisabledServices), | 307 | showDisabledServices: Boolean(settingsData.showDisabledServices), |
308 | showServiceName: Boolean(settingsData.showServiceName), | ||
304 | darkMode: Boolean(settingsData.darkMode), | 309 | darkMode: Boolean(settingsData.darkMode), |
305 | adaptableDarkMode: Boolean(settingsData.adaptableDarkMode), | 310 | adaptableDarkMode: Boolean(settingsData.adaptableDarkMode), |
306 | universalDarkMode: Boolean(settingsData.universalDarkMode), | 311 | universalDarkMode: Boolean(settingsData.universalDarkMode), |
@@ -558,6 +563,11 @@ class EditSettingsScreen extends Component { | |||
558 | value: settings.all.app.showDisabledServices, | 563 | value: settings.all.app.showDisabledServices, |
559 | default: DEFAULT_APP_SETTINGS.showDisabledServices, | 564 | default: DEFAULT_APP_SETTINGS.showDisabledServices, |
560 | }, | 565 | }, |
566 | showServiceName: { | ||
567 | label: intl.formatMessage(messages.showServiceName), | ||
568 | value: settings.all.app.showServiceName, | ||
569 | default: DEFAULT_APP_SETTINGS.showServiceName, | ||
570 | }, | ||
561 | showMessageBadgeWhenMuted: { | 571 | showMessageBadgeWhenMuted: { |
562 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), | 572 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), |
563 | value: settings.all.app.showMessageBadgeWhenMuted, | 573 | value: settings.all.app.showMessageBadgeWhenMuted, |