release: version 0.9.25 (#690)

* sync: update partial config to sync more actively

* rtl: make the order of go back/forward buttons consistent

* fix: wheel events conflict with touchpad scroll on macOS

* release: hot fix version 0.9.21

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Share an idea or suggestion
-title: 'FR: [a handful of words describing the FR]'
+title: 'FR: describing your feature request'
 labels: enhancement
 assignees: ''
 ---

.github/workflows/release.yml

@@ -137,6 +137,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          NODE_OPTIONS: '--max-old-space-size=8192'
         with:
           projectPath: apps/readest-app
           releaseId: ${{ needs.get-release.outputs.release_id }}

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "packages/foliate-js"]
 	path = packages/foliate-js
-	url = https://github.com/chrox/foliate-js.git
+	url = https://github.com/readest/foliate-js.git
 [submodule "packages/tauri"]
 	path = packages/tauri
-	url = https://github.com/chrox/tauri.git
+	url = https://github.com/tauri-apps/tauri.git

README.md

@@ -32,7 +32,7 @@
 
 <div align="center">
   <a href="https://readest.com" target="_blank">
-    <img src="./data/screenshots/landing_preview.png" alt="Readest Banner" width="100%" />
+    <img src="./data/screenshots/landing_all_platforms.png" alt="Readest Banner" width="100%" />
   </a>
 </div>
 
@@ -80,7 +80,7 @@ Stay tuned for continuous improvements and updates! Contributions and suggestion
 
 ![DeepL](./data/screenshots/deepl.png)
 
-![TTS](./data/screenshots/tts_control.png)
+![TTS](./data/screenshots/tts_speak_aloud.png)
 
 ![Footnote](./data/screenshots/footnote_popover.png)
 
@@ -205,7 +205,7 @@ Readest is open-source, and contributions are welcome! Feel free to open issues,
 
 <a href="https://github.com/readest/readest/graphs/contributors">
   <p align="left">
-    <img width="300" src="https://contrib.rocks/image?repo=readest/readest" alt="A table of avatars from the project's contributors" />
+    <img width="500" src="https://contrib.rocks/image?repo=readest/readest" alt="A table of avatars from the project's contributors" />
   </p>
 </a>
 

apps/readest-app/next.config.mjs

@@ -13,9 +13,7 @@ const nextConfig = {
   images: {
     unoptimized: true,
   },
-  devIndicators: {
-    appIsrStatus: false,
-  },
+  devIndicators: false,
   // Configure assetPrefix or else the server won't properly resolve your assets.
   assetPrefix: '',
   reactStrictMode: true,

apps/readest-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readest/readest-app",
-  "version": "0.9.18",
+  "version": "0.9.25",
   "private": true,
   "scripts": {
     "dev": "dotenv -e .env.tauri -- next dev",
@@ -42,19 +42,19 @@
     "@supabase/auth-ui-react": "^0.4.7",
     "@supabase/auth-ui-shared": "^0.1.8",
     "@supabase/supabase-js": "^2.47.7",
-    "@tauri-apps/api": "2.2.0",
+    "@tauri-apps/api": "2.3.0",
     "@tauri-apps/plugin-cli": "^2.2.0",
     "@tauri-apps/plugin-deep-link": "^2.2.0",
     "@tauri-apps/plugin-dialog": "^2.2.0",
     "@tauri-apps/plugin-fs": "^2.2.0",
     "@tauri-apps/plugin-haptics": "^2.2.3",
     "@tauri-apps/plugin-http": "^2.3.0",
-    "@tauri-apps/plugin-log": "^2.2.1",
-    "@tauri-apps/plugin-opener": "^2.2.5",
+    "@tauri-apps/plugin-log": "^2.2.3",
+    "@tauri-apps/plugin-opener": "^2.2.6",
     "@tauri-apps/plugin-os": "^2.2.0",
     "@tauri-apps/plugin-process": "^2.2.0",
     "@tauri-apps/plugin-shell": "~2.2.0",
-    "@tauri-apps/plugin-updater": "^2.4.0",
+    "@tauri-apps/plugin-updater": "^2.5.1",
     "@zip.js/zip.js": "^2.7.53",
     "clsx": "^2.1.1",
     "cors": "^2.8.5",
@@ -65,9 +65,10 @@
     "i18next-http-backend": "^3.0.1",
     "js-md5": "^0.8.3",
     "jwt-decode": "^4.0.0",
-    "next": "15.1.6",
+    "next": "15.2.2",
     "posthog-js": "^1.205.0",
     "react": "19.0.0",
+    "react-color": "^2.19.3",
     "react-dom": "19.0.0",
     "react-i18next": "^15.2.0",
     "react-icons": "^5.4.0",
@@ -76,16 +77,17 @@
     "zustand": "5.0.1"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.2.7",
+    "@tauri-apps/cli": "2.3.1",
     "@types/cors": "^2.8.17",
     "@types/cssbeautify": "^0.3.5",
     "@types/node": "^22.10.1",
     "@types/react": "18.3.12",
+    "@types/react-color": "^3.0.13",
     "@types/react-dom": "18.3.1",
     "@types/tinycolor2": "^1.4.6",
     "autoprefixer": "^10.4.20",
     "cpx2": "^8.0.0",
-    "daisyui": "^4.12.23",
+    "daisyui": "^4.12.24",
     "dotenv-cli": "^7.4.4",
     "eslint": "^9.16.0",
     "eslint-config-next": "15.0.3",

apps/readest-app/public/locales/ar/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "الواصلة",
   "Identifier:": "المعرف:",
   "Import Books": "استيراد الكتب",
-  "Invert Colors in Dark Mode": "عكس الألوان في الوضع المظلم",
   "Language:": "اللغة:",
   "Layout": "التخطيط",
   "Light Mode": "الوضع الفاتح",
   "Loading...": "جارٍ التحميل...",
-  "Loc. {{currentPage}} / {{totalPage}}": "الصفحة {{currentPage}} \\ {{totalPage}}",
   "Logged in": "تم تسجيل الدخول",
   "Logged in as {{userDisplayName}}": "تم تسجيل الدخول باسم {{userDisplayName}}",
   "Match Case": "مطابقة حالة الأحرف",
   "Match Diacritics": "مطابقة التشكيل",
   "Match Whole Words": "مطابقة الكلمات الكاملة",
-  "Maximum Block Size": "أقصى مساحة رأسية",
-  "Maximum Inline Size": "أقصى مساحة أفقية",
   "Maximum Number of Columns": "العدد الأقصى للأعمدة",
   "Minimum Font Size": "الحد الأدنى لحجم الخط",
   "Misc": "أخرى",
@@ -230,5 +226,37 @@
   "Delete Permanently": "حذف نهائي",
   "Free Tier": "الفئة المجانية",
   "Plus Tier": "فئة Plus",
-  "Pro Tier": "فئة Pro"
+  "Pro Tier": "فئة Pro",
+  "RTL Direction": "الاتجاه من اليمين إلى اليسار",
+  "Maximum Column Height": "الارتفاع الأقصى للعمود",
+  "Maximum Column Width": "العرض الأقصى للعمود",
+  "Continuous Scroll": "التمرير المستمر",
+  "Fullscreen": "ملء الشاشة",
+  "No supported files found. Supported formats: {{formats}}": "لم يتم العثور على ملفات مدعومة. الصيغ المدعومة: {{formats}}",
+  "Drop to Import Books": "اسحب لاستيراد الكتب",
+  "Custom": "مخصص",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "العالم مسرح،\nوالناس فيه ممثلون؛\nلهم مخارج ومداخل،\nوالإنسان في حياته يلعب دورًا كثيرًا،\nوأفعاله تمر بسبع مراحل.\n\n— ويليام شكسبير",
+  "Custom Theme": "سمة مخصصة",
+  "Theme Name": "اسم السمة",
+  "Text Color": "لون النص",
+  "Background Color": "لون الخلفية",
+  "Preview": "معاينة",
+  "Contrast": "التباين",
+  "Sunset": "غروب الشمس",
+  "Double Border": "حدود مزدوجة",
+  "Border Color": "لون الحدود",
+  "Border Frame": "إطار الحدود",
+  "Show Header": "عرض الرأس",
+  "Show Footer": "عرض التذييل",
+  "Small": "صغير",
+  "Large": "كبير",
+  "Auto": "تلقائي",
+  "Language": "اللغة",
+  "No annotations to export": "لا توجد تعليقات للتصدير",
+  "Author": "المؤلف",
+  "Exported from Readest": "تم التصدير من ريديست",
+  "Highlights & Annotations": "التمييزات والتعليقات",
+  "Note": "ملاحظة",
+  "Copied to clipboard": "تم النسخ إلى الحافظة",
+  "Export Annotations": "تصدير التعليقات"
 }

apps/readest-app/public/locales/de/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Silbentrennung",
   "Identifier:": "Kennung:",
   "Import Books": "Bücher importieren",
-  "Invert Colors in Dark Mode": "Farben im Dunkelmodus invertieren",
   "Language:": "Sprache:",
   "Layout": "Layout",
   "Light Mode": "Hellmodus",
   "Loading...": "Wird geladen...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Pos. {{currentPage}} / {{totalPage}}",
   "Logged in": "Angemeldet",
   "Logged in as {{userDisplayName}}": "Angemeldet als {{userDisplayName}}",
   "Match Case": "Groß-/Kleinschreibung beachten",
   "Match Diacritics": "Akzente beachten",
   "Match Whole Words": "Ganze Wörter",
-  "Maximum Block Size": "Maximale Blockgröße",
-  "Maximum Inline Size": "Maximale Zeilengröße",
   "Maximum Number of Columns": "Maximale Spaltenanzahl",
   "Minimum Font Size": "Minimale Schriftgröße",
   "Misc": "Sonstiges",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Dauerhaft löschen",
   "Free Tier": "Kostenlose Stufe",
   "Plus Tier": "Plus-Stufe",
-  "Pro Tier": "Pro-Stufe"
+  "Pro Tier": "Pro-Stufe",
+  "RTL Direction": "RTL-Richtung",
+  "Maximum Column Height": "Maximale Spaltenhöhe",
+  "Maximum Column Width": "Maximale Spaltenbreite",
+  "Continuous Scroll": "Kontinuierliches Scrollen",
+  "Fullscreen": "Vollbild",
+  "No supported files found. Supported formats: {{formats}}": "Keine unterstützten Dateien gefunden. Unterstützte Formate: {{formats}}",
+  "Drop to Import Books": "Zum Importieren von Büchern ablegen",
+  "Custom": "Benutzerdefiniert",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Die ganze Welt ist eine Bühne,\nUnd alle Männer und Frauen sind bloß Spieler;\nSie haben ihre Abgänge und ihre Auftritte,\nUnd ein Mann spielt in seinem Leben viele Rollen,\nSeine Taten sind sieben Zeitalter.\n\n— William Shakespeare",
+  "Custom Theme": "Benutzerdefiniertes Thema",
+  "Theme Name": "Themenname",
+  "Text Color": "Textfarbe",
+  "Background Color": "Hintergrundfarbe",
+  "Preview": "Vorschau",
+  "Contrast": "Kontrast",
+  "Sunset": "Sonnenuntergang",
+  "Double Border": "Doppelter Rand",
+  "Border Color": "Randfarbe",
+  "Border Frame": "Rahmenrand",
+  "Show Header": "Kopfzeile anzeigen",
+  "Show Footer": "Fußzeile anzeigen",
+  "Small": "Klein",
+  "Large": "Groß",
+  "Auto": "Automatisch",
+  "Language": "Sprache",
+  "No annotations to export": "Keine Anmerkungen zum Exportieren",
+  "Author": "Autor",
+  "Exported from Readest": "Exportiert von Readest",
+  "Highlights & Annotations": "Hervorhebungen & Anmerkungen",
+  "Note": "Notiz",
+  "Copied to clipboard": "In die Zwischenablage kopiert",
+  "Export Annotations": "Anmerkungen exportieren"
 }

apps/readest-app/public/locales/el/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Συλλαβισμός",
   "Identifier:": "Αναγνωριστικό:",
   "Import Books": "Εισαγωγή βιβλίων",
-  "Invert Colors in Dark Mode": "Αντιστροφή χρωμάτων στη σκοτεινή λειτουργία",
   "Language:": "Γλώσσα:",
   "Layout": "Διάταξη",
   "Light Mode": "Φωτεινή λειτουργία",
   "Loading...": "Φόρτωση...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Θέση {{currentPage}} / {{totalPage}}",
   "Logged in": "Συνδεδεμένος",
   "Logged in as {{userDisplayName}}": "Συνδεδεμένος ως {{userDisplayName}}",
   "Match Case": "Ταίριασμα πεζών-κεφαλαίων",
   "Match Diacritics": "Ταίριασμα διακριτικών σημείων",
   "Match Whole Words": "Ταίριασμα ολόκληρων λέξεων",
-  "Maximum Block Size": "Μέγιστο μέγεθος μπλοκ",
-  "Maximum Inline Size": "Μέγιστο μέγεθος γραμμής",
   "Maximum Number of Columns": "Μέγιστος αριθμός στηλών",
   "Minimum Font Size": "Ελάχιστο μέγεθος γραμματοσειράς",
   "Misc": "Διάφορα",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Μόνιμη διαγραφή",
   "Free Tier": "Δωρεάν βαθμίδα",
   "Plus Tier": "Βαθμίδα Plus",
-  "Pro Tier": "Βαθμίδα Pro"
+  "Pro Tier": "Βαθμίδα Pro",
+  "RTL Direction": "Κατεύθυνση RTL",
+  "Maximum Column Height": "Μέγιστο ύψος στήλης",
+  "Maximum Column Width": "Μέγιστο πλάτος στήλης",
+  "Continuous Scroll": "Συνεχής κύλιση",
+  "Fullscreen": "Πλήρης οθόνη",
+  "No supported files found. Supported formats: {{formats}}": "Δεν βρέθηκαν υποστηριζόμενα αρχεία. Υποστηριζόμενες μορφές: {{formats}}",
+  "Drop to Import Books": "Ρίξτε για εισαγωγή βιβλίων",
+  "Custom": "Προσαρμοσμένο",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Όλος ο κόσμος είναι σκηνή,\nΚαι όλοι οι άνδρες και οι γυναίκες απλώς ηθοποιοί·\nΈχουν τις εξόδους και τις εισόδους τους,\nΚαι ένας άνθρωπος στον χρόνο του παίζει πολλούς ρόλους,\nΟι πράξεις του υπάρχουν σε επτά ηλικίες.\n\n— William Shakespeare",
+  "Custom Theme": "Προσαρμοσμένο θέμα",
+  "Theme Name": "Όνομα θέματος",
+  "Text Color": "Χρώμα κειμένου",
+  "Background Color": "Χρώμα φόντου",
+  "Preview": "Προεπισκόπηση",
+  "Contrast": "Αντίθεση",
+  "Sunset": "Ηλιοβασίλεμα",
+  "Double Border": "Διπλό περιθώριο",
+  "Border Color": "Χρώμα περιγράμματος",
+  "Border Frame": "Πλαίσιο περιγράμματος",
+  "Show Header": "Εμφάνιση κεφαλίδας",
+  "Show Footer": "Εμφάνιση υποσέλιδου",
+  "Small": "Μικρό",
+  "Large": "Μεγάλο",
+  "Auto": "Αυτόματο",
+  "Language": "Γλώσσα",
+  "No annotations to export": "Δεν υπάρχουν σχολιασμοί για εξαγωγή",
+  "Author": "Συγγραφέας",
+  "Exported from Readest": "Εξήχθη από το Readest",
+  "Highlights & Annotations": "Επισημάνσεις & Σχολιασμοί",
+  "Note": "Σημείωση",
+  "Copied to clipboard": "Αντιγράφηκε στο πρόχειρο",
+  "Export Annotations": "Εξαγωγή σχολιασμών"
 }

apps/readest-app/public/locales/es/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Guionización",
   "Identifier:": "Identificador:",
   "Import Books": "Importar libros",
-  "Invert Colors in Dark Mode": "Invertir colores en modo oscuro",
   "Language:": "Idioma:",
   "Layout": "Diseño",
   "Light Mode": "Modo claro",
   "Loading...": "Cargando...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Pos. {{currentPage}} / {{totalPage}}",
   "Logged in": "Sesión iniciada",
   "Logged in as {{userDisplayName}}": "Sesión iniciada como {{userDisplayName}}",
   "Match Case": "Coincidir mayúsculas y minúsculas",
   "Match Diacritics": "Coincidir diacríticos",
   "Match Whole Words": "Coincidir palabras completas",
-  "Maximum Block Size": "Tamaño máximo de bloque",
-  "Maximum Inline Size": "Tamaño máximo en línea",
   "Maximum Number of Columns": "Número máximo de columnas",
   "Minimum Font Size": "Tamaño de fuente mínimo",
   "Misc": "Varios",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Eliminar permanentemente",
   "Free Tier": "Nivel gratuito",
   "Plus Tier": "Nivel Plus",
-  "Pro Tier": "Nivel Pro"
+  "Pro Tier": "Nivel Pro",
+  "RTL Direction": "Dirección RTL",
+  "Maximum Column Height": "Altura máxima de columna",
+  "Maximum Column Width": "Ancho máximo de columna",
+  "Continuous Scroll": "Desplazamiento continuo",
+  "Fullscreen": "Pantalla completa",
+  "No supported files found. Supported formats: {{formats}}": "No se encontraron archivos compatibles. Formatos compatibles: {{formats}}",
+  "Drop to Import Books": "Soltar para importar libros",
+  "Custom": "Personalizado",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Todo el mundo es un escenario,\nY todos los hombres y mujeres son meros actores;\nTienen sus salidas y sus entradas,\nY un hombre en su tiempo interpreta muchos papeles,\nSus actos son siete edades.\n\n— William Shakespeare",
+  "Custom Theme": "Tema personalizado",
+  "Theme Name": "Nombre del tema",
+  "Text Color": "Color del texto",
+  "Background Color": "Color de fondo",
+  "Preview": "Vista previa",
+  "Contrast": "Contraste",
+  "Sunset": "Atardecer",
+  "Double Border": "Doble borde",
+  "Border Color": "Color del borde",
+  "Border Frame": "Marco de borde",
+  "Show Header": "Mostrar encabezado",
+  "Show Footer": "Mostrar pie de página",
+  "Small": "Pequeño",
+  "Large": "Grande",
+  "Auto": "Automático",
+  "Language": "Idioma",
+  "No annotations to export": "No hay anotaciones para exportar",
+  "Author": "Autor",
+  "Exported from Readest": "Exportado desde Readest",
+  "Highlights & Annotations": "Resaltados y anotaciones",
+  "Note": "Nota",
+  "Copied to clipboard": "Copiado al portapapeles",
+  "Export Annotations": "Exportar anotaciones"
 }

apps/readest-app/public/locales/fr/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Césure",
   "Identifier:": "Identifiant :",
   "Import Books": "Importer des livres",
-  "Invert Colors in Dark Mode": "Inverser les couleurs en mode sombre",
   "Language:": "Langue :",
   "Layout": "Mise en page",
   "Light Mode": "Mode clair",
   "Loading...": "Chargement...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Pos. {{currentPage}} / {{totalPage}}",
   "Logged in": "Connecté",
   "Logged in as {{userDisplayName}}": "Connecté en tant que {{userDisplayName}}",
   "Match Case": "Respecter la casse",
   "Match Diacritics": "Respecter les accents",
   "Match Whole Words": "Mots entiers",
-  "Maximum Block Size": "Taille maximale du bloc",
-  "Maximum Inline Size": "Taille maximale en ligne",
   "Maximum Number of Columns": "Nombre maximal de colonnes",
   "Minimum Font Size": "Taille minimale de police",
   "Misc": "Divers",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Supprimer définitivement",
   "Free Tier": "Niveau gratuit",
   "Plus Tier": "Niveau Plus",
-  "Pro Tier": "Niveau Pro"
+  "Pro Tier": "Niveau Pro",
+  "RTL Direction": "Direction RTL",
+  "Maximum Column Height": "Hauteur maximale de colonne",
+  "Maximum Column Width": "Largeur maximale de colonne",
+  "Continuous Scroll": "Défilement continu",
+  "Fullscreen": "Plein écran",
+  "No supported files found. Supported formats: {{formats}}": "Aucun fichier pris en charge trouvé. Formats pris en charge : {{formats}}",
+  "Drop to Import Books": "Déposez pour importer des livres",
+  "Custom": "Personnalisé",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Le monde entier est un théâtre,\nEt tous les hommes et les femmes ne sont que des acteurs ;\nIls ont leurs sorties et leurs entrées,\nEt un homme, dans sa vie, joue de nombreux rôles,\nSes actes étant sept âges.\n\n— William Shakespeare",
+  "Custom Theme": "Thème personnalisé",
+  "Theme Name": "Nom du thème",
+  "Text Color": "Couleur du texte",
+  "Background Color": "Couleur de fond",
+  "Preview": "Aperçu",
+  "Contrast": "Contraste",
+  "Sunset": "Coucher de soleil",
+  "Double Border": "Double bordure",
+  "Border Color": "Couleur de la bordure",
+  "Border Frame": "Cadre de bordure",
+  "Show Header": "Afficher l'en-tête",
+  "Show Footer": "Afficher le pied de page",
+  "Small": "Petit",
+  "Large": "Grand",
+  "Auto": "Automatique",
+  "Language": "Langue",
+  "No annotations to export": "Aucune annotation à exporter",
+  "Author": "Auteur",
+  "Exported from Readest": "Exporté depuis Readest",
+  "Highlights & Annotations": "Surlignages et annotations",
+  "Note": "Note",
+  "Copied to clipboard": "Copié dans le presse-papiers",
+  "Export Annotations": "Exporter les annotations"
 }

apps/readest-app/public/locales/hi/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "हाइफ़नेशन",
   "Identifier:": "पहचानकर्ता:",
   "Import Books": "पुस्तकें आयात करें",
-  "Invert Colors in Dark Mode": "डार्क मोड में रंग उलटें",
   "Language:": "भाषा:",
   "Layout": "लेआउट",
   "Light Mode": "लाइट मोड",
   "Loading...": "लोड हो रहा है...",
-  "Loc. {{currentPage}} / {{totalPage}}": "स्थान {{currentPage}} / {{totalPage}}",
   "Logged in": "लॉग इन किया",
   "Logged in as {{userDisplayName}}": "{{userDisplayName}} के रूप में लॉग इन किया",
   "Match Case": "केस मैच करें",
   "Match Diacritics": "डायाक्रिटिक्स मैच करें",
   "Match Whole Words": "पूरे शब्द मैच करें",
-  "Maximum Block Size": "अधिकतम ब्लॉक साइज़",
-  "Maximum Inline Size": "अधिकतम इनलाइन साइज़",
   "Maximum Number of Columns": "कॉलम की अधिकतम संख्या",
   "Minimum Font Size": "न्यूनतम फ़ॉन्ट साइज़",
   "Misc": "विविध",
@@ -230,5 +226,37 @@
   "Delete Permanently": "स्थायी रूप से हटाएं",
   "Free Tier": "फ्री टियर",
   "Plus Tier": "प्लस टियर",
-  "Pro Tier": "प्रो टियर"
+  "Pro Tier": "प्रो टियर",
+  "RTL Direction": "RTL दिशा",
+  "Maximum Column Height": "कॉलम की अधिकतम ऊँचाई",
+  "Maximum Column Width": "कॉलम की अधिकतम चौड़ाई",
+  "Continuous Scroll": "निरंतर स्क्रॉल",
+  "Fullscreen": "पूर्णस्क्रीन",
+  "No supported files found. Supported formats: {{formats}}": "कोई समर्थित फ़ाइलें नहीं मिलीं। समर्थित प्रारूप: {{formats}}",
+  "Drop to Import Books": "पुस्तकें आयात करने के लिए छोड़ें",
+  "Custom": "कस्टम",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "पूरी दुनिया एक स्टेज है,\nऔर सभी आदमी और महिलाएँ केवल अभिनेता हैं;\nउनके निकास और प्रवेश होते हैं,\nऔर एक आदमी अपने समय में कई भूमिकाएँ निभाता है,\nउसके कार्य सात युग होते हैं।\n\n— विलियम शेक्सपियर",
+  "Custom Theme": "कस्टम थीम",
+  "Theme Name": "थीम का नाम",
+  "Text Color": "टेक्स्ट रंग",
+  "Background Color": "पृष्ठभूमि रंग",
+  "Preview": "पूर्वावलोकन",
+  "Contrast": "विरोधाभास",
+  "Sunset": "सनसेट",
+  "Double Border": "डबल बॉर्डर",
+  "Border Color": "बॉर्डर रंग",
+  "Border Frame": "बॉर्डर फ्रेम",
+  "Show Header": "हेडर दिखाएं",
+  "Show Footer": "फ़ुटर दिखाएं",
+  "Small": "छोटा",
+  "Large": "बड़ा",
+  "Auto": "स्वचालित",
+  "Language": "भाषा",
+  "No annotations to export": "निर्यात करने के लिए कोई टिप्पणियाँ नहीं हैं",
+  "Author": "लेखक",
+  "Exported from Readest": "Readest से निर्यात किया गया",
+  "Highlights & Annotations": "हाइलाइट और टिप्पणियाँ",
+  "Note": "टिप्पणी",
+  "Copied to clipboard": "क्लिपबोर्ड पर कॉपी किया गया",
+  "Export Annotations": "टिप्पणियाँ निर्यात करें"
 }

apps/readest-app/public/locales/id/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Pemenggalan Kata",
   "Identifier:": "Pengenal:",
   "Import Books": "Impor Buku",
-  "Invert Colors in Dark Mode": "Balik Warna di Mode Gelap",
   "Language:": "Bahasa:",
   "Layout": "Tata Letak",
   "Light Mode": "Mode Terang",
   "Loading...": "Memuat...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Lok. {{currentPage}} / {{totalPage}}",
   "Logged in": "Sudah Masuk",
   "Logged in as {{userDisplayName}}": "Masuk sebagai {{userDisplayName}}",
   "Match Case": "Cocokkan Huruf Besar/Kecil",
   "Match Diacritics": "Cocokkan Diakritik",
   "Match Whole Words": "Cocokkan Kata Utuh",
-  "Maximum Block Size": "Ukuran Blok Maksimum",
-  "Maximum Inline Size": "Ukuran Sebaris Maksimum",
   "Maximum Number of Columns": "Jumlah Kolom Maksimum",
   "Minimum Font Size": "Ukuran Font Minimum",
   "Misc": "Lain-lain",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Hapus Secara Permanen",
   "Free Tier": "Tingkat Gratis",
   "Plus Tier": "Tingkat Plus",
-  "Pro Tier": "Tingkat Pro"
+  "Pro Tier": "Tingkat Pro",
+  "RTL Direction": "Arah RTL",
+  "Maximum Column Height": "Tinggi Kolom Maksimum",
+  "Maximum Column Width": "Lebar Kolom Maksimum",
+  "Continuous Scroll": "Gulir Terus",
+  "Fullscreen": "Layar Penuh",
+  "No supported files found. Supported formats: {{formats}}": "Tidak ada file yang didukung ditemukan. Format yang didukung: {{formats}}",
+  "Drop to Import Books": "Jatuhkan untuk Mengimpor Buku",
+  "Custom": "Kustom",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Seluruh dunia adalah panggung,\nDan semua pria dan wanita hanyalah pemain;\nMereka memiliki keluar dan masuk mereka,\nDan seorang pria dalam hidupnya memainkan banyak peran,\nTindakannya ada tujuh zaman.\n\n— William Shakespeare",
+  "Custom Theme": "Tema Kustom",
+  "Theme Name": "Nama Tema",
+  "Text Color": "Warna Teks",
+  "Background Color": "Warna Latar Belakang",
+  "Preview": "Pratinjau",
+  "Contrast": "Kontras",
+  "Sunset": "Senja",
+  "Double Border": "Garis Ganda",
+  "Border Color": "Warna Garis",
+  "Border Frame": "Bingkai Garis",
+  "Show Header": "Tampilkan Header",
+  "Show Footer": "Tampilkan Footer",
+  "Small": "Kecil",
+  "Large": "Besar",
+  "Auto": "Otomatis",
+  "Language": "Bahasa",
+  "No annotations to export": "Tidak ada anotasi yang diekspor",
+  "Author": "Penulis",
+  "Exported from Readest": "Diekspor dari Readest",
+  "Highlights & Annotations": "Sorotan & Anotasi",
+  "Note": "Catatan",
+  "Copied to clipboard": "Disalin ke papan klip",
+  "Export Annotations": "Ekspor Anotasi"
 }

apps/readest-app/public/locales/it/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Sillabazione",
   "Identifier:": "Identificatore:",
   "Import Books": "Importa libri",
-  "Invert Colors in Dark Mode": "Inverti colori in modalità scura",
   "Language:": "Lingua:",
   "Layout": "Layout",
   "Light Mode": "Modalità chiara",
   "Loading...": "Caricamento...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Pos. {{currentPage}} / {{totalPage}}",
   "Logged in": "Accesso effettuato",
   "Logged in as {{userDisplayName}}": "Accesso effettuato come {{userDisplayName}}",
   "Match Case": "Maiuscole/minuscole",
   "Match Diacritics": "Corrispondenza diacritici",
   "Match Whole Words": "Parole intere",
-  "Maximum Block Size": "Dimensione massima blocco",
-  "Maximum Inline Size": "Dimensione massima in linea",
   "Maximum Number of Columns": "Numero massimo di colonne",
   "Minimum Font Size": "Dimensione minima font",
   "Misc": "Varie",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Elimina definitivamente",
   "Free Tier": "Piano gratuito",
   "Plus Tier": "Piano Plus",
-  "Pro Tier": "Piano Pro"
+  "Pro Tier": "Piano Pro",
+  "RTL Direction": "Direzione RTL",
+  "Maximum Column Height": "Altezza massima colonna",
+  "Maximum Column Width": "Larghezza massima colonna",
+  "Continuous Scroll": "Scorrimento continuo",
+  "Fullscreen": "Schermo intero",
+  "No supported files found. Supported formats: {{formats}}": "Nessun file supportato trovato. Formati supportati: {{formats}}",
+  "Drop to Import Books": "Rilascia per importare libri",
+  "Custom": "Personalizzato",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Tutto il mondo è un palcoscenico,\nE tutti gli uomini e le donne sono solo attori;\nHanno le loro uscite e le loro entrate,\nE un uomo nella sua vita interpreta molte parti,\nI suoi atti sono sette età.\n\n— William Shakespeare",
+  "Custom Theme": "Tema personalizzato",
+  "Theme Name": "Nome tema",
+  "Text Color": "Colore testo",
+  "Background Color": "Colore sfondo",
+  "Preview": "Anteprima",
+  "Contrast": "Contrasto",
+  "Sunset": "Tramonto",
+  "Double Border": "Doppio bordo",
+  "Border Color": "Colore bordo",
+  "Border Frame": "Cornice bordo",
+  "Show Header": "Mostra intestazione",
+  "Show Footer": "Mostra piè di pagina",
+  "Small": "Piccolo",
+  "Large": "Grande",
+  "Auto": "Automatico",
+  "Language": "Lingua",
+  "No annotations to export": "Nessuna annotazione da esportare",
+  "Author": "Autore",
+  "Exported from Readest": "Esportato da Readest",
+  "Highlights & Annotations": "Evidenziazioni e annotazioni",
+  "Note": "Nota",
+  "Copied to clipboard": "Copiato negli appunti",
+  "Export Annotations": "Esporta annotazioni"
 }

apps/readest-app/public/locales/ja/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "ハイフネーション",
   "Identifier:": "識別子：",
   "Import Books": "書籍をインポート",
-  "Invert Colors in Dark Mode": "ダークモードで色を反転",
   "Language:": "言語：",
   "Layout": "レイアウト",
   "Light Mode": "ライトモード",
   "Loading...": "読み込み中...",
-  "Loc. {{currentPage}} / {{totalPage}}": "位置 {{currentPage}} / {{totalPage}}",
   "Logged in": "ログイン済み",
   "Logged in as {{userDisplayName}}": "{{userDisplayName}}としてログイン中",
   "Match Case": "大文字・小文字を区別",
   "Match Diacritics": "アクセント記号を区別",
   "Match Whole Words": "単語全体を一致",
-  "Maximum Block Size": "最大ブロックサイズ",
-  "Maximum Inline Size": "最大インラインサイズ",
   "Maximum Number of Columns": "最大列数",
   "Minimum Font Size": "最小フォントサイズ",
   "Misc": "その他",
@@ -230,5 +226,37 @@
   "Delete Permanently": "完全に削除",
   "Free Tier": "無料プラン",
   "Plus Tier": "Plusプラン",
-  "Pro Tier": "Proプラン"
+  "Pro Tier": "Proプラン",
+  "RTL Direction": "RTL方向",
+  "Maximum Column Height": "最大列高",
+  "Maximum Column Width": "最大列幅",
+  "Continuous Scroll": "連続スクロール",
+  "Fullscreen": "全画面",
+  "No supported files found. Supported formats: {{formats}}": "サポートされているファイルが見つかりません。サポートされている形式：{{formats}}",
+  "Drop to Import Books": "書籍をインポートするにはドロップ",
+  "Custom": "カスタム",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "全世界は舞台であり、\nそしてすべての男性と女性は単なる役者です。\n彼らは出入り口を持っており、\nそして一人の男性は時に多くの役を演じます。\n彼の行為は七つの時代です。\n\n— ウィリアム・シェイクスピア",
+  "Custom Theme": "カスタムテーマ",
+  "Theme Name": "テーマ名",
+  "Text Color": "テキストカラー",
+  "Background Color": "背景色",
+  "Preview": "プレビュー",
+  "Contrast": "コントラスト",
+  "Sunset": "サンセット",
+  "Double Border": "二重枠",
+  "Border Color": "ボーダーカラー",
+  "Border Frame": "ボーダーフレーム",
+  "Show Header": "ヘッダーを表示",
+  "Show Footer": "フッターを表示",
+  "Small": "小",
+  "Large": "大",
+  "Auto": "自動",
+  "Language": "言語",
+  "No annotations to export": "エクスポートする注釈はありません",
+  "Author": "著者",
+  "Exported from Readest": "Readestからエクスポート",
+  "Highlights & Annotations": "ハイライトと注釈",
+  "Note": "メモ",
+  "Copied to clipboard": "クリップボードにコピー",
+  "Export Annotations": "注釈をエクスポート"
 }

apps/readest-app/public/locales/ko/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "하이픈 넣기",
   "Identifier:": "식별자:",
   "Import Books": "책 가져오기",
-  "Invert Colors in Dark Mode": "다크 모드에서 색상 반전",
   "Language:": "언어:",
   "Layout": "레이아웃",
   "Light Mode": "라이트 모드",
   "Loading...": "로딩 중...",
-  "Loc. {{currentPage}} / {{totalPage}}": "위치 {{currentPage}} / {{totalPage}}",
   "Logged in": "로그인됨",
   "Logged in as {{userDisplayName}}": "{{userDisplayName}}(으)로 로그인됨",
   "Match Case": "대소문자 구분",
   "Match Diacritics": "발음 구별 부호 구분",
   "Match Whole Words": "전체 단어 일치",
-  "Maximum Block Size": "최대 블록 크기",
-  "Maximum Inline Size": "최대 인라인 크기",
   "Maximum Number of Columns": "최대 열 수",
   "Minimum Font Size": "최소 글꼴 크기",
   "Misc": "기타",
@@ -230,5 +226,37 @@
   "Delete Permanently": "영구 삭제",
   "Free Tier": "무료 등급",
   "Plus Tier": "플러스 등급",
-  "Pro Tier": "프로 등급"
+  "Pro Tier": "프로 등급",
+  "RTL Direction": "RTL 방향",
+  "Maximum Column Height": "최대 열 높이",
+  "Maximum Column Width": "최대 열 너비",
+  "Continuous Scroll": "연속 스크롤",
+  "Fullscreen": "전체 화면",
+  "No supported files found. Supported formats: {{formats}}": "지원되는 파일이 없습니다. 지원되는 형식: {{formats}}",
+  "Drop to Import Books": "책 가져오기 위해 드롭",
+  "Custom": "사용자 정의",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "세상은 무대이며,\n그리고 모든 남자와 여자는 단지 배우일 뿐입니다;\n그들은 나가는 곳과 들어오는 곳이 있으며,\n그리고 한 남자는 그의 시간에 많은 역할을 합니다,\n그의 행동은 일곱 시대입니다.\n\n— 윌리엄 셰익스피어",
+  "Custom Theme": "사용자 정의 테마",
+  "Theme Name": "테마 이름",
+  "Text Color": "텍스트 색상",
+  "Background Color": "배경 색상",
+  "Preview": "미리보기",
+  "Contrast": "대비",
+  "Sunset": "일몰",
+  "Double Border": "이중 테두리",
+  "Border Color": "테두리 색상",
+  "Border Frame": "테두리 프레임",
+  "Show Header": "헤더 표시",
+  "Show Footer": "푸터 표시",
+  "Small": "작음",
+  "Large": "큼",
+  "Auto": "자동",
+  "Language": "언어",
+  "No annotations to export": "내보낼 주석이 없습니다",
+  "Author": "저자",
+  "Exported from Readest": "Readest에서 내보냄",
+  "Highlights & Annotations": "하이라이트 및 주석",
+  "Note": "노트",
+  "Copied to clipboard": "클립보드에 복사",
+  "Export Annotations": "주석 내보내기"
 }

apps/readest-app/public/locales/pl/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Dzielenie wyrazów",
   "Identifier:": "Identyfikator:",
   "Import Books": "Importuj książki",
-  "Invert Colors in Dark Mode": "Odwróć kolory w trybie ciemnym",
   "Language:": "Język:",
   "Layout": "Układ",
   "Light Mode": "Tryb jasny",
   "Loading...": "Ładowanie...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Poz. {{currentPage}} / {{totalPage}}",
   "Logged in": "Zalogowano",
   "Logged in as {{userDisplayName}}": "Zalogowano jako {{userDisplayName}}",
   "Match Case": "Uwzględnij wielkość liter",
   "Match Diacritics": "Uwzględnij znaki diakrytyczne",
   "Match Whole Words": "Uwzględnij całe słowa",
-  "Maximum Block Size": "Maksymalny rozmiar bloku",
-  "Maximum Inline Size": "Maksymalny rozmiar linii",
   "Maximum Number of Columns": "Maksymalna liczba kolumn",
   "Minimum Font Size": "Minimalny rozmiar czcionki",
   "Misc": "Różne",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Usuń trwale",
   "Free Tier": "Plan darmowy",
   "Plus Tier": "Plan Plus",
-  "Pro Tier": "Plan Pro"
+  "Pro Tier": "Plan Pro",
+  "RTL Direction": "Kierunek RTL",
+  "Maximum Column Height": "Maksymalna wysokość kolumny",
+  "Maximum Column Width": "Maksymalna szerokość kolumny",
+  "Continuous Scroll": "Przewijanie ciągłe",
+  "Fullscreen": "Pełny ekran",
+  "No supported files found. Supported formats: {{formats}}": "Nie znaleziono obsługiwanych plików. Obsługiwane formaty: {{formats}}",
+  "Drop to Import Books": "Upuść, aby zaimportować książki",
+  "Custom": "Niestandardowy",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Cały świat jest sceną,\nA wszyscy mężczyźni i kobiety są tylko aktorami;\nMają swoje wyjścia i wejścia,\nI jeden człowiek w swoim czasie gra wiele ról,\nJego czyny to siedem wieków.\n\n— William Shakespeare",
+  "Custom Theme": "Niestandardowy motyw",
+  "Theme Name": "Nazwa motywu",
+  "Text Color": "Kolor tekstu",
+  "Background Color": "Kolor tła",
+  "Preview": "Podgląd",
+  "Contrast": "Kontrast",
+  "Sunset": "Zachód słońca",
+  "Double Border": "Podwójna ramka",
+  "Border Color": "Kolor ramki",
+  "Border Frame": "Ramka",
+  "Show Header": "Pokaż nagłówek",
+  "Show Footer": "Pokaż stopkę",
+  "Small": "Mały",
+  "Large": "Duży",
+  "Auto": "Automatyczny",
+  "Language": "Język",
+  "No annotations to export": "Brak adnotacji do eksportu",
+  "Author": "Autor",
+  "Exported from Readest": "Eksportowane z Readest",
+  "Highlights & Annotations": "Zaznaczenia i adnotacje",
+  "Note": "Notatka",
+  "Copied to clipboard": "Skopiowano do schowka",
+  "Export Annotations": "Eksportuj adnotacje"
 }

apps/readest-app/public/locales/pt/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Hifenização",
   "Identifier:": "Identificador:",
   "Import Books": "Importar Livros",
-  "Invert Colors in Dark Mode": "Inverter Cores no Modo Escuro",
   "Language:": "Idioma:",
   "Layout": "Layout",
   "Light Mode": "Modo Claro",
   "Loading...": "Carregando...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Loc. {{currentPage}} / {{totalPage}}",
   "Logged in": "Conectado",
   "Logged in as {{userDisplayName}}": "Conectado como {{userDisplayName}}",
   "Match Case": "Diferenciar Maiúsculas e Minúsculas",
   "Match Diacritics": "Corresponder Acentos",
   "Match Whole Words": "Corresponder Palavras Inteiras",
-  "Maximum Block Size": "Tamanho Máximo do Bloco",
-  "Maximum Inline Size": "Tamanho Máximo em Linha",
   "Maximum Number of Columns": "Número Máximo de Colunas",
   "Minimum Font Size": "Tamanho Mínimo da Fonte",
   "Misc": "Diversos",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Excluir permanentemente",
   "Free Tier": "Plano gratuito",
   "Plus Tier": "Plano Plus",
-  "Pro Tier": "Plano Pro"
+  "Pro Tier": "Plano Pro",
+  "RTL Direction": "Direção RTL",
+  "Maximum Column Height": "Altura Máxima da Coluna",
+  "Maximum Column Width": "Largura Máxima da Coluna",
+  "Continuous Scroll": "Rolagem Contínua",
+  "Fullscreen": "Tela Cheia",
+  "No supported files found. Supported formats: {{formats}}": "Nenhum arquivo suportado encontrado. Formatos suportados: {{formats}}",
+  "Drop to Import Books": "Arraste para Importar Livros",
+  "Custom": "Personalizado",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Todo o mundo é um palco,\nE todos os homens e mulheres são meros atores;\nEles têm suas saídas e suas entradas,\nE um homem em seu tempo desempenha muitos papéis,\nSeus atos sendo sete idades.\n\n— William Shakespeare",
+  "Custom Theme": "Tema Personalizado",
+  "Theme Name": "Nome do Tema",
+  "Text Color": "Cor do Texto",
+  "Background Color": "Cor de Fundo",
+  "Preview": "Visualizar",
+  "Contrast": "Contraste",
+  "Sunset": "Pôr do Sol",
+  "Double Border": "Borda Dupla",
+  "Border Color": "Cor da Borda",
+  "Border Frame": "Moldura da Borda",
+  "Show Header": "Mostrar Cabeçalho",
+  "Show Footer": "Mostrar Rodapé",
+  "Small": "Pequeno",
+  "Large": "Grande",
+  "Auto": "Automático",
+  "Language": "Idioma",
+  "No annotations to export": "Nenhuma anotação para exportar",
+  "Author": "Autor",
+  "Exported from Readest": "Exportado do Readest",
+  "Highlights & Annotations": "Destaques e Anotações",
+  "Note": "Nota",
+  "Copied to clipboard": "Copiado para a área de transferência",
+  "Export Annotations": "Exportar Anotações"
 }

apps/readest-app/public/locales/ru/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Перенос слов",
   "Identifier:": "Идентификатор:",
   "Import Books": "Импорт книг",
-  "Invert Colors in Dark Mode": "Инвертировать цвета в тёмной теме",
   "Language:": "Язык:",
   "Layout": "Макет",
   "Light Mode": "Светлая тема",
   "Loading...": "Загрузка...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Поз. {{currentPage}} / {{totalPage}}",
   "Logged in": "Выполнен вход",
   "Logged in as {{userDisplayName}}": "Вход выполнен как {{userDisplayName}}",
   "Match Case": "Учитывать регистр",
   "Match Diacritics": "Учитывать диакритические знаки",
   "Match Whole Words": "Только целые слова",
-  "Maximum Block Size": "Максимальный размер блока",
-  "Maximum Inline Size": "Максимальный размер строки",
   "Maximum Number of Columns": "Максимальное количество колонок",
   "Minimum Font Size": "Минимальный размер шрифта",
   "Misc": "Разное",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Удалить навсегда",
   "Free Tier": "Бесплатный тариф",
   "Plus Tier": "Тариф Plus",
-  "Pro Tier": "Тариф Pro"
+  "Pro Tier": "Тариф Pro",
+  "RTL Direction": "Направление RTL",
+  "Maximum Column Height": "Максимальная высота колонки",
+  "Maximum Column Width": "Максимальная ширина колонки",
+  "Continuous Scroll": "Непрерывная прокрутка",
+  "Fullscreen": "Полноэкранный режим",
+  "No supported files found. Supported formats: {{formats}}": "Поддерживаемые файлы не найдены. Поддерживаемые форматы: {{formats}}",
+  "Drop to Import Books": "Перетащите сюда книги для импорта",
+  "Custom": "Пользовательский",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Весь мир — театр,\nИ все мужчины и женщины — просто актёры;\nУ них есть свои выходы и входы,\nИ один человек в своё время играет много ролей,\nЕго поступки — это семь веков.\n\n— Уильям Шекспир",
+  "Custom Theme": "Пользовательская тема",
+  "Theme Name": "Название темы",
+  "Text Color": "Цвет текста",
+  "Background Color": "Цвет фона",
+  "Preview": "Предпросмотр",
+  "Contrast": "Контраст",
+  "Sunset": "Закат",
+  "Double Border": "Двойная граница",
+  "Border Color": "Цвет границы",
+  "Border Frame": "Граница рамки",
+  "Show Header": "Показать заголовок",
+  "Show Footer": "Показать нижний колонтитул",
+  "Small": "Маленький",
+  "Large": "Большой",
+  "Auto": "Авто",
+  "Language": "Язык",
+  "No annotations to export": "Нет аннотаций для экспорта",
+  "Author": "Автор",
+  "Exported from Readest": "Экспортировано из Readest",
+  "Highlights & Annotations": "Выделения и аннотации",
+  "Note": "Заметка",
+  "Copied to clipboard": "Скопировано в буфер обмена",
+  "Export Annotations": "Экспортировать аннотации"
 }

apps/readest-app/public/locales/tr/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Heceleme",
   "Identifier:": "Tanımlayıcı:",
   "Import Books": "Kitapları İçe Aktar",
-  "Invert Colors in Dark Mode": "Karanlık Modda Renkleri Ters Çevir",
   "Language:": "Dil:",
   "Layout": "Düzen",
   "Light Mode": "Aydınlık Mod",
   "Loading...": "Yükleniyor...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Konum {{currentPage}} / {{totalPage}}",
   "Logged in": "Giriş Yapıldı",
   "Logged in as {{userDisplayName}}": "{{userDisplayName}} olarak giriş yapıldı",
   "Match Case": "Büyük/Küçük Harf Eşleştir",
   "Match Diacritics": "Aksan İşaretlerini Eşleştir",
   "Match Whole Words": "Tam Kelimeleri Eşleştir",
-  "Maximum Block Size": "Maksimum Blok Boyutu",
-  "Maximum Inline Size": "Maksimum Satır İçi Boyut",
   "Maximum Number of Columns": "Maksimum Sütun Sayısı",
   "Minimum Font Size": "Minimum Yazı Boyutu",
   "Misc": "Diğer",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Kalıcı Olarak Sil",
   "Free Tier": "Ücretsiz Paket",
   "Plus Tier": "Plus Paket",
-  "Pro Tier": "Pro Paket"
+  "Pro Tier": "Pro Paket",
+  "RTL Direction": "RTL Yönü",
+  "Maximum Column Height": "Maksimum Sütun Yüksekliği",
+  "Maximum Column Width": "Maksimum Sütun Genişliği",
+  "Continuous Scroll": "Sürekli Kaydırma",
+  "Fullscreen": "Tam Ekran",
+  "No supported files found. Supported formats: {{formats}}": "Desteklenen dosya bulunamadı. Desteklenen formatlar: {{formats}}",
+  "Drop to Import Books": "Kitapları İçe Aktarmak İçin Bırak",
+  "Custom": "Özel",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Tüm dünya bir sahnedir,\nVe tüm erkekler ve kadınlar sadece oyunculardır;\nOnların çıkışları ve girişleri vardır,\nVe bir adam zamanında birçok rol oynar,\nOnun eylemleri yedi yaşındadır.\n\n— William Shakespeare",
+  "Custom Theme": "Özel Tema",
+  "Theme Name": "Tema Adı",
+  "Text Color": "Metin Rengi",
+  "Background Color": "Arka Plan Rengi",
+  "Preview": "Önizleme",
+  "Contrast": "Kontrast",
+  "Sunset": "Gün Batımı",
+  "Double Border": "Çift Sınır",
+  "Border Color": "Sınır Rengi",
+  "Border Frame": "Sınır Çerçevesi",
+  "Show Header": "Başlık Göster",
+  "Show Footer": "Altbilgi Göster",
+  "Small": "Küçük",
+  "Large": "Büyük",
+  "Auto": "Otomatik",
+  "Language": "Dil",
+  "No annotations to export": "Dışa aktarılacak not yok",
+  "Author": "Yazar",
+  "Exported from Readest": "Readest'ten dışa aktarıldı",
+  "Highlights & Annotations": "Vurgular ve Notlar",
+  "Note": "Not",
+  "Copied to clipboard": "Panoya kopyalandı",
+  "Export Annotations": "Notları Dışa Aktar"
 }

apps/readest-app/public/locales/uk/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Перенесення слів",
   "Identifier:": "Ідентифікатор:",
   "Import Books": "Імпортувати книги",
-  "Invert Colors in Dark Mode": "Інвертувати кольори в темному режимі",
   "Language:": "Мова:",
   "Layout": "Макет",
   "Light Mode": "Світлий режим",
   "Loading...": "Завантаження...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Поз. {{currentPage}} / {{totalPage}}",
   "Logged in": "Увійшли",
   "Logged in as {{userDisplayName}}": "Увійшли як {{userDisplayName}}",
   "Match Case": "Враховувати регістр",
   "Match Diacritics": "Враховувати діакритичні знаки",
   "Match Whole Words": "Шукати цілі слова",
-  "Maximum Block Size": "Максимальний розмір блоку",
-  "Maximum Inline Size": "Максимальний розмір рядка",
   "Maximum Number of Columns": "Максимальна кількість колонок",
   "Minimum Font Size": "Мінімальний розмір шрифту",
   "Misc": "Різне",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Видалити назавжди",
   "Free Tier": "Безкоштовний тариф",
   "Plus Tier": "Тариф Plus",
-  "Pro Tier": "Тариф Pro"
+  "Pro Tier": "Тариф Pro",
+  "RTL Direction": "Напрямок RTL",
+  "Maximum Column Height": "Максимальна висота колонки",
+  "Maximum Column Width": "Максимальна ширина колонки",
+  "Continuous Scroll": "Постійна прокрутка",
+  "Fullscreen": "Повноекранний",
+  "No supported files found. Supported formats: {{formats}}": "Не знайдено підтримуваних файлів. Підтримувані формати: {{formats}}",
+  "Drop to Import Books": "Перетягніть для імпорту книг",
+  "Custom": "Користувацький",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Весь світ — театр,\nІ всі чоловіки та жінки — просто актори;\nУ них є свої виходи та входи,\nІ один чоловік у свій час грає багато ролей,\nЙого вчинки — це сім віков.\n\n— Вільям Шекспір",
+  "Custom Theme": "Користувацька тема",
+  "Theme Name": "Назва теми",
+  "Text Color": "Колір тексту",
+  "Background Color": "Колір фону",
+  "Preview": "Попередній перегляд",
+  "Contrast": "Контраст",
+  "Sunset": "Захід сонця",
+  "Double Border": "Подвійна рамка",
+  "Border Color": "Колір рамки",
+  "Border Frame": "Рамка рамки",
+  "Show Header": "Показати заголовок",
+  "Show Footer": "Показати нижню частину",
+  "Small": "Малий",
+  "Large": "Великий",
+  "Auto": "Автоматичний",
+  "Language": "Мова",
+  "No annotations to export": "Немає анотацій для експорту",
+  "Author": "Автор",
+  "Exported from Readest": "Експортовано з Readest",
+  "Highlights & Annotations": "Виділення та анотації",
+  "Note": "Примітка",
+  "Copied to clipboard": "Скопійовано в буфер обміну",
+  "Export Annotations": "Експортувати анотації"
 }

apps/readest-app/public/locales/vi/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "Gạch nối từ",
   "Identifier:": "Định danh:",
   "Import Books": "Nhập sách",
-  "Invert Colors in Dark Mode": "Đảo màu trong chế độ tối",
   "Language:": "Ngôn ngữ:",
   "Layout": "Bố cục",
   "Light Mode": "Chế độ sáng",
   "Loading...": "Đang tải...",
-  "Loc. {{currentPage}} / {{totalPage}}": "Vị trí {{currentPage}} / {{totalPage}}",
   "Logged in": "Đã đăng nhập",
   "Logged in as {{userDisplayName}}": "Đăng nhập với tên {{userDisplayName}}",
   "Match Case": "Phân biệt chữ hoa/thường",
   "Match Diacritics": "Phân biệt dấu",
   "Match Whole Words": "Khớp toàn bộ từ",
-  "Maximum Block Size": "Kích thước khối tối đa",
-  "Maximum Inline Size": "Kích thước nội tuyến tối đa",
   "Maximum Number of Columns": "Số cột tối đa",
   "Minimum Font Size": "Cỡ chữ tối thiểu",
   "Misc": "Khác",
@@ -230,5 +226,37 @@
   "Delete Permanently": "Xóa vĩnh viễn",
   "Free Tier": "Gói miễn phí",
   "Plus Tier": "Gói Plus",
-  "Pro Tier": "Gói Pro"
+  "Pro Tier": "Gói Pro",
+  "RTL Direction": "Hướng RTL",
+  "Maximum Column Height": "Chiều cao cột tối đa",
+  "Maximum Column Width": "Chiều rộng cột tối đa",
+  "Continuous Scroll": "Cuộn liên tục",
+  "Fullscreen": "Toàn màn hình",
+  "No supported files found. Supported formats: {{formats}}": "Không tìm thấy tệp được hỗ trợ. Định dạng được hỗ trợ: {{formats}}",
+  "Drop to Import Books": "Kéo và thả để nhập sách",
+  "Custom": "Tùy chỉnh",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "Cả thế giới này là một sân khấu,\nVà tất cả đàn ông và phụ nữ chỉ là những diễn viên;\nHọ có cửa ra và cửa vào của mình,\nVà một người trong cuộc đời mình đóng nhiều vai,\nHành động của mình là bảy tuổi.\n\n— William Shakespeare",
+  "Custom Theme": "Chủ đề tùy chỉnh",
+  "Theme Name": "Tên chủ đề",
+  "Text Color": "Màu văn bản",
+  "Background Color": "Màu nền",
+  "Preview": "Xem trước",
+  "Contrast": "Tương phản",
+  "Sunset": "Hoàng hôn",
+  "Double Border": "Đôi viền",
+  "Border Color": "Màu viền",
+  "Border Frame": "Khung viền",
+  "Show Header": "Hiển thị tiêu đề",
+  "Show Footer": "Hiển thị chân trang",
+  "Small": "Nhỏ",
+  "Large": "Lớn",
+  "Auto": "Tự động",
+  "Language": "Ngôn ngữ",
+  "No annotations to export": "Không có chú thích để xuất",
+  "Author": "Tác giả",
+  "Exported from Readest": "Đã xuất từ Readest",
+  "Highlights & Annotations": "Điểm nổi bật & Chú thích",
+  "Note": "Ghi chú",
+  "Copied to clipboard": "Đã sao chép vào bảng ghi",
+  "Export Annotations": "Xuất chú thích"
 }

apps/readest-app/public/locales/zh-CN/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "断字",
   "Identifier:": "识别码",
   "Import Books": "导入书籍",
-  "Invert Colors in Dark Mode": "深色主题下反色",
   "Language:": "语言",
   "Layout": "布局",
   "Light Mode": "浅色主题",
   "Loading...": "加载中...",
-  "Loc. {{currentPage}} / {{totalPage}}": "位置 {{currentPage}} / {{totalPage}}",
   "Logged in": "已登录",
   "Logged in as {{userDisplayName}}": "{{userDisplayName}} 已登录",
   "Match Case": "匹配大小写",
   "Match Diacritics": "匹配重音符号",
   "Match Whole Words": "匹配整个单词",
-  "Maximum Block Size": "内容最大宽度",
-  "Maximum Inline Size": "每栏最大宽度",
   "Maximum Number of Columns": "分栏数",
   "Minimum Font Size": "最小字号",
   "Misc": "杂项",
@@ -230,5 +226,37 @@
   "Delete Permanently": "永久删除",
   "Free Tier": "免费版",
   "Plus Tier": "增强版",
-  "Pro Tier": "专业版"
+  "Pro Tier": "专业版",
+  "RTL Direction": "从右向左",
+  "Maximum Column Height": "最大列高",
+  "Maximum Column Width": "最大列宽",
+  "Continuous Scroll": "连续滚动",
+  "Fullscreen": "全屏",
+  "No supported files found. Supported formats: {{formats}}": "未找到支持的文件。支持的格式：{{formats}}",
+  "Drop to Import Books": "拖放导入书籍",
+  "Custom": "自定义",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "世界是座舞台， \n所有男女都只是演员； \n各有其出场和入场； \n每个人皆扮演许多角色， \n而演出共分为七个阶段。\n\n——威廉·莎士比亚",
+  "Custom Theme": "自定义主题",
+  "Theme Name": "主题名称",
+  "Text Color": "文本颜色",
+  "Background Color": "背景颜色",
+  "Preview": "预览",
+  "Contrast": "对比",
+  "Sunset": "日落",
+  "Double Border": "显示版框",
+  "Border Color": "版框颜色",
+  "Border Frame": "页面版框",
+  "Show Header": "显示页眉",
+  "Show Footer": "显示页脚",
+  "Small": "小",
+  "Large": "大",
+  "Auto": "自动",
+  "Language": "语言",
+  "No annotations to export": "没有要导出的笔记",
+  "Author": "作者",
+  "Exported from Readest": "从 Readest 导出",
+  "Highlights & Annotations": "划线和笔记",
+  "Note": "笔记",
+  "Copied to clipboard": "已复制到剪贴板",
+  "Export Annotations": "导出笔记"
 }

apps/readest-app/public/locales/zh-TW/translation.json

@@ -53,19 +53,15 @@
   "Hyphenation": "斷字",
   "Identifier:": "識別碼",
   "Import Books": "導入書籍",
-  "Invert Colors in Dark Mode": "深色主題下反色",
   "Language:": "語言",
   "Layout": "版面",
   "Light Mode": "淺色主題",
   "Loading...": "載入中...",
-  "Loc. {{currentPage}} / {{totalPage}}": "位置 {{currentPage}} / {{totalPage}}",
   "Logged in": "已登入",
   "Logged in as {{userDisplayName}}": "{{userDisplayName}} 已登入",
   "Match Case": "匹配大小寫",
   "Match Diacritics": "匹配重音符號",
   "Match Whole Words": "匹配整個單詞",
-  "Maximum Block Size": "內容最大寬度",
-  "Maximum Inline Size": "每欄最大寬度",
   "Maximum Number of Columns": "分欄數",
   "Minimum Font Size": "最小字號",
   "Misc": "雜項",
@@ -230,5 +226,37 @@
   "Delete Permanently": "永久刪除",
   "Free Tier": "免費方案",
   "Plus Tier": "Plus方案",
-  "Pro Tier": "專業方案"
+  "Pro Tier": "專業方案",
+  "RTL Direction": "從右向左",
+  "Maximum Column Height": "最大列高",
+  "Maximum Column Width": "最大列寬",
+  "Continuous Scroll": "連續滾動",
+  "Fullscreen": "全螢幕",
+  "No supported files found. Supported formats: {{formats}}": "未找到支援的檔案。支援的格式：{{formats}}",
+  "Drop to Import Books": "拖放導入書籍",
+  "Custom": "自定義",
+  "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare": "世界是一個舞台，\n所有的男人和女人都只是演員：\n他們有出口，也有入口；\n一個人在他的時代扮演許多角​​色。 \n\n——威廉·莎士比亞",
+  "Custom Theme": "自定義主題",
+  "Theme Name": "主題名稱",
+  "Text Color": "文字顏色",
+  "Background Color": "背景顏色",
+  "Preview": "預覽",
+  "Contrast": "對比",
+  "Sunset": "日落",
+  "Double Border": "顯示邊框",
+  "Border Color": "邊框顏色",
+  "Border Frame": "頁面邊框",
+  "Show Header": "顯示頁眉",
+  "Show Footer": "顯示頁腳",
+  "Small": "小",
+  "Large": "大",
+  "Auto": "自動",
+  "Language": "語言",
+  "No annotations to export": "沒有要匯出的筆記",
+  "Author": "作者",
+  "Exported from Readest": "從 Readest 匯出",
+  "Highlights & Annotations": "高亮和筆記",
+  "Note": "筆記",
+  "Copied to clipboard": "已複製到剪貼板",
+  "Export Annotations": "匯出筆記"
 }

apps/readest-app/release-notes.json

@@ -1,5 +1,61 @@
 {
   "releases": {
+    "0.9.25": {
+      "date": "2025-03-24",
+      "notes": [
+        "Support exporting annotations in markdown format",
+        "Support importing TXT files",
+        "Support setting reader language in the UI",
+        "Add bottom action bar on mobile platforms",
+        "Various fixes on layout settings and styles"
+      ]
+    },
+    "0.9.23": {
+      "date": "2025-03-19",
+      "notes": [
+        "Add options to show/hide header and footer",
+        "Add responsive window size for popup footnotes",
+        "Fix theme color not applied on Safari browsers",
+        "Fix progress not updated to 100% when finished reading"
+      ]
+    },
+    "0.9.22": {
+      "date": "2025-03-16",
+      "notes": [
+        "Add theme color editor for more customization",
+        "Add border frame for vertical layout",
+        "Fix layout glitches on macOS in scroll mode",
+        "Various fixes and enhancements on translator, footnote, and scrollbar"
+      ]
+    },
+    "0.9.21": {
+      "date": "2025-03-10",
+      "notes": [
+        "Fix column height in vertical layout on mobile",
+        "Fix drag handle height not constant on mobile",
+        "Add fullscreen option on desktop",
+        "Add drag and drop to import books on desktop",
+        "Various fixes and enhancements on updater, footerbar and note"
+      ]
+    },
+    "0.9.20": {
+      "date": "2025-03-10",
+      "notes": [
+        "Fix column height in vertical layout on mobile",
+        "Fix drag handle height not constant on mobile",
+        "Add fullscreen option on desktop",
+        "Add drag and drop to import books on desktop",
+        "Various fixes and enhancements on updater, footerbar and note"
+      ]
+    },
+    "0.9.19": {
+      "date": "2025-03-07",
+      "notes": [
+        "Support custom CSS for Reader UI",
+        "Initial support of RTL layout for Arabic and Hebrew books",
+        "Various fixes and enhancements on layout and sync"
+      ]
+    },
     "0.9.18": {
       "date": "2025-02-26",
       "notes": [

apps/readest-app/src-tauri/capabilities/default.json

@@ -62,6 +62,7 @@
     "core:window:allow-is-maximized",
     "core:window:allow-start-dragging",
     "core:window:allow-toggle-maximize",
+    "core:window:allow-set-fullscreen",
     "shell:default",
     "process:default",
     "process:allow-exit",

apps/readest-app/src-tauri/src/lib.rs

@@ -10,6 +10,8 @@ extern crate objc;
 mod menu;
 #[cfg(target_os = "macos")]
 mod traffic_light;
+#[cfg(target_os = "macos")]
+use traffic_light::set_traffic_lights;
 
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
@@ -98,6 +100,8 @@ pub fn run() {
             start_server,
             download_file,
             upload_file,
+            #[cfg(target_os = "macos")]
+            set_traffic_lights,
             #[cfg(desktop)]
             list_fonts
         ])

apps/readest-app/src-tauri/src/traffic_light.rs

@@ -1,13 +1,14 @@
 use objc::{msg_send, sel, sel_impl};
 use rand::{distributions::Alphanumeric, Rng};
-use tauri::Emitter;
 use tauri::{
+    command,
     plugin::{Builder, TauriPlugin},
-    Runtime, Window,
-}; // 0.8
+    Emitter, Runtime, Window,
+};
 
-const WINDOW_CONTROL_PAD_X: f64 = 10.0;
-const WINDOW_CONTROL_PAD_Y: f64 = 22.0;
+static mut WINDOW_CONTROL_PAD_X: f64 = 10.0;
+static mut WINDOW_CONTROL_PAD_Y: f64 = 22.0;
+static mut TRAFFIC_LIGHTS_VISIBLE: bool = true;
 
 struct UnsafeWindowHandle(*mut std::ffi::c_void);
 unsafe impl Send for UnsafeWindowHandle {}
@@ -30,7 +31,24 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
 }
 
 #[cfg(target_os = "macos")]
-fn position_traffic_lights(ns_window_handle: UnsafeWindowHandle, x: f64, y: f64) {
+#[command]
+pub fn set_traffic_lights(window: Window, visible: bool, x: f64, y: f64) {
+    unsafe {
+        TRAFFIC_LIGHTS_VISIBLE = visible;
+        WINDOW_CONTROL_PAD_X = x;
+        WINDOW_CONTROL_PAD_Y = y;
+
+        position_traffic_lights(
+            UnsafeWindowHandle(window.ns_window().expect("Failed to create window handle")),
+            TRAFFIC_LIGHTS_VISIBLE,
+            WINDOW_CONTROL_PAD_X,
+            WINDOW_CONTROL_PAD_Y,
+        );
+    }
+}
+
+#[cfg(target_os = "macos")]
+fn position_traffic_lights(ns_window_handle: UnsafeWindowHandle, visible: bool, x: f64, y: f64) {
     use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
     use cocoa::foundation::NSRect;
     let ns_window = ns_window_handle.0 as cocoa::base::id;
@@ -45,7 +63,10 @@ fn position_traffic_lights(ns_window_handle: UnsafeWindowHandle, x: f64, y: f64)
         let close_rect: NSRect = msg_send![close, frame];
         let button_height = close_rect.size.height;
 
-        let title_bar_frame_height = button_height + y;
+        let mut title_bar_frame_height = button_height + y;
+        if !visible {
+            title_bar_frame_height = 0.0;
+        }
         let mut title_bar_rect = NSView::frame(title_bar_container_view);
         title_bar_rect.size.height = title_bar_frame_height;
         title_bar_rect.origin.y = NSView::frame(ns_window).size.height - title_bar_frame_height;
@@ -77,11 +98,14 @@ pub fn setup_traffic_light_positioner<R: Runtime>(window: Window<R>) {
     use std::ffi::c_void;
 
     // Do the initial positioning
-    position_traffic_lights(
-        UnsafeWindowHandle(window.ns_window().expect("Failed to create window handle")),
-        WINDOW_CONTROL_PAD_X,
-        WINDOW_CONTROL_PAD_Y,
-    );
+    unsafe {
+        position_traffic_lights(
+            UnsafeWindowHandle(window.ns_window().expect("Failed to create window handle")),
+            TRAFFIC_LIGHTS_VISIBLE,
+            WINDOW_CONTROL_PAD_X,
+            WINDOW_CONTROL_PAD_Y,
+        );
+    }
 
     // Ensure they stay in place while resizing the window.
     fn with_window_state<R: Runtime, F: FnOnce(&mut WindowState<R>) -> T, T>(
@@ -127,6 +151,7 @@ pub fn setup_traffic_light_positioner<R: Runtime>(window: Window<R>) {
                     #[cfg(target_os = "macos")]
                     position_traffic_lights(
                         UnsafeWindowHandle(id as *mut std::ffi::c_void),
+                        TRAFFIC_LIGHTS_VISIBLE,
                         WINDOW_CONTROL_PAD_X,
                         WINDOW_CONTROL_PAD_Y,
                     );
@@ -258,6 +283,7 @@ pub fn setup_traffic_light_positioner<R: Runtime>(window: Window<R>) {
                     let id = state.window.ns_window().expect("Failed to emit event") as id;
                     position_traffic_lights(
                         UnsafeWindowHandle(id as *mut std::ffi::c_void),
+                        TRAFFIC_LIGHTS_VISIBLE,
                         WINDOW_CONTROL_PAD_X,
                         WINDOW_CONTROL_PAD_Y,
                     );

apps/readest-app/src/app/auth/page.tsx

@@ -12,8 +12,8 @@ import { IoArrowBack } from 'react-icons/io5';
 
 import { useAuth } from '@/context/AuthContext';
 import { supabase } from '@/utils/supabase';
-import { useTheme } from '@/hooks/useTheme';
 import { useEnv } from '@/context/EnvContext';
+import { useThemeStore } from '@/store/themeStore';
 import { useSettingsStore } from '@/store/settingsStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { isTauriAppPlatform } from '@/services/environment';
@@ -61,7 +61,7 @@ export default function AuthPage() {
   const router = useRouter();
   const { login } = useAuth();
   const { envConfig, appService } = useEnv();
-  const { isDarkMode } = useTheme();
+  const { isDarkMode } = useThemeStore();
   const { settings, setSettings, saveSettings } = useSettingsStore();
   const [port, setPort] = useState<number | null>(null);
   const isOAuthServerRunning = useRef(false);
@@ -129,7 +129,7 @@ export default function AuthPage() {
   };
 
   const handleOAuthUrl = async (url: string) => {
-    console.log('Received OAuth URL:', url);
+    console.log('Handle OAuth URL:', url);
     const hashMatch = url.match(/#(.*)/);
     if (hashMatch) {
       const hash = hashMatch[1];

apps/readest-app/src/app/library/components/Bookshelf.tsx

@@ -21,9 +21,9 @@ interface BookshelfProps {
   libraryBooks: Book[];
   isSelectMode: boolean;
   handleImportBooks: () => void;
-  handleBookUpload: (book: Book) => void;
-  handleBookDownload: (book: Book) => void;
-  handleBookDelete: (book: Book) => void;
+  handleBookUpload: (book: Book) => Promise<boolean>;
+  handleBookDownload: (book: Book) => Promise<boolean>;
+  handleBookDelete: (book: Book) => Promise<boolean>;
   handleSetSelectMode: (selectMode: boolean) => void;
   handleShowDetailsBook: (book: Book) => void;
   booksTransferProgress: { [key: string]: number | null };
@@ -143,7 +143,7 @@ const Bookshelf: React.FC<BookshelfProps> = ({
       <div
         className={clsx(
           'transform-wrapper grid flex-1 gap-x-4 sm:gap-x-0',
-          'grid-cols-3 sm:grid-cols-4 md:grid-cols-6 xl:grid-cols-8',
+          'grid-cols-3 sm:grid-cols-4 md:grid-cols-6 xl:grid-cols-8 2xl:grid-cols-12',
         )}
       >
         {currentBookshelfItems.map((item, index) => (

apps/readest-app/src/app/library/components/BookshelfItem.tsx

@@ -72,9 +72,9 @@ interface BookshelfItemProps {
   transferProgress: number | null;
   setLoading: React.Dispatch<React.SetStateAction<boolean>>;
   toggleSelection: (hash: string) => void;
-  handleBookUpload: (book: Book) => void;
-  handleBookDownload: (book: Book) => void;
-  handleBookDelete: (book: Book) => void;
+  handleBookUpload: (book: Book) => Promise<boolean>;
+  handleBookDownload: (book: Book) => Promise<boolean>;
+  handleBookDelete: (book: Book) => Promise<boolean>;
   handleSetSelectMode: (selectMode: boolean) => void;
   handleShowDetailsBook: (book: Book) => void;
 }
@@ -109,9 +109,8 @@ const BookshelfItem: React.FC<BookshelfItemProps> = ({
       let available = false;
       const loadingTimeout = setTimeout(() => setLoading(true), 200);
       try {
-        await handleBookDownload(book);
+        available = await handleBookDownload(book);
         updateBook(envConfig, book);
-        available = true;
       } finally {
         if (loadingTimeout) clearTimeout(loadingTimeout);
         setLoading(false);

apps/readest-app/src/app/library/components/LibraryHeader.tsx

@@ -1,5 +1,5 @@
 import clsx from 'clsx';
-import React, { useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { FaSearch } from 'react-icons/fa';
 import { PiPlus } from 'react-icons/pi';
@@ -10,8 +10,8 @@ import { MdArrowBackIosNew } from 'react-icons/md';
 import { useEnv } from '@/context/EnvContext';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
+import { useTrafficLightStore } from '@/store/trafficLightStore';
 import { navigateToLibrary } from '@/utils/nav';
-import useTrafficLight from '@/hooks/useTrafficLight';
 import WindowButtons from '@/components/WindowButtons';
 import Dropdown from '@/components/Dropdown';
 import SettingsMenu from './SettingsMenu';
@@ -33,7 +33,14 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
   const router = useRouter();
   const searchParams = useSearchParams();
   const { appService } = useEnv();
-  const { isTrafficLightVisible } = useTrafficLight();
+  const {
+    isTrafficLightVisible,
+    initializeTrafficLightStore,
+    initializeTrafficLightListeners,
+    setTrafficLightVisibility,
+    cleanupTrafficLightListeners,
+  } = useTrafficLightStore();
+
   const headerRef = useRef<HTMLDivElement>(null);
   const iconSize16 = useResponsiveSize(16);
   const iconSize20 = useResponsiveSize(20);
@@ -42,6 +49,18 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
     onToggleSelectMode,
   });
 
+  useEffect(() => {
+    if (!appService?.hasTrafficLight) return;
+
+    initializeTrafficLightStore(appService);
+    initializeTrafficLightListeners();
+    setTrafficLightVisibility(true);
+    return () => {
+      cleanupTrafficLightListeners();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const windowButtonVisible = appService?.hasWindowBar && !isTrafficLightVisible;
   const isInGroupView = !!searchParams?.get('group');
 

apps/readest-app/src/app/library/components/ReadingProgress.tsx

@@ -13,7 +13,8 @@ const getProgressPercentage = (book: Book) => {
   if (book.progress && book.progress[1] === 1) {
     return 100;
   }
-  return Math.round((book.progress[0] / book.progress[1]) * 100);
+  const percentage = Math.round((book.progress[0] / book.progress[1]) * 100);
+  return Math.max(0, Math.min(100, percentage));
 };
 
 const ReadingProgress: React.FC<ReadingProgressProps> = memo(

apps/readest-app/src/app/library/components/SettingsMenu.tsx

@@ -14,6 +14,7 @@ import { useSettingsStore } from '@/store/settingsStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { getStoragePlanData } from '@/utils/access';
 import { navigateToLogin, navigateToProfile } from '@/utils/nav';
+import { tauriHandleToggleFullScreen } from '@/utils/window';
 import { QuotaType } from '@/types/user';
 import MenuItem from '@/components/MenuItem';
 import Quota from '@/components/Quota';
@@ -25,7 +26,7 @@ interface BookMenuProps {
 const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
   const _ = useTranslation();
   const router = useRouter();
-  const { envConfig } = useEnv();
+  const { envConfig, appService } = useEnv();
   const { token, user } = useAuth();
   const { settings, setSettings, saveSettings } = useSettingsStore();
   const [quotas, setQuotas] = React.useState<QuotaType[]>([]);
@@ -57,6 +58,11 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
     setIsDropdownOpen?.(false);
   };
 
+  const handleFullScreen = () => {
+    tauriHandleToggleFullScreen();
+    setIsDropdownOpen?.(false);
+  };
+
   const toggleAutoUploadBooks = () => {
     settings.autoUpload = !settings.autoUpload;
     setSettings(settings);
@@ -157,6 +163,9 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
         onClick={toggleScreenWakeLock}
       />
       <hr className='border-base-200 my-1' />
+      {appService?.hasRoundedWindow && (
+        <MenuItem label={_('Fullscreen')} onClick={handleFullScreen} />
+      )}
       <MenuItem label={_('Reload Page')} onClick={handleReloadPage} />
       <hr className='border-base-200 my-1' />
       {isWebApp && <MenuItem label={_('Download Readest')} onClick={downloadReadest} />}

apps/readest-app/src/app/library/hooks/useBooksSync.ts

@@ -85,9 +85,8 @@ export const useBooksSync = ({ onSyncStart, onSyncEnd }: UseBooksSyncProps) => {
         }
         const mergedBook =
           matchingBook.updatedAt > oldBook.updatedAt
-            ? { ...oldBook, ...matchingBook, updatedAt: oldBook.updatedAt }
-            : { ...matchingBook, ...oldBook, updatedAt: oldBook.updatedAt };
-        mergedBook.progress = matchingBook.progress ?? oldBook.progress;
+            ? { ...oldBook, ...matchingBook }
+            : { ...matchingBook, ...oldBook };
         return mergedBook;
       }
       return oldBook;

apps/readest-app/src/app/library/page.tsx

@@ -2,8 +2,8 @@
 
 import clsx from 'clsx';
 import * as React from 'react';
-import { useState, useRef, useEffect } from 'react';
-import { useRouter } from 'next/navigation';
+import { useState, useRef, useEffect, Suspense } from 'react';
+import { ReadonlyURLSearchParams, useRouter, useSearchParams } from 'next/navigation';
 
 import { Book } from '@/types/book';
 import { AppService } from '@/types/system';
@@ -17,17 +17,20 @@ import { isTauriAppPlatform, hasUpdater } from '@/services/environment';
 import { checkForAppUpdates } from '@/helpers/updater';
 import { FILE_ACCEPT_FORMATS, SUPPORTED_FILE_EXTS } from '@/services/constants';
 import { impactFeedback } from '@tauri-apps/plugin-haptics';
+import { getCurrentWebview } from '@tauri-apps/api/webview';
 
 import { useEnv } from '@/context/EnvContext';
 import { useAuth } from '@/context/AuthContext';
-import { useTheme } from '@/hooks/useTheme';
+import { useThemeStore } from '@/store/themeStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useLibraryStore } from '@/store/libraryStore';
 import { useSettingsStore } from '@/store/settingsStore';
 import { usePullToRefresh } from '@/hooks/usePullToRefresh';
+import { useTheme } from '@/hooks/useTheme';
 import { useDemoBooks } from './hooks/useDemoBooks';
 import { useBooksSync } from './hooks/useBooksSync';
 import { useScreenWakeLock } from '@/hooks/useScreenWakeLock';
+import { useOpenWithBooks } from '@/hooks/useOpenWithBooks';
 import { tauriQuitApp } from '@/utils/window';
 
 import { AboutWindow } from '@/components/AboutWindow';
@@ -37,8 +40,14 @@ import LibraryHeader from './components/LibraryHeader';
 import Bookshelf from './components/Bookshelf';
 import BookDetailModal from '@/components/BookDetailModal';
 import useShortcuts from '@/hooks/useShortcuts';
+import DropIndicator from '@/components/DropIndicator';
 
-const LibraryPage = () => {
+const LibraryPageWithSearchParams = () => {
+  const searchParams = useSearchParams();
+  return <LibraryPageContent searchParams={searchParams} />;
+};
+
+const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchParams | null }) => {
   const router = useRouter();
   const { envConfig, appService } = useEnv();
   const { token, user } = useAuth();
@@ -47,10 +56,11 @@ const LibraryPage = () => {
     updateBook,
     setLibrary,
     checkOpenWithBooks,
-    clearOpenWithBooks,
+    setCheckOpenWithBooks,
   } = useLibraryStore();
   const _ = useTranslation();
-  const { updateAppTheme } = useTheme();
+  useTheme();
+  const { updateAppTheme } = useThemeStore();
   const { settings, setSettings, saveSettings } = useSettingsStore();
   const [loading, setLoading] = useState(false);
   const isInitiating = useRef(false);
@@ -60,8 +70,12 @@ const LibraryPage = () => {
   const [booksTransferProgress, setBooksTransferProgress] = useState<{
     [key: string]: number | null;
   }>({});
+  const [isDragging, setIsDragging] = useState(false);
   const demoBooks = useDemoBooks();
   const containerRef = useRef<HTMLDivElement>(null);
+  const pageRef = useRef<HTMLDivElement>(null);
+
+  useOpenWithBooks();
 
   const { pullLibrary, pushLibrary } = useBooksSync({
     onSyncStart: () => setLoading(true),
@@ -94,6 +108,87 @@ const LibraryPage = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [settings]);
 
+  const handleDropedFiles = async (files: File[] | string[]) => {
+    if (files.length === 0) return;
+    const supportedFiles = files.filter((file) => {
+      let fileExt;
+      if (typeof file === 'string') {
+        fileExt = file.split('.').pop()?.toLowerCase();
+      } else {
+        fileExt = file.name.split('.').pop()?.toLowerCase();
+      }
+      return FILE_ACCEPT_FORMATS.includes(`.${fileExt}`);
+    });
+    if (supportedFiles.length === 0) {
+      eventDispatcher.dispatch('toast', {
+        message: _('No supported files found. Supported formats: {{formats}}', {
+          formats: FILE_ACCEPT_FORMATS,
+        }),
+        type: 'error',
+      });
+      return;
+    }
+
+    if (appService?.hasHaptics) {
+      impactFeedback('medium');
+    }
+
+    await importBooks(supportedFiles);
+  };
+
+  const handleDragOver = (event: React.DragEvent<HTMLDivElement> | DragEvent) => {
+    event.preventDefault();
+    event.stopPropagation();
+    setIsDragging(true);
+  };
+
+  const handleDragLeave = (event: React.DragEvent<HTMLDivElement> | DragEvent) => {
+    event.preventDefault();
+    event.stopPropagation();
+    setIsDragging(false);
+  };
+
+  const handleDrop = async (event: React.DragEvent<HTMLDivElement> | DragEvent) => {
+    event.preventDefault();
+    event.stopPropagation();
+    setIsDragging(false);
+
+    if (event.dataTransfer?.files && event.dataTransfer.files.length > 0) {
+      const files = Array.from(event.dataTransfer.files);
+      handleDropedFiles(files);
+    }
+  };
+
+  useEffect(() => {
+    const libraryPage = document.querySelector('.library-page');
+    libraryPage?.addEventListener('dragover', handleDragOver as unknown as EventListener);
+    libraryPage?.addEventListener('dragleave', handleDragLeave as unknown as EventListener);
+    libraryPage?.addEventListener('drop', handleDrop as unknown as EventListener);
+
+    if (isTauriAppPlatform()) {
+      const unlisten = getCurrentWebview().onDragDropEvent((event) => {
+        if (event.payload.type === 'over') {
+          setIsDragging(true);
+        } else if (event.payload.type === 'drop') {
+          setIsDragging(false);
+          handleDropedFiles(event.payload.paths);
+        } else {
+          setIsDragging(false);
+        }
+      });
+      return () => {
+        unlisten.then((fn) => fn());
+      };
+    }
+
+    return () => {
+      libraryPage?.removeEventListener('dragover', handleDragOver as unknown as EventListener);
+      libraryPage?.removeEventListener('dragleave', handleDragLeave as unknown as EventListener);
+      libraryPage?.removeEventListener('drop', handleDrop as unknown as EventListener);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [pageRef.current]);
+
   const processOpenWithFiles = React.useCallback(
     async (appService: AppService, openWithFiles: string[], libraryBooks: Book[]) => {
       const bookIds: string[] = [];
@@ -113,7 +208,9 @@ const LibraryPage = () => {
 
       console.log('Opening books:', bookIds);
       if (bookIds.length > 0) {
-        navigateToReader(router, bookIds);
+        setTimeout(() => {
+          navigateToReader(router, bookIds);
+        }, 0);
       }
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -148,7 +245,7 @@ const LibraryPage = () => {
       if (checkOpenWithBooks && isTauriAppPlatform()) {
         await handleOpenWithBooks(appService, libraryBooks);
       } else {
-        clearOpenWithBooks();
+        setCheckOpenWithBooks(false);
         setLibrary(libraryBooks);
       }
 
@@ -163,7 +260,7 @@ const LibraryPage = () => {
       if (openWithFiles.length > 0) {
         await processOpenWithFiles(appService, openWithFiles, libraryBooks);
       } else {
-        clearOpenWithBooks();
+        setCheckOpenWithBooks(false);
         setLibrary(libraryBooks);
       }
     };
@@ -171,10 +268,11 @@ const LibraryPage = () => {
     initLogin();
     initLibrary();
     return () => {
-      clearOpenWithBooks();
+      setCheckOpenWithBooks(false);
+      isInitiating.current = false;
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [searchParams]);
 
   useEffect(() => {
     if (demoBooks.length > 0 && libraryLoaded) {
@@ -193,7 +291,7 @@ const LibraryPage = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [demoBooks, libraryLoaded]);
 
-  const importBooks = async (files: [string | File]) => {
+  const importBooks = async (files: (string | File)[]) => {
     setLoading(true);
     const failedFiles = [];
     for (const file of files) {
@@ -262,17 +360,18 @@ const LibraryPage = () => {
           title: book.title,
         }),
       });
+      return true;
     } catch (err) {
       if (err instanceof Error) {
         if (err.message.includes('Not authenticated') && settings.keepLogin) {
           navigateToLogin(router);
-          return;
+          return false;
         } else if (err.message.includes('Insufficient storage quota')) {
           eventDispatcher.dispatch('toast', {
             type: 'error',
             message: _('Insufficient storage quota'),
           });
-          return;
+          return false;
         }
       }
       eventDispatcher.dispatch('toast', {
@@ -281,6 +380,7 @@ const LibraryPage = () => {
           title: book.title,
         }),
       });
+      return false;
     }
   };
 
@@ -297,6 +397,7 @@ const LibraryPage = () => {
           title: book.title,
         }),
       });
+      return true;
     } catch {
       eventDispatcher.dispatch('toast', {
         message: _('Failed to download book: {{title}}', {
@@ -304,6 +405,7 @@ const LibraryPage = () => {
         }),
         type: 'error',
       });
+      return false;
     }
   };
 
@@ -319,6 +421,7 @@ const LibraryPage = () => {
           title: book.title,
         }),
       });
+      return true;
     } catch {
       eventDispatcher.dispatch('toast', {
         message: _('Failed to delete book: {{title}}', {
@@ -326,10 +429,12 @@ const LibraryPage = () => {
         }),
         type: 'error',
       });
+      return false;
     }
   };
 
   const handleImportBooks = async () => {
+    setIsSelectMode(false);
     console.log('Importing books...');
     let files;
 
@@ -379,6 +484,7 @@ const LibraryPage = () => {
 
   return (
     <div
+      ref={pageRef}
       className={clsx(
         'library-page bg-base-200 text-base-content flex select-none flex-col overflow-hidden',
         appService?.isIOSApp ? 'h-[100vh]' : 'h-dvh',
@@ -402,11 +508,13 @@ const LibraryPage = () => {
           <div
             ref={containerRef}
             className={clsx(
-              'scroll-container mt-12 flex-grow overflow-auto px-4 sm:px-2',
+              'scroll-container drop-zone mt-12 flex-grow overflow-auto px-4 sm:px-2',
               appService?.hasSafeAreaInset && 'mt-[calc(48px+env(safe-area-inset-top))]',
               appService?.hasSafeAreaInset && 'pb-[calc(env(safe-area-inset-bottom))]',
+              isDragging && 'drag-over',
             )}
           >
+            <DropIndicator />
             <Bookshelf
               libraryBooks={libraryBooks}
               isSelectMode={isSelectMode}
@@ -420,7 +528,8 @@ const LibraryPage = () => {
             />
           </div>
         ) : (
-          <div className='hero h-screen items-center justify-center'>
+          <div className='hero drop-zone h-screen items-center justify-center'>
+            <DropIndicator />
             <div className='hero-content text-neutral-content text-center'>
               <div className='max-w-md'>
                 <h1 className='mb-5 text-5xl font-bold'>{_('Your Library')}</h1>
@@ -449,4 +558,18 @@ const LibraryPage = () => {
   );
 };
 
+const LibraryPage = () => {
+  return (
+    <Suspense
+      fallback={
+        <div className='fixed inset-0 z-50 flex items-center justify-center'>
+          <Spinner loading />
+        </div>
+      }
+    >
+      <LibraryPageWithSearchParams />
+    </Suspense>
+  );
+};
+
 export default LibraryPage;

apps/readest-app/src/app/reader/components/BooksGrid.tsx

@@ -17,6 +17,7 @@ import SettingsDialog from './settings/SettingsDialog';
 import Annotator from './annotator/Annotator';
 import FootnotePopup from './FootnotePopup';
 import HintInfo from './HintInfo';
+import DoubleBorder from './DoubleBorder';
 
 interface BooksGridProps {
   bookKeys: string[];
@@ -60,7 +61,8 @@ const BooksGrid: React.FC<BooksGridProps> = ({ bookKeys, onCloseBook }) => {
 
         const { section, pageinfo, sectionLabel } = progress || {};
         const isBookmarked = getViewState(bookKey)?.ribbonVisible;
-        const marginGap = `${viewSettings.gapPercent}%`;
+        const horizontalGapPercent = viewSettings.gapPercent;
+        const verticalMarginPixels = viewSettings.marginPx;
 
         return (
           <div
@@ -68,7 +70,7 @@ const BooksGrid: React.FC<BooksGridProps> = ({ bookKeys, onCloseBook }) => {
             key={bookKey}
             className={`${appService?.hasRoundedWindow ? 'rounded-window' : ''} relative h-full w-full overflow-hidden`}
           >
-            {isBookmarked && <Ribbon width={marginGap} />}
+            {isBookmarked && <Ribbon width={`${horizontalGapPercent}%`} />}
             <HeaderBar
               bookKey={bookKey}
               bookTitle={book.title}
@@ -79,20 +81,70 @@ const BooksGrid: React.FC<BooksGridProps> = ({ bookKeys, onCloseBook }) => {
             />
             <FoliateViewer bookKey={bookKey} bookDoc={bookDoc} config={config} />
             <FootnotePopup bookKey={bookKey} bookDoc={bookDoc} />
-            {viewSettings.scrolled ? null : (
+            {viewSettings.vertical && viewSettings.scrolled && (
               <>
-                <SectionInfo section={sectionLabel} gapLeft={marginGap} />
-                <HintInfo bookKey={bookKey} gapRight={marginGap} />
-                <PageInfoView
-                  bookFormat={book.format}
-                  section={section ?? null}
-                  pageinfo={pageinfo ?? null}
-                  gapRight={marginGap}
+                <div
+                  className='bg-base-100 absolute left-0 top-0 h-full'
+                  style={{
+                    width: `calc(${horizontalGapPercent}%)`,
+                    height: `calc(100% - ${verticalMarginPixels}px)`,
+                  }}
+                />
+                <div
+                  className='bg-base-100 absolute right-0 top-0 h-full'
+                  style={{
+                    width: `calc(${horizontalGapPercent}%)`,
+                    height: `calc(100% - ${verticalMarginPixels}px)`,
+                  }}
                 />
               </>
             )}
+            {viewSettings.vertical && viewSettings.doubleBorder && (
+              <DoubleBorder
+                showHeader={viewSettings.showHeader}
+                showFooter={viewSettings.showFooter}
+                borderColor={viewSettings.borderColor}
+                horizontalGap={horizontalGapPercent}
+                verticalMargin={verticalMarginPixels}
+              />
+            )}
+            {viewSettings.showHeader && (
+              <SectionInfo
+                section={sectionLabel}
+                showDoubleBorder={viewSettings.vertical && viewSettings.doubleBorder}
+                isScrolled={viewSettings.scrolled}
+                isVertical={viewSettings.vertical}
+                horizontalGap={horizontalGapPercent}
+                verticalMargin={verticalMarginPixels}
+              />
+            )}
+            <HintInfo
+              bookKey={bookKey}
+              showDoubleBorder={viewSettings.vertical && viewSettings.doubleBorder}
+              isVertical={viewSettings.vertical}
+              horizontalGap={horizontalGapPercent}
+              verticalMargin={verticalMarginPixels}
+            />
+            {viewSettings.showFooter && (
+              <PageInfoView
+                bookFormat={book.format}
+                section={section}
+                pageinfo={pageinfo}
+                showDoubleBorder={viewSettings.vertical && viewSettings.doubleBorder}
+                isScrolled={viewSettings.scrolled}
+                isVertical={viewSettings.vertical}
+                horizontalGap={horizontalGapPercent}
+                verticalMargin={verticalMarginPixels}
+              />
+            )}
             <Annotator bookKey={bookKey} />
-            <FooterBar bookKey={bookKey} pageinfo={pageinfo} isHoveredAnim={false} />
+            <FooterBar
+              bookKey={bookKey}
+              bookFormat={book.format}
+              section={section}
+              pageinfo={pageinfo}
+              isHoveredAnim={false}
+            />
             {isFontLayoutSettingsDialogOpen && <SettingsDialog bookKey={bookKey} config={config} />}
           </div>
         );

apps/readest-app/src/app/reader/components/DoubleBorder.tsx

@@ -0,0 +1,76 @@
+interface DoubleBorderProps {
+  borderColor: string;
+  horizontalGap: number;
+  verticalMargin: number;
+  showHeader: boolean;
+  showFooter: boolean;
+}
+
+const paddingPx = 10;
+
+const DoubleBorder: React.FC<DoubleBorderProps> = ({
+  borderColor,
+  horizontalGap,
+  verticalMargin,
+  showHeader,
+  showFooter,
+}) => {
+  return (
+    <>
+      {/* outter frame */}
+      <div
+        className={'borderframe pointer-events-none absolute'}
+        style={{
+          border: `4px solid ${borderColor}`,
+          height: `calc(100% - ${verticalMargin * 2}px + ${paddingPx * 2}px)`,
+          top: `calc(${verticalMargin}px - ${paddingPx}px)`,
+          left: `calc(${horizontalGap}% - ${showFooter ? 32 : 0}px - ${paddingPx}px)`,
+          right: `calc(${horizontalGap}% - ${showHeader ? 32 : 0}px - ${paddingPx}px)`,
+        }}
+      ></div>
+      {/* inner frame */}
+      <div
+        className={'borderframe pointer-events-none absolute'}
+        style={{
+          border: `1px solid ${borderColor}`,
+          height: `calc(100% - ${verticalMargin * 2}px)`,
+          top: `${verticalMargin}px`,
+          left: showFooter ? `${horizontalGap}%` : `calc(${horizontalGap}%)`,
+          right: showHeader ? `${horizontalGap}%` : `calc(${horizontalGap}%)`,
+        }}
+      />
+      {/* footer */}
+      {showFooter && (
+        <div
+          className={'borderframe pointer-events-none absolute'}
+          style={{
+            borderTop: `1px solid ${borderColor}`,
+            borderBottom: `1px solid ${borderColor}`,
+            borderLeft: `1px solid ${borderColor}`,
+            width: '32px',
+            height: `calc(100% - ${verticalMargin * 2}px)`,
+            top: `${verticalMargin}px`,
+            left: `calc(${horizontalGap}% - 32px)`,
+          }}
+        />
+      )}
+      {/* header */}
+      {showHeader && (
+        <div
+          className={'borderframe pointer-events-none absolute'}
+          style={{
+            borderTop: `1px solid ${borderColor}`,
+            borderBottom: `1px solid ${borderColor}`,
+            borderRight: `1px solid ${borderColor}`,
+            width: '32px',
+            height: `calc(100% - ${verticalMargin * 2}px)`,
+            top: `${verticalMargin}px`,
+            left: `calc(100% - ${horizontalGap}%)`,
+          }}
+        />
+      )}
+    </>
+  );
+};
+
+export default DoubleBorder;

apps/readest-app/src/app/reader/components/FoliateViewer.tsx

@@ -2,17 +2,16 @@ import React, { useEffect, useRef, useState } from 'react';
 import { BookDoc, getDirection } from '@/libs/document';
 import { BookConfig } from '@/types/book';
 import { FoliateView, wrappedFoliateView } from '@/types/view';
+import { useThemeStore } from '@/store/themeStore';
 import { useReaderStore } from '@/store/readerStore';
 import { useParallelViewStore } from '@/store/parallelViewStore';
 import { useClickEvent, useTouchEvent } from '../hooks/useIframeEvents';
 import { useFoliateEvents } from '../hooks/useFoliateEvents';
 import { useProgressSync } from '../hooks/useProgressSync';
 import { useProgressAutoSave } from '../hooks/useProgressAutoSave';
-import { useAutoHideScrollbar } from '../hooks/useAutoHideScrollbar';
 import { getStyles, mountAdditionalFonts } from '@/utils/style';
-import { getBookDirFromWritingMode } from '@/utils/book';
-import { useTheme } from '@/hooks/useTheme';
-import { ONE_COLUMN_MAX_INLINE_SIZE } from '@/services/constants';
+import { getBookDirFromLanguage, getBookDirFromWritingMode } from '@/utils/book';
+import { useUICSS } from '@/hooks/useUICSS';
 import {
   handleKeydown,
   handleMousedown,
@@ -23,6 +22,7 @@ import {
   handleTouchMove,
   handleTouchEnd,
 } from '../utils/iframeEventHandlers';
+import { getMaxInlineSize } from '@/utils/config';
 
 const FoliateViewer: React.FC<{
   bookKey: string;
@@ -35,7 +35,8 @@ const FoliateViewer: React.FC<{
   const { getView, setView: setFoliateView, setProgress } = useReaderStore();
   const { getViewSettings, setViewSettings } = useReaderStore();
   const { getParallels } = useParallelViewStore();
-  const { themeCode } = useTheme();
+  const { themeCode, isDarkMode } = useThemeStore();
+  const viewSettings = getViewSettings(bookKey)!;
 
   const [toastMessage, setToastMessage] = useState('');
   useEffect(() => {
@@ -43,6 +44,7 @@ const FoliateViewer: React.FC<{
     return () => clearTimeout(timer);
   }, [toastMessage]);
 
+  useUICSS(bookKey, viewSettings);
   useProgressSync(bookKey);
   useProgressAutoSave(bookKey);
 
@@ -51,18 +53,16 @@ const FoliateViewer: React.FC<{
     setProgress(bookKey, detail.cfi, detail.tocItem, detail.section, detail.location, detail.range);
   };
 
-  const { shouldAutoHideScrollbar, handleScrollbarAutoHide } = useAutoHideScrollbar();
   const docLoadHandler = (event: Event) => {
     const detail = (event as CustomEvent).detail;
     console.log('doc loaded:', detail);
     if (detail.doc) {
       const writingDir = viewRef.current?.renderer.setStyles && getDirection(detail.doc);
       const viewSettings = getViewSettings(bookKey)!;
-      viewSettings.vertical = writingDir?.vertical || false;
-      setViewSettings(bookKey, viewSettings);
-      if (viewSettings.scrolled && shouldAutoHideScrollbar) {
-        handleScrollbarAutoHide(detail.doc);
-      }
+      viewSettings.vertical =
+        writingDir?.vertical || viewSettings.writingMode.includes('vertical') || false;
+      viewSettings.rtl = writingDir?.rtl || viewSettings.writingMode.includes('rl') || false;
+      setViewSettings(bookKey, { ...viewSettings });
 
       mountAdditionalFonts(detail.doc);
 
@@ -86,7 +86,8 @@ const FoliateViewer: React.FC<{
 
     if (detail.reason === 'scroll') {
       const renderer = viewRef.current?.renderer;
-      if (renderer) {
+      const viewSettings = getViewSettings(bookKey)!;
+      if (renderer && viewSettings.continuousScroll) {
         if (renderer.start <= 0) {
           viewRef.current?.prev(1);
           // sometimes viewSize has subpixel value that the end never reaches
@@ -120,10 +121,10 @@ const FoliateViewer: React.FC<{
   useEffect(() => {
     if (viewRef.current && viewRef.current.renderer) {
       const viewSettings = getViewSettings(bookKey)!;
-      viewRef.current.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+      viewRef.current.renderer.setStyles?.(getStyles(viewSettings));
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [themeCode]);
+  }, [themeCode, isDarkMode]);
 
   useEffect(() => {
     if (isViewCreated.current) return;
@@ -133,31 +134,34 @@ const FoliateViewer: React.FC<{
       console.log('Opening book', bookKey);
       await import('foliate-js/view.js');
       const view = wrappedFoliateView(document.createElement('foliate-view') as FoliateView);
+      view.id = `foliate-view-${bookKey}`;
       document.body.append(view);
       containerRef.current?.appendChild(view);
 
+      const writingMode = viewSettings.writingMode;
+      if (writingMode) {
+        const settingsDir = getBookDirFromWritingMode(writingMode);
+        const languageDir = getBookDirFromLanguage(bookDoc.metadata.language);
+        if (settingsDir !== 'auto') {
+          bookDoc.dir = settingsDir;
+        } else if (languageDir !== 'auto') {
+          bookDoc.dir = languageDir;
+        }
+      }
+
       await view.open(bookDoc);
       // make sure we can listen renderer events after opening book
       viewRef.current = view;
       setFoliateView(bookKey, view);
 
-      const viewSettings = getViewSettings(bookKey)!;
-      view.renderer.setStyles?.(getStyles(viewSettings, themeCode));
-
-      const writingMode = viewSettings.writingMode;
-      if (writingMode) {
-        view.book.dir = getBookDirFromWritingMode(writingMode);
-      }
+      view.renderer.setStyles?.(getStyles(viewSettings));
 
       const isScrolled = viewSettings.scrolled!;
       const marginPx = viewSettings.marginPx!;
       const gapPercent = viewSettings.gapPercent!;
       const animated = viewSettings.animated!;
       const maxColumnCount = viewSettings.maxColumnCount!;
-      const maxInlineSize =
-        maxColumnCount === 1 || isScrolled
-          ? ONE_COLUMN_MAX_INLINE_SIZE
-          : viewSettings.maxInlineSize!;
+      const maxInlineSize = getMaxInlineSize(viewSettings);
       const maxBlockSize = viewSettings.maxBlockSize!;
       if (animated) {
         view.renderer.setAttribute('animated', '');

apps/readest-app/src/app/reader/components/FooterBar.tsx

@@ -3,31 +3,80 @@ import clsx from 'clsx';
 import { RiArrowLeftWideLine, RiArrowRightWideLine } from 'react-icons/ri';
 import { RiArrowGoBackLine, RiArrowGoForwardLine } from 'react-icons/ri';
 import { FaHeadphones } from 'react-icons/fa6';
+import { IoIosList as TOCIcon } from 'react-icons/io';
+import { PiNotePencil as NoteIcon } from 'react-icons/pi';
+import { RxSlider as SliderIcon } from 'react-icons/rx';
+import { RiFontFamily as FontIcon } from 'react-icons/ri';
+import { MdOutlineHeadphones as TTSIcon } from 'react-icons/md';
+import { TbBoxMargin } from 'react-icons/tb';
+import { RxLineHeight } from 'react-icons/rx';
 
 import { useEnv } from '@/context/EnvContext';
 import { useReaderStore } from '@/store/readerStore';
 import { useSidebarStore } from '@/store/sidebarStore';
 import { useTranslation } from '@/hooks/useTranslation';
+import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 import { eventDispatcher } from '@/utils/event';
+import { saveViewSettings } from '../utils/viewSettingsHelper';
+import { PageInfo } from '@/types/book';
+import { getStyles } from '@/utils/style';
 import Button from '@/components/Button';
+import Slider from '@/components/Slider';
 
 interface FooterBarProps {
   bookKey: string;
-  pageinfo: { current: number; total: number } | undefined;
+  bookFormat: string;
+  section?: PageInfo;
+  pageinfo?: PageInfo;
   isHoveredAnim: boolean;
 }
 
-const FooterBar: React.FC<FooterBarProps> = ({ bookKey, pageinfo, isHoveredAnim }) => {
+const FooterBar: React.FC<FooterBarProps> = ({
+  bookKey,
+  bookFormat,
+  section,
+  pageinfo,
+  isHoveredAnim,
+}) => {
   const _ = useTranslation();
-  const { appService } = useEnv();
-  const { hoveredBookKey, setHoveredBookKey, getView, getProgress } = useReaderStore();
-  const { isSideBarVisible } = useSidebarStore();
+  const { envConfig, appService } = useEnv();
+  const { hoveredBookKey, setHoveredBookKey, getView, getProgress, getViewSettings } =
+    useReaderStore();
+  const { isSideBarVisible, setSideBarVisible } = useSidebarStore();
+  const [actionTab, setActionTab] = React.useState('');
+  const sliderHeight = useResponsiveSize(28);
+  const tocIconSize = useResponsiveSize(23);
+  const fontIconSize = useResponsiveSize(18);
+  const marginIconSize = useResponsiveSize(20);
+
   const view = getView(bookKey);
   const progress = getProgress(bookKey);
+  const viewSettings = getViewSettings(bookKey);
 
-  const handleProgressChange = (event: React.ChangeEvent) => {
-    const newProgress = parseInt((event.target as HTMLInputElement).value, 10);
-    view?.goToFraction(newProgress / 100.0);
+  const handleProgressChange = (value: number) => {
+    view?.goToFraction(value / 100.0);
+  };
+
+  const handleFontSizeChange = (value: number) => {
+    saveViewSettings(envConfig, bookKey, 'defaultFontSize', value);
+    view?.renderer.setStyles?.(getStyles(viewSettings!));
+  };
+
+  const handleMarginChange = (value: number) => {
+    const marginPx = Math.round((value / 100) * 88);
+    const gapPercent = Math.round((value / 100) * 10);
+    saveViewSettings(envConfig, bookKey, 'marginPx', marginPx);
+    saveViewSettings(envConfig, bookKey, 'gapPercent', gapPercent);
+    view?.renderer.setAttribute('margin', `${marginPx}px`);
+    view?.renderer.setAttribute('gap', `${gapPercent}%`);
+    if (viewSettings?.scrolled) {
+      view?.renderer.setAttribute('flow', 'scrolled');
+    }
+  };
+
+  const handleLineHeightChange = (value: number) => {
+    saveViewSettings(envConfig, bookKey, 'lineHeight', value / 10);
+    view?.renderer.setStyles?.(getStyles(viewSettings!));
   };
 
   const handleGoPrev = () => {
@@ -56,53 +105,225 @@ const FooterBar: React.FC<FooterBarProps> = ({ bookKey, pageinfo, isHoveredAnim
     }
   };
 
-  const pageinfoValid = pageinfo && pageinfo.total > 0 && pageinfo.current >= 0;
-  const progressFraction = pageinfoValid ? pageinfo.current / pageinfo.total : 0;
+  const handleSetActionTab = (tab: string) => {
+    console.log('handleSetActionTab', tab);
+    setActionTab(actionTab === tab ? '' : tab);
+    if (tab === 'tts') {
+      setHoveredBookKey('');
+      handleSpeakText();
+    } else if (tab === 'toc') {
+      setHoveredBookKey('');
+      if (viewSettings) {
+        viewSettings.sideBarTab = 'toc';
+      }
+      setSideBarVisible(true);
+    } else if (tab === 'note') {
+      setHoveredBookKey('');
+      setSideBarVisible(true);
+      if (viewSettings) {
+        viewSettings.sideBarTab = 'annotations';
+      }
+    }
+  };
+
+  const getMarginProgressValue = (marginPx: number, gapPercent: number) => {
+    return (marginPx / 88 + gapPercent / 10) * 50;
+  };
+
+  const isVisible = hoveredBookKey === bookKey;
+  const progressInfo = bookFormat === 'PDF' ? section : pageinfo;
+  const progressValid = !!progressInfo;
+  const progressFraction = progressValid
+    ? ((progressInfo!.next ?? progressInfo!.current) + 1) / progressInfo!.total
+    : 0;
+
   return (
-    <div
-      className={clsx(
-        'footer-bar absolute bottom-0 z-10 flex h-12 w-full items-center gap-x-4 px-4',
-        'shadow-xs bg-base-100 transition-opacity duration-300',
-        appService?.hasSafeAreaInset && 'pb-[env(safe-area-inset-bottom)]',
-        appService?.hasRoundedWindow && 'rounded-window-bottom-right',
-        !isSideBarVisible && appService?.hasRoundedWindow && 'rounded-window-bottom-left',
-        isHoveredAnim && 'hover-bar-anim',
-        hoveredBookKey === bookKey ? `opacity-100` : `opacity-0`,
-      )}
-      onMouseEnter={() => setHoveredBookKey(bookKey)}
-      onMouseLeave={() => setHoveredBookKey('')}
-    >
-      <div className='hidden sm:flex'>
-        <Button icon={<RiArrowLeftWideLine />} onClick={handleGoPrev} tooltip={_('Go Left')} />
+    <>
+      <div
+        className={clsx(
+          'absolute bottom-0 left-0 z-10 hidden w-full sm:flex sm:h-[52px]',
+          // show scroll bar when vertical and scrolled in desktop
+          viewSettings?.vertical && viewSettings?.scrolled && 'sm:!bottom-3 sm:!h-7',
+        )}
+        onMouseEnter={() => !appService?.isMobile && setHoveredBookKey(bookKey)}
+        onTouchStart={() => !appService?.isMobile && setHoveredBookKey(bookKey)}
+      />
+      <div
+        className={clsx(
+          'footer-bar shadow-xs absolute bottom-0 z-50 flex w-full flex-col',
+          'sm:h-[52px] sm:justify-center',
+          'sm:bg-base-100 border-base-300/50 border sm:border-none',
+          'transition-[opacity,transform] duration-300',
+          appService?.hasRoundedWindow && 'rounded-window-bottom-right',
+          !isSideBarVisible && appService?.hasRoundedWindow && 'rounded-window-bottom-left',
+          isHoveredAnim && 'hover-bar-anim',
+          // show scroll bar when vertical and scrolled in desktop
+          viewSettings?.vertical && viewSettings?.scrolled && 'sm:!bottom-3 sm:!h-7',
+          isVisible
+            ? `pointer-events-auto translate-y-0 opacity-100`
+            : `pointer-events-none translate-y-full opacity-0 sm:translate-y-0`,
+        )}
+        dir={viewSettings?.rtl ? 'rtl' : 'ltr'}
+        onMouseLeave={() => window.innerWidth >= 640 && setHoveredBookKey('')}
+        aria-hidden={!isVisible}
+      >
+        {/* Mobile footer bar */}
+        <div
+          className={clsx(
+            'bg-base-200 absolute bottom-16 flex w-full items-center gap-x-2 px-4 transition-all sm:hidden',
+            actionTab === 'progress'
+              ? 'pointer-events-auto translate-y-0 pb-4 pt-8 ease-out'
+              : 'pointer-events-none invisible translate-y-full overflow-hidden pb-0 pt-0 ease-in',
+          )}
+          style={{
+            bottom: appService?.hasSafeAreaInset
+              ? 'calc(env(safe-area-inset-bottom) + 64px)'
+              : '64px',
+          }}
+        >
+          <Button
+            icon={viewSettings?.rtl ? <RiArrowRightWideLine /> : <RiArrowLeftWideLine />}
+            onClick={viewSettings?.rtl ? handleGoNext : handleGoPrev}
+            tooltip={viewSettings?.rtl ? _('Go Right') : _('Go Left')}
+          />
+          <Button
+            icon={viewSettings?.rtl ? <RiArrowGoForwardLine /> : <RiArrowGoBackLine />}
+            onClick={handleGoBack}
+            tooltip={_('Go Back')}
+            disabled={!view?.history.canGoBack}
+          />
+          <Button
+            icon={viewSettings?.rtl ? <RiArrowGoBackLine /> : <RiArrowGoForwardLine />}
+            onClick={handleGoForward}
+            tooltip={_('Go Forward')}
+            disabled={!view?.history.canGoForward}
+          />
+          <Slider
+            heightPx={sliderHeight}
+            bubbleLabel={`${Math.round(progressFraction * 100)}%`}
+            initialValue={progressValid ? progressFraction * 100 : 0}
+            onChange={(e) => handleProgressChange(e)}
+          />
+          <Button
+            icon={viewSettings?.rtl ? <RiArrowLeftWideLine /> : <RiArrowRightWideLine />}
+            onClick={viewSettings?.rtl ? handleGoPrev : handleGoNext}
+            tooltip={viewSettings?.rtl ? _('Go Left') : _('Go Right')}
+          />
+        </div>
+        <div
+          className={clsx(
+            'bg-base-200 absolute flex w-full flex-col items-center gap-y-8 px-4 transition-all sm:hidden',
+            actionTab === 'font'
+              ? 'pointer-events-auto translate-y-0 pb-4 pt-8 ease-out'
+              : 'pointer-events-none invisible translate-y-full overflow-hidden pb-0 pt-0 ease-in',
+          )}
+          style={{
+            bottom: appService?.hasSafeAreaInset
+              ? 'calc(env(safe-area-inset-bottom) + 64px)'
+              : '64px',
+          }}
+        >
+          <Slider
+            initialValue={viewSettings?.defaultFontSize ?? 16}
+            bubbleLabel={`${viewSettings?.defaultFontSize ?? 16}`}
+            minLabel='A'
+            maxLabel='A'
+            minClassName='text-xs'
+            maxClassName='text-base'
+            onChange={handleFontSizeChange}
+            min={8}
+            max={30}
+          />
+          <div className='flex w-full items-center justify-between gap-x-6'>
+            <Slider
+              initialValue={getMarginProgressValue(
+                viewSettings?.marginPx ?? 44,
+                viewSettings?.gapPercent ?? 5,
+              )}
+              bubbleElement={<TbBoxMargin size={marginIconSize} />}
+              minLabel={_('Small')}
+              maxLabel={_('Large')}
+              step={10}
+              onChange={handleMarginChange}
+            />
+            <Slider
+              initialValue={(viewSettings?.lineHeight ?? 1.6) * 10}
+              bubbleElement={<RxLineHeight size={marginIconSize} />}
+              minLabel={_('Small')}
+              maxLabel={_('Large')}
+              min={8}
+              max={24}
+              onChange={handleLineHeightChange}
+            />
+          </div>
+        </div>
+        <div
+          className={clsx(
+            'bg-base-200 z-50 mt-auto flex w-full justify-between px-8 py-4 sm:hidden',
+            appService?.hasSafeAreaInset && 'pb-[calc(env(safe-area-inset-bottom)+16px)]',
+          )}
+        >
+          <Button
+            icon={<TOCIcon size={tocIconSize} className='' />}
+            onClick={() => handleSetActionTab('toc')}
+          />
+          <Button icon={<NoteIcon className='' />} onClick={() => handleSetActionTab('note')} />
+          <Button
+            icon={<SliderIcon className={clsx(actionTab === 'progress' && 'text-blue-500')} />}
+            onClick={() => handleSetActionTab('progress')}
+          />
+          <Button
+            icon={
+              <FontIcon
+                size={fontIconSize}
+                className={clsx(actionTab === 'font' && 'text-blue-500')}
+              />
+            }
+            onClick={() => handleSetActionTab('font')}
+          />
+          <Button icon={<TTSIcon className='' />} onClick={() => handleSetActionTab('tts')} />
+        </div>
+        {/* Desktop footer bar */}
+        <div className='hidden w-full items-center gap-x-4 px-4 sm:flex'>
+          <Button
+            icon={viewSettings?.rtl ? <RiArrowRightWideLine /> : <RiArrowLeftWideLine />}
+            onClick={viewSettings?.rtl ? handleGoNext : handleGoPrev}
+            tooltip={viewSettings?.rtl ? _('Go Right') : _('Go Left')}
+          />
+          <Button
+            icon={viewSettings?.rtl ? <RiArrowGoForwardLine /> : <RiArrowGoBackLine />}
+            onClick={handleGoBack}
+            tooltip={_('Go Back')}
+            disabled={!view?.history.canGoBack}
+          />
+          <Button
+            icon={viewSettings?.rtl ? <RiArrowGoBackLine /> : <RiArrowGoForwardLine />}
+            onClick={handleGoForward}
+            tooltip={_('Go Forward')}
+            disabled={!view?.history.canGoForward}
+          />
+          <span className='mx-2 text-center text-sm'>
+            {progressValid ? `${Math.round(progressFraction * 100)}%` : ''}
+          </span>
+          <input
+            type='range'
+            className='text-base-content mx-2 w-full'
+            min={0}
+            max={100}
+            value={progressValid ? progressFraction * 100 : 0}
+            onChange={(e) =>
+              handleProgressChange(parseInt((e.target as HTMLInputElement).value, 10))
+            }
+          />
+          <Button icon={<FaHeadphones />} onClick={handleSpeakText} tooltip={_('Speak')} />
+          <Button
+            icon={viewSettings?.rtl ? <RiArrowLeftWideLine /> : <RiArrowRightWideLine />}
+            onClick={viewSettings?.rtl ? handleGoPrev : handleGoNext}
+            tooltip={viewSettings?.rtl ? _('Go Left') : _('Go Right')}
+          />
+        </div>
       </div>
-      <Button
-        icon={<RiArrowGoBackLine />}
-        onClick={handleGoBack}
-        tooltip={_('Go Back')}
-        disabled={!view?.history.canGoBack}
-      />
-      <Button
-        icon={<RiArrowGoForwardLine />}
-        onClick={handleGoForward}
-        tooltip={_('Go Forward')}
-        disabled={!view?.history.canGoForward}
-      />
-      <span className='mx-2 text-center text-sm'>
-        {pageinfoValid ? `${Math.round(progressFraction * 100)}%` : ''}
-      </span>
-      <input
-        type='range'
-        className='text-base-content mx-2 w-full'
-        min={0}
-        max={100}
-        value={pageinfoValid ? progressFraction * 100 : 0}
-        onChange={(e) => handleProgressChange(e)}
-      />
-      <Button icon={<FaHeadphones />} onClick={handleSpeakText} tooltip={_('Speak')} />
-      <div className='hidden sm:flex'>
-        <Button icon={<RiArrowRightWideLine />} onClick={handleGoNext} tooltip={_('Go Right')} />
-      </div>
-    </div>
+    </>
   );
 };
 

apps/readest-app/src/app/reader/components/FootnotePopup.tsx

@@ -3,8 +3,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { BookDoc } from '@/libs/document';
 import { useReaderStore } from '@/store/readerStore';
 import { useFoliateEvents } from '../hooks/useFoliateEvents';
-import { useTheme } from '@/hooks/useTheme';
-import { getFootnoteStyles, getStyles } from '@/utils/style';
+import { getFootnoteStyles, getStyles, getThemeCode } from '@/utils/style';
 import { getPopupPosition, getPosition, Position } from '@/utils/sel';
 import { eventDispatcher } from '@/utils/event';
 import { FoliateView } from '@/types/view';
@@ -26,23 +25,42 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
   const [trianglePosition, setTrianglePosition] = useState<Position | null>();
   const [popupPosition, setPopupPosition] = useState<Position | null>();
   const [showPopup, setShowPopup] = useState(false);
+
   const { getView, getViewSettings } = useReaderStore();
-  const { themeCode } = useTheme();
   const view = getView(bookKey);
   const viewSettings = getViewSettings(bookKey)!;
   const footnoteHandler = new FootnoteHandler();
 
+  const [gridRect, setGridRect] = useState<DOMRect | null>(null);
+  const [responsiveWidth, setResponsiveWidth] = useState(popupWidth);
+  const [responsiveHeight, setResponsiveHeight] = useState(popupHeight);
+
+  const getResponsivePopupSize = (size: number, isVertical: boolean) => {
+    const maxSize = isVertical ? window.innerWidth / 2 : window.innerHeight / 2;
+    return Math.min(size, maxSize - popupPadding - 12);
+  };
+
   useEffect(() => {
     const handleBeforeRender = (e: Event) => {
       const detail = (e as CustomEvent).detail;
       const { view } = detail;
+      view.addEventListener('link', (e: Event) => {
+        e.preventDefault();
+        const { detail: popupLinkDetail } = e as CustomEvent;
+        popupLinkDetail['follow'] = true;
+        footnoteHandler.handle(bookDoc, e)?.catch((err) => {
+          console.warn(err);
+          getView(bookKey)?.goTo(popupLinkDetail.href);
+        });
+      });
       footnoteViewRef.current = view;
       footnoteRef.current?.replaceChildren(view);
       const { renderer } = view;
       renderer.setAttribute('flow', 'scrolled');
       renderer.setAttribute('margin', '0px');
-      renderer.setAttribute('gap', '5%');
+      renderer.setAttribute('gap', '0%');
       const viewSettings = getViewSettings(bookKey)!;
+      const themeCode = getThemeCode();
       const popupTheme = { ...themeCode };
       const popupContainer = document.getElementById('popup-container');
       if (popupContainer) {
@@ -56,8 +74,17 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
 
     const handleRender = (e: Event) => {
       const detail = (e as CustomEvent).detail;
-      console.log('render footnote', detail);
-      setShowPopup(true);
+      // console.log('render footnote', detail);
+      const { view } = detail;
+      view.addEventListener('relocate', () => {
+        const { renderer } = view as FoliateView;
+        if (viewSettings.vertical) {
+          setResponsiveWidth(getResponsivePopupSize(renderer.viewSize, true));
+        } else {
+          setResponsiveHeight(getResponsivePopupSize(renderer.viewSize, false));
+        }
+        setShowPopup(true);
+      });
     };
 
     footnoteHandler.addEventListener('before-render', handleBeforeRender);
@@ -67,25 +94,41 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
       footnoteHandler.removeEventListener('render', handleRender);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [view, themeCode]);
+  }, [view]);
+
+  useEffect(() => {
+    if (viewSettings.vertical) {
+      setResponsiveWidth(popupHeight);
+      setResponsiveHeight(Math.max(popupWidth, window.innerHeight / 4));
+    } else {
+      setResponsiveWidth(Math.max(popupWidth, window.innerWidth / 4));
+      setResponsiveHeight(popupHeight);
+    }
+  }, [viewSettings]);
+
+  useEffect(() => {
+    if (trianglePosition && gridRect) {
+      const popupPos = getPopupPosition(
+        trianglePosition,
+        gridRect,
+        responsiveWidth,
+        responsiveHeight,
+        popupPadding,
+      );
+      setPopupPosition(popupPos);
+    }
+  }, [trianglePosition, gridRect, responsiveWidth, responsiveHeight]);
 
   const docLinkHandler = async (event: Event) => {
     const detail = (event as CustomEvent).detail;
-    console.log('doc link click', detail);
+    // console.log('doc link click', detail);
     const gridFrame = document.querySelector(`#gridcell-${bookKey}`);
     if (!gridFrame) return;
     const rect = gridFrame.getBoundingClientRect();
     const viewSettings = getViewSettings(bookKey)!;
     const triangPos = getPosition(detail.a, rect, popupPadding, viewSettings.vertical);
-    const popupPos = getPopupPosition(
-      triangPos,
-      rect,
-      viewSettings.vertical ? popupHeight : popupWidth,
-      viewSettings.vertical ? popupWidth : popupHeight,
-      popupPadding,
-    );
+    setGridRect(rect);
     setTrianglePosition(triangPos);
-    setPopupPosition(popupPos);
 
     footnoteHandler.handle(bookDoc, event)?.catch((err) => {
       console.warn(err);
@@ -102,11 +145,13 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
 
   const handleDismissPopup = () => {
     closePopup();
+    setGridRect(null);
     setPopupPosition(null);
     setTrianglePosition(null);
     setShowPopup(false);
   };
 
+  // Handle custom footnote popup event from iframe event
   const handleFootnotePopupEvent = (event: CustomEvent) => {
     const { element, footnote } = event.detail;
     const gridFrame = document.querySelector(`#gridcell-${bookKey}`);
@@ -114,21 +159,30 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
     const rect = gridFrame.getBoundingClientRect();
     const viewSettings = getViewSettings(bookKey)!;
     const triangPos = getPosition(element, rect, popupPadding, viewSettings.vertical);
-    const popupPos = getPopupPosition(
-      triangPos,
-      rect,
-      viewSettings.vertical ? popupHeight : popupWidth,
-      viewSettings.vertical ? popupWidth : popupHeight,
-      popupPadding,
-    );
     if (footnoteRef.current) {
       const elem = document.createElement('p');
       elem.textContent = footnote;
-      elem.setAttribute('style', `padding: 16px; hanging-punctuation: allow-end last;`);
+      elem.setAttribute('style', `padding: 1em; hanging-punctuation: allow-end last;`);
+      elem.style.visibility = 'hidden';
+      if (viewSettings.vertical) {
+        elem.style.height = `${responsiveHeight}px`;
+      } else {
+        elem.style.width = `${responsiveWidth}px`;
+      }
+      document.body.appendChild(elem);
+      const popupSize = elem.getBoundingClientRect();
+      if (viewSettings.vertical) {
+        setResponsiveWidth(getResponsivePopupSize(popupSize.width, true));
+      } else {
+        setResponsiveHeight(getResponsivePopupSize(popupSize.height, false));
+      }
+      document.body.removeChild(elem);
+
+      elem.style.visibility = 'visible';
       footnoteRef.current.replaceChildren(elem);
-      setShowPopup(true);
+      setGridRect(rect);
       setTrianglePosition(triangPos);
-      setPopupPosition(popupPos);
+      setShowPopup(true);
     }
   };
 
@@ -137,8 +191,10 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
   });
 
   useEffect(() => {
+    window.addEventListener('resize', handleDismissPopup);
     eventDispatcher.on('footnote-popup', handleFootnotePopupEvent);
     return () => {
+      window.removeEventListener('resize', handleDismissPopup);
       eventDispatcher.off('footnote-popup', handleFootnotePopupEvent);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -150,9 +206,6 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
     }
   }, [footnoteRef]);
 
-  const width = viewSettings.vertical ? popupHeight : popupWidth;
-  const height = viewSettings.vertical ? popupWidth : popupHeight;
-
   return (
     <div>
       {showPopup && (
@@ -163,8 +216,8 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
         />
       )}
       <Popup
-        width={width}
-        height={height}
+        width={responsiveWidth}
+        height={responsiveHeight}
         position={showPopup ? popupPosition! : undefined}
         trianglePosition={showPopup ? trianglePosition! : undefined}
         className='select-text overflow-y-auto'
@@ -173,8 +226,8 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
           className=''
           ref={footnoteRef}
           style={{
-            width: `${width}px`,
-            height: `${height}px`,
+            width: `${responsiveWidth}px`,
+            height: `${responsiveHeight}px`,
           }}
         ></div>
       </Popup>

apps/readest-app/src/app/reader/components/HeaderBar.tsx

@@ -1,12 +1,12 @@
 import clsx from 'clsx';
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { PiDotsThreeVerticalBold } from 'react-icons/pi';
 
 import { useEnv } from '@/context/EnvContext';
 import { useReaderStore } from '@/store/readerStore';
 import { useSidebarStore } from '@/store/sidebarStore';
+import { useTrafficLightStore } from '@/store/trafficLightStore';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
-import useTrafficLight from '@/hooks/useTrafficLight';
 import WindowButtons from '@/components/WindowButtons';
 import Dropdown from '@/components/Dropdown';
 import SidebarToggler from './SidebarToggler';
@@ -34,7 +34,13 @@ const HeaderBar: React.FC<HeaderBarProps> = ({
 }) => {
   const { appService } = useEnv();
   const headerRef = useRef<HTMLDivElement>(null);
-  const { isTrafficLightVisible } = useTrafficLight();
+  const {
+    isTrafficLightVisible,
+    setTrafficLightVisibility,
+    initializeTrafficLightStore,
+    initializeTrafficLightListeners,
+    cleanupTrafficLightListeners,
+  } = useTrafficLightStore();
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
   const { hoveredBookKey, setHoveredBookKey, bookKeys } = useReaderStore();
   const { isSideBarVisible } = useSidebarStore();
@@ -45,6 +51,25 @@ const HeaderBar: React.FC<HeaderBarProps> = ({
     if (!isOpen) setHoveredBookKey('');
   };
 
+  useEffect(() => {
+    if (!appService?.hasTrafficLight) return;
+
+    initializeTrafficLightStore(appService);
+    initializeTrafficLightListeners();
+    setTrafficLightVisibility(true);
+    return () => {
+      cleanupTrafficLightListeners();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (!appService?.hasTrafficLight) return;
+
+    setTrafficLightVisibility(isSideBarVisible);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isSideBarVisible]);
+
   return (
     <div
       ref={headerRef}
@@ -61,8 +86,10 @@ const HeaderBar: React.FC<HeaderBarProps> = ({
       onMouseEnter={() => setHoveredBookKey(bookKey)}
       onMouseLeave={() => setHoveredBookKey('')}
     >
-      <div className='sidebar-bookmark-toggler bg-base-100 z-20 flex h-full items-center space-x-4'>
-        <SidebarToggler bookKey={bookKey} />
+      <div className='sidebar-bookmark-toggler bg-base-100 z-20 flex h-full items-center gap-x-4'>
+        <div className='hidden sm:flex'>
+          <SidebarToggler bookKey={bookKey} />
+        </div>
         <BookmarkToggler bookKey={bookKey} />
       </div>
 

apps/readest-app/src/app/reader/components/HintInfo.tsx

@@ -1,17 +1,22 @@
 import clsx from 'clsx';
 import React, { useEffect, useRef } from 'react';
-import { useSidebarStore } from '@/store/sidebarStore';
 import { eventDispatcher } from '@/utils/event';
-import useTrafficLight from '@/hooks/useTrafficLight';
 
 interface SectionInfoProps {
   bookKey: string;
-  gapRight: string;
+  showDoubleBorder: boolean;
+  isVertical: boolean;
+  horizontalGap: number;
+  verticalMargin: number;
 }
 
-const HintInfo: React.FC<SectionInfoProps> = ({ bookKey, gapRight }) => {
-  const { isSideBarVisible } = useSidebarStore();
-  const { isTrafficLightVisible } = useTrafficLight();
+const HintInfo: React.FC<SectionInfoProps> = ({
+  bookKey,
+  showDoubleBorder,
+  isVertical,
+  horizontalGap,
+  verticalMargin,
+}) => {
   const [hintMessage, setHintMessage] = React.useState<string | null>(null);
   const hintTimeout = useRef(2000);
   const dismissTimeout = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -42,13 +47,21 @@ const HintInfo: React.FC<SectionInfoProps> = ({ bookKey, gapRight }) => {
   return (
     <div
       className={clsx(
-        'pageinfo absolute right-0 top-0 flex max-w-[50%] items-end',
-        isTrafficLightVisible && !isSideBarVisible ? 'h-[44px]' : 'h-[30px]',
-        hintMessage ? '' : '',
+        'hintinfo absolute flex items-center justify-end overflow-hidden',
+        hintMessage ? 'bg-base-100' : 'bg-transparent',
+        isVertical ? 'writing-vertical-rl max-h-[50%]' : 'top-0 h-[44px] max-w-[50%]',
       )}
-      style={{ right: gapRight }}
+      style={
+        isVertical
+          ? {
+              bottom: `${verticalMargin * 1.5}px`,
+              left: `calc(100% - ${horizontalGap}%)`,
+              width: showDoubleBorder ? '30px' : `${horizontalGap}%`,
+            }
+          : { insetInlineEnd: `${horizontalGap}%` }
+      }
     >
-      <h2 className='text-neutral-content line-clamp-1 text-center font-sans text-xs font-light'>
+      <h2 className={clsx('text-neutral-content text-center font-sans text-xs font-light')}>
         {hintMessage || ''}
       </h2>
     </div>

apps/readest-app/src/app/reader/components/PageInfo.tsx

@@ -1,32 +1,65 @@
+import clsx from 'clsx';
 import React from 'react';
+import { useEnv } from '@/context/EnvContext';
 import { useTranslation } from '@/hooks/useTranslation';
 import { PageInfo } from '@/types/book';
 
 interface PageInfoProps {
   bookFormat: string;
-  section: PageInfo | null;
-  pageinfo: PageInfo | null;
-  gapRight: string;
+  section?: PageInfo;
+  pageinfo?: PageInfo;
+  showDoubleBorder: boolean;
+  isScrolled: boolean;
+  isVertical: boolean;
+  horizontalGap: number;
+  verticalMargin: number;
 }
 
-const PageInfoView: React.FC<PageInfoProps> = ({ bookFormat, section, pageinfo, gapRight }) => {
+const PageInfoView: React.FC<PageInfoProps> = ({
+  bookFormat,
+  section,
+  pageinfo,
+  showDoubleBorder,
+  isScrolled,
+  isVertical,
+  horizontalGap,
+  verticalMargin,
+}) => {
   const _ = useTranslation();
-  const pageInfo =
-    bookFormat === 'PDF'
-      ? section
-        ? `${section.current + 1} / ${section.total}`
-        : ''
-      : pageinfo
-        ? _('Loc. {{currentPage}} / {{totalPage}}', {
-            currentPage: pageinfo.current + 1,
-            totalPage: pageinfo.total,
-          })
-        : '';
+  const { appService } = useEnv();
+  const pageInfo = ['PDF', 'CBZ'].includes(bookFormat)
+    ? section
+      ? isVertical
+        ? `${section.current + 1} · ${section.total}`
+        : `${section.current + 1} / ${section.total}`
+      : ''
+    : pageinfo
+      ? _(isVertical ? '{{currentPage}} · {{totalPage}}' : 'Loc. {{currentPage}} / {{totalPage}}', {
+          currentPage: (pageinfo.next ?? pageinfo.current) + 1,
+          totalPage: pageinfo.total,
+        })
+      : '';
 
   return (
     <div
-      className='pageinfo absolute bottom-0 left-0 right-0 flex h-12 items-center justify-end'
-      style={{ paddingRight: gapRight }}
+      className={clsx(
+        'pageinfo absolute bottom-0 flex items-center justify-end',
+        isVertical ? 'writing-vertical-rl' : 'h-12 w-full',
+        isScrolled && 'bg-base-100',
+      )}
+      style={
+        isVertical
+          ? {
+              bottom: `${verticalMargin * 1.5}px`,
+              left: showDoubleBorder ? `calc(${horizontalGap}% - 32px)` : 0,
+              width: showDoubleBorder ? '32px' : `${horizontalGap}%`,
+              height: `calc(100% - ${verticalMargin * 2}px)`,
+            }
+          : {
+              insetInlineEnd: `${horizontalGap}%`,
+              paddingBottom: appService?.hasSafeAreaInset ? 'env(safe-area-inset-bottom)' : 0,
+            }
+      }
     >
       <h2 className='text-neutral-content text-right font-sans text-xs font-extralight'>
         {pageInfo}

apps/readest-app/src/app/reader/components/Reader.tsx

@@ -6,6 +6,7 @@ import { useEffect, Suspense, useRef } from 'react';
 
 import { useEnv } from '@/context/EnvContext';
 import { useTheme } from '@/hooks/useTheme';
+import { useThemeStore } from '@/store/themeStore';
 import { useLibraryStore } from '@/store/libraryStore';
 import { useSettingsStore } from '@/store/settingsStore';
 import { useScreenWakeLock } from '@/hooks/useScreenWakeLock';
@@ -16,10 +17,11 @@ import ReaderContent from './ReaderContent';
 const Reader: React.FC<{ ids?: string }> = ({ ids }) => {
   const { envConfig, appService } = useEnv();
   const { settings, setSettings } = useSettingsStore();
-  const { library, setLibrary } = useLibraryStore();
+  const { getVisibleLibrary, setLibrary } = useLibraryStore();
   const isInitiating = useRef(false);
 
-  const { updateAppTheme } = useTheme();
+  const { updateAppTheme } = useThemeStore();
+  useTheme();
   useScreenWakeLock(settings.screenWakeLock);
 
   useEffect(() => {
@@ -38,7 +40,7 @@ const Reader: React.FC<{ ids?: string }> = ({ ids }) => {
   }, []);
 
   return (
-    library.length > 0 &&
+    getVisibleLibrary().length > 0 &&
     settings.globalReadSettings && (
       <div
         className={clsx(

apps/readest-app/src/app/reader/components/SectionInfo.tsx

@@ -1,26 +1,47 @@
 import clsx from 'clsx';
 import React from 'react';
 
-import { useSidebarStore } from '@/store/sidebarStore';
-import useTrafficLight from '@/hooks/useTrafficLight';
-
 interface SectionInfoProps {
   section?: string;
-  gapLeft: string;
+  showDoubleBorder: boolean;
+  isScrolled: boolean;
+  isVertical: boolean;
+  horizontalGap: number;
+  verticalMargin: number;
 }
 
-const SectionInfo: React.FC<SectionInfoProps> = ({ section, gapLeft }) => {
-  const { isSideBarVisible } = useSidebarStore();
-  const { isTrafficLightVisible } = useTrafficLight();
+const SectionInfo: React.FC<SectionInfoProps> = ({
+  section,
+  showDoubleBorder,
+  isScrolled,
+  isVertical,
+  horizontalGap,
+  verticalMargin,
+}) => {
   return (
     <div
       className={clsx(
-        'pageinfo absolute right-0 top-0 flex max-w-[50%] items-end',
-        isTrafficLightVisible && !isSideBarVisible ? 'h-[44px]' : 'h-[30px]',
+        'sectioninfo absolute flex items-center overflow-hidden',
+        isVertical ? 'writing-vertical-rl max-h-[85%]' : 'top-0 h-[44px]',
+        isScrolled && 'bg-base-100',
       )}
-      style={{ left: gapLeft }}
+      style={
+        isVertical
+          ? {
+              top: `${verticalMargin * 1.5}px`,
+              left: `calc(100% - ${horizontalGap}%)`,
+              width: showDoubleBorder ? '32px' : `${horizontalGap}%`,
+              height: `calc(100% - ${verticalMargin * 2}px)`,
+            }
+          : { insetInlineStart: `${horizontalGap}%`, width: `calc(100% - ${horizontalGap * 2}%)` }
+      }
     >
-      <h2 className='text-neutral-content line-clamp-1 text-center font-sans text-xs font-light'>
+      <h2
+        className={clsx(
+          'text-neutral-content text-center font-sans text-xs font-light',
+          isVertical ? '' : 'line-clamp-1',
+        )}
+      >
         {section || ''}
       </h2>
     </div>

apps/readest-app/src/app/reader/components/ViewMenu.tsx

@@ -5,17 +5,16 @@ import { BiMoon, BiSun } from 'react-icons/bi';
 import { TbSunMoon } from 'react-icons/tb';
 import { MdZoomOut, MdZoomIn, MdCheck } from 'react-icons/md';
 
-import {
-  MAX_ZOOM_LEVEL,
-  MIN_ZOOM_LEVEL,
-  ONE_COLUMN_MAX_INLINE_SIZE,
-  ZOOM_STEP,
-} from '@/services/constants';
-import MenuItem from '@/components/MenuItem';
+import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL, ZOOM_STEP } from '@/services/constants';
+import { useEnv } from '@/context/EnvContext';
+import { useThemeStore } from '@/store/themeStore';
 import { useReaderStore } from '@/store/readerStore';
 import { useTranslation } from '@/hooks/useTranslation';
-import { useTheme, ThemeMode } from '@/hooks/useTheme';
+import { ThemeMode } from '@/styles/themes';
 import { getStyles } from '@/utils/style';
+import { getMaxInlineSize } from '@/utils/config';
+import { tauriHandleToggleFullScreen } from '@/utils/window';
+import MenuItem from '@/components/MenuItem';
 
 interface ViewMenuProps {
   bookKey: string;
@@ -29,19 +28,18 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
   onSetSettingsDialogOpen,
 }) => {
   const _ = useTranslation();
+  const { appService } = useEnv();
   const { getView, getViews, getViewSettings, setViewSettings } = useReaderStore();
   const viewSettings = getViewSettings(bookKey)!;
 
-  const { themeMode, isDarkMode, themeCode, updateThemeMode } = useTheme();
+  const { themeMode, themeCode, setThemeMode } = useThemeStore();
   const [isScrolledMode, setScrolledMode] = useState(viewSettings!.scrolled);
-  const [isInvertedColors, setInvertedColors] = useState(viewSettings!.invert);
   const [zoomLevel, setZoomLevel] = useState(viewSettings!.zoomLevel!);
 
   const zoomIn = () => setZoomLevel((prev) => Math.min(prev + ZOOM_STEP, MAX_ZOOM_LEVEL));
   const zoomOut = () => setZoomLevel((prev) => Math.max(prev - ZOOM_STEP, MIN_ZOOM_LEVEL));
   const resetZoom = () => setZoomLevel(100);
   const toggleScrolledMode = () => setScrolledMode(!isScrolledMode);
-  const toggleInvertedColors = () => setInvertedColors(!isInvertedColors);
 
   const openFontLayoutMenu = () => {
     setIsDropdownOpen?.(false);
@@ -51,40 +49,39 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
   const cycleThemeMode = () => {
     const nextMode: ThemeMode =
       themeMode === 'auto' ? 'light' : themeMode === 'light' ? 'dark' : 'auto';
-    updateThemeMode(nextMode);
+    setThemeMode(nextMode);
+  };
+
+  const handleFullScreen = () => {
+    tauriHandleToggleFullScreen();
+    setIsDropdownOpen?.(false);
   };
 
   useEffect(() => {
     getViews().forEach((view) => {
-      view.renderer.setStyles?.(getStyles(viewSettings!, themeCode));
+      view.renderer.setStyles?.(getStyles(viewSettings!));
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [themeCode]);
 
   useEffect(() => {
+    viewSettings!.scrolled = isScrolledMode;
     getView(bookKey)?.renderer.setAttribute('flow', isScrolledMode ? 'scrolled' : 'paginated');
     getView(bookKey)?.renderer.setAttribute(
       'max-inline-size',
-      `${viewSettings.maxColumnCount === 1 || isScrolledMode ? ONE_COLUMN_MAX_INLINE_SIZE : viewSettings.maxInlineSize}px`,
+      `${getMaxInlineSize(viewSettings)}px`,
     );
-    getView(bookKey)?.renderer.setStyles?.(getStyles(viewSettings!, themeCode));
-    viewSettings!.scrolled = isScrolledMode;
+    getView(bookKey)?.renderer.setStyles?.(getStyles(viewSettings!));
     setViewSettings(bookKey, viewSettings!);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isScrolledMode]);
 
-  useEffect(() => {
-    document.body.classList.toggle('invert', isInvertedColors);
-    getView(bookKey)?.renderer.setStyles?.(getStyles(viewSettings!, themeCode));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isInvertedColors]);
-
   useEffect(() => {
     const view = getView(bookKey);
     if (!view) return;
     viewSettings!.zoomLevel = zoomLevel;
     setViewSettings(bookKey, viewSettings!);
-    view.renderer.setStyles?.(getStyles(viewSettings!, themeCode));
+    view.renderer.setStyles?.(getStyles(viewSettings!));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [zoomLevel]);
 
@@ -135,6 +132,9 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
 
       <hr className='border-base-300 my-1' />
 
+      {appService?.hasRoundedWindow && (
+        <MenuItem label={_('Fullscreen')} onClick={handleFullScreen} />
+      )}
       <MenuItem
         label={
           themeMode === 'dark'
@@ -146,12 +146,6 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
         icon={themeMode === 'dark' ? <BiMoon /> : themeMode === 'light' ? <BiSun /> : <TbSunMoon />}
         onClick={cycleThemeMode}
       />
-      <MenuItem
-        label={_('Invert Colors in Dark Mode')}
-        icon={isInvertedColors ? <MdCheck className='text-base-content' /> : undefined}
-        onClick={toggleInvertedColors}
-        disabled={!isDarkMode}
-      />
     </div>
   );
 };

apps/readest-app/src/app/reader/components/annotator/AnnotationPopup.tsx

@@ -7,6 +7,7 @@ import { HighlightColor, HighlightStyle } from '@/types/book';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 
 interface AnnotationPopupProps {
+  dir: 'ltr' | 'rtl';
   buttons: Array<{ tooltipText: string; Icon: React.ElementType; onClick: () => void }>;
   position: Position;
   trianglePosition: Position;
@@ -22,6 +23,7 @@ const OPTIONS_HEIGHT_PIX = 28;
 const OPTIONS_PADDING_PIX = 16;
 
 const AnnotationPopup: React.FC<AnnotationPopupProps> = ({
+  dir,
   buttons,
   position,
   trianglePosition,
@@ -35,7 +37,7 @@ const AnnotationPopup: React.FC<AnnotationPopupProps> = ({
   const highlightOptionsHeightPx = useResponsiveSize(OPTIONS_HEIGHT_PIX);
   const highlightOptionsPaddingPx = useResponsiveSize(OPTIONS_PADDING_PIX);
   return (
-    <div>
+    <div dir={dir}>
       <Popup
         width={popupWidth}
         height={popupHeight}

apps/readest-app/src/app/reader/components/annotator/Annotator.tsx

@@ -12,7 +12,7 @@ import { FaHeadphones } from 'react-icons/fa6';
 import * as CFI from 'foliate-js/epubcfi.js';
 import { Overlayer } from 'foliate-js/overlayer.js';
 import { useEnv } from '@/context/EnvContext';
-import { BookNote, HighlightColor, HighlightStyle } from '@/types/book';
+import { BookNote, BooknoteGroup, HighlightColor, HighlightStyle } from '@/types/book';
 import { getOSPlatform, uniqueId } from '@/utils/misc';
 import { useBookDataStore } from '@/store/bookDataStore';
 import { useSettingsStore } from '@/store/settingsStore';
@@ -24,6 +24,7 @@ import { useFoliateEvents } from '../../hooks/useFoliateEvents';
 import { useNotesSync } from '../../hooks/useNotesSync';
 import { getPopupPosition, getPosition, Position, TextSelection } from '@/utils/sel';
 import { eventDispatcher } from '@/utils/event';
+import { findTocItemBS } from '@/utils/toc';
 import { HIGHLIGHT_COLOR_HEX } from '@/services/constants';
 import AnnotationPopup from './AnnotationPopup';
 import WiktionaryPopup from './WiktionaryPopup';
@@ -76,9 +77,9 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const dictPopupHeight = Math.min(300, maxHeight);
   const transPopupWidth = Math.min(480, maxWidth);
   const transPopupHeight = Math.min(360, maxHeight);
-  const annotPopupWidth = useResponsiveSize(280);
+  const annotPopupWidth = useResponsiveSize(300);
   const annotPopupHeight = useResponsiveSize(44);
-  const androidSelectionHandlerHeight = 8;
+  const androidSelectionHandlerHeight = 0;
 
   const onLoad = (event: Event) => {
     const detail = (event as CustomEvent).detail;
@@ -240,8 +241,10 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     };
 
     eventDispatcher.onSync('iframe-single-click', handleSingleClick);
+    eventDispatcher.on('export-annotations', handleExportMarkdown);
     return () => {
       eventDispatcher.offSync('iframe-single-click', handleSingleClick);
+      eventDispatcher.off('export-annotations', handleExportMarkdown);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -438,6 +441,90 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     eventDispatcher.dispatch('tts-speak', { bookKey, range: selection.range });
   };
 
+  const handleExportMarkdown = (event: CustomEvent) => {
+    const { bookKey: exportBookKey } = event.detail;
+    if (bookKey !== exportBookKey) return;
+
+    const { bookDoc, book } = bookData;
+    if (!bookDoc || !book || !bookDoc.toc) return;
+
+    const { booknotes: allNotes = [] } = config;
+    const booknotes = allNotes.filter((note) => !note.deletedAt);
+    if (booknotes.length === 0) {
+      eventDispatcher.dispatch('toast', {
+        type: 'info',
+        message: _('No annotations to export'),
+        className: 'whitespace-nowrap',
+        timeout: 2000,
+      });
+      return;
+    }
+    const booknoteGroups: { [href: string]: BooknoteGroup } = {};
+    for (const booknote of booknotes) {
+      const tocItem = findTocItemBS(bookDoc.toc ?? [], booknote.cfi);
+      const href = tocItem?.href || '';
+      const label = tocItem?.label || '';
+      const id = tocItem?.id || 0;
+      if (!booknoteGroups[href]) {
+        booknoteGroups[href] = { id, href, label, booknotes: [] };
+      }
+      booknoteGroups[href].booknotes.push(booknote);
+    }
+
+    Object.values(booknoteGroups).forEach((group) => {
+      group.booknotes.sort((a, b) => {
+        return CFI.compare(a.cfi, b.cfi);
+      });
+    });
+
+    const sortedGroups = Object.values(booknoteGroups).sort((a, b) => {
+      return a.id - b.id;
+    });
+
+    const lines: string[] = [];
+    lines.push(`# ${book.title}`);
+    lines.push(`**${_('Author')}**: ${book.author || ''}`);
+    lines.push('');
+    lines.push(`**${_('Exported from Readest')}**: ${new Date().toISOString().slice(0, 10)}`);
+    lines.push('');
+    lines.push('---');
+    lines.push('');
+    lines.push(`## ${_('Highlights & Annotations')}`);
+    lines.push('');
+
+    for (const group of sortedGroups) {
+      const chapterTitle = group.label || _('Untitled');
+      lines.push(`### ${chapterTitle}`);
+      for (const note of group.booknotes) {
+        lines.push(`> "${note.text}"`);
+        if (note.note) {
+          lines.push(`**${_('Note')}**:: ${note.note}`);
+        }
+        lines.push('');
+      }
+      lines.push('---');
+      lines.push('');
+    }
+
+    const markdownContent = lines.join('\n');
+
+    navigator.clipboard?.writeText(markdownContent);
+    eventDispatcher.dispatch('toast', {
+      type: 'info',
+      message: _('Copied to clipboard'),
+      className: 'whitespace-nowrap',
+      timeout: 2000,
+    });
+    if (appService?.isMobile) return;
+    const blob = new Blob([markdownContent], { type: 'text/markdown;charset=utf-8' });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = `${book.title.replace(/\s+/g, '_')}.md`;
+    a.click();
+    URL.revokeObjectURL(url);
+  };
+
   const selectionAnnotated = selection?.annotated;
   const buttons = [
     { tooltipText: _('Copy'), Icon: FiCopy, onClick: handleCopy },
@@ -487,6 +574,7 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
       )}
       {showAnnotPopup && trianglePosition && annotPopupPosition && (
         <AnnotationPopup
+          dir={viewSettings.rtl ? 'rtl' : 'ltr'}
           buttons={buttons}
           position={annotPopupPosition}
           trianglePosition={trianglePosition}

apps/readest-app/src/app/reader/components/annotator/DeepLPopup.tsx

@@ -165,13 +165,7 @@ const DeepLPopup: React.FC<DeepLPopupProps> = ({
           ) : (
             <div>
               <p className='text-base'>{translation || 'No translation available.'}</p>
-              <div className='pt-4 text-sm opacity-60'>
-                Translated by{' '}
-                <a href='https://www.deepl.com/' target='_blank' rel='noopener noreferrer'>
-                  DeepL
-                </a>
-                .
-              </div>
+              <div className='pt-4 text-sm opacity-60'>Translated by DeepL.</div>
             </div>
           )}
         </div>

apps/readest-app/src/app/reader/components/annotator/WikipediaPopup.tsx

@@ -114,11 +114,7 @@ const WikipediaPopup: React.FC<WikipediaPopupProps> = ({
           <main className='flex-grow overflow-y-auto px-2 font-sans'></main>
           <footer className='mt-auto hidden data-[state=loaded]:block data-[state=error]:hidden data-[state=loading]:hidden'>
             <div className='flex items-center px-4 py-2 text-sm opacity-60'>
-              From <a id='link'>Wikipedia</a>, released under the{' '}
-              <a href='https://en.wikipedia.org/wiki/Wikipedia:Text_of_the_Creative_Commons_Attribution-ShareAlike_4.0_International_License'>
-                CC BY-SA License
-              </a>
-              .
+              Source: Wikipedia (CC BY-SA)
             </div>
           </footer>
         </div>

apps/readest-app/src/app/reader/components/annotator/WiktionaryPopup.tsx

@@ -169,8 +169,7 @@ const WiktionaryPopup: React.FC<WiktionaryPopupProps> = ({
           <main className='flex-grow overflow-y-auto p-4 font-sans' />
           <footer className='mt-auto hidden data-[state=loaded]:block data-[state=error]:hidden data-[state=loading]:hidden'>
             <div className='flex items-center px-4 py-2 text-sm opacity-60'>
-              From <a id='link'>Wiktionary</a>, released under the{' '}
-              <a href='https://creativecommons.org/licenses/by-sa/4.0/'>CC BY-SA License</a>.
+              Source: Wiktionary (CC BY-SA)
             </div>
           </footer>
         </div>

apps/readest-app/src/app/reader/components/notebook/Header.tsx

@@ -15,10 +15,10 @@ const NotebookHeader: React.FC<{
   const _ = useTranslation();
   const iconSize14 = useResponsiveSize(14);
   return (
-    <div className='notebook-header relative flex h-11 items-center px-3'>
+    <div className='notebook-header relative flex h-11 items-center px-3' dir='ltr'>
       <div className='absolute inset-0 flex items-center justify-center space-x-2'>
         <LuNotebookPen />
-        <div className='notebook-title text-sm font-medium'>{_('Notebook')}</div>
+        <div className='notebook-title hidden text-sm font-medium sm:flex'>{_('Notebook')}</div>
       </div>
       <div className='z-10 flex items-center gap-x-4'>
         <button

apps/readest-app/src/app/reader/components/notebook/NoteEditor.tsx

@@ -114,6 +114,7 @@ const NoteEditor: React.FC<NoteEditorProps> = ({ onSave, onEdit }) => {
               'inset-0 w-full rounded-none border-0 bg-transparent p-0',
               'content font-size-sm',
             )}
+            dir='auto'
             ref={editorRef}
             value={note}
             rows={1}
@@ -130,7 +131,7 @@ const NoteEditor: React.FC<NoteEditorProps> = ({ onSave, onEdit }) => {
           <span className='content font-size-xs inline text-gray-500'>{getAnnotationText()}</span>
         </div>
       </div>
-      <div className='flex justify-end p-2'>
+      <div className='flex justify-end p-2' dir='ltr'>
         <button
           className={clsx(
             'content btn btn-ghost font-size-sm hover:bg-transparent',

apps/readest-app/src/app/reader/components/notebook/Notebook.tsx

@@ -7,13 +7,14 @@ import { useReaderStore } from '@/store/readerStore';
 import { useSidebarStore } from '@/store/sidebarStore';
 import { useNotebookStore } from '@/store/notebookStore';
 import { useTranslation } from '@/hooks/useTranslation';
-import { useTheme } from '@/hooks/useTheme';
+import { useThemeStore } from '@/store/themeStore';
 import { useEnv } from '@/context/EnvContext';
 import { useDrag } from '@/hooks/useDrag';
 import { TextSelection } from '@/utils/sel';
 import { BookNote } from '@/types/book';
 import { uniqueId } from '@/utils/misc';
 import { eventDispatcher } from '@/utils/event';
+import { getBookDirFromLanguage } from '@/utils/book';
 import BooknoteItem from '../sidebar/BooknoteItem';
 import NotebookHeader from './Header';
 import NoteEditor from './NoteEditor';
@@ -23,14 +24,14 @@ const MAX_NOTEBOOK_WIDTH = 0.45;
 
 const Notebook: React.FC = ({}) => {
   const _ = useTranslation();
-  const { updateAppTheme } = useTheme();
+  const { updateAppTheme } = useThemeStore();
   const { envConfig, appService } = useEnv();
   const { settings } = useSettingsStore();
   const { sideBarBookKey } = useSidebarStore();
   const { notebookWidth, isNotebookVisible, isNotebookPinned } = useNotebookStore();
   const { notebookNewAnnotation, notebookEditAnnotation, setNotebookPin } = useNotebookStore();
-  const { getConfig, saveConfig, updateBooknotes } = useBookDataStore();
-  const { getView } = useReaderStore();
+  const { getBookData, getConfig, saveConfig, updateBooknotes } = useBookDataStore();
+  const { getView, getViewSettings } = useReaderStore();
   const { setNotebookWidth, setNotebookVisible, toggleNotebookPin } = useNotebookStore();
   const { setNotebookNewAnnotation, setNotebookEditAnnotation } = useNotebookStore();
 
@@ -136,6 +137,14 @@ const Notebook: React.FC = ({}) => {
 
   if (!sideBarBookKey) return null;
 
+  const bookData = getBookData(sideBarBookKey);
+  const viewSettings = getViewSettings(sideBarBookKey);
+  if (!bookData || !bookData.bookDoc) {
+    return null;
+  }
+  const { bookDoc } = bookData;
+  const languageDir = getBookDirFromLanguage(bookDoc.metadata.language);
+
   const config = getConfig(sideBarBookKey);
   const { booknotes: allNotes = [] } = config || {};
   const annotationNotes = allNotes
@@ -159,6 +168,7 @@ const Notebook: React.FC = ({}) => {
           appService?.hasRoundedWindow && 'rounded-window-top-right rounded-window-bottom-right',
           !isNotebookPinned && 'shadow-2xl',
         )}
+        dir={viewSettings?.rtl && languageDir === 'rtl' ? 'rtl' : 'ltr'}
         style={{
           width: `${notebookWidth}`,
           maxWidth: `${MAX_NOTEBOOK_WIDTH * 100}%`,
@@ -183,7 +193,7 @@ const Notebook: React.FC = ({}) => {
           handleTogglePin={handleTogglePin}
         />
         <div className='max-h-[calc(100vh-44px)] overflow-y-auto px-3'>
-          <div>
+          <div dir='ltr'>
             {excerptNotes.length > 0 && (
               <p className='content font-size-base pt-1'>{_('Excerpts')}</p>
             )}
@@ -196,7 +206,7 @@ const Notebook: React.FC = ({}) => {
                   className='collapse-arrow border-base-300 bg-base-100 collapse border'
                 >
                   <div
-                    className='collapse-title font-size-sm h-9 min-h-9 p-2 pr-8 font-medium'
+                    className='collapse-title font-size-sm h-9 min-h-9 p-2 pe-8 font-medium'
                     style={
                       {
                         '--top-override': '1.2rem',
@@ -208,7 +218,7 @@ const Notebook: React.FC = ({}) => {
                   </div>
                   <div className='collapse-content font-size-xs select-text px-3 pb-0'>
                     <p className='hyphens-auto text-justify'>{item.text}</p>
-                    <div className='flex justify-end'>
+                    <div className='flex justify-end' dir='ltr'>
                       <div
                         className='font-size-xs cursor-pointer align-bottom text-red-500 hover:text-red-600'
                         onClick={handleEditNote.bind(null, item, true)}
@@ -221,7 +231,7 @@ const Notebook: React.FC = ({}) => {
               </li>
             ))}
           </ul>
-          <div>
+          <div dir='ltr'>
             {(notebookNewAnnotation || annotationNotes.length > 0) && (
               <p className='content font-size-base pt-1'>{_('Notes')}</p>
             )}

apps/readest-app/src/app/reader/components/settings/ColorInput.tsx

@@ -0,0 +1,66 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { SketchPicker, ColorResult } from 'react-color';
+
+type ColorInputProps = {
+  label: string;
+  value: string;
+  onChange: (value: string) => void;
+};
+
+const ColorInput: React.FC<ColorInputProps> = ({ label, value, onChange }) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const pickerRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    function handleClickOutside(event: MouseEvent) {
+      if (pickerRef.current && !pickerRef.current.contains(event.target as Node)) {
+        setIsOpen(false);
+      }
+    }
+    if (isOpen) {
+      document.addEventListener('mousedown', handleClickOutside);
+    } else {
+      document.removeEventListener('mousedown', handleClickOutside);
+    }
+    return () => document.removeEventListener('mousedown', handleClickOutside);
+  }, [isOpen]);
+
+  const handlePickerChange = (colorResult: ColorResult) => {
+    onChange(colorResult.hex);
+  };
+
+  return (
+    <div className='mb-3'>
+      <label className='mb-1 block text-sm font-medium'>{label}</label>
+      <div className='flex items-center'>
+        <div
+          className='border-base-200 relative mr-2 flex h-7 w-8 cursor-pointer items-center justify-center overflow-hidden rounded border'
+          style={{ backgroundColor: value }}
+          onClick={() => setIsOpen(!isOpen)}
+        />
+
+        <input
+          type='text'
+          value={value}
+          onChange={(e) => onChange(e.target.value)}
+          className='bg-base-100 text-base-content border-base-200 min-w-4 max-w-36 flex-1 rounded border p-1 font-mono text-sm'
+        />
+      </div>
+
+      {isOpen && (
+        <div ref={pickerRef} className='relative z-50 mt-2'>
+          <div className='absolute'>
+            <SketchPicker
+              width='100%'
+              color={value}
+              onChange={handlePickerChange}
+              disableAlpha={true}
+            />
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default ColorInput;

apps/readest-app/src/app/reader/components/settings/ColorPanel.tsx

@@ -1,96 +1,183 @@
-import React, { useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import { MdOutlineLightMode, MdOutlineDarkMode } from 'react-icons/md';
 import { MdRadioButtonUnchecked, MdRadioButtonChecked } from 'react-icons/md';
+import { CgColorPicker } from 'react-icons/cg';
 import { TbSunMoon } from 'react-icons/tb';
-
-import { useTheme } from '@/hooks/useTheme';
-import { themes } from '@/styles/themes';
+import { PiPlus } from 'react-icons/pi';
+import {
+  applyCustomTheme,
+  CustomTheme,
+  generateDarkPalette,
+  generateLightPalette,
+  Theme,
+  themes,
+} from '@/styles/themes';
 import { getStyles } from '@/utils/style';
+import { useEnv } from '@/context/EnvContext';
+import { useSettingsStore } from '@/store/settingsStore';
+import { useThemeStore } from '@/store/themeStore';
 import { useReaderStore } from '@/store/readerStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
+import ThemeEditor from './ThemeEditor';
 
 const ColorPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const _ = useTranslation();
-  const { themeMode, themeColor, themeCode, isDarkMode, updateThemeMode, updateThemeColor } =
-    useTheme();
+  const {
+    themeMode,
+    themeColor,
+    themeCode,
+    isDarkMode,
+    setThemeMode,
+    setThemeColor,
+    saveCustomTheme,
+  } = useThemeStore();
+  const { envConfig } = useEnv();
+  const { settings, setSettings } = useSettingsStore();
   const { getViews, getViewSettings } = useReaderStore();
   const viewSettings = getViewSettings(bookKey)!;
+  const iconSize16 = useResponsiveSize(16);
   const iconSize24 = useResponsiveSize(24);
+  const [editTheme, setEditTheme] = useState<CustomTheme | null>(null);
+  const [customThems, setCustomThemes] = useState<Theme[]>([]);
+  const [showCustomThemeEditor, setShowCustomThemeEditor] = useState(false);
 
   useEffect(() => {
     getViews().forEach((view) => {
-      view.renderer.setStyles?.(getStyles(viewSettings!, themeCode));
+      view.renderer.setStyles?.(getStyles(viewSettings));
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [themeCode]);
 
+  useEffect(() => {
+    const customThemes = settings.globalReadSettings.customThemes ?? [];
+    setCustomThemes(
+      customThemes.map((customTheme) => ({
+        name: customTheme.name,
+        label: customTheme.label,
+        colors: {
+          light: generateLightPalette(customTheme.colors.light),
+          dark: generateDarkPalette(customTheme.colors.dark),
+        },
+        isCustomizale: true,
+      })),
+    );
+  }, [settings]);
+
+  const handleSaveCustomTheme = (customTheme: CustomTheme) => {
+    applyCustomTheme(customTheme);
+    saveCustomTheme(envConfig, settings, customTheme);
+
+    setSettings({ ...settings });
+    setThemeColor(customTheme.name);
+    setShowCustomThemeEditor(false);
+  };
+
+  const handleDeleteCustomTheme = (customTheme: CustomTheme) => {
+    saveCustomTheme(envConfig, settings, customTheme, true);
+
+    setSettings({ ...settings });
+    setThemeColor('default');
+    setShowCustomThemeEditor(false);
+  };
+
+  const handleEditTheme = (name: string) => {
+    const customTheme = settings.globalReadSettings.customThemes.find((t) => t.name === name);
+    if (customTheme) {
+      setEditTheme(customTheme);
+      setShowCustomThemeEditor(true);
+    }
+  };
+
   return (
     <div className='my-4 w-full space-y-6'>
-      <div className='flex items-center justify-between'>
-        <h2 className='font-medium'>{_('Theme Mode')}</h2>
-        <div className='flex gap-2'>
-          <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Auto Mode')}>
-            <button
-              className={`btn btn-ghost btn-circle ${themeMode === 'auto' ? 'btn-active bg-base-300' : ''}`}
-              onClick={() => updateThemeMode('auto')}
-            >
-              <TbSunMoon />
-            </button>
+      {showCustomThemeEditor ? (
+        <ThemeEditor
+          customTheme={editTheme}
+          onSave={handleSaveCustomTheme}
+          onDelete={handleDeleteCustomTheme}
+          onCancel={() => setShowCustomThemeEditor(false)}
+        />
+      ) : (
+        <>
+          <div className='flex items-center justify-between'>
+            <h2 className='font-medium'>{_('Theme Mode')}</h2>
+            <div className='flex gap-4'>
+              <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Auto Mode')}>
+                <button
+                  className={`btn btn-ghost btn-circle btn-sm ${themeMode === 'auto' ? 'btn-active bg-base-300' : ''}`}
+                  onClick={() => setThemeMode('auto')}
+                >
+                  <TbSunMoon />
+                </button>
+              </div>
+              <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Light Mode')}>
+                <button
+                  className={`btn btn-ghost btn-circle btn-sm ${themeMode === 'light' ? 'btn-active bg-base-300' : ''}`}
+                  onClick={() => setThemeMode('light')}
+                >
+                  <MdOutlineLightMode />
+                </button>
+              </div>
+              <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Dark Mode')}>
+                <button
+                  className={`btn btn-ghost btn-circle btn-sm ${themeMode === 'dark' ? 'btn-active bg-base-300' : ''}`}
+                  onClick={() => setThemeMode('dark')}
+                >
+                  <MdOutlineDarkMode />
+                </button>
+              </div>
+            </div>
           </div>
 
-          <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Light Mode')}>
-            <button
-              className={`btn btn-ghost btn-circle ${themeMode === 'light' ? 'btn-active bg-base-300' : ''}`}
-              onClick={() => updateThemeMode('light')}
-            >
-              <MdOutlineLightMode />
-            </button>
+          <div>
+            <h2 className='mb-2 font-medium'>{_('Theme Color')}</h2>
+            <div className='grid grid-cols-3 gap-4'>
+              {themes.concat(customThems).map(({ name, label, colors, isCustomizale }) => (
+                <label
+                  key={name}
+                  className={`relative flex cursor-pointer flex-col items-center justify-center rounded-lg p-4 shadow-md ${
+                    themeColor === name ? 'ring-2 ring-indigo-500 ring-offset-2' : ''
+                  }`}
+                  style={{
+                    backgroundColor: isDarkMode
+                      ? colors.dark['base-100']
+                      : colors.light['base-100'],
+                    color: isDarkMode ? colors.dark['base-content'] : colors.light['base-content'],
+                  }}
+                >
+                  <input
+                    type='radio'
+                    name='theme'
+                    value={name}
+                    checked={themeColor === name}
+                    onChange={() => setThemeColor(name)}
+                    className='hidden'
+                  />
+                  {themeColor === name ? (
+                    <MdRadioButtonChecked size={iconSize24} />
+                  ) : (
+                    <MdRadioButtonUnchecked size={iconSize24} />
+                  )}
+                  <span>{_(label)}</span>
+                  {isCustomizale && themeColor === name && (
+                    <button onClick={() => handleEditTheme(name)}>
+                      <CgColorPicker size={iconSize16} className='absolute right-2 top-2' />
+                    </button>
+                  )}
+                </label>
+              ))}
+              <label
+                className={`relative flex cursor-pointer flex-col items-center justify-center rounded-lg border border-dashed p-4 shadow-md`}
+                onClick={() => setShowCustomThemeEditor(true)}
+              >
+                <PiPlus size={iconSize24} />
+                <span>{_('Custom')}</span>
+              </label>
+            </div>
           </div>
-
-          <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Dark Mode')}>
-            <button
-              className={`btn btn-ghost btn-circle ${themeMode === 'dark' ? 'btn-active bg-base-300' : ''}`}
-              onClick={() => updateThemeMode('dark')}
-            >
-              <MdOutlineDarkMode />
-            </button>
-          </div>
-        </div>
-      </div>
-
-      <div>
-        <h2 className='mb-2 font-medium'>{_('Theme Color')}</h2>
-        <div className='grid grid-cols-3 gap-4'>
-          {themes.map(({ name, label, colors }) => (
-            <label
-              key={name}
-              className={`relative flex cursor-pointer flex-col items-center justify-center rounded-lg p-4 shadow-md ${
-                themeColor === name ? 'ring-2 ring-indigo-500 ring-offset-2' : ''
-              }`}
-              style={{
-                backgroundColor: isDarkMode ? colors.dark['base-100'] : colors.light['base-100'],
-                color: isDarkMode ? colors.dark['base-content'] : colors.light['base-content'],
-              }}
-            >
-              <input
-                type='radio'
-                name='theme'
-                value={name}
-                checked={themeColor === name}
-                onChange={() => updateThemeColor(name)}
-                className='hidden'
-              />
-              {themeColor === name ? (
-                <MdRadioButtonChecked size={iconSize24} />
-              ) : (
-                <MdRadioButtonUnchecked size={iconSize24} />
-              )}
-              <span>{_(label)}</span>
-            </label>
-          ))}
-        </div>
-      </div>
+        </>
+      )}
     </div>
   );
 };

apps/readest-app/src/app/reader/components/settings/DropDown.tsx

@@ -0,0 +1,49 @@
+import clsx from 'clsx';
+import React from 'react';
+import { FiChevronDown } from 'react-icons/fi';
+import { MdCheck } from 'react-icons/md';
+import { useDefaultIconSize, useResponsiveSize } from '@/hooks/useResponsiveSize';
+
+interface DropDownProps {
+  selected: { option: string; label: string };
+  options: { option: string; label: string }[];
+  onSelect: (option: string) => void;
+}
+
+const DropDown: React.FC<DropDownProps> = ({ selected, options, onSelect }) => {
+  const iconSize16 = useResponsiveSize(16);
+  const defaultIconSize = useDefaultIconSize();
+
+  return (
+    <div className='dropdown dropdown-bottom'>
+      <button
+        tabIndex={0}
+        className='btn btn-sm flex items-center gap-1 px-[20px] font-normal normal-case'
+        onClick={(e) => e.currentTarget.focus()}
+      >
+        <span>{selected.label}</span>
+        <FiChevronDown size={iconSize16} />
+      </button>
+      <ul
+        tabIndex={0}
+        className={clsx(
+          'dropdown-content bgcolor-base-200 no-triangle menu rounded-box absolute z-[1] shadow',
+          'menu-vertical right-[-32px] mt-2 inline max-h-80 w-44 overflow-y-scroll sm:right-0',
+        )}
+      >
+        {options.map(({ option, label }) => (
+          <li key={option} onClick={() => onSelect(option)}>
+            <div className='flex items-center px-0'>
+              <span style={{ minWidth: `${defaultIconSize}px` }}>
+                {selected.option === option && <MdCheck className='text-base-content' />}
+              </span>
+              <span>{label || option}</span>
+            </div>
+          </li>
+        ))}
+      </ul>
+    </div>
+  );
+};
+
+export default DropDown;

apps/readest-app/src/app/reader/components/settings/FontDropDown.tsx

@@ -32,6 +32,7 @@ const FontDropdown: React.FC<DropdownProps> = ({
       <button
         tabIndex={0}
         className='btn btn-sm flex items-center gap-1 px-[20px] font-normal normal-case'
+        onClick={(e) => e.currentTarget.focus()}
       >
         <span style={{ fontFamily: onGetFontFamily(selectedOption.option, family ?? '') }}>
           {selectedOption.label}

apps/readest-app/src/app/reader/components/settings/FontPanel.tsx

@@ -1,8 +1,6 @@
 import clsx from 'clsx';
 import React, { useEffect, useState } from 'react';
 
-import NumberInput from './NumberInput';
-import FontDropdown from './FontDropDown';
 import {
   ANDROID_FONTS,
   IOS_FONTS,
@@ -14,13 +12,15 @@ import {
   WINDOWS_FONTS,
 } from '@/services/constants';
 import { useReaderStore } from '@/store/readerStore';
-import { useSettingsStore } from '@/store/settingsStore';
 import { useTranslation } from '@/hooks/useTranslation';
-import { useTheme } from '@/hooks/useTheme';
+import { useEnv } from '@/context/EnvContext';
 import { getStyles } from '@/utils/style';
 import { getOSPlatform } from '@/utils/misc';
-import { FONT_ENUM_SUPPORTED_OS_PLATFORMS, getSysFontsList } from '@/utils/font';
+import { getSysFontsList } from '@/utils/font';
 import { isTauriAppPlatform } from '@/services/environment';
+import { saveViewSettings } from '../../utils/viewSettingsHelper';
+import NumberInput from './NumberInput';
+import FontDropdown from './FontDropDown';
 
 interface FontFaceProps {
   className?: string;
@@ -60,11 +60,10 @@ const FontFace = ({
 
 const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const _ = useTranslation();
-  const { settings, isFontLayoutSettingsGlobal, setSettings } = useSettingsStore();
-  const { getView, getViewSettings, setViewSettings } = useReaderStore();
+  const { envConfig, appService } = useEnv();
+  const { getView, getViewSettings } = useReaderStore();
   const view = getView(bookKey);
   const viewSettings = getViewSettings(bookKey)!;
-  const { themeCode } = useTheme();
 
   const fontFamilyOptions = [
     {
@@ -109,7 +108,7 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const [fontWeight, setFontWeight] = useState(viewSettings.fontWeight!);
 
   useEffect(() => {
-    if (isTauriAppPlatform() && FONT_ENUM_SUPPORTED_OS_PLATFORMS.includes(osPlatform)) {
+    if (isTauriAppPlatform() && appService?.hasSysFontsList) {
       getSysFontsList().then((fonts) => {
         setSysFonts(fonts);
       });
@@ -118,90 +117,50 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   }, []);
 
   useEffect(() => {
-    viewSettings.defaultFont = defaultFont;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.defaultFont = defaultFont;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'defaultFont', defaultFont);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultFont]);
 
   useEffect(() => {
-    viewSettings.defaultFontSize = defaultFontSize;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.defaultFontSize = defaultFontSize;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'defaultFontSize', defaultFontSize);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultFontSize]);
 
   useEffect(() => {
-    viewSettings.minimumFontSize = minFontSize;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.minimumFontSize = minFontSize;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'minimumFontSize', minFontSize);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [minFontSize]);
 
   useEffect(() => {
-    viewSettings.fontWeight = fontWeight;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.fontWeight = fontWeight;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'fontWeight', fontWeight);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fontWeight]);
 
   useEffect(() => {
-    viewSettings.serifFont = serifFont;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.serifFont = serifFont;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'serifFont', serifFont);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [serifFont]);
 
   useEffect(() => {
-    viewSettings.sansSerifFont = sansSerifFont;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.sansSerifFont = sansSerifFont;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'sansSerifFont', sansSerifFont);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sansSerifFont]);
 
   useEffect(() => {
-    viewSettings.monospaceFont = monospaceFont;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.monospaceFont = monospaceFont;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'monospaceFont', monospaceFont);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [monospaceFont]);
 
   useEffect(() => {
-    viewSettings.overrideFont = overrideFont;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.overrideFont = overrideFont;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'overrideFont', overrideFont);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [overrideFont]);
 
@@ -225,7 +184,6 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
         <div className='card border-base-200 border shadow'>
           <div className='divide-base-200 divide-y'>
             <NumberInput
-              className='config-item-top'
               label={_('Default Font Size')}
               value={defaultFontSize}
               onChange={setDefaultFontSize}
@@ -233,7 +191,6 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               max={120}
             />
             <NumberInput
-              className='config-item-bottom'
               label={_('Minimum Font Size')}
               value={minFontSize}
               onChange={setMinFontSize}
@@ -249,7 +206,6 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
         <div className='card border-base-200 border shadow'>
           <div className='divide-base-200 divide-y'>
             <NumberInput
-              className='config-item-top'
               label={_('Font Weight')}
               value={fontWeight}
               onChange={setFontWeight}
@@ -265,7 +221,7 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
         <h2 className='mb-2 font-medium'>{_('Font Family')}</h2>
         <div className='card border-base-200 border shadow'>
           <div className='divide-base-200 divide-y'>
-            <div className='config-item config-item-top'>
+            <div className='config-item'>
               <span className=''>{_('Default Font')}</span>
               <FontDropdown
                 options={fontFamilyOptions}
@@ -275,7 +231,7 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               />
             </div>
 
-            <div className='config-item config-item-bottom'>
+            <div className='config-item'>
               <span className=''>{_('Override Book Font')}</span>
               <input
                 type='checkbox'

apps/readest-app/src/app/reader/components/settings/LayoutPanel.tsx

@@ -1,26 +1,28 @@
 import React, { useEffect, useState } from 'react';
 import { MdOutlineAutoMode } from 'react-icons/md';
-import { MdOutlineTextRotationDown, MdOutlineTextRotationNone } from 'react-icons/md';
+import { MdOutlineTextRotationNone, MdTextRotateVertical } from 'react-icons/md';
+import { TbTextDirectionRtl } from 'react-icons/tb';
 
-import { ONE_COLUMN_MAX_INLINE_SIZE } from '@/services/constants';
-import { useSettingsStore } from '@/store/settingsStore';
+import { useEnv } from '@/context/EnvContext';
 import { useReaderStore } from '@/store/readerStore';
 import { useBookDataStore } from '@/store/bookDataStore';
 import { useTranslation } from '@/hooks/useTranslation';
-import { useTheme } from '@/hooks/useTheme';
+import { isCJKEnv } from '@/utils/misc';
 import { getStyles } from '@/utils/style';
+import { getMaxInlineSize } from '@/utils/config';
 import { getBookDirFromWritingMode, getBookLangCode } from '@/utils/book';
+import { MIGHT_BE_RTL_LANGS } from '@/services/constants';
+import { saveViewSettings } from '../../utils/viewSettingsHelper';
 import NumberInput from './NumberInput';
 
 const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const _ = useTranslation();
-  const { settings, isFontLayoutSettingsGlobal, setSettings } = useSettingsStore();
+  const { envConfig } = useEnv();
   const { getView, getViewSettings, setViewSettings } = useReaderStore();
   const { getBookData } = useBookDataStore();
   const view = getView(bookKey);
   const bookData = getBookData(bookKey)!;
   const viewSettings = getViewSettings(bookKey)!;
-  const { themeCode } = useTheme();
 
   const [paragraphMargin, setParagraphMargin] = useState(viewSettings.paragraphMargin!);
   const [lineHeight, setLineHeight] = useState(viewSettings.lineHeight!);
@@ -36,102 +38,62 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const [maxBlockSize, setMaxBlockSize] = useState(viewSettings.maxBlockSize!);
   const [writingMode, setWritingMode] = useState(viewSettings.writingMode!);
   const [overrideLayout, setOverrideLayout] = useState(viewSettings.overrideLayout!);
+  const [isScrolledMode, setScrolledMode] = useState(viewSettings.scrolled!);
+  const [doubleBorder, setDoubleBorder] = useState(viewSettings.doubleBorder!);
+  const [borderColor, setBorderColor] = useState(viewSettings.borderColor!);
+  const [showHeader, setShowHeader] = useState(viewSettings.showHeader!);
+  const [showFooter, setShowFooter] = useState(viewSettings.showFooter!);
 
   useEffect(() => {
-    viewSettings.paragraphMargin = paragraphMargin;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.paragraphMargin = paragraphMargin;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'paragraphMargin', paragraphMargin);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [paragraphMargin]);
 
   useEffect(() => {
-    viewSettings.lineHeight = lineHeight;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.lineHeight = lineHeight;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'lineHeight', lineHeight);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [lineHeight]);
 
   useEffect(() => {
-    viewSettings.wordSpacing = wordSpacing;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.wordSpacing = wordSpacing;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'wordSpacing', wordSpacing);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [wordSpacing]);
 
   useEffect(() => {
-    viewSettings.letterSpacing = letterSpacing;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.letterSpacing = letterSpacing;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'letterSpacing', letterSpacing);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [letterSpacing]);
 
   useEffect(() => {
-    viewSettings.textIndent = textIndent;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.textIndent = textIndent;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'textIndent', textIndent);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [textIndent]);
 
   useEffect(() => {
-    viewSettings.fullJustification = fullJustification;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.fullJustification = fullJustification;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'fullJustification', fullJustification);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fullJustification]);
 
   useEffect(() => {
-    viewSettings.hyphenation = hyphenation;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.hyphenation = hyphenation;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'hyphenation', hyphenation);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [hyphenation]);
 
   useEffect(() => {
-    viewSettings.marginPx = marginPx;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.marginPx = marginPx;
-      setSettings(settings);
-    }
+    saveViewSettings(envConfig, bookKey, 'marginPx', marginPx);
     view?.renderer.setAttribute('margin', `${marginPx}px`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [marginPx]);
 
   useEffect(() => {
-    viewSettings.gapPercent = gapPercent;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.gapPercent = gapPercent;
-      setSettings(settings);
-    }
+    saveViewSettings(envConfig, bookKey, 'gapPercent', gapPercent);
     view?.renderer.setAttribute('gap', `${gapPercent}%`);
     if (viewSettings.scrolled) {
       view?.renderer.setAttribute('flow', 'scrolled');
@@ -140,80 +102,139 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   }, [gapPercent]);
 
   useEffect(() => {
-    viewSettings.maxColumnCount = maxColumnCount;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.maxColumnCount = maxColumnCount;
-      setSettings(settings);
-    }
+    saveViewSettings(envConfig, bookKey, 'maxColumnCount', maxColumnCount);
     view?.renderer.setAttribute('max-column-count', maxColumnCount);
-    view?.renderer.setAttribute(
-      'max-inline-size',
-      `${maxColumnCount === 1 || viewSettings.scrolled ? ONE_COLUMN_MAX_INLINE_SIZE : maxInlineSize}px`,
-    );
+    view?.renderer.setAttribute('max-inline-size', `${getMaxInlineSize(viewSettings)}px`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [maxColumnCount]);
 
   useEffect(() => {
-    viewSettings.maxInlineSize = maxInlineSize;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.maxInlineSize = maxInlineSize;
-      setSettings(settings);
-    }
-    view?.renderer.setAttribute(
-      'max-inline-size',
-      `${maxColumnCount === 1 || viewSettings.scrolled ? ONE_COLUMN_MAX_INLINE_SIZE : maxInlineSize}px`,
-    );
+    saveViewSettings(envConfig, bookKey, 'maxInlineSize', maxInlineSize);
+    view?.renderer.setAttribute('max-inline-size', `${getMaxInlineSize(viewSettings)}px`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [maxInlineSize]);
 
   useEffect(() => {
-    viewSettings.maxBlockSize = maxBlockSize;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.maxBlockSize = maxBlockSize;
-      setSettings(settings);
-    }
+    saveViewSettings(envConfig, bookKey, 'maxBlockSize', maxBlockSize);
     view?.renderer.setAttribute('max-block-size', `${maxBlockSize}px`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [maxBlockSize]);
 
   useEffect(() => {
     // global settings are not supported for writing mode
-    viewSettings.writingMode = writingMode;
-    setViewSettings(bookKey, viewSettings);
+    const prevWritingMode = viewSettings.writingMode;
+    if (!writingMode.includes('vertical')) {
+      viewSettings.vertical = false;
+    }
+    saveViewSettings(envConfig, bookKey, 'writingMode', writingMode, true);
     if (view) {
-      view.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+      view.renderer.setStyles?.(getStyles(viewSettings));
       view.book.dir = getBookDirFromWritingMode(writingMode);
     }
+    if (
+      prevWritingMode !== writingMode &&
+      (['horizontal-rl', 'vertical-rl'].includes(writingMode) ||
+        ['horizontal-rl', 'vertical-rl'].includes(prevWritingMode))
+    ) {
+      setTimeout(() => window.location.reload(), 100);
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [writingMode]);
 
   useEffect(() => {
-    viewSettings.overrideLayout = overrideLayout;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.overrideLayout = overrideLayout;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    saveViewSettings(envConfig, bookKey, 'overrideLayout', overrideLayout);
+    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [overrideLayout]);
 
+  useEffect(() => {
+    saveViewSettings(envConfig, bookKey, 'scrolled', isScrolledMode);
+    getView(bookKey)?.renderer.setAttribute('flow', isScrolledMode ? 'scrolled' : 'paginated');
+    getView(bookKey)?.renderer.setAttribute(
+      'max-inline-size',
+      `${getMaxInlineSize(viewSettings)}px`,
+    );
+    getView(bookKey)?.renderer.setStyles?.(getStyles(viewSettings!));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isScrolledMode]);
+
+  useEffect(() => {
+    if (doubleBorder && viewSettings.vertical) {
+      viewSettings.gapPercent = Math.max(
+        viewSettings.gapPercent,
+        Math.ceil(4800 / window.innerWidth),
+      );
+      setGapPercent(viewSettings.gapPercent);
+      setViewSettings(bookKey, viewSettings);
+    }
+    saveViewSettings(envConfig, bookKey, 'doubleBorder', doubleBorder);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [doubleBorder]);
+
+  useEffect(() => {
+    saveViewSettings(envConfig, bookKey, 'borderColor', borderColor);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [borderColor]);
+
+  useEffect(() => {
+    if (showHeader && !viewSettings.vertical) {
+      viewSettings.marginPx = Math.max(viewSettings.marginPx, 44);
+      setMarginPx(viewSettings.marginPx);
+      setViewSettings(bookKey, viewSettings);
+    } else if (showHeader && viewSettings.vertical) {
+      viewSettings.gapPercent = Math.max(
+        viewSettings.gapPercent,
+        Math.ceil(4800 / window.innerWidth),
+      );
+      setGapPercent(viewSettings.gapPercent);
+      setViewSettings(bookKey, viewSettings);
+    }
+    saveViewSettings(envConfig, bookKey, 'showHeader', showHeader);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [showHeader]);
+
+  useEffect(() => {
+    if (showFooter && !viewSettings.vertical) {
+      viewSettings.marginPx = Math.max(viewSettings.marginPx, 44);
+      setMarginPx(viewSettings.marginPx);
+      setViewSettings(bookKey, viewSettings);
+    } else if (showFooter && viewSettings.vertical) {
+      viewSettings.gapPercent = Math.max(
+        viewSettings.gapPercent,
+        Math.ceil(4800 / window.innerWidth),
+      );
+      setGapPercent(viewSettings.gapPercent);
+      setViewSettings(bookKey, viewSettings);
+    }
+    saveViewSettings(envConfig, bookKey, 'showFooter', showFooter);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [showFooter]);
+
   const langCode = getBookLangCode(bookData.bookDoc?.metadata?.language);
-  const isCJKBook = langCode === 'zh' || langCode === 'ja' || langCode === 'ko';
+  const mightBeRTLBook = MIGHT_BE_RTL_LANGS.includes(langCode) || isCJKEnv();
 
   return (
     <div className='my-4 w-full space-y-6'>
-      {isCJKBook && (
+      <div className='w-full'>
+        <div className='flex items-center justify-between'>
+          <h2 className='font-medium'>{_('Scrolled Mode')}</h2>
+          <input
+            type='checkbox'
+            className='toggle'
+            checked={isScrolledMode}
+            onChange={() => setScrolledMode(!isScrolledMode)}
+          />
+        </div>
+      </div>
+
+      {mightBeRTLBook && (
         <div className='w-full'>
           <div className='flex items-center justify-between'>
             <h2 className='font-medium'>{_('Writing Mode')}</h2>
-            <div className='flex gap-2'>
+            <div className='flex gap-4'>
               <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Default')}>
                 <button
-                  className={`btn btn-ghost btn-circle ${writingMode === 'auto' ? 'btn-active bg-base-300' : ''}`}
+                  className={`btn btn-ghost btn-circle btn-sm ${writingMode === 'auto' ? 'btn-active bg-base-300' : ''}`}
                   onClick={() => setWritingMode('auto')}
                 >
                   <MdOutlineAutoMode />
@@ -222,7 +243,7 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
 
               <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Horizontal Direction')}>
                 <button
-                  className={`btn btn-ghost btn-circle ${writingMode === 'horizontal-tb' ? 'btn-active bg-base-300' : ''}`}
+                  className={`btn btn-ghost btn-circle btn-sm ${writingMode === 'horizontal-tb' ? 'btn-active bg-base-300' : ''}`}
                   onClick={() => setWritingMode('horizontal-tb')}
                 >
                   <MdOutlineTextRotationNone />
@@ -231,12 +252,55 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
 
               <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Vertical Direction')}>
                 <button
-                  className={`btn btn-ghost btn-circle ${writingMode === 'vertical-rl' ? 'btn-active bg-base-300' : ''}`}
+                  className={`btn btn-ghost btn-circle btn-sm ${writingMode === 'vertical-rl' ? 'btn-active bg-base-300' : ''}`}
                   onClick={() => setWritingMode('vertical-rl')}
                 >
-                  <MdOutlineTextRotationDown />
+                  <MdTextRotateVertical />
                 </button>
               </div>
+
+              <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('RTL Direction')}>
+                <button
+                  className={`btn btn-ghost btn-circle btn-sm ${writingMode === 'horizontal-rl' ? 'btn-active bg-base-300' : ''}`}
+                  onClick={() => setWritingMode('horizontal-rl')}
+                >
+                  <TbTextDirectionRtl />
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {viewSettings.vertical && (
+        <div className='w-full'>
+          <h2 className='mb-2 font-medium'>{_('Border Frame')}</h2>
+          <div className='card bg-base-100 border-base-200 border shadow'>
+            <div className='divide-base-200 divide-y'>
+              <div className='config-item'>
+                <span className=''>{_('Double Border')}</span>
+                <input
+                  type='checkbox'
+                  className='toggle'
+                  checked={doubleBorder}
+                  onChange={() => setDoubleBorder(!doubleBorder)}
+                />
+              </div>
+
+              <div className='config-item'>
+                <span className=''>{_('Border Color')}</span>
+                <div className='flex gap-4'>
+                  <button
+                    className={`btn btn-circle btn-sm bg-red-300 hover:bg-red-500 ${borderColor === 'red' ? 'btn-active !bg-red-500' : ''}`}
+                    onClick={() => setBorderColor('red')}
+                  ></button>
+
+                  <button
+                    className={`btn btn-circle btn-sm bg-black/50 hover:bg-black ${borderColor === 'black' ? 'btn-active !bg-black' : ''}`}
+                    onClick={() => setBorderColor('black')}
+                  ></button>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -247,7 +311,6 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
         <div className='card bg-base-100 border-base-200 border shadow'>
           <div className='divide-base-200 divide-y'>
             <NumberInput
-              className='config-item-top'
               label={_('Paragraph Margin')}
               value={paragraphMargin}
               onChange={setParagraphMargin}
@@ -256,7 +319,6 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               step={0.5}
             />
             <NumberInput
-              className='config-item-top'
               label={_('Line Spacing')}
               value={lineHeight}
               onChange={setLineHeight}
@@ -264,26 +326,25 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               max={3.0}
               step={0.1}
             />
+            {langCode !== 'zh' && (
+              <NumberInput
+                label={_('Word Spacing')}
+                value={wordSpacing}
+                onChange={setWordSpacing}
+                min={-4}
+                max={8}
+                step={0.5}
+              />
+            )}
             <NumberInput
-              className='config-item-top'
-              label={_('Word Spacing')}
-              value={wordSpacing}
-              onChange={setWordSpacing}
-              min={-4}
-              max={8}
-              step={0.5}
-            />
-            <NumberInput
-              className='config-item-top'
               label={_('Letter Spacing')}
               value={letterSpacing}
               onChange={setLetterSpacing}
               min={-2}
               max={4}
-              step={0.1}
+              step={0.5}
             />
             <NumberInput
-              className='config-item-top'
               label={_('Text Indent')}
               value={textIndent}
               onChange={setTextIndent}
@@ -291,7 +352,7 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               max={4}
               step={1}
             />
-            <div className='config-item config-item-bottom'>
+            <div className='config-item'>
               <span className=''>{_('Full Justification')}</span>
               <input
                 type='checkbox'
@@ -300,7 +361,7 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
                 onChange={() => setFullJustification(!fullJustification)}
               />
             </div>
-            <div className='config-item config-item-bottom'>
+            <div className='config-item'>
               <span className=''>{_('Hyphenation')}</span>
               <input
                 type='checkbox'
@@ -309,7 +370,7 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
                 onChange={() => setHyphenation(!hyphenation)}
               />
             </div>
-            <div className='config-item config-item-bottom'>
+            <div className='config-item'>
               <span className=''>{_('Override Book Layout')}</span>
               <input
                 type='checkbox'
@@ -326,12 +387,29 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
         <h2 className='mb-2 font-medium'>{_('Page')}</h2>
         <div className='card bg-base-100 border-base-200 border shadow'>
           <div className='divide-base-200 divide-y'>
+            <div className='config-item'>
+              <span className=''>{_('Show Header')}</span>
+              <input
+                type='checkbox'
+                className='toggle'
+                checked={showHeader}
+                onChange={() => setShowHeader(!showHeader)}
+              />
+            </div>
+            <div className='config-item'>
+              <span className=''>{_('Show Footer')}</span>
+              <input
+                type='checkbox'
+                className='toggle'
+                checked={showFooter}
+                onChange={() => setShowFooter(!showFooter)}
+              />
+            </div>
             <NumberInput
-              className='config-item-top'
               label={_('Vertical Margins (px)')}
               value={marginPx}
               onChange={setMarginPx}
-              min={0}
+              min={!viewSettings.vertical && (showFooter || showHeader) ? 44 : 0}
               max={88}
               step={4}
             />
@@ -339,7 +417,11 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               label={_('Horizontal Margins (%)')}
               value={gapPercent}
               onChange={setGapPercent}
-              min={0}
+              min={
+                viewSettings.vertical && (showFooter || showHeader)
+                  ? Math.ceil(4800 / window.innerWidth)
+                  : 0
+              }
               max={30}
             />
             <NumberInput
@@ -350,18 +432,20 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               max={4}
             />
             <NumberInput
-              label={_('Maximum Inline Size')}
+              label={viewSettings.vertical ? _('Maximum Column Height') : _('Maximum Column Width')}
               value={maxInlineSize}
               onChange={setMaxInlineSize}
-              min={500}
+              disabled={maxColumnCount === 1 || viewSettings.scrolled}
+              min={400}
               max={9999}
               step={100}
             />
             <NumberInput
-              label={_('Maximum Block Size')}
+              label={viewSettings.vertical ? _('Maximum Column Width') : _('Maximum Column Height')}
               value={maxBlockSize}
               onChange={setMaxBlockSize}
-              min={500}
+              disabled={maxColumnCount === 1 || viewSettings.scrolled}
+              min={400}
               max={9999}
               step={100}
             />

apps/readest-app/src/app/reader/components/settings/MiscPanel.tsx

@@ -1,22 +1,27 @@
 import clsx from 'clsx';
 import React, { useEffect, useState } from 'react';
+import i18n from 'i18next';
+import { useEnv } from '@/context/EnvContext';
 import { useReaderStore } from '@/store/readerStore';
 import { useSettingsStore } from '@/store/settingsStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { getStyles } from '@/utils/style';
-import { useTheme } from '@/hooks/useTheme';
+import { saveViewSettings } from '../../utils/viewSettingsHelper';
+import { TRANSLATED_LANGS } from '@/services/constants';
 import cssbeautify from 'cssbeautify';
 import cssValidate from '@/utils/css';
+import DropDown from './DropDown';
 
 const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const _ = useTranslation();
+  const { envConfig } = useEnv();
   const { settings, isFontLayoutSettingsGlobal, setSettings } = useSettingsStore();
   const { getView, getViewSettings, setViewSettings } = useReaderStore();
   const viewSettings = getViewSettings(bookKey)!;
-  const { themeCode } = useTheme();
 
   const [animated, setAnimated] = useState(viewSettings.animated!);
   const [isDisableClick, setIsDisableClick] = useState(viewSettings.disableClick!);
+  const [isContinuousScroll, setIsContinuousScroll] = useState(viewSettings.continuousScroll!);
   const [draftStylesheet, setDraftStylesheet] = useState(viewSettings.userStylesheet!);
   const [draftStylesheetSaved, setDraftStylesheetSaved] = useState(true);
   const [error, setError] = useState<string | null>(null);
@@ -52,14 +57,14 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     setDraftStylesheet(formattedCSS);
     setDraftStylesheetSaved(true);
     viewSettings.userStylesheet = formattedCSS;
-    setViewSettings(bookKey, viewSettings);
+    setViewSettings(bookKey, { ...viewSettings });
 
     if (isFontLayoutSettingsGlobal) {
       settings.globalViewSettings.userStylesheet = formattedCSS;
       setSettings(settings);
     }
 
-    getView(bookKey)?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
+    getView(bookKey)?.renderer.setStyles?.(getStyles(viewSettings));
   };
 
   const handleInput = (e: React.FormEvent<HTMLTextAreaElement>) => {
@@ -67,13 +72,33 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     e.nativeEvent.stopImmediatePropagation();
   };
 
+  const getCurrentUILangOption = () => {
+    const uiLanguage = viewSettings.uiLanguage;
+    return {
+      option: uiLanguage,
+      label:
+        uiLanguage === ''
+          ? _('Auto')
+          : TRANSLATED_LANGS[uiLanguage as keyof typeof TRANSLATED_LANGS],
+    };
+  };
+
+  const getUILangOptions = () => {
+    const langs = TRANSLATED_LANGS as Record<string, string>;
+    const options = Object.entries(langs).map(([option, label]) => ({ option, label }));
+    options.sort((a, b) => a.label.localeCompare(b.label));
+    options.unshift({ option: '', label: _('Auto') });
+    return options;
+  };
+
+  const handleSelectUILang = (option: string) => {
+    viewSettings.uiLanguage = option;
+    saveViewSettings(envConfig, bookKey, 'uiLanguage', option);
+    i18n.changeLanguage(option ? option : navigator.language);
+  };
+
   useEffect(() => {
-    viewSettings.animated = animated;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.animated = animated;
-      setSettings(settings);
-    }
+    saveViewSettings(envConfig, bookKey, 'animated', animated);
     if (animated) {
       getView(bookKey)?.renderer.setAttribute('animated', '');
     } else {
@@ -83,22 +108,38 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   }, [animated]);
 
   useEffect(() => {
-    viewSettings.disableClick = isDisableClick;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.disableClick = isDisableClick;
-      setSettings(settings);
-    }
+    saveViewSettings(envConfig, bookKey, 'disableClick', isDisableClick);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isDisableClick]);
 
+  useEffect(() => {
+    saveViewSettings(envConfig, bookKey, 'continuousScroll', isContinuousScroll);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isContinuousScroll]);
+
   return (
     <div className='my-4 w-full space-y-6'>
+      <div className='w-full'>
+        <h2 className='mb-2 font-medium'>{_('Language')}</h2>
+        <div className='card border-base-200 bg-base-100 border shadow'>
+          <div className='divide-base-200 divide-y'>
+            <div className='config-item'>
+              <span className=''>{_('Language')}</span>
+              <DropDown
+                selected={getCurrentUILangOption()}
+                options={getUILangOptions()}
+                onSelect={handleSelectUILang}
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+
       <div className='w-full'>
         <h2 className='mb-2 font-medium'>{_('Animation')}</h2>
         <div className='card border-base-200 bg-base-100 border shadow'>
-          <div className='divide-y'>
-            <div className='config-item config-item-top config-item-bottom'>
+          <div className='divide-base-200 divide-y'>
+            <div className='config-item'>
               <span className=''>{_('Paging Animation')}</span>
               <input
                 type='checkbox'
@@ -114,8 +155,17 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
       <div className='w-full'>
         <h2 className='mb-2 font-medium'>{_('Behavior')}</h2>
         <div className='card border-base-200 bg-base-100 border shadow'>
-          <div className='divide-y'>
-            <div className='config-item config-item-top config-item-bottom'>
+          <div className='divide-base-200 divide-y'>
+            <div className='config-item'>
+              <span className=''>{_('Continuous Scroll')}</span>
+              <input
+                type='checkbox'
+                className='toggle'
+                checked={isContinuousScroll}
+                onChange={() => setIsContinuousScroll(!isContinuousScroll)}
+              />
+            </div>
+            <div className='config-item'>
               <span className=''>{_('Disable Click-to-Flip')}</span>
               <input
                 type='checkbox'

apps/readest-app/src/app/reader/components/settings/NumberInput.tsx

@@ -1,5 +1,5 @@
 import clsx from 'clsx';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { FiMinus, FiPlus } from 'react-icons/fi';
 
 interface NumberInputProps {
@@ -9,6 +9,7 @@ interface NumberInputProps {
   min: number;
   max: number;
   step?: number;
+  disabled?: boolean;
   onChange: (value: number) => void;
 }
 
@@ -20,10 +21,15 @@ const NumberInput: React.FC<NumberInputProps> = ({
   min,
   max,
   step,
+  disabled,
 }) => {
   const [localValue, setLocalValue] = useState(value);
   const numberStep = step || 1;
 
+  useEffect(() => {
+    setLocalValue(value);
+  }, [value]);
+
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const value = e.target.value;
 
@@ -74,13 +80,13 @@ const NumberInput: React.FC<NumberInputProps> = ({
         />
         <button
           onClick={decrement}
-          className={`btn btn-circle btn-sm ${value === min ? 'btn-disabled !bg-opacity-5' : ''}`}
+          className={`btn btn-circle btn-sm ${value <= min || disabled ? 'btn-disabled !bg-opacity-5' : ''}`}
         >
           <FiMinus className='h-4 w-4' />
         </button>
         <button
           onClick={increment}
-          className={`btn btn-circle btn-sm ${value === max ? 'btn-disabled !bg-opacity-5' : ''}`}
+          className={`btn btn-circle btn-sm ${value >= max || disabled ? 'btn-disabled !bg-opacity-5' : ''}`}
         >
           <FiPlus className='h-4 w-4' />
         </button>

apps/readest-app/src/app/reader/components/settings/SettingsDialog.tsx

@@ -28,7 +28,9 @@ type TabConfig = {
 
 const SettingsDialog: React.FC<{ bookKey: string; config: BookConfig }> = ({ bookKey }) => {
   const _ = useTranslation();
-  const [activePanel, setActivePanel] = useState<SettingsPanelType>('Font');
+  const [activePanel, setActivePanel] = useState<SettingsPanelType>(
+    (localStorage.getItem('lastConfigPanel') || 'Font') as SettingsPanelType,
+  );
   const { setFontLayoutSettingsDialogOpen } = useSettingsStore();
 
   const tabConfig = [
@@ -54,6 +56,11 @@ const SettingsDialog: React.FC<{ bookKey: string; config: BookConfig }> = ({ boo
     },
   ] as TabConfig[];
 
+  const handleSetActivePanel = (tab: SettingsPanelType) => {
+    setActivePanel(tab);
+    localStorage.setItem('lastConfigPanel', tab);
+  };
+
   const handleClose = () => {
     setFontLayoutSettingsDialogOpen(false);
   };
@@ -64,7 +71,8 @@ const SettingsDialog: React.FC<{ bookKey: string; config: BookConfig }> = ({ boo
         isOpen={true}
         onClose={handleClose}
         className='modal-open'
-        boxClassName='sm:w-1/2 sm:min-w-[480px] sm:h-[65%]'
+        boxClassName='sm:min-w-[520px]'
+        snapHeight={window.innerWidth < 640 ? 0.7 : undefined}
         header={
           <div className='flex w-full items-center justify-between'>
             <button
@@ -76,15 +84,15 @@ const SettingsDialog: React.FC<{ bookKey: string; config: BookConfig }> = ({ boo
             >
               <MdArrowBackIosNew />
             </button>
-            <div className='dialog-tabs flex h-10 max-w-[100%] flex-grow items-center justify-around pl-4'>
+            <div className='dialog-tabs flex h-10 max-w-[100%] flex-grow items-center gap-2 pl-4'>
               {tabConfig.map(({ tab, icon: Icon, label }) => (
                 <button
                   key={tab}
                   className={clsx(
-                    'btn btn-ghost text-base-content h-8 min-h-8',
+                    'btn btn-ghost text-base-content btn-sm',
                     activePanel === tab ? 'btn-active' : '',
                   )}
-                  onClick={() => setActivePanel(tab)}
+                  onClick={() => handleSetActivePanel(tab)}
                 >
                   <Icon className='mr-0' />
                   {window.innerWidth >= 500 ? label : ''}

apps/readest-app/src/app/reader/components/settings/ThemeEditor.tsx

@@ -0,0 +1,161 @@
+import { useState } from 'react';
+import { useTranslation } from '@/hooks/useTranslation';
+import { CustomTheme } from '@/styles/themes';
+import { md5Fingerprint } from '@/utils/md5';
+import { CUSTOM_THEME_TEMPLATES } from '@/services/constants';
+import { useSettingsStore } from '@/store/settingsStore';
+import clsx from 'clsx';
+import ColorInput from './ColorInput';
+
+type ThemeEditorProps = {
+  customTheme: CustomTheme | null;
+  onSave: (customTheme: CustomTheme) => void;
+  onDelete: (customTheme: CustomTheme) => void;
+  onCancel: () => void;
+};
+
+const ThemeEditor: React.FC<ThemeEditorProps> = ({ customTheme, onSave, onDelete, onCancel }) => {
+  const _ = useTranslation();
+  const { settings } = useSettingsStore();
+  const template =
+    CUSTOM_THEME_TEMPLATES[Math.floor(Math.random() * CUSTOM_THEME_TEMPLATES.length)]!;
+  const [lightTextColor, setLightTextColor] = useState(
+    customTheme?.colors.light.fg || template.light.fg,
+  );
+  const [lightBackgroundColor, setLightBackgroundColor] = useState(
+    customTheme?.colors.light.bg || template.light.bg,
+  );
+  const [darkTextColor, setDarkTextColor] = useState(
+    customTheme?.colors.dark.fg || template.dark.fg,
+  );
+  const [darkBackgroundColor, setDarkBackgroundColor] = useState(
+    customTheme?.colors.dark.bg || template.dark.bg,
+  );
+
+  const [themeName, setThemeName] = useState(customTheme?.label || _('Custom'));
+
+  const ThemePreview: React.FC<{
+    textColor: string;
+    backgroundColor: string;
+    label: string;
+  }> = ({ textColor, backgroundColor, label }) => (
+    <div className='mb-2 mt-4'>
+      <label className='mb-1 block text-sm font-medium'>{label}</label>
+      <div
+        className='border-base-300 overflow-hidden rounded border p-3'
+        style={{
+          backgroundColor: backgroundColor,
+          color: textColor,
+        }}
+      >
+        <p className='mb-2 whitespace-pre-line text-sm'>
+          {_(
+            "All the world's a stage,\nAnd all the men and women merely players;\nThey have their exits and their entrances,\nAnd one man in his time plays many parts,\nHis acts being seven ages.\n\n— William Shakespeare",
+          )}
+        </p>
+      </div>
+    </div>
+  );
+
+  const getCustomTheme = () => {
+    return {
+      name: md5Fingerprint(themeName),
+      label: themeName,
+      colors: {
+        light: {
+          fg: lightTextColor,
+          bg: lightBackgroundColor,
+          primary: '#3b82f6',
+        },
+        dark: {
+          fg: darkTextColor,
+          bg: darkBackgroundColor,
+          primary: '#60a5fa',
+        },
+      },
+    };
+  };
+
+  return (
+    <div className='mt-6 rounded-lg'>
+      <div className='mb-4'>
+        <div className='mb-4 flex items-center justify-between'>
+          <label className='font-medium'>{_('Custom Theme')}</label>
+          <div className='flex w-[calc(50%-12px)] justify-between'>
+            <button
+              className='btn btn-ghost btn-sm text-base-content px-2'
+              onClick={() => onSave(getCustomTheme())}
+            >
+              {_('Save')}
+            </button>
+
+            <button
+              className={clsx(
+                'btn btn-ghost btn-sm px-2',
+                !settings.globalReadSettings.customThemes.find(
+                  (theme) => theme.name === md5Fingerprint(themeName),
+                ) && 'btn-disabled',
+              )}
+              onClick={() => onDelete(getCustomTheme())}
+            >
+              {_('Delete')}
+            </button>
+
+            <button className='btn btn-ghost btn-sm px-2' onClick={onCancel}>
+              {_('Cancel')}
+            </button>
+          </div>
+        </div>
+        <div className='mb-4 flex items-center justify-between'>
+          <label className='font-medium'>{_('Theme Name')}</label>
+          <input
+            type='text'
+            value={themeName}
+            onChange={(e) => setThemeName(e.target.value)}
+            className='bg-base-100 text-base-content border-base-200 w-[calc(50%-12px)] rounded border p-2 text-sm'
+          />
+        </div>
+      </div>
+
+      <div className='grid grid-cols-2 gap-6'>
+        <div className='bg-base-200 rounded-lg p-3'>
+          <h3 className='mb-3 text-center font-medium'>{_('Light Mode')}</h3>
+
+          <ColorInput label={_('Text Color')} value={lightTextColor} onChange={setLightTextColor} />
+
+          <ColorInput
+            label={_('Background Color')}
+            value={lightBackgroundColor}
+            onChange={setLightBackgroundColor}
+          />
+
+          <ThemePreview
+            textColor={lightTextColor}
+            backgroundColor={lightBackgroundColor}
+            label={_('Preview')}
+          />
+        </div>
+
+        <div className='bg-base-300 rounded-lg p-3'>
+          <h3 className='mb-3 text-center font-medium'>{_('Dark Mode')}</h3>
+
+          <ColorInput label={_('Text Color')} value={darkTextColor} onChange={setDarkTextColor} />
+
+          <ColorInput
+            label={_('Background Color')}
+            value={darkBackgroundColor}
+            onChange={setDarkBackgroundColor}
+          />
+
+          <ThemePreview
+            textColor={darkTextColor}
+            backgroundColor={darkBackgroundColor}
+            label={_('Preview')}
+          />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ThemeEditor;

apps/readest-app/src/app/reader/components/sidebar/BookCard.tsx

@@ -1,7 +1,9 @@
+import clsx from 'clsx';
 import React from 'react';
 import Image from 'next/image';
 import { MdInfoOutline } from 'react-icons/md';
 import { Book } from '@/types/book';
+import { useThemeStore } from '@/store/themeStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { eventDispatcher } from '@/utils/event';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
@@ -10,6 +12,7 @@ import { formatAuthors, formatTitle } from '@/utils/book';
 const BookCard = ({ book }: { book: Book }) => {
   const { coverImageUrl, title, author } = book;
   const _ = useTranslation();
+  const { isDarkMode } = useThemeStore();
   const iconSize18 = useResponsiveSize(18);
 
   const showBookDetails = () => {
@@ -23,14 +26,17 @@ const BookCard = ({ book }: { book: Book }) => {
         alt={_('Book Cover')}
         width={56}
         height={80}
-        className='mr-4 aspect-auto max-h-16 w-[15%] max-w-12 rounded-sm object-cover shadow-md'
+        className={clsx(
+          'me-4 aspect-auto max-h-16 w-[15%] max-w-12 rounded-sm object-cover shadow-md',
+          isDarkMode ? 'mix-blend-screen' : 'mix-blend-multiply',
+        )}
         onError={(e) => {
           (e.target as HTMLImageElement).style.display = 'none';
         }}
       />
       <div className='min-w-0 flex-1'>
         <h4 className='line-clamp-2 w-[90%] text-sm font-semibold'>{formatTitle(title)}</h4>
-        <p className='text-neutral-content truncate text-xs'>{formatAuthors(author)}</p>
+        <p className='truncate text-xs opacity-75'>{formatAuthors(author)}</p>
       </div>
       <button
         className='btn btn-ghost hover:bg-base-300 h-6 min-h-6 w-6 rounded-full p-0 transition-colors'

apps/readest-app/src/app/reader/components/sidebar/BookMenu.tsx

@@ -5,8 +5,10 @@ import Image from 'next/image';
 import MenuItem from '@/components/MenuItem';
 import { setAboutDialogVisible } from '@/components/AboutWindow';
 import { useLibraryStore } from '@/store/libraryStore';
+import { useSidebarStore } from '@/store/sidebarStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { isWebAppPlatform } from '@/services/environment';
+import { eventDispatcher } from '@/utils/event';
 import { DOWNLOAD_READEST_URL } from '@/services/constants';
 import useBooksManager from '../../hooks/useBooksManager';
 
@@ -17,8 +19,10 @@ interface BookMenuProps {
 
 const BookMenu: React.FC<BookMenuProps> = ({ menuClassName, setIsDropdownOpen }) => {
   const _ = useTranslation();
-  const { library } = useLibraryStore();
+  const { getVisibleLibrary } = useLibraryStore();
   const { openParallelView } = useBooksManager();
+  const { sideBarBookKey } = useSidebarStore();
+
   const handleParallelView = (id: string) => {
     openParallelView(id);
     setIsDropdownOpen?.(false);
@@ -35,6 +39,10 @@ const BookMenu: React.FC<BookMenuProps> = ({ menuClassName, setIsDropdownOpen })
     window.open(DOWNLOAD_READEST_URL, '_blank');
     setIsDropdownOpen?.(false);
   };
+  const handleExportAnnotations = () => {
+    eventDispatcher.dispatch('export-annotations', { bookKey: sideBarBookKey });
+    setIsDropdownOpen?.(false);
+  };
 
   const isWebApp = isWebAppPlatform();
 
@@ -48,28 +56,32 @@ const BookMenu: React.FC<BookMenuProps> = ({ menuClassName, setIsDropdownOpen })
     >
       <MenuItem label={_('Parallel Read')} noIcon>
         <ul className='max-h-60 overflow-y-auto'>
-          {library.slice(0, 20).map((book) => (
-            <MenuItem
-              key={book.hash}
-              icon={
-                <Image
-                  src={book.coverImageUrl!}
-                  alt={book.title}
-                  width={56}
-                  height={80}
-                  className='aspect-auto max-h-8 max-w-6 rounded-sm shadow-md'
-                  onError={(e) => {
-                    (e.target as HTMLImageElement).style.display = 'none';
-                  }}
-                />
-              }
-              label={book.title}
-              labelClass='max-w-36'
-              onClick={() => handleParallelView(book.hash)}
-            />
-          ))}
+          {getVisibleLibrary()
+            .filter((book) => book.format !== 'PDF' && book.format !== 'CBZ')
+            .slice(0, 20)
+            .map((book) => (
+              <MenuItem
+                key={book.hash}
+                icon={
+                  <Image
+                    src={book.coverImageUrl!}
+                    alt={book.title}
+                    width={56}
+                    height={80}
+                    className='aspect-auto max-h-8 max-w-6 rounded-sm shadow-md'
+                    onError={(e) => {
+                      (e.target as HTMLImageElement).style.display = 'none';
+                    }}
+                  />
+                }
+                label={book.title}
+                labelClass='max-w-36'
+                onClick={() => handleParallelView(book.hash)}
+              />
+            ))}
         </ul>
       </MenuItem>
+      <MenuItem label={_('Export Annotations')} noIcon onClick={handleExportAnnotations} />
       <MenuItem label={_('Reload Page')} noIcon shortcut='Shift+R' onClick={handleReloadPage} />
       <hr className='border-base-200 my-1' />
       {isWebApp && <MenuItem label={_('Download Readest')} noIcon onClick={downloadReadest} />}

apps/readest-app/src/app/reader/components/sidebar/BooknoteItem.tsx

@@ -81,12 +81,16 @@ const BooknoteItem: React.FC<BooknoteItemProps> = ({ bookKey, item }) => {
           } as React.CSSProperties
         }
       >
-        {item.note && <span className='content font-size-sm font-normal'>{item.note}</span>}
+        {item.note && (
+          <span className='content font-size-sm font-normal' dir='auto'>
+            {item.note}
+          </span>
+        )}
         <div className='flex items-start'>
           {item.note && (
-            <div className='my-1 mr-2 min-h-full self-stretch border-l-2 border-gray-300'></div>
+            <div className='my-1 me-2 min-h-full self-stretch border-l-2 border-gray-300'></div>
           )}
-          <div className={clsx('content font-size-sm line-clamp-3', item.note && 'py-2')}>
+          <div className={clsx('content font-size-sm line-clamp-3', item.note && 'my-2')}>
             <span
               className={clsx(
                 'inline',
@@ -116,7 +120,7 @@ const BooknoteItem: React.FC<BooknoteItemProps> = ({ bookKey, item }) => {
         }
         onClick={(e) => e.stopPropagation()}
       >
-        <div className='flex justify-end space-x-3 p-2'>
+        <div className='flex justify-end space-x-3 p-2' dir='ltr'>
           {item.note && (
             <button
               className={clsx(

apps/readest-app/src/app/reader/components/sidebar/BooknoteView.tsx

@@ -4,16 +4,9 @@ import * as CFI from 'foliate-js/epubcfi.js';
 import { useBookDataStore } from '@/store/bookDataStore';
 import { findTocItemBS } from '@/utils/toc';
 import { TOCItem } from '@/libs/document';
-import { BookNote, BookNoteType } from '@/types/book';
+import { BooknoteGroup, BookNoteType } from '@/types/book';
 import BooknoteItem from './BooknoteItem';
 
-interface BooknoteGroup {
-  id: number;
-  href: string;
-  label: string;
-  booknotes: BookNote[];
-}
-
 const BooknoteView: React.FC<{
   type: BookNoteType;
   bookKey: string;

apps/readest-app/src/app/reader/components/sidebar/Header.tsx

@@ -5,8 +5,8 @@ import { FiSearch } from 'react-icons/fi';
 import { MdOutlineMenu, MdOutlinePushPin, MdPushPin } from 'react-icons/md';
 import { MdArrowBackIosNew } from 'react-icons/md';
 
-import useTrafficLight from '@/hooks/useTrafficLight';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
+import { useTrafficLightStore } from '@/store/trafficLightStore';
 import Dropdown from '@/components/Dropdown';
 import BookMenu from './BookMenu';
 
@@ -18,16 +18,18 @@ const SidebarHeader: React.FC<{
   onTogglePin: () => void;
   onToggleSearchBar: () => void;
 }> = ({ isPinned, isSearchBarVisible, onGoToLibrary, onClose, onTogglePin, onToggleSearchBar }) => {
-  const { isTrafficLightVisible } = useTrafficLight();
+  const { isTrafficLightVisible } = useTrafficLightStore();
   const iconSize14 = useResponsiveSize(14);
   const iconSize18 = useResponsiveSize(18);
   const iconSize22 = useResponsiveSize(22);
+
   return (
     <div
       className={clsx(
-        'sidebar-header flex h-11 items-center justify-between pr-2',
-        isTrafficLightVisible ? 'pl-20' : 'pl-1.5',
+        'sidebar-header flex h-11 items-center justify-between pe-2',
+        isTrafficLightVisible ? 'pl-20' : 'ps-1.5',
       )}
+      dir='ltr'
     >
       <div className='flex items-center gap-x-8'>
         <button
@@ -36,7 +38,10 @@ const SidebarHeader: React.FC<{
         >
           <MdArrowBackIosNew size={iconSize22} />
         </button>
-        <button className='btn btn-ghost h-8 min-h-8 w-8 p-0' onClick={onGoToLibrary}>
+        <button
+          className='btn btn-ghost hidden h-8 min-h-8 w-8 p-0 sm:flex'
+          onClick={onGoToLibrary}
+        >
           <GiBookshelf className='fill-base-content' />
         </button>
       </div>

apps/readest-app/src/app/reader/components/sidebar/SearchBar.tsx

@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import React, { useEffect, useRef, useState } from 'react';
 import { FaSearch, FaChevronDown } from 'react-icons/fa';
 
@@ -7,9 +8,9 @@ import { useBookDataStore } from '@/store/bookDataStore';
 import { useReaderStore } from '@/store/readerStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { BookSearchConfig, BookSearchResult } from '@/types/book';
+import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 import Dropdown from '@/components/Dropdown';
 import SearchOptions from './SearchOptions';
-import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 
 const MINIMUM_SEARCH_TERM_LENGTH_DEFAULT = 2;
 const MINIMUM_SEARCH_TERM_LENGTH_CJK = 1;
@@ -172,7 +173,11 @@ const SearchBar: React.FC<SearchBarProps> = ({
 
         <div className='bg-base-300 flex h-8 w-8 items-center rounded-r-lg'>
           <Dropdown
-            className='dropdown-bottom flex justify-center'
+            className={clsx(
+              window.innerWidth < 640 && 'dropdown-end',
+              'dropdown-bottom flex justify-center',
+            )}
+            menuClassName={window.innerWidth < 640 ? 'no-triangle mt-1' : 'dropdown-center mt-3'}
             buttonClassName='btn btn-ghost h-8 min-h-8 w-8 p-0 rounded-none rounded-r-lg'
             toggleButton={<FaChevronDown size={iconSize12} className='text-gray-500' />}
           >

apps/readest-app/src/app/reader/components/sidebar/SearchOptions.tsx

@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import React from 'react';
 import { MdCheck } from 'react-icons/md';
 import { BookSearchConfig } from '@/types/book';
@@ -6,6 +7,7 @@ import { useDefaultIconSize } from '@/hooks/useResponsiveSize';
 
 interface SearchOptionsProps {
   searchConfig: BookSearchConfig;
+  menuClassName?: string;
   onSearchConfigChanged: (searchConfig: BookSearchConfig) => void;
   setIsDropdownOpen?: (isOpen: boolean) => void;
 }
@@ -32,6 +34,7 @@ const Option: React.FC<OptionProps> = ({ label, isActive, onClick }) => (
 
 const SearchOptions: React.FC<SearchOptionsProps> = ({
   searchConfig,
+  menuClassName,
   onSearchConfigChanged,
   setIsDropdownOpen,
 }) => {
@@ -44,7 +47,10 @@ const SearchOptions: React.FC<SearchOptionsProps> = ({
   return (
     <div
       tabIndex={0}
-      className='book-menu dropdown-content dropdown-center border-base-200 z-20 mt-3 w-56 border shadow-2xl'
+      className={clsx(
+        'book-menu dropdown-content dropdown-center border-base-200 z-20 w-56 border shadow-2xl',
+        menuClassName,
+      )}
     >
       <Option
         label={_('Book')}

apps/readest-app/src/app/reader/components/sidebar/SideBar.tsx

@@ -8,9 +8,10 @@ import { useReaderStore } from '@/store/readerStore';
 import { useSidebarStore } from '@/store/sidebarStore';
 import { BookSearchResult } from '@/types/book';
 import { eventDispatcher } from '@/utils/event';
+import { getBookDirFromLanguage } from '@/utils/book';
 import { useEnv } from '@/context/EnvContext';
-import { useTheme } from '@/hooks/useTheme';
 import { useDrag } from '@/hooks/useDrag';
+import { useThemeStore } from '@/store/themeStore';
 import SidebarHeader from './Header';
 import SidebarContent from './Content';
 import BookCard from './BookCard';
@@ -28,11 +29,11 @@ const SideBar: React.FC<{
   onGoToLibrary: () => void;
 }> = ({ onGoToLibrary }) => {
   const { appService } = useEnv();
-  const { updateAppTheme } = useTheme();
+  const { updateAppTheme } = useThemeStore();
   const { settings } = useSettingsStore();
   const { sideBarBookKey } = useSidebarStore();
   const { getBookData } = useBookDataStore();
-  const { getView } = useReaderStore();
+  const { getView, getViewSettings } = useReaderStore();
   const [isSearchBarVisible, setIsSearchBarVisible] = useState(false);
   const [searchResults, setSearchResults] = useState<BookSearchResult[] | null>(null);
   const [searchTerm, setSearchTerm] = useState('');
@@ -162,11 +163,13 @@ const SideBar: React.FC<{
 
   if (!sideBarBookKey) return null;
 
+  const viewSettings = getViewSettings(sideBarBookKey);
   const bookData = getBookData(sideBarBookKey);
   if (!bookData || !bookData.book || !bookData.bookDoc) {
     return null;
   }
   const { book, bookDoc } = bookData;
+  const languageDir = getBookDirFromLanguage(bookDoc.metadata.language);
 
   return isSideBarVisible ? (
     <>
@@ -178,6 +181,7 @@ const SideBar: React.FC<{
           appService?.hasRoundedWindow && 'rounded-window-top-left rounded-window-bottom-left',
           !isSideBarPinned && 'shadow-2xl',
         )}
+        dir={viewSettings?.rtl && languageDir === 'rtl' ? 'rtl' : 'ltr'}
         style={{
           width: `${sideBarWidth}`,
           maxWidth: `${MAX_SIDEBAR_WIDTH * 100}%`,

apps/readest-app/src/app/reader/components/sidebar/TOCView.tsx

@@ -68,7 +68,7 @@ const TOCItemView: React.FC<{
         aria-selected={isActive ? 'true' : 'false'}
         data-href={item.href ? getContentMd5(item.href) : undefined}
         className={`flex w-full cursor-pointer items-center rounded-md py-2 ${
-          isActive ? 'bg-base-300/85 hover:bg-base-300' : 'hover:bg-base-300/85'
+          isActive ? 'bg-base-300/85 hover:bg-base-300' : 'sm:hover:bg-base-300/85'
         }`}
       >
         {item.subitems && (

apps/readest-app/src/app/reader/components/sidebar/TabNavigation.tsx

@@ -1,6 +1,8 @@
 import clsx from 'clsx';
 import React from 'react';
-import { MdToc, MdEditNote, MdBookmarkBorder } from 'react-icons/md';
+import { MdBookmarkBorder as BookmarkIcon } from 'react-icons/md';
+import { IoIosList as TOCIcon } from 'react-icons/io';
+import { PiNotePencil as NoteIcon } from 'react-icons/pi';
 
 import { useTranslation } from '@/hooks/useTranslation';
 
@@ -15,10 +17,11 @@ const TabNavigation: React.FC<{
   return (
     <div
       className={clsx('bottom-tab border-base-300/50 bg-base-200 relative flex w-full border-t')}
+      dir='ltr'
     >
       <div
         className={clsx(
-          'bg-base-300 absolute bottom-1.5 left-1 h-[calc(100%-12px)] w-[calc(33.3%-8px)] rounded-lg',
+          'bg-base-300 absolute bottom-1.5 start-1 h-[calc(100%-12px)] w-[calc(33.3%-8px)] rounded-lg',
           'transform transition-transform duration-300',
           activeTab === 'toc' && 'translate-x-0',
           activeTab === 'annotations' && 'translate-x-[calc(100%+8px)]',
@@ -33,13 +36,13 @@ const TabNavigation: React.FC<{
             tab === 'toc' ? _('TOC') : tab === 'annotations' ? _('Annotate') : _('Bookmark')
           }
         >
-          <div className={clsx('')} onClick={() => onTabChange(tab)}>
+          <div className={clsx('flex h-6 items-center')} onClick={() => onTabChange(tab)}>
             {tab === 'toc' ? (
-              <MdToc className='mx-auto' />
+              <TOCIcon className='mx-auto' />
             ) : tab === 'annotations' ? (
-              <MdEditNote className='mx-auto' />
+              <NoteIcon className='mx-auto' />
             ) : (
-              <MdBookmarkBorder className='mx-auto' />
+              <BookmarkIcon className='mx-auto' />
             )}
           </div>
         </div>

apps/readest-app/src/app/reader/hooks/useAutoHideScrollbar.ts

@@ -1,5 +1,8 @@
 import { getOSPlatform } from '@/utils/misc';
 
+// NOTE: Be careful to use this hook. When the scrollbar is set always visible in macOS,
+// hide it will change the layout. Make sure to only use it in constrained widgets.
+// See https://github.com/readest/readest/issues/600
 export const useAutoHideScrollbar = () => {
   const shouldAutoHideScrollbar = ['macos', 'ios'].includes(getOSPlatform());
   const handleScrollbarAutoHide = (doc: Document) => {

apps/readest-app/src/app/reader/hooks/useBookShortcuts.ts

@@ -5,7 +5,6 @@ import useShortcuts from '@/hooks/useShortcuts';
 import useBooksManager from './useBooksManager';
 import { useSidebarStore } from '@/store/sidebarStore';
 import { useSettingsStore } from '@/store/settingsStore';
-import { useTheme } from '@/hooks/useTheme';
 import { getStyles } from '@/utils/style';
 import { tauriQuitApp } from '@/utils/window';
 import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL, ZOOM_STEP } from '@/services/constants';
@@ -21,7 +20,6 @@ const useBookShortcuts = ({ sideBarBookKey, bookKeys }: UseBookShortcutsProps) =
   const { setFontLayoutSettingsDialogOpen } = useSettingsStore();
   const { toggleNotebook } = useNotebookStore();
   const { getNextBookKey } = useBooksManager();
-  const { themeCode } = useTheme();
   const viewSettings = getViewSettings(sideBarBookKey ?? '');
   const fontSize = viewSettings?.defaultFontSize ?? 16;
   const lineHeight = viewSettings?.lineHeight ?? 1.6;
@@ -100,7 +98,7 @@ const useBookShortcuts = ({ sideBarBookKey, bookKeys }: UseBookShortcutsProps) =
     const zoomLevel = viewSettings!.zoomLevel + ZOOM_STEP;
     viewSettings!.zoomLevel = Math.min(zoomLevel, MAX_ZOOM_LEVEL);
     setViewSettings(sideBarBookKey, viewSettings!);
-    view?.renderer.setStyles?.(getStyles(viewSettings!, themeCode));
+    view?.renderer.setStyles?.(getStyles(viewSettings!));
   };
 
   const zoomOut = () => {
@@ -111,7 +109,7 @@ const useBookShortcuts = ({ sideBarBookKey, bookKeys }: UseBookShortcutsProps) =
     const zoomLevel = viewSettings!.zoomLevel - ZOOM_STEP;
     viewSettings!.zoomLevel = Math.max(zoomLevel, MIN_ZOOM_LEVEL);
     setViewSettings(sideBarBookKey, viewSettings!);
-    view?.renderer.setStyles?.(getStyles(viewSettings!, themeCode));
+    view?.renderer.setStyles?.(getStyles(viewSettings!));
   };
 
   const resetZoom = () => {
@@ -121,7 +119,7 @@ const useBookShortcuts = ({ sideBarBookKey, bookKeys }: UseBookShortcutsProps) =
     const viewSettings = getViewSettings(sideBarBookKey)!;
     viewSettings!.zoomLevel = 100;
     setViewSettings(sideBarBookKey, viewSettings!);
-    view?.renderer.setStyles?.(getStyles(viewSettings!, themeCode));
+    view?.renderer.setStyles?.(getStyles(viewSettings!));
   };
 
   useShortcuts(

apps/readest-app/src/app/reader/hooks/useIframeEvents.ts

@@ -59,6 +59,7 @@ export const useClickEvent = (
             }
           }
         } else if (msg.data.type === 'iframe-wheel' && !viewSettings.scrolled) {
+          // The wheel event is handled by the iframe itself in scrolled mode.
           const { deltaY } = msg.data;
           if (deltaY > 0) {
             viewRef.current?.next(1);
@@ -136,7 +137,11 @@ export const useTouchEvent = (
     if (hoveredBookKey && touchEnd) {
       const deltaY = touchEnd.screenY - touchStart.screenY;
       const deltaX = touchEnd.screenX - touchStart.screenX;
-      if (Math.abs(deltaX) > Math.abs(deltaY) && Math.abs(deltaX) > 10) {
+      if (!viewSettings!.scrolled && !viewSettings!.vertical) {
+        if (Math.abs(deltaX) > Math.abs(deltaY) && Math.abs(deltaX) > 10) {
+          setHoveredBookKey(null);
+        }
+      } else {
         setHoveredBookKey(null);
       }
     }
@@ -160,8 +165,10 @@ export const useTouchEvent = (
         Math.abs(deltaY) > Math.abs(deltaX) &&
         Math.abs(deltaX) < windowWidth * 0.3
       ) {
-        // swipe up to toggle the header bar and the footer bar
-        setHoveredBookKey(hoveredBookKey ? null : bookKey);
+        // swipe up to toggle the header bar and the footer bar, only for horizontal page mode
+        if (!viewSettings!.scrolled && !viewSettings!.vertical) {
+          setHoveredBookKey(hoveredBookKey ? null : bookKey);
+        }
       } else {
         if (hoveredBookKey) {
           setHoveredBookKey(null);
@@ -186,15 +193,10 @@ export const useTouchEvent = (
   };
 
   useEffect(() => {
-    // swipe touch is not compatible with scrolled mode, so only enable it in page mode
-    if (!viewSettings!.scrolled) {
-      window.addEventListener('message', handleTouch);
-      return () => {
-        window.removeEventListener('message', handleTouch);
-      };
-    } else {
-      return () => {};
-    }
+    window.addEventListener('message', handleTouch);
+    return () => {
+      window.removeEventListener('message', handleTouch);
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [hoveredBookKey, viewRef]);
 };

apps/readest-app/src/app/reader/hooks/useNotesSync.ts

@@ -1,6 +1,7 @@
 import { useEffect, useRef } from 'react';
 import { useAuth } from '@/context/AuthContext';
 import { useSync } from '@/hooks/useSync';
+import { BookNote } from '@/types/book';
 import { useBookDataStore } from '@/store/bookDataStore';
 import { SYNC_NOTES_INTERVAL_SEC } from '@/services/constants';
 
@@ -12,12 +13,6 @@ export const useNotesSync = (bookKey: string) => {
   const config = getConfig(bookKey);
   const bookHash = bookKey.split('-')[0]!;
 
-  useEffect(() => {
-    if (!user) return;
-    syncNotes([], bookHash, 'pull');
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   const lastSyncTime = useRef<number>(0);
   const syncTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
@@ -57,15 +52,27 @@ export const useNotesSync = (bookKey: string) => {
   }, [config]);
 
   useEffect(() => {
-    if (syncedNotes?.length && config?.location) {
+    const processNewNote = (note: BookNote) => {
+      const oldNotes = config?.booknotes ?? [];
+      const existingNote = oldNotes.find((oldNote) => oldNote.id === note.id);
+      if (existingNote) {
+        if (existingNote.updatedAt < note.updatedAt) {
+          return { ...existingNote, ...note };
+        } else {
+          return { ...note, ...existingNote };
+        }
+      }
+      return note;
+    };
+    if (syncedNotes?.length && config) {
       const newNotes = syncedNotes.filter((note) => note.bookHash === bookHash);
       if (!newNotes.length) return;
       const oldNotes = config.booknotes ?? [];
       const mergedNotes = [
         ...oldNotes.filter((oldNote) => !newNotes.some((newNote) => newNote.id === oldNote.id)),
-        ...newNotes,
+        ...newNotes.map(processNewNote),
       ];
-      setConfig(bookKey, { ...config, booknotes: mergedNotes });
+      setConfig(bookKey, { booknotes: mergedNotes });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [syncedNotes]);

apps/readest-app/src/app/reader/hooks/useProgressAutoSave.ts

@@ -6,7 +6,7 @@ import { useSettingsStore } from '@/store/settingsStore';
 import { throttle } from '@/utils/throttle';
 
 export const useProgressAutoSave = (bookKey: string) => {
-  const { envConfig, appService } = useEnv();
+  const { envConfig } = useEnv();
   const { getConfig, saveConfig } = useBookDataStore();
   const { getProgress } = useReaderStore();
   const progress = getProgress(bookKey);
@@ -22,9 +22,6 @@ export const useProgressAutoSave = (bookKey: string) => {
   );
 
   useEffect(() => {
-    // FIXME: On Android and iOS we need a better way to be notified
-    // when the app is about to go in background
-    if (!appService?.isMobile || !progress) return;
     saveBookConfig();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [progress, bookKey]);

apps/readest-app/src/app/reader/hooks/useProgressSync.ts

@@ -6,7 +6,7 @@ import { useBookDataStore } from '@/store/bookDataStore';
 import { useReaderStore } from '@/store/readerStore';
 import { useSettingsStore } from '@/store/settingsStore';
 import { useTranslation } from '@/hooks/useTranslation';
-import { deserializeConfig, serializeConfig } from '@/utils/serializer';
+import { serializeConfig } from '@/utils/serializer';
 import { CFI } from '@/libs/document';
 import { eventDispatcher } from '@/utils/event';
 import { DEFAULT_BOOK_SEARCH_CONFIG, SYNC_PROGRESS_INTERVAL_SEC } from '@/services/constants';
@@ -106,14 +106,9 @@ export const useProgressSync = (bookKey: string) => {
       configSynced.current = true;
       const syncedConfig = syncedConfigs.filter((c) => c.bookHash === bookKey.split('-')[0])[0];
       if (syncedConfig) {
-        const newConfig = deserializeConfig(
-          JSON.stringify(syncedConfig),
-          settings.globalViewSettings,
-          DEFAULT_BOOK_SEARCH_CONFIG,
-        );
-        setConfig(bookKey, { ...config, ...newConfig });
-        const syncedCFI = syncedConfig.location;
         const configCFI = config?.location;
+        const syncedCFI = syncedConfig.location;
+        setConfig(bookKey, syncedConfig);
         if (syncedCFI && configCFI) {
           if (CFI.compare(configCFI, syncedCFI) < 0) {
             if (view) {

apps/readest-app/src/app/reader/page.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { useEffect } from 'react';
-import { useTheme } from '@/hooks/useTheme';
 import { hasUpdater } from '@/services/environment';
 import { checkForAppUpdates } from '@/helpers/updater';
 import { useTranslation } from '@/hooks/useTranslation';
+import { useOpenWithBooks } from '@/hooks/useOpenWithBooks';
 import { useSettingsStore } from '@/store/settingsStore';
 import Reader from './components/Reader';
 
@@ -12,7 +12,7 @@ export default function Page() {
   const _ = useTranslation();
   const { settings } = useSettingsStore();
 
-  useTheme();
+  useOpenWithBooks();
 
   useEffect(() => {
     const doCheckAppUpdates = async () => {

apps/readest-app/src/app/reader/utils/viewSettingsHelper.ts

@@ -0,0 +1,29 @@
+import { ViewSettings } from '@/types/book';
+import { EnvConfigType } from '@/services/environment';
+import { useBookDataStore } from '@/store/bookDataStore';
+import { useReaderStore } from '@/store/readerStore';
+import { useSettingsStore } from '@/store/settingsStore';
+
+export const saveViewSettings = async <K extends keyof ViewSettings>(
+  envConfig: EnvConfigType,
+  bookKey: string,
+  key: K,
+  value: ViewSettings[K],
+  skipGlobal?: boolean,
+) => {
+  const { settings, isFontLayoutSettingsGlobal, setSettings, saveSettings } =
+    useSettingsStore.getState();
+  const { getViewSettings, setViewSettings } = useReaderStore.getState();
+  const { getConfig, saveConfig } = useBookDataStore.getState();
+  const viewSettings = getViewSettings(bookKey)!;
+  const config = getConfig(bookKey)!;
+  viewSettings[key] = value;
+  setViewSettings(bookKey, viewSettings);
+
+  if (isFontLayoutSettingsGlobal && !skipGlobal) {
+    settings.globalViewSettings[key] = value;
+    setSettings(settings);
+  }
+  await saveConfig(envConfig, bookKey, config, settings);
+  await saveSettings(envConfig, settings);
+};

apps/readest-app/src/app/user/page.tsx

@@ -169,9 +169,9 @@ const ProfilePage = () => {
       >
         <IoArrowBack className='text-base-content' />
       </button>
-      <div className='w-full max-w-4xl px-6 py-10'>
+      <div className='w-full max-w-4xl px-4 py-10'>
         <div className='bg-base-200 overflow-hidden rounded-lg p-2 shadow-md sm:p-6'>
-          <div className='p-6'>
+          <div className='p-2 sm:p-6'>
             <div className='mb-8 flex flex-col items-center gap-x-6 gap-y-4 md:flex-row md:items-start'>
               <div className='flex-shrink-0'>
                 {avatarUrl ? (
@@ -202,7 +202,7 @@ const ProfilePage = () => {
               </div>
             </div>
 
-            <div className='bg-base-100 mb-8 rounded-lg p-6'>
+            <div className='bg-base-100 mb-8 rounded-lg px-4 py-6'>
               <h3 className='text-base-content mb-2 text-lg font-semibold'>{_('Features')}</h3>
               <div className='mt-6'>
                 <ul className='text-base-content/60 grid grid-cols-1 gap-2 md:grid-cols-2'>

apps/readest-app/src/components/AboutWindow.tsx

@@ -20,7 +20,7 @@ export const AboutWindow = () => {
   const [isUpdated, setIsUpdated] = React.useState(false);
 
   const handleCheckUpdate = async () => {
-    const update = await checkForAppUpdates(_);
+    const update = await checkForAppUpdates(_, false);
     if (!update) {
       setIsUpdated(true);
     }

apps/readest-app/src/components/Dialog.tsx

@@ -7,11 +7,13 @@ import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 import { impactFeedback } from '@tauri-apps/plugin-haptics';
 
 const VELOCITY_THRESHOLD = 0.5;
+const SNAP_THRESHOLD = 0.2;
 
 interface DialogProps {
   id?: string;
   isOpen: boolean;
   children: ReactNode;
+  snapHeight?: number;
   header?: ReactNode;
   title?: string;
   className?: string;
@@ -25,6 +27,7 @@ const Dialog: React.FC<DialogProps> = ({
   id,
   isOpen,
   children,
+  snapHeight,
   header,
   title,
   className,
@@ -34,6 +37,7 @@ const Dialog: React.FC<DialogProps> = ({
   onClose,
 }) => {
   const { appService } = useEnv();
+  const [isFullHeightInMobile, setIsFullHeightInMobile] = React.useState(!snapHeight);
   const iconSize22 = useResponsiveSize(22);
   const isMobile = window.innerWidth < 640;
 
@@ -61,9 +65,12 @@ const Dialog: React.FC<DialogProps> = ({
     const newTop = Math.max(0.0, Math.min(1, heightFraction));
 
     if (modal && overlay) {
-      modal.style.transition = '';
+      modal.style.height = '100%';
       modal.style.transform = `translateY(${newTop * 100}%)`;
       overlay.style.opacity = `${1 - heightFraction}`;
+
+      setIsFullHeightInMobile(data.clientY < 44);
+      modal.style.transition = `padding-top 0.3s ease-out`;
     }
   };
 
@@ -72,11 +79,14 @@ const Dialog: React.FC<DialogProps> = ({
     const overlay = document.querySelector('.overlay') as HTMLElement;
     if (!modal || !overlay) return;
 
+    const snapUpper = snapHeight ? 1 - snapHeight - SNAP_THRESHOLD : 0.5;
+    const snapLower = snapHeight ? 1 - snapHeight + SNAP_THRESHOLD : 0.5;
     if (
       data.velocity > VELOCITY_THRESHOLD ||
-      (data.velocity >= 0 && data.clientY >= window.innerHeight * 0.5)
+      (data.velocity >= 0 && data.clientY >= window.innerHeight * snapLower)
     ) {
       const transitionDuration = 0.15 / Math.max(data.velocity, 0.5);
+      modal.style.height = '100%';
       modal.style.transition = `transform ${transitionDuration}s ease-out`;
       modal.style.transform = 'translateY(100%)';
       overlay.style.transition = `opacity ${transitionDuration}s ease-out`;
@@ -88,7 +98,22 @@ const Dialog: React.FC<DialogProps> = ({
       if (appService?.hasHaptics) {
         impactFeedback('medium');
       }
+    } else if (
+      snapHeight &&
+      data.clientY > window.innerHeight * snapUpper &&
+      data.clientY < window.innerHeight * snapLower
+    ) {
+      modal.style.transition = `transform 0.3s ease-out`;
+      modal.style.transform = `translateY(${(1 - snapHeight) * window.innerHeight}px)`;
+      setTimeout(() => {
+        modal.style.height = `${snapHeight * 100}%`;
+      }, 100);
+      if (appService?.hasHaptics) {
+        impactFeedback('medium');
+      }
     } else {
+      setIsFullHeightInMobile(true);
+      modal.style.height = '100%';
       modal.style.transition = `transform 0.3s ease-out`;
       modal.style.transform = `translateY(0%)`;
       overlay.style.opacity = '0';
@@ -104,20 +129,39 @@ const Dialog: React.FC<DialogProps> = ({
     <dialog
       id={id ?? 'dialog'}
       open={isOpen}
-      className={clsx('modal sm:min-w-90 z-50 h-full w-full !bg-transparent sm:w-full', className)}
+      className={clsx(
+        'modal sm:min-w-90 z-50 h-full w-full !items-start !bg-transparent sm:w-full sm:!items-center',
+        className,
+      )}
     >
-      <div className={clsx('overlay fixed inset-0 z-10 bg-black/50 sm:bg-black/20', bgClassName)} />
+      <div
+        className={clsx('overlay fixed inset-0 z-10 bg-black/50 sm:bg-black/20', bgClassName)}
+        onClick={onClose}
+      />
       <div
         className={clsx(
           'modal-box settings-content z-20 flex flex-col rounded-none rounded-tl-2xl rounded-tr-2xl p-0 sm:rounded-2xl',
-          'h-full max-h-full w-full max-w-full sm:w-[65%] sm:max-w-[600px]',
-          appService?.hasSafeAreaInset && 'pt-[env(safe-area-inset-top)] sm:pt-0',
+          'h-full max-h-full w-full max-w-full',
+          window.innerWidth < window.innerHeight
+            ? 'sm:h-[50%] sm:w-3/4'
+            : 'sm:h-[65%] sm:w-1/2 sm:max-w-[600px]',
+          appService?.hasSafeAreaInset &&
+            isFullHeightInMobile &&
+            'pt-[env(safe-area-inset-top)] sm:pt-0',
           boxClassName,
         )}
+        style={
+          snapHeight
+            ? {
+                height: `${snapHeight * 100}%`,
+                transform: `translateY(${(1 - snapHeight) * window.innerHeight}px)`,
+              }
+            : {}
+        }
       >
         {window.innerWidth < 640 && (
           <div
-            className='drag-handle flex h-10 w-full cursor-row-resize items-center justify-center'
+            className='drag-handle flex h-10 max-h-10 min-h-10 w-full cursor-row-resize items-center justify-center'
             onMouseDown={handleDragStart}
             onTouchStart={handleDragStart}
           >

apps/readest-app/src/components/DropIndicator.tsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import { useTranslation } from '@/hooks/useTranslation';
+import { HiArrowDownTray } from 'react-icons/hi2';
+
+const DropIndicator: React.FC = () => {
+  const _ = useTranslation();
+  return (
+    <>
+      <div className='drag-overlay'></div>
+      <div className='drop-indicator'>
+        <div className='flex flex-col items-center justify-center'>
+          <HiArrowDownTray className='h-12 w-12' />
+          <p className='mt-2 font-medium'>{_('Drop to Import Books')}</p>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default DropIndicator;

apps/readest-app/src/components/Slider.tsx

@@ -0,0 +1,93 @@
+import React, { useEffect, useState } from 'react';
+
+interface SliderProps {
+  min?: number;
+  max?: number;
+  step?: number;
+  initialValue?: number;
+  heightPx?: number;
+  minLabel?: string;
+  maxLabel?: string;
+  bubbleElement?: React.ReactNode;
+  bubbleLabel?: string;
+  className?: string;
+  minClassName?: string;
+  maxClassName?: string;
+  bubbleClassName?: string;
+  onChange?: (value: number) => void;
+}
+
+const Slider: React.FC<SliderProps> = ({
+  min = 0,
+  max = 100,
+  step = 1,
+  initialValue = 50,
+  heightPx = 40,
+  minLabel = '',
+  maxLabel = '',
+  bubbleElement,
+  bubbleLabel = '',
+  className = '',
+  minClassName = '',
+  maxClassName = '',
+  bubbleClassName = '',
+  onChange,
+}) => {
+  const [value, setValue] = useState(initialValue);
+
+  const handleChange = (e: React.ChangeEvent) => {
+    const newValue = parseInt((e.target as HTMLInputElement).value, 10);
+    setValue(newValue);
+    if (onChange) {
+      onChange(newValue);
+    }
+  };
+
+  useEffect(() => {
+    setValue(initialValue);
+  }, [initialValue]);
+
+  const percentage = ((value - min) / (max - min)) * 100;
+
+  return (
+    <div className={`slider bg-base-200 mx-auto w-full max-w-md rounded-xl ${className}`}>
+      <div className='relative' style={{ height: `${heightPx}px` }}>
+        <div className='bg-base-300/40 absolute h-full w-full rounded-full'></div>
+        <div
+          className='bg-base-300 absolute h-full rounded-full'
+          style={{ width: percentage > 0 ? `calc(${percentage}% + ${heightPx / 2}px)` : '0px' }}
+        ></div>
+        <div className='absolute inset-0 flex items-center justify-between px-4 text-sm'>
+          <span className={`ml-2 ${minClassName}`}>{minLabel}</span>
+          <span className={`mr-2 ${maxClassName}`}>{maxLabel}</span>
+        </div>
+        <div
+          className='pointer-events-none absolute top-0 z-10'
+          style={{
+            left: `max(${heightPx / 2}px, calc(${percentage}%))`,
+            transform: 'translateX(calc(-50%))',
+            height: '100%',
+          }}
+        >
+          <div
+            className={`bg-base-200 flex h-full items-center justify-center rounded-full text-sm shadow-md ${bubbleClassName}`}
+            style={{ width: `${heightPx}px` }}
+          >
+            {bubbleElement || bubbleLabel}
+          </div>
+        </div>
+        <input
+          type='range'
+          min={min}
+          max={max}
+          step={step}
+          value={value}
+          className='absolute inset-0 h-full w-full cursor-pointer opacity-0'
+          onChange={handleChange}
+        />
+      </div>
+    </div>
+  );
+};
+
+export default Slider;

apps/readest-app/src/context/AuthContext.tsx

@@ -3,6 +3,7 @@
 import React, { createContext, useState, useContext, ReactNode, useEffect } from 'react';
 import { User } from '@supabase/supabase-js';
 import { supabase } from '@/utils/supabase';
+import posthog from 'posthog-js';
 
 interface AuthContextType {
   token: string | null;
@@ -38,6 +39,7 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
         localStorage.setItem('token', access_token);
         localStorage.setItem('refresh_token', refresh_token);
         localStorage.setItem('user', JSON.stringify(user));
+        posthog.identify(user.id);
         setToken(access_token);
         setUser(user);
       } else {

apps/readest-app/src/helpers/updater.ts

@@ -6,10 +6,11 @@ import { TranslationFunc } from '@/hooks/useTranslation';
 
 const LAST_CHECK_KEY = 'lastAppUpdateCheck';
 
-export const checkForAppUpdates = async (_: TranslationFunc) => {
+export const checkForAppUpdates = async (_: TranslationFunc, autoCheck = true) => {
   const lastCheck = localStorage.getItem(LAST_CHECK_KEY);
   const now = Date.now();
-  if (lastCheck && now - parseInt(lastCheck, 10) < CHECK_UPDATE_INTERVAL_SEC * 1000) return;
+  if (autoCheck && lastCheck && now - parseInt(lastCheck, 10) < CHECK_UPDATE_INTERVAL_SEC * 1000)
+    return;
   localStorage.setItem(LAST_CHECK_KEY, now.toString());
 
   console.log('Checking for updates');

apps/readest-app/src/hooks/useOpenWithBooks.ts

@@ -0,0 +1,44 @@
+import { useEffect, useRef } from 'react';
+import { useRouter } from 'next/navigation';
+import { onOpenUrl } from '@tauri-apps/plugin-deep-link';
+import { isTauriAppPlatform } from '@/services/environment';
+import { useLibraryStore } from '@/store/libraryStore';
+import { navigateToLibrary } from '@/utils/nav';
+
+export function useOpenWithBooks() {
+  const router = useRouter();
+  const { setCheckOpenWithBooks } = useLibraryStore();
+  const listenedOpenWithBooks = useRef(false);
+
+  const handleOpenWithFileUrl = (url: string) => {
+    let filePath = url;
+    if (filePath.startsWith('file://')) {
+      filePath = decodeURI(filePath.replace('file://', ''));
+    }
+    if (filePath.startsWith('/')) {
+      window.OPEN_WITH_FILES = [filePath];
+      setCheckOpenWithBooks(true);
+      navigateToLibrary(router, `reload=${Date.now()}`);
+    }
+  };
+
+  useEffect(() => {
+    if (!isTauriAppPlatform()) return;
+    if (listenedOpenWithBooks.current) return;
+    listenedOpenWithBooks.current = true;
+
+    const listenOpenWithFiles = async () => {
+      return await onOpenUrl((urls) => {
+        urls.forEach((url) => {
+          handleOpenWithFileUrl(url);
+        });
+      });
+    };
+
+    const unlisten = listenOpenWithFiles();
+    return () => {
+      unlisten.then((f) => f());
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+}

apps/readest-app/src/hooks/useScreenWakeLock.ts

@@ -1,7 +1,10 @@
 import { useEffect, useRef } from 'react';
+import { getCurrentWindow } from '@tauri-apps/api/window';
+import { isTauriAppPlatform, isWebAppPlatform } from '@/services/environment';
 
 export const useScreenWakeLock = (lock: boolean) => {
   const wakeLockRef = useRef<WakeLockSentinel | null>(null);
+  const unlistenOnFocusChangedRef = useRef<Promise<() => void> | null>(null);
 
   useEffect(() => {
     const requestWakeLock = async () => {
@@ -20,20 +23,50 @@ export const useScreenWakeLock = (lock: boolean) => {
       }
     };
 
-    if (lock) {
-      requestWakeLock();
-    } else if (wakeLockRef.current) {
-      wakeLockRef.current.release();
-      wakeLockRef.current = null;
-      console.log('Wake lock released');
-    }
-
-    return () => {
+    const releaseWakeLock = () => {
       if (wakeLockRef.current) {
         wakeLockRef.current.release();
         wakeLockRef.current = null;
         console.log('Wake lock released');
       }
     };
+
+    const handleVisibilityChange = () => {
+      if (document.hidden) {
+        releaseWakeLock();
+      } else {
+        requestWakeLock();
+      }
+    };
+
+    if (lock) {
+      requestWakeLock();
+    } else if (wakeLockRef.current) {
+      releaseWakeLock();
+    }
+
+    if (isWebAppPlatform() && lock) {
+      document.addEventListener('visibilitychange', handleVisibilityChange);
+    } else if (isTauriAppPlatform() && lock) {
+      unlistenOnFocusChangedRef.current = getCurrentWindow().onFocusChanged(
+        ({ payload: focused }) => {
+          if (focused) {
+            requestWakeLock();
+          } else {
+            releaseWakeLock();
+          }
+        },
+      );
+    }
+
+    return () => {
+      releaseWakeLock();
+      if (isWebAppPlatform() && lock) {
+        document.removeEventListener('visibilitychange', handleVisibilityChange);
+      }
+      if (unlistenOnFocusChangedRef.current) {
+        unlistenOnFocusChangedRef.current.then((f) => f());
+      }
+    };
   }, [lock]);
 };

apps/readest-app/src/hooks/useTheme.ts

@@ -1,109 +1,21 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-import { ThemeCode } from '@/utils/style';
-import { themes, Palette } from '@/styles/themes';
-import { isWebAppPlatform } from '@/services/environment';
-
-export type ThemeMode = 'auto' | 'light' | 'dark';
+import { useEffect } from 'react';
+import { useThemeStore } from '@/store/themeStore';
+import { useSettingsStore } from '@/store/settingsStore';
+import { applyCustomTheme } from '@/styles/themes';
 
 export const useTheme = () => {
-  const [themeMode, setThemeMode] = useState<ThemeMode>(() => {
-    if (typeof window !== 'undefined' && localStorage) {
-      return (localStorage.getItem('themeMode') as ThemeMode) || 'auto';
-    }
-    return 'auto';
-  });
-
-  const [themeColor, setThemeColor] = useState(() => {
-    if (typeof window !== 'undefined' && localStorage) {
-      return localStorage.getItem('themeColor') || 'default';
-    }
-    return 'default';
-  });
-
-  const [systemIsDarkMode, setSystemIsDarkMode] = useState(() => {
-    return (
-      typeof window !== 'undefined' && window.matchMedia('(prefers-color-scheme: dark)').matches
-    );
-  });
-
-  const isDarkMode = themeMode === 'dark' || (themeMode === 'auto' && systemIsDarkMode);
-
-  const [themeCode, setThemeCode] = useState<ThemeCode>(() => {
-    let themeMode = 'auto';
-    let themeColor = 'default';
-    let systemIsDarkMode = false;
-    if (typeof window !== 'undefined') {
-      themeColor = localStorage.getItem('themeColor') || 'default';
-      themeMode = localStorage.getItem('themeMode') as ThemeMode;
-      systemIsDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
-    }
-    const isDarkMode = themeMode === 'dark' || (themeMode === 'auto' && systemIsDarkMode);
-    const defaultTheme = themes.find((theme) => theme.name === themeColor);
-    const defaultPalette = isDarkMode ? defaultTheme!.colors.dark : defaultTheme!.colors.light;
-    return {
-      bg: defaultPalette['base-100'],
-      fg: defaultPalette['base-content'],
-      primary: defaultPalette.primary,
-      palette: defaultPalette,
-    };
-  });
+  const { settings } = useSettingsStore();
+  const { themeColor, isDarkMode } = useThemeStore();
+  useEffect(() => {
+    const customThemes = settings.globalReadSettings?.customThemes ?? [];
+    customThemes.forEach((customTheme) => {
+      applyCustomTheme(customTheme);
+    });
+  }, [settings]);
 
   useEffect(() => {
-    if (typeof window !== 'undefined') {
-      const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
-      const handleSystemThemeChange = () => {
-        setSystemIsDarkMode(mediaQuery.matches);
-      };
-
-      mediaQuery.addEventListener('change', handleSystemThemeChange);
-      return () => mediaQuery.removeEventListener('change', handleSystemThemeChange);
-    }
-    return undefined;
-  }, []);
-
-  useEffect(() => {
-    document.documentElement.setAttribute(
-      'data-theme',
-      `${themeColor}-${isDarkMode ? 'dark' : 'light'}`,
-    );
+    const colorScheme = isDarkMode ? 'dark' : 'light';
+    document.documentElement.setAttribute('data-theme', `${themeColor}-${colorScheme}`);
+    document.documentElement.style.setProperty('color-scheme', colorScheme);
   }, [themeColor, isDarkMode]);
-
-  useEffect(() => {
-    if (typeof window !== 'undefined' && localStorage) {
-      localStorage.setItem('themeMode', themeMode);
-      localStorage.setItem('themeColor', themeColor);
-    }
-    const isDarkMode = themeMode === 'dark' || (themeMode === 'auto' && systemIsDarkMode);
-    const theme = themes.find((t) => t.name === themeColor);
-    const palette = isDarkMode ? theme!.colors.dark : theme!.colors.light;
-    const bg = palette['base-100'];
-    const fg = palette['base-content'];
-    const primary = palette.primary;
-    if (isWebAppPlatform()) {
-      document.querySelector('meta[name="theme-color"]')?.setAttribute('content', bg);
-    }
-    setThemeCode({ bg, fg, primary, palette });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [themeMode, themeColor, isDarkMode]);
-
-  const updateThemeMode = (mode: ThemeMode) => setThemeMode(mode);
-  const updateThemeColor = (color: string) => setThemeColor(color);
-  const updateAppTheme = (color: keyof Palette) => {
-    if (isWebAppPlatform()) {
-      const { palette } = themeCode;
-      document.querySelector('meta[name="theme-color"]')?.setAttribute('content', palette[color]);
-    }
-  };
-
-  return {
-    themeMode,
-    themeColor,
-    themeCode,
-    isDarkMode,
-    updateThemeMode,
-    updateThemeColor,
-    updateAppTheme,
-  };
 };

apps/readest-app/src/hooks/useTrafficLight.ts

@@ -1,47 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useEnv } from '@/context/EnvContext';
-
-/**
- * Custom hook to get the visibility of the traffic light (window control buttons on macOS)
- * based on the fullscreen state of the application window.
- *
- * @returns {Object} An object containing:
- * - `isTrafficLightVisible` (boolean): A state indicating whether the traffic light is visible.
- */
-const useTrafficLight = () => {
-  const { appService } = useEnv();
-  const [isTrafficLightVisible, setVisible] = useState(appService?.hasTrafficLight ?? false);
-  let unlistenEnterFullScreen: () => void;
-  let unlistenExitFullScreen: () => void;
-
-  const handleSwitchFullScreen = async () => {
-    const { getCurrentWindow } = await import('@tauri-apps/api/window');
-    const currentWindow = getCurrentWindow();
-    const isFullscreen = await currentWindow.isFullscreen();
-    if (appService?.hasTrafficLight) setVisible(!isFullscreen);
-
-    unlistenEnterFullScreen = await currentWindow.listen('will-enter-fullscreen', () => {
-      if (appService?.hasTrafficLight) setVisible(false);
-    });
-
-    unlistenExitFullScreen = await currentWindow.listen('will-exit-fullscreen', () => {
-      if (appService?.hasTrafficLight) setVisible(true);
-    });
-  };
-
-  useEffect(() => {
-    if (!appService?.hasTrafficLight) return;
-
-    handleSwitchFullScreen();
-
-    return () => {
-      unlistenEnterFullScreen?.();
-      unlistenExitFullScreen?.();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return { isTrafficLightVisible };
-};
-
-export default useTrafficLight;

apps/readest-app/src/hooks/useUICSS.ts

@@ -0,0 +1,26 @@
+import { ViewSettings } from '@/types/book';
+import { useEffect, useState } from 'react';
+
+// This hook allows you to inject custom CSS into the reader UI.
+// Note that the book content is rendered in an iframe, so UI CSS won't affect book rendering.
+export const useUICSS = (bookKey: string, viewSettings: ViewSettings) => {
+  const [styleElement, setStyleElement] = useState<HTMLStyleElement | null>(null);
+
+  useEffect(() => {
+    if (!viewSettings) return;
+    if (styleElement) {
+      styleElement.remove();
+    }
+
+    const rawCSS = viewSettings.userStylesheet;
+    const newStyleEl = document.createElement('style');
+    newStyleEl.textContent = rawCSS.replace('foliate-view', `#foliate-view-${bookKey}`);
+    document.head.appendChild(newStyleEl);
+    setStyleElement(newStyleEl);
+
+    return () => {
+      newStyleEl.remove();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [viewSettings]);
+};

apps/readest-app/src/libs/document.ts

@@ -99,6 +99,31 @@ export class DocumentLoader {
   }
 
   private async makeZipLoader() {
+    const getComment = async (): Promise<string | null> => {
+      const EOCD_SIGNATURE = [0x50, 0x4b, 0x05, 0x06];
+      const maxEOCDSearch = 1024 * 64;
+
+      const sliceSize = Math.min(maxEOCDSearch, this.file.size);
+      const tail = await this.file.slice(this.file.size - sliceSize, this.file.size).arrayBuffer();
+      const bytes = new Uint8Array(tail);
+
+      for (let i = bytes.length - 22; i >= 0; i--) {
+        if (
+          bytes[i] === EOCD_SIGNATURE[0] &&
+          bytes[i + 1] === EOCD_SIGNATURE[1] &&
+          bytes[i + 2] === EOCD_SIGNATURE[2] &&
+          bytes[i + 3] === EOCD_SIGNATURE[3]
+        ) {
+          const commentLength = bytes[i + 20]! + (bytes[i + 21]! << 8);
+          const commentStart = i + 22;
+          const commentBytes = bytes.slice(commentStart, commentStart + commentLength);
+          return new TextDecoder().decode(commentBytes);
+        }
+      }
+
+      return null;
+    };
+
     const { configure, ZipReader, BlobReader, TextWriter, BlobWriter } = await import(
       '@zip.js/zip.js'
     );
@@ -120,7 +145,7 @@ export class DocumentLoader {
     );
     const getSize = (name: string) => map.get(name)?.uncompressedSize ?? 0;
 
-    return { entries, loadText, loadBlob, getSize, sha1: undefined };
+    return { entries, loadText, loadBlob, getSize, getComment, sha1: undefined };
   }
 
   private isCBZ(): boolean {
@@ -155,7 +180,7 @@ export class DocumentLoader {
 
       if (this.isCBZ()) {
         const { makeComicBook } = await import('foliate-js/comic-book.js');
-        book = makeComicBook(loader, this.file);
+        book = await makeComicBook(loader, this.file);
         format = 'CBZ';
       } else if (this.isFBZ()) {
         const entry = entries.find((entry) => entry.filename.endsWith(`.${EXTS.FB2}`));

apps/readest-app/src/pages/api/deepl/translate.ts

@@ -2,6 +2,7 @@ import { NextApiRequest, NextApiResponse } from 'next';
 import { corsAllMethods, runMiddleware } from '@/utils/cors';
 import { supabase } from '@/utils/supabase';
 import { getUserPlan } from '@/utils/access';
+import { query as deeplQuery } from '@/utils/deepl';
 
 const DEEPL_FREE_API = 'https://api-free.deepl.com/v2/translate';
 const DEEPL_PRO_API = 'https://api.deepl.com/v2/translate';
@@ -27,8 +28,9 @@ const getDeepLAPIKey = (keys: string | undefined) => {
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const { user, token } = await getUserAndToken(req.headers['authorization']);
   let deeplApiUrl = DEEPL_FREE_API;
+  let userPlan = 'free';
   if (user && token) {
-    const userPlan = getUserPlan(token);
+    userPlan = getUserPlan(token);
     if (userPlan !== 'free') deeplApiUrl = DEEPL_PRO_API;
   }
   const deeplAuthKey =
@@ -38,17 +40,31 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
 
   await runMiddleware(req, res, corsAllMethods);
 
+  const {
+    text,
+    source_lang: sourceLang = 'auto',
+    target_lang: targetLang = 'en',
+  }: { text: string[]; source_lang: string; target_lang: string } = req.body;
   try {
-    const response = await fetch(deeplApiUrl, {
-      method: 'POST',
-      headers: {
-        Authorization: `DeepL-Auth-Key ${deeplAuthKey}`,
-        'Content-Type': 'application/json',
-      },
-      body: req.method === 'POST' ? JSON.stringify(req.body) : undefined,
-    });
-    res.status(response.status);
-    res.json(await response.json());
+    if (targetLang.toLowerCase().includes('zh')) {
+      const response = await fetch(deeplApiUrl, {
+        method: 'POST',
+        headers: {
+          Authorization: `DeepL-Auth-Key ${deeplAuthKey}`,
+          'Content-Type': 'application/json',
+        },
+        body: req.method === 'POST' ? JSON.stringify(req.body) : undefined,
+      });
+      res.status(response.status);
+      res.json(await response.json());
+    } else {
+      const result = await deeplQuery({
+        text: text[0] ?? '',
+        sourceLang,
+        targetLang,
+      });
+      res.status(200).json(result);
+    }
   } catch (error) {
     console.error('Error proxying DeepL request:', error);
     res.status(500).json({ error: 'Internal Server Error' });

apps/readest-app/src/pages/api/sync.ts

@@ -30,19 +30,26 @@ const getUserAndToken = async (req: NextRequest) => {
   if (!authHeader) return {};
 
   const token = authHeader.replace('Bearer ', '');
-  const {
-    data: { user },
-    error,
-  } = await supabase.auth.getUser(token);
-
-  if (error || !user) return {};
-  return { user, token };
+  try {
+    const {
+      data: { user },
+      error,
+    } = await supabase.auth.getUser(token);
+    if (error?.message === 'fetch failed') {
+      return { error: 'Network error' };
+    } else if (error || !user) {
+      return { error: 'Not authenticated' };
+    }
+    return { user, token };
+  } catch {
+    return { error: 'Network error' };
+  }
 };
 
 export async function GET(req: NextRequest) {
-  const { user, token } = await getUserAndToken(req);
-  if (!user || !token) {
-    return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
+  const { user, token, error } = await getUserAndToken(req);
+  if (!user || !token || error) {
+    return NextResponse.json({ error: error || 'Unknown error' }, { status: 401 });
   }
   const supabase = createSupabaseClient(token);
 
@@ -114,9 +121,9 @@ export async function GET(req: NextRequest) {
 }
 
 export async function POST(req: NextRequest) {
-  const { user, token } = await getUserAndToken(req);
-  if (!user || !token) {
-    return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
+  const { user, token, error } = await getUserAndToken(req);
+  if (!user || !token || error) {
+    return NextResponse.json({ error: error || 'Unknown error' }, { status: 401 });
   }
   const supabase = createSupabaseClient(token);
 
@@ -173,8 +180,6 @@ export async function POST(req: NextRequest) {
           clientDeletedAt > serverDeletedAt || clientUpdatedAt > serverUpdatedAt;
 
         if (clientIsNewer) {
-          // use server updated_at for updated records
-          dbRec.updated_at = new Date().toISOString();
           const { data: updated, error: updateError } = await supabase
             .from(table)
             .update(dbRec)

apps/readest-app/src/services/appService.ts

@@ -36,6 +36,7 @@ import { getOSPlatform, isCJKEnv, isValidURL } from '@/utils/misc';
 import { deserializeConfig, serializeConfig } from '@/utils/serializer';
 import { downloadFile, uploadFile, deleteFile, createProgressHandler } from '@/libs/storage';
 import { ProgressHandler } from '@/utils/transfer';
+import { TxtToEpubConverter } from '@/utils/txt';
 import { BOOK_FILE_NOT_FOUND_ERROR } from './errors';
 
 export abstract class BaseAppService implements AppService {
@@ -53,6 +54,7 @@ export abstract class BaseAppService implements AppService {
   abstract hasRoundedWindow: boolean;
   abstract hasSafeAreaInset: boolean;
   abstract hasHaptics: boolean;
+  abstract hasSysFontsList: boolean;
 
   abstract resolvePath(fp: string, base: BaseDir): { baseDir: number; base: BaseDir; fp: string };
   abstract getCoverImageUrl(book: Book): string;
@@ -124,7 +126,7 @@ export abstract class BaseAppService implements AppService {
   }
 
   async importBook(
-    file: string | File,
+    file: string | File, // file path/url or file object
     books: Book[],
     saveBook: boolean = true,
     saveCover: boolean = true,
@@ -144,6 +146,10 @@ export abstract class BaseAppService implements AppService {
           filename = file.name;
           fileobj = file;
         }
+        if (filename.endsWith('.txt')) {
+          const txt2epub = new TxtToEpubConverter();
+          ({ file: fileobj } = await txt2epub.convert({ file: fileobj }));
+        }
         ({ book: loadedBook, format } = await new DocumentLoader(fileobj).open());
         if (!loadedBook.metadata.title) {
           loadedBook.metadata.title = getBaseFilename(filename);
@@ -176,7 +182,7 @@ export abstract class BaseAppService implements AppService {
         await this.fs.createDir(getDir(book), 'Books');
       }
       if (saveBook && (!(await this.fs.exists(getFilename(book), 'Books')) || overwrite)) {
-        if (typeof file === 'string' && !isValidURL(file)) {
+        if (typeof file === 'string' && !isValidURL(file) && !filename.endsWith('.txt')) {
           await this.fs.copyFile(file, getFilename(book), 'Books');
         } else {
           await this.fs.writeFile(getFilename(book), 'Books', await fileobj.arrayBuffer());
@@ -192,6 +198,9 @@ export abstract class BaseAppService implements AppService {
       if (!existingBook) {
         await this.saveBookConfig(book, INIT_BOOK_CONFIG);
         books.splice(0, 0, book);
+      } else {
+        existingBook.title = book.title;
+        existingBook.author = book.author;
       }
 
       if (typeof file === 'string' && isValidURL(file)) {