diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx index d40b350..1896f94 100644 --- a/web/src/components/App/index.jsx +++ b/web/src/components/App/index.jsx @@ -35,7 +35,7 @@ export default function App() { const [torrServerVersion, setTorrServerVersion] = useState('') // https://material-ui.com/ru/customization/palette/ - const [isDarkMode, currentThemeMode, setCurrentThemeMode, muiTheme] = useMaterialUITheme() + const [isDarkMode, currentThemeMode, updateThemeMode, muiTheme] = useMaterialUITheme() const [currentLang, changeLang] = useChangeLanguage() const [isOffline, setIsOffline] = useState(false) const { data: torrents, isLoading } = useQuery('torrents', getTorrents, { @@ -82,11 +82,6 @@ export default function App() { > { - const updateThemeMode = mode => { - setCurrentThemeMode(mode) - localStorage.setItem('themeMode', mode) - } - if (currentThemeMode === THEME_MODES.LIGHT) updateThemeMode(THEME_MODES.DARK) if (currentThemeMode === THEME_MODES.DARK) updateThemeMode(THEME_MODES.AUTO) if (currentThemeMode === THEME_MODES.AUTO) updateThemeMode(THEME_MODES.LIGHT) diff --git a/web/src/style/colors.js b/web/src/style/colors.js index a7dce73..afedb59 100644 --- a/web/src/style/colors.js +++ b/web/src/style/colors.js @@ -4,7 +4,7 @@ export const themeColors = { light: { app: { headerToggleColor: '#4db380', - appSecondaryColor: '#f1eff3', + appSecondaryColor: '#CBE8D9', sidebarBGColor: '#575757', sidebarFillColor: '#dee3e5', }, diff --git a/web/src/style/materialUISetup.js b/web/src/style/materialUISetup.js index 4587cfe..705977f 100644 --- a/web/src/style/materialUISetup.js +++ b/web/src/style/materialUISetup.js @@ -28,6 +28,11 @@ export const useMaterialUITheme = () => { const [isDarkMode, setIsDarkMode] = useState(savedThemeMode === 'dark' || isSystemModeDark) const [currentThemeMode, setCurrentThemeMode] = useState(savedThemeMode || THEME_MODES.LIGHT) + const updateThemeMode = mode => { + setCurrentThemeMode(mode) + localStorage.setItem('themeMode', mode) + } + useEffect(() => { currentThemeMode === THEME_MODES.LIGHT && setIsDarkMode(false) currentThemeMode === THEME_MODES.DARK && setIsDarkMode(true) @@ -48,5 +53,5 @@ export const useMaterialUITheme = () => { [theme], ) - return [isDarkMode, currentThemeMode, setCurrentThemeMode, muiTheme] + return [isDarkMode, currentThemeMode, updateThemeMode, muiTheme] }