diff --git a/.changeset/y_saturation_slider.md b/.changeset/y_saturation_slider.md new file mode 100644 index 00000000..77fbb35b --- /dev/null +++ b/.changeset/y_saturation_slider.md @@ -0,0 +1,5 @@ +--- +sable: minor +--- + +Replaced the monochrome mode with a saturation slider for more control. diff --git a/src/app/features/settings/cosmetics/Themes.tsx b/src/app/features/settings/cosmetics/Themes.tsx index 714bbd57..778550b1 100644 --- a/src/app/features/settings/cosmetics/Themes.tsx +++ b/src/app/features/settings/cosmetics/Themes.tsx @@ -244,7 +244,7 @@ function SystemThemePreferences() { function ThemeSettings() { const [systemTheme, setSystemTheme] = useSetting(settingsAtom, 'useSystemTheme'); - const [monochromeMode, setMonochromeMode] = useSetting(settingsAtom, 'monochromeMode'); + const [saturation, setSaturation] = useSetting(settingsAtom, 'saturationLevel'); return ( @@ -274,8 +274,27 @@ function ThemeSettings() { } + title="Saturation" + description={`${saturation}%`} + after={ + setSaturation(parseInt(e.target.value, 10))} + style={{ + width: toRem(160), + cursor: 'pointer', + appearance: 'none', + height: toRem(6), + borderRadius: config.radii.Pill, + backgroundColor: 'var(--sable-surface-container-line)', + accentColor: 'var(--sable-primary-main)', + }} + /> + } /> diff --git a/src/app/pages/ThemeManager.tsx b/src/app/pages/ThemeManager.tsx index dea860f9..49319d55 100644 --- a/src/app/pages/ThemeManager.tsx +++ b/src/app/pages/ThemeManager.tsx @@ -30,20 +30,21 @@ export function UnAuthRouteThemeManager() { export function AuthRouteThemeManager({ children }: { children: ReactNode }) { const activeTheme = useActiveTheme(); - const [monochromeMode] = useSetting(settingsAtom, 'monochromeMode'); + const [saturation] = useSetting(settingsAtom, 'saturationLevel'); useEffect(() => { document.body.className = ''; document.body.classList.add(configClass, varsClass); - document.body.classList.add(...activeTheme.classNames); - if (monochromeMode) { + if (saturation === 0) { document.body.style.filter = 'grayscale(1)'; + } else if (saturation && saturation < 100) { + document.body.style.filter = `saturate(${saturation}%)`; } else { document.body.style.filter = ''; } - }, [activeTheme, monochromeMode]); + }, [activeTheme, saturation]); return {children}; } diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts index d7067171..5ae12802 100644 --- a/src/app/state/settings.ts +++ b/src/app/state/settings.ts @@ -22,7 +22,7 @@ export interface Settings { useSystemTheme: boolean; lightThemeId?: string; darkThemeId?: string; - monochromeMode?: boolean; + saturationLevel?: number; uniformIcons: boolean; isMarkdown: boolean; editorToolbar: boolean; @@ -90,7 +90,7 @@ const defaultSettings: Settings = { useSystemTheme: true, lightThemeId: undefined, darkThemeId: undefined, - monochromeMode: false, + saturationLevel: 100, uniformIcons: false, isMarkdown: true, editorToolbar: false, @@ -157,9 +157,20 @@ const defaultSettings: Settings = { export const getSettings = () => { const settings = localStorage.getItem(STORAGE_KEY); if (settings === null) return defaultSettings; + + // migration for old keys + // monochrome -> saturation + const parsed = JSON.parse(settings); + if (parsed.monochromeMode === true && parsed.saturationLevel === undefined) { + parsed.saturationLevel = 0; + } else if (parsed.monochromeMode === false && parsed.saturationLevel === undefined) { + parsed.saturationLevel = 100; + } + delete parsed.monochromeMode; + return { ...defaultSettings, - ...(JSON.parse(settings) as Settings), + ...(parsed as Settings), }; };