Optionally hide history
This commit is contained in:
@@ -520,6 +520,9 @@
|
|||||||
"no_history_available": "You have not read any series yet."
|
"no_history_available": "You have not read any series yet."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"settings": {
|
||||||
|
"hide": "Hide history"
|
||||||
|
},
|
||||||
"title": "History"
|
"title": "History"
|
||||||
},
|
},
|
||||||
"hotkeys": {
|
"hotkeys": {
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ import { ErrorBoundary } from '@/modules/core/components/ErrorBoundary.tsx';
|
|||||||
import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
|
import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
|
||||||
import { Reader } from '@/modules/reader/screens/Reader.tsx';
|
import { Reader } from '@/modules/reader/screens/Reader.tsx';
|
||||||
import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
|
import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
|
||||||
|
import { HistorySettings } from '@/modules/history/screens/HistorySettings.tsx';
|
||||||
|
import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
|
||||||
|
|
||||||
const { Browse } = loadable(() => import('@/modules/browse/screens/Browse.tsx'), lazyLoadFallback);
|
const { Browse } = loadable(() => import('@/modules/browse/screens/Browse.tsx'), lazyLoadFallback);
|
||||||
const { DownloadQueue } = loadable(() => import('@/modules/downloads/screens/DownloadQueue.tsx'), lazyLoadFallback);
|
const { DownloadQueue } = loadable(() => import('@/modules/downloads/screens/DownloadQueue.tsx'), lazyLoadFallback);
|
||||||
@@ -101,6 +103,10 @@ const BackgroundSubscriptions = () => {
|
|||||||
const MainApp = () => {
|
const MainApp = () => {
|
||||||
const { navBarWidth, appBarHeight, bottomBarHeight } = useNavBarContext();
|
const { navBarWidth, appBarHeight, bottomBarHeight } = useNavBarContext();
|
||||||
|
|
||||||
|
const {
|
||||||
|
settings: { hideHistory },
|
||||||
|
} = useMetadataServerSettings();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
id="appMainContainer"
|
id="appMainContainer"
|
||||||
@@ -139,6 +145,7 @@ const MainApp = () => {
|
|||||||
<Route path={AppRoutes.settings.childRoutes.server.match} element={<ServerSettings />} />
|
<Route path={AppRoutes.settings.childRoutes.server.match} element={<ServerSettings />} />
|
||||||
<Route path={AppRoutes.settings.childRoutes.webui.match} element={<WebUISettings />} />
|
<Route path={AppRoutes.settings.childRoutes.webui.match} element={<WebUISettings />} />
|
||||||
<Route path={AppRoutes.settings.childRoutes.browse.match} element={<BrowseSettings />} />
|
<Route path={AppRoutes.settings.childRoutes.browse.match} element={<BrowseSettings />} />
|
||||||
|
<Route path={AppRoutes.settings.childRoutes.history.match} element={<HistorySettings />} />
|
||||||
<Route path={AppRoutes.settings.childRoutes.device.match} element={<DeviceSetting />} />
|
<Route path={AppRoutes.settings.childRoutes.device.match} element={<DeviceSetting />} />
|
||||||
<Route path={AppRoutes.settings.childRoutes.tracking.match} element={<TrackingSettings />} />
|
<Route path={AppRoutes.settings.childRoutes.tracking.match} element={<TrackingSettings />} />
|
||||||
<Route path={AppRoutes.settings.childRoutes.appearance.match} element={<Appearance />} />
|
<Route path={AppRoutes.settings.childRoutes.appearance.match} element={<Appearance />} />
|
||||||
@@ -159,7 +166,7 @@ const MainApp = () => {
|
|||||||
</Route>
|
</Route>
|
||||||
<Route path={AppRoutes.library.match} element={<Library />} />
|
<Route path={AppRoutes.library.match} element={<Library />} />
|
||||||
<Route path={AppRoutes.updates.match} element={<Updates />} />
|
<Route path={AppRoutes.updates.match} element={<Updates />} />
|
||||||
<Route path={AppRoutes.history.match} element={<History />} />
|
{!hideHistory && <Route path={AppRoutes.history.match} element={<History />} />}
|
||||||
<Route path={AppRoutes.browse.match} element={<Browse />} />
|
<Route path={AppRoutes.browse.match} element={<Browse />} />
|
||||||
<Route path={AppRoutes.migrate.match}>
|
<Route path={AppRoutes.migrate.match}>
|
||||||
<Route index element={<Migrate />} />
|
<Route index element={<Migrate />} />
|
||||||
|
|||||||
@@ -84,6 +84,10 @@ export const AppRoutes = {
|
|||||||
match: 'appearance',
|
match: 'appearance',
|
||||||
path: '/settings/appearance',
|
path: '/settings/appearance',
|
||||||
},
|
},
|
||||||
|
history: {
|
||||||
|
match: 'history',
|
||||||
|
path: '/settings/history',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
sources: {
|
sources: {
|
||||||
|
|||||||
11
src/modules/history/History.types.ts
Normal file
11
src/modules/history/History.types.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export type MetadataHistorySettings = {
|
||||||
|
hideHistory: boolean;
|
||||||
|
};
|
||||||
70
src/modules/history/screens/HistorySettings.tsx
Normal file
70
src/modules/history/screens/HistorySettings.tsx
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { useLayoutEffect } from 'react';
|
||||||
|
import List from '@mui/material/List';
|
||||||
|
import ListItem from '@mui/material/ListItem';
|
||||||
|
import ListItemText from '@mui/material/ListItemText';
|
||||||
|
import Switch from '@mui/material/Switch';
|
||||||
|
import {
|
||||||
|
createUpdateMetadataServerSettings,
|
||||||
|
useMetadataServerSettings,
|
||||||
|
} from '@/modules/settings/services/ServerSettingsMetadata.ts';
|
||||||
|
import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
|
||||||
|
import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';
|
||||||
|
import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
|
||||||
|
import { makeToast } from '@/modules/core/utils/Toast.ts';
|
||||||
|
import { getErrorMessage } from '@/lib/HelperFunctions.ts';
|
||||||
|
import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
|
||||||
|
import { MetadataHistorySettings } from '@/modules/history/History.types.ts';
|
||||||
|
|
||||||
|
export const HistorySettings = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { setTitle, setAction } = useNavBarContext();
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
setTitle(t('history.title'));
|
||||||
|
setAction(null);
|
||||||
|
}, [t]);
|
||||||
|
|
||||||
|
const {
|
||||||
|
settings: { hideHistory },
|
||||||
|
request: { loading, error, refetch },
|
||||||
|
} = useMetadataServerSettings();
|
||||||
|
const updateMetadataServerSettings = createUpdateMetadataServerSettings<keyof MetadataHistorySettings>((e) =>
|
||||||
|
makeToast(t('global.error.label.failed_to_save_changes'), 'error', getErrorMessage(e)),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return <LoadingPlaceholder />;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
return (
|
||||||
|
<EmptyViewAbsoluteCentered
|
||||||
|
message={t('global.error.label.failed_to_load_data')}
|
||||||
|
messageExtra={getErrorMessage(error)}
|
||||||
|
retry={() => refetch().catch(defaultPromiseErrorHandler('HistorySettings::refetch'))}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<List sx={{ pt: 0 }}>
|
||||||
|
<ListItem>
|
||||||
|
<ListItemText primary={t('history.settings.hide')} />
|
||||||
|
<Switch
|
||||||
|
edge="end"
|
||||||
|
checked={hideHistory}
|
||||||
|
onChange={() => updateMetadataServerSettings('hideHistory', !hideHistory)}
|
||||||
|
/>
|
||||||
|
</ListItem>
|
||||||
|
</List>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -37,6 +37,7 @@ import { MobileBottomBar } from '@/modules/navigation-bar/components/MobileBotto
|
|||||||
import { NavbarItem } from '@/modules/navigation-bar/NavigationBar.types.ts';
|
import { NavbarItem } from '@/modules/navigation-bar/NavigationBar.types.ts';
|
||||||
import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
|
import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
|
||||||
import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
|
import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
|
||||||
|
import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
|
||||||
|
|
||||||
const navbarItems: Array<NavbarItem> = [
|
const navbarItems: Array<NavbarItem> = [
|
||||||
{
|
{
|
||||||
@@ -93,6 +94,10 @@ export function DefaultNavBar() {
|
|||||||
const handleBack = useBackButton();
|
const handleBack = useBackButton();
|
||||||
const isMobileWidth = MediaQuery.useIsMobileWidth();
|
const isMobileWidth = MediaQuery.useIsMobileWidth();
|
||||||
|
|
||||||
|
const {
|
||||||
|
settings: { hideHistory },
|
||||||
|
} = useMetadataServerSettings();
|
||||||
|
|
||||||
const appBarRef = useRef<HTMLDivElement | null>(null);
|
const appBarRef = useRef<HTMLDivElement | null>(null);
|
||||||
useResizeObserver(
|
useResizeObserver(
|
||||||
appBarRef,
|
appBarRef,
|
||||||
@@ -123,8 +128,15 @@ export function DefaultNavBar() {
|
|||||||
|
|
||||||
const activeNavBar: NavbarItem['show'] = isMobileWidth ? 'mobile' : 'desktop';
|
const activeNavBar: NavbarItem['show'] = isMobileWidth ? 'mobile' : 'desktop';
|
||||||
const visibleNavBarItems = useMemo(
|
const visibleNavBarItems = useMemo(
|
||||||
() => navbarItems.filter(({ show }) => ['both', activeNavBar].includes(show)),
|
() =>
|
||||||
[isMobileWidth],
|
navbarItems
|
||||||
|
.filter((item) => {
|
||||||
|
const isHistory = item.title === 'history.title';
|
||||||
|
|
||||||
|
return !isHistory || !hideHistory;
|
||||||
|
})
|
||||||
|
.filter(({ show }) => ['both', activeNavBar].includes(show)),
|
||||||
|
[isMobileWidth, hideHistory],
|
||||||
);
|
);
|
||||||
const NavBarComponent = useMemo(() => (isMobileWidth ? MobileBottomBar : DesktopSideBar), [isMobileWidth]);
|
const NavBarComponent = useMemo(() => (isMobileWidth ? MobileBottomBar : DesktopSideBar), [isMobileWidth]);
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,9 @@ export const SERVER_SETTINGS_METADATA_DEFAULT: MetadataServerSettings = {
|
|||||||
// browse
|
// browse
|
||||||
hideLibraryEntries: false,
|
hideLibraryEntries: false,
|
||||||
|
|
||||||
|
// history
|
||||||
|
hideHistory: false,
|
||||||
|
|
||||||
// tracking
|
// tracking
|
||||||
updateProgressAfterReading: true,
|
updateProgressAfterReading: true,
|
||||||
updateProgressManualMarkRead: false,
|
updateProgressManualMarkRead: false,
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { MetadataTrackingSettings } from '@/modules/tracker/Tracker.types.ts';
|
|||||||
import { MetadataUpdateSettings } from '@/modules/app-updates/AppUpdateChecker.types.ts';
|
import { MetadataUpdateSettings } from '@/modules/app-updates/AppUpdateChecker.types.ts';
|
||||||
import { MetadataThemeSettings } from '@/modules/theme/AppTheme.types.ts';
|
import { MetadataThemeSettings } from '@/modules/theme/AppTheme.types.ts';
|
||||||
import { GetServerSettingsQuery } from '@/lib/graphql/generated/graphql.ts';
|
import { GetServerSettingsQuery } from '@/lib/graphql/generated/graphql.ts';
|
||||||
|
import { MetadataHistorySettings } from '@/modules/history/History.types.ts';
|
||||||
|
|
||||||
export type MetadataServerSettingKeys = keyof MetadataServerSettings;
|
export type MetadataServerSettingKeys = keyof MetadataServerSettings;
|
||||||
|
|
||||||
@@ -27,7 +28,8 @@ export type MetadataServerSettings = MetadataDownloadSettings &
|
|||||||
MetadataBrowseSettings &
|
MetadataBrowseSettings &
|
||||||
MetadataTrackingSettings &
|
MetadataTrackingSettings &
|
||||||
MetadataUpdateSettings &
|
MetadataUpdateSettings &
|
||||||
MetadataThemeSettings;
|
MetadataThemeSettings &
|
||||||
|
MetadataHistorySettings;
|
||||||
|
|
||||||
export interface ISearchSettings {
|
export interface ISearchSettings {
|
||||||
ignoreFilters: boolean;
|
ignoreFilters: boolean;
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import ExploreOutlinedIcon from '@mui/icons-material/ExploreOutlined';
|
|||||||
import DevicesIcon from '@mui/icons-material/Devices';
|
import DevicesIcon from '@mui/icons-material/Devices';
|
||||||
import SyncIcon from '@mui/icons-material/Sync';
|
import SyncIcon from '@mui/icons-material/Sync';
|
||||||
import PaletteIcon from '@mui/icons-material/Palette';
|
import PaletteIcon from '@mui/icons-material/Palette';
|
||||||
|
import HistoryIcon from '@mui/icons-material/History';
|
||||||
import { ListItemLink } from '@/modules/core/components/ListItemLink.tsx';
|
import { ListItemLink } from '@/modules/core/components/ListItemLink.tsx';
|
||||||
import { requestManager } from '@/lib/requests/RequestManager.ts';
|
import { requestManager } from '@/lib/requests/RequestManager.ts';
|
||||||
import { makeToast } from '@/modules/core/utils/Toast.ts';
|
import { makeToast } from '@/modules/core/utils/Toast.ts';
|
||||||
@@ -109,6 +110,12 @@ export function Settings() {
|
|||||||
</ListItemIcon>
|
</ListItemIcon>
|
||||||
<ListItemText primary={t('global.label.browse')} />
|
<ListItemText primary={t('global.label.browse')} />
|
||||||
</ListItemLink>
|
</ListItemLink>
|
||||||
|
<ListItemLink to={AppRoutes.settings.childRoutes.history.path}>
|
||||||
|
<ListItemIcon>
|
||||||
|
<HistoryIcon />
|
||||||
|
</ListItemIcon>
|
||||||
|
<ListItemText primary={t('history.title')} />
|
||||||
|
</ListItemLink>
|
||||||
<ListItemLink to={AppRoutes.settings.childRoutes.device.path}>
|
<ListItemLink to={AppRoutes.settings.childRoutes.device.path}>
|
||||||
<ListItemIcon>
|
<ListItemIcon>
|
||||||
<DevicesIcon />
|
<DevicesIcon />
|
||||||
|
|||||||
Reference in New Issue
Block a user