From b3e3d94bda89201902484fcd7ffb1b5060eef72b Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:57:24 +0100 Subject: [PATCH] Move "theme.tsx" to proper module --- src/modules/core/components/menu/NestedMenuItem.tsx | 2 +- src/modules/core/contexts/AppContext.tsx | 2 +- src/modules/core/utils/AwaitableDialog.tsx | 2 +- src/modules/core/utils/MediaQuery.tsx | 2 +- src/modules/navigation-bar/components/DefaultNavBar.tsx | 2 +- src/modules/navigation-bar/components/DesktopSideBar.tsx | 2 +- src/modules/reader/components/ReaderHotkeys.tsx | 2 +- .../reader/components/overlay/ReaderOverlayHeaderMobile.tsx | 2 +- .../overlay/navigation/desktop/ReaderNavBarDesktop.tsx | 2 +- .../navigation/desktop/ReaderNavBarDesktopChapterNavigation.tsx | 2 +- .../navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx | 2 +- .../components/overlay/progress-bar/ReaderProgressBar.tsx | 2 +- .../overlay/progress-bar/ReaderProgressBarDirectionWrapper.tsx | 2 +- .../overlay/progress-bar/variants/MobileReaderProgressBar.tsx | 2 +- src/modules/reader/services/ReaderControls.ts | 2 +- src/modules/reader/utils/ReaderPager.utils.tsx | 2 +- src/modules/reader/utils/ReaderProgressBar.utils.tsx | 2 +- src/modules/theme/components/ThemePreview.tsx | 2 +- src/{ => modules/theme/services}/theme.tsx | 0 src/modules/tracker/components/TrackerSearch.tsx | 2 +- 20 files changed, 19 insertions(+), 19 deletions(-) rename src/{ => modules/theme/services}/theme.tsx (100%) diff --git a/src/modules/core/components/menu/NestedMenuItem.tsx b/src/modules/core/components/menu/NestedMenuItem.tsx index 9f2de0bd..7d530d27 100644 --- a/src/modules/core/components/menu/NestedMenuItem.tsx +++ b/src/modules/core/components/menu/NestedMenuItem.tsx @@ -35,7 +35,7 @@ import Box from '@mui/material/Box'; 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 { getOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; export type NestedMenuItemProps = Omit & { diff --git a/src/modules/core/contexts/AppContext.tsx b/src/modules/core/contexts/AppContext.tsx index bc7e0c6b..4e4fc19e 100644 --- a/src/modules/core/contexts/AppContext.tsx +++ b/src/modules/core/contexts/AppContext.tsx @@ -14,7 +14,7 @@ import { ReactRouter6Adapter } from 'use-query-params/adapters/react-router-6'; import { useTranslation } from 'react-i18next'; import { CacheProvider } from '@emotion/react'; import { SnackbarProvider } from 'notistack'; -import { createAndSetTheme } from '@/theme.tsx'; +import { createAndSetTheme } from '@/modules/theme/services/theme.tsx'; import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; import { ThemeMode, ThemeModeContext } from '@/modules/theme/contexts/ThemeModeContext.tsx'; import { NavBarContextProvider } from '@/modules/navigation-bar/contexts/NavBarContextProvider.tsx'; diff --git a/src/modules/core/utils/AwaitableDialog.tsx b/src/modules/core/utils/AwaitableDialog.tsx index db9d5885..a5ca4806 100644 --- a/src/modules/core/utils/AwaitableDialog.tsx +++ b/src/modules/core/utils/AwaitableDialog.tsx @@ -10,7 +10,7 @@ import { createRoot } from 'react-dom/client'; import { ThemeProvider } from '@mui/material/styles'; import { ConfirmDialog } from '@/modules/core/components/ConfirmDialog.tsx'; import { ControlledPromise } from '@/lib/ControlledPromise.ts'; -import { getCurrentTheme } from '@/theme.tsx'; +import { getCurrentTheme } from '@/modules/theme/services/theme.tsx'; export const awaitConfirmation = async ( dialogProps: Omit, 'onCancel' | 'onConfirm'>, diff --git a/src/modules/core/utils/MediaQuery.tsx b/src/modules/core/utils/MediaQuery.tsx index a8aa7a32..9903c241 100644 --- a/src/modules/core/utils/MediaQuery.tsx +++ b/src/modules/core/utils/MediaQuery.tsx @@ -9,7 +9,7 @@ import useMediaQuery from '@mui/material/useMediaQuery'; import { Breakpoint } from '@mui/material/styles'; import { useCallback, useState } from 'react'; -import { getCurrentTheme } from '@/theme.tsx'; +import { getCurrentTheme } from '@/modules/theme/services/theme.tsx'; import { ThemeMode } from '@/modules/theme/contexts/ThemeModeContext.tsx'; import { AppStorage } from '@/lib/storage/AppStorage.ts'; import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx'; diff --git a/src/modules/navigation-bar/components/DefaultNavBar.tsx b/src/modules/navigation-bar/components/DefaultNavBar.tsx index 39c3914d..fcf141a8 100644 --- a/src/modules/navigation-bar/components/DefaultNavBar.tsx +++ b/src/modules/navigation-bar/components/DefaultNavBar.tsx @@ -28,7 +28,7 @@ import Stack from '@mui/material/Stack'; 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 { useGetOptionForDirection } from '@/modules/theme/services/theme.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'; diff --git a/src/modules/navigation-bar/components/DesktopSideBar.tsx b/src/modules/navigation-bar/components/DesktopSideBar.tsx index e9fc6ccb..86bec197 100644 --- a/src/modules/navigation-bar/components/DesktopSideBar.tsx +++ b/src/modules/navigation-bar/components/DesktopSideBar.tsx @@ -22,7 +22,7 @@ import Box from '@mui/material/Box'; import ListItem from '@mui/material/ListItem'; import Tooltip from '@mui/material/Tooltip'; import { ListItemLink } from '@/modules/core/components/ListItemLink.tsx'; -import { useGetOptionForDirection } from '@/theme.tsx'; +import { useGetOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx'; import { NavbarItem } from '@/modules/navigation-bar/NavigationBar.types.ts'; diff --git a/src/modules/reader/components/ReaderHotkeys.tsx b/src/modules/reader/components/ReaderHotkeys.tsx index c3e1ca6e..f03dc536 100644 --- a/src/modules/reader/components/ReaderHotkeys.tsx +++ b/src/modules/reader/components/ReaderHotkeys.tsx @@ -23,7 +23,7 @@ import { MangaIdInfo } from '@/modules/manga/Manga.types.ts'; import { HotkeyScope } from '@/modules/hotkeys/Hotkeys.types.ts'; import { ReaderControls } from '@/modules/reader/services/ReaderControls.ts'; import { ScrollDirection, ScrollOffset } from '@/modules/core/Core.types.ts'; -import { getOptionForDirection } from '@/theme.tsx'; +import { getOptionForDirection } from '@/modules/theme/services/theme.tsx'; const useHotkeys = (...args: Parameters): ReturnType => { const [keys, callback, options, dependencies] = args; diff --git a/src/modules/reader/components/overlay/ReaderOverlayHeaderMobile.tsx b/src/modules/reader/components/overlay/ReaderOverlayHeaderMobile.tsx index 7ccbaca7..e02f1e0f 100644 --- a/src/modules/reader/components/overlay/ReaderOverlayHeaderMobile.tsx +++ b/src/modules/reader/components/overlay/ReaderOverlayHeaderMobile.tsx @@ -22,7 +22,7 @@ import { Link as RouterLink } from 'react-router-dom'; import { alpha } from '@mui/material/styles'; import Tooltip from '@mui/material/Tooltip'; import Slide from '@mui/material/Slide'; -import { useGetOptionForDirection } from '@/theme.tsx'; +import { useGetOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx'; import { actionToTranslationKey, ChapterAction, Chapters } from '@/modules/chapter/services/Chapters.ts'; import { useBackButton } from '@/modules/core/hooks/useBackButton.ts'; diff --git a/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktop.tsx b/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktop.tsx index 2f0f4554..013f8a5c 100644 --- a/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktop.tsx +++ b/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktop.tsx @@ -16,7 +16,7 @@ import PushPinIcon from '@mui/icons-material/PushPin'; import Divider from '@mui/material/Divider'; import { useCallback, useLayoutEffect, useRef, useState } from 'react'; import Drawer from '@mui/material/Drawer'; -import { useGetOptionForDirection } from '@/theme.tsx'; +import { useGetOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { ReaderNavBarDesktopProps } from '@/modules/reader/types/ReaderOverlay.types.ts'; import { ReaderNavContainer } from '@/modules/reader/components/overlay/navigation/desktop/ReaderNavContainer.tsx'; import { ReaderNavBarDesktopMetadata } from '@/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopMetadata.tsx'; diff --git a/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopChapterNavigation.tsx b/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopChapterNavigation.tsx index 93e9feef..37327eae 100644 --- a/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopChapterNavigation.tsx +++ b/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopChapterNavigation.tsx @@ -21,7 +21,7 @@ import { Chapters } from '@/modules/chapter/services/Chapters.ts'; import { ReaderStateChaptersContext } from '@/modules/reader/contexts/state/ReaderStateChaptersContext.tsx'; import { ReaderChapterList } from '@/modules/reader/components/overlay/navigation/ReaderChapterList.tsx'; import { ReaderNavBarDesktopNextPreviousButton } from '@/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopNextPreviousButton.tsx'; -import { getOptionForDirection } from '@/theme.tsx'; +import { getOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { ReaderService } from '@/modules/reader/services/ReaderService.ts'; import { ReaderResumeMode } from '@/modules/reader/types/Reader.types.ts'; diff --git a/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx b/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx index 71ad70d4..7651de49 100644 --- a/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx +++ b/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx @@ -16,7 +16,7 @@ import { Select } from '@/modules/core/components/inputs/Select.tsx'; import { getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx'; import { ReaderStatePages } from '@/modules/reader/types/ReaderProgressBar.types.ts'; import { ReaderControls } from '@/modules/reader/services/ReaderControls.ts'; -import { useGetOptionForDirection } from '@/theme.tsx'; +import { useGetOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { ReaderService } from '@/modules/reader/services/ReaderService.ts'; import { ReaderNavBarDesktopNextPreviousButton } from '@/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopNextPreviousButton.tsx'; import { READING_DIRECTION_TO_THEME_DIRECTION } from '@/modules/reader/constants/ReaderSettings.constants.tsx'; diff --git a/src/modules/reader/components/overlay/progress-bar/ReaderProgressBar.tsx b/src/modules/reader/components/overlay/progress-bar/ReaderProgressBar.tsx index c6a3e8b7..2f5c186b 100644 --- a/src/modules/reader/components/overlay/progress-bar/ReaderProgressBar.tsx +++ b/src/modules/reader/components/overlay/progress-bar/ReaderProgressBar.tsx @@ -25,7 +25,7 @@ import { getProgressBarPositionInfo, useHandleProgressDragging, } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx'; -import { getOptionForDirection as getOptionForDirectionImpl } from '@/theme.tsx'; +import { getOptionForDirection as getOptionForDirectionImpl } from '@/modules/theme/services/theme.tsx'; import { ReaderProgressBarSlotsActionArea } from '@/modules/reader/components/overlay/progress-bar/ReaderProgressBarSlotsActionArea.tsx'; import { ReaderService } from '@/modules/reader/services/ReaderService.ts'; import { ReaderControls } from '@/modules/reader/services/ReaderControls.ts'; diff --git a/src/modules/reader/components/overlay/progress-bar/ReaderProgressBarDirectionWrapper.tsx b/src/modules/reader/components/overlay/progress-bar/ReaderProgressBarDirectionWrapper.tsx index a7d8e2ab..d2f75265 100644 --- a/src/modules/reader/components/overlay/progress-bar/ReaderProgressBarDirectionWrapper.tsx +++ b/src/modules/reader/components/overlay/progress-bar/ReaderProgressBarDirectionWrapper.tsx @@ -13,7 +13,7 @@ import { useMetadataServerSettings } from '@/modules/settings/services/ServerSet import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; import { AppThemes, getTheme } from '@/modules/theme/services/AppThemes.ts'; import { ThemeMode } from '@/modules/theme/contexts/ThemeModeContext.tsx'; -import { createTheme } from '@/theme.tsx'; +import { createTheme } from '@/modules/theme/services/theme.tsx'; import { ReaderService } from '@/modules/reader/services/ReaderService.ts'; import { DIRECTION_TO_CACHE } from '@/modules/theme/ThemeDirectionCache.ts'; diff --git a/src/modules/reader/components/overlay/progress-bar/variants/MobileReaderProgressBar.tsx b/src/modules/reader/components/overlay/progress-bar/variants/MobileReaderProgressBar.tsx index ebf76c76..cc887314 100644 --- a/src/modules/reader/components/overlay/progress-bar/variants/MobileReaderProgressBar.tsx +++ b/src/modules/reader/components/overlay/progress-bar/variants/MobileReaderProgressBar.tsx @@ -19,7 +19,7 @@ import { userReaderStatePagesContext } from '@/modules/reader/contexts/state/Rea import { useReaderStateChaptersContext } from '@/modules/reader/contexts/state/ReaderStateChaptersContext.tsx'; import { ReaderService } from '@/modules/reader/services/ReaderService.ts'; import { getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx'; -import { getOptionForDirection } from '@/theme.tsx'; +import { getOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { ProgressBarPosition, ReaderResumeMode } from '@/modules/reader/types/Reader.types.ts'; import { ReaderProgressBarDirectionWrapper } from '@/modules/reader/components/overlay/progress-bar/ReaderProgressBarDirectionWrapper.tsx'; import { useReaderProgressBarContext } from '@/modules/reader/contexts/ReaderProgressBarContext.tsx'; diff --git a/src/modules/reader/services/ReaderControls.ts b/src/modules/reader/services/ReaderControls.ts index 43dbbd2d..1c95ba9d 100644 --- a/src/modules/reader/services/ReaderControls.ts +++ b/src/modules/reader/services/ReaderControls.ts @@ -10,7 +10,7 @@ import { MutableRefObject, useCallback, useMemo } from 'react'; import { Direction, useTheme } from '@mui/material/styles'; import { userReaderStatePagesContext } from '@/modules/reader/contexts/state/ReaderStatePagesContext.tsx'; import { getNextIndexFromPage, getNextPageIndex, getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx'; -import { getOptionForDirection } from '@/theme.tsx'; +import { getOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { ReaderService } from '@/modules/reader/services/ReaderService.ts'; import { useReaderStateChaptersContext } from '@/modules/reader/contexts/state/ReaderStateChaptersContext.tsx'; import { diff --git a/src/modules/reader/utils/ReaderPager.utils.tsx b/src/modules/reader/utils/ReaderPager.utils.tsx index ad5986cd..c0309df7 100644 --- a/src/modules/reader/utils/ReaderPager.utils.tsx +++ b/src/modules/reader/utils/ReaderPager.utils.tsx @@ -24,7 +24,7 @@ import { ReaderPage } from '@/modules/reader/components/viewer/ReaderPage.tsx'; import { reverseString } from '@/util/Strings.ts'; import { getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx'; import { DirectionOffset } from '@/Base.types.ts'; -import { getOptionForDirection } from '@/theme.tsx'; +import { getOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { READING_DIRECTION_TO_THEME_DIRECTION } from '@/modules/reader/constants/ReaderSettings.constants.tsx'; type CSSObject = ReturnType; diff --git a/src/modules/reader/utils/ReaderProgressBar.utils.tsx b/src/modules/reader/utils/ReaderProgressBar.utils.tsx index 634dcf3e..2c2b87cf 100644 --- a/src/modules/reader/utils/ReaderProgressBar.utils.tsx +++ b/src/modules/reader/utils/ReaderProgressBar.utils.tsx @@ -8,7 +8,7 @@ import { RefObject, useEffect } from 'react'; import { ReaderProgressBarProps, TReaderProgressCurrentPage } from '@/modules/reader/types/ReaderProgressBar.types.ts'; -import { getOptionForDirection as getOptionForDirectionImpl } from '@/theme.tsx'; +import { getOptionForDirection as getOptionForDirectionImpl } from '@/modules/theme/services/theme.tsx'; import { ProgressBarPosition } from '@/modules/reader/types/Reader.types.ts'; import { ReaderControls } from '@/modules/reader/services/ReaderControls.ts'; diff --git a/src/modules/theme/components/ThemePreview.tsx b/src/modules/theme/components/ThemePreview.tsx index 6451a013..5b523488 100644 --- a/src/modules/theme/components/ThemePreview.tsx +++ b/src/modules/theme/components/ThemePreview.tsx @@ -21,7 +21,7 @@ import EditIcon from '@mui/icons-material/Edit'; import { bindDialog, usePopupState } from 'material-ui-popup-state/hooks'; import { ThemeModeContext } from '@/modules/theme/contexts/ThemeModeContext.tsx'; import { AppTheme, hasMissingFonts, loadThemeFonts } from '@/modules/theme/services/AppThemes.ts'; -import { createTheme } from '@/theme.tsx'; +import { createTheme } from '@/modules/theme/services/theme.tsx'; import { ThemeCreationDialog } from '@/modules/theme/components/CreateThemeDialog.tsx'; import { makeToast } from '@/modules/core/utils/Toast.ts'; import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx'; diff --git a/src/theme.tsx b/src/modules/theme/services/theme.tsx similarity index 100% rename from src/theme.tsx rename to src/modules/theme/services/theme.tsx diff --git a/src/modules/tracker/components/TrackerSearch.tsx b/src/modules/tracker/components/TrackerSearch.tsx index 17456169..677deb5d 100644 --- a/src/modules/tracker/components/TrackerSearch.tsx +++ b/src/modules/tracker/components/TrackerSearch.tsx @@ -29,7 +29,7 @@ import { SearchTextField } from '@/modules/core/components/inputs/SearchTextFiel 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'; +import { useGetOptionForDirection } from '@/modules/theme/services/theme.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { MangaType } from '@/lib/graphql/generated/graphql.ts';