release: version 0.9.8 (#283)

.github/workflows/pull-request.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y pkg-config libfontconfig-dev libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev libsoup-3.0-dev
+          sudo apt-get install -y libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev libsoup-3.0-dev
       - name: Format
         working-directory: apps/readest-app/src-tauri
         run: cargo fmt --check

.github/workflows/release.yml

@@ -73,7 +73,7 @@ jobs:
             args: '--target aarch64-pc-windows-msvc --bundles nsis'
 
     runs-on: ${{ matrix.config.os }}
-    timeout-minutes: 25
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
 
@@ -121,7 +121,7 @@ jobs:
         if: matrix.config.os == 'ubuntu-22.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y pkg-config libfontconfig-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
       - uses: tauri-apps/tauri-action@v0
         env:
@@ -168,95 +168,6 @@ jobs:
           echo "Uploading $bin_file to GitHub release"
           gh release upload ${{ needs.get-release.outputs.release_tag }} $bin_file --clobber
 
-  build-tauri-linux-arm:
-    if: false
-    permissions:
-      contents: write
-    runs-on: ubuntu-22.04
-    needs: [get-release]
-
-    strategy:
-      matrix:
-        arch: [aarch64, armv7l]
-        include:
-          - arch: aarch64
-            cpu: cortex-a72
-            base_image: https://dietpi.com/downloads/images/DietPi_RPi-ARMv8-Bookworm.img.xz
-            deb: arm64
-            appimage: aarch64
-          - arch: armv7l
-            cpu: cortex-a53
-            deb: armhfp
-            appimage: armhf
-            base_image: https://dietpi.com/downloads/images/DietPi_RPi-ARMv7-Bookworm.img.xz
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: initialize git submodules
-        run: git submodule update --init --recursive
-
-      - name: create .env.local file for Next.js
-        run: |
-          echo "NEXT_PUBLIC_POSTHOG_KEY=${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}" >> .env.local
-          echo "NEXT_PUBLIC_POSTHOG_HOST=${{ secrets.NEXT_PUBLIC_POSTHOG_HOST }}" >> .env.local
-          echo "NEXT_PUBLIC_SUPABASE_URL=${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}" >> .env.local
-          echo "NEXT_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}" >> .env.local
-          echo "NEXT_PUBLIC_APP_PLATFORM=tauri" >> .env.local
-
-      - name: copy .env.local to apps/readest-app
-        run: cp .env.local apps/readest-app/.env.local
-
-      - name: cache rust build artifacts
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-
-      - name: build app
-        uses: pguyot/arm-runner-action@v2.6.5
-        with:
-          base_image: ${{ matrix.base_image }}
-          cpu: ${{ matrix.cpu }}
-          bind_mount_repository: true
-          image_additional_mb: 10240
-          optimize_image: no
-          #exit_on_fail: no
-          commands: |
-            # Prevent Rust from complaining about $HOME not matching eid home
-            export HOME=/root
-
-            # Workaround to CI worker being stuck on Updating crates.io index
-            export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
-
-            # Install setup prerequisites
-            apt-get update -y --allow-releaseinfo-change
-            apt-get autoremove -y
-            apt-get install -y --no-install-recommends --no-install-suggests pkg-config libfontconfig-dev curl libwebkit2gtk-4.1-dev build-essential libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf libfuse2 file
-            curl https://sh.rustup.rs -sSf | sh -s -- -y
-            . "$HOME/.cargo/env"
-            curl -fsSL https://deb.nodesource.com/setup_lts.x | bash
-            apt-get install -y nodejs
-
-            npm install -g pnpm@latest-10
-
-            # Install frontend dependencies
-            pnpm install
-
-            # Copy pdfjs-dist to public directory
-            pnpm --filter @readest/readest-app setup-pdfjs
-
-            # Build the application
-            pnpm tauri build
-
-      - name: upload arm bundles
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-          version=${{ needs.get-release.outputs.release_version }}
-          gh release upload ${{ needs.get-release.outputs.release_tag }} target/release/bundle/deb/Readest_${version}_${{ matrix.deb }}.deb  --clobber
-          gh release upload ${{ needs.get-release.outputs.release_tag }} target/release/bundle/appimage/Readest_${version}_${{ matrix.appimage }}.AppImage  --clobber
-
   update-release:
     permissions:
       contents: write

README.md

@@ -5,14 +5,13 @@
   <h1>Readest</h1>
   <br>
 
-[Readest][link-website] is an open-source ebook reader designed for immersive and deep reading experiences. Built as a modern rewrite of [Foliate](https://github.com/johnfactotum/foliate), it leverages [Next.js 15](https://github.com/vercel/next.js) and [Tauri v2](https://github.com/tauri-apps/tauri) to deliver a smooth, cross-platform experience across macOS, Windows, Linux, Android, iOS, and the Web.
+[Readest][link-website] is an open-source ebook reader designed for immersive and deep reading experiences. Built as a modern rewrite of [Foliate](https://github.com/johnfactotum/foliate), it leverages [Next.js 15](https://github.com/vercel/next.js) and [Tauri v2](https://github.com/tauri-apps/tauri) to offer a seamless cross-platform experience on macOS, Windows, Linux and Web, with support for mobile platforms coming soon.
 
 [![Website][badge-website]][link-website]
 [![Web App][badge-web-app]][link-web-readest]
 [![OS][badge-platforms]][link-website]
-<br>
-[![][badge-hellogithub]][link-hellogithub]
 [![][badge-discord]][link-discord]
+<br>
 [![AGPL Licence][badge-license]](LICENSE)
 [![Latest release][badge-release]][link-gh-releases]
 [![Last commit][badge-last-commit]][link-gh-commits]
@@ -62,8 +61,9 @@
 
 | **Feature**                     | **Description**                                                                            | **Priority** |
 | ------------------------------- | ------------------------------------------------------------------------------------------ | ------------ |
+| **Support iOS and Android**     | Expand the APP to work on iOS and Android devices.                                         | 🛠           |
 | **Library Management**          | Organize, sort, and manage your entire ebook library.                                      | 🛠           |
-| **AI-Powered Summarization**    | Generate summaries of books or chapters using AI for quick insights.                       | 🛠           |
+| **AI-Powered Summarization**    | Generate summaries of books or chapters using AI for quick insights.                       | 🔄           |
 | **Sync with Koreader**          | Synchronize reading progress, notes, and bookmarks with [Koreader][link-koreader] devices. | 🔄           |
 | **Keyboard Navigation**         | Implement vimium-style keybindings for book navigation.                                    | 🔄           |
 | **Support OPDS/Calibre**        | Integrate OPDS/Calibre to access online libraries and catalogs.                            | 🔄           |
@@ -152,34 +152,16 @@ For Windows targets, “Build Tools for Visual Studio 2022” (or a higher editi
 pnpm tauri dev
 ```
 
-For Android:
-
-```bash
-# Initialize the Android environment (run once)
-pnpm tauri android init
-
-pnpm tauri android dev
-# or if you want to dev on a real device
-pnpm tauri android dev --host
-```
-
 For iOS:
 
 ```bash
-# Set up the iOS environment (run once)
-pnpm tauri ios init
-
 pnpm tauri ios dev
-# or if you want to dev on a real device
-pnpm tauri ios dev --host
 ```
 
 ### 5. Build for Production
 
 ```bash
 pnpm tauri build
-pnpm tauri android build
-pnpm tauri ios build
 ```
 
 ### 6. Setup dev environment with Nix
@@ -211,7 +193,7 @@ Readest is open-source, and contributions are welcome! Feel free to open issues,
 
 Readest is free software: you can redistribute it and/or modify it under the terms of the [GNU Affero General Public License](https://www.gnu.org/licenses/agpl-3.0.html) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. See the [LICENSE](LICENSE) file for details.
 
-The following libraries and frameworks are used in this software:
+The following libraries and software are used in this software:
 
 - [foliate-js](https://github.com/johnfactotum/foliate-js), which is MIT licensed.
 - [zip.js](https://github.com/gildas-lormeau/zip.js), which is licensed under the BSD-3-Clause license.
@@ -234,11 +216,10 @@ The following fonts are utilized in this software, either bundled within the app
 [badge-web-app]: https://img.shields.io/badge/read%20online-web.readest.com-orange
 [badge-license]: https://img.shields.io/github/license/readest/readest?color=teal
 [badge-release]: https://img.shields.io/github/release/readest/readest?color=green
-[badge-platforms]: https://img.shields.io/badge/platforms-macOS%2C%20Windows%2C%20Linux%2C%20Android%2C%20iOS%2C%20Web%2C%20PWA-green
+[badge-platforms]: https://img.shields.io/badge/platforms-macOS%2C%20Windows%2C%20Linux%2C%20Web%2C%20PWA-green
 [badge-last-commit]: https://img.shields.io/github/last-commit/readest/readest?color=green
 [badge-commit-activity]: https://img.shields.io/github/commit-activity/m/readest/readest
 [badge-discord]: https://img.shields.io/discord/1314226120886976544?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square
-[badge-hellogithub]: https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=8a5b6ade2aee461a8bd94e59200682a7&claim_uid=eRLUbPOy2qZtDgw&theme=small
 [link-macos-appstore]: https://apps.apple.com/app/apple-store/id6738622779?pt=127463130&ct=github&mt=8
 [link-website]: https://readest.com?utm_source=github&utm_medium=referral&utm_campaign=readme
 [link-web-readest]: https://web.readest.com
@@ -249,4 +230,3 @@ The following fonts are utilized in this software, either bundled within the app
 [link-discord]: https://discord.gg/gntyVNk3BJ
 [link-parallel-read]: https://readest.com/#parallel-read
 [link-koreader]: https://github.com/koreader/koreader
-[link-hellogithub]: https://hellogithub.com/repository/8a5b6ade2aee461a8bd94e59200682a7

apps/readest-app/.env.local.example

@@ -6,10 +6,3 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=YOUR_SUPABASE_ANON_KEY
 
 DEEPL_PRO_API_KEY=YOUR_DEEPL_PRO_API_KEY
 DEEPL_FREE_API_KEY=YOUR_DEEPL_FREE_API_KEY
-
-R2_TOKEN_VALUE=YOUR_R2_TOKEN_VALUE
-R2_ACCESS_KEY_ID=YOUR_R2_ACCESS_KEY_ID
-R2_SECRET_ACCESS_KEY=YOUR_R2_SECRET_ACCESS_KEY
-R2_BUCKET_NAME=YOUR_R2_BUCKET_NAME
-R2_ACCOUNT_ID=YOUR_R2_ACCOUNT_ID
-R2_REGION=YOUR_R2_REGION

apps/readest-app/.gitignore

@@ -40,10 +40,6 @@ tauri.*.conf.json
 # vercel
 .vercel
 
-# open-next
-.open-next
-.wrangler
-
 # typescript
 *.tsbuildinfo
 next-env.d.ts

apps/readest-app/next.config.mjs

@@ -19,19 +19,6 @@ const nextConfig = {
   // Configure assetPrefix or else the server won't properly resolve your assets.
   assetPrefix: '',
   reactStrictMode: true,
-  async headers() {
-    return [
-      {
-        source: '/.well-known/apple-app-site-association',
-        headers: [
-          {
-            key: 'Content-Type',
-            value: 'application/json',
-          },
-        ],
-      },
-    ];
-  },
 };
 
 const withPWA = withPWAInit({

apps/readest-app/open-next.config.ts

@@ -1,29 +0,0 @@
-// @ts-nocheck
-// default open-next.config.ts file created by @opennextjs/cloudflare
-
-import type { OpenNextConfig } from '@opennextjs/aws/types/open-next.js';
-import cache from '@opennextjs/cloudflare/kv-cache';
-
-const config: OpenNextConfig = {
-  default: {
-    override: {
-      wrapper: 'cloudflare-node',
-      converter: 'edge',
-      // set `incrementalCache` to "dummy" to disable KV cache
-      incrementalCache: async () => cache,
-      tagCache: 'dummy',
-      queue: 'dummy',
-    },
-  },
-
-  middleware: {
-    external: true,
-    override: {
-      wrapper: 'cloudflare-edge',
-      converter: 'edge',
-      proxyExternalRequest: 'fetch',
-    },
-  },
-};
-
-export default config;

apps/readest-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readest/readest-app",
-  "version": "0.9.13",
+  "version": "0.9.7",
   "private": true,
   "scripts": {
     "dev": "dotenv -e .env.tauri -- next dev",
@@ -26,13 +26,7 @@
     "build-macos-universial": "dotenv -e .env.tauri.local -e .env.apple-nonstore.local -- tauri build -t universal-apple-darwin --bundles dmg",
     "build-macos-universial-appstore": "dotenv -e .env.tauri.local -e .env.apple-appstore.local -- tauri build -t universal-apple-darwin --bundles app --config src-tauri/tauri.appstore.conf.json",
     "build-macos-universial-appstore-dev": "dotenv -e .env.tauri.local -e .env.apple-appstore-dev.local -- tauri build -t universal-apple-darwin --bundles app --config src-tauri/tauri.appstore-dev.conf.json",
-    "build-ios": "dotenv -e .env.ios-appstore-dev.local -- tauri ios build",
-    "build-ios-appstore": "dotenv -e .env.ios-appstore.local -- tauri ios build --export-method app-store-connect",
-    "release-macos-universial-appstore": "dotenv -e .env.tauri.local -e .env.apple-appstore.local -- bash scripts/release-mac-appstore.sh",
-    "release-ios-appstore": "dotenv -e .env.ios-appstore.local -- bash scripts/release-ios-appstore.sh",
-    "preview": "NEXT_PUBLIC_APP_PLATFORM=web opennextjs-cloudflare && wrangler dev",
-    "deploy": "NEXT_PUBLIC_APP_PLATFORM=web opennextjs-cloudflare && wrangler deploy",
-    "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
+    "release-macos-universial-appstore": "dotenv -e .env.tauri.local -e .env.apple-appstore.local -- bash scripts/release-mac-appstore.sh"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
@@ -42,18 +36,18 @@
     "@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.1.1",
     "@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-http": "^2.3.0",
-    "@tauri-apps/plugin-log": "^2.2.1",
-    "@tauri-apps/plugin-opener": "^2.2.5",
+    "@tauri-apps/plugin-http": "^2.2.0",
+    "@tauri-apps/plugin-log": "^2.2.0",
+    "@tauri-apps/plugin-opener": "^2.2.2",
     "@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.3.0",
     "@zip.js/zip.js": "^2.7.53",
     "clsx": "^2.1.1",
     "cors": "^2.8.5",
@@ -64,7 +58,7 @@
     "i18next-http-backend": "^3.0.1",
     "js-md5": "^0.8.3",
     "jwt-decode": "^4.0.0",
-    "next": "15.1.6",
+    "next": "15.1.0",
     "posthog-js": "^1.205.0",
     "react": "19.0.0",
     "react-dom": "19.0.0",
@@ -75,7 +69,7 @@
     "zustand": "5.0.1"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.2.7",
+    "@tauri-apps/cli": "2.1.0",
     "@types/cors": "^2.8.17",
     "@types/cssbeautify": "^0.3.5",
     "@types/node": "^22.10.1",

apps/readest-app/public/.well-known/apple-app-site-association

@@ -1,17 +0,0 @@
-{
-  "applinks": {
-    "details": [
-      {
-        "appIDs": [
-          "J5W48D69VR.com.bilingify.readest"
-        ],
-        "components": [
-          {
-            "/": "/auth/*",
-            "comment": "Matches any URL whose path starts with /auth/"
-          }
-        ]
-      }
-    ]
-  }
-}

apps/readest-app/public/.well-known/assetlinks.json

@@ -1,12 +0,0 @@
-[
-  {
-    "relation": ["delegate_permission/common.handle_all_urls"],
-    "target": {
-      "namespace": "android_app",
-      "package_name": "com.bilingify.readest",
-      "sha256_cert_fingerprints": [
-        "65:2D:11:67:76:12:29:14:18:42:CB:3D:18:50:B6:E4:7E:46:E1:2F:4B:E4:7F:5A:6C:14:B6:D7:12:74:1E:82"
-      ]
-    }
-  }
-]

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

@@ -57,6 +57,7 @@
   "Language:": "Sprache:",
   "Layout": "Layout",
   "Light Mode": "Hellmodus",
+  "Line Height": "Zeilenhöhe",
   "Loading...": "Wird geladen...",
   "Loc. {{currentPage}} / {{totalPage}}": "Pos. {{currentPage}} / {{totalPage}}",
   "Logged in": "Angemeldet",
@@ -75,6 +76,7 @@
   "Notebook": "Notizbuch",
   "Notes": "Notizen",
   "Open": "Öffnen",
+  "Open Book": "Buch öffnen",
   "Original Text": "Originaltext",
   "Page": "Seite",
   "Paging Animation": "Blätter-Animation",
@@ -147,23 +149,5 @@
   "Storage": "Speicher",
   "Book deleted: {{title}}": "Buch gelöscht: {{title}}",
   "Failed to delete book: {{title}}": "Fehler beim Löschen des Buches: {{title}}",
-  "Check Updates on Start": "Aktualisierungen beim Start prüfen",
-  "Insufficient storage quota": "Unzureichendes Speicherkontingent",
-  "Font Weight": "Schriftgewicht",
-  "Line Spacing": "Zeilenabstand",
-  "Word Spacing": "Wortabstand",
-  "Letter Spacing": "Buchstabenabstand",
-  "Text Indent": "Texteinzug",
-  "Paragraph Margin": "Absatzrand",
-  "Override Book Layout": "Buch-Layout überschreiben",
-  "Add to Group": "Zur Gruppe hinzufügen",
-  "Untitled Group": "Unbenannte Gruppe",
-  "Group Books": "Bücher gruppieren",
-  "Remove From Group": "Aus Gruppe entfernen",
-  "Create New Group": "Neue Gruppe erstellen",
-  "Deselect Book": "Buch abwählen",
-  "Download Book": "Buch herunterladen",
-  "Deselect Group": "Gruppe abwählen",
-  "Select Group": "Gruppe auswählen",
-  "Keep Screen Awake": "Bildschirm aktiv halten"
+  "Check Updates on Start": "Aktualisierungen beim Start prüfen"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Γλώσσα:",
   "Layout": "Διάταξη",
   "Light Mode": "Φωτεινή λειτουργία",
+  "Line Height": "Ύψος γραμμής",
   "Loading...": "Φόρτωση...",
   "Loc. {{currentPage}} / {{totalPage}}": "Θέση {{currentPage}} / {{totalPage}}",
   "Logged in": "Συνδεδεμένος",
@@ -75,6 +76,7 @@
   "Notebook": "Σημειωματάριο",
   "Notes": "Σημειώσεις",
   "Open": "Άνοιγμα",
+  "Open Book": "Άνοιγμα βιβλίου",
   "Original Text": "Αρχικό κείμενο",
   "Page": "Σελίδα",
   "Paging Animation": "Κινούμενα σχέδια σελιδοποίησης",
@@ -147,23 +149,5 @@
   "Storage": "Αποθήκευση",
   "Book deleted: {{title}}": "Το βιβλίο με τίτλο {{title}} διαγράφηκε",
   "Failed to delete book: {{title}}": "Αποτυχία διαγραφής βιβλίου: {{title}}",
-  "Check Updates on Start": "Έλεγχος ενημερώσεων κατά την εκκίνηση",
-  "Insufficient storage quota": "Ανεπαρκές όριο αποθήκευσης",
-  "Font Weight": "Βάρος γραμματοσειράς",
-  "Line Spacing": "Διάκενο γραμμών",
-  "Word Spacing": "Διάκενο λέξεων",
-  "Letter Spacing": "Διάκενο γραμμάτων",
-  "Text Indent": "Εσοχή κειμένου",
-  "Paragraph Margin": "Περιθώριο παραγράφου",
-  "Override Book Layout": "Παράκαμψη διάταξης βιβλίου",
-  "Add to Group": "Προσθήκη στην ομάδα",
-  "Untitled Group": "Ομάδα χωρίς τίτλο",
-  "Group Books": "Ομαδοποίηση βιβλίων",
-  "Remove From Group": "Αφαίρεση από την ομάδα",
-  "Create New Group": "Δημιουργία νέας ομάδας",
-  "Deselect Book": "Αποεπιλογή βιβλίου",
-  "Download Book": "Λήψη βιβλίου",
-  "Deselect Group": "Αποεπιλογή ομάδας",
-  "Select Group": "Επιλογή ομάδας",
-  "Keep Screen Awake": "Διατήρηση ενεργού οθόνης"
+  "Check Updates on Start": "Έλεγχος ενημερώσεων κατά την εκκίνηση"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Idioma:",
   "Layout": "Diseño",
   "Light Mode": "Modo claro",
+  "Line Height": "Altura de línea",
   "Loading...": "Cargando...",
   "Loc. {{currentPage}} / {{totalPage}}": "Pos. {{currentPage}} / {{totalPage}}",
   "Logged in": "Sesión iniciada",
@@ -75,6 +76,7 @@
   "Notebook": "Cuaderno",
   "Notes": "Notas",
   "Open": "Abrir",
+  "Open Book": "Abrir libro",
   "Original Text": "Texto original",
   "Page": "Página",
   "Paging Animation": "Animación de paginación",
@@ -147,23 +149,5 @@
   "Storage": "Almacenamiento",
   "Book deleted: {{title}}": "Libro eliminado: {{title}}",
   "Failed to delete book: {{title}}": "Error al eliminar libro: {{title}}",
-  "Check Updates on Start": "Comprobar actualizaciones al iniciar",
-  "Insufficient storage quota": "Cuota de almacenamiento insuficiente",
-  "Font Weight": "Peso de la fuente",
-  "Line Spacing": "Espaciado de línea",
-  "Word Spacing": "Espaciado de palabras",
-  "Letter Spacing": "Espaciado de letras",
-  "Text Indent": "Sangría de texto",
-  "Paragraph Margin": "Margen de párrafo",
-  "Override Book Layout": "Sobrescribir diseño del libro",
-  "Add to Group": "Añadir a grupo",
-  "Untitled Group": "Grupo sin título",
-  "Group Books": "Agrupar libros",
-  "Remove From Group": "Eliminar del grupo",
-  "Create New Group": "Crear nuevo grupo",
-  "Deselect Book": "Deseleccionar libro",
-  "Download Book": "Descargar libro",
-  "Deselect Group": "Deseleccionar grupo",
-  "Select Group": "Seleccionar grupo",
-  "Keep Screen Awake": "Mantener pantalla activa"
+  "Check Updates on Start": "Comprobar actualizaciones al iniciar"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Langue :",
   "Layout": "Mise en page",
   "Light Mode": "Mode clair",
+  "Line Height": "Hauteur de ligne",
   "Loading...": "Chargement...",
   "Loc. {{currentPage}} / {{totalPage}}": "Pos. {{currentPage}} / {{totalPage}}",
   "Logged in": "Connecté",
@@ -75,6 +76,7 @@
   "Notebook": "Carnet de notes",
   "Notes": "Notes",
   "Open": "Ouvrir",
+  "Open Book": "Ouvrir le livre",
   "Original Text": "Texte original",
   "Page": "Page",
   "Paging Animation": "Animation de page",
@@ -147,23 +149,5 @@
   "Storage": "Stockage",
   "Book deleted: {{title}}": "Livre supprimé : {{title}}",
   "Failed to delete book: {{title}}": "Échec de la suppression du livre : {{title}}",
-  "Check Updates on Start": "Vérifier les mises à jour au démarrage",
-  "Insufficient storage quota": "Quota de stockage insuffisant",
-  "Font Weight": "Poids de la police",
-  "Line Spacing": "Interligne",
-  "Word Spacing": "Espacement des mots",
-  "Letter Spacing": "Espacement des lettres",
-  "Text Indent": "Retrait du texte",
-  "Paragraph Margin": "Marge de paragraphe",
-  "Override Book Layout": "Remplacer la mise en page du livre",
-  "Add to Group": "Ajouter au groupe",
-  "Untitled Group": "Groupe sans titre",
-  "Group Books": "Regrouper les livres",
-  "Remove From Group": "Retirer du groupe",
-  "Create New Group": "Créer un nouveau groupe",
-  "Deselect Book": "Désélectionner le livre",
-  "Download Book": "Télécharger le livre",
-  "Deselect Group": "Désélectionner le groupe",
-  "Select Group": "Sélectionner le groupe",
-  "Keep Screen Awake": "Maintenir l'écran allumé"
+  "Check Updates on Start": "Vérifier les mises à jour au démarrage"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "भाषा:",
   "Layout": "लेआउट",
   "Light Mode": "लाइट मोड",
+  "Line Height": "लाइन हाइट",
   "Loading...": "लोड हो रहा है...",
   "Loc. {{currentPage}} / {{totalPage}}": "स्थान {{currentPage}} / {{totalPage}}",
   "Logged in": "लॉग इन किया",
@@ -75,6 +76,7 @@
   "Notebook": "नोटबुक",
   "Notes": "नोट्स",
   "Open": "खोलें",
+  "Open Book": "पुस्तक खोलें",
   "Original Text": "मूल पाठ",
   "Page": "पृष्ठ",
   "Paging Animation": "पेजिंग एनीमेशन",
@@ -147,23 +149,5 @@
   "Storage": "स्टोरेज",
   "Book deleted: {{title}}": "पुस्तक हटाई गई: {{title}}",
   "Failed to delete book: {{title}}": "पुस्तक हटाने में विफल: {{title}}",
-  "Check Updates on Start": "शुरू में अपडेट जांचें",
-  "Insufficient storage quota": "अपर्याप्त स्टोरेज कोटा",
-  "Font Weight": "फ़ॉन्ट वजन",
-  "Line Spacing": "लाइन स्पेसिंग",
-  "Word Spacing": "शब्द स्पेसिंग",
-  "Letter Spacing": "अक्षर स्पेसिंग",
-  "Text Indent": "टेक्स्ट इंडेंट",
-  "Paragraph Margin": "पैराग्राफ मार्जिन",
-  "Override Book Layout": "पुस्तक लेआउट ओवरराइड करें",
-  "Add to Group": "समूह में जोड़ें",
-  "Untitled Group": "अभिनामित समूह",
-  "Group Books": "समूह पुस्तकें",
-  "Remove From Group": "समूह से हटाएं",
-  "Create New Group": "नया समूह बनाएं",
-  "Deselect Book": "पुस्तक का चयन रद्द करें",
-  "Download Book": "पुस्तक डाउनलोड करें",
-  "Deselect Group": "समूह का चयन रद्द करें",
-  "Select Group": "समूह चुनें",
-  "Keep Screen Awake": "स्क्रीन जागरूक रखें"
+  "Check Updates on Start": "शुरू में अपडेट जांचें"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Bahasa:",
   "Layout": "Tata Letak",
   "Light Mode": "Mode Terang",
+  "Line Height": "Tinggi Baris",
   "Loading...": "Memuat...",
   "Loc. {{currentPage}} / {{totalPage}}": "Lok. {{currentPage}} / {{totalPage}}",
   "Logged in": "Sudah Masuk",
@@ -75,6 +76,7 @@
   "Notebook": "Buku Catatan",
   "Notes": "Catatan",
   "Open": "Buka",
+  "Open Book": "Buka Buku",
   "Original Text": "Teks Asli",
   "Page": "Halaman",
   "Paging Animation": "Animasi Halaman",
@@ -147,23 +149,5 @@
   "Storage": "Penyimpanan",
   "Book deleted: {{title}}": "Buku dihapus: {{title}}",
   "Failed to delete book: {{title}}": "Gagal menghapus buku: {{title}}",
-  "Check Updates on Start": "Periksa Pembaruan saat Memulai",
-  "Insufficient storage quota": "Kuota penyimpanan tidak mencukupi",
-  "Font Weight": "Berat Font",
-  "Line Spacing": "Spasi Baris",
-  "Word Spacing": "Spasi Kata",
-  "Letter Spacing": "Spasi Huruf",
-  "Text Indent": "Indentasi Teks",
-  "Paragraph Margin": "Margin Paragraf",
-  "Override Book Layout": "Ganti Tata Letak Buku",
-  "Add to Group": "Tambahkan ke Grup",
-  "Untitled Group": "Grup Tanpa Judul",
-  "Group Books": "Grupkan Buku",
-  "Remove From Group": "Hapus dari Grup",
-  "Create New Group": "Buat Grup Baru",
-  "Deselect Book": "Batalkan Pilihan Buku",
-  "Download Book": "Unduh Buku",
-  "Deselect Group": "Batalkan Pilihan Grup",
-  "Select Group": "Pilih Grup",
-  "Keep Screen Awake": "Biarkan Layar Tetap Hidup"
+  "Check Updates on Start": "Periksa Pembaruan saat Memulai"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Lingua:",
   "Layout": "Layout",
   "Light Mode": "Modalità chiara",
+  "Line Height": "Altezza riga",
   "Loading...": "Caricamento...",
   "Loc. {{currentPage}} / {{totalPage}}": "Pos. {{currentPage}} / {{totalPage}}",
   "Logged in": "Accesso effettuato",
@@ -75,6 +76,7 @@
   "Notebook": "Quaderno",
   "Notes": "Note",
   "Open": "Apri",
+  "Open Book": "Apri libro",
   "Original Text": "Testo originale",
   "Page": "Pagina",
   "Paging Animation": "Animazione cambio pagina",
@@ -147,23 +149,5 @@
   "Storage": "Archiviazione",
   "Book deleted: {{title}}": "Libro eliminato: {{title}}",
   "Failed to delete book: {{title}}": "Eliminazione libro non riuscita: {{title}}",
-  "Check Updates on Start": "Controlla aggiornamenti all'avvio",
-  "Insufficient storage quota": "Quota di archiviazione insufficiente",
-  "Font Weight": "Peso font",
-  "Line Spacing": "Interlinea",
-  "Word Spacing": "Spaziatura parole",
-  "Letter Spacing": "Spaziatura lettere",
-  "Text Indent": "Rientro testo",
-  "Paragraph Margin": "Margine paragrafo",
-  "Override Book Layout": "Sovrascrivi layout libro",
-  "Add to Group": "Aggiungi al gruppo",
-  "Untitled Group": "Gruppo senza titolo",
-  "Group Books": "Raggruppa libri",
-  "Remove From Group": "Rimuovi dal",
-  "Create New Group": "Crea nuovo gruppo",
-  "Deselect Book": "Deseleziona libro",
-  "Download Book": "Scarica libro",
-  "Deselect Group": "Deseleziona gruppo",
-  "Select Group": "Seleziona gruppo",
-  "Keep Screen Awake": "Mantieni schermo attivo"
+  "Check Updates on Start": "Controlla aggiornamenti all'avvio"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "言語：",
   "Layout": "レイアウト",
   "Light Mode": "ライトモード",
+  "Line Height": "行間",
   "Loading...": "読み込み中...",
   "Loc. {{currentPage}} / {{totalPage}}": "位置 {{currentPage}} / {{totalPage}}",
   "Logged in": "ログイン済み",
@@ -75,6 +76,7 @@
   "Notebook": "ノート",
   "Notes": "メモ",
   "Open": "開く",
+  "Open Book": "書籍を開く",
   "Original Text": "原文",
   "Page": "ページ",
   "Paging Animation": "ページめくりアニメーション",
@@ -97,7 +99,7 @@
   "Select Books": "書籍を選択",
   "Select Multiple Books": "複数の書籍を選択",
   "Sepia": "セピア",
-  "Serif Font": "セリフ体",
+  "Serif Font": "明朝体",
   "Show Book Details": "書籍の詳細を表示",
   "Sidebar": "サイドバー",
   "Sign In": "サインイン",
@@ -147,23 +149,5 @@
   "Storage": "ストレージ",
   "Book deleted: {{title}}": "書籍が削除されました：{{title}}",
   "Failed to delete book: {{title}}": "書籍の削除に失敗しました：{{title}}",
-  "Check Updates on Start": "開始時に更新を確認",
-  "Insufficient storage quota": "ストレージクォータが不足しています",
-  "Font Weight": "フォントウェイト",
-  "Line Spacing": "行間",
-  "Word Spacing": "単語間隔",
-  "Letter Spacing": "文字間隔",
-  "Text Indent": "テキストインデント",
-  "Paragraph Margin": "段落マージン",
-  "Override Book Layout": "書籍のレイアウトを上書き",
-  "Add to Group": "グループに追加",
-  "Untitled Group": "無題のグループ",
-  "Group Books": "書籍をグループ化",
-  "Remove From Group": "グループから削除",
-  "Create New Group": "新しいグループを作成",
-  "Deselect Book": "書籍の選択を解除",
-  "Download Book": "書籍をダウンロード",
-  "Deselect Group": "グループの選択を解除",
-  "Select Group": "グループを選択",
-  "Keep Screen Awake": "画面をオンのままにする"
+  "Check Updates on Start": "開始時に更新を確認"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "언어:",
   "Layout": "레이아웃",
   "Light Mode": "라이트 모드",
+  "Line Height": "줄 간격",
   "Loading...": "로딩 중...",
   "Loc. {{currentPage}} / {{totalPage}}": "위치 {{currentPage}} / {{totalPage}}",
   "Logged in": "로그인됨",
@@ -75,6 +76,7 @@
   "Notebook": "노트북",
   "Notes": "메모",
   "Open": "열기",
+  "Open Book": "책 열기",
   "Original Text": "원본 텍스트",
   "Page": "페이지",
   "Paging Animation": "페이지 넘김 애니메이션",
@@ -147,23 +149,5 @@
   "Storage": "저장소",
   "Book deleted: {{title}}": "책 삭제됨: {{title}}",
   "Failed to delete book: {{title}}": "책 삭제 실패: {{title}}",
-  "Check Updates on Start": "시작 시 업데이트 확인",
-  "Insufficient storage quota": "저장소 할당량 부족",
-  "Font Weight": "글꼴 두께",
-  "Line Spacing": "줄 간격",
-  "Word Spacing": "단어 간격",
-  "Letter Spacing": "글자 간격",
-  "Text Indent": "들여쓰기",
-  "Paragraph Margin": "단락 여백",
-  "Override Book Layout": "책 레이아웃 덮어쓰기",
-  "Add to Group": "그룹에 추가",
-  "Untitled Group": "제목 없는 그룹",
-  "Group Books": "책 그룹화",
-  "Remove From Group": "그룹에서 제거",
-  "Create New Group": "새 그룹 만들기",
-  "Deselect Book": "책 선택 해제",
-  "Download Book": "책 다운로드",
-  "Deselect Group": "그룹 선택 해제",
-  "Select Group": "그룹 선택",
-  "Keep Screen Awake": "화면 켜짐 유지"
+  "Check Updates on Start": "시작 시 업데이트 확인"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Język:",
   "Layout": "Układ",
   "Light Mode": "Tryb jasny",
+  "Line Height": "Wysokość linii",
   "Loading...": "Ładowanie...",
   "Loc. {{currentPage}} / {{totalPage}}": "Poz. {{currentPage}} / {{totalPage}}",
   "Logged in": "Zalogowano",
@@ -75,6 +76,7 @@
   "Notebook": "Notatnik",
   "Notes": "Notatki",
   "Open": "Otwórz",
+  "Open Book": "Otwórz książkę",
   "Original Text": "Tekst oryginalny",
   "Page": "Strona",
   "Paging Animation": "Animacja przewracania stron",
@@ -147,23 +149,5 @@
   "Storage": "Przechowywanie",
   "Book deleted: {{title}}": "Książka usunięta: {{title}}",
   "Failed to delete book: {{title}}": "Nie udało się usunąć książki: {{title}}",
-  "Check Updates on Start": "Sprawdź aktualizacje przy starcie",
-  "Insufficient storage quota": "Niewystarczająca kwota przechowywania",
-  "Font Weight": "Grubość czcionki",
-  "Line Spacing": "Interlinia",
-  "Word Spacing": "Odstęp między wyrazami",
-  "Letter Spacing": "Odstęp między literami",
-  "Text Indent": "Wcięcie tekstu",
-  "Paragraph Margin": "Margines akapitu",
-  "Override Book Layout": "Nadpisz układ książki",
-  "Add to Group": "Dodaj do grupy",
-  "Untitled Group": "Grupa bez tytułu",
-  "Group Books": "Grupuj książki",
-  "Remove From Group": "Usuń z grupy",
-  "Create New Group": "Utwórz nową grupę",
-  "Deselect Book": "Odznacz książkę",
-  "Download Book": "Pobierz książkę",
-  "Deselect Group": "Odznacz grupę",
-  "Select Group": "Wybierz grupę",
-  "Keep Screen Awake": "Nie wygaszaj ekranu"
+  "Check Updates on Start": "Sprawdź aktualizacje przy starcie"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Idioma:",
   "Layout": "Layout",
   "Light Mode": "Modo Claro",
+  "Line Height": "Altura da Linha",
   "Loading...": "Carregando...",
   "Loc. {{currentPage}} / {{totalPage}}": "Loc. {{currentPage}} / {{totalPage}}",
   "Logged in": "Conectado",
@@ -75,6 +76,7 @@
   "Notebook": "Caderno",
   "Notes": "Notas",
   "Open": "Abrir",
+  "Open Book": "Abrir Livro",
   "Original Text": "Texto Original",
   "Page": "Página",
   "Paging Animation": "Animação de Página",
@@ -147,23 +149,5 @@
   "Storage": "Armazenamento",
   "Book deleted: {{title}}": "Livro excluído: {{title}}",
   "Failed to delete book: {{title}}": "Falha ao excluir livro: {{title}}",
-  "Check Updates on Start": "Verificar Atualizações ao Iniciar",
-  "Insufficient storage quota": "Cota de armazenamento insuficiente",
-  "Font Weight": "Peso da Fonte",
-  "Line Spacing": "Espaçamento de Linha",
-  "Word Spacing": "Espaçamento de Palavra",
-  "Letter Spacing": "Espaçamento de Letra",
-  "Text Indent": "Recuo de Texto",
-  "Paragraph Margin": "Margem de Parágrafo",
-  "Override Book Layout": "Sobrescrever Layout do Livro",
-  "Add to Group": "Adicionar ao Grupo",
-  "Untitled Group": "Grupo Sem Título",
-  "Group Books": "Agrupar Livros",
-  "Remove From Group": "Remover do Grupo",
-  "Create New Group": "Criar Novo Grupo",
-  "Deselect Book": "Desmarcar Livro",
-  "Download Book": "Baixar Livro",
-  "Deselect Group": "Desmarcar Grupo",
-  "Select Group": "Selecionar Grupo",
-  "Keep Screen Awake": "Manter a Tela Ativa"
+  "Check Updates on Start": "Verificar Atualizações ao Iniciar"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Язык:",
   "Layout": "Макет",
   "Light Mode": "Светлая тема",
+  "Line Height": "Межстрочный интервал",
   "Loading...": "Загрузка...",
   "Loc. {{currentPage}} / {{totalPage}}": "Поз. {{currentPage}} / {{totalPage}}",
   "Logged in": "Выполнен вход",
@@ -75,6 +76,7 @@
   "Notebook": "Блокнот",
   "Notes": "Заметки",
   "Open": "Открыть",
+  "Open Book": "Открыть книгу",
   "Original Text": "Оригинальный текст",
   "Page": "Страница",
   "Paging Animation": "Анимация перелистывания",
@@ -147,23 +149,5 @@
   "Storage": "Хранилище",
   "Book deleted: {{title}}": "Книга удалена: {{title}}",
   "Failed to delete book: {{title}}": "Не удалось удалить книгу: {{title}}",
-  "Check Updates on Start": "Проверять обновления при запуске",
-  "Insufficient storage quota": "Недостаточно квоты хранилища",
-  "Font Weight": "Насыщенность шрифта",
-  "Line Spacing": "Межстрочный интервал",
-  "Word Spacing": "Межсловный интервал",
-  "Letter Spacing": "Межбуквенный интервал",
-  "Text Indent": "Отступ текста",
-  "Paragraph Margin": "Отступ абзаца",
-  "Override Book Layout": "Переопределить макет книги",
-  "Add to Group": "Добавить в группу",
-  "Untitled Group": "Группа без названия",
-  "Group Books": "Группировать книги",
-  "Remove From Group": "Удалить из группы",
-  "Create New Group": "Создать новую группу",
-  "Deselect Book": "Отменить выбор книги",
-  "Download Book": "Скачать книгу",
-  "Deselect Group": "Отменить выбор группы",
-  "Select Group": "Выбрать группу",
-  "Keep Screen Awake": "Не выключать экран"
+  "Check Updates on Start": "Проверять обновления при запуске"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Dil:",
   "Layout": "Düzen",
   "Light Mode": "Aydınlık Mod",
+  "Line Height": "Satır Yüksekliği",
   "Loading...": "Yükleniyor...",
   "Loc. {{currentPage}} / {{totalPage}}": "Konum {{currentPage}} / {{totalPage}}",
   "Logged in": "Giriş Yapıldı",
@@ -75,6 +76,7 @@
   "Notebook": "Not Defteri",
   "Notes": "Notlar",
   "Open": "Aç",
+  "Open Book": "Kitabı Aç",
   "Original Text": "Orijinal Metin",
   "Page": "Sayfa",
   "Paging Animation": "Sayfa Çevirme Animasyonu",
@@ -147,23 +149,5 @@
   "Storage": "Depolama",
   "Book deleted: {{title}}": "Kitap silindi: {{title}}",
   "Failed to delete book: {{title}}": "Kitap silinemedi: {{title}}",
-  "Check Updates on Start": "Başlangıçta Güncellemeleri Kontrol Et",
-  "Insufficient storage quota": "Yetersiz depolama kotası",
-  "Font Weight": "Yazı Tipi Ağırlığı",
-  "Line Spacing": "Satır Aralığı",
-  "Word Spacing": "Kelime Aralığı",
-  "Letter Spacing": "Harf Aralığı",
-  "Text Indent": "Metin Girintisi",
-  "Paragraph Margin": "Paragraf Kenarı",
-  "Override Book Layout": "Kitap Düzenini Geçersiz Kıl",
-  "Add to Group": "Gruba Ekle",
-  "Untitled Group": "Başlıksız Grup",
-  "Group Books": "Kitapları Grupla",
-  "Remove From Group": "Grubu Kaldır",
-  "Create New Group": "Yeni Grup Oluştur",
-  "Deselect Book": "Kitabı Seçme",
-  "Download Book": "Kitabı İndir",
-  "Deselect Group": "Grubu Seçme",
-  "Select Group": "Grup Seç",
-  "Keep Screen Awake": "Ekranı Açık Tut"
+  "Check Updates on Start": "Başlangıçta Güncellemeleri Kontrol Et"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Мова:",
   "Layout": "Макет",
   "Light Mode": "Світлий режим",
+  "Line Height": "Висота рядка",
   "Loading...": "Завантаження...",
   "Loc. {{currentPage}} / {{totalPage}}": "Поз. {{currentPage}} / {{totalPage}}",
   "Logged in": "Увійшли",
@@ -75,6 +76,7 @@
   "Notebook": "Нотатник",
   "Notes": "Нотатки",
   "Open": "Відкрити",
+  "Open Book": "Відкрити книгу",
   "Original Text": "Оригінальний текст",
   "Page": "Сторінка",
   "Paging Animation": "Анімація гортання",
@@ -147,23 +149,5 @@
   "Storage": "Сховище",
   "Book deleted: {{title}}": "Книгу видалено: {{title}}",
   "Failed to delete book: {{title}}": "Не вдалося видалити книгу: {{title}}",
-  "Check Updates on Start": "Перевіряти оновлення при запуску",
-  "Insufficient storage quota": "Недостатньо квоти сховища",
-  "Font Weight": "Насиченість шрифту",
-  "Line Spacing": "Міжрядковий інтервал",
-  "Word Spacing": "Міжслівний інтервал",
-  "Letter Spacing": "Міжбуквений інтервал",
-  "Text Indent": "Відступ тексту",
-  "Paragraph Margin": "Відступ абзацу",
-  "Override Book Layout": "Перевизначити макет книги",
-  "Add to Group": "Додати до групи",
-  "Untitled Group": "Група без назви",
-  "Group Books": "Групувати книги",
-  "Remove From Group": "Видалити з групи",
-  "Create New Group": "Створити нову групу",
-  "Deselect Book": "Скасувати вибір книги",
-  "Download Book": "Завантажити книгу",
-  "Deselect Group": "Скасувати вибір групи",
-  "Select Group": "Вибрати групу",
-  "Keep Screen Awake": "Не вимикати екран"
+  "Check Updates on Start": "Перевіряти оновлення при запуску"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "Ngôn ngữ:",
   "Layout": "Bố cục",
   "Light Mode": "Chế độ sáng",
+  "Line Height": "Độ cao dòng",
   "Loading...": "Đang tải...",
   "Loc. {{currentPage}} / {{totalPage}}": "Vị trí {{currentPage}} / {{totalPage}}",
   "Logged in": "Đã đăng nhập",
@@ -75,6 +76,7 @@
   "Notebook": "Sổ ghi chép",
   "Notes": "Ghi chú",
   "Open": "Mở",
+  "Open Book": "Mở sách",
   "Original Text": "Văn bản gốc",
   "Page": "Trang",
   "Paging Animation": "Hiệu ứng lật trang",
@@ -147,23 +149,5 @@
   "Storage": "Lưu trữ",
   "Book deleted: {{title}}": "Sách đã xóa: {{title}}",
   "Failed to delete book: {{title}}": "Không thể xóa sách: {{title}}",
-  "Check Updates on Start": "Kiểm tra cập nhật khi khởi động",
-  "Insufficient storage quota": "Không đủ lượng lưu trữ",
-  "Font Weight": "Độ đậm của phông chữ",
-  "Line Spacing": "Khoảng cách dòng",
-  "Word Spacing": "Khoảng cách từ",
-  "Letter Spacing": "Khoảng cách chữ",
-  "Text Indent": "Thụt lề",
-  "Paragraph Margin": "Lề đoạn",
-  "Override Book Layout": "Ghi đè bố cục sách",
-  "Add to Group": "Thêm vào nhóm",
-  "Untitled Group": "Nhóm không có tiêu đề",
-  "Group Books": "Nhóm sách",
-  "Remove From Group": "Xóa khỏi nhóm",
-  "Create New Group": "Tạo nhóm mới",
-  "Deselect Book": "Bỏ chọn sách",
-  "Download Book": "Tải sách",
-  "Deselect Group": "Bỏ chọn nhóm",
-  "Select Group": "Chọn nhóm",
-  "Keep Screen Awake": "Giữ màn hình luôn bật"
+  "Check Updates on Start": "Kiểm tra cập nhật khi khởi động"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "语言",
   "Layout": "布局",
   "Light Mode": "浅色主题",
+  "Line Height": "行高",
   "Loading...": "加载中...",
   "Loc. {{currentPage}} / {{totalPage}}": "位置 {{currentPage}} / {{totalPage}}",
   "Logged in": "已登录",
@@ -75,6 +76,7 @@
   "Notebook": "笔记本",
   "Notes": "笔记",
   "Open": "打开",
+  "Open Book": "打开书籍",
   "Original Text": "原文",
   "Page": "页面",
   "Paging Animation": "翻页动画",
@@ -147,23 +149,5 @@
   "Storage": "存储空间",
   "Book deleted: {{title}}": "书籍已删除：{{title}}",
   "Failed to delete book: {{title}}": "删除书籍失败：{{title}}",
-  "Check Updates on Start": "启动时检查更新",
-  "Insufficient storage quota": "云存储空间不足",
-  "Font Weight": "字重",
-  "Line Spacing": "行间距",
-  "Word Spacing": "词间距",
-  "Letter Spacing": "字间距",
-  "Text Indent": "首行缩进",
-  "Paragraph Margin": "段间距",
-  "Override Book Layout": "覆盖版面布局",
-  "Add to Group": "添加到分组",
-  "Untitled Group": "无标题分组",
-  "Group Books": "分组书籍",
-  "Remove From Group": "从分组中移除",
-  "Create New Group": "创建新分组",
-  "Deselect Book": "取消选择书籍",
-  "Download Book": "下载书籍",
-  "Deselect Group": "取消选择分组",
-  "Select Group": "选择分组",
-  "Keep Screen Awake": "保持屏幕常亮"
+  "Check Updates on Start": "启动时检查更新"
 }

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

@@ -57,6 +57,7 @@
   "Language:": "語言",
   "Layout": "版面",
   "Light Mode": "淺色主題",
+  "Line Height": "行高",
   "Loading...": "載入中...",
   "Loc. {{currentPage}} / {{totalPage}}": "位置 {{currentPage}} / {{totalPage}}",
   "Logged in": "已登入",
@@ -75,6 +76,7 @@
   "Notebook": "筆記本",
   "Notes": "筆記",
   "Open": "打開",
+  "Open Book": "打開書籍",
   "Original Text": "原文",
   "Page": "頁面",
   "Paging Animation": "翻頁動畫",
@@ -147,23 +149,5 @@
   "Storage": "存儲空間",
   "Book deleted: {{title}}": "書籍已刪除：{{title}}",
   "Failed to delete book: {{title}}": "書籍刪除失敗：{{title}}",
-  "Check Updates on Start": "啟動時檢查更新",
-  "Insufficient storage quota": "雲存儲空間不足",
-  "Font Weight": "字重",
-  "Line Spacing": "行間距",
-  "Word Spacing": "字間距",
-  "Letter Spacing": "字間距",
-  "Text Indent": "首行縮進",
-  "Paragraph Margin": "段間距",
-  "Override Book Layout": "覆蓋版面佈局",
-  "Add to Group": "添加到組",
-  "Untitled Group": "無標題組",
-  "Group Books": "分組書籍",
-  "Remove From Group": "從組中移除",
-  "Create New Group": "創建新組",
-  "Deselect Book": "取消選擇書籍",
-  "Download Book": "下載書籍",
-  "Deselect Group": "取消選擇組",
-  "Select Group": "選擇組",
-  "Keep Screen Awake": "保持屏幕常亮"
+  "Check Updates on Start": "啟動時檢查更新"
 }

apps/readest-app/release-notes.json

@@ -1,37 +1,5 @@
 {
   "releases": {
-    "0.9.13": {
-      "date": "2025-02-19",
-      "notes": [
-        "Add option to keep screen awake when reading",
-        "Add shortcuts to notetaking UI",
-        "UX enhancements of grid view in mobile platforms"
-      ]
-    },
-    "0.9.11": {
-      "date": "2025-02-14",
-      "notes": [
-        "Organize the library with customizable groups/folders",
-        "Alpha release for Android and iOS platforms",
-        "Various fixes and enhancements on Android and iOS platforms"
-      ]
-    },
-    "0.9.10": {
-      "date": "2025-02-08",
-      "notes": [
-        "Add options to adjust paragraph margin, word spacing, letter spacing, text indent and font weight",
-        "Alpha release for Android and iOS platforms"
-      ]
-    },
-    "0.9.9": {
-      "date": "2025-02-06",
-      "notes": [
-        "Load system fonts list at runtime on desktop",
-        "Incrementally load new books in synchronization",
-        "Change voice language dynamically by detecting text language",
-        "Various fixes and enhancements on sync, fonts and highlighting"
-      ]
-    },
     "0.9.8": {
       "date": "2025-02-01",
       "notes": [

apps/readest-app/scripts/release-ios-appstore.sh

@@ -1,6 +0,0 @@
-pnpm tauri ios build --export-method app-store-connect
-
-BUNDLE_DIR=src-tauri/gen/apple/build/arm64
-IPA_BUNDLE=$BUNDLE_DIR/Readest.ipa
-
-xcrun altool --upload-app --type ios --file $IPA_BUNDLE --apiKey $APPLE_API_KEY --apiIssuer $APPLE_API_ISSUER

apps/readest-app/scripts/release-mac-appstore.sh

@@ -1,6 +1,6 @@
 pnpm run build-macos-universial-appstore
 
-BUNDLE_DIR=../../target/universal-apple-darwin/release/bundle/macos
+BUNDLE_DIR=src-tauri/target/universal-apple-darwin/release/bundle/macos
 APP_BUNDLE=$BUNDLE_DIR/Readest.app
 INSTALLER_BUNDLE=$BUNDLE_DIR/Readest.pkg
 

apps/readest-app/src-tauri/Cargo.toml

@@ -57,4 +57,3 @@ tauri-plugin-cli = "2"
 tauri-plugin-single-instance = "2.2.0"
 tauri-plugin-updater = "2"
 tauri-plugin-window-state = "2.2.0"
-font-enumeration = "0.9.0"

apps/readest-app/src-tauri/gen/android/app/build.gradle.kts

@@ -1,80 +0,0 @@
-import java.util.Properties
-import java.io.FileInputStream
-
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("rust")
-}
-
-val tauriProperties = Properties().apply {
-    val propFile = file("tauri.properties")
-    if (propFile.exists()) {
-        propFile.inputStream().use { load(it) }
-    }
-}
-
-android {
-    compileSdk = 34
-    namespace = "com.bilingify.readest"
-    defaultConfig {
-        manifestPlaceholders["usesCleartextTraffic"] = "false"
-        applicationId = "com.bilingify.readest"
-        minSdk = 26
-        targetSdk = 34
-        versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
-        versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
-    }
-    signingConfigs {
-        create("release") {
-            val keystorePropertiesFile = rootProject.file("keystore.properties")
-            val keystoreProperties = Properties()
-            if (keystorePropertiesFile.exists()) {
-                keystoreProperties.load(FileInputStream(keystorePropertiesFile))
-            }
-
-            keyAlias = keystoreProperties["keyAlias"] as String
-            keyPassword = keystoreProperties["password"] as String
-            storeFile = file(keystoreProperties["storeFile"] as String)
-            storePassword = keystoreProperties["password"] as String
-        }
-    }
-    buildTypes {
-        getByName("debug") {
-            manifestPlaceholders["usesCleartextTraffic"] = "true"
-            isDebuggable = true
-            isJniDebuggable = true
-            isMinifyEnabled = false
-            packaging {                jniLibs.keepDebugSymbols.add("*/arm64-v8a/*.so")
-                jniLibs.keepDebugSymbols.add("*/armeabi-v7a/*.so")
-                jniLibs.keepDebugSymbols.add("*/x86/*.so")
-                jniLibs.keepDebugSymbols.add("*/x86_64/*.so")
-            }
-        }
-        getByName("release") {
-            signingConfig = signingConfigs.getByName("release")
-        }
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        buildConfig = true
-    }
-}
-
-rust {
-    rootDirRel = "../../../"
-}
-
-dependencies {
-    implementation("androidx.webkit:webkit:1.6.1")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.activity:activity-ktx:1.9.3")
-    implementation("com.google.android.material:material:1.8.0")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.4")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
-}
-
-apply(from = "tauri.build.gradle.kts")

apps/readest-app/src-tauri/gen/android/app/src/main/java/com/bilingify/readest/MainActivity.kt

@@ -1,33 +0,0 @@
-package com.bilingify.readest
-
-import android.os.Build
-import android.os.Bundle
-import android.view.View
-import android.view.WindowInsets
-import android.view.WindowInsetsController
-import androidx.activity.enableEdgeToEdge
-
-class MainActivity : TauriActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
-        super.onCreate(savedInstanceState)
-	      
-        hideSystemUI()
-    }
-
-    private fun hideSystemUI() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.decorView.windowInsetsController?.let { controller ->
-                controller.hide(WindowInsets.Type.systemBars())
-                controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            }
-        } else {
-            @Suppress("DEPRECATION")
-            window.decorView.systemUiVisibility = (
-                View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                        or View.SYSTEM_UI_FLAG_FULLSCREEN
-                        or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-            )
-        }
-    }
-}

apps/readest-app/src-tauri/gen/android/app/src/main/res/values/themes.xml

@@ -1,9 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!-- Base application theme. -->
-  <style name="Theme.readest" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-    <!-- Customize your theme here. -->
-    <item name="android:windowActionBar">false</item>
-    <item name="android:windowNoTitle">true</item>
-    <item name="android:windowFullscreen">true</item>
-  </style>
-</resources>

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

@@ -11,20 +11,21 @@ mod menu;
 #[cfg(target_os = "macos")]
 mod traffic_light_plugin;
 
+mod transfer_file;
+use transfer_file::{download_file, upload_file};
+
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
 
-#[cfg(desktop)]
 use std::path::PathBuf;
-#[cfg(desktop)]
-use tauri::{AppHandle, Listener, Manager, Url};
-#[cfg(desktop)]
+use tauri::{command, Window};
+use tauri::{AppHandle, Emitter, Manager, Url};
+use tauri::{WebviewUrl, WebviewWindowBuilder};
 use tauri_plugin_fs::FsExt;
-
-mod transfer_file;
-use tauri::{command, Emitter, WebviewUrl, WebviewWindowBuilder, Window};
 use tauri_plugin_oauth::start;
-use transfer_file::{download_file, upload_file};
+
+#[cfg(desktop)]
+use tauri::Listener;
 
 #[cfg(desktop)]
 fn allow_file_in_scopes(app: &AppHandle, files: Vec<PathBuf>) {
@@ -71,19 +72,7 @@ async fn start_server(window: Window) -> Result<u16, String> {
     .map_err(|err| err.to_string())
 }
 
-#[cfg(desktop)]
-#[command]
-async fn list_fonts() -> Result<Vec<String>, String> {
-    let font_collection = font_enumeration::Collection::new().unwrap();
-    let mut fonts = Vec::new();
-    for font in font_collection.all() {
-        fonts.push(font.family_name.clone());
-    }
-    Ok(fonts)
-}
-
 #[derive(Clone, serde::Serialize)]
-#[allow(dead_code)]
 struct Payload {
     args: Vec<String>,
     cwd: String,
@@ -97,9 +86,7 @@ pub fn run() {
         .invoke_handler(tauri::generate_handler![
             start_server,
             download_file,
-            upload_file,
-            #[cfg(desktop)]
-            list_fonts
+            upload_file
         ])
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_opener::init())
@@ -204,26 +191,12 @@ pub fn run() {
                 .title("");
 
             #[cfg(all(not(target_os = "macos"), desktop))]
-            let win_builder = {
-                let mut win_builder = win_builder
-                    .decorations(false)
-                    .transparent(true)
-                    .visible(false)
-                    .title("Readest");
-
-                if cfg!(target_os = "windows") {
-                    let version = tauri_plugin_os::version();
-                    if version <= tauri_plugin_os::Version::from_string("10.0.19045") {
-                        win_builder = win_builder.shadow(false);
-                    } else {
-                        win_builder = win_builder.shadow(true);
-                    }
-                } else {
-                    win_builder = win_builder.shadow(true);
-                }
-
-                win_builder
-            };
+            let win_builder = win_builder
+                .decorations(false)
+                .transparent(true)
+                .visible(false)
+                .shadow(true)
+                .title("Readest");
 
             win_builder.build().unwrap();
             // let win = win_builder.build().unwrap();

apps/readest-app/src-tauri/tauri.conf.json

@@ -14,11 +14,11 @@
     "windows": [],
     "security": {
       "csp": {
-        "default-src": "'self' 'unsafe-inline' blob: data: customprotocol: asset: http://asset.localhost ipc: http://ipc.localhost",
-        "connect-src": "'self' blob: data: asset: http://asset.localhost ipc: http://ipc.localhost https://*.sentry.io https://*.posthog.com https://*.deepl.com https://*.wikipedia.org https://*.wiktionary.org https://*.supabase.co https://*.readest.com wss://speech.platform.bing.com https://*.cloudflarestorage.com",
+        "default-src": "'self' 'unsafe-inline' blob: customprotocol: asset: http://asset.localhost ipc: http://ipc.localhost",
+        "connect-src": "'self' blob: asset: http://asset.localhost ipc: http://ipc.localhost https://*.sentry.io https://*.posthog.com https://*.deepl.com https://*.wikipedia.org https://*.wiktionary.org https://*.supabase.co https://*.readest.com wss://speech.platform.bing.com https://*.cloudflarestorage.com",
         "img-src": "'self' blob: data: asset: http://asset.localhost https://*",
         "style-src": "'self' 'unsafe-inline' blob: asset: http://asset.localhost https://cdn.jsdelivr.net https://fonts.googleapis.com",
-        "font-src": "'self' blob: data: asset: http://asset.localhost tauri: https://fonts.gstatic.com https://db.onlinewebfonts.com https://cdn.jsdelivr.net",
+        "font-src": "'self' data: asset: http://asset.localhost tauri: https://fonts.gstatic.com https://db.onlinewebfonts.com https://cdn.jsdelivr.net",
         "frame-src": "'self' blob: asset: http://asset.localhost",
         "script-src": "'self' 'unsafe-inline' 'unsafe-eval' blob: asset: http://asset.localhost https://*.sentry.io https://*.posthog.com"
       },
@@ -56,12 +56,6 @@
         "section": "text"
       }
     },
-    "android": {
-      "minSdkVersion": 26
-    },
-    "iOS": {
-      "developmentTeam": "J5W48D69VR"
-    },
     "fileAssociations": [
       {
         "name": "epub",

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

@@ -7,6 +7,7 @@ import { Auth } from '@supabase/auth-ui-react';
 import { ThemeSupa } from '@supabase/auth-ui-shared';
 import { FcGoogle } from 'react-icons/fc';
 import { FaApple } from 'react-icons/fa';
+import { VscAzure } from 'react-icons/vsc';
 import { FaGithub } from 'react-icons/fa';
 import { IoArrowBack } from 'react-icons/io5';
 
@@ -20,7 +21,6 @@ import { onOpenUrl } from '@tauri-apps/plugin-deep-link';
 import { start, cancel, onUrl, onInvalidUrl } from '@fabianlars/tauri-plugin-oauth';
 import { openUrl } from '@tauri-apps/plugin-opener';
 import { handleAuthCallback } from '@/helpers/auth';
-import { getOSPlatform } from '@/utils/misc';
 
 type OAuthProvider = 'google' | 'apple' | 'azure' | 'github';
 
@@ -36,9 +36,6 @@ interface ProviderLoginProp {
   label: string;
 }
 
-const WEB_AUTH_CALLBACK = 'https://web.readest.com/auth/callback';
-const DEEPLINK_CALLBACK = 'readest://auth/callback';
-
 const ProviderLogin: React.FC<ProviderLoginProp> = ({ provider, handleSignIn, Icon, label }) => {
   return (
     <button
@@ -63,17 +60,8 @@ export default function AuthPage() {
   const [port, setPort] = useState<number | null>(null);
   const isOAuthServerRunning = useRef(false);
   const [isMounted, setIsMounted] = useState(false);
-  const osPlatform = getOSPlatform();
 
-  const getTauriRedirectTo = () => {
-    return process.env.NODE_ENV === 'production'
-      ? ['android', 'ios'].includes(osPlatform)
-        ? WEB_AUTH_CALLBACK
-        : DEEPLINK_CALLBACK
-      : `http://localhost:${port}`;
-  };
-
-  const tauriSignIn = async (provider: OAuthProvider) => {
+  const signIn = async (provider: OAuthProvider) => {
     if (!supabase) {
       throw new Error('No backend connected');
     }
@@ -82,7 +70,10 @@ export default function AuthPage() {
       provider,
       options: {
         skipBrowserRedirect: true,
-        redirectTo: getTauriRedirectTo(),
+        redirectTo:
+          process.env.NODE_ENV === 'production'
+            ? 'readest://auth/callback'
+            : `http://localhost:${port}`,
       },
     });
 
@@ -90,7 +81,7 @@ export default function AuthPage() {
       console.error('Authentication error:', error);
       return;
     }
-    await openUrl(data.url);
+    openUrl(data.url);
   };
 
   const handleOAuthUrl = async (url: string) => {
@@ -209,19 +200,25 @@ export default function AuthPage() {
       <div style={{ maxWidth: '420px', margin: 'auto', padding: '2rem' }}>
         <ProviderLogin
           provider='google'
-          handleSignIn={tauriSignIn}
+          handleSignIn={signIn}
           Icon={FcGoogle}
           label='Sign in with Google'
         />
         <ProviderLogin
           provider='apple'
-          handleSignIn={tauriSignIn}
+          handleSignIn={signIn}
           Icon={FaApple}
           label='Sign in with Apple'
         />
+        <ProviderLogin
+          provider='azure'
+          handleSignIn={signIn}
+          Icon={VscAzure}
+          label='Sign in with Azure'
+        />
         <ProviderLogin
           provider='github'
-          handleSignIn={tauriSignIn}
+          handleSignIn={signIn}
           Icon={FaGithub}
           label='Sign in with GitHub'
         />
@@ -232,7 +229,7 @@ export default function AuthPage() {
           theme={isDarkMode ? 'dark' : 'light'}
           magicLink={true}
           providers={[]}
-          redirectTo={getTauriRedirectTo()}
+          redirectTo={`http://localhost:${port}`}
         />
       </div>
     </div>
@@ -249,7 +246,7 @@ export default function AuthPage() {
         appearance={{ theme: ThemeSupa }}
         theme={isDarkMode ? 'dark' : 'light'}
         magicLink={true}
-        providers={['google', 'apple', 'github']}
+        providers={['google', 'apple', 'azure', 'github']}
         redirectTo='/auth/callback'
       />
     </div>

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

@@ -1,57 +0,0 @@
-import clsx from 'clsx';
-import Image from 'next/image';
-import { Book } from '@/types/book';
-import { formatAuthors, formatTitle } from '@/utils/book';
-
-interface BookCoverProps {
-  book: Book;
-  isPreview?: boolean;
-}
-
-const BookCover: React.FC<BookCoverProps> = ({ book, isPreview }) => {
-  return (
-    <div className='relative flex h-full w-full'>
-      <Image
-        src={book.coverImageUrl!}
-        alt={book.title}
-        fill={true}
-        className='object-cover'
-        onError={(e) => {
-          (e.target as HTMLImageElement).style.display = 'none';
-          (e.target as HTMLImageElement).nextElementSibling?.classList.remove('invisible');
-        }}
-      />
-      <div
-        className={clsx(
-          'invisible absolute inset-0 rounded-none p-2',
-          'text-neutral-content text-center font-serif font-medium',
-          isPreview && 'bg-base-200/50',
-        )}
-      >
-        <div className='flex h-1/2 items-center justify-center'>
-          <span
-            className={clsx(
-              isPreview ? 'line-clamp-2' : 'line-clamp-3',
-              isPreview ? 'text-[0.5em]' : 'text-lg',
-            )}
-          >
-            {formatTitle(book.title)}
-          </span>
-        </div>
-        <div className='h-1/6'></div>
-        <div className='flex h-1/3 items-center justify-center'>
-          <span
-            className={clsx(
-              'text-neutral-content/50 line-clamp-1',
-              isPreview ? 'text-[0.4em]' : 'text-base',
-            )}
-          >
-            {formatAuthors(book.author)}
-          </span>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default BookCover;

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

@@ -1,62 +1,84 @@
 import clsx from 'clsx';
+import Image from 'next/image';
 import { MdCheckCircle, MdCheckCircleOutline } from 'react-icons/md';
 import { CiCircleMore } from 'react-icons/ci';
 import { LiaCloudUploadAltSolid, LiaCloudDownloadAltSolid } from 'react-icons/lia';
 
 import { Book } from '@/types/book';
-import { useEnv } from '@/context/EnvContext';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 import ReadingProgress from './ReadingProgress';
-import BookCover from './BookCover';
 
 interface BookItemProps {
   book: Book;
   isSelectMode: boolean;
   selectedBooks: string[];
+  clickedBookHash: string | null;
   transferProgress: number | null;
+  handleBookClick: (book: Book) => void;
   handleBookUpload: (book: Book) => void;
   handleBookDownload: (book: Book) => void;
   showBookDetailsModal: (book: Book) => void;
+  bookContextMenuHandler: (book: Book, e: React.MouseEvent<HTMLDivElement>) => void;
 }
 
 const BookItem: React.FC<BookItemProps> = ({
   book,
   isSelectMode,
   selectedBooks,
+  clickedBookHash,
   transferProgress,
+  handleBookClick,
   handleBookUpload,
   handleBookDownload,
   showBookDetailsModal,
+  bookContextMenuHandler,
 }) => {
   const iconSize15 = useResponsiveSize(15);
-  const { appService } = useEnv();
-
-  const stopEvent = (e: React.MouseEvent | React.TouchEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-  };
 
   return (
     <div
-      className={clsx(
-        'book-item flex h-full flex-col',
-        appService?.hasContextMenu ? 'cursor-pointer' : '',
-      )}
+      className='book-item cursor-pointer'
+      onContextMenu={bookContextMenuHandler.bind(null, book)}
     >
-      <div className='bg-base-100 relative flex aspect-[28/41] items-center justify-center overflow-hidden shadow-md'>
-        <BookCover book={book} />
-        {selectedBooks.includes(book.hash) && (
-          <div className='absolute inset-0 bg-black opacity-30 transition-opacity duration-300'></div>
-        )}
-        {isSelectMode && (
-          <div className='absolute bottom-1 right-1'>
-            {selectedBooks.includes(book.hash) ? (
-              <MdCheckCircle className='fill-blue-500' />
-            ) : (
-              <MdCheckCircleOutline className='fill-gray-300 drop-shadow-sm' />
+      <div className='bg-base-100 shadow-md' onClick={() => handleBookClick(book)}>
+        <div className='relative aspect-[28/41]'>
+          <Image
+            src={book.coverImageUrl!}
+            alt={book.title}
+            fill={true}
+            className='object-cover'
+            onError={(e) => {
+              (e.target as HTMLImageElement).style.display = 'none';
+              (e.target as HTMLImageElement).nextElementSibling?.classList.remove('invisible');
+            }}
+          />
+          <div
+            className={clsx(
+              'invisible absolute inset-0 rounded-none p-2',
+              'text-neutral-content text-center font-serif font-medium',
             )}
+          >
+            <div className='flex h-1/2 items-center justify-center'>
+              <span className='line-clamp-3 text-lg'>{book.title}</span>
+            </div>
+            <div className='h-1/6'></div>
+            <div className='flex h-1/3 items-center justify-center'>
+              <span className='text-neutral-content/50 line-clamp-1 text-base'>{book.author}</span>
+            </div>
           </div>
-        )}
+          {(selectedBooks.includes(book.hash) || clickedBookHash === book.hash) && (
+            <div className='absolute inset-0 bg-black opacity-30 transition-opacity duration-300'></div>
+          )}
+          {isSelectMode && (
+            <div className='absolute bottom-1 right-1'>
+              {selectedBooks.includes(book.hash) ? (
+                <MdCheckCircle className='fill-blue-500' />
+              ) : (
+                <MdCheckCircleOutline className='fill-gray-300 drop-shadow-sm' />
+              )}
+            </div>
+          )}
+        </div>
       </div>
       <div className={clsx('flex w-full flex-col p-0 pt-2')}>
         <div className='min-w-0 flex-1'>
@@ -86,11 +108,6 @@ const BookItem: React.FC<BookItemProps> = ({
             ) : (
               <button
                 className='show-detail-button opacity-0 group-hover:opacity-100'
-                onPointerDown={(e) => stopEvent(e)}
-                onPointerUp={(e) => stopEvent(e)}
-                onPointerMove={(e) => stopEvent(e)}
-                onPointerCancel={(e) => stopEvent(e)}
-                onPointerLeave={(e) => stopEvent(e)}
                 onClick={() => {
                   if (!book.uploadedAt) {
                     handleBookUpload(book);
@@ -107,11 +124,6 @@ const BookItem: React.FC<BookItemProps> = ({
             )}
             <button
               className='show-detail-button opacity-0 group-hover:opacity-100'
-              onPointerDown={(e) => stopEvent(e)}
-              onPointerUp={(e) => stopEvent(e)}
-              onPointerMove={(e) => stopEvent(e)}
-              onPointerCancel={(e) => stopEvent(e)}
-              onPointerLeave={(e) => stopEvent(e)}
               onClick={() => showBookDetailsModal(book)}
             >
               <CiCircleMore size={iconSize15} />

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

@@ -2,20 +2,53 @@ import clsx from 'clsx';
 import * as React from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { useEffect, useRef, useState } from 'react';
-import { MdDelete, MdOpenInNew, MdOutlineCancel } from 'react-icons/md';
-import { LuFolderPlus } from 'react-icons/lu';
+import { MdDelete, MdOpenInNew } from 'react-icons/md';
 import { PiPlus } from 'react-icons/pi';
+import { Menu, MenuItem } from '@tauri-apps/api/menu';
+import { revealItemInDir } from '@tauri-apps/plugin-opener';
 import { Book, BooksGroup } from '@/types/book';
 import { useEnv } from '@/context/EnvContext';
 import { useLibraryStore } from '@/store/libraryStore';
+import { useSettingsStore } from '@/store/settingsStore';
 import { useTranslation } from '@/hooks/useTranslation';
-import { navigateToLibrary, navigateToReader } from '@/utils/nav';
-import { isMd5 } from '@/utils/md5';
+import { navigateToReader } from '@/utils/nav';
+import { getOSPlatform } from '@/utils/misc';
+import { getFilename } from '@/utils/book';
+import { FILE_REVEAL_LABELS, FILE_REVEAL_PLATFORMS } from '@/utils/os';
+import { isTauriAppPlatform } from '@/services/environment';
 
 import Alert from '@/components/Alert';
 import Spinner from '@/components/Spinner';
-import BookshelfItem, { generateBookshelfItems } from './BookshelfItem';
-import GroupingModal from './GroupingModal';
+import BookDetailModal from '@/components/BookDetailModal';
+import BookItem from './BookItem';
+import GroupItem from './GroupItem';
+
+type BookshelfItem = Book | BooksGroup;
+
+const UNGROUPED_NAME = 'ungrouped';
+
+const generateBookshelfItems = (books: Book[]): BookshelfItem[] => {
+  const groups: BooksGroup[] = books.reduce((acc: BooksGroup[], book: Book) => {
+    if (book.deletedAt) return acc;
+    book.group = book.group || UNGROUPED_NAME;
+    const groupIndex = acc.findIndex((group) => group.name === book.group);
+    const booksGroup = acc[acc.findIndex((group) => group.name === book.group)];
+    if (booksGroup) {
+      booksGroup.books.push(book);
+      booksGroup.updatedAt = Math.max(acc[groupIndex]!.updatedAt, book.updatedAt);
+    } else {
+      acc.push({
+        name: book.group,
+        books: [book],
+        updatedAt: book.updatedAt,
+      });
+    }
+    return acc;
+  }, []);
+  const ungroupedBooks: Book[] = groups.find((group) => group.name === UNGROUPED_NAME)?.books || [];
+  const groupedBooks: BooksGroup[] = groups.filter((group) => group.name !== UNGROUPED_NAME);
+  return [...ungroupedBooks, ...groupedBooks].sort((a, b) => b.updatedAt - a.updatedAt);
+};
 
 interface BookshelfProps {
   libraryBooks: Book[];
@@ -24,8 +57,6 @@ interface BookshelfProps {
   handleBookUpload: (book: Book) => void;
   handleBookDownload: (book: Book) => void;
   handleBookDelete: (book: Book) => void;
-  handleSetSelectMode: (selectMode: boolean) => void;
-  handleShowDetailsBook: (book: Book) => void;
   booksTransferProgress: { [key: string]: number | null };
 }
 
@@ -36,33 +67,50 @@ const Bookshelf: React.FC<BookshelfProps> = ({
   handleBookUpload,
   handleBookDownload,
   handleBookDelete,
-  handleSetSelectMode,
-  handleShowDetailsBook,
   booksTransferProgress,
 }) => {
   const _ = useTranslation();
   const router = useRouter();
   const searchParams = useSearchParams();
-  const { appService } = useEnv();
+  const { envConfig, appService } = useEnv();
+  const { settings } = useSettingsStore();
+  const { updateBook } = useLibraryStore();
   const [loading, setLoading] = useState(false);
   const [selectedBooks, setSelectedBooks] = useState<string[]>([]);
-  const [showSelectModeActions, setShowSelectModeActions] = useState(false);
   const [showDeleteAlert, setShowDeleteAlert] = useState(false);
-  const [showGroupingModal, setShowGroupingModal] = useState(false);
-  const [navBooksGroup, setNavBooksGroup] = useState<BooksGroup | null>(null);
+  const [clickedImage, setClickedImage] = useState<string | null>(null);
   const [importBookUrl] = useState(searchParams?.get('url') || '');
   const isImportingBook = useRef(false);
+  const [showDetailsBook, setShowDetailsBook] = useState<Book | null>(null);
+
+  const makeBookAvailable = async (book: Book) => {
+    if (book.uploadedAt && !book.downloadedAt) {
+      let available = false;
+      try {
+        await handleBookDownload(book);
+        updateBook(envConfig, book);
+        available = true;
+      } finally {
+        return available;
+      }
+    }
+    return true;
+  };
+
+  const showBookDetailsModal = async (book: Book) => {
+    if (await makeBookAvailable(book)) {
+      setShowDetailsBook(book);
+    }
+  };
+
+  const dismissBookDetailsModal = () => {
+    setShowDetailsBook(null);
+  };
 
   const { setLibrary } = useLibraryStore();
-  const allBookshelfItems = generateBookshelfItems(libraryBooks);
 
   useEffect(() => {
-    if (isSelectMode) {
-      setShowSelectModeActions(true);
-    } else {
-      setSelectedBooks([]);
-      setShowSelectModeActions(false);
-    }
+    setSelectedBooks([]);
   }, [isSelectMode]);
 
   useEffect(() => {
@@ -84,27 +132,24 @@ const Bookshelf: React.FC<BookshelfProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [importBookUrl, appService]);
 
-  useEffect(() => {
-    const group = searchParams?.get('group') || '';
-    if (group) {
-      const booksGroup = allBookshelfItems.find(
-        (item) => 'name' in item && item.id === group,
-      ) as BooksGroup;
-      if (booksGroup) {
-        setNavBooksGroup(booksGroup);
-      } else {
-        navigateToLibrary(router);
-      }
+  const bookshelfItems = generateBookshelfItems(libraryBooks);
+
+  const handleBookClick = async (book: Book) => {
+    if (!(await makeBookAvailable(book))) return;
+
+    if (isSelectMode) {
+      toggleSelection(book.hash);
     } else {
-      setNavBooksGroup(null);
-      navigateToLibrary(router);
+      setClickedImage(book.hash);
+      setTimeout(() => setClickedImage(null), 300);
+      setTimeout(() => setLoading(true), 200);
+      navigateToReader(router, [book.hash]);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [searchParams, libraryBooks, showGroupingModal]);
+  };
 
   const toggleSelection = (id: string) => {
     setSelectedBooks((prev) =>
-      prev.includes(id) ? prev.filter((selectedId) => selectedId !== id) : [...prev, id],
+      prev.includes(id) ? prev.filter((bookId) => bookId !== id) : [...prev, id],
     );
   };
 
@@ -114,8 +159,8 @@ const Bookshelf: React.FC<BookshelfProps> = ({
   };
 
   const confirmDelete = async () => {
-    for (const id of selectedBooks) {
-      const book = libraryBooks.find((b) => b.hash === id || b.groupId === id);
+    for (const selectedBook of selectedBooks) {
+      const book = libraryBooks.find((b) => b.hash === selectedBook);
       if (book) {
         await handleBookDelete(book);
       }
@@ -125,49 +170,87 @@ const Bookshelf: React.FC<BookshelfProps> = ({
   };
 
   const deleteSelectedBooks = () => {
-    setShowSelectModeActions(false);
     setShowDeleteAlert(true);
   };
 
-  const groupSelectedBooks = () => {
-    setShowSelectModeActions(false);
-    setShowGroupingModal(true);
+  const bookContextMenuHandler = async (book: Book, e: React.MouseEvent) => {
+    if (!isTauriAppPlatform()) return;
+    e.preventDefault();
+    e.stopPropagation();
+    const osPlatform = getOSPlatform();
+    const fileRevealLabel =
+      FILE_REVEAL_LABELS[osPlatform as FILE_REVEAL_PLATFORMS] || FILE_REVEAL_LABELS.default;
+    const openBookMenuItem = await MenuItem.new({
+      text: isSelectMode ? _('Select Book') : _('Open Book'),
+      action: async () => {
+        handleBookClick(book);
+      },
+    });
+    const showBookInFinderMenuItem = await MenuItem.new({
+      text: _(fileRevealLabel),
+      action: async () => {
+        const folder = `${settings.localBooksDir}/${getFilename(book)}`;
+        revealItemInDir(folder);
+      },
+    });
+    const showBookDetailsMenuItem = await MenuItem.new({
+      text: _('Show Book Details'),
+      action: async () => {
+        showBookDetailsModal(book);
+      },
+    });
+    const uploadBookMenuItem = await MenuItem.new({
+      text: _('Upload Book'),
+      action: async () => {
+        handleBookUpload(book);
+      },
+    });
+    const deleteBookMenuItem = await MenuItem.new({
+      text: _('Delete'),
+      action: async () => {
+        await handleBookDelete(book);
+      },
+    });
+    const menu = await Menu.new();
+    menu.append(openBookMenuItem);
+    menu.append(showBookDetailsMenuItem);
+    menu.append(showBookInFinderMenuItem);
+    menu.append(uploadBookMenuItem);
+    menu.append(deleteBookMenuItem);
+    menu.popup();
   };
 
-  const currentBookshelfItems = navBooksGroup ? navBooksGroup.books : allBookshelfItems;
-
   return (
     <div className='bookshelf'>
-      <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',
-        )}
-      >
-        {currentBookshelfItems.map((item, index) => (
-          <BookshelfItem
-            key={`library-item-${index}`}
-            item={item}
-            isSelectMode={isSelectMode}
-            selectedBooks={selectedBooks}
-            setLoading={setLoading}
-            toggleSelection={toggleSelection}
-            handleBookUpload={handleBookUpload}
-            handleBookDownload={handleBookDownload}
-            handleBookDelete={handleBookDelete}
-            handleSetSelectMode={handleSetSelectMode}
-            handleShowDetailsBook={handleShowDetailsBook}
-            transferProgress={
-              'hash' in item ? booksTransferProgress[(item as Book).hash] || null : null
-            }
-          />
-        ))}
-        {!navBooksGroup && allBookshelfItems.length > 0 && (
+      <div className='grid grid-cols-3 gap-0 sm:grid-cols-4 md:grid-cols-6 lg:grid-cols-8'>
+        {bookshelfItems.map((item, index) => (
           <div
-            className={clsx(
-              'border-1 bg-base-100 hover:bg-base-300/50 flex items-center justify-center',
-              'mx-0 my-4 aspect-[28/41] sm:mx-4',
-            )}
+            key={`library-item-${index}`}
+            className='hover:bg-base-300/50 group flex h-full flex-col p-4'
+          >
+            <div className='flex-grow'>
+              {'format' in item ? (
+                <BookItem
+                  book={item}
+                  isSelectMode={isSelectMode}
+                  selectedBooks={selectedBooks}
+                  clickedBookHash={clickedImage}
+                  handleBookClick={handleBookClick}
+                  handleBookUpload={handleBookUpload}
+                  handleBookDownload={handleBookDownload}
+                  showBookDetailsModal={showBookDetailsModal}
+                  bookContextMenuHandler={bookContextMenuHandler}
+                  transferProgress={booksTransferProgress[item.hash] || null}
+                />
+              ) : (
+                <GroupItem group={item} />
+              )}
+            </div>
+          </div>
+        ))}
+        {bookshelfItems.length > 0 && (
+          <div
+            className='border-1 bg-base-100 hover:bg-base-300/50 m-4 flex aspect-[28/41] items-center justify-center'
             role='button'
             onClick={handleImportBooks}
           >
@@ -175,94 +258,42 @@ const Bookshelf: React.FC<BookshelfProps> = ({
           </div>
         )}
       </div>
+      {selectedBooks.length > 0 && (
+        <div
+          className={clsx(
+            'text-base-content bg-base-300 fixed bottom-4 left-1/2 flex',
+            '-translate-x-1/2 transform space-x-4 rounded-lg p-4 shadow-lg',
+          )}
+        >
+          <button onClick={openSelectedBooks} className='flex items-center space-x-2'>
+            <MdOpenInNew />
+            <span>{_('Open')}</span>
+          </button>
+          <button onClick={deleteSelectedBooks} className='flex items-center space-x-2'>
+            <MdDelete className='fill-red-500' />
+            <span className='text-red-500'>{_('Delete')}</span>
+          </button>
+        </div>
+      )}
       {loading && (
         <div className='fixed inset-0 z-50 flex items-center justify-center'>
           <Spinner loading />
         </div>
       )}
-      <div className='fixed bottom-0 left-0 right-0 z-40 pb-[calc(env(safe-area-inset-bottom)+16px)]'>
-        {isSelectMode && showSelectModeActions && (
-          <div
-            className={clsx(
-              'flex items-center justify-center shadow-lg',
-              'text-base-content bg-base-300 text-sm',
-              'mx-auto w-fit space-x-6 rounded-lg p-4',
-            )}
-          >
-            <button
-              onClick={openSelectedBooks}
-              className={clsx(
-                'flex flex-col items-center justify-center',
-                (!selectedBooks.length || !selectedBooks.every((id) => isMd5(id))) &&
-                  'btn-disabled opacity-50',
-              )}
-            >
-              <MdOpenInNew />
-              <div>{_('Open')}</div>
-            </button>
-            <button
-              onClick={groupSelectedBooks}
-              className={clsx(
-                'flex flex-col items-center justify-center',
-                !selectedBooks.length && 'btn-disabled opacity-50',
-              )}
-            >
-              <LuFolderPlus />
-              <div>{_('Add to Group')}</div>
-            </button>
-            <button
-              onClick={deleteSelectedBooks}
-              className={clsx(
-                'flex flex-col items-center justify-center',
-                !selectedBooks.length && 'btn-disabled opacity-50',
-              )}
-            >
-              <MdDelete className='fill-red-500' />
-              <div className='text-red-500'>{_('Delete')}</div>
-            </button>
-            <button
-              onClick={() => handleSetSelectMode(false)}
-              className={clsx('flex flex-col items-center justify-center')}
-            >
-              <MdOutlineCancel />
-              <div>{_('Cancel')}</div>
-            </button>
-          </div>
-        )}
-      </div>
-      {showGroupingModal && (
-        <div>
-          <GroupingModal
-            libraryBooks={libraryBooks}
-            selectedBooks={selectedBooks}
-            onCancel={() => {
-              setShowGroupingModal(false);
-              setShowSelectModeActions(true);
-            }}
-            onConfirm={() => {
-              setShowGroupingModal(false);
-              handleSetSelectMode(false);
-            }}
-          />
-        </div>
-      )}
       {showDeleteAlert && (
-        <div
-          className={clsx(
-            'fixed bottom-0 left-0 right-0 z-50 flex justify-center',
-            'pb-[calc(env(safe-area-inset-bottom)+16px)]',
-          )}
-        >
-          <Alert
-            title={_('Confirm Deletion')}
-            message={_('Are you sure to delete the selected books?')}
-            onCancel={() => {
-              setShowDeleteAlert(false);
-              setShowSelectModeActions(true);
-            }}
-            onConfirm={confirmDelete}
-          />
-        </div>
+        <Alert
+          title={_('Confirm Deletion')}
+          message={_('Are you sure to delete the selected books?')}
+          onClickCancel={() => setShowDeleteAlert(false)}
+          onClickConfirm={confirmDelete}
+        />
+      )}
+      {showDetailsBook && (
+        <BookDetailModal
+          isOpen={!!showDetailsBook}
+          book={showDetailsBook}
+          onClose={dismissBookDetailsModal}
+        />
       )}
     </div>
   );

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

@@ -1,278 +0,0 @@
-import clsx from 'clsx';
-import { useRouter } from 'next/navigation';
-import { navigateToLibrary, navigateToReader } from '@/utils/nav';
-import { useEnv } from '@/context/EnvContext';
-import { useLibraryStore } from '@/store/libraryStore';
-import { useSettingsStore } from '@/store/settingsStore';
-import { useTranslation } from '@/hooks/useTranslation';
-import { useLongPress } from '@/hooks/useLongPress';
-import { Menu, MenuItem } from '@tauri-apps/api/menu';
-import { revealItemInDir } from '@tauri-apps/plugin-opener';
-import { getOSPlatform } from '@/utils/misc';
-import { getFilename } from '@/utils/book';
-import { BOOK_UNGROUPED_ID, BOOK_UNGROUPED_NAME } from '@/services/constants';
-import { FILE_REVEAL_LABELS, FILE_REVEAL_PLATFORMS } from '@/utils/os';
-import { Book, BookGroupType, BooksGroup } from '@/types/book';
-import BookItem from './BookItem';
-import GroupItem from './GroupItem';
-
-export type BookshelfItem = Book | BooksGroup;
-
-export const generateBookshelfItems = (books: Book[]): (Book | BooksGroup)[] => {
-  const groups: BooksGroup[] = books.reduce((acc: BooksGroup[], book: Book) => {
-    if (book.deletedAt) return acc;
-    book.groupId = book.groupId || BOOK_UNGROUPED_ID;
-    book.groupName = book.groupName || BOOK_UNGROUPED_NAME;
-    const groupIndex = acc.findIndex((group) => group.id === book.groupId);
-    const booksGroup = acc[acc.findIndex((group) => group.id === book.groupId)];
-    if (booksGroup) {
-      booksGroup.books.push(book);
-      booksGroup.updatedAt = Math.max(acc[groupIndex]!.updatedAt, book.updatedAt);
-    } else {
-      acc.push({
-        id: book.groupId,
-        name: book.groupName,
-        books: [book],
-        updatedAt: book.updatedAt,
-      });
-    }
-    return acc;
-  }, []);
-  groups.forEach((group) => {
-    group.books.sort((a, b) => b.updatedAt - a.updatedAt);
-  });
-  const ungroupedBooks: Book[] =
-    groups.find((group) => group.name === BOOK_UNGROUPED_NAME)?.books || [];
-  const groupedBooks: BooksGroup[] = groups.filter((group) => group.name !== BOOK_UNGROUPED_NAME);
-  return [...ungroupedBooks, ...groupedBooks].sort((a, b) => b.updatedAt - a.updatedAt);
-};
-
-export const generateGroupsList = (items: Book[]): BookGroupType[] => {
-  return items
-    .sort((a, b) => b.updatedAt - a.updatedAt)
-    .reduce((acc: BookGroupType[], item: Book) => {
-      if (item.deletedAt) return acc;
-      if (
-        item.groupId &&
-        item.groupName &&
-        item.groupId !== BOOK_UNGROUPED_ID &&
-        item.groupName !== BOOK_UNGROUPED_NAME &&
-        !acc.find((group) => group.id === item.groupId)
-      ) {
-        acc.push({ id: item.groupId, name: item.groupName });
-      }
-      return acc;
-    }, []) as BookGroupType[];
-};
-
-interface BookshelfItemProps {
-  item: BookshelfItem;
-  isSelectMode: boolean;
-  selectedBooks: string[];
-  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;
-  handleSetSelectMode: (selectMode: boolean) => void;
-  handleShowDetailsBook: (book: Book) => void;
-}
-
-const BookshelfItem: React.FC<BookshelfItemProps> = ({
-  item,
-  isSelectMode,
-  selectedBooks,
-  transferProgress,
-  setLoading,
-  toggleSelection,
-  handleBookUpload,
-  handleBookDownload,
-  handleBookDelete,
-  handleSetSelectMode,
-  handleShowDetailsBook,
-}) => {
-  const _ = useTranslation();
-  const router = useRouter();
-  const { envConfig, appService } = useEnv();
-  const { settings } = useSettingsStore();
-  const { updateBook } = useLibraryStore();
-
-  const showBookDetailsModal = async (book: Book) => {
-    if (await makeBookAvailable(book)) {
-      handleShowDetailsBook(book);
-    }
-  };
-
-  const makeBookAvailable = async (book: Book) => {
-    if (book.uploadedAt && !book.downloadedAt) {
-      let available = false;
-      const loadingTimeout = setTimeout(() => setLoading(true), 200);
-      try {
-        await handleBookDownload(book);
-        updateBook(envConfig, book);
-        available = true;
-      } finally {
-        if (loadingTimeout) clearTimeout(loadingTimeout);
-        setLoading(false);
-        return available;
-      }
-    }
-    return true;
-  };
-
-  const handleBookClick = async (book: Book) => {
-    if (isSelectMode) {
-      toggleSelection(book.hash);
-    } else {
-      if (!(await makeBookAvailable(book))) return;
-      navigateToReader(router, [book.hash]);
-    }
-  };
-
-  const handleGroupClick = (group: BooksGroup) => {
-    if (isSelectMode) {
-      toggleSelection(group.id);
-    } else {
-      navigateToLibrary(router, `group=${group.id}`);
-    }
-  };
-
-  const bookContextMenuHandler = async (book: Book) => {
-    if (!appService?.hasContextMenu) return;
-    const osPlatform = getOSPlatform();
-    const fileRevealLabel =
-      FILE_REVEAL_LABELS[osPlatform as FILE_REVEAL_PLATFORMS] || FILE_REVEAL_LABELS.default;
-    const selectBookMenuItem = await MenuItem.new({
-      text: selectedBooks.includes(book.hash) ? _('Deselect Book') : _('Select Book'),
-      action: async () => {
-        if (!isSelectMode) handleSetSelectMode(true);
-        toggleSelection(book.hash);
-      },
-    });
-    const showBookInFinderMenuItem = await MenuItem.new({
-      text: _(fileRevealLabel),
-      action: async () => {
-        const folder = `${settings.localBooksDir}/${getFilename(book)}`;
-        revealItemInDir(folder);
-      },
-    });
-    const showBookDetailsMenuItem = await MenuItem.new({
-      text: _('Show Book Details'),
-      action: async () => {
-        showBookDetailsModal(book);
-      },
-    });
-    const downloadBookMenuItem = await MenuItem.new({
-      text: _('Download Book'),
-      action: async () => {
-        handleBookDownload(book);
-      },
-    });
-    const uploadBookMenuItem = await MenuItem.new({
-      text: _('Upload Book'),
-      action: async () => {
-        handleBookUpload(book);
-      },
-    });
-    const deleteBookMenuItem = await MenuItem.new({
-      text: _('Delete'),
-      action: async () => {
-        await handleBookDelete(book);
-      },
-    });
-    const menu = await Menu.new();
-    menu.append(selectBookMenuItem);
-    menu.append(showBookDetailsMenuItem);
-    menu.append(showBookInFinderMenuItem);
-    if (book.uploadedAt && !book.downloadedAt) {
-      menu.append(downloadBookMenuItem);
-    }
-    if (!book.uploadedAt && book.downloadedAt) {
-      menu.append(uploadBookMenuItem);
-    }
-    menu.append(deleteBookMenuItem);
-    menu.popup();
-  };
-
-  const groupContextMenuHandler = async (group: BooksGroup) => {
-    if (!appService?.hasContextMenu) return;
-    const selectGroupMenuItem = await MenuItem.new({
-      text: selectedBooks.includes(group.id) ? _('Deselect Group') : _('Select Group'),
-      action: async () => {
-        if (!isSelectMode) handleSetSelectMode(true);
-        toggleSelection(group.id);
-      },
-    });
-    const deleteGroupMenuItem = await MenuItem.new({
-      text: _('Delete'),
-      action: async () => {
-        for (const book of group.books) {
-          await handleBookDelete(book);
-        }
-      },
-    });
-    const menu = await Menu.new();
-    menu.append(selectGroupMenuItem);
-    menu.append(deleteGroupMenuItem);
-    menu.popup();
-  };
-
-  const { pressing, handlers } = useLongPress({
-    onLongPress: () => {
-      if (!isSelectMode) {
-        handleSetSelectMode(true);
-      }
-      if ('format' in item) {
-        toggleSelection((item as Book).hash);
-      } else {
-        toggleSelection((item as BooksGroup).id);
-      }
-    },
-    onTap: () => {
-      if ('format' in item) {
-        handleBookClick(item as Book);
-      } else {
-        handleGroupClick(item as BooksGroup);
-      }
-    },
-    onContextMenu: () => {
-      if ('format' in item) {
-        bookContextMenuHandler(item as Book);
-      } else {
-        groupContextMenuHandler(item as BooksGroup);
-      }
-    },
-  });
-
-  return (
-    <div
-      className={clsx(
-        'sm:hover:bg-base-300/50 group flex h-full flex-col px-0 py-4 sm:px-4',
-        pressing ? 'scale-95' : 'scale-100',
-      )}
-      style={{
-        transition: 'transform 0.2s',
-      }}
-      {...handlers}
-    >
-      <div className='flex-grow'>
-        {'format' in item ? (
-          <BookItem
-            book={item}
-            isSelectMode={isSelectMode}
-            selectedBooks={selectedBooks}
-            transferProgress={transferProgress}
-            handleBookUpload={handleBookUpload}
-            handleBookDownload={handleBookDownload}
-            showBookDetailsModal={showBookDetailsModal}
-          />
-        ) : (
-          <GroupItem group={item} isSelectMode={isSelectMode} selectedBooks={selectedBooks} />
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default BookshelfItem;

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

@@ -1,50 +1,33 @@
-import clsx from 'clsx';
-import { MdCheckCircle, MdCheckCircleOutline } from 'react-icons/md';
-import { useEnv } from '@/context/EnvContext';
+import Image from 'next/image';
 import { BooksGroup } from '@/types/book';
-import BookCover from './BookCover';
+import ReadingProgress from './ReadingProgress';
 
 interface GroupItemProps {
   group: BooksGroup;
-  isSelectMode: boolean;
-  selectedBooks: string[];
 }
 
-const GroupItem: React.FC<GroupItemProps> = ({ group, isSelectMode, selectedBooks }) => {
-  const { appService } = useEnv();
+const GroupItem: React.FC<GroupItemProps> = ({ group }) => {
   return (
-    <div
-      className={clsx(
-        'group-item flex h-full flex-col',
-        appService?.hasContextMenu ? 'cursor-pointer' : '',
-      )}
-    >
-      <div className='bg-base-100 relative flex aspect-[28/41] items-center justify-center overflow-hidden p-2 shadow-md'>
-        <div className='grid w-full grid-cols-2 grid-rows-2 gap-1 overflow-hidden'>
-          {group.books.slice(0, 4).map((book) => (
-            <div key={book.hash} className='relative aspect-[28/41] h-full w-full'>
-              <BookCover book={book} isPreview />
-            </div>
-          ))}
-        </div>
-        {selectedBooks.includes(group.id) && (
-          <div className='absolute inset-0 bg-black opacity-30 transition-opacity duration-300'></div>
-        )}
-        {isSelectMode && (
-          <div className='absolute bottom-1 right-1'>
-            {selectedBooks.includes(group.id) ? (
-              <MdCheckCircle className='fill-blue-500' />
-            ) : (
-              <MdCheckCircleOutline className='fill-gray-300 drop-shadow-sm' />
-            )}
+    <div>
+      {group.books.map((book) => (
+        <div key={book.hash} className='card bg-base-100 w-full shadow-md'>
+          <figure>
+            <Image
+              width={10}
+              height={10}
+              src={book.coverImageUrl!}
+              alt={book.title || ''}
+              className='h-48 w-full object-cover'
+            />
+          </figure>
+          <div className='card-body p-4'>
+            <h3 className='card-title line-clamp-2 text-sm'>{book.title}</h3>
+            <p className='text-neutral-content line-clamp-1 text-xs'>{book.author}</p>
+            <ReadingProgress book={book} />
           </div>
-        )}
-      </div>
-      <div className='min-w-0 flex-1 pt-2'>
-        <h4 className='block overflow-hidden text-ellipsis whitespace-nowrap text-xs font-semibold'>
-          {group.name}
-        </h4>
-      </div>
+        </div>
+      ))}
+      <h2 className='mb-2 text-lg font-bold'>{group.name}</h2>
     </div>
   );
 };

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

@@ -1,247 +0,0 @@
-import clsx from 'clsx';
-import React, { useEffect, useRef, useState } from 'react';
-import { MdCheck } from 'react-icons/md';
-import { HiOutlineFolder, HiOutlineFolderAdd, HiOutlineFolderRemove } from 'react-icons/hi';
-
-import { Book, BookGroupType } from '@/types/book';
-import { isMd5, md5Fingerprint } from '@/utils/md5';
-import { useEnv } from '@/context/EnvContext';
-import { useTranslation } from '@/hooks/useTranslation';
-import { useLibraryStore } from '@/store/libraryStore';
-import { useResponsiveSize } from '@/hooks/useResponsiveSize';
-import { BOOK_UNGROUPED_ID, BOOK_UNGROUPED_NAME } from '@/services/constants';
-import { generateGroupsList } from './BookshelfItem';
-
-interface GroupingModalProps {
-  libraryBooks: Book[];
-  selectedBooks: string[];
-  onCancel: () => void;
-  onConfirm: () => void;
-}
-
-const GroupingModal: React.FC<GroupingModalProps> = ({
-  libraryBooks,
-  selectedBooks,
-  onCancel,
-  onConfirm,
-}) => {
-  const _ = useTranslation();
-  const { appService } = useEnv();
-  const { setLibrary } = useLibraryStore();
-  const groupsList = generateGroupsList(libraryBooks);
-
-  const [showInput, setShowInput] = useState(false);
-  const [editGroupName, setEditGroupName] = useState(_('Untitled Group'));
-  const [selectedGroup, setSelectedGroup] = useState<BookGroupType | null>(null);
-  const [newGroups, setNewGroups] = useState<BookGroupType[]>([]);
-  const [allGroups, setAllGroups] = useState<BookGroupType[]>(groupsList);
-  const editorRef = useRef<HTMLInputElement>(null);
-
-  const iconSize = useResponsiveSize(16);
-
-  const isSelectedBooksHasGroup =
-    selectedBooks.some((hash) => !isMd5(hash)) ||
-    selectedBooks
-      .map((hash) => libraryBooks.find((book) => book.hash === hash)?.groupId)
-      .some((group) => group && group !== BOOK_UNGROUPED_NAME);
-
-  const handleCreateGroup = () => {
-    setShowInput(true);
-  };
-
-  const handleRemoveFromGroup = () => {
-    selectedBooks.forEach((id) => {
-      for (const book of libraryBooks.filter((book) => book.hash === id || book.groupId === id)) {
-        if (
-          book &&
-          book.groupId &&
-          book.groupName &&
-          book.groupId !== BOOK_UNGROUPED_ID &&
-          book.groupName !== BOOK_UNGROUPED_NAME
-        ) {
-          book.groupId = undefined;
-          book.groupName = undefined;
-          book.updatedAt = Date.now();
-        }
-      }
-    });
-    setLibrary(libraryBooks);
-    appService?.saveLibraryBooks(libraryBooks);
-    onConfirm();
-  };
-
-  const handleConfirmCreateGroup = () => {
-    const groupName = editGroupName.trim();
-    if (groupName) {
-      const newGroup = { id: md5Fingerprint(groupName), name: groupName };
-      const existingGroupIndex = newGroups.findIndex((group) => group.name === groupName);
-      if (existingGroupIndex > -1) {
-        newGroups.splice(existingGroupIndex, 1);
-      }
-      newGroups.push(newGroup);
-      setSelectedGroup(newGroup);
-      setNewGroups(newGroups);
-      for (const newGroup of newGroups) {
-        const existingGroupIndex = groupsList.findIndex((group) => group.id === newGroup.id);
-        if (existingGroupIndex > -1) {
-          groupsList.splice(existingGroupIndex, 1);
-        }
-        groupsList.unshift(newGroup);
-      }
-      setAllGroups(groupsList);
-      const untitledGroupPattern = new RegExp(`^${_('Untitled Group')}\\s*(\\d+)?$`);
-      const untitledGroupNumbers = groupsList
-        .map((group) => {
-          const match = group.name.match(untitledGroupPattern);
-          return match ? parseInt(match[1] || '0', 10) : null;
-        })
-        .filter((num) => num !== null);
-
-      const nextNumber =
-        untitledGroupNumbers.length > 0 ? Math.max(...untitledGroupNumbers) + 1 : 1;
-      setEditGroupName(`${_('Untitled Group')} ${nextNumber}`);
-      setShowInput(false);
-    }
-  };
-
-  const handleToggleSelectGroup = (group: BookGroupType) => {
-    setSelectedGroup((prevGroup) => (prevGroup?.id === group.id ? null : group));
-  };
-
-  const handleConfirmGrouping = () => {
-    selectedBooks.forEach((id) => {
-      for (const book of libraryBooks.filter((book) => book.hash === id || book.groupId === id)) {
-        if (book && selectedGroup) {
-          book.groupId = selectedGroup.id;
-          book.groupName = selectedGroup.name;
-          book.updatedAt = Date.now();
-        }
-      }
-    });
-    setLibrary(libraryBooks);
-    appService?.saveLibraryBooks(libraryBooks);
-    onConfirm();
-  };
-
-  useEffect(() => {
-    if (editorRef.current) {
-      editorRef.current.select();
-    }
-  }, [showInput]);
-
-  useEffect(() => {
-    const groupIds = selectedBooks
-      .map((id) => libraryBooks.find((book) => book.hash === id || book.groupId === id)?.groupId)
-      .filter((groupId) => groupId);
-    if (Array.from(new Set(groupIds)).length === 1) {
-      setSelectedGroup(groupsList.find((group) => group.id === groupIds[0]) || null);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedBooks]);
-
-  return (
-    <div className='fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50'>
-      <div
-        className={clsx(
-          'modal-box bg-base-100 overflow-y-auto rounded-2xl shadow-xl',
-          'max-h-[85%] w-[95%] min-w-64 max-w-[440px] p-6 sm:w-[70%]',
-        )}
-      >
-        <h2 className='text-center text-lg font-bold'>{_('Group Books')}</h2>
-        <div className={clsx('mt-4 grid grid-cols-1 gap-2 text-base md:grid-cols-2')}>
-          {isSelectedBooksHasGroup && (
-            <div
-              onClick={handleRemoveFromGroup}
-              role='button'
-              className='flex items-center space-x-2 p-2 text-blue-500'
-            >
-              <HiOutlineFolderRemove size={iconSize} />
-              <span>{_('Remove From Group')}</span>
-            </div>
-          )}
-          <div
-            onClick={handleCreateGroup}
-            role='button'
-            className='flex items-center space-x-2 p-2 text-blue-500'
-          >
-            <HiOutlineFolderAdd size={iconSize} />
-            <span>{_('Create New Group')}</span>
-          </div>
-        </div>
-        {showInput && (
-          <div className='mt-4 flex items-center gap-2'>
-            <input
-              type='text'
-              autoFocus
-              ref={editorRef}
-              value={editGroupName}
-              onChange={(e) => setEditGroupName(e.target.value)}
-              onKeyDown={(e) => {
-                if (e.key === 'Enter') handleConfirmCreateGroup();
-                e.stopPropagation();
-              }}
-              className='input input-ghost w-full border-0 px-2 text-base !outline-none sm:text-sm'
-            />
-            <button
-              className={clsx(
-                'btn btn-ghost settings-content hover:bg-transparent',
-                'flex h-[1.3em] min-h-[1.3em] items-end p-0',
-                editorRef.current && editorRef.current.value ? '' : 'btn-disabled !bg-opacity-0',
-              )}
-              onClick={() => handleConfirmCreateGroup()}
-            >
-              <div className='pr-1 align-bottom text-base text-blue-500 sm:text-sm'>
-                {_('Save')}
-              </div>
-            </button>
-          </div>
-        )}
-        <ul className='groups-list mt-4 grid grid-cols-2 gap-2'>
-          {allGroups.map((group, index) => (
-            <button
-              key={index}
-              className={clsx(
-                'hover:bg-base-300 text-base-content flex w-full',
-                'items-center justify-between rounded-md px-2 py-2',
-              )}
-              onClick={() => handleToggleSelectGroup(group)}
-            >
-              <div className='flex min-w-0 items-center'>
-                <span style={{ minWidth: `${iconSize}px` }}>
-                  <HiOutlineFolder size={iconSize} />
-                </span>
-                <span
-                  className={clsx('mx-2 flex-1 truncate text-base sm:text-sm')}
-                  style={{ minWidth: 0 }}
-                >
-                  {group.name}
-                </span>
-              </div>
-              <span className='text-neutral-content flex shrink-0 text-sm'>
-                {selectedGroup && selectedGroup.id == group.id && (
-                  <MdCheck className='fill-blue-500' size={iconSize} />
-                )}
-              </span>
-            </button>
-          ))}
-        </ul>
-        <div className='mt-6 flex justify-end gap-x-8 p-2'>
-          <button onClick={onCancel} className='flex items-center'>
-            {_('Cancel')}
-          </button>
-          <button
-            onClick={handleConfirmGrouping}
-            className={clsx(
-              'flex items-center text-blue-500',
-              !selectedGroup && 'btn-disabled opacity-50',
-            )}
-          >
-            {_('Confirm')}
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default GroupingModal;

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

@@ -1,16 +1,13 @@
 import clsx from 'clsx';
 import React, { useEffect, useRef } from 'react';
-import { useRouter, useSearchParams } from 'next/navigation';
 import { FaSearch } from 'react-icons/fa';
 import { PiPlus } from 'react-icons/pi';
 import { PiSelectionAllDuotone } from 'react-icons/pi';
 import { MdOutlineMenu } from 'react-icons/md';
-import { MdArrowBackIosNew } from 'react-icons/md';
 
 import { useEnv } from '@/context/EnvContext';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
-import { navigateToLibrary } from '@/utils/nav';
 import useTrafficLight from '@/hooks/useTrafficLight';
 import WindowButtons from '@/components/WindowButtons';
 import Dropdown from '@/components/Dropdown';
@@ -29,13 +26,10 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
   onToggleSelectMode,
 }) => {
   const _ = useTranslation();
-  const router = useRouter();
-  const searchParams = useSearchParams();
   const { appService } = useEnv();
   const { isTrafficLightVisible } = useTrafficLight();
   const headerRef = useRef<HTMLDivElement>(null);
   const iconSize16 = useResponsiveSize(16);
-  const iconSize20 = useResponsiveSize(20);
 
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
@@ -49,48 +43,30 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
     };
   }, [onToggleSelectMode]);
 
-  const windowButtonVisible = appService?.hasWindowBar && !isTrafficLightVisible;
-  const isInGroupView = !!searchParams?.get('group');
-
   return (
     <div
       ref={headerRef}
       className={clsx(
-        'titlebar z-10 flex h-11 w-full items-center py-2 pr-4 sm:pr-6',
-        appService?.hasSafeAreaInset && 'mt-[env(safe-area-inset-top)]',
-        isTrafficLightVisible ? 'pl-16' : 'pl-0 sm:pl-2',
+        'titlebar z-10 h-11 w-full py-2 pr-6',
+        isTrafficLightVisible ? 'pl-16' : 'pl-2',
       )}
     >
-      <div className='flex w-full items-center justify-between space-x-6 sm:space-x-12'>
+      <div className='flex items-center justify-between space-x-12'>
         <div className='exclude-title-bar-mousedown relative flex w-full items-center pl-4'>
-          {isInGroupView && (
-            <button
-              onClick={() => {
-                navigateToLibrary(router);
-              }}
-              className='ml-[-6px] mr-4 flex h-7 min-h-7 w-7 items-center p-0'
-            >
-              <div className='lg:tooltip lg:tooltip-bottom' data-tip={_('Go Back')}>
-                <MdArrowBackIosNew size={iconSize20} />
-              </div>
-            </button>
-          )}
-          <div className='relative flex h-7 w-full items-center'>
-            <span className='absolute left-3 text-gray-500'>
-              <FaSearch className='h-4 w-4' />
-            </span>
-            <input
-              type='text'
-              placeholder={_('Search Books...')}
-              spellCheck='false'
-              className={clsx(
-                'input rounded-badge bg-base-300/50 h-7 w-full pl-10 pr-10',
-                'font-sans text-sm font-light',
-                'border-none focus:outline-none focus:ring-0',
-              )}
-            />
-          </div>
-          <div className='absolute right-4 flex items-center space-x-2 text-gray-500 sm:space-x-4'>
+          <span className='absolute left-8 text-gray-500'>
+            <FaSearch className='h-4 w-4' />
+          </span>
+          <input
+            type='text'
+            placeholder={_('Search Books...')}
+            spellCheck='false'
+            className={clsx(
+              'input rounded-badge bg-base-300/50 h-7 w-full pl-10 pr-10',
+              'font-sans text-sm font-light',
+              'border-none focus:outline-none focus:ring-0',
+            )}
+          />
+          <div className='absolute right-4 flex items-center space-x-4 text-gray-500'>
             <span className='mx-2 h-6 w-[1px] bg-gray-400'></span>
             <Dropdown
               className='exclude-title-bar-mousedown dropdown-bottom flex h-6 cursor-pointer justify-center'
@@ -120,7 +96,7 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
             </button>
           </div>
         </div>
-        <div className='flex h-full items-center gap-x-2 sm:gap-x-4'>
+        <div className='flex h-full items-center gap-x-4'>
           <Dropdown
             className='exclude-title-bar-mousedown dropdown-bottom dropdown-end'
             buttonClassName='btn btn-ghost h-8 min-h-8 w-8 p-0'
@@ -128,12 +104,12 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
           >
             <SettingsMenu />
           </Dropdown>
-          {appService?.hasWindowBar && (
+          {!isTrafficLightVisible && appService?.appPlatform !== 'web' && (
             <WindowButtons
               headerRef={headerRef}
-              showMinimize={windowButtonVisible}
-              showMaximize={windowButtonVisible}
-              showClose={windowButtonVisible}
+              showMinimize={true}
+              showMaximize={true}
+              showClose={true}
             />
           )}
         </div>

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

@@ -31,7 +31,6 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
   const [quotas, setQuotas] = React.useState<QuotaType[]>([]);
   const [isAutoUpload, setIsAutoUpload] = useState(settings.autoUpload);
   const [isAutoCheckUpdates, setIsAutoCheckUpdates] = useState(settings.autoCheckUpdates);
-  const [isScreenWakeLock, setIsScreenWakeLock] = useState(settings.screenWakeLock);
 
   const showAboutReadest = () => {
     setAboutDialogVisible(true);
@@ -78,13 +77,6 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
     setIsAutoCheckUpdates(settings.autoCheckUpdates);
   };
 
-  const toggleScreenWakeLock = () => {
-    settings.screenWakeLock = !settings.screenWakeLock;
-    setSettings(settings);
-    saveSettings(envConfig, settings);
-    setIsScreenWakeLock(settings.screenWakeLock);
-  };
-
   useEffect(() => {
     if (!user || !token) return;
     const storagPlan = getStoragePlanData(token);
@@ -154,11 +146,6 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
           onClick={toggleAutoCheckUpdates}
         />
       )}
-      <MenuItem
-        label={_('Keep Screen Awake')}
-        icon={isScreenWakeLock ? <MdCheck className='text-base-content' /> : undefined}
-        onClick={toggleScreenWakeLock}
-      />
       <hr className='border-base-200 my-1' />
       <MenuItem label={_('Reload Page')} onClick={handleReloadPage} />
       <hr className='border-base-200 my-1' />

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

@@ -6,12 +6,7 @@ import { useLibraryStore } from '@/store/libraryStore';
 import { SYNC_BOOKS_INTERVAL_SEC } from '@/services/constants';
 import { Book } from '@/types/book';
 
-export interface UseBooksSyncProps {
-  onSyncStart?: () => void;
-  onSyncEnd?: () => void;
-}
-
-export const useBooksSync = ({ onSyncStart, onSyncEnd }: UseBooksSyncProps) => {
+export const useBooksSync = () => {
   const { user } = useAuth();
   const { appService } = useEnv();
   const { library, setLibrary } = useLibraryStore();
@@ -74,8 +69,6 @@ export const useBooksSync = ({ onSyncStart, onSyncEnd }: UseBooksSyncProps) => {
 
   const updateLibrary = async () => {
     if (!syncedBooks?.length) return;
-    // Process old books first so that when we update the library the order is preserved
-    syncedBooks.sort((a, b) => a.updatedAt - b.updatedAt);
 
     const processOldBook = async (oldBook: Book) => {
       const matchingBook = syncedBooks.find((newBook) => newBook.hash === oldBook.hash);
@@ -98,23 +91,16 @@ export const useBooksSync = ({ onSyncStart, onSyncEnd }: UseBooksSyncProps) => {
       if (!updatedLibrary.some((oldBook) => oldBook.hash === newBook.hash)) {
         if (newBook.uploadedAt && !newBook.deletedAt) {
           try {
+            updatedLibrary.push(newBook);
             await appService?.downloadBook(newBook, true);
             newBook.coverImageUrl = await appService?.generateCoverImageUrl(newBook);
-            updatedLibrary.push(newBook);
-            setLibrary(updatedLibrary);
           } catch {
             console.error('Failed to download book:', newBook);
           }
         }
       }
     };
-    onSyncStart?.();
-    const batchSize = 3;
-    for (let i = 0; i < syncedBooks.length; i += batchSize) {
-      const batch = syncedBooks.slice(i, i + batchSize);
-      await Promise.all(batch.map(processNewBook));
-    }
-    onSyncEnd?.();
+    await Promise.all(syncedBooks.map(processNewBook));
     setLibrary(updatedLibrary);
     appService?.saveLibraryBooks(updatedLibrary);
   };

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

@@ -2,16 +2,14 @@
 
 import clsx from 'clsx';
 import * as React from 'react';
-import { useState, useRef, useEffect } from 'react';
+import { useState, useRef, useEffect, Suspense } from 'react';
 import { useRouter } from 'next/navigation';
 
 import { Book } from '@/types/book';
 import { AppService } from '@/types/system';
-import { navigateToLogin, navigateToReader } from '@/utils/nav';
+import { navigateToReader } from '@/utils/nav';
 import { getBaseFilename, listFormater } from '@/utils/book';
 import { eventDispatcher } from '@/utils/event';
-import { ProgressPayload } from '@/utils/transfer';
-import { throttle } from '@/utils/throttle';
 import { parseOpenWithFiles } from '@/helpers/cli';
 import { isTauriAppPlatform, hasUpdater } from '@/services/environment';
 import { checkForAppUpdates } from '@/helpers/updater';
@@ -32,8 +30,8 @@ import { Toast } from '@/components/Toast';
 import Spinner from '@/components/Spinner';
 import LibraryHeader from './components/LibraryHeader';
 import Bookshelf from './components/Bookshelf';
-import BookDetailModal from '@/components/BookDetailModal';
-import { useScreenWakeLock } from '@/hooks/useScreenWakeLock';
+import { ProgressPayload } from '@/utils/transfer';
+import { throttle } from '@/utils/throttle';
 
 const LibraryPage = () => {
   const router = useRouter();
@@ -53,20 +51,15 @@ const LibraryPage = () => {
   const isInitiating = useRef(false);
   const [libraryLoaded, setLibraryLoaded] = useState(false);
   const [isSelectMode, setIsSelectMode] = useState(false);
-  const [showDetailsBook, setShowDetailsBook] = useState<Book | null>(null);
   const [booksTransferProgress, setBooksTransferProgress] = useState<{
     [key: string]: number | null;
   }>({});
   const demoBooks = useDemoBooks();
   const containerRef = useRef<HTMLDivElement>(null);
 
-  const { pullLibrary, pushLibrary } = useBooksSync({
-    onSyncStart: () => setLoading(true),
-    onSyncEnd: () => setLoading(false),
-  });
+  const { pullLibrary, pushLibrary } = useBooksSync();
 
   usePullToRefresh(containerRef, pullLibrary);
-  useScreenWakeLock(settings.screenWakeLock);
 
   useEffect(() => {
     updateAppTheme('base-200');
@@ -251,19 +244,7 @@ const LibraryPage = () => {
           title: book.title,
         }),
       });
-    } catch (err) {
-      if (err instanceof Error) {
-        if (err.message.includes('Not authenticated')) {
-          navigateToLogin(router);
-          return;
-        } else if (err.message.includes('Insufficient storage quota')) {
-          eventDispatcher.dispatch('toast', {
-            type: 'error',
-            message: _('Insufficient storage quota'),
-          });
-          return;
-        }
-      }
+    } catch {
       eventDispatcher.dispatch('toast', {
         type: 'error',
         message: _('Failed to upload book: {{title}}', {
@@ -339,14 +320,6 @@ const LibraryPage = () => {
     setIsSelectMode(!isSelectMode);
   };
 
-  const handleSetSelectMode = (selectMode: boolean) => {
-    setIsSelectMode(selectMode);
-  };
-
-  const handleShowDetailsBook = (book: Book) => {
-    setShowDetailsBook(book);
-  };
-
   if (!appService) {
     return null;
   }
@@ -364,9 +337,8 @@ const LibraryPage = () => {
   return (
     <div
       className={clsx(
-        'library-page bg-base-200 text-base-content flex select-none flex-col overflow-hidden',
-        appService?.isIOSApp ? 'h-[100vh]' : 'h-dvh',
-        appService?.hasRoundedWindow && 'rounded-window',
+        'library-page bg-base-200 text-base-content flex h-dvh select-none flex-col overflow-hidden',
+        isTauriAppPlatform() && 'rounded-window',
       )}
     >
       <div className='fixed top-0 z-40 w-full'>
@@ -383,24 +355,18 @@ const LibraryPage = () => {
       )}
       {libraryLoaded &&
         (libraryBooks.length > 0 ? (
-          <div
-            ref={containerRef}
-            className={clsx(
-              'mt-12 flex-grow overflow-auto px-4 sm:px-2',
-              appService?.hasSafeAreaInset && 'mt-[calc(48px+env(safe-area-inset-top))]',
-            )}
-          >
-            <Bookshelf
-              libraryBooks={libraryBooks}
-              isSelectMode={isSelectMode}
-              handleImportBooks={handleImportBooks}
-              handleBookUpload={handleBookUpload}
-              handleBookDownload={handleBookDownload}
-              handleBookDelete={handleBookDelete}
-              handleSetSelectMode={handleSetSelectMode}
-              handleShowDetailsBook={handleShowDetailsBook}
-              booksTransferProgress={booksTransferProgress}
-            />
+          <div ref={containerRef} className='mt-12 flex-grow overflow-auto px-2'>
+            <Suspense>
+              <Bookshelf
+                libraryBooks={libraryBooks}
+                isSelectMode={isSelectMode}
+                handleImportBooks={handleImportBooks}
+                handleBookUpload={handleBookUpload}
+                handleBookDownload={handleBookDownload}
+                handleBookDelete={handleBookDelete}
+                booksTransferProgress={booksTransferProgress}
+              />
+            </Suspense>
           </div>
         ) : (
           <div className='hero h-screen items-center justify-center'>
@@ -419,13 +385,6 @@ const LibraryPage = () => {
             </div>
           </div>
         ))}
-      {showDetailsBook && (
-        <BookDetailModal
-          isOpen={!!showDetailsBook}
-          book={showDetailsBook}
-          onClose={() => setShowDetailsBook(null)}
-        />
-      )}
       <AboutWindow />
       <Toast />
     </div>

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

@@ -1,11 +1,10 @@
-import clsx from 'clsx';
 import React, { useEffect } from 'react';
 
-import { useEnv } from '@/context/EnvContext';
 import { useSettingsStore } from '@/store/settingsStore';
 import { useReaderStore } from '@/store/readerStore';
 import { useBookDataStore } from '@/store/bookDataStore';
 import { useSidebarStore } from '@/store/sidebarStore';
+import { isTauriAppPlatform } from '@/services/environment';
 import FoliateViewer from './FoliateViewer';
 import getGridTemplate from '@/utils/grid';
 import SectionInfo from './SectionInfo';
@@ -24,7 +23,6 @@ interface BooksGridProps {
 }
 
 const BooksGrid: React.FC<BooksGridProps> = ({ bookKeys, onCloseBook }) => {
-  const { appService } = useEnv();
   const { getConfig, getBookData } = useBookDataStore();
   const { getProgress, getViewState, getViewSettings } = useReaderStore();
   const { sideBarBookKey } = useSidebarStore();
@@ -41,10 +39,7 @@ const BooksGrid: React.FC<BooksGridProps> = ({ bookKeys, onCloseBook }) => {
 
   return (
     <div
-      className={clsx(
-        'grid h-full flex-grow',
-        appService?.hasSafeAreaInset && 'pt-[env(safe-area-inset-top)]',
-      )}
+      className='grid h-full flex-grow'
       style={{
         gridTemplateColumns: gridTemplate.columns,
         gridTemplateRows: gridTemplate.rows,
@@ -66,7 +61,7 @@ const BooksGrid: React.FC<BooksGridProps> = ({ bookKeys, onCloseBook }) => {
           <div
             id={`gridcell-${bookKey}`}
             key={bookKey}
-            className={`${appService?.hasRoundedWindow ? 'rounded-window' : ''} relative h-full w-full overflow-hidden`}
+            className={`${isTauriAppPlatform() ? 'rounded-window' : ''} relative h-full w-full overflow-hidden`}
           >
             {isBookmarked && <Ribbon width={marginGap} />}
             <HeaderBar

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

@@ -7,10 +7,8 @@ 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 {
@@ -44,7 +42,6 @@ const FoliateViewer: React.FC<{
   }, [toastMessage]);
 
   useProgressSync(bookKey);
-  useProgressAutoSave(bookKey);
 
   const progressRelocateHandler = (event: Event) => {
     const detail = (event as CustomEvent).detail;
@@ -89,8 +86,7 @@ const FoliateViewer: React.FC<{
       if (renderer) {
         if (renderer.start <= 0) {
           viewRef.current?.prev(1);
-          // sometimes viewSize has subpixel value that the end never reaches
-        } else if (renderer.end + 1 >= renderer.viewSize) {
+        } else if (renderer.end >= renderer.viewSize) {
           viewRef.current?.next(1);
         }
       }
@@ -144,11 +140,6 @@ const FoliateViewer: React.FC<{
       const viewSettings = getViewSettings(bookKey)!;
       view.renderer.setStyles?.(getStyles(viewSettings, themeCode));
 
-      const writingMode = viewSettings.writingMode;
-      if (writingMode) {
-        view.book.dir = getBookDirFromWritingMode(writingMode);
-      }
-
       const isScrolled = viewSettings.scrolled!;
       const marginPx = viewSettings.marginPx!;
       const gapPercent = viewSettings.gapPercent!;

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

@@ -4,11 +4,11 @@ import { RiArrowLeftWideLine, RiArrowRightWideLine } from 'react-icons/ri';
 import { RiArrowGoBackLine, RiArrowGoForwardLine } from 'react-icons/ri';
 import { FaHeadphones } from 'react-icons/fa6';
 
-import { useEnv } from '@/context/EnvContext';
 import { useReaderStore } from '@/store/readerStore';
 import { useSidebarStore } from '@/store/sidebarStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { eventDispatcher } from '@/utils/event';
+import { isPWA, isTauriAppPlatform } from '@/services/environment';
 import Button from '@/components/Button';
 
 interface FooterBarProps {
@@ -19,7 +19,6 @@ interface FooterBarProps {
 
 const FooterBar: React.FC<FooterBarProps> = ({ bookKey, pageinfo, isHoveredAnim }) => {
   const _ = useTranslation();
-  const { appService } = useEnv();
   const { hoveredBookKey, setHoveredBookKey, getView, getProgress } = useReaderStore();
   const { isSideBarVisible } = useSidebarStore();
   const view = getView(bookKey);
@@ -63,9 +62,9 @@ const FooterBar: React.FC<FooterBarProps> = ({ bookKey, pageinfo, isHoveredAnim
       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',
+        isPWA() ? 'pb-[env(safe-area-inset-bottom)]' : '',
+        isTauriAppPlatform() && 'rounded-window-bottom-right',
+        !isSideBarVisible && isTauriAppPlatform() && 'rounded-window-bottom-left',
         isHoveredAnim && 'hover-bar-anim',
         hoveredBookKey === bookKey ? `opacity-100` : `opacity-0`,
       )}

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

@@ -4,9 +4,8 @@ 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 { getStyles } from '@/utils/style';
 import { getPopupPosition, getPosition, Position } from '@/utils/sel';
-import { eventDispatcher } from '@/utils/event';
 import { FoliateView } from '@/types/view';
 import { FootnoteHandler } from 'foliate-js/footnotes.js';
 import Popup from '@/components/Popup';
@@ -49,9 +48,7 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
         const backgroundColor = getComputedStyle(popupContainer).backgroundColor;
         popupTheme.bg = backgroundColor;
       }
-      const mainStyles = getStyles(viewSettings, popupTheme);
-      const footnoteStyles = getFootnoteStyles();
-      renderer.setStyles?.(`${mainStyles}\n${footnoteStyles}`);
+      renderer.setStyles?.(getStyles(viewSettings, popupTheme));
     };
 
     const handleRender = (e: Event) => {
@@ -107,43 +104,10 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
     setShowPopup(false);
   };
 
-  const handleFootnotePopupEvent = (event: CustomEvent) => {
-    const { element, footnote } = event.detail;
-    const gridFrame = document.querySelector(`#gridcell-${bookKey}`);
-    if (!gridFrame) return;
-    const rect = gridFrame.getBoundingClientRect();
-    const viewSettings = getViewSettings(bookKey)!;
-    const triangPos = getPosition(element, rect, 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;`);
-      footnoteRef.current.replaceChildren(elem);
-      setShowPopup(true);
-      setTrianglePosition(triangPos);
-      setPopupPosition(popupPos);
-    }
-  };
-
   useFoliateEvents(view, {
     onLinkClick: docLinkHandler,
   });
 
-  useEffect(() => {
-    eventDispatcher.on('footnote-popup', handleFootnotePopupEvent);
-    return () => {
-      eventDispatcher.off('footnote-popup', handleFootnotePopupEvent);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   useEffect(() => {
     if (footnoteViewRef.current) {
       footnoteRef.current?.replaceChildren(footnoteViewRef.current);

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

@@ -5,6 +5,7 @@ import { PiDotsThreeVerticalBold } from 'react-icons/pi';
 import { useEnv } from '@/context/EnvContext';
 import { useReaderStore } from '@/store/readerStore';
 import { useSidebarStore } from '@/store/sidebarStore';
+import { isTauriAppPlatform } from '@/services/environment';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 import useTrafficLight from '@/hooks/useTrafficLight';
 import WindowButtons from '@/components/WindowButtons';
@@ -52,8 +53,8 @@ const HeaderBar: React.FC<HeaderBarProps> = ({
         `header-bar absolute top-0 z-10 flex h-11 w-full items-center pr-4`,
         isTrafficLightVisible && isTopLeft && !isSideBarVisible ? 'pl-16' : 'pl-4',
         `shadow-xs bg-base-100 transition-opacity duration-300`,
-        appService?.hasRoundedWindow && 'rounded-window-top-right',
-        !isSideBarVisible && appService?.hasRoundedWindow && 'rounded-window-top-left',
+        isTauriAppPlatform() && 'rounded-window-top-right',
+        !isSideBarVisible && isTauriAppPlatform() && 'rounded-window-top-left',
         isHoveredAnim && 'hover-bar-anim',
         hoveredBookKey === bookKey || isDropdownOpen ? `visible` : `opacity-0`,
         isDropdownOpen && 'header-bar-pinned',

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

@@ -8,19 +8,18 @@ import { useEnv } from '@/context/EnvContext';
 import { useTheme } from '@/hooks/useTheme';
 import { useLibraryStore } from '@/store/libraryStore';
 import { useSettingsStore } from '@/store/settingsStore';
-import { useScreenWakeLock } from '@/hooks/useScreenWakeLock';
+import { isTauriAppPlatform } from '@/services/environment';
 import { AboutWindow } from '@/components/AboutWindow';
 import { Toast } from '@/components/Toast';
 import ReaderContent from './ReaderContent';
 
 const Reader: React.FC<{ ids?: string }> = ({ ids }) => {
-  const { envConfig, appService } = useEnv();
+  const { envConfig } = useEnv();
   const { settings, setSettings } = useSettingsStore();
   const { library, setLibrary } = useLibraryStore();
   const isInitiating = useRef(false);
 
   const { updateAppTheme } = useTheme();
-  useScreenWakeLock(settings.screenWakeLock);
 
   useEffect(() => {
     updateAppTheme('base-100');
@@ -43,7 +42,7 @@ const Reader: React.FC<{ ids?: string }> = ({ ids }) => {
       <div
         className={clsx(
           `reader-page bg-base-100 text-base-content select-none`,
-          appService?.hasRoundedWindow && 'rounded-window',
+          isTauriAppPlatform() && 'rounded-window',
         )}
       >
         <Suspense>

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

@@ -1,6 +1,5 @@
 'use client';
 
-import clsx from 'clsx';
 import * as React from 'react';
 import { useState, useRef, useEffect } from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
@@ -32,7 +31,7 @@ import TTSControl from './tts/TTSControl';
 const ReaderContent: React.FC<{ ids?: string; settings: SystemSettings }> = ({ ids, settings }) => {
   const router = useRouter();
   const searchParams = useSearchParams();
-  const { envConfig, appService } = useEnv();
+  const { envConfig } = useEnv();
   const { bookKeys, dismissBook, getNextBookKey } = useBooksManager();
   const { sideBarBookKey, setSideBarBookKey } = useSidebarStore();
   const { saveSettings } = useSettingsStore();
@@ -149,7 +148,7 @@ const ReaderContent: React.FC<{ ids?: string; settings: SystemSettings }> = ({ i
     setTimeout(() => setLoading(true), 300);
     return (
       loading && (
-        <div className={clsx('hero hero-content', appService?.isIOSApp ? 'h-[100vh]' : 'h-dvh')}>
+        <div className={'hero hero-content h-dvh'}>
           <Spinner loading={true} />
         </div>
       )
@@ -157,7 +156,7 @@ const ReaderContent: React.FC<{ ids?: string; settings: SystemSettings }> = ({ i
   }
 
   return (
-    <div className={clsx('flex', appService?.isIOSApp ? 'h-[100vh]' : 'h-dvh')}>
+    <div className='flex h-dvh'>
       <SideBar onGoToLibrary={handleCloseBooksToLibrary} />
       <BooksGrid bookKeys={bookKeys} onCloseBook={handleCloseBook} />
       <TTSControl />

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

@@ -5,12 +5,7 @@ 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 { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL, ONE_COLUMN_MAX_INLINE_SIZE } from '@/services/constants';
 import MenuItem from '@/components/MenuItem';
 import { useReaderStore } from '@/store/readerStore';
 import { useTranslation } from '@/hooks/useTranslation';
@@ -37,8 +32,8 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
   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 zoomIn = () => setZoomLevel((prev) => Math.min(prev + 1, MAX_ZOOM_LEVEL));
+  const zoomOut = () => setZoomLevel((prev) => Math.max(prev - 1, MIN_ZOOM_LEVEL));
   const resetZoom = () => setZoomLevel(100);
   const toggleScrolledMode = () => setScrolledMode(!isScrolledMode);
   const toggleInvertedColors = () => setInvertedColors(!isInvertedColors);
@@ -109,7 +104,7 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
           )}
           onClick={resetZoom}
         >
-          {zoomLevel}%
+          {100 - (100 - zoomLevel) * 10}%
         </button>
         <button
           onClick={zoomIn}

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

@@ -49,7 +49,6 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const isShowingPopup = useRef(false);
   const isTextSelected = useRef(false);
   const isUpToShowPopup = useRef(false);
-  const isTouchstarted = useRef(false);
   const [selection, setSelection] = useState<TextSelection | null>();
   const [showAnnotPopup, setShowAnnotPopup] = useState(false);
   const [showWiktionaryPopup, setShowWiktionaryPopup] = useState(false);
@@ -95,6 +94,14 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
       }
       setSelection({ key: bookKey, text: sel.toString(), range, index });
     };
+    const handlePointerup = () => {
+      // Available on iOS and Desktop, fired when release the long press
+      // Note that on Android, pointerup event is fired for any tap but not for long press
+      const sel = doc.getSelection();
+      if (isValidSelection(sel)) {
+        makeSelection(sel, true);
+      }
+    };
     const handleSelectionchange = () => {
       // Available on iOS, Android and Desktop, fired when the selection is changed
       // Ideally the popup only shows when the selection is done,
@@ -102,7 +109,7 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
       // we make the popup show when the selection is changed
       const sel = doc.getSelection();
       if (isValidSelection(sel)) {
-        if (osPlatform === 'android' && isTouchstarted.current) {
+        if (osPlatform === 'android') {
           makeSelection(sel, false);
         }
       } else if (!isUpToShowPopup.current) {
@@ -113,32 +120,14 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
         setShowDeepLPopup(false);
       }
     };
-    const handlePointerup = () => {
-      // Available on iOS and Desktop, fired when release the long press
-      // Note that on Android, pointerup event is fired after an additional touch event
-      const sel = doc.getSelection();
-      if (isValidSelection(sel)) {
-        makeSelection(sel, true);
-      }
-    };
-    const handleTouchstart = () => {
-      // Available on iOS and Android for the initial touch event
-      isTouchstarted.current = true;
-    };
     const handleTouchmove = () => {
-      // Available on iOS, on Android not fired
+      // Available on iOS
       // To make the popup not to follow the selection
       setShowAnnotPopup(false);
     };
-    const handleTouchend = () => {
-      // Available on iOS, on Android fired after an additional touch event
-      isTouchstarted.current = false;
-    };
     if (bookData.book?.format !== 'PDF') {
       detail.doc?.addEventListener('pointerup', handlePointerup);
-      detail.doc?.addEventListener('touchstart', handleTouchstart);
       detail.doc?.addEventListener('touchmove', handleTouchmove);
-      detail.doc?.addEventListener('touchend', handleTouchend);
       detail.doc?.addEventListener('selectionchange', handleSelectionchange);
 
       // Disable the default context menu on mobile devices,

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

@@ -4,7 +4,6 @@ import { useNotebookStore } from '@/store/notebookStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { TextSelection } from '@/utils/sel';
 import { BookNote } from '@/types/book';
-import useShortcuts from '@/hooks/useShortcuts';
 
 interface NoteEditorProps {
   onSave: (selection: TextSelection, note: string) => void;
@@ -13,7 +12,7 @@ interface NoteEditorProps {
 
 const NoteEditor: React.FC<NoteEditorProps> = ({ onSave, onEdit }) => {
   const _ = useTranslation();
-  const { notebookNewAnnotation, notebookEditAnnotation, setNotebookNewAnnotation, setNotebookEditAnnotation } = useNotebookStore();
+  const { notebookNewAnnotation, notebookEditAnnotation } = useNotebookStore();
   const editorRef = useRef<HTMLTextAreaElement>(null);
   const [note, setNote] = React.useState('');
 
@@ -50,21 +49,6 @@ const NoteEditor: React.FC<NoteEditorProps> = ({ onSave, onEdit }) => {
     }
   };
 
-  useShortcuts({
-    onSaveNote: () => {
-      if (editorRef.current && editorRef.current.value) {
-        handleSaveNote();
-      }
-    },
-    onCloseNote: () => {
-      if (notebookNewAnnotation) {
-        setNotebookNewAnnotation(null)
-      } else if (notebookEditAnnotation) {
-        setNotebookEditAnnotation(null)
-      }
-    }
-  })
-
   return (
     <div className='note-editor-container bg-base-100 mt-2 rounded-md p-2'>
       <div className='flex w-full justify-between space-x-2'>

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

@@ -13,6 +13,7 @@ import { TextSelection } from '@/utils/sel';
 import { BookNote } from '@/types/book';
 import { uniqueId } from '@/utils/misc';
 import { eventDispatcher } from '@/utils/event';
+import { isTauriAppPlatform } from '@/services/environment';
 import useDragBar from '../../hooks/useDragBar';
 import BooknoteItem from '../sidebar/BooknoteItem';
 import NotebookHeader from './Header';
@@ -24,7 +25,7 @@ const MAX_NOTEBOOK_WIDTH = 0.45;
 const Notebook: React.FC = ({}) => {
   const _ = useTranslation();
   const { updateAppTheme } = useTheme();
-  const { envConfig, appService } = useEnv();
+  const { envConfig } = useEnv();
   const { settings } = useSettingsStore();
   const { sideBarBookKey } = useSidebarStore();
   const { notebookWidth, isNotebookVisible, isNotebookPinned } = useNotebookStore();
@@ -150,10 +151,8 @@ const Notebook: React.FC = ({}) => {
       )}
       <div
         className={clsx(
-          'notebook-container bg-base-200 right-0 z-20 min-w-60 select-none',
-          appService?.isIOSApp ? 'h-[100vh]' : 'h-full',
-          appService?.hasSafeAreaInset && 'pt-[env(safe-area-inset-top)]',
-          appService?.hasRoundedWindow && 'rounded-window-top-right rounded-window-bottom-right',
+          'notebook-container bg-base-200 right-0 z-20 h-full min-w-60 select-none',
+          isTauriAppPlatform() && 'rounded-window-top-right rounded-window-bottom-right',
           !isNotebookPinned && 'shadow-2xl',
         )}
         style={{

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

@@ -8,8 +8,8 @@ import { useDefaultIconSize, useResponsiveSize } from '@/hooks/useResponsiveSize
 interface DropdownProps {
   family?: string;
   selected: string;
-  options: { option: string; label?: string }[];
-  moreOptions?: { option: string; label?: string }[];
+  options: string[];
+  moreOptions?: string[];
   onSelect: (option: string) => void;
   onGetFontFamily: (option: string, family: string) => string;
 }
@@ -25,32 +25,26 @@ const FontDropdown: React.FC<DropdownProps> = ({
   const _ = useTranslation();
   const iconSize16 = useResponsiveSize(16);
   const defaultIconSize = useDefaultIconSize();
-  const allOptions = [...options, ...(moreOptions ?? [])];
-  const selectedOption = allOptions.find((option) => option.option === selected) ?? allOptions[0]!;
   return (
     <div className='dropdown dropdown-top'>
       <button
         tabIndex={0}
         className='btn btn-sm flex items-center gap-1 px-[20px] font-normal normal-case'
       >
-        <span style={{ fontFamily: onGetFontFamily(selectedOption.option, family ?? '') }}>
-          {selectedOption.label}
-        </span>
+        <span style={{ fontFamily: onGetFontFamily(selected, family ?? '') }}>{selected}</span>
         <FiChevronUp size={iconSize16} />
       </button>
       <ul
         tabIndex={0}
         className='dropdown-content bgcolor-base-200 no-triangle menu rounded-box absolute right-[-32px] z-[1] mt-4 w-44 shadow sm:right-0'
       >
-        {options.map(({ option, label }) => (
+        {options.map((option) => (
           <li key={option} onClick={() => onSelect(option)}>
             <div className='flex items-center px-0'>
               <span style={{ minWidth: `${defaultIconSize}px` }}>
                 {selected === option && <MdCheck className='text-base-content' />}
               </span>
-              <span style={{ fontFamily: onGetFontFamily(option, family ?? '') }}>
-                {label || option}
-              </span>
+              <span style={{ fontFamily: onGetFontFamily(option, family ?? '') }}>{option}</span>
             </div>
           </li>
         ))}
@@ -69,14 +63,14 @@ const FontDropdown: React.FC<DropdownProps> = ({
                 '!mr-5 mb-[-46px] inline max-h-80 w-[200px] overflow-y-scroll',
               )}
             >
-              {moreOptions.map((option, index) => (
-                <li key={`${index}-${option.option}`} onClick={() => onSelect(option.option)}>
+              {moreOptions.map((option) => (
+                <li key={option} onClick={() => onSelect(option)}>
                   <div className='flex items-center px-2'>
                     <span style={{ minWidth: `${defaultIconSize}px` }}>
-                      {selected === option.option && <MdCheck className='text-base-content' />}
+                      {selected === option && <MdCheck className='text-base-content' />}
                     </span>
-                    <span style={{ fontFamily: onGetFontFamily(option.option, family ?? '') }}>
-                      {option.label || option.option}
+                    <span style={{ fontFamily: onGetFontFamily(option, family ?? '') }}>
+                      {option}
                     </span>
                   </div>
                 </li>

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

@@ -19,8 +19,6 @@ import { useTranslation } from '@/hooks/useTranslation';
 import { useTheme } from '@/hooks/useTheme';
 import { getStyles } from '@/utils/style';
 import { getOSPlatform } from '@/utils/misc';
-import { FONT_ENUM_SUPPORTED_OS_PLATFORMS, getSysFontsList } from '@/utils/font';
-import { isTauriAppPlatform } from '@/services/environment';
 
 interface FontFaceProps {
   className?: string;
@@ -32,6 +30,8 @@ interface FontFaceProps {
   onSelect: (option: string) => void;
 }
 
+const fontFamilyOptions = ['Serif', 'Sans-serif'];
+
 const handleFontFaceFont = (option: string, family: string) => {
   return `'${option}', ${family}`;
 };
@@ -49,8 +49,8 @@ const FontFace = ({
     <span className=''>{label}</span>
     <FontDropdown
       family={family}
-      options={options.map((option) => ({ option, label: option }))}
-      moreOptions={moreOptions?.map((option) => ({ option, label: option })) ?? []}
+      options={options}
+      moreOptions={moreOptions}
       selected={selected}
       onSelect={onSelect}
       onGetFontFamily={handleFontFaceFont}
@@ -66,39 +66,27 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const viewSettings = getViewSettings(bookKey)!;
   const { themeCode } = useTheme();
 
-  const fontFamilyOptions = [
-    {
-      option: 'Serif',
-      label: _('Serif Font'),
-    },
-    {
-      option: 'Sans-serif',
-      label: _('Sans-Serif Font'),
-    },
-  ];
-
   const osPlatform = getOSPlatform();
-  let defaultSysFonts: string[] = [];
+  let moreFonts: string[] = [];
   switch (osPlatform) {
     case 'macos':
-      defaultSysFonts = MACOS_FONTS;
+      moreFonts = MACOS_FONTS;
       break;
     case 'windows':
-      defaultSysFonts = WINDOWS_FONTS;
+      moreFonts = WINDOWS_FONTS;
       break;
     case 'linux':
-      defaultSysFonts = LINUX_FONTS;
+      moreFonts = LINUX_FONTS;
       break;
     case 'ios':
-      defaultSysFonts = IOS_FONTS;
+      moreFonts = IOS_FONTS;
       break;
     case 'android':
-      defaultSysFonts = ANDROID_FONTS;
+      moreFonts = ANDROID_FONTS;
       break;
     default:
       break;
   }
-  const [sysFonts, setSysFonts] = useState<string[]>(defaultSysFonts);
   const [defaultFontSize, setDefaultFontSize] = useState(viewSettings.defaultFontSize!);
   const [minFontSize, setMinFontSize] = useState(viewSettings.minimumFontSize!);
   const [overrideFont, setOverrideFont] = useState(viewSettings.overrideFont!);
@@ -106,16 +94,6 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const [serifFont, setSerifFont] = useState(viewSettings.serifFont!);
   const [sansSerifFont, setSansSerifFont] = useState(viewSettings.sansSerifFont!);
   const [monospaceFont, setMonospaceFont] = useState(viewSettings.monospaceFont!);
-  const [fontWeight, setFontWeight] = useState(viewSettings.fontWeight!);
-
-  useEffect(() => {
-    if (isTauriAppPlatform() && FONT_ENUM_SUPPORTED_OS_PLATFORMS.includes(osPlatform)) {
-      getSysFontsList().then((fonts) => {
-        setSysFonts(fonts);
-      });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
 
   useEffect(() => {
     viewSettings.defaultFont = defaultFont;
@@ -150,17 +128,6 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     // 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));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [fontWeight]);
-
   useEffect(() => {
     viewSettings.serifFont = serifFont;
     setViewSettings(bookKey, viewSettings);
@@ -244,23 +211,6 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
         </div>
       </div>
 
-      <div className='w-full'>
-        <h2 className='mb-2 font-medium'>{_('Font Weight')}</h2>
-        <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}
-              min={100}
-              max={900}
-              step={100}
-            />
-          </div>
-        </div>
-      </div>
-
       <div className='w-full'>
         <h2 className='mb-2 font-medium'>{_('Font Family')}</h2>
         <div className='card border-base-200 border shadow'>
@@ -297,7 +247,7 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               family='serif'
               label={_('Serif Font')}
               options={SERIF_FONTS}
-              moreOptions={sysFonts}
+              moreOptions={moreFonts}
               selected={serifFont}
               onSelect={setSerifFont}
             />
@@ -305,7 +255,7 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               family='sans-serif'
               label={_('Sans-Serif Font')}
               options={SANS_SERIF_FONTS}
-              moreOptions={sysFonts}
+              moreOptions={moreFonts}
               selected={sansSerifFont}
               onSelect={setSansSerifFont}
             />
@@ -314,7 +264,7 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               family='monospace'
               label={_('Monospace Font')}
               options={MONOSPACE_FONTS}
-              moreOptions={sysFonts}
+              moreOptions={moreFonts}
               selected={monospaceFont}
               onSelect={setMonospaceFont}
             />

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

@@ -9,7 +9,7 @@ import { useBookDataStore } from '@/store/bookDataStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useTheme } from '@/hooks/useTheme';
 import { getStyles } from '@/utils/style';
-import { getBookDirFromWritingMode, getBookLangCode } from '@/utils/book';
+import { getBookLangCode } from '@/utils/book';
 import NumberInput from './NumberInput';
 
 const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
@@ -22,11 +22,7 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const viewSettings = getViewSettings(bookKey)!;
   const { themeCode } = useTheme();
 
-  const [paragraphMargin, setParagraphMargin] = useState(viewSettings.paragraphMargin!);
   const [lineHeight, setLineHeight] = useState(viewSettings.lineHeight!);
-  const [wordSpacing, setWordSpacing] = useState(viewSettings.wordSpacing!);
-  const [letterSpacing, setLetterSpacing] = useState(viewSettings.letterSpacing!);
-  const [textIndent, setTextIndent] = useState(viewSettings.textIndent!);
   const [fullJustification, setFullJustification] = useState(viewSettings.fullJustification!);
   const [hyphenation, setHyphenation] = useState(viewSettings.hyphenation!);
   const [marginPx, setMarginPx] = useState(viewSettings.marginPx!);
@@ -35,18 +31,6 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const [maxInlineSize, setMaxInlineSize] = useState(viewSettings.maxInlineSize!);
   const [maxBlockSize, setMaxBlockSize] = useState(viewSettings.maxBlockSize!);
   const [writingMode, setWritingMode] = useState(viewSettings.writingMode!);
-  const [overrideLayout, setOverrideLayout] = useState(viewSettings.overrideLayout!);
-
-  useEffect(() => {
-    viewSettings.paragraphMargin = paragraphMargin;
-    setViewSettings(bookKey, viewSettings);
-    if (isFontLayoutSettingsGlobal) {
-      settings.globalViewSettings.paragraphMargin = paragraphMargin;
-      setSettings(settings);
-    }
-    view?.renderer.setStyles?.(getStyles(viewSettings, themeCode));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [paragraphMargin]);
 
   useEffect(() => {
     viewSettings.lineHeight = lineHeight;
@@ -59,39 +43,6 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     // 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));
-    // 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));
-    // 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));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [textIndent]);
-
   useEffect(() => {
     viewSettings.fullJustification = fullJustification;
     setViewSettings(bookKey, viewSettings);
@@ -183,23 +134,9 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     // global settings are not supported for writing mode
     viewSettings.writingMode = writingMode;
     setViewSettings(bookKey, viewSettings);
-    if (view) {
-      view.renderer.setStyles?.(getStyles(viewSettings, themeCode));
-      view.book.dir = getBookDirFromWritingMode(writingMode);
-    }
-    // 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));
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [overrideLayout]);
+  }, [writingMode]);
 
   const langCode = getBookLangCode(bookData.bookDoc?.metadata?.language);
   const isCJKBook = langCode === 'zh' || langCode === 'ja' || langCode === 'ko';
@@ -248,49 +185,13 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
           <div className='divide-base-200 divide-y'>
             <NumberInput
               className='config-item-top'
-              label={_('Paragraph Margin')}
-              value={paragraphMargin}
-              onChange={setParagraphMargin}
-              min={0}
-              max={4}
-              step={0.5}
-            />
-            <NumberInput
-              className='config-item-top'
-              label={_('Line Spacing')}
+              label={_('Line Height')}
               value={lineHeight}
               onChange={setLineHeight}
               min={1.0}
               max={3.0}
               step={0.1}
             />
-            <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}
-            />
-            <NumberInput
-              className='config-item-top'
-              label={_('Text Indent')}
-              value={textIndent}
-              onChange={setTextIndent}
-              min={-2}
-              max={4}
-              step={1}
-            />
             <div className='config-item config-item-bottom'>
               <span className=''>{_('Full Justification')}</span>
               <input
@@ -309,15 +210,6 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
                 onChange={() => setHyphenation(!hyphenation)}
               />
             </div>
-            <div className='config-item config-item-bottom'>
-              <span className=''>{_('Override Book Layout')}</span>
-              <input
-                type='checkbox'
-                className='toggle'
-                checked={overrideLayout}
-                onChange={() => setOverrideLayout(!overrideLayout)}
-              />
-            </div>
           </div>
         </div>
       </div>

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

@@ -30,7 +30,7 @@ const BookCard = ({ book }: { book: Book }) => {
       />
       <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='text-neutral-content truncate text-xs'>{formatAuthors(undefined, 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/Content.tsx

@@ -2,17 +2,16 @@ import clsx from 'clsx';
 import React, { useEffect, useRef, useState } from 'react';
 
 import { BookDoc } from '@/libs/document';
-import { useEnv } from '@/context/EnvContext';
 import { useBookDataStore } from '@/store/bookDataStore';
 import TOCView from './TOCView';
 import BooknoteView from './BooknoteView';
 import TabNavigation from './TabNavigation';
+import { isPWA } from '@/services/environment';
 
 const SidebarContent: React.FC<{
   bookDoc: BookDoc;
   sideBarBookKey: string;
 }> = ({ bookDoc, sideBarBookKey }) => {
-  const { appService } = useEnv();
   const scrollContainerRef = useRef<HTMLDivElement>(null);
   const { getConfig, setConfig } = useBookDataStore();
   const config = getConfig(sideBarBookKey);
@@ -93,10 +92,7 @@ const SidebarContent: React.FC<{
         </div>
       </div>
       <div
-        className={clsx(
-          'flex-shrink-0',
-          appService?.hasSafeAreaInset && 'pb-[calc(env(safe-area-inset-bottom)/2)]',
-        )}
+        className={clsx('flex-shrink-0', isPWA() ? 'pb-[calc(env(safe-area-inset-bottom)/2)]' : '')}
       >
         <TabNavigation activeTab={activeTab} onTabChange={handleTabChange} />
       </div>

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

@@ -7,7 +7,7 @@ import { useReaderStore } from '@/store/readerStore';
 import { useSidebarStore } from '@/store/sidebarStore';
 import { BookSearchResult } from '@/types/book';
 import { eventDispatcher } from '@/utils/event';
-import { useEnv } from '@/context/EnvContext';
+import { isTauriAppPlatform } from '@/services/environment';
 import { useTheme } from '@/hooks/useTheme';
 import SidebarHeader from './Header';
 import SidebarContent from './Content';
@@ -24,7 +24,6 @@ const MAX_SIDEBAR_WIDTH = 0.45;
 const SideBar: React.FC<{
   onGoToLibrary: () => void;
 }> = ({ onGoToLibrary }) => {
-  const { appService } = useEnv();
   const { updateAppTheme } = useTheme();
   const { settings } = useSettingsStore();
   const { sideBarBookKey } = useSidebarStore();
@@ -118,10 +117,8 @@ const SideBar: React.FC<{
     <>
       <div
         className={clsx(
-          'sidebar-container bg-base-200 z-20 flex min-w-60 select-none flex-col',
-          appService?.isIOSApp ? 'h-[100vh]' : 'h-full',
-          appService?.hasSafeAreaInset && 'pt-[env(safe-area-inset-top)]',
-          appService?.hasRoundedWindow && 'rounded-window-top-left rounded-window-bottom-left',
+          'sidebar-container bg-base-200 z-20 flex h-full min-w-60 select-none flex-col',
+          isTauriAppPlatform() && 'rounded-window-top-left rounded-window-bottom-left',
           !isSideBarPinned && 'shadow-2xl',
         )}
         style={{