ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version update close buttons into one

Browse Source
This commit is contained in:
schroda
2024-05-03 01:48:12 +02:00
parent e54a98001a
commit 61b43b80af
2 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/components/util/ServerUpdateChecker.tsx
View File

@@ -14,6 +14,9 @@ import Button from '@mui/material/Button';
import DialogContentText from '@mui/material/DialogContentText'; import DialogContentText from '@mui/material/DialogContentText';
import { useState } from 'react'; import { useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import PopupState, { bindMenu, bindTrigger } from 'material-ui-popup-state';
import Menu from '@mui/material/Menu';
import MenuItem from '@mui/material/MenuItem';
import { requestManager } from '@/lib/requests/RequestManager.ts'; import { requestManager } from '@/lib/requests/RequestManager.ts';
import { getVersion } from '@/screens/settings/About.tsx'; import { getVersion } from '@/screens/settings/About.tsx';
import { useUpdateChecker } from '@/util/useUpdateChecker.tsx'; import { useUpdateChecker } from '@/util/useUpdateChecker.tsx';
@@ -78,22 +81,33 @@ export const ServerUpdateChecker = () => {
</DialogContentText> </DialogContentText>
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>
<Button <PopupState variant="popover" popupId="server-update-checker-close-menu">
onClick={() => { {(popupState) => (
updateChecker.remindLater(); <>
handleClose(); <Button {...bindTrigger(popupState)}>{t('global.label.close')}</Button>
}} <Menu {...bindMenu(popupState)}>
> <MenuItem
{t('global.button.remind_later')} onClick={() => {
</Button> updateChecker.remindLater();
<Button popupState.close();
onClick={() => { handleClose();
updateChecker.ignoreUpdate(); }}
handleClose(); >
}} {t('global.button.remind_later')}
> </MenuItem>
{t('global.button.ignore')} <MenuItem
</Button> onClick={() => {
updateChecker.ignoreUpdate();
popupState.close();
handleClose();
}}
>
{t('global.button.ignore')}
</MenuItem>
</Menu>
</>
)}
</PopupState>
<Button onClick={handleClose} variant="contained" href={selectedServerChannelInfo.url} target="_blank"> <Button onClick={handleClose} variant="contained" href={selectedServerChannelInfo.url} target="_blank">
{t('chapter.action.download.add.label.action')} {t('chapter.action.download.add.label.action')}
</Button> </Button>

48
src/components/util/WebUIUpdateChecker.tsx
View File

@@ -15,6 +15,9 @@ import DialogContentText from '@mui/material/DialogContentText';
import DialogActions from '@mui/material/DialogActions'; import DialogActions from '@mui/material/DialogActions';
import Button from '@mui/material/Button'; import Button from '@mui/material/Button';
import Stack from '@mui/material/Stack'; import Stack from '@mui/material/Stack';
import PopupState, { bindMenu, bindTrigger } from 'material-ui-popup-state';
import Menu from '@mui/material/Menu';
import MenuItem from '@mui/material/MenuItem';
import { defaultPromiseErrorHandler } from '@/util/defaultPromiseErrorHandler.ts'; import { defaultPromiseErrorHandler } from '@/util/defaultPromiseErrorHandler.ts';
import { UpdateState, WebUiChannel, WebUiUpdateStatus } from '@/lib/graphql/generated/graphql.ts'; import { UpdateState, WebUiChannel, WebUiUpdateStatus } from '@/lib/graphql/generated/graphql.ts';
import { useLocalStorage } from '@/util/useStorage.tsx'; import { useLocalStorage } from '@/util/useStorage.tsx';
@@ -131,24 +134,33 @@ export const WebUIUpdateChecker = () => {
{t('global.button.changelog')} {t('global.button.changelog')}
</Button> </Button>
<Stack direction="row"> <Stack direction="row">
<Button <PopupState variant="popover" popupId="webui-update-checker-close-menu">
disabled={isUpdateInProgress} {(popupState) => (
onClick={() => { <>
updateChecker.remindLater(); <Button {...bindTrigger(popupState)}>{t('global.label.close')}</Button>
setOpen(false); <Menu {...bindMenu(popupState)}>
}} <MenuItem
> onClick={() => {
{t('global.button.remind_later')} updateChecker.remindLater();
</Button> popupState.close();
<Button setOpen(false);
disabled={isUpdateInProgress} }}
onClick={() => { >
updateChecker.ignoreUpdate(); {t('global.button.remind_later')}
setOpen(false); </MenuItem>
}} <MenuItem
> onClick={() => {
{t('global.button.ignore')} updateChecker.ignoreUpdate();
</Button> popupState.close();
setOpen(false);
}}
>
{t('global.button.ignore')}
</MenuItem>
</Menu>
</>
)}
</PopupState>
<Button <Button
disabled={isUpdateInProgress} disabled={isUpdateInProgress}
onClick={() => { onClick={() => {