release: version 0.9.11

* ui: tweaks on header bar layout * release: build arm64 linux binaries
ui: fix layout in mobile platforms (#371 )
2025-02-14 02:31:03 +01:00 · 2025-02-14 00:19:25 +01:00 · 2025-02-13 22:49:59 +01:00 · 2025-02-13 21:34:56 +01:00 · 2025-02-13 18:45:57 +01:00 · 2025-02-10 23:15:43 +01:00
57 changed files with 1568 additions and 425 deletions
@@ -73,7 +73,7 @@ jobs:
            args: '--target aarch64-pc-windows-msvc --bundles nsis'

    runs-on: ${{ matrix.config.os }}
-    timeout-minutes: 20
+    timeout-minutes: 25
    steps:
      - uses: actions/checkout@v4

@@ -168,6 +168,95 @@ 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
@@ -10,9 +10,9 @@
 [![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]
@@ -63,7 +63,7 @@
 | **Feature**                     | **Description**                                                                            | **Priority** |
 | ------------------------------- | ------------------------------------------------------------------------------------------ | ------------ |
 | **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.                            | 🔄           |
@@ -159,6 +159,8 @@ For Android:
 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:
@@ -168,12 +170,16 @@ For iOS:
 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
@@ -228,7 +234,7 @@ 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%20Web%2C%20PWA-green
+[badge-platforms]: https://img.shields.io/badge/platforms-macOS%2C%20Windows%2C%20Linux%2C%20Android%2C%20iOS%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
@@ -6,3 +6,10 @@ 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
@@ -40,6 +40,10 @@ tauri.*.conf.json
 # vercel
 .vercel

+# open-next
+.open-next
+.wrangler
+
 # typescript
 *.tsbuildinfo
 next-env.d.ts
@@ -0,0 +1,29 @@
+// @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;
@@ -1,6 +1,6 @@
 {
  "name": "@readest/readest-app",
-  "version": "0.9.10",
+  "version": "0.9.11",
  "private": true,
  "scripts": {
    "dev": "dotenv -e .env.tauri -- next dev",
@@ -26,7 +26,10 @@
    "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",
-    "release-macos-universial-appstore": "dotenv -e .env.tauri.local -e .env.apple-appstore.local -- bash scripts/release-mac-appstore.sh"
+    "release-macos-universial-appstore": "dotenv -e .env.tauri.local -e .env.apple-appstore.local -- bash scripts/release-mac-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"
  },
  "dependencies": {
    "@aws-sdk/client-s3": "^3.735.0",
@@ -155,5 +155,11 @@
  "Word Spacing": "Wortabstand",
  "Letter Spacing": "Buchstabenabstand",
  "Text Indent": "Texteinzug",
-  "Paragraph Margin": "Absatzrand"
+  "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"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Διάκενο λέξεων",
  "Letter Spacing": "Διάκενο γραμμάτων",
  "Text Indent": "Εσοχή κειμένου",
-  "Paragraph Margin": "Περιθώριο παραγράφου"
+  "Paragraph Margin": "Περιθώριο παραγράφου",
+  "Override Book Layout": "Παράκαμψη διάταξης βιβλίου",
+  "Add to Group": "Προσθήκη στην ομάδα",
+  "Untitled Group": "Ομάδα χωρίς τίτλο",
+  "Group Books": "Ομαδοποίηση βιβλίων",
+  "Remove From Group": "Αφαίρεση από την ομάδα",
+  "Create New Group": "Δημιουργία νέας ομάδας"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Espaciado de palabras",
  "Letter Spacing": "Espaciado de letras",
  "Text Indent": "Sangría de texto",
-  "Paragraph Margin": "Margen de párrafo"
+  "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"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Espacement des mots",
  "Letter Spacing": "Espacement des lettres",
  "Text Indent": "Retrait du texte",
-  "Paragraph Margin": "Marge de paragraphe"
+  "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"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "शब्द स्पेसिंग",
  "Letter Spacing": "अक्षर स्पेसिंग",
  "Text Indent": "टेक्स्ट इंडेंट",
-  "Paragraph Margin": "पैराग्राफ मार्जिन"
+  "Paragraph Margin": "पैराग्राफ मार्जिन",
+  "Override Book Layout": "पुस्तक लेआउट ओवरराइड करें",
+  "Add to Group": "समूह में जोड़ें",
+  "Untitled Group": "अभिनामित समूह",
+  "Group Books": "समूह पुस्तकें",
+  "Remove From Group": "समूह से हटाएं",
+  "Create New Group": "नया समूह बनाएं"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Spasi Kata",
  "Letter Spacing": "Spasi Huruf",
  "Text Indent": "Indentasi Teks",
-  "Paragraph Margin": "Margin Paragraf"
+  "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"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Spaziatura parole",
  "Letter Spacing": "Spaziatura lettere",
  "Text Indent": "Rientro testo",
-  "Paragraph Margin": "Margine paragrafo"
+  "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"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "単語間隔",
  "Letter Spacing": "文字間隔",
  "Text Indent": "テキストインデント",
-  "Paragraph Margin": "段落マージン"
+  "Paragraph Margin": "段落マージン",
+  "Override Book Layout": "書籍のレイアウトを上書き",
+  "Add to Group": "グループに追加",
+  "Untitled Group": "無題のグループ",
+  "Group Books": "書籍をグループ化",
+  "Remove From Group": "グループから削除",
+  "Create New Group": "新しいグループを作成"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "단어 간격",
  "Letter Spacing": "글자 간격",
  "Text Indent": "들여쓰기",
-  "Paragraph Margin": "단락 여백"
+  "Paragraph Margin": "단락 여백",
+  "Override Book Layout": "책 레이아웃 덮어쓰기",
+  "Add to Group": "그룹에 추가",
+  "Untitled Group": "제목 없는 그룹",
+  "Group Books": "책 그룹화",
+  "Remove From Group": "그룹에서 제거",
+  "Create New Group": "새 그룹 만들기"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Odstęp między wyrazami",
  "Letter Spacing": "Odstęp między literami",
  "Text Indent": "Wcięcie tekstu",
-  "Paragraph Margin": "Margines akapitu"
+  "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ę"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Espaçamento de Palavra",
  "Letter Spacing": "Espaçamento de Letra",
  "Text Indent": "Recuo de Texto",
-  "Paragraph Margin": "Margem de Parágrafo"
+  "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"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Межсловный интервал",
  "Letter Spacing": "Межбуквенный интервал",
  "Text Indent": "Отступ текста",
-  "Paragraph Margin": "Отступ абзаца"
+  "Paragraph Margin": "Отступ абзаца",
+  "Override Book Layout": "Переопределить макет книги",
+  "Add to Group": "Добавить в группу",
+  "Untitled Group": "Группа без названия",
+  "Group Books": "Группировать книги",
+  "Remove From Group": "Удалить из группы",
+  "Create New Group": "Создать новую группу"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Kelime Aralığı",
  "Letter Spacing": "Harf Aralığı",
  "Text Indent": "Metin Girintisi",
-  "Paragraph Margin": "Paragraf Kenarı"
+  "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"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Міжслівний інтервал",
  "Letter Spacing": "Міжбуквений інтервал",
  "Text Indent": "Відступ тексту",
-  "Paragraph Margin": "Відступ абзацу"
+  "Paragraph Margin": "Відступ абзацу",
+  "Override Book Layout": "Перевизначити макет книги",
+  "Add to Group": "Додати до групи",
+  "Untitled Group": "Група без назви",
+  "Group Books": "Групувати книги",
+  "Remove From Group": "Видалити з групи",
+  "Create New Group": "Створити нову групу"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "Khoảng cách từ",
  "Letter Spacing": "Khoảng cách chữ",
  "Text Indent": "Thụt lề",
-  "Paragraph Margin": "Lề đoạn"
+  "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"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "词间距",
  "Letter Spacing": "字间距",
  "Text Indent": "首行缩进",
-  "Paragraph Margin": "段间距"
+  "Paragraph Margin": "段间距",
+  "Override Book Layout": "覆盖版面布局",
+  "Add to Group": "添加到分组",
+  "Untitled Group": "无标题分组",
+  "Group Books": "分组书籍",
+  "Remove From Group": "从分组中移除",
+  "Create New Group": "创建新分组"
 }
@@ -155,5 +155,11 @@
  "Word Spacing": "字間距",
  "Letter Spacing": "字間距",
  "Text Indent": "首行縮進",
-  "Paragraph Margin": "段間距"
+  "Paragraph Margin": "段間距",
+  "Override Book Layout": "覆蓋版面佈局",
+  "Add to Group": "添加到組",
+  "Untitled Group": "無標題組",
+  "Group Books": "分組書籍",
+  "Remove From Group": "從組中移除",
+  "Create New Group": "創建新組"
 }
@@ -1,5 +1,13 @@
 {
  "releases": {
+    "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": [
@@ -1,5 +1,6 @@
 package com.bilingify.readest

+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.WindowInsets
@@ -10,14 +11,23 @@ class MainActivity : TauriActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        enableEdgeToEdge()
        super.onCreate(savedInstanceState)
-	
-	hideSystemUI()
+	      
+        hideSystemUI()
    }

    private fun hideSystemUI() {
-        window.decorView.windowInsetsController?.let { controller ->
-            controller.hide(WindowInsets.Type.systemBars())
-            controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        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
+            )
        }
    }
 }
@@ -0,0 +1,9 @@
+<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>
@@ -18,7 +18,7 @@
        "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",
        "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' data: asset: http://asset.localhost tauri: https://fonts.gstatic.com https://db.onlinewebfonts.com https://cdn.jsdelivr.net",
+        "font-src": "'self' blob: 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"
      },
@@ -0,0 +1,57 @@
+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;
@@ -1,5 +1,4 @@
 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';
@@ -7,16 +6,14 @@ import { LiaCloudUploadAltSolid, LiaCloudDownloadAltSolid } from 'react-icons/li
 import { Book } from '@/types/book';
 import { useEnv } from '@/context/EnvContext';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
-import { formatAuthors, formatTitle } from '@/utils/book';
 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;
@@ -27,9 +24,7 @@ const BookItem: React.FC<BookItemProps> = ({
  book,
  isSelectMode,
  selectedBooks,
-  clickedBookHash,
  transferProgress,
-  handleBookClick,
  handleBookUpload,
  handleBookDownload,
  showBookDetailsModal,
@@ -38,52 +33,33 @@ const BookItem: React.FC<BookItemProps> = ({
  const iconSize15 = useResponsiveSize(15);
  const { appService } = useEnv();

+  const stopEvent = (e: React.MouseEvent | React.TouchEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+  };
+
  return (
    <div
-      className={clsx('book-item', appService?.hasContextMenu ? 'cursor-pointer' : '')}
+      className={clsx(
+        'book-item flex h-full flex-col',
+        appService?.hasContextMenu ? 'cursor-pointer' : '',
+      )}
      onContextMenu={bookContextMenuHandler.bind(null, book)}
    >
-      <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='bg-base-100 relative aspect-[28/41] 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='flex h-1/2 items-center justify-center'>
-              <span className='line-clamp-3 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='text-neutral-content/50 line-clamp-1 text-base'>
-                {formatAuthors(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'>
@@ -113,6 +89,10 @@ const BookItem: React.FC<BookItemProps> = ({
            ) : (
              <button
                className='show-detail-button opacity-0 group-hover:opacity-100'
+                onTouchStart={(e) => stopEvent(e)}
+                onMouseDown={(e) => stopEvent(e)}
+                onTouchEnd={(e) => stopEvent(e)}
+                onMouseUp={(e) => stopEvent(e)}
                onClick={() => {
                  if (!book.uploadedAt) {
                    handleBookUpload(book);
@@ -129,6 +109,10 @@ const BookItem: React.FC<BookItemProps> = ({
            )}
            <button
              className='show-detail-button opacity-0 group-hover:opacity-100'
+              onTouchStart={(e) => stopEvent(e)}
+              onMouseDown={(e) => stopEvent(e)}
+              onTouchEnd={(e) => stopEvent(e)}
+              onMouseUp={(e) => stopEvent(e)}
              onClick={() => showBookDetailsModal(book)}
            >
              <CiCircleMore size={iconSize15} />
@@ -2,51 +2,20 @@ import clsx from 'clsx';
 import * as React from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { useEffect, useRef, useState } from 'react';
-import { MdDelete, MdOpenInNew } from 'react-icons/md';
+import { MdDelete, MdOpenInNew, MdOutlineCancel } from 'react-icons/md';
+import { LuFolderPlus } from 'react-icons/lu';
 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 { 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 { navigateToLibrary, navigateToReader } from '@/utils/nav';
+import { isMd5 } from '@/utils/md5';

 import Alert from '@/components/Alert';
 import Spinner from '@/components/Spinner';
-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);
-};
+import BookshelfItem, { generateBookshelfItems } from './BookshelfItem';
+import GroupingModal from './GroupingModal';

 interface BookshelfProps {
  libraryBooks: Book[];
@@ -55,6 +24,7 @@ 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 };
 }
@@ -66,46 +36,33 @@ const Bookshelf: React.FC<BookshelfProps> = ({
  handleBookUpload,
  handleBookDownload,
  handleBookDelete,
+  handleSetSelectMode,
  handleShowDetailsBook,
  booksTransferProgress,
 }) => {
  const _ = useTranslation();
  const router = useRouter();
  const searchParams = useSearchParams();
-  const { envConfig, appService } = useEnv();
-  const { settings } = useSettingsStore();
-  const { updateBook } = useLibraryStore();
+  const { appService } = useEnv();
  const [loading, setLoading] = useState(false);
  const [selectedBooks, setSelectedBooks] = useState<string[]>([]);
+  const [showSelectModeActions, setShowSelectModeActions] = useState(false);
  const [showDeleteAlert, setShowDeleteAlert] = useState(false);
-  const [clickedImage, setClickedImage] = useState<string | null>(null);
+  const [showGroupingModal, setShowGroupingModal] = useState(false);
+  const [navBooksGroup, setNavBooksGroup] = useState<BooksGroup | null>(null);
  const [importBookUrl] = useState(searchParams?.get('url') || '');
  const isImportingBook = useRef(false);

-  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)) {
-      handleShowDetailsBook(book);
-    }
-  };
-
  const { setLibrary } = useLibraryStore();
+  const allBookshelfItems = generateBookshelfItems(libraryBooks);

  useEffect(() => {
-    setSelectedBooks([]);
+    if (isSelectMode) {
+      setShowSelectModeActions(true);
+    } else {
+      setSelectedBooks([]);
+      setShowSelectModeActions(false);
+    }
  }, [isSelectMode]);

  useEffect(() => {
@@ -127,24 +84,27 @@ const Bookshelf: React.FC<BookshelfProps> = ({
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [importBookUrl, appService]);

-  const bookshelfItems = generateBookshelfItems(libraryBooks);
-
-  const handleBookClick = async (book: Book) => {
-    if (!(await makeBookAvailable(book))) return;
-
-    if (isSelectMode) {
-      toggleSelection(book.hash);
+  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);
+      }
    } else {
-      setClickedImage(book.hash);
-      setTimeout(() => setClickedImage(null), 300);
-      setTimeout(() => setLoading(true), 200);
-      navigateToReader(router, [book.hash]);
+      setNavBooksGroup(null);
+      navigateToLibrary(router);
    }
-  };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [searchParams, showGroupingModal]);

  const toggleSelection = (id: string) => {
    setSelectedBooks((prev) =>
-      prev.includes(id) ? prev.filter((bookId) => bookId !== id) : [...prev, id],
+      prev.includes(id) ? prev.filter((selectedId) => selectedId !== id) : [...prev, id],
    );
  };

@@ -154,8 +114,8 @@ const Bookshelf: React.FC<BookshelfProps> = ({
  };

  const confirmDelete = async () => {
-    for (const selectedBook of selectedBooks) {
-      const book = libraryBooks.find((b) => b.hash === selectedBook);
+    for (const id of selectedBooks) {
+      const book = libraryBooks.find((b) => b.hash === id || b.groupId === id);
      if (book) {
        await handleBookDelete(book);
      }
@@ -165,85 +125,39 @@ const Bookshelf: React.FC<BookshelfProps> = ({
  };

  const deleteSelectedBooks = () => {
+    setShowSelectModeActions(false);
    setShowDeleteAlert(true);
  };

-  const bookContextMenuHandler = async (book: Book, e: React.MouseEvent) => {
-    if (!appService?.hasContextMenu) 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 groupSelectedBooks = () => {
+    setShowSelectModeActions(false);
+    setShowGroupingModal(true);
  };

+  const currentBookshelfItems = navBooksGroup ? navBooksGroup.books : allBookshelfItems;
+
  return (
    <div className='bookshelf'>
-      <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
+      <div className='transform-wrapper grid flex-1 grid-cols-3 gap-0 sm:grid-cols-4 md:grid-cols-6 lg:grid-cols-8'>
+        {currentBookshelfItems.map((item, index) => (
+          <BookshelfItem
            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>
+            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
+            }
+          />
        ))}
-        {bookshelfItems.length > 0 && (
+        {!navBooksGroup && allBookshelfItems.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'
@@ -253,35 +167,94 @@ 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 && (
-        <Alert
-          title={_('Confirm Deletion')}
-          message={_('Are you sure to delete the selected books?')}
-          onClickCancel={() => setShowDeleteAlert(false)}
-          onClickConfirm={confirmDelete}
-        />
+        <div
+          className={clsx(
+            'fixed bottom-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>
      )}
    </div>
  );
@@ -0,0 +1,246 @@
+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;
+      try {
+        await handleBookDownload(book);
+        updateBook(envConfig, book);
+        available = true;
+      } finally {
+        return available;
+      }
+    }
+    return true;
+  };
+
+  const handleBookClick = async (book: Book) => {
+    if (!(await makeBookAvailable(book))) return;
+
+    if (isSelectMode) {
+      toggleSelection(book.hash);
+    } else {
+      setTimeout(() => setLoading(true), 200);
+      navigateToReader(router, [book.hash]);
+    }
+  };
+
+  const handleGroupClick = (group: BooksGroup) => {
+    if (isSelectMode) {
+      toggleSelection(group.id);
+    } else {
+      navigateToLibrary(router, `group=${group.id}`);
+    }
+  };
+
+  const handleItemContextMenu = (item: BookshelfItem, event: React.MouseEvent) => {
+    event.preventDefault();
+    if ('format' in item) {
+      bookContextMenuHandler(item as Book, event);
+    }
+  };
+
+  const bookContextMenuHandler = async (book: Book, e: React.MouseEvent) => {
+    if (!appService?.hasContextMenu) 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 { 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);
+      }
+    },
+  });
+
+  return (
+    <div
+      className={clsx(
+        'hover:bg-base-300/50 group flex h-full flex-col p-4',
+        pressing ? 'scale-95' : 'scale-100',
+      )}
+      style={{
+        transition: 'transform 0.2s',
+      }}
+      {...handlers}
+      onContextMenu={(event) => handleItemContextMenu(item, event)}
+    >
+      <div className='flex-grow'>
+        {'format' in item ? (
+          <BookItem
+            book={item}
+            isSelectMode={isSelectMode}
+            selectedBooks={selectedBooks}
+            handleBookUpload={handleBookUpload}
+            handleBookDownload={handleBookDownload}
+            showBookDetailsModal={showBookDetailsModal}
+            bookContextMenuHandler={bookContextMenuHandler}
+            transferProgress={transferProgress}
+          />
+        ) : (
+          <GroupItem group={item} isSelectMode={isSelectMode} selectedBooks={selectedBooks} />
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default BookshelfItem;
@@ -1,36 +1,42 @@
-import Image from 'next/image';
+import { MdCheckCircle, MdCheckCircleOutline } from 'react-icons/md';
 import { BooksGroup } from '@/types/book';
-import { formatAuthors, formatTitle } from '@/utils/book';
-import ReadingProgress from './ReadingProgress';
+import BookCover from './BookCover';

 interface GroupItemProps {
  group: BooksGroup;
+  isSelectMode: boolean;
+  selectedBooks: string[];
 }

-const GroupItem: React.FC<GroupItemProps> = ({ group }) => {
+const GroupItem: React.FC<GroupItemProps> = ({ group, isSelectMode, selectedBooks }) => {
  return (
-    <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'>{formatTitle(book.title)}</h3>
-            <p className='text-neutral-content line-clamp-1 text-xs'>
-              {formatAuthors(book.author)}
-            </p>
-            <ReadingProgress book={book} />
-          </div>
+    <div className='group-item flex h-full flex-col'>
+      <div className='bg-base-100 relative flex aspect-[28/41] items-center justify-center 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>
-      ))}
-      <h2 className='mb-2 text-lg font-bold'>{group.name}</h2>
+        {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>
+        )}
+      </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>
  );
 };
@@ -0,0 +1,247 @@
+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;
@@ -1,13 +1,16 @@
 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';
@@ -26,10 +29,13 @@ 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) => {
@@ -44,31 +50,46 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
  }, [onToggleSelectMode]);

  const windowButtonVisible = appService?.appPlatform !== 'web' && !isTrafficLightVisible;
+  const isInGroupView = !!searchParams?.get('group');

  return (
    <div
      ref={headerRef}
      className={clsx(
-        'titlebar z-10 h-11 w-full py-2 pr-6',
+        'titlebar z-10 flex h-11 w-full items-center py-2 pr-6',
        appService?.hasSafeAreaInset && 'mt-[env(safe-area-inset-top)]',
        isTrafficLightVisible ? 'pl-16' : 'pl-2',
      )}
    >
-      <div className='flex items-center justify-between space-x-6 sm:space-x-12'>
+      <div className='flex w-full items-center justify-between space-x-6 sm:space-x-12'>
        <div className='exclude-title-bar-mousedown relative flex w-full items-center pl-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',
-            )}
-          />
+          {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='mx-2 h-6 w-[1px] bg-gray-400'></span>
            <Dropdown
@@ -74,6 +74,8 @@ 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);
@@ -2,7 +2,7 @@

 import clsx from 'clsx';
 import * as React from 'react';
-import { useState, useRef, useEffect, Suspense } from 'react';
+import { useState, useRef, useEffect } from 'react';
 import { useRouter } from 'next/navigation';

 import { Book } from '@/types/book';
@@ -337,6 +337,10 @@ const LibraryPage = () => {
    setIsSelectMode(!isSelectMode);
  };

+  const handleSetSelectMode = (selectMode: boolean) => {
+    setIsSelectMode(selectMode);
+  };
+
  const handleShowDetailsBook = (book: Book) => {
    setShowDetailsBook(book);
  };
@@ -384,18 +388,17 @@ const LibraryPage = () => {
              appService?.hasSafeAreaInset && 'mt-[calc(48px+env(safe-area-inset-top))]',
            )}
          >
-            <Suspense>
-              <Bookshelf
-                libraryBooks={libraryBooks}
-                isSelectMode={isSelectMode}
-                handleImportBooks={handleImportBooks}
-                handleBookUpload={handleBookUpload}
-                handleBookDownload={handleBookDownload}
-                handleBookDelete={handleBookDelete}
-                handleShowDetailsBook={handleShowDetailsBook}
-                booksTransferProgress={booksTransferProgress}
-              />
-            </Suspense>
+            <Bookshelf
+              libraryBooks={libraryBooks}
+              isSelectMode={isSelectMode}
+              handleImportBooks={handleImportBooks}
+              handleBookUpload={handleBookUpload}
+              handleBookDownload={handleBookDownload}
+              handleBookDelete={handleBookDelete}
+              handleSetSelectMode={handleSetSelectMode}
+              handleShowDetailsBook={handleShowDetailsBook}
+              booksTransferProgress={booksTransferProgress}
+            />
          </div>
        ) : (
          <div className='hero h-screen items-center justify-center'>
@@ -35,6 +35,7 @@ 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;
@@ -189,6 +190,17 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
    // 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]);
+
  const langCode = getBookLangCode(bookData.bookDoc?.metadata?.language);
  const isCJKBook = langCode === 'zh' || langCode === 'ja' || langCode === 'ko';

@@ -297,6 +309,15 @@ 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>
@@ -15,9 +15,6 @@ export const useClickEvent = (
      if (msg.data && msg.data.bookKey === bookKey) {
        const viewSettings = getViewSettings(bookKey)!;
        if (msg.data.type === 'iframe-single-click') {
-          if (viewSettings.disableClick!) {
-            return;
-          }
          const viewElement = containerRef.current;
          if (viewElement) {
            const rect = viewElement.getBoundingClientRect();
@@ -32,9 +29,9 @@ export const useClickEvent = (
              if (screenX >= centerStartX && screenX <= centerEndX) {
                // toggle visibility of the header bar and the footer bar
                setHoveredBookKey(hoveredBookKey ? null : bookKey);
-              } else if (screenX >= rect.left + rect.width / 2) {
+              } else if (!viewSettings.disableClick! && screenX >= rect.left + rect.width / 2) {
                viewRef.current?.goRight();
-              } else if (screenX < rect.left + rect.width / 2) {
+              } else if (!viewSettings.disableClick! && screenX < rect.left + rect.width / 2) {
                viewRef.current?.goLeft();
              }
            }
@@ -1,5 +1,13 @@
-const doubleClickThreshold = 250;
-const longHoldThreshold = 500;
+import {
+  DISABLE_DOUBLE_CLICK_ON_MOBILE,
+  DOUBLE_CLICK_INTERVAL_THRESHOLD_MS,
+  LONG_HOLD_THRESHOLD,
+} from '@/services/constants';
+import { getOSPlatform } from '@/utils/misc';
+
+const doubleClickEnabled =
+  !DISABLE_DOUBLE_CLICK_ON_MOBILE || !['android', 'ios'].includes(getOSPlatform());
+
 let lastClickTime = 0;
 let longHoldTimeout: ReturnType<typeof setTimeout> | null = null;

@@ -25,7 +33,8 @@ export const handleKeydown = (bookKey: string, event: KeyboardEvent) => {
 export const handleMousedown = (bookKey: string, event: MouseEvent) => {
  longHoldTimeout = setTimeout(() => {
    longHoldTimeout = null;
-  }, longHoldThreshold);
+  }, LONG_HOLD_THRESHOLD);
+
  window.postMessage(
    {
      type: 'iframe-mousedown',
@@ -86,7 +95,7 @@ export const handleWheel = (bookKey: string, event: WheelEvent) => {
 export const handleClick = (bookKey: string, event: MouseEvent) => {
  const now = Date.now();

-  if (now - lastClickTime < doubleClickThreshold) {
+  if (doubleClickEnabled && now - lastClickTime < DOUBLE_CLICK_INTERVAL_THRESHOLD_MS) {
    lastClickTime = now;
    window.postMessage(
      {
@@ -106,35 +115,43 @@ export const handleClick = (bookKey: string, event: MouseEvent) => {

  lastClickTime = now;

-  setTimeout(() => {
-    if (Date.now() - lastClickTime >= doubleClickThreshold) {
-      let element: HTMLElement | null = event.target as HTMLElement;
-      while (element) {
-        if (['sup', 'a', 'audio', 'video'].includes(element.tagName.toLowerCase())) {
-          return;
-        }
-        element = element.parentElement;
-      }
-
-      if (!longHoldTimeout) {
+  const postSingleClick = () => {
+    let element: HTMLElement | null = event.target as HTMLElement;
+    while (element) {
+      if (['sup', 'a', 'audio', 'video'].includes(element.tagName.toLowerCase())) {
        return;
      }
-
-      window.postMessage(
-        {
-          type: 'iframe-single-click',
-          bookKey,
-          screenX: event.screenX,
-          screenY: event.screenY,
-          clientX: event.clientX,
-          clientY: event.clientY,
-          offsetX: event.offsetX,
-          offsetY: event.offsetY,
-        },
-        '*',
-      );
+      element = element.parentElement;
    }
-  }, doubleClickThreshold);
+
+    // if long hold is detected, we don't want to send single click event
+    if (!longHoldTimeout) {
+      return;
+    }
+
+    window.postMessage(
+      {
+        type: 'iframe-single-click',
+        bookKey,
+        screenX: event.screenX,
+        screenY: event.screenY,
+        clientX: event.clientX,
+        clientY: event.clientY,
+        offsetX: event.offsetX,
+        offsetY: event.offsetY,
+      },
+      '*',
+    );
+  };
+  if (doubleClickEnabled) {
+    setTimeout(() => {
+      if (Date.now() - lastClickTime >= DOUBLE_CLICK_INTERVAL_THRESHOLD_MS) {
+        postSingleClick();
+      }
+    }, DOUBLE_CLICK_INTERVAL_THRESHOLD_MS);
+  } else {
+    postSingleClick();
+  }
 };

 const handleTouchEv = (bookKey: string, event: TouchEvent, type: string) => {
@@ -1,49 +1,51 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 import { useTranslation } from '@/hooks/useTranslation';

 const Alert: React.FC<{
  title: string;
  message: string;
-  onClickCancel: () => void;
-  onClickConfirm: () => void;
-}> = ({ title, message, onClickCancel, onClickConfirm }) => {
+  onCancel: () => void;
+  onConfirm: () => void;
+}> = ({ title, message, onCancel, onConfirm }) => {
  const _ = useTranslation();
  return (
-    <div
-      role='alert'
-      className={clsx(
-        'alert fixed bottom-4 left-1/2 z-[100] flex -translate-x-1/2 transform items-center justify-between',
-        'bg-base-300 rounded-lg p-4 shadow-2xl',
-        'w-full max-w-[90vw] sm:max-w-[70vw] md:max-w-[50vw] lg:max-w-[40vw] xl:max-w-[40vw]',
-      )}
-    >
-      <div className='flex items-center space-x-2'>
-        <svg
-          xmlns='http://www.w3.org/2000/svg'
-          fill='none'
-          viewBox='0 0 24 24'
-          className='stroke-info h-6 w-6 shrink-0'
-        >
-          <path
-            strokeLinecap='round'
-            strokeLinejoin='round'
-            strokeWidth='2'
-            d='M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z'
-          ></path>
-        </svg>
-        <div className=''>
-          <h3 className='font-bold'>{title}</h3>
-          <div className='text-xs'>{message}</div>
+    <div className={clsx('z-[100] flex justify-center px-4')}>
+      <div
+        role='alert'
+        className={clsx(
+          'alert flex items-center justify-between',
+          'bg-base-300 rounded-lg border-none p-4 shadow-2xl',
+          'w-full max-w-[90vw] sm:max-w-[70vw] md:max-w-[50vw] lg:max-w-[40vw] xl:max-w-[40vw]',
+        )}
+      >
+        <div className='flex items-center space-x-2'>
+          <svg
+            xmlns='http://www.w3.org/2000/svg'
+            fill='none'
+            viewBox='0 0 24 24'
+            className='stroke-info h-6 w-6 shrink-0'
+          >
+            <path
+              strokeLinecap='round'
+              strokeLinejoin='round'
+              strokeWidth='2'
+              d='M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z'
+            ></path>
+          </svg>
+          <div className=''>
+            <h3 className='font-sm text-base'>{title}</h3>
+            <div className='text-xs'>{message}</div>
+          </div>
+        </div>
+        <div className='flex flex-wrap items-center justify-center gap-2'>
+          <button className='btn btn-sm' onClick={onCancel}>
+            {_('Cancel')}
+          </button>
+          <button className='btn btn-sm btn-warning' onClick={onConfirm}>
+            {_('Confirm')}
+          </button>
        </div>
-      </div>
-      <div className='flex space-x-2'>
-        <button className='btn btn-sm' onClick={onClickCancel}>
-          {_('Cancel')}
-        </button>
-        <button className='btn btn-sm btn-warning' onClick={onClickConfirm}>
-          {_('Confirm')}
-        </button>
      </div>
    </div>
  );
@@ -196,10 +196,10 @@ const BookDetailModal = ({ book, isOpen, onClose }: BookDetailModalProps) => {
        <Alert
          title={_('Confirm Deletion')}
          message={_('Are you sure to delete the selected books?')}
-          onClickCancel={() => {
+          onCancel={() => {
            setShowDeleteAlert(false);
          }}
-          onClickConfirm={confirmDelete}
+          onConfirm={confirmDelete}
        />
      )}
    </div>
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import React from 'react';
 import { useTranslation } from '@/hooks/useTranslation';

@@ -9,7 +10,10 @@ const Spinner: React.FC<{

  return (
    <div
-      className='absolute left-1/2 top-4 -translate-x-1/2 transform pt-16 text-center'
+      className={clsx(
+        'absolute left-1/2 -translate-x-1/2 transform text-center',
+        'top-4 pt-[calc(env(safe-area-inset-top)+64px)]',
+      )}
      role='status'
    >
      <span className='loading loading-dots loading-lg'></span>
@@ -1,6 +1,6 @@
-import { eventDispatcher } from '@/utils/event';
 import clsx from 'clsx';
 import React, { useEffect, useRef, useState } from 'react';
+import { eventDispatcher } from '@/utils/event';

 export type ToastType = 'info' | 'success' | 'warning' | 'error';

@@ -12,9 +12,9 @@ export const Toast = () => {
  const toastDismissTimeout = useRef<ReturnType<typeof setTimeout> | null>(null);
  const toastClassMap = {
    info: 'toast-info toast-center toast-middle',
-    success: 'toast-success toast-top toast-end pt-11',
-    warning: 'toast-warning toast-top toast-end pt-11',
-    error: 'toast-error toast-top toast-end pt-11',
+    success: 'toast-success toast-top toast-end',
+    warning: 'toast-warning toast-top toast-end',
+    error: 'toast-error toast-top toast-end',
  };
  const alertClassMap = {
    info: 'alert-primary',
@@ -32,10 +32,10 @@ export const Toast = () => {
  }, [toastMessage]);

  const handleShowToast = async (event: CustomEvent) => {
-    const { message, type = 'info', timeout = 5000, className = '' } = event.detail;
+    const { message, type = 'info', timeout, className = '' } = event.detail;
    setToastMessage(message);
    toastType.current = type;
-    toastTimeout.current = timeout;
+    if (timeout) toastTimeout.current = timeout;
    messageClass.current = className;
  };

@@ -52,6 +52,8 @@ export const Toast = () => {
        className={clsx(
          'toast toast-center toast-middle w-auto max-w-screen-sm',
          toastClassMap[toastType.current],
+          toastClassMap[toastType.current].includes('toast-top') &&
+            'pt-[calc(44px+env(safe-area-inset-top))]',
        )}
      >
        <div
@@ -0,0 +1,131 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+interface UseLongPressOptions {
+  onLongPress?: () => void;
+  onTap?: () => void;
+  onCancel?: () => void;
+  threshold?: number;
+  moveThreshold?: number;
+}
+
+interface UseLongPressResult {
+  pressing: boolean;
+  handlers: {
+    onPointerDown: (e: React.PointerEvent) => void;
+    onPointerUp: (e: React.PointerEvent) => void;
+    onPointerMove: (e: React.PointerEvent) => void;
+    onPointerCancel: (e: React.PointerEvent) => void;
+    onPointerLeave: (e: React.PointerEvent) => void;
+    onContextMenu: (e: React.MouseEvent) => void;
+  };
+}
+
+export const useLongPress = ({
+  onLongPress,
+  onTap,
+  onCancel,
+  threshold = 500,
+  moveThreshold = 10,
+}: UseLongPressOptions): UseLongPressResult => {
+  const [pressing, setPressing] = useState(false);
+  const timerRef = useRef<NodeJS.Timeout>();
+  const startPosRef = useRef<{ x: number; y: number } | null>(null);
+  const pointerId = useRef<number | null>(null);
+  const isLongPressTriggered = useRef(false);
+
+  const reset = useCallback(() => {
+    setPressing(false);
+    isLongPressTriggered.current = false;
+    startPosRef.current = null;
+    pointerId.current = null;
+    clearTimeout(timerRef.current);
+  }, []);
+
+  const handlePointerDown = useCallback(
+    (e: React.PointerEvent) => {
+      if (e.pointerType === 'mouse' && e.button !== 0) {
+        return;
+      }
+
+      pointerId.current = e.pointerId;
+      startPosRef.current = { x: e.clientX, y: e.clientY };
+      isLongPressTriggered.current = false;
+      setPressing(true);
+
+      timerRef.current = setTimeout(() => {
+        if (startPosRef.current) {
+          isLongPressTriggered.current = true;
+          onLongPress?.();
+          setPressing(false);
+        }
+      }, threshold);
+    },
+    [onLongPress, threshold],
+  );
+
+  const handlePointerMove = useCallback(
+    (e: React.PointerEvent) => {
+      if (e.pointerId !== pointerId.current || !startPosRef.current) return;
+
+      const deltaX = Math.abs(e.clientX - startPosRef.current.x);
+      const deltaY = Math.abs(e.clientY - startPosRef.current.y);
+
+      if (deltaX > moveThreshold || deltaY > moveThreshold) {
+        onCancel?.();
+        reset();
+      }
+    },
+    [moveThreshold, onCancel, reset],
+  );
+
+  const handlePointerUp = useCallback(
+    (e: React.PointerEvent) => {
+      if (e.pointerId !== pointerId.current) return;
+
+      if (!isLongPressTriggered.current && startPosRef.current) {
+        const deltaX = Math.abs(e.clientX - startPosRef.current.x);
+        const deltaY = Math.abs(e.clientY - startPosRef.current.y);
+
+        if (deltaX <= moveThreshold && deltaY <= moveThreshold) {
+          onTap?.();
+        }
+      }
+
+      reset();
+    },
+    [onTap, moveThreshold, reset],
+  );
+
+  const handleCancel = useCallback(
+    (e: React.PointerEvent) => {
+      if (e.pointerId !== pointerId.current) return;
+      onCancel?.();
+      reset();
+    },
+    [onCancel, reset],
+  );
+
+  const handleContextMenu = useCallback((e: React.MouseEvent) => {
+    if (isLongPressTriggered.current) {
+      e.preventDefault();
+    }
+  }, []);
+
+  useEffect(() => {
+    return () => {
+      clearTimeout(timerRef.current);
+    };
+  }, []);
+
+  return {
+    pressing,
+    handlers: {
+      onPointerDown: handlePointerDown,
+      onPointerUp: handlePointerUp,
+      onPointerMove: handlePointerMove,
+      onPointerCancel: handleCancel,
+      onPointerLeave: handleCancel,
+      onContextMenu: handleContextMenu,
+    },
+  };
+};
@@ -20,6 +20,9 @@ export const usePullToRefresh = (ref: React.RefObject<HTMLDivElement>, onTrigger
      const el = ref.current;
      if (!el) return;

+      if (el.scrollTop > 0) return;
+
+      const initialX = startEvent.touches[0]!.clientX;
      const initialY = startEvent.touches[0]!.clientY;

      el.addEventListener('touchmove', handleTouchMove, { passive: false });
@@ -29,10 +32,12 @@ export const usePullToRefresh = (ref: React.RefObject<HTMLDivElement>, onTrigger
        const el = ref.current;
        if (!el) return;

+        const currentX = moveEvent.touches[0]!.clientX;
        const currentY = moveEvent.touches[0]!.clientY;
+        const dx = currentX - initialX;
        const dy = currentY - initialY;
+        if (dy < 0 || Math.abs(dx) * 2 > Math.abs(dy)) return;

-        if (dy < 0) return;
        const parentEl = el.parentNode as HTMLDivElement;
        if (dy > TRIGGER_THRESHOLD) {
          flipArrow(parentEl);
@@ -42,7 +47,10 @@ export const usePullToRefresh = (ref: React.RefObject<HTMLDivElement>, onTrigger
          removePullIndicator(parentEl);
        }

-        el.style.transform = `translateY(${appr(dy)}px)`;
+        const wrapper = el.querySelector('.transform-wrapper') as HTMLElement;
+        if (wrapper) {
+          wrapper.style.transform = `translate3d(0, ${appr(dy)}px, 0)`;
+        }
      }

      function addPullIndicator(el: HTMLDivElement) {
@@ -82,7 +90,10 @@ export const usePullToRefresh = (ref: React.RefObject<HTMLDivElement>, onTrigger
        const el = ref.current;
        if (!el) return;

-        el.style.transform = 'translateY(0)';
+        const wrapper = el.querySelector('.transform-wrapper') as HTMLElement;
+        if (wrapper) {
+          wrapper.style.transform = 'translateY(0)';
+        }
        removePullIndicator(el.parentNode as HTMLDivElement);

        el.style.transition = 'transform 0.2s';
@@ -29,9 +29,10 @@ import {
  CLOUD_BOOKS_SUBDIR,
  DEFAULT_MOBILE_VIEW_SETTINGS,
  DEFAULT_SYSTEM_SETTINGS,
+  DEFAULT_CJK_VIEW_SETTINGS,
 } from './constants';
 import { isWebAppPlatform } from './environment';
-import { getOSPlatform, isValidURL } from '@/utils/misc';
+import { getOSPlatform, isCJKEnv, isValidURL } from '@/utils/misc';
 import { deserializeConfig, serializeConfig } from '@/utils/serializer';
 import { downloadFile, uploadFile, deleteFile, createProgressHandler } from '@/libs/storage';
 import { ProgressHandler } from '@/utils/transfer';
@@ -83,6 +84,7 @@ export abstract class BaseAppService implements AppService {
        ...DEFAULT_BOOK_STYLE,
        ...DEFAULT_BOOK_FONT,
        ...(this.isMobile ? DEFAULT_MOBILE_VIEW_SETTINGS : {}),
+        ...(isCJKEnv() ? DEFAULT_CJK_VIEW_SETTINGS : {}),
        ...DEFAULT_VIEW_CONFIG,
        ...DEFAULT_TTS_CONFIG,
        ...settings.globalViewSettings,
@@ -98,6 +100,7 @@ export abstract class BaseAppService implements AppService {
          ...DEFAULT_BOOK_STYLE,
          ...DEFAULT_BOOK_FONT,
          ...(this.isMobile ? DEFAULT_MOBILE_VIEW_SETTINGS : {}),
+          ...(isCJKEnv() ? DEFAULT_CJK_VIEW_SETTINGS : {}),
          ...DEFAULT_VIEW_CONFIG,
          ...DEFAULT_TTS_CONFIG,
        },
@@ -15,6 +15,8 @@ export const CLOUD_BOOKS_SUBDIR = 'Readest/Books';

 export const SUPPORTED_FILE_EXTS = ['epub', 'mobi', 'azw', 'azw3', 'fb2', 'zip', 'cbz', 'pdf'];
 export const FILE_ACCEPT_FORMATS = SUPPORTED_FILE_EXTS.map((ext) => `.${ext}`).join(', ');
+export const BOOK_UNGROUPED_NAME = '';
+export const BOOK_UNGROUPED_ID = '';

 export const DEFAULT_SYSTEM_SETTINGS: Partial<SystemSettings> = {
  keepLogin: false,
@@ -77,6 +79,7 @@ export const DEFAULT_BOOK_STYLE: BookStyle = {
  invert: false,
  theme: 'light',
  overrideFont: false,
+  overrideLayout: false,
  userStylesheet: '',
 };

@@ -84,6 +87,11 @@ export const DEFAULT_MOBILE_VIEW_SETTINGS: Partial<ViewSettings> = {
  fullJustification: false,
 };

+export const DEFAULT_CJK_VIEW_SETTINGS: Partial<ViewSettings> = {
+  fullJustification: true,
+  textIndent: 2,
+};
+
 export const DEFAULT_VIEW_CONFIG: ViewConfig = {
  sideBarTab: 'toc',
 };
@@ -392,3 +400,7 @@ export const DEFAULT_STORAGE_QUOTA: UserStorageQuota = {
  plus: 2 * 1024 * 1024 * 1024,
  pro: 10 * 1024 * 1024 * 1024,
 };
+
+export const DOUBLE_CLICK_INTERVAL_THRESHOLD_MS = 250;
+export const DISABLE_DOUBLE_CLICK_ON_MOBILE = true;
+export const LONG_HOLD_THRESHOLD = 500;
@@ -10,7 +10,9 @@ export interface Book {
  format: BookFormat;
  title: string;
  author: string;
-  group?: string;
+  group?: string; // deprecated in favor of groupId and groupName
+  groupId?: string;
+  groupName?: string;
  tags?: string[];
  coverImageUrl?: string | null;

@@ -25,6 +27,11 @@ export interface Book {
  progress?: [number, number]; // Add progress field: [current, total]
 }

+export interface BookGroupType {
+  id: string;
+  name: string;
+}
+
 export interface PageInfo {
  current: number;
  next?: number;
@@ -73,6 +80,7 @@ export interface BookStyle {
  invert: boolean;
  theme: string;
  overrideFont: boolean;
+  overrideLayout: boolean;
  userStylesheet: string;
 }

@@ -156,6 +164,7 @@ export interface BookDataRecord {
 }

 export interface BooksGroup {
+  id: string;
  name: string;
  books: Book[];

@@ -4,7 +4,8 @@ export interface DBBook {
  format: string;
  title: string;
  author: string;
-  group?: string;
+  group_id?: string;
+  group_name?: string;
  tags?: string[];
  progress?: [number, number];

@@ -1,5 +1,13 @@
 import { md5 } from 'js-md5';

+export function isMd5(value: string): boolean {
+  return /^[0-9a-f]{32}$/.test(value);
+}
+
+export function md5Fingerprint(value: string): string {
+  return md5(value).slice(0, 7);
+}
+
 export async function partialMD5(file: File): Promise<string> {
  const step = 1024;
  const size = 1024;
@@ -32,6 +32,8 @@ export const makeSafeFilename = (filename: string, replacement = '_') => {

 export const getUserLang = () => navigator?.language.split('-')[0] || 'en';

+export const isCJKEnv = () => ['zh', 'ja', 'ko'].includes(getUserLang());
+
 export const getUserLocale = (lang: string): string | undefined => {
  const languages =
    navigator.languages && navigator.languages.length > 0
@@ -25,8 +25,12 @@ export const navigateToLogin = (router: ReturnType<typeof useRouter>) => {
  router.push(`/auth?redirect=${encodeURIComponent(currentPath)}`);
 };

-export const navigateToLibrary = (router: ReturnType<typeof useRouter>) => {
-  router.push('/library');
+export const navigateToLibrary = (
+  router: ReturnType<typeof useRouter>,
+  queryParams?: string,
+  navOptions?: { scroll?: boolean },
+) => {
+  router.push(`/library${queryParams ? `?${queryParams}` : ''}`, navOptions);
 };

 export const redirectToLibrary = () => {
@@ -94,6 +94,7 @@ const getAdditionalFontFaces = () => `
 `;

 const getLayoutStyles = (
+  overrideLayout: boolean,
  paragraphMargin: number,
  lineSpacing: number,
  wordSpacing: number,
@@ -150,7 +151,6 @@ const getLayoutStyles = (
  html, body {
    color: ${fg};
    ${writingMode === 'auto' ? '' : `writing-mode: ${writingMode};`}
-    text-indent: ${textIndent}em;
    text-align: var(--default-text-align);
    background-color: var(--theme-bg-color, transparent);
    background: var(--background-set, none);
@@ -167,10 +167,11 @@ const getLayoutStyles = (
    background-color: transparent !important;
  }
  p, li, blockquote, dd {
-    margin: ${paragraphMargin}em 0 !important;
-    line-height: ${lineSpacing} !important;
-    word-spacing: ${wordSpacing}px !important;
-    letter-spacing: ${letterSpacing}px !important;
+    margin: ${paragraphMargin}em 0;
+    line-height: ${lineSpacing} ${overrideLayout ? '!important' : ''};
+    word-spacing: ${wordSpacing}px ${overrideLayout ? '!important' : ''};
+    letter-spacing: ${letterSpacing}px ${overrideLayout ? '!important' : ''};
+    text-indent: ${textIndent}em ${overrideLayout ? '!important' : ''};
    text-align: inherit;
    -webkit-hyphens: ${hyphenate ? 'auto' : 'manual'};
    hyphens: ${hyphenate ? 'auto' : 'manual'};
@@ -211,6 +212,7 @@ export interface ThemeCode {

 export const getStyles = (viewSettings: ViewSettings, themeCode: ThemeCode) => {
  const layoutStyles = getLayoutStyles(
+    viewSettings.overrideLayout!,
    viewSettings.paragraphMargin!,
    viewSettings.lineHeight!,
    viewSettings.wordSpacing!,
@@ -42,7 +42,8 @@ export const transformBookToDB = (book: unknown, userId: string): DBBook => {
    format,
    title,
    author,
-    group,
+    groupId,
+    groupName,
    tags,
    progress,
    createdAt,
@@ -57,7 +58,8 @@ export const transformBookToDB = (book: unknown, userId: string): DBBook => {
    format,
    title,
    author,
-    group,
+    group_id: groupId,
+    group_name: groupName,
    tags: tags,
    progress: progress,
    created_at: new Date(createdAt ?? Date.now()).toISOString(),
@@ -73,7 +75,8 @@ export const transformBookFromDB = (dbBook: DBBook): Book => {
    format,
    title,
    author,
-    group,
+    group_id,
+    group_name,
    tags,
    progress,
    created_at,
@@ -87,7 +90,8 @@ export const transformBookFromDB = (dbBook: DBBook): Book => {
    format: format as BookFormat,
    title,
    author,
-    group,
+    groupId: group_id,
+    groupName: group_name,
    tags: tags,
    progress: progress,
    createdAt: new Date(created_at!).getTime(),
@@ -0,0 +1,12 @@
+{
+  "$schema": "node_modules/wrangler/config-schema.json",
+  "main": ".open-next/worker.js",
+  "name": "readest-web",
+  "compatibility_date": "2025-02-04",
+  "compatibility_flags": ["nodejs_compat"],
+  "assets": {
+    "directory": ".open-next/assets",
+    "binding": "ASSETS"
+  },
+  "kv_namespaces": []
+}
@@ -1387,6 +1387,10 @@ packages:
    resolution: {integrity: sha512-hhUZlBWYuh9t6ycAcN90XOyG76C1AzwxZZgaCVPMYpWqqk9uMFo7HGG5Zu2cEhCJn7DdOi5krBmlibWWWPgdsw==}
    engines: {node: '>=18.0.0'}

+  '@smithy/core@3.1.2':
+    resolution: {integrity: sha512-htwQXkbdF13uwwDevz9BEzL5ABK+1sJpVQXywwGSH973AVOvisHNfpcB8A8761G6XgHoS2kHPqc9DqHJ2gp+/Q==}
+    engines: {node: '>=18.0.0'}
+
  '@smithy/credential-provider-imds@4.0.1':
    resolution: {integrity: sha512-l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==}
    engines: {node: '>=18.0.0'}
@@ -1451,14 +1455,26 @@ packages:
    resolution: {integrity: sha512-Z9m67CXizGpj8CF/AW/7uHqYNh1VXXOn9Ap54fenWsCa0HnT4cJuE61zqG3cBkTZJDCy0wHJphilI41co/PE5g==}
    engines: {node: '>=18.0.0'}

+  '@smithy/middleware-endpoint@4.0.3':
+    resolution: {integrity: sha512-YdbmWhQF5kIxZjWqPIgboVfi8i5XgiYMM7GGKFMTvBei4XjNQfNv8sukT50ITvgnWKKKpOtp0C0h7qixLgb77Q==}
+    engines: {node: '>=18.0.0'}
+
  '@smithy/middleware-retry@4.0.3':
    resolution: {integrity: sha512-TiKwwQTwUDeDtwWW8UWURTqu7s6F3wN2pmziLU215u7bqpVT9Mk2oEvURjpRLA+5XeQhM68R5BpAGzVtomsqgA==}
    engines: {node: '>=18.0.0'}

+  '@smithy/middleware-retry@4.0.4':
+    resolution: {integrity: sha512-wmxyUBGHaYUqul0wZiset4M39SMtDBOtUr2KpDuftKNN74Do9Y36Go6Eqzj9tL0mIPpr31ulB5UUtxcsCeGXsQ==}
+    engines: {node: '>=18.0.0'}
+
  '@smithy/middleware-serde@4.0.1':
    resolution: {integrity: sha512-Fh0E2SOF+S+P1+CsgKyiBInAt3o2b6Qk7YOp2W0Qx2XnfTdfMuSDKUEcnrtpxCzgKJnqXeLUZYqtThaP0VGqtA==}
    engines: {node: '>=18.0.0'}

+  '@smithy/middleware-serde@4.0.2':
+    resolution: {integrity: sha512-Sdr5lOagCn5tt+zKsaW+U2/iwr6bI9p08wOkCp6/eL6iMbgdtc2R5Ety66rf87PeohR0ExI84Txz9GYv5ou3iQ==}
+    engines: {node: '>=18.0.0'}
+
  '@smithy/middleware-stack@4.0.1':
    resolution: {integrity: sha512-dHwDmrtR/ln8UTHpaIavRSzeIk5+YZTBtLnKwDW3G2t6nAupCiQUvNzNoHBpik63fwUaJPtlnMzXbQrNFWssIA==}
    engines: {node: '>=18.0.0'}
@@ -1503,6 +1519,10 @@ packages:
    resolution: {integrity: sha512-0yApeHWBqocelHGK22UivZyShNxFbDNrgREBllGh5Ws0D0rg/yId/CJfeoKKpjbfY2ju8j6WgDUGZHYQmINZ5w==}
    engines: {node: '>=18.0.0'}

+  '@smithy/smithy-client@4.1.3':
+    resolution: {integrity: sha512-A2Hz85pu8BJJaYFdX8yb1yocqigyqBzn+OVaVgm+Kwi/DkN8vhN2kbDVEfADo6jXf5hPKquMLGA3UINA64UZ7A==}
+    engines: {node: '>=18.0.0'}
+
  '@smithy/types@4.1.0':
    resolution: {integrity: sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==}
    engines: {node: '>=18.0.0'}
@@ -1539,10 +1559,18 @@ packages:
    resolution: {integrity: sha512-7c5SF1fVK0EOs+2EOf72/qF199zwJflU1d02AevwKbAUPUZyE9RUZiyJxeUmhVxfKDWdUKaaVojNiaDQgnHL9g==}
    engines: {node: '>=18.0.0'}

+  '@smithy/util-defaults-mode-browser@4.0.4':
+    resolution: {integrity: sha512-Ej1bV5sbrIfH++KnWxjjzFNq9nyP3RIUq2c9Iqq7SmMO/idUR24sqvKH2LUQFTSPy/K7G4sB2m8n7YYlEAfZaw==}
+    engines: {node: '>=18.0.0'}
+
  '@smithy/util-defaults-mode-node@4.0.3':
    resolution: {integrity: sha512-CVnD42qYD3JKgDlImZ9+On+MqJHzq9uJgPbMdeBE8c2x8VJ2kf2R3XO/yVFx+30ts5lD/GlL0eFIShY3x9ROgQ==}
    engines: {node: '>=18.0.0'}

+  '@smithy/util-defaults-mode-node@4.0.4':
+    resolution: {integrity: sha512-HE1I7gxa6yP7ZgXPCFfZSDmVmMtY7SHqzFF55gM/GPegzZKaQWZZ+nYn9C2Cc3JltCMyWe63VPR3tSFDEvuGjw==}
+    engines: {node: '>=18.0.0'}
+
  '@smithy/util-endpoints@3.0.1':
    resolution: {integrity: sha512-zVdUENQpdtn9jbpD9SCFK4+aSiavRb9BxEtw9ZGUR1TYo6bBHbIoi7VkrFQ0/RwZlzx0wRBaRmPclj8iAoJCLA==}
    engines: {node: '>=18.0.0'}
@@ -4708,26 +4736,26 @@ snapshots:
      '@aws-sdk/util-user-agent-browser': 3.734.0
      '@aws-sdk/util-user-agent-node': 3.734.0
      '@smithy/config-resolver': 4.0.1
-      '@smithy/core': 3.1.1
+      '@smithy/core': 3.1.2
      '@smithy/fetch-http-handler': 5.0.1
      '@smithy/hash-node': 4.0.1
      '@smithy/invalid-dependency': 4.0.1
      '@smithy/middleware-content-length': 4.0.1
-      '@smithy/middleware-endpoint': 4.0.2
-      '@smithy/middleware-retry': 4.0.3
-      '@smithy/middleware-serde': 4.0.1
+      '@smithy/middleware-endpoint': 4.0.3
+      '@smithy/middleware-retry': 4.0.4
+      '@smithy/middleware-serde': 4.0.2
      '@smithy/middleware-stack': 4.0.1
      '@smithy/node-config-provider': 4.0.1
      '@smithy/node-http-handler': 4.0.2
      '@smithy/protocol-http': 5.0.1
-      '@smithy/smithy-client': 4.1.2
+      '@smithy/smithy-client': 4.1.3
      '@smithy/types': 4.1.0
      '@smithy/url-parser': 4.0.1
      '@smithy/util-base64': 4.0.0
      '@smithy/util-body-length-browser': 4.0.0
      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.3
-      '@smithy/util-defaults-mode-node': 4.0.3
+      '@smithy/util-defaults-mode-browser': 4.0.4
+      '@smithy/util-defaults-mode-node': 4.0.4
      '@smithy/util-endpoints': 3.0.1
      '@smithy/util-middleware': 4.0.1
      '@smithy/util-retry': 4.0.1
@@ -4739,12 +4767,12 @@ snapshots:
  '@aws-sdk/core@3.734.0':
    dependencies:
      '@aws-sdk/types': 3.734.0
-      '@smithy/core': 3.1.1
+      '@smithy/core': 3.1.2
      '@smithy/node-config-provider': 4.0.1
      '@smithy/property-provider': 4.0.1
      '@smithy/protocol-http': 5.0.1
      '@smithy/signature-v4': 5.0.1
-      '@smithy/smithy-client': 4.1.2
+      '@smithy/smithy-client': 4.1.3
      '@smithy/types': 4.1.0
      '@smithy/util-middleware': 4.0.1
      fast-xml-parser: 4.4.1
@@ -4766,7 +4794,7 @@ snapshots:
      '@smithy/node-http-handler': 4.0.2
      '@smithy/property-provider': 4.0.1
      '@smithy/protocol-http': 5.0.1
-      '@smithy/smithy-client': 4.1.2
+      '@smithy/smithy-client': 4.1.3
      '@smithy/types': 4.1.0
      '@smithy/util-stream': 4.0.2
      tslib: 2.8.1
@@ -4903,11 +4931,11 @@ snapshots:
      '@aws-sdk/core': 3.734.0
      '@aws-sdk/types': 3.734.0
      '@aws-sdk/util-arn-parser': 3.723.0
-      '@smithy/core': 3.1.1
+      '@smithy/core': 3.1.2
      '@smithy/node-config-provider': 4.0.1
      '@smithy/protocol-http': 5.0.1
      '@smithy/signature-v4': 5.0.1
-      '@smithy/smithy-client': 4.1.2
+      '@smithy/smithy-client': 4.1.3
      '@smithy/types': 4.1.0
      '@smithy/util-config-provider': 4.0.0
      '@smithy/util-middleware': 4.0.1
@@ -4926,7 +4954,7 @@ snapshots:
      '@aws-sdk/core': 3.734.0
      '@aws-sdk/types': 3.734.0
      '@aws-sdk/util-endpoints': 3.734.0
-      '@smithy/core': 3.1.1
+      '@smithy/core': 3.1.2
      '@smithy/protocol-http': 5.0.1
      '@smithy/types': 4.1.0
      tslib: 2.8.1
@@ -4946,26 +4974,26 @@ snapshots:
      '@aws-sdk/util-user-agent-browser': 3.734.0
      '@aws-sdk/util-user-agent-node': 3.734.0
      '@smithy/config-resolver': 4.0.1
-      '@smithy/core': 3.1.1
+      '@smithy/core': 3.1.2
      '@smithy/fetch-http-handler': 5.0.1
      '@smithy/hash-node': 4.0.1
      '@smithy/invalid-dependency': 4.0.1
      '@smithy/middleware-content-length': 4.0.1
-      '@smithy/middleware-endpoint': 4.0.2
-      '@smithy/middleware-retry': 4.0.3
-      '@smithy/middleware-serde': 4.0.1
+      '@smithy/middleware-endpoint': 4.0.3
+      '@smithy/middleware-retry': 4.0.4
+      '@smithy/middleware-serde': 4.0.2
      '@smithy/middleware-stack': 4.0.1
      '@smithy/node-config-provider': 4.0.1
      '@smithy/node-http-handler': 4.0.2
      '@smithy/protocol-http': 5.0.1
-      '@smithy/smithy-client': 4.1.2
+      '@smithy/smithy-client': 4.1.3
      '@smithy/types': 4.1.0
      '@smithy/url-parser': 4.0.1
      '@smithy/util-base64': 4.0.0
      '@smithy/util-body-length-browser': 4.0.0
      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.3
-      '@smithy/util-defaults-mode-node': 4.0.3
+      '@smithy/util-defaults-mode-browser': 4.0.4
+      '@smithy/util-defaults-mode-node': 4.0.4
      '@smithy/util-endpoints': 3.0.1
      '@smithy/util-middleware': 4.0.1
      '@smithy/util-retry': 4.0.1
@@ -6103,7 +6131,18 @@ snapshots:

  '@smithy/core@3.1.1':
    dependencies:
-      '@smithy/middleware-serde': 4.0.1
+      '@smithy/middleware-serde': 4.0.2
+      '@smithy/protocol-http': 5.0.1
+      '@smithy/types': 4.1.0
+      '@smithy/util-body-length-browser': 4.0.0
+      '@smithy/util-middleware': 4.0.1
+      '@smithy/util-stream': 4.0.2
+      '@smithy/util-utf8': 4.0.0
+      tslib: 2.8.1
+
+  '@smithy/core@3.1.2':
+    dependencies:
+      '@smithy/middleware-serde': 4.0.2
      '@smithy/protocol-http': 5.0.1
      '@smithy/types': 4.1.0
      '@smithy/util-body-length-browser': 4.0.0
@@ -6205,8 +6244,19 @@ snapshots:

  '@smithy/middleware-endpoint@4.0.2':
    dependencies:
-      '@smithy/core': 3.1.1
-      '@smithy/middleware-serde': 4.0.1
+      '@smithy/core': 3.1.2
+      '@smithy/middleware-serde': 4.0.2
+      '@smithy/node-config-provider': 4.0.1
+      '@smithy/shared-ini-file-loader': 4.0.1
+      '@smithy/types': 4.1.0
+      '@smithy/url-parser': 4.0.1
+      '@smithy/util-middleware': 4.0.1
+      tslib: 2.8.1
+
+  '@smithy/middleware-endpoint@4.0.3':
+    dependencies:
+      '@smithy/core': 3.1.2
+      '@smithy/middleware-serde': 4.0.2
      '@smithy/node-config-provider': 4.0.1
      '@smithy/shared-ini-file-loader': 4.0.1
      '@smithy/types': 4.1.0
@@ -6219,7 +6269,19 @@ snapshots:
      '@smithy/node-config-provider': 4.0.1
      '@smithy/protocol-http': 5.0.1
      '@smithy/service-error-classification': 4.0.1
-      '@smithy/smithy-client': 4.1.2
+      '@smithy/smithy-client': 4.1.3
+      '@smithy/types': 4.1.0
+      '@smithy/util-middleware': 4.0.1
+      '@smithy/util-retry': 4.0.1
+      tslib: 2.8.1
+      uuid: 9.0.1
+
+  '@smithy/middleware-retry@4.0.4':
+    dependencies:
+      '@smithy/node-config-provider': 4.0.1
+      '@smithy/protocol-http': 5.0.1
+      '@smithy/service-error-classification': 4.0.1
+      '@smithy/smithy-client': 4.1.3
      '@smithy/types': 4.1.0
      '@smithy/util-middleware': 4.0.1
      '@smithy/util-retry': 4.0.1
@@ -6231,6 +6293,11 @@ snapshots:
      '@smithy/types': 4.1.0
      tslib: 2.8.1

+  '@smithy/middleware-serde@4.0.2':
+    dependencies:
+      '@smithy/types': 4.1.0
+      tslib: 2.8.1
+
  '@smithy/middleware-stack@4.0.1':
    dependencies:
      '@smithy/types': 4.1.0
@@ -6294,8 +6361,18 @@ snapshots:

  '@smithy/smithy-client@4.1.2':
    dependencies:
-      '@smithy/core': 3.1.1
-      '@smithy/middleware-endpoint': 4.0.2
+      '@smithy/core': 3.1.2
+      '@smithy/middleware-endpoint': 4.0.3
+      '@smithy/middleware-stack': 4.0.1
+      '@smithy/protocol-http': 5.0.1
+      '@smithy/types': 4.1.0
+      '@smithy/util-stream': 4.0.2
+      tslib: 2.8.1
+
+  '@smithy/smithy-client@4.1.3':
+    dependencies:
+      '@smithy/core': 3.1.2
+      '@smithy/middleware-endpoint': 4.0.3
      '@smithy/middleware-stack': 4.0.1
      '@smithy/protocol-http': 5.0.1
      '@smithy/types': 4.1.0
@@ -6343,7 +6420,15 @@ snapshots:
  '@smithy/util-defaults-mode-browser@4.0.3':
    dependencies:
      '@smithy/property-provider': 4.0.1
-      '@smithy/smithy-client': 4.1.2
+      '@smithy/smithy-client': 4.1.3
+      '@smithy/types': 4.1.0
+      bowser: 2.11.0
+      tslib: 2.8.1
+
+  '@smithy/util-defaults-mode-browser@4.0.4':
+    dependencies:
+      '@smithy/property-provider': 4.0.1
+      '@smithy/smithy-client': 4.1.3
      '@smithy/types': 4.1.0
      bowser: 2.11.0
      tslib: 2.8.1
@@ -6354,7 +6439,17 @@ snapshots:
      '@smithy/credential-provider-imds': 4.0.1
      '@smithy/node-config-provider': 4.0.1
      '@smithy/property-provider': 4.0.1
-      '@smithy/smithy-client': 4.1.2
+      '@smithy/smithy-client': 4.1.3
+      '@smithy/types': 4.1.0
+      tslib: 2.8.1
+
+  '@smithy/util-defaults-mode-node@4.0.4':
+    dependencies:
+      '@smithy/config-resolver': 4.0.1
+      '@smithy/credential-provider-imds': 4.0.1
+      '@smithy/node-config-provider': 4.0.1
+      '@smithy/property-provider': 4.0.1
+      '@smithy/smithy-client': 4.1.3
      '@smithy/types': 4.1.0
      tslib: 2.8.1
Author	SHA1	Message	Date
Huang Xin	bd6ef7fe8e	release: version 0.9.11 * ui: tweaks on header bar layout * release: build arm64 linux binaries	2025-02-14 02:31:03 +01:00
Huang Xin	b33d85f439	ui: fix layout in mobile platforms (#371 )	2025-02-14 00:19:25 +01:00
Huang Xin	95a69d6bdf	ux: polish ux of grouping dialog (#370 )	2025-02-13 22:49:59 +01:00
Huang Xin	ed9a0c6f20	ux: hide action bar when modal is shown (#369 )	2025-02-13 21:34:56 +01:00
Huang Xin	71b075dfa8	feat: organize the library with groups (#368 )	2025-02-13 18:45:57 +01:00
Huang Xin	937832a8ee	ui: fix toast position on mobile devices (#350 )	2025-02-10 23:15:43 +01:00
Huang Xin	881a54f155	cjk: default text indent for CJK and fix unusual OEBPS naming, closes #346 (#349 )	2025-02-10 22:05:58 +01:00
Huang Xin	2dd0a20925	fix: reintroduce hold detection to avoid unwanted single click (#348 )	2025-02-10 20:31:27 +01:00
Huang Xin	b7ae3f29d9	chore: support deployment with open-next on cloudflare (#347 )	2025-02-10 19:28:06 +01:00
Huang Xin	609ddb776b	ux: disable double click timeout on mobile devices for more performant page turning (#339 )	2025-02-09 21:36:08 +01:00
Huang Xin	7847360588	cjk: set full justification by default for CJK even on mobile devices (#338 )	2025-02-09 20:32:30 +01:00
Huang Xin	8e7240bb9b	ux: process synced books in update time ascending order (#337 )	2025-02-09 18:58:56 +01:00
Huang Xin	effbc08561	mobile: use sticky position for action bars for mobile compatibility (#335 )	2025-02-09 18:35:24 +01:00
Huang Xin	6b057ebc14	feat: add override option for paragraph spacing settings, closes #329 (#334 )	2025-02-09 16:05:37 +01:00
Huang Xin	26b64adca6	fix: add blob CSP for font and don't override <p> margin by default (#327 ) * android: add fullscreen theme * fix: add blob CSP for font and don't override <p> margin by default, closes #320	2025-02-09 00:54:06 +01:00
Huang Xin	9577f6a026	android: compatibility for Android 8 (#326 )	2025-02-08 20:02:05 +01:00
Huang Xin	25da9210e2	readme: update roadmap and badge-platforms (#325 )	2025-02-08 19:04:24 +01:00