Move more core logic to new folder

src/lib/requests/client/BaseClient.ts

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { AppStorage } from '@/lib/AppStorage.ts';
+import { AppStorage } from '@/lib/storage/AppStorage.ts';
 
 export abstract class BaseClient<Client, ClientConfig, Fetcher> {
     protected abstract client: Client;

src/lib/requests/requests/RequestManager.ts

@@ -276,7 +276,7 @@ import {
     UPDATE_LIBRARY_MANGAS,
 } from '@/lib/graphql/mutations/UpdaterMutation.ts';
 import { GET_LAST_UPDATE_TIMESTAMP, GET_UPDATE_STATUS } from '@/lib/graphql/queries/UpdaterQuery.ts';
-import { CustomCache } from '@/lib/CustomCache.ts';
+import { CustomCache } from '@/lib/storage/CustomCache.ts';
 import { RESTORE_BACKUP } from '@/lib/graphql/mutations/BackupMutation.ts';
 import { GET_RESTORE_STATUS, VALIDATE_BACKUP } from '@/lib/graphql/queries/BackupQuery.ts';
 import { DOWNLOAD_STATUS_SUBSCRIPTION } from '@/lib/graphql/subscriptions/DownloaderSubscription.ts';

src/modules/app-updates/components/WebUIUpdateChecker.tsx

@@ -18,7 +18,7 @@ import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'
 import { UpdateState, WebUiChannel, WebUiUpdateStatus } from '@/lib/graphql/generated/graphql.ts';
 import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { ABOUT_WEBUI, WEBUI_UPDATE_CHECK } from '@/lib/graphql/fragments/InfoFragments.ts';
 import { VersionUpdateInfoDialog } from '@/modules/app-updates/components/VersionUpdateInfoDialog.tsx';
 import { useUpdateChecker } from '@/modules/app-updates/hooks/useUpdateChecker.tsx';

src/modules/backup/screens/Backup.tsx

@@ -24,7 +24,7 @@ import ListItem from '@mui/material/ListItem';
 import { Link } from 'react-router-dom';
 import Stack from '@mui/material/Stack';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { BackupRestoreState, ValidateBackupQuery } from '@/lib/graphql/generated/graphql.ts';
 import { Progress } from '@/modules/core/components/Progress.tsx';

src/modules/browse/screens/BrowseSettings.tsx

@@ -25,7 +25,7 @@ import {
 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 '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { MetadataBrowseSettings } from '@/modules/browse/Browse.types.ts';
 import { ServerSettings as GqlServerSettings } from '@/modules/settings/Settings.types.ts';
 

src/modules/category/components/CategoriesInclusionSetting.tsx

@@ -18,7 +18,7 @@ import DialogActions from '@mui/material/DialogActions';
 import Button from '@mui/material/Button';
 import { t as translate } from 'i18next';
 import { ThreeStateCheckboxInput } from '@/modules/core/components/inputs/ThreeStateCheckboxInput.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { IncludeOrExclude } from '@/lib/graphql/generated/graphql.ts';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { CheckboxContainer } from '@/modules/core/components/inputs/CheckboxContainer.ts';

src/modules/category/components/CategorySelect.tsx

@@ -22,7 +22,7 @@ import { useSelectableCollection } from '@/modules/collection/hooks/useSelectabl
 import { ThreeStateCheckboxInput } from '@/modules/core/components/inputs/ThreeStateCheckboxInput.tsx';
 import { Categories } from '@/modules/category/services/Categories.ts';
 import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { updateMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
 import {

src/modules/chapter/components/ChapterList.tsx

@@ -44,7 +44,7 @@ import { GET_CHAPTERS_MANGA } from '@/lib/graphql/queries/ChapterQuery.ts';
 import { Mangas } from '@/modules/manga/services/Mangas.ts';
 import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { shouldForwardProp } from '@/modules/core/utils/ShouldForwardProp.ts';
 import { useChapterOptions } from '@/modules/chapter/hooks/useChapterOptions.tsx';
 

src/modules/chapter/services/Chapters.ts

@@ -9,7 +9,7 @@
 import { t as translate } from 'i18next';
 import gql from 'graphql-tag';
 import { DocumentNode } from '@apollo/client';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { getMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
 import {

src/modules/core/components/UpdateChecker.tsx

@@ -17,12 +17,12 @@ import MenuItem from '@mui/material/MenuItem';
 import ClearIcon from '@mui/icons-material/Clear';
 import Stack from '@mui/material/Stack';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { UpdaterSubscription } from '@/lib/graphql/generated/graphql.ts';
 import { Progress } from '@/modules/core/components/Progress.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { dateTimeFormatter } from '@/util/DateHelper.ts';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 
 import { CategoryIdInfo } from '@/modules/category/Category.types.ts';
 

src/modules/core/components/menu/NestedMenuItem.tsx

@@ -36,7 +36,7 @@ import { OverridableComponent } from '@mui/material/OverridableComponent';
 import { SvgIconTypeMap } from '@mui/material/SvgIcon';
 import { IconMenuItem } from '@/modules/core/components/menu/IconMenuItem.tsx';
 import { getOptionForDirection } from '@/theme.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 
 export type NestedMenuItemProps = Omit<MuiMenuItemProps, 'button'> & {
     parentMenuOpen: boolean;

src/modules/core/components/settings/MutableListSetting.tsx

@@ -26,7 +26,7 @@ import DialogContentText from '@mui/material/DialogContentText';
 import InfoIcon from '@mui/icons-material/Info';
 import { TextSetting, TextSettingProps } from '@/modules/core/components/settings/text/TextSetting.tsx';
 import { TextSettingDialog } from '@/modules/core/components/settings/text/TextSettingDialog.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 
 const MutableListItem = ({
     handleDelete,

src/modules/core/contexts/AppContext.tsx

@@ -23,7 +23,7 @@ import { ThemeMode, ThemeModeContext } from '@/modules/theme/contexts/ThemeModeC
 import { NavBarContextProvider } from '@/modules/navigation-bar/contexts/NavBarContextProvider.tsx';
 import { LibraryOptionsContextProvider } from '@/modules/library/contexts/LibraryOptionsProvider.tsx';
 import { ActiveDeviceContextProvider } from '@/modules/device/contexts/DeviceContext.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { AppThemes, getTheme } from '@/modules/theme/services/AppThemes.ts';
 import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
 

src/modules/core/hooks/useStorage.tsx

@@ -7,7 +7,7 @@
  */
 
 import { Dispatch, Reducer, SetStateAction, useCallback, useMemo, useReducer, useSyncExternalStore } from 'react';
-import { AppStorage, Storage } from '@/lib/AppStorage.ts';
+import { AppStorage, Storage } from '@/lib/storage/AppStorage.ts';
 
 const subscribeToStorageUpdates = (callback: () => void) => {
     window.addEventListener('storage', callback);

src/modules/core/utils/Languages.ts

@@ -7,7 +7,7 @@
  */
 
 import { t } from 'i18next';
-import { ISOLanguage, IsoLanguages } from '@/lib/IsoLanguages.ts';
+import { ISOLanguage, IsoLanguages } from '@/modules/core/IsoLanguages.ts';
 
 export enum DefaultLanguage {
     ALL = 'all',

src/modules/core/utils/MediaQuery.tsx

@@ -11,7 +11,7 @@ import { Breakpoint } from '@mui/material/styles';
 import { useCallback, useState } from 'react';
 import { getCurrentTheme } from '@/theme.tsx';
 import { ThemeMode } from '@/modules/theme/contexts/ThemeModeContext.tsx';
-import { AppStorage } from '@/lib/AppStorage.ts';
+import { AppStorage } from '@/lib/storage/AppStorage.ts';
 import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
 
 export class MediaQuery {

src/modules/device/screens/DeviceSetting.tsx

@@ -16,7 +16,7 @@ import {
     updateMetadataServerSettings,
     useMetadataServerSettings,
 } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { MutableListSetting } from '@/modules/core/components/settings/MutableListSetting.tsx';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { DeviceContext } from '@/modules/device/contexts/DeviceContext.tsx';

src/modules/downloads/components/DownloadAheadSetting.tsx

@@ -14,7 +14,7 @@ import Switch from '@mui/material/Switch';
 import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx';
 import { getPersistedServerSetting, usePersistedValue } from '@/modules/core/hooks/usePersistedValue.tsx';
 import { updateMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { MetadataDownloadSettings } from '@/modules/downloads/Downloads.types.ts';
 import { MetadataServerSettings } from '@/modules/settings/Settings.types.ts';
 

src/modules/downloads/screens/DownloadQueue.tsx

@@ -27,7 +27,7 @@ import CardContent from '@mui/material/CardContent';
 import Refresh from '@mui/icons-material/Refresh';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { StrictModeDroppable } from '@/modules/core/components/StrictModeDroppable.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { DownloadStateIndicator } from '@/modules/core/components/DownloadStateIndicator.tsx';
 import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';

src/modules/downloads/screens/DownloadSettings.tsx

@@ -21,7 +21,7 @@ import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,
 } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { DeleteChaptersWhileReadingSetting } from '@/modules/downloads/components/DeleteChaptersWhileReadingSetting.tsx';
 import { CategoriesInclusionSetting } from '@/modules/category/components/CategoriesInclusionSetting.tsx';
 import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx';

src/modules/extension/components/ExtensionCard.tsx

@@ -16,7 +16,7 @@ import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
 import { TExtension } from '@/modules/extension/services/Extensions.ts';
 import { TranslationKey } from '@/Base.types.ts';

src/modules/extension/screens/Extensions.tsx

@@ -18,7 +18,7 @@ import Typography from '@mui/material/Typography';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { extensionDefaultLangs, DefaultLanguage, langSortCmp } from '@/lib/Languages.tsx';
+import { extensionDefaultLangs, DefaultLanguage, langSortCmp } from '@/modules/core/utils/Languages.ts';
 import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
 import {
     ExtensionState,
@@ -30,7 +30,7 @@ import {
 } from '@/modules/extension/services/Extensions.ts';
 import { AppbarSearch } from '@/modules/core/components/AppbarSearch.tsx';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { LangSelect } from '@/modules/core/components/inputs/LangSelect.tsx';
 import { ExtensionCard } from '@/modules/extension/components/ExtensionCard.tsx';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';

src/modules/extension/services/Extensions.ts

@@ -7,7 +7,7 @@
  */
 
 import { t } from 'i18next';
-import { DefaultLanguage, langCodeToName } from '@/lib/Languages.tsx';
+import { DefaultLanguage, langCodeToName } from '@/modules/core/utils/Languages.ts';
 import { ExtensionType } from '@/lib/graphql/generated/graphql.ts';
 import { TranslationKey } from '@/Base.types.ts';
 

src/modules/global-search/screens/SearchAll.tsx

@@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next';
 import Box from '@mui/material/Box';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
-import { langSortCmp, sourceDefualtLangs, sourceForcedDefaultLangs } from '@/lib/Languages.tsx';
+import { langSortCmp, sourceDefualtLangs, sourceForcedDefaultLangs } from '@/modules/core/utils/Languages.ts';
 import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts';
 import { AppbarSearch } from '@/modules/core/components/AppbarSearch.tsx';
 import { LangSelect } from '@/modules/core/components/inputs/LangSelect.tsx';

src/modules/library/components/LibraryOptionsPanel.tsx

@@ -22,7 +22,7 @@ import { GetTrackersSettingsQuery, MangaStatus } from '@/lib/graphql/generated/g
 import { GET_TRACKERS_SETTINGS } from '@/lib/graphql/queries/TrackerQuery.ts';
 import { statusToTranslationKey } from '@/modules/manga/services/Mangas.ts';
 import { createUpdateCategoryMetadata, getCategoryMetadata } from '@/modules/category/services/CategoryMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,

src/modules/library/hooks/useGetVisibleLibraryMangas.ts

@@ -11,7 +11,7 @@ import { useMemo } from 'react';
 import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
 import { ChapterType, MangaType, SourceType, TrackRecordType } from '@/lib/graphql/generated/graphql.ts';
 import { MangaChapterCountInfo, MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
-import { enhancedCleanup } from '@/lib/data/Strings.ts';
+import { enhancedCleanup } from '@/util/Strings.ts';
 import { getCategoryMetadata } from '@/modules/category/services/CategoryMetadata.ts';
 import { NullAndUndefined } from '@/Base.types.ts';
 import { LibraryOptions, LibrarySortMode } from '@/modules/library/Library.types.ts';

src/modules/library/screens/LibraryDuplicates.tsx

@@ -35,7 +35,7 @@ import { GET_MANGAS_DUPLICATES } from '@/lib/graphql/queries/MangaQuery.ts';
 import { BaseMangaGrid } from '@/modules/manga/components/BaseMangaGrid.tsx';
 import { IMangaGridProps } from '@/modules/manga/components/MangaGrid.tsx';
 import { StyledGroupItemWrapper } from '@/modules/core/components/virtuoso/StyledGroupItemWrapper.tsx';
-import { enhancedCleanup } from '@/lib/data/Strings.ts';
+import { enhancedCleanup } from '@/util/Strings.ts';
 
 const findDuplicatesByTitle = <Manga extends Pick<MangaType, 'title'>>(
     libraryMangas: Manga[],

src/modules/library/screens/LibrarySettings.tsx

@@ -17,7 +17,7 @@ import ListSubheader from '@mui/material/ListSubheader';
 import { t as translate } from 'i18next';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { GlobalUpdateSettings } from '@/modules/settings/components/globalUpdate/GlobalUpdateSettings.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,

src/modules/manga/components/MangaBadges.tsx

@@ -11,7 +11,7 @@ import { useTranslation } from 'react-i18next';
 import Button from '@mui/material/Button';
 import Typography from '@mui/material/Typography';
 import { MangaCardMode } from '@/modules/manga/MangaCard.types.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { useLibraryOptionsContext } from '@/modules/library/contexts/LibraryOptionsContext.tsx';
 
 const BadgeContainer = styled('div')(({ theme }) => ({

src/modules/manga/components/MangaDetails.tsx

@@ -26,7 +26,7 @@ import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import OpenInFullIcon from '@mui/icons-material/OpenInFull';
 import Modal from '@mui/material/Modal';
 import { bindPopover, bindTrigger, usePopupState } from 'material-ui-popup-state/hooks';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import {
     Mangas,
     MangaThumbnailInfo,

src/modules/manga/components/MangaGrid.tsx

@@ -28,7 +28,7 @@ import { GridLayout } from '@/modules/library/contexts/LibraryOptionsContext.tsx
 import { useLocalStorage, useSessionStorage } from '@/modules/core/hooks/useStorage.tsx';
 import { SelectableCollectionReturnType } from '@/modules/collection/hooks/useSelectableCollection.ts';
 import { DEFAULT_FULL_FAB_HEIGHT } from '@/modules/core/components/buttons/StyledFab.tsx';
-import { AppStorage } from '@/lib/AppStorage.ts';
+import { AppStorage } from '@/lib/storage/AppStorage.ts';
 import { MangaCardProps } from '@/modules/manga/MangaCard.types.tsx';
 import { MangaType } from '@/lib/graphql/generated/graphql.ts';
 import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';

src/modules/manga/components/MangaOptionButton.tsx

@@ -16,7 +16,7 @@ import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { PopupState } from 'material-ui-popup-state/hooks';
 import { bindTrigger } from 'material-ui-popup-state';
 import { SelectableCollectionReturnType } from '@/modules/collection/hooks/useSelectableCollection.ts';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { MangaType } from '@/lib/graphql/generated/graphql.ts';
 
 export const MangaOptionButton = forwardRef(

src/modules/manga/components/TrackMangaButton.tsx

@@ -13,7 +13,7 @@ import PopupState, { bindDialog, bindTrigger } from 'material-ui-popup-state';
 import Dialog from '@mui/material/Dialog';
 import CheckIcon from '@mui/icons-material/Check';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { TrackManga } from '@/modules/tracker/components/TrackManga.tsx';
 import { Trackers } from '@/modules/tracker/services/Trackers.ts';
 import { CustomIconButton } from '@/modules/core/components/buttons/CustomIconButton.tsx';

src/modules/manga/hooks/useManageMangaLibraryState.tsx

@@ -12,12 +12,12 @@ import { useNavigate } from 'react-router-dom';
 import gql from 'graphql-tag';
 import { useCategorySelect } from '@/modules/category/hooks/useCategorySelect.tsx';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { getMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
 import { Categories } from '@/modules/category/services/Categories.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { Mangas } from '@/modules/manga/services/Mangas.ts';
-import { awaitConfirmation } from '@/lib/ui/AwaitableDialog.tsx';
+import { awaitConfirmation } from '@/modules/core/utils/AwaitableDialog.tsx';
 import { GetCategoriesBaseQuery, GetCategoriesBaseQueryVariables, MangaType } from '@/lib/graphql/generated/graphql.ts';
 import { GET_CATEGORIES_BASE } from '@/lib/graphql/queries/CategoryQuery.ts';
 

src/modules/manga/hooks/useRefreshManga.ts

@@ -9,7 +9,7 @@
 import { useCallback, useState } from 'react';
 import { ApolloError } from '@apollo/client';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { baseCleanup } from '@/lib/data/Strings.ts';
+import { baseCleanup } from '@/util/Strings.ts';
 
 export const useRefreshManga = (mangaId: string) => {
     const [fetchingOnline, setFetchingOnline] = useState(false);

src/modules/manga/services/Mangas.ts

@@ -24,7 +24,7 @@ import {
     UpdateMangaCategoriesPatchInput,
 } from '@/lib/graphql/generated/graphql.ts';
 import { Chapters } from '@/modules/chapter/services/Chapters.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { getMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
 import { GET_MANGAS_BASE } from '@/lib/graphql/queries/MangaQuery.ts';
 import { MANGA_BASE_FIELDS } from '@/lib/graphql/fragments/MangaFragments.ts';

src/modules/migration/components/MigrateDialog.tsx

@@ -18,7 +18,7 @@ import { useState } from 'react';
 import FormGroup from '@mui/material/FormGroup';
 import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx';
 import { Mangas, MigrateMode } from '@/modules/manga/services/Mangas.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,

src/modules/migration/screens/Migration.tsx

@@ -28,7 +28,7 @@ import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,
 } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 
 const getMigratableSources = (

src/modules/navigation-bar/components/DefaultNavBar.tsx

@@ -29,7 +29,7 @@ import { useTheme } from '@mui/material/styles';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { useBackButton } from '@/modules/core/hooks/useBackButton.ts';
 import { useGetOptionForDirection } from '@/theme.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { DesktopSideBar } from '@/modules/navigation-bar/components/DesktopSideBar.tsx';
 import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
 import { MobileBottomBar } from '@/modules/navigation-bar/components/MobileBottomBar.tsx';

src/modules/reader/components/page/Page.tsx

@@ -11,7 +11,7 @@ import Box from '@mui/material/Box';
 import { useTheme } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { IReaderSettings, ReaderType } from '@/modules/reader/Reader.types.ts';
 
 export const isHorizontalReaderType = (readerType: ReaderType): boolean =>

src/modules/reader/screens/DefaultReaderSettings.tsx

@@ -14,7 +14,7 @@ import {
     useDefaultReaderSettings,
 } from '@/modules/reader/services/ReaderSettingsMetadata.ts';
 import { ReaderSettingsOptions } from '@/modules/reader/components/ReaderSettingsOptions.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';

src/modules/reader/screens/Reader.tsx

@@ -24,7 +24,7 @@ import { PagedPager } from '@/modules/reader/components/pager/PagedPager.tsx';
 import { DoublePagedPager } from '@/modules/reader/components/pager/DoublePagedPager.tsx';
 import { VerticalPager } from '@/modules/reader/components/pager/VerticalPager.tsx';
 import { ReaderNavBar } from '@/modules/reader/components/ReaderNavBar.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { useDebounce } from '@/modules/core/hooks/useDebounce.ts';
 import {
@@ -41,7 +41,7 @@ import { GET_CHAPTERS_READER } from '@/lib/graphql/queries/ChapterQuery.ts';
 import { GET_MANGA_READER } from '@/lib/graphql/queries/MangaQuery.ts';
 import { TMangaReader } from '@/modules/manga/services/Mangas.ts';
 import { CHAPTER_READER_FIELDS } from '@/lib/graphql/fragments/ChapterFragments.ts';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { IReaderSettings, ReaderType } from '@/modules/reader/Reader.types.ts';
 import { DirectionOffset } from '@/Base.types.ts';
 import { AllowedMetadataValueTypes } from '@/modules/metadata/Metadata.types.ts';

src/modules/settings/components/globalUpdate/GlobalUpdateSettings.tsx

@@ -19,7 +19,7 @@ import {
 import { GlobalUpdateSettingsEntries } from '@/modules/settings/components/globalUpdate/GlobalUpdateSettingsEntries.tsx';
 import { GlobalUpdateSettingsInterval } from '@/modules/settings/components/globalUpdate/GlobalUpdateSettingsInterval.tsx';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { ServerSettings } from '@/modules/settings/Settings.types.ts';
 
 type LibrarySettingsType = Pick<ServerSettings, 'updateMangas'>;

src/modules/settings/components/globalUpdate/GlobalUpdateSettingsEntries.tsx

@@ -17,7 +17,7 @@ import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
 import DialogTitle from '@mui/material/DialogTitle';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { CheckboxContainer } from '@/modules/core/components/inputs/CheckboxContainer.ts';
 import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx';
 import { TranslationKey } from '@/Base.types.ts';

src/modules/settings/screens/Appearance.tsx

@@ -18,11 +18,11 @@ import Link from '@mui/material/Link';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { ThemeMode, ThemeModeContext } from '@/modules/theme/contexts/ThemeModeContext.tsx';
 import { Select } from '@/modules/core/components/inputs/Select.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx';
 import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
 import { I18nResourceCode, i18nResources } from '@/i18n';
-import { langCodeToName } from '@/lib/Languages.tsx';
+import { langCodeToName } from '@/modules/core/utils/Languages.ts';
 import { getTheme } from '@/modules/theme/services/AppThemes.ts';
 import { ThemeList } from '@/modules/theme/components/ThemeList.tsx';
 import {
@@ -32,7 +32,7 @@ import {
 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 '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { MetadataThemeSettings } from '@/modules/theme/AppTheme.types.ts';
 
 export const Appearance = () => {

src/modules/settings/screens/ServerSettings.tsx

@@ -28,7 +28,7 @@ import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,
 } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { MetadataUpdateSettings } from '@/modules/app-updates/AppUpdateChecker.types.ts';
 import { ServerSettings as GqlServerSettings } from '@/modules/settings/Settings.types.ts';
 

src/modules/settings/screens/Settings.tsx

@@ -28,7 +28,7 @@ import PaletteIcon from '@mui/icons-material/Palette';
 import { ListItemLink } from '@/modules/core/components/ListItemLink.tsx';
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 
 export function Settings() {
     const { t } = useTranslation();

src/modules/settings/screens/WebUISettings.tsx

@@ -29,7 +29,7 @@ import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,
 } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { MetadataUpdateSettings } from '@/modules/app-updates/AppUpdateChecker.types.ts';
 import { ServerSettings } from '@/modules/settings/Settings.types.ts';
 

src/modules/source/components/SourceCard.tsx

@@ -22,7 +22,7 @@ import { translateExtensionLanguage } from '@/modules/extension/services/Extensi
 import { SourceContentType } from '@/modules/source/screens/SourceMangas.tsx';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
 import { GetSourcesListQuery } from '@/lib/graphql/generated/graphql.ts';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 
 interface IProps {
     source: GetSourcesListQuery['sources']['nodes'][number];

src/modules/source/components/SourceOptions.tsx

@@ -36,7 +36,7 @@ import { TriStateFilter } from '@/modules/source/components/filters/TriStateFilt
 import { GroupFilter } from '@/modules/source/components/filters/GroupFilter.tsx';
 import { SeparatorFilter } from '@/modules/source/components/filters/SeparatorFilter.tsx';
 import { StyledFab } from '@/modules/core/components/buttons/StyledFab.tsx';
-import { awaitConfirmation } from '@/lib/ui/AwaitableDialog.tsx';
+import { awaitConfirmation } from '@/modules/core/utils/AwaitableDialog.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { ISourceMetadata, SourceFilters } from '@/modules/source/Source.types.ts';
 

src/modules/source/screens/SourceConfigure.tsx

@@ -25,7 +25,7 @@ import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { GetCategoriesSettingsQueryVariables, GetSourceSettingsQuery } from '@/lib/graphql/generated/graphql.ts';
 import { GET_SOURCE_SETTINGS } from '@/lib/graphql/queries/SourceQuery.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { PreferenceProps } from '@/modules/source/Source.types.ts';
 
 function getPrefComponent(type: string) {

src/modules/source/screens/SourceMangas.tsx

@@ -39,10 +39,10 @@ import {
 import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
 import { useLocalStorage, useSessionStorage } from '@/modules/core/hooks/useStorage.tsx';
-import { AppStorage } from '@/lib/AppStorage.ts';
+import { AppStorage } from '@/lib/storage/AppStorage.ts';
 import { getGridSnapshotKey } from '@/modules/manga/components/MangaGrid.tsx';
 import { createUpdateSourceMetadata, getSourceMetadata } from '@/modules/source/services/SourceMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { GET_SOURCE_BROWSE } from '@/lib/graphql/queries/SourceQuery.ts';
 import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 import { TranslationKey } from '@/Base.types.ts';

src/modules/source/screens/Sources.tsx

@@ -15,7 +15,12 @@ import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
-import { sourceDefualtLangs, sourceForcedDefaultLangs, langSortCmp, DefaultLanguage } from '@/lib/Languages.tsx';
+import {
+    sourceDefualtLangs,
+    sourceForcedDefaultLangs,
+    langSortCmp,
+    DefaultLanguage,
+} from '@/modules/core/utils/Languages.ts';
 import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { SourceCard } from '@/modules/source/components/SourceCard.tsx';

src/modules/theme/components/CreateThemeDialog.tsx

@@ -25,7 +25,7 @@ import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,
 } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { EmptyView } from '@/modules/core/components/placeholder/EmptyView.tsx';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';

src/modules/theme/components/ThemeList.tsx

@@ -14,7 +14,7 @@ import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,
 } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { EmptyView } from '@/modules/core/components/placeholder/EmptyView.tsx';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';

src/modules/theme/components/ThemePreview.tsx

@@ -23,7 +23,7 @@ import { ThemeModeContext } from '@/modules/theme/contexts/ThemeModeContext.tsx'
 import { AppTheme, hasMissingFonts, loadThemeFonts } from '@/modules/theme/services/AppThemes.ts';
 import { createTheme } from '@/theme.tsx';
 import { ThemeCreationDialog } from '@/modules/theme/components/CreateThemeDialog.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx';
 
 const ThemePreviewBadge = styled(Box)(() => ({

src/modules/tracker/components/TrackManga.tsx

@@ -16,7 +16,7 @@ import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { Trackers } from '@/modules/tracker/services/Trackers.ts';
 import { TrackerCard, TrackerMode } from '@/modules/tracker/components/cards/TrackerCard.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { GetMangaTrackRecordsQuery, GetTrackersBindQuery, MangaType } from '@/lib/graphql/generated/graphql.ts';
 import { GET_TRACKERS_BIND } from '@/lib/graphql/queries/TrackerQuery.ts';

src/modules/tracker/components/TrackerSearch.tsx

@@ -26,7 +26,7 @@ import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { Tracker, TTrackerBase } from '@/modules/tracker/services/Trackers.ts';
 import { SearchTextField } from '@/modules/core/components/inputs/SearchTextField.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { TrackerMangaCard } from '@/modules/tracker/components/cards/TrackerMangaCard.tsx';
 import { DIALOG_PADDING } from '@/modules/tracker/Tracker.constants.ts';
 import { useGetOptionForDirection } from '@/theme.tsx';

src/modules/tracker/components/cards/SettingsTrackerCard.tsx

@@ -22,7 +22,7 @@ import TextField from '@mui/material/TextField';
 import DialogActions from '@mui/material/DialogActions';
 import Button from '@mui/material/Button';
 import { PasswordTextField } from '@/modules/core/components/inputs/PasswordTextField.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { Trackers, TTrackerSearch } from '@/modules/tracker/services/Trackers.ts';
 

src/modules/tracker/components/cards/TrackerActiveCard.tsx

@@ -33,7 +33,7 @@ import { Trackers, TTrackerBind, TTrackRecordBind, UNSET_DATE } from '@/modules/
 import { ListPreference } from '@/modules/source/components/sourceConfiguration/ListPreference.tsx';
 import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx';
 import { DateSetting } from '@/modules/core/components/settings/DateSetting.tsx';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { Menu } from '@/modules/core/components/menu/Menu.tsx';
 import { CARD_STYLING } from '@/modules/tracker/Tracker.constants.ts';
 import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx';

src/modules/tracker/components/cards/TrackerMangaCard.tsx

@@ -25,7 +25,7 @@ import sanitizeHtml from 'sanitize-html';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
 import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx';
 import { Metadata } from '@/modules/core/components/Metadata.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { TTrackerManga } from '@/modules/tracker/services/Trackers.ts';
 
 const TrackerMangaCardTitle = ({ title, selected }: { title: string; selected: boolean }) => (

src/modules/tracker/screens/TrackerOAuthLogin.tsx

@@ -10,7 +10,7 @@ import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 
 export const TrackerOAuthLogin = () => {
     const { t } = useTranslation();

src/modules/tracker/screens/TrackingSettings.tsx

@@ -23,7 +23,7 @@ import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,
 } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { GET_TRACKERS_SETTINGS } from '@/lib/graphql/queries/TrackerQuery.ts';
 import { GetTrackersSettingsQuery } from '@/lib/graphql/generated/graphql.ts';

src/modules/updates/screens/Updates.tsx

@@ -35,7 +35,7 @@ import { dateTimeFormatter, epochToDate, getDateString } from '@/util/DateHelper
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx';
 import { ChapterIdInfo, ChapterMangaInfo } from '@/modules/chapter/services/Chapters.ts';
-import { makeToast } from '@/lib/ui/Toast.ts';
+import { makeToast } from '@/modules/core/utils/Toast.ts';
 
 const groupByDate = (updates: Pick<ChapterType, 'fetchedAt'>[]): [date: string, items: number][] => {
     if (!updates.length) {

src/theme.tsx

@@ -18,7 +18,7 @@ import {
 } from '@mui/material/styles';
 import { useCallback } from 'react';
 import { ThemeMode } from '@/modules/theme/contexts/ThemeModeContext.tsx';
-import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
+import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { AppTheme, loadThemeFonts } from '@/modules/theme/services/AppThemes.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';