Prepare for release 1.14.5

Opt out activity recreation for size-based config changes as they are
handled by Compose.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/workflows/baseline-profile.yml

@@ -25,16 +25,16 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -48,7 +48,7 @@ jobs:
           key: cmake-
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
           cache-read-only: true

.github/workflows/ci.yml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -38,10 +38,13 @@ jobs:
         run: cargo clippy --target aarch64-linux-android --all-features -- -D warnings
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-read-only: true
 
+      - name: Check build-logic
+        run: ./gradlew :build-logic:convention:check
+
       - name: Spotless Check
         run: ./gradlew spotlessCheck
 
@@ -52,16 +55,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -71,7 +74,7 @@ jobs:
           save-if: "false"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
 
@@ -79,9 +82,13 @@ jobs:
         uses: actions/cache@v4
         with:
           path: app/.cxx
-          key: cmake-default-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
+          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-
 
+      # https://github.com/mikepenz/AboutLibraries/issues/1225
+      - name: Generate aboutlibraries.json
+        run: ./gradlew :app:prepareLibraryDefinitionsDefaultRelease --rerun
+
       - name: Build
         run: ./gradlew assembleDefaultRelease
 
@@ -120,16 +127,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -139,7 +146,7 @@ jobs:
           save-if: "false"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
 
@@ -147,9 +154,13 @@ jobs:
         uses: actions/cache@v4
         with:
           path: app/.cxx
-          key: cmake-marshmallow-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
+          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-
 
+      # https://github.com/mikepenz/AboutLibraries/issues/1225
+      - name: Generate aboutlibraries.json
+        run: ./gradlew :app:prepareLibraryDefinitionsMarshmallowRelease --rerun
+
       - name: Build
         run: ./gradlew assembleMarshmallowRelease
 

.github/workflows/releases.yml

@@ -19,16 +19,16 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -42,7 +42,7 @@ jobs:
           key: cmake-
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
           cache-read-only: true
@@ -51,6 +51,12 @@ jobs:
         run: ./gradlew generateBaselineProfile
           -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
 
+      # https://github.com/mikepenz/AboutLibraries/issues/1225
+      - name: Generate aboutlibraries.json
+        run: ./gradlew
+          :app:prepareLibraryDefinitionsDefaultRelease --rerun
+          :app:prepareLibraryDefinitionsMarshmallowRelease --rerun
+
       - name: Build
         run: ./gradlew assembleRelease
 

.gitignore

@@ -1,8 +1,9 @@
 .gradle
 /local.properties
 .DS_Store
-/build
-/.kotlin
+build
+.cxx
+.kotlin
 *.iml
 .idea
 .vscode

CHANGELOG.zh-CN.MD

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

app/.gitignore

@@ -1,2 +0,0 @@
-/build
-/.cxx

app/build.gradle.kts

@@ -1,20 +1,16 @@
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import java.util.regex.Pattern
-import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 
 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.compose)
+    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.aboutlibraries)
+    alias(libs.plugins.aboutlibrariesAndroid)
     alias(libs.plugins.baselineprofile)
 }
 
@@ -61,7 +57,7 @@ android {
     defaultConfig {
         applicationId = "moe.tarsin.ehviewer"
         versionCode = 180063
-        versionName = "1.14.0"
+        versionName = "1.14.5"
         // versionNameSuffix = "-SNAPSHOT"
         buildConfigField("String", "RAW_VERSION_NAME", "\"$versionName${versionNameSuffix.orEmpty()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
@@ -79,9 +75,10 @@ android {
     flavorDimensions += "api"
 
     productFlavors {
-        create("default")
+        create("default") {
+            minSdk = 26
+        }
         create("marshmallow") {
-            minSdk = 23
             applicationIdSuffix = ".m"
             versionNameSuffix = "-M"
         }
@@ -97,16 +94,13 @@ android {
         isCoreLibraryDesugaringEnabled = true
     }
 
-    lint {
-        checkReleaseBuilds = false
-        disable += setOf("MissingTranslation", "MissingQuantity")
-        error += setOf("InlinedApi")
-    }
-
     packaging {
         dex {
             useLegacyPackaging = false
         }
+        jniLibs {
+            excludes += "**/libdatastore_shared_counter.so" // DataStore multi-process
+        }
         resources {
             // Required by Layout Inspector
             pickFirsts += "/META-INF/androidx.compose.ui_ui.version"
@@ -176,6 +170,10 @@ baselineProfile {
 }
 
 dependencies {
+    implementation(projects.core.data)
+    implementation(projects.core.i18n)
+    implementation(projects.core.ui)
+
     // https://developer.android.com/jetpack/androidx/releases/activity
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.appcompat)
@@ -189,7 +187,10 @@ dependencies {
     implementation(libs.compose.destinations.core)
     ksp(libs.compose.destinations.compiler)
 
-    implementation(libs.compose.preference)
+    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)
@@ -204,7 +205,6 @@ dependencies {
     implementation(libs.androidx.paging.compose)
 
     // https://developer.android.com/jetpack/androidx/releases/room
-    ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.paging)
 
     implementation(libs.androidx.work.runtime)
@@ -216,8 +216,6 @@ dependencies {
     // https://square.github.io/okhttp/changelogs/changelog/
     implementation(platform(libs.okhttp.bom))
 
-    implementation(platform(libs.okio.bom))
-
     implementation(libs.logcat)
 
     implementation(libs.diff)
@@ -254,43 +252,16 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(21)
-
-    // https://kotlinlang.org/docs/gradle-compiler-options.html#all-compiler-options
     compilerOptions {
-        jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
-        progressiveMode = true
         optIn.addAll(
             "coil3.annotation.ExperimentalCoilApi",
-            "androidx.compose.foundation.layout.ExperimentalLayoutApi",
-            "androidx.compose.material3.ExperimentalMaterial3Api",
-            "androidx.compose.material3.ExperimentalMaterial3ExpressiveApi",
-            "androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi",
-            "androidx.compose.ui.ExperimentalComposeUiApi",
-            "androidx.compose.foundation.ExperimentalFoundationApi",
-            "androidx.compose.animation.ExperimentalAnimationApi",
-            "androidx.compose.animation.ExperimentalSharedTransitionApi",
-            "androidx.compose.runtime.ExperimentalComposeRuntimeApi",
             "androidx.paging.ExperimentalPagingApi",
-            "kotlin.ExperimentalStdlibApi",
-            "kotlin.concurrent.atomics.ExperimentalAtomicApi",
-            "kotlin.contracts.ExperimentalContracts",
-            "kotlin.time.ExperimentalTime",
-            "kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "kotlinx.coroutines.FlowPreview",
-            "kotlinx.serialization.ExperimentalSerializationApi",
-            "splitties.experimental.ExperimentalSplittiesApi",
-            "splitties.preferences.DataStorePreferencesPreview",
-        )
-        freeCompilerArgs.addAll(
-            "-Xcontext-parameters",
-            "-Xannotation-default-target=param-property",
+            "me.saket.telephoto.ExperimentalTelephotoApi",
         )
     }
 }
 
 ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
     arg("compose-destinations.codeGenPackageName", "com.hippo.ehviewer.ui")
 }
 
@@ -304,16 +275,3 @@ aboutLibraries {
         duplicationRule = DuplicateRule.GROUP
     }
 }
-
-val ktlintVersion = libs.ktlint.get().version
-
-spotless {
-    kotlin {
-        // https://github.com/diffplug/spotless/issues/111
-        target("src/**/*.kt")
-        ktlint(ktlintVersion)
-    }
-    kotlinGradle {
-        ktlint(ktlintVersion)
-    }
-}

app/src/main/AndroidManifest.xml

@@ -39,7 +39,7 @@
         <activity
             android:name=".ui.MainActivity"
             android:banner="@mipmap/ic_leanback_banner"
-            android:configChanges="screenSize"
+            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.Splash"

app/src/main/cpp/CMakeLists.txt

@@ -4,17 +4,17 @@ include(ExternalProject)
 include(FetchContent)
 
 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto \
-           -mllvm -polly \
-           -mllvm -polly-run-dce \
-           -mllvm -polly-run-inliner \
-           -mllvm -polly-isl-arg=--no-schedule-serialize-sccs \
-           -mllvm -polly-ast-use-context \
-           -mllvm -polly-detect-keep-going \
-           -mllvm -polly-position=before-vectorizer \
-           -mllvm -polly-vectorizer=stripmine \
-           -mllvm -polly-detect-profitability-min-per-loop-insts=40 \
-           -mllvm -polly-invariant-load-hoisting")
+    string(CONCAT CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto "
+           "-mllvm -polly "
+           "-mllvm -polly-run-dce "
+           "-mllvm -polly-run-inliner "
+           "-mllvm -polly-isl-arg=--no-schedule-serialize-sccs "
+           "-mllvm -polly-ast-use-context "
+           "-mllvm -polly-detect-keep-going "
+           "-mllvm -polly-position=before-vectorizer "
+           "-mllvm -polly-vectorizer=stripmine "
+           "-mllvm -polly-detect-profitability-min-per-loop-insts=40 "
+           "-mllvm -polly-invariant-load-hoisting")
 endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 
 option(BUILD_TESTING OFF)
@@ -96,7 +96,7 @@ set(LIBARCHIVE_PATCH
 FetchContent_Declare(
         libarchive
         GIT_REPOSITORY https://github.com/libarchive/libarchive.git
-        GIT_TAG v3.8.1
+        GIT_TAG v3.8.2
         GIT_SHALLOW 1
         PATCH_COMMAND git apply --check -R ${LIBARCHIVE_PATCH} || git apply ${LIBARCHIVE_PATCH}
 )
@@ -129,6 +129,8 @@ 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
@@ -141,8 +143,9 @@ corrosion_import_crate(
         MANIFEST_PATH ../rust/Cargo.toml
         LOCKED
         FEATURES $<IF:$<VERSION_GREATER_EQUAL:${ANDROID_NATIVE_API_LEVEL},26>,android-26,android>
-        FLAGS $<$<NOT:$<CONFIG:Debug>>:-Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort>
+        FLAGS $<$<NOT:$<CONFIG:Debug>>:-Z build-std -Z build-std-features=>
 )
+corrosion_add_target_rustflags(ehviewer_rust $<$<NOT:$<CONFIG:Debug>>:-Z unstable-options -C panic=immediate-abort>)
 corrosion_link_libraries(ehviewer_rust android jnigraphics log webp webpdemux)
 
 # Build and link our app's native lib

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

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

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

@@ -22,6 +22,7 @@ import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.runtime.Composer
+import androidx.compose.runtime.tooling.ComposeStackTraceMode
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.coroutineScope
 import coil3.EventListener
@@ -37,6 +38,16 @@ import coil3.request.allowRgb565
 import coil3.request.crossfade
 import coil3.serviceLoaderEnabled
 import coil3.util.DebugLogger
+import com.ehviewer.core.database.SearchDatabase
+import com.ehviewer.core.files.deleteContent
+import com.ehviewer.core.ui.util.initSETConnection
+import com.ehviewer.core.util.isAtLeastO
+import com.ehviewer.core.util.isAtLeastP
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.isAtLeastSExtension7
+import com.ehviewer.core.util.launchIO
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.coil.AnimatedWebPDecoder
 import com.hippo.ehviewer.coil.CropBorderInterceptor
@@ -47,7 +58,6 @@ import com.hippo.ehviewer.coil.MapExtraInfoInterceptor
 import com.hippo.ehviewer.coil.MergeInterceptor
 import com.hippo.ehviewer.coil.QrCodeInterceptor
 import com.hippo.ehviewer.dailycheck.checkDawn
-import com.hippo.ehviewer.dao.SearchDatabase
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadsFilterMode
 import com.hippo.ehviewer.ktbuilder.diskCache
@@ -59,21 +69,11 @@ import com.hippo.ehviewer.ui.keepNoMediaFileStatus
 import com.hippo.ehviewer.ui.lockObserver
 import com.hippo.ehviewer.ui.screen.detailCache
 import com.hippo.ehviewer.ui.tools.dataStateFlow
-import com.hippo.ehviewer.ui.tools.initSETConnection
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.CrashHandler
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.OSUtils
-import com.hippo.ehviewer.util.isAtLeastO
-import com.hippo.ehviewer.util.isAtLeastP
-import com.hippo.ehviewer.util.isAtLeastS
-import com.hippo.ehviewer.util.isAtLeastSExtension7
-import com.hippo.files.deleteContent
-import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.lang.launchUI
-import eu.kanade.tachiyomi.util.lang.withUIContext
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.okhttp.OkHttp
 import kotlinx.coroutines.Dispatchers
@@ -89,13 +89,11 @@ import splitties.init.appCtx
 private val lifecycle = ProcessLifecycleOwner.get().lifecycle
 private val lifecycleScope = lifecycle.coroutineScope
 
-class EhApplication :
-    Application(),
-    SingletonImageLoader.Factory {
-    override fun onCreate() {
+class EhApplication : Application(), SingletonImageLoader.Factory {
+    override fun onCreate() = with(lifecycleScope) {
         initSETConnection()
         // Initialize Settings on first access
-        lifecycleScope.launchIO {
+        launchIO {
             val mode = Settings.theme.value
             if (!isAtLeastS) {
                 withUIContext {
@@ -115,24 +113,25 @@ class EhApplication :
         CrashHandler.install()
         super.onCreate()
         System.loadLibrary("ehviewer")
-        lifecycleScope.launchIO {
-            launchUI {
-                FavouriteStatusRouter.collect { info ->
-                    detailCache[info.gid]?.apply {
-                        favoriteSlot = info.favoriteSlot
-                        favoriteName = info.favoriteName
-                        favoriteNote = info.favoriteNote
-                    }
+        launch {
+            FavouriteStatusRouter.collect { info ->
+                detailCache[info.gid]?.apply {
+                    favoriteSlot = info.favoriteSlot
+                    favoriteName = info.favoriteName
+                    favoriteNote = info.favoriteNote
                 }
             }
+        }
+        launchIO {
             EhTagDatabase.launchUpdate()
             launch { EhDB }
-            launchIO { dataStateFlow.value }
-            launchIO { OSUtils.totalMemory }
+            launch { dataStateFlow.value }
+            launch { OSUtils.totalMemory }
             launch {
-                if (DownloadManager.labelList.isNotEmpty() && Settings.downloadFilterMode.key !in Settings.prefs) {
+                if (DownloadManager.labelList.isNotEmpty() && Settings.downloadFilterMode !in Settings.snapshot()) {
                     Settings.downloadFilterMode.value = DownloadsFilterMode.CUSTOM.flag
                 }
+                initialized = true
                 DownloadManager.readMetadataFromLocal()
             }
             launch {
@@ -146,7 +145,7 @@ class EhApplication :
         }
         if (BuildConfig.DEBUG) {
             StrictMode.enableDefaults()
-            Composer.setDiagnosticStackTraceEnabled(true)
+            Composer.setDiagnosticStackTraceMode(ComposeStackTraceMode.SourceInformation)
         }
     }
 
@@ -214,6 +213,10 @@ class EhApplication :
     }
 
     companion object {
+        @Volatile
+        var initialized = false
+            private set
+
         val ktorClient by lazy {
             if (isAtLeastSExtension7 && Settings.enableCronet.value) {
                 HttpClient(Cronet) {

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

@@ -19,20 +19,22 @@ import android.content.Context
 import android.net.Uri
 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
-import com.hippo.ehviewer.dao.EhDatabase
-import com.hippo.ehviewer.dao.Filter
-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.ehviewer.core.data.model.asEntity
+import com.ehviewer.core.database.EhDatabase
+import com.ehviewer.core.database.Schema17to18
+import com.ehviewer.core.database.model.DownloadArtist
+import com.ehviewer.core.database.model.DownloadDirname
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.database.model.DownloadLabel
+import com.ehviewer.core.database.model.Filter
+import com.ehviewer.core.database.model.GalleryEntity
+import com.ehviewer.core.database.model.HistoryInfo
+import com.ehviewer.core.database.model.LocalFavoriteInfo
+import com.ehviewer.core.database.model.ProgressInfo
+import com.ehviewer.core.database.model.QuickSearch
+import com.ehviewer.core.files.sendTo
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.util.sendTo
 import kotlinx.coroutines.flow.Flow
 import okio.Path
 import okio.Path.Companion.toOkioPath
@@ -44,15 +46,15 @@ object EhDB {
         addMigrations(Schema17to18())
     }
 
-    suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun putGalleryInfo(galleryInfo: GalleryEntity) {
         db.galleryDao().upsert(galleryInfo)
     }
 
-    private suspend fun deleteGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    private suspend fun deleteGalleryInfo(galleryInfo: GalleryEntity) {
         runCatching { db.galleryDao().delete(galleryInfo) }
     }
 
-    suspend fun updateGalleryInfo(galleryInfoList: List<BaseGalleryInfo>) {
+    suspend fun updateGalleryInfo(galleryInfoList: List<GalleryEntity>) {
         db.galleryDao().update(galleryInfoList)
     }
 
@@ -146,6 +148,8 @@ object EhDB {
         dao.fill(raw.position)
     }
 
+    suspend fun searchDownloadLabel(keyword: String, limit: Int) = db.downloadLabelDao().search("%$keyword%", limit)
+
     suspend fun putDownloadArtist(gid: Long, artists: List<DownloadArtist>) {
         if (artists.isNotEmpty()) {
             val dao = db.downloadArtistDao()
@@ -154,12 +158,12 @@ object EhDB {
         }
     }
 
-    suspend fun removeLocalFavorites(galleryInfo: BaseGalleryInfo) {
+    suspend fun removeLocalFavorites(galleryInfo: GalleryInfo) {
         db.localFavoritesDao().deleteByKey(galleryInfo.gid)
-        deleteGalleryInfo(galleryInfo)
+        deleteGalleryInfo(galleryInfo.asEntity())
     }
 
-    suspend fun removeLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun removeLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
         galleryInfoList.forEach {
             removeLocalFavorites(it)
         }
@@ -170,12 +174,12 @@ object EhDB {
         return dao.contains(gid)
     }
 
-    suspend fun putLocalFavorites(galleryInfo: BaseGalleryInfo) {
-        putGalleryInfo(galleryInfo)
+    suspend fun putLocalFavorites(galleryInfo: GalleryInfo) {
+        putGalleryInfo(galleryInfo.asEntity())
         db.localFavoritesDao().upsert(LocalFavoriteInfo(galleryInfo.gid))
     }
 
-    suspend fun putLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun putLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
         galleryInfoList.forEach {
             putLocalFavorites(it)
         }
@@ -221,8 +225,8 @@ object EhDB {
 
     fun searchLocalFav(keyword: String) = db.localFavoritesDao().joinListLazy("*$keyword*")
 
-    suspend fun putHistoryInfo(galleryInfo: BaseGalleryInfo) {
-        putGalleryInfo(galleryInfo)
+    suspend fun putHistoryInfo(galleryInfo: GalleryInfo) {
+        putGalleryInfo(galleryInfo.asEntity())
         db.historyDao().upsert(HistoryInfo(galleryInfo.gid))
     }
 
@@ -239,7 +243,7 @@ object EhDB {
         dao.insertOrIgnore(historyInfoList)
     }
 
-    suspend fun deleteHistoryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun deleteHistoryInfo(galleryInfo: GalleryEntity) {
         val dao = db.historyDao()
         dao.deleteByKey(galleryInfo.gid)
         deleteGalleryInfo(galleryInfo)

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

@@ -9,6 +9,9 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
+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
@@ -25,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))
 }
 
@@ -73,32 +41,28 @@ 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() = readOnly.value
-            override fun component2() = ::setValue
+            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)
@@ -107,9 +71,9 @@ object Settings : DataStorePreferences(null) {
     var favCloudCount by intPref("fav_cloud", 0).emitTo(_favFlow)
 
     // Eh
-    val gallerySite = intPref("gallery_site_2", 0).observed { updateWhenGallerySiteChanges() }
+    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 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)
@@ -121,17 +85,16 @@ object Settings : DataStorePreferences(null) {
     val showVoteStatus = boolPref("show_vote_status", false)
     val showComments = boolPref("show_gallery_comments", true)
     val commentThreshold = intPref("comment_threshold", -100)
-    val showTagTranslations = boolPref(KEY_SHOW_TAG_TRANSLATIONS, false).observed { updateWhenTagTranslationChanges() }
+    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 mediaScan = boolPref("media_scan", false).observed(::updateWhenKeepMediaStatusChanges)
     val multiThreadDownload = intPref("download_thread_2", 3)
     val downloadDelay = intPref("download_delay_3", 1000)
-    val connTimeout = intPref("conn_timeout", 10)
     val timeoutSpeed = intPref("timeout_speed_level", 6)
     val preloadImage = intPref("preload_image_2", 5)
     val downloadOriginImage = boolPref("download_origin_image", false)
@@ -155,7 +118,7 @@ object Settings : DataStorePreferences(null) {
     val desktopSite = boolPref("desktop_site", true)
 
     // About
-    val backupBeforeUpdate = boolPref("backup_before_update", true)
+    val backupBeforeUpdate = boolPref("backup_before_update", false)
     val useCIUpdateChannel = boolPref("ci_update_channel", AppConfig.isSnapshot)
     val updateIntervalDays = intPref("update_interval_days", 7)
 
@@ -167,15 +130,15 @@ object Settings : DataStorePreferences(null) {
     val needSignIn = boolPref("need_sign_in", true)
     val gridView = boolPref("grid_view", false)
     val qSSaveProgress = boolPref("qs_save_progress", true)
-    val displayName = stringOrNullPref("display_name", null)
-    val avatar = stringOrNullPref("avatar", null)
-    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 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 hasDefaultDownloadLabel by boolPref("has_default_download_label", false)
@@ -185,7 +148,7 @@ object Settings : DataStorePreferences(null) {
     var requestNewsTime by intPref("request_news_time", 0).observed { updateWhenRequestNewsChanges() }
     var lastDawnDays by intPref("last_dawn_days", 0)
     var recentToplist by stringPref("recent_toplist", "11")
-    var defaultDownloadLabel by stringOrNullPref("default_download_label", null)
+    var defaultDownloadLabel by stringOrNullPref("default_download_label")
     var lastUpdateTime by longPref("last_update_time", BuildConfig.COMMIT_TIME)
 
     // Reader
@@ -195,8 +158,8 @@ object Settings : DataStorePreferences(null) {
     val colorFilterMode = intPref("color_filter_mode", 0)
     val customBrightness = boolPref("pref_custom_brightness_key", false)
     val customBrightnessValue = intPref("custom_brightness_value", 0)
-    val readingMode = intPref("pref_default_reading_mode_key", ReadingModeType.LEFT_TO_RIGHT.flagValue)
-    val orientationMode = intPref("pref_default_orientation_type_key", OrientationType.FREE.flagValue)
+    val readingMode = intPref("pref_default_reading_mode_key", ReadingModeType.DEFAULT.prefValue)
+    val orientationMode = intPref("pref_default_orientation_type_key", OrientationType.DEFAULT.prefValue)
     val showReaderSeekbar = boolPref("pref_show_reader_seekbar", true)
     val showPageNumber = boolPref("pref_show_page_number_key", true)
     val readerTheme = intPref("pref_reader_theme_key", 1)
@@ -206,7 +169,8 @@ object Settings : DataStorePreferences(null) {
     val keepScreenOn = boolPref("pref_keep_screen_on_key", true)
     val readerLongTapAction = boolPref("reader_long_tap", true)
     val pageTransitions = boolPref("pref_enable_transitions_key", true)
-    val readerReverseControls = boolPref("reader_volume_keys_inverted", false)
+    val readWithVolumeKeys = boolPref("reader_volume_keys", false)
+    val readWithVolumeKeysInverted = boolPref("reader_volume_keys_inverted", false)
     val grayScale = boolPref("pref_grayscale", false)
     val invertedColors = boolPref("pref_inverted_colors", false)
     val readerWebtoonNav = intPref("reader_navigation_mode_webtoon", 0)
@@ -223,43 +187,43 @@ object Settings : DataStorePreferences(null) {
     val stripExtraneousAds = boolPref("strip_extraneous_ads", false)
 
     init {
-        if ("CN" == Locale.getDefault().country) {
-            edit {
-                if (KEY_SHOW_TAG_TRANSLATIONS !in prefs) showTagTranslations.value = 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] = ""
+            }
+            val orientation = pref[orientationMode]
+            if (OrientationType.entries.none { it.prefValue == orientation }) {
+                pref.remove(orientationMode)
             }
-        }
-        if (downloadFilterMode.value == DownloadsFilterMode.ARTIST.flag && recentDownloadLabel.value == null) {
-            recentDownloadLabel.value = ""
         }
     }
 
     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:backing-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:backing-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 } }
         }
     }
 }

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

@@ -2,68 +2,73 @@ package com.hippo.ehviewer
 
 import android.app.UiModeManager
 import androidx.appcompat.app.AppCompatDelegate
+import arrow.core.Either.Companion.catch
+import com.ehviewer.core.preferences.PrefDelegate
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.withIOContext
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.dailycheck.updateDailyCheckWork
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
-import com.hippo.ehviewer.util.isAtLeastS
-import eu.kanade.tachiyomi.util.lang.launchIO
-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 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) } } }
+private const val TAG = "SettingsCollector"
 
-fun updateWhenKeepMediaStatusChanges() {
-    collectScope.launchIO {
-        runCatching {
-            keepNoMediaFileStatus()
+private val collectScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
+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()) } }
+
+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.value) {
-                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.value)
+        uiModeManager.setApplicationNightMode(mode)
     }
+    AppCompatDelegate.setDefaultNightMode(theme)
 }
 
 fun updateWhenRequestNewsChanges() {
     updateDailyCheckWork(appCtx)
 }
 
-fun updateWhenGallerySiteChanges() {
+suspend fun updateWhenGallerySiteChanges(gallerySite: Int) {
     if (Settings.hasSignedIn.value) {
-        collectScope.launchIO {
-            runCatching {
-                EhEngine.getUConfig()
-            }.onFailure {
-                logcat(it)
-            }
+        catch {
+            EhEngine.getUConfig(gallerySite)
+        }.onLeft {
+            logcat(TAG, it)
         }
     }
 }
 
-fun updateWhenTagTranslationChanges() {
-    EhTagDatabase.launchUpdate()
+fun updateWhenTagTranslationChanges(enabled: Boolean) {
+    if (enabled) {
+        EhTagDatabase.launchUpdate()
+    }
 }

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

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

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

@@ -21,15 +21,20 @@ 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.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.logcat
 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.data.fillInfo
+import com.hippo.ehviewer.client.data.filterComments
 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.InsufficientGpException
+import com.hippo.ehviewer.client.exception.IpBannedException
 import com.hippo.ehviewer.client.exception.NoHathClientException
 import com.hippo.ehviewer.client.exception.NoHitsFoundException
 import com.hippo.ehviewer.client.exception.NotLoggedInException
@@ -41,6 +46,7 @@ import com.hippo.ehviewer.client.parser.FavoritesParser
 import com.hippo.ehviewer.client.parser.GalleryApiParser
 import com.hippo.ehviewer.client.parser.GalleryDetailParser
 import com.hippo.ehviewer.client.parser.GalleryListParser
+import com.hippo.ehviewer.client.parser.GalleryMultiPageViewerPTokenParser
 import com.hippo.ehviewer.client.parser.GalleryPageParser
 import com.hippo.ehviewer.client.parser.GalleryTokenApiParser
 import com.hippo.ehviewer.client.parser.HomeParser
@@ -58,10 +64,11 @@ import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.ReadableTime
 import com.hippo.ehviewer.util.bodyAsUtf8Text
 import com.hippo.ehviewer.util.ensureSuccess
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.HttpStatement
 import io.ktor.client.statement.bodyAsChannel
+import io.ktor.client.statement.request
+import io.ktor.http.Url
 import io.ktor.utils.io.pool.DirectByteBufferPool
 import io.ktor.utils.io.pool.useInstance
 import io.ktor.utils.io.readAvailable
@@ -86,7 +93,9 @@ private const val MAX_REQUEST_SIZE = 25
 private const val MAX_SEQUENTIAL_REQUESTS = 5
 private const val REQUEST_INTERVAL = 5000L
 
-fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
+private val Url.isLogin get() = segments.firstOrNull() == "bounce_login.php"
+
+private fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
     val dir = AppConfig.externalParseErrorDir ?: return
     val file = File(dir, ReadableTime.getFilenamableTime() + ".txt")
     file.sink().buffer().use { sink ->
@@ -98,7 +107,7 @@ fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
     }
 }
 
-fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e: Throwable): Nothing {
+private fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e: Throwable): Nothing {
     // Don't translate coroutine cancellation
     if (e is CancellationException) throw e
 
@@ -110,16 +119,12 @@ fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e:
         { !it.hasRemaining() },
     )
     if (empty) {
-        if (EhUtils.isExHentai) {
-            throw EhException("Sad Panda\n(without panda)")
+        val message = if (EhUtils.isExHentai) {
+            "Sad Panda\n(without panda)"
         } else {
-            throw EhException("IP banned")
+            appCtx.getString(R.string.error_ip_banned)
         }
-    }
-
-    // Check Gallery Not Available
-    body.onLeft {
-        if ("Gallery Not Available - " in it) throw e
+        throw IpBannedException(message)
     }
 
     // Check parse error thrown by rust
@@ -131,7 +136,12 @@ fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e:
             "2" -> throw NotLoggedInException()
             "3" -> throw NoHathClientException()
             "4" -> throw InsufficientFundsException()
-            is String if message.startsWith('5') -> throw EhException(message.drop(1))
+            is String if message.isNotEmpty() -> {
+                when (message[0]) {
+                    '5' -> throw IpBannedException(message.substring(1))
+                    '6' -> throw EhException(message.substring(1))
+                }
+            }
         }
     }
 
@@ -139,7 +149,7 @@ fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e:
     response.status.ensureSuccess()
 
     if (e is ParseException || e is SerializationException) {
-        body.onLeft { if ("<" !in it) throw EhException(it) }
+        body.onLeft { if ("<" !in it) throw IpBannedException(it) }
         if (Settings.saveParseErrorBody.value) body.saveParseError(e)
         throw EhException(appCtx.getString(R.string.error_parse_error), e)
     }
@@ -148,9 +158,10 @@ fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e:
     throw e
 }
 
-val httpContentPool = DirectByteBufferPool(8, 0x80000)
+private val httpContentPool = DirectByteBufferPool(8, 0x80000)
 
-suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend String.() -> T) = executeSafely { response ->
+private suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend String.() -> T) = executeSafely { response ->
+    if (response.request.url.isLogin) throw NotLoggedInException()
     val body = response.bodyAsUtf8Text()
     runSuspendCatching {
         block(body)
@@ -159,7 +170,8 @@ suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend
     }.getOrThrow()
 }
 
-suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: suspend ByteBuffer.() -> T) = executeSafely { response ->
+private suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: suspend ByteBuffer.() -> T) = executeSafely { response ->
+    if (response.request.url.isLogin) throw NotLoggedInException()
     httpContentPool.useInstance { buffer ->
         with(response.bodyAsChannel()) { while (!isClosedForRead) readAvailable(buffer) }
         buffer.flip()
@@ -174,10 +186,12 @@ suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: s
 
 object EhEngine {
     suspend fun getOriginalImageUrl(url: String, referer: String?) = noRedirectEhRequest(url, referer).executeSafely { response ->
-        val location = response.headers["Location"] ?: throw InsufficientFundsException()
-        location.takeIf { "bounce_login" !in it } ?: throw NotLoggedInException()
+        response.headers["Location"]?.takeUnless { Url(it).isLogin } ?: throw InsufficientGpException()
     }
 
+    suspend fun getPTokenListFromMpv(gid: Long, token: String) = ehRequest(EhUrl.getGalleryMultiPageViewerUrl(gid, token), EhUrl.referer)
+        .fetchUsingAsText(GalleryMultiPageViewerPTokenParser::parse)
+
     suspend fun getTorrentList(gid: Long, token: String): TorrentResult {
         val url = EhUrl.getTorrentUrl(gid, token)
         val referer = EhUrl.getGalleryDetailUrl(gid, token)
@@ -212,7 +226,8 @@ object EhEngine {
         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).fetchUsingAsByteBuffer(UserConfigParser::parse)
         }.onFailure { throwable ->

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

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

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

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

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

@@ -20,17 +20,17 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import arrow.core.Either
+import com.ehviewer.core.files.metadataOrNull
+import com.ehviewer.core.files.read
+import com.ehviewer.core.files.write
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhApplication.Companion.ktorClient
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.data.TagNamespace
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.bodyAsUtf8Text
 import com.hippo.ehviewer.util.ensureSuccess
 import com.hippo.ehviewer.util.utf8
-import com.hippo.files.metadataOrNull
-import com.hippo.files.read
-import com.hippo.files.write
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.request.prepareGet
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.days
@@ -68,6 +68,7 @@ object EhTagDatabase : CoroutineScope {
     // 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,
@@ -82,7 +83,7 @@ object EhTagDatabase : CoroutineScope {
 
     data class Tag(val tag: String, val hint: String?, val score: Float)
 
-    context(ctx: Context)
+    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()

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

@@ -80,12 +80,11 @@ object EhUrl {
             else -> ORIGIN_E
         }
 
-    val uConfigUrl: String
-        get() = when (Settings.gallerySite.value) {
-            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.value) {

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

@@ -27,9 +27,10 @@ import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
 import androidx.core.net.toUri
 import arrow.core.memoize
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.parser.Archive
 import com.hippo.ehviewer.spider.SpiderDen
 import com.hippo.ehviewer.util.AppConfig
@@ -38,7 +39,6 @@ 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 {

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

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

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

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

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

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

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

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

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

@@ -15,25 +15,24 @@
  */
 package com.hippo.ehviewer.client.data
 
+import com.ehviewer.core.database.model.QuickSearch
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.addQueryParameter
 import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
 import com.hippo.ehviewer.client.ehUrl
-import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.ui.main.AdvanceTable
 import io.ktor.http.Parameters
-import kotlin.text.toIntOrNull
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class ListUrlBuilder(
     var mode: Int = MODE_NORMAL,
     private var prev: String? = null,
-    var next: String? = null,
-    // Reset to null after initial loading
-    var jumpTo: String? = null,
+    private var next: String? = null,
+    private var jumpTo: String? = null,
     private var range: Int = 0,
     var category: Int = EhUtils.NONE,
     private var mKeyword: String? = null,
@@ -49,11 +48,14 @@ data class ListUrlBuilder(
         next = index.takeIf { isNext }
         prev = index.takeUnless { isNext }
         range = 0
+        jumpTo = null
     }
 
-    fun setJumpTo(to: Int) {
-        jumpTo = to.takeUnless { it == 0 }?.toString()
-    }
+    var page: Int
+        get() = (jumpTo?.toInt() ?: 0) + 1
+        set(value) {
+            jumpTo = (value - 1).takeUnless { it == 0 }?.toString()
+        }
 
     fun setRange(to: Int) {
         range = to
@@ -62,6 +64,11 @@ data class ListUrlBuilder(
         jumpTo = null
     }
 
+    fun setSeek(date: String) {
+        setIndex("2", true)
+        jumpTo = date
+    }
+
     var keyword: String?
         get() = if (MODE_UPLOADER == mode) "uploader:$mKeyword" else mKeyword
         set(keyword) {

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

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

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

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

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

@@ -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)

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

@@ -15,6 +15,6 @@
  */
 package com.hippo.ehviewer.client.exception
 
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 
 class NoHathClientException() : EhException(R.string.download_archive_failure_no_hath)

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

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

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

@@ -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)

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 import kotlinx.serialization.Serializable

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

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

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

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

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

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

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

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

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

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

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

@@ -6,16 +6,16 @@ import coil3.intercept.Interceptor
 import coil3.request.ImageRequest
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.isFile
+import com.ehviewer.core.files.sendTo
+import com.ehviewer.core.files.toUri
 import com.hippo.ehviewer.EhApplication.Companion.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.util.sendTo
-import com.hippo.files.delete
-import com.hippo.files.isDirectory
-import com.hippo.files.isFile
-import com.hippo.files.toUri
 
 private val downloadInfoKey = Extras.Key<DownloadInfo?>(default = null)
 
@@ -35,7 +35,7 @@ object DownloadThumbInterceptor : Interceptor {
                 info.thumbKey = thumbKey
                 EhDB.putGalleryInfo(info.galleryInfo)
             }
-            val dir = downloadLocation / info.dirname
+            val dir = downloadLocation / info.dirname!!
             val format = thumbKey.substringAfterLast('.', "")
             check(format.isNotBlank())
             val thumb = dir / "thumb.$format"

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

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

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

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

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

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

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

@@ -31,16 +31,20 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.savedstate.serialization.decodeFromSavedState
 import androidx.savedstate.serialization.encodeToSavedState
-import com.hippo.ehviewer.R
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.unsafeLazy
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.dao.DownloadInfo
+import com.hippo.ehviewer.client.exception.FatalException
+import com.hippo.ehviewer.client.exception.InsufficientGpException
+import com.hippo.ehviewer.client.exception.IpBannedException
+import com.hippo.ehviewer.client.exception.QuotaExceededException
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.util.isAtLeastS
-import com.hippo.ehviewer.util.unsafeLazy
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -61,7 +65,7 @@ class DownloadService :
     private val notifyManager by unsafeLazy { NotificationManagerCompat.from(this) }
     private val downloadingNotification by unsafeLazy { initDownloadingNotification() }
     private val downloadedNotification by lazy { initDownloadedNotification() }
-    private val error509Notification by lazy { init509Notification() }
+    private val fatalNotification by lazy { initFatalNotification() }
     private val channelId by unsafeLazy { "$packageName.download" }
 
     override fun onCreate() {
@@ -137,7 +141,7 @@ class DownloadService :
             .setAutoCancel(false)
             .setCategory(NotificationCompat.CATEGORY_PROGRESS)
             .addAction(
-                R.drawable.v_pause_x24,
+                com.hippo.ehviewer.R.drawable.v_pause_x24,
                 getString(R.string.stat_download_action_stop_all),
                 piStopAll,
             )
@@ -172,24 +176,27 @@ class DownloadService :
             .apply { launch { run() } }
     }
 
-    private fun init509Notification(): NotificationHandler {
+    private fun initFatalNotification(): NotificationHandler {
         val builder = NotificationCompat.Builder(applicationContext, channelId)
-            .setSmallIcon(R.drawable.ic_baseline_warning_24)
-            .setContentTitle(getString(R.string.stat_509_alert_title))
-            .setContentText(getString(R.string.stat_509_alert_text))
-            .setStyle(
-                NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)),
-            )
+            .setSmallIcon(com.hippo.ehviewer.R.drawable.ic_baseline_warning_24)
             .setAutoCancel(true)
             .setOngoing(false)
             .setCategory(NotificationCompat.CATEGORY_ERROR)
-        return NotificationHandler(this, notifyManager, builder, ID_509)
+        return NotificationHandler(this, notifyManager, builder, ID_FATAL)
             .apply { launch { run() } }
     }
 
-    override fun onGet509() {
-        error509Notification.run {
+    override fun onFatal(error: FatalException) {
+        val (title, text) = when (error) {
+            is IpBannedException -> R.string.error_ip_banned to error.message
+            is InsufficientGpException -> R.string.insufficient_funds to error.message
+            is QuotaExceededException -> R.string.stat_509_alert_title to getString(R.string.stat_509_alert_text)
+        }
+        fatalNotification.run {
             builder.setWhen(System.currentTimeMillis())
+                .setContentTitle(getString(title))
+                .setContentText(text)
+                .setStyle(NotificationCompat.BigTextStyle().bigText(text))
             show()
         }
     }
@@ -412,7 +419,7 @@ class DownloadService :
         const val ACTION_CLEAR_DOWNLOAD_SERVICE = "clear_download_service"
         private const val ID_DOWNLOADING = 1
         private const val ID_DOWNLOADED = 2
-        private const val ID_509 = 3
+        private const val ID_FATAL = 3
         private const val DELAY = 1000L // 1s
         private val sItemStateArray = LongSparseArray<Boolean>()
         private val sItemTitleArray = LongSparseArray<String>()

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

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

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

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

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

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

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

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

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

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

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

@@ -36,6 +36,10 @@ import coil3.size.Dimension
 import coil3.size.Precision
 import coil3.size.Size
 import coil3.size.SizeResolver
+import com.ehviewer.core.files.openFileDescriptor
+import com.ehviewer.core.files.toUri
+import com.ehviewer.core.util.isAtLeastP
+import com.ehviewer.core.util.isAtLeastU
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.coil.AnimatedWebPDrawable
 import com.hippo.ehviewer.coil.BitmapImageWithExtraInfo
@@ -48,21 +52,17 @@ import com.hippo.ehviewer.jni.munmap
 import com.hippo.ehviewer.jni.rewriteGifSource
 import com.hippo.ehviewer.ktbuilder.execute
 import com.hippo.ehviewer.ktbuilder.imageRequest
-import com.hippo.ehviewer.util.isAtLeastP
-import com.hippo.ehviewer.util.isAtLeastU
-import com.hippo.ehviewer.util.updateAndGet
-import com.hippo.files.openFileDescriptor
-import com.hippo.files.toUri
 import java.nio.ByteBuffer
 import kotlin.concurrent.atomics.AtomicInt
 import kotlin.concurrent.atomics.decrementAndFetch
+import kotlin.concurrent.atomics.updateAndFetch
 import okio.Path
 import splitties.init.appCtx
 
 class Image private constructor(image: CoilImage, private val src: ImageSource) {
     val refcnt = AtomicInt(1)
 
-    fun pin() = refcnt.updateAndGet { if (it != 0) it + 1 else 0 } != 0
+    fun pin() = refcnt.updateAndFetch { if (it != 0) it + 1 else 0 } != 0
 
     fun unpin() = (refcnt.decrementAndFetch() == 0).also { if (it) recycle() }
 

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

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

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

@@ -10,6 +10,7 @@ import android.net.http.UrlRequest
 import android.net.http.UrlResponseInfo
 import android.os.Build
 import androidx.annotation.RequiresExtension
+import com.ehviewer.core.preferences.edit
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.util.restartApplication
 import io.ktor.client.engine.HttpClientEngineBase
@@ -40,7 +41,6 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.job
 import kotlinx.coroutines.suspendCancellableCoroutine
-import splitties.preferences.edit
 
 class CronetEngine(override val config: CronetConfig) : HttpClientEngineBase("Cronet") {
     // Limit thread to 1 since we are async & non-blocking
@@ -108,7 +108,7 @@ class CronetEngine(override val config: CronetConfig) : HttpClientEngineBase("Cr
                 val message = error.message.orEmpty()
                 if ("ERR_FILE_NOT_FOUND" in message || "ERR_PROXY_CONNECTION_FAILED" in message) {
                     Settings.edit(true) {
-                        enableCronet.value = false
+                        it[enableCronet] = false
                     }
                     with(config.context) { restartApplication() }
                 }

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

@@ -1,6 +1,6 @@
 package com.hippo.ehviewer.ktor
 
-import com.hippo.ehviewer.util.isAtLeastQ
+import com.ehviewer.core.util.isAtLeastQ
 import io.ktor.client.engine.okhttp.OkHttpConfig
 import okhttp3.AsyncDns
 import okhttp3.android.AndroidAsyncDns

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

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

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

@@ -1,23 +1,24 @@
 package com.hippo.ehviewer.spider
 
+import com.ehviewer.core.database.util.SimpleTagsConverter
+import com.ehviewer.core.files.read
+import com.ehviewer.core.files.write
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryTag
+import com.ehviewer.core.model.PowerStatus
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.model.TagNamespace.Artist
+import com.ehviewer.core.model.TagNamespace.Character
+import com.ehviewer.core.model.TagNamespace.Cosplayer
+import com.ehviewer.core.model.TagNamespace.Female
+import com.ehviewer.core.model.TagNamespace.Group
+import com.ehviewer.core.model.TagNamespace.Location
+import com.ehviewer.core.model.TagNamespace.Male
+import com.ehviewer.core.model.TagNamespace.Mixed
+import com.ehviewer.core.model.TagNamespace.Other
+import com.ehviewer.core.model.TagNamespace.Parody
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryTag
-import com.hippo.ehviewer.client.data.PowerStatus
-import com.hippo.ehviewer.client.data.SimpleTagsConverter
-import com.hippo.ehviewer.client.data.TagNamespace
-import com.hippo.ehviewer.client.data.TagNamespace.Artist
-import com.hippo.ehviewer.client.data.TagNamespace.Character
-import com.hippo.ehviewer.client.data.TagNamespace.Cosplayer
-import com.hippo.ehviewer.client.data.TagNamespace.Female
-import com.hippo.ehviewer.client.data.TagNamespace.Group
-import com.hippo.ehviewer.client.data.TagNamespace.Male
-import com.hippo.ehviewer.client.data.TagNamespace.Mixed
-import com.hippo.ehviewer.client.data.TagNamespace.Other
-import com.hippo.ehviewer.client.data.TagNamespace.Parody
-import com.hippo.files.read
-import com.hippo.files.write
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -60,7 +61,7 @@ fun GalleryInfo.getComicInfo(): ComicInfo {
                     Group -> groups.addAll(list)
                     Character -> characters.addAll(list)
                     Parody -> parodies.addAll(list)
-                    Other -> otherTags.addAll(list)
+                    Location, Other -> otherTags.addAll(list)
                     Female, Male, Mixed -> ns.prefix.let { prefix ->
                         list.forEach { tag -> otherTags.add("$prefix:$tag") }
                     }
@@ -76,7 +77,7 @@ fun GalleryInfo.getComicInfo(): ComicInfo {
                     Group -> groups.add(tag)
                     Character -> characters.add(tag)
                     Parody -> if (tag != TAG_ORIGINAL) parodies.add(tag)
-                    Other -> otherTags.add(tag)
+                    Location, Other -> otherTags.add(tag)
                     Female, Male, Mixed -> ns.prefix.let { otherTags.add("$it:$tag") }
                     else -> Unit
                 }

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

@@ -24,7 +24,7 @@ import kotlin.time.Duration.Companion.seconds
 import kotlin.time.Instant
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -47,7 +47,7 @@ class SpeedTracker(val window: Duration = 1.seconds) {
         }
     }
 
-    fun speedFlow(sample: Duration = 1.seconds) = fixedRate(sample).map {
+    fun speedFlow(sample: Duration = 1.seconds) = fixedRate(sample).mapNotNull {
         mutex.withLock {
             start?.let { start ->
                 val now = Clock.System.now()
@@ -55,8 +55,8 @@ class SpeedTracker(val window: Duration = 1.seconds) {
                 val window = passed.coerceIn(10.milliseconds, window)
                 val cutoff = now - window
                 received.removeIf { time, _ -> time < cutoff }
-                received.fold(0) { total, _, v -> total + v } / (window / 1.seconds)
-            } ?: 0.0
+                (received.fold(0) { total, _, v -> total + v } / (window / 1.seconds)).toLong()
+            }
         }
     }
 }
@@ -72,16 +72,21 @@ suspend inline fun <R> timeoutBySpeed(
 ) = coroutineScope {
     val onTimeout = AtomicReference<OnTimeout?>(t).let { { e: IOException -> it.exchange(null)?.invoke(e) } }
     val watchdog = launch {
-        delay(Settings.connTimeout.value.seconds)
-        onTimeout(ConnectTimeoutException(url, Settings.connTimeout.value * 1000L))
+        val timeout = 10.seconds
+        delay(timeout)
+        onTimeout(ConnectTimeoutException(url, timeout.inWholeMilliseconds))
     }
     val tracker = SpeedTracker(2.seconds)
     request {
         var prev = 0L
         onDownload { done, total ->
             val bytesRead = (done - prev).toInt()
-            tracker.track(bytesRead)
-            l(total!!, done, bytesRead)
+            if (done == total!!) {
+                tracker.reset()
+            } else {
+                tracker.track(bytesRead)
+            }
+            l(total, done, bytesRead)
             prev = done
         }
         timeout { reset() }
@@ -89,10 +94,10 @@ suspend inline fun <R> timeoutBySpeed(
         watchdog.cancel()
         resp.status.ensureSuccess()
         val speedWatchdog = launch {
-            val timeoutSpeed = speedLevelToSpeed(Settings.timeoutSpeed.value) * 1024.0
-            tracker.speedFlow(1.seconds).collect { speed ->
-                if (timeoutSpeed != 0.0 && speed < timeoutSpeed) {
-                    onTimeout(LowSpeedException(url, speed.toLong()))
+            val timeoutSpeed = speedLevelToSpeed(Settings.timeoutSpeed.value) * 1024L
+            tracker.speedFlow().collect { speed ->
+                if (speed < timeoutSpeed) {
+                    onTimeout(LowSpeedException(url, speed))
                 }
             }
         }
@@ -104,7 +109,9 @@ suspend inline fun <R> timeoutBySpeed(
     }
 }
 
-fun speedLevelToSpeed(level: Int) = 2f.pow(level).roundToInt()
+const val MIN_SPEED_LEVEL = 3
+
+fun speedLevelToSpeed(level: Int) = if (level == MIN_SPEED_LEVEL) 0 else 2f.pow(level).roundToInt()
 
 inline fun <T, R> MutableObjectIntMap<T>.fold(initial: R, operation: (acc: R, T, Int) -> R): R {
     var accumulator = initial

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

@@ -20,18 +20,28 @@ import arrow.fx.coroutines.autoCloseable
 import arrow.fx.coroutines.closeable
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.resourceScope
+import com.ehviewer.core.database.model.DownloadArtist
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.exists
+import com.ehviewer.core.files.find
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.list
+import com.ehviewer.core.files.mkdirs
+import com.ehviewer.core.files.moveTo
+import com.ehviewer.core.files.openFileDescriptor
+import com.ehviewer.core.files.sendTo
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhApplication.Companion.imageCache as sCache
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils.getSuitableTitle
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.ehRequest
 import com.hippo.ehviewer.client.getImageKey
 import com.hippo.ehviewer.coil.read
 import com.hippo.ehviewer.coil.suspendEdit
-import com.hippo.ehviewer.dao.DownloadArtist
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.downloadLocation
 import com.hippo.ehviewer.download.tempDownloadDir
@@ -39,17 +49,7 @@ import com.hippo.ehviewer.image.PathSource
 import com.hippo.ehviewer.jni.archiveFdBatch
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.copyTo
-import com.hippo.ehviewer.util.sendTo
 import com.hippo.ehviewer.util.sha1
-import com.hippo.files.delete
-import com.hippo.files.exists
-import com.hippo.files.find
-import com.hippo.files.isDirectory
-import com.hippo.files.list
-import com.hippo.files.mkdirs
-import com.hippo.files.moveTo
-import com.hippo.files.openFileDescriptor
-import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.bodyAsChannel
 import io.ktor.client.statement.request

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

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

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

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

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

@@ -35,17 +35,27 @@ import androidx.compose.material3.Text
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.exists
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.write
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo.Companion.LOCAL_FAVORITED
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
+import com.ehviewer.core.ui.component.LabeledCheckbox
+import com.ehviewer.core.util.isAtLeastT
+import com.ehviewer.core.util.mapToLongArray
+import com.ehviewer.core.util.toEpochMillis
+import com.ehviewer.core.util.toLocalDateTime
+import com.ehviewer.core.util.withIOContext
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.download.downloadDir
@@ -54,7 +64,6 @@ import com.hippo.ehviewer.download.tempDownloadDir
 import com.hippo.ehviewer.ui.destinations.ReaderScreenDestination
 import com.hippo.ehviewer.ui.reader.ReaderScreenArgs
 import com.hippo.ehviewer.ui.tools.DialogState
-import com.hippo.ehviewer.ui.tools.LabeledCheckbox
 import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel
 import com.hippo.ehviewer.ui.tools.awaitResult
 import com.hippo.ehviewer.ui.tools.awaitSelectDate
@@ -64,18 +73,9 @@ import com.hippo.ehviewer.ui.tools.awaitSelectItemWithIcon
 import com.hippo.ehviewer.ui.tools.awaitSelectItemWithIconAndTextField
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 import com.hippo.ehviewer.util.bgWork
-import com.hippo.ehviewer.util.isAtLeastT
-import com.hippo.ehviewer.util.mapToLongArray
 import com.hippo.ehviewer.util.requestPermission
 import com.hippo.ehviewer.util.restartApplication
-import com.hippo.ehviewer.util.toEpochMillis
-import com.hippo.ehviewer.util.toLocalDateTime
-import com.hippo.files.delete
-import com.hippo.files.exists
-import com.hippo.files.isDirectory
-import com.hippo.files.write
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import eu.kanade.tachiyomi.util.lang.withIOContext
 import kotlin.time.Clock
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -100,10 +100,10 @@ private fun ensureNoMediaFile(downloadDir: Path) {
 
 private val lck = Mutex()
 
-suspend fun keepNoMediaFileStatus(downloadDir: Path = downloadLocation) {
+suspend fun keepNoMediaFileStatus(downloadDir: Path = downloadLocation, mediaScan: Boolean = Settings.mediaScan.value) {
     if (downloadDir.isDirectory) {
         lck.withLock {
-            if (Settings.mediaScan.value) {
+            if (mediaScan) {
                 removeNoMediaFile(downloadDir)
             } else {
                 ensureNoMediaFile(downloadDir)
@@ -114,7 +114,7 @@ suspend fun keepNoMediaFileStatus(downloadDir: Path = downloadLocation) {
 
 fun getFavoriteIcon(favorited: Boolean) = if (favorited) Icons.Default.Favorite else Icons.Default.FavoriteBorder
 
-context(_: DialogState, context: MainActivity)
+context(_: DialogState, _: MainActivity)
 suspend fun startDownload(forceDefault: Boolean, vararg galleryInfos: BaseGalleryInfo) {
     if (isAtLeastT) {
         requestPermission(Manifest.permission.POST_NOTIFICATIONS)
@@ -177,7 +177,7 @@ suspend fun startDownload(forceDefault: Boolean, vararg galleryInfos: BaseGaller
 }
 
 context(_: DialogState)
-suspend fun modifyFavorites(galleryInfo: BaseGalleryInfo): Boolean {
+suspend fun modifyFavorites(galleryInfo: GalleryInfo): Boolean {
     val localFavorited = EhDB.containLocalFavorites(galleryInfo.gid)
     if (Settings.hasSignedIn.value) {
         val isFavorited = galleryInfo.favoriteSlot != NOT_FAVORITED
@@ -215,7 +215,7 @@ suspend fun modifyFavorites(galleryInfo: BaseGalleryInfo): Boolean {
 }
 
 private suspend fun doModifyFavorites(
-    galleryInfo: BaseGalleryInfo,
+    galleryInfo: GalleryInfo,
     slot: Int = NOT_FAVORITED,
     localFavorited: Boolean = true,
     note: String = "",
@@ -263,7 +263,7 @@ private suspend fun doModifyFavorites(
     add
 }
 
-suspend fun removeFromFavorites(galleryInfo: BaseGalleryInfo) = doModifyFavorites(
+suspend fun removeFromFavorites(galleryInfo: GalleryInfo) = doModifyFavorites(
     galleryInfo = galleryInfo,
     localFavorited = EhDB.containLocalFavorites(galleryInfo.gid),
 )
@@ -419,7 +419,7 @@ suspend fun showMoveDownloadLabelList(list: Collection<DownloadInfo>): String? {
 }
 
 context(_: DialogState)
-suspend fun awaitSelectDate(): String? {
+suspend fun awaitSelectDate(): String {
     val initial = LocalDate(2007, 3, 21)
     val yesterday = Clock.System.todayIn(TimeZone.UTC).minus(1, DateTimeUnit.DAY)
     val initialMillis = initial.toEpochMillis()
@@ -432,8 +432,7 @@ suspend fun awaitSelectDate(): String? {
             override fun isSelectableDate(utcTimeMillis: Long): Boolean = utcTimeMillis in dateRange
         },
     )
-    val date = dateMillis?.run { toLocalDateTime().date.toString() }
-    return date
+    return dateMillis.toLocalDateTime().date.toString()
 }
 
 context(_: Context, _: DialogState)

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

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

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

@@ -20,8 +20,8 @@ import android.view.View
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.ActivityNavigator
+import com.ehviewer.core.util.isAtLeastR
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.util.isAtLeastR
 import eu.kanade.tachiyomi.util.view.setSecureScreen
 
 abstract class EhActivity : AppCompatActivity() {

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

@@ -24,12 +24,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.client.thumbUrl
 import com.hippo.ehviewer.ui.screen.navWithUrl
 import com.hippo.ehviewer.util.addTextToClipboard
@@ -76,7 +76,7 @@ fun GalleryInfoBottomSheet(detail: GalleryDetail) {
             LazyColumn(contentPadding = WindowInsets.systemBars.only(WindowInsetsSides.Bottom).asPaddingValues()) {
                 itemsIndexed(data) { index, (key, content) ->
                     Row(
-                        modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.keyline_margin)).clickable {
+                        modifier = Modifier.padding(horizontal = dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)).clickable {
                             if (index == INDEX_PARENT) {
                                 if (content != null) {
                                     navWithUrl(content)

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

@@ -70,7 +70,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.currentCompositeKeyHashCode
@@ -97,14 +96,26 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.lerp
 import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.LifecycleResumeEffect
 import androidx.navigation.compose.rememberNavController
-import com.hippo.ehviewer.R
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.toOkioPath
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.component.LabeledCheckbox
+import com.ehviewer.core.ui.component.LocalSideSheetState
+import com.ehviewer.core.ui.component.MutableSideSheet
+import com.ehviewer.core.ui.icons.EhIcons
+import com.ehviewer.core.ui.icons.filled.Subscriptions
+import com.ehviewer.core.ui.util.LocalSnackBarFabPadding
+import com.ehviewer.core.ui.util.LocalWindowSizeClass
+import com.ehviewer.core.util.isAtLeastQ
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.withIOContext
+import com.hippo.ehviewer.EhApplication.Companion.initialized
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser
@@ -112,8 +123,6 @@ import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.download.downloadLocation
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.filled.Subscriptions
 import com.hippo.ehviewer.ui.destinations.DownloadScreenDestination
 import com.hippo.ehviewer.ui.destinations.DownloadsScreenDestination
 import com.hippo.ehviewer.ui.destinations.FavouritesScreenDestination
@@ -130,8 +139,6 @@ import com.hippo.ehviewer.ui.screen.asDstWith
 import com.hippo.ehviewer.ui.screen.navWithUrl
 import com.hippo.ehviewer.ui.settings.showNewVersion
 import com.hippo.ehviewer.ui.tools.DialogState
-import com.hippo.ehviewer.ui.tools.LabeledCheckbox
-import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass
 import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel
 import com.hippo.ehviewer.ui.tools.awaitInputText
 import com.hippo.ehviewer.updater.AppUpdater
@@ -141,16 +148,11 @@ import com.hippo.ehviewer.util.calculateFraction
 import com.hippo.ehviewer.util.displayString
 import com.hippo.ehviewer.util.getParcelableExtraCompat
 import com.hippo.ehviewer.util.getUrlFromClipboard
-import com.hippo.ehviewer.util.isAtLeastQ
-import com.hippo.ehviewer.util.isAtLeastS
 import com.hippo.ehviewer.util.sha1
-import com.hippo.files.isDirectory
-import com.hippo.files.toOkioPath
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.spec.Direction
 import com.ramcosta.composedestinations.utils.currentDestinationAsState
 import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator
-import eu.kanade.tachiyomi.util.lang.withIOContext
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
@@ -199,7 +201,7 @@ class MainActivity : EhActivity() {
 
     @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
     override fun onCreate(savedInstanceState: Bundle?) {
-        installSplashScreen()
+        installSplashScreen().setKeepOnScreenCondition { !initialized }
         super.onCreate(savedInstanceState)
         setMD3Content {
             val configuration = LocalConfiguration.current
@@ -394,7 +396,7 @@ class MainActivity : EhActivity() {
                                         .windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Bottom)),
                                 ) {
                                     Image(
-                                        painter = painterResource(id = R.drawable.sadpanda_low_poly),
+                                        painter = painterResource(id = com.hippo.ehviewer.R.drawable.sadpanda_low_poly),
                                         contentDescription = null,
                                         modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
                                         contentScale = ContentScale.FillWidth,
@@ -532,7 +534,6 @@ val LocalNavDrawerState = compositionLocalOf<DrawerState> { error("CompositionLo
 
 val LocalDrawerHandle = compositionLocalOf<SnapshotStateList<Long>> { error("CompositionLocal LocalDrawerHandle not present!") }
 val LocalSnackBarHostState = compositionLocalOf<SnackbarHostState> { error("CompositionLocal LocalSnackBarHostState not present!") }
-val LocalSnackBarFabPadding = compositionLocalOf<State<Dp>> { error("CompositionLocal LocalSnackBarFabPadding not present!") }
 val LocalSharedTransitionScope = compositionLocalOf<SharedTransitionScope> { error("CompositionLocal LocalSharedTransitionScope not present!") }
 
 @Composable

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

@@ -29,7 +29,7 @@ import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
 import androidx.biometric.registerForAuthenticationResult
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 import com.hippo.ehviewer.Settings
 
 context(ctx: Context)

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

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

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

@@ -20,8 +20,8 @@ import android.content.Context
 import android.widget.Toast
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.net.toUri
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.data.GalleryDetail
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryDetail
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 
@@ -32,7 +32,7 @@ fun openBrowser(url: String) {
     if (url.isEmpty()) return
     try {
         intent.launchUrl(ctx, url.toUri())
-    } catch (e: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         Toast.makeText(ctx, R.string.no_browser_installed, Toast.LENGTH_LONG).show()
     }
 }

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

@@ -7,8 +7,8 @@ import coil3.decode.DecodeUtils
 import coil3.imageLoader
 import coil3.request.crossfade
 import coil3.size.Scale
+import com.ehviewer.core.util.toIntOrDefault
 import com.hippo.ehviewer.ktbuilder.imageRequest
-import com.hippo.ehviewer.util.toIntOrDefault
 import kotlin.math.roundToInt
 import splitties.init.appCtx
 

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

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

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

@@ -1,11 +1,11 @@
 package com.hippo.ehviewer.ui.login
 
 import arrow.core.Either.Companion.catch
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -36,7 +36,7 @@ fun postLogin() = GlobalScope.async(Dispatchers.IO) {
     // Get cookies for image limits
     launch {
         catch {
-            EhEngine.getUConfig(EhUrl.URL_UCONFIG_E)
+            EhEngine.getUConfig(EhUrl.SITE_E)
             EhCookieStore.flush()
         }.onLeft {
             logcat(it)
@@ -45,7 +45,7 @@ fun postLogin() = GlobalScope.async(Dispatchers.IO) {
 
     // Sad panda check
     catch {
-        EhEngine.getUConfig(EhUrl.URL_UCONFIG_EX)
+        EhEngine.getUConfig(EhUrl.SITE_EX)
         EhCookieStore.flush()
         Settings.gallerySite.value = EhUrl.SITE_EX
     }.onLeft {

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

@@ -58,7 +58,13 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.util.LocalWindowSizeClass
+import com.ehviewer.core.ui.util.ifTrueThen
+import com.ehviewer.core.ui.util.isExpanded
+import com.ehviewer.core.ui.util.thenIf
+import com.ehviewer.core.util.launchIO
+import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
@@ -66,18 +72,12 @@ import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.Screen
 import com.hippo.ehviewer.ui.destinations.WebViewSignInScreenDestination
 import com.hippo.ehviewer.ui.openBrowser
-import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass
 import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel
-import com.hippo.ehviewer.ui.tools.isExpanded
-import com.hippo.ehviewer.ui.tools.thenIf
 import com.hippo.ehviewer.util.displayString
-import com.jamal.composeprefs3.ui.ifTrueThen
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.Job
-import moe.tarsin.launchIO
 import moe.tarsin.navigate
 
 @Destination<RootGraph>(start = true)
@@ -142,7 +142,7 @@ fun AnimatedVisibilityScope.SignInScreen(navigator: DestinationsNavigator) = Scr
     fun UsernameAndPasswordTextField() {
         OutlinedTextField(
             state = username,
-            modifier = Modifier.width(dimensionResource(id = R.dimen.single_max_width))
+            modifier = Modifier.width(dimensionResource(id = com.hippo.ehviewer.R.dimen.single_max_width))
                 .semantics { contentType = ContentType.Username }
                 .thenIf(!showUsernameError) { padding(bottom = 16.dp) },
             label = { Text(stringResource(R.string.username)) },
@@ -154,7 +154,7 @@ fun AnimatedVisibilityScope.SignInScreen(navigator: DestinationsNavigator) = Scr
         )
         OutlinedSecureTextField(
             state = password,
-            modifier = Modifier.width(dimensionResource(id = R.dimen.single_max_width))
+            modifier = Modifier.width(dimensionResource(id = com.hippo.ehviewer.R.dimen.single_max_width))
                 .semantics { contentType = ContentType.Password }
                 .thenIf(!showPasswordError) { padding(bottom = 16.dp) },
             label = { Text(stringResource(R.string.password)) },
@@ -180,27 +180,27 @@ fun AnimatedVisibilityScope.SignInScreen(navigator: DestinationsNavigator) = Scr
         when {
             !windowSizeClass.isExpanded -> {
                 Column(
-                    modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).systemBarsPadding().padding(dimensionResource(id = R.dimen.keyline_margin)),
+                    modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).systemBarsPadding().padding(dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)),
                     horizontalAlignment = Alignment.CenterHorizontally,
                 ) {
                     Image(
-                        painter = painterResource(id = R.drawable.ic_launcher_foreground),
+                        painter = painterResource(id = com.hippo.ehviewer.R.drawable.ic_launcher_foreground),
                         contentDescription = null,
-                        modifier = Modifier.padding(dimensionResource(id = R.dimen.keyline_margin)),
+                        modifier = Modifier.padding(dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)),
                     )
                     UsernameAndPasswordTextField()
                     Text(
                         text = stringResource(id = R.string.app_waring),
-                        modifier = Modifier.widthIn(max = dimensionResource(id = R.dimen.single_max_width)).padding(top = 24.dp),
+                        modifier = Modifier.widthIn(max = dimensionResource(id = com.hippo.ehviewer.R.dimen.single_max_width)).padding(top = 24.dp),
                         style = MaterialTheme.typography.titleMedium,
                     )
                     Text(
                         text = stringResource(id = R.string.app_waring_2),
-                        modifier = Modifier.widthIn(max = dimensionResource(id = R.dimen.single_max_width)).padding(top = 12.dp),
+                        modifier = Modifier.widthIn(max = dimensionResource(id = com.hippo.ehviewer.R.dimen.single_max_width)).padding(top = 12.dp),
                         style = MaterialTheme.typography.titleLarge,
                     )
-                    Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.keyline_margin)))
-                    Row(modifier = Modifier.padding(top = dimensionResource(R.dimen.keyline_margin))) {
+                    Spacer(modifier = Modifier.height(dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)))
+                    Row(modifier = Modifier.padding(top = dimensionResource(com.hippo.ehviewer.R.dimen.keyline_margin))) {
                         FilledTonalButton(
                             onClick = { openBrowser(EhUrl.URL_REGISTER) },
                             shapes = ButtonDefaults.shapes(),
@@ -255,18 +255,18 @@ fun AnimatedVisibilityScope.SignInScreen(navigator: DestinationsNavigator) = Scr
             }
             else -> {
                 Row(
-                    modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).systemBarsPadding().padding(dimensionResource(id = R.dimen.keyline_margin)),
+                    modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).systemBarsPadding().padding(dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Column(
-                        modifier = Modifier.width(dimensionResource(id = R.dimen.signinscreen_landscape_caption_frame_width)).padding(dimensionResource(id = R.dimen.keyline_margin)),
+                        modifier = Modifier.width(dimensionResource(id = com.hippo.ehviewer.R.dimen.signinscreen_landscape_caption_frame_width)).padding(dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)),
                         horizontalAlignment = Alignment.CenterHorizontally,
                     ) {
                         Image(
-                            painter = painterResource(id = R.drawable.ic_launcher_foreground),
+                            painter = painterResource(id = com.hippo.ehviewer.R.drawable.ic_launcher_foreground),
                             contentDescription = null,
                             alignment = Alignment.Center,
-                            modifier = Modifier.padding(dimensionResource(id = R.dimen.keyline_margin)),
+                            modifier = Modifier.padding(dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)),
                         )
                         Text(
                             text = stringResource(id = R.string.app_waring),

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

@@ -22,7 +22,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 import com.hippo.ehviewer.client.parser.Archive
 import com.hippo.ehviewer.client.parser.Funds
 

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

@@ -43,7 +43,11 @@ import arrow.core.none
 import arrow.core.some
 import coil3.compose.AsyncImage
 import coil3.network.HttpException
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.component.RollingNumber
+import com.ehviewer.core.ui.component.RollingNumberPlaceholder
+import com.ehviewer.core.util.launch
+import com.ehviewer.core.util.launchIO
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils
@@ -65,8 +69,6 @@ import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import moe.tarsin.coroutines.runSwallowingWithUI
-import moe.tarsin.launch
-import moe.tarsin.launchIO
 
 private val limitScope = CoroutineScope(Dispatchers.IO)
 private val refreshEvent = MutableSharedFlow<Unit>()
@@ -107,7 +109,7 @@ fun AvatarIcon() {
                                 horizontalAlignment = Alignment.CenterHorizontally,
                             ) {
                                 CircularWavyProgressIndicator()
-                                Spacer(modifier = Modifier.size(dimensionResource(id = R.dimen.keyline_margin)))
+                                Spacer(modifier = Modifier.size(dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)))
                                 Text(text = placeholder)
                             }
                         }

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

@@ -39,15 +39,15 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.hippo.ehviewer.R
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.component.CrystalCard
+import com.ehviewer.core.ui.component.GalleryListCardRating
+import com.ehviewer.core.ui.util.TransitionsVisibilityScope
+import com.ehviewer.core.ui.util.listThumbGenerator
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.ui.tools.CrystalCard
-import com.hippo.ehviewer.ui.tools.GalleryListCardRating
-import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope
-import com.hippo.ehviewer.ui.tools.listThumbGenerator
 import com.hippo.ehviewer.util.FileUtils
 
 @Composable

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

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

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

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

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

@@ -23,8 +23,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.text.parseAsHtml
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.data.GalleryComment
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryComment
 import com.hippo.ehviewer.ui.legacy.CoilImageGetter
 import com.hippo.ehviewer.ui.legacy.LinkifyTextView
 import com.hippo.ehviewer.util.ReadableTime
@@ -50,7 +50,7 @@ fun GalleryCommentCard(
         },
         modifier = modifier,
     ) {
-        val margin = dimensionResource(id = R.dimen.keyline_margin)
+        val margin = dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)
         Row(
             modifier = Modifier.padding(horizontal = margin, vertical = 8.dp).fillMaxWidth(),
             horizontalArrangement = Arrangement.SpaceBetween,

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

@@ -32,14 +32,14 @@ import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.ui.icons.EhIcons
+import com.ehviewer.core.ui.icons.big.SadAndroid
+import com.ehviewer.core.ui.util.TransitionsVisibilityScope
+import com.ehviewer.core.ui.util.detailThumbGenerator
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.big.SadAndroid
-import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope
-import com.hippo.ehviewer.ui.tools.detailThumbGenerator
 
 @Composable
 fun GalleryDetailHeaderInfoCard(
@@ -91,21 +91,21 @@ fun GalleryDetailHeaderCard(
             EhThumbCard(
                 key = remember(info.gid) { info },
                 modifier = Modifier.size(
-                    dimensionResource(id = R.dimen.gallery_detail_thumb_width),
-                    dimensionResource(id = R.dimen.gallery_detail_thumb_height),
+                    dimensionResource(id = com.hippo.ehviewer.R.dimen.gallery_detail_thumb_width),
+                    dimensionResource(id = com.hippo.ehviewer.R.dimen.gallery_detail_thumb_height),
                 ),
             )
         }
         Spacer(modifier = Modifier.weight(0.5F))
         Column(
-            modifier = Modifier.height(dimensionResource(id = R.dimen.gallery_detail_thumb_height)),
+            modifier = Modifier.height(dimensionResource(id = com.hippo.ehviewer.R.dimen.gallery_detail_thumb_height)),
             horizontalAlignment = Alignment.End,
         ) {
             (info as? GalleryDetail)?.let {
                 GalleryDetailHeaderInfoCard(
                     detail = it,
                     onClick = onInfoCardClick,
-                    modifier = Modifier.padding(top = 8.dp, end = dimensionResource(id = R.dimen.keyline_margin)),
+                    modifier = Modifier.padding(top = 8.dp, end = dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)),
                 )
             }
             Spacer(modifier = Modifier.weight(1F))
@@ -113,7 +113,7 @@ fun GalleryDetailHeaderCard(
             AssistChip(
                 onClick = onCategoryChipClick,
                 label = { Text(text = categoryText, overflow = TextOverflow.Visible, softWrap = false, maxLines = 1) },
-                modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.keyline_margin)),
+                modifier = Modifier.padding(horizontal = dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)),
                 leadingIcon = {
                     Icon(
                         imageVector = Icons.AutoMirrored.Default.Label,
@@ -125,7 +125,7 @@ fun GalleryDetailHeaderCard(
             AssistChip(
                 onClick = onUploaderChipClick,
                 label = { Text(text = uploaderText, overflow = TextOverflow.Visible, softWrap = false, maxLines = 1) },
-                modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.keyline_margin)),
+                modifier = Modifier.padding(horizontal = dimensionResource(id = com.hippo.ehviewer.R.dimen.keyline_margin)),
                 leadingIcon = {
                     Icon(
                         imageVector = Icons.Default.NoAccounts,

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

@@ -38,17 +38,17 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
+import com.ehviewer.core.ui.component.CrystalCard
+import com.ehviewer.core.ui.component.ElevatedCard
+import com.ehviewer.core.ui.component.GalleryListCardRating
+import com.ehviewer.core.ui.util.SharedElementBox
+import com.ehviewer.core.ui.util.TransitionsVisibilityScope
+import com.ehviewer.core.ui.util.listThumbGenerator
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.ui.tools.CrystalCard
-import com.hippo.ehviewer.ui.tools.ElevatedCard
-import com.hippo.ehviewer.ui.tools.GalleryListCardRating
-import com.hippo.ehviewer.ui.tools.SharedElementBox
-import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope
-import com.hippo.ehviewer.ui.tools.listThumbGenerator
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 
 @Composable

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

@@ -32,7 +32,6 @@ import androidx.compose.material3.pulltorefresh.pullToRefresh
 import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -45,41 +44,31 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.ui.component.FastScrollLazyVerticalGrid
+import com.ehviewer.core.ui.component.FastScrollLazyVerticalStaggeredGrid
+import com.ehviewer.core.ui.icons.EhIcons
+import com.ehviewer.core.ui.icons.big.SadAndroid
+import com.ehviewer.core.util.launch
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.exception.NoHitsFoundException
 import com.hippo.ehviewer.coil.PrefetchAround
 import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.big.SadAndroid
 import com.hippo.ehviewer.ktbuilder.imageRequest
 import com.hippo.ehviewer.ui.screen.collectDetailSizeAsState
-import com.hippo.ehviewer.ui.tools.FastScrollLazyVerticalGrid
-import com.hippo.ehviewer.ui.tools.FastScrollLazyVerticalStaggeredGrid
 import com.hippo.ehviewer.util.displayString
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
-import moe.tarsin.launch
-
-@Stable
-operator fun PaddingValues.plus(r: PaddingValues) = object : PaddingValues {
-    val l = this@plus
-    override fun calculateBottomPadding() = l.calculateBottomPadding() + r.calculateBottomPadding()
-    override fun calculateLeftPadding(layoutDirection: LayoutDirection) = l.calculateLeftPadding(layoutDirection) + r.calculateLeftPadding(layoutDirection)
-    override fun calculateRightPadding(layoutDirection: LayoutDirection) = l.calculateRightPadding(layoutDirection) + r.calculateRightPadding(layoutDirection)
-    override fun calculateTopPadding() = l.calculateTopPadding() + r.calculateTopPadding()
-}
 
 @Composable
-context(_: CoroutineScope, ctx: Context)
+context(_: CoroutineScope, _: Context)
 fun GalleryList(
     modifier: Modifier = Modifier,
     data: LazyPagingItems<BaseGalleryInfo>,
@@ -95,8 +84,8 @@ fun GalleryList(
     onRefresh: () -> Unit,
     onLoading: () -> Unit,
 ) {
-    val marginH = dimensionResource(id = R.dimen.gallery_list_margin_h)
-    val marginV = dimensionResource(id = R.dimen.gallery_list_margin_v)
+    val marginH = dimensionResource(id = com.hippo.ehviewer.R.dimen.gallery_list_margin_h)
+    val marginV = dimensionResource(id = com.hippo.ehviewer.R.dimen.gallery_list_margin_v)
 
     var isRefreshing by remember { mutableStateOf(false) }
     val refreshState = rememberPullToRefreshState()
@@ -132,8 +121,8 @@ fun GalleryList(
                 modifier = contentModifier.fillMaxSize(),
                 state = detailListState,
                 contentPadding = contentPadding + PaddingValues(marginH, marginV),
-                verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.gallery_list_interval)),
-                horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.gallery_list_interval)),
+                verticalArrangement = Arrangement.spacedBy(dimensionResource(com.hippo.ehviewer.R.dimen.gallery_list_interval)),
+                horizontalArrangement = Arrangement.spacedBy(dimensionResource(com.hippo.ehviewer.R.dimen.gallery_list_interval)),
             ) {
                 items(
                     count = data.itemCount,
@@ -155,7 +144,7 @@ fun GalleryList(
                 }
             }
         } else {
-            val gridInterval = dimensionResource(R.dimen.gallery_grid_interval)
+            val gridInterval = dimensionResource(com.hippo.ehviewer.R.dimen.gallery_grid_interval)
             val thumbColumns by Settings.thumbColumns.collectAsState()
             FastScrollLazyVerticalStaggeredGrid(
                 columns = StaggeredGridCells.Fixed(thumbColumns),

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

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

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

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

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

@@ -17,7 +17,7 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 
 @Composable
 fun ImageSearch(
@@ -29,7 +29,7 @@ fun ImageSearch(
 ) {
     AnimatedVisibility(visible = image != null, modifier = Modifier.align(Alignment.CenterHorizontally)) {
         Card {
-            val maxSize = dimensionResource(id = R.dimen.image_search_max_size)
+            val maxSize = dimensionResource(id = com.hippo.ehviewer.R.dimen.image_search_max_size)
             AsyncImage(
                 model = image,
                 contentDescription = null,

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

@@ -10,7 +10,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.paging.LoadState
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 import com.hippo.ehviewer.util.displayString
 
 @Composable

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

@@ -33,19 +33,19 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import arrow.core.raise.ensure
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryInfo.Companion.S_LANG_TAGS
+import com.ehviewer.core.ui.component.DropdownFilterChip
+import com.ehviewer.core.ui.util.thenIf
+import com.ehviewer.core.util.launch
+import com.ehviewer.core.util.toIntOrDefault
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANG_TAGS
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.ui.tools.DialogState
-import com.hippo.ehviewer.ui.tools.DropdownFilterChip
 import com.hippo.ehviewer.ui.tools.awaitResult
-import com.hippo.ehviewer.ui.tools.thenIf
-import com.hippo.ehviewer.util.toIntOrDefault
 import kotlinx.coroutines.CoroutineScope
-import moe.tarsin.launch
 
 private val categoryTable = arrayOf(
     EhUtils.DOUJINSHI to R.string.doujinshi,
@@ -117,7 +117,7 @@ fun SearchFilter(
             selectedItemIndex = language + 1,
             onSelectedItemIndexChange = { onLanguageChange(it - 1) },
         )
-        val minRatingItems = stringArrayResource(id = R.array.search_min_rating)
+        val minRatingItems = stringArrayResource(id = com.hippo.ehviewer.R.array.search_min_rating)
         val minRatingStr = stringResource(id = R.string.search_sr)
         DropdownFilterChip(
             label = minRatingStr,

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

@@ -22,7 +22,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 import com.hippo.ehviewer.client.parser.Torrent
 import com.hippo.ehviewer.client.parser.format
 

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ColorFilterSetting.kt

@@ -21,10 +21,10 @@ import androidx.core.graphics.alpha
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.component.RollingNumber
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.asMutableState
-import com.hippo.ehviewer.ui.main.RollingNumber
 
 @Composable
 fun ColorFilterSetting() = Column(modifier = Modifier.verticalScroll(rememberScrollState()).navigationBarsPadding()) {
@@ -87,8 +87,8 @@ fun ColorFilterSetting() = Column(modifier = Modifier.verticalScroll(rememberScr
     }
     SpinnerChoice(
         title = stringResource(id = R.string.pref_color_filter_mode),
-        entries = stringArrayResource(id = R.array.color_filter_modes),
-        values = arrayOf("0", "1", "2", "3", "4", "5"),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.color_filter_modes),
+        values = listOf(0, 1, 2, 3, 4, 5),
         field = Settings.colorFilterMode.asMutableState(),
     )
     SwitchChoice(

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/KeyEventHandler.kt

@@ -8,15 +8,17 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.input.key.type
 
 fun Modifier.keyEventHandler(
-    enabled: () -> Boolean,
-    reverse: () -> Boolean,
+    volumeKeysEnabled: () -> Boolean,
+    volumeKeysInverted: () -> Boolean,
     movePrevious: () -> Unit,
     moveNext: () -> Unit,
 ) = onPreviewKeyEvent {
-    if (enabled() && it.type == KeyEventType.KeyDown) {
+    if (it.type == KeyEventType.KeyDown) {
         when (it.key) {
-            Key.DirectionUp, Key.PageUp, Key.VolumeUp -> if (reverse()) moveNext() else movePrevious()
-            Key.DirectionDown, Key.PageDown, Key.VolumeDown -> if (reverse()) movePrevious() else moveNext()
+            Key.DirectionUp, Key.PageUp -> movePrevious()
+            Key.DirectionDown, Key.PageDown -> moveNext()
+            Key.VolumeUp if volumeKeysEnabled() -> if (volumeKeysInverted()) moveNext() else movePrevious()
+            Key.VolumeDown if volumeKeysEnabled() -> if (volumeKeysInverted()) movePrevious() else moveNext()
             else -> return@onPreviewKeyEvent false
         }
         true

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/PageActions.kt

@@ -13,21 +13,21 @@ import android.webkit.MimeTypeMap
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.material3.SnackbarHostState
 import androidx.core.content.FileProvider
+import com.ehviewer.core.files.toOkioPath
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.isAtLeastQ
+import com.ehviewer.core.util.isAtLeastT
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.BuildConfig.APPLICATION_ID
-import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.gallery.Page
 import com.hippo.ehviewer.gallery.PageLoader
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.awaitActivityResult
 import com.hippo.ehviewer.util.displayPath
-import com.hippo.ehviewer.util.isAtLeastQ
-import com.hippo.ehviewer.util.isAtLeastT
 import com.hippo.ehviewer.util.requestPermission
-import com.hippo.files.toOkioPath
-import eu.kanade.tachiyomi.util.system.logcat
 import java.io.File
 import kotlin.time.Clock
 import moe.tarsin.coroutines.runSuspendCatching
@@ -121,7 +121,7 @@ suspend fun save(page: Page) {
                 try {
                     ctx.contentResolver.delete(imageUri, null, null)
                 } catch (e: Exception) {
-                    e.logcat(e)
+                    logcat("SavePage", e)
                 }
                 snackbar(cannotSave)
             } else if (isAtLeastQ) {

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/PagerItem.kt

@@ -37,8 +37,10 @@ import coil3.DrawableImage
 import coil3.compose.AsyncImagePainter
 import coil3.compose.SubcomposeAsyncImage
 import coil3.compose.SubcomposeAsyncImageContent
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.ui.util.thenIf
+import com.ehviewer.core.util.unreachable
 import com.google.accompanist.drawablepainter.DrawablePainter
-import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.gallery.Page
@@ -47,12 +49,10 @@ import com.hippo.ehviewer.gallery.PageStatus
 import com.hippo.ehviewer.gallery.progressObserved
 import com.hippo.ehviewer.gallery.statusObserved
 import com.hippo.ehviewer.image.Image
-import com.hippo.ehviewer.ui.tools.thenIf
 import com.hippo.ehviewer.util.AdsPlaceholderFile
 import eu.kanade.tachiyomi.ui.reader.viewer.CombinedCircularProgressIndicator
 import kotlinx.coroutines.awaitCancellation
 import kotlinx.coroutines.flow.drop
-import moe.tarsin.kt.unreachable
 
 @Composable
 fun PagerItem(
@@ -109,11 +109,11 @@ fun PagerItem(
                     // DrawablePainter <: RememberObserver
                     painter = remember(painter) { painter },
                     contentDescription = null,
-                    modifier = contentModifier.fillMaxSize().thenIf(drawable is Animatable) {
+                    modifier = Modifier.thenIf(drawable is Animatable) {
                         onVisibilityChanged(minDurationMs = 33, minFractionVisible = 0.5f) {
                             drawable!!.setVisible(it, false)
                         }
-                    },
+                    }.then(contentModifier).fillMaxSize(),
                     contentScale = contentScale,
                     colorFilter = when {
                         grayScale && invert -> grayScaleAndInvertFilter

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/PagerViewer.kt

@@ -42,10 +42,14 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import me.saket.telephoto.zoomable.OverzoomEffect
+import me.saket.telephoto.zoomable.Viewport
+import me.saket.telephoto.zoomable.ZoomLimit
 import me.saket.telephoto.zoomable.ZoomSpec
 import me.saket.telephoto.zoomable.ZoomableContentLocation
 import me.saket.telephoto.zoomable.ZoomableState
 import me.saket.telephoto.zoomable.rememberZoomableState
+import me.saket.telephoto.zoomable.spatial.CoordinateSpace
 import me.saket.telephoto.zoomable.zoomable
 
 @Composable
@@ -171,7 +175,9 @@ private fun PageContainer(
                 val zoomFraction = snapshotFlow { zoomableState.zoomFraction }.first { it != null }
                 if (zoomFraction == 0f) {
                     delay(500)
-                    val contentSize = zoomableState.transformedContentBounds.size
+                    val contentSize = with(zoomableState.coordinateSystem) {
+                        unscaledContentBounds(false).sizeIn(CoordinateSpace.Viewport)
+                    }
                     val scale = ContentScale.FillHeight.computeScaleFactor(contentSize, layoutSize)
                     val targetScale = scale.scaleX.coerceAtMost(zoomableState.zoomSpec.maximum.factor)
                     val offset = alignment.align(0, layoutSize.width.toInt(), LayoutDirection.Ltr)
@@ -258,7 +264,11 @@ private inline fun ZoomableState?.canPan(getRemaining: (Rect) -> Float): Boolean
     contract {
         returns(true) implies (this@canPan != null)
     }
-    return this != null && Settings.navigateToPan.value && getRemaining(transformedContentBounds) > 1f
+    return this != null && Settings.navigateToPan.value &&
+        getRemaining(with(coordinateSystem) { contentBounds(false).rectIn(CoordinateSpace.Viewport) }) > 1f
 }
 
-private val PagerZoomSpec = ZoomSpec(maxZoomFactor = 5f)
+private val PagerZoomSpec = ZoomSpec(
+    maximum = ZoomLimit(factor = 5f),
+    minimum = ZoomLimit(factor = 1f, overzoomEffect = OverzoomEffect.Disabled),
+)

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderGeneralSetting.kt

@@ -9,19 +9,20 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.integerArrayResource
 import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.util.isAtLeastP
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.asMutableState
-import com.hippo.ehviewer.util.isAtLeastP
 
 @Composable
 fun ReaderGeneralSetting() = Column(modifier = Modifier.verticalScroll(rememberScrollState()).navigationBarsPadding()) {
     SpinnerChoice(
         title = stringResource(id = R.string.pref_reader_theme),
-        entries = stringArrayResource(id = R.array.reader_themes),
-        values = stringArrayResource(id = R.array.reader_themes_values),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.reader_themes),
+        values = integerArrayResource(id = com.hippo.ehviewer.R.array.reader_themes_values).toList(),
         field = Settings.readerTheme.asMutableState(),
     )
     SwitchChoice(
@@ -63,8 +64,15 @@ fun ReaderGeneralSetting() = Column(modifier = Modifier.verticalScroll(rememberS
         title = stringResource(id = R.string.pref_page_transitions),
         field = Settings.pageTransitions.asMutableState(),
     )
+    val volume = Settings.readWithVolumeKeys.asMutableState()
     SwitchChoice(
-        title = stringResource(id = R.string.settings_read_reverse_controls),
-        field = Settings.readerReverseControls.asMutableState(),
+        title = stringResource(id = R.string.settings_read_volume_page),
+        field = volume,
     )
+    AnimatedVisibility(visible = volume.value) {
+        SwitchChoice(
+            title = stringResource(id = R.string.settings_read_reverse_volume),
+            field = Settings.readWithVolumeKeysInverted.asMutableState(),
+        )
+    }
 }

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderModeSetting.kt

@@ -12,40 +12,37 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.integerArrayResource
 import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.asMutableState
-import com.hippo.ehviewer.collectAsState
+import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 
 @Composable
-fun ReaderModeSetting() = Column(modifier = Modifier.verticalScroll(rememberScrollState()).navigationBarsPadding()) {
+fun ReaderModeSetting(isWebtoon: Boolean) = Column(modifier = Modifier.verticalScroll(rememberScrollState()).navigationBarsPadding()) {
     SpinnerChoice(
         title = stringResource(id = R.string.pref_category_reading_mode),
-        entries = stringArrayResource(id = R.array.viewers_selector),
-        values = arrayOf("0", "1", "2", "3", "4", "5"),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.viewers_selector),
+        values = ReadingModeType.entries.map { it.prefValue },
         field = Settings.readingMode.asMutableState(),
     )
     SpinnerChoice(
         title = stringResource(id = R.string.rotation_type),
-        entries = stringArrayResource(id = R.array.rotation_type),
-        values = arrayOf("0", "8", "16", "24", "32", "40", "48"),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.rotation_type),
+        values = OrientationType.entries.map { it.prefValue },
         field = Settings.orientationMode.asMutableState(),
     )
     Spacer(modifier = Modifier.size(16.dp))
-    val isPager by Settings.readingMode.collectAsState { value ->
-        ReadingModeType.isPagerType(value)
-    }
-    Crossfade(targetState = isPager, label = "Pager") { pager ->
-        if (pager) {
-            PagerSetting()
-        } else {
+    Crossfade(targetState = isWebtoon, label = "Setting") { webtoon ->
+        if (webtoon) {
             WebtoonSetting()
+        } else {
+            PagerSetting()
         }
     }
 }
@@ -60,16 +57,16 @@ private fun PagerSetting() = Column {
     val pagerNav = Settings.readerPagerNav.asMutableState()
     SpinnerChoice(
         title = stringResource(id = R.string.pref_viewer_nav),
-        entries = stringArrayResource(id = R.array.pager_nav),
-        values = arrayOf("0", "1", "2", "3", "4", "5"),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.pager_nav),
+        values = listOf(0, 1, 2, 3, 4, 5),
         field = pagerNav,
     )
     AnimatedVisibility(visible = pagerNav.value != 5) {
         Column {
             SpinnerChoice(
                 title = stringResource(id = R.string.pref_read_with_tapping_inverted),
-                entries = stringArrayResource(id = R.array.invert_tapping_mode),
-                values = arrayOf("0", "1", "2", "3"),
+                entries = stringArrayResource(id = com.hippo.ehviewer.R.array.invert_tapping_mode),
+                values = listOf(0, 1, 2, 3),
                 field = Settings.readerPagerNavInverted.asMutableState(),
             )
             SwitchChoice(
@@ -81,8 +78,8 @@ private fun PagerSetting() = Column {
     val scaleType = Settings.imageScaleType.asMutableState()
     SpinnerChoice(
         title = stringResource(id = R.string.pref_image_scale_type),
-        entries = stringArrayResource(id = R.array.image_scale_type),
-        values = arrayOf("1", "2", "3", "4", "5", "6"),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.image_scale_type),
+        values = listOf(1, 2, 3, 4, 5, 6),
         field = scaleType,
     )
     AnimatedVisibility(visible = scaleType.value == 1) {
@@ -93,8 +90,8 @@ private fun PagerSetting() = Column {
     }
     SpinnerChoice(
         title = stringResource(id = R.string.pref_zoom_start),
-        entries = stringArrayResource(id = R.array.zoom_start),
-        values = arrayOf("1", "2", "3", "4"),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.zoom_start),
+        values = listOf(1, 2, 3, 4),
         field = Settings.zoomStart.asMutableState(),
     )
     SwitchChoice(
@@ -113,22 +110,22 @@ private fun WebtoonSetting() = Column {
     val webtoonNav = Settings.readerWebtoonNav.asMutableState()
     SpinnerChoice(
         title = stringResource(id = R.string.pref_viewer_nav),
-        entries = stringArrayResource(id = R.array.webtoon_nav),
-        values = arrayOf("0", "1", "2", "3", "4", "5"),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.webtoon_nav),
+        values = listOf(0, 1, 2, 3, 4, 5),
         field = webtoonNav,
     )
     AnimatedVisibility(visible = webtoonNav.value != 5) {
         SpinnerChoice(
             title = stringResource(id = R.string.pref_read_with_tapping_inverted),
-            entries = stringArrayResource(id = R.array.invert_tapping_mode),
-            values = arrayOf("0", "1", "2", "3"),
+            entries = stringArrayResource(id = com.hippo.ehviewer.R.array.invert_tapping_mode),
+            values = listOf(0, 1, 2, 3),
             field = Settings.readerWebtoonNavInverted.asMutableState(),
         )
     }
     SpinnerChoice(
         title = stringResource(id = R.string.pref_webtoon_side_padding),
-        entries = stringArrayResource(id = R.array.webtoon_side_padding),
-        values = stringArrayResource(id = R.array.webtoon_side_padding_values),
+        entries = stringArrayResource(id = com.hippo.ehviewer.R.array.webtoon_side_padding),
+        values = integerArrayResource(id = com.hippo.ehviewer.R.array.webtoon_side_padding_values).toList(),
         field = Settings.webtoonSidePadding.asMutableState(),
     )
     SwitchChoice(

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt

@@ -13,14 +13,11 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.safeDrawing
-import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.foundation.layout.windowInsetsTopHeight
 import androidx.compose.foundation.lazy.layout.LazyLayoutCacheWindow
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.rememberPagerState
@@ -53,17 +50,21 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.keepScreenOn
 import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.zIndex
-import androidx.core.view.WindowInsetsControllerCompat
 import arrow.core.Either
 import arrow.core.Either.Companion.catch
 import arrow.core.raise.ensure
 import arrow.core.right
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.ui.util.Await
+import com.ehviewer.core.ui.util.asyncInVM
+import com.ehviewer.core.ui.util.rememberSystemUiController
+import com.ehviewer.core.ui.util.thenIf
+import com.ehviewer.core.util.launch
+import com.ehviewer.core.util.launchIO
+import com.ehviewer.core.util.unreachable
 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.collectAsState
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.archiveFile
@@ -77,13 +78,9 @@ import com.hippo.ehviewer.gallery.useEhPageLoader
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.ui.Screen
 import com.hippo.ehviewer.ui.theme.EhTheme
-import com.hippo.ehviewer.ui.theme.scrim
-import com.hippo.ehviewer.ui.tools.Await
 import com.hippo.ehviewer.ui.tools.DialogState
-import com.hippo.ehviewer.ui.tools.asyncInVM
 import com.hippo.ehviewer.ui.tools.awaitInputText
 import com.hippo.ehviewer.ui.tools.dialog
-import com.hippo.ehviewer.ui.tools.thenIf
 import com.hippo.ehviewer.util.displayString
 import com.hippo.ehviewer.util.hasAds
 import com.ramcosta.composedestinations.annotation.Destination
@@ -94,7 +91,6 @@ import eu.kanade.tachiyomi.ui.reader.ReaderAppBars
 import eu.kanade.tachiyomi.ui.reader.ReaderContentOverlay
 import eu.kanade.tachiyomi.ui.reader.ReaderPageSheetMeta
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
-import eu.kanade.tachiyomi.util.lang.launchIO
 import kotlin.coroutines.resume
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.awaitCancellation
@@ -103,8 +99,6 @@ import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.serialization.Serializable
-import moe.tarsin.kt.unreachable
-import moe.tarsin.launch
 import moe.tarsin.string
 import okio.Path.Companion.toPath
 
@@ -132,26 +126,24 @@ fun AnimatedVisibilityScope.ReaderScreen(args: ReaderScreenArgs, navigator: Dest
     val uiController = rememberSystemUiController()
     DisposableEffect(uiController) {
         val lightStatusBar = uiController.statusBarDarkContentEnabled
+        uiController.statusBarDarkContentEnabled = bgColor == Color.White
         onDispose {
             uiController.statusBarDarkContentEnabled = lightStatusBar
         }
     }
-    LaunchedEffect(uiController) {
-        snapshotFlow { bgColor }.collect {
-            uiController.statusBarDarkContentEnabled = it == Color.White
-        }
-    }
 
     Await(
         block = asyncInVM(args) { alive ->
             suspendCancellableCoroutine { cont ->
-                alive.launchIO {
-                    catch {
-                        usePageLoader(args) { loader ->
-                            cont.resume(loader.right())
-                            awaitCancellation()
-                        }
-                    }.let { left -> cont.resume(left) }
+                with(alive) {
+                    launchIO {
+                        catch {
+                            usePageLoader(args) { loader ->
+                                cont.resume(loader.right())
+                                awaitCancellation()
+                            }
+                        }.let { left -> cont.resume(left) }
+                    }
                 }
             }
         }.value.run {
@@ -183,7 +175,7 @@ fun AnimatedVisibilityScope.ReaderScreen(args: ReaderScreenArgs, navigator: Dest
 }
 
 @Composable
-context(activity: MainActivity, _: SnackbarHostState, _: DialogState, _: CoroutineScope)
+context(activity: MainActivity, _: SnackbarHostState, _: DialogState, _: CoroutineScope, _: DestinationsNavigator)
 fun ReaderScreen(pageLoader: PageLoader, info: BaseGalleryInfo?) {
     LaunchedEffect(Unit) {
         val orientation = activity.requestedOrientation
@@ -198,18 +190,28 @@ fun ReaderScreen(pageLoader: PageLoader, info: BaseGalleryInfo?) {
             }
         }
     }
+    val webtoon = remember(info) {
+        // Tags in database may or may not have the prefix "other:"
+        info?.simpleTags?.any { it.endsWith("webtoon") } == true
+    }
     val showSeekbar by Settings.showReaderSeekbar.collectAsState()
-    val readingMode by Settings.readingMode.collectAsState { ReadingModeType.fromPreference(it) }
-    val reverseControls by Settings.readerReverseControls.collectAsState()
+    val readingMode by Settings.readingMode.collectAsState {
+        when (val mode = ReadingModeType.fromPreference(it)) {
+            ReadingModeType.DEFAULT -> if (webtoon) ReadingModeType.WEBTOON else ReadingModeType.RIGHT_TO_LEFT
+            else -> mode
+        }
+    }
+    val volumeKeysEnabled by Settings.readWithVolumeKeys.collectAsState()
+    val volumeKeysInverted by Settings.readWithVolumeKeysInverted.collectAsState()
     val fullscreen by Settings.fullscreen.collectAsState()
     val cutoutShort by Settings.cutoutShort.collectAsState()
     val keepScreenOn by Settings.keepScreenOn.collectAsState()
     val uiController = rememberSystemUiController()
     DisposableEffect(uiController) {
-        uiController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        uiController.showTransientSystemBarsBySwipe = true
         onDispose {
             uiController.isSystemBarsVisible = true
-            uiController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_DEFAULT
+            uiController.showTransientSystemBarsBySwipe = false
         }
     }
     val lazyListState = rememberLazyListState(LazyLayoutCacheWindow(SCROLL_FRACTION, SCROLL_FRACTION), pageLoader.startPage)
@@ -220,8 +222,8 @@ fun ReaderScreen(pageLoader: PageLoader, info: BaseGalleryInfo?) {
     val focusRequester = remember { FocusRequester() }
     Box(
         Modifier.keyEventHandler(
-            enabled = { !appbarVisible },
-            reverse = { reverseControls },
+            volumeKeysEnabled = { volumeKeysEnabled && !appbarVisible },
+            volumeKeysInverted = { volumeKeysInverted },
             movePrevious = { launch { if (isWebtoon) lazyListState.scrollUp() else pagerState.moveToPrevious() } },
             moveNext = { launch { if (isWebtoon) lazyListState.scrollDown() else pagerState.moveToNext() } },
         ).focusRequester(focusRequester).focusable().thenIf(keepScreenOn) { keepScreenOn() },
@@ -229,18 +231,14 @@ fun ReaderScreen(pageLoader: PageLoader, info: BaseGalleryInfo?) {
         LaunchedEffect(Unit) {
             focusRequester.requestFocus()
         }
-        val bgColor by collectBackgroundColorAsState()
         syncState.Sync(isWebtoon) { appbarVisible = false }
-        if (fullscreen) {
-            LaunchedEffect(Unit) {
-                snapshotFlow { appbarVisible }.collect {
-                    uiController.isSystemBarsVisible = it
-                }
+        val bgColor by collectBackgroundColorAsState()
+        val isDarkTheme = isSystemInDarkTheme()
+        LaunchedEffect(isDarkTheme) {
+            snapshotFlow { appbarVisible }.collect {
+                uiController.isSystemBarsVisible = it || !fullscreen
+                uiController.statusBarDarkContentEnabled = if (it) !isDarkTheme else bgColor == Color.White
             }
-            Box(
-                Modifier.windowInsetsTopHeight(WindowInsets.statusBars).fillMaxWidth()
-                    .align(Alignment.TopCenter).background(bgColor.scrim()).zIndex(1f),
-            )
         }
         var showNavigationOverlay by remember {
             val showOnStart = Settings.showNavigationOverlayNewUser.value || Settings.showNavigationOverlayOnStart.value
@@ -342,6 +340,7 @@ fun ReaderScreen(pageLoader: PageLoader, info: BaseGalleryInfo?) {
         }
         ReaderAppBars(
             visible = appbarVisible,
+            title = pageLoader.title,
             isRtl = readingMode == ReadingModeType.RIGHT_TO_LEFT,
             showSeekBar = showSeekbar,
             currentPage = syncState.sliderValue,
@@ -364,7 +363,7 @@ fun ReaderScreen(pageLoader: PageLoader, info: BaseGalleryInfo?) {
                             dragHandle = null,
                             contentWindowInsets = { WindowInsets() },
                         ) {
-                            SettingsPager(modifier = Modifier.fillMaxSize()) { page ->
+                            SettingsPager(isWebtoon = isWebtoon, modifier = Modifier.fillMaxSize()) { page ->
                                 isColorFilter = page == 2
                                 appbarVisible = !isColorFilter
                             }
@@ -372,19 +371,18 @@ fun ReaderScreen(pageLoader: PageLoader, info: BaseGalleryInfo?) {
                     }
                 }
             },
-            modifier = Modifier.align(Alignment.BottomCenter),
         )
     }
 }
 
-context(ctx: Context, state: DialogState, nav: DestinationsNavigator)
+context(_: Context, _: DialogState, nav: DestinationsNavigator)
 suspend inline fun <T> usePageLoader(args: ReaderScreenArgs, crossinline block: suspend (PageLoader) -> T) = when (args) {
     is ReaderScreenArgs.Gallery -> {
         val info = args.info
         val page = args.page.takeUnless { it == -1 } ?: EhDB.getReadProgress(info.gid)
         val archive = DownloadManager.getDownloadInfo(info.gid)?.archiveFile
         if (archive != null) {
-            useArchivePageLoader(archive, info.gid, page, info.hasAds, { error("Managed Archive have password???") }, block)
+            useArchivePageLoader(archive, info, page, info.hasAds, { error("Managed Archive have password???") }, block)
         } else {
             useEhPageLoader(info, page, block)
         }
@@ -407,7 +405,7 @@ suspend inline fun <T> usePageLoader(args: ReaderScreenArgs, crossinline block:
 
 @Composable
 private fun collectBackgroundColorAsState(): State<Color> {
-    val grey = colorResource(R.color.reader_background_dark)
+    val grey = colorResource(com.hippo.ehviewer.R.color.reader_background_dark)
     val dark = isSystemInDarkTheme()
     return Settings.readerTheme.collectAsState { theme ->
         when (theme) {

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/SettingsPager.kt

@@ -15,7 +15,7 @@ import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 import kotlinx.coroutines.launch
 
 private val tabs = intArrayOf(
@@ -25,7 +25,7 @@ private val tabs = intArrayOf(
 )
 
 @Composable
-fun SettingsPager(modifier: Modifier = Modifier, onPageSelected: (Int) -> Unit) {
+fun SettingsPager(isWebtoon: Boolean, modifier: Modifier = Modifier, onPageSelected: (Int) -> Unit) {
     val pagerState = rememberPagerState { tabs.size }
     LaunchedEffect(onPageSelected) {
         snapshotFlow { pagerState.currentPage }.collect { page ->
@@ -53,7 +53,7 @@ fun SettingsPager(modifier: Modifier = Modifier, onPageSelected: (Int) -> Unit)
     ) { page ->
         ProvideTextStyle(value = MaterialTheme.typography.labelLarge) {
             when (page) {
-                0 -> ReaderModeSetting()
+                0 -> ReaderModeSetting(isWebtoon)
                 1 -> ReaderGeneralSetting()
                 2 -> ColorFilterSetting()
             }

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/WebtoonViewer.kt

@@ -24,6 +24,8 @@ import eu.kanade.tachiyomi.ui.reader.viewer.NavigationRegions
 import eu.kanade.tachiyomi.ui.reader.viewer.ViewerNavigation.NavigationRegion
 import eu.kanade.tachiyomi.ui.reader.viewer.getAction
 import kotlinx.coroutines.launch
+import me.saket.telephoto.zoomable.OverzoomEffect
+import me.saket.telephoto.zoomable.ZoomLimit
 import me.saket.telephoto.zoomable.ZoomSpec
 import me.saket.telephoto.zoomable.rememberZoomableState
 import me.saket.telephoto.zoomable.zoomable
@@ -90,4 +92,7 @@ fun WebtoonViewer(
     }
 }
 
-private val WebtoonZoomSpec = ZoomSpec(maxZoomFactor = 3f)
+private val WebtoonZoomSpec = ZoomSpec(
+    maximum = ZoomLimit(factor = 3f),
+    minimum = ZoomLimit(factor = 1f, overzoomEffect = OverzoomEffect.Disabled),
+)