From 68d4a04a02335493e35545d8d5f43680b64cc9a2 Mon Sep 17 00:00:00 2001 From: André Oliveira Date: Fri, 24 Jun 2022 15:29:40 +0100 Subject: Add split mode toggle to side bar and hide collapse button --- src/components/layout/Sidebar.js | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'src/components/layout') diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 0d3a7c20c..1d3c81dcd 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -14,6 +14,7 @@ import { mdiMenu, mdiChevronDown, mdiChevronRight, + mdiViewSplitVertical, } from '@mdi/js'; import Tabbar from '../services/tabs/Tabbar'; @@ -23,6 +24,7 @@ import { todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, + splitModeToggleShortcutKey, muteFerdiumShortcutKey, } from '../../environment'; import { todosStore } from '../../features/todos'; @@ -37,6 +39,10 @@ const messages = defineMessages({ id: 'sidebar.addNewService', defaultMessage: 'Add new service', }, + splitModeToggle: { + id: 'sidebar.splitModeToggle', + defaultMessage: 'Split Mode Toggle', + }, mute: { id: 'sidebar.muteApp', defaultMessage: 'Disable notifications & audio', @@ -137,11 +143,14 @@ class Sidebar extends Component { isTodosServiceActive, } = this.props; const { + hideCollapseButton, hideRecipesButton, hideWorkspacesButton, hideNotificationsButton, hideSettingsButton, - useVerticalStyle + hideSplitModeButton, + useVerticalStyle, + splitMode, } = stores.settings.app; const { intl } = this.props; const todosToggleMessage = todosStore.isTodosPanelVisible @@ -157,6 +166,7 @@ class Sidebar extends Component { !hideWorkspacesButton, !hideNotificationsButton, !hideSettingsButton, + !hideSplitModeButton, todosStore.isFeatureEnabledByUser ].filter(Boolean).length; @@ -169,7 +179,7 @@ class Sidebar extends Component { useVerticalStyle={stores.settings.all.app.useVerticalStyle} /> <> - {numberActiveButtons <= 1 ? ( + {numberActiveButtons <= 1 || hideCollapseButton ? ( null ) : ) : null} + {!hideSplitModeButton && !this.state.isCollapsed ? ( + + ) : null} {!hideWorkspacesButton && !this.state.isCollapsed ? (