Skip to content

TagSpaces is an offline, open source, document manager with tagging support

feat: added new themes with refactoring

Ilian Sapundshiev65b5fd07036c
diff --git a/src/renderer/components/dialogs/components/SettingsGeneral.tsx b/src/renderer/components/dialogs/components/SettingsGeneral.tsx
index 0c02f6b53..184270ee7 100644
--- a/src/renderer/components/dialogs/components/SettingsGeneral.tsx
+++ b/src/renderer/components/dialogs/components/SettingsGeneral.tsx
@@ -45,9 +45,10 @@ import {
} from '-/reducers/settings';
import { isWorkerAvailable, setLanguage } from '-/services/utils-io';
import { TS } from '-/tagspaces.namespace';
+import { darkThemes, lightThemes } from '-/utils/Themes';
import CheckIcon from '@mui/icons-material/Check';
import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
-import { Box, IconButton, InputAdornment } from '@mui/material';
+import { Box, IconButton, InputAdornment, ListItemIcon } from '@mui/material';
import CircularProgress from '@mui/material/CircularProgress';
import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
@@ -248,11 +249,32 @@ function SettingsGeneral() {
)
}
>
- {settings.supportedRegularThemes.map((theme) => (
- <MenuItem key={theme} value={theme}>
- {theme.charAt(0).toUpperCase() + theme.slice(1)}
- </MenuItem>
- ))}
+ {Object.entries(lightThemes).map((theme) => {
+ const themeKey = theme[0];
+ const themeValue = theme[1];
+ const themeName =
+ themeKey.charAt(0).toUpperCase() + themeKey.slice(1);
+ return (
+ <MenuItem key={themeKey} value={themeKey}>
+ <div style={{ display: 'flex' }}>
+ <ListItemIcon>
+ <Box
+ component="div"
+ sx={{
+ // @ts-ignore
+ backgroundColor: themeValue.primary.main,
+ width: '30px',
+ height: '30px',
+ borderRadius: AppConfig.defaultCSSRadius,
+ marginRight: '10px',
+ }}
+ ></Box>
+ </ListItemIcon>
+ <ListItemText>{themeName}</ListItemText>
+ </div>
+ </MenuItem>
+ );
+ })}
</TsSelect>
</ListItem>
),
@@ -272,11 +294,32 @@ function SettingsGeneral() {
)
}
>
- {settings.supportedDarkThemes.map((theme) => (
- <MenuItem key={theme} value={theme}>
- {theme.charAt(0).toUpperCase() + theme.slice(1)}
- </MenuItem>
- ))}
+ {Object.entries(darkThemes).map((theme) => {
+ const themeKey = theme[0];
+ const themeValue = theme[1];
+ const themeName =
+ themeKey.charAt(0).toUpperCase() + themeKey.slice(1);
+ return (
+ <MenuItem key={themeKey} value={themeKey}>
+ <div style={{ display: 'flex' }}>
+ <ListItemIcon>
+ <Box
+ component="div"
+ sx={{
+ // @ts-ignore
+ backgroundColor: themeValue.primary.main,
+ width: '30px',
+ height: '30px',
+ borderRadius: AppConfig.defaultCSSRadius,
+ marginRight: '10px',
+ }}
+ ></Box>
+ </ListItemIcon>
+ <ListItemText>{themeName}</ListItemText>
+ </div>
+ </MenuItem>
+ );
+ })}
</TsSelect>
</ListItem>
),
diff --git a/src/renderer/containers/App.tsx b/src/renderer/containers/App.tsx
index 872df6459..9b43037c3 100644
--- a/src/renderer/containers/App.tsx
+++ b/src/renderer/containers/App.tsx
@@ -16,95 +16,18 @@
*
*/
-import AppConfig from '-/AppConfig';
import {
getCurrentTheme,
getDefaultDarkTheme,
getDefaultRegularTheme,
} from '-/reducers/settings';
-import {
- StyledEngineProvider,
- ThemeProvider,
- createTheme,
-} from '@mui/material/styles';
+import { createTSTheme } from '-/utils/Themes';
+import { StyledEngineProvider, ThemeProvider } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
import { useEffect, useMemo } from 'react';
import { I18nextProvider, useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
-declare module '@mui/material/styles' {
- interface Theme extends Record<string, any> {}
-}
-
-// Theme definitions
-const legacyTheme = createTheme({
- palette: {
- mode: 'light',
- primary: {
- light: AppConfig.lightThemeLightColor,
- main: AppConfig.lightThemeMainColor,
- dark: AppConfig.lightThemeMainColor,
- },
- secondary: { main: '#777' },
- divider: '#ddd',
- },
-});
-
-const newlightTheme = createTheme({
- palette: {
- mode: 'light',
- primary: {
- light: '#a6def4',
- main: '#3bc8ff',
- dark: '#3bc8ff',
- },
- secondary: { main: '#777' },
- divider: '#ddd',
- },
-});
-
-const darklegacyTheme = createTheme({
- palette: {
- mode: 'dark',
- primary: {
- light: AppConfig.darkThemeLightColor,
- main: AppConfig.darkThemeMainColor,
- dark: AppConfig.darkThemeMainColor,
- },
- secondary: { main: '#bbb' },
- divider: '#555',
- },
-});
-
-const darkblueTheme = createTheme({
- palette: {
- mode: 'dark',
- primary: {
- light: '#a6def4',
- main: '#3bc8ff',
- dark: '#3bc8ff',
- },
- secondary: { main: '#bbb' },
- background: { default: '#001E3C' },
- divider: '#555',
- },
-});
-
-const draculaTheme = createTheme({
- palette: {
- mode: 'dark',
- primary: {
- light: '#503d50',
- main: '#BD93F9',
- dark: '#BD93F9',
- },
- secondary: { main: '#bbb' },
- divider: '#555',
- background: { default: '#282A36' },
- text: { primary: '#f8f8f2' },
- },
-});
-
interface Props {
children: React.ReactNode;
}
@@ -118,37 +41,18 @@ function App({ children }: Props) {
// Memoize theme selection for performance and clarity
const theme = useMemo(() => {
- let regularTheme = legacyTheme;
- let darkTheme = darklegacyTheme;
+ let lightTheme = createTSTheme(defaultRegularTheme, false);
+ let darkTheme = createTSTheme(defaultDarkTheme, true);
- switch (defaultRegularTheme) {
- case 'newlight':
- regularTheme = newlightTheme;
- break;
- case 'legacy':
- default:
- regularTheme = legacyTheme;
- }
- switch (defaultDarkTheme) {
- case 'darkblue':
- darkTheme = darkblueTheme;
- break;
- case 'dracula':
- darkTheme = draculaTheme;
- break;
- case 'darklegacy':
- default:
- darkTheme = darklegacyTheme;
- }
switch (currentTheme) {
case 'light':
- return regularTheme;
+ return lightTheme;
case 'dark':
return darkTheme;
case 'system':
- return systemDarkMode ? darkTheme : regularTheme;
+ return systemDarkMode ? darkTheme : lightTheme;
default:
- return regularTheme;
+ return lightTheme;
}
}, [currentTheme, defaultDarkTheme, defaultRegularTheme, systemDarkMode]);
@@ -170,5 +74,4 @@ function App({ children }: Props) {
</StyledEngineProvider>
);
}
-
export default App;
diff --git a/src/renderer/reducers/settings-default.ts b/src/renderer/reducers/settings-default.ts
index 90ca07498..091c29f61 100644
--- a/src/renderer/reducers/settings-default.ts
+++ b/src/renderer/reducers/settings-default.ts
@@ -114,8 +114,6 @@ export default {
mainVSplitSize: '50%',
supportedGeoTagging: ['pluscodes', 'mgrs'],
supportedThemes: ['light', 'dark', 'system'],
- supportedRegularThemes: ['legacy', 'newlight'],
- supportedDarkThemes: ['darklegacy', 'darkblue', 'dracula'],
tsLastOpenedFilesHistory: 10,
tsLastOpenedFoldersHistory: 10,
tsLastEditedFilesHistory: 10,
diff --git a/src/renderer/reducers/settings.ts b/src/renderer/reducers/settings.ts
index 509c3ff96..ab5835b78 100644
--- a/src/renderer/reducers/settings.ts
+++ b/src/renderer/reducers/settings.ts
@@ -16,15 +16,9 @@
*
*/
-import semver from 'semver';
import AppConfig from '-/AppConfig';
-import defaultSettings from './settings-default';
-import Links from 'assets/links';
-import versionMeta from '-/version.json';
-import { actions as AppActions } from './app';
-import { TS } from '-/tagspaces.namespace';
-import { Pro } from '../pro';
-import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
+import { AIProvider } from '-/components/chat/ChatTypes';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
import {
getDefaultEditor,
getDefaultViewer,
@@ -32,8 +26,14 @@ import {
setZoomFactorElectron,
updateByProp,
} from '-/services/utils-io';
-import { AIProvider } from '-/components/chat/ChatTypes';
-import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
+import { TS } from '-/tagspaces.namespace';
+import versionMeta from '-/version.json';
+import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
+import Links from 'assets/links';
+import semver from 'semver';
+import { Pro } from '../pro';
+import { actions as AppActions } from './app';
+import defaultSettings from './settings-default';
export const types = {
UPGRADE_SETTINGS: 'SETTINGS/UPGRADE_SETTINGS',
@@ -146,10 +146,7 @@ export default (state: any = defaultSettings, action: any) => {
currentRegularTheme:
window.ExtRegularTheme || state.currentRegularTheme,
currentDarkTheme: window.ExtDarkTheme || state.currentDarkTheme,
- // TODO dynamically add supportedThemes functionality
supportedThemes: defaultSettings.supportedThemes, // taking always the themes from default settings
- supportedRegularThemes: defaultSettings.supportedRegularThemes, // taking always the themes from default settings
- supportedDarkThemes: defaultSettings.supportedDarkThemes, // taking always the themes from default settings
supportedLanguages: defaultSettings.supportedLanguages, // taking always the languages from default settings
keyBindings: [
// ...defaultSettings.keyBindings, // use to reset to the default key bindings
diff --git a/src/renderer/utils/Themes.ts b/src/renderer/utils/Themes.ts
new file mode 100644
index 000000000..a091db1f2
--- /dev/null
+++ b/src/renderer/utils/Themes.ts
@@ -0,0 +1,162 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2025-present TagSpaces GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import AppConfig from '-/AppConfig';
+import { createTheme } from '@mui/material';
+
+export const createTSTheme = (themeName: string, isDark: boolean = false) => {
+ let palette = isDark ? darkThemes[themeName] : lightThemes[themeName];
+ if (!palette) {
+ const primaryLightColor = isDark
+ ? AppConfig.darkThemeLightColor
+ : AppConfig.lightThemeLightColor;
+ const primaryMainColor = isDark
+ ? AppConfig.darkThemeMainColor
+ : AppConfig.lightThemeMainColor;
+ palette = {
+ mode: isDark ? 'dark' : 'light',
+ primary: {
+ light: primaryLightColor,
+ main: primaryMainColor,
+ dark: primaryMainColor,
+ },
+ secondary: { main: isDark ? '#bbb' : '#777' },
+ divider: isDark ? '#555' : '#ddd',
+ };
+ }
+
+ return createTheme({
+ palette,
+ components: {
+ MuiDialog: {
+ styleOverrides: {
+ paper: {
+ borderRadius: '15px', // AppConfig.defaultCSSRadius,
+ },
+ },
+ },
+ },
+ });
+};
+
+export const darkThemes = {};
+darkThemes['darklegacy'] = {
+ mode: 'dark',
+ primary: {
+ light: AppConfig.darkThemeLightColor,
+ main: AppConfig.darkThemeMainColor,
+ dark: AppConfig.darkThemeMainColor,
+ },
+ secondary: { main: '#bbb' },
+ background: { default: '#282A36' },
+ divider: '#555',
+};
+darkThemes['dracula'] = {
+ mode: 'dark',
+ primary: {
+ light: '#503d50',
+ main: '#BD93F9',
+ dark: '#BD93F9',
+ },
+ secondary: { main: '#bbb' },
+ divider: '#555',
+ background: { default: '#282A36' },
+ text: { primary: '#f8f8f2' },
+};
+darkThemes['darkblue'] = {
+ mode: 'dark',
+ primary: {
+ light: '#a6def4',
+ main: '#3bc8ff',
+ dark: '#3bc8ff',
+ },
+ secondary: { main: '#bbb' },
+ background: { default: '#001E3C' },
+ text: { primary: '#f8f8f2' },
+ divider: '#555',
+};
+darkThemes['oilgreen'] = {
+ mode: 'dark',
+ primary: {
+ light: '#138086',
+ main: '#138086',
+ dark: '#04484cff',
+ },
+ secondary: { main: '#bbb' },
+ background: { default: '#000' },
+ text: { primary: '#f8f8f2' },
+ divider: '#555',
+};
+darkThemes['Orangefire'] = {
+ mode: 'dark',
+ primary: {
+ light: '#fd8f52',
+ main: '#fd8f52',
+ dark: '#fd8f52',
+ },
+ secondary: { main: '#bbb' },
+ background: { default: '#1c1c1cff' },
+ text: { primary: '#f8f8f2' },
+ divider: '#555',
+};
+
+export const lightThemes = {};
+lightThemes['legacy'] = {
+ mode: 'light',
+ primary: {
+ light: AppConfig.lightThemeLightColor,
+ main: AppConfig.lightThemeMainColor,
+ dark: AppConfig.lightThemeMainColor,
+ },
+ secondary: { main: '#777' },
+ background: { default: '#fff' },
+ divider: '#ddd',
+};
+lightThemes['newlight'] = {
+ mode: 'light',
+ primary: {
+ light: '#a6def4',
+ main: '#3bc8ff',
+ dark: '#3bc8ff',
+ },
+ secondary: { main: '#777' },
+ background: { default: '#f4f4f4ff' },
+ divider: '#ddd',
+};
+lightThemes['orange'] = {
+ mode: 'light',
+ primary: {
+ light: '#fcb272ff',
+ main: '#ed7a13',
+ dark: '#b45808ff',
+ },
+ secondary: { main: '#777' },
+ background: { default: '#f4f4f4ff' },
+ divider: '#fff',
+};
+lightThemes['herbal'] = {
+ mode: 'light',
+ primary: {
+ light: '#b9d08fff',
+ main: '#6a8042',
+ dark: '#1e3006',
+ },
+ secondary: { main: '#777' },
+ background: { default: '#f4f4f4ff' },
+ divider: '#fff',
+};