release: version 0.9.28 (hotfix) (#759)

* fix: layout tweaks for mobile

* refactor: rename plugin safari-auth to native-bridge

.github/workflows/release.yml

@@ -56,27 +56,35 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - os: ubuntu-latest
+            release: android
+            rust_target: aarch64-linux-android,armv7-linux-androideabi,i686-linux-android,x86_64-linux-android
           - os: ubuntu-22.04
+            release: linux
             arch: x86_64
             rust_target: x86_64-unknown-linux-gnu
           - os: ubuntu-22.04-arm
+            release: linux
             arch: aarch64
             rust_target: aarch64-unknown-linux-gnu
           - os: macos-latest
+            release: macos
             arch: aarch64
             rust_target: x86_64-apple-darwin,aarch64-apple-darwin
             args: '--target universal-apple-darwin'
           - os: windows-latest
+            release: windows
             arch: x86_64
             rust_target: x86_64-pc-windows-msvc
             args: '--target x86_64-pc-windows-msvc'
           - os: windows-latest
+            release: windows
             arch: aarch64
             rust_target: aarch64-pc-windows-msvc
             args: '--target aarch64-pc-windows-msvc --bundles nsis'
 
     runs-on: ${{ matrix.config.os }}
-    timeout-minutes: 30
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
 
@@ -94,6 +102,21 @@ jobs:
           node-version: 22
           cache: pnpm
 
+      - name: setup Java (for Android build only)
+        if: matrix.config.release == 'android'
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: setup Android SDK (for Android build only)
+        if: matrix.config.release == 'android'
+        uses: android-actions/setup-android@v3
+
+      - name: install NDK (for Android build only)
+        if: matrix.config.release == 'android'
+        run: sdkmanager "ndk;27.0.11902837"
+
       - name: install dependencies
         run: pnpm install
 
@@ -109,6 +132,12 @@ jobs:
         with:
           key: ${{ matrix.config.os }}-cargo-${{ hashFiles('Cargo.lock') }}
 
+      - name: install dependencies (ubuntu only)
+        if: contains(matrix.config.os, 'ubuntu') && matrix.config.release != 'android'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pkg-config libfontconfig-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf xdg-utils
+
       - name: create .env.local file for Next.js
         run: |
           echo "NEXT_PUBLIC_POSTHOG_KEY=${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}" >> .env.local
@@ -116,17 +145,43 @@ jobs:
           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
+          cp .env.local apps/readest-app/.env.local
 
-      - name: copy .env.local to apps/readest-app
-        run: cp .env.local apps/readest-app/.env.local
-
-      - name: install dependencies (ubuntu only)
-        if: contains(matrix.config.os, 'ubuntu')
+      - name: build and upload Android apks
+        if: matrix.config.release == 'android'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NDK_HOME: ${{ env.ANDROID_HOME }}/ndk/27.0.11902837
         run: |
-          sudo apt-get update
-          sudo apt-get install -y pkg-config libfontconfig-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf xdg-utils
+          cd apps/readest-app/
+          rm -rf src-tauri/gen/android
+          pnpm tauri android init
+          pnpm tauri icon ../../data/icons/readest-book.png
+          git checkout .
+
+          pushd src-tauri/gen/android
+          echo "keyAlias=${{ secrets.ANDROID_KEY_ALIAS }}" > keystore.properties
+          echo "password=${{ secrets.ANDROID_KEY_PASSWORD }}" >> keystore.properties
+          base64 -d <<< "${{ secrets.ANDROID_KEY_BASE64 }}" > $RUNNER_TEMP/keystore.jks
+          echo "storeFile=$RUNNER_TEMP/keystore.jks" >> keystore.properties
+
+          popd
+          version=${{ needs.get-release.outputs.release_version }}
+          apk_path=src-tauri/gen/android/app/build/outputs/apk/universal/release
+          universial_apk=Readest_${version}_universal.apk
+          arm64_apk=Readest_${version}_arm64.apk
+          pnpm tauri android build
+          cp ${apk_path}/app-universal-release.apk $universial_apk
+          pnpm tauri android build -t aarch64
+          cp ${apk_path}/app-universal-release.apk $arm64_apk
+
+          echo "Uploading $universial_apk to GitHub release"
+          gh release upload ${{ needs.get-release.outputs.release_tag }} $universial_apk --clobber
+          echo "Uploading $arm64_apk to GitHub release"
+          gh release upload ${{ needs.get-release.outputs.release_tag }} $arm64_apk --clobber
 
       - uses: tauri-apps/tauri-action@v0
+        if: matrix.config.release != 'android'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}

README.md

@@ -42,7 +42,7 @@
 
 | **Feature**                             | **Description**                                                                                | **Status** |
 | --------------------------------------- | ---------------------------------------------------------------------------------------------- | ---------- |
-| **Multi-Format Support**                | Support EPUB, MOBI, KF8 (AZW3), FB2, CBZ, PDF (experimental)                                   | ✅         |
+| **Multi-Format Support**                | Support EPUB, MOBI, KF8 (AZW3), FB2, CBZ, TXT, PDF (experimental)                              | ✅         |
 | **Scroll/Page View Modes**              | Switch between scrolling or paginated reading modes.                                           | ✅         |
 | **Full-Text Search**                    | Search across the entire book to find relevant sections.                                       | ✅         |
 | **Annotations and Highlighting**        | Add highlights, bookmarks, and notes to enhance your reading experience.                       | ✅         |

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

@@ -9,9 +9,18 @@ SUPABASE_ADMIN_KEY=YOUR_SUPABASE_ADMIN_KEY
 DEEPL_PRO_API_KEYS=YOUR_DEEPL_PRO_API_KEYS
 DEEPL_FREE_API_KEYS=YOUR_DEEPL_FREE_API_KEYS
 
+# r2, s3
+NEXT_PUBLIC_OBJECT_STORAGE_TYPE=r2
+
 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
+
+S3_ENDPOINT=PLACE_HOLDER
+S3_ACCESS_KEY_ID=PLACE_HOLDER
+S3_SECRET_ACCESS_KEY=PLACE_HOLDER
+S3_BUCKET_NAME=PLACE_HOLDER
+S3_REGION=PLACE_HOLDER

apps/readest-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readest/readest-app",
-  "version": "0.9.25",
+  "version": "0.9.28",
   "private": true,
   "scripts": {
     "dev": "dotenv -e .env.tauri -- next dev",
@@ -56,6 +56,7 @@
     "@tauri-apps/plugin-shell": "~2.2.0",
     "@tauri-apps/plugin-updater": "^2.5.1",
     "@zip.js/zip.js": "^2.7.53",
+    "aws4fetch": "^1.0.20",
     "clsx": "^2.1.1",
     "cors": "^2.8.5",
     "cssbeautify": "^0.3.1",
@@ -65,7 +66,7 @@
     "i18next-http-backend": "^3.0.1",
     "js-md5": "^0.8.3",
     "jwt-decode": "^4.0.0",
-    "next": "15.2.2",
+    "next": "15.2.4",
     "posthog-js": "^1.205.0",
     "react": "19.0.0",
     "react-color": "^2.19.3",
@@ -77,6 +78,7 @@
     "zustand": "5.0.1"
   },
   "devDependencies": {
+    "@opennextjs/cloudflare": "^0.5.12",
     "@tauri-apps/cli": "2.3.1",
     "@types/cors": "^2.8.17",
     "@types/cssbeautify": "^0.3.5",
@@ -99,6 +101,7 @@
     "postcss-nested": "^7.0.2",
     "raw-loader": "^4.0.2",
     "tailwindcss": "^3.4.17",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "wrangler": "^4.4.0"
   }
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "التمييزات والتعليقات",
   "Note": "ملاحظة",
   "Copied to clipboard": "تم النسخ إلى الحافظة",
-  "Export Annotations": "تصدير التعليقات"
+  "Export Annotations": "تصدير التعليقات",
+  "Auto Import on File Open": "استيراد تلقائي عند فتح الملف",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "تبديل منطقة التقليب بالنقر",
+  "No chapters detected.": "لم يتم التعرف على فصول.",
+  "Failed to parse the EPUB file.": "فشل في تحليل ملف EPUB.",
+  "This book format is not supported.": "هذا تنسيق الكتاب غير مدعوم."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Hervorhebungen & Anmerkungen",
   "Note": "Notiz",
   "Copied to clipboard": "In die Zwischenablage kopiert",
-  "Export Annotations": "Anmerkungen exportieren"
+  "Export Annotations": "Anmerkungen exportieren",
+  "Auto Import on File Open": "Automatischer Import beim Öffnen einer Datei",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Klick-zu-Blättern-Bereich tauschen",
+  "No chapters detected.": "Keine Kapitel erkannt.",
+  "Failed to parse the EPUB file.": "Fehler beim Parsen der EPUB-Datei.",
+  "This book format is not supported.": "Dieses Buchformat wird nicht unterstützt."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Επισημάνσεις & Σχολιασμοί",
   "Note": "Σημείωση",
   "Copied to clipboard": "Αντιγράφηκε στο πρόχειρο",
-  "Export Annotations": "Εξαγωγή σχολιασμών"
+  "Export Annotations": "Εξαγωγή σχολιασμών",
+  "Auto Import on File Open": "Αυτόματη εισαγωγή κατά το άνοιγμα αρχείου",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Ανταλλαγή περιοχής κλικ για γύρισμα σελίδας",
+  "No chapters detected.": "Δεν εντοπίστηκαν κεφάλαια.",
+  "Failed to parse the EPUB file.": "Αποτυχία ανάλυσης του αρχείου EPUB.",
+  "This book format is not supported.": "Αυτή η μορφή βιβλίου δεν υποστηρίζεται."
 }

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

@@ -1 +1,3 @@
-{}
+{
+  "LXGW WenKai GB Screen": "LXGW WenKai"
+}

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Resaltados y anotaciones",
   "Note": "Nota",
   "Copied to clipboard": "Copiado al portapapeles",
-  "Export Annotations": "Exportar anotaciones"
+  "Export Annotations": "Exportar anotaciones",
+  "Auto Import on File Open": "Importación automática al abrir archivo",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Intercambiar área de clic para voltear",
+  "No chapters detected.": "No se detectaron capítulos.",
+  "Failed to parse the EPUB file.": "Error al analizar el archivo EPUB.",
+  "This book format is not supported.": "Este formato de libro no es compatible."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Surlignages et annotations",
   "Note": "Note",
   "Copied to clipboard": "Copié dans le presse-papiers",
-  "Export Annotations": "Exporter les annotations"
+  "Export Annotations": "Exporter les annotations",
+  "Auto Import on File Open": "Importation automatique à l'ouverture du fichier",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Échanger la zone de clic pour tourner",
+  "No chapters detected.": "Aucun chapitre détecté.",
+  "Failed to parse the EPUB file.": "Échec de l'analyse du fichier EPUB.",
+  "This book format is not supported.": "Ce format de livre n'est pas pris en charge."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "हाइलाइट और टिप्पणियाँ",
   "Note": "टिप्पणी",
   "Copied to clipboard": "क्लिपबोर्ड पर कॉपी किया गया",
-  "Export Annotations": "टिप्पणियाँ निर्यात करें"
+  "Export Annotations": "टिप्पणियाँ निर्यात करें",
+  "Auto Import on File Open": "फ़ाइल खोलने पर स्वचालित आयात",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "क्लिक-टू-फ्लिप क्षेत्र स्वैप करें",
+  "No chapters detected.": "कोई अध्याय नहीं मिला।",
+  "Failed to parse the EPUB file.": "EPUB फ़ाइल को पार्स करने में विफल।",
+  "This book format is not supported.": "यह पुस्तक प्रारूप समर्थित नहीं है।"
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Sorotan & Anotasi",
   "Note": "Catatan",
   "Copied to clipboard": "Disalin ke papan klip",
-  "Export Annotations": "Ekspor Anotasi"
+  "Export Annotations": "Ekspor Anotasi",
+  "Auto Import on File Open": "Impor Otomatis saat File Dibuka",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Tukar Area Klik untuk Membalik",
+  "No chapters detected.": "Tidak ada bab yang terdeteksi.",
+  "Failed to parse the EPUB file.": "Gagal mengurai file EPUB.",
+  "This book format is not supported.": "Format buku ini tidak didukung."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Evidenziazioni e annotazioni",
   "Note": "Nota",
   "Copied to clipboard": "Copiato negli appunti",
-  "Export Annotations": "Esporta annotazioni"
+  "Export Annotations": "Esporta annotazioni",
+  "Auto Import on File Open": "Importazione automatica all'apertura del file",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Scambia area click per voltare pagina",
+  "No chapters detected.": "Nessun capitolo rilevato.",
+  "Failed to parse the EPUB file.": "Impossibile analizzare il file EPUB.",
+  "This book format is not supported.": "Questo formato di libro non è supportato."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "ハイライトと注釈",
   "Note": "メモ",
   "Copied to clipboard": "クリップボードにコピー",
-  "Export Annotations": "注釈をエクスポート"
+  "Export Annotations": "注釈をエクスポート",
+  "Auto Import on File Open": "ファイルを開くと自動インポート",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "クリックめくりエリアを入れ替え",
+  "No chapters detected.": "章が検出されません。",
+  "Failed to parse the EPUB file.": "EPUBファイルの解析に失敗しました。",
+  "This book format is not supported.": "この書籍形式はサポートされていません。"
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "하이라이트 및 주석",
   "Note": "노트",
   "Copied to clipboard": "클립보드에 복사",
-  "Export Annotations": "주석 내보내기"
+  "Export Annotations": "주석 내보내기",
+  "Auto Import on File Open": "파일 열 때 자동 가져오기",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "클릭-뒤집기 영역 교환",
+  "No chapters detected.": "장 발견되지 않음.",
+  "Failed to parse the EPUB file.": "EPUB 파일 구문 분석 실패.",
+  "This book format is not supported.": "이 책 형식은 지원되지 않습니다."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Zaznaczenia i adnotacje",
   "Note": "Notatka",
   "Copied to clipboard": "Skopiowano do schowka",
-  "Export Annotations": "Eksportuj adnotacje"
+  "Export Annotations": "Eksportuj adnotacje",
+  "Auto Import on File Open": "Automatyczne importowanie przy otwieraniu pliku",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Zamień obszar kliknięcia na przewracanie",
+  "No chapters detected.": "Nie wykryto rozdziałów.",
+  "Failed to parse the EPUB file.": "Nie udało się przeanalizować pliku EPUB.",
+  "This book format is not supported.": "Ten format książki nie jest obsługiwany."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Destaques e Anotações",
   "Note": "Nota",
   "Copied to clipboard": "Copiado para a área de transferência",
-  "Export Annotations": "Exportar Anotações"
+  "Export Annotations": "Exportar Anotações",
+  "Auto Import on File Open": "Importação Automática ao Abrir Arquivo",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Trocar Área de Clique para Virar",
+  "No chapters detected.": "Nenhum capítulo detectado.",
+  "Failed to parse the EPUB file.": "Falha ao analisar o arquivo EPUB.",
+  "This book format is not supported.": "Este formato de livro não é suportado."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Выделения и аннотации",
   "Note": "Заметка",
   "Copied to clipboard": "Скопировано в буфер обмена",
-  "Export Annotations": "Экспортировать аннотации"
+  "Export Annotations": "Экспортировать аннотации",
+  "Auto Import on File Open": "Автоматический импорт при открытии файла",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Переключить область клика для переворота",
+  "No chapters detected.": "Не обнаружено глав.",
+  "Failed to parse the EPUB file.": "Не удалось разобрать файл EPUB.",
+  "This book format is not supported.": "Этот формат книги не поддерживается."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Vurgular ve Notlar",
   "Note": "Not",
   "Copied to clipboard": "Panoya kopyalandı",
-  "Export Annotations": "Notları Dışa Aktar"
+  "Export Annotations": "Notları Dışa Aktar",
+  "Auto Import on File Open": "Dosya Açıldığında Otomatik İçe Aktar",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Tıkla-Çevir Alanını Değiştir",
+  "No chapters detected.": "Bölüm bulunamadı.",
+  "Failed to parse the EPUB file.": "EPUB dosyası ayrıştırılamadı.",
+  "This book format is not supported.": "Bu kitap formatı desteklenmiyor."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Виділення та анотації",
   "Note": "Примітка",
   "Copied to clipboard": "Скопійовано в буфер обміну",
-  "Export Annotations": "Експортувати анотації"
+  "Export Annotations": "Експортувати анотації",
+  "Auto Import on File Open": "Автоматичний імпорт при відкритті файлу",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Поміняти місцями область кліку для перевороту",
+  "No chapters detected.": "Не виявлено жодного розділу.",
+  "Failed to parse the EPUB file.": "Не вдалося розібрати файл EPUB.",
+  "This book format is not supported.": "Цей формат книги не підтримується."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "Điểm nổi bật & Chú thích",
   "Note": "Ghi chú",
   "Copied to clipboard": "Đã sao chép vào bảng ghi",
-  "Export Annotations": "Xuất chú thích"
+  "Export Annotations": "Xuất chú thích",
+  "Auto Import on File Open": "Tự động nhập khi mở tệp",
+  "LXGW WenKai GB Screen": "LXGW WenKai",
+  "Swap Click-to-Flip Area": "Hoán đổi khu vực nhấp để lật trang",
+  "No chapters detected.": "Không phát hiện thấy chương nào.",
+  "Failed to parse the EPUB file.": "Không thể phân tích tệp EPUB.",
+  "This book format is not supported.": "Định dạng sách này không được hỗ trợ."
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "划线和笔记",
   "Note": "笔记",
   "Copied to clipboard": "已复制到剪贴板",
-  "Export Annotations": "导出笔记"
+  "Export Annotations": "导出笔记",
+  "Auto Import on File Open": "打开文件时自动导入",
+  "LXGW WenKai GB Screen": "霞鹜文楷",
+  "Swap Click-to-Flip Area": "交换点击翻页区域",
+  "No chapters detected.": "未检测到章节。",
+  "Failed to parse the EPUB file.": "无法解析 EPUB 文件。",
+  "This book format is not supported.": "不支持此书籍格式。"
 }

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

@@ -258,5 +258,11 @@
   "Highlights & Annotations": "高亮和筆記",
   "Note": "筆記",
   "Copied to clipboard": "已複製到剪貼板",
-  "Export Annotations": "匯出筆記"
+  "Export Annotations": "匯出筆記",
+  "Auto Import on File Open": "打開文件時自動導入",
+  "LXGW WenKai GB Screen": "霞鶩文楷",
+  "Swap Click-to-Flip Area": "交換點擊翻頁區域",
+  "No chapters detected.": "未檢測到章節。",
+  "Failed to parse the EPUB file.": "無法解析 EPUB 文件。",
+  "This book format is not supported.": "不支援此書籍格式。"
 }

apps/readest-app/release-notes.json

@@ -1,5 +1,31 @@
 {
   "releases": {
+    "0.9.28": {
+      "date": "2025-03-30",
+      "notes": [
+        "Improved vertical reading mode with better support for Chinese punctuations",
+        "Fixed TXT file importing issue on desktop apps — TXT books now load reliably and display as expected",
+        "Improved annotation experience — highlighting tools are now properly dismissed when adding notes to avoid UI conflicts"
+      ]
+    },
+    "0.9.27": {
+      "date": "2025-03-29",
+      "notes": [
+        "Added option to swap click-to-flip area and reset password",
+        "Added global shortcuts for full-text search",
+        "Added support for both R2 and S3 storage in cloud sync",
+        "Improved TTS with fewer unintended pauses, faster startup, and support for preferred voices",
+        "Various fixes for rendering styles and UI layout"
+      ]
+    },
+    "0.9.26": {
+      "date": "2025-03-27",
+      "notes": [
+        "Support open book from file manager without importing",
+        "Add LXGW WenKai font in Serif fonts list",
+        "Various fixes on layout and styles on Windows and Android"
+      ]
+    },
     "0.9.25": {
       "date": "2025-03-24",
       "notes": [

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

@@ -46,7 +46,7 @@ tauri-plugin-opener = "2.2.2"
 tauri-plugin-deep-link = "2"
 tauri-plugin-sign-in-with-apple = "1.0.2"
 tauri-plugin-haptics = "2.2.3"
-tauri-plugin-safari-auth = { path = "./plugins/tauri-plugin-safari-auth" }
+tauri-plugin-native-bridge = { path = "./plugins/tauri-plugin-native-bridge" }
 [patch.crates-io]
 tauri = { path = "../../../packages/tauri/crates/tauri" }
 

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

@@ -75,7 +75,7 @@
     "haptics:allow-impact-feedback",
     "haptics:allow-notification-feedback",
     "haptics:allow-selection-feedback",
-    "safari-auth:default",
+    "native-bridge:default",
     "deep-link:default"
   ]
 }

apps/readest-app/src-tauri/gen/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <!-- AndroidTV support -->
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+
+    <application
+        android:icon="@mipmap/ic_launcher"
+        android:largeHeap="true"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.readest"
+        android:usesCleartextTraffic="${usesCleartextTraffic}">
+        <activity
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:launchMode="singleTask"
+            android:label="@string/main_activity_title"
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <!-- AndroidTV support -->
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+            <!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="web.readest.com" />
+                
+            </intent-filter>
+            <!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
+        </activity>
+
+        <provider
+          android:name="androidx.core.content.FileProvider"
+          android:authorities="${applicationId}.fileprovider"
+          android:exported="false"
+          android:grantUriPermissions="true">
+          <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/file_paths" />
+        </provider>
+    </application>
+</manifest>

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "tauri-plugin-native-bridge"
+version = "0.1.0"
+authors = [ "You" ]
+description = "a bridge between tauri app and native OS functionality"
+edition = "2021"
+rust-version = "1.77.2"
+exclude = ["/examples", "/dist-js", "/guest-js", "/node_modules"]
+links = "tauri-plugin-native-bridge"
+
+[dependencies]
+tauri = { version = "2.3.1" }
+serde = "1.0"
+thiserror = "2"
+schemars = "0.8"
+
+[build-dependencies]
+tauri-plugin = { version = "2.0.4", features = ["build"] }
+schemars = "0.8"

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/README.md

@@ -0,0 +1 @@
+# Tauri Plugin native-bridge

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace = "com.plugin.safari_auth"
+    namespace = "com.readest.native_bridge"
     compileSdk = 34
 
     defaultConfig {

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/src/androidTest/java/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.plugin.safari_auth
+package com.readest.native_bridge
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.plugin.safari_auth", appContext.packageName)
+        assertEquals("com.readest.native_bridge", appContext.packageName)
     }
 }

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/src/main/java/NativeBridge.kt

@@ -0,0 +1,9 @@
+package com.readest.native_bridge
+
+import android.util.Log
+
+class NativeBridge {
+    fun auth_with_safari(value: String): String {
+        return ""
+    }
+}

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/src/main/java/NativeBridgePlugin.kt

@@ -0,0 +1,28 @@
+package com.readest.native_bridge
+
+import android.app.Activity
+import app.tauri.annotation.Command
+import app.tauri.annotation.InvokeArg
+import app.tauri.annotation.TauriPlugin
+import app.tauri.plugin.JSObject
+import app.tauri.plugin.Plugin
+import app.tauri.plugin.Invoke
+
+@InvokeArg
+class SafariAuthRequestArgs {
+  var authUrl: String? = null
+}
+
+@TauriPlugin
+class NativeBridgePlugin(private val activity: Activity): Plugin(activity) {
+    private val implementation = NativeBridge()
+
+    @Command
+    fun auth_with_safari(invoke: Invoke) {
+        val args = invoke.parseArgs(SafariAuthRequestArgs::class.java)
+
+        val ret = JSObject()
+        ret.put("redirectUrl", implementation.auth_with_safari(args.authUrl ?: ""))
+        invoke.resolve(ret)
+    }
+}

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/src/test/java/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.plugin.safari_auth
+package com.readest.native_bridge
 
 import org.junit.Test
 

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/build.rs

@@ -0,0 +1,8 @@
+const COMMANDS: &[&str] = &["auth_with_safari"];
+
+fn main() {
+  tauri_plugin::Builder::new(COMMANDS)
+    .android_path("android")
+    .ios_path("ios")
+    .build();
+}

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/ios/Package.swift

@@ -4,7 +4,7 @@
 import PackageDescription
 
 let package = Package(
-    name: "tauri-plugin-safari-auth",
+    name: "tauri-plugin-native-bridge",
     platforms: [
         .macOS(.v10_13),
         .iOS(.v13),
@@ -12,9 +12,9 @@ let package = Package(
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
-            name: "tauri-plugin-safari-auth",
+            name: "tauri-plugin-native-bridge",
             type: .static,
-            targets: ["tauri-plugin-safari-auth"]),
+            targets: ["tauri-plugin-native-bridge"]),
     ],
     dependencies: [
         .package(name: "Tauri", path: "../.tauri/tauri-api")
@@ -23,7 +23,7 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
-            name: "tauri-plugin-safari-auth",
+            name: "tauri-plugin-native-bridge",
             dependencies: [
                 .byName(name: "Tauri")
             ],

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/ios/README.md

@@ -1,3 +1,3 @@
-# Tauri Plugin safari-auth
+# Tauri Plugin native-bridge
 
 A description of this package.

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/ios/Sources/NativeBridgePlugin.swift

@@ -4,19 +4,15 @@ import Tauri
 import UIKit
 import WebKit
 
-class RequestArgs: Decodable {
+class SafariAuthRequestArgs: Decodable {
   let authUrl: String
 }
 
-struct Response: Encodable {
-  let redirectUrl: String
-}
-
-class SafariAuthPlugin: Plugin {
+class NativeBridgePlugin: Plugin {
   private var authSession: ASWebAuthenticationSession?
 
   @objc public func auth_with_safari(_ invoke: Invoke) throws {
-    let args = try invoke.parseArgs(RequestArgs.self)
+    let args = try invoke.parseArgs(SafariAuthRequestArgs.self)
     let authUrl = URL(string: args.authUrl)!
 
     authSession = ASWebAuthenticationSession(url: authUrl, callbackURLScheme: "readest") {
@@ -46,14 +42,14 @@ class SafariAuthPlugin: Plugin {
   }
 }
 
-@_cdecl("init_plugin_safari_auth")
+@_cdecl("init_plugin_native_bridge")
 func initPlugin() -> Plugin {
-  return SafariAuthPlugin()
+  return NativeBridgePlugin()
 }
 
 @available(iOS 13.0, *)
-extension SafariAuthPlugin: ASWebAuthenticationPresentationContextProviding {
+extension NativeBridgePlugin: ASWebAuthenticationPresentationContextProviding {
   func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
     return UIApplication.shared.windows.first ?? UIWindow()
   }
-}
+}

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/ios/Tests/PluginTests/PluginTests.swift

@@ -0,0 +1,8 @@
+import XCTest
+@testable import NativeBridgePlugin
+
+final class NativeBridgePluginTests: XCTestCase {
+    func testNativeBridge() throws {
+        let plugin = NativeBridgePlugin()
+    }
+}

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/permissions/autogenerated/reference.md

@@ -16,7 +16,7 @@ Default permissions for the plugin
 <tr>
 <td>
 
-`safari-auth:allow-auth-with-safari`
+`native-bridge:allow-auth-with-safari`
 
 </td>
 <td>
@@ -29,7 +29,7 @@ Enables the auth_with_safari command without any pre-configured scope.
 <tr>
 <td>
 
-`safari-auth:deny-auth-with-safari`
+`native-bridge:deny-auth-with-safari`
 
 </td>
 <td>

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/commands.rs

@@ -1,13 +1,13 @@
 use tauri::{command, AppHandle, Runtime};
 
 use crate::models::*;
+use crate::NativeBridgeExt;
 use crate::Result;
-use crate::SafariAuthExt;
 
 #[command]
 pub(crate) async fn auth_with_safari<R: Runtime>(
     app: AppHandle<R>,
     payload: SafariAuthRequest,
 ) -> Result<SafariAuthResponse> {
-    app.safari_auth().auth_with_safari(payload)
+    app.native_bridge().auth_with_safari(payload)
 }

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/desktop.rs

@@ -6,14 +6,14 @@ use crate::models::*;
 pub fn init<R: Runtime, C: DeserializeOwned>(
     app: &AppHandle<R>,
     _api: PluginApi<R, C>,
-) -> crate::Result<SafariAuth<R>> {
-    Ok(SafariAuth(app.clone()))
+) -> crate::Result<NativeBridge<R>> {
+    Ok(NativeBridge(app.clone()))
 }
 
-/// Access to the safari-auth APIs.
-pub struct SafariAuth<R: Runtime>(AppHandle<R>);
+/// Access to the native-bridge APIs.
+pub struct NativeBridge<R: Runtime>(AppHandle<R>);
 
-impl<R: Runtime> SafariAuth<R> {
+impl<R: Runtime> NativeBridge<R> {
     pub fn auth_with_safari(
         &self,
         _payload: SafariAuthRequest,

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/error.rs

@@ -6,6 +6,8 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub enum Error {
     #[error("Unsupported platform for this plugin")]
     UnsupportedPlatformError,
+    #[error("Native bridge error: {0}")]
+    NativeBridgeError(String),
     #[error(transparent)]
     Io(#[from] std::io::Error),
     #[cfg(mobile)]

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/lib.rs

@@ -13,35 +13,36 @@ mod mobile;
 mod commands;
 mod error;
 mod models;
+mod platform;
 
 pub use error::{Error, Result};
 
 #[cfg(desktop)]
-use desktop::SafariAuth;
+use desktop::NativeBridge;
 #[cfg(mobile)]
-use mobile::SafariAuth;
+use mobile::NativeBridge;
 
-/// Extensions to [`tauri::App`], [`tauri::AppHandle`] and [`tauri::Window`] to access the safari-auth APIs.
-pub trait SafariAuthExt<R: Runtime> {
-    fn safari_auth(&self) -> &SafariAuth<R>;
+/// Extensions to [`tauri::App`], [`tauri::AppHandle`] and [`tauri::Window`] to access the native-bridge APIs.
+pub trait NativeBridgeExt<R: Runtime> {
+    fn native_bridge(&self) -> &NativeBridge<R>;
 }
 
-impl<R: Runtime, T: Manager<R>> crate::SafariAuthExt<R> for T {
-    fn safari_auth(&self) -> &SafariAuth<R> {
-        self.state::<SafariAuth<R>>().inner()
+impl<R: Runtime, T: Manager<R>> crate::NativeBridgeExt<R> for T {
+    fn native_bridge(&self) -> &NativeBridge<R> {
+        self.state::<NativeBridge<R>>().inner()
     }
 }
 
 /// Initializes the plugin.
 pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    Builder::new("safari-auth")
+    Builder::new("native-bridge")
         .invoke_handler(tauri::generate_handler![commands::auth_with_safari])
         .setup(|app, api| {
             #[cfg(mobile)]
-            let safari_auth = mobile::init(app, api)?;
+            let native_bridge = mobile::init(app, api)?;
             #[cfg(desktop)]
-            let safari_auth = desktop::init(app, api)?;
-            app.manage(safari_auth);
+            let native_bridge = desktop::init(app, api)?;
+            app.manage(native_bridge);
             Ok(())
         })
         .build()

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/mobile.rs

@@ -7,25 +7,24 @@ use tauri::{
 use crate::models::*;
 
 #[cfg(target_os = "ios")]
-tauri::ios_plugin_binding!(init_plugin_safari_auth);
+tauri::ios_plugin_binding!(init_plugin_native_bridge);
 
 // initializes the Kotlin or Swift plugin classes
 pub fn init<R: Runtime, C: DeserializeOwned>(
     _app: &AppHandle<R>,
     api: PluginApi<R, C>,
-) -> crate::Result<SafariAuth<R>> {
+) -> crate::Result<NativeBridge<R>> {
     #[cfg(target_os = "android")]
-    let handle = api.register_android_plugin("com.bilingify.safari_auth", "ExamplePlugin")?;
+    let handle = api.register_android_plugin("com.readest.native_bridge", "NativeBridgePlugin")?;
     #[cfg(target_os = "ios")]
-    let handle = api.register_ios_plugin(init_plugin_safari_auth)?;
-
-    Ok(SafariAuth(handle))
+    let handle = api.register_ios_plugin(init_plugin_native_bridge)?;
+    Ok(NativeBridge(handle))
 }
 
-/// Access to the safari-auth APIs.
-pub struct SafariAuth<R: Runtime>(PluginHandle<R>);
+/// Access to the native-bridge APIs.
+pub struct NativeBridge<R: Runtime>(PluginHandle<R>);
 
-impl<R: Runtime> SafariAuth<R> {
+impl<R: Runtime> NativeBridge<R> {
     pub fn auth_with_safari(
         &self,
         payload: SafariAuthRequest,

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/platform/mod.rs

@@ -0,0 +1,2 @@
+#[cfg(target_os = "macos")]
+pub mod macos;

apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "tauri-plugin-safari-auth"
-version = "0.1.0"
-authors = [ "chrox" ]
-description = "OAuth with ASWebAuthenticationSession on iOS"
-edition = "2021"
-rust-version = "1.77.2"
-exclude = ["/examples", "/dist-js", "/guest-js", "/node_modules"]
-links = "tauri-plugin-safari-auth"
-
-[dependencies]
-tauri = { version = "2.2.4" }
-serde = "1.0"
-thiserror = "2"
-
-[build-dependencies]
-tauri-plugin = { version = "2.0.3", features = ["build"] }

apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/README.md

@@ -1 +0,0 @@
-# Tauri Plugin safari-auth

apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/java/Example.kt

@@ -1,10 +0,0 @@
-package com.plugin.safari_auth
-
-import android.util.Log
-
-class Example {
-    fun pong(value: String): String {
-        Log.i("Pong", value)
-        return value
-    }
-}

apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/java/ExamplePlugin.kt

@@ -1,28 +0,0 @@
-package com.plugin.safari_auth
-
-import android.app.Activity
-import app.tauri.annotation.Command
-import app.tauri.annotation.InvokeArg
-import app.tauri.annotation.TauriPlugin
-import app.tauri.plugin.JSObject
-import app.tauri.plugin.Plugin
-import app.tauri.plugin.Invoke
-
-@InvokeArg
-class PingArgs {
-  var value: String? = null
-}
-
-@TauriPlugin
-class ExamplePlugin(private val activity: Activity): Plugin(activity) {
-    private val implementation = Example()
-
-    @Command
-    fun ping(invoke: Invoke) {
-        val args = invoke.parseArgs(PingArgs::class.java)
-
-        val ret = JSObject()
-        ret.put("value", implementation.pong(args.value ?: "default value :("))
-        invoke.resolve(ret)
-    }
-}

apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/build.rs

@@ -1,8 +0,0 @@
-const COMMANDS: &[&str] = &["auth_with_safari"];
-
-fn main() {
-    tauri_plugin::Builder::new(COMMANDS)
-        .android_path("android")
-        .ios_path("ios")
-        .build();
-}

apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/ios/Tests/PluginTests/PluginTests.swift

@@ -1,8 +0,0 @@
-import XCTest
-@testable import SafariAuthPlugin
-
-final class SafariAuthPluginTests: XCTestCase {
-    func testExample() throws {
-        let plugin = SafariAuthPlugin()
-    }
-}

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

@@ -46,6 +46,31 @@ fn allow_file_in_scopes(app: &AppHandle, files: Vec<PathBuf>) {
     }
 }
 
+#[cfg(desktop)]
+fn get_files_from_argv(argv: Vec<String>) -> Vec<PathBuf> {
+    let mut files = Vec::new();
+    // NOTICE: `args` may include URL protocol (`your-app-protocol://`)
+    // or arguments (`--`) if your app supports them.
+    // files may also be passed as `file://path/to/file`
+    for (_, maybe_file) in argv.iter().enumerate().skip(1) {
+        // skip flags like -f or --flag
+        if maybe_file.starts_with("-") {
+            continue;
+        }
+        // handle `file://` path urls and skip other urls
+        if let Ok(url) = Url::parse(maybe_file) {
+            if let Ok(path) = url.to_file_path() {
+                files.push(path);
+            } else {
+                files.push(PathBuf::from(maybe_file))
+            }
+        } else {
+            files.push(PathBuf::from(maybe_file))
+        }
+    }
+    files
+}
+
 #[cfg(desktop)]
 fn set_window_open_with_files(app: &AppHandle, files: Vec<PathBuf>) {
     let files = files
@@ -63,6 +88,15 @@ fn set_window_open_with_files(app: &AppHandle, files: Vec<PathBuf>) {
     }
 }
 
+#[cfg(desktop)]
+fn set_rounded_window(app: &AppHandle, rounded: bool) {
+    let window = app.get_webview_window("main").unwrap();
+    let script = format!("window.IS_ROUNDED = {};", rounded);
+    if let Err(e) = window.eval(&script) {
+        eprintln!("Failed to set IS_ROUNDED variable: {}", e);
+    }
+}
+
 #[command]
 async fn start_server(window: Window) -> Result<u16, String> {
     start(move |url| {
@@ -110,6 +144,7 @@ pub fn run() {
         .plugin(tauri_plugin_http::init())
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_dialog::init())
+        .plugin(tauri_plugin_native_bridge::init())
         .plugin(tauri_plugin_fs::init());
 
     #[cfg(desktop)]
@@ -118,6 +153,10 @@ pub fn run() {
             .get_webview_window("main")
             .expect("no main window")
             .set_focus();
+        let files = get_files_from_argv(argv.clone());
+        if !files.is_empty() {
+            allow_file_in_scopes(app, files.clone());
+        }
         app.emit("single-instance", Payload { args: argv, cwd })
             .unwrap();
     }));
@@ -136,9 +175,6 @@ pub fn run() {
     #[cfg(target_os = "ios")]
     let builder = builder.plugin(tauri_plugin_sign_in_with_apple::init());
 
-    #[cfg(target_os = "ios")]
-    let builder = builder.plugin(tauri_plugin_safari_auth::init());
-
     #[cfg(any(target_os = "ios", target_os = "android"))]
     let builder = builder.plugin(tauri_plugin_haptics::init());
 
@@ -146,26 +182,7 @@ pub fn run() {
         .setup(|#[allow(unused_variables)] app| {
             #[cfg(desktop)]
             {
-                let mut files = Vec::new();
-                // NOTICE: `args` may include URL protocol (`your-app-protocol://`)
-                // or arguments (`--`) if your app supports them.
-                // files may also be passed as `file://path/to/file`
-                for maybe_file in std::env::args().skip(1) {
-                    // skip flags like -f or --flag
-                    if maybe_file.starts_with("-") {
-                        continue;
-                    }
-                    // handle `file://` path urls and skip other urls
-                    if let Ok(url) = Url::parse(&maybe_file) {
-                        if let Ok(path) = url.to_file_path() {
-                            files.push(path);
-                        } else {
-                            files.push(PathBuf::from(maybe_file))
-                        }
-                    } else {
-                        files.push(PathBuf::from(maybe_file))
-                    }
-                }
+                let files = get_files_from_argv(std::env::args().collect());
                 if !files.is_empty() {
                     let app_handle = app.handle().clone();
                     allow_file_in_scopes(&app_handle, files.clone());
@@ -185,6 +202,12 @@ pub fn run() {
                     app_handle.get_webview_window("main").unwrap()
                         .eval("window.__READEST_CLI_ACCESS = true; window.__READEST_UPDATER_ACCESS = true;")
                         .expect("Failed to set cli access config");
+
+                    set_rounded_window(&app_handle, true);
+                    #[cfg(target_os = "windows")]
+                    if tauri_plugin_os::version() <= tauri_plugin_os::Version::from_string("10.0.19045") {
+                        set_rounded_window(&app_handle, false);
+                    }
                 });
             }
 
@@ -225,8 +248,7 @@ pub fn run() {
                     .title("Readest");
 
                 if cfg!(target_os = "windows") {
-                    let version = tauri_plugin_os::version();
-                    if version <= tauri_plugin_os::Version::from_string("10.0.19045") {
+                    if tauri_plugin_os::version() <= tauri_plugin_os::Version::from_string("10.0.19045") {
                         win_builder = win_builder.shadow(false);
                     } else {
                         win_builder = win_builder.shadow(true);

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

@@ -16,9 +16,27 @@ export default function AuthCallback() {
 
   const accessToken = params.get('access_token');
   const refreshToken = params.get('refresh_token');
+  const type = params.get('type');
   const next = params.get('next') ?? '/';
+  const error = params.get('error');
+  const errorDescription = params.get('error_description');
+  const errorCode = params.get('error_code');
 
-  handleAuthCallback({ accessToken, refreshToken, next, login, navigate: router.push });
+  handleAuthCallback({
+    accessToken,
+    refreshToken,
+    type,
+    next,
+    error,
+    errorCode,
+    errorDescription,
+    login,
+    navigate: router.push,
+  });
 
-  return null;
+  return (
+    <div className='fixed inset-0 z-50 flex items-center justify-center'>
+      <span className='loading loading-infinity loading-xl w-20'></span>
+    </div>
+  );
 }

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

@@ -16,6 +16,7 @@ import { useEnv } from '@/context/EnvContext';
 import { useThemeStore } from '@/store/themeStore';
 import { useSettingsStore } from '@/store/settingsStore';
 import { useTranslation } from '@/hooks/useTranslation';
+import { useTrafficLightStore } from '@/store/trafficLightStore';
 import { isTauriAppPlatform } from '@/services/environment';
 import { onOpenUrl } from '@tauri-apps/plugin-deep-link';
 import { start, cancel, onUrl, onInvalidUrl } from '@fabianlars/tauri-plugin-oauth';
@@ -23,6 +24,8 @@ import { openUrl } from '@tauri-apps/plugin-opener';
 import { handleAuthCallback } from '@/helpers/auth';
 import { getAppleIdAuth, Scope } from './utils/appleIdAuth';
 import { authWithSafari } from './utils/safariAuth';
+import { READEST_WEB_BASE_URL } from '@/services/constants';
+import WindowButtons from '@/components/WindowButtons';
 
 type OAuthProvider = 'google' | 'apple' | 'azure' | 'github';
 
@@ -38,7 +41,7 @@ interface ProviderLoginProp {
   label: string;
 }
 
-const WEB_AUTH_CALLBACK = 'https://web.readest.com/auth/callback';
+const WEB_AUTH_CALLBACK = `${READEST_WEB_BASE_URL}/auth/callback`;
 const DEEPLINK_CALLBACK = 'readest://auth/callback';
 
 const ProviderLogin: React.FC<ProviderLoginProp> = ({ provider, handleSignIn, Icon, label }) => {
@@ -47,11 +50,11 @@ const ProviderLogin: React.FC<ProviderLoginProp> = ({ provider, handleSignIn, Ic
       onClick={() => handleSignIn(provider)}
       className={clsx(
         'mb-2 flex w-64 items-center justify-center rounded border p-2.5',
-        'bg-base-100 border-gray-300 shadow-sm transition hover:bg-gray-50',
+        'bg-base-100 border-base-300 hover:bg-base-200 shadow-sm transition',
       )}
     >
       <Icon />
-      <span className='text-neutral-content/70 px-2 text-sm'>{label}</span>
+      <span className='text-base-content/75 px-2 text-sm'>{label}</span>
     </button>
   );
 };
@@ -62,11 +65,14 @@ export default function AuthPage() {
   const { login } = useAuth();
   const { envConfig, appService } = useEnv();
   const { isDarkMode } = useThemeStore();
+  const { isTrafficLightVisible } = useTrafficLightStore();
   const { settings, setSettings, saveSettings } = useSettingsStore();
   const [port, setPort] = useState<number | null>(null);
   const isOAuthServerRunning = useRef(false);
   const [isMounted, setIsMounted] = useState(false);
 
+  const headerRef = useRef<HTMLDivElement>(null);
+
   const getTauriRedirectTo = (isOAuth: boolean) => {
     if (process.env.NODE_ENV === 'production' || appService?.isMobile) {
       if (appService?.isIOSApp) {
@@ -79,6 +85,12 @@ export default function AuthPage() {
     return `http://localhost:${port}`; // only for development env on Desktop
   };
 
+  const getWebRedirectTo = () => {
+    return process.env.NODE_ENV === 'production'
+      ? WEB_AUTH_CALLBACK
+      : `${window.location.origin}/auth/callback`;
+  };
+
   const tauriSignInApple = async () => {
     if (!supabase) {
       throw new Error('No backend connected');
@@ -136,9 +148,10 @@ export default function AuthPage() {
       const params = new URLSearchParams(hash);
       const accessToken = params.get('access_token');
       const refreshToken = params.get('refresh_token');
+      const type = params.get('type');
       const next = params.get('next') ?? '/';
       if (accessToken) {
-        handleAuthCallback({ accessToken, refreshToken, next, login, navigate: router.push });
+        handleAuthCallback({ accessToken, refreshToken, type, next, login, navigate: router.push });
       }
     }
   };
@@ -235,13 +248,6 @@ export default function AuthPage() {
           link_text: _('Forgot your password?'),
           confirmation_text: _('Check your email for the password reset link'),
         },
-        update_password: {
-          password_label: _('New Password'),
-          password_input_placeholder: _('Your new password'),
-          button_label: _('Update password'),
-          loading_button_label: _('Updating password ...'),
-          confirmation_text: _('Your password has been updated'),
-        },
         verify_otp: {
           email_input_label: _('Email address'),
           email_input_placeholder: _('Your email address'),
@@ -298,21 +304,31 @@ export default function AuthPage() {
   return isTauriAppPlatform() ? (
     <div
       className={clsx(
-        'mt-6 flex',
+        'bg-base-100 border-base-200 flex h-dvh w-full select-none flex-col items-center border',
         appService?.hasSafeAreaInset && 'pt-[env(safe-area-inset-top)]',
-        appService?.hasTrafficLight && 'pt-11',
       )}
     >
-      <button
-        onClick={handleGoBack}
+      <div
+        ref={headerRef}
         className={clsx(
-          'btn btn-ghost fixed left-4 h-8 min-h-8 w-8 p-0',
-          appService?.hasSafeAreaInset && 'top-[calc(env(safe-area-inset-top)+16px)]',
-          appService?.hasTrafficLight && 'top-11',
+          'fixed flex w-full items-center justify-between py-2 pe-6 ps-4',
+          appService?.hasTrafficLight && 'pt-11',
         )}
       >
-        <IoArrowBack className='text-base-content' />
-      </button>
+        <button onClick={handleGoBack} className={clsx('btn btn-ghost h-8 min-h-8 w-8 p-0')}>
+          <IoArrowBack className='text-base-content' />
+        </button>
+
+        {appService?.hasWindowBar && (
+          <WindowButtons
+            headerRef={headerRef}
+            showMinimize={!isTrafficLightVisible}
+            showMaximize={!isTrafficLightVisible}
+            showClose={!isTrafficLightVisible}
+            onClose={handleGoBack}
+          />
+        )}
+      </div>
       <div style={{ maxWidth: '420px', margin: 'auto', padding: '2rem' }}>
         <ProviderLogin
           provider='google'
@@ -332,7 +348,7 @@ export default function AuthPage() {
           Icon={FaGithub}
           label={_('Sign in with GitHub')}
         />
-        <hr className='my-3 mt-6 w-64 border-t border-gray-200' />
+        <hr className='border-base-300 my-3 mt-6 w-64 border-t' />
         <Auth
           supabaseClient={supabase}
           appearance={{ theme: ThemeSupa }}
@@ -358,7 +374,7 @@ export default function AuthPage() {
         theme={isDarkMode ? 'dark' : 'light'}
         magicLink={true}
         providers={['google', 'apple', 'github']}
-        redirectTo='/auth/callback'
+        redirectTo={getWebRedirectTo()}
         localization={getAuthLocalization()}
       />
     </div>

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

@@ -0,0 +1,62 @@
+'use client';
+
+import { useEffect } from 'react';
+import { useRouter } from 'next/navigation';
+import { useAuth } from '@/context/AuthContext';
+import { useThemeStore } from '@/store/themeStore';
+import { useTranslation } from '@/hooks/useTranslation';
+import { ThemeSupa } from '@supabase/auth-ui-shared';
+import { Auth } from '@supabase/auth-ui-react';
+import { supabase } from '@/utils/supabase';
+
+export default function ResetPasswordPage() {
+  const _ = useTranslation();
+  const router = useRouter();
+  const { login } = useAuth();
+  const { isDarkMode } = useThemeStore();
+
+  const getAuthLocalization = () => {
+    return {
+      variables: {
+        update_password: {
+          password_label: _('New Password'),
+          password_input_placeholder: _('Your new password'),
+          button_label: _('Update password'),
+          loading_button_label: _('Updating password ...'),
+          confirmation_text: _('Your password has been updated'),
+        },
+      },
+    };
+  };
+
+  useEffect(() => {
+    const { data: subscription } = supabase.auth.onAuthStateChange((event, session) => {
+      if (session?.access_token && session.user && event === 'USER_UPDATED') {
+        login(session.access_token, session.user);
+        const redirectTo = new URLSearchParams(window.location.search).get('redirect');
+        router.push(redirectTo ?? '/library');
+      }
+    });
+
+    return () => {
+      subscription?.subscription.unsubscribe();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [router]);
+
+  return (
+    <div className='flex min-h-screen items-center justify-center'>
+      <div className='w-full max-w-md'>
+        <Auth
+          supabaseClient={supabase}
+          view='update_password'
+          appearance={{ theme: ThemeSupa }}
+          theme={isDarkMode ? 'dark' : 'light'}
+          magicLink={false}
+          providers={[]}
+          localization={getAuthLocalization()}
+        />
+      </div>
+    </div>
+  );
+}

apps/readest-app/src/app/auth/utils/safariAuth.ts

@@ -9,7 +9,7 @@ export interface SafariAuthResponse {
 }
 
 export async function authWithSafari(request: SafariAuthRequest): Promise<SafariAuthResponse> {
-  const result = await invoke<SafariAuthResponse>('plugin:safari-auth|auth_with_safari', {
+  const result = await invoke<SafariAuthResponse>('plugin:native-bridge|auth_with_safari', {
     payload: request,
   });
 

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

@@ -9,7 +9,7 @@ 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 { getLocalBookFilename } 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';
@@ -152,7 +152,7 @@ const BookshelfItem: React.FC<BookshelfItemProps> = ({
     const showBookInFinderMenuItem = await MenuItem.new({
       text: _(fileRevealLabel),
       action: async () => {
-        const folder = `${settings.localBooksDir}/${getFilename(book)}`;
+        const folder = `${settings.localBooksDir}/${getLocalBookFilename(book)}`;
         revealItemInDir(folder);
       },
     });

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

@@ -68,7 +68,7 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
     <div
       ref={headerRef}
       className={clsx(
-        'titlebar h-13 z-10 flex w-full items-center py-2 pr-4 sm:pr-6',
+        'titlebar z-10 flex h-[52px] w-full items-center py-2 pr-4 sm:h-[48px] sm:pr-6',
         appService?.hasSafeAreaInset && 'mt-[env(safe-area-inset-top)]',
         isTrafficLightVisible ? 'pl-16' : 'pl-0 sm:pl-2',
       )}

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

@@ -6,7 +6,7 @@ import { PiUserCircleCheck } from 'react-icons/pi';
 import { MdCheck } from 'react-icons/md';
 
 import { setAboutDialogVisible } from '@/components/AboutWindow';
-import { hasUpdater, isWebAppPlatform } from '@/services/environment';
+import { hasUpdater, isTauriAppPlatform, isWebAppPlatform } from '@/services/environment';
 import { DOWNLOAD_READEST_URL } from '@/services/constants';
 import { useAuth } from '@/context/AuthContext';
 import { useEnv } from '@/context/EnvContext';
@@ -33,6 +33,9 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
   const [isAutoUpload, setIsAutoUpload] = useState(settings.autoUpload);
   const [isAutoCheckUpdates, setIsAutoCheckUpdates] = useState(settings.autoCheckUpdates);
   const [isScreenWakeLock, setIsScreenWakeLock] = useState(settings.screenWakeLock);
+  const [isAutoImportBooksOnOpen, setIsAutoImportBooksOnOpen] = useState(
+    settings.autoImportBooksOnOpen,
+  );
 
   const showAboutReadest = () => {
     setAboutDialogVisible(true);
@@ -74,6 +77,13 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
     }
   };
 
+  const toggleAutoImportBooksOnOpen = () => {
+    settings.autoImportBooksOnOpen = !settings.autoImportBooksOnOpen;
+    setSettings(settings);
+    saveSettings(envConfig, settings);
+    setIsAutoImportBooksOnOpen(settings.autoImportBooksOnOpen);
+  };
+
   const toggleAutoCheckUpdates = () => {
     settings.autoCheckUpdates = !settings.autoCheckUpdates;
     setSettings(settings);
@@ -150,6 +160,13 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
         icon={isAutoUpload ? <MdCheck className='text-base-content' /> : undefined}
         onClick={toggleAutoUploadBooks}
       />
+      {isTauriAppPlatform() && !appService?.isMobile && (
+        <MenuItem
+          label={_('Auto Import on File Open')}
+          icon={isAutoImportBooksOnOpen ? <MdCheck className='text-base-content' /> : undefined}
+          onClick={toggleAutoImportBooksOnOpen}
+        />
+      )}
       {hasUpdater() && (
         <MenuItem
           label={_('Check Updates on Start')}
@@ -163,9 +180,7 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
         onClick={toggleScreenWakeLock}
       />
       <hr className='border-base-200 my-1' />
-      {appService?.hasRoundedWindow && (
-        <MenuItem label={_('Fullscreen')} onClick={handleFullScreen} />
-      )}
+      {appService?.hasWindow && <MenuItem label={_('Fullscreen')} onClick={handleFullScreen} />}
       <MenuItem label={_('Reload Page')} onClick={handleReloadPage} />
       <hr className='border-base-200 my-1' />
       {isWebApp && <MenuItem label={_('Download Readest')} onClick={downloadReadest} />}

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

@@ -191,11 +191,13 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP
 
   const processOpenWithFiles = React.useCallback(
     async (appService: AppService, openWithFiles: string[], libraryBooks: Book[]) => {
+      const settings = await appService.loadSettings();
       const bookIds: string[] = [];
       for (const file of openWithFiles) {
         console.log('Open with book:', file);
         try {
-          const book = await appService.importBook(file, libraryBooks);
+          const temp = !settings.autoImportBooksOnOpen;
+          const book = await appService.importBook(file, libraryBooks, true, true, false, temp);
           if (book) {
             bookIds.push(book.hash);
           }
@@ -294,6 +296,11 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP
   const importBooks = async (files: (string | File)[]) => {
     setLoading(true);
     const failedFiles = [];
+    const errorMap: [string, string][] = [
+      ['No chapters detected.', _('No chapters detected.')],
+      ['Failed to parse EPUB.', _('Failed to parse the EPUB file.')],
+      ['Unsupported format.', _('This book format is not supported.')],
+    ];
     for (const file of files) {
       try {
         const book = await appService?.importBook(file, libraryBooks);
@@ -306,10 +313,15 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP
         const filename = typeof file === 'string' ? file : file.name;
         const baseFilename = getBaseFilename(filename);
         failedFiles.push(baseFilename);
+        const errorMessage =
+          error instanceof Error
+            ? errorMap.find(([substring]) => error.message.includes(substring))?.[1] || ''
+            : '';
         eventDispatcher.dispatch('toast', {
-          message: _('Failed to import book(s): {{filenames}}', {
-            filenames: listFormater(false).format(failedFiles),
-          }),
+          message:
+            _('Failed to import book(s): {{filenames}}', {
+              filenames: listFormater(false).format(failedFiles),
+            }) + (errorMessage ? `\n${errorMessage}` : ''),
           type: 'error',
         });
         console.error('Failed to import book:', filename, error);
@@ -364,6 +376,8 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP
     } catch (err) {
       if (err instanceof Error) {
         if (err.message.includes('Not authenticated') && settings.keepLogin) {
+          settings.keepLogin = false;
+          setSettings(settings);
           navigateToLogin(router);
           return false;
         } else if (err.message.includes('Insufficient storage quota')) {
@@ -508,8 +522,8 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP
           <div
             ref={containerRef}
             className={clsx(
-              'scroll-container drop-zone mt-12 flex-grow overflow-auto px-4 sm:px-2',
-              appService?.hasSafeAreaInset && 'mt-[calc(48px+env(safe-area-inset-top))]',
+              'scroll-container drop-zone mt-[48px] flex-grow overflow-y-auto px-4 sm:px-2',
+              appService?.hasSafeAreaInset && 'mt-[calc(52px+env(safe-area-inset-top))]',
               appService?.hasSafeAreaInset && 'pb-[calc(env(safe-area-inset-bottom))]',
               isDragging && 'drag-over',
             )}

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

@@ -9,7 +9,7 @@ import { useClickEvent, useTouchEvent } from '../hooks/useIframeEvents';
 import { useFoliateEvents } from '../hooks/useFoliateEvents';
 import { useProgressSync } from '../hooks/useProgressSync';
 import { useProgressAutoSave } from '../hooks/useProgressAutoSave';
-import { getStyles, mountAdditionalFonts } from '@/utils/style';
+import { getStyles, mountAdditionalFonts, transformStylesheet } from '@/utils/style';
 import { getBookDirFromLanguage, getBookDirFromWritingMode } from '@/utils/book';
 import { useUICSS } from '@/hooks/useUICSS';
 import {
@@ -23,6 +23,7 @@ import {
   handleTouchEnd,
 } from '../utils/iframeEventHandlers';
 import { getMaxInlineSize } from '@/utils/config';
+import { transformContent } from '@/services/transformService';
 
 const FoliateViewer: React.FC<{
   bookKey: string;
@@ -53,6 +54,28 @@ const FoliateViewer: React.FC<{
     setProgress(bookKey, detail.cfi, detail.tocItem, detail.section, detail.location, detail.range);
   };
 
+  const docTransformHandler = (event: Event) => {
+    const { detail } = event as CustomEvent;
+    detail.data = Promise.resolve(detail.data)
+      .then((data) => {
+        const viewSettings = getViewSettings(bookKey)!;
+        if (detail.type === 'text/css') return transformStylesheet(data);
+        if (detail.type === 'application/xhtml+xml') {
+          const ctx = {
+            bookKey,
+            viewSettings,
+            content: data,
+          };
+          return Promise.resolve(transformContent(ctx));
+        }
+        return data;
+      })
+      .catch((e) => {
+        console.error(new Error(`Failed to load ${detail.name}`, { cause: e }));
+        return '';
+      });
+  };
+
   const docLoadHandler = (event: Event) => {
     const detail = (event as CustomEvent).detail;
     console.log('doc loaded:', detail);
@@ -154,6 +177,9 @@ const FoliateViewer: React.FC<{
       viewRef.current = view;
       setFoliateView(bookKey, view);
 
+      const { book } = view;
+
+      book.transformTarget?.addEventListener('data', docTransformHandler);
       view.renderer.setStyles?.(getStyles(viewSettings));
 
       const isScrolled = viewSettings.scrolled!;

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

@@ -19,7 +19,6 @@ import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 import { eventDispatcher } from '@/utils/event';
 import { saveViewSettings } from '../utils/viewSettingsHelper';
 import { PageInfo } from '@/types/book';
-import { getStyles } from '@/utils/style';
 import Button from '@/components/Button';
 import Slider from '@/components/Slider';
 
@@ -59,14 +58,13 @@ const FooterBar: React.FC<FooterBarProps> = ({
 
   const handleFontSizeChange = (value: number) => {
     saveViewSettings(envConfig, bookKey, 'defaultFontSize', value);
-    view?.renderer.setStyles?.(getStyles(viewSettings!));
   };
 
   const handleMarginChange = (value: number) => {
     const marginPx = Math.round((value / 100) * 88);
     const gapPercent = Math.round((value / 100) * 10);
-    saveViewSettings(envConfig, bookKey, 'marginPx', marginPx);
-    saveViewSettings(envConfig, bookKey, 'gapPercent', gapPercent);
+    saveViewSettings(envConfig, bookKey, 'marginPx', marginPx, false, false);
+    saveViewSettings(envConfig, bookKey, 'gapPercent', gapPercent, false, false);
     view?.renderer.setAttribute('margin', `${marginPx}px`);
     view?.renderer.setAttribute('gap', `${gapPercent}%`);
     if (viewSettings?.scrolled) {
@@ -76,7 +74,6 @@ const FooterBar: React.FC<FooterBarProps> = ({
 
   const handleLineHeightChange = (value: number) => {
     saveViewSettings(envConfig, bookKey, 'lineHeight', value / 10);
-    view?.renderer.setStyles?.(getStyles(viewSettings!));
   };
 
   const handleGoPrev = () => {

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

@@ -78,6 +78,7 @@ const FootnotePopup: React.FC<FootnotePopupProps> = ({ bookKey, bookDoc }) => {
       const { view } = detail;
       view.addEventListener('relocate', () => {
         const { renderer } = view as FoliateView;
+        const viewSettings = getViewSettings(bookKey)!;
         if (viewSettings.vertical) {
           setResponsiveWidth(getResponsivePopupSize(renderer.viewSize, true));
         } else {

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

@@ -45,7 +45,7 @@ const PageInfoView: React.FC<PageInfoProps> = ({
       className={clsx(
         'pageinfo absolute bottom-0 flex items-center justify-end',
         isVertical ? 'writing-vertical-rl' : 'h-12 w-full',
-        isScrolled && 'bg-base-100',
+        isScrolled && !isVertical && 'bg-base-100',
       )}
       style={
         isVertical

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

@@ -23,7 +23,7 @@ const SectionInfo: React.FC<SectionInfoProps> = ({
       className={clsx(
         'sectioninfo absolute flex items-center overflow-hidden',
         isVertical ? 'writing-vertical-rl max-h-[85%]' : 'top-0 h-[44px]',
-        isScrolled && 'bg-base-100',
+        isScrolled && !isVertical && 'bg-base-100',
       )}
       style={
         isVertical

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

@@ -14,6 +14,7 @@ import { ThemeMode } from '@/styles/themes';
 import { getStyles } from '@/utils/style';
 import { getMaxInlineSize } from '@/utils/config';
 import { tauriHandleToggleFullScreen } from '@/utils/window';
+import { saveViewSettings } from '../utils/viewSettingsHelper';
 import MenuItem from '@/components/MenuItem';
 
 interface ViewMenuProps {
@@ -28,11 +29,11 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
   onSetSettingsDialogOpen,
 }) => {
   const _ = useTranslation();
-  const { appService } = useEnv();
-  const { getView, getViews, getViewSettings, setViewSettings } = useReaderStore();
+  const { envConfig, appService } = useEnv();
+  const { getView, getViewSettings, setViewSettings } = useReaderStore();
   const viewSettings = getViewSettings(bookKey)!;
 
-  const { themeMode, themeCode, setThemeMode } = useThemeStore();
+  const { themeMode, setThemeMode } = useThemeStore();
   const [isScrolledMode, setScrolledMode] = useState(viewSettings!.scrolled);
   const [zoomLevel, setZoomLevel] = useState(viewSettings!.zoomLevel!);
 
@@ -58,13 +59,7 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
   };
 
   useEffect(() => {
-    getViews().forEach((view) => {
-      view.renderer.setStyles?.(getStyles(viewSettings!));
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [themeCode]);
-
-  useEffect(() => {
+    if (isScrolledMode === viewSettings!.scrolled) return;
     viewSettings!.scrolled = isScrolledMode;
     getView(bookKey)?.renderer.setAttribute('flow', isScrolledMode ? 'scrolled' : 'paginated');
     getView(bookKey)?.renderer.setAttribute(
@@ -77,11 +72,7 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
   }, [isScrolledMode]);
 
   useEffect(() => {
-    const view = getView(bookKey);
-    if (!view) return;
-    viewSettings!.zoomLevel = zoomLevel;
-    setViewSettings(bookKey, viewSettings!);
-    view.renderer.setStyles?.(getStyles(viewSettings!));
+    saveViewSettings(envConfig, bookKey, 'zoomLevel', zoomLevel, true, true);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [zoomLevel]);
 
@@ -132,9 +123,7 @@ const ViewMenu: React.FC<ViewMenuProps> = ({
 
       <hr className='border-base-300 my-1' />
 
-      {appService?.hasRoundedWindow && (
-        <MenuItem label={_('Fullscreen')} onClick={handleFullScreen} />
-      )}
+      {appService?.hasWindow && <MenuItem label={_('Fullscreen')} onClick={handleFullScreen} />}
       <MenuItem
         label={
           themeMode === 'dark'

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

@@ -77,7 +77,7 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const dictPopupHeight = Math.min(300, maxHeight);
   const transPopupWidth = Math.min(480, maxWidth);
   const transPopupHeight = Math.min(360, maxHeight);
-  const annotPopupWidth = useResponsiveSize(300);
+  const annotPopupWidth = Math.min(useResponsiveSize(300), maxWidth);
   const annotPopupHeight = useResponsiveSize(44);
   const androidSelectionHandlerHeight = 0;
 
@@ -351,7 +351,9 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
       saveConfig(envConfig, bookKey, updatedConfig, settings);
     }
     handleDismissPopupAndSelection();
-    setNotebookVisible(true);
+    if (!appService?.isMobile) {
+      setNotebookVisible(true);
+    }
   };
 
   const handleHighlight = (update = false) => {
@@ -404,11 +406,10 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     if (!selection || !selection.text) return;
     const { sectionHref: href } = progress;
     selection.href = href;
-    setShowAnnotPopup(false);
-    setHighlightOptionsVisible(false);
+    handleHighlight(true);
     setNotebookVisible(true);
     setNotebookNewAnnotation(selection);
-    handleHighlight(true);
+    handleDismissPopup();
   };
 
   const handleSearch = () => {
@@ -448,6 +449,7 @@ const Annotator: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     const { bookDoc, book } = bookData;
     if (!bookDoc || !book || !bookDoc.toc) return;
 
+    const config = getConfig(bookKey)!;
     const { booknotes: allNotes = [] } = config;
     const booknotes = allNotes.filter((note) => !note.deletedAt);
     if (booknotes.length === 0) {

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

@@ -12,12 +12,18 @@ const LANGUAGES = {
   DE: 'German',
   FR: 'French',
   ES: 'Spanish',
-  ID: 'Indonesian',
   IT: 'Italian',
+  EL: 'Greek',
   PT: 'Portuguese',
   NL: 'Dutch',
   PL: 'Polish',
+  UK: 'Ukrainian',
   RU: 'Russian',
+  AR: 'Arabic',
+  TR: 'Turkish',
+  HI: 'Hindi',
+  ID: 'Indonesian',
+  VI: 'Vietnamese',
   KO: 'Korean',
   JA: 'Japanese',
   'ZH-HANS': 'Chinese (Simplified)',

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

@@ -12,43 +12,25 @@ import {
   Theme,
   themes,
 } from '@/styles/themes';
-import { getStyles } from '@/utils/style';
 import { useEnv } from '@/context/EnvContext';
 import { useSettingsStore } from '@/store/settingsStore';
 import { useThemeStore } from '@/store/themeStore';
-import { useReaderStore } from '@/store/readerStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useResponsiveSize } from '@/hooks/useResponsiveSize';
 import ThemeEditor from './ThemeEditor';
 
-const ColorPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
+const ColorPanel: React.FC<{ bookKey: string }> = ({}) => {
   const _ = useTranslation();
-  const {
-    themeMode,
-    themeColor,
-    themeCode,
-    isDarkMode,
-    setThemeMode,
-    setThemeColor,
-    saveCustomTheme,
-  } = useThemeStore();
+  const { themeMode, themeColor, isDarkMode, setThemeMode, setThemeColor, saveCustomTheme } =
+    useThemeStore();
   const { envConfig } = useEnv();
   const { settings, setSettings } = useSettingsStore();
-  const { getViews, getViewSettings } = useReaderStore();
-  const viewSettings = getViewSettings(bookKey)!;
   const iconSize16 = useResponsiveSize(16);
   const iconSize24 = useResponsiveSize(24);
   const [editTheme, setEditTheme] = useState<CustomTheme | null>(null);
   const [customThems, setCustomThemes] = useState<Theme[]>([]);
   const [showCustomThemeEditor, setShowCustomThemeEditor] = useState(false);
 
-  useEffect(() => {
-    getViews().forEach((view) => {
-      view.renderer.setStyles?.(getStyles(viewSettings));
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [themeCode]);
-
   useEffect(() => {
     const customThemes = settings.globalReadSettings.customThemes ?? [];
     setCustomThemes(

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

@@ -14,7 +14,6 @@ import {
 import { useReaderStore } from '@/store/readerStore';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useEnv } from '@/context/EnvContext';
-import { getStyles } from '@/utils/style';
 import { getOSPlatform } from '@/utils/misc';
 import { getSysFontsList } from '@/utils/font';
 import { isTauriAppPlatform } from '@/services/environment';
@@ -44,25 +43,27 @@ const FontFace = ({
   moreOptions,
   selected,
   onSelect,
-}: FontFaceProps) => (
-  <div className={clsx('config-item', className)}>
-    <span className=''>{label}</span>
-    <FontDropdown
-      family={family}
-      options={options.map((option) => ({ option, label: option }))}
-      moreOptions={moreOptions?.map((option) => ({ option, label: option })) ?? []}
-      selected={selected}
-      onSelect={onSelect}
-      onGetFontFamily={handleFontFaceFont}
-    />
-  </div>
-);
+}: FontFaceProps) => {
+  const _ = useTranslation();
+  return (
+    <div className={clsx('config-item', className)}>
+      <span className=''>{label}</span>
+      <FontDropdown
+        family={family}
+        options={options.map((option) => ({ option, label: _(option) }))}
+        moreOptions={moreOptions?.map((option) => ({ option, label: option })) ?? []}
+        selected={selected}
+        onSelect={onSelect}
+        onGetFontFamily={handleFontFaceFont}
+      />
+    </div>
+  );
+};
 
 const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const _ = useTranslation();
   const { envConfig, appService } = useEnv();
-  const { getView, getViewSettings } = useReaderStore();
-  const view = getView(bookKey);
+  const { getViewSettings } = useReaderStore();
   const viewSettings = getViewSettings(bookKey)!;
 
   const fontFamilyOptions = [
@@ -118,49 +119,41 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'defaultFont', defaultFont);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultFont]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'defaultFontSize', defaultFontSize);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultFontSize]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'minimumFontSize', minFontSize);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [minFontSize]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'fontWeight', fontWeight);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fontWeight]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'serifFont', serifFont);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [serifFont]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'sansSerifFont', sansSerifFont);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sansSerifFont]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'monospaceFont', monospaceFont);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [monospaceFont]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'overrideFont', overrideFont);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [overrideFont]);
 

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

@@ -46,54 +46,49 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'paragraphMargin', paragraphMargin);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [paragraphMargin]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'lineHeight', lineHeight);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [lineHeight]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'wordSpacing', wordSpacing);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [wordSpacing]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'letterSpacing', letterSpacing);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [letterSpacing]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'textIndent', textIndent);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [textIndent]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'fullJustification', fullJustification);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fullJustification]);
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'hyphenation', hyphenation);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [hyphenation]);
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'marginPx', marginPx);
+    if (marginPx === viewSettings.marginPx) return;
+    saveViewSettings(envConfig, bookKey, 'marginPx', marginPx, false, false);
     view?.renderer.setAttribute('margin', `${marginPx}px`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [marginPx]);
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'gapPercent', gapPercent);
+    if (gapPercent === viewSettings.gapPercent) return;
+    saveViewSettings(envConfig, bookKey, 'gapPercent', gapPercent, false, false);
     view?.renderer.setAttribute('gap', `${gapPercent}%`);
     if (viewSettings.scrolled) {
       view?.renderer.setAttribute('flow', 'scrolled');
@@ -102,28 +97,34 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   }, [gapPercent]);
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'maxColumnCount', maxColumnCount);
+    if (maxColumnCount === viewSettings.maxColumnCount) return;
+    saveViewSettings(envConfig, bookKey, 'maxColumnCount', maxColumnCount, false, false);
     view?.renderer.setAttribute('max-column-count', maxColumnCount);
     view?.renderer.setAttribute('max-inline-size', `${getMaxInlineSize(viewSettings)}px`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [maxColumnCount]);
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'maxInlineSize', maxInlineSize);
+    if (maxInlineSize === viewSettings.maxInlineSize) return;
+    saveViewSettings(envConfig, bookKey, 'maxInlineSize', maxInlineSize, false, false);
     view?.renderer.setAttribute('max-inline-size', `${getMaxInlineSize(viewSettings)}px`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [maxInlineSize]);
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'maxBlockSize', maxBlockSize);
+    if (maxBlockSize === viewSettings.maxBlockSize) return;
+    saveViewSettings(envConfig, bookKey, 'maxBlockSize', maxBlockSize, false, false);
     view?.renderer.setAttribute('max-block-size', `${maxBlockSize}px`);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [maxBlockSize]);
 
   useEffect(() => {
+    if (writingMode === viewSettings.writingMode) return;
     // global settings are not supported for writing mode
     const prevWritingMode = viewSettings.writingMode;
-    if (!writingMode.includes('vertical')) {
+    if (writingMode.includes('vertical')) {
+      viewSettings.vertical = true;
+    } else {
       viewSettings.vertical = false;
     }
     saveViewSettings(envConfig, bookKey, 'writingMode', writingMode, true);
@@ -143,11 +144,11 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
 
   useEffect(() => {
     saveViewSettings(envConfig, bookKey, 'overrideLayout', overrideLayout);
-    view?.renderer.setStyles?.(getStyles(viewSettings));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [overrideLayout]);
 
   useEffect(() => {
+    if (isScrolledMode === viewSettings.scrolled) return;
     saveViewSettings(envConfig, bookKey, 'scrolled', isScrolledMode);
     getView(bookKey)?.renderer.setAttribute('flow', isScrolledMode ? 'scrolled' : 'paginated');
     getView(bookKey)?.renderer.setAttribute(
@@ -159,6 +160,7 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   }, [isScrolledMode]);
 
   useEffect(() => {
+    if (doubleBorder === viewSettings.doubleBorder) return;
     if (doubleBorder && viewSettings.vertical) {
       viewSettings.gapPercent = Math.max(
         viewSettings.gapPercent,
@@ -167,16 +169,17 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
       setGapPercent(viewSettings.gapPercent);
       setViewSettings(bookKey, viewSettings);
     }
-    saveViewSettings(envConfig, bookKey, 'doubleBorder', doubleBorder);
+    saveViewSettings(envConfig, bookKey, 'doubleBorder', doubleBorder, false, false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [doubleBorder]);
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'borderColor', borderColor);
+    saveViewSettings(envConfig, bookKey, 'borderColor', borderColor, false, false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [borderColor]);
 
   useEffect(() => {
+    if (showHeader === viewSettings.showHeader) return;
     if (showHeader && !viewSettings.vertical) {
       viewSettings.marginPx = Math.max(viewSettings.marginPx, 44);
       setMarginPx(viewSettings.marginPx);
@@ -189,11 +192,12 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
       setGapPercent(viewSettings.gapPercent);
       setViewSettings(bookKey, viewSettings);
     }
-    saveViewSettings(envConfig, bookKey, 'showHeader', showHeader);
+    saveViewSettings(envConfig, bookKey, 'showHeader', showHeader, false, false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [showHeader]);
 
   useEffect(() => {
+    if (showFooter === viewSettings.showFooter) return;
     if (showFooter && !viewSettings.vertical) {
       viewSettings.marginPx = Math.max(viewSettings.marginPx, 44);
       setMarginPx(viewSettings.marginPx);
@@ -206,7 +210,7 @@ const LayoutPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
       setGapPercent(viewSettings.gapPercent);
       setViewSettings(bookKey, viewSettings);
     }
-    saveViewSettings(envConfig, bookKey, 'showFooter', showFooter);
+    saveViewSettings(envConfig, bookKey, 'showFooter', showFooter, false, false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [showFooter]);
 

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

@@ -1,5 +1,5 @@
 import clsx from 'clsx';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import i18n from 'i18next';
 import { useEnv } from '@/context/EnvContext';
 import { useReaderStore } from '@/store/readerStore';
@@ -14,18 +14,22 @@ import DropDown from './DropDown';
 
 const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   const _ = useTranslation();
-  const { envConfig } = useEnv();
+  const { envConfig, appService } = useEnv();
   const { settings, isFontLayoutSettingsGlobal, setSettings } = useSettingsStore();
   const { getView, getViewSettings, setViewSettings } = useReaderStore();
   const viewSettings = getViewSettings(bookKey)!;
 
   const [animated, setAnimated] = useState(viewSettings.animated!);
   const [isDisableClick, setIsDisableClick] = useState(viewSettings.disableClick!);
+  const [swapClickArea, setSwapClickArea] = useState(viewSettings.swapClickArea!);
   const [isContinuousScroll, setIsContinuousScroll] = useState(viewSettings.continuousScroll!);
   const [draftStylesheet, setDraftStylesheet] = useState(viewSettings.userStylesheet!);
   const [draftStylesheetSaved, setDraftStylesheetSaved] = useState(true);
   const [error, setError] = useState<string | null>(null);
 
+  const [inputFocusInAndroid, setInputFocusInAndroid] = useState(false);
+  const textareaRef = useRef<HTMLTextAreaElement | null>(null);
+
   const handleUserStylesheetChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
     const cssInput = e.target.value;
     setDraftStylesheet(cssInput);
@@ -72,6 +76,24 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
     e.nativeEvent.stopImmediatePropagation();
   };
 
+  const handleInputFocus = () => {
+    if (appService?.isAndroidApp) {
+      setInputFocusInAndroid(true);
+    }
+    setTimeout(() => {
+      textareaRef.current?.scrollIntoView({
+        behavior: 'instant',
+        block: 'center',
+      });
+    }, 300);
+  };
+
+  const handleInputBlur = () => {
+    if (appService?.isAndroidApp) {
+      setInputFocusInAndroid(false);
+    }
+  };
+
   const getCurrentUILangOption = () => {
     const uiLanguage = viewSettings.uiLanguage;
     return {
@@ -92,13 +114,12 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   };
 
   const handleSelectUILang = (option: string) => {
-    viewSettings.uiLanguage = option;
-    saveViewSettings(envConfig, bookKey, 'uiLanguage', option);
+    saveViewSettings(envConfig, bookKey, 'uiLanguage', option, false, false);
     i18n.changeLanguage(option ? option : navigator.language);
   };
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'animated', animated);
+    saveViewSettings(envConfig, bookKey, 'animated', animated, false, false);
     if (animated) {
       getView(bookKey)?.renderer.setAttribute('animated', '');
     } else {
@@ -108,17 +129,24 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
   }, [animated]);
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'disableClick', isDisableClick);
+    saveViewSettings(envConfig, bookKey, 'disableClick', isDisableClick, false, false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isDisableClick]);
 
   useEffect(() => {
-    saveViewSettings(envConfig, bookKey, 'continuousScroll', isContinuousScroll);
+    saveViewSettings(envConfig, bookKey, 'swapClickArea', swapClickArea, false, false);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [swapClickArea]);
+
+  useEffect(() => {
+    saveViewSettings(envConfig, bookKey, 'continuousScroll', isContinuousScroll, false, false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isContinuousScroll]);
 
   return (
-    <div className='my-4 w-full space-y-6'>
+    <div
+      className={clsx('my-4 w-full space-y-6', inputFocusInAndroid && 'h-[50%] overflow-y-auto')}
+    >
       <div className='w-full'>
         <h2 className='mb-2 font-medium'>{_('Language')}</h2>
         <div className='card border-base-200 bg-base-100 border shadow'>
@@ -174,6 +202,16 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
                 onChange={() => setIsDisableClick(!isDisableClick)}
               />
             </div>
+            <div className='config-item'>
+              <span className=''>{_('Swap Click-to-Flip Area')}</span>
+              <input
+                type='checkbox'
+                className='toggle'
+                checked={swapClickArea}
+                disabled={isDisableClick}
+                onChange={() => setSwapClickArea(!swapClickArea)}
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -185,6 +223,7 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
         >
           <div className='relative p-1'>
             <textarea
+              ref={textareaRef}
               className={clsx(
                 'textarea textarea-ghost h-48 w-full border-0 p-3 text-base !outline-none sm:text-sm',
                 'placeholder:text-base-content/70',
@@ -192,6 +231,8 @@ const MiscPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => {
               placeholder={_('Enter your custom CSS here...')}
               spellCheck='false'
               value={draftStylesheet}
+              onFocus={handleInputFocus}
+              onBlur={handleInputBlur}
               onInput={handleInput}
               onKeyDown={handleInput}
               onKeyUp={handleInput}

apps/readest-app/src/app/reader/components/tts/TTSControl.tsx

@@ -102,14 +102,15 @@ const TTSControl = () => {
       await ttsController.initViewTTS();
       const ssml = view.tts?.from(range);
       if (ssml) {
+        const lang = parseSSMLLang(ssml) || 'en';
+        setTtsLang(lang);
+        setIsPlaying(true);
+
+        ttsController.setLang(lang);
         ttsController.setRate(viewSettings.ttsRate);
         ttsController.setVoice(viewSettings.ttsVoice);
         ttsController.speak(ssml);
         ttsControllerRef.current = ttsController;
-
-        const lang = parseSSMLLang(ssml) || 'en';
-        setTtsLang(lang);
-        setIsPlaying(true);
       }
     } catch (error) {
       eventDispatcher.dispatch('toast', {
@@ -276,8 +277,8 @@ const TTSControl = () => {
           className={clsx(
             'fixed right-6 h-12 w-12',
             appService?.hasSafeAreaInset
-              ? 'bottom-[calc(env(safe-area-inset-bottom)+48px)]'
-              : 'bottom-12',
+              ? 'bottom-[calc(env(safe-area-inset-bottom)+70px)]'
+              : 'bottom-[70px] sm:bottom-14',
           )}
         >
           <TTSIcon isPlaying={isPlaying} onClick={togglePopup} />

apps/readest-app/src/app/reader/components/tts/TTSPanel.tsx

@@ -1,11 +1,13 @@
 import clsx from 'clsx';
 import React, { useState, ChangeEvent, useEffect } from 'react';
-import { useReaderStore } from '@/store/readerStore';
-import { useTranslation } from '@/hooks/useTranslation';
 import { MdPlayCircle, MdPauseCircle, MdFastRewind, MdFastForward, MdStop } from 'react-icons/md';
 import { RiVoiceAiFill } from 'react-icons/ri';
 import { MdCheck } from 'react-icons/md';
 import { TTSVoice } from '@/services/tts';
+import { useEnv } from '@/context/EnvContext';
+import { useReaderStore } from '@/store/readerStore';
+import { useTranslation } from '@/hooks/useTranslation';
+import { useSettingsStore } from '@/store/settingsStore';
 import { useDefaultIconSize, useResponsiveSize } from '@/hooks/useResponsiveSize';
 
 type TTSPanelProps = {
@@ -36,7 +38,9 @@ const TTSPanel = ({
   onGetVoiceId,
 }: TTSPanelProps) => {
   const _ = useTranslation();
+  const { envConfig } = useEnv();
   const { getViewSettings, setViewSettings } = useReaderStore();
+  const { settings, setSettings, saveSettings } = useSettingsStore();
   const viewSettings = getViewSettings(bookKey);
 
   const [voices, setVoices] = useState<TTSVoice[]>([]);
@@ -54,7 +58,10 @@ const TTSPanel = ({
     onSetRate(newRate);
     const viewSettings = getViewSettings(bookKey)!;
     viewSettings.ttsRate = newRate;
+    settings.globalViewSettings.ttsRate = newRate;
     setViewSettings(bookKey, viewSettings);
+    setSettings(settings);
+    saveSettings(envConfig, settings);
   };
 
   const handleSelectVoice = (voice: string) => {

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

@@ -7,6 +7,7 @@ import { useSidebarStore } from '@/store/sidebarStore';
 import { useSettingsStore } from '@/store/settingsStore';
 import { getStyles } from '@/utils/style';
 import { tauriQuitApp } from '@/utils/window';
+import { eventDispatcher } from '@/utils/event';
 import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL, ZOOM_STEP } from '@/services/constants';
 
 interface UseBookShortcutsProps {
@@ -90,6 +91,10 @@ const useBookShortcuts = ({ sideBarBookKey, bookKeys }: UseBookShortcutsProps) =
     }
   };
 
+  const showSearchBar = () => {
+    eventDispatcher.dispatch('search', { term: '' });
+  };
+
   const zoomIn = () => {
     if (!sideBarBookKey) return;
     const view = getView(sideBarBookKey);
@@ -129,6 +134,7 @@ const useBookShortcuts = ({ sideBarBookKey, bookKeys }: UseBookShortcutsProps) =
       onToggleNotebook: toggleNotebook,
       onToggleScrollMode: toggleScrollMode,
       onOpenFontLayoutSettings: () => setFontLayoutSettingsDialogOpen(true),
+      onToggleSearchBar: showSearchBar,
       onReloadPage: reloadPage,
       onQuitApp: quitApp,
       onGoLeft: goLeft,

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

@@ -51,9 +51,17 @@ export const useClickEvent = (
                   setHoveredBookKey(null);
                 }
                 if (!viewSettings.disableClick! && screenX >= viewCenterX) {
-                  viewRef.current?.goRight();
+                  if (viewSettings.swapClickArea) {
+                    viewRef.current?.goLeft();
+                  } else {
+                    viewRef.current?.goRight();
+                  }
                 } else if (!viewSettings.disableClick! && screenX < viewCenterX) {
-                  viewRef.current?.goLeft();
+                  if (viewSettings.swapClickArea) {
+                    viewRef.current?.goRight();
+                  } else {
+                    viewRef.current?.goLeft();
+                  }
                 }
               }
             }

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

@@ -3,21 +3,29 @@ import { EnvConfigType } from '@/services/environment';
 import { useBookDataStore } from '@/store/bookDataStore';
 import { useReaderStore } from '@/store/readerStore';
 import { useSettingsStore } from '@/store/settingsStore';
+import { getStyles } from '@/utils/style';
 
 export const saveViewSettings = async <K extends keyof ViewSettings>(
   envConfig: EnvConfigType,
   bookKey: string,
   key: K,
   value: ViewSettings[K],
-  skipGlobal?: boolean,
+  skipGlobal = false,
+  applyStyles = true,
 ) => {
   const { settings, isFontLayoutSettingsGlobal, setSettings, saveSettings } =
     useSettingsStore.getState();
-  const { getViewSettings, setViewSettings } = useReaderStore.getState();
+  const { getView, getViewSettings, setViewSettings } = useReaderStore.getState();
   const { getConfig, saveConfig } = useBookDataStore.getState();
   const viewSettings = getViewSettings(bookKey)!;
   const config = getConfig(bookKey)!;
-  viewSettings[key] = value;
+  if (viewSettings[key] !== value) {
+    viewSettings[key] = value;
+    if (applyStyles) {
+      const view = getView(bookKey);
+      view?.renderer.setStyles?.(getStyles(viewSettings));
+    }
+  }
   setViewSettings(bookKey, viewSettings);
 
   if (isFontLayoutSettingsGlobal && !skipGlobal) {

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

@@ -1,7 +1,7 @@
 'use client';
 
 import clsx from 'clsx';
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import Image from 'next/image';
 import { useRouter } from 'next/navigation';
 import { IoArrowBack } from 'react-icons/io5';
@@ -11,12 +11,14 @@ import { useAuth } from '@/context/AuthContext';
 import { useTheme } from '@/hooks/useTheme';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useSettingsStore } from '@/store/settingsStore';
+import { useTrafficLightStore } from '@/store/trafficLightStore';
 import { QuotaType, UserPlan } from '@/types/user';
 import { getStoragePlanData, getUserPlan } from '@/utils/access';
 import { navigateToLibrary } from '@/utils/nav';
 import { deleteUser } from '@/libs/user';
 import { eventDispatcher } from '@/utils/event';
 import { Toast } from '@/components/Toast';
+import WindowButtons from '@/components/WindowButtons';
 import Quota from '@/components/Quota';
 
 const ProfilePage = () => {
@@ -24,11 +26,14 @@ const ProfilePage = () => {
   const router = useRouter();
   const { envConfig, appService } = useEnv();
   const { token, user, logout } = useAuth();
+  const { isTrafficLightVisible } = useTrafficLightStore();
   const { settings, setSettings, saveSettings } = useSettingsStore();
   const [userPlan, setUserPlan] = useState<UserPlan>('free');
   const [quotas, setQuotas] = React.useState<QuotaType[]>([]);
   const [showConfirmDelete, setShowConfirmDelete] = useState(false);
 
+  const headerRef = useRef<HTMLDivElement>(null);
+
   useTheme();
 
   useEffect(() => {
@@ -154,21 +159,31 @@ const ProfilePage = () => {
   return (
     <div
       className={clsx(
-        'mt-6 flex justify-center',
+        'bg-base-100 border-base-200 flex h-dvh w-full select-none flex-col items-center border',
         appService?.hasSafeAreaInset && 'pt-[env(safe-area-inset-top)]',
-        appService?.hasTrafficLight && 'pt-11',
       )}
     >
-      <button
-        onClick={handleGoBack}
+      <div
+        ref={headerRef}
         className={clsx(
-          'btn btn-ghost fixed left-4 h-8 min-h-8 w-8 p-0',
-          appService?.hasSafeAreaInset && 'top-[calc(env(safe-area-inset-top)+16px)]',
-          appService?.hasTrafficLight && 'top-11',
+          'fixed flex w-full items-center justify-between py-2 pe-6 ps-4',
+          appService?.hasTrafficLight && 'pt-11',
         )}
       >
-        <IoArrowBack className='text-base-content' />
-      </button>
+        <button onClick={handleGoBack} className={clsx('btn btn-ghost h-8 min-h-8 w-8 p-0')}>
+          <IoArrowBack className='text-base-content' />
+        </button>
+
+        {appService?.hasWindowBar && (
+          <WindowButtons
+            headerRef={headerRef}
+            showMinimize={!isTrafficLightVisible}
+            showMaximize={!isTrafficLightVisible}
+            showClose={!isTrafficLightVisible}
+            onClose={handleGoBack}
+          />
+        )}
+      </div>
       <div className='w-full max-w-4xl px-4 py-10'>
         <div className='bg-base-200 overflow-hidden rounded-lg p-2 shadow-md sm:p-6'>
           <div className='p-2 sm:p-6'>

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

@@ -21,7 +21,20 @@ const Popup = ({
 }) => (
   <div>
     <div
-      className={`triangle text-base-300 absolute z-40 ${triangleClassName}`}
+      id='popup-container'
+      className={`bg-base-300 absolute rounded-lg font-sans shadow-xl ${className}`}
+      style={{
+        width: `${width}px`,
+        height: `${height}px`,
+        left: `${position ? position.point.x : -999}px`,
+        top: `${position ? position.point.y : -999}px`,
+        ...additionalStyle,
+      }}
+    >
+      {children}
+    </div>
+    <div
+      className={`triangle text-base-300 absolute ${triangleClassName}`}
       style={{
         left:
           trianglePosition?.dir === 'left'
@@ -65,19 +78,6 @@ const Popup = ({
             : 'translateX(-50%)',
       }}
     />
-    <div
-      id='popup-container'
-      className={`bg-base-300 absolute z-30 rounded-lg font-sans shadow-xl ${className}`}
-      style={{
-        width: `${width}px`,
-        height: `${height}px`,
-        left: `${position ? position.point.x : -999}px`,
-        top: `${position ? position.point.y : -999}px`,
-        ...additionalStyle,
-      }}
-    >
-      {children}
-    </div>
   </div>
 );
 

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

@@ -50,7 +50,7 @@ export const Toast = () => {
     toastMessage && (
       <div
         className={clsx(
-          'toast toast-center toast-middle w-auto max-w-screen-sm',
+          'toast toast-center toast-middle z-50 w-auto max-w-screen-sm',
           toastClassMap[toastType.current],
           toastClassMap[toastType.current].includes('toast-top') &&
             'pt-[calc(44px+env(safe-area-inset-top))]',
@@ -64,12 +64,17 @@ export const Toast = () => {
         >
           <span
             className={clsx(
-              'max-h-[50vh] min-w-[30vw] max-w-80',
-              'overflow-scroll whitespace-normal break-words text-center',
+              'max-h-[50vh] min-w-32 max-w-80',
+              'overflow-y-auto whitespace-normal break-words text-center',
               messageClass.current,
             )}
           >
-            {toastMessage}
+            {toastMessage.split('\n').map((line, idx) => (
+              <React.Fragment key={idx}>
+                {line || <>&nbsp;</>}
+                <br />
+              </React.Fragment>
+            ))}
           </span>
         </div>
       </div>

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

@@ -6,7 +6,11 @@ interface UseAuthCallbackOptions {
   refreshToken?: string | null;
   login: (accessToken: string, user: User) => void;
   navigate: (path: string) => void;
+  type?: string | null;
   next?: string;
+  error?: string | null;
+  errorCode?: string | null;
+  errorDescription?: string | null;
 }
 
 export function handleAuthCallback({
@@ -14,22 +18,28 @@ export function handleAuthCallback({
   refreshToken,
   login,
   navigate,
+  type,
   next = '/',
+  error,
 }: UseAuthCallbackOptions) {
   async function finalizeSession() {
-    if (!accessToken || !refreshToken) {
-      console.error('No access token or refresh token');
+    if (error) {
       navigate('/auth/error');
       return;
     }
 
-    const { error } = await supabase.auth.setSession({
+    if (!accessToken || !refreshToken) {
+      navigate('/library');
+      return;
+    }
+
+    const { error: err } = await supabase.auth.setSession({
       access_token: accessToken,
       refresh_token: refreshToken,
     });
 
-    if (error) {
-      console.error('Error setting session:', error);
+    if (err) {
+      console.error('Error setting session:', err);
       navigate('/auth/error');
       return;
     }
@@ -39,6 +49,10 @@ export function handleAuthCallback({
     } = await supabase.auth.getUser();
     if (user) {
       login(accessToken, user);
+      if (type === 'recovery') {
+        navigate('/auth/recovery');
+        return;
+      }
       navigate(next);
     } else {
       console.error('Error fetching user data');

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

@@ -1,21 +1,28 @@
 import { useEffect, useRef } from 'react';
 import { useRouter } from 'next/navigation';
 import { onOpenUrl } from '@tauri-apps/plugin-deep-link';
+import { getCurrentWindow } from '@tauri-apps/api/window';
 import { isTauriAppPlatform } from '@/services/environment';
 import { useLibraryStore } from '@/store/libraryStore';
 import { navigateToLibrary } from '@/utils/nav';
 
+interface SingleInstancePayload {
+  args: string[];
+  cwd: string;
+}
+
 export function useOpenWithBooks() {
   const router = useRouter();
   const { setCheckOpenWithBooks } = useLibraryStore();
   const listenedOpenWithBooks = useRef(false);
 
   const handleOpenWithFileUrl = (url: string) => {
+    console.log('Handle Open with URL:', url);
     let filePath = url;
     if (filePath.startsWith('file://')) {
       filePath = decodeURI(filePath.replace('file://', ''));
     }
-    if (filePath.startsWith('/')) {
+    if (!/^(https?:|data:|blob:)/i.test(filePath)) {
       window.OPEN_WITH_FILES = [filePath];
       setCheckOpenWithBooks(true);
       navigateToLibrary(router, `reload=${Date.now()}`);
@@ -27,6 +34,13 @@ export function useOpenWithBooks() {
     if (listenedOpenWithBooks.current) return;
     listenedOpenWithBooks.current = true;
 
+    const unlistenDeeplink = getCurrentWindow().listen('single-instance', ({ event, payload }) => {
+      console.log('Received deep link:', event, payload);
+      const { args } = payload as SingleInstancePayload;
+      if (args?.[1]) {
+        handleOpenWithFileUrl(args[1]);
+      }
+    });
     const listenOpenWithFiles = async () => {
       return await onOpenUrl((urls) => {
         urls.forEach((url) => {
@@ -34,10 +48,10 @@ export function useOpenWithBooks() {
         });
       });
     };
-
-    const unlisten = listenOpenWithFiles();
+    const unlistenOpenUrl = listenOpenWithFiles();
     return () => {
-      unlisten.then((f) => f());
+      unlistenDeeplink.then((f) => f());
+      unlistenOpenUrl.then((f) => f());
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

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

@@ -126,6 +126,8 @@ export function useSync(bookKey?: string) {
       console.error(err);
       if (err instanceof Error) {
         if (err.message.includes('Not authenticated') && settings.keepLogin) {
+          settings.keepLogin = false;
+          setSettings(settings);
           navigateToLogin(router);
         }
         setSyncError(err.message || `Error pulling ${type}`);

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

@@ -12,7 +12,7 @@ export const useUICSS = (bookKey: string, viewSettings: ViewSettings) => {
       styleElement.remove();
     }
 
-    const rawCSS = viewSettings.userStylesheet;
+    const rawCSS = viewSettings.userStylesheet || '';
     const newStyleEl = document.createElement('style');
     newStyleEl.textContent = rawCSS.replace('foliate-view', `#foliate-view-${bookKey}`);
     document.head.appendChild(newStyleEl);

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

@@ -66,6 +66,7 @@ export interface BookDoc {
   dir: string;
   toc?: Array<TOCItem>;
   sections?: Array<SectionItem>;
+  transformTarget?: EventTarget;
   splitTOCHref(href: string): Array<string | number>;
   getCover(): Promise<Blob | null>;
 }

apps/readest-app/src/pages/api/storage/delete.ts

@@ -2,8 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { corsAllMethods, runMiddleware } from '@/utils/cors';
 import { createSupabaseClient } from '@/utils/supabase';
 import { validateUserAndToken } from '@/utils/access';
-import { DeleteObjectCommand } from '@aws-sdk/client-s3';
-import { s3Client } from '@/utils/s3';
+import { deleteObject } from '@/utils/object';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   await runMiddleware(req, res, corsAllMethods);
@@ -41,13 +40,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       return res.status(403).json({ error: 'Unauthorized access to the file' });
     }
 
-    const deleteCommand = new DeleteObjectCommand({
-      Bucket: process.env['R2_BUCKET_NAME'] || '',
-      Key: fileKey,
-    });
-
     try {
-      await s3Client.send(deleteCommand);
+      await deleteObject(fileKey);
       const { error: deleteError } = await supabase.from('files').delete().eq('id', fileRecord.id);
 
       if (deleteError) {

apps/readest-app/src/pages/api/storage/download.ts

@@ -1,9 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { supabase, createSupabaseClient } from '@/utils/supabase';
 import { corsAllMethods, runMiddleware } from '@/utils/cors';
-import { GetObjectCommand } from '@aws-sdk/client-s3';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-import { s3Client } from '@/utils/s3';
+import { getDownloadSignedUrl } from '@/utils/object';
 
 const getUserAndToken = async (authHeader: string | undefined) => {
   if (!authHeader) return {};
@@ -56,15 +54,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       return res.status(403).json({ error: 'Unauthorized access to the file' });
     }
 
-    const getCommand = new GetObjectCommand({
-      Bucket: process.env['R2_BUCKET_NAME'] || '',
-      Key: fileKey,
-    });
-
     try {
-      const downloadUrl = await getSignedUrl(s3Client, getCommand, {
-        expiresIn: 1800,
-      });
+      const downloadUrl = await getDownloadSignedUrl(fileKey, 1800);
 
       res.status(200).json({
         downloadUrl,