Release 1.15.0

The updater compares against upstream CI builds, which is meaningless
for this fork. Manual check still works.

.editorconfig

@@ -1,5 +1,7 @@
 [*.{kt,kts}]
 ij_kotlin_imports_layout = *
+ij_kotlin_line_break_after_multiline_when_entry = false
 ktlint_code_style = intellij_idea
 ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_standard_class-signature = disabled
+ktlint_standard_mixed-condition-operators = disabled

.forgejo/workflows/baseline-profile.yml

@@ -13,42 +13,39 @@ on:
 
 jobs:
   baseline-profile:
-    runs-on: ubuntu-latest
+    runs-on: nekomoee
     steps:
-      - name: Free disk space
-        run: rm -rf $AGENT_TOOLSDIRECTORY
-
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
-      - name: Install Rust Toolchain
+      - name: Setup Android SDK
-        run: rustup target add armv7-linux-androideabi
+        uses: https://github.com/android-actions/setup-android@v4
+
+      - name: Setup Rust
+        uses: https://github.com/dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly-2026-10-07
+          targets: aarch64-linux-android, thumbv7neon-linux-androideabi
 
       - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
+        uses: https://github.com/Swatinem/rust-cache@v2
         with:
           workspaces: "./app/src/main/rust"
 
       - name: CMake Cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: app/.cxx
           key: cmake-
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v6
         with:
           cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
           cache-read-only: true
@@ -59,7 +56,7 @@ jobs:
 
       - name: Upload reports
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: reports
           path: benchmark/build/reports

.forgejo/workflows/ci.yml

@@ -0,0 +1,128 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  check:
+    runs-on: nekomoee
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Setup Android SDK
+        uses: https://github.com/android-actions/setup-android@v4
+
+      - name: Setup Rust
+        uses: https://github.com/dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly-2026-10-07
+          targets: aarch64-linux-android, thumbv7neon-linux-androideabi
+
+      - name: Rust Cache
+        uses: https://github.com/Swatinem/rust-cache@v2
+        with:
+          workspaces: "./app/src/main/rust"
+          shared-key: ${{ runner.os }}
+
+      - name: Rustfmt Check
+        working-directory: ./app/src/main/rust
+        run: cargo fmt --all -- --check
+
+      - name: Clippy Check
+        working-directory: ./app/src/main/rust
+        run: cargo clippy --target aarch64-linux-android --all-features -- -D warnings
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-read-only: true
+
+      - name: Check build-logic
+        run: ./gradlew :build-logic:convention:check
+
+      - name: Spotless Check
+        run: ./gradlew spotlessCheck
+
+  default:
+    runs-on: nekomoee
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Setup Android SDK
+        uses: https://github.com/android-actions/setup-android@v4
+
+      - name: Setup Rust
+        uses: https://github.com/dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly-2026-10-07
+          targets: aarch64-linux-android, thumbv7neon-linux-androideabi
+
+      - name: Rust Cache
+        uses: https://github.com/Swatinem/rust-cache@v2
+        with:
+          workspaces: "./app/src/main/rust"
+          shared-key: ${{ runner.os }}
+          save-if: "false"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
+
+      - name: CMake Cache
+        uses: actions/cache@v5
+        with:
+          path: app/.cxx
+          key: cmake-default-${{ hashFiles('rust-toolchain.toml', 'settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
+          restore-keys: cmake-default-
+
+      - name: Build
+        run: ./gradlew assembleDefaultRelease
+
+      - name: Upload ARM64
+        uses: actions/upload-artifact@v3
+        with:
+          name: default-arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/default/release/app-default-arm64-v8a-release.apk
+
+      - name: Upload x86_64
+        uses: actions/upload-artifact@v3
+        with:
+          name: default-x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/default/release/app-default-x86_64-release.apk
+
+      - name: Upload ARM32
+        uses: actions/upload-artifact@v3
+        with:
+          name: default-armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk
+
+      - name: Upload mapping
+        uses: actions/upload-artifact@v3
+        with:
+          name: default-mapping-${{ github.sha }}
+          path: app/build/outputs/mapping/defaultRelease/*.txt
+
+      - name: Upload native debug symbols
+        uses: actions/upload-artifact@v3
+        with:
+          name: default-native-debug-symbols-${{ github.sha }}
+          path: app/build/outputs/native-debug-symbols/defaultRelease/native-debug-symbols.zip

.forgejo/workflows/releases.yml

@@ -0,0 +1,79 @@
+name: Releases
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    runs-on: nekomoee
+    steps:
+      - name: Free disk space
+        run: rm -rf $AGENT_TOOLSDIRECTORY
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Setup Rust
+        uses: https://github.com/dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly-2026-10-07
+          targets: aarch64-linux-android, thumbv7neon-linux-androideabi
+
+      - name: Rust Cache
+        uses: https://github.com/Swatinem/rust-cache@v2
+        with:
+          workspaces: "./app/src/main/rust"
+
+      - name: CMake Cache
+        uses: actions/cache/restore@v5
+        with:
+          path: app/.cxx
+          key: cmake-
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
+          cache-read-only: true
+
+      - name: Generate Baseline Profile
+        run: ./gradlew generateBaselineProfile
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+          -Prelease
+
+      - name: Build
+        run: ./gradlew assembleRelease
+          -Prelease
+
+      - name: Rename Apks
+        run: |
+          mkdir release
+          mv app/build/outputs/apk/default/release/app-default-universal-release.apk         release/EhViewer-${{ github.ref_name }}-default-universal.apk
+          mv app/build/outputs/apk/default/release/app-default-arm64-v8a-release.apk         release/EhViewer-${{ github.ref_name }}-default-arm64-v8a.apk
+          mv app/build/outputs/apk/default/release/app-default-x86_64-release.apk            release/EhViewer-${{ github.ref_name }}-default-x86_64.apk
+          mv app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk       release/EhViewer-${{ github.ref_name }}-default-armeabi-v7a.apk
+          mv app/build/outputs/mapping/defaultRelease/mapping.txt                            release/EhViewer-${{ github.ref_name }}-default-mapping.txt
+          mv app/build/outputs/native-debug-symbols/defaultRelease/native-debug-symbols.zip  release/EhViewer-${{ github.ref_name }}-default-native-debug-symbols.zip
+
+      - name: Releases
+        uses: actions/forgejo-release@v2
+        with:
+          direction: upload
+          url: https://codeberg.org
+          repo: EhViewer/EhViewer
+          release-dir: release
+          body: Bump Version

.gitattributes

@@ -1 +0,0 @@
-*.sh eol=lf

.github/workflows/ci.yml

@@ -1,188 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-          shared-key: ${{ runner.os }}
-
-      - name: Rustfmt Check
-        working-directory: ./app/src/main/rust
-        run: cargo fmt --all -- --check
-
-      - name: Clippy Check
-        working-directory: ./app/src/main/rust
-        run: cargo clippy --target aarch64-linux-android --all-features -- -D warnings
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          cache-read-only: true
-
-      - name: Check build-logic
-        run: ./gradlew :build-logic:convention:check
-
-      - name: Spotless Check
-        run: ./gradlew spotlessCheck
-
-      - name: Lint Check
-        run: ./gradlew lintMarshmallowRelease
-
-  default:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-          shared-key: ${{ runner.os }}
-          save-if: "false"
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-
-      - name: CMake Cache
-        uses: actions/cache@v4
-        with:
-          path: app/.cxx
-          key: cmake-default-${{ hashFiles('rust-toolchain.toml', 'settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
-          restore-keys: cmake-default-
-
-      - name: Build
-        run: ./gradlew assembleDefaultRelease
-
-      - name: Upload ARM64
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/default/release/app-default-arm64-v8a-release.apk
-
-      - name: Upload x86_64
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/default/release/app-default-x86_64-release.apk
-
-      - name: Upload ARM32
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk
-
-      - name: Upload mapping
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/defaultRelease
-
-      - name: Upload native debug symbols
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/defaultRelease/native-debug-symbols.zip
-
-  marshmallow:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-          shared-key: ${{ runner.os }}
-          save-if: "false"
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-
-      - name: CMake Cache
-        uses: actions/cache@v4
-        with:
-          path: app/.cxx
-          key: cmake-marshmallow-${{ hashFiles('rust-toolchain.toml', 'settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
-          restore-keys: cmake-marshmallow-
-
-      - name: Build
-        run: ./gradlew assembleMarshmallowRelease
-
-      - name: Upload ARM64
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-arm64-v8a-release.apk
-
-      - name: Upload x86_64
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-x86_64-release.apk
-
-      - name: Upload ARM32
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-armeabi-v7a-release.apk
-
-      - name: Upload mapping
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/marshmallowRelease
-
-      - name: Upload native debug symbols
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/marshmallowRelease/native-debug-symbols.zip

.github/workflows/lock-threads.yml

@@ -1,21 +0,0 @@
-name: 'Lock Threads'
-
-on:
-  schedule:
-    - cron: '0 8 * * *'
-  workflow_dispatch:
-
-permissions:
-  issues: write
-
-concurrency:
-  group: lock-threads
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5
-        with:
-          issue-inactive-days: '1'
-          process-only: 'issues'

.github/workflows/releases.yml

@@ -1,90 +0,0 @@
-name: Releases
-
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Free disk space
-        run: rm -rf $AGENT_TOOLSDIRECTORY
-
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-
-      - name: CMake Cache
-        uses: actions/cache/restore@v4
-        with:
-          path: app/.cxx
-          key: cmake-
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          cache-read-only: true
-
-      - name: Generate Baseline Profile
-        run: ./gradlew generateBaselineProfile
-          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
-
-      - name: Build
-        run: ./gradlew assembleRelease
-
-      - name: Rename Apks
-        run: |
-          mv app/build/outputs/apk/default/release/app-default-universal-release.apk EhViewer-${{ github.ref_name }}-default-universal.apk
-          mv app/build/outputs/apk/default/release/app-default-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-default-arm64-v8a.apk
-          mv app/build/outputs/apk/default/release/app-default-x86_64-release.apk EhViewer-${{ github.ref_name }}-default-x86_64.apk
-          mv app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-default-armeabi-v7a.apk
-          mv app/build/outputs/mapping/defaultRelease/mapping.txt EhViewer-${{ github.ref_name }}-default-mapping.txt
-          mv app/build/outputs/native-debug-symbols/defaultRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-default-native-debug-symbols.zip
-
-          mv app/build/outputs/apk/marshmallow/release/app-marshmallow-universal-release.apk EhViewer-${{ github.ref_name }}-marshmallow-universal.apk
-          mv app/build/outputs/apk/marshmallow/release/app-marshmallow-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-arm64-v8a.apk
-          mv app/build/outputs/apk/marshmallow/release/app-marshmallow-x86_64-release.apk EhViewer-${{ github.ref_name }}-marshmallow-x86_64.apk
-          mv app/build/outputs/apk/marshmallow/release/app-marshmallow-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-armeabi-v7a.apk
-          mv app/build/outputs/mapping/marshmallowRelease/mapping.txt EhViewer-${{ github.ref_name }}-marshmallow-mapping.txt
-          mv app/build/outputs/native-debug-symbols/marshmallowRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-marshmallow-native-debug-symbols.zip
-
-      - name: Releases
-        uses: softprops/action-gh-release@v2
-        with:
-          body: Bump Version
-          files: |
-            EhViewer-${{ github.ref_name }}-default-universal.apk
-            EhViewer-${{ github.ref_name }}-default-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-default-x86_64.apk
-            EhViewer-${{ github.ref_name }}-default-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-default-mapping.txt
-            EhViewer-${{ github.ref_name }}-default-native-debug-symbols.zip
-
-            EhViewer-${{ github.ref_name }}-marshmallow-universal.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-x86_64.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-mapping.txt
-            EhViewer-${{ github.ref_name }}-marshmallow-native-debug-symbols.zip

.java-version

@@ -0,0 +1 @@
+25

CHANGELOG.zh-CN.MD

@@ -1,5 +1,76 @@
 # 变更日志
 
+## [1.14.6] - 2025-12-17
+
+### 新功能
+
+* 支持显示画廊阅读进度（于 EH 设置中开启） [#2277](https://github.com/FooIbar/EhViewer/issues/2277)
+
+### 改进
+
+* 画廊列表变化时重新显示悬浮操作按钮 [#2681](https://github.com/FooIbar/EhViewer/issues/2681)
+* 移除文件名中的尾随空格和点以兼容 Windows [#2727](https://github.com/FooIbar/EhViewer/issues/2727)
+* 长按画廊详情中的标签时显示标签名称 [#2769](https://github.com/FooIbar/EhViewer/issues/2769)
+* 杂项优化
+
+### Bug 修复
+
+* 对话框中的下拉菜单显示错位
+* HTTP 状态错误显示为“什么都没有找到”
+* 某些老设备无法通过 Cloudflare 验证 [#2794](https://github.com/FooIbar/EhViewer/issues/2794)
+* 杂项修复
+
+
+## [1.14.5] - 2025-10-19
+
+### 改进
+
+* [阅读器] 显示画廊标题
+* [阅读器] 显示菜单时改变标题栏颜色
+
+### Bug 修复
+
+* 横屏模式下打开阅读器设置会闪退 [#2673](https://github.com/FooIbar/EhViewer/issues/2673)
+* 强制横屏时竖直拿取设备加载图片会横竖屏乱跳 [#2674](https://github.com/FooIbar/EhViewer/issues/2674)
+
+
+## [1.14.4] - 2025-10-12
+
+### 改进
+
+* [阅读器] 支持禁用使用音量键翻页 [#2593](https://github.com/FooIbar/EhViewer/issues/2593)
+* 视搜索警告为错误 [#2604](https://github.com/FooIbar/EhViewer/issues/2604)
+* 余额不足时停止下载并显示通知 [#2479](https://github.com/FooIbar/EhViewer/issues/2479)
+* [阅读器] 使用默认阅读模式时对带有 webtoon 标签的画廊自动使用条漫模式 [#2632](https://github.com/FooIbar/EhViewer/issues/2632)
+* 优化按页数排序下载项目的速度
+* 开启显示标签投票状态时为 power >= 100 的标签添加下划线
+* 杂项优化
+
+### Bug 修复
+
+* Android 16 QPR1 上画廊详情中的标签文本对比度不足
+* 初始化 DownloadManager 用时过长导致 ANR [#2588](https://github.com/FooIbar/EhViewer/issues/2588)
+* 某些设备上无法下载名称较长的画廊 [#2607](https://github.com/FooIbar/EhViewer/issues/2607)
+* 评论区链接实际可点击区域比画面显示上的略长 [#2615](https://github.com/FooIbar/EhViewer/issues/2615)
+* 主页快速搜索再次打开出现以前的画廊重复出现在最上层 [#2628](https://github.com/FooIbar/EhViewer/issues/2628)
+* 非条漫模式下原始大小较小的动图不播放 [#2652](https://github.com/FooIbar/EhViewer/issues/2652)
+* Android 9 以下打开评论区切屏后回来会闪退 [#2655](https://github.com/FooIbar/EhViewer/issues/2655)
+* 杂项修复
+
+
+## [1.14.3] - 2025-09-01
+
+### 新功能
+
+* 支持以 label: 语法搜索下载标签
+
+### Bug 修复
+
+* [阅读器] 关闭滤镜设置时崩溃 [#2573](https://github.com/FooIbar/EhViewer/issues/2573)
+* 编辑评论时上下文菜单缺少格式化选项
+* 某些情况下搜索相似画廊时出错
+
+
 ## [1.14.2] - 2025-08-16
 
 ### 改进

README.md

@@ -1,103 +1,25 @@
-<p align="right">
-  <strong>English</strong>
-  <span> | </span>
-  <a href="/docs/README/zh-cn.md">
-  简体中文
-  </a>
-  <span> | </span>
-  <a href="/docs/README/zh-tw.md">
-  正體中文
-  </a>
-  <span> | </span>
-  <a href="/docs/README/ja.md">
-  日本語
-  </a>
-</p>
-
 <h1 align="center">
-  <img src="https://github.com/Ehviewer-Overhauled/Art/blob/master/launcher_icon-web.svg" width="200" alt="EhViewer">
+  <img src="https://github.com/FooIbar/EhViewer-art/blob/master/launcher_icon-web.svg" width="200" alt="EhViewer">
   <br>EhViewer<br>
 </h1>
 
 <p align="center">
-  <a href="https://github.com/FooIbar/EhViewer/actions/workflows/ci.yml">
+  Standalone fork of
-    <img src="https://github.com/FooIbar/EhViewer/actions/workflows/ci.yml/badge.svg" alt="Github Actions">
+  <a href="https://codeberg.org/EhViewer/EhViewer">EhViewer (codeberg)</a>
-  </a>
+  maintained at <a href="https://gitea.yrkaierx.com/yenru0/EhViewer">gitea.yrkaierx.com/yenru0/EhViewer</a>
-  <a href="/LICENSE">
-    <img src="https://img.shields.io/github/license/FooIbar/EhViewer" alt="LICENSE">
-  </a>
-  <a href="https://www.codefactor.io/repository/github/FooIbar/EhViewer">
-    <img src="https://www.codefactor.io/repository/github/FooIbar/EhViewer/badge" alt="CodeFactor">
-  </a>
-  <a href="https://github.com/FooIbar/EhViewer/releases">
-    <img src="https://img.shields.io/github/v/release/FooIbar/EhViewer" alt="Release">
-  </a>
-  <a href="https://github.com/FooIbar/EhViewer/issues">
-    <img src="https://img.shields.io/github/issues/FooIbar/EhViewer" alt="Issues">
-  </a>
 </p>
 
-<div align="center">
+# Changes over upstream
-  <h3>
-    <a href="#description">
-    Description
-    </a>
-    <span> | </span>
-    <a href="#download">
-    Download
-    </a>
-    <span> | </span>
-    <a href="#screenshot">
-    Screenshot
-    </a>
-    <span> | </span>
-    <a href="#thanks">
-    Thanks
-    </a>
-    <span> | </span>
-    <a href="#license">
-    License
-    </a>
-  </h3>
-</div>
 
-# Description
+- Built-in hosts, Cloudflare CDN fallback and domain fronting with SNI spoofing for censored networks (`EhHostsConfig.kt`, `EhDns.kt`, `EhSSLSocketFactory.kt`)
+- Cronet engine disabled by default (bypasses the anti-DPI OkHttp stack; `enable_quic` re-enables it)
+- Update check disabled by default (manual check still available)
+- API request timeout raised to 30 s
+- Own application id (`yenru0.yrkaierx.ehviewer`), installs side by side with upstream builds
 
-A modern EhViewer fork dedicated to high-performance
+# Upstream
 
-with [Material Design 3](https://m3.material.io/)
+Synced from [EhViewer/EhViewer on codeberg](https://codeberg.org/EhViewer/EhViewer), the continuation of FooIbar's EhViewer. Feature work happens there; this fork tracks it and carries the network/resilience patches above.
-and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview) Support
-
-# Download
-
-| Flavor      | Minimum Android Version | Notes                          |
-|-------------|-------------------------|--------------------------------|
-| Default     | 8.0                     | Full support                   |
-| Marshmallow | 6.0*                    | Limited support, no guarantees |
-
-*Devices running Android 6 need to have the [ISRG Root X1](https://letsencrypt.org/certs/isrgrootx1.pem) certificate installed
-
-<a href="https://github.com/FooIbar/EhViewer/releases">
-<img alt="Get it on GitHub" src="https://github.com/Ehviewer-Overhauled/Art/blob/master/get-it-on-github.svg" width="200px"/>
-</a>
-
-# Screenshot
-
-![screenshot-01](https://github.com/Ehviewer-Overhauled/Art/blob/master/screenshot-01.png)
-![screenshot-02](https://github.com/Ehviewer-Overhauled/Art/blob/master/screenshot-02.png)
-
-# Thanks
-
-Here is the libraries
-
-- [Arrow](https://arrow-kt.io/)
-- [AOSP & AndroidX](https://source.android.com/)
-- [Kotlin & KotlinX](https://kotlinlang.org/)
-- [Material Icons](https://github.com/google/material-design-icons)
-- [Ktor](https://ktor.io/)
-- [Coil](https://coil-kt.github.io/coil/)
-- [Compose Destinations](https://composedestinations.rafaelcosta.xyz/)
-- [libarchive](https://www.libarchive.org/)
 
 # License
 

app/build.gradle.kts

@@ -9,7 +9,8 @@ plugins {
     alias(libs.plugins.ehviewer.android.application)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
-    alias(libs.plugins.aboutlibrariesPlugin)
+    alias(libs.plugins.aboutlibraries)
+    alias(libs.plugins.aboutlibrariesAndroid)
     alias(libs.plugins.baselineprofile)
 }
 
@@ -48,21 +49,23 @@ android {
 
     val repoName = providers.exec {
         commandLine = "git remote get-url origin".split(' ')
-    }.standardOutput.asText.get().trim().removePrefix("https://github.com/").removePrefix("git@github.com:")
+    }.standardOutput.asText.get().trim().removeSuffix(".git").removePrefix("https://codeberg.org/")
-        .removeSuffix(".git")
 
-    val chromeVersion = rootProject.layout.projectDirectory.file("chrome.version").asFile.readText().trim()
+    val snapshot = !hasProperty("release")
 
     defaultConfig {
-        applicationId = "moe.tarsin.ehviewer"
+        applicationId = "yenru0.yrkaierx.ehviewer"
-        versionCode = 180063
+        versionCode = 180064
-        versionName = "1.14.2"
+        versionName = if (snapshot) {
-        // versionNameSuffix = "-SNAPSHOT"
+            "1.15.0-SNAPSHOT"
-        buildConfigField("String", "RAW_VERSION_NAME", "\"$versionName${versionNameSuffix.orEmpty()}\"")
+        } else {
+            "1.15.0"
+        }
+        buildConfigField("boolean", "SNAPSHOT", "$snapshot")
+        buildConfigField("String", "RAW_VERSION_NAME", "\"$versionName\"")
         buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
         buildConfigField("long", "COMMIT_TIME", commitTime)
         buildConfigField("String", "REPO_NAME", "\"$repoName\"")
-        buildConfigField("String", "CHROME_VERSION", "\"$chromeVersion\"")
         ndk {
             if (isRelease) {
                 abiFilters.addAll(supportedAbis)
@@ -97,6 +100,9 @@ android {
         dex {
             useLegacyPackaging = false
         }
+        jniLibs {
+            excludes += "**/libdatastore_shared_counter.so" // DataStore multi-process
+        }
         resources {
             // Required by Layout Inspector
             pickFirsts += "/META-INF/androidx.compose.ui_ui.version"
@@ -168,16 +174,14 @@ baselineProfile {
 dependencies {
     implementation(projects.core.data)
     implementation(projects.core.i18n)
+    implementation(projects.core.ui)
 
     // https://developer.android.com/jetpack/androidx/releases/activity
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.biometric)
     implementation(libs.androidx.browser)
-
+    implementation(libs.androidx.webkit)
-    // https://developer.android.com/jetpack/androidx/releases/compose-material3
-    api(platform(libs.compose.bom))
-    implementation(libs.bundles.compose)
 
     implementation(libs.compose.destinations.core)
     ksp(libs.compose.destinations.compiler)
@@ -200,7 +204,6 @@ dependencies {
     implementation(libs.androidx.paging.compose)
 
     // https://developer.android.com/jetpack/androidx/releases/room
-    ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.paging)
 
     implementation(libs.androidx.work.runtime)
@@ -212,8 +215,6 @@ dependencies {
     // https://square.github.io/okhttp/changelogs/changelog/
     implementation(platform(libs.okhttp.bom))
 
-    implementation(platform(libs.okio.bom))
-
     implementation(libs.logcat)
 
     implementation(libs.diff)
@@ -254,13 +255,12 @@ kotlin {
         optIn.addAll(
             "coil3.annotation.ExperimentalCoilApi",
             "androidx.paging.ExperimentalPagingApi",
-            "kotlinx.serialization.ExperimentalSerializationApi",
+            "me.saket.telephoto.ExperimentalTelephotoApi",
         )
     }
 }
 
 ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
     arg("compose-destinations.codeGenPackageName", "com.hippo.ehviewer.ui")
 }
 

app/proguard-rules.pro

@@ -15,6 +15,10 @@
     java.nio.ByteBuffer source;
 }
 
+-assumevalues public class androidx.compose.runtime.ComposeRuntimeFlags {
+    static boolean isLinkBufferComposerEnabled() return true;
+}
+
 # Ktor logger
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 

app/src/main/AndroidManifest.xml

@@ -39,7 +39,7 @@
         <activity
             android:name=".ui.MainActivity"
             android:banner="@mipmap/ic_leanback_banner"
-            android:configChanges="screenSize"
+            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.Splash"
@@ -118,10 +118,6 @@
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.SecurityActivity"
-            android:configChanges="screenSize"
-            android:label="@string/settings" />
         <activity
             android:name=".shortcuts.ShortcutsActivity"
             android:excludeFromRecents="true"

app/src/main/cpp/CMakeLists.txt

@@ -4,17 +4,20 @@ include(ExternalProject)
 include(FetchContent)
 
 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto \
+    string(CONCAT CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto "
-           -mllvm -polly \
+            "-ffile-prefix-map=${ANDROID_TOOLCHAIN_ROOT}= "
-           -mllvm -polly-run-dce \
+            "-ffile-prefix-map=${CMAKE_SOURCE_DIR}= "
-           -mllvm -polly-run-inliner \
+            "-ffile-prefix-map=${CMAKE_BINARY_DIR}= "
-           -mllvm -polly-isl-arg=--no-schedule-serialize-sccs \
+            "-mllvm -polly "
-           -mllvm -polly-ast-use-context \
+            "-mllvm -polly-run-dce "
-           -mllvm -polly-detect-keep-going \
+            "-mllvm -polly-run-inliner "
-           -mllvm -polly-position=before-vectorizer \
+            "-mllvm -polly-isl-arg=--no-schedule-serialize-sccs "
-           -mllvm -polly-vectorizer=stripmine \
+            "-mllvm -polly-ast-use-context "
-           -mllvm -polly-detect-profitability-min-per-loop-insts=40 \
+            "-mllvm -polly-detect-keep-going "
-           -mllvm -polly-invariant-load-hoisting")
+            "-mllvm -polly-position=before-vectorizer "
+            "-mllvm -polly-vectorizer=stripmine "
+            "-mllvm -polly-detect-profitability-min-per-loop-insts=40 "
+            "-mllvm -polly-invariant-load-hoisting")
 endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 
 option(BUILD_TESTING OFF)
@@ -29,7 +32,7 @@ option(XZ_TOOL_XZDEC OFF)
 FetchContent_Declare(
         liblzma
         GIT_REPOSITORY https://github.com/tukaani-project/xz.git
-        GIT_TAG v5.8.1
+        GIT_TAG v5.8.3
         GIT_SHALLOW 1
 )
 
@@ -38,23 +41,27 @@ include_directories(${liblzma_SOURCE_DIR}/src/liblzma/api)
 
 # Build GNUTLS libnettle
 if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-    execute_process(
+    set(NDK_VERSION "${ANDROID_NDK_MAJOR}.${ANDROID_NDK_MINOR}.${ANDROID_NDK_BUILD}")
-            COMMAND wsl wslpath ${CMAKE_CURRENT_LIST_DIR}
+    set(TOOLCHAIN "$ANDROID_HOME/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/linux-x86_64/bin")
-            OUTPUT_VARIABLE CURRENT_DIR
+    set(WSL wsl)
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
 else ()
-    set(CURRENT_DIR ${CMAKE_CURRENT_LIST_DIR})
+    set(TOOLCHAIN "${ANDROID_TOOLCHAIN_ROOT}/bin")
 endif ()
-set(NDK_VERSION "${ANDROID_NDK_MAJOR}.${ANDROID_NDK_MINOR}.${ANDROID_NDK_BUILD}")
+set(CONFIGURE_COMMAND ${WSL} ./.bootstrap && ${WSL} ./configure --disable-public-key --disable-dependency-tracking
+        "--host=${CMAKE_C_COMPILER_TARGET}"
+        "CFLAGS=${CMAKE_C_FLAGS} -Qunused-arguments"
+        "AR=${TOOLCHAIN}/llvm-ar"
+        "CC=${TOOLCHAIN}/clang --target=${CMAKE_C_COMPILER_TARGET}"
+        "RANLIB=${TOOLCHAIN}/llvm-ranlib"
+)
 ExternalProject_Add(
         nettle
         GIT_REPOSITORY https://gitlab.com/gnutls/nettle.git
-        GIT_TAG nettle_3.10.2_release_20250626
+        GIT_TAG nettle_4.0_release_20260205
         GIT_SHALLOW 1
         GIT_CONFIG core.autocrlf=input
-        CONFIGURE_COMMAND bash ${CURRENT_DIR}/configure_nettle.sh ${NDK_VERSION} ${CMAKE_C_COMPILER_TARGET}
+        CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
-        BUILD_COMMAND bash -c "make -j4 libnettle.a CFLAGS='${CMAKE_C_FLAGS} -Qunused-arguments'"
+        BUILD_COMMAND ${WSL} make -j4 libnettle.a
         INSTALL_COMMAND ""
         BUILD_IN_SOURCE 1
         BUILD_BYPRODUCTS <SOURCE_DIR>/libnettle.a
@@ -96,7 +103,7 @@ set(LIBARCHIVE_PATCH
 FetchContent_Declare(
         libarchive
         GIT_REPOSITORY https://github.com/libarchive/libarchive.git
-        GIT_TAG v3.8.1
+        GIT_TAG v3.8.7
         GIT_SHALLOW 1
         PATCH_COMMAND git apply --check -R ${LIBARCHIVE_PATCH} || git apply ${LIBARCHIVE_PATCH}
 )
@@ -133,8 +140,8 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ../../../../rust-
 unset(Rust_TOOLCHAIN CACHE)
 FetchContent_Declare(
         Corrosion
-        GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
+        GIT_REPOSITORY https://github.com/FooIbar/corrosion.git
-        GIT_TAG v0.5.2
+        GIT_TAG v0.6.1
         GIT_SHALLOW 1
 )
 
@@ -143,8 +150,9 @@ corrosion_import_crate(
         MANIFEST_PATH ../rust/Cargo.toml
         LOCKED
         FEATURES $<IF:$<VERSION_GREATER_EQUAL:${ANDROID_NATIVE_API_LEVEL},26>,android-26,android>
-        FLAGS $<$<NOT:$<CONFIG:Debug>>:-Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort>
+        FLAGS $<$<NOT:$<CONFIG:Debug>>:-Z build-std -Z build-std-features=>
 )
+corrosion_add_target_rustflags(ehviewer_rust $<$<NOT:$<CONFIG:Debug>>:-Z unstable-options -C panic=immediate-abort -Z location-detail=none -Z fmt-debug=none>)
 corrosion_link_libraries(ehviewer_rust android jnigraphics log webp webpdemux)
 
 # Build and link our app's native lib

app/src/main/cpp/configure_nettle.sh

@@ -1,13 +0,0 @@
-SUFFIX=toolchains/llvm/prebuilt/$(uname -s | tr '[:upper:]' '[:lower:]')-x86_64/bin
-CI_NDK_LOCATION=$ANDROID_HOME/ndk/$1/$SUFFIX
-ARCH_NDK_LOCATION=$ANDROID_HOME/ndk-bundle/$SUFFIX
-if test -e $CI_NDK_LOCATION ;then
-    TOOLCHAIN=$CI_NDK_LOCATION
-else
-    TOOLCHAIN=$ARCH_NDK_LOCATION
-fi
-TARGET=$2
-./.bootstrap && ./configure --host=$TARGET --disable-public-key --disable-dependency-tracking \
-  AR=$TOOLCHAIN/llvm-ar \
-  CC="$TOOLCHAIN/clang -target $TARGET" \
-  RANLIB=$TOOLCHAIN/llvm-ranlib

app/src/main/cpp/hash.c

@@ -24,7 +24,7 @@ Java_com_hippo_ehviewer_jni_HashKt_sha1(JNIEnv *env, jclass clazz, jint fd) {
     }
 
     byte digest[SHA1_DIGEST_SIZE];
-    sha1_digest(&ctx, SHA1_DIGEST_SIZE, digest);
+    sha1_digest(&ctx, digest);
 
     byte byte;
     char hex_digest[2 * SHA1_DIGEST_SIZE + 1];

app/src/main/kotlin/com/google/accompanist/systemuicontroller/SystemUiController.kt

@@ -1,161 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.accompanist.systemuicontroller
-
-import android.app.Activity
-import android.content.Context
-import android.content.ContextWrapper
-import android.view.View
-import android.view.Window
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.window.DialogWindowProvider
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
-
-/**
- * A class which provides easy-to-use utilities for updating the System UI bar
- * colors within Jetpack Compose.
- */
-@Stable
-interface SystemUiController {
-
-    /**
-     * Control for the behavior of the system bars. This value should be one of the
-     * [WindowInsetsControllerCompat] behavior constants:
-     * [WindowInsetsControllerCompat.BEHAVIOR_SHOW_BARS_BY_TOUCH] (Deprecated),
-     * [WindowInsetsControllerCompat.BEHAVIOR_DEFAULT] and
-     * [WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE].
-     */
-    var systemBarsBehavior: Int
-
-    /**
-     * Property which holds the status bar visibility. If set to true, show the status bar,
-     * otherwise hide the status bar.
-     */
-    var isStatusBarVisible: Boolean
-
-    /**
-     * Property which holds the navigation bar visibility. If set to true, show the navigation bar,
-     * otherwise hide the navigation bar.
-     */
-    var isNavigationBarVisible: Boolean
-
-    /**
-     * Property which holds the status & navigation bar visibility. If set to true, show both bars,
-     * otherwise hide both bars.
-     */
-    var isSystemBarsVisible: Boolean
-        get() = isNavigationBarVisible && isStatusBarVisible
-        set(value) {
-            isStatusBarVisible = value
-            isNavigationBarVisible = value
-        }
-
-    /**
-     * Property which holds whether the status bar icons + content are 'dark' or not.
-     */
-    var statusBarDarkContentEnabled: Boolean
-}
-
-/**
- * Remembers a [SystemUiController] for the given [window].
- *
- * If no [window] is provided, an attempt to find the correct [Window] is made.
- *
- * First, if the [LocalView]'s parent is a [DialogWindowProvider], then that dialog's [Window] will
- * be used.
- *
- * Second, we attempt to find [Window] for the [Activity] containing the [LocalView].
- *
- * If none of these are found (such as may happen in a preview), then the functionality of the
- * returned [SystemUiController] will be degraded, but won't throw an exception.
- */
-@Composable
-fun rememberSystemUiController(
-    window: Window? = findWindow(),
-): SystemUiController {
-    val view = LocalView.current
-    return remember(view, window) { AndroidSystemUiController(view, window) }
-}
-
-@Composable
-private fun findWindow(): Window? = (LocalView.current.parent as? DialogWindowProvider)?.window
-    ?: LocalView.current.context.findWindow()
-
-private tailrec fun Context.findWindow(): Window? = when (this) {
-    is Activity -> window
-    is ContextWrapper -> baseContext.findWindow()
-    else -> null
-}
-
-/**
- * A helper class for setting the navigation and status bar colors for a [View], gracefully
- * degrading behavior based upon API level.
- *
- * Typically you would use [rememberSystemUiController] to remember an instance of this.
- */
-internal class AndroidSystemUiController(
-    private val view: View,
-    window: Window?,
-) : SystemUiController {
-    private val windowInsetsController = window?.let {
-        WindowCompat.getInsetsController(it, view)
-    }
-
-    override var systemBarsBehavior: Int
-        get() = windowInsetsController?.systemBarsBehavior ?: 0
-        set(value) {
-            windowInsetsController?.systemBarsBehavior = value
-        }
-
-    override var isStatusBarVisible: Boolean
-        get() {
-            return ViewCompat.getRootWindowInsets(view)
-                ?.isVisible(WindowInsetsCompat.Type.statusBars()) == true
-        }
-        set(value) {
-            if (value) {
-                windowInsetsController?.show(WindowInsetsCompat.Type.statusBars())
-            } else {
-                windowInsetsController?.hide(WindowInsetsCompat.Type.statusBars())
-            }
-        }
-
-    override var isNavigationBarVisible: Boolean
-        get() {
-            return ViewCompat.getRootWindowInsets(view)
-                ?.isVisible(WindowInsetsCompat.Type.navigationBars()) == true
-        }
-        set(value) {
-            if (value) {
-                windowInsetsController?.show(WindowInsetsCompat.Type.navigationBars())
-            } else {
-                windowInsetsController?.hide(WindowInsetsCompat.Type.navigationBars())
-            }
-        }
-
-    override var statusBarDarkContentEnabled: Boolean
-        get() = windowInsetsController?.isAppearanceLightStatusBars == true
-        set(value) {
-            windowInsetsController?.isAppearanceLightStatusBars = value
-        }
-}

app/src/main/kotlin/com/google/accompanist/web/WebView.kt

@@ -180,7 +180,6 @@ fun WebView(
                     is WebContent.Url -> {
                         wv.loadUrl(content.url, content.additionalHttpHeaders)
                     }
-
                     is WebContent.Data -> {
                         wv.loadDataWithBaseURL(
                             content.baseUrl,
@@ -190,14 +189,12 @@ fun WebView(
                             content.historyUrl,
                         )
                     }
-
                     is WebContent.Post -> {
                         wv.postUrl(
                             content.url,
                             content.postData,
                         )
                     }
-
                     is WebContent.NavigatorOnly -> {
                         // NO-OP
                     }
@@ -502,11 +499,9 @@ class WebViewNavigator(private val coroutineScope: CoroutineScope) {
                     event.encoding,
                     event.historyUrl,
                 )
-
                 is NavigationEvent.LoadUrl -> {
                     loadUrl(event.url, event.additionalHttpHeaders)
                 }
-
                 is NavigationEvent.PostUrl -> {
                     postUrl(event.url, event.postData)
                 }

app/src/main/kotlin/com/hippo/ehviewer/EhApplication.kt

@@ -22,6 +22,7 @@ import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.runtime.Composer
+import androidx.compose.runtime.tooling.ComposeStackTraceMode
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.coroutineScope
 import coil3.EventListener
@@ -37,6 +38,16 @@ import coil3.request.allowRgb565
 import coil3.request.crossfade
 import coil3.serviceLoaderEnabled
 import coil3.util.DebugLogger
+import com.ehviewer.core.database.SearchDatabase
+import com.ehviewer.core.database.roomDb
+import com.ehviewer.core.files.deleteContent
+import com.ehviewer.core.ui.util.initSETConnection
+import com.ehviewer.core.util.isAtLeastO
+import com.ehviewer.core.util.isAtLeastP
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.launchIO
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.coil.AnimatedWebPDecoder
 import com.hippo.ehviewer.coil.CropBorderInterceptor
@@ -47,7 +58,6 @@ import com.hippo.ehviewer.coil.MapExtraInfoInterceptor
 import com.hippo.ehviewer.coil.MergeInterceptor
 import com.hippo.ehviewer.coil.QrCodeInterceptor
 import com.hippo.ehviewer.dailycheck.checkDawn
-import com.hippo.ehviewer.dao.SearchDatabase
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadsFilterMode
 import com.hippo.ehviewer.ktbuilder.diskCache
@@ -55,25 +65,15 @@ import com.hippo.ehviewer.ktbuilder.imageLoader
 import com.hippo.ehviewer.ktor.Cronet
 import com.hippo.ehviewer.ktor.configureClient
 import com.hippo.ehviewer.ktor.configureCommon
+import com.hippo.ehviewer.ktor.isCronetAvailable
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
-import com.hippo.ehviewer.ui.lockObserver
 import com.hippo.ehviewer.ui.screen.detailCache
 import com.hippo.ehviewer.ui.tools.dataStateFlow
-import com.hippo.ehviewer.ui.tools.initSETConnection
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.CrashHandler
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.OSUtils
-import com.hippo.ehviewer.util.isAtLeastO
-import com.hippo.ehviewer.util.isAtLeastP
-import com.hippo.ehviewer.util.isAtLeastS
-import com.hippo.ehviewer.util.isAtLeastSExtension7
-import com.hippo.files.deleteContent
-import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.lang.launchUI
-import eu.kanade.tachiyomi.util.lang.withUIContext
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.okhttp.OkHttp
 import kotlinx.coroutines.Dispatchers
@@ -83,19 +83,16 @@ import logcat.LogPriority
 import logcat.LogcatLogger
 import logcat.asLog
 import okio.Path.Companion.toOkioPath
-import splitties.arch.room.roomDb
 import splitties.init.appCtx
 
 private val lifecycle = ProcessLifecycleOwner.get().lifecycle
 private val lifecycleScope = lifecycle.coroutineScope
 
-class EhApplication :
+class EhApplication : Application(), SingletonImageLoader.Factory {
-    Application(),
+    override fun onCreate() = with(lifecycleScope) {
-    SingletonImageLoader.Factory {
-    override fun onCreate() {
         initSETConnection()
         // Initialize Settings on first access
-        lifecycleScope.launchIO {
+        launchIO {
             val mode = Settings.theme.value
             if (!isAtLeastS) {
                 withUIContext {
@@ -111,28 +108,29 @@ class EhApplication :
                 }
             }
         }
-        lifecycle.addObserver(lockObserver)
         CrashHandler.install()
         super.onCreate()
         System.loadLibrary("ehviewer")
-        lifecycleScope.launchIO {
+        launch {
-            launchUI {
+            FavouriteStatusRouter.collect { info ->
-                FavouriteStatusRouter.collect { info ->
+                detailCache[info.gid]?.apply {
-                    detailCache[info.gid]?.apply {
+                    favoriteSlot = info.favoriteSlot
-                        favoriteSlot = info.favoriteSlot
+                    favoriteName = info.favoriteName
-                        favoriteName = info.favoriteName
+                    favoriteNote = info.favoriteNote
-                        favoriteNote = info.favoriteNote
-                    }
                 }
             }
+        }
+        launchIO {
             EhTagDatabase.launchUpdate()
+            @Suppress("UNUSED_EXPRESSION")
             launch { EhDB }
-            launchIO { dataStateFlow.value }
+            launch { dataStateFlow.value }
-            launchIO { OSUtils.totalMemory }
+            launch { OSUtils.totalMemory }
             launch {
                 if (DownloadManager.labelList.isNotEmpty() && Settings.downloadFilterMode !in Settings.snapshot()) {
                     Settings.downloadFilterMode.value = DownloadsFilterMode.CUSTOM.flag
                 }
+                initialized = true
                 DownloadManager.readMetadataFromLocal()
             }
             launch {
@@ -146,7 +144,9 @@ class EhApplication :
         }
         if (BuildConfig.DEBUG) {
             StrictMode.enableDefaults()
-            Composer.setDiagnosticStackTraceEnabled(true)
+            Composer.setDiagnosticStackTraceMode(ComposeStackTraceMode.SourceInformation)
+        } else {
+            Composer.setDiagnosticStackTraceMode(ComposeStackTraceMode.Auto)
         }
     }
 
@@ -196,7 +196,7 @@ class EhApplication :
                 add(GifDecoder.Factory())
             }
         }
-        diskCache { imageCache }
+        diskCache { thumbCache }
         crossfade(300)
         val drawable = AppCompatResources.getDrawable(appCtx, R.drawable.image_failed)
         if (drawable != null) error(drawable.asImage(true))
@@ -214,8 +214,12 @@ class EhApplication :
     }
 
     companion object {
+        @Volatile
+        var initialized = false
+            private set
+
         val ktorClient by lazy {
-            if (isAtLeastSExtension7 && Settings.enableCronet.value) {
+            if (isCronetAvailable && Settings.enableQuic.value) {
                 HttpClient(Cronet) {
                     engine { configureClient(Settings.enableQuic.value) }
                     configureCommon()
@@ -234,10 +238,10 @@ class EhApplication :
             }
         }
 
-        val imageCache by lazy {
+        val thumbCache by lazy {
             diskCache {
-                directory(appCtx.cacheDir.toOkioPath() / "image_cache")
+                directory(appCtx.cacheDir.toOkioPath() / "thumb")
-                maxSizeBytes(Settings.readCacheSize.value.coerceIn(320, 5120).toLong() * 1024 * 1024)
+                maxSizeBytes(80L * 1024 * 1024)
             }
         }
 

app/src/main/kotlin/com/hippo/ehviewer/EhDB.kt

@@ -15,28 +15,31 @@
  */
 package com.hippo.ehviewer
 
-import android.content.Context
+import androidx.room.execSQL
-import android.net.Uri
+import androidx.room.useWriterConnection
 import arrow.fx.coroutines.resource
 import arrow.fx.coroutines.resourceScope
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.ehviewer.core.data.model.asEntity
-import com.hippo.ehviewer.dao.DownloadArtist
+import com.ehviewer.core.database.EhDatabase
-import com.hippo.ehviewer.dao.DownloadDirname
+import com.ehviewer.core.database.Schema17to18
-import com.hippo.ehviewer.dao.DownloadInfo
+import com.ehviewer.core.database.getDatabasePath
-import com.hippo.ehviewer.dao.DownloadLabel
+import com.ehviewer.core.database.model.DownloadArtist
-import com.hippo.ehviewer.dao.EhDatabase
+import com.ehviewer.core.database.model.DownloadDirname
-import com.hippo.ehviewer.dao.Filter
+import com.ehviewer.core.database.model.DownloadInfo
-import com.hippo.ehviewer.dao.HistoryInfo
+import com.ehviewer.core.database.model.DownloadLabel
-import com.hippo.ehviewer.dao.LocalFavoriteInfo
+import com.ehviewer.core.database.model.Filter
-import com.hippo.ehviewer.dao.ProgressInfo
+import com.ehviewer.core.database.model.GalleryEntity
-import com.hippo.ehviewer.dao.QuickSearch
+import com.ehviewer.core.database.model.HistoryInfo
-import com.hippo.ehviewer.dao.Schema17to18
+import com.ehviewer.core.database.model.LocalFavoriteInfo
+import com.ehviewer.core.database.model.ProgressInfo
+import com.ehviewer.core.database.model.QuickSearch
+import com.ehviewer.core.database.roomDb
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.sendTo
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.util.sendTo
 import kotlinx.coroutines.flow.Flow
 import okio.Path
-import okio.Path.Companion.toOkioPath
-import splitties.arch.room.roomDb
 
 object EhDB {
     private const val DB_NAME = "eh.db"
@@ -44,15 +47,15 @@ object EhDB {
         addMigrations(Schema17to18())
     }
 
-    suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun putGalleryInfo(galleryInfo: GalleryEntity) {
         db.galleryDao().upsert(galleryInfo)
     }
 
-    private suspend fun deleteGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    private suspend fun deleteGalleryInfo(galleryInfo: GalleryEntity) {
         runCatching { db.galleryDao().delete(galleryInfo) }
     }
 
-    suspend fun updateGalleryInfo(galleryInfoList: List<BaseGalleryInfo>) {
+    suspend fun updateGalleryInfo(galleryInfoList: List<GalleryEntity>) {
         db.galleryDao().update(galleryInfoList)
     }
 
@@ -146,6 +149,8 @@ object EhDB {
         dao.fill(raw.position)
     }
 
+    suspend fun searchDownloadLabel(keyword: String, limit: Int) = db.downloadLabelDao().search("%$keyword%", limit)
+
     suspend fun putDownloadArtist(gid: Long, artists: List<DownloadArtist>) {
         if (artists.isNotEmpty()) {
             val dao = db.downloadArtistDao()
@@ -154,12 +159,12 @@ object EhDB {
         }
     }
 
-    suspend fun removeLocalFavorites(galleryInfo: BaseGalleryInfo) {
+    suspend fun removeLocalFavorites(galleryInfo: GalleryInfo) {
         db.localFavoritesDao().deleteByKey(galleryInfo.gid)
-        deleteGalleryInfo(galleryInfo)
+        deleteGalleryInfo(galleryInfo.asEntity())
     }
 
-    suspend fun removeLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun removeLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
         galleryInfoList.forEach {
             removeLocalFavorites(it)
         }
@@ -170,12 +175,12 @@ object EhDB {
         return dao.contains(gid)
     }
 
-    suspend fun putLocalFavorites(galleryInfo: BaseGalleryInfo) {
+    suspend fun putLocalFavorites(galleryInfo: GalleryInfo) {
-        putGalleryInfo(galleryInfo)
+        putGalleryInfo(galleryInfo.asEntity())
         db.localFavoritesDao().upsert(LocalFavoriteInfo(galleryInfo.gid))
     }
 
-    suspend fun putLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun putLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
         galleryInfoList.forEach {
             putLocalFavorites(it)
         }
@@ -221,8 +226,8 @@ object EhDB {
 
     fun searchLocalFav(keyword: String) = db.localFavoritesDao().joinListLazy("*$keyword*")
 
-    suspend fun putHistoryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun putHistoryInfo(galleryInfo: GalleryInfo) {
-        putGalleryInfo(galleryInfo)
+        putGalleryInfo(galleryInfo.asEntity())
         db.historyDao().upsert(HistoryInfo(galleryInfo.gid))
     }
 
@@ -239,7 +244,7 @@ object EhDB {
         dao.insertOrIgnore(historyInfoList)
     }
 
-    suspend fun deleteHistoryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun deleteHistoryInfo(galleryInfo: GalleryEntity) {
         val dao = db.historyDao()
         dao.deleteByKey(galleryInfo.gid)
         deleteGalleryInfo(galleryInfo)
@@ -273,23 +278,26 @@ object EhDB {
         db.filterDao().update(filter)
     }
 
-    fun exportDB(context: Context, file: Path) {
+    suspend fun exportDB(file: Path) {
-        db.query("PRAGMA wal_checkpoint(FULL)", null).use { it.moveToNext() }
+        db.useWriterConnection { conn ->
-        val dbFile = context.getDatabasePath(DB_NAME)
+            conn.execSQL("PRAGMA wal_checkpoint(FULL)")
-        dbFile.toOkioPath() sendTo file
+            conn.execSQL("VACUUM")
+        }
+        val dbFile = getDatabasePath(DB_NAME)
+        dbFile sendTo file
     }
 
-    suspend fun importDB(context: Context, uri: Uri) = resourceScope {
+    suspend fun importDB(file: Path) = resourceScope {
         val tempDBName = "tmp.db"
+        val dbFile = getDatabasePath(tempDBName)
+        file sendTo dbFile
         val oldDB = resource {
-            context.deleteDatabase(tempDBName)
             roomDb<EhDatabase>(tempDBName) {
-                createFromInputStream { context.contentResolver.openInputStream(uri) }
                 addMigrations(Schema17to18())
             }
         } release { db ->
             db.close()
-            context.deleteDatabase(tempDBName)
+            dbFile.delete()
         }
 
         db.galleryDao().insertOrIgnore(oldDB.galleryDao().list())

app/src/main/kotlin/com/hippo/ehviewer/EhHostsConfig.kt

@@ -0,0 +1,56 @@
+package com.hippo.ehviewer
+
+import com.hippo.ehviewer.client.hosts
+import com.hippo.ehviewer.client.hostsDsl
+
+val builtInHosts = hostsDsl {
+    hosts("exhentai.org") {
+        "178.175.128.251" blockedInCN false
+        "178.175.128.252" blockedInCN false
+        "178.175.128.253" blockedInCN false
+        "178.175.128.254" blockedInCN false
+        "178.175.129.251" blockedInCN false
+        "178.175.129.252" blockedInCN false
+        "178.175.129.253" blockedInCN false
+        "178.175.129.254" blockedInCN false
+        "178.175.132.19" blockedInCN false
+        "178.175.132.20" blockedInCN false
+        "178.175.132.21" blockedInCN false
+        "178.175.132.22" blockedInCN false
+    }
+    hosts("api.github.com") {
+        "140.82.114.5" blockedInCN false
+        "140.82.114.6" blockedInCN false
+        "140.82.116.5" blockedInCN false
+        "140.82.116.6" blockedInCN false
+        "140.82.121.5" blockedInCN true
+        "140.82.121.6" blockedInCN true
+        "20.200.245.245" blockedInCN false
+        "20.201.28.148" blockedInCN false
+        "20.205.243.168" blockedInCN false
+        "20.26.156.210" blockedInCN false
+        "20.27.177.116" blockedInCN false
+        "20.87.245.6" blockedInCN false
+        "4.237.22.34" blockedInCN false
+    }
+    hosts("github.com") {
+        "140.82.113.4" blockedInCN false
+        "140.82.114.3" blockedInCN false
+        "140.82.116.4" blockedInCN false
+        "140.82.121.3" blockedInCN true
+        "140.82.121.4" blockedInCN true
+        "20.200.245.247" blockedInCN false
+        "20.201.28.151" blockedInCN false
+        "20.205.243.166" blockedInCN false
+        "20.26.156.215" blockedInCN false
+        "20.27.177.113" blockedInCN false
+        "20.87.245.0" blockedInCN false
+        "4.237.22.38" blockedInCN false
+    }
+    hosts("raw.githubusercontent.com") {
+        "185.199.108.133" blockedInCN false
+        "185.199.109.133" blockedInCN false
+        "185.199.110.133" blockedInCN false
+        "185.199.111.133" blockedInCN false
+    }
+}

app/src/main/kotlin/com/hippo/ehviewer/Settings.kt

@@ -9,14 +9,13 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
+import com.ehviewer.core.network.EhCookieStore
 import com.ehviewer.core.preferences.DataStorePreferences
 import com.ehviewer.core.preferences.PrefDelegate
 import com.ehviewer.core.preferences.edit
-import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.download.DownloadsFilterMode
 import com.hippo.ehviewer.download.SortMode
-import com.hippo.ehviewer.util.AppConfig
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 import java.util.Locale
@@ -82,6 +81,7 @@ object Settings : DataStorePreferences(null) {
     val detailSize = intPref("detail_size_2", 0)
     val thumbColumns = intPref("thumb_columns", 3)
     val showGalleryPages = boolPref("show_gallery_pages", true)
+    val showReadingProgress = boolPref("show_reading_progress", false)
     val showVoteStatus = boolPref("show_vote_status", false)
     val showComments = boolPref("show_gallery_comments", true)
     val commentThreshold = intPref("comment_threshold", -100)
@@ -111,16 +111,16 @@ object Settings : DataStorePreferences(null) {
     val saveCrashLog = boolPref("save_crash_log", true)
     val readCacheSize = intPref("read_cache_size_2", 640)
     val enableCronet = boolPref("enable_cronet", true)
-    val enableQuic = boolPref("enable_quic", true)
+    val enableQuic = boolPref("enable_quic", false)
     val hardwareBitmapThreshold = intPref("hardware_bitmap_threshold", 16384)
     val preloadThumbAggressively = boolPref("preload_thumb_aggressively", false)
     val animateItems = boolPref("animate_items", true)
     val desktopSite = boolPref("desktop_site", true)
 
     // About
-    val backupBeforeUpdate = boolPref("backup_before_update", true)
+    val backupBeforeUpdate = boolPref("backup_before_update", false)
-    val useCIUpdateChannel = boolPref("ci_update_channel", AppConfig.isSnapshot)
+    val useCIUpdateChannel = boolPref("ci_update_channel", BuildConfig.SNAPSHOT)
-    val updateIntervalDays = intPref("update_interval_days", 7)
+    val updateIntervalDays = intPref("update_interval_days", 0)
 
     // Misc
     val languageFilter = intPref("language_filter", -1)
@@ -158,8 +158,8 @@ object Settings : DataStorePreferences(null) {
     val colorFilterMode = intPref("color_filter_mode", 0)
     val customBrightness = boolPref("pref_custom_brightness_key", false)
     val customBrightnessValue = intPref("custom_brightness_value", 0)
-    val readingMode = intPref("pref_default_reading_mode_key", ReadingModeType.LEFT_TO_RIGHT.flagValue)
+    val readingMode = intPref("pref_default_reading_mode_key", ReadingModeType.DEFAULT.prefValue)
-    val orientationMode = intPref("pref_default_orientation_type_key", OrientationType.FREE.flagValue)
+    val orientationMode = intPref("pref_default_orientation_type_key", OrientationType.DEFAULT.prefValue)
     val showReaderSeekbar = boolPref("pref_show_reader_seekbar", true)
     val showPageNumber = boolPref("pref_show_page_number_key", true)
     val readerTheme = intPref("pref_reader_theme_key", 1)
@@ -169,7 +169,8 @@ object Settings : DataStorePreferences(null) {
     val keepScreenOn = boolPref("pref_keep_screen_on_key", true)
     val readerLongTapAction = boolPref("reader_long_tap", true)
     val pageTransitions = boolPref("pref_enable_transitions_key", true)
-    val readerReverseControls = boolPref("reader_volume_keys_inverted", false)
+    val readWithVolumeKeys = boolPref("reader_volume_keys", false)
+    val readWithVolumeKeysInverted = boolPref("reader_volume_keys_inverted", false)
     val grayScale = boolPref("pref_grayscale", false)
     val invertedColors = boolPref("pref_inverted_colors", false)
     val readerWebtoonNav = intPref("reader_navigation_mode_webtoon", 0)
@@ -193,6 +194,10 @@ object Settings : DataStorePreferences(null) {
             if (pref[downloadFilterMode] == DownloadsFilterMode.ARTIST.flag && pref[recentDownloadLabel] == null) {
                 pref[recentDownloadLabel] = ""
             }
+            val orientation = pref[orientationMode]
+            if (OrientationType.entries.none { it.prefValue == orientation }) {
+                pref.remove(orientationMode)
+            }
         }
     }
 

app/src/main/kotlin/com/hippo/ehviewer/SettingsCollector.kt

@@ -4,13 +4,13 @@ import android.app.UiModeManager
 import androidx.appcompat.app.AppCompatDelegate
 import arrow.core.Either.Companion.catch
 import com.ehviewer.core.preferences.PrefDelegate
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.withIOContext
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.dailycheck.updateDailyCheckWork
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
-import com.hippo.ehviewer.util.isAtLeastS
-import eu.kanade.tachiyomi.util.lang.withIOContext
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

app/src/main/kotlin/com/hippo/ehviewer/client/EhCacheKeyFactory.kt

@@ -15,7 +15,7 @@
  */
 package com.hippo.ehviewer.client
 
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo
 
 // Normal Preview (v2): https://*.hath.network/c(m|1|2)/[timed token]/[gid]-[index].(jpg|webp)
 // ExHentai Large Preview (v1 Cover): https://s.exhentai.org/t/***

app/src/main/kotlin/com/hippo/ehviewer/client/EhDns.kt

@@ -0,0 +1,67 @@
+package com.hippo.ehviewer.client
+
+import com.ehviewer.core.util.isAtLeastQ
+import com.hippo.ehviewer.builtInHosts
+import java.net.Inet4Address
+import java.net.InetAddress
+import okhttp3.AsyncDns
+import okhttp3.Dns
+import okhttp3.android.AndroidAsyncDns
+
+private typealias HostsMap = MutableMap<String, List<InetAddress>>
+
+const val CFSUFFIX = ".cdn.cloudflare.net"
+
+val cloudflaredDomains = listOf(
+    "e-hentai.org",
+    "api.e-hentai.org",
+    "upload.e-hentai.org",
+    "forums.e-hentai.org",
+    "exhentai.org",
+    "s.exhentai.org",
+    "testingcf.jsdelivr.net",
+)
+
+val dFEnabledDomains = listOf(
+    "github.com", "api.github.com",
+    "ehgt.org", "gt0.ehgt.org", "gt1.ehgt.org", "gt2.ehgt.org", "gt3.ehgt.org", "ul.ehgt.org",
+    "e-hentai.org", "api.e-hentai.org", "forums.e-hentai.org", "repo.e-hentai.org", "upload.e-hentai.org",
+    "exhentai.org", "s.exhentai.org",
+)
+
+val dohSkipDomains = listOf(
+    "www.recaptcha.net",
+    "www.gstatic.cn",
+    "www.gstatic.com",
+)
+
+fun hostsDsl(builder: HostsMap.() -> Unit): HostsMap = mutableMapOf<String, List<InetAddress>>().apply(builder)
+
+fun interface HostMapBuilder {
+    infix fun String.blockedInCN(boolean: Boolean)
+}
+
+fun HostsMap.hosts(vararg hosts: String, builder: HostMapBuilder.() -> Unit) = apply {
+    hosts.forEach { host ->
+        fun String.toInetAddress() = InetAddress.getByName(this).let { InetAddress.getByAddress(host, it.address) }
+        mutableListOf<InetAddress>().apply {
+            HostMapBuilder { if (!it) add(toInetAddress()) }.apply(builder)
+            put(host, this)
+        }
+    }
+}
+
+val systemDns = if (isAtLeastQ) AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6) else Dns.SYSTEM
+
+object EhDns : Dns {
+    override fun lookup(hostname: String): List<InetAddress> = when {
+        (hostname in "exhentai.org") ->
+            builtInHosts[hostname] ?: systemDns.lookup("s.exhentai.org$CFSUFFIX")
+        (hostname in cloudflaredDomains) ->
+            builtInHosts[hostname] ?: systemDns.lookup("$hostname$CFSUFFIX")
+        (hostname in dohSkipDomains) ->
+            systemDns.lookup(hostname)
+        else ->
+            builtInHosts[hostname] ?: systemDns.lookup(hostname)
+    }.shuffled()
+}

app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt

@@ -22,14 +22,21 @@ import arrow.core.right
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.parZip
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.network.EhCookieStore
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.client.data.fillInfo
+import com.hippo.ehviewer.client.data.filterComments
 import com.hippo.ehviewer.client.exception.CloudflareBypassException
+import com.hippo.ehviewer.client.exception.EhError
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.InsufficientFundsException
+import com.hippo.ehviewer.client.exception.InsufficientGpException
+import com.hippo.ehviewer.client.exception.IpBannedException
 import com.hippo.ehviewer.client.exception.NoHathClientException
 import com.hippo.ehviewer.client.exception.NoHitsFoundException
 import com.hippo.ehviewer.client.exception.NotLoggedInException
@@ -41,6 +48,7 @@ import com.hippo.ehviewer.client.parser.FavoritesParser
 import com.hippo.ehviewer.client.parser.GalleryApiParser
 import com.hippo.ehviewer.client.parser.GalleryDetailParser
 import com.hippo.ehviewer.client.parser.GalleryListParser
+import com.hippo.ehviewer.client.parser.GalleryMultiPageViewerPTokenParser
 import com.hippo.ehviewer.client.parser.GalleryPageParser
 import com.hippo.ehviewer.client.parser.GalleryTokenApiParser
 import com.hippo.ehviewer.client.parser.HomeParser
@@ -58,10 +66,12 @@ import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.ReadableTime
 import com.hippo.ehviewer.util.bodyAsUtf8Text
 import com.hippo.ehviewer.util.ensureSuccess
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.HttpStatement
 import io.ktor.client.statement.bodyAsChannel
+import io.ktor.client.statement.request
+import io.ktor.http.Url
+import io.ktor.util.moveToByteArray
 import io.ktor.utils.io.pool.DirectByteBufferPool
 import io.ktor.utils.io.pool.useInstance
 import io.ktor.utils.io.readAvailable
@@ -72,6 +82,8 @@ import kotlin.system.measureTimeMillis
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import kotlinx.serialization.SerializationException
+import kotlinx.serialization.cbor.Cbor
+import kotlinx.serialization.decodeFromByteArray
 import kotlinx.serialization.json.add
 import kotlinx.serialization.json.addJsonArray
 import kotlinx.serialization.json.put
@@ -86,7 +98,9 @@ private const val MAX_REQUEST_SIZE = 25
 private const val MAX_SEQUENTIAL_REQUESTS = 5
 private const val REQUEST_INTERVAL = 5000L
 
-fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
+private val Url.isLogin get() = segments.firstOrNull() == "bounce_login.php"
+
+private fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
     val dir = AppConfig.externalParseErrorDir ?: return
     val file = File(dir, ReadableTime.getFilenamableTime() + ".txt")
     file.sink().buffer().use { sink ->
@@ -98,7 +112,7 @@ fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
     }
 }
 
-fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e: Throwable): Nothing {
+private fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e: Throwable): Nothing {
     // Don't translate coroutine cancellation
     if (e is CancellationException) throw e
 
@@ -110,36 +124,40 @@ fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e:
         { !it.hasRemaining() },
     )
     if (empty) {
-        if (EhUtils.isExHentai) {
+        val message = if (response.request.url.host == EhUrl.DOMAIN_EX) {
-            throw EhException("Sad Panda\n(without panda)")
+            "Sad Panda\n(without panda)"
         } else {
-            throw EhException("IP banned")
+            appCtx.getString(R.string.error_ip_banned)
         }
+        throw IpBannedException(message)
     }
 
-    // Check Gallery Not Available
+    // Parse error from rust
-    body.onLeft {
+    val error = body.getOrNull()?.runCatching {
-        if ("Gallery Not Available - " in it) throw e
+        val array = moveToByteArray()
-    }
+        rewind()
+        Cbor.decodeFromByteArray<EhError>(array)
+    }?.getOrNull()
 
-    // Check parse error thrown by rust
+    // Check Gallery Not Available - 404
-    val cause = e.cause
+    if (error is EhError.GalleryUnavailable) throw EhException(error.message)
-    if (e is ParseException && cause is RuntimeException) {
-        when (val message = cause.message) {
-            "0" -> throw NoHitsFoundException()
-            "1" -> throw EhException(R.string.gallery_list_empty_hit_subscription)
-            "2" -> throw NotLoggedInException()
-            "3" -> throw NoHathClientException()
-            "4" -> throw InsufficientFundsException()
-            is String if message.startsWith('5') -> throw EhException(message.drop(1))
-        }
-    }
 
     // Check bad response code
     response.status.ensureSuccess()
 
+    when (error) {
+        EhError.NoHits -> throw NoHitsFoundException()
+        EhError.NoWatched -> throw EhException(R.string.gallery_list_empty_hit_subscription)
+        EhError.NeedLogin -> throw NotLoggedInException()
+        EhError.NoHathClient -> throw NoHathClientException()
+        EhError.InsufficientFunds -> throw InsufficientFundsException()
+        is EhError.IpBanned -> throw IpBannedException(error.message)
+        is EhError.Error -> throw EhException(error.message)
+        else -> Unit
+    }
+
     if (e is ParseException || e is SerializationException) {
-        body.onLeft { if ("<" !in it) throw EhException(it) }
+        body.onLeft { if ("<" !in it) throw IpBannedException(it) }
         if (Settings.saveParseErrorBody.value) body.saveParseError(e)
         throw EhException(appCtx.getString(R.string.error_parse_error), e)
     }
@@ -148,9 +166,10 @@ fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e:
     throw e
 }
 
-val httpContentPool = DirectByteBufferPool(8, 0x80000)
+private val httpContentPool = DirectByteBufferPool(8, 0x80000)
 
-suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend String.() -> T) = executeSafely { response ->
+private suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend String.() -> T) = executeSafely { response ->
+    if (response.request.url.isLogin) throw NotLoggedInException()
     val body = response.bodyAsUtf8Text()
     runSuspendCatching {
         block(body)
@@ -159,7 +178,8 @@ suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend
     }.getOrThrow()
 }
 
-suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: suspend ByteBuffer.() -> T) = executeSafely { response ->
+private suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: suspend ByteBuffer.() -> T) = executeSafely { response ->
+    if (response.request.url.isLogin) throw NotLoggedInException()
     httpContentPool.useInstance { buffer ->
         with(response.bodyAsChannel()) { while (!isClosedForRead) readAvailable(buffer) }
         buffer.flip()
@@ -174,10 +194,17 @@ suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: s
 
 object EhEngine {
     suspend fun getOriginalImageUrl(url: String, referer: String?) = noRedirectEhRequest(url, referer).executeSafely { response ->
-        val location = response.headers["Location"] ?: throw InsufficientFundsException()
+        val location = response.headers["Location"] ?: run {
-        location.takeIf { "bounce_login" !in it } ?: throw NotLoggedInException()
+            val body = response.bodyAsUtf8Text()
+            rethrowExactly(response, body.left(), InsufficientGpException())
+        }
+        if (Url(location).isLogin) throw InsufficientGpException()
+        location
     }
 
+    suspend fun getPTokenListFromMpv(gid: Long, token: String) = ehRequest(EhUrl.getGalleryMultiPageViewerUrl(gid, token), EhUrl.referer)
+        .fetchUsingAsText(GalleryMultiPageViewerPTokenParser::parse)
+
     suspend fun getTorrentList(gid: Long, token: String): TorrentResult {
         val url = EhUrl.getTorrentUrl(gid, token)
         val referer = EhUrl.getGalleryDetailUrl(gid, token)

app/src/main/kotlin/com/hippo/ehviewer/client/EhFilter.kt

@@ -1,10 +1,10 @@
 package com.hippo.ehviewer.client
 
 import arrow.core.memoize
+import com.ehviewer.core.database.model.Filter
+import com.ehviewer.core.database.model.FilterMode
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.dao.FilterMode
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async

app/src/main/kotlin/com/hippo/ehviewer/client/EhRequestBuilder.kt

@@ -15,11 +15,11 @@
  */
 package com.hippo.ehviewer.client
 
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhApplication.Companion.ktorClient
 import com.hippo.ehviewer.EhApplication.Companion.noRedirectKtorClient
 import com.hippo.ehviewer.util.bodyAsUtf8Text
 import com.hippo.ehviewer.util.ensureSuccess
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.forms.FormDataContent
 import io.ktor.client.request.header

app/src/main/kotlin/com/hippo/ehviewer/client/EhSSLSocketFactory.kt

@@ -0,0 +1,41 @@
+package com.hippo.ehviewer.client
+
+import android.util.Log
+import com.hippo.ehviewer.Settings
+import java.net.InetAddress
+import java.net.Socket
+import java.security.KeyStore
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
+import okhttp3.OkHttpClient
+
+const val EXCEPTIONAL_DOMAIN = "hath.network"
+private val sslSocketFactory: SSLSocketFactory = SSLContext.getInstance("TLS").apply {
+    init(null, null, null)
+}.socketFactory
+
+object EhSSLSocketFactory : SSLSocketFactory() {
+    override fun getDefaultCipherSuites(): Array<String> = sslSocketFactory.defaultCipherSuites
+    override fun getSupportedCipherSuites(): Array<String> = sslSocketFactory.supportedCipherSuites
+    override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket = sslSocketFactory.createSocket(s, resolveHost(s, host), port, autoClose) as SSLSocket
+
+    override fun createSocket(host: String, port: Int): Socket = sslSocketFactory.createSocket(host, port)
+    override fun createSocket(host: String, port: Int, localHost: InetAddress, localPort: Int): Socket = sslSocketFactory.createSocket(host, port, localHost, localPort)
+    override fun createSocket(host: InetAddress, port: Int): Socket = sslSocketFactory.createSocket(host, port)
+    override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket = sslSocketFactory.createSocket(address, port, localAddress, localPort)
+
+    private fun resolveHost(socket: Socket, host: String): String = socket.inetAddress.hostAddress.takeIf {
+        host in dFEnabledDomains || EXCEPTIONAL_DOMAIN in host
+    } ?: host
+}
+
+fun OkHttpClient.Builder.install(sslSocketFactory: SSLSocketFactory) = apply {
+    val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())!!
+    factory.init(null as KeyStore?)
+    val manager = factory.trustManagers!!
+    val trustManager = manager.filterIsInstance<X509TrustManager>().first()
+    sslSocketFactory(sslSocketFactory, trustManager)
+}

app/src/main/kotlin/com/hippo/ehviewer/client/EhTagDatabase.kt

@@ -20,17 +20,17 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import arrow.core.Either
+import com.ehviewer.core.files.metadataOrNull
+import com.ehviewer.core.files.read
+import com.ehviewer.core.files.write
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhApplication.Companion.ktorClient
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.data.TagNamespace
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.bodyAsUtf8Text
 import com.hippo.ehviewer.util.ensureSuccess
 import com.hippo.ehviewer.util.utf8
-import com.hippo.files.metadataOrNull
-import com.hippo.files.read
-import com.hippo.files.write
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.request.prepareGet
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.days
@@ -53,12 +53,7 @@ import splitties.init.appCtx
 object EhTagDatabase : CoroutineScope {
     override val coroutineContext = Dispatchers.IO + Job()
     private const val NAMESPACE_PREFIX = "n"
-    private val PREFIXES = arrayOf(
+    private val PREFIXES = ["-", "~", "tag:", "weak:"]
-        "-",
-        "~",
-        "tag:",
-        "weak:",
-    )
     private lateinit var tagGroups: Map<String, Map<String, String>>
     private val updateLock = Mutex()
     var initialized by mutableStateOf(false)

app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt

@@ -107,14 +107,14 @@ object EhUrl {
             else -> URL_IMAGE_SEARCH_E
         }
 
-    fun getGalleryDetailUrl(gid: Long, token: String, index: Int = 0, allComment: Boolean = false) = ehUrl(listOf("g", "$gid", token)) {
+    fun getGalleryDetailUrl(gid: Long, token: String, index: Int = 0, allComment: Boolean = false) = ehUrl(["g", "$gid", token]) {
         if (index != 0) addQueryParameter("p", "$index")
         if (allComment) addQueryParameter("hc", "1")
     }.buildString()
 
-    fun getGalleryMultiPageViewerUrl(gid: Long, token: String) = ehUrl(listOf("mpv", "$gid", token)).buildString()
+    fun getGalleryMultiPageViewerUrl(gid: Long, token: String) = ehUrl(["mpv", "$gid", token]).buildString()
 
-    fun getPageUrl(gid: Long, index: Int, pToken: String, nl: String? = null) = ehUrl(listOf("s", pToken, "$gid-${index + 1}")) {
+    fun getPageUrl(gid: Long, index: Int, pToken: String, nl: String? = null) = ehUrl(["s", pToken, "$gid-${index + 1}"]) {
         addQueryParameterIfNotBlank("nl", nl)
     }.buildString()
 
@@ -143,7 +143,7 @@ object EhUrl {
 }
 
 inline fun ehUrl(path: String? = null, host: String = EhUrl.domain, builder: ParametersBuilder.() -> Unit) = ehUrl(
-    path = if (path.isNullOrBlank()) emptyList() else listOf(path),
+    path = if (path.isNullOrBlank()) [] else [path],
     host = host,
     parameters = Parameters.build(builder),
 )

app/src/main/kotlin/com/hippo/ehviewer/client/EhUtils.kt

@@ -20,16 +20,21 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.os.Environment
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.core.net.toUri
 import arrow.core.memoize
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.network.EhCookieStore
+import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.parser.Archive
 import com.hippo.ehviewer.spider.SpiderDen
 import com.hippo.ehviewer.util.AppConfig
@@ -38,7 +43,7 @@ import com.hippo.ehviewer.util.addTextToClipboard
 import com.materialkolor.hct.Hct
 import com.materialkolor.ktx.from
 import com.materialkolor.ktx.toColor
-import eu.kanade.tachiyomi.util.lang.withUIContext
+import com.materialkolor.utils.ColorUtils.lstarFromArgb
 import splitties.systemservices.downloadManager
 
 object EhUtils {
@@ -151,7 +156,13 @@ object EhUtils {
         }
     }
 
-    val categoryTextColor = Color(0xffe6e0e9)
+    @ReadOnlyComposable
+    @Composable
+    fun getCategoryTextColor(color: Color) = if (isSystemInDarkTheme() == lstarFromArgb(color.toArgb()) > 70) {
+        MaterialTheme.colorScheme.surface
+    } else {
+        LocalContentColor.current
+    }
 
     val favoriteIconColor = Color(0xffff3040)
 

app/src/main/kotlin/com/hippo/ehviewer/client/data/AbstractDownloadInfo.kt

@@ -1,13 +0,0 @@
-package com.hippo.ehviewer.client.data
-
-interface AbstractDownloadInfo {
-    var state: Int
-    var legacy: Int
-    var time: Long
-    var label: String?
-    var speed: Long
-    var remaining: Long
-    var finished: Int
-    var downloaded: Int
-    var total: Int
-}

app/src/main/kotlin/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt

@@ -1,96 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer.client.data
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Ignore
-import androidx.room.PrimaryKey
-import androidx.room.TypeConverter
-import androidx.room.TypeConverters
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
-import kotlinx.serialization.Serializable
-
-@Serializable
-@Entity(tableName = "GALLERIES")
-@TypeConverters(SimpleTagsConverter::class)
-data class BaseGalleryInfo(
-    @PrimaryKey
-    @ColumnInfo(name = "GID")
-    override var gid: Long = 0,
-
-    @ColumnInfo(name = "TOKEN")
-    override var token: String = "",
-
-    @ColumnInfo(name = "TITLE")
-    override var title: String? = null,
-
-    @ColumnInfo(name = "TITLE_JPN")
-    override var titleJpn: String? = null,
-
-    @ColumnInfo(name = "THUMB")
-    override var thumbKey: String? = null,
-
-    @ColumnInfo(name = "CATEGORY")
-    override var category: Int = 0,
-
-    @ColumnInfo(name = "POSTED")
-    override var posted: String? = null,
-
-    @ColumnInfo(name = "UPLOADER")
-    override var uploader: String? = null,
-
-    @Ignore
-    override var disowned: Boolean = false,
-
-    @ColumnInfo(name = "RATING")
-    override var rating: Float = 0f,
-
-    @Ignore
-    override var rated: Boolean = false,
-
-    @ColumnInfo(name = "SIMPLE_TAGS")
-    override var simpleTags: List<String>? = null,
-
-    @ColumnInfo(name = "PAGES", defaultValue = "0")
-    override var pages: Int = 0,
-
-    @Ignore
-    override var thumbWidth: Int = 0,
-
-    @Ignore
-    override var thumbHeight: Int = 0,
-
-    @ColumnInfo(name = "SIMPLE_LANGUAGE")
-    override var simpleLanguage: String? = null,
-
-    @ColumnInfo(name = "FAVORITE_SLOT")
-    override var favoriteSlot: Int = NOT_FAVORITED,
-
-    @Ignore
-    override var favoriteName: String? = null,
-
-    @Ignore
-    override var favoriteNote: String? = null,
-) : GalleryInfo
-
-class SimpleTagsConverter {
-    @TypeConverter
-    fun fromString(value: String) = value.split(", ")
-
-    @TypeConverter
-    fun toString(value: List<String>) = value.joinToString()
-}

app/src/main/kotlin/com/hippo/ehviewer/client/data/FavListUrlBuilder.kt

@@ -25,9 +25,9 @@ import kotlinx.serialization.Serializable
 data class FavListUrlBuilder(
     val favCat: Int = FAV_CAT_ALL,
     val keyword: String? = null,
-    var jumpTo: String? = null,
+    private var jumpTo: String? = null,
-    var prev: String? = null,
+    private var prev: String? = null,
-    var next: String? = null,
+    private var next: String? = null,
 ) {
     val isLocal
         get() = favCat == FAV_CAT_LOCAL
@@ -35,6 +35,7 @@ data class FavListUrlBuilder(
     fun setIndex(index: String?, isNext: Boolean) {
         next = index.takeIf { isNext }
         prev = index.takeUnless { isNext }
+        jumpTo = null
     }
 
     fun build() = ehUrl(EhUrl.FAV_PATH) {

app/src/main/kotlin/com/hippo/ehviewer/client/data/GalleryDetail.kt

@@ -16,10 +16,13 @@
 package com.hippo.ehviewer.client.data
 
 import androidx.compose.ui.util.fastFlatMap
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryTagGroup
+import com.ehviewer.core.model.PowerStatus
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhFilter
-import kotlinx.serialization.Serializable
 
 private val LANGUAGES = arrayOf(
     "English",
@@ -38,45 +41,27 @@ private val LANGUAGES = arrayOf(
     "Dutch",
 )
 
-@Serializable
+suspend fun GalleryDetail.fillInfo() {
-data class GalleryDetail(
+    val index = LANGUAGES.indexOf(language)
-    val galleryInfo: BaseGalleryInfo = BaseGalleryInfo(),
+    if (index != -1) simpleLanguage = GalleryInfo.S_LANGS[index]
-    var apiUid: Long = -1L,
+    simpleTags = tagGroups.fastFlatMap(GalleryTagGroup::tags).map { (text, power, _) ->
-    var apiKey: String? = null,
+        if (power == PowerStatus.Weak) "_$text" else text
-    var torrentCount: Int = 0,
-    var parent: String? = null,
-    var newerVersions: List<BaseGalleryInfo> = emptyList(),
-    var visible: String? = null,
-    var language: String? = null,
-    var size: String? = null,
-    var favoriteCount: Int = 0,
-    var ratingCount: Int = 0,
-    val tagGroups: List<GalleryTagGroup>,
-    var comments: GalleryCommentList,
-    val previewList: List<GalleryPreview>,
-) : GalleryInfo by galleryInfo {
-    suspend fun fillInfo() {
-        val index = LANGUAGES.indexOf(language)
-        if (index != -1) simpleLanguage = GalleryInfo.S_LANGS[index]
-        simpleTags = tagGroups.fastFlatMap(GalleryTagGroup::tags).map { (text, power, _) ->
-            if (power == PowerStatus.Weak) "_$text" else text
-        }
-        if (favoriteSlot == GalleryInfo.NOT_FAVORITED && EhDB.containLocalFavorites(gid)) {
-            favoriteSlot = GalleryInfo.LOCAL_FAVORITED
-        }
     }
+    if (favoriteSlot == GalleryInfo.NOT_FAVORITED && EhDB.containLocalFavorites(gid)) {
+        favoriteSlot = GalleryInfo.LOCAL_FAVORITED
+    }
+}
 
-    suspend fun filterComments() {
+suspend fun GalleryDetail.filterComments() {
-        comments = with(comments) {
+    comments = with(comments) {
-            val scoreThreshold = Settings.commentThreshold.value
+        val scoreThreshold = Settings.commentThreshold.value
-            copy(
+        copy(
-                comments = comments.filter {
+            comments = comments.filter {
-                    it.uploader ||
+                it.uploader ||
-                        it.score > scoreThreshold &&
+                    it.score > scoreThreshold &&
-                        !EhFilter.filterCommenter(it.user.orEmpty()) &&
+                    !EhFilter.filterCommenter(it.user.orEmpty()) &&
-                        !EhFilter.filterComment(it.comment)
+                    !EhFilter.filterComment(it.comment)
-                },
+            },
-            )
+        )
-        }
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/client/data/ListUrlBuilder.kt

@@ -15,28 +15,27 @@
  */
 package com.hippo.ehviewer.client.data
 
+import com.ehviewer.core.database.model.QuickSearch
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.addQueryParameter
 import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
 import com.hippo.ehviewer.client.ehUrl
-import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.ui.main.AdvanceTable
 import io.ktor.http.Parameters
-import kotlin.text.toIntOrNull
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class ListUrlBuilder(
     var mode: Int = MODE_NORMAL,
     private var prev: String? = null,
-    var next: String? = null,
+    private var next: String? = null,
-    // Reset to null after initial loading
+    private var jumpTo: String? = null,
-    var jumpTo: String? = null,
     private var range: Int = 0,
     var category: Int = EhUtils.NONE,
-    private var mKeyword: String? = null,
+    var keyword: String? = null,
     var hash: String? = null,
     var language: Int = -1,
     var advanceSearch: Int = -1,
@@ -49,11 +48,14 @@ data class ListUrlBuilder(
         next = index.takeIf { isNext }
         prev = index.takeUnless { isNext }
         range = 0
+        jumpTo = null
     }
 
-    fun setJumpTo(to: Int) {
+    var page: Int
-        jumpTo = to.takeUnless { it == 0 }?.toString()
+        get() = (jumpTo?.toInt() ?: 0) + 1
-    }
+        set(value) {
+            jumpTo = (value - 1).takeUnless { it == 0 }?.toString()
+        }
 
     fun setRange(to: Int) {
         range = to
@@ -62,16 +64,15 @@ data class ListUrlBuilder(
         jumpTo = null
     }
 
-    var keyword: String?
+    fun setSeek(date: String) {
-        get() = if (MODE_UPLOADER == mode) "uploader:$mKeyword" else mKeyword
+        setIndex("2", true)
-        set(keyword) {
+        jumpTo = date
-            mKeyword = keyword
+    }
-        }
 
     constructor(q: QuickSearch) : this(
         mode = q.mode,
         category = q.category,
-        mKeyword = q.keyword,
+        keyword = q.keyword,
         advanceSearch = q.advanceSearch,
         minRating = q.minRating,
         pageFrom = q.pageFrom,
@@ -83,7 +84,7 @@ data class ListUrlBuilder(
         name = name,
         mode = mode,
         category = category,
-        keyword = mKeyword,
+        keyword = keyword,
         advanceSearch = advanceSearch,
         minRating = minRating,
         pageFrom = pageFrom,
@@ -100,7 +101,7 @@ data class ListUrlBuilder(
         if (q.category != this.category) {
             return false
         }
-        if (q.keyword != mKeyword) {
+        if (q.keyword != keyword) {
             return false
         }
         if (q.advanceSearch != advanceSearch) {
@@ -122,7 +123,7 @@ data class ListUrlBuilder(
         jumpTo = params["seek"],
         range = params["range"]?.toIntOrNull() ?: 0,
         category = params["f_cats"]?.toIntOrNull()?.let(EhUtils::invCategory) ?: EhUtils.NONE,
-        mKeyword = params["f_search"],
+        keyword = params["f_search"],
     ) {
         if (params["advsearch"] == "1") {
             advanceSearch = 0
@@ -153,7 +154,7 @@ data class ListUrlBuilder(
             if (category > 0) {
                 addQueryParameter("f_cats", "${EhUtils.invCategory(category)}")
             }
-            val query = mKeyword?.let { keyword ->
+            val query = keyword?.let { keyword ->
                 if (language == -1 || "gid:" in keyword || "l:" in keyword || "language:" in keyword) {
                     keyword
                 } else {
@@ -205,26 +206,23 @@ data class ListUrlBuilder(
                 }
             }
         }.buildString()
-
         MODE_UPLOADER, MODE_TAG -> {
             val path = if (mode == MODE_UPLOADER) "uploader" else "tag"
-            ehUrl(listOf(path, requireNotNull(mKeyword))) {
+            ehUrl([path, requireNotNull(keyword)]) {
                 addQueryParameterIfNotBlank("prev", prev)
                 addQueryParameterIfNotBlank("next", next)
                 addQueryParameterIfNotBlank("seek", jumpTo)
                 addQueryParameterIfNotBlank("range", range.takeIf { it > 0 }?.toString())
             }.buildString()
         }
-
         MODE_WHATS_HOT -> EhUrl.popularUrl
         MODE_IMAGE_SEARCH -> ehUrl {
             addQueryParameter("f_shash", requireNotNull(hash))
         }.buildString()
         MODE_TOPLIST -> ehUrl("toplist.php", EhUrl.DOMAIN_E) {
-            addQueryParameter("tl", requireNotNull(mKeyword))
+            addQueryParameter("tl", requireNotNull(keyword))
             addQueryParameterIfNotBlank("p", jumpTo)
         }.buildString()
-
         else -> throw IllegalStateException("Unexpected value: $mode")
     }
 

app/src/main/kotlin/com/hippo/ehviewer/client/exception/EhError.kt

@@ -0,0 +1,48 @@
+package com.hippo.ehviewer.client.exception
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.cbor.CborArray
+
+@Serializable
+sealed interface EhError {
+    @CborArray
+    @Serializable
+    @SerialName("NoHits")
+    data object NoHits : EhError
+
+    @CborArray
+    @Serializable
+    @SerialName("NoWatched")
+    data object NoWatched : EhError
+
+    @CborArray
+    @Serializable
+    @SerialName("NeedLogin")
+    data object NeedLogin : EhError
+
+    @CborArray
+    @Serializable
+    @SerialName("NoHathClient")
+    data object NoHathClient : EhError
+
+    @CborArray
+    @Serializable
+    @SerialName("InsufficientFunds")
+    data object InsufficientFunds : EhError
+
+    @CborArray
+    @Serializable
+    @SerialName("GalleryUnavailable")
+    data class GalleryUnavailable(val message: String) : EhError
+
+    @CborArray
+    @Serializable
+    @SerialName("IpBanned")
+    data class IpBanned(val message: String) : EhError
+
+    @CborArray
+    @Serializable
+    @SerialName("Error")
+    data class Error(val message: String) : EhError
+}

app/src/main/kotlin/com/hippo/ehviewer/client/exception/FatalException.kt

@@ -0,0 +1,13 @@
+package com.hippo.ehviewer.client.exception
+
+import androidx.annotation.StringRes
+import com.ehviewer.core.i18n.R
+
+sealed class FatalException : EhException {
+    constructor(message: String) : super(message)
+    constructor(@StringRes messageId: Int) : super(messageId)
+}
+
+class IpBannedException(message: String) : FatalException(message)
+class InsufficientGpException : FatalException(R.string.insufficient_gp)
+class QuotaExceededException : FatalException(R.string.error_509)

app/src/main/kotlin/com/hippo/ehviewer/client/exception/QuotaExceededException.kt

@@ -1,5 +0,0 @@
-package com.hippo.ehviewer.client.exception
-
-import com.ehviewer.core.i18n.R
-
-class QuotaExceededException : EhException(R.string.error_509)

app/src/main/kotlin/com/hippo/ehviewer/client/parser/FavoritesParser.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.client.parser
 
+import com.ehviewer.core.util.unescapeXml
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.util.unescapeXml
 import java.nio.ByteBuffer
 import kotlinx.serialization.Serializable
 import moe.tarsin.coroutines.runSuspendCatching

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryApiParser.kt

@@ -15,11 +15,11 @@
  */
 package com.hippo.ehviewer.client.parser
 
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.unescapeXml
 import com.hippo.ehviewer.client.EhUtils.getCategory
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.util.unescapeXml
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt

@@ -17,9 +17,9 @@ package com.hippo.ehviewer.client.parser
 
 import arrow.core.Either
 import arrow.core.getOrElse
-import com.hippo.ehviewer.client.data.GalleryCommentList
+import com.ehviewer.core.model.GalleryCommentList
-import com.hippo.ehviewer.client.data.GalleryDetail
+import com.ehviewer.core.model.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryPreviewList
+import com.ehviewer.core.model.GalleryPreviewList
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 import kotlinx.serialization.Serializable

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryListParser.kt

@@ -1,6 +1,6 @@
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 import kotlinx.serialization.Serializable
@@ -13,14 +13,14 @@ object GalleryListParser {
         throw ParseException("Can't parse gallery list", it)
     }
 
-    val emptyResult = GalleryListResult(null, null, arrayListOf())
+    val emptyResult = GalleryListResult(null, null, [])
 }
 
 @Serializable
 data class GalleryListResult(
     val prev: String?,
     val next: String?,
-    val galleryInfoList: ArrayList<BaseGalleryInfo>,
+    val galleryInfoList: MutableList<BaseGalleryInfo>,
 )
 
 private external fun parseGalleryInfoList(body: ByteBuffer, size: Int = body.limit()): Int

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt

@@ -26,7 +26,7 @@ object GalleryListUrlParser {
     fun parse(urlStr: String) = Either.catch {
         val url = Url(urlStr)
         if (url.host != EhUrl.DOMAIN_E && url.host != EhUrl.DOMAIN_EX) {
-            return null
+            return@catch null
         }
         val segments = url.segments
         if (segments.isEmpty()) {
@@ -42,20 +42,18 @@ object GalleryListUrlParser {
                     mode = if (head == "uploader") ListUrlBuilder.MODE_UPLOADER else ListUrlBuilder.MODE_TAG
                     keyword = segments[1].decodeURLQueryComponent(plusIsSpace = true)
                 }
-
                 "toplist.php" -> {
                     val tl = url.parameters["tl"]
                     if (tl != null && tl in arrayOf("11", "12", "13", "15")) {
                         ListUrlBuilder(
                             mode = ListUrlBuilder.MODE_TOPLIST,
                             jumpTo = url.parameters["p"],
-                            mKeyword = tl,
+                            keyword = tl,
                         )
                     } else {
                         null
                     }
                 }
-
                 else -> {
                     val category = EhUtils.getCategory(head)
                     if (category != EhUtils.UNKNOWN) {

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryPageParser.kt

@@ -15,8 +15,8 @@
  */
 package com.hippo.ehviewer.client.parser
 
+import com.ehviewer.core.util.unescapeXml
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.util.unescapeXml
 
 object GalleryPageParser {
     private val PATTERN_IMAGE_URL = Regex("<img[^>]*src=\"([^\"]+)\" style")

app/src/main/kotlin/com/hippo/ehviewer/client/parser/ParserUtils.kt

@@ -15,9 +15,9 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.util.toEpochMillis
+import com.ehviewer.core.util.toEpochMillis
-import com.hippo.ehviewer.util.toIntOrDefault
+import com.ehviewer.core.util.toIntOrDefault
-import com.hippo.ehviewer.util.toLocalDateTime
+import com.ehviewer.core.util.toLocalDateTime
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.format.char
 

app/src/main/kotlin/com/hippo/ehviewer/client/parser/VoteTagParser.kt

@@ -19,7 +19,7 @@ package com.hippo.ehviewer.client.parser
 
 import arrow.core.Either.Companion.catch
 import arrow.core.getOrElse
-import com.hippo.ehviewer.client.data.GalleryTagGroup
+import com.ehviewer.core.model.GalleryTagGroup
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 

app/src/main/kotlin/com/hippo/ehviewer/coil/AnimatedWebPDrawable.kt

@@ -9,7 +9,7 @@ import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
 import android.os.SystemClock
 import androidx.core.graphics.createBitmap
-import eu.kanade.tachiyomi.util.system.logcat
+import com.ehviewer.core.util.logcat
 import java.nio.ByteBuffer
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope

app/src/main/kotlin/com/hippo/ehviewer/coil/CropBorderInterceptor.kt

@@ -12,9 +12,9 @@ import coil3.asImage
 import coil3.intercept.Interceptor
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
+import com.ehviewer.core.util.isAtLeastQ
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.image.copyBitmapToAHB
-import com.hippo.ehviewer.util.isAtLeastQ
-import eu.kanade.tachiyomi.util.system.logcat
 import moe.tarsin.coroutines.runSuspendCatching
 
 @RequiresApi(Build.VERSION_CODES.O)

app/src/main/kotlin/com/hippo/ehviewer/coil/DownloadThumbInterceptor.kt

@@ -6,16 +6,16 @@ import coil3.intercept.Interceptor
 import coil3.request.ImageRequest
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
-import com.hippo.ehviewer.EhApplication.Companion.imageCache
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.isFile
+import com.ehviewer.core.files.sendTo
+import com.ehviewer.core.files.toUri
+import com.hippo.ehviewer.EhApplication.Companion.thumbCache
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.client.getThumbKey
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.downloadLocation
-import com.hippo.ehviewer.util.sendTo
-import com.hippo.files.delete
-import com.hippo.files.isDirectory
-import com.hippo.files.isFile
-import com.hippo.files.toUri
 
 private val downloadInfoKey = Extras.Key<DownloadInfo?>(default = null)
 
@@ -35,7 +35,7 @@ object DownloadThumbInterceptor : Interceptor {
                 info.thumbKey = thumbKey
                 EhDB.putGalleryInfo(info.galleryInfo)
             }
-            val dir = downloadLocation / info.dirname
+            val dir = downloadLocation / info.dirname!!
             val format = thumbKey.substringAfterLast('.', "")
             check(format.isNotBlank())
             val thumb = dir / "thumb.$format"
@@ -53,7 +53,7 @@ object DownloadThumbInterceptor : Interceptor {
                 // Accessing the recreated file immediately after deleting it throws
                 // FileNotFoundException, so we just overwrite the existing file.
                 val key = requireNotNull(chain.request.memoryCacheKey)
-                imageCache.read(key) {
+                thumbCache.read(key) {
                     data sendTo thumb
                 }
                 if (thumb != v1Thumb) v1Thumb.delete()

app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt

@@ -7,10 +7,13 @@ import coil3.decode.BlackholeDecoder
 import coil3.request.CachePolicy
 import coil3.request.ImageRequest
 import coil3.size.SizeResolver
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.ehviewer.core.database.model.DownloadInfo
-import com.hippo.ehviewer.client.data.GalleryPreview
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryPreview
+import com.ehviewer.core.model.V2GalleryPreview
+import com.hippo.ehviewer.client.getThumbKey
+import com.hippo.ehviewer.client.getV2PreviewKey
 import com.hippo.ehviewer.client.thumbUrl
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.ktbuilder.execute
 
@@ -30,7 +33,7 @@ fun ImageRequest.Builder.ehUrl(info: GalleryInfo) = apply {
 // Load in original size so the memory cache can be reused for preload requests
 fun ImageRequest.Builder.ehPreview(preview: GalleryPreview) = apply {
     with(preview) {
-        val key = imageKey
+        val key = if (this is V2GalleryPreview) getV2PreviewKey(url) else getThumbKey(url)
         data(url)
         size(SizeResolver.ORIGINAL)
         memoryCacheKey(key)

app/src/main/kotlin/com/hippo/ehviewer/dailycheck/DailyCheckWork.kt

@@ -19,11 +19,11 @@ import androidx.work.PeriodicWorkRequest
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.withIOContext
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
-import eu.kanade.tachiyomi.util.lang.withIOContext
-import eu.kanade.tachiyomi.util.system.logcat
 import java.time.Duration
 import java.util.concurrent.TimeUnit
 import kotlin.time.Clock

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadManager.kt

@@ -22,18 +22,29 @@ import androidx.compose.runtime.DisallowComposableCalls
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.core.util.size
 import arrow.fx.coroutines.parMapNotNull
+import com.ehviewer.core.data.model.asEntity
+import com.ehviewer.core.database.model.DownloadArtist
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.database.model.DownloadLabel
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.find
+import com.ehviewer.core.files.toOkioPath
+import com.ehviewer.core.files.toUri
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.preferences.edit
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.mapNotNull
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.hippo.ehviewer.client.exception.FatalException
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.dao.DownloadArtist
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.dao.DownloadLabel
 import com.hippo.ehviewer.spider.COMIC_INFO_FILE
 import com.hippo.ehviewer.spider.SpeedTracker
 import com.hippo.ehviewer.spider.SpiderQueen
@@ -45,13 +56,7 @@ import com.hippo.ehviewer.spider.readCompatFromPath
 import com.hippo.ehviewer.spider.toSimpleTags
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.insertWith
-import com.hippo.ehviewer.util.mapNotNull
 import com.hippo.ehviewer.util.runAssertingNotMainThread
-import com.hippo.files.delete
-import com.hippo.files.find
-import com.hippo.files.toOkioPath
-import com.hippo.files.toUri
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -70,9 +75,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     override val coroutineContext = Dispatchers.IO + Job()
 
     // All download info list
-    private val allInfoList = runAssertingNotMainThread {
+    private val allInfoList = runAssertingNotMainThread { EhDB.getAllDownloadInfo() as MutableList }
-        (EhDB.getAllDownloadInfo() as MutableList).apply { sortWith(comparator()) }
-    }
 
     val downloadInfoList: List<DownloadInfo>
         get() = allInfoList
@@ -97,6 +100,21 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
 
     private val mutex = Mutex()
 
+    private val sortMutex = Mutex()
+    private val sortMode
+        get() = SortMode.from(Settings.downloadSortMode.value)
+
+    var isInitialized by mutableStateOf(false)
+        private set
+
+    init {
+        launch {
+            val mode = sortMode
+            if (mode != SortMode.Default) sortDownloads(mode)
+            isInitialized = true
+        }
+    }
+
     fun containLabel(label: String?): Boolean {
         if (label == null) {
             return false
@@ -130,7 +148,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
                 mCurrentTask = info
                 with(info) {
                     archiveFile?.let {
-                        return onFinish(pages, pages, pages)
+                        return onFinish(pages, pages, pages, failed = false)
                     }
                     state = DownloadInfo.STATE_DOWNLOAD
                     speed = -1
@@ -178,11 +196,13 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             }
         } else {
             // It is new download info
-            info = DownloadInfo(galleryInfo, galleryInfo.downloadDirname())
+            info = DownloadInfo(galleryInfo.asEntity(), galleryInfo.downloadDirname())
             info.label = label
             info.state = DownloadInfo.STATE_WAIT
             // Add to all download list and map
-            allInfoList.insertWith(info, comparator())
+            sortMutex.withLock {
+                allInfoList.insertWith(info, sortMode.comparator())
+            }
             mAllInfoMap[galleryInfo.gid] = info
 
             // Add to wait list
@@ -197,7 +217,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             ensureDownload()
 
             // Add it to history
-            EhDB.putHistoryInfo(info.galleryInfo)
+            EhDB.putHistoryInfo(info)
         }
     }
 
@@ -239,10 +259,12 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     }.collectAsState(transform(info)).value
 
     suspend fun startAllDownload() {
-        val updateList = allInfoList.filter {
+        val updateList = sortMutex.withLock {
-            when (it.state) {
+            allInfoList.filter {
-                DownloadInfo.STATE_NONE, DownloadInfo.STATE_FAILED -> true
+                when (it.state) {
-                else -> false
+                    DownloadInfo.STATE_NONE, DownloadInfo.STATE_FAILED -> true
+                    else -> false
+                }
             }
         }
         if (updateList.isNotEmpty()) {
@@ -256,8 +278,8 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         }
     }
 
-    suspend fun addDownload(downloadInfoList: List<DownloadInfo>) {
+    suspend fun addDownload(downloadInfoList: List<DownloadInfo>) = sortMutex.withLock {
-        val comparator = comparator()
+        val comparator = sortMode.comparator()
         downloadInfoList.forEach { info ->
             if (containDownloadInfo(info.gid)) return@forEach
 
@@ -287,11 +309,13 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     }
 
     suspend fun restoreDownload(galleryInfo: BaseGalleryInfo, dirname: String) {
-        val info = DownloadInfo(galleryInfo, dirname)
+        val info = DownloadInfo(galleryInfo.asEntity(), dirname)
         info.state = DownloadInfo.STATE_NONE
 
         // Add to all download list and map
-        allInfoList.insertWith(info, comparator())
+        sortMutex.withLock {
+            allInfoList.insertWith(info, sortMode.comparator())
+        }
         mAllInfoMap[galleryInfo.gid] = info
 
         // Save to
@@ -350,7 +374,9 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             EhDB.removeDownloadInfo(info)
 
             // Remove all list and map
-            allInfoList.remove(info)
+            sortMutex.withLock {
+                allInfoList.remove(info)
+            }
             mAllInfoMap.remove(info.gid)
 
             // Update listener
@@ -373,7 +399,9 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             mAllInfoMap.remove(gid)
         }
         EhDB.removeDownloadInfo(list)
-        allInfoList.removeAll(list.toSet())
+        sortMutex.withLock {
+            allInfoList.removeAll(list.toSet())
+        }
 
         // Update listener
         list.forEach { mutableNotifyFlow.emit(it) }
@@ -382,7 +410,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         ensureDownload()
     }
 
-    fun sortDownloads(mode: SortMode) {
+    suspend fun sortDownloads(mode: SortMode) = sortMutex.withLock {
         allInfoList.sortWith(mode.comparator())
     }
 
@@ -501,9 +529,11 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             val new = exist.copy(label = to)
             labelList.add(index, new)
             EhDB.updateDownloadLabel(new)
-            allInfoList.forEach {
+            sortMutex.withLock {
-                if (it.label == from) {
+                allInfoList.forEach {
-                    it.label = to
+                    if (it.label == from) {
+                        it.label = to
+                    }
                 }
             }
         }
@@ -519,21 +549,25 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             }
             removeAt(index)
         }
-        allInfoList.forEach {
+        sortMutex.withLock {
-            if (it.label == label) {
+            allInfoList.forEach {
-                it.label = null
+                if (it.label == label) {
+                    it.label = null
+                }
             }
         }
     }
 
     suspend fun readMetadataFromLocal() {
-        val list = allInfoList.mapNotNull {
+        val list = sortMutex.withLock {
-            val updateGallery = it.pages == 0 || it.simpleTags == null
+            allInfoList.mapNotNull {
-            val updateArtist = it.artistInfoList.isEmpty()
+                val updateGallery = it.pages == 0 || it.simpleTags == null
-            if (updateGallery || updateArtist) {
+                val updateArtist = it.artistInfoList.isEmpty()
-                Triple(it, updateGallery, updateArtist)
+                if (updateGallery || updateArtist) {
-            } else {
+                    Triple(it, updateGallery, updateArtist)
-                null
+                } else {
+                    null
+                }
             }
         }.parMapNotNull(concurrency = 5) { (info, updateGallery, updateArtist) ->
             info.downloadDir?.run {
@@ -574,13 +608,14 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             }
         }
 
-        val galleryInfoList = mutableListOf<BaseGalleryInfo>()
+        val galleryInfoList = buildList {
-        list.forEach { (info, artists) ->
+            list.forEach { (info, artists) ->
-            info?.let {
+                info?.let {
-                galleryInfoList.add(it)
+                    add(it)
-            }
+                }
-            artists?.let { (gid, updateList) ->
+                artists?.let { (gid, updateList) ->
-                EhDB.putDownloadArtist(gid, updateList)
+                    EhDB.putDownloadArtist(gid, updateList)
+                }
             }
         }
         if (galleryInfoList.isNotEmpty()) EhDB.updateGalleryInfo(galleryInfoList)
@@ -598,9 +633,9 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         }
     }
 
-    override fun onGet509(index: Int) {
+    override fun onFatal(error: FatalException) {
         launch {
-            mDownloadListener?.onGet509()
+            mDownloadListener?.onFatal(error)
             stopAllDownload()
         }
     }
@@ -647,7 +682,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         }
     }
 
-    override fun onFinish(finished: Int, downloaded: Int, total: Int) {
+    override fun onFinish(finished: Int, downloaded: Int, total: Int, failed: Boolean) {
         launch {
             mSpeedReminder.onFinish()
             mCurrentSpider?.let { spider ->
@@ -662,11 +697,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
                 info.downloaded = downloaded
                 info.total = total
                 info.legacy = total - finished
-                if (info.legacy == 0) {
+                info.state = if (failed) DownloadInfo.STATE_FAILED else DownloadInfo.STATE_FINISH
-                    info.state = DownloadInfo.STATE_FINISH
-                } else {
-                    info.state = DownloadInfo.STATE_FAILED
-                }
                 EhDB.putDownloadInfo(info)
                 mDownloadListener?.onFinish(info)
                 mutableNotifyFlow.emit(info)
@@ -677,9 +708,9 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
 
     interface DownloadListener {
         /**
-         * Get 509 error
+         * Fatal error
          */
-        fun onGet509()
+        fun onFatal(error: FatalException)
 
         /**
          * Start download
@@ -782,8 +813,6 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     }
 
     private const val TAG = "DownloadManager"
-
-    private fun comparator() = SortMode.from(Settings.downloadSortMode.value).comparator()
 }
 
 var downloadLocation: Path

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadService.kt

@@ -31,16 +31,20 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.savedstate.serialization.decodeFromSavedState
 import androidx.savedstate.serialization.encodeToSavedState
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.unsafeLazy
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.hippo.ehviewer.client.exception.FatalException
-import com.hippo.ehviewer.dao.DownloadInfo
+import com.hippo.ehviewer.client.exception.InsufficientGpException
+import com.hippo.ehviewer.client.exception.IpBannedException
+import com.hippo.ehviewer.client.exception.QuotaExceededException
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.util.isAtLeastS
-import com.hippo.ehviewer.util.unsafeLazy
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -48,8 +52,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 
 class DownloadService :
@@ -61,7 +63,7 @@ class DownloadService :
     private val notifyManager by unsafeLazy { NotificationManagerCompat.from(this) }
     private val downloadingNotification by unsafeLazy { initDownloadingNotification() }
     private val downloadedNotification by lazy { initDownloadedNotification() }
-    private val error509Notification by lazy { init509Notification() }
+    private val fatalNotification by lazy { initFatalNotification() }
     private val channelId by unsafeLazy { "$packageName.download" }
 
     override fun onCreate() {
@@ -109,14 +111,12 @@ class DownloadService :
                 val label = intent.getStringExtra(KEY_LABEL)
                 deferredMgr.await().startDownload(decodeFromSavedState(gi), label)
             }
-
             ACTION_START_RANGE -> {
                 val gidList = intent.getLongArrayExtra(KEY_GID_LIST)
                 if (gidList != null) {
                     deferredMgr.await().startRangeDownload(gidList)
                 }
             }
-
             ACTION_START_ALL -> deferredMgr.await().startAllDownload()
             ACTION_STOP_ALL -> deferredMgr.await().stopAllDownload()
             ACTION_CLEAR -> clear()
@@ -172,24 +172,27 @@ class DownloadService :
             .apply { launch { run() } }
     }
 
-    private fun init509Notification(): NotificationHandler {
+    private fun initFatalNotification(): NotificationHandler {
         val builder = NotificationCompat.Builder(applicationContext, channelId)
             .setSmallIcon(com.hippo.ehviewer.R.drawable.ic_baseline_warning_24)
-            .setContentTitle(getString(R.string.stat_509_alert_title))
-            .setContentText(getString(R.string.stat_509_alert_text))
-            .setStyle(
-                NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)),
-            )
             .setAutoCancel(true)
             .setOngoing(false)
             .setCategory(NotificationCompat.CATEGORY_ERROR)
-        return NotificationHandler(this, notifyManager, builder, ID_509)
+        return NotificationHandler(this, notifyManager, builder, ID_FATAL)
             .apply { launch { run() } }
     }
 
-    override fun onGet509() {
+    override fun onFatal(error: FatalException) {
-        error509Notification.run {
+        val (title, text) = when (error) {
+            is IpBannedException -> R.string.error_ip_banned to error.message
+            is InsufficientGpException -> R.string.insufficient_funds to error.message
+            is QuotaExceededException -> R.string.stat_509_alert_title to getString(R.string.stat_509_alert_text)
+        }
+        fatalNotification.run {
             builder.setWhen(System.currentTimeMillis())
+                .setContentTitle(getString(title))
+                .setContentText(text)
+                .setStyle(NotificationCompat.BigTextStyle().bigText(text))
             show()
         }
     }
@@ -370,8 +373,8 @@ class DownloadService :
         }
 
         suspend fun run() {
-            channel.receiveAsFlow().sample(DELAY).collect {
+            while (true) {
-                when (it) {
+                when (channel.receive()) {
                     Ops.Notify -> {
                         if (ActivityCompat.checkSelfPermission(
                                 service,
@@ -381,10 +384,10 @@ class DownloadService :
                             notifyManager.notify(id, builder.build())
                         }
                     }
-
                     Ops.Cancel -> notifyManager.cancel(id)
                     Ops.StartForeground -> service.startForeground(id, builder.build())
                 }
+                delay(DELAY)
             }
         }
 
@@ -412,7 +415,7 @@ class DownloadService :
         const val ACTION_CLEAR_DOWNLOAD_SERVICE = "clear_download_service"
         private const val ID_DOWNLOADING = 1
         private const val ID_DOWNLOADED = 2
-        private const val ID_509 = 3
+        private const val ID_FATAL = 3
         private const val DELAY = 1000L // 1s
         private val sItemStateArray = LongSparseArray<Boolean>()
         private val sItemTitleArray = LongSparseArray<String>()

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadsFilterMode.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.download
 
-import com.hippo.ehviewer.dao.DownloadInfo
+import com.ehviewer.core.database.model.DownloadInfo
-import com.hippo.ehviewer.dao.artists
+import com.ehviewer.core.database.model.artists
 
 enum class DownloadsFilterMode(
     val flag: Int,

app/src/main/kotlin/com/hippo/ehviewer/download/SortMode.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.download
 
+import com.ehviewer.core.database.model.DownloadInfo
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.dao.DownloadInfo
 
 data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel: Boolean = false) {
     val flag
@@ -11,7 +11,6 @@ data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel
         GID(0),
         TITLE(1),
         TIME(2),
-        LABEL(3),
         PAGES(4),
     }
 
@@ -23,13 +22,16 @@ data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel
     fun comparator(): Comparator<DownloadInfo> {
         var comparator = when (field) {
             Field.GID -> compareBy { it.gid }
-            Field.TITLE, Field.LABEL -> compareBy { EhUtils.getSuitableTitle(it) }
+            Field.TITLE -> compareBy { EhUtils.getSuitableTitle(it) }
             Field.TIME -> compareBy { it.time }
-            Field.PAGES -> compareBy<DownloadInfo> { it.pages }.thenBy { EhUtils.getSuitableTitle(it) }
+            Field.PAGES -> compareBy<DownloadInfo> { it.pages }
         }
         if (order == Order.DESC) {
             comparator = comparator.reversed()
         }
+        if (field == Field.PAGES) {
+            comparator = comparator.thenByDescending { it.time }
+        }
         if (groupByDownloadLabel) {
             comparator = compareBy<DownloadInfo> { it.label }.then(comparator)
         }
@@ -38,15 +40,16 @@ data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel
 
     companion object {
         fun from(flag: Int): SortMode {
-            val field = flag and 0xF shr 1
+            val fieldValue = flag and 0xF shr 1
-            val order = flag and 0x1
+            val orderValue = flag and 0x1
             val groupByDownloadLabel = flag shr 4 == 1
-            require(field in Field.entries.indices && order in Order.entries.indices)
+            val field = Field.entries.find { it.value == fieldValue } ?: Default.field
-            return SortMode(Field.entries[field], Order.entries[order], groupByDownloadLabel)
+            val order = Order.entries.find { it.value == orderValue } ?: Default.order
+            return SortMode(field, order, groupByDownloadLabel)
         }
         val Default = SortMode(Field.TIME, Order.DESC)
-        val All = listOf(
+        val All = [
-            SortMode(Field.TIME, Order.DESC),
+            Default,
             SortMode(Field.TIME, Order.ASC),
             SortMode(Field.GID, Order.DESC),
             SortMode(Field.GID, Order.ASC),
@@ -54,6 +57,6 @@ data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel
             SortMode(Field.TITLE, Order.DESC),
             SortMode(Field.PAGES, Order.ASC),
             SortMode(Field.PAGES, Order.DESC),
-        )
+        ]
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/gallery/ArchivePageLoader.kt

@@ -16,7 +16,11 @@
 package com.hippo.ehviewer.gallery
 
 import arrow.autoCloseScope
+import com.ehviewer.core.files.openFileDescriptor
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.Settings.archivePasswds
+import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.image.ImageSource
 import com.hippo.ehviewer.image.byteBufferSource
 import com.hippo.ehviewer.jni.closeArchive
@@ -29,8 +33,6 @@ import com.hippo.ehviewer.jni.providePassword
 import com.hippo.ehviewer.jni.releaseByteBuffer
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.displayName
-import com.hippo.files.openFileDescriptor
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.coroutineScope
 import moe.tarsin.kt.install
 import okio.Path
@@ -40,7 +42,7 @@ typealias PasswdProvider = suspend (PasswdInvalidator) -> String
 
 suspend inline fun <T> useArchivePageLoader(
     file: Path,
-    gid: Long = 0,
+    info: GalleryInfo? = null,
     startPage: Int = 0,
     hasAds: Boolean = false,
     crossinline passwdProvider: PasswdProvider,
@@ -49,7 +51,7 @@ suspend inline fun <T> useArchivePageLoader(
     coroutineScope {
         val pfd = install(file.openFileDescriptor("r"))
         val size = install(
-            { openArchive(pfd.fd, pfd.statSize, gid == 0L || file.name.endsWith(".zip")) },
+            { openArchive(pfd.fd, pfd.statSize, info == null || file.name.endsWith(".zip")) },
             { _, _ -> closeArchive() },
         )
         check(size > 0) { "Archive have no content!" }
@@ -57,8 +59,14 @@ suspend inline fun <T> useArchivePageLoader(
             archivePasswds += passwdProvider(::providePassword)
         }
         val loader = install(
-            object : PageLoader(this, gid, startPage, size, hasAds) {
+            object : PageLoader(this, info, startPage, size, hasAds) {
-                override val title by lazy { FileUtils.getNameFromFilename(file.displayName)!! }
+                override val title by lazy {
+                    if (info != null) {
+                        EhUtils.getSuitableTitle(info)
+                    } else {
+                        FileUtils.getNameFromFilename(file.displayName)!!
+                    }
+                }
 
                 override fun getImageExtension(index: Int) = getExtension(index)
 

app/src/main/kotlin/com/hippo/ehviewer/gallery/EhPageLoader.kt

@@ -1,8 +1,8 @@
 package com.hippo.ehviewer.gallery
 
 import arrow.autoCloseScope
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.obtainSpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.releaseSpiderQueen
@@ -24,7 +24,7 @@ suspend inline fun <T> useEhPageLoader(
         )
         queen.awaitReady()
         val loader = install(
-            object : PageLoader(this, info.gid, startPage, queen.size, info.hasAds) {
+            object : PageLoader(this, info, startPage, queen.size, info.hasAds) {
                 override val title by lazy { EhUtils.getSuitableTitle(info) }
 
                 override fun getImageExtension(index: Int) = queen.getExtension(index)

app/src/main/kotlin/com/hippo/ehviewer/gallery/PageLoader.kt

@@ -4,6 +4,9 @@ import androidx.collection.SieveCache
 import androidx.collection.mutableIntObjectMapOf
 import arrow.fx.coroutines.ExitCase
 import arrow.fx.coroutines.bracketCase
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.isAtLeastO
+import com.ehviewer.core.util.withNonCancellableContext
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.image.Image
@@ -12,8 +15,6 @@ import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.OSUtils
 import com.hippo.ehviewer.util.detectAds
 import com.hippo.ehviewer.util.displayString
-import com.hippo.ehviewer.util.isAtLeastO
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.atomics.AtomicInt
 import kotlin.concurrent.read
@@ -35,7 +36,7 @@ private val progressScope = CoroutineScope(Dispatchers.IO)
 private const val MAX_CACHE_SIZE = 512 * 1024 * 1024
 private const val MIN_CACHE_SIZE = 256 * 1024 * 1024
 
-abstract class PageLoader(val scope: CoroutineScope, val gid: Long, startPage: Int, val size: Int, val hasAds: Boolean = false) : AutoCloseable {
+abstract class PageLoader(val scope: CoroutineScope, val info: GalleryInfo?, startPage: Int, val size: Int, val hasAds: Boolean = false) : AutoCloseable {
     var startPage = startPage.coerceIn(0, size - 1)
 
     private val jobs = mutableIntObjectMapOf<Job>()
@@ -111,14 +112,14 @@ abstract class PageLoader(val scope: CoroutineScope, val gid: Long, startPage: I
 
     override fun close() {
         lock.write { cache.evictAll() }
-        if (gid != 0L) {
+        info?.run {
             progressScope.launch {
                 EhDB.putReadProgress(gid, startPage)
             }
         }
     }
 
-    protected abstract val title: String
+    abstract val title: String
 
     protected abstract fun getImageExtension(index: Int): String?
 

app/src/main/kotlin/com/hippo/ehviewer/image/Image.kt

@@ -32,10 +32,15 @@ import coil3.request.CachePolicy
 import coil3.request.ErrorResult
 import coil3.request.SuccessResult
 import coil3.request.allowHardware
-import coil3.size.Dimension
+import coil3.request.maxBitmapSize
 import coil3.size.Precision
+import coil3.size.Scale
 import coil3.size.Size
 import coil3.size.SizeResolver
+import com.ehviewer.core.files.openFileDescriptor
+import com.ehviewer.core.files.toUri
+import com.ehviewer.core.util.isAtLeastP
+import com.ehviewer.core.util.isAtLeastU
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.coil.AnimatedWebPDrawable
 import com.hippo.ehviewer.coil.BitmapImageWithExtraInfo
@@ -48,10 +53,6 @@ import com.hippo.ehviewer.jni.munmap
 import com.hippo.ehviewer.jni.rewriteGifSource
 import com.hippo.ehviewer.ktbuilder.execute
 import com.hippo.ehviewer.ktbuilder.imageRequest
-import com.hippo.ehviewer.util.isAtLeastP
-import com.hippo.ehviewer.util.isAtLeastU
-import com.hippo.files.openFileDescriptor
-import com.hippo.files.toUri
 import java.nio.ByteBuffer
 import kotlin.concurrent.atomics.AtomicInt
 import kotlin.concurrent.atomics.decrementAndFetch
@@ -90,8 +91,10 @@ class Image private constructor(image: CoilImage, private val src: ImageSource)
     }
 
     companion object {
-        private val targetWidth = appCtx.resources.displayMetrics.widthPixels * 3
+        private val sizeResolver = with(appCtx.resources.displayMetrics) {
-        private val sizeResolver = SizeResolver(Size(targetWidth, Dimension.Undefined))
+            val targetSize = minOf(widthPixels, heightPixels) * 4 / 3
+            SizeResolver(Size(targetSize, targetSize))
+        }
 
         private suspend fun Either<ByteBufferSource, PathSource>.decodeCoil(checkExtraneousAds: Boolean): CoilImage {
             val request = with(appCtx) {
@@ -99,7 +102,9 @@ class Image private constructor(image: CoilImage, private val src: ImageSource)
                     onLeft { data(it.source) }
                     onRight { data(it.source.toUri()) }
                     size(sizeResolver)
+                    scale(Scale.FILL)
                     precision(Precision.INEXACT)
+                    maxBitmapSize(Size.ORIGINAL)
                     allowHardware(false)
                     hardwareThreshold(Settings.hardwareBitmapThreshold.value)
                     maybeCropBorder(Settings.cropBorder.value)
@@ -130,7 +135,6 @@ class Image private constructor(image: CoilImage, private val src: ImageSource)
                     }
                     src.right().decodeCoil(checkExtraneousAds)
                 }
-
                 is ByteBufferSource -> {
                     if (isAtLeastP && !isAtLeastU) {
                         rewriteGifSource(src.source)

app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Coil.kt

@@ -5,8 +5,8 @@ import coil3.ImageLoader
 import coil3.disk.DiskCache
 import coil3.imageLoader
 import coil3.request.ImageRequest
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryPreview
+import com.ehviewer.core.model.GalleryPreview
 import com.hippo.ehviewer.coil.ehPreview
 import com.hippo.ehviewer.coil.ehUrl
 import kotlinx.coroutines.CoroutineScope

app/src/main/kotlin/com/hippo/ehviewer/ktor/Common.kt

@@ -1,8 +1,8 @@
 package com.hippo.ehviewer.ktor
 
-import com.hippo.ehviewer.BuildConfig
+import androidx.webkit.WebViewCompat
+import com.ehviewer.core.network.EhCookieStore
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhCookieStore
 import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.HttpClientEngineConfig
 import io.ktor.client.plugins.HttpTimeout
@@ -14,9 +14,12 @@ import io.ktor.client.request.header
 import io.ktor.http.HttpHeaders
 import io.ktor.http.userAgent
 import io.ktor.util.appendIfNameAbsent
+import splitties.init.appCtx
 
-const val CHROME_MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${BuildConfig.CHROME_VERSION}.0.0.0 Mobile Safari/537.36"
+// It's safe to assume the WebView package will always be present as we require CookieManager anyway
-private const val CHROME_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${BuildConfig.CHROME_VERSION}.0.0.0 Safari/537.36"
+private val WebViewVersion = WebViewCompat.getCurrentWebViewPackage(appCtx)!!.versionName!!.substringBefore('.')
+val CHROME_MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/$WebViewVersion.0.0.0 Mobile Safari/537.36"
+private val CHROME_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/$WebViewVersion.0.0.0 Safari/537.36"
 private const val CHROME_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7"
 private const val CHROME_ACCEPT_LANGUAGE = "en-US,en;q=0.9"
 
@@ -26,7 +29,7 @@ fun <T : HttpClientEngineConfig> HttpClientConfig<T>.configureCommon(redirect: B
     }
     install(HttpTimeout) {
         reset()
-        requestTimeoutMillis = 10_000
+        requestTimeoutMillis = 30_000
     }
     install(UserAgent)
     defaultRequest {

app/src/main/kotlin/com/hippo/ehviewer/ktor/CronetEngine.kt

@@ -10,9 +10,6 @@ import android.net.http.UrlRequest
 import android.net.http.UrlResponseInfo
 import android.os.Build
 import androidx.annotation.RequiresExtension
-import com.ehviewer.core.preferences.edit
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.util.restartApplication
 import io.ktor.client.engine.HttpClientEngineBase
 import io.ktor.client.engine.callContext
 import io.ktor.client.plugins.HttpTimeoutCapability
@@ -35,20 +32,21 @@ import java.nio.ByteBuffer
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asExecutor
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.consumeEach
+import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.job
 import kotlinx.coroutines.suspendCancellableCoroutine
 
 class CronetEngine(override val config: CronetConfig) : HttpClientEngineBase("Cronet") {
     // Limit thread to 1 since we are async & non-blocking
-    override val dispatcher = Dispatchers.Default.limitedParallelism(1)
+    // TODO: Investigate https://github.com/FooIbar/EhViewer/issues/2854
+    // override val dispatcher = Dispatchers.Default.limitedParallelism(1)
 
     override val supportedCapabilities = setOf(HttpTimeoutCapability)
 
-    private val executor = dispatcher.asExecutor()
+    private val executor = dispatcher.limitedParallelism(1).asExecutor()
     private val pool = DirectByteBufferPool(32)
     private val client by lazy {
         with(config) { HttpEngine.Builder(context).apply(config).build() }
@@ -95,7 +93,7 @@ class CronetEngine(override val config: CronetConfig) : HttpClientEngineBase("Cr
             }
 
             override fun onReadCompleted(request: UrlRequest, info: UrlResponseInfo, byteBuffer: ByteBuffer) {
-                chunkChan.trySend(byteBuffer).getOrThrow()
+                chunkChan.trySendBlocking(byteBuffer).getOrThrow()
             }
 
             override fun onSucceeded(request: UrlRequest, info: UrlResponseInfo) {
@@ -103,15 +101,6 @@ class CronetEngine(override val config: CronetConfig) : HttpClientEngineBase("Cr
             }
 
             override fun onFailed(request: UrlRequest, info: UrlResponseInfo?, error: HttpException) {
-                // Cronet may crash on some devices, fuck xiaomi
-                // https://github.com/FooIbar/EhViewer/issues/1826
-                val message = error.message.orEmpty()
-                if ("ERR_FILE_NOT_FOUND" in message || "ERR_PROXY_CONNECTION_FAILED" in message) {
-                    Settings.edit(true) {
-                        it[enableCronet] = false
-                    }
-                    with(config.context) { restartApplication() }
-                }
                 if (continuation.isActive) {
                     continuation.resumeWithException(error)
                 } else {

app/src/main/kotlin/com/hippo/ehviewer/ktor/CronetExtensions.kt

@@ -1,12 +1,12 @@
-@file:RequiresExtension(extension = Build.VERSION_CODES.S, version = 7)
-
 package com.hippo.ehviewer.ktor
 
 import android.net.http.HttpEngine
 import android.os.Build
 import androidx.annotation.RequiresExtension
+import com.ehviewer.core.util.isAtLeastSExtension7
 import java.io.File
 
+@RequiresExtension(extension = Build.VERSION_CODES.S, version = 7)
 fun CronetConfig.configureClient(enableQuic: Boolean) {
     config = {
         setEnableBrotli(true)
@@ -24,3 +24,14 @@ fun CronetConfig.configureClient(enableQuic: Boolean) {
         }
     }
 }
+
+val isCronetAvailable: Boolean
+    get() = isAtLeastSExtension7 && !isDeviceBlocked
+
+// https://github.com/FooIbar/EhViewer/issues/1826
+private val isDeviceBlocked = when (Build.VERSION.INCREMENTAL.substringBefore('.')) {
+    "V816", // HyperOS 1
+    "OS2", // HyperOS 2
+    -> true
+    else -> false
+}

app/src/main/kotlin/com/hippo/ehviewer/ktor/OkhttpExtensions.kt

@@ -1,14 +1,18 @@
 package com.hippo.ehviewer.ktor
 
-import com.hippo.ehviewer.util.isAtLeastQ
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.EhDns
+import com.hippo.ehviewer.client.EhSSLSocketFactory
+import com.hippo.ehviewer.client.install
 import io.ktor.client.engine.okhttp.OkHttpConfig
-import okhttp3.AsyncDns
+import java.net.Proxy
-import okhttp3.android.AndroidAsyncDns
 
 fun OkHttpConfig.configureClient() {
     config {
-        if (isAtLeastQ) {
+        dns(EhDns)
-            dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
+        proxy(Proxy.NO_PROXY)
+        if (!Settings.enableQuic.value) {
+            install(EhSSLSocketFactory)
         }
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/legacy/SpiderInfoCompat.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.legacy
 
+import com.ehviewer.core.files.read
 import com.hippo.ehviewer.spider.SpiderInfo
-import com.hippo.files.read
 import kotlinx.io.readLineStrict
 import okio.Path
 

app/src/main/kotlin/com/hippo/ehviewer/spider/ComicInfo.kt

@@ -1,24 +1,24 @@
 package com.hippo.ehviewer.spider
 
+import com.ehviewer.core.database.util.SimpleTagsConverter
+import com.ehviewer.core.files.read
+import com.ehviewer.core.files.write
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryTag
+import com.ehviewer.core.model.PowerStatus
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.model.TagNamespace.Artist
+import com.ehviewer.core.model.TagNamespace.Character
+import com.ehviewer.core.model.TagNamespace.Cosplayer
+import com.ehviewer.core.model.TagNamespace.Female
+import com.ehviewer.core.model.TagNamespace.Group
+import com.ehviewer.core.model.TagNamespace.Location
+import com.ehviewer.core.model.TagNamespace.Male
+import com.ehviewer.core.model.TagNamespace.Mixed
+import com.ehviewer.core.model.TagNamespace.Other
+import com.ehviewer.core.model.TagNamespace.Parody
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryTag
-import com.hippo.ehviewer.client.data.PowerStatus
-import com.hippo.ehviewer.client.data.SimpleTagsConverter
-import com.hippo.ehviewer.client.data.TagNamespace
-import com.hippo.ehviewer.client.data.TagNamespace.Artist
-import com.hippo.ehviewer.client.data.TagNamespace.Character
-import com.hippo.ehviewer.client.data.TagNamespace.Cosplayer
-import com.hippo.ehviewer.client.data.TagNamespace.Female
-import com.hippo.ehviewer.client.data.TagNamespace.Group
-import com.hippo.ehviewer.client.data.TagNamespace.Location
-import com.hippo.ehviewer.client.data.TagNamespace.Male
-import com.hippo.ehviewer.client.data.TagNamespace.Mixed
-import com.hippo.ehviewer.client.data.TagNamespace.Other
-import com.hippo.ehviewer.client.data.TagNamespace.Parody
-import com.hippo.files.read
-import com.hippo.files.write
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -43,7 +43,7 @@ private val xml = XML {
     }
     xmlDeclMode = XmlDeclMode.Charset
     xmlVersion = XmlVersion.XML10
-    indent = 2
+    setIndent(2)
 }
 
 fun GalleryInfo.getComicInfo(): ComicInfo {
@@ -68,7 +68,6 @@ fun GalleryInfo.getComicInfo(): ComicInfo {
                     else -> Unit
                 }
             }
-
             else -> simpleTags?.forEach { tagString ->
                 val (namespace, tag) = tagString.split(':', limit = 2)
                     .takeIf { it.size == 2 } ?: return@forEach // Ignore temp tags that don't have namespace

app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt

@@ -20,44 +20,45 @@ import arrow.fx.coroutines.autoCloseable
 import arrow.fx.coroutines.closeable
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.resourceScope
-import com.hippo.ehviewer.EhApplication.Companion.imageCache as sCache
+import com.ehviewer.core.database.model.DownloadArtist
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.exists
+import com.ehviewer.core.files.find
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.list
+import com.ehviewer.core.files.mkdirs
+import com.ehviewer.core.files.moveTo
+import com.ehviewer.core.files.openFileDescriptor
+import com.ehviewer.core.files.sendTo
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils.getSuitableTitle
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.ehRequest
 import com.hippo.ehviewer.client.getImageKey
 import com.hippo.ehviewer.coil.read
 import com.hippo.ehviewer.coil.suspendEdit
-import com.hippo.ehviewer.dao.DownloadArtist
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.downloadLocation
 import com.hippo.ehviewer.download.tempDownloadDir
 import com.hippo.ehviewer.image.PathSource
 import com.hippo.ehviewer.jni.archiveFdBatch
+import com.hippo.ehviewer.ktbuilder.diskCache
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.copyTo
-import com.hippo.ehviewer.util.sendTo
 import com.hippo.ehviewer.util.sha1
-import com.hippo.files.delete
-import com.hippo.files.exists
-import com.hippo.files.find
-import com.hippo.files.isDirectory
-import com.hippo.files.list
-import com.hippo.files.mkdirs
-import com.hippo.files.moveTo
-import com.hippo.files.openFileDescriptor
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.bodyAsChannel
 import io.ktor.client.statement.request
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.read
 import kotlin.concurrent.write
-import kotlinx.coroutines.CancellationException
 import okio.Path
+import okio.Path.Companion.toOkioPath
+import splitties.init.appCtx
 
 class SpiderDen(val info: GalleryInfo) {
     private val gid = info.gid
@@ -129,11 +130,9 @@ class SpiderDen(val info: GalleryInfo) {
         SpiderQueen.MODE_READ -> {
             containInCache(index) || containInDownloadDir(index)
         }
-
         SpiderQueen.MODE_DOWNLOAD -> {
             containInDownloadDir(index) || copyFromCacheToDownloadDir(index)
         }
-
         else -> {
             false
         }
@@ -154,6 +153,10 @@ class SpiderDen(val info: GalleryInfo) {
         removeTempFile(index)
     }
 
+    fun clearCache() {
+        repeat(info.pages, ::removeFromCache)
+    }
+
     private fun Path.findDownloadFileForIndex(index: Int, extension: String) = with(lock) {
         val name = perFilename(index, extension)
         read { fileCache[name] } ?: resolve(name).also { write { fileCache[name] = it } }
@@ -270,22 +273,18 @@ class SpiderDen(val info: GalleryInfo) {
         }
     }
 
-    suspend fun archive() {
+    suspend fun archive() = saveAsCbz && downloadDir?.run {
-        if (saveAsCbz) {
+        resolve(archiveName).let { file ->
-            downloadDir?.run {
+            runCatching {
-                resolve(archiveName).let { file ->
+                archiveTo(file)
-                    runCatching {
+            }.onFailure {
-                        archiveTo(file)
+                file.delete()
-                    }.onFailure {
+                logcat(it)
-                        file.delete()
+            }.isFailure
-                        if (it is CancellationException) throw it
-                        logcat(it)
-                    }
-                }
-            }
         }
-    }
+    } == true
 
+    // Postpone this to `SpiderQueen.stop` because files may still be in use by reader
     suspend fun postArchive(): Boolean {
         val dir = downloadDir
         val archived = saveAsCbz && dir?.find(archiveName) != null
@@ -335,7 +334,7 @@ class SpiderDen(val info: GalleryInfo) {
         downloadDir?.run {
             resolve(COMIC_INFO_FILE).also {
                 if (info !is GalleryDetail && fetchMetadata) {
-                    EhEngine.fillGalleryListByApi(listOf(info))
+                    EhEngine.fillGalleryListByApi([info])
                 }
                 info.getComicInfo().apply {
                     writeComicInfo(this, it)
@@ -349,6 +348,12 @@ class SpiderDen(val info: GalleryInfo) {
     }
 }
 
+private val sCache by lazy {
+    diskCache {
+        directory(appCtx.cacheDir.toOkioPath() / "image_cache")
+        maxSizeBytes(Settings.readCacheSize.value.coerceIn(320, 5120).toLong() * 1024 * 1024)
+    }
+}
 private const val TEMP_SUFFIX = ".tmp"
 private val FileNameRegex = Regex("^\\d{8}\\.\\w{3,4}")
 private val FileHashRegex = Regex("/h/([0-9a-f]{40})")

app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderInfo.kt

@@ -1,12 +1,12 @@
 package com.hippo.ehviewer.spider
 
+import com.ehviewer.core.files.read
+import com.ehviewer.core.files.write
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.coil.edit
 import com.hippo.ehviewer.coil.read
 import com.hippo.ehviewer.ktbuilder.diskCache
 import com.hippo.ehviewer.legacy.readLegacySpiderInfo
-import com.hippo.files.read
-import com.hippo.files.write
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.io.readByteArray
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.cbor.Cbor

app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt

@@ -20,23 +20,20 @@ import androidx.annotation.IntDef
 import arrow.core.Either
 import arrow.core.getOrElse
 import arrow.core.partially1
+import com.ehviewer.core.files.find
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryPreview
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUrl.getGalleryDetailUrl
-import com.hippo.ehviewer.client.EhUrl.getGalleryMultiPageViewerUrl
 import com.hippo.ehviewer.client.EhUrl.referer
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.client.exception.FatalException
-import com.hippo.ehviewer.client.data.GalleryPreview
-import com.hippo.ehviewer.client.ehRequest
 import com.hippo.ehviewer.client.exception.QuotaExceededException
-import com.hippo.ehviewer.client.fetchUsingAsText
-import com.hippo.ehviewer.client.parser.GalleryMultiPageViewerPTokenParser
 import com.hippo.ehviewer.util.displayString
-import com.hippo.files.find
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlin.concurrent.atomics.AtomicInt
 import kotlin.concurrent.atomics.decrementAndFetch
 import kotlin.concurrent.atomics.incrementAndFetch
@@ -91,9 +88,9 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
         }
     }
 
-    fun notifyGet509(index: Int) {
+    fun notifyFatal(error: FatalException) {
         synchronized(mSpiderListeners) {
-            mSpiderListeners.forEach { it.onGet509(index) }
+            mSpiderListeners.forEach { it.onFatal(error) }
         }
     }
 
@@ -137,13 +134,14 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
         }
     }
 
-    private fun notifyAllPageDownloaded() {
+    private fun notifyAllPageDownloaded(failed: Boolean) {
         synchronized(mSpiderListeners) {
             mSpiderListeners.forEach {
                 it.onFinish(
                     mFinishedPages.load(),
                     mDownloadedPages.load(),
                     pageStates.size,
+                    failed,
                 )
             }
         }
@@ -216,7 +214,10 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
 
     private val prepareScope = CoroutineScope(coroutineContext + SupervisorJob())
     private val prepareJob = prepareScope.async { doPrepare() }
-    private val archiveJob = launch(start = CoroutineStart.LAZY) { spiderDen.archive() }
+    private val archiveJob = launch(start = CoroutineStart.LAZY) {
+        val failed = spiderDen.archive()
+        notifyAllPageDownloaded(failed)
+    }
 
     private suspend fun doPrepare() {
         spiderDen.initDownloadDirIfExist()
@@ -331,7 +332,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
     }
 
     private suspend fun readSpiderInfoFromInternet() = EhEngine.getPreviewList(
-        getGalleryDetailUrl(galleryInfo.gid, galleryInfo.token, 0, false),
+        getGalleryDetailUrl(galleryInfo.gid, galleryInfo.token),
     ).run {
         val spiderInfo = SpiderInfo(galleryInfo.gid, galleryInfo.token, total)
         readPreviews(previews, 0, spiderInfo)
@@ -342,17 +343,11 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
 
     suspend fun getPTokenFromMultiPageViewer(index: Int): String? {
         if (!isMpvAvailable) return null
-        val url = getGalleryMultiPageViewerUrl(
-            galleryInfo.gid,
-            galleryInfo.token,
-        )
         return runSuspendCatching {
-            ehRequest(url, referer).fetchUsingAsText {
+            EhEngine.getPTokenListFromMpv(galleryInfo.gid, galleryInfo.token).forEachIndexed { index, s ->
-                GalleryMultiPageViewerPTokenParser.parse(this).forEachIndexed { index, s ->
+                spiderInfo.pTokenMap[index] = s
-                    spiderInfo.pTokenMap[index] = s
-                }
-                spiderInfo.pTokenMap[index]
             }
+            spiderInfo.pTokenMap[index]
         }.getOrElse {
             logcat(it)
             null
@@ -365,12 +360,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
         } else {
             0
         }
-        val url = getGalleryDetailUrl(
+        val url = getGalleryDetailUrl(galleryInfo.gid, galleryInfo.token, previewIndex)
-            galleryInfo.gid,
-            galleryInfo.token,
-            previewIndex,
-            false,
-        )
         return runSuspendCatching {
             EhEngine.getPreviewList(url).run {
                 readPreviews(previews, previewIndex, spiderInfo)
@@ -414,8 +404,11 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
             notifyPageSuccess(index)
         }
         if (mDownloadedPages.load() == size) {
-            if (mFinishedPages.load() == size) archiveJob.start()
+            if (mFinishedPages.load() == size) {
-            notifyAllPageDownloaded()
+                archiveJob.start()
+            } else {
+                notifyAllPageDownloaded(failed = true)
+            }
         }
     }
 
@@ -428,11 +421,11 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
     annotation class State
     interface OnSpiderListener {
         fun onGetPages(pages: Int) {}
-        fun onGet509(index: Int) {}
+        fun onFatal(error: FatalException) {}
         fun onPageDownload(index: Int, contentLength: Long, receivedSize: Long, bytesRead: Int) {}
         fun onPageSuccess(index: Int, finished: Int, downloaded: Int, total: Int) {}
         fun onPageFailure(index: Int, error: String?, finished: Int, downloaded: Int, total: Int) {}
-        fun onFinish(finished: Int, downloaded: Int, total: Int) {}
+        fun onFinish(finished: Int, downloaded: Int, total: Int, failed: Boolean) {}
         fun onPageReady(index: Int) {}
     }
 
@@ -555,7 +548,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
                 if (!force && index in spiderDen) {
                     return updatePageState(index, STATE_FINISHED)
                 }
-                pToken = getPToken(index) ?: return updatePageState(index, STATE_FAILED, PTOKEN_FAILED_MESSAGE)
+                pToken = getPToken(index) ?: return updatePageState(index, STATE_FAILED, pTokenFailedMessage)
                 previousPToken = getPToken(index - 1)
 
                 // The lock for delay should be acquired before anything else to maintain FIFO order
@@ -601,6 +594,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
                                 previousPToken,
                             )
                         }.getOrElse {
+                            if (it is FatalException) throw it
                             forceHtml = true
                             return@repeat
                         }.let {
@@ -650,10 +644,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
                     }
                 }
             }.onFailure {
-                when (it) {
+                if (it is FatalException) notifyFatal(it)
-                    is QuotaExceededException -> notifyGet509(index)
-                    // TODO: Check IP ban
-                }
                 error = it.displayString()
                 if (error == "Invalid page.") {
                     pTokenLock.withLock {
@@ -664,13 +655,13 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
             updatePageState(index, STATE_FAILED, error)
         }
     }
+    private val pTokenFailedMessage = appCtx.getString(R.string.error_get_ptoken_error)
 }
 
-private val PTOKEN_FAILED_MESSAGE = appCtx.getString(R.string.error_get_ptoken_error)
+private val Url509Regex = Regex("https://(?:ehgt\\.org/|exhentai\\.org/im)g/509s?\\.gif")
-private val URL_509_PATTERN = Regex("\\.org/.+/509s?\\.gif")
 private const val FORCE_RETRY = "Force retry"
 private const val WORKER_DEBUG_TAG = "SpiderQueenWorker"
 
 private fun check509(url: String) {
-    if (URL_509_PATTERN in url) throw QuotaExceededException()
+    if (Url509Regex.matches(url)) throw QuotaExceededException()
 }

app/src/main/kotlin/com/hippo/ehviewer/ui/CommonOperations.kt

@@ -35,17 +35,27 @@ import androidx.compose.material3.Text
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.exists
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.write
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo.Companion.LOCAL_FAVORITED
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
+import com.ehviewer.core.ui.component.LabeledCheckbox
+import com.ehviewer.core.util.isAtLeastT
+import com.ehviewer.core.util.mapToLongArray
+import com.ehviewer.core.util.toEpochMillis
+import com.ehviewer.core.util.toLocalDateTime
+import com.ehviewer.core.util.withIOContext
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.download.downloadDir
@@ -54,7 +64,6 @@ import com.hippo.ehviewer.download.tempDownloadDir
 import com.hippo.ehviewer.ui.destinations.ReaderScreenDestination
 import com.hippo.ehviewer.ui.reader.ReaderScreenArgs
 import com.hippo.ehviewer.ui.tools.DialogState
-import com.hippo.ehviewer.ui.tools.LabeledCheckbox
 import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel
 import com.hippo.ehviewer.ui.tools.awaitResult
 import com.hippo.ehviewer.ui.tools.awaitSelectDate
@@ -64,18 +73,9 @@ import com.hippo.ehviewer.ui.tools.awaitSelectItemWithIcon
 import com.hippo.ehviewer.ui.tools.awaitSelectItemWithIconAndTextField
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 import com.hippo.ehviewer.util.bgWork
-import com.hippo.ehviewer.util.isAtLeastT
-import com.hippo.ehviewer.util.mapToLongArray
 import com.hippo.ehviewer.util.requestPermission
 import com.hippo.ehviewer.util.restartApplication
-import com.hippo.ehviewer.util.toEpochMillis
-import com.hippo.ehviewer.util.toLocalDateTime
-import com.hippo.files.delete
-import com.hippo.files.exists
-import com.hippo.files.isDirectory
-import com.hippo.files.write
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import eu.kanade.tachiyomi.util.lang.withIOContext
 import kotlin.time.Clock
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -177,7 +177,7 @@ suspend fun startDownload(forceDefault: Boolean, vararg galleryInfos: BaseGaller
 }
 
 context(_: DialogState)
-suspend fun modifyFavorites(galleryInfo: BaseGalleryInfo): Boolean {
+suspend fun modifyFavorites(galleryInfo: GalleryInfo): Boolean {
     val localFavorited = EhDB.containLocalFavorites(galleryInfo.gid)
     if (Settings.hasSignedIn.value) {
         val isFavorited = galleryInfo.favoriteSlot != NOT_FAVORITED
@@ -215,7 +215,7 @@ suspend fun modifyFavorites(galleryInfo: BaseGalleryInfo): Boolean {
 }
 
 private suspend fun doModifyFavorites(
-    galleryInfo: BaseGalleryInfo,
+    galleryInfo: GalleryInfo,
     slot: Int = NOT_FAVORITED,
     localFavorited: Boolean = true,
     note: String = "",
@@ -233,7 +233,6 @@ private suspend fun doModifyFavorites(
             }
             false
         }
-
         LOCAL_FAVORITED -> {
             if (localFavorited) {
                 EhDB.removeLocalFavorites(galleryInfo)
@@ -248,7 +247,6 @@ private suspend fun doModifyFavorites(
             }
             !localFavorited
         }
-
         in 0..9 -> {
             EhEngine.modifyFavorites(gid, token, slot, note)
             favoriteSlot = slot
@@ -256,14 +254,13 @@ private suspend fun doModifyFavorites(
             favoriteNote = note
             true
         }
-
         else -> throw EhException("Invalid favorite slot!")
     }
     FavouriteStatusRouter.notify(galleryInfo)
     add
 }
 
-suspend fun removeFromFavorites(galleryInfo: BaseGalleryInfo) = doModifyFavorites(
+suspend fun removeFromFavorites(galleryInfo: GalleryInfo) = doModifyFavorites(
     galleryInfo = galleryInfo,
     localFavorited = EhDB.containLocalFavorites(galleryInfo.gid),
 )
@@ -305,13 +302,11 @@ suspend fun doGalleryInfoAction(info: BaseGalleryInfo) {
             EhDB.putHistoryInfo(info)
             navToReader(info)
         }
-
         1 -> if (downloaded) {
             confirmRemoveDownload(info)
         } else {
             startDownload(false, info)
         }
-
         2 -> if (favorited) {
             runSuspendCatching {
                 removeFromFavorites(info)
@@ -327,7 +322,6 @@ suspend fun doGalleryInfoAction(info: BaseGalleryInfo) {
                 tip(R.string.add_to_favorite_failure)
             }
         }
-
         3 -> showMoveDownloadLabel(info)
     }
 }
@@ -400,7 +394,7 @@ suspend fun showMoveDownloadLabel(info: GalleryInfo) {
     val selected = awaitSelectItem(labels, R.string.download_move_dialog_title)
     val downloadInfo = DownloadManager.getDownloadInfo(info.gid) ?: return
     val label = if (selected == 0) null else labels[selected]
-    DownloadManager.changeLabel(listOf(downloadInfo), label)
+    DownloadManager.changeLabel([downloadInfo], label)
 }
 
 context(_: DialogState)
@@ -419,7 +413,7 @@ suspend fun showMoveDownloadLabelList(list: Collection<DownloadInfo>): String? {
 }
 
 context(_: DialogState)
-suspend fun awaitSelectDate(): String? {
+suspend fun awaitSelectDate(): String {
     val initial = LocalDate(2007, 3, 21)
     val yesterday = Clock.System.todayIn(TimeZone.UTC).minus(1, DateTimeUnit.DAY)
     val initialMillis = initial.toEpochMillis()
@@ -432,8 +426,7 @@ suspend fun awaitSelectDate(): String? {
             override fun isSelectableDate(utcTimeMillis: Long): Boolean = utcTimeMillis in dateRange
         },
     )
-    val date = dateMillis?.run { toLocalDateTime().date.toString() }
+    return dateMillis.toLocalDateTime().date.toString()
-    return date
 }
 
 context(_: Context, _: DialogState)

app/src/main/kotlin/com/hippo/ehviewer/ui/ComposeDefault.kt

@@ -10,11 +10,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import com.ehviewer.core.ui.util.NoopTransitionsVisibilityScope
+import com.ehviewer.core.ui.util.TransitionsVisibilityScope
+import com.ehviewer.core.ui.util.togetherWith
 import com.hippo.ehviewer.ui.tools.DialogState
 import com.hippo.ehviewer.ui.tools.LocalGlobalDialogState
-import com.hippo.ehviewer.ui.tools.NoopTransitionsVisibilityScope
-import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope
-import com.hippo.ehviewer.ui.tools.togetherWith
 import com.hippo.ehviewer.util.findActivity
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.CoroutineScope

app/src/main/kotlin/com/hippo/ehviewer/ui/EhActivity.kt

@@ -1,51 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer.ui
-
-import android.os.Bundle
-import android.view.View
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.ActivityNavigator
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.util.isAtLeastR
-import eu.kanade.tachiyomi.util.view.setSecureScreen
-
-abstract class EhActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        // https://issuetracker.google.com/204791558
-        // Fix system bars insets still exist in fullscreen mode on API < 30
-        @Suppress("DEPRECATION")
-        if (!isAtLeastR) {
-            with(window.decorView) {
-                systemUiVisibility = systemUiVisibility and View.SYSTEM_UI_FLAG_LAYOUT_STABLE.inv()
-            }
-        }
-    }
-
-    override fun onResume() {
-        interceptSecurityOrReturn()
-        super.onResume()
-        window.setSecureScreen(Settings.enabledSecurity.value)
-    }
-
-    override fun finish() {
-        super.finish()
-        ActivityNavigator.applyPopAnimationsToPendingTransition(this)
-    }
-}

app/src/main/kotlin/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt

@@ -25,11 +25,11 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.client.thumbUrl
 import com.hippo.ehviewer.ui.screen.navWithUrl
 import com.hippo.ehviewer.util.addTextToClipboard

app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt

@@ -24,7 +24,10 @@ import android.content.pm.verify.domain.DomainVerificationManager
 import android.content.pm.verify.domain.DomainVerificationUserState.DOMAIN_STATE_NONE
 import android.net.Uri
 import android.os.Bundle
+import android.view.View
 import android.widget.Toast
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.SharedTransitionLayout
 import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.animation.core.animateDpAsState
@@ -63,14 +66,13 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfoV2
 import androidx.compose.material3.rememberDrawerState
 import androidx.compose.material3.rememberDrawerState2
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.currentCompositeKeyHashCode
@@ -97,14 +99,28 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.lerp
+import androidx.compose.ui.zIndex
 import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.LifecycleResumeEffect
 import androidx.navigation.compose.rememberNavController
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.toOkioPath
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.component.LabeledCheckbox
+import com.ehviewer.core.ui.component.LocalSideSheetState
+import com.ehviewer.core.ui.component.MutableSideSheet
+import com.ehviewer.core.ui.icons.EhIcons
+import com.ehviewer.core.ui.icons.filled.Subscriptions
+import com.ehviewer.core.ui.util.LocalSnackBarFabPadding
+import com.ehviewer.core.ui.util.LocalWindowSizeClass
+import com.ehviewer.core.util.isAtLeastQ
+import com.ehviewer.core.util.isAtLeastR
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.withIOContext
+import com.hippo.ehviewer.EhApplication.Companion.initialized
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser
@@ -112,8 +128,6 @@ import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.download.downloadLocation
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.filled.Subscriptions
 import com.hippo.ehviewer.ui.destinations.DownloadScreenDestination
 import com.hippo.ehviewer.ui.destinations.DownloadsScreenDestination
 import com.hippo.ehviewer.ui.destinations.FavouritesScreenDestination
@@ -130,8 +144,6 @@ import com.hippo.ehviewer.ui.screen.asDstWith
 import com.hippo.ehviewer.ui.screen.navWithUrl
 import com.hippo.ehviewer.ui.settings.showNewVersion
 import com.hippo.ehviewer.ui.tools.DialogState
-import com.hippo.ehviewer.ui.tools.LabeledCheckbox
-import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass
 import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel
 import com.hippo.ehviewer.ui.tools.awaitInputText
 import com.hippo.ehviewer.updater.AppUpdater
@@ -141,16 +153,12 @@ import com.hippo.ehviewer.util.calculateFraction
 import com.hippo.ehviewer.util.displayString
 import com.hippo.ehviewer.util.getParcelableExtraCompat
 import com.hippo.ehviewer.util.getUrlFromClipboard
-import com.hippo.ehviewer.util.isAtLeastQ
-import com.hippo.ehviewer.util.isAtLeastS
 import com.hippo.ehviewer.util.sha1
-import com.hippo.files.isDirectory
-import com.hippo.files.toOkioPath
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.spec.Direction
 import com.ramcosta.composedestinations.utils.currentDestinationAsState
 import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator
-import eu.kanade.tachiyomi.util.lang.withIOContext
+import eu.kanade.tachiyomi.util.view.setSecureScreen
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
@@ -173,7 +181,7 @@ private val navItems = arrayOf<Triple<Direction, Int, ImageVector>>(
     Triple(SettingsScreenDestination, R.string.settings, Icons.Default.Settings),
 )
 
-class MainActivity : EhActivity() {
+class MainActivity : AppCompatActivity() {
 
     private var shareUrl: String? = null
 
@@ -199,8 +207,17 @@ class MainActivity : EhActivity() {
 
     @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
     override fun onCreate(savedInstanceState: Bundle?) {
-        installSplashScreen()
+        installSplashScreen().setKeepOnScreenCondition { !initialized }
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        // https://issuetracker.google.com/204791558
+        // Fix system bars insets still exist in fullscreen mode on API < 30
+        @Suppress("DEPRECATION")
+        if (!isAtLeastR) {
+            with(window.decorView) {
+                systemUiVisibility = systemUiVisibility and View.SYSTEM_UI_FLAG_LAYOUT_STABLE.inv()
+            }
+        }
         setMD3Content {
             val configuration = LocalConfiguration.current
             val navDrawerState = rememberDrawerState(DrawerValue.Closed)
@@ -251,6 +268,15 @@ class MainActivity : EhActivity() {
                 }
             }
 
+            LaunchedEffect(Unit) {
+                Settings.enabledSecurity.valueFlow().collect {
+                    window.setSecureScreen(it)
+                }
+            }
+            if (isAuthenticationSupported()) {
+                SecurityScreen(onError = { moveTaskToBack(true) }, modifier = Modifier.zIndex(1f))
+            }
+
             val cannotParse = stringResource(R.string.error_cannot_parse_the_url)
             LaunchedEffect(Unit) {
                 intentFlow.collect { intent ->
@@ -274,7 +300,7 @@ class MainActivity : EhActivity() {
                             if ("text/plain" == type) {
                                 val keyword = intent.getStringExtra(Intent.EXTRA_TEXT)
                                 if (keyword != null && !navWithUrl(keyword)) {
-                                    navigate(ListUrlBuilder(mKeyword = keyword).asDst())
+                                    navigate(ListUrlBuilder(keyword = keyword).asDst())
                                 }
                             } else if (type != null && type.startsWith("image/")) {
                                 val uri = intent.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)
@@ -354,7 +380,7 @@ class MainActivity : EhActivity() {
             var snackbarFabPadding by remember { mutableStateOf(0.dp) }
             val drawerEnabled = drawerHandle.isNotEmpty()
             val density = LocalDensity.current
-            val adaptiveInfo = currentWindowAdaptiveInfo()
+            val adaptiveInfo = currentWindowAdaptiveInfoV2()
             val needSignIn by Settings.needSignIn.collectAsState()
             val launchPage by Settings.launchPage.collectAsState()
             CompositionLocalProvider(
@@ -532,7 +558,6 @@ val LocalNavDrawerState = compositionLocalOf<DrawerState> { error("CompositionLo
 
 val LocalDrawerHandle = compositionLocalOf<SnapshotStateList<Long>> { error("CompositionLocal LocalDrawerHandle not present!") }
 val LocalSnackBarHostState = compositionLocalOf<SnackbarHostState> { error("CompositionLocal LocalSnackBarHostState not present!") }
-val LocalSnackBarFabPadding = compositionLocalOf<State<Dp>> { error("CompositionLocal LocalSnackBarFabPadding not present!") }
 val LocalSharedTransitionScope = compositionLocalOf<SharedTransitionScope> { error("CompositionLocal LocalSharedTransitionScope not present!") }
 
 @Composable

app/src/main/kotlin/com/hippo/ehviewer/ui/SecurityActivity.kt

@@ -1,102 +0,0 @@
-/*
- * Copyright 2022 Tarsin Norbin
- *
- * This file is part of EhViewer
- *
- * EhViewer is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * EhViewer is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with EhViewer.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.hippo.ehviewer.ui
-
-import android.content.Context
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
-import androidx.biometric.AuthenticationRequest.Biometric
-import androidx.biometric.AuthenticationRequest.Companion.biometricRequest
-import androidx.biometric.AuthenticationResult
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
-import androidx.biometric.registerForAuthenticationResult
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import com.ehviewer.core.i18n.R
-import com.hippo.ehviewer.Settings
-
-context(ctx: Context)
-fun isAuthenticationSupported(): Boolean {
-    val authenticators = BiometricManager.Authenticators.BIOMETRIC_WEAK or DEVICE_CREDENTIAL
-    return BiometricManager.from(ctx).canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS
-}
-
-class SecurityActivity : AppCompatActivity() {
-    override fun onResume() {
-        super.onResume()
-        if (isAuthenticationSupported()) {
-            startAuthentication()
-        } else {
-            onSuccess()
-        }
-    }
-
-    private val authLauncher = registerForAuthenticationResult { result ->
-        when (result) {
-            is AuthenticationResult.Success -> onSuccess()
-            is AuthenticationResult.Error -> onError()
-        }
-    }
-
-    @Synchronized
-    private fun startAuthentication() {
-        if (isAuthenticating) return
-        isAuthenticating = true
-        val request = biometricRequest(
-            title = getString(R.string.settings_privacy_require_unlock),
-            authFallback = Biometric.Fallback.DeviceCredential,
-        ) {}
-        authLauncher.launch(request)
-    }
-
-    private fun onSuccess() {
-        isAuthenticating = false
-        locked = false
-        finish()
-    }
-
-    private fun onError() {
-        moveTaskToBack(true)
-        isAuthenticating = false
-    }
-}
-
-private var isAuthenticating = false
-var locked = true
-var lockedLastLeaveTime: Long = 0
-
-val lockObserver = object : DefaultLifecycleObserver {
-    override fun onPause(owner: LifecycleOwner) {
-        if (!locked) {
-            lockedLastLeaveTime = System.currentTimeMillis() / 1000
-        }
-        locked = true
-    }
-}
-
-fun Context.interceptSecurityOrReturn() {
-    val lockedResumeTime = System.currentTimeMillis() / 1000
-    val lockedDelayTime = lockedResumeTime - lockedLastLeaveTime
-    if (lockedDelayTime < Settings.securityDelay.value * 60) {
-        locked = false
-    } else if (Settings.security.value && isAuthenticationSupported() && locked) {
-        startActivity(Intent(this, SecurityActivity::class.java))
-    }
-}

app/src/main/kotlin/com/hippo/ehviewer/ui/SecurityScreen.kt

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2022 Tarsin Norbin
+ *
+ * This file is part of EhViewer
+ *
+ * EhViewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * EhViewer is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with EhViewer.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.hippo.ehviewer.ui
+
+import android.content.Context
+import androidx.biometric.AuthenticationRequest.Biometric
+import androidx.biometric.AuthenticationRequest.Companion.biometricRequest
+import androidx.biometric.AuthenticationResult
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
+import androidx.biometric.compose.rememberAuthenticationLauncher
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalWindowInfo
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.LifecycleResumeEffect
+import com.ehviewer.core.i18n.R
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.collectAsState
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.TimeSource
+
+context(ctx: Context)
+fun isAuthenticationSupported(): Boolean {
+    val authenticators = BiometricManager.Authenticators.BIOMETRIC_WEAK or DEVICE_CREDENTIAL
+    return BiometricManager.from(ctx).canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS
+}
+
+@Composable
+fun SecurityScreen(onError: () -> Unit, modifier: Modifier) {
+    val security by Settings.security.collectAsState()
+    var locked by remember { mutableStateOf(security) }
+    var isAuthenticating by remember { mutableStateOf(false) }
+    val title = stringResource(R.string.settings_privacy_require_unlock)
+    val launcher = rememberAuthenticationLauncher { result ->
+        isAuthenticating = false
+        when (result) {
+            is AuthenticationResult.Success -> locked = false
+            else -> onError()
+        }
+    }
+
+    @Synchronized
+    fun startAuthentication() {
+        if (isAuthenticating) return
+        isAuthenticating = true
+        val request = biometricRequest(title, Biometric.Fallback.DeviceCredential) {}
+        launcher.launch(request)
+    }
+
+    val securityDelay by Settings.securityDelay.collectAsState { it.minutes }
+    var leaveTime by remember { mutableStateOf(TimeSource.Monotonic.markNow()) }
+    LifecycleResumeEffect(Unit) {
+        if (security && leaveTime.elapsedNow() > securityDelay) {
+            locked = true
+        }
+        onPauseOrDispose {
+            if (!locked) {
+                leaveTime = TimeSource.Monotonic.markNow()
+            }
+        }
+    }
+
+    if (locked) {
+        val windowInfo = LocalWindowInfo.current
+        LaunchedEffect(windowInfo) {
+            snapshotFlow { windowInfo.isWindowFocused }.collect {
+                if (it) startAuthentication()
+            }
+        }
+        Surface(modifier = modifier.fillMaxSize()) {}
+    }
+}

app/src/main/kotlin/com/hippo/ehviewer/ui/Theme.kt

@@ -14,10 +14,10 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavBackStackEntry
+import com.ehviewer.core.ui.util.ProvideVectorPainterCache
 import com.hippo.ehviewer.ui.theme.EhTheme
 import com.hippo.ehviewer.ui.tools.DialogState
 import com.hippo.ehviewer.ui.tools.LocalGlobalDialogState
-import com.hippo.ehviewer.ui.tools.ProvideVectorPainterCache
 import com.ramcosta.composedestinations.animations.NavHostAnimatedDestinationStyle
 import me.zhanghai.compose.preference.ProvidePreferenceTheme
 import me.zhanghai.compose.preference.preferenceTheme

app/src/main/kotlin/com/hippo/ehviewer/ui/UrlOpener.kt

@@ -21,7 +21,7 @@ import android.widget.Toast
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.net.toUri
 import com.ehviewer.core.i18n.R
-import com.hippo.ehviewer.client.data.GalleryDetail
+import com.ehviewer.core.model.GalleryDetail
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 

app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/CoilImageGetter.kt

@@ -7,8 +7,9 @@ import coil3.decode.DecodeUtils
 import coil3.imageLoader
 import coil3.request.crossfade
 import coil3.size.Scale
+import coil3.size.Size
+import com.ehviewer.core.util.toIntOrDefault
 import com.hippo.ehviewer.ktbuilder.imageRequest
-import com.hippo.ehviewer.util.toIntOrDefault
 import kotlin.math.roundToInt
 import splitties.init.appCtx
 
@@ -21,7 +22,7 @@ class CoilImageGetter(private val onSuccess: () -> Unit) : Html.ImageGetter {
             val srcHeight = groupValues[2].toInt()
             val dstWidth = groupValues[3].toIntOrDefault(200)
             val dstHeight = dstWidth / 2 * 3
-            val multiplier = DecodeUtils.computeSizeMultiplier(srcWidth, srcHeight, dstWidth, dstHeight, Scale.FIT)
+            val multiplier = DecodeUtils.computeSizeMultiplier(srcWidth, srcHeight, dstWidth, dstHeight, Scale.FIT, Size.ORIGINAL)
             setBounds(0, 0, (srcWidth * multiplier).roundToInt(), (srcHeight * multiplier).roundToInt())
         } ?: setBounds(0, 0, 200, 300)
         with(appCtx) {

app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/LinkifyTextView.kt

@@ -41,6 +41,7 @@ class LinkifyTextView(
                     val x = event.x + scrollX - totalPaddingLeft
                     val y = event.y + scrollY - totalPaddingTop
                     val line = layout.getLineForVertical(y.toInt())
+                    if (x > layout.getLineMax(line)) return@let
                     val off = layout.getOffsetForHorizontal(line, x)
                     val spans = text.getSpans<URLSpan>(off, off)
                     if (spans.isNotEmpty()) {

app/src/main/kotlin/com/hippo/ehviewer/ui/login/PostLogin.kt

@@ -1,11 +1,11 @@
 package com.hippo.ehviewer.ui.login
 
 import arrow.core.Either.Companion.catch
+import com.ehviewer.core.network.EhCookieStore
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers

app/src/main/kotlin/com/hippo/ehviewer/ui/login/SignInScreen.kt

@@ -59,6 +59,12 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.util.LocalWindowSizeClass
+import com.ehviewer.core.ui.util.ifTrueThen
+import com.ehviewer.core.ui.util.isExpanded
+import com.ehviewer.core.ui.util.thenIf
+import com.ehviewer.core.util.launchIO
+import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
@@ -66,18 +72,12 @@ import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.Screen
 import com.hippo.ehviewer.ui.destinations.WebViewSignInScreenDestination
 import com.hippo.ehviewer.ui.openBrowser
-import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass
 import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel
-import com.hippo.ehviewer.ui.tools.isExpanded
-import com.hippo.ehviewer.ui.tools.thenIf
 import com.hippo.ehviewer.util.displayString
-import com.jamal.composeprefs3.ui.ifTrueThen
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.Job
-import moe.tarsin.launchIO
 import moe.tarsin.navigate
 
 @Destination<RootGraph>(start = true)

app/src/main/kotlin/com/hippo/ehviewer/ui/login/WebViewSignInScreen.kt

@@ -6,10 +6,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
+import com.ehviewer.core.network.EhCookieStore
 import com.google.accompanist.web.WebView
 import com.google.accompanist.web.rememberWebViewState
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.Screen
@@ -31,6 +31,7 @@ fun AnimatedVisibilityScope.WebViewSignInScreen(navigator: DestinationsNavigator
                     Settings.desktopSite.value = false
                 }
                 if (EhCookieStore.hasSignedIn()) {
+                    EhCookieStore.flush()
                     postLogin()
                     state.webView?.destroy()
                     bgWork { awaitCancellation() }

app/src/main/kotlin/com/hippo/ehviewer/ui/main/AvatarIcon.kt

@@ -44,6 +44,10 @@ import arrow.core.some
 import coil3.compose.AsyncImage
 import coil3.network.HttpException
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.component.RollingNumber
+import com.ehviewer.core.ui.component.RollingNumberPlaceholder
+import com.ehviewer.core.util.launch
+import com.ehviewer.core.util.launchIO
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils
@@ -65,8 +69,6 @@ import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import moe.tarsin.coroutines.runSwallowingWithUI
-import moe.tarsin.launch
-import moe.tarsin.launchIO
 
 private val limitScope = CoroutineScope(Dispatchers.IO)
 private val refreshEvent = MutableSharedFlow<Unit>()

app/src/main/kotlin/com/hippo/ehviewer/ui/main/DownloadCard.kt

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.DownloadDone
 import androidx.compose.material.icons.filled.Pause
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.Card
@@ -26,6 +27,7 @@ import androidx.compose.material3.ShapeDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.minimumInteractiveComponentSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.movableContentOf
 import androidx.compose.runtime.mutableIntStateOf
@@ -35,19 +37,18 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.i18n.R
-import com.hippo.ehviewer.Settings
+import com.ehviewer.core.ui.component.CrystalCard
+import com.ehviewer.core.ui.component.GalleryListCardRating
+import com.ehviewer.core.ui.util.TransitionsVisibilityScope
+import com.ehviewer.core.ui.util.listThumbGenerator
+import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.ui.tools.CrystalCard
-import com.hippo.ehviewer.ui.tools.GalleryListCardRating
-import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope
-import com.hippo.ehviewer.ui.tools.listThumbGenerator
 import com.hippo.ehviewer.util.FileUtils
 
 @Composable
@@ -60,6 +61,7 @@ fun DownloadCard(
     onStop: () -> Unit,
     info: DownloadInfo,
     selectMode: Boolean,
+    showProgress: Boolean,
     modifier: Modifier = Modifier,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
 ) = CrystalCard(modifier = modifier, onClick = onClick, onLongClick = onLongClick, interactionSource = interactionSource) {
@@ -99,7 +101,14 @@ fun DownloadCard(
                     DownloadInfo.STATE_NONE -> stringResource(R.string.download_state_none)
                     DownloadInfo.STATE_WAIT -> stringResource(R.string.download_state_wait)
                     DownloadInfo.STATE_FAILED -> if (info.legacy <= 0) stateFailed else stateFailed2
-                    DownloadInfo.STATE_FINISH -> stringResource(R.string.download_state_finish)
+                    DownloadInfo.STATE_FINISH -> {
+                        if (showProgress) {
+                            val readProgress by remember { EhDB.getReadProgressFlow(info.gid) }.collectAsState(0)
+                            if (readProgress > 0) "${readProgress + 1}/${info.pages}P" else "${info.pages}P"
+                        } else {
+                            "${info.pages}P"
+                        }
+                    }
                     else -> null // The item has been removed and this will be disposed soon
                 }
                 ProvideTextStyle(MaterialTheme.typography.labelLarge) {
@@ -149,24 +158,24 @@ fun DownloadCard(
                     Text(
                         text = categoryText,
                         modifier = Modifier.clip(ShapeDefaults.Small).background(categoryColor).padding(vertical = 2.dp, horizontal = 8.dp),
-                        color = if (Settings.harmonizeCategoryColor.value) Color.Unspecified else EhUtils.categoryTextColor,
+                        color = EhUtils.getCategoryTextColor(categoryColor),
                         style = MaterialTheme.typography.labelLarge,
                     )
                 }
                 Spacer(modifier = Modifier.weight(1f))
                 val running = downloadState == DownloadInfo.STATE_WAIT || downloadState == DownloadInfo.STATE_DOWNLOAD
-                val icon = remember {
+                val icon = when (downloadState) {
-                    movableContentOf<Boolean> {
+                    DownloadInfo.STATE_WAIT, DownloadInfo.STATE_DOWNLOAD -> Icons.Default.Pause
-                        Icon(imageVector = if (it) Icons.Default.Pause else Icons.Default.PlayArrow, contentDescription = null)
+                    DownloadInfo.STATE_FINISH -> Icons.Default.DownloadDone
-                    }
+                    else -> Icons.Default.PlayArrow
                 }
                 if (selectMode) {
                     Box(modifier = Modifier.offset(4.dp).minimumInteractiveComponentSize()) {
-                        icon(running)
+                        Icon(imageVector = icon, contentDescription = null)
                     }
                 } else {
                     IconButton(onClick = if (running) onStop else onStart, shapes = IconButtonDefaults.shapes(), modifier = Modifier.offset(4.dp)) {
-                        icon(running)
+                        Icon(imageVector = icon, contentDescription = null)
                     }
                 }
             }

app/src/main/kotlin/com/hippo/ehviewer/ui/main/EhAsyncThumb.kt

@@ -18,13 +18,13 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import coil3.compose.AsyncImagePainter
 import coil3.compose.rememberAsyncImagePainter
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.ui.util.SETNodeGenerator
+import com.ehviewer.core.ui.util.SharedElementBox
+import com.ehviewer.core.ui.util.TransitionsVisibilityScope
+import com.ehviewer.core.ui.util.thenIf
 import com.hippo.ehviewer.ktbuilder.imageRequest
-import com.hippo.ehviewer.ui.tools.SETNodeGenerator
-import com.hippo.ehviewer.ui.tools.SharedElementBox
-import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope
 import com.hippo.ehviewer.ui.tools.shouldCrop
-import com.hippo.ehviewer.ui.tools.thenIf
 
 @Composable
 @NonRestartableComposable

app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt

@@ -11,6 +11,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
+import com.ehviewer.core.ui.component.RollingNumber
 
 @Composable
 fun FundsItem(

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryComment.kt

@@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.text.parseAsHtml
 import com.ehviewer.core.i18n.R
-import com.hippo.ehviewer.client.data.GalleryComment
+import com.ehviewer.core.model.GalleryComment
 import com.hippo.ehviewer.ui.legacy.CoilImageGetter
 import com.hippo.ehviewer.ui.legacy.LinkifyTextView
 import com.hippo.ehviewer.util.ReadableTime

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryDetail.kt

@@ -33,13 +33,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.ui.icons.EhIcons
+import com.ehviewer.core.ui.icons.big.SadAndroid
+import com.ehviewer.core.ui.util.TransitionsVisibilityScope
+import com.ehviewer.core.ui.util.detailThumbGenerator
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.big.SadAndroid
-import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope
-import com.hippo.ehviewer.ui.tools.detailThumbGenerator
 
 @Composable
 fun GalleryDetailHeaderInfoCard(

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryInfo.kt

@@ -23,8 +23,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
 import androidx.compose.material3.ShapeDefaults
 import androidx.compose.material3.Text
-import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
@@ -33,22 +33,21 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.hippo.ehviewer.Settings
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
+import com.ehviewer.core.ui.component.CrystalCard
+import com.ehviewer.core.ui.component.ElevatedCard
+import com.ehviewer.core.ui.component.GalleryListCardRating
+import com.ehviewer.core.ui.util.SharedElementBox
+import com.ehviewer.core.ui.util.TransitionsVisibilityScope
+import com.ehviewer.core.ui.util.listThumbGenerator
+import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.ui.tools.CrystalCard
-import com.hippo.ehviewer.ui.tools.ElevatedCard
-import com.hippo.ehviewer.ui.tools.GalleryListCardRating
-import com.hippo.ehviewer.ui.tools.SharedElementBox
-import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope
-import com.hippo.ehviewer.ui.tools.listThumbGenerator
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 
 @Composable
@@ -58,6 +57,7 @@ fun GalleryInfoListItem(
     onLongClick: () -> Unit,
     info: GalleryInfo,
     showPages: Boolean,
+    showProgress: Boolean,
     modifier: Modifier = Modifier,
     isInFavScene: Boolean = false,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
@@ -126,7 +126,12 @@ fun GalleryInfoListItem(
                         Text(text = it)
                     }
                     if (info.pages != 0 && showPages) {
-                        Text(text = "${info.pages}P")
+                        val readProgress = if (showProgress) {
+                            remember { EhDB.getReadProgressFlow(info.gid) }.collectAsState(0).value
+                        } else {
+                            0
+                        }
+                        Text(text = if (readProgress > 0) "${readProgress + 1}/${info.pages}P" else "${info.pages}P")
                     }
                 }
                 Row(verticalAlignment = Alignment.CenterVertically) {
@@ -135,7 +140,7 @@ fun GalleryInfoListItem(
                     Text(
                         text = categoryText,
                         modifier = Modifier.clip(ShapeDefaults.Small).background(categoryColor).padding(vertical = 2.dp, horizontal = 8.dp),
-                        color = if (Settings.harmonizeCategoryColor.value) Color.Unspecified else EhUtils.categoryTextColor,
+                        color = EhUtils.getCategoryTextColor(categoryColor),
                     )
                     Spacer(modifier = Modifier.weight(1f))
                     Text(text = info.posted.orEmpty())
@@ -154,6 +159,7 @@ fun GalleryInfoGridItem(
     modifier: Modifier = Modifier,
     showLanguage: Boolean = true,
     showPages: Boolean = true,
+    showProgress: Boolean = true,
     showFavoriteStatus: Boolean = true,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
 ) = ElevatedCard(
@@ -187,11 +193,16 @@ fun GalleryInfoGridItem(
         Badge(
             modifier = Modifier.align(Alignment.TopEnd).widthIn(min = 32.dp).height(24.dp),
             containerColor = categoryColor,
-            contentColor = if (Settings.harmonizeCategoryColor.value) contentColorFor(categoryColor) else EhUtils.categoryTextColor,
+            contentColor = EhUtils.getCategoryTextColor(categoryColor),
         ) {
             val shouldShowLanguage = showLanguage && info.simpleLanguage != null
             if (showPages && info.pages > 0) {
-                Text(text = "${info.pages}")
+                val readProgress = if (showProgress) {
+                    remember { EhDB.getReadProgressFlow(info.gid) }.collectAsState(0).value
+                } else {
+                    0
+                }
+                Text(text = if (readProgress > 0) "${readProgress + 1}/${info.pages}" else "${info.pages}")
                 if (shouldShowLanguage) {
                     Spacer(modifier = Modifier.width(4.dp))
                 }

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt

@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.grid.GridCells
@@ -32,7 +33,6 @@ import androidx.compose.material3.pulltorefresh.pullToRefresh
 import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -45,38 +45,28 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.ui.component.FastScrollLazyVerticalGrid
+import com.ehviewer.core.ui.component.FastScrollLazyVerticalStaggeredGrid
+import com.ehviewer.core.ui.icons.EhIcons
+import com.ehviewer.core.ui.icons.big.SadAndroid
+import com.ehviewer.core.util.launch
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.exception.NoHitsFoundException
 import com.hippo.ehviewer.coil.PrefetchAround
 import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.big.SadAndroid
 import com.hippo.ehviewer.ktbuilder.imageRequest
 import com.hippo.ehviewer.ui.screen.collectDetailSizeAsState
-import com.hippo.ehviewer.ui.tools.FastScrollLazyVerticalGrid
-import com.hippo.ehviewer.ui.tools.FastScrollLazyVerticalStaggeredGrid
 import com.hippo.ehviewer.util.displayString
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
-import moe.tarsin.launch
-
-@Stable
-operator fun PaddingValues.plus(r: PaddingValues) = object : PaddingValues {
-    val l = this@plus
-    override fun calculateBottomPadding() = l.calculateBottomPadding() + r.calculateBottomPadding()
-    override fun calculateLeftPadding(layoutDirection: LayoutDirection) = l.calculateLeftPadding(layoutDirection) + r.calculateLeftPadding(layoutDirection)
-    override fun calculateRightPadding(layoutDirection: LayoutDirection) = l.calculateRightPadding(layoutDirection) + r.calculateRightPadding(layoutDirection)
-    override fun calculateTopPadding() = l.calculateTopPadding() + r.calculateTopPadding()
-}
 
 @Composable
 context(_: CoroutineScope, _: Context)
@@ -207,7 +197,6 @@ fun GalleryList(
                     }
                 }
             }
-
             is LoadState.Error -> {
                 Surface {
                     ErrorTip(
@@ -216,7 +205,6 @@ fun GalleryList(
                     )
                 }
             }
-
             is LoadState.NotLoading -> if (data.itemCount == 0) {
                 // Only for local favorites as empty gallery lists from network are treated as error
                 ErrorTip(modifier = Modifier.widthIn(max = 228.dp), text = stringResource(id = R.string.gallery_list_empty_hit))

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryPreview.kt

@@ -23,10 +23,10 @@ import androidx.compose.ui.unit.IntSize
 import coil3.BitmapImage
 import coil3.compose.AsyncImagePainter.State
 import coil3.compose.rememberAsyncImagePainter
-import com.hippo.ehviewer.client.data.GalleryPreview
+import com.ehviewer.core.model.GalleryPreview
-import com.hippo.ehviewer.client.data.V2GalleryPreview
+import com.ehviewer.core.model.V2GalleryPreview
+import com.ehviewer.core.ui.component.CrystalCard
 import com.hippo.ehviewer.ktbuilder.imageRequest
-import com.hippo.ehviewer.ui.tools.CrystalCard
 import com.hippo.ehviewer.ui.tools.shouldCrop
 
 @Composable

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryTag.kt

@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -19,14 +20,15 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.ehviewer.core.model.GalleryTagGroup
+import com.ehviewer.core.model.PowerStatus
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.model.VoteStatus
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
-import com.hippo.ehviewer.client.data.GalleryTagGroup
-import com.hippo.ehviewer.client.data.PowerStatus
-import com.hippo.ehviewer.client.data.TagNamespace
-import com.hippo.ehviewer.client.data.VoteStatus
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.ui.tools.includeFontPadding
 
@@ -59,6 +61,7 @@ fun GalleryTags(
                             BaseRoundText(
                                 text = translation,
                                 weak = power == PowerStatus.Weak,
+                                solid = power == PowerStatus.Solid && showVote,
                                 modifier = Modifier.combinedClickable(
                                     onClick = { onTagClick(tag) },
                                     onLongClick = {
@@ -88,6 +91,7 @@ private fun BaseRoundText(
     text: String,
     modifier: Modifier = Modifier,
     weak: Boolean = false,
+    solid: Boolean = false,
     isGroup: Boolean = false,
 ) {
     val bgColor = if (isGroup) {
@@ -103,8 +107,9 @@ private fun BaseRoundText(
         Text(
             text = text,
             modifier = modifier.padding(horizontal = 12.dp, vertical = 4.dp).width(IntrinsicSize.Max),
-            color = MaterialTheme.colorScheme.onSurface.let { if (weak) it.copy(0.5F) else it },
+            color = LocalContentColor.current.let { if (weak) it.copy(0.5F) else it },
             style = MaterialTheme.typography.labelLarge.includeFontPadding,
+            textDecoration = if (solid) TextDecoration.Underline else null,
         )
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/ui/main/LoadStateIndicator.kt

@@ -22,7 +22,6 @@ fun LoadStateIndicator(
     is LoadState.Loading -> {
         LinearWavyProgressIndicator(modifier = modifier)
     }
-
     is LoadState.Error -> {
         Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) {
             Text(text = state.error.displayString())
@@ -31,6 +30,5 @@ fun LoadStateIndicator(
             }
         }
     }
-
     is LoadState.NotLoading -> Unit
 }

app/src/main/kotlin/com/hippo/ehviewer/ui/main/SearchFilter.kt

@@ -34,20 +34,20 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import arrow.core.raise.ensure
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryInfo.Companion.S_LANG_TAGS
+import com.ehviewer.core.ui.component.DropdownFilterChip
+import com.ehviewer.core.ui.util.thenIf
+import com.ehviewer.core.util.launch
+import com.ehviewer.core.util.toIntOrDefault
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANG_TAGS
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.ui.tools.DialogState
-import com.hippo.ehviewer.ui.tools.DropdownFilterChip
 import com.hippo.ehviewer.ui.tools.awaitResult
-import com.hippo.ehviewer.ui.tools.thenIf
-import com.hippo.ehviewer.util.toIntOrDefault
 import kotlinx.coroutines.CoroutineScope
-import moe.tarsin.launch
 
-private val categoryTable = arrayOf(
+private val categoryTable = [
     EhUtils.DOUJINSHI to R.string.doujinshi,
     EhUtils.MANGA to R.string.manga,
     EhUtils.ARTIST_CG to R.string.artist_cg,
@@ -58,7 +58,7 @@ private val categoryTable = arrayOf(
     EhUtils.COSPLAY to R.string.cosplay,
     EhUtils.ASIAN_PORN to R.string.asian_porn,
     EhUtils.MISC to R.string.misc,
-)
+]
 
 @Composable
 context(_: DialogState, _: CoroutineScope, _: Context)
@@ -193,9 +193,6 @@ fun SearchFilter(
                             }
                             if (error != null) {
                                 ListItem(
-                                    headlineContent = {
-                                        Text(text = error, style = MaterialTheme.typography.bodySmall)
-                                    },
                                     leadingContent = {
                                         Icon(imageVector = Icons.Default.Info, contentDescription = null)
                                     },
@@ -204,6 +201,9 @@ fun SearchFilter(
                                         headlineColor = MaterialTheme.colorScheme.error,
                                         leadingIconColor = MaterialTheme.colorScheme.error,
                                     ),
+                                    content = {
+                                        Text(text = error, style = MaterialTheme.typography.bodySmall)
+                                    },
                                 )
                             }
                         }