diff --git a/src/components/App/index.jsx b/src/components/App/index.jsx index fe09f3c..162a83d 100644 --- a/src/components/App/index.jsx +++ b/src/components/App/index.jsx @@ -7,6 +7,7 @@ import Snackbar from '@mui/material/Snackbar'; import { createTheme, ThemeProvider } from '@mui/material/styles'; import Toolbar from '@mui/material/Toolbar'; import Typography from '@mui/material/Typography'; +import useMediaQuery from '@mui/material/useMediaQuery'; import { platform } from '@tauri-apps/plugin-os'; import { BrowserRouter, Routes, Route } from 'react-router-dom'; import packageJson from '../../../package.json'; @@ -47,20 +48,18 @@ const App = () => { checkedForUpdates, } = state; - const [drawerOpen, setDrawerOpen] = useState(false); - const [snackOpen, setSnackOpen] = useState( - !window.__TAURI__ && window.innerWidth > 600, - ); - const language = state.languages[languageIndex]; - const color = ThemeSelector(themeIndex); - const theme = createTheme({ palette: { primary: color, mode: themeType, }, }); + const isMobile = useMediaQuery(theme.breakpoints.down('sm')); + + const [drawerOpen, setDrawerOpen] = useState(false); + const [snackOpen, setSnackOpen] = useState(!window.__TAURI__ && !isMobile); + const language = state.languages[languageIndex]; /** * Check for updates diff --git a/src/components/PasswordTips/index.jsx b/src/components/PasswordTips/index.jsx index a968768..5f55744 100644 --- a/src/components/PasswordTips/index.jsx +++ b/src/components/PasswordTips/index.jsx @@ -10,6 +10,8 @@ import Alert from '@mui/material/Alert'; import AlertTitle from '@mui/material/AlertTitle'; import Collapse from '@mui/material/Collapse'; import IconButton from '@mui/material/IconButton'; +import { useTheme } from '@mui/material/styles'; +import useMediaQuery from '@mui/material/useMediaQuery'; import { MainContext } from '../../contexts/MainContextProvider'; const getRandomTipIndex = (length) => @@ -17,6 +19,8 @@ const getRandomTipIndex = (length) => const PasswordTips = () => { const [state] = useContext(MainContext); + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down('sm')); const { languageIndex, tips } = state; const language = state.languages[languageIndex]; @@ -75,7 +79,7 @@ const PasswordTips = () => { }; return ( - + { const { languageIndex, loading, sortByStrength } = state1; const language = state1.languages[languageIndex]; + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down('sm')); const [exportType, setExportType] = useState('application/json'); const [snackOpen, setSnackOpen] = useState(false); @@ -307,6 +311,14 @@ const Generate = () => { { min > max || max < min; + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down('sm')); + /** * Generate passwords */ @@ -307,7 +312,7 @@ const Home = () => { 600} + defaultExpanded={!window.__TAURI__ && !isMobile} > }