From fb0f660eaf08dbe4aa172c663fb9bf0de47ee698 Mon Sep 17 00:00:00 2001
From: Huang Xin <chrox.huang@gmail.com>
Date: Thu, 6 Nov 2025 05:45:13 +0800
Subject: [PATCH] fix(android): fixed back gesture to close config panel,
 closes #2406 (#2411)

---
 .../src/app/library/components/Bookshelf.tsx  |  2 +-
 .../src/app/reader/components/HeaderBar.tsx   |  3 +-
 .../src/app/reader/components/HintInfo.tsx    |  2 +
 .../src/app/reader/components/SectionInfo.tsx |  8 ++--
 .../reader/components/footerbar/FooterBar.tsx | 39 ++++++++++++++++++-
 apps/readest-app/src/styles/globals.css       | 22 +++++++++--
 6 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/apps/readest-app/src/app/library/components/Bookshelf.tsx b/apps/readest-app/src/app/library/components/Bookshelf.tsx
index 7e6995ec..a0837879 100644
--- a/apps/readest-app/src/app/library/components/Bookshelf.tsx
+++ b/apps/readest-app/src/app/library/components/Bookshelf.tsx
@@ -406,7 +406,7 @@ const Bookshelf: React.FC<BookshelfProps> = ({
                 !selectedBooks.length && 'btn-disabled opacity-50',
               )}
             >
-              <MdDelete className='fill-red-500' />
+              <MdDelete className='text-red-500' />
               <div className='text-red-500'>{_('Delete')}</div>
             </button>
             <button
diff --git a/apps/readest-app/src/app/reader/components/HeaderBar.tsx b/apps/readest-app/src/app/reader/components/HeaderBar.tsx
index 96668016..ff1a4daf 100644
--- a/apps/readest-app/src/app/reader/components/HeaderBar.tsx
+++ b/apps/readest-app/src/app/reader/components/HeaderBar.tsx
@@ -106,7 +106,8 @@ const HeaderBar: React.FC<HeaderBarProps> = ({
     >
       <div
         role='none'
-        className={clsx('absolute top-0 z-10 h-11 w-full')}
+        className={clsx('absolute top-0 z-20 h-11 w-full')}
+        onClick={() => setHoveredBookKey(bookKey)}
         onMouseEnter={() => !appService?.isMobile && setHoveredBookKey(bookKey)}
         onTouchStart={() => !appService?.isMobile && setHoveredBookKey(bookKey)}
       />
diff --git a/apps/readest-app/src/app/reader/components/HintInfo.tsx b/apps/readest-app/src/app/reader/components/HintInfo.tsx
index 38679232..15d60fa9 100644
--- a/apps/readest-app/src/app/reader/components/HintInfo.tsx
+++ b/apps/readest-app/src/app/reader/components/HintInfo.tsx
@@ -60,6 +60,8 @@ const HintInfo: React.FC<SectionInfoProps> = ({
     };
   }, [hintMessage]);
 
+  if (!hintMessage) return null;
+
   return (
     <>
       <div
diff --git a/apps/readest-app/src/app/reader/components/SectionInfo.tsx b/apps/readest-app/src/app/reader/components/SectionInfo.tsx
index a2bc8e84..9c5db0bc 100644
--- a/apps/readest-app/src/app/reader/components/SectionInfo.tsx
+++ b/apps/readest-app/src/app/reader/components/SectionInfo.tsx
@@ -31,7 +31,7 @@ const SectionInfo: React.FC<SectionInfoProps> = ({
 }) => {
   const _ = useTranslation();
   const { appService } = useEnv();
-  const { hoveredBookKey } = useReaderStore();
+  const { hoveredBookKey, setHoveredBookKey } = useReaderStore();
   const { systemUIVisible, statusBarHeight } = useThemeStore();
   const topInset = Math.max(
     gridInsets.top,
@@ -56,8 +56,8 @@ const SectionInfo: React.FC<SectionInfoProps> = ({
           isVertical ? 'writing-vertical-rl max-h-[85%]' : 'top-0 h-[44px]',
           isScrolled && !isVertical && 'bg-base-100',
         )}
-        role='banner'
-        aria-label={section ? _('Section Title') + `: ${section}` : ''}
+        role='none'
+        onClick={() => setHoveredBookKey(bookKey)}
         style={
           isVertical
             ? {
@@ -76,7 +76,7 @@ const SectionInfo: React.FC<SectionInfoProps> = ({
         }
       >
         <span
-          aria-hidden='true'
+          aria-label={section ? _('Section Title') + `: ${section}` : ''}
           className={clsx(
             'text-center',
             isVertical ? '' : 'line-clamp-1',
diff --git a/apps/readest-app/src/app/reader/components/footerbar/FooterBar.tsx b/apps/readest-app/src/app/reader/components/footerbar/FooterBar.tsx
index f492b3ac..63b73d24 100644
--- a/apps/readest-app/src/app/reader/components/footerbar/FooterBar.tsx
+++ b/apps/readest-app/src/app/reader/components/footerbar/FooterBar.tsx
@@ -1,10 +1,11 @@
 import clsx from 'clsx';
-import React, { useState, useCallback, useMemo } from 'react';
+import React, { useState, useCallback, useMemo, useEffect } from 'react';
 import { useEnv } from '@/context/EnvContext';
 import { useReaderStore } from '@/store/readerStore';
 import { useSidebarStore } from '@/store/sidebarStore';
 import { useBookDataStore } from '@/store/bookDataStore';
 import { useTranslation } from '@/hooks/useTranslation';
+import { useDeviceControlStore } from '@/store/deviceStore';
 import { eventDispatcher } from '@/utils/event';
 import { FooterBarProps, NavigationHandlers, FooterBarChildProps } from './types';
 import { debounce } from '@/utils/debounce';
@@ -27,6 +28,7 @@ const FooterBar: React.FC<FooterBarProps> = ({
   const { hoveredBookKey, setHoveredBookKey } = useReaderStore();
   const { getView, getViewState, getProgress, getViewSettings } = useReaderStore();
   const { isSideBarVisible, setSideBarVisible } = useSidebarStore();
+  const { acquireBackKeyInterception, releaseBackKeyInterception } = useDeviceControlStore();
 
   const view = getView(bookKey);
   const config = getConfig(bookKey);
@@ -147,6 +149,40 @@ const FooterBar: React.FC<FooterBarProps> = ({
     ],
   );
 
+  const handleKeyDown = useCallback(
+    (event: KeyboardEvent | CustomEvent) => {
+      if (event instanceof CustomEvent) {
+        if (event.detail.keyName === 'Back') {
+          setHoveredBookKey('');
+          return true;
+        }
+      } else {
+        if (event.key === 'Escape') {
+          setHoveredBookKey('');
+        }
+        event.stopPropagation();
+      }
+      return false;
+    },
+    [setHoveredBookKey],
+  );
+
+  useEffect(() => {
+    if (!appService?.isAndroidApp) return;
+
+    if (hoveredBookKey) {
+      acquireBackKeyInterception();
+      eventDispatcher.onSync('native-key-down', handleKeyDown);
+    }
+    return () => {
+      if (hoveredBookKey) {
+        releaseBackKeyInterception();
+        eventDispatcher.offSync('native-key-down', handleKeyDown);
+      }
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [hoveredBookKey]);
+
   const commonProps: FooterBarChildProps = {
     bookKey,
     gridInsets,
@@ -182,6 +218,7 @@ const FooterBar: React.FC<FooterBarProps> = ({
           'absolute bottom-0 left-0 z-10 flex h-[52px] w-full',
           viewSettings?.vertical && viewSettings?.scrolled && 'sm:!bottom-3 sm:!h-7',
         )}
+        onClick={() => setHoveredBookKey(bookKey)}
         onMouseEnter={() => !appService?.isMobile && setHoveredBookKey(bookKey)}
         onTouchStart={() => !appService?.isMobile && setHoveredBookKey(bookKey)}
       />
diff --git a/apps/readest-app/src/styles/globals.css b/apps/readest-app/src/styles/globals.css
index 8677892f..b1d29a04 100644
--- a/apps/readest-app/src/styles/globals.css
+++ b/apps/readest-app/src/styles/globals.css
@@ -416,7 +416,23 @@ foliate-view {
   box-shadow: none !important;
 }
 
-[data-eink="true"] [class*="text-"] {
+[data-eink="true"] [class*="text-base-content"] {
+  color: theme('colors.base-content') !important;
+}
+
+[data-eink="true"] [class*="text-red"] {
+  color: theme('colors.base-content') !important;
+}
+
+[data-eink="true"] [class*="text-gray"] {
+  color: theme('colors.base-content') !important;
+}
+
+[data-eink="true"] [class*="text-neutral-content"] {
+  color: theme('colors.base-content') !important;
+}
+
+[data-eink="true"] [class*="placeholder"]::placeholder {
   color: theme('colors.base-content') !important;
 }
 
@@ -424,8 +440,8 @@ foliate-view {
   background-color: theme('colors.base-content') !important;
 }
 
-[data-eink="true"] [class*="placeholder:"]::placeholder {
-  color: theme('colors.base-content') !important;
+[data-eink="true"] [class*="font-light"] {
+  font-weight: normal !important;
 }
 
 [data-eink="true"] [class*="text-bold-in-eink"] {