Prepare for release 1.14.2

Prepare changelog for 1.14.2
Remove confusing connect timeout configuration
2025-08-16 22:23:45 +08:00 · 2025-08-16 22:19:58 +08:00 · 2025-08-16 22:19:58 +08:00 · 2025-08-16 17:21:53 +08:00 · 2025-08-15 17:51:31 +08:00 · 2025-08-15 08:33:52 +00:00
512 changed files with 23948 additions and 22982 deletions
@@ -2,3 +2,4 @@
 ij_kotlin_imports_layout = *
 ktlint_code_style = intellij_idea
 ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_class-signature = disabled
@@ -0,0 +1 @@
+*.sh eol=lf
@@ -0,0 +1,65 @@
+name: Baseline profile generation
+
+on:
+  schedule:
+    - cron: '30 0 * * *'
+  workflow_dispatch:
+  push:
+    branches:
+      - '**'
+    paths:
+      - 'benchmark/**'
+      - '.github/workflows/baseline-profile.yml'
+
+jobs:
+  baseline-profile:
+    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: Upload reports
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: reports
+          path: benchmark/build/reports
@@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5

      - name: Setup Java
        uses: actions/setup-java@v4
@@ -21,7 +21,7 @@ jobs:
          java-version: 21

      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+        run: rustup target add armv7-linux-androideabi

      - name: Rust Cache
        uses: Swatinem/rust-cache@v2
@@ -35,21 +35,27 @@ jobs:

      - name: Clippy Check
        working-directory: ./app/src/main/rust
-        run: cargo clippy --all-targets --all-features -- -D warnings
+        run: cargo clippy --target aarch64-linux-android --all-features -- -D warnings

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        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

-  oss:
+      - name: Lint Check
+        run: ./gradlew lintMarshmallowRelease
+
+  default:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5

      - name: Setup Java
        uses: actions/setup-java@v4
@@ -58,7 +64,7 @@ jobs:
          java-version: 21

      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+        run: rustup target add armv7-linux-androideabi

      - name: Rust Cache
        uses: Swatinem/rust-cache@v2
@@ -68,62 +74,56 @@ jobs:
          save-if: "false"

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
        with:
          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          gradle-home-cache-cleanup: true

      - name: CMake Cache
        uses: actions/cache@v4
        with:
          path: app/.cxx
-          key: cmake-default-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
+          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 OSS
-        run: ./gradlew assembleDefaultOssRelease
+      - name: Build
+        run: ./gradlew assembleDefaultRelease

-      - name: Upload OSS ARM64
+      - name: Upload ARM64
        uses: actions/upload-artifact@v4
        with:
-          name: default-oss-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/defaultOss/release/app-default-oss-arm64-v8a-release.apk
+          name: default-arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/default/release/app-default-arm64-v8a-release.apk

-      - name: Upload OSS x86_64
+      - name: Upload x86_64
        uses: actions/upload-artifact@v4
        with:
-          name: default-oss-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/defaultOss/release/app-default-oss-x86_64-release.apk
+          name: default-x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/default/release/app-default-x86_64-release.apk

-      - name: Upload OSS ARM32
+      - name: Upload ARM32
        uses: actions/upload-artifact@v4
        with:
-          name: default-oss-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/defaultOss/release/app-default-oss-armeabi-v7a-release.apk
+          name: default-armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk

-      - name: Upload OSS x86
+      - name: Upload mapping
+        if: always()
        uses: actions/upload-artifact@v4
        with:
-          name: default-oss-x86-${{ github.sha }}
-          path: app/build/outputs/apk/defaultOss/release/app-default-oss-x86-release.apk
+          name: default-mapping-${{ github.sha }}
+          path: app/build/outputs/mapping/defaultRelease

-      - name: Upload OSS mapping
+      - name: Upload native debug symbols
        uses: actions/upload-artifact@v4
        with:
-          name: default-oss-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/defaultOssRelease/mapping.txt
+          name: default-native-debug-symbols-${{ github.sha }}
+          path: app/build/outputs/native-debug-symbols/defaultRelease/native-debug-symbols.zip

-      - name: Upload OSS native debug symbols
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-oss-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/defaultOssRelease/native-debug-symbols.zip
-
-  gms:
+  marshmallow:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5

      - name: Setup Java
        uses: actions/setup-java@v4
@@ -132,7 +132,7 @@ jobs:
          java-version: 21

      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+        run: rustup target add armv7-linux-androideabi

      - name: Rust Cache
        uses: Swatinem/rust-cache@v2
@@ -142,210 +142,47 @@ jobs:
          save-if: "false"

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
        with:
          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          gradle-home-cache-cleanup: true
-
-      - name: CMake Cache
-        uses: actions/cache/restore@v4
-        with:
-          path: app/.cxx
-          key: cmake-default-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
-          restore-keys: cmake-default-
-
-      - name: Install Build Tools
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1"
-
-      - name: Build GMS
-        run: ./gradlew assembleDefaultGmsRelease
-
-      - name: Upload GMS ARM64
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-gms-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/defaultGms/release/app-default-gms-arm64-v8a-release.apk
-
-      - name: Upload GMS x86_64
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-gms-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/defaultGms/release/app-default-gms-x86_64-release.apk
-
-      - name: Upload GMS ARM32
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-gms-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/defaultGms/release/app-default-gms-armeabi-v7a-release.apk
-
-      - name: Upload GMS x86
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-gms-x86-${{ github.sha }}
-          path: app/build/outputs/apk/defaultGms/release/app-default-gms-x86-release.apk
-
-      - name: Upload GMS mapping
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-gms-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/defaultGmsRelease/mapping.txt
-
-      - name: Upload GMS native debug symbols
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-gms-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/defaultGmsRelease/native-debug-symbols.zip
-
-  marshmallow-oss:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
-
-      - 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@v3
-        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          gradle-home-cache-cleanup: true

      - name: CMake Cache
        uses: actions/cache@v4
        with:
          path: app/.cxx
-          key: cmake-marshmallow-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
+          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: Install Build Tools
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1"
+      - name: Build
+        run: ./gradlew assembleMarshmallowRelease

-      - name: Build Marshmallow OSS
-        run: ./gradlew assembleMarshmallowOssRelease
-
-      - name: Upload Marshmallow OSS ARM64
+      - name: Upload ARM64
        uses: actions/upload-artifact@v4
        with:
-          name: marshmallow-oss-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-arm64-v8a-release.apk
+          name: marshmallow-arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-arm64-v8a-release.apk

-      - name: Upload Marshmallow OSS x86_64
+      - name: Upload x86_64
        uses: actions/upload-artifact@v4
        with:
-          name: marshmallow-oss-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-x86_64-release.apk
+          name: marshmallow-x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-x86_64-release.apk

-      - name: Upload Marshmallow OSS ARM32
+      - name: Upload ARM32
        uses: actions/upload-artifact@v4
        with:
-          name: marshmallow-oss-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-armeabi-v7a-release.apk
+          name: marshmallow-armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-armeabi-v7a-release.apk

-      - name: Upload Marshmallow OSS x86
+      - name: Upload mapping
+        if: always()
        uses: actions/upload-artifact@v4
        with:
-          name: marshmallow-oss-x86-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-x86-release.apk
+          name: marshmallow-mapping-${{ github.sha }}
+          path: app/build/outputs/mapping/marshmallowRelease

-      - name: Upload Marshmallow OSS mapping
+      - name: Upload native debug symbols
        uses: actions/upload-artifact@v4
        with:
-          name: marshmallow-oss-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/marshmallowOssRelease/mapping.txt
-
-      - name: Upload Marshmallow OSS native debug symbols
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-oss-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/marshmallowOssRelease/native-debug-symbols.zip
-
-  marshmallow-gms:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
-
-      - 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@v3
-        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          gradle-home-cache-cleanup: true
-
-      - name: CMake Cache
-        uses: actions/cache/restore@v4
-        with:
-          path: app/.cxx
-          key: cmake-marshmallow-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
-          restore-keys: cmake-marshmallow-
-
-      - name: Install Build Tools
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1"
-
-      - name: Build Marshmallow GMS
-        run: ./gradlew assembleMarshmallowGmsRelease
-
-      - name: Upload Marshmallow GMS ARM64
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-gms-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-arm64-v8a-release.apk
-
-      - name: Upload Marshmallow GMS x86_64
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-gms-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-x86_64-release.apk
-
-      - name: Upload Marshmallow GMS ARM32
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-gms-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-armeabi-v7a-release.apk
-
-      - name: Upload Marshmallow GMS x86
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-gms-x86-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-x86-release.apk
-
-      - name: Upload Marshmallow GMS mapping
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-gms-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/marshmallowGmsRelease/mapping.txt
-
-      - name: Upload Marshmallow GMS native debug symbols
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-gms-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/marshmallowGmsRelease/native-debug-symbols.zip
+          name: marshmallow-native-debug-symbols-${{ github.sha }}
+          path: app/build/outputs/native-debug-symbols/marshmallowRelease/native-debug-symbols.zip
@@ -2,7 +2,7 @@ name: 'Lock Threads'

 on:
  schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 8 * * *'
  workflow_dispatch:

 permissions:
@@ -6,12 +6,20 @@ on:
      - "*"

 jobs:
-  linux:
-    name: Build
+  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@v4
+        uses: actions/checkout@v5

      - name: Setup Java
        uses: actions/setup-java@v4
@@ -20,7 +28,7 @@ jobs:
          java-version: 21

      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi

      - name: Rust Cache
        uses: Swatinem/rust-cache@v2
@@ -28,86 +36,55 @@ jobs:
          workspaces: "./app/src/main/rust"

      - name: CMake Cache
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
        with:
-          path: |
-            app/.cxx
-            app/src/main/cpp/nettle/nettle
-          key: ${{ runner.os }}-cmake-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
-          restore-keys: ${{ runner.os }}-cmake-
+          path: app/.cxx
+          key: cmake-

-      - name: Gradle Build
-        uses: gradle/actions/setup-gradle@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
        with:
-          arguments: assembleRelease
+          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/defaultOss/release/app-default-oss-universal-release.apk EhViewer-${{ github.ref_name }}-default-oss-universal.apk
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-default-oss-arm64-v8a.apk
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-x86_64-release.apk EhViewer-${{ github.ref_name }}-default-oss-x86_64.apk
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-x86-release.apk EhViewer-${{ github.ref_name }}-default-oss-x86.apk
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-default-oss-armeabi-v7a.apk
-          mv app/build/outputs/mapping/defaultOssRelease/mapping.txt EhViewer-${{ github.ref_name }}-default-oss-mapping.txt
-          mv app/build/outputs/native-debug-symbols/defaultOssRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-default-oss-native-debug-symbols.zip
+          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/defaultGms/release/app-default-gms-universal-release.apk EhViewer-${{ github.ref_name }}-default-gms-universal.apk
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-default-gms-arm64-v8a.apk
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-x86_64-release.apk EhViewer-${{ github.ref_name }}-default-gms-x86_64.apk
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-x86-release.apk EhViewer-${{ github.ref_name }}-default-gms-x86.apk
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-default-gms-armeabi-v7a.apk
-          mv app/build/outputs/mapping/defaultGmsRelease/mapping.txt EhViewer-${{ github.ref_name }}-default-gms-mapping.txt
-          mv app/build/outputs/native-debug-symbols/defaultGmsRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-default-gms-native-debug-symbols.zip
-
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-universal-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-universal.apk
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-arm64-v8a.apk
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-x86_64-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-x86_64.apk
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-x86-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-x86.apk
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-armeabi-v7a.apk
-          mv app/build/outputs/mapping/marshmallowOssRelease/mapping.txt EhViewer-${{ github.ref_name }}-marshmallow-oss-mapping.txt
-          mv app/build/outputs/native-debug-symbols/marshmallowOssRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-marshmallow-oss-native-debug-symbols.zip
-
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-universal-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-universal.apk
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-arm64-v8a.apk
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-x86_64-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-x86_64.apk
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-x86-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-x86.apk
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-armeabi-v7a.apk
-          mv app/build/outputs/mapping/marshmallowGmsRelease/mapping.txt EhViewer-${{ github.ref_name }}-marshmallow-gms-mapping.txt
-          mv app/build/outputs/native-debug-symbols/marshmallowGmsRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-marshmallow-gms-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-oss-universal.apk
-            EhViewer-${{ github.ref_name }}-default-oss-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-default-oss-x86_64.apk
-            EhViewer-${{ github.ref_name }}-default-oss-x86.apk
-            EhViewer-${{ github.ref_name }}-default-oss-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-default-oss-mapping.txt
-            EhViewer-${{ github.ref_name }}-default-oss-native-debug-symbols.zip
+            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 }}-default-gms-universal.apk
-            EhViewer-${{ github.ref_name }}-default-gms-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-default-gms-x86_64.apk
-            EhViewer-${{ github.ref_name }}-default-gms-x86.apk
-            EhViewer-${{ github.ref_name }}-default-gms-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-default-gms-mapping.txt
-            EhViewer-${{ github.ref_name }}-default-gms-native-debug-symbols.zip
-
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-universal.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-x86_64.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-x86.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-mapping.txt
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-native-debug-symbols.zip
-
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-universal.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-x86_64.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-x86.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-mapping.txt
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-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
@@ -1,8 +1,10 @@
 .gradle
 /local.properties
 .DS_Store
-/build
-/.kotlin
+build
+.cxx
+.kotlin
 *.iml
 .idea
+.vscode
 /captures
@@ -1,5 +1,354 @@
 # 变更日志

+## [1.14.2] - 2025-08-16
+
+### 改进
+
+* [下载] 支持将最低下载速度设为 0 [#2545](https://github.com/FooIbar/EhViewer/issues/2545)
+* [下载] 移除令人困惑的连接超时设置 [#2556](https://github.com/FooIbar/EhViewer/issues/2556)
+
+### Bug 修复
+
+* 下载速度计算不准确导致下载失败误报 [#2545](https://github.com/FooIbar/EhViewer/issues/2545)
+* 无法解析带有 location: 标签的画廊
+
+
+## [1.14.1] - 2025-07-31
+
+### 改进
+
+* 更新 GitHub 访问令牌
+
+
+## [1.14.0] - 2025-07-23
+
+### 重大变更
+
+* 默认隐藏分数为 -100 的评论
+* 迁移部分组件到 Material 3 Expressive
+
+### 新功能
+
+* [EH] 支持显示标签投票状态
+* 支持添加画廊标签时自动补全
+* [下载] 支持指定连接超时和最低响应速度 [#1915](https://github.com/FooIbar/EhViewer/issues/1915)
+* [阅读器] 支持反转物理按键控制 [#1962](https://github.com/FooIbar/EhViewer/issues/1962)
+* [高级] 支持禁用 QUIC 支持
+* [高级] 重新添加桌面版网站选项以绕过 Cloudflare [#2230](https://github.com/FooIbar/EhViewer/issues/2230)
+* 支持 Android 6.0 上的动画 WebP
+
+### 改进
+
+* 优化压缩包加载性能
+* 优化预加载策略
+* 更新日本语翻译
+* 为已选中的项目使用不同的颜色 [#2121](https://github.com/FooIbar/EhViewer/issues/2121)
+* 缩略图模式下显示已收藏图标 [#2128](https://github.com/FooIbar/EhViewer/issues/2128)
+* 迁移大部分解析器到 Rust 实现
+* 优化动画 WebP 解码性能 [#2415](https://github.com/FooIbar/EhViewer/issues/2415)
+* 优化标签自动补全命中率 [#2473](https://github.com/FooIbar/EhViewer/issues/2473)
+* 在状态栏后绘制半透明背景以提高对比度
+* 杂项优化
+
+### Bug 修复
+
+* 退出阅读器时崩溃
+* Android 8.0 以下的设备无法读取某些压缩包
+* 列表模式下点击画廊封面无法进入详情页
+* 点击某些评论时崩溃
+* 开启裁剪边缘时某些图片被不正确裁剪
+* 下载数较多时无网络时启动 app 时崩溃 [#2041](https://github.com/FooIbar/EhViewer/issues/2041)
+* 标签翻译数据无法更新 [#2075](https://github.com/FooIbar/EhViewer/issues/2075)
+* 画廊详情页面显示的收藏夹名称错误 [#2081](https://github.com/FooIbar/EhViewer/issues/2081)
+* 不使用 CI 频道时无法更新
+* 添加后移动快捷搜索闪退 [#2124](https://github.com/FooIbar/EhViewer/issues/2124)
+* 某些数据无法导入
+* App 位于后台时清除下载通知时崩溃
+* 杂项修复
+
+
+## [1.13.1] - 2024-11-11
+
+### 重大变更
+
+* 由于网站限制，移除搜索封面功能
+* 移除桌面版网站选项，默认使用 1280x 分辨率
+
+### 改进
+
+* 更新日本语翻译
+* 优化压缩包读取
+* 缓解某些小米系统上应用闪退 [#1826](https://github.com/FooIbar/EhViewer/issues/1826)
+* 杂项优化
+
+### Bug 修复
+
+* Android 9 上的下载失败误报 [#1914](https://github.com/FooIbar/EhViewer/issues/1914)
+
+
+## [1.13.0] - 2024-11-01
+
+### 重大变更
+
+* 不再捆绑 Cronet 库，在不支持 HttpEngine 的设备上回退到 OkHttp
+* 适配 E 站缩略图和 WebP 等相关变更
+
+### 改进
+
+* 使用磁力链接代替种子下载
+* 在搜索栏右侧显示论坛头像
+* 支持重置下载路径
+* 为 Android 10 以下且没有 DocumentsUI 的设备创建默认下载目录 [#1735](https://github.com/FooIbar/EhViewer/issues/1735)
+* 重新添加了强制使用 e-hentai 缩略图服务器的选项
+* 阅读器支持 PageUp/PageDown 和方向键上/下翻页 [#1801](https://github.com/FooIbar/EhViewer/issues/1801)
+* 未找到搜索结果时显示可能存在的警告 [#1787](https://github.com/FooIbar/EhViewer/issues/1787)
+* 更新了日本语翻译
+* 杂项优化
+
+### Bug 修复
+
+* 阅读器屏幕方向与手机屏幕方向不同时闪退 [#1779](https://github.com/FooIbar/EhViewer/issues/1779)
+* 下载文件哈希不匹配导致下载失败 [#1811](https://github.com/FooIbar/EhViewer/issues/1811)
+* 无法同时下载和查看 [#1822](https://github.com/FooIbar/EhViewer/issues/1822)
+* 杂项修复
+
+
+## [1.12.1] - 2024-09-28
+
+### 新功能
+
+* 屏蔽含有二维码的图片（位于高级设置）
+
+### 改进
+
+* 移除高级设置中的自定义 User Agent，改为桌面版网站选项
+* 画廊预览与画廊详情页面合并
+* 为快速搜索和下载标签列表添加了滚动条
+* 无网络条件下启动时自动转到下载页面
+* 杂项优化
+
+### Bug 修复
+
+* 从左到右或右到左模式观看使用鼠标滚轮无法翻页 [#1541](https://github.com/FooIbar/EhViewer/issues/1541)
+* 状态栏颜色未跟随阅读器主题变化 [#1542](https://github.com/FooIbar/EhViewer/issues/1542)
+* 打开 EH 设置时闪退 [#1563](https://github.com/FooIbar/EhViewer/issues/1563)
+* 画廊种子过多时显示没有种子 [#1561](https://github.com/FooIbar/EhViewer/issues/1561)
+* 加载大于 100 MB 的位图时崩溃
+* 阅读器加载小圆圈在黑色背景下不自动变色 [#1579](https://github.com/FooIbar/EhViewer/issues/1579)
+* 因闪退造成的无法挽回的下载失败 [#1602](https://github.com/FooIbar/EhViewer/issues/1602)
+* 某些情况下闪退 [#1548](https://github.com/FooIbar/EhViewer/issues/1548) [#1555](https://github.com/FooIbar/EhViewer/issues/1555) [#1568](https://github.com/FooIbar/EhViewer/issues/1568)
+* Android 7.0 及以下的设备无法加载图片 [#1633](https://github.com/FooIbar/EhViewer/issues/1633)
+* 某些情况下导入数据失败 [#1634](https://github.com/FooIbar/EhViewer/issues/1634)
+* 下载时创建重复文件夹 [#1619](https://github.com/FooIbar/EhViewer/issues/1619)
+* 滚动方向改变后预载图片不生效 [#1560](https://github.com/FooIbar/EhViewer/issues/1560)
+* 选择无效的下载位置后闪退
+* 杂项修复
+
+
+## [1.12.0] - 2024-08-19
+
+### 重大变更
+
+* Compose 阅读器已稳定，移除了旧阅读器实现 [#847](https://github.com/FooIbar/EhViewer/issues/847)
+* 由于 E 站缩略图服务器变更，移除了强制使用 e-hentai 缩略图服务器的选项
+
+### 改进
+
+* 更新高级搜索选项中页数过滤器的范围限制以遵循 E 站变更
+
+### Bug 修复
+
+* 评论页面刷新指示器边距不正确 [#1428](https://github.com/FooIbar/EhViewer/issues/1428)
+* 关闭打开失败的压缩包时崩溃
+* 无法打开带密码的压缩包 [#1454](https://github.com/FooIbar/EhViewer/issues/1454)
+* 使用音量键翻页时无法关闭过渡动画 [#1467](https://github.com/FooIbar/EhViewer/issues/1467)
+* 带有图片的评论显示错位 [#1468](https://github.com/FooIbar/EhViewer/issues/1468)
+* 在包含相同项目的页面间切换时崩溃 [#1490](https://github.com/FooIbar/EhViewer/issues/1490)
+* 无法检查更新 [#1512](https://github.com/FooIbar/EhViewer/issues/1512)
+* 画廊详情未加载完成时退出阅读器导致崩溃 [#1507](https://github.com/FooIbar/EhViewer/issues/1507)
+* 无法为带有临时标签的画廊生成 ComicInfo.xml [#1509](https://github.com/FooIbar/EhViewer/issues/1509)
+* 已下载的画廊翻页时出现加载动画 [#1510](https://github.com/FooIbar/EhViewer/issues/1510)
+* 画廊详情页面的缩略图无法加载 [#1529](https://github.com/FooIbar/EhViewer/issues/1529)
+* 图片未加载完成时无法通过点击翻页
+* 搜索结果为空时解析失败 [#1418](https://github.com/FooIbar/EhViewer/issues/1418)
+* 缩略图分辨率设置不起作用
+
+
+## [1.11.7] - 2024-07-10
+
+### Bug 修复
+
+* 无法下载标题包含 # 或 % 的画廊
+* 下载页数较多的画廊时应用无响应
+* 退出搜索栏时文本闪烁
+
+
+## [1.11.6] - 2024-07-09 [YANKED]
+
+### 改进
+
+* 某些设备上无法加载长图时可尝试减小 设置-高级 中的硬件位图阈值 [#1321](https://github.com/FooIbar/EhViewer/issues/1321)
+* 清理下载冗余时显示确认对话框 [#1369](https://github.com/FooIbar/EhViewer/issues/1369)
+* 修改收藏时显示收藏备注 [#1392](https://github.com/FooIbar/EhViewer/issues/1392)
+
+### Bug 修复
+
+* 图片完整性校验误报 [#1286](https://github.com/FooIbar/EhViewer/issues/1286)
+* 某些情况下应用崩溃 [#1290](https://github.com/FooIbar/EhViewer/issues/1290) [#1302](https://github.com/FooIbar/EhViewer/issues/1302)
+* 某些情况下渲染问题 [#1284](https://github.com/FooIbar/EhViewer/issues/1284)
+* 无法下载标题过长的画廊 [#1340](https://github.com/FooIbar/EhViewer/issues/1340)
+* 某些界面拖动滚动条时黑屏 [#1329](https://github.com/FooIbar/EhViewer/issues/1329)
+* 搜索栏多行文本遮挡其他内容 [#1365](https://github.com/FooIbar/EhViewer/issues/1365)
+* CIFS Documents Provider 兼容问题 [#1356](https://github.com/FooIbar/EhViewer/issues/1356)
+* 清理下载冗余未按预期运行 [#1369](https://github.com/FooIbar/EhViewer/issues/1369)
+* 读取压缩包失败时崩溃
+* 某些设备上崩溃 [#1276](https://github.com/FooIbar/EhViewer/issues/1276)
+* 检查更新失效
+
+
+## [1.11.6-RC2] - 2024-06-06
+
+### 改进
+
+* 下载图片时执行完整性校验以防止文件损坏/被篡改
+
+
+## [1.11.6-RC1] - 2024-06-02
+
+### 改进
+
+* 下载列表默认显示全部下载项目
+* 替换搜索文本中的换行符为空格 [#1258](https://github.com/FooIbar/EhViewer/issues/1258)
+
+### Bug 修复
+
+* 评价画廊时未使用输入的评分
+* 搜索时意外选择 Non-H 类别 [#1246](https://github.com/FooIbar/EhViewer/issues/1246)
+* 侧边栏与导航抽屉重叠 [#1262](https://github.com/FooIbar/EhViewer/issues/1262)
+* 快速搜索/下载标签排序失效 [#1267](https://github.com/FooIbar/EhViewer/issues/1267)
+* 加载压缩包/种子列表出错时 UI 冻结
+* 低版本 Android 上某些 UI 被遮挡
+
+
+## [1.11.5] - 2024-05-19
+
+### 重大变更
+
+* 不再支持 32 位 x86
+
+### 新功能
+
+* 支持按作者对下载分组
+* 由于 E 站不再强制要求人机验证，重新支持账号密码登录
+
+### 改进
+
+* 在登录时加载收藏名称 [#1077](https://github.com/FooIbar/EhViewer/issues/1077)
+* 优化归档和种子界面 UI
+* 禁止在 cookie 界面截图以防止泄露
+* 在缩略图模式下显示画廊页数
+* 记住最低评分和页数搜索参数
+* 更新 User-Agent 以缓解 IP 封禁 [#1182](https://github.com/FooIbar/EhViewer/issues/1182)
+* 账号密码登录支持自动填充
+* 更新中文（台灣）翻译
+
+### Bug 修复
+
+* 非触摸模式下无法退出搜索界面 [#1060](https://github.com/FooIbar/EhViewer/issues/1060)
+* 某些设备上无法安装更新 [#1067](https://github.com/FooIbar/EhViewer/issues/1067)
+* 某些设备上崩溃/卡顿 [#996](https://github.com/FooIbar/EhViewer/issues/996) [#1023](https://github.com/FooIbar/EhViewer/issues/1023)
+* 搜索记录中存在重复条目时崩溃 [#1130](https://github.com/FooIbar/EhViewer/issues/1130)
+* 条漫模式下缩小后点按区域偏移 [#127](https://github.com/FooIbar/EhViewer/issues/127)
+* 多窗口模式下点按区域偏移
+* 点击下载通知时未清除状态
+* 保存未完成加载的图片时崩溃 [#1154](https://github.com/FooIbar/EhViewer/issues/1154)
+* 历史记录界面无法在项目上滑动打开抽屉 [#464](https://github.com/FooIbar/EhViewer/issues/464)
+* 导入数据失败时显示导入成功 [#1174](https://github.com/FooIbar/EhViewer/issues/1174)
+* 某些条件下收藏界面崩溃 [#1190](https://github.com/FooIbar/EhViewer/issues/1190)
+* 反转点按区域功能失效 [#1217](https://github.com/FooIbar/EhViewer/issues/1217)
+
+### 已知问题
+
+* 某些设备上从后台返回时某些 UI 消失，可通过关闭列表项目动画部分缓解 [#1184](https://github.com/FooIbar/EhViewer/issues/1184)
+
+
+## [1.11.4] - 2024-04-21
+
+### 新功能
+
+* 更新前自动备份数据
+
+### 改进
+
+* 在 设置-高级 中加入了禁用列表项目动画的选项，该功能在部分设备上导致崩溃/卡顿 [#996](https://github.com/FooIbar/EhViewer/issues/996) [#1023](https://github.com/FooIbar/EhViewer/issues/1023)
+* 下载列表多选模式下避免误触 [#1016](https://github.com/FooIbar/EhViewer/issues/1016)
+* 杂项 UI 优化
+
+### Bug 修复
+
+* 重命名下载标签后删除该标签时崩溃 [#1008](https://github.com/FooIbar/EhViewer/issues/1008)
+* 搜索栏中某些输入法长按退格无法连续删除 [#606](https://github.com/FooIbar/EhViewer/issues/606)
+* 评论/屏蔽/搜索建议/下载标签/快速搜索列表卡顿 [#1041](https://github.com/FooIbar/EhViewer/issues/1041)
+
+
+## [1.11.3] - 2024-04-06
+
+### 改进
+
+* 优化预加载逻辑和图片加载顺序
+* 优化画廊详情和评论页面 UI
+
+### Bug 修复
+
+* 某些模式下搜索结果不显示画廊语言 [#923](https://github.com/FooIbar/EhViewer/issues/923)
+* 某些情况下在搜索结果中直接阅读画廊后崩溃 [#927](https://github.com/FooIbar/EhViewer/issues/927)
+* 更新至最新版本后仍提示有新版本 [#927](https://github.com/FooIbar/EhViewer/issues/927)
+* 从旧版本升级时包含不兼容数据导致崩溃/无法导出数据 [#940](https://github.com/FooIbar/EhViewer/issues/940) [#974](https://github.com/FooIbar/EhViewer/issues/974)
+* Android 10 以下的设备打开 设置-隐私 时崩溃 [#953](https://github.com/FooIbar/EhViewer/issues/953)
+* 下载标签无法拖动
+* 刷新 和 刷新（原图） 无法在已下载的图片上使用
+* 临时 IP 封禁错误显示为解析失败
+* 某些情况下下载时闪退 [#980](https://github.com/FooIbar/EhViewer/issues/980)
+* 某些设备上下载列表中的缩略图无法显示 [#977](https://github.com/FooIbar/EhViewer/issues/977)
+
+
+## [1.11.2] - 2024-03-17
+
+### 重大变更
+
+* Default 变种最低支持版本更改为 Android 8.0，重新添加了最低支持 Android 6.0 的 Marshmallow 变种
+
+### 改进
+
+* 重新添加了删除快速搜索/下载标签时的确认对话框
+
+### Bug 修复
+
+* 收藏页面 搜索栏中文标签转英文异常 [#902](https://github.com/FooIbar/EhViewer/issues/902)
+* 在收藏或者取消收藏之后，收藏按钮会无反应 [#908](https://github.com/FooIbar/EhViewer/issues/908)
+* 横屏页面下阅读设置UI重合 [#909](https://github.com/FooIbar/EhViewer/issues/909)
+* Search bar does not work properly in Japanese [#906](https://github.com/FooIbar/EhViewer/issues/906)
+* 搜索结果中的 Disowned 画廊不显示上传者
+* 使用 CI 频道更新时，有时会获取到错误的更新链接
+
+
+## [1.11.1] - 2024-03-12
+
+### 重大变更
+
+* 由于 E 站强制要求人机验证，仅支持通过网页登录
+* 默认支持 Android 6，不再提供 Marshmallow 变种
+* 集成 Cronet 库，不再提供 GMS 变种
+
+### 改进
+
+* 支持在排序下载列表前按下载标签分组
+
+### Bug 修复
+
+* 下载画廊时崩溃 [#893](https://github.com/FooIbar/EhViewer/issues/893)
+
+
 ## [1.11.0] - 2024-03-09

 ### 重大变更
@@ -7,6 +356,7 @@
 * 由于 E 站 Cookie 策略变更，不再支持 Cookie 登录
 * 登录时自动选择 exhentai （如果可用）
 * 不再提供默认下载路径
+* 手动排序更改为以添加时间/上传时间/标题/下载标签/页数对下载列表排序
 * 由于数据库结构变更，此版本导出的数据将无法被旧版本导入

 ### 新功能
@@ -19,7 +369,6 @@
 * 随机打开本地收藏/下载中的画廊 [#695](https://github.com/FooIbar/EhViewer/issues/695)
 * 随机在搜索结果中跳转
 * 以网格模式查看下载列表
-* 以添加时间/上传时间/标题/下载标签/页数对下载列表排序
 * 本地收藏/历史/下载中的标签搜索 [#860](https://github.com/FooIbar/EhViewer/issues/860)

 ### 改进
@@ -8,6 +8,10 @@
  <a href="/docs/README/zh-tw.md">
  正體中文
  </a>
+  <span> | </span>
+  <a href="/docs/README/ja.md">
+  日本語
+  </a>
 </p>

 <h1 align="center">
@@ -59,23 +63,19 @@

 # Description

-EhViewer fork dedicated to lightweight and high-performance
+A modern EhViewer fork dedicated to high-performance

 with [Material Design 3](https://m3.material.io/)
 and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview) Support

 # Download

-| Flavor      | Feature                           |
-|-------------|-----------------------------------|
-| Default     | Android 9+, full support          |
-| Marshmallow | Android 6.0-8.1, limited support* |
-| OSS         | FOSS dependencies**               |
-| GMS         | Proprietary GMS component         |
+| Flavor      | Minimum Android Version | Notes                          |
+|-------------|-------------------------|--------------------------------|
+| Default     | 8.0                     | Full support                   |
+| Marshmallow | 6.0*                    | Limited support, no guarantees |

-\* May not support some archives
-
-** Fall back to OkHttp on devices that don't support [HttpEngine](https://developer.android.com/reference/android/net/http/HttpEngine)
+*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"/>
@@ -91,16 +91,13 @@ and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview)
 Here is the libraries

 - [Arrow](https://arrow-kt.io/)
- [AOSP & AndroidX](http://source.android.com/)
+- [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](http://www.libarchive.org/)
- [jsoup](https://jsoup.org/)
-
-Specially thanks [Tachiyomi](https://tachiyomi.org/) for its reader implementation!
+- [libarchive](https://www.libarchive.org/)

 # License

@@ -1,2 +0,0 @@
-/build
-/.cxx
@@ -1,33 +1,27 @@
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
-import com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
-import java.time.Instant
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
+import com.mikepenz.aboutlibraries.plugin.DuplicateMode
+import com.mikepenz.aboutlibraries.plugin.DuplicateRule
+import java.util.regex.Pattern

 val isRelease: Boolean
    get() = gradle.startParameter.taskNames.any { it.contains("Release") }

 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.ehviewer.android.application)
    alias(libs.plugins.kotlin.serialization)
    alias(libs.plugins.ksp)
-    alias(libs.plugins.spotless)
    alias(libs.plugins.aboutlibrariesPlugin)
-    alias(libs.plugins.composeCompilerReportGenerator)
+    alias(libs.plugins.baselineprofile)
 }

-android {
-    compileSdk = 34
-    ndkVersion = "26.2.11394342"
+val supportedAbis = arrayOf("arm64-v8a", "x86_64", "armeabi-v7a")

+android {
    splits {
        abi {
            isEnable = true
            reset()
            if (isRelease) {
-                include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
+                include(*supportedAbis)
                isUniversalApk = true
            } else {
                include("arm64-v8a", "x86_64")
@@ -48,66 +42,44 @@ android {
        commandLine = "git rev-parse --short=7 HEAD".split(' ')
    }.standardOutput.asText.get().trim()

-    val buildTime by lazy {
-        val formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm").withZone(ZoneOffset.UTC)
-        formatter.format(Instant.now())
-    }
+    val commitTime = providers.exec {
+        commandLine = "git log -1 --format=%ct".split(' ')
+    }.standardOutput.asText.get().trim()

    val repoName = providers.exec {
        commandLine = "git remote get-url origin".split(' ')
    }.standardOutput.asText.get().trim().removePrefix("https://github.com/").removePrefix("git@github.com:")
        .removeSuffix(".git")

+    val chromeVersion = rootProject.layout.projectDirectory.file("chrome.version").asFile.readText().trim()
+
    defaultConfig {
        applicationId = "moe.tarsin.ehviewer"
-        minSdk = 28
-        targetSdk = 34
-        versionCode = 180051
-        versionName = "1.11.0"
-        resourceConfigurations.addAll(
-            listOf(
-                "zh",
-                "zh-rCN",
-                "zh-rHK",
-                "zh-rTW",
-                "es",
-                "ja",
-                "ko",
-                "fr",
-                "de",
-                "th",
-                "tr",
-                "nb-rNO",
-            ),
-        )
+        versionCode = 180063
+        versionName = "1.14.2"
+        // versionNameSuffix = "-SNAPSHOT"
+        buildConfigField("String", "RAW_VERSION_NAME", "\"$versionName${versionNameSuffix.orEmpty()}\"")
        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)
+            }
            debugSymbolLevel = "FULL"
        }
    }

-    flavorDimensions += listOf("api", "oss")
+    flavorDimensions += "api"

    productFlavors {
        create("default") {
-            dimension = "api"
+            minSdk = 26
        }
        create("marshmallow") {
-            dimension = "api"
-            minSdk = 23
            applicationIdSuffix = ".m"
            versionNameSuffix = "-M"
-            compileOptions {
-                isCoreLibraryDesugaringEnabled = true
-            }
-        }
-        create("oss") {
-            dimension = "oss"
-        }
-        create("gms") {
-            dimension = "oss"
-            versionNameSuffix = "-gms"
        }
    }

@@ -117,47 +89,47 @@ android {
        }
    }

-    kotlinOptions {
-        freeCompilerArgs = listOf(
-            // https://kotlinlang.org/docs/compiler-reference.html#progressive
-            "-progressive",
-            "-Xjvm-default=all",
-            "-Xlambdas=indy",
-            "-Xcontext-receivers",
-
-            "-opt-in=coil3.annotation.ExperimentalCoilApi",
-            "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-            "-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi",
-            "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-            "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
-            "-opt-in=androidx.paging.ExperimentalPagingApi",
-            "-opt-in=kotlin.contracts.ExperimentalContracts",
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlinx.coroutines.FlowPreview",
-            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-            "-opt-in=splitties.experimental.ExperimentalSplittiesApi",
-            "-opt-in=splitties.preferences.DataStorePreferencesPreview",
-
-            "-P", "plugin:androidx.compose.compiler.plugins.kotlin:experimentalStrongSkipping=true",
-            "-P", "plugin:androidx.compose.compiler.plugins.kotlin:nonSkippingGroupOptimization=true",
-        )
-    }
-
-    lint {
-        disable += setOf("MissingTranslation", "MissingQuantity")
-        fatal += setOf("NewApi", "InlineApi")
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
    }

    packaging {
-        resources {
-            excludes += "/META-INF/**"
-            excludes += "/okhttp3/**"
-            excludes += "/kotlin/**"
-            excludes += "**.txt"
-            excludes += "**.bin"
+        dex {
+            useLegacyPackaging = false
        }
+        resources {
+            // Required by Layout Inspector
+            pickFirsts += "/META-INF/androidx.compose.ui_ui.version"
+
+            excludes += listOf(
+                "/META-INF/**",
+                "/kotlin/**",
+                "**.txt",
+                "**.bin",
+            )
+        }
+    }
+
+    androidResources {
+        ignoreAssetsPatterns += listOf(
+            "!PublicSuffixDatabase.list", // OkHttp
+            "!composepreference.preference.generated.resources",
+        )
+        generateLocaleConfig = true
+        localeFilters += listOf(
+            "zh",
+            "zh-rCN",
+            "zh-rHK",
+            "zh-rTW",
+            "es",
+            "ja",
+            "ko",
+            "fr",
+            "de",
+            "th",
+            "tr",
+            "nb-rNO",
+        )
    }

    dependenciesInfo.includeInApk = false
@@ -168,28 +140,35 @@ android {
            isShrinkResources = true
            proguardFiles("proguard-rules.pro")
            signingConfig = signConfig
-            buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
        }
        debug {
            applicationIdSuffix = ".debug"
-            buildConfigField("String", "BUILD_TIME", "\"\"")
+        }
+        create("benchmarkRelease") {
+            initWith(buildTypes.getByName("release"))
+            matchingFallbacks += listOf("release")
+            applicationIdSuffix = ".benchmark"
+            signingConfig = signingConfigs.getByName("debug")
+            isDebuggable = false
        }
    }

    buildFeatures {
        buildConfig = true
        compose = true
-        viewBinding = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
    }

    namespace = "com.hippo.ehviewer"
 }

+baselineProfile {
+    mergeIntoMain = true
+}
+
 dependencies {
+    implementation(projects.core.data)
+    implementation(projects.core.i18n)
+
    // https://developer.android.com/jetpack/androidx/releases/activity
    implementation(libs.androidx.activity.compose)
    implementation(libs.androidx.appcompat)
@@ -203,38 +182,37 @@ dependencies {
    implementation(libs.compose.destinations.core)
    ksp(libs.compose.destinations.compiler)

+    implementation(libs.compose.preference) {
+        // R8 won't remove it because it adds a content provider
+        exclude(group = "org.jetbrains.compose.components", module = "components-resources")
+    }
+
    implementation(libs.androidx.core)
    implementation(libs.androidx.core.splashscreen)

-    implementation(libs.androidx.constraintlayout.compose)
+    implementation(libs.androidx.datastore)
+
    // https://developer.android.com/jetpack/androidx/releases/lifecycle
    implementation(libs.androidx.lifecycle.process)
    implementation(libs.androidx.lifecycle.compose)

-    // https://developer.android.com/jetpack/androidx/releases/navigation
-    implementation(libs.androidx.navigation.compose)
-
    // https://developer.android.com/jetpack/androidx/releases/paging
    implementation(libs.androidx.paging.compose)

-    implementation(libs.androidx.recyclerview)
-
    // https://developer.android.com/jetpack/androidx/releases/room
    ksp(libs.androidx.room.compiler)
    implementation(libs.androidx.room.paging)

    implementation(libs.androidx.work.runtime)
-    implementation(libs.photoview) // Dead Dependency
-    implementation(libs.directionalviewpager) // Dead Dependency
    implementation(libs.material.motion.core)
+    implementation(libs.material.kolor)

    implementation(libs.bundles.splitties)

    // https://square.github.io/okhttp/changelogs/changelog/
    implementation(platform(libs.okhttp.bom))
-    implementation(libs.bundles.okhttp)

-    implementation(libs.okio.jvm)
+    implementation(platform(libs.okio.bom))

    implementation(libs.logcat)

@@ -244,12 +222,10 @@ dependencies {
    implementation(libs.aboutlibraries.compose.m3)
    implementation(libs.accompanist.drawable.painter)

-    implementation(libs.insetter) // Dead Dependency
-
    implementation(libs.reorderable)

    implementation(platform(libs.arrow.stack))
-    implementation(libs.arrow.fx.coroutines)
+    implementation(libs.bundles.arrow)

    // https://coil-kt.github.io/coil/changelog/
    implementation(platform(libs.coil.bom))
@@ -257,40 +233,44 @@ dependencies {

    implementation(libs.telephoto.zoomable)

-    implementation(libs.bundles.ktor)
+    implementation(libs.ktor.client.okhttp)

    implementation(libs.bundles.kotlinx.serialization)

    implementation(libs.kotlinx.coroutines.android)
    implementation(libs.kotlinx.datetime)
-    implementation(libs.jsoup)

    coreLibraryDesugaring(libs.desugar)

-    "gmsImplementation"(libs.bundles.cronet)
+    implementation(libs.androidx.profileinstaller)
+    "baselineProfile"(project(":benchmark"))
+
+    debugImplementation(libs.compose.ui.tooling)
+    implementation(libs.compose.ui.tooling.preview)
 }

 kotlin {
-    jvmToolchain(21)
+    compilerOptions {
+        optIn.addAll(
+            "coil3.annotation.ExperimentalCoilApi",
+            "androidx.paging.ExperimentalPagingApi",
+            "kotlinx.serialization.ExperimentalSerializationApi",
+        )
+    }
 }

 ksp {
    arg("room.schemaLocation", "$projectDir/schemas")
-    arg("room.generateKotlin", "true")
+    arg("compose-destinations.codeGenPackageName", "com.hippo.ehviewer.ui")
 }

 aboutLibraries {
-    duplicationMode = MERGE
-    duplicationRule = GROUP
-}
-
-spotless {
-    kotlin {
-        // https://github.com/diffplug/spotless/issues/111
-        target("src/**/*.kt")
-        ktlint()
+    collect {
+        includePlatform = false
    }
-    kotlinGradle {
-        ktlint()
+    library {
+        exclusionPatterns.add(Pattern.compile("org\\.jetbrains\\.(?:compose|androidx)\\..*"))
+        duplicationMode = DuplicateMode.MERGE
+        duplicationRule = DuplicateRule.GROUP
    }
 }
@@ -11,10 +11,18 @@
    public static final ** CREATOR;
 }

+-keepclassmembers,allowobfuscation class com.hippo.ehviewer.coil.AnimatedWebPDrawable {
+    java.nio.ByteBuffer source;
+}
+
 # Ktor logger
 -dontwarn org.slf4j.impl.StaticLoggerBinder

-dontwarn org.conscrypt.Conscrypt
+# https://issuetracker.google.com/222232895
+-dontwarn androidx.window.extensions.**
+-dontwarn androidx.window.sidecar.Sidecar*
+
+-keepattributes LineNumberTable

 -allowaccessmodification
 -repackageclasses
@@ -0,0 +1,564 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "7d1cfc4e9a9d506a73eb0520ae414d25",
+    "entities": [
+      {
+        "tableName": "GALLERIES",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TOKEN` TEXT NOT NULL, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_TAGS` TEXT, `PAGES` INTEGER NOT NULL DEFAULT 0, `SIMPLE_LANGUAGE` TEXT, `FAVORITE_SLOT` INTEGER NOT NULL, PRIMARY KEY(`GID`))",
+        "fields": [
+          {
+            "fieldPath": "gid",
+            "columnName": "GID",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "token",
+            "columnName": "TOKEN",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "TITLE",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "titleJpn",
+            "columnName": "TITLE_JPN",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "thumbKey",
+            "columnName": "THUMB",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "CATEGORY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "posted",
+            "columnName": "POSTED",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uploader",
+            "columnName": "UPLOADER",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rating",
+            "columnName": "RATING",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "simpleTags",
+            "columnName": "SIMPLE_TAGS",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "pages",
+            "columnName": "PAGES",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "simpleLanguage",
+            "columnName": "SIMPLE_LANGUAGE",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "favoriteSlot",
+            "columnName": "FAVORITE_SLOT",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "GID"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DOWNLOAD_LABELS",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `POSITION` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
+        "fields": [
+          {
+            "fieldPath": "label",
+            "columnName": "LABEL",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "POSITION",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DOWNLOAD_LABELS_LABEL",
+            "unique": true,
+            "columnNames": [
+              "LABEL"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_DOWNLOAD_LABELS_LABEL` ON `${TABLE_NAME}` (`LABEL`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DOWNLOADS",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`LABEL`) REFERENCES `DOWNLOAD_LABELS`(`LABEL`) ON UPDATE CASCADE ON DELETE SET NULL )",
+        "fields": [
+          {
+            "fieldPath": "gid",
+            "columnName": "GID",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "STATE",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "legacy",
+            "columnName": "LEGACY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "time",
+            "columnName": "TIME",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "LABEL",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "GID"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DOWNLOADS_LABEL",
+            "unique": false,
+            "columnNames": [
+              "LABEL"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DOWNLOADS_LABEL` ON `${TABLE_NAME}` (`LABEL`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GALLERIES",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "GID"
+            ],
+            "referencedColumns": [
+              "GID"
+            ]
+          },
+          {
+            "table": "DOWNLOAD_LABELS",
+            "onDelete": "SET NULL",
+            "onUpdate": "CASCADE",
+            "columns": [
+              "LABEL"
+            ],
+            "referencedColumns": [
+              "LABEL"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DOWNLOAD_DIRNAME",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
+        "fields": [
+          {
+            "fieldPath": "gid",
+            "columnName": "GID",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dirname",
+            "columnName": "DIRNAME",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "GID"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DOWNLOAD_ARTISTS",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `ARTIST` TEXT NOT NULL, PRIMARY KEY(`GID`, `ARTIST`), FOREIGN KEY(`GID`) REFERENCES `DOWNLOADS`(`GID`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "gid",
+            "columnName": "GID",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "artist",
+            "columnName": "ARTIST",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "GID",
+            "ARTIST"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "DOWNLOADS",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "GID"
+            ],
+            "referencedColumns": [
+              "GID"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FILTER",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
+        "fields": [
+          {
+            "fieldPath": "mode",
+            "columnName": "MODE",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "TEXT",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "enable",
+            "columnName": "ENABLE",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "HISTORY",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "gid",
+            "columnName": "GID",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "time",
+            "columnName": "TIME",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "GID"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GALLERIES",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "GID"
+            ],
+            "referencedColumns": [
+              "GID"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LOCAL_FAVORITES",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "gid",
+            "columnName": "GID",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "time",
+            "columnName": "TIME",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "GID"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GALLERIES",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "GID"
+            ],
+            "referencedColumns": [
+              "GID"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PROGRESS",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `PAGE` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "gid",
+            "columnName": "GID",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "PAGE",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "GID"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GALLERIES",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "GID"
+            ],
+            "referencedColumns": [
+              "GID"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "QUICK_SEARCH",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `NAME` TEXT NOT NULL, `MODE` INTEGER NOT NULL, `CATEGORY` INTEGER NOT NULL, `KEYWORD` TEXT, `ADVANCE_SEARCH` INTEGER NOT NULL, `MIN_RATING` INTEGER NOT NULL, `PAGE_FROM` INTEGER NOT NULL, `PAGE_TO` INTEGER NOT NULL, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "NAME",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mode",
+            "columnName": "MODE",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "CATEGORY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyword",
+            "columnName": "KEYWORD",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "advanceSearch",
+            "columnName": "ADVANCE_SEARCH",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minRating",
+            "columnName": "MIN_RATING",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pageFrom",
+            "columnName": "PAGE_FROM",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pageTo",
+            "columnName": "PAGE_TO",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "POSITION",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "ftsVersion": "FTS4",
+        "ftsOptions": {
+          "tokenizer": "simple",
+          "tokenizerArgs": [],
+          "contentTable": "GALLERIES",
+          "languageIdColumnName": "",
+          "matchInfo": "FTS4",
+          "notIndexedColumns": [],
+          "prefixSizes": [],
+          "preferredOrder": "ASC"
+        },
+        "contentSyncTriggers": [
+          "CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_GALLERIES_FTS_BEFORE_UPDATE BEFORE UPDATE ON `GALLERIES` BEGIN DELETE FROM `GALLERIES_FTS` WHERE `docid`=OLD.`rowid`; END",
+          "CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_GALLERIES_FTS_BEFORE_DELETE BEFORE DELETE ON `GALLERIES` BEGIN DELETE FROM `GALLERIES_FTS` WHERE `docid`=OLD.`rowid`; END",
+          "CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_GALLERIES_FTS_AFTER_UPDATE AFTER UPDATE ON `GALLERIES` BEGIN INSERT INTO `GALLERIES_FTS`(`docid`, `TITLE`, `TITLE_JPN`, `SIMPLE_TAGS`) VALUES (NEW.`rowid`, NEW.`TITLE`, NEW.`TITLE_JPN`, NEW.`SIMPLE_TAGS`); END",
+          "CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_GALLERIES_FTS_AFTER_INSERT AFTER INSERT ON `GALLERIES` BEGIN INSERT INTO `GALLERIES_FTS`(`docid`, `TITLE`, `TITLE_JPN`, `SIMPLE_TAGS`) VALUES (NEW.`rowid`, NEW.`TITLE`, NEW.`TITLE_JPN`, NEW.`SIMPLE_TAGS`); END"
+        ],
+        "tableName": "GALLERIES_FTS",
+        "createSql": "CREATE VIRTUAL TABLE IF NOT EXISTS `${TABLE_NAME}` USING FTS4(`TITLE` TEXT NOT NULL, `TITLE_JPN` TEXT NOT NULL, `SIMPLE_TAGS` TEXT, content=`GALLERIES`)",
+        "fields": [
+          {
+            "fieldPath": "title",
+            "columnName": "TITLE",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleJpn",
+            "columnName": "TITLE_JPN",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "simpleTags",
+            "columnName": "SIMPLE_TAGS",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": []
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7d1cfc4e9a9d506a73eb0520ae414d25')"
+    ]
+  }
+}
@@ -1,20 +0,0 @@
-package com.hippo.ehviewer.cronet
-
-import com.hippo.ehviewer.Settings
-import okio.Path.Companion.toOkioPath
-import org.chromium.net.CronetEngine
-import splitties.init.appCtx
-
-val cronetHttpClient: CronetEngine = CronetEngine.Builder(appCtx).apply {
-    enableBrotli(true)
-    setUserAgent(Settings.userAgent)
-
-    // Cache Quic hint only since the real cache mechanism should on Ktor layer
-    val cache = (appCtx.cacheDir.toOkioPath() / "http_cache").toFile().apply { mkdirs() }
-    setStoragePath(cache.absolutePath)
-    enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 4096)
-
-    addQuicHint("e-hentai.org", 443, 443)
-    addQuicHint("forums.e-hentai.org", 443, 443)
-    addQuicHint("exhentai.org", 443, 443)
-}.build()
@@ -1,176 +0,0 @@
-package com.hippo.ehviewer.ktor
-
-import com.hippo.ehviewer.cronet.cronetDispatcher
-import com.hippo.ehviewer.cronet.cronetHttpClient
-import com.hippo.ehviewer.cronet.cronetHttpClientExecutor
-import com.hippo.ehviewer.cronet.pool
-import io.ktor.client.engine.HttpClientEngineBase
-import io.ktor.client.engine.HttpClientEngineConfig
-import io.ktor.client.engine.callContext
-import io.ktor.client.request.HttpRequestData
-import io.ktor.client.request.HttpResponseData
-import io.ktor.http.HttpHeaders
-import io.ktor.http.HttpProtocolVersion
-import io.ktor.http.HttpStatusCode
-import io.ktor.http.content.OutgoingContent
-import io.ktor.http.headers
-import io.ktor.util.date.GMTDate
-import io.ktor.util.flattenForEach
-import io.ktor.utils.io.ByteReadChannel
-import io.ktor.utils.io.InternalAPI
-import io.ktor.utils.io.pool.useInstance
-import io.ktor.utils.io.writer
-import java.nio.ByteBuffer
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.consumeEach
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import org.chromium.net.CronetException
-import org.chromium.net.UploadDataProvider
-import org.chromium.net.UploadDataSink
-import org.chromium.net.UrlRequest
-import org.chromium.net.UrlResponseInfo
-
-object CronetEngine : HttpClientEngineBase("Cronet") {
-    override val config = HttpClientEngineConfig()
-    override val dispatcher = cronetDispatcher
-
-    @InternalAPI
-    override suspend fun execute(data: HttpRequestData): HttpResponseData {
-        val callContext = callContext()
-
-        return executeHttpRequest(callContext, data)
-    }
-
-    @OptIn(DelicateCoroutinesApi::class)
-    private suspend fun executeHttpRequest(
-        callContext: CoroutineContext,
-        data: HttpRequestData,
-    ): HttpResponseData = suspendCancellableCoroutine { continuation ->
-        val requestTime = GMTDate()
-
-        val callback = object : UrlRequest.Callback() {
-            lateinit var chunkChan: Channel<ByteBuffer>
-            override fun onRedirectReceived(request: UrlRequest, info: UrlResponseInfo, newLocationUrl: String) {
-                continuation.resume(
-                    info.toHttpResponseData(
-                        requestTime = requestTime,
-                        callContext = callContext,
-                    ),
-                )
-            }
-
-            override fun onResponseStarted(request: UrlRequest, info: UrlResponseInfo) {
-                val channel = GlobalScope.writer(callContext) {
-                    pool.useInstance {
-                        chunkChan = Channel(1)
-                        request.read(it)
-                        chunkChan.consumeEach { buffer ->
-                            buffer.flip()
-                            channel.writeFully(buffer)
-                            buffer.clear()
-                            request.read(buffer)
-                        }
-                    }
-                }.channel
-                continuation.resume(
-                    info.toHttpResponseData(
-                        requestTime = requestTime,
-                        callContext = callContext,
-                        responseBody = channel,
-                    ),
-                )
-            }
-
-            override fun onReadCompleted(request: UrlRequest, info: UrlResponseInfo, byteBuffer: ByteBuffer) {
-                chunkChan.trySend(byteBuffer).getOrThrow()
-            }
-
-            override fun onSucceeded(request: UrlRequest, info: UrlResponseInfo) {
-                chunkChan.close()
-            }
-
-            override fun onFailed(request: UrlRequest, info: UrlResponseInfo?, error: CronetException) {
-                if (::chunkChan.isInitialized) {
-                    chunkChan.close(error)
-                } else {
-                    continuation.resumeWithException(error)
-                }
-            }
-        }
-
-        val request = cronetHttpClient.newUrlRequestBuilder(data.url.toString(), callback, cronetHttpClientExecutor).apply {
-            setHttpMethod(data.method.value)
-            data.headers.flattenForEach { key, value -> addHeader(key, value) }
-            data.body.contentType?.let { addHeader(HttpHeaders.ContentType, it.toString()) }
-            data.body.contentLength?.let { addHeader(HttpHeaders.ContentLength, it.toString()) }
-            data.body.toUploadDataProvider(callContext)?.let { setUploadDataProvider(it, cronetHttpClientExecutor) }
-        }.build()
-        request.start()
-        callContext[Job]!!.invokeOnCompletion { request.cancel() }
-        continuation.invokeOnCancellation { request.cancel() }
-    }
-}
-
-private fun UrlResponseInfo.toHttpResponseData(
-    requestTime: GMTDate,
-    callContext: CoroutineContext,
-    responseBody: ByteReadChannel = ByteReadChannel.Empty,
-): HttpResponseData {
-    return HttpResponseData(
-        statusCode = HttpStatusCode.fromValue(httpStatusCode),
-        requestTime = requestTime,
-        headers = headers {
-            allHeaders.forEach { (key, value) ->
-                appendAll(key, value)
-            }
-        },
-        version = when (negotiatedProtocol) {
-            "h2" -> HttpProtocolVersion.HTTP_2_0
-            "h3" -> HttpProtocolVersion.QUIC
-            "quic/1+spdy/3" -> HttpProtocolVersion.SPDY_3
-            else -> HttpProtocolVersion.HTTP_1_1
-        },
-        body = responseBody,
-        callContext = callContext,
-    )
-}
-
-@OptIn(DelicateCoroutinesApi::class)
-private fun OutgoingContent.toUploadDataProvider(callContext: CoroutineContext): UploadDataProvider? = when (this) {
-    is OutgoingContent.NoContent -> null
-    is OutgoingContent.ByteArrayContent -> object : UploadDataProvider() {
-        val buffer = ByteBuffer.wrap(bytes()).slice()
-        override fun getLength() = buffer.limit().toLong()
-        override fun read(uploadDataSink: UploadDataSink, byteBuffer: ByteBuffer) {
-            byteBuffer.put(buffer)
-            uploadDataSink.onReadSucceeded(false)
-        }
-        override fun rewind(uploadDataSink: UploadDataSink) {
-            buffer.position(0)
-            uploadDataSink.onRewindSucceeded()
-        }
-    }
-    is OutgoingContent.WriteChannelContent -> object : UploadDataProvider() {
-        fun launch() = GlobalScope.writer(callContext) { writeTo(channel) }.channel
-        var chan = launch()
-        override fun getLength() = contentLength!!
-        override fun read(uploadDataSink: UploadDataSink, byteBuffer: ByteBuffer) {
-            GlobalScope.launch(callContext) {
-                chan.readAvailable(byteBuffer)
-                uploadDataSink.onReadSucceeded(false)
-            }
-        }
-        override fun rewind(uploadDataSink: UploadDataSink) {
-            chan = launch()
-            uploadDataSink.onRewindSucceeded()
-        }
-    }
-    else -> error("UnsupportedContentType $this")
-}
@@ -1,12 +0,0 @@
-package com.hippo.ehviewer.util
-
-import com.google.android.gms.net.CronetProviderInstaller
-import org.chromium.net.CronetProvider
-import splitties.init.appCtx
-
-val isCronetAvailable: Boolean
-    get() = CronetProvider.getAllProviders(appCtx).any { it.isEnabled }.also {
-        if (!it) {
-            CronetProviderInstaller.installProvider(appCtx)
-        }
-    }
@@ -29,7 +29,6 @@
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:largeHeap="@bool/large_heap"
-        android:localeConfig="@xml/locale_config"
        android:networkSecurityConfig="@xml/network_security_config"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
@@ -71,6 +70,39 @@
                <data android:host="exhentai.org" />
                <data android:host="e-hentai.org" />
            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:host="*" />
+                <data android:mimeType="application/octet-stream" />
+                <data android:mimeType="application/zip" />
+                <data android:mimeType="application/x-7z-compressed" />
+                <data android:mimeType="application/x-tar" />
+                <data android:mimeType="application/x-xz" />
+                <data android:mimeType="application/gzip" />
+                <data android:mimeType="application/vnd.rar" />
+                <data android:mimeType="application/vnd.comicbook+zip" />
+                <data android:mimeType="application/vnd.comicbook-rar" />
+
+                <!-- unofficial -->
+                <data android:mimeType="application/7z" />
+                <data android:mimeType="application/rar" />
+                <data android:mimeType="application/x-cbz" />
+                <data android:mimeType="application/x-cbr" />
+                <data android:mimeType="application/x-cbt" />
+                <data android:mimeType="application/x-cb7" />
+                <data android:mimeType="application/x-zip-compressed" />
+                <data android:mimeType="application/x-rar-compressed" />
+                <data android:mimeType="application/x-compressed-tar" />
+                <data android:mimeType="application/x-bzip-compressed-tar" />
+                <data android:mimeType="application/x-lzma-compressed-tar" />
+                <data android:mimeType="application/x-xz-compressed-tar" />
+            </intent-filter>
            <intent-filter android:label="@string/keyword_search">
                <action android:name="android.intent.action.SEND" />

@@ -86,44 +118,6 @@
                <data android:mimeType="image/*" />
            </intent-filter>
        </activity>
-        <activity
-            android:name="eu.kanade.tachiyomi.ui.reader.ReaderActivity"
-            android:configChanges="screenSize"
-            android:exported="true"
-            android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="file" />
-                <data android:scheme="content" />
-                <data android:host="*" />
-                <data android:mimeType="application/octet-stream" />
-                <data android:mimeType="application/7z" />
-                <data android:mimeType="application/rar" />
-                <data android:mimeType="application/zip" />
-                <data android:mimeType="application/x-7z-compressed" />
-                <data android:mimeType="application/x-rar-compressed" />
-                <data android:mimeType="application/x-zip-compressed" />
-                <data android:mimeType="application/x-tar" />
-                <data android:mimeType="application/x-xz" />
-                <data android:mimeType="application/gzip" />
-                <data android:mimeType="application/x-cbz" />
-                <data android:mimeType="application/x-cbr" />
-                <data android:mimeType="application/x-cbt" />
-                <data android:mimeType="application/x-cb7" />
-
-                <!-- untested -->
-                <data android:mimeType="application/vnd.comicbook+zip" />
-                <data android:mimeType="application/vnd.comicbook-rar" />
-                <data android:mimeType="application/x-compressed-tar" />
-                <data android:mimeType="application/x-bzip-compressed-tar" />
-                <data android:mimeType="application/x-lzma-compressed-tar" />
-                <data android:mimeType="application/x-xz-compressed-tar" />
-            </intent-filter>
-        </activity>
        <activity
            android:name=".ui.SecurityActivity"
            android:configChanges="screenSize"
@@ -0,0 +1,25 @@
+From e971b9f23727833cc39b9e325db30f383e5bfc30 Mon Sep 17 00:00:00 2001
+From: Dude so hot <djohn@fbi.gov>
+Date: Thu, 14 Nov 2024 00:28:13 +0800
+Subject: [PATCH] Fix zip_time performance
+
+Signed-off-by: Dude so hot <djohn@fbi.gov>
+---
+ libarchive/archive_time.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libarchive/archive_time.c b/libarchive/archive_time.c
+index 3352c809..9289bf1e 100644
+--- a/libarchive/archive_time.c
+++ b/libarchive/archive_time.c
+@@ -53,6 +53,7 @@ FILETIME_to_ntfs(const FILETIME* filetime)
+ int64_t
+ dos_to_unix(uint32_t dos_time)
+ {
+	return 0;
+ 	uint16_t msTime, msDate;
+ 	struct tm ts;
+ 	time_t t;
+-- 
+2.47.0
+
@@ -0,0 +1,27 @@
+From 86d199429b3fabc83f7dcc9afd72e7b4c7750b1a Mon Sep 17 00:00:00 2001
+From: FooIbar <118464521+FooIbar@users.noreply.github.com>
+Date: Thu, 14 Nov 2024 20:22:52 +0800
+Subject: [PATCH] Use UTF-8 as default charset on bionic
+
+---
+ libarchive/archive_string.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
+index abf7ad66..63a73c58 100644
+--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
+@@ -423,7 +423,9 @@ static const char *
+ default_iconv_charset(const char *charset) {
+ 	if (charset != NULL && charset[0] != '\0')
+ 		return charset;
+-#if HAVE_LOCALE_CHARSET && !defined(__APPLE__)
+#ifdef __BIONIC__
+	return "UTF-8";
+#elif HAVE_LOCALE_CHARSET && !defined(__APPLE__)
+ 	/* locale_charset() is broken on Mac OS */
+ 	return locale_charset();
+ #elif HAVE_NL_LANGINFO
+-- 
+2.43.0
+
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 project(ehviewer C)
+include(ExternalProject)
 include(FetchContent)

 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -17,31 +18,55 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

 option(BUILD_TESTING OFF)
-
+option(XZ_DOC OFF)
+option(XZ_LZIP_DECODER OFF)
+option(XZ_MICROLZMA_DECODER OFF)
+option(XZ_MICROLZMA_ENCODER OFF)
+option(XZ_TOOL_LZMADEC OFF)
+option(XZ_TOOL_LZMAINFO OFF)
+option(XZ_TOOL_XZ OFF)
+option(XZ_TOOL_XZDEC OFF)
 FetchContent_Declare(
        liblzma
-        GIT_REPOSITORY https://github.com/FooIbar/xz.git
-        GIT_TAG v5.6.1
+        GIT_REPOSITORY https://github.com/tukaani-project/xz.git
+        GIT_TAG v5.8.1
+        GIT_SHALLOW 1
 )

 FetchContent_MakeAvailable(liblzma)
 include_directories(${liblzma_SOURCE_DIR}/src/liblzma/api)

 # Build GNUTLS libnettle
-FetchContent_Declare(
+if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    execute_process(
+            COMMAND wsl wslpath ${CMAKE_CURRENT_LIST_DIR}
+            OUTPUT_VARIABLE CURRENT_DIR
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+else ()
+    set(CURRENT_DIR ${CMAKE_CURRENT_LIST_DIR})
+endif ()
+set(NDK_VERSION "${ANDROID_NDK_MAJOR}.${ANDROID_NDK_MINOR}.${ANDROID_NDK_BUILD}")
+ExternalProject_Add(
        nettle
-        URL https://ftp.gnu.org/gnu/nettle/nettle-3.9.1.tar.gz
-        URL_MD5 29fcd2dec6bf5b48e5e3ffb3cbc4779e
-        SOURCE_DIR nettle-src/nettle
+        GIT_REPOSITORY https://gitlab.com/gnutls/nettle.git
+        GIT_TAG nettle_3.10.2_release_20250626
+        GIT_SHALLOW 1
+        GIT_CONFIG core.autocrlf=input
+        CONFIGURE_COMMAND bash ${CURRENT_DIR}/configure_nettle.sh ${NDK_VERSION} ${CMAKE_C_COMPILER_TARGET}
+        BUILD_COMMAND bash -c "make -j4 libnettle.a CFLAGS='${CMAKE_C_FLAGS} -Qunused-arguments'"
+        INSTALL_COMMAND ""
+        BUILD_IN_SOURCE 1
+        BUILD_BYPRODUCTS <SOURCE_DIR>/libnettle.a
 )

-FetchContent_MakeAvailable(nettle)
-set(NETTLE_DIR ${nettle_SOURCE_DIR})
-add_subdirectory(nettle)
+ExternalProject_Get_Property(nettle SOURCE_DIR)
+include_directories(${SOURCE_DIR}/..)
+add_library(libnettle STATIC IMPORTED)
+set_property(TARGET libnettle PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/libnettle.a)
+add_dependencies(libnettle nettle)

 # Configure libnettle support for libarchive
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/nettle-src)
-include_directories(.)
 set(HAVE_LIBNETTLE 1)
 set(HAVE_NETTLE_AES_H 1)
 set(HAVE_NETTLE_HMAC_H 1)
@@ -57,33 +82,75 @@ SET(HAVE_LZMA_STREAM_ENCODER_MT 1)
 SET(HAVE_LZMADEC_H 1)
 SET(HAVE_LIBLZMADEC 1)

+option(ENABLE_OPENSSL OFF)
 option(ENABLE_TAR OFF)
 option(ENABLE_CPIO OFF)
 option(ENABLE_CAT OFF)
 option(ENABLE_UNZIP OFF)
 option(ENABLE_TEST OFF)

-# Configure libarchive link's static lib
-SET(LIBARCHIVE_CUSTOM_LIBS "nettle" "liblzma")
-
+set(LIBARCHIVE_PATCH
+        ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-zip_time-performance.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0002-Use-UTF-8-as-default-charset-on-bionic.patch
+)
 FetchContent_Declare(
        libarchive
-        GIT_REPOSITORY https://github.com/FooIbar/libarchive.git
-        GIT_TAG v3.7.2
+        GIT_REPOSITORY https://github.com/libarchive/libarchive.git
+        GIT_TAG v3.8.1
+        GIT_SHALLOW 1
+        PATCH_COMMAND git apply --check -R ${LIBARCHIVE_PATCH} || git apply ${LIBARCHIVE_PATCH}
 )

 FetchContent_MakeAvailable(libarchive)
+target_link_libraries(archive_static liblzma libnettle)
 include_directories(${libarchive_SOURCE_DIR}/libarchive)

+FetchContent_Declare(
+        libwebp
+        GIT_REPOSITORY https://github.com/webmproject/libwebp.git
+        GIT_TAG v1.6.0
+        GIT_SHALLOW 1
+)
+
+option(WEBP_BUILD_ANIM_UTILS OFF)
+option(WEBP_BUILD_CWEBP OFF)
+option(WEBP_BUILD_DWEBP OFF)
+option(WEBP_BUILD_VWEBP OFF)
+option(WEBP_BUILD_WEBPINFO OFF)
+option(WEBP_BUILD_LIBWEBPMUX OFF)
+option(WEBP_BUILD_EXTRAS OFF)
+option(WEBP_ENABLE_SWAP_16BIT_CSP ON)
+
+# Disable runtime detection of NEON support as NEON is required since API level 23
+# https://source.android.com/docs/compatibility/6.0/android-6.0-cdd#3_3_1_application_binary_interfaces
+unset(ANDROID)
+FetchContent_MakeAvailable(libwebp)
+if (CMAKE_SYSTEM_NAME STREQUAL "Android")
+    set(ANDROID 1)
+endif ()
+
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ../../../../rust-toolchain.toml)
+unset(Rust_TOOLCHAIN CACHE)
 FetchContent_Declare(
        Corrosion
        GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
-        GIT_TAG 0a3bdf452995803c334d79dc9a2affbfad51b720
+        GIT_TAG v0.5.2
+        GIT_SHALLOW 1
 )

 FetchContent_MakeAvailable(Corrosion)
-corrosion_import_crate(MANIFEST_PATH ../rust/Cargo.toml)
+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>
+)
+corrosion_link_libraries(ehviewer_rust android jnigraphics log webp webpdemux)

 # Build and link our app's native lib
-add_library(${PROJECT_NAME} SHARED archive.c border.c gifutils.c natsort/strnatcmp.c)
-target_link_libraries(${PROJECT_NAME} ehviewer_rust archive_static log jnigraphics)
+add_library(${PROJECT_NAME} SHARED archive.c gifutils.c hash.c natsort/strnatcmp.c)
+target_link_libraries(
+        ${PROJECT_NAME} archive_static ehviewer_rust
+        -Wl,-u,JNI_OnLoad -Wl,--undefined-glob,Java_*
+        -Wl,--version-script,${CMAKE_SOURCE_DIR}/libehviewer.map.txt
+)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Tarsin Norbin
+ * Copyright 2022-2024 Tarsin Norbin
 *
 * This file is part of EhViewer
 *
@@ -45,32 +45,29 @@ typedef struct {
 typedef struct {
    const char *filename;
    int index;
-    size_t size;
+    ssize_t size;
+    void *addr;
 } entry;

-pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static archive_ctx **ctx_pool;
 #define CTX_POOL_SIZE 20
+#define MAX_PARALLEL_DECOMP 4
+#define max(a, b) ((a) > (b) ? (a) : (b))

-static void *mempool = NULL;
-static size_t *mempoolofs = NULL;
-
-#define PAGE_ALIGN(x) ((x + ~PAGE_MASK) & PAGE_MASK)
-
-#define MEMPOOL_ADDR_BY_SORTED_IDX(x) (mempool + (index ? mempoolofs[index - 1] : 0))
-#define MEMPOOL_SIZE (mempoolofs[entryCount - 1])
-
-#define PROT_RW (PROT_WRITE | PROT_READ)
-#define MAP_ANON_POOL (MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE | MAP_UNINITIALIZED)
-
+static pthread_mutex_t ctx_pool_mutex = PTHREAD_MUTEX_INITIALIZER;
+static archive_ctx **ctx_pool = NULL;
+static pthread_mutex_t buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
+static void *decode_buffer[MAX_PARALLEL_DECOMP];
 static bool need_encrypt = false;
 static char *passwd = NULL;
-static void *archiveAddr = NULL;
+static void *archiveAddr = MAP_FAILED;
 static size_t archiveSize = 0;
 static entry *entries = NULL;
 static size_t entryCount = 0;
+static ssize_t max_file_size = 0;

-const char supportExt[10][6] = {
+#define SUPPORT_EXT_COUNT 11
+
+const char supportExt[SUPPORT_EXT_COUNT][5] = {
        "jpeg",
        "jpg",
        "png",
@@ -79,6 +76,7 @@ const char supportExt[10][6] = {
        "bmp",
        "ico",
        "wbmp",
+        "heic",
        "heif",
        "avif"
 };
@@ -90,24 +88,19 @@ static inline int filename_is_playable_file(const char *name) {
    if (!dotptr++)
        return false;
    int i;
-    for (i = 0; i < 10; i++)
+    for (i = 0; i < SUPPORT_EXT_COUNT; i++)
        if (strcmp(dotptr, supportExt[i]) == 0)
            return true;
    return false;
 }

-static inline const char *archive_entry_pathname2(struct archive_entry *entry) {
-    const char *name = archive_entry_pathname_utf8(entry);
-    return name ? name : archive_entry_pathname(entry);
-}
-
 static inline bool archive_entry_is_file(struct archive_entry *entry) {
    return archive_entry_filetype(entry) == AE_IFREG;
 }

 static inline bool archive_entry_is_playable(struct archive_entry *entry) {
    return archive_entry_is_file(entry) &&
-           filename_is_playable_file(archive_entry_pathname2(entry));
+           filename_is_playable_file(archive_entry_pathname(entry));
 }

 static inline int compare_entries(const void *a, const void *b) {
@@ -116,63 +109,71 @@ static inline int compare_entries(const void *a, const void *b) {
    return strnatcmp(fa, fb);
 }

-static long archive_map_entries_index(archive_ctx *ctx, bool sort) {
-    long count = 0;
+#define ADDR_IN_FILE_MAPPING(addr) (addr >= archiveAddr && addr < archiveAddr + archiveSize)
+
+static bool fill_entry_zero_copy(struct archive *arc, entry *entry) {
+    void *buffer = NULL;
+    size_t buffer_size = 0;
+    la_int64_t output_ofs = 0;
+    archive_read_data_block(arc, (const void **) &buffer, &buffer_size, &output_ofs);
+    bool zero_copy = ADDR_IN_FILE_MAPPING(buffer) && !output_ofs && buffer_size == entry->size;
+    entry->addr = zero_copy ? buffer : NULL;
+    return zero_copy;
+}
+
+static void archive_map_entries_index(archive_ctx *ctx, bool sort) {
+    int count = 0;
+    bool zero_copy = true;
    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK) {
-        const char *name = archive_entry_pathname2(ctx->entry);
+        const char *name = archive_entry_pathname(ctx->entry);
        if (archive_entry_is_file(ctx->entry) && filename_is_playable_file(name)) {
            entries[count].filename = strdup(name);
            entries[count].index = count;
-            entries[count].size = archive_entry_size(ctx->entry);
+            ssize_t size = archive_entry_size(ctx->entry);
+            max_file_size = max(size, max_file_size);
+            entries[count].size = size;
+            // We don't expect zero copy if first content can't do zero copy
+            if (zero_copy) zero_copy = fill_entry_zero_copy(ctx->arc, &entries[count]);
            count++;
        }
    }
-    if (!count)
-        LOGE("%s", archive_error_string(ctx->arc));
-    if (sort)
-        qsort(entries, entryCount, sizeof(entry), compare_entries);
-    return count;
+    if (sort) qsort(entries, entryCount, sizeof(entry), compare_entries);
 }

-static bool archive_prealloc_mempool() {
-    mempoolofs = calloc(entryCount, sizeof(size_t));
-    for (int i = 0; i < entryCount; ++i) {
-        if (!i)
-            mempoolofs[i] = PAGE_ALIGN(entries[i].size);
-        else
-            mempoolofs[i] = PAGE_ALIGN(entries[i].size) + mempoolofs[i - 1];
+static void *acquire_decode_buffer() {
+    void *addr = NULL;
+    pthread_mutex_lock(&buffer_mutex);
+    for (int i = 0; i < MAX_PARALLEL_DECOMP; ++i) {
+        addr = decode_buffer[i];
+        if (addr) {
+            decode_buffer[i] = NULL;
+            break;
+        }
    }
-    mempool = mmap(0, MEMPOOL_SIZE, PROT_RW, MAP_ANON_POOL, -1, 0);
-    if (mempool == MAP_FAILED) {
-        LOGE("%s%s", "mmap failed with error ", strerror(errno));
-        return false;
+    pthread_mutex_unlock(&buffer_mutex);
+    if (!addr) addr = malloc(max_file_size);
+    return addr;
+}
+
+static void release_decode_buffer(void *buffer) {
+    pthread_mutex_lock(&buffer_mutex);
+    for (int i = 0; i < MAX_PARALLEL_DECOMP; ++i) {
+        void *addr = decode_buffer[i];
+        if (!addr) {
+            decode_buffer[i] = buffer;
+            pthread_mutex_unlock(&buffer_mutex);
+            return;
+        }
    }
-    return true;
+    pthread_mutex_unlock(&buffer_mutex);
+    free(buffer);
 }

-#define ADDR_IN_FILE_MAPPING(addr) (addr >= archiveAddr && addr < archiveAddr + archiveSize)
-
-static void mempool_release_pages(void *addr, size_t size) {
-    size = PAGE_ALIGN(size);
-    madvise_log_if_error(addr, size, MADV_DONTNEED);
-}
-
-static bool kernel_can_prefault = true;
-
-static void mempool_prefault_pages(void *addr, size_t size) {
-    size = PAGE_ALIGN(size);
-    if (kernel_can_prefault) {
-        if (madvise(addr, size, MADV_POPULATE_WRITE)) kernel_can_prefault = false;
-    }
-}
-
-static long archive_list_all_entries(archive_ctx *ctx) {
-    long count = 0;
+static int archive_list_all_entries(archive_ctx *ctx) {
+    int count = 0;
    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK)
        if (archive_entry_is_playable(ctx->entry))
            count++;
-    if (!count)
-        LOGE("%s", archive_error_string(ctx->arc));
    return count;
 }

@@ -184,18 +185,10 @@ static void archive_release_ctx(archive_ctx *ctx) {
    }
 }

-static int archive_alloc_ctx(archive_ctx **ctxptr) {
-    archive_ctx *ctx;
-    int err;
-    ctx = calloc(1, sizeof(archive_ctx));
-    if (!ctx)
-        return -ENOMEM;
+static archive_ctx *archive_alloc_ctx() {
+    archive_ctx *ctx = calloc(1, sizeof(archive_ctx));
    ctx->arc = archive_read_new();
    ctx->using = 1;
-    if (!ctx->arc) {
-        free(ctx);
-        return -ENOMEM;
-    }
    archive_read_support_format_tar(ctx->arc);
    archive_read_support_format_7zip(ctx->arc);
    archive_read_support_format_rar5(ctx->arc);
@@ -205,14 +198,14 @@ static int archive_alloc_ctx(archive_ctx **ctxptr) {
    archive_read_set_option(ctx->arc, "zip", "ignorecrc32", "1");
    if (passwd)
        archive_read_add_passphrase(ctx->arc, passwd);
-    err = archive_read_open_memory(ctx->arc, archiveAddr, archiveSize);
-    if (err) {
+    int err = archive_read_open_memory(ctx->arc, archiveAddr, archiveSize);
+    if (err < ARCHIVE_OK) {
+        LOGE("%s%s", "Open archive failed: ", archive_error_string(ctx->arc));
        archive_read_free(ctx->arc);
        free(ctx);
-        return err;
+        return NULL;
    }
-    *ctxptr = ctx;
-    return 0;
+    return ctx;
 }

 static int archive_skip_to_index(archive_ctx *ctx, int index) {
@@ -229,7 +222,7 @@ static int archive_skip_to_index(archive_ctx *ctx, int index) {
 static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
    int ret;
    archive_ctx *ctx = NULL;
-    pthread_mutex_lock(&mutex);
+    pthread_mutex_lock(&ctx_pool_mutex);
    for (int i = 0; i < CTX_POOL_SIZE; i++) {
        if (!ctx_pool[i])
            continue;
@@ -244,16 +237,14 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
    }
    if (ctx)
        ctx->using = 1;
-    pthread_mutex_unlock(&mutex);
+    pthread_mutex_unlock(&ctx_pool_mutex);

    if (!ctx) {
        archive_ctx *victimCtx = NULL;
        int victimIdx = 0;
        int replace = 1;
-        ret = archive_alloc_ctx(&ctx);
-        if (ret)
-            return ret;
-        pthread_mutex_lock(&mutex);
+        ctx = archive_alloc_ctx();
+        pthread_mutex_lock(&ctx_pool_mutex);
        for (int i = 0; i < CTX_POOL_SIZE; i++) {
            if (!ctx_pool[i]) {
                ctx_pool[i] = ctx;
@@ -268,13 +259,13 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
            }
        }
        if (replace) ctx_pool[victimIdx] = ctx;
-        pthread_mutex_unlock(&mutex);
+        pthread_mutex_unlock(&ctx_pool_mutex);
        if (replace) archive_release_ctx(victimCtx);
    }
    ret = archive_skip_to_index(ctx, idx);
    if (ret != idx) {
        ret = archive_errno(ctx->arc);
-        LOGE("Skip to index failed:%s", archive_error_string(ctx->arc));
+        LOGE("Skip to index failed: %s", archive_error_string(ctx->arc));
        archive_release_ctx(ctx);
        return ret;
    }
@@ -294,104 +285,74 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_openArchive(JNIEnv *env, jclass thiz, jint
    }
    archiveSize = size;
    ctx_pool = calloc(CTX_POOL_SIZE, sizeof(archive_ctx **));
-    if (!ctx_pool) {
-        LOGE("Allocate archive ctx pool failed:ENOMEM");
+    ctx = archive_alloc_ctx();
+    if (!ctx) return 0;
+
+    entryCount = archive_list_all_entries(ctx);
+    LOGI("%s%zu%s", "Found ", entryCount, " images in archive");
+    if (!entryCount) {
+        LOGE("%s%s", "Archive read failed: ", archive_error_string(ctx->arc));
+        archive_release_ctx(ctx);
        return 0;
    }
-    long r = archive_alloc_ctx(&ctx);
-    if (r) {
-        if (r == -ENOMEM)
-            LOGE("%s", "Mem alloc failed");
-        LOGE("%s%s", "Archive open failed:", archive_error_string(ctx->arc));
-    } else {
-        entryCount = archive_list_all_entries(ctx);
-        LOGI("%s%zu%s", "Found ", entryCount, " image entries in archive");

-        // We must read through the file|vm then we can know whether it is encrypted
-        int encryptRet = archive_read_has_encrypted_entries(ctx->arc);
-        switch (encryptRet) {
-            case 1: // At lease 1 encrypted entry
-                need_encrypt = true;
-                break;
-            case 0: // format supports but no encrypted entry found
-            default:
-                need_encrypt = false;
-        }
-
-        int format = archive_format(ctx->arc);
-        switch (format) {
-            case ARCHIVE_FORMAT_ZIP:
-            case ARCHIVE_FORMAT_RAR_V5:
-                madvise_log_if_error(archiveAddr, archiveSize, MADV_SEQUENTIAL);
-                break;
-            case ARCHIVE_FORMAT_7ZIP: // Seek is bad
-                madvise_log_if_error(archiveAddr, archiveSize, MADV_RANDOM);
-                break;
-            default:;
-        }
+    // We must read through the file|vm then we can know whether it is encrypted
+    int encryptRet = archive_read_has_encrypted_entries(ctx->arc);
+    switch (encryptRet) {
+        case 1: // At lease 1 encrypted entry
+            need_encrypt = true;
+            break;
+        case 0: // format supports but no encrypted entry found
+        default:
+            need_encrypt = false;
    }

-    archive_release_ctx(ctx);
-
-    r = archive_alloc_ctx(&ctx);
-    if (r) {
-        if (r == -ENOMEM)
-            LOGE("%s", "Mem alloc failed");
-        r = 0;
-        LOGE("%s%s", "Archive open failed:", archive_error_string(ctx->arc));
-    } else {
-        entries = calloc(entryCount, sizeof(entry));
-        r = archive_map_entries_index(ctx, sort_entries);
-        if (!archive_prealloc_mempool()) {
-            r = 0;
-            for (int i = 0; i < entryCount; ++i) {
-                free((void *) entries[i].filename);
-            }
-            free(entries);
-        }
+    int format = archive_format(ctx->arc);
+    switch (format) {
+        case ARCHIVE_FORMAT_ZIP:
+        case ARCHIVE_FORMAT_RAR_V5:
+            madvise_log_if_error(archiveAddr, archiveSize, MADV_SEQUENTIAL);
+            break;
+        case ARCHIVE_FORMAT_7ZIP: // Seek is bad
+            madvise_log_if_error(archiveAddr, archiveSize, MADV_RANDOM);
+            break;
+        default:;
    }
-
    archive_release_ctx(ctx);
-    return r;
+
+    ctx = archive_alloc_ctx();
+    if (!ctx) return 0;
+    entries = calloc(entryCount, sizeof(entry));
+    archive_map_entries_index(ctx, sort_entries);
+    archive_release_ctx(ctx);
+    return (int) entryCount;
 }

 JNIEXPORT jobject JNICALL
 Java_com_hippo_ehviewer_jni_ArchiveKt_extractToByteBuffer(JNIEnv *env, jclass thiz, jint index) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
-    void *addr = MEMPOOL_ADDR_BY_SORTED_IDX(index);
-    size_t size = entries[index].size;
-    index = entries[index].index;
-    archive_ctx *ctx = NULL;
-    int ret = archive_get_ctx(&ctx, index);
-    if (ret) return 0;
-    void *buffer = NULL;
-    size_t buffer_size = 0;
-    la_int64_t output_ofs = 0;
-    archive_read_data_block(ctx->arc, (const void **) &buffer, &buffer_size, &output_ofs);
-    bool zero_copy = ADDR_IN_FILE_MAPPING(buffer) && !output_ofs && buffer_size == size;
-    if (zero_copy) {
-        ctx->using = 0;
-        return (*env)->NewDirectByteBuffer(env, buffer, buffer_size);
+    entry *entry = &entries[index];
+    ssize_t size = entry->size;
+    if (entry->addr) {
+        return (*env)->NewDirectByteBuffer(env, entry->addr, size);
    } else {
-        size_t bytes = 0;
-        mempool_prefault_pages(addr, size);
-        do {
-            memcpy(addr + output_ofs, buffer, buffer_size);
-            bytes += buffer_size;
-            ret = archive_read_data_block(ctx->arc, (const void **) &buffer, &buffer_size, &output_ofs);
-        } while (bytes != size && !ret);
-        ctx->using = 0;
-        if (bytes == size) {
-            return (*env)->NewDirectByteBuffer(env, addr, size);
-        } else {
-            if (ret < 0) {
-                LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
+        archive_ctx *ctx = NULL;
+        if (!archive_get_ctx(&ctx, entry->index)) {
+            void *addr = acquire_decode_buffer();
+            ssize_t bytes = archive_read_data(ctx->arc, addr, size);
+            ctx->using = 0;
+            if (bytes == size) {
+                return (*env)->NewDirectByteBuffer(env, addr, size);
            } else {
-                LOGE("%s", "No enough data read, WTF?");
+                if (bytes < 0) {
+                    LOGE("%s%s", "Archive read failed: ", archive_error_string(ctx->arc));
+                } else {
+                    LOGE("%s", "No enough data read, WTF?");
+                }
            }
+            release_decode_buffer(addr);
        }
-        mempool_release_pages(addr, size);
    }
    return 0;
 }
@@ -400,19 +361,31 @@ JNIEXPORT void JNICALL
 Java_com_hippo_ehviewer_jni_ArchiveKt_closeArchive(JNIEnv *env, jclass thiz) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
-    for (int i = 0; i < CTX_POOL_SIZE; i++)
-        archive_release_ctx(ctx_pool[i]);
+    if (ctx_pool) {
+        for (int i = 0; i < CTX_POOL_SIZE; i++)
+            archive_release_ctx(ctx_pool[i]);
+        free(ctx_pool);
+        ctx_pool = NULL;
+    }
    free(passwd);
-    free(ctx_pool);
    passwd = NULL;
    need_encrypt = false;
-    munmap(archiveAddr, archiveSize);
-    munmap(mempool, MEMPOOL_SIZE);
-    free(mempoolofs);
-    for (int i = 0; i < entryCount; ++i) {
-        free((void *) entries[i].filename);
+    if (archiveAddr != MAP_FAILED) {
+        munmap(archiveAddr, archiveSize);
+        archiveAddr = MAP_FAILED;
+    }
+    for (int i = 0; i < MAX_PARALLEL_DECOMP; ++i) {
+        free(decode_buffer[i]);
+        decode_buffer[i] = NULL;
+    }
+    max_file_size = 0;
+    if (entries) {
+        for (int i = 0; i < entryCount; ++i) {
+            free((void *) entries[i].filename);
+        }
+        free(entries);
+        entries = NULL;
    }
-    free(entries);
 }

 JNIEXPORT jboolean JNICALL
@@ -429,21 +402,18 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_providePassword(JNIEnv *env, jclass thiz,
    archive_ctx *ctx;
    jboolean ret = true;
    int len = (*env)->GetStringUTFLength(env, str);
-    passwd = realloc(passwd, len * sizeof(char));
-    if (!passwd) {
-        LOGE("Allocate passwd buffer failed");
-        return false;
-    }
+    passwd = realloc(passwd, len + 1);
    (*env)->GetStringUTFRegion(env, str, 0, len, passwd);
-    archive_alloc_ctx(&ctx);
-    void *tmpBuf = alloca(4096);
+    passwd[len] = 0;
+    ctx = archive_alloc_ctx();
+    char tmpBuf[4096];
    while (archive_read_next_header(ctx->arc, &entry) == ARCHIVE_OK) {
        if (!archive_entry_is_playable(entry))
            continue;
        if (!archive_entry_is_encrypted(entry))
            continue;
        if (archive_read_data(ctx->arc, tmpBuf, 4096) < ARCHIVE_OK) {
-            LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
+            LOGE("%s%s", "Archive read failed: ", archive_error_string(ctx->arc));
            ret = false;
        }
        break;
@@ -479,11 +449,12 @@ JNIEXPORT void JNICALL
 Java_com_hippo_ehviewer_jni_ArchiveKt_releaseByteBuffer(JNIEnv *env, jclass thiz, jobject buffer) {
    EH_UNUSED(thiz);
    void *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
-    if (!ADDR_IN_FILE_MAPPING(addr)) mempool_release_pages(addr, size);
+    if (!ADDR_IN_FILE_MAPPING(addr)) {
+        release_decode_buffer(addr);
+    }
 }

-JNIEXPORT jboolean JNICALL
+JNIEXPORT void JNICALL
 Java_com_hippo_ehviewer_jni_ArchiveKt_archiveFdBatch(JNIEnv *env, jclass clazz, jintArray fd_batch, jobjectArray names, jint arc_fd, jint size) {
    EH_UNUSED(clazz);
    struct archive *arc = archive_write_new();
@@ -505,15 +476,15 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_archiveFdBatch(JNIEnv *env, jclass clazz,
        archive_entry_copy_stat(entry, &st);
        archive_entry_set_perm(entry, 0644);
        archive_write_header(arc, entry);
-        int len = read(fd, buff, sizeof(buff));
-        while (len > 0) {
-            archive_write_data(arc, buff, len);
+        size_t len;
+        do {
            len = read(fd, buff, sizeof(buff));
-        }
+            archive_write_data(arc, buff, len);
+        } while (len > 0);
        archive_write_finish_entry(arc);
        archive_entry_clear(entry);
    }
+    archive_entry_free(entry);
    archive_write_close(arc);
    archive_write_free(arc);
-    return true;
 }
@@ -1,241 +0,0 @@
-#include <jni.h>
-#include <math.h>
-#include <stdbool.h>
-#include <android/bitmap.h>
-#include <stdlib.h>
-#include <string.h>
-
-/** A line will be considered as having content if 0.25% of it is filled. */
-const float filledRatioLimit = 0.0025;
-
-/** When the threshold is closer to 1, less content will be cropped. **/
-#define THRESHOLD 0.75
-
-const uint8_t thresholdForBlack = (uint8_t) (255.0 * THRESHOLD);
-
-const uint8_t thresholdForWhite = (uint8_t) (255.0 - 255.0 * THRESHOLD);
-
-static uint8_t inline grey(uint32_t pixel) {
-    const uint8_t r = ((uint8_t *) &pixel)[0];
-    const uint8_t g = ((uint8_t *) &pixel)[1];
-    const uint8_t b = ((uint8_t *) &pixel)[2];
-    return (r * 77 + g * 151 + b * 28) >> 8;
-}
-
-static bool inline isBlackPixel(const uint32_t *pixels, uint32_t width, uint32_t x, uint32_t y) {
-    const uint32_t pixel = *((uint32_t *) pixels + (y * width + x));
-    return grey(pixel) < thresholdForBlack;
-}
-
-static bool inline isWhitePixel(const uint32_t *pixels, uint32_t width, uint32_t x, uint32_t y) {
-    const uint32_t pixel = *((uint32_t *) pixels + (y * width + x));
-    return grey(pixel) > thresholdForWhite;
-}
-
-/** Return the first x position where there is a substantial amount of fill,
- * starting the search from the left. */
-uint32_t findBorderLeft(uint32_t *pixels, uint32_t width, uint32_t height,
-                        uint32_t top, uint32_t bottom) {
-    int x, y;
-    const uint32_t filledLimit = round(height * filledRatioLimit / 2);
-
-    // Scan first line to detect dominant color
-    uint32_t whitePixels = 0;
-    uint32_t blackPixels = 0;
-
-    for (y = top; y < bottom; y += 2) {
-        if (isBlackPixel(pixels, width, 0, y)) {
-            blackPixels++;
-        } else if (isWhitePixel(pixels, width, 0, y)) {
-            whitePixels++;
-        }
-    }
-
-    bool (*detectFunc)(const uint32_t *, uint32_t, uint32_t, uint32_t) = isBlackPixel;
-    if (whitePixels > filledLimit && blackPixels > filledLimit) {
-        // Mixed fill found... don't crop anything
-        return 0;
-    } else if (blackPixels > filledLimit) {
-        detectFunc = isWhitePixel;
-    }
-
-    // Scan vertical lines in search of filled lines
-    for (x = 1; x < width; x++) {
-        uint32_t filledCount = 0;
-
-        for (y = top; y < bottom; y += 2) {
-            if (detectFunc(pixels, width, x, y)) {
-                filledCount++;
-            }
-        }
-
-        if (filledCount > filledLimit) {
-            // This line contains enough fill
-            return x;
-        }
-    }
-
-    // No fill found... don't crop anything
-    return 0;
-}
-
-/** Return the first x position where there is a substantial amount of fill,
- * starting the search from the right. */
-uint32_t findBorderRight(uint32_t *pixels, uint32_t width, uint32_t height,
-                         uint32_t top, uint32_t bottom) {
-    int x, y;
-    const uint32_t filledLimit = round(height * filledRatioLimit / 2);
-
-    // Scan first line to detect dominant color
-    uint32_t whitePixels = 0;
-    uint32_t blackPixels = 0;
-
-    uint32_t lastX = width - 1;
-    for (y = top; y < bottom; y += 2) {
-        if (isBlackPixel(pixels, width, lastX, y)) {
-            blackPixels++;
-        } else if (isWhitePixel(pixels, width, lastX, y)) {
-            whitePixels++;
-        }
-    }
-
-    bool (*detectFunc)(const uint32_t *, uint32_t, uint32_t, uint32_t) = isBlackPixel;
-    if (whitePixels > filledLimit && blackPixels > filledLimit) {
-        // Mixed fill found... don't crop anything
-        return width;
-    } else if (blackPixels > filledLimit) {
-        detectFunc = isWhitePixel;
-    }
-
-    // Scan vertical lines in search of filled lines
-    for (x = width - 2; x > 0; x--) {
-        uint32_t filledCount = 0;
-
-        for (y = top; y < bottom; y += 2) {
-            if (detectFunc(pixels, width, x, y)) {
-                filledCount++;
-            }
-        }
-
-        if (filledCount > filledLimit) {
-            // This line contains enough fill
-            return x + 1;
-        }
-    }
-
-    // No fill found... don't crop anything
-    return width;
-}
-
-/** Return the first y position where there is a substantial amount of fill,
- * starting the search from the top. */
-uint32_t findBorderTop(uint32_t *pixels, uint32_t width, uint32_t height) {
-    int x, y;
-    const uint32_t filledLimit = round(width * filledRatioLimit / 2);
-
-    // Scan first line to detect dominant color
-    uint32_t whitePixels = 0;
-    uint32_t blackPixels = 0;
-
-    for (x = 0; x < width; x += 2) {
-        if (isBlackPixel(pixels, width, x, 0)) {
-            blackPixels++;
-        } else if (isWhitePixel(pixels, width, x, 0)) {
-            whitePixels++;
-        }
-    }
-
-    bool (*detectFunc)(const uint32_t *, uint32_t, uint32_t, uint32_t) = isBlackPixel;
-    if (whitePixels > filledLimit && blackPixels > filledLimit) {
-        // Mixed fill found... don't crop anything
-        return 0;
-    } else if (blackPixels > filledLimit) {
-        detectFunc = isWhitePixel;
-    }
-
-    // Scan horizontal lines in search of filled lines
-    for (y = 1; y < height; y++) {
-        uint32_t filledCount = 0;
-
-        for (x = 0; x < width; x += 2) {
-            if (detectFunc(pixels, width, x, y)) {
-                filledCount++;
-            }
-        }
-
-        if (filledCount > filledLimit) {
-            // This line contains enough fill
-            return y;
-        }
-    }
-
-    // No fill found... don't crop anything
-    return 0;
-}
-
-/** Return the first y position where there is a substantial amount of fill,
- * starting the search from the bottom. */
-uint32_t findBorderBottom(uint32_t *pixels, uint32_t width, uint32_t height) {
-    int x, y;
-    const uint32_t filledLimit = round(width * filledRatioLimit / 2);
-
-    // Scan first line to detect dominant color
-    uint32_t whitePixels = 0;
-    uint32_t blackPixels = 0;
-    uint32_t lastY = height - 1;
-
-    for (x = 0; x < width; x += 2) {
-        if (isBlackPixel(pixels, width, x, lastY)) {
-            blackPixels++;
-        } else if (isWhitePixel(pixels, width, x, lastY)) {
-            whitePixels++;
-        }
-    }
-
-    bool (*detectFunc)(const uint32_t *, uint32_t, uint32_t, uint32_t) = isBlackPixel;
-    if (whitePixels > filledLimit && blackPixels > filledLimit) {
-        // Mixed fill found... don't crop anything
-        return height;
-    } else if (blackPixels > filledLimit) {
-        detectFunc = isWhitePixel;
-    }
-
-    // Scan horizontal lines in search of filled lines
-    for (y = height - 2; y > 0; y--) {
-        uint32_t filledCount = 0;
-
-        for (x = 0; x < width; x += 2) {
-            if (detectFunc(pixels, width, x, y)) {
-                filledCount++;
-            }
-        }
-
-        if (filledCount > filledLimit) {
-            // This line contains enough fill
-            return y + 1;
-        }
-    }
-
-    // No fill found... don't crop anything
-    return height;
-}
-
-JNIEXPORT jintArray JNICALL
-Java_com_hippo_ehviewer_image_ImageKt_detectBorder(JNIEnv *env, jclass clazz, jobject bitmap) {
-    void *pixels = NULL;
-    AndroidBitmapInfo info;
-    memset(&info, 0, sizeof(info));
-    AndroidBitmap_getInfo(env, bitmap, &info);
-    AndroidBitmap_lockPixels(env, bitmap, &pixels);
-    uint32_t width = info.width;
-    uint32_t height = info.height;
-    uint32_t top = findBorderTop(pixels, width, height);
-    uint32_t bottom = findBorderBottom(pixels, width, height);
-    uint32_t left = findBorderLeft(pixels, width, height, top, bottom);
-    uint32_t right = findBorderRight(pixels, width, height, top, bottom);
-    int array[4] = {left, top, right, bottom};
-    AndroidBitmap_unlockPixels(env, bitmap);
-    jintArray ret = (*env)->NewIntArray(env, 4);
-    (*env)->SetIntArrayRegion(env, ret, 0, 4, array);
-    return ret;
-}
@@ -0,0 +1,13 @@
+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
@@ -37,7 +37,7 @@ static void doRewrite(byte *addr, size_t size) {
            byte *end = addr + i + 4;
            if (end[4] != 0) continue;
            int frameDelay = end[2] << 8 | end[1];
-            if (frameDelay > MINIMUM_FRAME_DELAY)
+            if (frameDelay >= MINIMUM_FRAME_DELAY)
                break; // Quit if the first block looks normal, for performance
            end[1] = DEFAULT_FRAME_DELAY;
            end[2] = 0;
@@ -0,0 +1,39 @@
+#include <unistd.h>
+
+#include <jni.h>
+#include <nettle/sha1.h>
+
+#include "ehviewer.h"
+
+#define BUFFER_SIZE 8192
+
+typedef uint8_t byte;
+
+const char hex_digits[] = "0123456789abcdef";
+
+JNIEXPORT jstring JNICALL
+Java_com_hippo_ehviewer_jni_HashKt_sha1(JNIEnv *env, jclass clazz, jint fd) {
+    EH_UNUSED(clazz);
+    struct sha1_ctx ctx;
+    sha1_init(&ctx);
+
+    size_t bytes_read;
+    byte buffer[BUFFER_SIZE];
+    while ((bytes_read = read(fd, buffer, BUFFER_SIZE)) > 0) {
+        sha1_update(&ctx, bytes_read, buffer);
+    }
+
+    byte digest[SHA1_DIGEST_SIZE];
+    sha1_digest(&ctx, SHA1_DIGEST_SIZE, digest);
+
+    byte byte;
+    char hex_digest[2 * SHA1_DIGEST_SIZE + 1];
+    for (int i = 0; i < SHA1_DIGEST_SIZE; i++) {
+        byte = digest[i];
+        hex_digest[2 * i] = hex_digits[byte >> 4 & 0xF];
+        hex_digest[2 * i + 1] = hex_digits[byte & 0xF];
+    }
+    hex_digest[2 * SHA1_DIGEST_SIZE] = '\0';
+
+    return (*env)->NewStringUTF(env, hex_digest);
+}
@@ -0,0 +1,7 @@
+{
+  global:
+    JNI_OnLoad;
+    Java_*;
+  local:
+    *;
+};
@@ -30,7 +30,6 @@
 * negative chars in their default char type.
 */

-#include <stddef.h>     /* size_t */
 #include <ctype.h>

 #include "strnatcmp.h"
@@ -39,28 +38,21 @@
 /* These are defined as macros to make it easier to adapt this code to
 * different characters types or comparison functions. */
 static inline int
-nat_isdigit(nat_char a)
+nat_isdigit(const char *a)
 {
-     return isdigit((unsigned char) a);
+     return isdigit((unsigned char) *a);
 }


 static inline int
-nat_isspace(nat_char a)
+nat_isspace(const char *a)
 {
-     return isspace((unsigned char) a);
-}
-
-
-static inline nat_char
-nat_toupper(nat_char a)
-{
-     return toupper((unsigned char) a);
+     return isspace((unsigned char) *a) || *a == '0' && nat_isdigit(a + 1);
 }


 static int
-compare_right(nat_char const *a, nat_char const *b)
+compare_right(const char *a, const char *b)
 {
     int bias = 0;

@@ -69,11 +61,11 @@ compare_right(nat_char const *a, nat_char const *b)
        both numbers to know that they have the same magnitude, so we
        remember it in BIAS. */
     for (;; a++, b++) {
-          if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
+          if (!nat_isdigit(a)  &&  !nat_isdigit(b))
               return bias;
-          if (!nat_isdigit(*a))
+          if (!nat_isdigit(a))
               return -1;
-          if (!nat_isdigit(*b))
+          if (!nat_isdigit(b))
               return +1;
          if (*a < *b) {
               if (!bias)
@@ -87,60 +79,38 @@ compare_right(nat_char const *a, nat_char const *b)
 }


-static int
-strnatcmp0(nat_char const *a, nat_char const *b, int fold_case)
+int
+strnatcmp(const char *a, const char *b)
 {
-     int ai, bi;
-     nat_char ca, cb;
-     int result;
+    int result;

-     ai = bi = 0;
-     while (1) {
-          ca = a[ai]; cb = b[bi];
+    while (1) {
+         /* skip over leading spaces or zeros */
+          while (nat_isspace(a))
+               a++;

-          /* skip over leading spaces or zeros */
-          while (nat_isspace(ca) || ca == '0')
-               ca = a[++ai];
-
-          while (nat_isspace(cb) || cb == '0')
-               cb = b[++bi];
+          while (nat_isspace(b))
+               b++;

          /* process run of digits */
-          if (nat_isdigit(ca)  &&  nat_isdigit(cb)) {
-               if ((result = compare_right(a+ai, b+bi)) != 0)
+          if (nat_isdigit(a)  &&  nat_isdigit(b)) {
+               if ((result = compare_right(a, b)) != 0)
                    return result;
          }

-          if (!ca && !cb) {
+          if (!*a && !*b) {
               /* The strings compare the same.  Perhaps the caller
                  will want to call strcmp to break the tie. */
               return 0;
          }

-          if (fold_case) {
-               ca = nat_toupper(ca);
-               cb = nat_toupper(cb);
-          }
-
-          if (ca < cb)
+          if (*a < *b)
               return -1;

-          if (ca > cb)
+          if (*a > *b)
               return +1;

-          ++ai; ++bi;
+          a++; b++;
     }
 }

-
-int
-strnatcmp(nat_char const *a, nat_char const *b) {
-     return strnatcmp0(a, b, 0);
-}
-
-
-/* Compare, recognizing numeric string and ignoring case. */
-int
-strnatcasecmp(nat_char const *a, nat_char const *b) {
-     return strnatcmp0(a, b, 1);
-}
@@ -24,14 +24,7 @@
 extern "C" {
 #endif

-/* CUSTOMIZATION SECTION
- *
- * You can change this typedef, but must then also change the inline
- * functions in strnatcmp.c */
-typedef char nat_char;
-
-int strnatcmp(nat_char const *a, nat_char const *b);
-int strnatcasecmp(nat_char const *a, nat_char const *b);
+int strnatcmp(const char *a, const char *b);

 #ifdef __cplusplus
 }
@@ -1,238 +0,0 @@
-cmake_minimum_required(VERSION 3.4.1)
-project(nettle C)
-
-set(LIBNETTLE_DEFINITIONS
-        -DHAVE_CONFIG_H)
-
-set(LIBNETTLE_SOURCES
-        ${NETTLE_DIR}/aes-decrypt-internal.c
-        ${NETTLE_DIR}/aes-decrypt.c
-        ${NETTLE_DIR}/aes-decrypt-table.c
-        ${NETTLE_DIR}/aes128-decrypt.c
-        ${NETTLE_DIR}/aes192-decrypt.c
-        ${NETTLE_DIR}/aes256-decrypt.c
-        ${NETTLE_DIR}/aes-encrypt-internal.c
-        ${NETTLE_DIR}/aes-encrypt.c
-        ${NETTLE_DIR}/aes-encrypt-table.c
-        ${NETTLE_DIR}/aes128-encrypt.c
-        ${NETTLE_DIR}/aes192-encrypt.c
-        ${NETTLE_DIR}/aes256-encrypt.c
-        ${NETTLE_DIR}/aes-invert-internal.c
-        ${NETTLE_DIR}/aes-set-key-internal.c
-        ${NETTLE_DIR}/aes-set-encrypt-key.c
-        ${NETTLE_DIR}/aes-set-decrypt-key.c
-        ${NETTLE_DIR}/aes128-set-encrypt-key.c
-        ${NETTLE_DIR}/aes128-set-decrypt-key.c
-        ${NETTLE_DIR}/aes128-meta.c
-        ${NETTLE_DIR}/aes192-set-encrypt-key.c
-        ${NETTLE_DIR}/aes192-set-decrypt-key.c
-        ${NETTLE_DIR}/aes192-meta.c
-        ${NETTLE_DIR}/aes256-set-encrypt-key.c
-        ${NETTLE_DIR}/aes256-set-decrypt-key.c
-        ${NETTLE_DIR}/aes256-meta.c
-        ${NETTLE_DIR}/nist-keywrap.c
-        ${NETTLE_DIR}/arcfour.c
-        ${NETTLE_DIR}/arctwo.c
-        ${NETTLE_DIR}/arctwo-meta.c
-        ${NETTLE_DIR}/blowfish.c
-        ${NETTLE_DIR}/blowfish-bcrypt.c
-        ${NETTLE_DIR}/base16-encode.c
-        ${NETTLE_DIR}/base16-decode.c
-        ${NETTLE_DIR}/base16-meta.c
-        ${NETTLE_DIR}/base64-encode.c
-        ${NETTLE_DIR}/base64-decode.c
-        ${NETTLE_DIR}/base64-meta.c
-        ${NETTLE_DIR}/base64url-encode.c
-        ${NETTLE_DIR}/base64url-decode.c
-        ${NETTLE_DIR}/base64url-meta.c
-        ${NETTLE_DIR}/buffer.c
-        ${NETTLE_DIR}/buffer-init.c
-        ${NETTLE_DIR}/camellia-crypt-internal.c
-        ${NETTLE_DIR}/camellia-table.c
-        ${NETTLE_DIR}/camellia-absorb.c
-        ${NETTLE_DIR}/camellia-invert-key.c
-        ${NETTLE_DIR}/camellia128-set-encrypt-key.c
-        ${NETTLE_DIR}/camellia128-crypt.c
-        ${NETTLE_DIR}/camellia128-set-decrypt-key.c
-        ${NETTLE_DIR}/camellia128-meta.c
-        ${NETTLE_DIR}/camellia192-meta.c
-        ${NETTLE_DIR}/camellia256-set-encrypt-key.c
-        ${NETTLE_DIR}/camellia256-crypt.c
-        ${NETTLE_DIR}/camellia256-set-decrypt-key.c
-        ${NETTLE_DIR}/camellia256-meta.c
-        ${NETTLE_DIR}/cast128.c
-        ${NETTLE_DIR}/cast128-meta.c
-        ${NETTLE_DIR}/cbc.c
-        ${NETTLE_DIR}/cbc-aes128-encrypt.c
-        ${NETTLE_DIR}/cbc-aes192-encrypt.c
-        ${NETTLE_DIR}/cbc-aes256-encrypt.c
-        ${NETTLE_DIR}/ccm.c
-        ${NETTLE_DIR}/ccm-aes128.c
-        ${NETTLE_DIR}/ccm-aes192.c
-        ${NETTLE_DIR}/ccm-aes256.c
-        ${NETTLE_DIR}/cfb.c
-        ${NETTLE_DIR}/siv-cmac.c
-        ${NETTLE_DIR}/siv-cmac-aes128.c
-        ${NETTLE_DIR}/siv-cmac-aes256.c
-        ${NETTLE_DIR}/cnd-memcpy.c
-        ${NETTLE_DIR}/chacha-crypt.c
-        ${NETTLE_DIR}/chacha-core-internal.c
-        ${NETTLE_DIR}/chacha-poly1305.c
-        ${NETTLE_DIR}/chacha-poly1305-meta.c
-        ${NETTLE_DIR}/chacha-set-key.c
-        ${NETTLE_DIR}/chacha-set-nonce.c
-        ${NETTLE_DIR}/ctr.c
-        ${NETTLE_DIR}/ctr16.c
-        ${NETTLE_DIR}/des.c
-        ${NETTLE_DIR}/des3.c
-        ${NETTLE_DIR}/eax.c
-        ${NETTLE_DIR}/eax-aes128.c
-        ${NETTLE_DIR}/eax-aes128-meta.c
-        ${NETTLE_DIR}/ghash-set-key.c
-        ${NETTLE_DIR}/ghash-update.c
-        ${NETTLE_DIR}/gcm.c
-        ${NETTLE_DIR}/gcm-aes.c
-        ${NETTLE_DIR}/gcm-aes128.c
-        ${NETTLE_DIR}/gcm-aes128-meta.c
-        ${NETTLE_DIR}/gcm-aes192.c
-        ${NETTLE_DIR}/gcm-aes192-meta.c
-        ${NETTLE_DIR}/gcm-aes256.c
-        ${NETTLE_DIR}/gcm-aes256-meta.c
-        ${NETTLE_DIR}/gcm-camellia128.c
-        ${NETTLE_DIR}/gcm-camellia128-meta.c
-        ${NETTLE_DIR}/gcm-camellia256.c
-        ${NETTLE_DIR}/gcm-camellia256-meta.c
-        ${NETTLE_DIR}/cmac.c
-        ${NETTLE_DIR}/cmac64.c
-        ${NETTLE_DIR}/cmac-aes128.c
-        ${NETTLE_DIR}/cmac-aes256.c
-        ${NETTLE_DIR}/cmac-des3.c
-        ${NETTLE_DIR}/cmac-aes128-meta.c
-        ${NETTLE_DIR}/cmac-aes256-meta.c
-        ${NETTLE_DIR}/cmac-des3-meta.c
-        ${NETTLE_DIR}/gost28147.c
-        ${NETTLE_DIR}/gosthash94.c
-        ${NETTLE_DIR}/gosthash94-meta.c
-        ${NETTLE_DIR}/hmac.c
-        ${NETTLE_DIR}/hmac-gosthash94.c
-        ${NETTLE_DIR}/hmac-md5.c
-        ${NETTLE_DIR}/hmac-ripemd160.c
-        ${NETTLE_DIR}/hmac-sha1.c
-        ${NETTLE_DIR}/hmac-sha224.c
-        ${NETTLE_DIR}/hmac-sha256.c
-        ${NETTLE_DIR}/hmac-sha384.c
-        ${NETTLE_DIR}/hmac-sha512.c
-        ${NETTLE_DIR}/hmac-streebog.c
-        ${NETTLE_DIR}/hmac-sm3.c
-        ${NETTLE_DIR}/hmac-md5-meta.c
-        ${NETTLE_DIR}/hmac-ripemd160-meta.c
-        ${NETTLE_DIR}/hmac-sha1-meta.c
-        ${NETTLE_DIR}/hmac-sha224-meta.c
-        ${NETTLE_DIR}/hmac-sha256-meta.c
-        ${NETTLE_DIR}/hmac-sha384-meta.c
-        ${NETTLE_DIR}/hmac-sha512-meta.c
-        ${NETTLE_DIR}/hmac-streebog-meta.c
-        ${NETTLE_DIR}/hmac-sm3-meta.c
-        ${NETTLE_DIR}/knuth-lfib.c
-        ${NETTLE_DIR}/hkdf.c
-        ${NETTLE_DIR}/md2.c
-        ${NETTLE_DIR}/md2-meta.c
-        ${NETTLE_DIR}/md4.c
-        ${NETTLE_DIR}/md4-meta.c
-        ${NETTLE_DIR}/md5.c
-        ${NETTLE_DIR}/md5-compress.c
-        ${NETTLE_DIR}/md5-compat.c
-        ${NETTLE_DIR}/md5-meta.c
-        ${NETTLE_DIR}/memeql-sec.c
-        ${NETTLE_DIR}/memxor.c
-        ${NETTLE_DIR}/memxor3.c
-        ${NETTLE_DIR}/nettle-lookup-hash.c
-        ${NETTLE_DIR}/nettle-meta-aeads.c
-        ${NETTLE_DIR}/nettle-meta-armors.c
-        ${NETTLE_DIR}/nettle-meta-ciphers.c
-        ${NETTLE_DIR}/nettle-meta-hashes.c
-        ${NETTLE_DIR}/nettle-meta-macs.c
-        ${NETTLE_DIR}/pbkdf2.c
-        ${NETTLE_DIR}/pbkdf2-hmac-gosthash94.c
-        ${NETTLE_DIR}/pbkdf2-hmac-sha1.c
-        ${NETTLE_DIR}/pbkdf2-hmac-sha256.c
-        ${NETTLE_DIR}/pbkdf2-hmac-sha384.c
-        ${NETTLE_DIR}/pbkdf2-hmac-sha512.c
-        ${NETTLE_DIR}/poly1305-aes.c
-        ${NETTLE_DIR}/poly1305-internal.c
-        ${NETTLE_DIR}/realloc.c
-        ${NETTLE_DIR}/ripemd160.c
-        ${NETTLE_DIR}/ripemd160-compress.c
-        ${NETTLE_DIR}/ripemd160-meta.c
-        ${NETTLE_DIR}/salsa20-core-internal.c
-        ${NETTLE_DIR}/salsa20-crypt-internal.c
-        ${NETTLE_DIR}/salsa20-crypt.c
-        ${NETTLE_DIR}/salsa20r12-crypt.c
-        ${NETTLE_DIR}/salsa20-set-key.c
-        ${NETTLE_DIR}/salsa20-set-nonce.c
-        ${NETTLE_DIR}/salsa20-128-set-key.c
-        ${NETTLE_DIR}/salsa20-256-set-key.c
-        ${NETTLE_DIR}/sha1.c
-        ${NETTLE_DIR}/sha1-compress.c
-        ${NETTLE_DIR}/sha1-meta.c
-        ${NETTLE_DIR}/sha256.c
-        ${NETTLE_DIR}/sha256-compress-n.c
-        ${NETTLE_DIR}/sha224-meta.c
-        ${NETTLE_DIR}/sha256-meta.c
-        ${NETTLE_DIR}/sha512.c
-        ${NETTLE_DIR}/sha512-compress.c
-        ${NETTLE_DIR}/sha384-meta.c
-        ${NETTLE_DIR}/sha512-meta.c
-        ${NETTLE_DIR}/sha512-224-meta.c
-        ${NETTLE_DIR}/sha512-256-meta.c
-        ${NETTLE_DIR}/sha3.c
-        ${NETTLE_DIR}/sha3-permute.c
-        ${NETTLE_DIR}/sha3-224.c
-        ${NETTLE_DIR}/sha3-224-meta.c
-        ${NETTLE_DIR}/sha3-256.c
-        ${NETTLE_DIR}/sha3-256-meta.c
-        ${NETTLE_DIR}/sha3-384.c
-        ${NETTLE_DIR}/sha3-384-meta.c
-        ${NETTLE_DIR}/sha3-512.c
-        ${NETTLE_DIR}/sha3-512-meta.c
-        ${NETTLE_DIR}/shake256.c
-        ${NETTLE_DIR}/sm3.c
-        ${NETTLE_DIR}/sm3-meta.c
-        ${NETTLE_DIR}/serpent-set-key.c
-        ${NETTLE_DIR}/serpent-encrypt.c
-        ${NETTLE_DIR}/serpent-decrypt.c
-        ${NETTLE_DIR}/serpent-meta.c
-        ${NETTLE_DIR}/streebog.c
-        ${NETTLE_DIR}/streebog-meta.c
-        ${NETTLE_DIR}/twofish.c
-        ${NETTLE_DIR}/twofish-meta.c
-        ${NETTLE_DIR}/umac-nh.c
-        ${NETTLE_DIR}/umac-nh-n.c
-        ${NETTLE_DIR}/umac-l2.c
-        ${NETTLE_DIR}/umac-l3.c
-        ${NETTLE_DIR}/umac-poly64.c
-        ${NETTLE_DIR}/umac-poly128.c
-        ${NETTLE_DIR}/umac-set-key.c
-        ${NETTLE_DIR}/umac32.c
-        ${NETTLE_DIR}/umac64.c
-        ${NETTLE_DIR}/umac96.c
-        ${NETTLE_DIR}/umac128.c
-        ${NETTLE_DIR}/version.c
-        ${NETTLE_DIR}/write-be32.c
-        ${NETTLE_DIR}/write-le32.c
-        ${NETTLE_DIR}/write-le64.c
-        ${NETTLE_DIR}/yarrow256.c
-        ${NETTLE_DIR}/yarrow_key_event.c
-        ${NETTLE_DIR}/xts.c
-        ${NETTLE_DIR}/xts-aes128.c
-        ${NETTLE_DIR}/xts-aes256.c
-        )
-
-set(LIBNETTLE_INCLUDES
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${NETTLE_DIR}
-        )
-
-add_library(nettle STATIC ${LIBNETTLE_SOURCES})
-target_include_directories(nettle PUBLIC ${LIBNETTLE_INCLUDES})
-target_compile_definitions(nettle PRIVATE ${LIBNETTLE_DEFINITIONS})
@@ -1,280 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#define HAVE_ALLOCA_H 1
-
-/* Define if __builtin_bswap64 is available */
-#define HAVE_BUILTIN_BSWAP64 1
-
-/* Define if clock_gettime is available */
-#define HAVE_CLOCK_GETTIME 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define if fcntl file locking is available */
-#define HAVE_FCNTL_LOCKING 1
-
-/* Define if the compiler understands __attribute__ */
-#define HAVE_GCC_ATTRIBUTE 1
-
-/* Define to 1 if you have the `getline' function. */
-#define HAVE_GETLINE 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have dlopen (with -ldl). */
-#define HAVE_LIBDL 1
-
-/* Define to 1 if you have the `gmp' library (-lgmp). */
-/* #undef HAVE_LIBGMP */
-
-/* Define if compiler and linker supports __attribute__ ifunc */
-#define HAVE_LINK_IFUNC 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 each of the following for which a native (ie. CPU specific)
-    implementation of the corresponding routine exists.  */
-/* #undef HAVE_NATIVE_memxor3 */
-/* #undef HAVE_NATIVE_aes_decrypt */
-/* #undef HAVE_NATIVE_aes_encrypt */
-/* #undef HAVE_NATIVE_aes128_decrypt */
-/* #undef HAVE_NATIVE_aes128_encrypt */
-/* #undef HAVE_NATIVE_aes128_invert_key */
-/* #undef HAVE_NATIVE_aes128_set_decrypt_key */
-/* #undef HAVE_NATIVE_aes128_set_encrypt_key */
-/* #undef HAVE_NATIVE_aes192_decrypt */
-/* #undef HAVE_NATIVE_aes192_encrypt */
-/* #undef HAVE_NATIVE_aes192_invert_key */
-/* #undef HAVE_NATIVE_aes192_set_decrypt_key */
-/* #undef HAVE_NATIVE_aes192_set_encrypt_key */
-/* #undef HAVE_NATIVE_aes256_decrypt */
-/* #undef HAVE_NATIVE_aes256_encrypt */
-/* #undef HAVE_NATIVE_aes256_invert_key */
-/* #undef HAVE_NATIVE_aes256_set_decrypt_key */
-/* #undef HAVE_NATIVE_aes256_set_encrypt_key */
-/* #undef HAVE_NATIVE_cbc_aes128_encrypt */
-/* #undef HAVE_NATIVE_cbc_aes192_encrypt */
-/* #undef HAVE_NATIVE_cbc_aes256_encrypt */
-/* #undef HAVE_NATIVE_chacha_core */
-/* #undef HAVE_NATIVE_chacha_2core */
-#define HAVE_NATIVE_chacha_3core 1
-/* #undef HAVE_NATIVE_chacha_4core */
-/* #undef HAVE_NATIVE_fat_chacha_2core */
-/* #undef HAVE_NATIVE_fat_chacha_3core */
-/* #undef HAVE_NATIVE_fat_chacha_4core */
-/* #undef HAVE_NATIVE_ecc_curve25519_modp */
-/* #undef HAVE_NATIVE_ecc_curve448_modp */
-/* #undef HAVE_NATIVE_ecc_secp192r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp192r1_redc */
-/* #undef HAVE_NATIVE_ecc_secp224r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp224r1_redc */
-/* #undef HAVE_NATIVE_ecc_secp256r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp256r1_redc */
-/* #undef HAVE_NATIVE_ecc_secp384r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp384r1_redc */
-/* #undef HAVE_NATIVE_ecc_secp521r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp521r1_redc */
-/* #undef HAVE_NATIVE_poly1305_set_key */
-/* #undef HAVE_NATIVE_poly1305_block */
-/* #undef HAVE_NATIVE_poly1305_digest */
-/* #undef HAVE_NATIVE_poly1305_blocks */
-/* #undef HAVE_NATIVE_fat_poly1305_blocks */
-/* #undef HAVE_NATIVE_ghash_set_key */
-/* #undef HAVE_NATIVE_ghash_update */
-/* #undef HAVE_NATIVE_salsa20_core */
-#define HAVE_NATIVE_salsa20_2core 1
-/* #undef HAVE_NATIVE_fat_salsa20_2core */
-/* #undef HAVE_NATIVE_sha1_compress */
-/* #undef HAVE_NATIVE_sha256_compress_n */
-/* #undef HAVE_NATIVE_sha512_compress */
-/* #undef HAVE_NATIVE_sha3_permute */
-/* #undef HAVE_NATIVE_umac_nh */
-/* #undef HAVE_NATIVE_umac_nh_n */
-
-/* Define to 1 if you have the <openssl/ecdsa.h> header file. */
-/* #undef HAVE_OPENSSL_ECDSA_H */
-
-/* Define to 1 if you have the <openssl/evp.h> header file. */
-/* #undef HAVE_OPENSSL_EVP_H */
-
-/* Define to 1 if you have the `secure_getenv' function. */
-#define HAVE_SECURE_GETENV 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
-/* #undef HAVE_VALGRIND_MEMCHECK_H */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "nettle-bugs@lists.lysator.liu.se"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "nettle"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "nettle 3.9.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "nettle"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.9.1"
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG __SIZEOF_LONG__
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T __SIZEOF_SIZE_T__
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Defined if public key features are enabled */
-/* #undef WITH_HOGWEED */
-
-/* Define if you have openssl's libcrypto (used for benchmarking) */
-/* #undef WITH_OPENSSL */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
-
-/* AIX requires this to be the first thing in the file.  */
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-/* Needed for alloca on windows */
-#  if HAVE_MALLOC_H
-#   include <malloc.h>
-#  endif
-# endif
-#else /* defined __GNUC__ */
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-/* Needed for alloca on windows, also with gcc */
-#  if HAVE_MALLOC_H
-#   include <malloc.h>
-#  endif
-# endif
-#endif
-
-
-#if HAVE_STRERROR
-#define STRERROR strerror
-#else
-#define STRERROR(x) (sys_errlist[x])
-#endif
-
-
-#if __GNUC__ && HAVE_GCC_ATTRIBUTE
-# define NORETURN __attribute__ ((__noreturn__))
-# define PRINTF_STYLE(f, a) __attribute__ ((__format__ (__printf__, f, a)))
-# define UNUSED __attribute__ ((__unused__))
-#else
-# define NORETURN
-# define PRINTF_STYLE(f, a)
-# define UNUSED
-#endif
-
-
-#if defined(__x86_64__) || defined(__arch64__)
-# define HAVE_NATIVE_64_BIT 1
-#else
-/* Needs include of <limits.h> before use. */
-# define HAVE_NATIVE_64_BIT (SIZEOF_LONG * CHAR_BIT >= 64)
-#endif
-
@@ -1 +0,0 @@
- 
@@ -1 +0,0 @@
- 
@@ -1,64 +0,0 @@
-/* version.h
-
-   Information about library version.
-
-   Copyright (C) 2015 Red Hat, Inc.
-   Copyright (C) 2015 Niels Möller
-
-   This file is part of GNU Nettle.
-
-   GNU Nettle is free software: you can redistribute it and/or
-   modify it under the terms of either:
-
-     * the GNU Lesser General Public License as published by the Free
-       Software Foundation; either version 3 of the License, or (at your
-       option) any later version.
-
-   or
-
-     * the GNU General Public License as published by the Free
-       Software Foundation; either version 2 of the License, or (at your
-       option) any later version.
-
-   or both in parallel, as here.
-
-   GNU Nettle 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 copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see http://www.gnu.org/licenses/.
-*/
-
-#ifndef NETTLE_VERSION_H_INCLUDED
-#define NETTLE_VERSION_H_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Individual version numbers in decimal */
-#define NETTLE_VERSION_MAJOR 3
-#define NETTLE_VERSION_MINOR 9
-
-#define NETTLE_USE_MINI_GMP 0
-
-/* We need a preprocessor constant for GMP_NUMB_BITS, simply using
-   sizeof(mp_limb_t) * CHAR_BIT is not good enough. */
-#if NETTLE_USE_MINI_GMP
-# define GMP_NUMB_BITS n/a
-#endif
-
-int
-nettle_version_major (void);
-
-int
-nettle_version_minor (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NETTLE_VERSION_H_INCLUDED */
@@ -0,0 +1,191 @@
+/*
+ * 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
+ *
+ *      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 androidx.compose.foundation.gestures
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.gestures.HorizontalDragEvent.DragDelta
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.PointerInputChange
+import androidx.compose.ui.input.pointer.positionChange
+import androidx.compose.ui.node.ModifierNodeElement
+import androidx.compose.ui.node.requireLayoutDirection
+import androidx.compose.ui.platform.InspectorInfo
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.Velocity
+import kotlin.math.absoluteValue
+import kotlinx.coroutines.launch
+
+@ExperimentalFoundationApi
+fun <T> Modifier.anchoredHorizontalDraggable(
+    state: AnchoredDraggableState<T>,
+    enableDragFromStartToEnd: Boolean = true,
+    enableDragFromEndToStart: Boolean = true,
+    enabled: Boolean = true,
+    startDragImmediately: Boolean = state.isAnimationRunning,
+    flingBehavior: FlingBehavior,
+): Modifier = this then AnchoredHorizontalDraggableElement(
+    state = state,
+    canDrag = { (x, y) ->
+        val enableDrag = if (x > 0) enableDragFromStartToEnd else enableDragFromEndToStart
+        enableDrag && x.absoluteValue > y.absoluteValue * 2f
+    },
+    enabled = enabled,
+    startDragImmediately = startDragImmediately,
+    flingBehavior = flingBehavior,
+)
+
+private class AnchoredHorizontalDraggableElement<T>(
+    private val state: AnchoredDraggableState<T>,
+    private val canDrag: (Offset) -> Boolean,
+    private val enabled: Boolean,
+    private val startDragImmediately: Boolean,
+    private val flingBehavior: FlingBehavior,
+) : ModifierNodeElement<AnchoredHorizontalDraggableNode<T>>() {
+    override fun create() = AnchoredHorizontalDraggableNode(
+        state,
+        canDrag,
+        enabled,
+        startDragImmediately,
+        flingBehavior,
+    )
+
+    override fun update(node: AnchoredHorizontalDraggableNode<T>) {
+        node.update(
+            state,
+            canDrag,
+            enabled,
+            startDragImmediately,
+            flingBehavior,
+        )
+    }
+
+    override fun hashCode(): Int {
+        var result = state.hashCode()
+        result = 31 * result + canDrag.hashCode()
+        result = 31 * result + enabled.hashCode()
+        result = 31 * result + startDragImmediately.hashCode()
+        result = 31 * result + flingBehavior.hashCode()
+        return result
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+
+        if (other !is AnchoredHorizontalDraggableElement<*>) return false
+
+        if (state != other.state) return false
+        if (canDrag != other.canDrag) return false
+        if (enabled != other.enabled) return false
+        if (startDragImmediately != other.startDragImmediately) return false
+        if (flingBehavior != other.flingBehavior) return false
+
+        return true
+    }
+
+    override fun InspectorInfo.inspectableProperties() {
+        name = "anchoredDraggable"
+        properties["state"] = state
+        properties["canDrag"] = canDrag
+        properties["enabled"] = enabled
+        properties["startDragImmediately"] = startDragImmediately
+        properties["flingBehavior"] = flingBehavior
+    }
+}
+
+private class AnchoredHorizontalDraggableNode<T>(
+    private var state: AnchoredDraggableState<T>,
+    private var canDrag: (Offset) -> Boolean,
+    enabled: Boolean,
+    private var startDragImmediately: Boolean,
+    private var flingBehavior: FlingBehavior,
+) : HorizontalDragGestureNode(enabled = enabled) {
+
+    private val isReverseDirection: Boolean
+        get() = requireLayoutDirection() == LayoutDirection.Rtl
+
+    override fun canDrag(change: PointerInputChange): Boolean = canDrag(change.positionChange().reverseIfNeeded())
+
+    override suspend fun drag(forEachDelta: suspend ((dragDelta: DragDelta) -> Unit) -> Unit) {
+        state.anchoredDrag {
+            forEachDelta { dragDelta ->
+                dragTo(state.newOffsetForDelta(dragDelta.delta.reverseIfNeeded().x))
+            }
+        }
+    }
+
+    override fun onDragStarted(startedPosition: Offset) = Unit
+
+    override fun onDragStopped(velocity: Velocity) {
+        if (!isAttached) return
+        coroutineScope.launch {
+            fling(velocity.reverseIfNeeded().x)
+        }
+    }
+
+    private suspend fun fling(velocity: Float): Float {
+        var leftoverVelocity = velocity
+        state.anchoredDrag {
+            val scrollScope =
+                object : ScrollScope {
+                    override fun scrollBy(pixels: Float): Float {
+                        val newOffset = state.newOffsetForDelta(pixels)
+                        val consumed = newOffset - state.offset
+                        dragTo(newOffset)
+                        return consumed
+                    }
+                }
+            with(flingBehavior) {
+                leftoverVelocity = scrollScope.performFling(velocity)
+            }
+        }
+        return leftoverVelocity
+    }
+
+    override fun startDragImmediately(): Boolean = startDragImmediately
+
+    fun update(
+        state: AnchoredDraggableState<T>,
+        canDrag: (Offset) -> Boolean,
+        enabled: Boolean,
+        startDragImmediately: Boolean,
+        flingBehavior: FlingBehavior,
+    ) {
+        this.flingBehavior = flingBehavior
+
+        var resetPointerInputHandling = false
+
+        if (this.state != state) {
+            this.state = state
+            resetPointerInputHandling = true
+        }
+
+        this.canDrag = canDrag
+        this.startDragImmediately = startDragImmediately
+
+        update(
+            enabled = enabled,
+            shouldResetPointerInputHandling = resetPointerInputHandling,
+        )
+    }
+
+    private fun Velocity.reverseIfNeeded() = if (isReverseDirection) this * -1f else this * 1f
+    private fun Offset.reverseIfNeeded() = if (isReverseDirection) this * -1f else this * 1f
+}
+
+internal fun <T> AnchoredDraggableState<T>.newOffsetForDelta(delta: Float) = ((if (offset.isNaN()) 0f else offset) + delta)
+    .coerceIn(anchors.minPosition(), anchors.maxPosition())
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2020 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
+ *
+ *      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 androidx.compose.foundation.gestures
+
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerInputChange
+import androidx.compose.ui.input.pointer.PointerInputScope
+import androidx.compose.ui.input.pointer.positionChange
+import androidx.compose.ui.platform.ViewConfiguration
+import kotlin.coroutines.cancellation.CancellationException
+
+/**
+ * A Gesture detector that waits for pointer down and touch slop in the horizontal direction and
+ * then calls [onDrag] for each drag event.
+ * It follows the touch slop detection of [awaitHorizontalTouchSlopOrCancellation] but will consume
+ * the position change automatically once the touch slop has been crossed, the amount of drag over
+ * the touch slop is reported as the first drag event [onDrag] after the slop is crossed.
+ * If [shouldAwaitTouchSlop] returns true the touch slop recognition phase will be ignored
+ * and the drag gesture will be recognized immediately.The first [onDrag] in this case will report
+ * an [Offset.Zero].
+ *
+ * [onDragStart] is called when the touch slop has been passed and includes an [Offset] representing
+ * the last known pointer position relative to the containing element as well as  the initial
+ * down event that triggered this gesture detection cycle. The [Offset] can be outside
+ * the actual bounds of the element itself meaning the numbers can be negative or larger than the
+ * element bounds if the touch target is smaller than the
+ * [ViewConfiguration.minimumTouchTargetSize].
+ *
+ * [onDragEnd] is called after all pointers are up with the event change of the up event
+ * and [onDragCancel] is called if another gesture has consumed pointer input,
+ * canceling this gesture.
+ *
+ * @param onDragStart A lambda to be called when the drag gesture starts, it contains information
+ * about the last known [PointerInputChange] relative to the containing element and the post slop
+ * delta.
+ * @param onDragEnd A lambda to be called when the gesture ends. It contains information about the
+ * up [PointerInputChange] that finished the gesture.
+ * @param onDragCancel A lambda to be called when the gesture is cancelled either by an error or
+ * when it was consumed.
+ * @param shouldAwaitTouchSlop Indicates if touch slop detection should be skipped.
+ * @param onDrag A lambda to be called for each delta event in the gesture. It contains information
+ * about the [PointerInputChange] and the movement offset.
+ */
+internal suspend fun PointerInputScope.detectHorizontalDragGestures(
+    canDrag: (PointerInputChange) -> Boolean,
+    onDragStart: (change: PointerInputChange, initialDelta: Offset) -> Unit,
+    onDragEnd: () -> Unit,
+    onDragCancel: () -> Unit,
+    shouldAwaitTouchSlop: () -> Boolean,
+    onDrag: (change: PointerInputChange, dragAmount: Offset) -> Unit,
+) {
+    awaitEachGesture {
+        val initialDown =
+            awaitFirstDown(requireUnconsumed = false, pass = PointerEventPass.Initial)
+        val awaitTouchSlop = shouldAwaitTouchSlop()
+
+        if (!awaitTouchSlop) {
+            initialDown.consume()
+        }
+        val down = awaitFirstDown(requireUnconsumed = false)
+        var drag: PointerInputChange?
+        var overSlop = Offset.Zero
+
+        if (awaitTouchSlop) {
+            do {
+                drag = awaitHorizontalTouchSlopOrCancellation(
+                    down.id,
+                ) { change, over ->
+                    if (canDrag.invoke(change)) {
+                        change.consume()
+                        overSlop = Offset(over, 0f)
+                    } else {
+                        throw CancellationException()
+                    }
+                }
+            } while (drag != null && !drag.isConsumed)
+        } else {
+            drag = initialDown
+        }
+
+        if (drag != null) {
+            onDragStart.invoke(drag, overSlop)
+            onDrag(drag, overSlop)
+            val dragEnd = horizontalDrag(
+                pointerId = drag.id,
+                onDrag = {
+                    onDrag(it, it.positionChange())
+                    it.consume()
+                },
+            )
+            if (dragEnd) {
+                onDragEnd()
+            } else {
+                onDragCancel()
+            }
+        }
+    }
+}
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2019 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
+ *
+ *      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 androidx.compose.foundation.gestures
+
+import androidx.compose.foundation.gestures.HorizontalDragEvent.DragCancelled
+import androidx.compose.foundation.gestures.HorizontalDragEvent.DragDelta
+import androidx.compose.foundation.gestures.HorizontalDragEvent.DragStarted
+import androidx.compose.foundation.gestures.HorizontalDragEvent.DragStopped
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.PointerEvent
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerInputChange
+import androidx.compose.ui.input.pointer.SuspendingPointerInputModifierNode
+import androidx.compose.ui.input.pointer.util.VelocityTracker
+import androidx.compose.ui.input.pointer.util.addPointerInputChange
+import androidx.compose.ui.node.CompositionLocalConsumerModifierNode
+import androidx.compose.ui.node.DelegatingNode
+import androidx.compose.ui.node.PointerInputModifierNode
+import androidx.compose.ui.node.currentValueOf
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.Velocity
+import kotlin.coroutines.cancellation.CancellationException
+import kotlin.math.sign
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+
+/**
+ * A node that performs drag gesture recognition and event propagation.
+ */
+internal abstract class HorizontalDragGestureNode(
+    enabled: Boolean,
+) : DelegatingNode(),
+    PointerInputModifierNode,
+    CompositionLocalConsumerModifierNode {
+
+    protected var enabled = enabled
+        private set
+
+    private var channel: Channel<HorizontalDragEvent>? = null
+    private var isListeningForEvents = false
+
+    abstract fun canDrag(change: PointerInputChange): Boolean
+
+    /**
+     * Responsible for the dragging behavior between the start and the end of the drag. It
+     * continually invokes `forEachDelta` to process incoming events. In return, `forEachDelta`
+     * calls `dragBy` method to process each individual delta.
+     */
+    abstract suspend fun drag(forEachDelta: suspend ((dragDelta: DragDelta) -> Unit) -> Unit)
+
+    /**
+     * Passes the action needed when a drag starts. This gives the ability to pass the desired
+     * behavior from other nodes implementing AbstractDraggableNode
+     */
+    abstract fun onDragStarted(startedPosition: Offset)
+
+    /**
+     * Passes the action needed when a drag stops. This gives the ability to pass the desired
+     * behavior from other nodes implementing AbstractDraggableNode
+     */
+    abstract fun onDragStopped(velocity: Velocity)
+
+    /**
+     * If touch slop recognition should be skipped. If this is true, this node will start
+     * recognizing drag events immediately without waiting for touch slop.
+     */
+    abstract fun startDragImmediately(): Boolean
+
+    private fun startListeningForEvents() {
+        isListeningForEvents = true
+
+        /**
+         * To preserve the original behavior we had (before the Modifier.Node migration) we need to
+         * scope the DragStopped and DragCancel methods to the node's coroutine scope instead of using
+         * the one provided by the pointer input modifier, this is to ensure that even when the pointer
+         * input scope is reset we will continue any coroutine scope scope that we started from these
+         * methods while the pointer input scope was active.
+         */
+        coroutineScope.launch {
+            while (isActive) {
+                var event = channel?.receive()
+                if (event !is DragStarted) continue
+                onDragStarted(event.startPoint)
+                try {
+                    drag { processDelta ->
+                        while (event !is DragStopped && event !is DragCancelled) {
+                            (event as? DragDelta)?.let(processDelta)
+                            event = channel?.receive()
+                        }
+                    }
+                    if (event is DragStopped) {
+                        onDragStopped((event as DragStopped).velocity)
+                    } else if (event is DragCancelled) {
+                        onDragStopped(Velocity.Zero)
+                    }
+                } catch (c: CancellationException) {
+                    onDragStopped(Velocity.Zero)
+                }
+            }
+        }
+    }
+
+    private var pointerInputNode: SuspendingPointerInputModifierNode? = null
+
+    override fun onDetach() {
+        isListeningForEvents = false
+    }
+
+    override fun onPointerEvent(
+        pointerEvent: PointerEvent,
+        pass: PointerEventPass,
+        bounds: IntSize,
+    ) {
+        if (enabled && pointerInputNode == null) {
+            pointerInputNode = delegate(initializePointerInputNode())
+        }
+        pointerInputNode?.onPointerEvent(pointerEvent, pass, bounds)
+    }
+
+    private fun initializePointerInputNode(): SuspendingPointerInputModifierNode = SuspendingPointerInputModifierNode {
+        // re-create tracker when pointer input block restarts. This lazily creates the tracker
+        // only when it is need.
+        val velocityTracker = VelocityTracker()
+        val onDragStart: (change: PointerInputChange, initialDelta: Offset) -> Unit =
+            { startEvent, initialDelta ->
+                if (!isListeningForEvents) {
+                    if (channel == null) {
+                        channel = Channel(capacity = Channel.UNLIMITED)
+                    }
+                    startListeningForEvents()
+                }
+                val xSign = sign(startEvent.position.x)
+                val ySign = sign(startEvent.position.y)
+                val adjustedStart = startEvent.position -
+                    Offset(initialDelta.x * xSign, initialDelta.y * ySign)
+
+                channel?.trySend(DragStarted(adjustedStart))
+            }
+
+        val onDragEnd: () -> Unit = {
+            val maximumVelocity = currentValueOf(LocalViewConfiguration)
+                .maximumFlingVelocity
+            val velocity = velocityTracker.calculateVelocity(
+                Velocity(maximumVelocity, maximumVelocity),
+            )
+            velocityTracker.resetTracking()
+            channel?.trySend(DragStopped(velocity))
+        }
+
+        val onDragCancel: () -> Unit = {
+            channel?.trySend(DragCancelled)
+        }
+
+        val shouldAwaitTouchSlop: () -> Boolean = {
+            !startDragImmediately()
+        }
+
+        val onDrag: (change: PointerInputChange, dragAmount: Offset) -> Unit =
+            { change, delta ->
+                velocityTracker.addPointerInputChange(change)
+                channel?.trySend(DragDelta(delta))
+            }
+
+        coroutineScope {
+            try {
+                detectHorizontalDragGestures(
+                    canDrag = ::canDrag,
+                    onDragStart = onDragStart,
+                    onDragEnd = onDragEnd,
+                    onDragCancel = onDragCancel,
+                    shouldAwaitTouchSlop = shouldAwaitTouchSlop,
+                    onDrag = onDrag,
+                )
+            } catch (cancellation: CancellationException) {
+                channel?.trySend(DragCancelled)
+                if (!isActive) throw cancellation
+            }
+        }
+    }
+
+    override fun onCancelPointerInput() {
+        pointerInputNode?.onCancelPointerInput()
+    }
+
+    fun update(
+        enabled: Boolean = this.enabled,
+        shouldResetPointerInputHandling: Boolean = false,
+    ) {
+        var resetPointerInputHandling = shouldResetPointerInputHandling
+
+        if (this.enabled != enabled) {
+            this.enabled = enabled
+            if (!enabled) {
+                pointerInputNode?.let { undelegate(it) }
+                pointerInputNode = null
+            }
+            resetPointerInputHandling = true
+        }
+
+        if (resetPointerInputHandling) {
+            pointerInputNode?.resetPointerInputHandler()
+        }
+    }
+}
+
+internal sealed class HorizontalDragEvent {
+    class DragStarted(val startPoint: Offset) : HorizontalDragEvent()
+    class DragStopped(val velocity: Velocity) : HorizontalDragEvent()
+    object DragCancelled : HorizontalDragEvent()
+    class DragDelta(val delta: Offset) : HorizontalDragEvent()
+}
@@ -0,0 +1,64 @@
+package androidx.compose.foundation.scrollbar
+
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemInfo
+import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+
+internal class LazyStaggeredGridScrollbarAdapter(
+    private val scrollState: LazyStaggeredGridState,
+) : LazyLineContentAdapter() {
+
+    override val viewportSize: Double
+        get() = with(scrollState.layoutInfo) {
+            if (isVertical) viewportSize.height else viewportSize.width
+        }.toDouble()
+
+    private val isVertical by lazy {
+        scrollState.layoutInfo.orientation == Orientation.Vertical
+    }
+
+    private fun LazyStaggeredGridItemInfo.mainAxisSize() = with(size) {
+        if (isVertical) height else width
+    }
+
+    private fun LazyStaggeredGridItemInfo.mainAxisOffset() = with(offset) {
+        if (isVertical) y else x
+    }
+
+    override fun firstVisibleLine(): VisibleLine? {
+        val first = scrollState.layoutInfo.visibleItemsInfo.firstOrNull()
+        return first?.run { VisibleLine(index, mainAxisOffset()) }
+    }
+
+    override fun totalLineCount() = scrollState.layoutInfo.totalItemsCount
+
+    override fun contentPadding() = with(scrollState.layoutInfo) {
+        beforeContentPadding + afterContentPadding
+    }
+
+    override suspend fun snapToLine(lineIndex: Int, scrollOffset: Int) {
+        scrollState.scrollToItem(lineIndex, scrollOffset)
+    }
+
+    override suspend fun scrollBy(value: Float) {
+        scrollState.scrollBy(value)
+    }
+
+    override fun averageVisibleLineSize() = with(scrollState.layoutInfo.visibleItemsInfo) {
+        val first = firstOrNull() ?: return@with 0.0
+        val last = last()
+        (last.mainAxisOffset() + last.mainAxisSize() - first.mainAxisOffset()).toDouble() / size
+    }
+
+    override val lineSpacing get() = 0
+}
+
+@Composable
+fun rememberScrollbarAdapter(
+    scrollState: LazyStaggeredGridState,
+): ScrollbarAdapter = remember(scrollState) {
+    LazyStaggeredGridScrollbarAdapter(scrollState)
+}
@@ -0,0 +1,462 @@
+/*
+ * Copyright 2023 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
+ *
+ *      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 androidx.compose.foundation.scrollbar
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.TweenSpec
+import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.gestures.drag
+import androidx.compose.foundation.hoverable
+import androidx.compose.foundation.interaction.DragInteraction
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsHoveredAsState
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.grid.LazyGridState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocal
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.input.pointer.positionChange
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.MeasurePolicy
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.constrainHeight
+import androidx.compose.ui.unit.constrainWidth
+import androidx.compose.ui.unit.dp
+import kotlin.math.roundToInt
+
+/**
+ * [CompositionLocal] used to pass [ScrollbarStyle] down the tree.
+ * This value is typically set in some "Theme" composable function
+ * (DesktopTheme, MaterialTheme)
+ */
+val LocalScrollbarStyle = staticCompositionLocalOf { defaultScrollbarStyle() }
+
+/**
+ * Defines visual style of scrollbars (thickness, shapes, colors, etc).
+ * Can be passed as a parameter of scrollbar through [LocalScrollbarStyle]
+ */
+@Immutable
+data class ScrollbarStyle(
+    val minimalHeight: Dp,
+    val thickness: Dp,
+    val padding: Dp,
+    val shape: Shape,
+    val hoverDurationMillis: Int,
+    val unhoverColor: Color,
+    val hoverColor: Color,
+)
+
+/**
+ * Simple default [ScrollbarStyle] without applying MaterialTheme.
+ */
+fun defaultScrollbarStyle() = ScrollbarStyle(
+    minimalHeight = 16.dp,
+    thickness = 8.dp,
+    padding = 0.dp,
+    shape = RoundedCornerShape(4.dp),
+    hoverDurationMillis = 300,
+    unhoverColor = Color.Black.copy(alpha = 0.12f),
+    hoverColor = Color.Black.copy(alpha = 0.50f),
+)
+
+/**
+ * Vertical scrollbar that can be attached to some scrollable
+ * component (ScrollableColumn, LazyColumn) and share common state with it.
+ *
+ * Can be placed independently.
+ *
+ * Example:
+ *     val state = rememberScrollState(0)
+ *
+ *     Box(Modifier.fillMaxSize()) {
+ *         Box(modifier = Modifier.verticalScroll(state)) {
+ *             ...
+ *         }
+ *
+ *         VerticalScrollbar(
+ *             adapter = rememberScrollbarAdapter(state)
+ *             modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(),
+ *         )
+ *     }
+ *
+ * @param adapter [ScrollbarAdapter] that will be used to
+ * communicate with scrollable component
+ * @param modifier the modifier to apply to this layout
+ * @param reverseLayout reverse the direction of scrolling and layout, when `true`
+ * and [LazyListState.firstVisibleItemIndex] == 0 then scrollbar
+ * will be at the bottom of the container.
+ * It is usually used in pair with `LazyColumn(reverseLayout = true)`
+ * @param style [ScrollbarStyle] to define visual style of scrollbar
+ * @param interactionSource [MutableInteractionSource] that will be used to dispatch
+ * [DragInteraction.Start] when this Scrollbar is being dragged.
+ */
+@Composable
+fun VerticalScrollbar(
+    adapter: ScrollbarAdapter,
+    modifier: Modifier = Modifier,
+    reverseLayout: Boolean = false,
+    style: ScrollbarStyle = LocalScrollbarStyle.current,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) = Scrollbar(
+    adapter,
+    modifier,
+    reverseLayout,
+    style,
+    interactionSource,
+    isVertical = true,
+)
+
+/**
+ * Horizontal scrollbar that can be attached to some scrollable
+ * component (Modifier.verticalScroll(), LazyRow) and share common state with it.
+ *
+ * Can be placed independently.
+ *
+ * Example:
+ *     val state = rememberScrollState(0)
+ *
+ *     Box(Modifier.fillMaxSize()) {
+ *         Box(modifier = Modifier.verticalScroll(state)) {
+ *             ...
+ *         }
+ *
+ *         HorizontalScrollbar(
+ *             adapter = rememberScrollbarAdapter(state)
+ *             modifier = Modifier.align(Alignment.CenterEnd).fillMaxWidth(),
+ *         )
+ *     }
+ *
+ * @param adapter [ScrollbarAdapter] that will be used to
+ * communicate with scrollable component
+ * @param modifier the modifier to apply to this layout
+ * @param reverseLayout reverse the direction of scrolling and layout, when `true`
+ * and [LazyListState.firstVisibleItemIndex] == 0 then scrollbar
+ * will be at the end of the container.
+ * It is usually used in pair with `LazyRow(reverseLayout = true)`
+ * @param style [ScrollbarStyle] to define visual style of scrollbar
+ * @param interactionSource [MutableInteractionSource] that will be used to dispatch
+ * [DragInteraction.Start] when this Scrollbar is being dragged.
+ */
+@Composable
+fun HorizontalScrollbar(
+    adapter: ScrollbarAdapter,
+    modifier: Modifier = Modifier,
+    reverseLayout: Boolean = false,
+    style: ScrollbarStyle = LocalScrollbarStyle.current,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) = Scrollbar(
+    adapter,
+    modifier,
+    if (LocalLayoutDirection.current == LayoutDirection.Rtl) !reverseLayout else reverseLayout,
+    style,
+    interactionSource,
+    isVertical = false,
+)
+
+@Composable
+private fun Scrollbar(
+    adapter: ScrollbarAdapter,
+    modifier: Modifier = Modifier,
+    reverseLayout: Boolean,
+    style: ScrollbarStyle,
+    interactionSource: MutableInteractionSource,
+    isVertical: Boolean,
+) = with(LocalDensity.current) {
+    val dragInteraction = remember<MutableState<DragInteraction.Start?>> { mutableStateOf(null) }
+    DisposableEffect(key1 = interactionSource) {
+        onDispose {
+            dragInteraction.value?.let { interaction ->
+                interactionSource.tryEmit(DragInteraction.Cancel(interaction))
+                dragInteraction.value = null
+            }
+        }
+    }
+
+    var containerSize by remember { mutableIntStateOf(0) }
+    val isHovered by interactionSource.collectIsHoveredAsState()
+
+    val isHighlighted by remember {
+        derivedStateOf {
+            isHovered || dragInteraction.value is DragInteraction.Start
+        }
+    }
+
+    val minimalHeight = style.minimalHeight.toPx()
+
+    val coroutineScope = rememberCoroutineScope()
+    val sliderAdapter = remember(
+        adapter,
+        containerSize,
+        minimalHeight,
+        reverseLayout,
+        isVertical,
+        coroutineScope,
+    ) {
+        SliderAdapter(
+            adapter,
+            containerSize,
+            minimalHeight,
+            reverseLayout = reverseLayout,
+            isVertical = isVertical,
+            coroutineScope = coroutineScope,
+        )
+    }
+
+    val scrollThickness = (style.thickness + style.padding * 2).roundToPx()
+    val measurePolicy = if (isVertical) {
+        remember(sliderAdapter, scrollThickness) {
+            verticalMeasurePolicy(sliderAdapter, { containerSize = it }, scrollThickness)
+        }
+    } else {
+        remember(sliderAdapter, scrollThickness) {
+            horizontalMeasurePolicy(sliderAdapter, { containerSize = it }, scrollThickness)
+        }
+    }
+
+    val color by animateColorAsState(
+        if (isHighlighted) style.hoverColor else style.unhoverColor,
+        animationSpec = TweenSpec(durationMillis = style.hoverDurationMillis),
+        label = "Scrollbar color",
+    )
+
+    val isVisible = sliderAdapter.thumbSize < containerSize
+
+    Layout(
+        {
+            Box(
+                if (isVertical) {
+                    Modifier.padding(horizontal = style.padding)
+                } else {
+                    Modifier.padding(vertical = style.padding)
+                }
+                    .background(if (isVisible) color else Color.Transparent, style.shape)
+                    .scrollbarDrag(
+                        interactionSource = interactionSource,
+                        draggedInteraction = dragInteraction,
+                        sliderAdapter = sliderAdapter,
+                    ),
+            )
+        },
+        modifier.hoverable(interactionSource = interactionSource),
+        measurePolicy,
+    )
+}
+
+/**
+ * Create and [remember] [ScrollbarAdapter] for
+ * scrollable container with the given instance [ScrollState].
+ */
+@Composable
+fun rememberScrollbarAdapter(
+    scrollState: ScrollState,
+): ScrollbarAdapter = remember(scrollState) {
+    ScrollbarAdapter(scrollState)
+}
+
+/**
+ * Create and [remember] [ScrollbarAdapter] for
+ * lazy scrollable container with the given instance [LazyListState].
+ */
+@Composable
+fun rememberScrollbarAdapter(
+    scrollState: LazyListState,
+): ScrollbarAdapter = remember(scrollState) {
+    ScrollbarAdapter(scrollState)
+}
+
+/**
+ * Create and [remember] [ScrollbarAdapter] for lazy grid with
+ * the given instance of [LazyGridState].
+ */
+@Composable
+fun rememberScrollbarAdapter(
+    scrollState: LazyGridState,
+): ScrollbarAdapter = remember(scrollState) {
+    ScrollbarAdapter(scrollState)
+}
+
+/**
+ * ScrollbarAdapter for Modifier.verticalScroll and Modifier.horizontalScroll
+ *
+ * [scrollState] is instance of [ScrollState] which is used by scrollable component
+ *
+ * Example:
+ *     val state = rememberScrollState(0)
+ *
+ *     Box(Modifier.fillMaxSize()) {
+ *         Box(modifier = Modifier.verticalScroll(state)) {
+ *             ...
+ *         }
+ *
+ *         VerticalScrollbar(
+ *             adapter = rememberScrollbarAdapter(state)
+ *             modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(),
+ *         )
+ *     }
+ */
+fun ScrollbarAdapter(
+    scrollState: ScrollState,
+): ScrollbarAdapter = ScrollableScrollbarAdapter(scrollState)
+
+/**
+ * ScrollbarAdapter for lazy lists.
+ *
+ * [scrollState] is instance of [LazyListState] which is used by scrollable component
+ *
+ * Example:
+ *     Box(Modifier.fillMaxSize()) {
+ *         val state = rememberLazyListState()
+ *
+ *         LazyColumn(state = state) {
+ *             ...
+ *         }
+ *
+ *         VerticalScrollbar(
+ *             adapter = rememberScrollbarAdapter(state)
+ *             modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(),
+ *         )
+ *     }
+ */
+fun ScrollbarAdapter(
+    scrollState: LazyListState,
+): ScrollbarAdapter = LazyListScrollbarAdapter(scrollState)
+
+/**
+ * ScrollbarAdapter for lazy grids.
+ *
+ * [scrollState] is instance of [LazyGridState] which is used by scrollable component
+ *
+ * Example:
+ *     Box(Modifier.fillMaxSize()) {
+ *         val state = rememberLazyGridState()
+ *
+ *         LazyVerticalGrid(columns = ..., state = state) {
+ *             ...
+ *         }
+ *
+ *         VerticalScrollbar(
+ *             adapter = rememberScrollbarAdapter(state)
+ *             modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(),
+ *         )
+ *     }
+ */
+fun ScrollbarAdapter(
+    scrollState: LazyGridState,
+): ScrollbarAdapter = LazyGridScrollbarAdapter(scrollState)
+
+private val SliderAdapter.thumbPixelRange: IntRange
+    get() {
+        val start = position.roundToInt()
+        val endExclusive = start + thumbSize.roundToInt()
+
+        return (start until endExclusive)
+    }
+
+private val IntRange.size get() = last + 1 - first
+
+private fun verticalMeasurePolicy(
+    sliderAdapter: SliderAdapter,
+    setContainerSize: (Int) -> Unit,
+    scrollThickness: Int,
+) = MeasurePolicy { measurables, constraints ->
+    setContainerSize(constraints.maxHeight)
+    val pixelRange = sliderAdapter.thumbPixelRange
+    val placeable = measurables.first().measure(
+        Constraints.fixed(
+            constraints.constrainWidth(scrollThickness),
+            pixelRange.size,
+        ),
+    )
+    layout(placeable.width, constraints.maxHeight) {
+        placeable.place(0, pixelRange.first)
+    }
+}
+
+private fun horizontalMeasurePolicy(
+    sliderAdapter: SliderAdapter,
+    setContainerSize: (Int) -> Unit,
+    scrollThickness: Int,
+) = MeasurePolicy { measurables, constraints ->
+    setContainerSize(constraints.maxWidth)
+    val pixelRange = sliderAdapter.thumbPixelRange
+    val placeable = measurables.first().measure(
+        Constraints.fixed(
+            pixelRange.size,
+            constraints.constrainHeight(scrollThickness),
+        ),
+    )
+    layout(constraints.maxWidth, placeable.height) {
+        placeable.place(pixelRange.first, 0)
+    }
+}
+
+private fun Modifier.scrollbarDrag(
+    interactionSource: MutableInteractionSource,
+    draggedInteraction: MutableState<DragInteraction.Start?>,
+    sliderAdapter: SliderAdapter,
+): Modifier = composed {
+    val currentInteractionSource by rememberUpdatedState(interactionSource)
+    val currentDraggedInteraction by rememberUpdatedState(draggedInteraction)
+    val currentSliderAdapter by rememberUpdatedState(sliderAdapter)
+
+    pointerInput(Unit) {
+        awaitEachGesture {
+            val down = awaitFirstDown(requireUnconsumed = false)
+            val interaction = DragInteraction.Start()
+            currentInteractionSource.tryEmit(interaction)
+            currentDraggedInteraction.value = interaction
+            currentSliderAdapter.onDragStarted()
+            val isSuccess = drag(down.id) { change ->
+                currentSliderAdapter.onDragDelta(change.positionChange())
+                change.consume()
+            }
+            val finishInteraction = if (isSuccess) {
+                DragInteraction.Stop(interaction)
+            } else {
+                DragInteraction.Cancel(interaction)
+            }
+            currentInteractionSource.tryEmit(finishInteraction)
+            currentDraggedInteraction.value = null
+        }
+    }
+}
@@ -0,0 +1,472 @@
+/*
+ * Copyright 2023 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
+ *
+ *      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 androidx.compose.foundation.scrollbar
+
+import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.grid.LazyGridItemInfo
+import androidx.compose.foundation.lazy.grid.LazyGridState
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.geometry.Offset
+import kotlin.math.abs
+import kotlin.math.roundToInt
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+/**
+ * Defines how to scroll the scrollable component and how to display a scrollbar for it.
+ *
+ * The values of this interface are typically in pixels, but do not have to be.
+ * It's possible to create an adapter with any scroll range of `Double` values.
+ */
+interface ScrollbarAdapter {
+
+    // We use `Double` values here in order to allow scrolling both very large (think LazyList with
+    // millions of items) and very small (think something whose natural coordinates are less than 1)
+    // content.
+
+    /**
+     * Scroll offset of the content inside the scrollable component.
+     *
+     * For example, a value of `100` could mean the content is scrolled by 100 pixels from the
+     * start.
+     */
+    val scrollOffset: Double
+
+    /**
+     * The size of the scrollable content, on the scrollable axis.
+     */
+    val contentSize: Double
+
+    /**
+     * The size of the viewport, on the scrollable axis.
+     */
+    val viewportSize: Double
+
+    /**
+     * Instantly jump to [scrollOffset].
+     *
+     * @param scrollOffset target offset to jump to, value will be coerced to the valid
+     * scroll range.
+     */
+    suspend fun scrollTo(scrollOffset: Double)
+}
+
+/**
+ * The maximum scroll offset of the scrollable content.
+ */
+val ScrollbarAdapter.maxScrollOffset: Double
+    get() = (contentSize - viewportSize).coerceAtLeast(0.0)
+
+internal class ScrollableScrollbarAdapter(
+    private val scrollState: ScrollState,
+) : ScrollbarAdapter {
+
+    override val scrollOffset: Double get() = scrollState.value.toDouble()
+
+    override suspend fun scrollTo(scrollOffset: Double) {
+        scrollState.scrollTo(scrollOffset.roundToInt())
+    }
+
+    override val contentSize: Double
+        // This isn't strictly correct, as the actual content can be smaller
+        // than the viewport when scrollState.maxValue is 0, but the scrollbar
+        // doesn't really care as long as contentSize <= viewportSize; it's
+        // just not showing itself
+        get() = scrollState.maxValue + viewportSize
+
+    override val viewportSize: Double
+        get() = scrollState.viewportSize.toDouble()
+}
+
+/**
+ * Base class for [LazyListScrollbarAdapter] and [LazyGridScrollbarAdapter],
+ * and in the future maybe other lazy widgets that lay out their content in lines.
+ */
+internal abstract class LazyLineContentAdapter : ScrollbarAdapter {
+
+    // Implement the adapter in terms of "lines", which means either rows,
+    // (for a vertically scrollable widget) or columns (for a horizontally
+    // scrollable one).
+    // For LazyList this translates directly to items; for LazyGrid, it
+    // translates to rows/columns of items.
+
+    class VisibleLine(
+        val index: Int,
+        val offset: Int,
+    )
+
+    /**
+     * Return the first visible line, if any.
+     */
+    protected abstract fun firstVisibleLine(): VisibleLine?
+
+    /**
+     * Return the total number of lines.
+     */
+    protected abstract fun totalLineCount(): Int
+
+    /**
+     * The sum of content padding (before+after) on the scrollable axis.
+     */
+    protected abstract fun contentPadding(): Int
+
+    /**
+     * Scroll immediately to the given line, and offset it by [scrollOffset] pixels.
+     */
+    protected abstract suspend fun snapToLine(lineIndex: Int, scrollOffset: Int)
+
+    /**
+     * Scroll from the current position by the given amount of pixels.
+     */
+    protected abstract suspend fun scrollBy(value: Float)
+
+    /**
+     * Return the average size (on the scrollable axis) of the visible lines.
+     */
+    protected abstract fun averageVisibleLineSize(): Double
+
+    /**
+     * The spacing between lines.
+     */
+    protected abstract val lineSpacing: Int
+
+    private val averageVisibleLineSize by derivedStateOf {
+        if (totalLineCount() == 0) {
+            0.0
+        } else {
+            averageVisibleLineSize()
+        }
+    }
+
+    private val averageVisibleLineSizeWithSpacing get() = averageVisibleLineSize + lineSpacing
+
+    override val scrollOffset: Double
+        get() {
+            val firstVisibleLine = firstVisibleLine()
+            return if (firstVisibleLine == null) {
+                0.0
+            } else {
+                firstVisibleLine.index * averageVisibleLineSizeWithSpacing - firstVisibleLine.offset
+            }
+        }
+
+    override val contentSize: Double
+        get() {
+            val totalLineCount = totalLineCount()
+            return averageVisibleLineSize * totalLineCount +
+                lineSpacing * (totalLineCount - 1).coerceAtLeast(0) +
+                contentPadding()
+        }
+
+    override suspend fun scrollTo(scrollOffset: Double) {
+        val distance = scrollOffset - this@LazyLineContentAdapter.scrollOffset
+
+        // if we scroll less than viewport we need to use scrollBy function to avoid
+        // undesirable scroll jumps (when an item size is different)
+        //
+        // if we scroll more than viewport we should immediately jump to this position
+        // without recreating all items between the current and the new position
+        if (abs(distance) <= viewportSize) {
+            scrollBy(distance.toFloat())
+        } else {
+            snapTo(scrollOffset)
+        }
+    }
+
+    private suspend fun snapTo(scrollOffset: Double) {
+        val scrollOffsetCoerced = scrollOffset.coerceIn(0.0, maxScrollOffset)
+
+        val index = (scrollOffsetCoerced / averageVisibleLineSizeWithSpacing)
+            .toInt()
+            .coerceAtLeast(0)
+            .coerceAtMost(totalLineCount() - 1)
+
+        val offset = (scrollOffsetCoerced - index * averageVisibleLineSizeWithSpacing)
+            .toInt()
+            .coerceAtLeast(0)
+
+        snapToLine(lineIndex = index, scrollOffset = offset)
+    }
+}
+
+internal class LazyListScrollbarAdapter(
+    private val scrollState: LazyListState,
+) : LazyLineContentAdapter() {
+
+    override val viewportSize: Double
+        get() = with(scrollState.layoutInfo) {
+            if (orientation == Orientation.Vertical) {
+                viewportSize.height
+            } else {
+                viewportSize.width
+            }
+        }.toDouble()
+
+    /**
+     * A heuristic that tries to ignore the "currently stickied" header because it breaks the other
+     * computations in this adapter:
+     * - The currently stickied header always appears in the list of visible items, with its
+     *   regular index. This makes [firstVisibleLine] always return its index, even if the list has
+     *   been scrolled far beyond it.
+     * - [averageVisibleLineSize] calculates the average size in O(1) by assuming that items don't
+     *   overlap, and the stickied item breaks this assumption.
+     *
+     * Attempts to return the index into `visibleItemsInfo` of the first non-currently-stickied (it
+     * could be sticky, but not stickied to the top of the list right now) item, if there is one.
+     *
+     * Note that this heuristic breaks down if the sticky header covers the entire list, so that
+     * it's the only visible item for some portion of the scroll range. But there's currently no
+     * known better way to solve it, and it's a relatively unusual case.
+     */
+    private fun firstFloatingVisibleItemIndex() = with(scrollState.layoutInfo.visibleItemsInfo) {
+        when (size) {
+            0 -> null
+            1 -> 0
+            else -> {
+                val first = this[0]
+                val second = this[1]
+                // If either the indices or the offsets aren't continuous, then the first item is
+                // sticky, so we return 1
+                if ((first.index < second.index - 1) ||
+                    (first.offset + first.size + lineSpacing > second.offset)
+                ) {
+                    1
+                } else {
+                    0
+                }
+            }
+        }
+    }
+
+    override fun firstVisibleLine(): VisibleLine? {
+        val firstFloatingVisibleIndex = firstFloatingVisibleItemIndex() ?: return null
+        val firstFloatingItem = scrollState.layoutInfo.visibleItemsInfo[firstFloatingVisibleIndex]
+        return VisibleLine(
+            index = firstFloatingItem.index,
+            offset = firstFloatingItem.offset,
+        )
+    }
+
+    override fun totalLineCount() = scrollState.layoutInfo.totalItemsCount
+
+    override fun contentPadding() = with(scrollState.layoutInfo) {
+        beforeContentPadding + afterContentPadding
+    }
+
+    override suspend fun snapToLine(lineIndex: Int, scrollOffset: Int) {
+        scrollState.scrollToItem(lineIndex, scrollOffset)
+    }
+
+    override suspend fun scrollBy(value: Float) {
+        scrollState.scrollBy(value)
+    }
+
+    override fun averageVisibleLineSize() = with(scrollState.layoutInfo.visibleItemsInfo) {
+        val firstFloatingIndex = firstFloatingVisibleItemIndex() ?: return@with 0.0
+        val first = this[firstFloatingIndex]
+        val last = last()
+        val count = size - firstFloatingIndex
+        (last.offset + last.size - first.offset - (count - 1) * lineSpacing).toDouble() / count
+    }
+
+    override val lineSpacing get() = scrollState.layoutInfo.mainAxisItemSpacing
+}
+
+internal class LazyGridScrollbarAdapter(
+    private val scrollState: LazyGridState,
+) : LazyLineContentAdapter() {
+
+    override val viewportSize: Double
+        get() = with(scrollState.layoutInfo) {
+            if (isVertical) {
+                viewportSize.height
+            } else {
+                viewportSize.width
+            }
+        }.toDouble()
+
+    private val isVertical by lazy {
+        scrollState.layoutInfo.orientation == Orientation.Vertical
+    }
+
+    private val unknownLine = with(LazyGridItemInfo) {
+        if (isVertical) UnknownRow else UnknownColumn
+    }
+
+    private fun LazyGridItemInfo.line() = if (isVertical) row else column
+
+    private fun LazyGridItemInfo.mainAxisSize() = with(size) {
+        if (isVertical) height else width
+    }
+
+    private fun LazyGridItemInfo.mainAxisOffset() = with(offset) {
+        if (isVertical) y else x
+    }
+
+    private fun slotsPerLine(): Int = scrollState.layoutInfo.visibleItemsInfo
+        .groupingBy { it.line() }.eachCount().maxOfOrNull { it.value } ?: 1
+
+    private fun lineOfIndex(index: Int) = index / slotsPerLine()
+
+    private fun indexOfFirstInLine(line: Int) = line * slotsPerLine()
+
+    override fun firstVisibleLine(): VisibleLine? = scrollState.layoutInfo.visibleItemsInfo
+        .firstOrNull { it.line() != unknownLine } // Skip exiting items
+        ?.let { firstVisibleItem ->
+            VisibleLine(
+                index = firstVisibleItem.line(),
+                offset = firstVisibleItem.mainAxisOffset(),
+            )
+        }
+
+    override fun totalLineCount(): Int {
+        val itemCount = scrollState.layoutInfo.totalItemsCount
+        return if (itemCount == 0) {
+            0
+        } else {
+            lineOfIndex(itemCount - 1) + 1
+        }
+    }
+
+    override fun contentPadding() = with(scrollState.layoutInfo) {
+        beforeContentPadding + afterContentPadding
+    }
+
+    override suspend fun snapToLine(lineIndex: Int, scrollOffset: Int) {
+        scrollState.scrollToItem(
+            index = indexOfFirstInLine(lineIndex),
+            scrollOffset = scrollOffset,
+        )
+    }
+
+    override suspend fun scrollBy(value: Float) {
+        scrollState.scrollBy(value)
+    }
+
+    override fun averageVisibleLineSize(): Double {
+        val visibleItemsInfo = // Non-exiting visible items
+            scrollState.layoutInfo.visibleItemsInfo.filter { it.line() != unknownLine }
+        if (visibleItemsInfo.isEmpty()) {
+            return 0.0
+        }
+
+        // Compute the size of the last line
+        val last = visibleItemsInfo.last()
+        val lastLine = last.line()
+        val lastLineSize = visibleItemsInfo
+            .asReversed()
+            .asSequence()
+            .takeWhile { it.line() == lastLine }
+            .maxOf { it.mainAxisSize() }
+
+        val first = visibleItemsInfo.first()
+        val lineCount = lastLine - first.line() + 1
+        val lineSpacingSum = (lineCount - 1) * lineSpacing
+        return (
+            last.mainAxisOffset() + lastLineSize - first.mainAxisOffset() - lineSpacingSum
+            ).toDouble() / lineCount
+    }
+
+    override val lineSpacing get() = scrollState.layoutInfo.mainAxisItemSpacing
+}
+
+internal class SliderAdapter(
+    private val adapter: ScrollbarAdapter,
+    private val trackSize: Int,
+    private val minHeight: Float,
+    private val reverseLayout: Boolean,
+    private val isVertical: Boolean,
+    private val coroutineScope: CoroutineScope,
+) {
+
+    private val contentSize get() = adapter.contentSize
+    private val visiblePart: Double
+        get() {
+            val contentSize = contentSize
+            return if (contentSize == 0.0) {
+                1.0
+            } else {
+                (adapter.viewportSize / contentSize).coerceAtMost(1.0)
+            }
+        }
+
+    val thumbSize
+        get() = (trackSize * visiblePart).coerceAtLeast(minHeight.toDouble())
+
+    private val scrollScale: Double
+        get() {
+            val extraScrollbarSpace = trackSize - thumbSize
+            val extraContentSpace = adapter.maxScrollOffset // == contentSize - viewportSize
+            return if (extraContentSpace == 0.0) 1.0 else extraScrollbarSpace / extraContentSpace
+        }
+
+    private val rawPosition: Double
+        get() = scrollScale * adapter.scrollOffset
+
+    val position: Double
+        get() = if (reverseLayout) trackSize - thumbSize - rawPosition else rawPosition
+
+    // How much of the current drag was ignored because we've reached the end of the scrollbar area
+    private var unscrolledDragDistance = 0.0
+
+    /** Called when the thumb dragging starts */
+    fun onDragStarted() {
+        unscrolledDragDistance = 0.0
+    }
+
+    private suspend fun setPosition(value: Double) {
+        val rawPosition = if (reverseLayout) {
+            trackSize - thumbSize - value
+        } else {
+            value
+        }
+        adapter.scrollTo(rawPosition / scrollScale)
+    }
+
+    private val dragMutex = Mutex()
+
+    /** Called on every movement while dragging the thumb */
+    fun onDragDelta(offset: Offset) {
+        coroutineScope.launch(start = CoroutineStart.UNDISPATCHED) {
+            // Mutex is used to ensure that all earlier drag deltas were applied
+            // before calculating a new raw position
+            dragMutex.withLock {
+                val dragDelta = if (isVertical) offset.y else offset.x
+                val maxScrollPosition = adapter.maxScrollOffset * scrollScale
+                val currentPosition = position
+                val targetPosition =
+                    (currentPosition + dragDelta + unscrolledDragDistance).coerceIn(
+                        0.0,
+                        maxScrollPosition,
+                    )
+                val sliderDelta = targetPosition - currentPosition
+
+                // Have to add to position for smooth content scroll if the items are of different size
+                val newPos = position + sliderDelta
+                setPosition(newPos)
+                unscrolledDragDistance += dragDelta - sliderDelta
+            }
+        }
+    }
+}
@@ -1,591 +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
- *
- *      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.
- */
-@file:Suppress("ktlint:standard:property-naming")
-
-package androidx.compose.material3
-
-import androidx.activity.BackEventCompat
-import androidx.activity.compose.PredictiveBackHandler
-import androidx.compose.animation.core.Animatable
-import androidx.compose.animation.core.AnimationVector1D
-import androidx.compose.animation.core.CubicBezierEasing
-import androidx.compose.animation.core.EaseOut
-import androidx.compose.animation.core.FiniteAnimationSpec
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.MutatorMutex
-import androidx.compose.foundation.interaction.Interaction
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.MutableWindowInsets
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.foundation.layout.exclude
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.onConsumedWindowInsetsChanged
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.GenericShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text.input.TextFieldLineLimits
-import androidx.compose.foundation.text.input.TextFieldState
-import androidx.compose.material3.SearchBarDefaults.InputFieldHeight
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableFloatState
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.structuralEqualityPolicy
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.geometry.CornerRadius
-import androidx.compose.ui.geometry.RoundRect
-import androidx.compose.ui.geometry.toRect
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.graphics.takeOrElse
-import androidx.compose.ui.layout.layout
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.semantics.onClick
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.lerp
-import androidx.compose.ui.unit.offset
-import androidx.compose.ui.util.lerp
-import androidx.compose.ui.zIndex
-import kotlin.coroutines.cancellation.CancellationException
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
-import kotlin.math.sign
-import kotlinx.coroutines.delay
-
-/**
- * <a href="https://m3.material.io/components/search/overview" class="external" target="_blank">Material Design search</a>.
- *
- * A search bar represents a floating search field that allows users to enter a keyword or phrase
- * and get relevant information. It can be used as a way to navigate through an app via search
- * queries.
- *
- * An active search bar expands into a search "view" and can be used to display dynamic suggestions.
- *
- * ![Search bar image](https://developer.android.com/images/reference/androidx/compose/material3/search-bar.png)
- *
- * A [SearchBar] expands to occupy the entirety of its allowed size when active. For full-screen
- * behavior as specified by Material guidelines, parent layouts of the [SearchBar] must not pass
- * any [Constraints] that limit its size, and the host activity should set
- * `WindowCompat.setDecorFitsSystemWindows(window, false)`.
- *
- * If this expansion behavior is undesirable, for example on large tablet screens, [DockedSearchBar]
- * can be used instead.
- *
- * @param state the query text to be shown in the search bar's input field
- * @param onSearch the callback to be invoked when the input service triggers the [ImeAction.Search]
- * action.
- * @param active whether this search bar is active
- * @param onActiveChange the callback to be invoked when this search bar's active state is changed
- * @param modifier the [Modifier] to be applied to this search bar
- * @param enabled controls the enabled state of this search bar. When `false`, this component will
- * not respond to user input, and it will appear visually disabled and disabled to accessibility
- * services.
- * @param placeholder the placeholder to be displayed when the search bar's query is empty.
- * @param leadingIcon the leading icon to be displayed at the beginning of the search bar container
- * @param trailingIcon the trailing icon to be displayed at the end of the search bar container
- * @param shape the shape of this search bar when it is not [active]. When [active], the shape will
- * always be [SearchBarDefaults.fullScreenShape].
- * @param colors [SearchBarColors] that will be used to resolve the colors used for this search bar
- * in different states. See [SearchBarDefaults.colors].
- * @param tonalElevation when [SearchBarColors.containerColor] is [ColorScheme.surface], a
- * translucent primary color overlay is applied on top of the container. A higher tonal elevation
- * value will result in a darker color in light theme and lighter color in dark theme. See also:
- * [Surface].
- * @param shadowElevation the elevation for the shadow below the search bar
- * @param windowInsets the window insets that the search bar will respect
- * @param interactionSource an optional hoisted [MutableInteractionSource] for observing and
- * emitting [Interaction]s for this search bar. You can use this to change the search bar's
- * appearance or preview the search bar in different states. Note that if `null` is provided,
- * interactions will still happen internally.
- * @param content the content of this search bar that will be displayed below the input field
- */
-@ExperimentalMaterial3Api
-@Composable
-fun SearchBar(
-    state: TextFieldState,
-    onSearch: () -> Unit,
-    active: Boolean,
-    onActiveChange: (Boolean) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    title: @Composable (() -> Unit)? = null,
-    placeholder: @Composable (() -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    shape: Shape = SearchBarDefaults.inputFieldShape,
-    colors: SearchBarColors = SearchBarDefaults.colors(),
-    tonalElevation: Dp = SearchBarDefaults.TonalElevation,
-    shadowElevation: Dp = SearchBarDefaults.ShadowElevation,
-    windowInsets: WindowInsets = SearchBarDefaults.windowInsets,
-    interactionSource: MutableInteractionSource? = null,
-    content: @Composable ColumnScope.() -> Unit,
-) {
-    val animationProgress = remember { Animatable(initialValue = if (active) 1f else 0f) }
-    val finalBackProgress = remember { mutableFloatStateOf(Float.NaN) }
-    val firstBackEvent = remember { mutableStateOf<BackEventCompat?>(null) }
-    val currentBackEvent = remember { mutableStateOf<BackEventCompat?>(null) }
-
-    LaunchedEffect(active) {
-        val animationInProgress = animationProgress.value > 0 && animationProgress.value < 1
-        val animationSpec =
-            if (animationInProgress) {
-                AnimationPredictiveBackExitFloatSpec
-            } else if (active) {
-                AnimationEnterFloatSpec
-            } else {
-                AnimationExitFloatSpec
-            }
-        val targetValue = if (active) 1f else 0f
-        if (animationProgress.value != targetValue) {
-            animationProgress.animateTo(targetValue, animationSpec)
-        }
-        if (!active) {
-            finalBackProgress.floatValue = Float.NaN
-            firstBackEvent.value = null
-            currentBackEvent.value = null
-        }
-    }
-
-    val mutatorMutex = remember { MutatorMutex() }
-    PredictiveBackHandler(enabled = active) { progress ->
-        mutatorMutex.mutate {
-            try {
-                finalBackProgress.floatValue = Float.NaN
-                progress.collect { backEvent ->
-                    if (firstBackEvent.value == null) {
-                        firstBackEvent.value = backEvent
-                    }
-                    currentBackEvent.value = backEvent
-                    val interpolatedProgress = EaseOut.transform(backEvent.progress)
-                    animationProgress.snapTo(targetValue = 1 - interpolatedProgress)
-                }
-                finalBackProgress.floatValue = animationProgress.value
-                onActiveChange(false)
-            } catch (e: CancellationException) {
-                animationProgress.animateTo(
-                    targetValue = 1f,
-                    animationSpec = AnimationPredictiveBackExitFloatSpec,
-                )
-                finalBackProgress.floatValue = Float.NaN
-                firstBackEvent.value = null
-                currentBackEvent.value = null
-            }
-        }
-    }
-
-    SearchBarInternal(
-        animationProgress = animationProgress,
-        finalBackProgress = finalBackProgress,
-        firstBackEvent = firstBackEvent,
-        currentBackEvent = currentBackEvent,
-        state = state,
-        onSearch = onSearch,
-        active = active,
-        onActiveChange = onActiveChange,
-        modifier = modifier,
-        enabled = enabled,
-        title = title,
-        placeholder = placeholder,
-        leadingIcon = leadingIcon,
-        trailingIcon = trailingIcon,
-        shape = shape,
-        colors = colors,
-        tonalElevation = tonalElevation,
-        shadowElevation = shadowElevation,
-        windowInsets = windowInsets,
-        interactionSource = interactionSource,
-        content = content,
-    )
-}
-
-@ExperimentalMaterial3Api
-@Composable
-internal fun SearchBarInternal(
-    animationProgress: Animatable<Float, AnimationVector1D>,
-    finalBackProgress: MutableFloatState,
-    firstBackEvent: MutableState<BackEventCompat?>,
-    currentBackEvent: MutableState<BackEventCompat?>,
-    state: TextFieldState,
-    onSearch: () -> Unit,
-    active: Boolean,
-    onActiveChange: (Boolean) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    title: @Composable (() -> Unit)? = null,
-    placeholder: @Composable (() -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    shape: Shape = SearchBarDefaults.inputFieldShape,
-    colors: SearchBarColors = SearchBarDefaults.colors(),
-    tonalElevation: Dp = SearchBarDefaults.TonalElevation,
-    shadowElevation: Dp = SearchBarDefaults.ShadowElevation,
-    windowInsets: WindowInsets = SearchBarDefaults.windowInsets,
-    interactionSource: MutableInteractionSource? = null,
-    content: @Composable ColumnScope.() -> Unit,
-) {
-    @Suppress("NAME_SHADOWING")
-    val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
-    val focusManager = LocalFocusManager.current
-    val density = LocalDensity.current
-
-    val defaultInputFieldShape = SearchBarDefaults.inputFieldShape
-    val defaultFullScreenShape = SearchBarDefaults.fullScreenShape
-    val useFullScreenShape by remember {
-        derivedStateOf(structuralEqualityPolicy()) { animationProgress.value == 1f }
-    }
-    val animatedShape = remember(useFullScreenShape, shape) {
-        when {
-            shape == defaultInputFieldShape ->
-                // The shape can only be animated if it's the default spec value
-                GenericShape { size, _ ->
-                    val radius = with(density) {
-                        (SearchBarCornerRadius * (1 - animationProgress.value)).toPx()
-                    }
-                    addRoundRect(RoundRect(size.toRect(), CornerRadius(radius)))
-                }
-            useFullScreenShape -> defaultFullScreenShape
-            else -> shape
-        }
-    }
-
-    // The main animation complexity is allowing the component to smoothly expand while keeping the
-    // input field at the same relative location on screen. `Modifier.windowInsetsPadding` does not
-    // support animation and thus is not suitable. Instead, we convert the insets to a padding
-    // applied to the Surface, which gradually becomes padding applied to the input field as the
-    // animation proceeds.
-    val unconsumedInsets = remember { MutableWindowInsets() }
-    val topPadding = remember(density) {
-        derivedStateOf {
-            SearchBarVerticalPadding +
-                unconsumedInsets.asPaddingValues(density).calculateTopPadding()
-        }
-    }
-
-    Surface(
-        shape = animatedShape,
-        color = colors.containerColor,
-        contentColor = contentColorFor(colors.containerColor),
-        tonalElevation = tonalElevation,
-        shadowElevation = shadowElevation,
-        modifier = modifier
-            .padding(horizontal = lerp(SearchBarHorizontalPadding, 0.dp, animationProgress.value))
-            .zIndex(1f)
-            .onConsumedWindowInsetsChanged { consumedInsets ->
-                unconsumedInsets.insets = windowInsets.exclude(consumedInsets)
-            }
-            .consumeWindowInsets(unconsumedInsets)
-            .layout { measurable, constraints ->
-                val animatedTopPadding =
-                    lerp(topPadding.value, 0.dp, animationProgress.value).roundToPx()
-
-                val defaultStartWidth = max(constraints.minWidth, SearchBarMinWidth.roundToPx())
-                    .coerceAtMost(min(constraints.maxWidth, SearchBarMaxWidth.roundToPx()))
-                val defaultStartHeight = max(constraints.minHeight, InputFieldHeight.roundToPx())
-                    .coerceAtMost(constraints.maxHeight)
-                val predictiveBackStartWidth =
-                    (constraints.maxWidth * SearchBarPredictiveBackMinScale).roundToInt()
-                val predictiveBackStartHeight =
-                    (constraints.maxHeight * SearchBarPredictiveBackMinScale).roundToInt()
-                val predictiveBackMultiplier = calculatePredictiveBackMultiplier(
-                    currentBackEvent.value,
-                    animationProgress.value,
-                    finalBackProgress.floatValue,
-                )
-                val startWidth =
-                    lerp(defaultStartWidth, predictiveBackStartWidth, predictiveBackMultiplier)
-                val startHeight =
-                    lerp(defaultStartHeight, predictiveBackStartHeight, predictiveBackMultiplier)
-
-                val endWidth = constraints.maxWidth
-                val endHeight = constraints.maxHeight
-
-                val width = lerp(startWidth, endWidth, animationProgress.value)
-                val height =
-                    lerp(startHeight, endHeight, animationProgress.value) + animatedTopPadding
-
-                val minOffsetMargin = SearchBarPredictiveBackMinMargin.roundToPx()
-                val predictiveBackOffsetX = calculatePredictiveBackOffsetX(
-                    constraints,
-                    minOffsetMargin,
-                    currentBackEvent.value,
-                    animationProgress.value,
-                    predictiveBackMultiplier,
-                )
-                val predictiveBackOffsetY = calculatePredictiveBackOffsetY(
-                    constraints,
-                    minOffsetMargin,
-                    currentBackEvent.value,
-                    firstBackEvent.value,
-                    height,
-                    SearchBarPredictiveBackMaxOffsetY.roundToPx(),
-                    predictiveBackMultiplier,
-                )
-
-                val placeable = measurable.measure(
-                    Constraints
-                        .fixed(width, height)
-                        .offset(
-                            vertical = -animatedTopPadding,
-                        ),
-                )
-                layout(width, height) {
-                    placeable.placeRelative(
-                        predictiveBackOffsetX,
-                        animatedTopPadding + predictiveBackOffsetY,
-                    )
-                }
-            },
-    ) {
-        Column {
-            val animatedInputFieldPadding = remember {
-                AnimatedPaddingValues2(animationProgress.asState(), topPadding)
-            }
-            SearchBarInputField(
-                state = state,
-                onSearch = onSearch,
-                onActiveChange = onActiveChange,
-                modifier = Modifier.padding(paddingValues = animatedInputFieldPadding),
-                enabled = enabled,
-                label = title.takeUnless { active || animationProgress.value > 0 || state.text.isNotEmpty() },
-                placeholder = placeholder,
-                leadingIcon = leadingIcon,
-                trailingIcon = trailingIcon,
-                colors = colors.inputFieldColors,
-                interactionSource = interactionSource,
-            )
-
-            val showResults by remember {
-                derivedStateOf(structuralEqualityPolicy()) { animationProgress.value > 0 }
-            }
-            if (showResults) {
-                Column(Modifier.graphicsLayer { alpha = animationProgress.value }) {
-                    HorizontalDivider(color = colors.dividerColor)
-                    content()
-                }
-            }
-        }
-    }
-
-    val isFocused = interactionSource.collectIsFocusedAsState().value
-    val shouldClearFocus = !active && isFocused
-    LaunchedEffect(active) {
-        if (shouldClearFocus) {
-            // Not strictly needed according to the motion spec, but since the animation already has
-            // a delay, this works around b/261632544.
-            delay(AnimationDelayMillis.toLong())
-            focusManager.clearFocus()
-        }
-    }
-}
-
-private fun calculatePredictiveBackMultiplier(
-    currentBackEvent: BackEventCompat?,
-    progress: Float,
-    finalBackProgress: Float,
-) = when {
-    currentBackEvent == null -> 0f // Not in predictive back at all.
-    finalBackProgress.isNaN() -> 1f // User is currently swiping predictive back.
-    finalBackProgress <= 0 -> 0f // Safety check for divide by zero.
-    else -> progress / finalBackProgress // User has released predictive back swipe.
-}
-
-private fun calculatePredictiveBackOffsetX(
-    constraints: Constraints,
-    minMargin: Int,
-    currentBackEvent: BackEventCompat?,
-    progress: Float,
-    predictiveBackMultiplier: Float,
-): Int {
-    if (currentBackEvent == null || predictiveBackMultiplier == 0f) {
-        return 0
-    }
-    val directionMultiplier = if (currentBackEvent.swipeEdge == BackEventCompat.EDGE_LEFT) 1 else -1
-    val maxOffsetX =
-        (constraints.maxWidth * SearchBarPredictiveBackMaxOffsetXRatio) - minMargin
-    val interpolatedOffsetX = maxOffsetX * (1 - progress)
-    return (interpolatedOffsetX * predictiveBackMultiplier * directionMultiplier).roundToInt()
-}
-
-private fun calculatePredictiveBackOffsetY(
-    constraints: Constraints,
-    minMargin: Int,
-    currentBackEvent: BackEventCompat?,
-    firstBackEvent: BackEventCompat?,
-    height: Int,
-    maxOffsetY: Int,
-    predictiveBackMultiplier: Float,
-): Int {
-    if (firstBackEvent == null || currentBackEvent == null || predictiveBackMultiplier == 0f) {
-        return 0
-    }
-    val availableVerticalSpace = max(0, (constraints.maxHeight - height) / 2 - minMargin)
-    val adjustedMaxOffsetY = min(availableVerticalSpace, maxOffsetY)
-    val yDelta = currentBackEvent.touchY - firstBackEvent.touchY
-    val yProgress = abs(yDelta) / constraints.maxHeight
-    val directionMultiplier = sign(yDelta)
-    val interpolatedOffsetY = lerp(0, adjustedMaxOffsetY, yProgress)
-    return (interpolatedOffsetY * predictiveBackMultiplier * directionMultiplier).roundToInt()
-}
-
-@Composable
-private fun SearchBarInputField(
-    state: TextFieldState,
-    onSearch: () -> Unit,
-    onActiveChange: (Boolean) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    label: @Composable (() -> Unit)? = null,
-    placeholder: @Composable (() -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    colors: TextFieldColors = SearchBarDefaults.inputFieldColors(),
-    interactionSource: MutableInteractionSource? = null,
-) {
-    @Suppress("NAME_SHADOWING")
-    val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
-    val focusRequester = remember { FocusRequester() }
-    val focused by interactionSource.collectIsFocusedAsState()
-    val textColor = LocalTextStyle.current.color.takeOrElse {
-        if (focused) colors.focusedTextColor else colors.unfocusedTextColor
-    }
-
-    BasicTextField(
-        state = state,
-        modifier = modifier
-            .height(InputFieldHeight)
-            .fillMaxWidth()
-            .focusRequester(focusRequester)
-            .onFocusChanged { if (it.isFocused) onActiveChange(true) }
-            .semantics {
-                onClick {
-                    focusRequester.requestFocus()
-                    true
-                }
-            },
-        enabled = enabled,
-        lineLimits = TextFieldLineLimits.SingleLine,
-        textStyle = LocalTextStyle.current.merge(TextStyle(color = textColor)),
-        cursorBrush = SolidColor(colors.cursorColor),
-        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-        keyboardActions = KeyboardActions(onSearch = { onSearch() }),
-        interactionSource = interactionSource,
-        decorator = @Composable { innerTextField ->
-            TextFieldDefaults.DecorationBox(
-                value = state.text.toString(),
-                innerTextField = innerTextField,
-                enabled = enabled,
-                singleLine = true,
-                visualTransformation = VisualTransformation.None,
-                interactionSource = interactionSource,
-                label = label,
-                placeholder = placeholder,
-                leadingIcon = leadingIcon?.let { leading ->
-                    {
-                        Box(Modifier.offset(x = SearchBarIconOffsetX)) { leading() }
-                    }
-                },
-                trailingIcon = trailingIcon?.let { trailing ->
-                    {
-                        Box(Modifier.offset(x = -SearchBarIconOffsetX)) { trailing() }
-                    }
-                },
-                shape = SearchBarDefaults.inputFieldShape,
-                colors = colors,
-                contentPadding = TextFieldDefaults.contentPaddingWithoutLabel(),
-                container = {},
-            )
-        },
-    )
-}
-
-@Stable
-private class AnimatedPaddingValues2(
-    val animationProgress: State<Float>,
-    val topPadding: State<Dp>,
-) : PaddingValues {
-    override fun calculateTopPadding(): Dp = topPadding.value * animationProgress.value
-    override fun calculateBottomPadding(): Dp = SearchBarVerticalPadding * animationProgress.value
-
-    override fun calculateLeftPadding(layoutDirection: LayoutDirection): Dp = 0.dp
-    override fun calculateRightPadding(layoutDirection: LayoutDirection): Dp = 0.dp
-}
-
-// Measurement specs
-private val SearchBarCornerRadius: Dp = InputFieldHeight / 2
-internal val SearchBarMinWidth: Dp = 360.dp
-private val SearchBarMaxWidth: Dp = 720.dp
-internal val SearchBarVerticalPadding: Dp = 8.dp
-internal val SearchBarHorizontalPadding: Dp = 16.dp
-
-// Search bar has 16dp padding between icons and start/end, while by default text field has 12dp.
-private val SearchBarIconOffsetX: Dp = 4.dp
-private const val SearchBarPredictiveBackMinScale: Float = 9f / 10f
-private val SearchBarPredictiveBackMinMargin: Dp = 8.dp
-private const val SearchBarPredictiveBackMaxOffsetXRatio: Float = 1f / 20f
-private val SearchBarPredictiveBackMaxOffsetY: Dp = 24.dp
-
-// Animation specs
-private const val AnimationEnterDurationMillis: Int = 600
-private const val AnimationExitDurationMillis: Int = 350
-private const val AnimationDelayMillis: Int = 100
-private val AnimationEnterEasing = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1.0f)
-private val AnimationExitEasing = CubicBezierEasing(0.0f, 1.0f, 0.0f, 1.0f)
-private val AnimationEnterFloatSpec: FiniteAnimationSpec<Float> = tween(
-    durationMillis = AnimationEnterDurationMillis,
-    delayMillis = AnimationDelayMillis,
-    easing = AnimationEnterEasing,
-)
-private val AnimationExitFloatSpec: FiniteAnimationSpec<Float> = tween(
-    durationMillis = AnimationExitDurationMillis,
-    delayMillis = AnimationDelayMillis,
-    easing = AnimationExitEasing,
-)
-private val AnimationPredictiveBackExitFloatSpec: FiniteAnimationSpec<Float> = tween(
-    durationMillis = AnimationExitDurationMillis,
-    easing = AnimationExitEasing,
-)
@@ -1,20 +1,17 @@
-@file:Suppress("ktlint:standard:property-naming", "ktlint:standard:function-naming")
+@file:Suppress("ktlint:standard:property-naming")

 package androidx.compose.material3

 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.TweenSpec
 import androidx.compose.animation.core.animate
-import androidx.compose.animation.core.exponentialDecay
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.AnchoredDraggableDefaults
 import androidx.compose.foundation.gestures.AnchoredDraggableState
 import androidx.compose.foundation.gestures.DraggableAnchors
-import androidx.compose.foundation.gestures.awaitEachGesture
-import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.awaitHorizontalTouchSlopOrCancellation
+import androidx.compose.foundation.gestures.anchoredHorizontalDraggable
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.gestures.horizontalDrag
 import androidx.compose.foundation.gestures.snapTo
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -42,17 +39,12 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.TileMode
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.input.pointer.positionChange
-import androidx.compose.ui.input.pointer.util.VelocityTracker
-import androidx.compose.ui.input.pointer.util.addPointerInputChange
 import androidx.compose.ui.layout.layout
-import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.lerp
 import com.hippo.ehviewer.ui.tools.animateFloatMergeOneWayPredictiveBackAsState
@@ -61,25 +53,12 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.launch

 private val AnimationSpec = TweenSpec<Float>(durationMillis = 256)
-private const val DrawerPositionalThreshold = 0.5f
-private val DrawerVelocityThreshold = 400.dp
-private val ContainerWidth = 360.0.dp

@Suppress("NotCloseable")
@Stable
-class DrawerState2(
-    initialValue: DrawerValue,
-    val confirmStateChange: (DrawerValue) -> Boolean = { true },
-) {
+class DrawerState2(initialValue: DrawerValue) {

-    val anchoredDraggableState = AnchoredDraggableState(
-        initialValue = initialValue,
-        snapAnimationSpec = AnimationSpec,
-        decayAnimationSpec = exponentialDecay(7.5f),
-        confirmValueChange = confirmStateChange,
-        positionalThreshold = { distance -> distance * DrawerPositionalThreshold },
-        velocityThreshold = { with(requireDensity()) { DrawerVelocityThreshold.toPx() } },
-    )
+    val anchoredDraggableState = AnchoredDraggableState(initialValue)

    /**
     * Whether the drawer is open.
@@ -102,7 +81,7 @@ class DrawerState2(
     */
    val currentValue: DrawerValue
        get() {
-            return anchoredDraggableState.currentValue
+            return anchoredDraggableState.settledValue
        }

    /**
@@ -221,11 +200,10 @@ class DrawerState2(
        /**
         * The default [Saver] implementation for [DrawerState2].
         */
-        fun Saver(confirmStateChange: (DrawerValue) -> Boolean) =
-            Saver<DrawerState2, DrawerValue>(
-                save = { it.currentValue },
-                restore = { DrawerState2(it, confirmStateChange) },
-            )
+        fun Saver() = Saver<DrawerState2, DrawerValue>(
+            save = { it.currentValue },
+            restore = { DrawerState2(it) },
+        )
    }
 }

@@ -233,82 +211,53 @@ class DrawerState2(
 * Create and [remember] a [DrawerState2].
 *
 * @param initialValue The initial value of the state.
- * @param confirmStateChange Optional callback invoked to confirm or veto a pending state change.
 */
@Composable
-fun rememberDrawerState(
+fun rememberDrawerState2(
    initialValue: DrawerValue,
-    confirmStateChange: (DrawerValue) -> Boolean = { true },
-): DrawerState2 {
-    return rememberSaveable(saver = DrawerState2.Saver(confirmStateChange)) {
-        DrawerState2(initialValue, confirmStateChange)
-    }
+): DrawerState2 = rememberSaveable(saver = DrawerState2.Saver()) {
+    DrawerState2(initialValue)
 }

@Composable
-fun ModalNavigationDrawer(
+fun ModalSideDrawer(
    drawerContent: @Composable () -> Unit,
    modifier: Modifier = Modifier,
-    drawerState: DrawerState2 = rememberDrawerState(DrawerValue.Closed),
+    drawerState: DrawerState2 = rememberDrawerState2(DrawerValue.Closed),
    gesturesEnabled: Boolean = true,
    scrimColor: Color = DrawerDefaults.scrimColor,
    content: @Composable () -> Unit,
 ) {
    val scope = rememberCoroutineScope()
    val density = LocalDensity.current
-    var minValue by remember { mutableFloatStateOf(-with(density) { ContainerWidth.toPx() }) }
-    val maxValue = 0f
+    var maxValue by remember { mutableFloatStateOf(with(density) { DrawerDefaults.MaximumDrawerWidth.toPx() }) }
+    val minValue = 0f

    SideEffect {
        drawerState.density = density
        drawerState.anchoredDraggableState.updateAnchors(
            DraggableAnchors {
-                DrawerValue.Closed at minValue
-                DrawerValue.Open at maxValue
+                DrawerValue.Closed at maxValue
+                DrawerValue.Open at minValue
            },
        )
    }

-    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
-    val velocityTracker = remember { VelocityTracker() }
-    val dragModifier = if (gesturesEnabled) {
-        Modifier.pointerInput(isRtl) {
-            val multiplier = if (isRtl) -1 else 1
-            awaitEachGesture {
-                fun canConsume(slop: Float) = (slop > 0 && drawerState.isClosed) || (slop < 0 && drawerState.isOpen)
-                val down = awaitFirstDown(requireUnconsumed = false)
-                var ignore = false
-                val drag = awaitHorizontalTouchSlopOrCancellation(down.id) { change, over ->
-                    val overSlop = over * multiplier
-                    val canConsume = canConsume(overSlop)
-                    if (canConsume && !ignore) {
-                        velocityTracker.addPointerInputChange(change)
-                        change.consume()
-                        drawerState.anchoredDraggableState.dispatchRawDelta(overSlop)
-                    } else {
-                        ignore = true
-                    }
-                }
-                if (drag != null) {
-                    horizontalDrag(drag.id) {
-                        velocityTracker.addPointerInputChange(it)
-                        drawerState.anchoredDraggableState.dispatchRawDelta(it.positionChange().x * multiplier)
-                    }
-                    val velocity = velocityTracker.calculateVelocity()
-                    velocityTracker.resetTracking()
-                    scope.launch {
-                        drawerState.anchoredDraggableState.settle(velocity.x * multiplier)
-                    }
-                }
-            }
-        }
-    } else {
-        Modifier
-    }
-    Box(modifier.fillMaxSize().then(dragModifier)) {
+    Box(
+        modifier.fillMaxSize().anchoredHorizontalDraggable(
+            state = drawerState.anchoredDraggableState,
+            enableDragFromStartToEnd = drawerState.isOpen,
+            enableDragFromEndToStart = drawerState.isClosed,
+            enabled = gesturesEnabled,
+            flingBehavior = AnchoredDraggableDefaults.flingBehavior(
+                state = drawerState.anchoredDraggableState,
+                animationSpec = AnimationSpec,
+            ),
+        ),
+    ) {
        val radius by remember {
            snapshotFlow {
-                val step = calculateFraction(minValue, maxValue, drawerState.currentOffset)
+                val step = calculateFraction(maxValue, minValue, drawerState.currentOffset)
                lerp(0, 10, step).dp
            }
        }.collectAsState(0.dp)
@@ -325,150 +274,12 @@ fun ModalNavigationDrawer(
        Scrim(
            open = drawerState.isOpen,
            onClose = {
-                if (gesturesEnabled && drawerState.confirmStateChange(DrawerValue.Closed)) {
+                if (gesturesEnabled) {
                    scope.launch { drawerState.close() }
                }
            },
            fraction = {
-                calculateFraction(minValue, maxValue, drawerState.requireOffset())
-            },
-            color = scrimColor,
-        )
-        val predictiveState by animateFloatMergeOneWayPredictiveBackAsState(drawerState.isOpen) {
-            drawerState.close()
-        }
-        val absoluteElevation = LocalAbsoluteTonalElevation.current + DrawerDefaults.ModalDrawerElevation
-        val predictiveModifier = if (drawerState.isOpen) {
-            if (predictiveState > 0) {
-                Modifier.layout { measurable, constraints ->
-                    val placeable = measurable.measure(constraints)
-                    val multiplierX = lerp(1f, 1.05f, predictiveState)
-                    val multiplierY = lerp(1f, 0.95f, predictiveState)
-                    val scaledWidth = (multiplierX * placeable.width).roundToInt()
-                    val scaledHeight = (multiplierY * placeable.height).roundToInt()
-                    val reMeasured = measurable.measure(Constraints.fixed(scaledWidth, scaledHeight))
-                    layout(scaledWidth, scaledHeight) {
-                        reMeasured.placeRelative(scaledWidth - placeable.width, 0)
-                    }
-                }.background(
-                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(absoluteElevation),
-                    shape = DrawerDefaults.shape,
-                )
-            } else {
-                Modifier.graphicsLayer {
-                    val scale = lerp(1f, 0.95f, -predictiveState)
-                    scaleX = scale
-                    scaleY = scale
-                }.offset {
-                    IntOffset(lerp(0f, minValue * 0.05f, -predictiveState).roundToInt(), 0)
-                }
-            }
-        } else {
-            Modifier.onGloballyPositioned {
-                val w = it.size.width
-                if (w != 0) {
-                    minValue = -it.size.width.toFloat()
-                }
-            }
-        }
-        Box(
-            modifier = Modifier.offset {
-                IntOffset(drawerState.requireOffset().roundToInt(), 0)
-            } then predictiveModifier.align(Alignment.CenterStart),
-            contentAlignment = Alignment.CenterEnd,
-        ) {
-            drawerContent()
-        }
-    }
-}
-
-@Composable
-fun SideDrawer(
-    drawerContent: @Composable () -> Unit,
-    modifier: Modifier = Modifier,
-    drawerState: DrawerState2 = rememberDrawerState(DrawerValue.Closed),
-    gesturesEnabled: Boolean = true,
-    scrimColor: Color = DrawerDefaults.scrimColor,
-    content: @Composable () -> Unit,
-) {
-    val scope = rememberCoroutineScope()
-    val density = LocalDensity.current
-    var minValue by remember { mutableFloatStateOf(with(density) { ContainerWidth.toPx() }) }
-    val maxValue = 0f
-
-    SideEffect {
-        drawerState.density = density
-        drawerState.anchoredDraggableState.updateAnchors(
-            DraggableAnchors {
-                DrawerValue.Closed at minValue
-                DrawerValue.Open at maxValue
-            },
-        )
-    }
-
-    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
-    val velocityTracker = remember { VelocityTracker() }
-    val dragModifier = if (gesturesEnabled) {
-        Modifier.pointerInput(isRtl) {
-            val multiplier = if (isRtl) -1 else 1
-            awaitEachGesture {
-                fun canConsume(slop: Float) = (slop > 0 && drawerState.isOpen) || (slop < 0 && drawerState.isClosed)
-                val down = awaitFirstDown(requireUnconsumed = false)
-                var ignore = false
-                val drag = awaitHorizontalTouchSlopOrCancellation(down.id) { change, over ->
-                    val overSlop = over * multiplier
-                    val canConsume = canConsume(overSlop)
-                    if (canConsume && !ignore) {
-                        velocityTracker.addPointerInputChange(change)
-                        change.consume()
-                        drawerState.anchoredDraggableState.dispatchRawDelta(overSlop)
-                    } else {
-                        ignore = true
-                    }
-                }
-                if (drag != null) {
-                    horizontalDrag(drag.id) {
-                        velocityTracker.addPointerInputChange(it)
-                        drag.consume()
-                        drawerState.anchoredDraggableState.dispatchRawDelta(it.positionChange().x * multiplier)
-                    }
-                    val velocity = velocityTracker.calculateVelocity()
-                    velocityTracker.resetTracking()
-                    scope.launch {
-                        drawerState.anchoredDraggableState.settle(velocity.x * multiplier)
-                    }
-                }
-            }
-        }
-    } else {
-        Modifier
-    }
-    Box(modifier.fillMaxSize().then(dragModifier)) {
-        val radius by remember {
-            snapshotFlow {
-                val step = calculateFraction(minValue, maxValue, drawerState.currentOffset)
-                lerp(0, 10, step).dp
-            }
-        }.collectAsState(0.dp)
-        val blurModifier = Modifier.graphicsLayer {
-            if (radius != 0.dp) {
-                renderEffect = BlurEffect(radius.toPx(), radius.toPx(), TileMode.Clamp)
-                shape = RectangleShape
-                clip = true
-            }
-        }
-        Box(modifier = blurModifier) {
-            content()
-        }
-        Scrim(
-            open = drawerState.isOpen,
-            onClose = {
-                if (gesturesEnabled && drawerState.confirmStateChange(DrawerValue.Closed)) {
-                    scope.launch { drawerState.close() }
-                }
-            },
-            fraction = {
-                calculateFraction(minValue, maxValue, drawerState.requireOffset())
+                calculateFraction(maxValue, minValue, drawerState.requireOffset())
            },
            color = scrimColor,
        )
@@ -486,7 +297,7 @@ fun SideDrawer(
                    val scaledHeight = (multiplierY * placeable.height).roundToInt()
                    val reMeasured = measurable.measure(Constraints.fixed(scaledWidth, scaledHeight))
                    layout(scaledWidth, scaledHeight) {
-                        reMeasured.placeRelative(-(scaledWidth - placeable.width), 0)
+                        reMeasured.placeRelative(placeable.width - scaledWidth, 0)
                    }
                }.background(
                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(absoluteElevation),
@@ -498,14 +309,20 @@ fun SideDrawer(
                    scaleX = scale
                    scaleY = scale
                }.offset {
-                    IntOffset(lerp(0f, minValue * 0.05f, predictiveState).roundToInt(), 0)
+                    IntOffset(lerp(0f, maxValue * 0.05f, predictiveState).roundToInt(), 0)
                }
            }
        } else {
-            Modifier.onGloballyPositioned {
-                val w = it.size.width
-                if (w != 0) {
-                    minValue = it.size.width.toFloat()
+            Modifier.onSizeChanged {
+                val width = it.width
+                if (width != 0) {
+                    maxValue = width.toFloat()
+                    drawerState.anchoredDraggableState.updateAnchors(
+                        DraggableAnchors {
+                            DrawerValue.Closed at maxValue
+                            DrawerValue.Open at minValue
+                        },
+                    )
                }
            }
        }
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2025 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
+ *
+ *      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 androidx.compose.material3.fork
+
+/**
+ * Material-specific anchor layout logic which considers lookahead. This internal code is expected
+ * to remain in the library after androidx.compose.material3.internal.AnchoredDraggable.kt is
+ * removed.
+ */
+import androidx.compose.foundation.gestures.AnchoredDraggableState
+import androidx.compose.foundation.gestures.DraggableAnchors
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.Measurable
+import androidx.compose.ui.layout.MeasureResult
+import androidx.compose.ui.layout.MeasureScope
+import androidx.compose.ui.node.LayoutModifierNode
+import androidx.compose.ui.node.ModifierNodeElement
+import androidx.compose.ui.node.requireLayoutDirection
+import androidx.compose.ui.platform.InspectorInfo
+import androidx.compose.ui.platform.debugInspectorInfo
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import kotlin.math.roundToInt
+
+/**
+ * This Modifier allows configuring an [AnchoredDraggableState]'s anchors based on this layout
+ * node's size and offsetting it. It considers lookahead and reports the appropriate size and
+ * measurement for the appropriate phase.
+ *
+ * @param state The state the anchors should be attached to
+ * @param orientation The orientation the component should be offset in
+ * @param anchors Lambda to calculate the anchors based on this layout's size and the incoming
+ *   constraints. These can be useful to avoid subcomposition.
+ */
+@Stable
+internal fun <T> Modifier.draggableAnchors(
+    state: AnchoredDraggableState<T>,
+    orientation: Orientation,
+    anchors: (size: IntSize, constraints: Constraints) -> Pair<DraggableAnchors<T>, T>,
+) = this then DraggableAnchorsElement(state, anchors, orientation)
+
+private class DraggableAnchorsElement<T>(
+    private val state: AnchoredDraggableState<T>,
+    private val anchors: (size: IntSize, constraints: Constraints) -> Pair<DraggableAnchors<T>, T>,
+    private val orientation: Orientation,
+) : ModifierNodeElement<DraggableAnchorsNode<T>>() {
+
+    override fun create() = DraggableAnchorsNode(state, anchors, orientation)
+
+    override fun update(node: DraggableAnchorsNode<T>) {
+        node.state = state
+        node.anchors = anchors
+        node.orientation = orientation
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+
+        if (other !is DraggableAnchorsElement<*>) return false
+
+        if (state != other.state) return false
+        if (anchors !== other.anchors) return false
+        if (orientation != other.orientation) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = state.hashCode()
+        result = 31 * result + anchors.hashCode()
+        result = 31 * result + orientation.hashCode()
+        return result
+    }
+
+    override fun InspectorInfo.inspectableProperties() {
+        debugInspectorInfo {
+            properties["state"] = state
+            properties["anchors"] = anchors
+            properties["orientation"] = orientation
+        }
+    }
+}
+
+private class DraggableAnchorsNode<T>(
+    var state: AnchoredDraggableState<T>,
+    var anchors: (size: IntSize, constraints: Constraints) -> Pair<DraggableAnchors<T>, T>,
+    var orientation: Orientation,
+) : Modifier.Node(), LayoutModifierNode {
+    private var didLookahead: Boolean = false
+
+    override fun onDetach() {
+        didLookahead = false
+    }
+
+    private val isReverseDirection: Boolean
+        get() = requireLayoutDirection() == LayoutDirection.Rtl && orientation == Orientation.Horizontal
+
+    override fun MeasureScope.measure(
+        measurable: Measurable,
+        constraints: Constraints,
+    ): MeasureResult {
+        val placeable = measurable.measure(constraints)
+        // If we are in a lookahead pass, we only want to update the anchors here and not in
+        // post-lookahead. If there is no lookahead happening (!isLookingAhead && !didLookahead),
+        // update the anchors in the main pass.
+        if (!isLookingAhead || !didLookahead) {
+            val size = IntSize(placeable.width, placeable.height)
+            val newAnchorResult = anchors(size, constraints)
+            state.updateAnchors(newAnchorResult.first, newAnchorResult.second)
+        }
+        didLookahead = isLookingAhead || didLookahead
+        return layout(placeable.width, placeable.height) {
+            // In a lookahead pass, we use the position of the current target as this is where any
+            // ongoing animations would move. If the component is in a settled state, lookahead
+            // and post-lookahead will converge.
+            val offset = if (isLookingAhead) {
+                state.anchors.positionOf(state.targetValue)
+            } else {
+                state.requireOffset()
+            }
+            val rtlModifier = if (isReverseDirection) -1f else 1f
+            val xOffset = if (orientation == Orientation.Horizontal) offset * rtlModifier else 0f
+            val yOffset = if (orientation == Orientation.Vertical) offset else 0f
+            // Tagging as motion frame of reference placement, meaning the placement
+            // contains scrolling. This allows the consumer of this placement offset to
+            // differentiate this offset vs. offsets from structural changes. Generally
+            // speaking, this signals a preference to directly apply changes rather than
+            // animating, to avoid a chasing effect to scrolling.
+            withMotionFrameOfReferencePlacement {
+                placeable.place(xOffset.roundToInt(), yOffset.roundToInt())
+            }
+        }
+    }
+}
@@ -0,0 +1,225 @@
+/*
+ * 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
+ *
+ *      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 androidx.compose.material3.fork
+
+import androidx.annotation.FloatRange
+import androidx.compose.foundation.gestures.AnchoredDraggableDefaults
+import androidx.compose.foundation.gestures.AnchoredDraggableState
+import androidx.compose.foundation.gestures.DraggableAnchors
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.anchoredHorizontalDraggable
+import androidx.compose.foundation.gestures.animateTo
+import androidx.compose.foundation.gestures.snapTo
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.material3.SwipeToDismissBoxDefaults
+import androidx.compose.material3.SwipeToDismissBoxValue
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Modifier
+import kotlinx.coroutines.CancellationException
+
+/**
+ * State of the [SwipeToDismissBox] composable.
+ *
+ * @param initialValue The initial value of the state.
+ * @param positionalThreshold The positional threshold to be used when calculating the target
+ *   state while a swipe is in progress and when settling after the swipe ends. This is the
+ *   distance from the start of a transition. It will be, depending on the direction of the
+ *   interaction, added or subtracted from/to the origin offset. It should always be a positive
+ *   value.
+ */
+class SwipeToDismissBoxState(
+    initialValue: SwipeToDismissBoxValue,
+    internal val positionalThreshold: (totalDistance: Float) -> Float,
+) {
+    internal val anchoredDraggableState = AnchoredDraggableState(initialValue)
+
+    internal val offset: Float
+        get() = anchoredDraggableState.offset
+
+    /**
+     * Require the current offset.
+     *
+     * @throws IllegalStateException If the offset has not been initialized yet
+     */
+    fun requireOffset(): Float = anchoredDraggableState.requireOffset()
+
+    /** The current state value of the [SwipeToDismissBoxState]. */
+    val currentValue: SwipeToDismissBoxValue
+        get() = anchoredDraggableState.currentValue
+
+    /**
+     * The target state. This is the closest state to the current offset (taking into account
+     * positional thresholds). If no interactions like animations or drags are in progress, this
+     * will be the current state.
+     */
+    val targetValue: SwipeToDismissBoxValue
+        get() = anchoredDraggableState.targetValue
+
+    /**
+     * The value the [SwipeToDismissBoxState] is currently settled at. When progressing through
+     * multiple anchors, e.g. A -> B -> C, settledValue will stay the same until settled at an
+     * anchor, while currentValue will update to the closest anchor.
+     */
+    val settledValue: SwipeToDismissBoxValue
+        get() = anchoredDraggableState.settledValue
+
+    /**
+     * The fraction of the progress going from currentValue to targetValue, within [0f..1f] bounds.
+     */
+    @get:FloatRange(from = 0.0, to = 1.0)
+    val progress: Float
+        get() = anchoredDraggableState.progress(anchoredDraggableState.settledValue, anchoredDraggableState.targetValue)
+
+    /**
+     * The direction (if any) in which the composable has been or is being dismissed.
+     *
+     * Use this to change the background of the [SwipeToDismissBox] if you want different actions on
+     * each side.
+     */
+    val dismissDirection: SwipeToDismissBoxValue
+        get() = when {
+            offset == 0f || offset.isNaN() -> SwipeToDismissBoxValue.Settled
+            offset > 0f -> SwipeToDismissBoxValue.StartToEnd
+            else -> SwipeToDismissBoxValue.EndToStart
+        }
+
+    /**
+     * Set the state without any animation and suspend until it's set
+     *
+     * @param targetValue The new target value
+     */
+    suspend fun snapTo(targetValue: SwipeToDismissBoxValue) {
+        anchoredDraggableState.snapTo(targetValue)
+    }
+
+    /**
+     * Reset the component to the default position with animation and suspend until it if fully
+     * reset or animation has been cancelled. This method will throw [CancellationException] if the
+     * animation is interrupted
+     *
+     * @return the reason the reset animation ended
+     */
+    suspend fun reset() = anchoredDraggableState.animateTo(targetValue = SwipeToDismissBoxValue.Settled)
+
+    /**
+     * Dismiss the component in the given [direction], with an animation and suspend. This method
+     * will throw [CancellationException] if the animation is interrupted
+     *
+     * @param direction The dismiss direction.
+     */
+    suspend fun dismiss(direction: SwipeToDismissBoxValue) {
+        anchoredDraggableState.animateTo(targetValue = direction)
+    }
+
+    companion object {
+
+        /** The default [Saver] implementation for [SwipeToDismissBoxState]. */
+        fun Saver(positionalThreshold: (totalDistance: Float) -> Float) = Saver<SwipeToDismissBoxState, SwipeToDismissBoxValue>(
+            save = { it.currentValue },
+            restore = { SwipeToDismissBoxState(it, positionalThreshold) },
+        )
+    }
+}
+
+/**
+ * Create and [remember] a [SwipeToDismissBoxState].
+ *
+ * @param initialValue The initial value of the state.
+ * @param positionalThreshold The positional threshold to be used when calculating the target state
+ *   while a swipe is in progress and when settling after the swipe ends. This is the distance from
+ *   the start of a transition. It will be, depending on the direction of the interaction, added or
+ *   subtracted from/to the origin offset. It should always be a positive value.
+ */
+@Composable
+fun rememberSwipeToDismissBoxState(
+    initialValue: SwipeToDismissBoxValue = SwipeToDismissBoxValue.Settled,
+    positionalThreshold: (totalDistance: Float) -> Float = SwipeToDismissBoxDefaults.positionalThreshold,
+): SwipeToDismissBoxState = rememberSaveable(
+    saver = SwipeToDismissBoxState.Saver(positionalThreshold = positionalThreshold),
+) {
+    SwipeToDismissBoxState(initialValue, positionalThreshold)
+}
+
+/**
+ * A composable that can be dismissed by swiping left or right.
+ *
+ * @param state The state of this component.
+ * @param backgroundContent A composable that is stacked behind the [content] and is exposed when
+ *   the content is swiped. You can/should use the [state] to have different backgrounds on each
+ *   side.
+ * @param modifier Optional [Modifier] for this component.
+ * @param enableDismissFromStartToEnd Whether SwipeToDismissBox can be dismissed from start to end.
+ * @param enableDismissFromEndToStart Whether SwipeToDismissBox can be dismissed from end to start.
+ * @param gesturesEnabled Whether swipe-to-dismiss can be interacted by gestures.
+ * @param onDismiss Optional callback to be called when [content] is dismissed. onDismissed provides
+ *   the current dismissed direction.
+ * @param content The content that can be dismissed.
+ */
+@Composable
+fun SwipeToDismissBox(
+    state: SwipeToDismissBoxState,
+    backgroundContent: @Composable RowScope.() -> Unit,
+    modifier: Modifier = Modifier,
+    enableDismissFromStartToEnd: Boolean = true,
+    enableDismissFromEndToStart: Boolean = true,
+    gesturesEnabled: Boolean = true,
+    onDismiss: suspend (SwipeToDismissBoxValue) -> Unit = {},
+    content: @Composable RowScope.() -> Unit,
+) {
+    Box(
+        modifier = modifier.anchoredHorizontalDraggable(
+            state = state.anchoredDraggableState,
+            enableDragFromStartToEnd = enableDismissFromStartToEnd,
+            enableDragFromEndToStart = enableDismissFromEndToStart,
+            enabled = gesturesEnabled && state.settledValue == SwipeToDismissBoxValue.Settled,
+            flingBehavior = AnchoredDraggableDefaults.flingBehavior(
+                state = state.anchoredDraggableState,
+                positionalThreshold = state.positionalThreshold,
+            ),
+        ),
+        propagateMinConstraints = true,
+    ) {
+        Row(content = backgroundContent, modifier = Modifier.matchParentSize())
+        Row(
+            content = content,
+            modifier = Modifier.draggableAnchors(state.anchoredDraggableState, Orientation.Horizontal) { size, _ ->
+                DraggableAnchors {
+                    val width = size.width.toFloat()
+                    SwipeToDismissBoxValue.Settled at 0f
+                    if (enableDismissFromStartToEnd) {
+                        SwipeToDismissBoxValue.StartToEnd at width
+                    }
+                    if (enableDismissFromEndToStart) {
+                        SwipeToDismissBoxValue.EndToStart at -width
+                    }
+                } to state.targetValue
+            },
+        )
+    }
+    LaunchedEffect(state.settledValue, onDismiss) {
+        // Only call when state is settled in a dismissed direction.
+        if (state.settledValue != SwipeToDismissBoxValue.Settled) {
+            onDismiss(state.dismissDirection)
+        }
+    }
+}
@@ -0,0 +1,161 @@
+/*
+ * 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
+        }
+}
@@ -635,8 +635,7 @@ data class WebViewError(
 fun rememberWebViewState(
    url: String,
    additionalHttpHeaders: Map<String, String> = emptyMap(),
-): WebViewState =
-// Rather than using .apply {} here we will recreate the state, this prevents
+): WebViewState = // Rather than using .apply {} here we will recreate the state, this prevents
    // a recomposition loop when the webview updates the url itself.
    remember {
        WebViewState(
@@ -21,55 +21,67 @@ import android.content.Context
 import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.content.res.AppCompatResources
-import androidx.collection.LruCache
-import androidx.compose.runtime.snapshots.Snapshot
+import androidx.compose.runtime.Composer
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.coroutineScope
+import coil3.EventListener
 import coil3.SingletonImageLoader
-import coil3.asCoilImage
+import coil3.asImage
 import coil3.gif.AnimatedImageDecoder
 import coil3.gif.GifDecoder
-import coil3.network.ktor.KtorNetworkFetcherFactory
+import coil3.network.ConnectivityChecker
+import coil3.network.ktor3.KtorNetworkFetcherFactory
+import coil3.request.ErrorResult
+import coil3.request.ImageRequest
+import coil3.request.allowRgb565
 import coil3.request.crossfade
 import coil3.serviceLoaderEnabled
 import coil3.util.DebugLogger
-import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhTagDatabase
-import com.hippo.ehviewer.client.data.GalleryDetail
+import com.hippo.ehviewer.coil.AnimatedWebPDecoder
 import com.hippo.ehviewer.coil.CropBorderInterceptor
+import com.hippo.ehviewer.coil.DetectBorderInterceptor
 import com.hippo.ehviewer.coil.DownloadThumbInterceptor
 import com.hippo.ehviewer.coil.HardwareBitmapInterceptor
+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
 import com.hippo.ehviewer.ktbuilder.imageLoader
-import com.hippo.ehviewer.ktor.CronetEngine
-import com.hippo.ehviewer.legacy.cleanObsoleteCache
+import com.hippo.ehviewer.ktor.Cronet
+import com.hippo.ehviewer.ktor.configureClient
+import com.hippo.ehviewer.ktor.configureCommon
 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.Crash
+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.isAtLeastQ
 import com.hippo.ehviewer.util.isAtLeastS
-import com.hippo.ehviewer.util.isCronetAvailable
-import eu.kanade.tachiyomi.network.interceptor.UncaughtExceptionInterceptor
+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 io.ktor.client.plugins.cookies.HttpCookies
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import logcat.AndroidLogcatLogger
 import logcat.LogPriority
 import logcat.LogcatLogger
-import okhttp3.AsyncDns
-import okhttp3.android.AndroidAsyncDns
+import logcat.asLog
 import okio.Path.Companion.toOkioPath
 import splitties.arch.room.roomDb
 import splitties.init.appCtx
@@ -77,64 +89,64 @@ import splitties.init.appCtx
 private val lifecycle = ProcessLifecycleOwner.get().lifecycle
 private val lifecycleScope = lifecycle.coroutineScope

-class EhApplication : Application(), SingletonImageLoader.Factory {
+class EhApplication :
+    Application(),
+    SingletonImageLoader.Factory {
    override fun onCreate() {
+        initSETConnection()
        // Initialize Settings on first access
        lifecycleScope.launchIO {
-            val mode = Settings.theme
+            val mode = Settings.theme.value
            if (!isAtLeastS) {
                withUIContext {
                    AppCompatDelegate.setDefaultNightMode(mode)
                }
            }
-            if (!LogcatLogger.isInstalled && Settings.saveCrashLog) {
-                LogcatLogger.install(AndroidLogcatLogger(LogPriority.VERBOSE))
+            LogcatLogger.loggers += AndroidLogcatLogger(LogPriority.VERBOSE)
+            Settings.saveCrashLog.valueFlow().collect {
+                if (it) {
+                    LogcatLogger.install()
+                } else {
+                    LogcatLogger.uninstall()
+                }
            }
        }
        lifecycle.addObserver(lockObserver)
-        val handler = Thread.getDefaultUncaughtExceptionHandler()
-        Thread.setDefaultUncaughtExceptionHandler { t, e ->
-            try {
-                if (Settings.saveCrashLog) {
-                    Crash.saveCrashLog(e)
-                }
-            } catch (ignored: Throwable) {
-            }
-            handler?.uncaughtException(t, e)
-        }
+        CrashHandler.install()
        super.onCreate()
        System.loadLibrary("ehviewer")
        lifecycleScope.launchIO {
-            launch {
-                EhTagDatabase
-            }
-            launch {
-                EhDB
+            launchUI {
+                FavouriteStatusRouter.collect { info ->
+                    detailCache[info.gid]?.apply {
+                        favoriteSlot = info.favoriteSlot
+                        favoriteName = info.favoriteName
+                        favoriteNote = info.favoriteNote
+                    }
+                }
            }
+            EhTagDatabase.launchUpdate()
+            launch { EhDB }
+            launchIO { dataStateFlow.value }
+            launchIO { OSUtils.totalMemory }
            launch {
+                if (DownloadManager.labelList.isNotEmpty() && Settings.downloadFilterMode !in Settings.snapshot()) {
+                    Settings.downloadFilterMode.value = DownloadsFilterMode.CUSTOM.flag
+                }
                DownloadManager.readMetadataFromLocal()
            }
            launch {
                FileUtils.cleanupDirectory(AppConfig.externalCrashDir)
                FileUtils.cleanupDirectory(AppConfig.externalParseErrorDir)
            }
-            launch {
-                cleanupDownload()
-            }
-            if (Settings.requestNews) {
-                launch {
-                    checkDawn()
-                }
-            }
-            launch {
-                cleanObsoleteCache()
+            launch { cleanupDownload() }
+            if (Settings.requestNews.value) {
+                launch { checkDawn() }
            }
        }
        if (BuildConfig.DEBUG) {
            StrictMode.enableDefaults()
-            Snapshot.registerApplyObserver { anies, _ ->
-                logcat(LogPriority.VERBOSE) { anies.toString() }
-            }
+            Composer.setDiagnosticStackTraceEnabled(true)
        }
    }

@@ -152,24 +164,32 @@ class EhApplication : Application(), SingletonImageLoader.Factory {
    }

    private fun clearTempDir() {
-        var dir = AppConfig.tempDir
-        if (null != dir) {
-            FileUtils.deleteContent(dir)
-        }
-        dir = AppConfig.externalTempDir
-        if (null != dir) {
-            FileUtils.deleteContent(dir)
-        }
+        AppConfig.tempDir.deleteContent()
+        AppConfig.externalTempDir?.deleteContent()
    }

    override fun newImageLoader(context: Context) = context.imageLoader {
+        interceptorCoroutineContext(Dispatchers.Default)
        components {
            serviceLoaderEnabled(false)
-            add(KtorNetworkFetcherFactory { ktorClient })
+            add(
+                KtorNetworkFetcherFactory(
+                    httpClient = { ktorClient },
+                    connectivityChecker = { ConnectivityChecker.ONLINE },
+                ),
+            )
            add(MergeInterceptor)
            add(DownloadThumbInterceptor)
+            if (isAtLeastO) {
+                add(HardwareBitmapInterceptor)
+            } else {
+                allowRgb565(true)
+            }
            add(CropBorderInterceptor)
-            add(HardwareBitmapInterceptor)
+            add(DetectBorderInterceptor)
+            add(QrCodeInterceptor)
+            add(MapExtraInfoInterceptor)
+            add(AnimatedWebPDecoder.Factory)
            if (isAtLeastP) {
                add(AnimatedImageDecoder.Factory(false))
            } else {
@@ -179,56 +199,45 @@ class EhApplication : Application(), SingletonImageLoader.Factory {
        diskCache { imageCache }
        crossfade(300)
        val drawable = AppCompatResources.getDrawable(appCtx, R.drawable.image_failed)
-        if (drawable != null) error(drawable.asCoilImage(true))
-        if (BuildConfig.DEBUG) logger(DebugLogger())
+        if (drawable != null) error(drawable.asImage(true))
+        if (BuildConfig.DEBUG) {
+            logger(DebugLogger())
+        } else {
+            eventListener(object : EventListener() {
+                override fun onError(request: ImageRequest, result: ErrorResult) {
+                    logcat("ImageLoader", LogPriority.ERROR) {
+                        "🚨 Failed - ${request.data}\n${result.throwable.asLog()}"
+                    }
+                }
+            })
+        }
    }

    companion object {
        val ktorClient by lazy {
-            if (Settings.enableCronet && isCronetAvailable) {
-                HttpClient(CronetEngine) {
-                    install(HttpCookies) {
-                        storage = EhCookieStore
-                    }
+            if (isAtLeastSExtension7 && Settings.enableCronet.value) {
+                HttpClient(Cronet) {
+                    engine { configureClient(Settings.enableQuic.value) }
+                    configureCommon()
                }
            } else {
                HttpClient(OkHttp) {
-                    engine {
-                        config {
-                            if (isAtLeastQ) {
-                                dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
-                            }
-                            addInterceptor(UncaughtExceptionInterceptor())
-                        }
-                    }
-                    install(HttpCookies) {
-                        storage = EhCookieStore
-                    }
+                    engine { configureClient() }
+                    configureCommon()
                }
            }
        }

        val noRedirectKtorClient by lazy {
            HttpClient(ktorClient.engine) {
-                followRedirects = false
-                install(HttpCookies) {
-                    storage = EhCookieStore
-                }
-            }
-        }
-
-        val galleryDetailCache by lazy {
-            LruCache<Long, GalleryDetail>(25).also {
-                lifecycleScope.launch {
-                    FavouriteStatusRouter.globalFlow.collect { (gid, slot) -> it[gid]?.favoriteSlot = slot }
-                }
+                configureCommon(redirect = false)
            }
        }

        val imageCache by lazy {
            diskCache {
                directory(appCtx.cacheDir.toOkioPath() / "image_cache")
-                maxSizeBytes(Settings.readCacheSize.coerceIn(320, 5120).toLong() * 1024 * 1024)
+                maxSizeBytes(Settings.readCacheSize.value.coerceIn(320, 5120).toLong() * 1024 * 1024)
            }
        }

@@ -17,9 +17,10 @@ package com.hippo.ehviewer

 import android.content.Context
 import android.net.Uri
-import arrow.fx.coroutines.release
 import arrow.fx.coroutines.resource
+import arrow.fx.coroutines.resourceScope
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.hippo.ehviewer.dao.DownloadArtist
 import com.hippo.ehviewer.dao.DownloadDirname
 import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.dao.DownloadLabel
@@ -29,16 +30,21 @@ import com.hippo.ehviewer.dao.HistoryInfo
 import com.hippo.ehviewer.dao.LocalFavoriteInfo
 import com.hippo.ehviewer.dao.ProgressInfo
 import com.hippo.ehviewer.dao.QuickSearch
+import com.hippo.ehviewer.dao.Schema17to18
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.util.sendTo
-import com.hippo.unifile.asUniFile
 import kotlinx.coroutines.flow.Flow
+import okio.Path
+import okio.Path.Companion.toOkioPath
 import splitties.arch.room.roomDb

 object EhDB {
-    private val db = roomDb<EhDatabase>("eh.db")
+    private const val DB_NAME = "eh.db"
+    private val db = roomDb<EhDatabase>(DB_NAME) {
+        addMigrations(Schema17to18())
+    }

-    private suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
        db.galleryDao().upsert(galleryInfo)
    }

@@ -108,8 +114,11 @@ object EhDB {
        dao.insertOrIgnore(downloadDirnameList)
    }

-    val downloadsCount
-        get() = db.downloadsDao().count()
+    val downloadsCountByLabel
+        get() = db.downloadsDao().countByLabel()
+
+    val downloadsCountByArtist
+        get() = db.downloadsDao().countByArtist()

    suspend fun getAllDownloadLabelList() = db.downloadLabelDao().list()

@@ -137,6 +146,14 @@ object EhDB {
        dao.fill(raw.position)
    }

+    suspend fun putDownloadArtist(gid: Long, artists: List<DownloadArtist>) {
+        if (artists.isNotEmpty()) {
+            val dao = db.downloadArtistDao()
+            dao.deleteByGid(gid)
+            dao.insertOrIgnore(artists)
+        }
+    }
+
    suspend fun removeLocalFavorites(galleryInfo: BaseGalleryInfo) {
        db.localFavoritesDao().deleteByKey(galleryInfo.gid)
        deleteGalleryInfo(galleryInfo)
@@ -256,83 +273,58 @@ object EhDB {
        db.filterDao().update(filter)
    }

-    suspend fun exportDB(context: Context, uri: Uri) {
-        val ehExportName = "eh.export.db"
-        resource {
-            context.deleteDatabase(ehExportName)
-            roomDb<EhDatabase>(ehExportName)
-        } release {
-            it.close()
-            context.deleteDatabase(ehExportName)
-        } use { newDb ->
-            db.galleryDao().list().let { newDb.galleryDao().insertOrIgnore(it) }
-            db.progressDao().list().let { newDb.progressDao().insertOrIgnore(it) }
-            db.downloadLabelDao().list().let { newDb.downloadLabelDao().insert(it) }
-            db.downloadDirnameDao().list().let { newDb.downloadDirnameDao().insertOrIgnore(it) }
-            db.downloadsDao().list().let { newDb.downloadsDao().insert(it) }
-            db.historyDao().list().let { newDb.historyDao().insertOrIgnore(it) }
-            db.quickSearchDao().list().let { newDb.quickSearchDao().insert(it) }
-            db.localFavoritesDao().list().let { newDb.localFavoritesDao().insertOrIgnore(it) }
-            db.filterDao().list().let { newDb.filterDao().insert(it) }
-            newDb.close()
-            val dbFile = context.getDatabasePath(ehExportName)
-            dbFile.asUniFile() sendTo uri.asUniFile()
-        }
+    fun exportDB(context: Context, file: Path) {
+        db.query("PRAGMA wal_checkpoint(FULL)", null).use { it.moveToNext() }
+        val dbFile = context.getDatabasePath(DB_NAME)
+        dbFile.toOkioPath() sendTo file
    }

-    suspend fun importDB(context: Context, uri: Uri) {
+    suspend fun importDB(context: Context, uri: Uri) = resourceScope {
        val tempDBName = "tmp.db"
-        resource {
+        val oldDB = resource {
            context.deleteDatabase(tempDBName)
-            roomDb<EhDatabase>(tempDBName) { createFromInputStream { context.contentResolver.openInputStream(uri) } }
-        } release {
-            it.close()
+            roomDb<EhDatabase>(tempDBName) {
+                createFromInputStream { context.contentResolver.openInputStream(uri) }
+                addMigrations(Schema17to18())
+            }
+        } release { db ->
+            db.close()
            context.deleteDatabase(tempDBName)
-        } use { oldDB ->
-            runCatching {
-                db.galleryDao().insertOrIgnore(oldDB.galleryDao().list())
-            }
-            runCatching {
-                db.progressDao().insertOrIgnore(oldDB.progressDao().list())
-            }
-            runCatching {
-                val downloadLabelList = oldDB.downloadLabelDao().list()
-                DownloadManager.addDownloadLabel(downloadLabelList)
-            }
-            runCatching {
-                oldDB.downloadDirnameDao().list().let {
-                    importDownloadDirname(it)
-                }
-            }
-            runCatching {
-                val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
-                DownloadManager.addDownload(downloadInfoList)
-            }
-            runCatching {
-                val historyInfoList = oldDB.historyDao().list()
-                importHistoryInfo(historyInfoList)
-            }
-            runCatching {
-                val quickSearchList = oldDB.quickSearchDao().list()
-                val currentQuickSearchList = db.quickSearchDao().list()
-                val offset = currentQuickSearchList.size
-                val importList = quickSearchList.filter { newQS ->
-                    currentQuickSearchList.none { it.name == newQS.name }
-                }.onEachIndexed { index, q -> q.position = index + offset }
-                importQuickSearch(importList)
-            }
-            runCatching {
-                oldDB.localFavoritesDao().list().let {
-                    importLocalFavorites(it)
-                }
-            }
-            runCatching {
-                val filterList = oldDB.filterDao().list()
-                val currentFilterList = db.filterDao().list()
-                filterList.forEach {
-                    if (it !in currentFilterList) addFilter(it)
-                }
-            }
+        }
+
+        db.galleryDao().insertOrIgnore(oldDB.galleryDao().list())
+        db.progressDao().insertOrIgnore(oldDB.progressDao().list())
+
+        val downloadLabelList = oldDB.downloadLabelDao().list()
+        DownloadManager.addDownloadLabel(downloadLabelList)
+
+        oldDB.downloadDirnameDao().list().let {
+            importDownloadDirname(it)
+        }
+
+        val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
+        DownloadManager.addDownload(downloadInfoList)
+
+        val historyInfoList = oldDB.historyDao().list()
+        importHistoryInfo(historyInfoList)
+
+        val quickSearchList = oldDB.quickSearchDao().list()
+        val currentQuickSearchList = db.quickSearchDao().list()
+        val offset = currentQuickSearchList.size
+        val importList = quickSearchList.filter { newQS ->
+            currentQuickSearchList.none { it.name == newQS.name }
+        }.onEachIndexed { index, q ->
+            q.id = null
+            q.position = index + offset
+        }
+        importQuickSearch(importList)
+
+        oldDB.localFavoritesDao().list().let {
+            importLocalFavorites(it)
+        }
+
+        oldDB.filterDao().list().forEach {
+            addFilter(it)
        }
    }
 }
@@ -9,10 +9,14 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
-import com.hippo.ehviewer.client.CHROME_USER_AGENT
-import com.hippo.ehviewer.client.EhUtils
+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
@@ -24,47 +28,12 @@ import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.flatMapMerge
 import kotlinx.coroutines.flow.map
-import splitties.preferences.BoolPref
-import splitties.preferences.DataStorePreferences
-import splitties.preferences.FloatPref
-import splitties.preferences.IntPref
-import splitties.preferences.LongPref
-import splitties.preferences.PrefDelegate
-import splitties.preferences.StringOrNullPref
-import splitties.preferences.StringPref
-import splitties.preferences.StringSetOrNullPref
-import splitties.preferences.StringSetPref
-import splitties.preferences.edit
-
-@Suppress("IMPLICIT_CAST_TO_ANY", "UNCHECKED_CAST")
-fun <T> PrefDelegate<T>.getValue(): T = when (this) {
-    is BoolPref -> value
-    is IntPref -> value
-    is FloatPref -> value
-    is LongPref -> value
-    is StringPref -> value
-    is StringOrNullPref -> value
-    is StringSetPref -> value
-    is StringSetOrNullPref -> value
-} as T
-
-@Suppress("UNCHECKED_CAST")
-fun <T> PrefDelegate<T>.setValue(newValue: T) = when (this) {
-    is BoolPref -> value = newValue as Boolean
-    is IntPref -> value = newValue as Int
-    is FloatPref -> value = newValue as Float
-    is LongPref -> value = newValue as Long
-    is StringPref -> value = newValue as String
-    is StringOrNullPref -> value = newValue as? String
-    is StringSetPref -> value = newValue as Set<String?>
-    is StringSetOrNullPref -> value = newValue as? Set<String?>
-}

@Stable
@Composable
 inline fun <R, T> PrefDelegate<T>.collectAsState(crossinline transform: @DisallowComposableCalls (T) -> R): State<R> {
    val flow = remember { valueFlow().map { transform(it) } }
-    val init = getValue()
+    val init = value
    return flow.collectAsState(transform(init))
 }

@@ -72,112 +41,117 @@ inline fun <R, T> PrefDelegate<T>.collectAsState(crossinline transform: @Disallo
@Composable
 fun <T> PrefDelegate<T>.collectAsState(): State<T> {
    val flow = remember { valueFlow() }
-    val init = getValue()
+    val init = value
    return flow.collectAsState(init)
 }

@Stable
@Composable
 fun <T> PrefDelegate<T>.asMutableState(): MutableState<T> {
-    val flow = remember { valueFlow() }
-    val init = getValue()
-    val readOnly = flow.collectAsState(init)
+    val readOnly = collectAsState()
    return remember {
        object : MutableState<T> {
            override var value: T
                get() = readOnly.value
                set(value) {
-                    setValue(value)
+                    this@asMutableState.value = value
                }
-            override fun component1() = TODO()
-            override fun component2() = TODO()
+            override fun component1() = readOnly.value
+            override fun component2() = this@asMutableState::value::set
        }
    }
 }

 object Settings : DataStorePreferences(null) {
-    private const val KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations"
-
+    @Suppress("ktlint:standard:backing-property-naming")
    private val _favFlow = MutableSharedFlow<Unit>()
    val favChangesFlow = _favFlow.debounce(1000)
    var favCat by stringArrayPref("fav_cat", 10, "Favorites").emitTo(_favFlow)
    var favCount by intArrayPref("fav_count", 10).emitTo(_favFlow)
    var favCloudCount by intPref("fav_cloud", 0).emitTo(_favFlow)

+    // Eh
+    val gallerySite = intPref("gallery_site_2", 0).observed(::updateWhenGallerySiteChanges)
+    val defaultFavSlot = intPref("default_favorite_slot", -2)
+    val theme = intPref("theme_2", -1).observed(::updateWhenThemeChanges)
+    val blackDarkTheme = boolPref("black_dark_theme", false)
+    val harmonizeCategoryColor = boolPref("harmonize_category_color", true)
+    val launchPage = intPref("launch_page_2", 0)
    val listMode = intPref("list_mode_2", 0)
+    val listThumbSize = intPref("list_tile_size", 40)
    val detailSize = intPref("detail_size_2", 0)
    val thumbColumns = intPref("thumb_columns", 3)
-    val listThumbSize = intPref("list_tile_size", 40)
+    val showGalleryPages = boolPref("show_gallery_pages", true)
+    val showVoteStatus = boolPref("show_vote_status", false)
+    val showComments = boolPref("show_gallery_comments", true)
+    val commentThreshold = intPref("comment_threshold", -100)
+    val showTagTranslations = boolPref("show_tag_translations", false).observed(::updateWhenTagTranslationChanges)
+    val meteredNetworkWarning = boolPref("cellular_network_warning", false)
+    val showJpnTitle = boolPref("show_jpn_title", false)
+    val requestNews = boolPref("request_news", false).observed { updateWhenRequestNewsChanges() }
+    val hideHvEvents = boolPref("hide_hv_events", false)
+
+    // Download
+    val mediaScan = boolPref("media_scan", false).observed(::updateWhenKeepMediaStatusChanges)
+    val multiThreadDownload = intPref("download_thread_2", 3)
+    val downloadDelay = intPref("download_delay_3", 1000)
+    val timeoutSpeed = intPref("timeout_speed_level", 6)
+    val preloadImage = intPref("preload_image_2", 5)
+    val downloadOriginImage = boolPref("download_origin_image", false)
+    val saveAsCbz = boolPref("save_as_cbz", false)
+    val archiveMetadata = boolPref("archive_metadata", true)
+
+    // Privacy
+    val security = boolPref("require_unlock", false)
+    val securityDelay = intPref("require_unlock_delay", 0)
+    val enabledSecurity = boolPref("enable_secure", false)
+
+    // Advanced
+    val saveParseErrorBody = boolPref("save_parse_error_body", true)
+    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 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 useCIUpdateChannel = boolPref("ci_update_channel", AppConfig.isSnapshot)
+    val updateIntervalDays = intPref("update_interval_days", 7)
+
+    // Misc
    val languageFilter = intPref("language_filter", -1)
    val downloadSortMode = intPref("download_sort_mode", SortMode.Default.flag)
-    val meteredNetworkWarning = boolPref("cellular_network_warning", false)
-    val blackDarkTheme = boolPref("black_dark_theme", false)
+    val downloadFilterMode = intPref("download_filter_mode", DownloadsFilterMode.Default.flag)
+    val hasSignedIn = boolPref("has_signed_in", EhCookieStore.hasSignedIn())
+    val needSignIn = boolPref("need_sign_in", true)
    val gridView = boolPref("grid_view", false)
-    val showGalleryPages = boolPref("show_gallery_pages", true)
    val qSSaveProgress = boolPref("qs_save_progress", true)
-    val recentDownloadLabel = stringOrNullPref("recent_download_label", null)
+    val displayName = stringOrNullPref("display_name")
+    val avatar = stringOrNullPref("avatar")
+    val recentDownloadLabel = stringOrNullPref("recent_download_label")

-    var downloadScheme by stringOrNullPref("image_scheme", null)
-    var downloadAuthority by stringOrNullPref("image_authority", null)
-    var downloadPath by stringOrNullPref("image_path", null)
-    var downloadQuery by stringOrNullPref("image_query", null)
-    var downloadFragment by stringOrNullPref("image_fragment", null)
-    var archivePasswds by stringSetOrNullPref("archive_passwds")
-    var downloadDelay by intPref("download_delay_3", 1000)
-    var gallerySite by intPref("gallery_site_2", 0).observed { updateWhenGallerySiteChanges() }
-    var multiThreadDownload by intPref("download_thread_2", 3)
-    var preloadImage by intPref("preload_image_2", 5)
-    var downloadTimeout by intPref("download_timeout", 60)
-    var theme by intPref("theme_2", -1).observed { updateWhenThemeChanges() }
-    var thumbResolution by intPref("thumb_resolution_2", 0)
-    var readCacheSize by intPref("read_cache_size_2", 640)
-    var launchPage by intPref("launch_page_2", 0)
-    var commentThreshold by intPref("comment_threshold", -101)
-    var forceEhThumb by boolPref("force_eh_thumb", false)
-    var showComments by boolPref("show_gallery_comments", true)
-    var requestNews by boolPref("request_news", false).observed { updateWhenRequestNewsChanges() }
-    var hideHvEvents by boolPref("hide_hv_events", false)
-    var showJpnTitle by boolPref("show_jpn_title", false)
-    var showTagTranslations by boolPref(KEY_SHOW_TAG_TRANSLATIONS, false).observed { updateWhenTagTranslationChanges() }
+    var downloadScheme by stringOrNullPref("image_scheme")
+    var downloadAuthority by stringOrNullPref("image_authority")
+    var downloadPath by stringOrNullPref("image_path")
+    var downloadQuery by stringOrNullPref("image_query")
+    var downloadFragment by stringOrNullPref("image_fragment")
+    var archivePasswds by stringSetPref("archive_passwds")
    var appLinkVerifyTip by boolPref("app_link_verify_tip", false)
-    var enabledSecurity by boolPref("enable_secure", false)
-    var useCIUpdateChannel by boolPref("ci_update_channel", false)
-    var mediaScan by boolPref("media_scan", false).observed { updateWhenKeepMediaStatusChanges() }
    var hasDefaultDownloadLabel by boolPref("has_default_download_label", false)
-    var saveParseErrorBody by boolPref("save_parse_error_body", true)
-    var saveCrashLog by boolPref("save_crash_log", true)
-    var security by boolPref("require_unlock", false)
    var removeImageFiles by boolPref("include_pic", true)
-    var needSignIn by boolPref("need_sign_in", true)
-    var harmonizeCategoryColor by boolPref("harmonize_category_color", true)
-    var preloadThumbAggressively by boolPref("preload_thumb_aggressively", false)
-    var downloadOriginImage by boolPref("download_origin_image", false)
-    var saveAsCbz by boolPref("save_as_cbz", false)
-    var archiveMetadata by boolPref("archive_metadata", true)
-    var enableCronet by boolPref("enable_cronet", true)
    var recentFavCat by intPref("recent_fav_cat", FavListUrlBuilder.FAV_CAT_LOCAL)
-    var defaultFavSlot by intPref("default_favorite_slot", -2)
-    var securityDelay by intPref("require_unlock_delay", 0)
    var clipboardTextHashCode by intPref("clipboard_text_hash_code", 0)
-    var searchCategory by intPref("search_pref", EhUtils.ALL_CATEGORY)
    var requestNewsTime by intPref("request_news_time", 0).observed { updateWhenRequestNewsChanges() }
-    var updateIntervalDays by intPref("update_interval_days", 7)
    var lastDawnDays by intPref("last_dawn_days", 0)
    var recentToplist by stringPref("recent_toplist", "11")
-    var userAgent by stringPref("user_agent", CHROME_USER_AGENT)
-    var defaultDownloadLabel by stringOrNullPref("default_download_label", null)
-    var displayName by stringOrNullPref("display_name", null)
-    var avatar by stringOrNullPref("avatar", null)
-    var language by stringPref("app_language", "system").observed { updateWhenLocaleChanges() }
-    var lastUpdateTime by longPref("last_update_time", 0)
-    var favDialogTheta by floatPref("fav_select_dialog_delta", 0F)
-
-    // TODO: Remove this after swipe gestures are correctly handled in compose
-    var touchSlopFactor by intPref("touch_slop", 3)
-
-    // Tachiyomi Reader
-    var newReader by boolPref("new_compose_reader", false)
+    var defaultDownloadLabel by stringOrNullPref("default_download_label")
+    var lastUpdateTime by longPref("last_update_time", BuildConfig.COMMIT_TIME)

+    // Reader
    val cropBorder = boolPref("crop_borders", false)
    val colorFilter = boolPref("pref_color_filter_key", false)
    val colorFilterValue = intPref("color_filter_value", 0)
@@ -195,55 +169,56 @@ 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 readWithVolumeKeys = boolPref("reader_volume_keys", false)
-    val readWithVolumeKeysInterval = intPref("reader_volume_keys_interval", 0)
-    val readWithVolumeKeysInverted = boolPref("reader_volume_keys_inverted", false)
+    val readerReverseControls = 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)
    val readerPagerNav = intPref("reader_navigation_mode_pager", 0)
-    val readerWebtoonNavInverted = intPref("reader_tapping_inverted_webtoon", 0)
+    val readerPagerNavInverted = intPref("reader_tapping_inverted_2", 0)
+    val readerWebtoonNavInverted = intPref("reader_tapping_inverted_webtoon_2", 0)
    val webtoonSidePadding = intPref("webtoon_side_padding", 0)
    val navigateToPan = boolPref("navigate_pan", true)
    val imageScaleType = intPref("pref_image_scale_type_key", 1)
    val landscapeZoom = boolPref("landscape_zoom", false)
    val zoomStart = intPref("pref_zoom_start_key", 1)
+    val showNavigationOverlayNewUser = boolPref("reader_navigation_overlay_new_user", true)
+    val showNavigationOverlayOnStart = boolPref("reader_navigation_overlay_on_start", false)
+    val stripExtraneousAds = boolPref("strip_extraneous_ads", false)

    init {
-        if ("CN" == Locale.getDefault().country) {
-            edit {
-                if (KEY_SHOW_TAG_TRANSLATIONS !in prefs) showTagTranslations = true
+        edit { pref ->
+            if ("CN" == Locale.getDefault().country) {
+                if (showTagTranslations !in pref) pref[showTagTranslations] = true
+            }
+            if (pref[downloadFilterMode] == DownloadsFilterMode.ARTIST.flag && pref[recentDownloadLabel] == null) {
+                pref[recentDownloadLabel] = ""
            }
        }
    }

    interface Delegate<R> {
-        val flowGetter: () -> Flow<Unit>
+        fun changesFlow(): Flow<Unit>
        operator fun getValue(thisRef: Any?, prop: KProperty<*>?): R
        operator fun setValue(thisRef: Any?, prop: KProperty<*>?, value: R)
    }

    private fun intArrayPref(key: String, count: Int) = object : Delegate<IntArray> {
-        override val flowGetter: () -> Flow<Unit> = { _value.asFlow().flatMapMerge { it.changesFlow() }.conflate() }
-
-        @Suppress("ktlint:standard:property-naming")
-        private var _value = (0 until count).map { intPref("${key}_$it", 0) }.toTypedArray()
-        override fun getValue(thisRef: Any?, prop: KProperty<*>?): IntArray = _value.map { it.value }.toIntArray()
+        private val delegates = Array(count) { intPref("${key}_$it", 0) }
+        override fun changesFlow(): Flow<Unit> = delegates.asFlow().flatMapMerge { it.changesFlow() }.conflate()
+        override fun getValue(thisRef: Any?, prop: KProperty<*>?) = IntArray(delegates.size) { delegates[it].value }
        override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: IntArray) {
            check(value.size == count)
-            edit { value.zip(_value) { v, d -> d.value = v } }
+            edit { pref -> value.zip(delegates) { v, d -> pref[d] = v } }
        }
    }

    private fun stringArrayPref(key: String, count: Int, defMetaValue: String) = object : Delegate<Array<String>> {
-        override val flowGetter: () -> Flow<Unit> = { _value.asFlow().flatMapMerge { it.changesFlow() }.conflate() }
-
-        @Suppress("ktlint:standard:property-naming")
-        private var _value = (0 until count).map { stringPref("${key}_$it", "$defMetaValue $it") }.toTypedArray()
-        override fun getValue(thisRef: Any?, prop: KProperty<*>?): Array<String> = _value.map { it.value }.toTypedArray()
+        private val delegates = Array(count) { stringPref("${key}_$it", "$defMetaValue $it") }
+        override fun changesFlow(): Flow<Unit> = delegates.asFlow().flatMapMerge { it.changesFlow() }.conflate()
+        override fun getValue(thisRef: Any?, prop: KProperty<*>?) = Array(delegates.size) { delegates[it].value }
        override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: Array<String>) {
            check(value.size == count)
-            edit { value.zip(_value) { v, d -> d.value = v } }
+            edit { pref -> value.zip(delegates) { v, d -> pref[d] = v } }
        }
    }
 }
@@ -2,85 +2,73 @@ package com.hippo.ehviewer

 import android.app.UiModeManager
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
-import com.hippo.ehviewer.client.EhCookieStore
+import arrow.core.Either.Companion.catch
+import com.ehviewer.core.preferences.PrefDelegate
 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.launchIO
+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
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.launch
 import splitties.init.appCtx
-import splitties.preferences.PrefDelegate
 import splitties.systemservices.uiModeManager

+private const val TAG = "SettingsCollector"
+
 private val collectScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
-fun <T, R : PrefDelegate<T>> R.observed(func: (Unit) -> Unit) = apply { collectScope.launch { changesFlow().collect(func) } }
-fun <T, R : Settings.Delegate<T>> R.observed(func: (Unit) -> Unit) = apply { collectScope.launch { flowGetter().collect(func) } }
-fun <T, R : Settings.Delegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { flowGetter().collect { flow.emit(Unit) } } }
-fun <T, R : PrefDelegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { changesFlow().collect { flow.emit(Unit) } } }
+fun <T, R : PrefDelegate<T>> R.observed(func: suspend (T) -> Unit) = apply { collectScope.launch { valueFlow().drop(1).collectLatest(func) } }
+fun <T, R : Settings.Delegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { flow.emitAll(changesFlow()) } }
+fun <T, R : PrefDelegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { flow.emitAll(changesFlow()) } }

-fun updateWhenLocaleChanges() {
-    val newValue = Settings.language
-    if ("system" == newValue) {
-        AppCompatDelegate.setApplicationLocales(LocaleListCompat.getEmptyLocaleList())
-    } else {
-        AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(newValue))
-    }
-}
-
-fun updateWhenKeepMediaStatusChanges() {
-    collectScope.launchIO {
-        runCatching {
-            keepNoMediaFileStatus()
+suspend fun updateWhenKeepMediaStatusChanges(mediaScan: Boolean) {
+    withIOContext {
+        catch {
+            keepNoMediaFileStatus(mediaScan = mediaScan)
+        }.onLeft {
+            logcat(TAG, it)
        }
    }
 }

-fun updateWhenThemeChanges() {
-    collectScope.launch {
-        delay(100) // Avoid recompose being cancelled
-        if (isAtLeastS) {
-            val mode = when (Settings.theme) {
-                AppCompatDelegate.MODE_NIGHT_NO -> UiModeManager.MODE_NIGHT_NO
-                AppCompatDelegate.MODE_NIGHT_YES -> UiModeManager.MODE_NIGHT_YES
-                else -> UiModeManager.MODE_NIGHT_AUTO
-            }
-            uiModeManager.setApplicationNightMode(mode)
+suspend fun updateWhenThemeChanges(theme: Int) {
+    delay(100) // Avoid recompose being cancelled
+    if (isAtLeastS) {
+        val mode = when (theme) {
+            AppCompatDelegate.MODE_NIGHT_NO -> UiModeManager.MODE_NIGHT_NO
+            AppCompatDelegate.MODE_NIGHT_YES -> UiModeManager.MODE_NIGHT_YES
+            else -> UiModeManager.MODE_NIGHT_AUTO
        }
-        AppCompatDelegate.setDefaultNightMode(Settings.theme)
+        uiModeManager.setApplicationNightMode(mode)
    }
+    AppCompatDelegate.setDefaultNightMode(theme)
 }

 fun updateWhenRequestNewsChanges() {
    updateDailyCheckWork(appCtx)
 }

-fun updateWhenGallerySiteChanges() {
-    if (!Settings.needSignIn && EhCookieStore.hasSignedIn()) {
-        collectScope.launchIO {
-            runCatching {
-                EhEngine.getUConfig()
-            }.onFailure {
-                logcat(it)
-            }
+suspend fun updateWhenGallerySiteChanges(gallerySite: Int) {
+    if (Settings.hasSignedIn.value) {
+        catch {
+            EhEngine.getUConfig(gallerySite)
+        }.onLeft {
+            logcat(TAG, it)
        }
    }
 }

-fun updateWhenTagTranslationChanges() {
-    collectScope.launchIO {
-        runCatching {
-            EhTagDatabase.update()
-        }.onFailure {
-            logcat(it)
-        }
+fun updateWhenTagTranslationChanges(enabled: Boolean) {
+    if (enabled) {
+        EhTagDatabase.launchUpdate()
    }
 }
@@ -15,36 +15,38 @@
 */
 package com.hippo.ehviewer.client

-import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryPreview
-import com.hippo.ehviewer.client.data.NormalGalleryPreview

-// ExHentai Large Preview: https://s.exhentai.org/t/***
-// ExHentai Normal Preview: https://s.exhentai.org/m/***
-// EHentai Normal Preview: https://ehgt.org/m/***
-// EHentai Large Preview: https://ehgt.org/***
+// 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/***
+// E-Hentai Large Preview (v1 Cover): https://ehgt.org/***
+// ExHentai v2 Cover: https://s.exhentai.org/**.webp
+// E-Hentai v2 Cover: https://ehgt.org/**.webp

-private const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
-private const val URL_PREFIX_THUMB_EX = "https://s.exhentai.org/"
-private const val URL_PREFIX_LARGE_THUMB_EX = URL_PREFIX_THUMB_EX + "t/"
+const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
+const val URL_PREFIX_THUMB_EX = "https://s.exhentai.org/"
+private const val URL_PREFIX_V1_THUMB_EX = URL_PREFIX_THUMB_EX + "t/"
+private val V2PreviewKeyRegex = Regex("/c([m12]/)[^/]+/(\\d+-\\d+)")

-fun getImageKey(gid: Long, index: Int): String {
-    return "image:$gid:$index"
-}
+fun getImageKey(gid: Long, index: Int): String = "image:$gid:$index"

-fun getThumbKey(url: String): String {
-    return url.removePrefix(URL_PREFIX_THUMB_E).removePrefix(URL_PREFIX_LARGE_THUMB_EX).removePrefix(URL_PREFIX_THUMB_EX)
-}
+fun getThumbKey(url: String): String = url.removePrefix(URL_PREFIX_THUMB_E).removePrefix(URL_PREFIX_V1_THUMB_EX).removePrefix(URL_PREFIX_THUMB_EX)

-val GalleryPreview.url
-    get() = if (exThumb) {
-        if (this is NormalGalleryPreview) URL_PREFIX_THUMB_EX else URL_PREFIX_LARGE_THUMB_EX
-    } else {
-        URL_PREFIX_THUMB_E
-    } + imageKey
+fun getV2PreviewKey(url: String) = "$".plus(
+    V2PreviewKeyRegex.find(url)?.let {
+        it.groupValues[1] + it.groupValues[2]
+    } ?: url,
+)

 val GalleryInfo.thumbUrl
-    get() = (if (exThumb) URL_PREFIX_LARGE_THUMB_EX else URL_PREFIX_THUMB_E) + thumbKey!!
+    get() = keyToUrl(thumbKey!!)

-val exThumb get() = EhUtils.isExHentai && !Settings.forceEhThumb
+fun keyToUrl(key: String) = if (key.startsWith("https:")) {
+    key
+} else {
+    if (key.endsWith("webp")) {
+        if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX else URL_PREFIX_THUMB_E
+    } else {
+        if (EhUtils.isExHentai) URL_PREFIX_V1_THUMB_EX else URL_PREFIX_THUMB_E
+    } + key
+}
@@ -1,28 +1,24 @@
 package com.hippo.ehviewer.client

 import android.webkit.CookieManager
-import androidx.compose.ui.util.fastAny
-import androidx.compose.ui.util.fastJoinToString
 import io.ktor.client.plugins.cookies.CookiesStorage
 import io.ktor.http.Cookie
 import io.ktor.http.Url
 import io.ktor.http.parseClientCookiesHeader
-import io.ktor.http.renderCookieHeader
 import io.ktor.http.renderSetCookieHeader

 object EhCookieStore : CookiesStorage {
    private val manager = CookieManager.getInstance()
-    fun signOut() = manager.removeAllCookies(null)
-    fun contains(url: String, name: String) = load(Url(url)).fastAny { it.name == name }
+    fun removeAllCookies() = manager.removeAllCookies(null)

-    fun hasSignedIn(): Boolean {
-        val url = EhUrl.HOST_E
-        return contains(url, KEY_IPB_MEMBER_ID) && contains(url, KEY_IPB_PASS_HASH)
-    }
+    fun hasSignedIn(): Boolean = getCookies(EhUrl.HOST_E)?.run {
+        containsKey(KEY_IPB_MEMBER_ID) && containsKey(KEY_IPB_PASS_HASH)
+    } == true

    const val KEY_IPB_MEMBER_ID = "ipb_member_id"
    const val KEY_IPB_PASS_HASH = "ipb_pass_hash"
    const val KEY_IGNEOUS = "igneous"
+    private const val KEY_HATH_PERKS = "hath_perks"
    private const val KEY_CONTENT_WARNING = "nw"
    private const val CONTENT_WARNING_NOT_SHOW = "1"
    private const val KEY_UTMP_NAME = "__utmp"
@@ -38,6 +34,10 @@ object EhCookieStore : CookiesStorage {
        )
    }

+    fun getUserId() = getCookies(EhUrl.HOST_E)?.get(KEY_IPB_MEMBER_ID)
+
+    fun getHathPerks() = getCookies(EhUrl.HOST_E)?.get(KEY_HATH_PERKS)?.substringBefore('-')
+
    fun getIdentityCookies(): List<Pair<String, String?>> {
        val eCookies = getCookies(EhUrl.HOST_E)
        val exCookies = getCookies(EhUrl.HOST_EX)
@@ -51,13 +51,9 @@ object EhCookieStore : CookiesStorage {
        )
    }

-    fun flush() = manager.flush()
+    fun isCloudflareBypassed() = getCookies(EhUrl.HOST_E)?.containsKey("cf_clearance") == true

-    fun getCookieHeader(url: String): String {
-        return load(Url(url)).fastJoinToString("; ") {
-            renderCookieHeader(it)
-        }
-    }
+    fun flush() = manager.flush()

    // See https://github.com/Ehviewer-Overhauled/Ehviewer/issues/873
    override suspend fun addCookie(requestUrl: Url, cookie: Cookie) {
@@ -17,28 +17,30 @@ package com.hippo.ehviewer.client

 import arrow.core.Either
 import arrow.core.left
+import arrow.core.partially2
 import arrow.core.right
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.parZip
+import com.ehviewer.core.i18n.R
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.R
 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.exception.CloudflareBypassException
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.InsufficientFundsException
+import com.hippo.ehviewer.client.exception.NoHathClientException
+import com.hippo.ehviewer.client.exception.NoHitsFoundException
 import com.hippo.ehviewer.client.exception.NotLoggedInException
 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.parser.ArchiveParser
 import com.hippo.ehviewer.client.parser.EventPaneParser
 import com.hippo.ehviewer.client.parser.FavParserResult
 import com.hippo.ehviewer.client.parser.FavoritesParser
-import com.hippo.ehviewer.client.parser.ForumsParser
 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.GalleryNotAvailableParser
 import com.hippo.ehviewer.client.parser.GalleryPageParser
 import com.hippo.ehviewer.client.parser.GalleryTokenApiParser
 import com.hippo.ehviewer.client.parser.HomeParser
@@ -47,23 +49,26 @@ import com.hippo.ehviewer.client.parser.RateGalleryResult
 import com.hippo.ehviewer.client.parser.SignInParser
 import com.hippo.ehviewer.client.parser.TorrentParser
 import com.hippo.ehviewer.client.parser.TorrentResult
+import com.hippo.ehviewer.client.parser.UserConfigParser
 import com.hippo.ehviewer.client.parser.VoteCommentResult
 import com.hippo.ehviewer.client.parser.VoteTagParser
 import com.hippo.ehviewer.dailycheck.showEventNotification
 import com.hippo.ehviewer.dailycheck.today
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.util.StatusCodeException
 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.utils.io.pool.DirectByteBufferPool
 import io.ktor.utils.io.pool.useInstance
+import io.ktor.utils.io.readAvailable
 import java.io.File
-import java.io.RandomAccessFile
 import java.nio.ByteBuffer
 import kotlin.math.ceil
+import kotlin.system.measureTimeMillis
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import kotlinx.serialization.SerializationException
@@ -72,7 +77,8 @@ import kotlinx.serialization.json.addJsonArray
 import kotlinx.serialization.json.put
 import moe.tarsin.coroutines.removeAllSuspend
 import moe.tarsin.coroutines.runSuspendCatching
-import org.jsoup.Jsoup
+import okio.buffer
+import okio.sink
 import splitties.init.appCtx

 // https://ehwiki.org/wiki/API#Basics
@@ -80,28 +86,28 @@ private const val MAX_REQUEST_SIZE = 25
 private const val MAX_SEQUENTIAL_REQUESTS = 5
 private const val REQUEST_INTERVAL = 5000L

-private const val U_CONFIG_TEXT = "Selected Profile"
-
 fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
    val dir = AppConfig.externalParseErrorDir ?: return
-    val file = File(dir, ReadableTime.getFilenamableTime(System.currentTimeMillis()) + ".txt")
-    RandomAccessFile(file, "rw").use { randomAccessFile ->
-        with(randomAccessFile) {
-            writeUTF(e.message + "\n")
-            onLeft { writeUTF(it) }
-            onRight { channel.write(it) }
+    val file = File(dir, ReadableTime.getFilenamableTime() + ".txt")
+    file.sink().buffer().use { sink ->
+        with(sink) {
+            writeUtf8(e.message + "\n")
+            onLeft { writeUtf8(it) }
+            onRight { write(it) }
        }
    }
 }

-fun rethrowExactly(code: Int, body: Either<String, ByteBuffer>, e: Throwable): Nothing {
+fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e: Throwable): Nothing {
    // Don't translate coroutine cancellation
    if (e is CancellationException) throw e

+    if (response.headers["cf-mitigated"] == "challenge") throw CloudflareBypassException()
+
    // Check sad panda (without panda)
    val empty = body.fold(
        { it.isEmpty() },
-        { it.limit() == 0 },
+        { !it.hasRemaining() },
    )
    if (empty) {
        if (EhUtils.isExHentai) {
@@ -113,28 +119,28 @@ fun rethrowExactly(code: Int, body: Either<String, ByteBuffer>, e: Throwable): N

    // Check Gallery Not Available
    body.onLeft {
-        if ("Gallery Not Available - " in it) {
-            val error = GalleryNotAvailableParser.parse(it)
-            if (!error.isNullOrBlank()) {
-                throw EhException(error)
-            }
+        if ("Gallery Not Available - " in it) throw e
+    }
+
+    // Check parse error thrown by rust
+    val cause = e.cause
+    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
-    if (code >= 400) {
-        throw StatusCodeException(code)
-    }
+    response.status.ensureSuccess()

    if (e is ParseException || e is SerializationException) {
        body.onLeft { if ("<" !in it) throw EhException(it) }
-        when (val message = e.cause?.message) {
-            "No hits found!" -> throw EhException(R.string.gallery_list_empty_hit)
-            "No watched tags!" -> throw EhException(R.string.gallery_list_empty_hit_subscription)
-            "Not logged in!" -> throw NotLoggedInException()
-            is String -> if (message.startsWith("Your IP address")) throw EhException(message)
-        }
-        if (Settings.saveParseErrorBody) body.saveParseError(e)
+        if (Settings.saveParseErrorBody.value) body.saveParseError(e)
        throw EhException(appCtx.getString(R.string.error_parse_error), e)
    }

@@ -144,64 +150,77 @@ fun rethrowExactly(code: Int, body: Either<String, ByteBuffer>, e: Throwable): N

 val httpContentPool = DirectByteBufferPool(8, 0x80000)

-suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend String.() -> T) = execute { response ->
+suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend String.() -> T) = executeSafely { response ->
    val body = response.bodyAsUtf8Text()
    runSuspendCatching {
        block(body)
    }.onFailure {
-        rethrowExactly(response.status.value, body.left(), it)
+        rethrowExactly(response, body.left(), it)
    }.getOrThrow()
 }

-suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: suspend ByteBuffer.() -> T) = execute { response ->
+suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: suspend ByteBuffer.() -> T) = executeSafely { response ->
    httpContentPool.useInstance { buffer ->
        with(response.bodyAsChannel()) { while (!isClosedForRead) readAvailable(buffer) }
        buffer.flip()
        runSuspendCatching {
            block(buffer)
        }.onFailure {
-            rethrowExactly(response.status.value, buffer.right(), it)
+            buffer.rewind()
+            rethrowExactly(response, buffer.right(), it)
        }.getOrThrow()
    }
 }

 object EhEngine {
-    suspend fun getOriginalImageUrl(url: String, referer: String?) = noRedirectEhRequest(url, referer).execute { response ->
+    suspend fun getOriginalImageUrl(url: String, referer: String?) = noRedirectEhRequest(url, referer).executeSafely { response ->
        val location = response.headers["Location"] ?: throw InsufficientFundsException()
        location.takeIf { "bounce_login" !in it } ?: throw NotLoggedInException()
    }

-    suspend fun getTorrentList(url: String, gid: Long, token: String): TorrentResult {
+    suspend fun getTorrentList(gid: Long, token: String): TorrentResult {
+        val url = EhUrl.getTorrentUrl(gid, token)
        val referer = EhUrl.getGalleryDetailUrl(gid, token)
        return ehRequest(url, referer).fetchUsingAsByteBuffer(TorrentParser::parse)
    }

-    suspend fun getArchiveList(url: String, gid: Long, token: String) = ehRequest(url, EhUrl.getGalleryDetailUrl(gid, token))
-        .fetchUsingAsText(ArchiveParser::parse)
-        .apply { funds = funds ?: ehRequest(EhUrl.URL_FUNDS).fetchUsingAsText(HomeParser::parseFunds) }
+    suspend fun getTorrentKey() = EhCookieStore.getUserId()?.let { id ->
+        val key = ehRequest(EhUrl.URL_HOME).fetchUsingAsText(HomeParser::parseTorrentKey)
+        "${id}x$key"
+    }
+
+    suspend fun getArchiveList(gid: Long, token: String): ArchiveParser.Result {
+        val url = EhUrl.getArchiveUrl(gid, token)
+        val funds = if (EhUtils.isExHentai) getFunds() else null
+        return ehRequest(url, EhUrl.getGalleryDetailUrl(gid, token))
+            .fetchUsingAsByteBuffer(ArchiveParser::parse.partially2(funds))
+    }

    suspend fun getImageLimits() = parZip(
        { ehRequest(EhUrl.URL_HOME).fetchUsingAsByteBuffer(HomeParser::parse) },
-        { ehRequest(EhUrl.URL_FUNDS).fetchUsingAsText(HomeParser::parseFunds) },
+        { getFunds() },
        { limits, funds -> HomeParser.Result(limits, funds) },
    )

+    private suspend fun getFunds() = ehRequest(EhUrl.URL_FUNDS).fetchUsingAsText(HomeParser::parseFunds)
+
    suspend fun getNews(parse: Boolean) = ehRequest(EhUrl.URL_NEWS, EhUrl.REFERER_E)
-        .fetchUsingAsText { if (parse) EventPaneParser.parse(this) else null }
+        .fetchUsingAsByteBuffer { if (parse) EventPaneParser.parse(this) else null }

    suspend fun getProfile(): ProfileParser.Result {
-        val url = ehRequest(EhUrl.URL_FORUMS).fetchUsingAsText(ForumsParser::parse)
-        return ehRequest(url, EhUrl.URL_FORUMS).fetchUsingAsText(ProfileParser::parse)
+        val url = ehRequest(EhUrl.URL_FORUMS).fetchUsingAsByteBuffer(ProfileParser::parseProfileUrl)
+        return ehRequest(url, EhUrl.URL_FORUMS).fetchUsingAsByteBuffer(ProfileParser::parse)
    }

-    suspend fun getUConfig(url: String = EhUrl.uConfigUrl) {
+    suspend fun getUConfig(gallerySite: Int) {
+        val url = EhUrl.getUConfigUrl(gallerySite)
        runSuspendCatching {
-            ehRequest(url).fetchUsingAsText { check(U_CONFIG_TEXT in this) { "Unable to load config from $url!" } }
+            ehRequest(url).fetchUsingAsByteBuffer(UserConfigParser::parse)
        }.onFailure { throwable ->
            // It may get redirected when accessing ex for the first time
            if (url == EhUrl.URL_UCONFIG_EX) {
                logcat(throwable)
-                ehRequest(url).fetchUsingAsText { check(U_CONFIG_TEXT in this) { "Unable to load config from $url!" } }
+                ehRequest(url).fetchUsingAsByteBuffer(UserConfigParser::parse)
            } else {
                throw throwable
            }
@@ -217,18 +236,19 @@ object EhEngine {
        .apply { galleryInfoList.fillInfo(url, true) }
        .takeUnless { it.galleryInfoList.isEmpty() } ?: GalleryListParser.emptyResult

-    suspend fun getGalleryDetail(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsText {
-        val eventPane = EventPaneParser.parse(this)
-        if (eventPane != null) {
+    suspend fun getGalleryDetail(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsByteBuffer(GalleryDetailParser::parse).run {
+        event?.let {
            Settings.lastDawnDays = today
-            showEventNotification(eventPane)
+            showEventNotification(it)
+        }
+        detail.apply {
+            // Fill info for database
+            fillInfo()
+            filterComments()
        }
-        GalleryDetailParser.parse(this)
    }

-    suspend fun getPreviewList(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsText {
-        GalleryDetailParser.parsePreviewList(this)
-    }
+    suspend fun getPreviewList(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsByteBuffer(GalleryDetailParser::parsePreviews)

    suspend fun getFavorites(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsByteBuffer(FavoritesParser::parse)
        .apply { galleryInfoList.fillInfo(url) }
@@ -258,18 +278,11 @@ object EhEngine {
                append("edit_comment", id.toString())
            }
        }
-    }.execute { response ->
+    }.executeSafely { response ->
        // Ktor does not handle POST redirect, we need to do it manually
        // https://youtrack.jetbrains.com/issue/KTOR-478
        val location = response.headers["Location"] ?: url
-        ehRequest(location, url).fetchUsingAsText {
-            val document = Jsoup.parse(this)
-            val elements = document.select("#chd + p")
-            if (elements.size > 0) {
-                throw EhException(elements[0].text())
-            }
-            GalleryDetailParser.parseComments(document)
-        }
+        ehRequest(location, url).fetchUsingAsByteBuffer(GalleryDetailParser::parseComments)
    }

    suspend fun modifyFavorites(gid: Long, token: String, dstCat: Int = -1, note: String = "") {
@@ -287,15 +300,18 @@ object EhEngine {
                append("apply", "Apply Changes")
                append("update", "1")
            }
-        }.execute { }
+        }.executeSafely { }
    }

-    suspend fun downloadArchive(gid: Long, token: String, or: String, res: String, isHAtH: Boolean): String? {
-        val url = EhUrl.getDownloadArchive(gid, token, or)
+    suspend fun getFavoriteNote(gid: Long, token: String) = ehRequest(EhUrl.getAddFavorites(gid, token), EhUrl.getGalleryDetailUrl(gid, token))
+        .fetchUsingAsText(FavoritesParser::parseNote)
+
+    suspend fun downloadArchive(gid: Long, token: String, res: String, isHath: Boolean): String? {
+        val url = EhUrl.getArchiveUrl(gid, token)
        val referer = EhUrl.getGalleryDetailUrl(gid, token)
        val request = ehRequest(url, referer, EhUrl.origin) {
            formBody {
-                if (isHAtH) {
+                if (isHath) {
                    append("hathdl_xres", res)
                } else {
                    append("dltype", res)
@@ -307,12 +323,12 @@ object EhEngine {
                }
            }
        }
-        var result = request.fetchUsingAsText(ArchiveParser::parseArchiveUrl)
-        if (!isHAtH) {
+        var result = request.fetchUsingAsByteBuffer(ArchiveParser::parseArchiveUrl)
+        if (!isHath) {
            if (result == null) {
                // Wait for the server to prepare archives
                delay(1000)
-                result = request.fetchUsingAsText(ArchiveParser::parseArchiveUrl)
+                result = request.fetchUsingAsByteBuffer(ArchiveParser::parseArchiveUrl)
                if (result == null) throw EhException("Archive unavailable")
            }
            return result
@@ -322,7 +338,7 @@ object EhEngine {

    suspend fun resetImageLimits() = ehRequest(EhUrl.URL_HOME) {
        formBody {
-            append("reset_imagelimit", "Reset Limit")
+            append("reset_imagelimit", "Reset Quota")
        }
    }.fetchUsingAsText(HomeParser::parseResetLimits)

@@ -367,54 +383,51 @@ object EhEngine {
        }
    }.fetchUsingAsText(String::parseAs)

-    suspend fun fillGalleryListByApi(galleryInfoList: List<GalleryInfo>, referer: String? = null) =
-        galleryInfoList.chunked(MAX_REQUEST_SIZE).chunked(MAX_SEQUENTIAL_REQUESTS).forEachIndexed { index, chunk ->
-            if (index != 0) {
-                delay(REQUEST_INTERVAL)
-            }
-            chunk.parMap {
-                ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
-                    jsonBody {
-                        put("method", "gdata")
-                        array("gidlist") {
-                            it.forEach {
-                                addJsonArray {
-                                    add(it.gid)
-                                    add(it.token)
-                                }
+    suspend fun fillGalleryListByApi(galleryInfoList: List<GalleryInfo>, referer: String? = null) = galleryInfoList.chunked(MAX_REQUEST_SIZE).chunked(MAX_SEQUENTIAL_REQUESTS).forEachIndexed { index, chunk ->
+        if (index != 0) {
+            delay(REQUEST_INTERVAL)
+        }
+        chunk.parMap {
+            ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
+                jsonBody {
+                    put("method", "gdata")
+                    array("gidlist") {
+                        it.forEach { info ->
+                            addJsonArray {
+                                add(info.gid)
+                                add(info.token)
                            }
                        }
-                        put("namespace", 1)
                    }
-                }.fetchUsingAsText { GalleryApiParser.parse(this, it) }
-            }
+                    put("namespace", 1)
+                }
+            }.fetchUsingAsText { GalleryApiParser.parse(this, it) }
        }
+    }

-    suspend fun voteComment(apiUid: Long, apiKey: String?, gid: Long, token: String, commentId: Long, commentVote: Int): VoteCommentResult =
-        ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
-            jsonBody {
-                put("method", "votecomment")
-                put("apiuid", apiUid)
-                put("apikey", requireNotNull(apiKey))
-                put("gid", gid)
-                put("token", token)
-                put("comment_id", commentId)
-                put("comment_vote", commentVote)
-            }
-        }.fetchUsingAsText(String::parseAs)
+    suspend fun voteComment(apiUid: Long, apiKey: String?, gid: Long, token: String, commentId: Long, commentVote: Int): VoteCommentResult = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
+        jsonBody {
+            put("method", "votecomment")
+            put("apiuid", apiUid)
+            put("apikey", requireNotNull(apiKey))
+            put("gid", gid)
+            put("token", token)
+            put("comment_id", commentId)
+            put("comment_vote", commentVote)
+        }
+    }.fetchUsingAsText(String::parseAs)

-    suspend fun voteTag(apiUid: Long, apiKey: String?, gid: Long, token: String, tags: String, vote: Int) =
-        ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
-            jsonBody {
-                put("method", "taggallery")
-                put("apiuid", apiUid)
-                put("apikey", requireNotNull(apiKey))
-                put("gid", gid)
-                put("token", token)
-                put("tags", tags)
-                put("vote", vote)
-            }
-        }.fetchUsingAsText(VoteTagParser::parse)
+    suspend fun voteTag(apiUid: Long, apiKey: String?, gid: Long, token: String, tags: String, vote: Int) = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
+        jsonBody {
+            put("method", "taggallery")
+            put("apiuid", apiUid)
+            put("apikey", requireNotNull(apiKey))
+            put("gid", gid)
+            put("token", token)
+            put("tags", tags)
+            put("vote", vote)
+        }
+    }.fetchUsingAsByteBuffer(VoteTagParser::parse)

    suspend fun getGalleryToken(gid: Long, gtoken: String, page: Int) = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
        jsonBody {
@@ -446,13 +459,13 @@ object EhEngine {
    }

    suspend fun addFavorites(galleryList: List<Pair<Long, String>>, dstCat: Int) {
-        galleryList.chunked(MAX_SEQUENTIAL_REQUESTS).forEachIndexed { index, chunk ->
-            if (index != 0) {
-                delay(REQUEST_INTERVAL)
-            }
-            chunk.parMap { (gid, token) ->
+        galleryList.forEach { (gid, token) ->
+            // https://github.com/FooIbar/EhViewer/issues/1190
+            // Workaround for duplicate items when sorting by favorited time
+            val timeTaken = measureTimeMillis {
                modifyFavorites(gid, token, dstCat)
            }
+            delay(1000 - timeTaken)
        }
    }
 }
@@ -55,8 +55,8 @@ object EhFilter : CoroutineScope {
    suspend fun needTags() = filters.await().any { it.enable && (it.mode == FilterMode.TAG || it.mode == FilterMode.TAG_NAMESPACE) }
    suspend fun filterTitle(info: GalleryInfo) = anyActive(FilterMode.TITLE) { info.title.orEmpty().contains(it.text, true) }
    suspend fun filterUploader(info: GalleryInfo) = anyActive(FilterMode.UPLOADER) { it.text == info.uploader }
-    suspend fun filterTag(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG) { matchTag(tag, it.text.lowercase()) } } ?: false
-    suspend fun filterTagNamespace(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG_NAMESPACE) { matchTagNamespace(tag, it.text.lowercase()) } } ?: false
+    suspend fun filterTag(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG) { matchTag(tag, it.text.lowercase()) } } == true
+    suspend fun filterTagNamespace(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG_NAMESPACE) { matchTagNamespace(tag, it.text.lowercase()) } } == true
    suspend fun filterCommenter(commenter: String) = anyActive(FilterMode.COMMENTER) { it.text == commenter }
    suspend fun filterComment(comment: String) = anyActive(FilterMode.COMMENT) { regex(it).containsMatchIn(comment) }
 }
@@ -17,51 +17,47 @@ package com.hippo.ehviewer.client

 import com.hippo.ehviewer.EhApplication.Companion.ktorClient
 import com.hippo.ehviewer.EhApplication.Companion.noRedirectKtorClient
-import com.hippo.ehviewer.Settings
 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.FormBuilder
 import io.ktor.client.request.forms.FormDataContent
-import io.ktor.client.request.forms.MultiPartFormDataContent
-import io.ktor.client.request.forms.formData
 import io.ktor.client.request.header
 import io.ktor.client.request.prepareRequest
 import io.ktor.client.request.setBody
+import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.HttpStatement
 import io.ktor.http.ContentType
-import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpMethod
 import io.ktor.http.ParametersBuilder
 import io.ktor.http.content.TextContent
-import io.ktor.http.userAgent
+import kotlinx.coroutines.cancel
+import kotlinx.io.Source
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArrayBuilder
 import kotlinx.serialization.json.JsonObjectBuilder
 import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.okio.decodeFromBufferedSource
-import okio.BufferedSource
+import kotlinx.serialization.json.io.decodeFromSource

 inline fun JsonObjectBuilder.array(name: String, builder: JsonArrayBuilder.() -> Unit) = put(name, buildJsonArray(builder))

-suspend inline fun <reified T> HttpStatement.executeAndParseAs() = execute { it.bodyAsUtf8Text().parseAs<T>() }
-inline fun <reified T> BufferedSource.parseAs(): T = json.decodeFromBufferedSource(this)
+suspend inline fun <reified T> HttpStatement.executeAndParseAs() = executeSafely {
+    it.status.ensureSuccess()
+    it.bodyAsUtf8Text().parseAs<T>()
+}
+
+inline fun <reified T> Source.parseAs(): T = json.decodeFromSource(this)
 inline fun <reified T> String.parseAs(): T = json.decodeFromString(this)

-val json = Json { ignoreUnknownKeys = true }
-
-const val CHROME_USER_AGENT = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Mobile Safari/537.36"
-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.9"
-const val CHROME_ACCEPT_LANGUAGE = "en-US,en;q=0.5"
+val json = Json {
+    ignoreUnknownKeys = true
+    explicitNulls = false
+}

 fun HttpRequestBuilder.applyEhConfig(referer: String?, origin: String?) {
-    method = HttpMethod.Get
    header("Referer", referer)
    header("Origin", origin)
-    userAgent(Settings.userAgent)
-    header(HttpHeaders.Accept, CHROME_ACCEPT)
-    header(HttpHeaders.AcceptLanguage, CHROME_ACCEPT_LANGUAGE)
 }

 suspend inline fun ehRequest(
@@ -85,6 +81,16 @@ suspend inline fun noRedirectEhRequest(
    apply(builder)
 }.also { logcat("EhRequest") { url } }

+suspend inline fun <T> HttpStatement.executeSafely(
+    crossinline block: suspend (response: HttpResponse) -> T,
+) = execute { resp ->
+    try {
+        block(resp)
+    } finally {
+        resp.coroutineContext.cancel()
+    }
+}
+
 inline fun HttpRequestBuilder.formBody(builder: ParametersBuilder.() -> Unit) {
    method = HttpMethod.Post
    val parameters = ParametersBuilder().apply(builder).build()
@@ -96,8 +102,3 @@ inline fun HttpRequestBuilder.jsonBody(builder: JsonObjectBuilder.() -> Unit) {
    val json = buildJsonObject(builder).toString()
    setBody(TextContent(text = json, contentType = ContentType.Application.Json))
 }
-
-fun HttpRequestBuilder.multipartBody(builder: FormBuilder.() -> Unit) {
-    method = HttpMethod.Post
-    setBody(MultiPartFormDataContent(formData(builder)))
-}
@@ -19,37 +19,39 @@ import android.content.Context
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import arrow.core.Either
 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.FileUtils
-import com.hippo.ehviewer.util.StatusCodeException
-import com.hippo.ehviewer.util.copyTo
-import com.hippo.unifile.asUniFile
-import com.hippo.unifile.sha1
+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.HttpClient
 import io.ktor.client.request.prepareGet
-import io.ktor.client.statement.bodyAsChannel
-import io.ktor.http.isSuccess
-import java.io.File
-import java.nio.charset.StandardCharsets
+import kotlin.time.Clock
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Instant
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.io.Source
+import kotlinx.io.writeString
+import kotlinx.serialization.json.io.encodeToSink
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import moe.tarsin.coroutines.runSuspendCatching
-import okio.BufferedSource
-import okio.buffer
-import okio.source
 import splitties.init.appCtx

 object EhTagDatabase : CoroutineScope {
+    override val coroutineContext = Dispatchers.IO + Job()
    private const val NAMESPACE_PREFIX = "n"
    private val PREFIXES = arrayOf(
        "-",
@@ -59,194 +61,140 @@ object EhTagDatabase : CoroutineScope {
    )
    private lateinit var tagGroups: Map<String, Map<String, String>>
    private val updateLock = Mutex()
-    override val coroutineContext = Dispatchers.IO + Job()
-
    var initialized by mutableStateOf(false)

-    fun getTranslation(prefix: String? = NAMESPACE_PREFIX, tag: String?): String? {
-        return tagGroups[prefix]?.get(tag)?.trim()?.ifEmpty { null }
-    }
+    fun getTranslation(prefix: String? = NAMESPACE_PREFIX, tag: String?): String? = tagGroups[prefix]?.get(tag)?.trim()?.ifEmpty { null }

-    private fun internalSuggestFlow(
-        tags: Map<String, String>,
-        keyword: String,
-        translate: Boolean,
-        exactly: Boolean,
-    ): Flow<Pair<String?, String>> = flow {
-        if (exactly) {
-            tags[keyword]?.let {
-                emit(Pair(it.takeIf { translate }, keyword))
-            }
+    // Copied from https://github.com/EhTagTranslation/EhSyringe/blob/c0cf88da04081072492829673aca34380b14dae6/src/plugin/suggest.ts#L37
+    // TODO: Optimize
+    private val nsScore = mapOf(
+        TagNamespace.Location.prefix to 10f,
+        TagNamespace.Other.prefix to 10f,
+        TagNamespace.Female.prefix to 9f,
+        TagNamespace.Male.prefix to 8.5f,
+        TagNamespace.Mixed.prefix to 8f,
+        TagNamespace.Parody.prefix to 3.3f,
+        TagNamespace.Character.prefix to 2.8f,
+        TagNamespace.Artist.prefix to 2.5f,
+        TagNamespace.Cosplayer.prefix to 2.4f,
+        TagNamespace.Group.prefix to 2.2f,
+        TagNamespace.Language.prefix to 2f,
+    )
+
+    data class Tag(val tag: String, val hint: String?, val score: Float)
+
+    context(_: Context)
+    fun suggestion(rawKeyword: String, expectTranslate: Boolean): List<Tag> {
+        val keyword = PREFIXES.fold(rawKeyword) { kwd, pfx -> kwd.removePrefix(pfx) }
+        if (!initialized || keyword.isEmpty()) return emptyList()
+        val translate = expectTranslate && translatable
+        val prefix = rawKeyword.dropLast(keyword.length)
+        val ns = keyword.substringBefore(':')
+        val tag = keyword.drop(ns.length + 1)
+        val nsPrefix = TagNamespace.from(ns)?.prefix ?: ns
+        val tags = tagGroups[nsPrefix.takeIf { tag.isNotEmpty() && it != NAMESPACE_PREFIX }]
+        return if (tags != null) {
+            lookup(tags, tag, translate).map { it.copy(tag = "$prefix$nsPrefix:${it.tag}") }
        } else {
-            if (translate) {
-                tags.forEach { (tag, hint) ->
-                    if (tag != keyword &&
-                        (tag.containsIgnoreSpace(keyword) || hint.containsIgnoreSpace(keyword))
-                    ) {
-                        emit(Pair(hint, tag))
-                    }
-                }
-            } else {
-                tags.keys.forEach { tag ->
-                    if (tag != keyword && tag.containsIgnoreSpace(keyword)) {
-                        emit(Pair(null, tag))
-                    }
-                }
-            }
-        }
-    }
-
-    // Construct a cold flow for tag database suggestions
-    fun suggestFlow(
-        keyword: String,
-        translate: Boolean,
-        exactly: Boolean = false,
-    ): Flow<Pair<String?, String>> = flow {
-        var mKeyword = keyword
-        PREFIXES.forEach { mKeyword = mKeyword.removePrefix(it) }
-        val prefix = keyword.dropLast(mKeyword.length)
-        val namespace = mKeyword.substringBefore(':')
-        val tagKeyword = mKeyword.drop(namespace.length + 1)
-        val namespacePrefix = TagNamespace(namespace).toPrefix() ?: namespace
-        val tags = tagGroups[namespacePrefix.takeIf { tagKeyword.isNotEmpty() && it != NAMESPACE_PREFIX }]
-        tags?.let {
-            internalSuggestFlow(it, tagKeyword, translate, exactly).collect { (hint, tag) ->
-                emit(Pair(hint, "$prefix$namespacePrefix:$tag"))
-            }
-        } ?: tagGroups.forEach { (namespacePrefix, tags) ->
-            if (namespacePrefix != NAMESPACE_PREFIX) {
-                internalSuggestFlow(tags, mKeyword, translate, exactly).collect { (hint, tag) ->
-                    emit(Pair(hint, "$prefix$namespacePrefix:$tag"))
-                }
-            } else {
-                internalSuggestFlow(tags, mKeyword, translate, exactly).collect { (hint, namespacePrefix) ->
-                    emit(Pair(hint, "$prefix$namespacePrefix:"))
-                }
-            }
-        }
-    }
-
-    private fun String.removeSpace(): String = replace(" ", "")
-
-    private fun String.containsIgnoreSpace(other: String, ignoreCase: Boolean = true): Boolean =
-        removeSpace().contains(other.removeSpace(), ignoreCase)
-
-    private fun getMetadata(context: Context): Array<String>? {
-        return context.resources.getStringArray(R.array.tag_translation_metadata)
-            .takeIf { it.size == 4 }
-    }
-
-    fun isTranslatable(context: Context): Boolean {
-        return context.resources.getBoolean(R.bool.tag_translatable)
-    }
-
-    private fun getFileContent(file: File): String? {
-        return runCatching {
-            file.source().buffer().use { it.readString(StandardCharsets.UTF_8) }
-        }.getOrNull()
-    }
-
-    private fun checkData(sha1: String?, data: File): Boolean {
-        return sha1 != null && sha1 == data.asUniFile().sha1()
-    }
-
-    private suspend fun save(client: HttpClient, url: String, file: File) {
-        runCatching {
-            client.prepareGet(url).execute {
-                if (it.status.isSuccess()) {
-                    it.bodyAsChannel().copyTo(file)
+            tagGroups.asSequence().flatMap { (nsPrefix, tags) ->
+                if (nsPrefix != NAMESPACE_PREFIX) {
+                    lookup(tags, keyword, translate).map { it.copy(tag = "$prefix$nsPrefix:${it.tag}", score = it.score / (nsScore[nsPrefix] ?: 1f)) }
                } else {
-                    throw StatusCodeException(it.status.value)
+                    lookup(tags, keyword, translate).map { it.copy(tag = "$prefix${it.tag}:", score = 0f) }
                }
            }
-        }.onFailure {
-            file.delete()
-        }.getOrThrow()
+        }.toMutableList().apply { sortBy { it.score } }
    }

-    suspend fun update() {
+    private fun lookup(tags: Map<String, String>, keyword: String, translate: Boolean) = if (translate) {
+        tags.asSequence().mapNotNull { (tag, hint) ->
+            val score = if (tag.startsWith(keyword, ignoreCase = true)) {
+                tag.length
+            } else {
+                if (tag.indexOf(" $keyword", ignoreCase = true) != -1) {
+                    tag.length * 2
+                } else {
+                    when (hint.indexOf(keyword, ignoreCase = true)) {
+                        -1 -> 0
+                        0 -> hint.length
+                        else -> hint.length * 2
+                    }
+                }
+            }
+            if (score != 0) Tag(tag, hint, score.toFloat()) else null
+        }
+    } else {
+        tags.keys.asSequence().mapNotNull { tag ->
+            val score = if (tag.startsWith(keyword, ignoreCase = true)) {
+                tag.length
+            } else {
+                if (tag.indexOf(" $keyword", ignoreCase = true) != -1) {
+                    tag.length * 2
+                } else {
+                    0
+                }
+            }
+            if (score != 0) Tag(tag, null, score.toFloat()) else null
+        }
+    }
+
+    private fun metadata(context: Context): Array<String> = context.resources.getStringArray(R.array.tag_translation_metadata)
+
+    context(ctx: Context)
+    val translatable
+        get() = ctx.resources.getBoolean(R.bool.tag_translatable)
+
+    private suspend fun fetch(url: String) = ktorClient.prepareGet(url).executeSafely {
+        it.status.ensureSuccess()
+        it.bodyAsUtf8Text()
+    }
+
+    fun launchUpdate() = launch {
        updateLock.withLock {
-            updateInternal()
-        }
-    }
-
-    private fun issueUpdateInMemoryData(file: File? = null) {
-        val dataFile = file ?: getMetadata(appCtx)?.let { metadata ->
-            val dataName = metadata[2]
-            val dir = AppConfig.getFilesDir("tag-translations")
-            File(dir, dataName).takeIf { it.exists() }
-        } ?: return
-        tagGroups = dataFile.source().buffer().use(BufferedSource::parseAs)
-        initialized = true
-    }
-
-    init {
-        launch {
-            updateLock.withLock {
-                runSuspendCatching {
-                    issueUpdateInMemoryData()
-                }.onFailure {
-                    logcat(it)
-                }
-                updateInternal()
-            }
-        }
-    }
-
-    private suspend fun updateInternal() {
-        getMetadata(appCtx)?.let { metadata ->
-            val sha1Name = metadata[0]
-            val sha1Url = metadata[1]
-            val dataName = metadata[2]
-            val dataUrl = metadata[3]
-
-            val dir = AppConfig.getFilesDir("tag-translations")
-            checkNotNull(dir)
-            val sha1File = File(dir, sha1Name)
-            val dataFile = File(dir, dataName)
-
            runSuspendCatching {
-                // Check current sha1 and current data
-                val sha1 = getFileContent(sha1File)
-                if (!checkData(sha1, dataFile)) {
-                    FileUtils.delete(sha1File)
-                    FileUtils.delete(dataFile)
-                }
-
-                // Save new sha1
-                val tempSha1File = File(dir, "$sha1Name.tmp")
-                save(ktorClient, sha1Url, tempSha1File)
-                val tempSha1 = getFileContent(tempSha1File)
-
-                // Check new sha1 and current sha1
-                if (tempSha1 == sha1) {
-                    // The data is the same
-                    FileUtils.delete(tempSha1File)
-                    return
-                }
-
-                // Save new data
-                val tempDataFile = File(dir, "$dataName.tmp")
-                save(ktorClient, dataUrl, tempDataFile)
-
-                // Check new sha1 and new data
-                if (!checkData(tempSha1, tempDataFile)) {
-                    FileUtils.delete(tempSha1File)
-                    FileUtils.delete(tempDataFile)
-                    return
-                }
-
-                // Replace current sha1 and current data with new sha1 and new data
-                FileUtils.delete(sha1File)
-                FileUtils.delete(dataFile)
-                tempSha1File.renameTo(sha1File)
-                tempDataFile.renameTo(dataFile)
-
-                // Read new EhTagDatabase
-                issueUpdateInMemoryData(dataFile)
+                atomicallyUpdate()
            }.onFailure {
                logcat(it)
            }
        }
    }
+
+    private suspend fun atomicallyUpdate() {
+        val (sha1Name, sha1Url, dataName, dataUrl) = metadata(appCtx)
+        val workdir = AppConfig.tagTranslationsDir
+        val sha1File = workdir / sha1Name
+        val dataFile = workdir / dataName
+
+        if (!initialized) {
+            Either.catch {
+                tagGroups = dataFile.read(Source::parseAs)
+                initialized = true
+
+                // Perform only one automatic update (on app startup) per day
+                val lastModified = Instant.fromEpochMilliseconds(dataFile.metadataOrNull()!!.lastModifiedAtMillis!!)
+                if (Clock.System.now() - lastModified < 1.days) return
+            }.onLeft {
+                logcat(it)
+            }
+        }
+
+        val currentSha1 = if (initialized) {
+            Either.catch { sha1File.utf8() }.getOrNull()
+        } else {
+            null
+        }
+        val newSha1 = fetch(sha1Url)
+        if (newSha1 == currentSha1) return
+
+        val rawData = fetch(dataUrl)
+        tagGroups = json.parseToJsonElement(rawData).jsonObject["data"]!!.jsonArray.associate { e ->
+            val data = e.jsonObject
+            val namespace = data["namespace"]!!.jsonPrimitive.content
+            val prefix = if (namespace == "rows") NAMESPACE_PREFIX else TagNamespace.from(namespace)!!.prefix!!
+            prefix to data["data"]!!.jsonObject.mapValues { it.value.jsonObject["name"]!!.jsonPrimitive.content }
+        }
+        initialized = true
+        sha1File.write { writeString(newSha1) }
+        dataFile.write { json.encodeToSink(tagGroups, this) }
+    }
 }
@@ -53,70 +53,64 @@ object EhUrl {
    const val ORIGIN_E = REFERER_E

    val domain: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
            SITE_E -> DOMAIN_E
            SITE_EX -> DOMAIN_EX
            else -> DOMAIN_E
        }

    val apiUrl: String
-        get() = if (Settings.forceEhThumb) {
-            API_E
-        } else {
-            when (Settings.gallerySite) {
-                SITE_E -> API_E
-                SITE_EX -> API_EX
-                else -> API_E
-            }
+        get() = when (Settings.gallerySite.value) {
+            SITE_E -> API_E
+            SITE_EX -> API_EX
+            else -> API_E
        }

    val referer: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
            SITE_E -> REFERER_E
            SITE_EX -> REFERER_EX
            else -> REFERER_E
        }

    val origin: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
            SITE_E -> ORIGIN_E
            SITE_EX -> ORIGIN_EX
            else -> ORIGIN_E
        }

-    val uConfigUrl: String
-        get() = when (Settings.gallerySite) {
-            SITE_E -> URL_UCONFIG_E
-            SITE_EX -> URL_UCONFIG_EX
-            else -> URL_UCONFIG_E
-        }
+    fun getUConfigUrl(gallerySite: Int = Settings.gallerySite.value) = when (gallerySite) {
+        SITE_E -> URL_UCONFIG_E
+        SITE_EX -> URL_UCONFIG_EX
+        else -> URL_UCONFIG_E
+    }

    val myTagsUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
            SITE_E -> URL_MY_TAGS_E
            SITE_EX -> URL_MY_TAGS_EX
            else -> URL_MY_TAGS_E
        }

    val popularUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
            SITE_E -> URL_POPULAR_E
            SITE_EX -> URL_POPULAR_EX
            else -> URL_POPULAR_E
        }

    val imageSearchUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
            SITE_E -> URL_IMAGE_SEARCH_E
            SITE_EX -> URL_IMAGE_SEARCH_EX
            else -> URL_IMAGE_SEARCH_E
        }

-    fun getGalleryDetailUrl(gid: Long, token: String, index: Int = 0, allComment: Boolean = false) =
-        ehUrl(listOf("g", "$gid", token)) {
-            if (index != 0) addQueryParameter("p", "$index")
-            if (allComment) addQueryParameter("hc", "1")
-        }.buildString()
+    fun getGalleryDetailUrl(gid: Long, token: String, index: Int = 0, allComment: Boolean = false) = ehUrl(listOf("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()

@@ -130,13 +124,22 @@ object EhUrl {
        addQueryParameter("act", "addfav")
    }.buildString()

-    fun getDownloadArchive(gid: Long, token: String, or: String) = ehUrl("archiver.php") {
+    fun getArchiveUrl(gid: Long, token: String) = ehUrl("archiver.php") {
        addQueryParameter("gid", "$gid")
        addQueryParameter("token", token)
-        addQueryParameter("or", or)
+    }.buildString()
+
+    fun getTorrentUrl(gid: Long, token: String) = ehUrl("gallerytorrents.php") {
+        addQueryParameter("gid", "$gid")
+        addQueryParameter("t", token)
    }.buildString()

    fun getTagDefinitionUrl(tag: String) = "https://ehwiki.org/wiki/" + tag.replace(' ', '_')
+
+    fun getTrackerUrl(gid: Long, key: String?) = ehUrl(
+        path = listOfNotNull("$gid", key, "announce"),
+        host = "ehtracker.org",
+    ).buildString()
 }

 inline fun ehUrl(path: String? = null, host: String = EhUrl.domain, builder: ParametersBuilder.() -> Unit) = ehUrl(
@@ -15,18 +15,31 @@
 */
 package com.hippo.ehviewer.client

+import android.app.DownloadManager
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.os.Environment
 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.graphics.ColorUtils
+import androidx.core.net.toUri
 import arrow.core.memoize
 import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.data.GalleryDetail
 import com.hippo.ehviewer.client.data.GalleryInfo
-import java.util.regex.Pattern
-import kotlin.math.abs
+import com.hippo.ehviewer.client.parser.Archive
+import com.hippo.ehviewer.spider.SpiderDen
+import com.hippo.ehviewer.util.AppConfig
+import com.hippo.ehviewer.util.FileUtils
+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 splitties.systemservices.downloadManager

 object EhUtils {
    const val NONE = -1 // Use it for homepage
@@ -58,14 +71,14 @@ object EhUtils {
    private const val BG_COLOR_UNKNOWN = 0xff000000u

    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff
-    private val PATTERN_TITLE_PREFIX = Pattern.compile(
-        "^(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*",
+    private val PATTERN_TITLE_PREFIX = Regex(
+        """^(?:\([^)]*\)|\[[^]]*]|\{[^}]*\}|~[^~]*~|\s+)*""",
    )

    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff and something like ch. 1-23
-    private val PATTERN_TITLE_SUFFIX = Pattern.compile(
-        "(?:\\s+ch.[\\s\\d-]+)?(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*$",
-        Pattern.CASE_INSENSITIVE,
+    private val PATTERN_TITLE_SUFFIX = Regex(
+        """(?:\s+ch.[\s\d-]+)?(?:\([^)]*\)|\[[^]]*]|\{[^}]*\}|~[^~]*~|\s+)*$""",
+        RegexOption.IGNORE_CASE,
    )

    private val CATEGORY_VALUES = hashMapOf(
@@ -85,119 +98,115 @@ object EhUtils {
    private val CATEGORY_STRINGS = CATEGORY_VALUES.entries.map { (k, v) -> v to k }

    val isExHentai: Boolean
-        get() = Settings.gallerySite == EhUrl.SITE_EX
+        get() = Settings.gallerySite.value == EhUrl.SITE_EX
+
+    val isMpvAvailable
+        get() = EhCookieStore.getHathPerks()?.contains('q') == true

    fun getCategory(type: String?): Int {
        for (entry in CATEGORY_STRINGS) {
-            for (str in entry.first)
+            for (str in entry.first) {
                if (str.equals(type, ignoreCase = true)) {
                    return entry.second
                }
+            }
        }
        return UNKNOWN
    }

-    fun getCategory(type: Int): String {
-        return CATEGORY_VALUES.getOrDefault(type, CATEGORY_VALUES[UNKNOWN])!![0]
-    }
+    fun getCategory(type: Int): String = CATEGORY_VALUES.getOrDefault(type, CATEGORY_VALUES[UNKNOWN])!![0]

-    private fun differenceDegrees(a: Float, b: Float): Float {
-        return 180.0f - abs(abs(a - b) - 180.0f)
-    }
+    fun invCategory(category: Int): Int = category.inv() and ALL_CATEGORY

-    private fun sanitizeDegreesDouble(degrees: Float): Float {
-        val deg = degrees % 360.0f
-        return if (deg < 0) deg + 360.0f else deg
-    }
-
-    private fun rotationDirection(from: Float, to: Float): Float {
-        val increasingDifference = sanitizeDegreesDouble(to - from)
-        return if (increasingDifference <= 180.0) 1.0f else -1.0f
-    }
-
-    val harmonizeWithRole = { primaryContainer: Int, src: Int ->
-        val fromHct = FloatArray(3).apply { ColorUtils.colorToM3HCT(src, this) }
-        val toHct = FloatArray(3).apply { ColorUtils.colorToM3HCT(primaryContainer, this) }
-        val differenceDegrees = differenceDegrees(fromHct[0], toHct[0])
-        val rotationDegrees = minOf(differenceDegrees * 0.5f, 15.0f)
-        val outputHue = sanitizeDegreesDouble(fromHct[0] + rotationDegrees * rotationDirection(fromHct[0], toHct[0]))
-        ColorUtils.M3HCTToColor(outputHue, toHct[1], toHct[2])
+    val mergeColor = { primaryContainer: Color, src: Color ->
+        val fromHct = Hct.from(src)
+        val toHct = Hct.from(primaryContainer)
+        Hct.from(fromHct.hue, toHct.chroma, toHct.tone).toColor()
    }.memoize()

    @Stable
    @ReadOnlyComposable
    @Composable
    fun getCategoryColor(category: Int): Color {
-        val primary = when (category) {
-            DOUJINSHI -> BG_COLOR_DOUJINSHI
-            MANGA -> BG_COLOR_MANGA
-            ARTIST_CG -> BG_COLOR_ARTIST_CG
-            GAME_CG -> BG_COLOR_GAME_CG
-            WESTERN -> BG_COLOR_WESTERN
-            NON_H -> BG_COLOR_NON_H
-            IMAGE_SET -> BG_COLOR_IMAGE_SET
-            COSPLAY -> BG_COLOR_COSPLAY
-            ASIAN_PORN -> BG_COLOR_ASIAN_PORN
-            MISC -> BG_COLOR_MISC
-            else -> BG_COLOR_UNKNOWN
-        }.toInt()
-        val color = if (Settings.harmonizeCategoryColor) {
-            val primaryContainer = MaterialTheme.colorScheme.primaryContainer.toArgb()
-            harmonizeWithRole(primaryContainer, primary)
+        val primary = Color(
+            when (category) {
+                DOUJINSHI -> BG_COLOR_DOUJINSHI
+                MANGA -> BG_COLOR_MANGA
+                ARTIST_CG -> BG_COLOR_ARTIST_CG
+                GAME_CG -> BG_COLOR_GAME_CG
+                WESTERN -> BG_COLOR_WESTERN
+                NON_H -> BG_COLOR_NON_H
+                IMAGE_SET -> BG_COLOR_IMAGE_SET
+                COSPLAY -> BG_COLOR_COSPLAY
+                ASIAN_PORN -> BG_COLOR_ASIAN_PORN
+                MISC -> BG_COLOR_MISC
+                else -> BG_COLOR_UNKNOWN
+            }.toInt(),
+        )
+        return if (Settings.harmonizeCategoryColor.value) {
+            val primaryContainer = MaterialTheme.colorScheme.primaryContainer
+            mergeColor(primaryContainer, primary)
        } else {
            primary
        }
-        return Color(color)
    }

    val categoryTextColor = Color(0xffe6e0e9)

+    val favoriteIconColor = Color(0xffff3040)
+
    fun signOut() {
-        EhCookieStore.signOut()
-        Settings.avatar = null
-        Settings.displayName = null
-        Settings.gallerySite = EhUrl.SITE_E
-        Settings.needSignIn = true
+        EhCookieStore.removeAllCookies()
+        Settings.displayName.value = null
+        Settings.hasSignedIn.value = false
+        Settings.gallerySite.value = EhUrl.SITE_E
+        Settings.needSignIn.value = true
    }

-    fun getSuitableTitle(gi: GalleryInfo): String {
-        return if (Settings.showJpnTitle) {
-            if (gi.titleJpn.isNullOrEmpty()) gi.title else gi.titleJpn
-        } else {
-            if (gi.title.isNullOrEmpty()) gi.titleJpn else gi.title
-        }.orEmpty()
-    }
+    fun getSuitableTitle(gi: GalleryInfo): String = if (Settings.showJpnTitle.value) {
+        if (gi.titleJpn.isNullOrEmpty()) gi.title else gi.titleJpn
+    } else {
+        if (gi.title.isNullOrEmpty()) gi.titleJpn else gi.title
+    }.orEmpty()

    fun extractTitle(fullTitle: String?): String? {
        var title: String = fullTitle ?: return null
-        title = PATTERN_TITLE_PREFIX.matcher(title).replaceFirst("")
-        title = PATTERN_TITLE_SUFFIX.matcher(title).replaceFirst("")
+        title = PATTERN_TITLE_PREFIX.replaceFirst(title, "")
+        title = PATTERN_TITLE_SUFFIX.replaceFirst(title, "")
        // Sometimes title is combined by romaji and english translation.
        // Only need romaji.
        // TODO But not sure every '|' means that
-        val index = title.indexOf('|')
-        if (index >= 0) {
-            title = title.substring(0, index)
-        }
-        return title.ifEmpty { null }
+        return title.substringBeforeLast('|').trim().ifEmpty { null }
    }

-    fun handleThumbUrlResolution(url: String?): String? {
-        if (null == url) {
-            return null
-        }
-        val resolution = when (Settings.thumbResolution) {
-            0 -> return url
-            1 -> "250"
-            2 -> "300"
-            else -> return url
-        }
-        val index1 = url.lastIndexOf('_')
-        val index2 = url.lastIndexOf('.')
-        return if (index1 >= 0 && index2 >= 0 && index1 < index2) {
-            url.substring(0, index1 + 1) + resolution + url.substring(index2)
-        } else {
-            url
+    context(ctx: Context)
+    suspend fun downloadArchive(galleryDetail: GalleryDetail, archive: Archive) {
+        val gid = galleryDetail.gid
+        EhEngine.downloadArchive(gid, galleryDetail.token, archive.res, archive.isHath)?.let {
+            val uri = it.toUri()
+            val intent = Intent().apply {
+                action = Intent.ACTION_VIEW
+                setDataAndType(uri, "application/zip")
+            }
+            val name = "$gid-${getSuitableTitle(galleryDetail)}.zip"
+            try {
+                ctx.startActivity(intent)
+                withUIContext { addTextToClipboard(name, true) }
+            } catch (_: ActivityNotFoundException) {
+                val r = DownloadManager.Request(uri)
+                r.setDestinationInExternalPublicDir(
+                    Environment.DIRECTORY_DOWNLOADS,
+                    AppConfig.APP_DIRNAME + "/" + FileUtils.sanitizeFilename(name),
+                )
+                r.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+                downloadManager.enqueue(r)
+            }
+            if (Settings.archiveMetadata.value) {
+                SpiderDen(galleryDetail).apply {
+                    initDownloadDir()
+                    writeComicInfo()
+                }
+            }
        }
    }
 }
@@ -15,7 +15,6 @@
 */
 package com.hippo.ehviewer.client.data

-import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Ignore
@@ -23,20 +22,18 @@ import androidx.room.PrimaryKey
 import androidx.room.TypeConverter
 import androidx.room.TypeConverters
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable

-@Parcelize
@Serializable
@Entity(tableName = "GALLERIES")
@TypeConverters(SimpleTagsConverter::class)
 data class BaseGalleryInfo(
    @PrimaryKey
    @ColumnInfo(name = "GID")
-    override var gid: Long,
+    override var gid: Long = 0,

    @ColumnInfo(name = "TOKEN")
-    override var token: String,
+    override var token: String = "",

    @ColumnInfo(name = "TITLE")
    override var title: String? = null,
@@ -88,9 +85,7 @@ data class BaseGalleryInfo(

    @Ignore
    override var favoriteNote: String? = null,
-) : GalleryInfo, Parcelable {
-    constructor() : this(0, "")
-}
+) : GalleryInfo

 class SimpleTagsConverter {
    @TypeConverter
@@ -15,21 +15,23 @@
 */
 package com.hippo.ehviewer.client.data

-import android.os.Parcelable
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.addQueryParameter
 import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
 import com.hippo.ehviewer.client.ehUrl
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable

-@Parcelize
+@Serializable
 data class FavListUrlBuilder(
    val favCat: Int = FAV_CAT_ALL,
    val keyword: String? = null,
    var jumpTo: String? = null,
    var prev: String? = null,
    var next: String? = null,
-) : Parcelable {
+) {
+    val isLocal
+        get() = favCat == FAV_CAT_LOCAL
+
    fun setIndex(index: String?, isNext: Boolean) {
        next = index.takeIf { isNext }
        prev = index.takeUnless { isNext }
@@ -15,10 +15,9 @@
 */
 package com.hippo.ehviewer.client.data

-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable

-@Parcelize
+@Serializable
 data class GalleryComment(
    val id: Long,
    val score: Int,
@@ -33,4 +32,4 @@ data class GalleryComment(
    val user: String?,
    val comment: String,
    val lastEdited: Long,
-) : Parcelable
+)
@@ -15,11 +15,10 @@
 */
 package com.hippo.ehviewer.client.data

-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable

-@Parcelize
+@Serializable
 data class GalleryCommentList(
    val comments: List<GalleryComment>,
    val hasMore: Boolean,
-) : Parcelable
+)
@@ -15,9 +15,11 @@
 */
 package com.hippo.ehviewer.client.data

-import android.os.Parcelable
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANGS
-import kotlinx.parcelize.Parcelize
+import androidx.compose.ui.util.fastFlatMap
+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",
@@ -36,14 +38,12 @@ private val LANGUAGES = arrayOf(
    "Dutch",
 )

-@Parcelize
+@Serializable
 data class GalleryDetail(
    val galleryInfo: BaseGalleryInfo = BaseGalleryInfo(),
    var apiUid: Long = -1L,
    var apiKey: String? = null,
    var torrentCount: Int = 0,
-    var torrentUrl: String? = null,
-    var archiveUrl: String? = null,
    var parent: String? = null,
    var newerVersions: List<BaseGalleryInfo> = emptyList(),
    var visible: String? = null,
@@ -51,14 +51,32 @@ data class GalleryDetail(
    var size: String? = null,
    var favoriteCount: Int = 0,
    var ratingCount: Int = 0,
-    val tags: List<GalleryTagGroup>,
+    val tagGroups: List<GalleryTagGroup>,
    var comments: GalleryCommentList,
-    val previewPages: Int,
    val previewList: List<GalleryPreview>,
-) : GalleryInfo by galleryInfo, Parcelable {
-    fun fillInfo() {
+) : GalleryInfo by galleryInfo {
+    suspend fun fillInfo() {
        val index = LANGUAGES.indexOf(language)
-        if (index != -1) simpleLanguage = S_LANGS[index]
-        simpleTags = tags.flatten()
+        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
+        }
+    }
+
+    suspend fun filterComments() {
+        comments = with(comments) {
+            val scoreThreshold = Settings.commentThreshold.value
+            copy(
+                comments = comments.filter {
+                    it.uploader ||
+                        it.score > scoreThreshold &&
+                        !EhFilter.filterCommenter(it.user.orEmpty()) &&
+                        !EhFilter.filterComment(it.comment)
+                },
+            )
+        }
    }
 }
@@ -15,7 +15,6 @@
 */
 package com.hippo.ehviewer.client.data

-import java.util.regex.Pattern
 import moe.tarsin.kt.unreachable

 interface GalleryInfo {
@@ -62,36 +61,36 @@ interface GalleryInfo {
            "NL",
        )
        private val S_LANG_PATTERNS = arrayOf(
-            Pattern.compile(
+            Regex(
                "[(\\[]eng(?:lish)?[)\\]]|英訳",
-                Pattern.CASE_INSENSITIVE,
+                RegexOption.IGNORE_CASE,
            ),
            // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
-            Pattern.compile(
+            Regex(
                "[(\uFF08\\[]ch(?:inese)?[)\uFF09\\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳",
-                Pattern.CASE_INSENSITIVE,
+                RegexOption.IGNORE_CASE,
            ),
-            Pattern.compile(
+            Regex(
                "[(\\[]spanish[)\\]]|[(\\[]Español[)\\]]|スペイン翻訳",
-                Pattern.CASE_INSENSITIVE,
+                RegexOption.IGNORE_CASE,
            ),
-            Pattern.compile("[(\\[]korean?[)\\]]|韓国翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile("[(\\[]rus(?:sian)?[)\\]]|ロシア翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile("[(\\[]fr(?:ench)?[)\\]]|フランス翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile("[(\\[]portuguese|ポルトガル翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile(
+            Regex("[(\\[]korean?[)\\]]|韓国翻訳", RegexOption.IGNORE_CASE),
+            Regex("[(\\[]rus(?:sian)?[)\\]]|ロシア翻訳", RegexOption.IGNORE_CASE),
+            Regex("[(\\[]fr(?:ench)?[)\\]]|フランス翻訳", RegexOption.IGNORE_CASE),
+            Regex("[(\\[]portuguese|ポルトガル翻訳", RegexOption.IGNORE_CASE),
+            Regex(
                "[(\\[]thai(?: ภาษาไทย)?[)\\]]|แปลไทย|タイ翻訳",
-                Pattern.CASE_INSENSITIVE,
+                RegexOption.IGNORE_CASE,
            ),
-            Pattern.compile("[(\\[]german[)\\]]|ドイツ翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile("[(\\[]italiano?[)\\]]|イタリア翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile(
+            Regex("[(\\[]german[)\\]]|ドイツ翻訳", RegexOption.IGNORE_CASE),
+            Regex("[(\\[]italiano?[)\\]]|イタリア翻訳", RegexOption.IGNORE_CASE),
+            Regex(
                "[(\\[]vietnamese(?: Tiếng Việt)?[)\\]]|ベトナム翻訳",
-                Pattern.CASE_INSENSITIVE,
+                RegexOption.IGNORE_CASE,
            ),
-            Pattern.compile("[(\\[]polish[)\\]]|ポーランド翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile("[(\\[]hun(?:garian)?[)\\]]|ハンガリー翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile("[(\\[]dutch[)\\]]|オランダ翻訳", Pattern.CASE_INSENSITIVE),
+            Regex("[(\\[]polish[)\\]]|ポーランド翻訳", RegexOption.IGNORE_CASE),
+            Regex("[(\\[]hun(?:garian)?[)\\]]|ハンガリー翻訳", RegexOption.IGNORE_CASE),
+            Regex("[(\\[]dutch[)\\]]|オランダ翻訳", RegexOption.IGNORE_CASE),
        )
        val S_LANG_TAGS = arrayOf(
            "language:english",
@@ -123,7 +122,7 @@ interface GalleryInfo {

        private fun generateSLangFromTitle(title: String): String? {
            for (i in S_LANGS.indices) {
-                if (S_LANG_PATTERNS[i].matcher(title).find()) {
+                if (S_LANG_PATTERNS[i].containsMatchIn(title)) {
                    return S_LANGS[i]
                }
            }
@@ -135,14 +134,10 @@ interface GalleryInfo {
    }
 }

-fun GalleryInfo.findBaseInfo(): BaseGalleryInfo {
-    return when (this) {
-        is BaseGalleryInfo -> this
-        is GalleryDetail -> galleryInfo
-        else -> unreachable()
-    }
+fun GalleryInfo.findBaseInfo(): BaseGalleryInfo = when (this) {
+    is BaseGalleryInfo -> this
+    is GalleryDetail -> galleryInfo
+    else -> unreachable()
 }

-fun GalleryInfo.asGalleryDetail(): GalleryDetail? {
-    return this as? GalleryDetail
-}
+fun GalleryInfo.asGalleryDetail(): GalleryDetail? = this as? GalleryDetail
@@ -15,25 +15,46 @@
 */
 package com.hippo.ehviewer.client.data

-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import com.hippo.ehviewer.client.getThumbKey
+import com.hippo.ehviewer.client.getV2PreviewKey
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.cbor.CborArray

-interface GalleryPreview : Parcelable {
+@Serializable
+sealed interface GalleryPreview {
+    val url: String
    val imageKey: String
    val position: Int
+    val pToken: String
 }

-@Parcelize
-data class LargeGalleryPreview(
-    override val imageKey: String,
+@Serializable
+@SerialName("V1")
+data class V1GalleryPreview(
+    override val url: String,
    override val position: Int,
-) : GalleryPreview
+    override val pToken: String,
+) : GalleryPreview {
+    override val imageKey get() = getThumbKey(url)
+}

-@Parcelize
-data class NormalGalleryPreview(
-    override val imageKey: String,
+@Serializable
+@SerialName("V2")
+data class V2GalleryPreview(
+    override val url: String,
    override val position: Int,
+    override val pToken: String,
    val offsetX: Int,
    val clipWidth: Int,
    val clipHeight: Int,
-) : GalleryPreview
+) : GalleryPreview {
+    override val imageKey get() = getV2PreviewKey(url)
+}
+
+@Serializable
+@CborArray
+class GalleryPreviewList(
+    val previews: List<GalleryPreview>,
+    val total: Int,
+)
@@ -0,0 +1,22 @@
+package com.hippo.ehviewer.client.data
+
+import kotlinx.serialization.Serializable
+
+enum class VoteStatus(val display: String) {
+    None(""),
+    Up("+1"),
+    Down("-1"),
+}
+
+enum class PowerStatus {
+    Solid,
+    Active,
+    Weak,
+}
+
+@Serializable
+data class GalleryTag(
+    val text: String,
+    val power: PowerStatus,
+    val vote: VoteStatus,
+)
@@ -15,11 +15,10 @@
 */
 package com.hippo.ehviewer.client.data

-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable

-@Parcelize
+@Serializable
 data class GalleryTagGroup(
-    val groupName: String,
-    private val tagList: MutableList<String> = mutableListOf(),
-) : Parcelable, MutableList<String> by tagList
+    val namespace: TagNamespace,
+    val tags: List<GalleryTag>,
+)
@@ -15,8 +15,6 @@
 */
 package com.hippo.ehviewer.client.data

-import android.os.Parcelable
-import androidx.annotation.IntDef
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
@@ -25,45 +23,43 @@ 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 com.hippo.ehviewer.util.toIntOrDefault
-import java.io.UnsupportedEncodingException
-import java.net.URLDecoder
-import kotlinx.parcelize.Parcelize
+import io.ktor.http.Parameters
+import kotlin.text.toIntOrNull
+import kotlinx.serialization.Serializable

-@Parcelize
+@Serializable
 data class ListUrlBuilder(
-    @get:Mode @Mode
    var mode: Int = MODE_NORMAL,
-    private var mPrev: String? = null,
-    var mNext: String? = null,
+    private var prev: String? = null,
+    var next: String? = null,
    // Reset to null after initial loading
-    var mJumpTo: String? = null,
-    private var mRange: Int = 0,
+    var jumpTo: String? = null,
+    private var range: Int = 0,
    var category: Int = EhUtils.NONE,
    private var mKeyword: String? = null,
    var hash: String? = null,
+    var language: Int = -1,
    var advanceSearch: Int = -1,
    var minRating: Int = -1,
    var pageFrom: Int = -1,
    var pageTo: Int = -1,
-    var imagePath: String? = null,
-) : Parcelable {
+) {

    fun setIndex(index: String, isNext: Boolean = true) {
-        mNext = index.takeIf { isNext }
-        mPrev = index.takeUnless { isNext }
-        mRange = 0
+        next = index.takeIf { isNext }
+        prev = index.takeUnless { isNext }
+        range = 0
    }

-    fun setJumpTo(jumpTo: Int) {
-        mJumpTo = jumpTo.takeUnless { it == 0 }?.toString()
+    fun setJumpTo(to: Int) {
+        jumpTo = to.takeUnless { it == 0 }?.toString()
    }

-    fun setRange(range: Int) {
-        mRange = range
-        mPrev = null
-        mNext = null
-        mJumpTo = null
+    fun setRange(to: Int) {
+        range = to
+        prev = null
+        next = null
+        jumpTo = null
    }

    var keyword: String?
@@ -72,29 +68,27 @@ data class ListUrlBuilder(
            mKeyword = keyword
        }

-    constructor(q: QuickSearch) : this() {
-        mode = q.mode
-        this.category = q.category
-        mKeyword = q.keyword
-        advanceSearch = q.advanceSearch
-        minRating = q.minRating
-        pageFrom = q.pageFrom
-        pageTo = q.pageTo
-        mNext = q.name.substringAfterLast('@', "").ifEmpty { null }
-    }
+    constructor(q: QuickSearch) : this(
+        mode = q.mode,
+        category = q.category,
+        mKeyword = q.keyword,
+        advanceSearch = q.advanceSearch,
+        minRating = q.minRating,
+        pageFrom = q.pageFrom,
+        pageTo = q.pageTo,
+        next = q.name.substringAfterLast('@', "").ifEmpty { null },
+    )

-    fun toQuickSearch(name: String): QuickSearch {
-        return QuickSearch(
-            name = name,
-            mode = mode,
-            category = category,
-            keyword = mKeyword,
-            advanceSearch = advanceSearch,
-            minRating = minRating,
-            pageFrom = pageFrom,
-            pageTo = pageTo,
-        )
-    }
+    fun toQuickSearch(name: String) = QuickSearch(
+        name = name,
+        mode = mode,
+        category = category,
+        keyword = mKeyword,
+        advanceSearch = advanceSearch,
+        minRating = minRating,
+        pageFrom = pageFrom,
+        pageTo = pageTo,
+    )

    fun equalsQuickSearch(q: QuickSearch?): Boolean {
        if (null == q) {
@@ -122,234 +116,118 @@ data class ListUrlBuilder(
        }
    }

-    /**
-     * @param query xxx=yyy&mmm=nnn
-     */
-    constructor(query: String?) : this() {
-        // TODO page
-        if (query.isNullOrEmpty()) {
-            return
-        }
-        val queries = query.split('&')
-        var category = 0
-        var keyword: String? = null
-        var enableAdvanceSearch = false
-        var advanceSearch = 0
-        var enableMinRating = false
-        var minRating = -1
-        var enablePage = false
-        var pageFrom = -1
-        var pageTo = -1
-        for (str in queries) {
-            val index = str.indexOf('=')
-            if (index < 0) {
-                continue
+    constructor(params: Parameters) : this(
+        prev = params["prev"],
+        next = params["next"],
+        jumpTo = params["seek"],
+        range = params["range"]?.toIntOrNull() ?: 0,
+        category = params["f_cats"]?.toIntOrNull()?.let(EhUtils::invCategory) ?: EhUtils.NONE,
+        mKeyword = params["f_search"],
+    ) {
+        if (params["advsearch"] == "1") {
+            advanceSearch = 0
+            if (params["f_sh"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.SH
            }
-            val key = str.substring(0, index)
-            val value = str.substring(index + 1)
-            when (key) {
-                "f_cats" -> {
-                    val cats = value.toIntOrDefault(EhUtils.ALL_CATEGORY)
-                    category = category or (cats.inv() and EhUtils.ALL_CATEGORY)
-                }
-
-                "f_doujinshi" -> if ("1" == value) {
-                    category = category or EhUtils.DOUJINSHI
-                }
-
-                "f_manga" -> if ("1" == value) {
-                    category = category or EhUtils.MANGA
-                }
-
-                "f_artistcg" -> if ("1" == value) {
-                    category = category or EhUtils.ARTIST_CG
-                }
-
-                "f_gamecg" -> if ("1" == value) {
-                    category = category or EhUtils.GAME_CG
-                }
-
-                "f_western" -> if ("1" == value) {
-                    category = category or EhUtils.WESTERN
-                }
-
-                "f_non-h" -> if ("1" == value) {
-                    category = category or EhUtils.NON_H
-                }
-
-                "f_imageset" -> if ("1" == value) {
-                    category = category or EhUtils.IMAGE_SET
-                }
-
-                "f_cosplay" -> if ("1" == value) {
-                    category = category or EhUtils.COSPLAY
-                }
-
-                "f_asianporn" -> if ("1" == value) {
-                    category = category or EhUtils.ASIAN_PORN
-                }
-
-                "f_misc" -> if ("1" == value) {
-                    category = category or EhUtils.MISC
-                }
-
-                "f_search" -> try {
-                    keyword = URLDecoder.decode(value, "utf-8")
-                } catch (e: UnsupportedEncodingException) {
-                    // Ignore
-                } catch (_: IllegalArgumentException) {
-                }
-
-                "advsearch" -> if ("1" == value) {
-                    enableAdvanceSearch = true
-                }
-
-                "f_sh" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.SH
-                }
-
-                "f_sto" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.STO
-                }
-
-                "f_sfl" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.SFL
-                }
-
-                "f_sfu" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.SFU
-                }
-
-                "f_sft" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.SFT
-                }
-
-                "f_sr" -> if ("on" == value) {
-                    enableMinRating = true
-                }
-
-                "f_srdd" -> minRating = value.toIntOrDefault(-1)
-                "f_sp" -> if ("on" == value) {
-                    enablePage = true
-                }
-
-                "f_spf" -> pageFrom = value.toIntOrDefault(-1)
-                "f_spt" -> pageTo = value.toIntOrDefault(-1)
-                "f_shash" -> hash = value
+            if (params["f_sto"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.STO
            }
-        }
-        this.category = category
-        mKeyword = keyword
-        if (enableAdvanceSearch) {
-            this.advanceSearch = advanceSearch
-            if (enableMinRating) {
-                this.minRating = minRating
-            } else {
-                this.minRating = -1
+            if (params["f_sfl"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.SFL
            }
-            if (enablePage) {
-                this.pageFrom = pageFrom
-                this.pageTo = pageTo
-            } else {
-                this.pageFrom = -1
-                this.pageTo = -1
+            if (params["f_sfu"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.SFU
            }
-        } else {
-            this.advanceSearch = -1
+            if (params["f_sft"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.SFT
+            }
+            minRating = params["f_srdd"]?.toIntOrNull() ?: -1
+            pageFrom = params["f_spf"]?.toIntOrNull() ?: -1
+            pageTo = params["f_spt"]?.toIntOrNull() ?: -1
        }
    }

-    fun build(): String {
-        return when (mode) {
-            MODE_NORMAL, MODE_SUBSCRIPTION -> ehUrl(EhUrl.WATCHED_PATH.takeIf { mode == MODE_SUBSCRIPTION }) {
-                if (category > 0) {
-                    addQueryParameter("f_cats", (category.inv() and EhUtils.ALL_CATEGORY).toString())
-                }
-                val query = mKeyword?.let {
-                    val index = Settings.languageFilter.value
-                    GalleryInfo.S_LANG_TAGS.getOrNull(index)?.let { lang ->
-                        "$it $lang"
-                    } ?: it
-                }
-                addQueryParameterIfNotBlank("f_search", query)
-                addQueryParameterIfNotBlank("prev", mPrev)
-                addQueryParameterIfNotBlank("next", mNext)
-                addQueryParameterIfNotBlank("seek", mJumpTo)
-                addQueryParameterIfNotBlank("range", mRange.takeIf { it > 0 }?.toString())
-                // Advance search
-                if (advanceSearch > 0 || minRating > 0 || pageFrom > 0 || pageTo > 0) {
-                    addQueryParameter("advsearch", "1")
-                    if (advanceSearch and AdvanceTable.SH != 0) {
-                        addQueryParameter("f_sh", "on")
-                    }
-                    if (advanceSearch and AdvanceTable.STO != 0) {
-                        addQueryParameter("f_sto", "on")
-                    }
-                    if (advanceSearch and AdvanceTable.SFL != 0) {
-                        addQueryParameter("f_sfl", "on")
-                    }
-                    if (advanceSearch and AdvanceTable.SFU != 0) {
-                        addQueryParameter("f_sfu", "on")
-                    }
-                    if (advanceSearch and AdvanceTable.SFT != 0) {
-                        addQueryParameter("f_sft", "on")
-                    }
-                    // Set min star
-                    if (minRating > 0) {
-                        addQueryParameter("f_sr", "on")
-                        addQueryParameter("f_srdd", "$minRating")
-                    }
-                    // Pages
-                    if (pageFrom > 0 || pageTo > 0) {
-                        addQueryParameter("f_sp", "on")
-                        addQueryParameterIfNotBlank(
-                            "f_spf",
-                            pageFrom.takeIf { it > 0 }?.toString(),
-                        )
-                        addQueryParameterIfNotBlank(
-                            "f_spt",
-                            pageTo.takeIf { it > 0 }?.toString(),
-                        )
-                    }
-                }
-            }.buildString()
-
-            MODE_UPLOADER, MODE_TAG -> {
-                val path = if (mode == MODE_UPLOADER) "uploader" else "tag"
-                ehUrl(listOf(path, requireNotNull(mKeyword))) {
-                    addQueryParameterIfNotBlank("prev", mPrev)
-                    addQueryParameterIfNotBlank("next", mNext)
-                    addQueryParameterIfNotBlank("seek", mJumpTo)
-                    addQueryParameterIfNotBlank("range", mRange.takeIf { it > 0 }?.toString())
-                }.buildString()
+    fun build(): String = when (mode) {
+        MODE_NORMAL, MODE_SUBSCRIPTION -> ehUrl(EhUrl.WATCHED_PATH.takeIf { mode == MODE_SUBSCRIPTION }) {
+            val category = if (!Settings.hasSignedIn.value && category <= 0) EhUtils.NON_H else category
+            if (category > 0) {
+                addQueryParameter("f_cats", "${EhUtils.invCategory(category)}")
            }
-
-            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))
-                    addQueryParameterIfNotBlank("p", mJumpTo)
-                }.buildString()
+            val query = mKeyword?.let { keyword ->
+                if (language == -1 || "gid:" in keyword || "l:" in keyword || "language:" in keyword) {
+                    keyword
+                } else {
+                    val tag = GalleryInfo.S_LANG_TAGS[language]
+                    if (keyword.isNotEmpty()) {
+                        "$tag $keyword"
+                    } else {
+                        tag
+                    }
+                }
            }
+            addQueryParameterIfNotBlank("f_search", query)
+            addQueryParameterIfNotBlank("prev", prev)
+            addQueryParameterIfNotBlank("next", next)
+            addQueryParameterIfNotBlank("seek", jumpTo)
+            addQueryParameterIfNotBlank("range", range.takeIf { it > 0 }?.toString())
+            // Advance search
+            if (advanceSearch > 0 || minRating > 0 || pageFrom > 0 || pageTo > 0) {
+                addQueryParameter("advsearch", "1")
+                if (advanceSearch and AdvanceTable.SH != 0) {
+                    addQueryParameter("f_sh", "on")
+                }
+                if (advanceSearch and AdvanceTable.STO != 0) {
+                    addQueryParameter("f_sto", "on")
+                }
+                if (advanceSearch and AdvanceTable.SFL != 0) {
+                    addQueryParameter("f_sfl", "on")
+                }
+                if (advanceSearch and AdvanceTable.SFU != 0) {
+                    addQueryParameter("f_sfu", "on")
+                }
+                if (advanceSearch and AdvanceTable.SFT != 0) {
+                    addQueryParameter("f_sft", "on")
+                }
+                // Set min star
+                if (minRating > 0) {
+                    addQueryParameter("f_srdd", "$minRating")
+                }
+                // Pages
+                if (pageFrom > 0 || pageTo > 0) {
+                    addQueryParameterIfNotBlank(
+                        "f_spf",
+                        pageFrom.takeIf { it > 0 }?.toString(),
+                    )
+                    addQueryParameterIfNotBlank(
+                        "f_spt",
+                        pageTo.takeIf { it > 0 }?.toString(),
+                    )
+                }
+            }
+        }.buildString()

-            else -> throw IllegalStateException("Unexpected value: $mode")
+        MODE_UPLOADER, MODE_TAG -> {
+            val path = if (mode == MODE_UPLOADER) "uploader" else "tag"
+            ehUrl(listOf(path, requireNotNull(mKeyword))) {
+                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))
+            addQueryParameterIfNotBlank("p", jumpTo)
+        }.buildString()
+
+        else -> throw IllegalStateException("Unexpected value: $mode")
    }

-    @IntDef(
-        MODE_NORMAL,
-        MODE_UPLOADER,
-        MODE_TAG,
-        MODE_WHATS_HOT,
-        MODE_IMAGE_SEARCH,
-        MODE_SUBSCRIPTION,
-        MODE_TOPLIST,
-    )
-    @Retention(AnnotationRetention.SOURCE)
-    private annotation class Mode
    companion object {
        const val MODE_NORMAL = 0x0
        const val MODE_UPLOADER = 0x1
@@ -1,33 +1,54 @@
 package com.hippo.ehviewer.client.data

-@JvmInline
-value class TagNamespace(val value: String) {
-    fun toPrefix(): String? = prefixMap[this]
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+@Serializable(TagNamespaceSerializer::class)
+sealed class TagNamespace(val value: String, val prefix: String?) {
+    object Artist : TagNamespace("artist", "a")
+    object Cosplayer : TagNamespace("cosplayer", "cos")
+    object Character : TagNamespace("character", "c")
+    object Female : TagNamespace("female", "f")
+    object Group : TagNamespace("group", "g")
+    object Language : TagNamespace("language", "l")
+    object Location : TagNamespace("location", "loc")
+    object Male : TagNamespace("male", "m")
+    object Mixed : TagNamespace("mixed", "x")
+    object Other : TagNamespace("other", "o")
+    object Parody : TagNamespace("parody", "p")
+    object Reclass : TagNamespace("reclass", "r")
+    object Temp : TagNamespace("temp", null)

    companion object {
-        val Artist = TagNamespace("artist")
-        val Cosplayer = TagNamespace("cosplayer")
-        val Character = TagNamespace("character")
-        val Female = TagNamespace("female")
-        val Group = TagNamespace("group")
-        val Language = TagNamespace("language")
-        val Male = TagNamespace("male")
-        val Mixed = TagNamespace("mixed")
-        val Other = TagNamespace("other")
-        val Parody = TagNamespace("parody")
-        val Reclass = TagNamespace("reclass")
-        private val prefixMap = mapOf(
-            Artist to "a",
-            Cosplayer to "cos",
-            Character to "c",
-            Female to "f",
-            Group to "g",
-            Language to "l",
-            Male to "m",
-            Mixed to "x",
-            Other to "o",
-            Parody to "p",
-            Reclass to "r",
-        )
+        fun from(value: String) = when (value) {
+            Artist.value -> Artist
+            Cosplayer.value -> Cosplayer
+            Character.value -> Character
+            Female.value -> Female
+            Group.value -> Group
+            Language.value -> Language
+            Location.value -> Location
+            Male.value -> Male
+            Mixed.value -> Mixed
+            Other.value -> Other
+            Parody.value -> Parody
+            Reclass.value -> Reclass
+            Temp.value -> Temp
+            else -> null
+        }
    }
 }
+
+object TagNamespaceSerializer : KSerializer<TagNamespace> {
+    override val descriptor = PrimitiveSerialDescriptor("TagNamespace", PrimitiveKind.STRING)
+    override fun deserialize(decoder: Decoder): TagNamespace {
+        val string = decoder.decodeString()
+        return TagNamespace.from(string) ?: throw SerializationException("Unknown tag namespace $string")
+    }
+    override fun serialize(encoder: Encoder, value: TagNamespace) = encoder.encodeString(value.value)
+}
@@ -0,0 +1,5 @@
+package com.hippo.ehviewer.client.exception
+
+import com.ehviewer.core.i18n.R
+
+class CloudflareBypassException : EhException(R.string.cloudflare_bypass_failed)
@@ -1,5 +1,5 @@
 package com.hippo.ehviewer.client.exception

-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R

 class InsufficientFundsException : EhException(R.string.insufficient_funds)
@@ -15,4 +15,6 @@
 */
 package com.hippo.ehviewer.client.exception

-class NoHAtHClientException(detailMessage: String?) : EhException(detailMessage)
+import com.ehviewer.core.i18n.R
+
+class NoHathClientException() : EhException(R.string.download_archive_failure_no_hath)
@@ -0,0 +1,5 @@
+package com.hippo.ehviewer.client.exception
+
+import com.ehviewer.core.i18n.R
+
+class NoHitsFoundException : EhException(R.string.gallery_list_empty_hit)
@@ -1,5 +1,5 @@
 package com.hippo.ehviewer.client.exception

-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R

 class NotLoggedInException : EhException(R.string.sign_in_first)
@@ -1,5 +1,5 @@
 package com.hippo.ehviewer.client.exception

-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R

 class QuotaExceededException : EhException(R.string.error_509)
@@ -15,78 +15,43 @@
 */
 package com.hippo.ehviewer.client.parser

-import com.hippo.ehviewer.client.exception.InsufficientFundsException
-import com.hippo.ehviewer.client.exception.NoHAtHClientException
-import eu.kanade.tachiyomi.util.system.logcat
-import org.jsoup.Jsoup
+import arrow.core.Either.Companion.catch
+import arrow.core.getOrElse
+import arrow.core.partially3
+import com.hippo.ehviewer.client.exception.ParseException
+import java.nio.ByteBuffer
+import kotlinx.serialization.Serializable

 object ArchiveParser {
-    private val PATTERN_ARCHIVE_URL =
-        Regex("<strong>(.*)</strong>.*<a href=\"([^\"]*)\">Click Here To Start Downloading</a>")
-    private val PATTERN_CURRENT_FUNDS =
-        Regex("<p>([\\d,]+) GP \\[[^]]*] &nbsp; ([\\d,]+) Credits \\[[^]]*]</p>")
-    private val PATTERN_HATH_FORM =
-        Regex("<form id=\"hathdl_form\" action=\"[^\"]*?or=([^=\"]*?)\" method=\"post\">")
-    private val PATTERN_HATH_ARCHIVE =
-        Regex("<p><a href=\"[^\"]*\" onclick=\"return do_hathdl\\('([0-9]+|org)'\\)\">([^<]+)</a></p>\\s*<p>([\\w. ]+)</p>\\s*<p>([\\w. ]+)</p>")
-    private const val ERROR_NEED_HATH_CLIENT =
-        "You must have a H@H client assigned to your account to use this feature."
-    private const val ERROR_INSUFFICIENT_FUNDS =
-        "You do not have enough funds to download this archive."
-
-    fun parse(body: String): Result {
-        val m = PATTERN_HATH_FORM.find(body)!!
-        val paramOr = m.groupValues[1]
-        val archiveList = ArrayList<Archive>()
-        Jsoup.parse(body).select("#db>div>div").forEach { element ->
-            if (element.childrenSize() > 0 && !element.attr("style").contains("color:#CCCCCC")) {
-                runCatching {
-                    val res = element.selectFirst("form>input")!!.attr("value")
-                    val name = element.selectFirst("form>div>input")!!.attr("value")
-                    val size = element.selectFirst("p>strong")!!.text()
-                    val cost = element.selectFirst("div>strong")!!.text().replace(",", "")
-                    Archive(res, name, size, cost, false)
-                }.onSuccess {
-                    archiveList.add(it)
-                }.onFailure {
-                    logcat(it)
-                }
-            }
+    fun parse(body: ByteBuffer, maybeFunds: Funds?) = catch {
+        if (maybeFunds != null) {
+            val archives = unmarshalParsingAs<List<Archive>>(body, ::parseArchives)
+            Result(archives, maybeFunds)
+        } else {
+            unmarshalParsingAs<Result>(body, ::parseArchives.partially3(true))
        }
-        PATTERN_HATH_ARCHIVE.findAll(body).forEach { matchResult ->
-            val (res, name, size, cost) = matchResult.groupValues.slice(1..4)
-                .map { ParserUtils.trim(it) }
-            val item = Archive(res, name, size, cost, true)
-            archiveList.add(item)
-        }
-        val result = Result(paramOr, archiveList, null)
-        PATTERN_CURRENT_FUNDS.find(body)?.groupValues?.run {
-            val fundsGP = ParserUtils.parseInt(get(1), 0)
-            val fundsC = ParserUtils.parseInt(get(2), 0)
-            val funds = HomeParser.Funds(fundsGP, fundsC)
-            result.funds = funds
-        }
-        return result
+    }.getOrElse {
+        throw ParseException("Can't parse archive list", it)
    }

-    fun parseArchiveUrl(body: String): String? {
-        if (body.contains(ERROR_NEED_HATH_CLIENT)) {
-            throw NoHAtHClientException("No H@H client")
-        } else if (body.contains(ERROR_INSUFFICIENT_FUNDS)) {
-            throw InsufficientFundsException()
-        }
-        return Jsoup.parse(body).selectFirst("#continue>a[href]")
-            ?.let { it.attr("href") + "?start=1" }
-        // TODO: Check more errors
+    fun parseArchiveUrl(body: ByteBuffer) = catch {
+        unmarshalParsingAs<String?>(body, ::parseArchiveUrl)
+    }.getOrElse {
+        throw ParseException("Can't parse archive url", it)
    }

-    class Archive(
-        val res: String,
-        val name: String,
-        val size: String,
-        val cost: String,
-        val isHAtH: Boolean,
-    )
-
-    class Result(val paramOr: String, val archiveList: List<Archive>, var funds: HomeParser.Funds?)
+    @Serializable
+    data class Result(val archiveList: List<Archive>, val funds: Funds)
 }
+
+@Serializable
+class Archive(
+    val res: String,
+    val name: String,
+    val size: String,
+    val cost: String,
+    val isHath: Boolean,
+)
+
+private external fun parseArchives(body: ByteBuffer, size: Int = body.limit(), parseFunds: Boolean = false): Int
+private external fun parseArchiveUrl(body: ByteBuffer, size: Int = body.limit()): Int
@@ -17,10 +17,10 @@
 */
 package com.hippo.ehviewer.client.parser

-import org.jsoup.Jsoup
+import java.nio.ByteBuffer

 object EventPaneParser {
-    fun parse(body: String): String? {
-        return Jsoup.parse(body).getElementById("eventpane")?.html()
-    }
+    private external fun parseEventPane(body: ByteBuffer, size: Int = body.limit()): Int
+
+    fun parse(body: ByteBuffer): String? = unmarshalParsingAs(body, ::parseEventPane)
 }
@@ -1,6 +1,7 @@
 package com.hippo.ehviewer.client.parser

 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
@@ -17,13 +18,16 @@ data class FavParserResult(
 }

 object FavoritesParser {
-    fun parse(body: ByteBuffer): FavParserResult {
-        return runSuspendCatching {
-            unmarshalParsingAs<FavParserResult>(body, ::parseFav)
-        }.getOrElse {
-            throw ParseException("Parse favorites error", it)
-        }
+    private val NoteRegex = Regex("<textarea[^>]*>([^<]*)</textarea>")
+
+    fun parse(body: ByteBuffer): FavParserResult = runSuspendCatching {
+        unmarshalParsingAs<FavParserResult>(body, ::parseFav)
+    }.getOrElse {
+        throw ParseException("Parse favorites error", it)
    }
+
+    fun parseNote(body: String) = NoteRegex.find(body)?.run { groupValues[1].unescapeXml() }
+        ?: throw ParseException("Can't parse favorite note")
 }

 private external fun parseFav(body: ByteBuffer, limit: Int = body.limit()): Int
@@ -1,35 +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.parser
-
-import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.exception.NotLoggedInException
-import com.hippo.ehviewer.util.ExceptionUtils
-import org.jsoup.Jsoup
-
-object ForumsParser {
-    fun parse(body: String): String {
-        return runCatching {
-            val d = Jsoup.parse(body, EhUrl.URL_FORUMS)
-            val userlinks = d.getElementById("userlinks")
-            val child = userlinks!!.child(0).child(0).child(0)
-            child.attr("href")
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            throw NotLoggedInException()
-        }
-    }
-}
@@ -16,7 +16,6 @@
 package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.EhUtils.getCategory
-import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.client.parseAs
@@ -32,7 +31,7 @@ object GalleryApiParser {
                title = item.title.unescapeXml()
                titleJpn = item.titleJpn.unescapeXml()
                category = getCategory(item.category)
-                thumbKey = getThumbKey(handleThumbUrlResolution(item.thumb)!!)
+                thumbKey = getThumbKey(item.thumb)
                uploader = item.uploader?.unescapeXml()
                posted = ParserUtils.formatDate(item.posted * 1000)
                rating = item.rating
@@ -15,481 +15,40 @@
 */
 package com.hippo.ehviewer.client.parser

-import arrow.core.unzip
-import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhFilter
-import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.EhUtils.getCategory
-import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryComment
+import arrow.core.Either
+import arrow.core.getOrElse
 import com.hippo.ehviewer.client.data.GalleryCommentList
 import com.hippo.ehviewer.client.data.GalleryDetail
-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.data.GalleryPreview
-import com.hippo.ehviewer.client.data.GalleryTagGroup
-import com.hippo.ehviewer.client.data.LargeGalleryPreview
-import com.hippo.ehviewer.client.data.NormalGalleryPreview
-import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.ehviewer.client.exception.OffensiveException
+import com.hippo.ehviewer.client.data.GalleryPreviewList
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.client.exception.PiningException
-import com.hippo.ehviewer.client.getThumbKey
-import com.hippo.ehviewer.util.ExceptionUtils
-import com.hippo.ehviewer.util.toEpochMillis
-import com.hippo.ehviewer.util.toFloatOrDefault
-import com.hippo.ehviewer.util.toIntOrDefault
-import com.hippo.ehviewer.util.trimAnd
-import com.hippo.ehviewer.util.unescapeXml
-import eu.kanade.tachiyomi.util.system.logcat
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.format.MonthNames
-import kotlinx.datetime.format.char
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import org.jsoup.nodes.Node
-import org.jsoup.select.Elements
-import org.jsoup.select.NodeTraversor
-import org.jsoup.select.NodeVisitor
+import java.nio.ByteBuffer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.cbor.CborArray

 object GalleryDetailParser {
-    private val PATTERN_ERROR = Regex("<div class=\"d\">\n<p>([^<]+)</p>")
-    private val PATTERN_DETAIL = Regex(
-        "var gid = (\\d+);.+?var token = \"([a-f0-9]+)\";.+?var apiuid = ([\\-\\d]+);.+?var apikey = \"([a-f0-9]+)\";",
-        RegexOption.DOT_MATCHES_ALL,
-    )
-    private val PATTERN_TORRENT =
-        Regex("<a[^<>]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Torrent Download[^<]+(\\d+)[^<]+</a")
-    private val PATTERN_ARCHIVE =
-        Regex("<a[^<>]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Archive Download</a>")
-    private val PATTERN_COVER = Regex("width:(\\d+)px; height:(\\d+)px.+?url\\((.+?)\\)")
-    private val PATTERN_PAGES =
-        Regex("<tr><td[^<>]*>Length:</td><td[^<>]*>([\\d,]+) pages</td></tr>")
-    private val PATTERN_PREVIEW_PAGES =
-        Regex("<td[^>]+><a[^>]+>([\\d,]+)</a></td><td[^>]+>(?:<a[^>]+>)?&gt;(?:</a>)?</td>")
-    private val PATTERN_NORMAL_PREVIEW =
-        Regex("<div class=\"gdtm\"[^<>]*><div[^<>]*width:(\\d+)[^<>]*height:(\\d+)[^<>]*\\((.+?)\\)[^<>]*-(\\d+)px[^<>]*><a[^<>]*href=\"(.+?)\"[^<>]*><img alt=\"([\\d,]+)\"")
-    private val PATTERN_LARGE_PREVIEW =
-        Regex("<div class=\"gdtl\".+?<a href=\"(.+?)\"><img alt=\"([\\d,]+)\".+?src=\"(.+?)\"")
-    private val PATTERN_NEWER_DATE = Regex(", added (.+?)<br />")
-    private val PATTERN_FAVORITE_SLOT =
-        Regex("/fav.png\\); background-position:0px -(\\d+)px")
-    private val EMPTY_GALLERY_COMMENT_LIST = GalleryCommentList(emptyList(), false)
-
-    // dd MMMM yyyy, HH:mm
-    private val WEB_COMMENT_DATE_FORMAT = LocalDateTime.Format {
-        dayOfMonth()
-        char(' ')
-        monthName(MonthNames.ENGLISH_FULL)
-        char(' ')
-        year()
-        chars(", ")
-        hour()
-        char(':')
-        minute()
-    }
-    private const val OFFENSIVE_STRING =
-        "<p>(And if you choose to ignore this warning, you lose all rights to complain about it in the future.)</p>"
-    private const val PINING_STRING = "<p>This gallery is pining for the fjords.</p>"
-
-    suspend fun parse(body: String): GalleryDetail {
-        if (body.contains(OFFENSIVE_STRING)) {
-            throw OffensiveException()
-        }
-        if (body.contains(PINING_STRING)) {
-            throw PiningException()
-        }
-
-        // Error info
-        PATTERN_ERROR.find(body)?.run { throw EhException(groupValues[1]) }
-        val document = Jsoup.parse(body)
-        val galleryDetail = GalleryDetail(
-            tags = parseTagGroups(document),
-            comments = parseComments(document),
-            previewPages = parsePreviewPages(body),
-            previewList = parsePreviewList(body).first,
-        )
-        parseDetail(galleryDetail, document, body)
-
-        // Fill info for database
-        galleryDetail.fillInfo()
-        return galleryDetail
+    fun parse(body: ByteBuffer) = Either.catch {
+        unmarshalParsingAs<Result>(body, ::nativeParse)
+    }.getOrElse {
+        throw ParseException("Failed to parse gallery detail", it)
    }

-    private suspend fun parseDetail(gd: GalleryDetail, d: Document, body: String) {
-        PATTERN_DETAIL.find(body)?.apply {
-            gd.gid = groupValues[1].toLongOrNull() ?: -1L
-            gd.token = groupValues[2]
-            gd.apiUid = groupValues[3].toLongOrNull() ?: -1L
-            gd.apiKey = groupValues[4]
-        } ?: throw ParseException("Can't parse gallery detail")
-        if (gd.gid == -1L) {
-            throw ParseException("Can't parse gallery detail")
-        }
-        PATTERN_TORRENT.find(body)?.run {
-            gd.torrentUrl = groupValues[1].trim().unescapeXml()
-            gd.torrentCount = groupValues[2].toIntOrNull() ?: 0
-        }
-        PATTERN_ARCHIVE.find(body)?.run {
-            gd.archiveUrl = groupValues[1].trim().unescapeXml()
-        }
-        try {
-            val gm = d.getElementsByClass("gm")[0]
-            // Thumb url
-            gm.getElementById("gd1")?.child(0)?.attr("style")?.trim()?.let {
-                gd.thumbKey = getThumbKey(
-                    PATTERN_COVER.find(it)?.run {
-                        handleThumbUrlResolution(groupValues[3])
-                    }!!,
-                )
-            }
-
-            gd.title = gm.getElementById("gn")?.text()?.trim()
-            gd.titleJpn = gm.getElementById("gj")?.text()?.trim()
-
-            // Category
-            try {
-                val gdc = gm.getElementById("gdc")!!
-                var ce = gdc.getElementsByClass("cn").first()
-                if (ce == null) {
-                    ce = gdc.getElementsByClass("cs").first()
-                }
-                gd.category = getCategory(ce!!.text())
-            } catch (e: Throwable) {
-                ExceptionUtils.throwIfFatal(e)
-                gd.category = EhUtils.UNKNOWN
-            }
-
-            // Uploader
-            val gdn = gm.getElementById("gdn")
-            if (null != gdn) {
-                gd.disowned = gdn.attr("style").contains("opacity:0.5")
-                gd.uploader = gdn.text().trim()
-            } else {
-                gd.uploader = ""
-            }
-            val gdd = gm.getElementById("gdd")
-            gd.posted = ""
-            gd.parent = ""
-            gd.visible = ""
-            gd.size = ""
-            gd.pages = 0
-            gd.favoriteCount = 0
-            val es = gdd!!.child(0).child(0).children()
-            es.forEach {
-                parseDetailInfo(gd, it)
-            }
-
-            // Rating count
-            val ratingCount = gm.getElementById("rating_count")
-            if (null != ratingCount) {
-                gd.ratingCount = ratingCount.text().trim().toIntOrDefault(0)
-            } else {
-                gd.ratingCount = 0
-            }
-
-            // Rating
-            val ratingLabel = gm.getElementById("rating_label")
-            if (null != ratingLabel) {
-                val ratingStr = ratingLabel.text().trim()
-                if ("Not Yet Rated" == ratingStr) {
-                    gd.rating = -1.0f
-                } else {
-                    val index = ratingStr.indexOf(' ')
-                    if (index == -1 || index >= ratingStr.length) {
-                        gd.rating = 0f
-                    } else {
-                        gd.rating = ratingStr.substring(index + 1).toFloatOrDefault(0f)
-                    }
-                }
-            } else {
-                gd.rating = -1.0f
-            }
-
-            // isFavorited
-            val gdf = gm.getElementById("gdf")
-            if (gdf != null) {
-                val favoriteName = gdf.text().trim()
-                if (favoriteName != "Add to Favorites") {
-                    gd.favoriteName = gdf.text().trim()
-                    PATTERN_FAVORITE_SLOT.find(body)?.run {
-                        gd.favoriteSlot = ((groupValues[1].toIntOrNull() ?: 2) - 2) / 19
-                    }
-                }
-            }
-            if (gd.favoriteSlot == NOT_FAVORITED && EhDB.containLocalFavorites(gd.gid)) {
-                gd.favoriteSlot = LOCAL_FAVORITED
-            }
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            throw ParseException("Can't parse gallery detail")
-        }
-
-        // newer version
-        d.getElementById("gnd")?.run {
-            val dates = PATTERN_NEWER_DATE.findAll(body).map { it.groupValues[1] }.toList()
-            gd.newerVersions = select("a").mapIndexedNotNull { index, element ->
-                val result = GalleryDetailUrlParser.parse(element.attr("href"))
-                result?.run {
-                    BaseGalleryInfo(gid, token, element.text().trim(), posted = dates[index])
-                }
-            }
-        }
+    fun parseComments(body: ByteBuffer) = Either.catch {
+        unmarshalParsingAs<GalleryCommentList>(body, ::nativeParseComments)
+    }.getOrElse {
+        throw ParseException("Failed to parse comments", it)
    }

-    private fun parseDetailInfo(gd: GalleryDetail, e: Element) {
-        val es = e.children()
-        if (es.size < 2) {
-            return
-        }
-        val key = es[0].text().trim()
-        val value = es[1].ownText().trim()
-        if (key.startsWith("Posted")) {
-            gd.posted = value
-        } else if (key.startsWith("Parent")) {
-            val a = es[1].children().first()
-            if (a != null) {
-                gd.parent = a.attr("href")
-            }
-        } else if (key.startsWith("Visible")) {
-            gd.visible = value
-        } else if (key.startsWith("Language")) {
-            gd.language = value
-        } else if (key.startsWith("File Size")) {
-            gd.size = value
-        } else if (key.startsWith("Length")) {
-            val index = value.indexOf(' ')
-            if (index >= 0) {
-                gd.pages = value.substring(0, index).toIntOrDefault(1)
-            } else {
-                gd.pages = 1
-            }
-        } else if (key.startsWith("Favorited")) {
-            when (value) {
-                "Never" -> gd.favoriteCount = 0
-                "Once" -> gd.favoriteCount = 1
-                else -> {
-                    val index = value.indexOf(' ')
-                    if (index == -1) {
-                        gd.favoriteCount = 0
-                    } else {
-                        gd.favoriteCount = value.substring(0, index).toIntOrDefault(0)
-                    }
-                }
-            }
-        }
+    fun parsePreviews(body: ByteBuffer) = Either.catch {
+        unmarshalParsingAs<GalleryPreviewList>(body, ::nativeParsePreviews)
+    }.getOrElse {
+        throw ParseException("Failed to parse previews", it)
    }

-    private fun parseTagGroup(element: Element): GalleryTagGroup? {
-        return try {
-            var nameSpace = element.child(0).text()
-            // Remove last ':'
-            nameSpace = nameSpace.substring(0, nameSpace.length - 1)
-            val group = GalleryTagGroup(nameSpace)
-            val tags = element.child(1).children()
-            tags.forEach {
-                var tag = it.text()
-                // Sometimes parody tag is followed with '|' and english translate, just remove them
-                val index = tag.indexOf('|')
-                if (index >= 0) {
-                    tag = tag.substring(0, index).trim()
-                }
-                if (it.className() == "gtw") {
-                    tag = "_$tag" // weak tag
-                }
-                group.add(tag)
-            }
-            if (group.size > 0) group else null
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            null
-        }
-    }
+    @Serializable
+    @CborArray
+    class Result(val detail: GalleryDetail, val event: String?)

-    /**
-     * Parse tag groups with html parser
-     */
-    private fun parseTagGroups(document: Document): List<GalleryTagGroup> {
-        return try {
-            val taglist = document.getElementById("taglist")!!
-            val tagGroups = taglist.child(0).child(0).children()
-            parseTagGroups(tagGroups)
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            emptyList()
-        }
-    }
-
-    private fun parseTagGroups(trs: Elements): List<GalleryTagGroup> {
-        return try {
-            trs.mapNotNull { parseTagGroup(it) }
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            emptyList()
-        }
-    }
-
-    private suspend fun parseComment(element: Element): GalleryComment? {
-        return try {
-            // Id
-            val a = element.previousElementSibling()
-            val name = a!!.attr("name")
-            val id = name trimAnd { substring(1).toInt().toLong() }
-            // Editable, vote up and vote down
-            val c4 = element.getElementsByClass("c4").first()
-            var voteUpAble = false
-            var voteUpEd = false
-            var voteDownAble = false
-            var voteDownEd = false
-            var editable = false
-            var uploader = false
-            if (null != c4) {
-                if ("Uploader Comment" == c4.text()) {
-                    uploader = true
-                }
-                for (e in c4.children()) {
-                    when (e.text()) {
-                        "Vote+" -> {
-                            voteUpAble = true
-                            voteUpEd = e.attr("style").trim().isNotEmpty()
-                        }
-
-                        "Vote-" -> {
-                            voteDownAble = true
-                            voteDownEd = e.attr("style").trim().isNotEmpty()
-                        }
-
-                        "Edit" -> editable = true
-                    }
-                }
-            }
-            // Vote state
-            val c7 = element.getElementsByClass("c7").first()
-            val voteState = c7?.text()?.trim()
-            // Score
-            val c5 = element.getElementsByClass("c5").first()
-            val score = c5?.children()?.first()?.text()?.trim()?.toIntOrDefault(0) ?: 0
-            // time
-            val c3 = element.getElementsByClass("c3").first()
-            val temp = c3!!.ownText()
-            val (timeStr, user) = if (temp.endsWith(':')) {
-                temp.substring("Posted on ".length, temp.length - " by:".length) to c3.child(0).text()
-            } else {
-                temp.substring("Posted on ".length) to null
-            }
-            val time = WEB_COMMENT_DATE_FORMAT.parse(timeStr).toEpochMillis()
-            // comment
-            val c6 = element.getElementsByClass("c6").first()
-            // fix underline support
-            for (e in c6!!.children()) {
-                if ("span" == e.tagName() && "text-decoration:underline;" == e.attr("style")) {
-                    e.tagName("u")
-                }
-            }
-            val commentHtml = c6.html()
-            // filter comment
-            if (!uploader) {
-                val sEhFilter = EhFilter
-                if (score <= Settings.commentThreshold || sEhFilter.filterCommenter(user.orEmpty()) || sEhFilter.filterComment(commentHtml)) {
-                    return null
-                }
-            }
-            // last edited
-            val c8 = element.getElementsByClass("c8").first()
-            val lastEdited = c8?.children()?.first()?.run { WEB_COMMENT_DATE_FORMAT.parse(text()).toEpochMillis() } ?: 0
-            GalleryComment(
-                id, score, editable, voteUpAble, voteUpEd, voteDownAble,
-                voteDownEd, uploader, voteState, time, user, commentHtml, lastEdited,
-            )
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            null
-        }
-    }
-
-    /**
-     * Parse comments with html parser
-     */
-    suspend fun parseComments(document: Document): GalleryCommentList {
-        // Disable pretty print to get comments in raw html
-        document.outputSettings().prettyPrint(false)
-        return try {
-            val cdiv = document.getElementById("cdiv")!!
-            val c1s = cdiv.getElementsByClass("c1")
-            val list = c1s.mapNotNull { parseComment(it) }
-            val chd = cdiv.getElementById("chd")
-            var hasMore = false
-            NodeTraversor.traverse(
-                object : NodeVisitor {
-                    override fun head(node: Node, depth: Int) {
-                        if (node is Element && node.text() == "click to show all") {
-                            hasMore = true
-                        }
-                    }
-
-                    override fun tail(node: Node, depth: Int) {}
-                },
-                chd!!,
-            )
-            GalleryCommentList(list, hasMore)
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            EMPTY_GALLERY_COMMENT_LIST
-        }
-    }
-
-    /**
-     * Parse preview pages with regular expressions
-     */
-    fun parsePreviewPages(body: String): Int {
-        return PATTERN_PREVIEW_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
-            ?: throw ParseException("Parse preview page count error")
-    }
-
-    /**
-     * Parse pages with regular expressions
-     */
-    fun parsePages(body: String): Int {
-        return PATTERN_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
-            ?: throw ParseException("Parse pages error")
-    }
-
-    fun parsePreviewList(body: String): Pair<List<GalleryPreview>, List<String>> {
-        return runCatching { parseNormalPreview(body) }.getOrElse { parseLargePreview(body) }
-    }
-
-    private fun parseLargePreview(body: String): Pair<List<GalleryPreview>, List<String>> {
-        check(PATTERN_LARGE_PREVIEW.containsMatchIn(body))
-        return PATTERN_LARGE_PREVIEW.findAll(body).unzip {
-            val position = it.groupValues[2].toInt() - 1
-            val imageKey = getThumbKey(it.groupValues[3].trim())
-            val pageUrl = it.groupValues[1].trim()
-            LargeGalleryPreview(imageKey, position) to pageUrl
-        }.run {
-            first.toList() to second.toList()
-        }
-    }
-
-    private fun parseNormalPreview(body: String): Pair<List<GalleryPreview>, List<String>> {
-        check(PATTERN_NORMAL_PREVIEW.containsMatchIn(body))
-        return PATTERN_NORMAL_PREVIEW.findAll(body).unzip {
-            val position = it.groupValues[6].toInt() - 1
-            val imageKey = getThumbKey(it.groupValues[3].trim())
-            val xOffset = it.groupValues[4].toIntOrNull() ?: 0
-            val width = it.groupValues[1].toInt()
-            val height = it.groupValues[2].toInt()
-            val pageUrl = it.groupValues[5].trim()
-            NormalGalleryPreview(imageKey, position, xOffset, width, height) to pageUrl
-        }.run {
-            first.toList() to second.toList()
-        }
-    }
+    private external fun nativeParse(body: ByteBuffer, size: Int = body.limit()): Int
+    private external fun nativeParseComments(body: ByteBuffer, size: Int = body.limit()): Int
+    private external fun nativeParsePreviews(body: ByteBuffer, size: Int = body.limit()): Int
 }
@@ -16,27 +16,21 @@
 package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.util.toLongOrDefault
-import java.util.regex.Pattern

 /**
 * Like http://exhentai.org/g/1234567/a1b2c3d4e5<br></br>
 */
 object GalleryDetailUrlParser {
-    private val URL_STRICT_PATTERN = Pattern.compile(
+    private val URL_STRICT_PATTERN = Regex(
        "https?://(?:${EhUrl.DOMAIN_EX}|${EhUrl.DOMAIN_E}(?:/lofi)?)/(?:g|mpv)/(\\d+)/([0-9a-f]{10})",
    )
-    private val URL_PATTERN = Pattern.compile("(\\d+)/([0-9a-f]{10})(?:[^0-9a-f]|$)")
+    private val URL_PATTERN = Regex("(\\d+)/([0-9a-f]{10})(?:[^0-9a-f]|$)")

    fun parse(url: String?, strict: Boolean = true): Result? {
        url ?: return null
        val pattern = if (strict) URL_STRICT_PATTERN else URL_PATTERN
-        val m = pattern.matcher(url)
-        return if (m.find()) {
-            val gid = m.group(1)!!.toLongOrDefault(0).takeIf { it > 0 }
-            gid?.let { Result(it, m.group(2)!!) }
-        } else {
-            null
+        return pattern.find(url)?.destructured?.let { (gid, token) ->
+            Result(gid.toLong(), token)
        }
    }

@@ -15,124 +15,56 @@
 */
 package com.hippo.ehviewer.client.parser

-import android.net.Uri
-import android.os.Build
+import arrow.core.Either
 import com.hippo.ehviewer.client.EhUrl
+import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.ListUrlBuilder
-import eu.kanade.tachiyomi.util.system.logcat
-import java.io.UnsupportedEncodingException
-import java.net.MalformedURLException
-import java.net.URL
-import java.net.URLDecoder
-import java.nio.charset.StandardCharsets
+import io.ktor.http.Url
+import io.ktor.http.decodeURLQueryComponent

 object GalleryListUrlParser {
-    private val VALID_HOSTS = arrayOf(EhUrl.DOMAIN_EX, EhUrl.DOMAIN_E)
-    private const val PATH_NORMAL = "/"
-    private const val PATH_UPLOADER = "/uploader/"
-    private const val PATH_TAG = "/tag/"
-    private const val PATH_TOPLIST = "/toplist.php"
-    fun parse(urlStr: String): ListUrlBuilder? {
-        val url = try {
-            URL(urlStr)
-        } catch (e: MalformedURLException) {
+    fun parse(urlStr: String) = Either.catch {
+        val url = Url(urlStr)
+        if (url.host != EhUrl.DOMAIN_E && url.host != EhUrl.DOMAIN_EX) {
            return null
        }
-        if (url.host !in VALID_HOSTS) {
-            return null
-        }
-        val path = url.path ?: return null
-        return if (PATH_NORMAL == path || path.isEmpty()) {
-            ListUrlBuilder(url.query)
-        } else if (path.startsWith(PATH_UPLOADER)) {
-            parseUploader(path)
-        } else if (path.startsWith(PATH_TAG)) {
-            parseTag(path)
-        } else if (path.startsWith(PATH_TOPLIST)) {
-            parseToplist(urlStr)
-        } else if (path.startsWith("/")) {
-            val category = try {
-                path.substring(1).toInt()
-            } catch (e: NumberFormatException) {
-                return null
+        val segments = url.segments
+        if (segments.isEmpty()) {
+            ListUrlBuilder(url.parameters).apply {
+                url.parameters["f_shash"]?.let {
+                    mode = ListUrlBuilder.MODE_IMAGE_SEARCH
+                    hash = it
+                }
            }
-            ListUrlBuilder(url.query).also { it.category = category }
        } else {
-            null
-        }
-    }
+            when (val head = segments[0]) {
+                "uploader", "tag" -> ListUrlBuilder(url.parameters).apply {
+                    mode = if (head == "uploader") ListUrlBuilder.MODE_UPLOADER else ListUrlBuilder.MODE_TAG
+                    keyword = segments[1].decodeURLQueryComponent(plusIsSpace = true)
+                }

-    // TODO get page
-    private fun parseUploader(path: String): ListUrlBuilder? {
-        var uploader: String?
-        val prefixLength = PATH_UPLOADER.length
-        val index = path.indexOf('/', prefixLength)
-        uploader = if (index < 0) {
-            path.substring(prefixLength)
-        } else {
-            path.substring(prefixLength, index)
-        }
-        uploader = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            URLDecoder.decode(uploader, StandardCharsets.UTF_8)
-        } else {
-            try {
-                URLDecoder.decode(uploader, StandardCharsets.UTF_8.displayName())
-            } catch (e: UnsupportedEncodingException) {
-                logcat(e)
-                return null
+                "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,
+                        )
+                    } else {
+                        null
+                    }
+                }
+
+                else -> {
+                    val category = EhUtils.getCategory(head)
+                    if (category != EhUtils.UNKNOWN) {
+                        ListUrlBuilder(url.parameters).also { it.category = category }
+                    } else {
+                        null
+                    }
+                }
            }
        }
-        if (uploader.isNullOrEmpty()) {
-            return null
-        }
-        val builder = ListUrlBuilder()
-        builder.mode = ListUrlBuilder.MODE_UPLOADER
-        builder.keyword = uploader
-        return builder
-    }
-
-    // TODO get page
-    private fun parseTag(path: String): ListUrlBuilder? {
-        var tag: String?
-        val prefixLength = PATH_TAG.length
-        val index = path.indexOf('/', prefixLength)
-        tag = if (index < 0) {
-            path.substring(prefixLength)
-        } else {
-            path.substring(prefixLength, index)
-        }
-        tag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            URLDecoder.decode(tag, StandardCharsets.UTF_8)
-        } else {
-            try {
-                URLDecoder.decode(tag, StandardCharsets.UTF_8.displayName())
-            } catch (e: UnsupportedEncodingException) {
-                logcat(e)
-                return null
-            }
-        }
-        if (tag.isNullOrEmpty()) {
-            return null
-        }
-        val builder = ListUrlBuilder()
-        builder.mode = ListUrlBuilder.MODE_TAG
-        builder.keyword = tag
-        return builder
-    }
-
-    // TODO get page
-    private fun parseToplist(path: String): ListUrlBuilder? {
-        val uri = Uri.parse(path)
-        if (uri == null || uri.getQueryParameter("tl").isNullOrEmpty()) {
-            return null
-        }
-        val tl = uri.getQueryParameter("tl")!!.toInt()
-        if (tl > 15 || tl < 11) {
-            return null
-        }
-        val builder = ListUrlBuilder()
-        builder.mode = ListUrlBuilder.MODE_TOPLIST
-        builder.keyword = tl.toString()
-        return builder
-    }
+    }.getOrNull()
 }
@@ -19,22 +19,18 @@ package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.util.ExceptionUtils
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

 object GalleryMultiPageViewerPTokenParser {
    private const val IMAGE_LIST_STRING = "var imagelist = "

-    fun parse(body: String): List<String> {
+    fun parse(body: String): List<String> = runCatching {
        val index = body.indexOf(IMAGE_LIST_STRING)
        val imagelist = body.substring(index + IMAGE_LIST_STRING.length, body.indexOf(";", index))
-        return runCatching {
-            imagelist.parseAs<List<Item>>().map(Item::token)
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse pToken from MPV error", it)
-        }
+        imagelist.parseAs<List<Item>>().map(Item::token)
+    }.getOrElse {
+        throw ParseException("Parse pToken from MPV error", it)
    }

    @Serializable
@@ -1,35 +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.client.parser
-
-import com.hippo.ehviewer.util.ExceptionUtils
-import eu.kanade.tachiyomi.util.system.logcat
-import org.jsoup.Jsoup
-
-object GalleryNotAvailableParser {
-    fun parse(body: String): String? {
-        return runCatching {
-            val e = Jsoup.parse(body).getElementsByClass("d").first()
-            e!!.child(0).html().replace("<br>", "\n")
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            logcat(it)
-            null
-        }
-    }
-}
@@ -16,34 +16,21 @@
 package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.util.toIntOrDefault
-import com.hippo.ehviewer.util.toLongOrDefault
-import java.util.regex.Pattern

 /**
 * Like http://exhentai.org/s/91ea4b6d89/901103-12
 */
 object GalleryPageUrlParser {
-    private val URL_STRICT_PATTERN = Pattern.compile(
+    private val URL_STRICT_PATTERN = Regex(
        "https?://(?:${EhUrl.DOMAIN_EX}|${EhUrl.DOMAIN_E}(?:/lofi)?)/s/([0-9a-f]{10})/(\\d+)-(\\d+)",
    )
-    private val URL_PATTERN = Pattern.compile("([0-9a-f]{10})/(\\d+)-(\\d+)")
+    private val URL_PATTERN = Regex("([0-9a-f]{10})/(\\d+)-(\\d+)")

    fun parse(url: String?, strict: Boolean = true): Result? {
        url ?: return null
        val pattern = if (strict) URL_STRICT_PATTERN else URL_PATTERN
-        val m = pattern.matcher(url)
-        return if (m.find()) {
-            val gid = m.group(2)!!.toLongOrDefault(-1L)
-            val pToken = m.group(1)!!
-            val page = m.group(3)!!.toIntOrDefault(0) - 1
-            if (gid < 0 || page < 0) {
-                null
-            } else {
-                Result(gid, pToken, page)
-            }
-        } else {
-            null
+        return pattern.find(url)?.destructured?.let { (pToken, gid, page) ->
+            Result(gid.toLong(), pToken, page.toInt() - 1)
        }
    }

@@ -15,9 +15,10 @@
 */
 package com.hippo.ehviewer.client.parser

+import arrow.core.Either
+import arrow.core.getOrElse
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.util.ExceptionUtils
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

@@ -32,13 +33,10 @@ object GalleryTokenApiParser {
     * ]
     * }
     */
-    fun parse(body: String): String {
-        return runCatching {
-            body.parseAs<Result>().tokenList[0].token
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            throw EhException(body.parseAs<Error>().error)
-        }
+    fun parse(body: String): String = Either.catch {
+        body.parseAs<Result>().tokenList[0].token
+    }.getOrElse {
+        throw EhException(body.parseAs<VoteTagResult>().error)
    }

    @Serializable
@@ -1,14 +1,14 @@
 package com.hippo.ehviewer.client.parser

-import android.os.Parcelable
 import com.hippo.ehviewer.client.exception.InsufficientFundsException
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
-import kotlinx.parcelize.Parcelize
+import kotlin.random.Random
 import kotlinx.serialization.Serializable

 object HomeParser {
-    private val PATTERN_FUNDS = Regex("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", RegexOption.DOT_MATCHES_ALL)
+    private val TorrentKeyRegex = Regex("Your current key is: <[^>]*>([^<]*)<")
+    private val FundsRegex = Regex("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", RegexOption.DOT_MATCHES_ALL)
    private const val INSUFFICIENT_FUNDS = "Insufficient funds."

    fun parse(body: ByteBuffer) = runCatching {
@@ -21,24 +21,25 @@ object HomeParser {
        }
    }

+    fun parseTorrentKey(body: String) = TorrentKeyRegex.find(body)?.run { groupValues[1] }
+        ?: throw ParseException("Parse torrent key error")
+
    fun parseFunds(body: String): Funds {
-        PATTERN_FUNDS.find(body)?.groupValues?.run {
-            val fundsC = ParserUtils.parseInt(get(1), 0)
-            val fundsGP = ParserUtils.parseInt(get(2), 0) * 1000
+        FundsRegex.find(body)?.run {
+            val fundsC = ParserUtils.parseInt(groupValues[1], 0)
+            val fundsGP = ParserUtils.parseInt(groupValues[2], 0)
            return Funds(fundsGP, fundsC)
        }
        throw ParseException("Parse funds error")
    }

-    @Parcelize
-    data class Funds(val fundsGP: Int, val fundsC: Int) : Parcelable
-
-    @Parcelize
-    data class Result(val limits: Limits, val funds: Funds) : Parcelable
+    data class Result(val limits: Limits, val funds: Funds, private val id: Int = Random.nextInt())
 }

-@Parcelize
@Serializable
-data class Limits(val current: Int, val maximum: Int, val resetCost: Int) : Parcelable
+data class Funds(val gp: Int, val credit: Int)
+
+@Serializable
+data class Limits(val current: Int, val maximum: Int, val resetCost: Int)

 private external fun parseLimit(body: ByteBuffer, limit: Int = body.limit()): Int
@@ -15,10 +15,9 @@
 */
 package com.hippo.ehviewer.client.parser

+import com.hippo.ehviewer.util.toEpochMillis
 import com.hippo.ehviewer.util.toIntOrDefault
 import com.hippo.ehviewer.util.toLocalDateTime
-import com.hippo.ehviewer.util.toLongOrDefault
-import com.hippo.ehviewer.util.unescapeXml
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.format.char

@@ -29,27 +28,16 @@ object ParserUtils {
        char('-')
        monthNumber()
        char('-')
-        dayOfMonth()
+        day()
        char(' ')
        hour()
        char(':')
        minute()
    }

-    @Synchronized
-    fun formatDate(time: Long): String {
-        return formatter.format(time.toLocalDateTime())
-    }
+    fun formatDate(time: Long): String = formatter.format(time.toLocalDateTime())

-    fun trim(str: String?): String {
-        return str?.unescapeXml()?.trim() ?: ""
-    }
+    fun parseDate(str: String): Long = formatter.parse(str).toEpochMillis()

-    fun parseInt(str: String?, defValue: Int): Int {
-        return trim(str).replace(",", "").toIntOrDefault(defValue)
-    }
-
-    fun parseLong(str: String?, defValue: Long): Long {
-        return trim(str).replace(",", "").toLongOrDefault(defValue)
-    }
+    fun parseInt(str: String, defValue: Int): Int = str.replace(",", "").toIntOrDefault(defValue)
 }
@@ -15,39 +15,28 @@
 */
 package com.hippo.ehviewer.client.parser

-import com.hippo.ehviewer.client.EhUrl
+import arrow.core.Either.Companion.catch
+import arrow.core.getOrElse
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.util.ExceptionUtils
-import eu.kanade.tachiyomi.util.system.logcat
-import org.jsoup.Jsoup
+import java.nio.ByteBuffer
+import kotlinx.serialization.Serializable

 object ProfileParser {
-    fun parse(body: String): Result {
-        return runCatching {
-            val d = Jsoup.parse(body)
-            val profilename = d.getElementById("profilename")
-            val displayName = profilename!!.child(0).text()
-            val avatar = runCatching {
-                val avatar =
-                    profilename.nextElementSibling()!!.nextElementSibling()!!.child(0).attr("src")
-                if (avatar.isEmpty()) {
-                    null
-                } else if (!avatar.startsWith("http")) {
-                    EhUrl.URL_FORUMS + avatar
-                } else {
-                    avatar
-                }
-            }.getOrElse {
-                ExceptionUtils.throwIfFatal(it)
-                logcat { "No avatar" }
-                null
-            }
-            Result(displayName, avatar)
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse forums error")
-        }
+    fun parse(body: ByteBuffer) = catch {
+        unmarshalParsingAs<Result>(body, ::parseProfile)
+    }.getOrElse {
+        throw ParseException("Failed to parse profile", it)
    }

-    class Result(val displayName: String?, val avatar: String?)
+    fun parseProfileUrl(body: ByteBuffer) = catch {
+        unmarshalParsingAs<String>(body, ::parseProfileUrl)
+    }.getOrElse {
+        throw ParseException("Failed to parse profile url", it)
+    }
+
+    @Serializable
+    data class Result(val displayName: String, val avatar: String?)
+
+    private external fun parseProfile(body: ByteBuffer, size: Int = body.limit()): Int
+    private external fun parseProfileUrl(body: ByteBuffer, size: Int = body.limit()): Int
 }
@@ -17,26 +17,17 @@ package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.ParseException
-import java.util.regex.Pattern

 object SignInParser {
-    private val NAME_PATTERN = Pattern.compile("<p>You are now logged in as: (.+?)<")
-    private val ERROR_PATTERN = Pattern.compile(
+    private val NAME_PATTERN = Regex("<p>You are now logged in as: (.+?)<")
+    private val ERROR_PATTERN = Regex(
        "<h4>The error returned was:</h4>\\s*<p>(.+?)</p>" +
            "|<span class=\"postcolor\">(.+?)</span>",
    )

-    fun parse(body: String): String {
-        var m = NAME_PATTERN.matcher(body)
-        return if (m.find()) {
-            m.group(1)!!
-        } else {
-            m = ERROR_PATTERN.matcher(body)
-            if (m.find()) {
-                throw EhException(m.group(1) ?: m.group(2))
-            } else {
-                throw ParseException("Can't parse sign in")
-            }
-        }
-    }
+    fun parse(body: String): String = NAME_PATTERN.find(body)?.let {
+        it.groupValues[1]
+    } ?: ERROR_PATTERN.find(body)?.let {
+        throw EhException(it.groupValues[1].ifEmpty { it.groupValues[2] })
+    } ?: throw ParseException("Can't parse sign in")
 }
@@ -14,16 +14,18 @@ object TorrentParser {

@Serializable
 data class Torrent(
+    val outdated: Boolean,
    val posted: String,
    val size: String,
    val seeds: Int,
    val peers: Int,
    val downloads: Int,
+    val uploader: String,
    val url: String,
    val name: String,
 )

-fun Torrent.format() = "[$posted] $name [$size] [↑$seeds ↓$peers ✓$downloads]"
+fun Torrent.format() = "↑$seeds ↓$peers ✓$downloads"

 typealias TorrentResult = List<Torrent>

@@ -0,0 +1,16 @@
+package com.hippo.ehviewer.client.parser
+
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.exception.ParseException
+import java.nio.ByteBuffer
+
+object UserConfigParser {
+    private external fun parseFavCat(body: ByteBuffer, size: Int = body.limit()): Int
+
+    fun parse(body: ByteBuffer) = runCatching {
+        val favCat = unmarshalParsingAs<Array<String>>(body, ::parseFavCat)
+        Settings.favCat = favCat
+    }.onFailure {
+        throw ParseException("Can't parse user config", it)
+    }
+}
@@ -17,11 +17,18 @@
 */
 package com.hippo.ehviewer.client.parser

-import com.hippo.ehviewer.client.parseAs
+import arrow.core.Either.Companion.catch
+import arrow.core.getOrElse
+import com.hippo.ehviewer.client.data.GalleryTagGroup
+import com.hippo.ehviewer.client.exception.ParseException
+import java.nio.ByteBuffer

 object VoteTagParser {
-    // {"error":"The tag \"neko\" is not allowed. Use character:neko or artist:neko"}
-    fun parse(body: String): String? {
-        return runCatching { body.parseAs<Error>().error }.getOrNull()
+    fun parse(body: ByteBuffer) = catch {
+        unmarshalParsingAs<List<GalleryTagGroup>>(body, ::nativeParse)
+    }.getOrElse {
+        throw ParseException("Failed to parse vote tag result", it)
    }
+
+    private external fun nativeParse(body: ByteBuffer, size: Int = body.limit()): Int
 }
@@ -3,4 +3,7 @@ package com.hippo.ehviewer.client.parser
 import kotlinx.serialization.Serializable

@Serializable
-data class Error(val error: String)
+data class VoteTagResult(
+    val error: String?,
+    val tagpane: String?,
+)
@@ -0,0 +1,49 @@
+package com.hippo.ehviewer.coil
+
+import coil3.ImageLoader
+import coil3.asImage
+import coil3.decode.ByteBufferMetadata
+import coil3.decode.ContentMetadata
+import coil3.decode.DecodeResult
+import coil3.decode.DecodeUtils
+import coil3.decode.Decoder
+import coil3.decode.ImageSource
+import coil3.fetch.SourceFetchResult
+import coil3.gif.isAnimatedWebP
+import coil3.request.Options
+import java.io.FileInputStream
+import java.nio.ByteBuffer
+import java.nio.channels.FileChannel
+import okio.FileSystem
+
+class AnimatedWebPDecoder(private val source: ByteBuffer) : Decoder {
+    override suspend fun decode() = DecodeResult(AnimatedWebPDrawable(source).asImage(), false)
+
+    object Factory : Decoder.Factory {
+        override fun create(
+            result: SourceFetchResult,
+            options: Options,
+            imageLoader: ImageLoader,
+        ) = if (DecodeUtils.isAnimatedWebP(result.source.source())) {
+            result.source.toByteBufferOrNull()?.let { AnimatedWebPDecoder(it) }
+        } else {
+            null
+        }
+    }
+}
+
+private fun ImageSource.toByteBufferOrNull(): ByteBuffer? {
+    if (fileSystem === FileSystem.SYSTEM) {
+        val file = fileOrNull()
+        if (file != null) {
+            return file.toFile().inputStream().mapReadOnly()
+        }
+    }
+    return when (val metadata = metadata) {
+        is ContentMetadata -> metadata.assetFileDescriptor.createInputStream().mapReadOnly()
+        is ByteBufferMetadata -> metadata.byteBuffer
+        else -> null
+    }
+}
+
+private fun FileInputStream.mapReadOnly(): ByteBuffer = channel.use { it.map(FileChannel.MapMode.READ_ONLY, 0, it.size()) }
@@ -0,0 +1,151 @@
+package com.hippo.ehviewer.coil
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.PixelFormat
+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 java.nio.ByteBuffer
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+
+// Hold a reference to the buffer as it's used by the decoder
+@Suppress("CanBeParameter")
+class AnimatedWebPDrawable(private val source: ByteBuffer) : Drawable(), Animatable {
+    private val decodeScope = CoroutineScope(Dispatchers.IO.limitedParallelism(1))
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.DITHER_FLAG or Paint.FILTER_BITMAP_FLAG)
+    private val decoder = nativeCreateDecoder(source)
+    private val width: Int
+    private val height: Int
+    private val loopCount: Int
+
+    private var decodeJob: Job? = null
+    private var loopsCompleted = 0
+    private var timeToShowNextFrame = 0L
+    private var currentFrame: Frame
+    private var nextFrame: Frame
+
+    init {
+        check(decoder != 0L) { "Failed to create decoder" }
+        val packed = nativeGetImageInfo(decoder)
+        width = (packed shr 40).toInt()
+        height = (packed shr 16 and 0xFFFFFF).toInt()
+        loopCount = (packed and 0xFFFF).toInt()
+        val bitmap = createBitmap(width, height)
+        val timestamp = nativeDecodeNextFrame(decoder, false, bitmap)
+        check(timestamp != 0) {
+            nativeDestroyDecoder(decoder)
+            "Failed to decode first frame"
+        }
+        currentFrame = Frame(bitmap, timestamp)
+        nextFrame = Frame(createBitmap(width, height), 0)
+    }
+
+    override fun getIntrinsicWidth() = width
+
+    override fun getIntrinsicHeight() = height
+
+    private val runnable = Runnable {
+        timeToShowNextFrame = SystemClock.uptimeMillis() + nextFrame.timestamp - currentFrame.timestamp
+        invalidateSelf()
+    }
+
+    private fun decodeNextFrame(reset: Boolean) = decodeScope.launch {
+        val timestamp = nativeDecodeNextFrame(decoder, reset, nextFrame.bitmap)
+        ensureActive()
+        check(timestamp != 0) {
+            decodeJob = null
+            "Failed to decode next frame"
+        }
+        if (timestamp <= currentFrame.timestamp) {
+            if (reset) loopsCompleted = 0 else loopsCompleted++
+            currentFrame.timestamp = 0
+        }
+        nextFrame.timestamp = timestamp
+        nextFrame.bitmap.prepareToDraw()
+    }.apply {
+        invokeOnCompletion { cause ->
+            when (cause) {
+                null -> if (reset) {
+                    runnable.run()
+                } else {
+                    scheduleSelf(runnable, timeToShowNextFrame)
+                }
+                !is CancellationException -> logcat(cause)
+            }
+        }
+    }
+
+    override fun draw(canvas: Canvas) {
+        if (decodeJob?.isCompleted == true && isVisible) {
+            decodeJob = if (loopCount == 0 || loopsCompleted < loopCount) {
+                currentFrame = nextFrame.also { nextFrame = currentFrame }
+                decodeNextFrame(false)
+            } else {
+                null
+            }
+        }
+        canvas.drawBitmap(currentFrame.bitmap, null, bounds, paint)
+    }
+
+    @Deprecated("Deprecated in Java")
+    override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
+
+    override fun setAlpha(alpha: Int) {
+        if (alpha != paint.alpha) {
+            paint.alpha = alpha
+            invalidateSelf()
+        }
+    }
+
+    override fun getAlpha(): Int = paint.alpha
+
+    override fun setColorFilter(colorFilter: ColorFilter?) {
+        if (colorFilter != paint.colorFilter) {
+            paint.colorFilter = colorFilter
+            invalidateSelf()
+        }
+    }
+
+    override fun getColorFilter(): ColorFilter? = paint.colorFilter
+
+    override fun isRunning() = decodeJob != null
+
+    override fun start() {
+        if (decodeJob == null) {
+            decodeJob = decodeNextFrame(true)
+        }
+    }
+
+    override fun stop() {
+        decodeJob?.cancel()
+        decodeJob = null
+        unscheduleSelf(runnable)
+    }
+
+    fun dispose() {
+        runBlocking {
+            decodeScope.coroutineContext.job.cancelAndJoin()
+        }
+        nativeDestroyDecoder(decoder)
+    }
+}
+
+private class Frame(val bitmap: Bitmap, var timestamp: Int)
+
+private external fun nativeCreateDecoder(source: ByteBuffer): Long
+private external fun nativeGetImageInfo(decoder: Long): Long
+private external fun nativeDecodeNextFrame(decoder: Long, reset: Boolean, bitmap: Bitmap): Int
+private external fun nativeDestroyDecoder(decoder: Long)
@@ -1,83 +1,64 @@
 package com.hippo.ehviewer.coil

 import android.graphics.Bitmap
-import androidx.compose.ui.unit.IntRect
-import coil3.BitmapImage
-import coil3.Extras
-import coil3.Image
-import coil3.asCoilImage
-import coil3.getExtra
+import android.hardware.HardwareBuffer
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.toIntRect
+import arrow.fx.coroutines.autoCloseable
+import arrow.fx.coroutines.resourceScope
+import coil3.asImage
 import coil3.intercept.Interceptor
-import coil3.intercept.Interceptor.Chain
-import coil3.request.ImageRequest
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
-import coil3.request.allowHardware
-import com.hippo.ehviewer.image.detectBorder
-import com.hippo.ehviewer.util.isAtLeastO
+import com.hippo.ehviewer.image.copyBitmapToAHB
+import com.hippo.ehviewer.util.isAtLeastQ
+import eu.kanade.tachiyomi.util.system.logcat
+import moe.tarsin.coroutines.runSuspendCatching

-private const val CROP_THRESHOLD = 0.75f
-private const val WEBTOON_THRESHOLD = 3
-
-private val maybeCropBorderKey = Extras.Key(default = false)
-
-fun ImageRequest.Builder.maybeCropBorder(enable: Boolean) = apply {
-    extras[maybeCropBorderKey] = enable
-}
-
-val ImageRequest.maybeCropBorder: Boolean
-    get() = getExtra(maybeCropBorderKey)
-
-class BitmapImageWithRect(
-    val rect: IntRect,
-    val image: Image,
-) : Image by image
+@RequiresApi(Build.VERSION_CODES.O)
+private const val USAGE = HardwareBuffer.USAGE_CPU_WRITE_RARELY or HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE

 object CropBorderInterceptor : Interceptor {
-    override suspend fun intercept(chain: Chain): ImageResult {
-        val req = chain.request
-        if (req.maybeCropBorder) {
-            val hw = req.allowHardware && isAtLeastO
-            val result = if (hw) {
-                val nonHw = req.newBuilder().allowHardware(false).build()
-                chain.withRequest(nonHw).proceed()
-            } else {
-                chain.proceed()
-            }
-            if (result is SuccessResult) {
-                val image = result.image
-                if (image is BitmapImage) {
-                    val bitmap = image.bitmap
-                    val rect = if (image.height / image.width < WEBTOON_THRESHOLD) {
-                        val array = detectBorder(bitmap)
-                        val minWidth = image.width * CROP_THRESHOLD
-                        val minHeight = image.height * CROP_THRESHOLD
-                        IntRect(array[0], array[1], array[2], array[3]).takeIf {
-                            it.width > minWidth && it.height > minHeight
-                        }
-                    } else {
-                        null
-                    }
-                    val maybeHwImage = if (hw) {
-                        // Upload to Graphical Buffer to accelerate render
-                        // May fail if the image is too long
-                        bitmap.copy(Bitmap.Config.HARDWARE, false)?.run {
-                            bitmap.recycle()
-                            asCoilImage()
-                        } ?: image
-                    } else {
-                        image
-                    }
-                    val new = if (rect != null) {
-                        BitmapImageWithRect(rect, maybeHwImage)
-                    } else {
-                        maybeHwImage
-                    }
-                    return result.copy(image = new, request = result.request, dataSource = result.dataSource)
+    override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
+        val result = chain.proceed()
+        if (result is SuccessResult) {
+            val image = result.image
+            if (image is BitmapImageWithExtraInfo) {
+                // Copy with cropped region
+                val srcSize = IntSize(image.width, image.height)
+                if (image.rect.size != srcSize) {
+                    val (x, y) = image.rect.topLeft
+                    val (w, h) = image.rect.size
+                    val src = image.image.bitmap
+
+                    // Large hardware bitmaps have rendering issues (e.g. crash, empty) on some devices.
+                    // This is not ideal but I haven't figured out how to probe the threshold.
+                    // All we know is that it's less than the maximum texture size.
+                    val meetHardwareThreshold = maxOf(w, h) <= chain.request.hardwareThreshold
+                    val bitmap = when {
+                        isAtLeastQ && meetHardwareThreshold -> runSuspendCatching {
+                            val format = when (val config = src.config) {
+                                Bitmap.Config.ARGB_8888 -> HardwareBuffer.RGBA_8888
+                                Bitmap.Config.RGB_565 -> HardwareBuffer.RGB_565
+                                Bitmap.Config.RGBA_F16 -> HardwareBuffer.RGBA_FP16
+                                else -> error("Unsupported bitmap config: $config")
+                            }
+                            resourceScope {
+                                val buffer = autoCloseable { HardwareBuffer.create(w, h, format, 1, USAGE) }
+                                copyBitmapToAHB(src, buffer, x, y)
+                                Bitmap.wrapHardwareBuffer(buffer, src.colorSpace)
+                            }
+                        }.onFailure { logcat(it) }.getOrNull()
+                        else -> null
+                    } ?: Bitmap.createBitmap(src, x, y, w, h)
+
+                    src.recycle()
+                    return result.copy(image = image.copy(image = bitmap.asImage(), rect = image.rect.size.toIntRect()))
                }
            }
-            return result
        }
-        return chain.proceed()
+        return result
    }
 }
@@ -0,0 +1,51 @@
+package com.hippo.ehviewer.coil
+
+import androidx.compose.ui.unit.IntRect
+import coil3.Extras
+import coil3.getExtra
+import coil3.intercept.Interceptor
+import coil3.intercept.Interceptor.Chain
+import coil3.request.ImageRequest
+import coil3.request.ImageResult
+import coil3.request.SuccessResult
+import com.hippo.ehviewer.image.detectBorder
+
+private const val CROP_THRESHOLD = 0.75f
+private const val RATIO_THRESHOLD = 2
+
+private val maybeCropBorderKey = Extras.Key(default = false)
+
+fun ImageRequest.Builder.maybeCropBorder(enable: Boolean) = apply {
+    extras[maybeCropBorderKey] = enable
+}
+
+val ImageRequest.maybeCropBorder: Boolean
+    get() = getExtra(maybeCropBorderKey)
+
+object DetectBorderInterceptor : Interceptor {
+    override suspend fun intercept(chain: Chain): ImageResult {
+        val result = chain.proceed()
+        if (chain.request.maybeCropBorder && result is SuccessResult) {
+            val image = result.image
+            if (image is BitmapImageWithExtraInfo && !image.hasQrCode) {
+                val bitmap = image.image.bitmap
+                val ratio = if (image.height > image.width) {
+                    image.height / image.width
+                } else {
+                    image.width / image.height
+                }
+                if (ratio < RATIO_THRESHOLD) {
+                    val array = detectBorder(bitmap)
+                    val minWidth = image.width * CROP_THRESHOLD
+                    val minHeight = image.height * CROP_THRESHOLD
+                    val rect = IntRect(array[0], array[1], array[2], array[3])
+                    if (rect.width > minWidth && rect.height > minHeight) {
+                        val new = image.copy(rect = rect)
+                        return result.copy(image = new)
+                    }
+                }
+            }
+        }
+        return result
+    }
+}
@@ -1,54 +1,64 @@
 package com.hippo.ehviewer.coil

+import coil3.Extras
+import coil3.getExtra
 import coil3.intercept.Interceptor
-import coil3.request.ErrorResult
+import coil3.request.ImageRequest
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
 import com.hippo.ehviewer.EhApplication.Companion.imageCache
+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.spider.DownloadInfoMagics.decodeMagicRequestOrUrl
 import com.hippo.ehviewer.util.sendTo
-import com.hippo.unifile.asUniFile
-import eu.kanade.tachiyomi.util.lang.withIOContext
+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)
+
+fun ImageRequest.Builder.downloadInfo(info: DownloadInfo) = apply {
+    extras[downloadInfoKey] = info
+}
+
+val ImageRequest.downloadInfo: DownloadInfo?
+    get() = getExtra(downloadInfoKey)

 object DownloadThumbInterceptor : Interceptor {
-    // TODO: Remove this after a few releases
-    private const val LEGACY_THUMB_FILE = ".thumb"
-    private const val THUMB_FILE = "thumb.jpg"
    override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
-        val magicOrUrl = chain.request.data as? String
-        if (magicOrUrl != null) {
-            val (url, location) = decodeMagicRequestOrUrl(magicOrUrl)
-            if (location != null) {
-                val thumb = withIOContext {
-                    val legacyThumb = downloadLocation / location / LEGACY_THUMB_FILE
-                    if (legacyThumb.isFile) {
-                        legacyThumb.apply { renameTo(THUMB_FILE) }
-                    } else {
-                        downloadLocation / location / THUMB_FILE
-                    }
-                }
-                if (withIOContext { thumb.isFile }) {
-                    val new = chain.request.newBuilder().data(thumb.uri.toString()).build()
-                    when (val result = chain.withRequest(new).proceed()) {
-                        is SuccessResult -> return result
-                        is ErrorResult -> withIOContext { thumb.delete() }
-                    }
-                }
-                val new = chain.request.newBuilder().data(url).build()
-                return chain.withRequest(new).proceed().also {
-                    if (it is SuccessResult) {
-                        withIOContext {
-                            if (thumb.ensureFile()) {
-                                val key = requireNotNull(chain.request.memoryCacheKey)
-                                imageCache.read(key) {
-                                    data.asUniFile() sendTo thumb
-                                }
-                            }
-                        }
-                    }
+        val info = chain.request.downloadInfo
+        if (info != null && !info.dirname.isNullOrBlank()) {
+            val thumbKey = getThumbKey(chain.request.data as String)
+            if (info.thumbKey != thumbKey) {
+                info.thumbKey = thumbKey
+                EhDB.putGalleryInfo(info.galleryInfo)
+            }
+            val dir = downloadLocation / info.dirname
+            val format = thumbKey.substringAfterLast('.', "")
+            check(format.isNotBlank())
+            val thumb = dir / "thumb.$format"
+            val v1Thumb = dir / "thumb.jpg"
+            if (thumb.isFile) {
+                val new = chain.request.newBuilder().data(thumb.toUri()).build()
+                val result = chain.withRequest(new).proceed()
+                if (result is SuccessResult) {
+                    if (thumb != v1Thumb) v1Thumb.delete()
+                    return result
                }
            }
+            val result = chain.proceed()
+            if (result is SuccessResult && dir.isDirectory) {
+                // 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) {
+                    data sendTo thumb
+                }
+                if (thumb != v1Thumb) v1Thumb.delete()
+            }
+            return result
        }
        return chain.proceed()
    }