diff --git a/apps/readest-app/src/app/library/components/Bookshelf.tsx b/apps/readest-app/src/app/library/components/Bookshelf.tsx index 8522f434..7e6995ec 100644 --- a/apps/readest-app/src/app/library/components/Bookshelf.tsx +++ b/apps/readest-app/src/app/library/components/Bookshelf.tsx @@ -363,7 +363,7 @@ const Bookshelf: React.FC = ({
diff --git a/apps/readest-app/src/app/library/components/LibraryHeader.tsx b/apps/readest-app/src/app/library/components/LibraryHeader.tsx index 1eb9ce1b..b18a3cc3 100644 --- a/apps/readest-app/src/app/library/components/LibraryHeader.tsx +++ b/apps/readest-app/src/app/library/components/LibraryHeader.tsx @@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'; import { useRouter, useSearchParams } from 'next/navigation'; import { FaSearch } from 'react-icons/fa'; import { PiPlus } from 'react-icons/pi'; -import { PiSelectionAllDuotone } from 'react-icons/pi'; +import { PiSelectionAll, PiSelectionAllFill } from 'react-icons/pi'; import { PiDotsThreeCircle } from 'react-icons/pi'; import { MdOutlineMenu, MdArrowBackIosNew } from 'react-icons/md'; import { IoMdCloseCircle } from 'react-icons/io'; @@ -152,6 +152,7 @@ const LibraryHeader: React.FC = ({ className={clsx( 'input rounded-badge bg-base-300/45 h-9 w-full pl-10 pr-10 sm:h-7', 'font-sans text-sm font-light', + 'placeholder:text-base-content/50', 'border-none focus:outline-none focus:ring-0', )} /> @@ -189,10 +190,11 @@ const LibraryHeader: React.FC = ({ title={_('Select Books')} className='h-6' > - + {isSelectMode ? ( + + ) : ( + + )} )}
diff --git a/apps/readest-app/src/app/library/page.tsx b/apps/readest-app/src/app/library/page.tsx index 59f62dd9..d974be9b 100644 --- a/apps/readest-app/src/app/library/page.tsx +++ b/apps/readest-app/src/app/library/page.tsx @@ -96,6 +96,7 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP const [pendingNavigationBookIds, setPendingNavigationBookIds] = useState(null); const isInitiating = useRef(false); + const viewSettings = settings.globalViewSettings; const demoBooks = useDemoBooks(); const osRef = useRef(null); const containerRef: React.MutableRefObject = useRef(null); @@ -604,7 +605,8 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP ref={pageRef} aria-label='Your Library' className={clsx( - 'library-page bg-base-200 text-base-content flex h-[100vh] select-none flex-col overflow-hidden', + 'library-page text-base-content flex h-[100vh] select-none flex-col overflow-hidden', + viewSettings?.isEink ? 'bg-base-100' : 'bg-base-200', appService?.hasRoundedWindow && isRoundedWindow && 'window-border rounded-window', )} > diff --git a/apps/readest-app/src/components/Providers.tsx b/apps/readest-app/src/components/Providers.tsx index 935c451a..01bebb41 100644 --- a/apps/readest-app/src/components/Providers.tsx +++ b/apps/readest-app/src/components/Providers.tsx @@ -60,8 +60,8 @@ const Providers = ({ children }: { children: React.ReactNode }) => { setScreenBrightness(brightness / 100); } applyBackgroundTexture(envConfig, globalViewSettings); - if (appService.isAndroidApp) { - applyEinkMode(globalViewSettings.isEink); + if (globalViewSettings.isEink) { + applyEinkMode(true); } }); } diff --git a/apps/readest-app/src/components/settings/ControlPanel.tsx b/apps/readest-app/src/components/settings/ControlPanel.tsx index c915b3b5..5ddc7789 100644 --- a/apps/readest-app/src/components/settings/ControlPanel.tsx +++ b/apps/readest-app/src/components/settings/ControlPanel.tsx @@ -269,12 +269,12 @@ const ControlPanel: React.FC = ({ bookKey, onRegisterRes - {appService?.isMobileApp && ( + {(appService?.isMobileApp || appService?.appPlatform === 'web') && (

{_('Device')}

- {appService?.isAndroidApp && ( + {(appService?.isAndroidApp || appService?.appPlatform === 'web') && (
{_('E-Ink Mode')} = ({ bookKey, onRegisterRes />
)} -
- {_('Auto Screen Brightness')} - setAutoScreenBrightness(!autoScreenBrightness)} - /> -
+ {appService?.isMobileApp && ( +
+ {_('Auto Screen Brightness')} + setAutoScreenBrightness(!autoScreenBrightness)} + /> +
+ )}
diff --git a/apps/readest-app/src/styles/globals.css b/apps/readest-app/src/styles/globals.css index 1bfb0ac3..002ea5bc 100644 --- a/apps/readest-app/src/styles/globals.css +++ b/apps/readest-app/src/styles/globals.css @@ -416,6 +416,18 @@ foliate-view { box-shadow: none !important; } +[data-eink="true"] [class*="text-"] { + color: theme('colors.base-content') !important; +} + +[data-eink="true"] [class*="bg-base-content"] { + background-color: theme('colors.base-content') !important; +} + +[data-eink="true"] [class*="placeholder:"]::placeholder { + color: theme('colors.base-content') !important; +} + .no-transitions * { transition: none !important; } \ No newline at end of file