Release 1.8.11.1

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Setup Java 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
@@ -48,6 +48,9 @@ jobs:
       - name: Spotless Check
         run: ./gradlew spotlessCheck
 
+      - name: Lint Check
+        run: ./gradlew lintMarshmallowGmsRelease
+
       - name: CMake Cache
         uses: actions/cache@v3
         with:

.github/workflows/lock-threads.yml

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

.github/workflows/releases.yml

@@ -16,7 +16,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Setup Java 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17

CHANGELOG.zh-CN.MD

@@ -1,40 +0,0 @@
-# 变更日志
-
-## 1.9.0
-
-### 重大变更
-
-* 除阅读器外全部迁移至 Compose
-
-### 新功能
-
-* 设置-高级 中增加实验性滑动手势敏感度设置
-* 支持通过滑动手势打开右侧抽屉
-* 支持预见式返回动画，相关设置位于 设置-高级
-
-### 改进
-
-* \[阅读器] 画廊页数过多时隐藏进度条刻度并禁用触感反馈
-* 优化原图下载重试策略
-* 优化小屏设备上的搜索类别布局
-* 优化过渡动画
-* 优化历史记录删除动画
-* 设置-EH 中的缩略图大小设置改为缩略图列数
-
-### Bug 修复
-
-* 修复点击通知栏的下载通知闪退 [#175](https://github.com/FooIbar/EhViewer/issues/175)
-* 修复收藏状态显示错误 [#189](https://github.com/FooIbar/EhViewer/issues/189)
-* 修复双击导航按钮后无法打开导航抽屉
-* 修复某些情况下闪退 [#142](https://github.com/FooIbar/EhViewer/issues/142) [#208](https://github.com/FooIbar/EhViewer/issues/208)
-* 修复收藏界面点击重试崩溃 [#193](https://github.com/FooIbar/EhViewer/issues/193)
-* 修复本地收藏滚动位置丢失 [#192](https://github.com/FooIbar/EhViewer/issues/192)
-* 修复手速过快页面切换过快使加载圈圈不自动消失 [#209](https://github.com/FooIbar/EhViewer/issues/209)
-* 修复打开并关闭右侧抽屉后，状态栏一片白色 [#101](https://github.com/FooIbar/EhViewer/issues/101)
-* 修复使用深色主题时，切换界面会闪过亮色界面 [#121](https://github.com/FooIbar/EhViewer/issues/121)
-* \[Marshmallow] 修复小内存设备上图片解码失败 [#229](https://github.com/FooIbar/EhViewer/issues/229) [#372](https://github.com/FooIbar/EhViewer/issues/372)
-* 修复已舍弃画廊上传者解析
-
-### 已知问题
-
-* 画廊信息对话框无法通过返回关闭 [#413](https://github.com/FooIbar/EhViewer/issues/413)

README.md

@@ -1,11 +1,15 @@
+# Maintenance Mode
+
+The project is in maintenance mode, will only receive bugfixes.
+
 <p align="right">
   <strong>English</strong>
   <span> | </span>
-  <a href="/docs/README/zh-cn.md">
+  <a href="https://github.com/FooIbar/EhViewer/blob/1.8.x.x/docs/README/zh-cn.md">
   简体中文
   </a>
   <span> | </span>
-  <a href="/docs/README/zh-tw.md">
+  <a href="https://github.com/FooIbar/EhViewer/blob/1.8.x.x/docs/README/zh-tw.md">
   正體中文
   </a>
 </p>
@@ -19,12 +23,15 @@
   <a href="https://github.com/FooIbar/EhViewer/actions/workflows/ci.yml">
     <img src="https://github.com/FooIbar/EhViewer/actions/workflows/ci.yml/badge.svg" alt="Github Actions">
   </a>
-  <a href="/LICENSE">
+  <a href="https://github.com/FooIbar/EhViewer/blob/1.8.x.x/LICENSE">
     <img src="https://img.shields.io/github/license/FooIbar/EhViewer" alt="LICENSE">
   </a>
   <a href="https://www.codefactor.io/repository/github/FooIbar/EhViewer">
     <img src="https://www.codefactor.io/repository/github/FooIbar/EhViewer/badge" alt="CodeFactor">
   </a>
+  <a href="https://github.com/FooIbar/EhViewer/releases">
+    <img src="https://img.shields.io/github/downloads/FooIbar/EhViewer/total.svg" alt="Downloads">
+  </a>
   <a href="https://github.com/FooIbar/EhViewer/releases">
     <img src="https://img.shields.io/github/v/release/FooIbar/EhViewer" alt="Release">
   </a>
@@ -35,23 +42,23 @@
 
 <div align="center">
   <h3>
-    <a href="#description">
+    <a href="https://github.com/FooIbar/EhViewer#description">
     Description
     </a>
     <span> | </span>
-    <a href="#download">
+    <a href="https://github.com/FooIbar/EhViewer#download">
     Download
     </a>
     <span> | </span>
-    <a href="#screenshot">
+    <a href="https://github.com/FooIbar/EhViewer#screenshot">
     Screenshot
     </a>
     <span> | </span>
-    <a href="#thanks">
+    <a href="https://github.com/FooIbar/EhViewer#thanks">
     Thanks
     </a>
     <span> | </span>
-    <a href="#license">
+    <a href="https://github.com/FooIbar/EhViewer#license">
     License
     </a>
   </h3>
@@ -66,12 +73,12 @@ and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview)
 
 # Download
 
-| Flavor      | Feature                           |
-|-------------|-----------------------------------|
-| Default     | Android 9+, full support          |
+| Flavor | Feature |
+|-|-|
+| Default | Android 9+, full support |
 | Marshmallow | Android 6.0-8.1, limited support* |
-| OSS         | FOSS dependencies**               |
-| GMS         | Proprietary GMS component         |
+| OSS | FOSS dependencies**  |
+| GMS | Proprietary GMS component |
 
 \* Archives and GIFs are not supported
 
@@ -93,13 +100,14 @@ Here is the libraries
 - [Arrow](https://arrow-kt.io/)
 - [AOSP & AndroidX](http://source.android.com/)
 - [Kotlin & KotlinX](https://kotlinlang.org/)
-- [MDC-Android](https://github.com/material-components/material-components-android)
-- [Material Icons](https://github.com/google/material-design-icons)
-- [OkHttp](https://square.github.io/okhttp/)
+- [FullDraggableDrawer](https://github.com/PureWriter/FullDraggableDrawer)
+- [MCA](https://github.com/material-components/material-components-android)
+- [material-design-icons](https://github.com/google/material-design-icons)
+- [Okhttp](https://square.github.io/okhttp/)
+- [RikkaX](https://github.com/RikkaApps/RikkaX)
+- [Libarchive](http://www.libarchive.org/)
 - [Coil](https://coil-kt.github.io/coil/)
-- [Compose Destinations](https://composedestinations.rafaelcosta.xyz/)
-- [libarchive](http://www.libarchive.org/)
-- [jsoup](https://jsoup.org/)
+- [Jsoup](https://jsoup.org/)
 
 Specially thanks [Tachiyomi](https://tachiyomi.org/) for its reader implementation!
 

app/build.gradle.kts

@@ -64,8 +64,8 @@ android {
         applicationId = "moe.tarsin.ehviewer"
         minSdk = 28
         targetSdk = 34
-        versionCode = 180046
-        versionName = "1.9.0"
+        versionCode = 180045
+        versionName = "1.8.11.1"
         resourceConfigurations.addAll(
             listOf(
                 "zh",
@@ -108,6 +108,10 @@ android {
             compileOptions {
                 isCoreLibraryDesugaringEnabled = true
             }
+            lint {
+                checkOnly += setOf("InlinedApi", "NewApi", "UnusedAttribute")
+                error += setOf("InlinedApi", "UnusedAttribute")
+            }
         }
         create("oss") {
             dimension = "oss"
@@ -145,15 +149,13 @@ android {
             "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
             "-opt-in=splitties.experimental.ExperimentalSplittiesApi",
             "-opt-in=splitties.preferences.DataStorePreferencesPreview",
-
-            "-P", "plugin:androidx.compose.compiler.plugins.kotlin:experimentalStrongSkipping=true",
-            "-P", "plugin:androidx.compose.compiler.plugins.kotlin:intrinsicRemember=true",
         )
     }
 
     lint {
-        disable += setOf("MissingTranslation", "MissingQuantity")
-        fatal += setOf("NewApi", "InlineApi")
+        abortOnError = true
+        checkReleaseBuilds = false
+        disable.add("MissingTranslation")
     }
 
     packaging {
@@ -200,23 +202,20 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.biometric)
     implementation(libs.androidx.browser)
+    implementation(libs.androidx.collection)
 
     // https://developer.android.com/jetpack/androidx/releases/compose-material3
     api(platform(libs.compose.bom))
     implementation(libs.bundles.compose)
 
-    implementation(libs.compose.destinations.core)
-    ksp(libs.compose.destinations.compiler)
-
     implementation(libs.androidx.core)
     implementation(libs.androidx.core.splashscreen)
 
     implementation(libs.androidx.constraintlayout.compose)
     implementation(libs.androidx.coordinatorlayout)
+    implementation(libs.androidx.fragment)
     // https://developer.android.com/jetpack/androidx/releases/lifecycle
     implementation(libs.androidx.lifecycle.process)
-    implementation(libs.androidx.lifecycle.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
 
     // https://developer.android.com/jetpack/androidx/releases/navigation
     implementation(libs.bundles.androidx.navigation)
@@ -224,12 +223,13 @@ dependencies {
     // https://developer.android.com/jetpack/androidx/releases/paging
     implementation(libs.bundles.androidx.paging)
 
-    implementation(libs.androidx.recyclerview)
+    implementation(libs.bundles.androidx.recyclerview)
 
     // https://developer.android.com/jetpack/androidx/releases/room
     ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.paging)
 
+    implementation(libs.androidx.swiperefreshlayout)
     implementation(libs.androidx.work.runtime)
     implementation(libs.photoview) // Dead Dependency
     implementation(libs.directionalviewpager) // Dead Dependency
@@ -245,14 +245,10 @@ dependencies {
 
     implementation(libs.okio.jvm)
 
-    implementation(libs.diff)
-
     implementation(libs.aboutlibraries.core)
 
     implementation(libs.insetter) // Dead Dependency
 
-    implementation(libs.reorderable)
-
     implementation(platform(libs.arrow.stack))
     implementation(libs.arrow.fx.coroutines)
 
@@ -265,26 +261,18 @@ dependencies {
     implementation(libs.bundles.kotlinx.serialization)
 
     implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.kotlinx.datetime)
     implementation(libs.jsoup)
 
     debugImplementation(libs.chucker)
     releaseImplementation(libs.chucker.nop)
 
+    debugImplementation(libs.leakcanary.android)
+
     coreLibraryDesugaring(libs.desugar)
 
     "gmsImplementation"(libs.bundles.cronet)
 }
 
-configurations.all {
-    resolutionStrategy {
-        // Workaround IME won't show again once hidden.
-        // Google issue-tracker link?
-        force("androidx.compose.ui:ui-text-android:1.6.0-alpha08")
-        exclude("androidx.navigation", "navigation-compose")
-    }
-}
-
 kotlin {
     jvmToolchain(17)
 }

app/proguard-rules.pro

@@ -1,20 +1,30 @@
--keepclasseswithmembernames,includedescriptorclasses class * {
-    native <methods>;
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
 -keepclassmembers class * implements android.os.Parcelable {
     public static final ** CREATOR;
 }
 
-# https://issuetracker.google.com/issues/307323842
--keepclassmembers class androidx.compose.ui.platform.WindowInfoImpl {
-    setWindowFocused(boolean);
+-keepclasseswithmembernames,includedescriptorclasses class * {
+    native <methods>;
 }
 
--allowaccessmodification
+# https://issuetracker.google.com/issues/190382641
+-keepclassmembers class kotlin.SafePublicationLazyImpl {
+    java.lang.Object _value;
+}
+
+-keep class androidx.viewpager.widget.ViewPager$LayoutParams { int position; }
+
+-keep class com.hippo.ehviewer.client.parser.Torrent { *; }
+-keep class com.hippo.ehviewer.client.parser.GalleryListResult { *; }
+-keep class com.hippo.ehviewer.client.parser.Limits { *; }
+-keep class com.hippo.ehviewer.client.data.BaseGalleryInfo { *; }
+-keep class com.hippo.ehviewer.ui.scene.SearchBarScene { getBinding(); }
+
+# Ktor logger
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+
+-keepattributes LineNumberTable,SourceFile
+-renamesourcefileattribute SourceFile
+
 -repackageclasses
+-allowaccessmodification
+-overloadaggressively

app/src/gms/kotlin/com/hippo/ehviewer/cronet/CronetKt.kt

@@ -14,13 +14,9 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.RequestBody
-import okio.Buffer
 import okio.Path.Companion.toOkioPath
 import org.chromium.net.CronetEngine
 import org.chromium.net.CronetException
-import org.chromium.net.UploadDataProvider
-import org.chromium.net.UploadDataSink
 import org.chromium.net.UrlRequest
 import org.chromium.net.UrlResponseInfo
 import splitties.init.appCtx
@@ -49,6 +45,7 @@ class CronetRequest {
         }
 
         override fun onReadCompleted(req: UrlRequest, info: UrlResponseInfo, data: ByteBuffer) {
+            data.flip()
             consumer(data)
         }
 
@@ -62,13 +59,12 @@ class CronetRequest {
     }
 }
 
-inline fun cronetRequest(url: String, referer: String? = null, origin: String? = null, conf: UrlRequest.Builder.() -> Unit = {}) = CronetRequest().apply {
+inline fun cronetRequest(url: String, referer: String? = null, conf: UrlRequest.Builder.() -> Unit = {}) = CronetRequest().apply {
     request = cronetHttpClient.newUrlRequestBuilder(url, callback, cronetHttpClientExecutor).apply {
         addHeader("Cookie", EhCookieStore.getCookieHeader(url.toHttpUrl()))
         addHeader("Accept", CHROME_ACCEPT)
         addHeader("Accept-Language", CHROME_ACCEPT_LANGUAGE)
         referer?.let { addHeader("Referer", it) }
-        origin?.let { addHeader("Origin", it) }
     }.apply(conf).build()
 }
 
@@ -86,21 +82,5 @@ suspend inline fun <R> CronetRequest.execute(crossinline callback: suspend Crone
     }
 }
 
-fun UrlRequest.Builder.withRequestBody(body: RequestBody) {
-    addHeader("Content-Type", body.contentType().toString())
-    val buffer = Buffer().apply { body.writeTo(this) }
-    val provider = object : UploadDataProvider() {
-        override fun getLength() = body.contentLength()
-        override fun read(uploadDataSink: UploadDataSink, byteBuffer: ByteBuffer) {
-            buffer.read(byteBuffer)
-            uploadDataSink.onReadSucceeded(false)
-        }
-        override fun rewind(uploadDataSink: UploadDataSink) {
-            error("OneShot!")
-        }
-    }
-    setUploadDataProvider(provider, cronetHttpClientExecutor)
-}
-
 fun UrlRequest.Builder.noCache(): UrlRequest.Builder = disableCache()
 fun UrlResponseInfo.getHeadersMap(): Map<String, List<String>> = allHeaders

app/src/main/AndroidManifest.xml

@@ -23,20 +23,16 @@
         android:allowBackup="true"
         android:appCategory="image"
         android:dataExtractionRules="@xml/data_extraction_rules"
-        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_scheme"
         android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:largeHeap="@bool/large_heap"
         android:localeConfig="@xml/locale_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:targetApi="tiramisu">
-        <profileable android:shell="true" />
-
         <activity
             android:name=".ui.ConfigureActivity"
             android:exported="false"
@@ -139,7 +135,8 @@
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity android:name=".ui.WebViewActivity" />
+        <activity
+            android:name=".ui.WebViewActivity" />
 
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"

app/src/main/kotlin/androidx/compose/material3/ModalBottomSheet2.kt

@@ -1,989 +0,0 @@
-@file:Suppress("ktlint:standard:property-naming", "ktlint:standard:function-naming")
-
-package androidx.compose.material3
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.PixelFormat
-import android.os.Build
-import android.view.Gravity
-import android.view.View
-import android.view.ViewTreeObserver
-import android.view.WindowManager
-import androidx.activity.OnBackPressedDispatcher
-import androidx.activity.OnBackPressedDispatcherOwner
-import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
-import androidx.compose.animation.core.SpringSpec
-import androidx.compose.animation.core.TweenSpec
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.gestures.AnchoredDraggableState
-import androidx.compose.foundation.gestures.DraggableAnchors
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.anchoredDraggable
-import androidx.compose.foundation.gestures.animateTo
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.gestures.snapTo
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionContext
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCompositionContext
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.graphics.isSpecified
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.AbstractComposeView
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.platform.ViewRootForInspector
-import androidx.compose.ui.semantics.clearAndSetSemantics
-import androidx.compose.ui.semantics.popup
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.Velocity
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.lerp
-import androidx.compose.ui.window.SecureFlagPolicy
-import androidx.lifecycle.findViewTreeLifecycleOwner
-import androidx.lifecycle.findViewTreeViewModelStoreOwner
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.lifecycle.setViewTreeViewModelStoreOwner
-import androidx.savedstate.findViewTreeSavedStateRegistryOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
-import com.hippo.ehviewer.ui.tools.animateFloatMergeOneWayPredictiveBackAsState
-import com.hippo.ehviewer.util.isAtLeastT
-import java.util.UUID
-import kotlin.math.absoluteValue
-import kotlin.math.max
-import kotlin.math.roundToInt
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.launch
-
-@Stable
-@ExperimentalMaterial3Api
-internal object AnchoredDraggableDefaults2 {
-    /**
-     * The default animation used by [AnchoredDraggableState].
-     */
-    @get:ExperimentalMaterial3Api
-    @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
-    @ExperimentalMaterial3Api
-    val AnimationSpec = SpringSpec<Float>()
-}
-
-/**
- * State of a sheet composable, such as [ModalBottomSheetFix]
- *
- * Contains states relating to its swipe position as well as animations between state values.
- *
- * @param skipPartiallyExpanded Whether the partially expanded state, if the sheet is large
- * enough, should be skipped. If true, the sheet will always expand to the [Expanded] state and move
- * to the [Hidden] state if available when hiding the sheet, either programmatically or by user
- * interaction.
- * @param initialValue The initial value of the state.
- * @param confirmValueChange Optional callback invoked to confirm or veto a pending state change.
- * @param skipHiddenState Whether the hidden state should be skipped. If true, the sheet will always
- * expand to the [Expanded] state and move to the [PartiallyExpanded] if available, either
- * programmatically or by user interaction.
- */
-@Stable
-@ExperimentalMaterial3Api
-class SheetState2
-@Deprecated(
-    message = "This constructor is deprecated. " +
-        "Please use the constructor that provides a [Density]",
-    replaceWith = ReplaceWith(
-        "SheetState(" +
-            "skipPartiallyExpanded, LocalDensity.current, initialValue, " +
-            "confirmValueChange, skipHiddenState)",
-    ),
-)
-constructor(
-    internal val skipPartiallyExpanded: Boolean,
-    initialValue: SheetValue = SheetValue.Hidden,
-    val confirmValueChange: (SheetValue) -> Boolean = { true },
-    internal val skipHiddenState: Boolean = false,
-) {
-
-    /**
-     * State of a sheet composable, such as [ModalBottomSheetFix]
-     *
-     * Contains states relating to its swipe position as well as animations between state values.
-     *
-     * @param skipPartiallyExpanded Whether the partially expanded state, if the sheet is large
-     * enough, should be skipped. If true, the sheet will always expand to the [Expanded] state and move
-     * to the [Hidden] state if available when hiding the sheet, either programmatically or by user
-     * interaction.
-     * @param initialValue The initial value of the state.
-     * @param density The density that this state can use to convert values to and from dp.
-     * @param confirmValueChange Optional callback invoked to confirm or veto a pending state change.
-     * @param skipHiddenState Whether the hidden state should be skipped. If true, the sheet will always
-     * expand to the [Expanded] state and move to the [PartiallyExpanded] if available, either
-     * programmatically or by user interaction.
-     */
-    @ExperimentalMaterial3Api
-    @Suppress("Deprecation")
-    constructor(
-        skipPartiallyExpanded: Boolean,
-        density: Density,
-        initialValue: SheetValue = SheetValue.Hidden,
-        confirmValueChange: (SheetValue) -> Boolean = { true },
-        skipHiddenState: Boolean = false,
-    ) : this(skipPartiallyExpanded, initialValue, confirmValueChange, skipHiddenState) {
-        this.density = density
-    }
-    init {
-        if (skipPartiallyExpanded) {
-            require(initialValue != SheetValue.PartiallyExpanded) {
-                "The initial value must not be set to PartiallyExpanded if skipPartiallyExpanded " +
-                    "is set to true."
-            }
-        }
-        if (skipHiddenState) {
-            require(initialValue != SheetValue.Hidden) {
-                "The initial value must not be set to Hidden if skipHiddenState is set to true."
-            }
-        }
-    }
-
-    /**
-     * The current value of the state.
-     *
-     * If no swipe or animation is in progress, this corresponds to the state the bottom sheet is
-     * currently in. If a swipe or an animation is in progress, this corresponds the state the sheet
-     * was in before the swipe or animation started.
-     */
-
-    val currentValue: SheetValue get() = anchoredDraggableState.currentValue
-
-    /**
-     * The target value of the bottom sheet state.
-     *
-     * If a swipe is in progress, this is the value that the sheet would animate to if the
-     * swipe finishes. If an animation is running, this is the target value of that animation.
-     * Finally, if no swipe or animation is in progress, this is the same as the [currentValue].
-     */
-    val targetValue: SheetValue get() = anchoredDraggableState.targetValue
-
-    /**
-     * Whether the modal bottom sheet is visible.
-     */
-    val isVisible: Boolean
-        get() = anchoredDraggableState.currentValue != SheetValue.Hidden
-
-    /**
-     * Require the current offset (in pixels) of the bottom sheet.
-     *
-     * The offset will be initialized during the first measurement phase of the provided sheet
-     * content.
-     *
-     * These are the phases:
-     * Composition { -> Effects } -> Layout { Measurement -> Placement } -> Drawing
-     *
-     * During the first composition, an [IllegalStateException] is thrown. In subsequent
-     * compositions, the offset will be derived from the anchors of the previous pass. Always prefer
-     * accessing the offset from a LaunchedEffect as it will be scheduled to be executed the next
-     * frame, after layout.
-     *
-     * @throws IllegalStateException If the offset has not been initialized yet
-     */
-    fun requireOffset(): Float = anchoredDraggableState.requireOffset()
-
-    /**
-     * Whether the sheet has an expanded state defined.
-     */
-
-    val hasExpandedState: Boolean
-        get() = anchoredDraggableState.anchors.hasAnchorFor(SheetValue.Expanded)
-
-    /**
-     * Whether the modal bottom sheet has a partially expanded state defined.
-     */
-    val hasPartiallyExpandedState: Boolean
-        get() = anchoredDraggableState.anchors.hasAnchorFor(SheetValue.PartiallyExpanded)
-
-    /**
-     * Fully expand the bottom sheet with animation and suspend until it is fully expanded or
-     * animation has been cancelled.
-     * *
-     * @throws [CancellationException] if the animation is interrupted
-     */
-    suspend fun expand() {
-        anchoredDraggableState.animateTo(SheetValue.Expanded)
-    }
-
-    /**
-     * Animate the bottom sheet and suspend until it is partially expanded or animation has been
-     * cancelled.
-     * @throws [CancellationException] if the animation is interrupted
-     * @throws [IllegalStateException] if [skipPartiallyExpanded] is set to true
-     */
-    suspend fun partialExpand() {
-        check(!skipPartiallyExpanded) {
-            "Attempted to animate to partial expanded when skipPartiallyExpanded was enabled. Set" +
-                " skipPartiallyExpanded to false to use this function."
-        }
-        animateTo(SheetValue.PartiallyExpanded)
-    }
-
-    /**
-     * Expand the bottom sheet with animation and suspend until it is [PartiallyExpanded] if defined
-     * else [Expanded].
-     * @throws [CancellationException] if the animation is interrupted
-     */
-    suspend fun show() {
-        val targetValue = when {
-            hasPartiallyExpandedState -> SheetValue.PartiallyExpanded
-            else -> SheetValue.Expanded
-        }
-        animateTo(targetValue)
-    }
-
-    /**
-     * Hide the bottom sheet with animation and suspend until it is fully hidden or animation has
-     * been cancelled.
-     * @throws [CancellationException] if the animation is interrupted
-     */
-    suspend fun hide() {
-        check(!skipHiddenState) {
-            "Attempted to animate to hidden when skipHiddenState was enabled. Set skipHiddenState" +
-                " to false to use this function."
-        }
-        animateTo(SheetValue.Hidden)
-    }
-
-    /**
-     * Animate to a [targetValue].
-     * If the [targetValue] is not in the set of anchors, the [currentValue] will be updated to the
-     * [targetValue] without updating the offset.
-     *
-     * @throws CancellationException if the interaction interrupted by another interaction like a
-     * gesture interaction or another programmatic interaction like a [animateTo] or [snapTo] call.
-     *
-     * @param targetValue The target value of the animation
-     */
-    internal suspend fun animateTo(
-        targetValue: SheetValue,
-        velocity: Float = anchoredDraggableState.lastVelocity,
-    ) {
-        anchoredDraggableState.animateTo(targetValue, velocity)
-    }
-
-    /**
-     * Snap to a [targetValue] without any animation.
-     *
-     * @throws CancellationException if the interaction interrupted by another interaction like a
-     * gesture interaction or another programmatic interaction like a [animateTo] or [snapTo] call.
-     *
-     * @param targetValue The target value of the animation
-     */
-    internal suspend fun snapTo(targetValue: SheetValue) {
-        anchoredDraggableState.snapTo(targetValue)
-    }
-
-    /**
-     * Find the closest anchor taking into account the velocity and settle at it with an animation.
-     */
-    internal suspend fun settle(velocity: Float) {
-        anchoredDraggableState.settle(velocity)
-    }
-
-    internal var anchoredDraggableState = AnchoredDraggableState(
-        initialValue = initialValue,
-        animationSpec = AnchoredDraggableDefaults2.AnimationSpec,
-        confirmValueChange = confirmValueChange,
-        positionalThreshold = { with(requireDensity()) { 56.dp.toPx() } },
-        velocityThreshold = { with(requireDensity()) { 125.dp.toPx() } },
-    )
-
-    internal val offset: Float get() = anchoredDraggableState.offset
-
-    internal var density: Density? = null
-    private fun requireDensity() = requireNotNull(density) {
-        "SheetState did not have a density attached. Are you using SheetState with " +
-            "BottomSheetScaffold or ModalBottomSheet component?"
-    }
-
-    companion object {
-        /**
-         * The default [Saver] implementation for [SheetState2].
-         */
-        fun Saver(
-            skipPartiallyExpanded: Boolean,
-            confirmValueChange: (SheetValue) -> Boolean,
-            density: Density,
-        ) = Saver<SheetState2, SheetValue>(
-            save = { it.currentValue },
-            restore = { savedValue ->
-                SheetState2(skipPartiallyExpanded, density, savedValue, confirmValueChange)
-            },
-        )
-
-        /**
-         * The default [Saver] implementation for [SheetState2].
-         */
-        @Deprecated(
-            message = "This function is deprecated. Please use the overload where Density is" +
-                " provided.",
-            replaceWith = ReplaceWith(
-                "Saver(skipPartiallyExpanded, confirmValueChange, LocalDensity.current)",
-            ),
-        )
-        @Suppress("Deprecation")
-        fun Saver(
-            skipPartiallyExpanded: Boolean,
-            confirmValueChange: (SheetValue) -> Boolean,
-        ) = Saver<SheetState2, SheetValue>(
-            save = { it.currentValue },
-            restore = { savedValue ->
-                SheetState2(skipPartiallyExpanded, savedValue, confirmValueChange)
-            },
-        )
-    }
-}
-
-/**
- * <a href="https://m3.material.io/components/bottom-sheets/overview" class="external" target="_blank">Material Design modal bottom sheet</a>.
- *
- * Modal bottom sheets are used as an alternative to inline menus or simple dialogs on mobile,
- * especially when offering a long list of action items, or when items require longer descriptions
- * and icons. Like dialogs, modal bottom sheets appear in front of app content, disabling all other
- * app functionality when they appear, and remaining on screen until confirmed, dismissed, or a
- * required action has been taken.
- *
- * ![Bottom sheet image](https://developer.android.com/images/reference/androidx/compose/material3/bottom_sheet.png)
- *
- * A simple example of a modal bottom sheet looks like this:
- *
- * @sample androidx.compose.material3.samples.ModalBottomSheetSample
- *
- * @param onDismissRequest Executes when the user clicks outside of the bottom sheet, after sheet
- * animates to [Hidden].
- * @param modifier Optional [Modifier] for the bottom sheet.
- * @param sheetState The state of the bottom sheet.
- * @param sheetMaxWidth [Dp] that defines what the maximum width the sheet will take.
- * Pass in [Dp.Unspecified] for a sheet that spans the entire screen width.
- * @param shape The shape of the bottom sheet.
- * @param containerColor The color used for the background of this bottom sheet
- * @param contentColor The preferred color for content inside this bottom sheet. Defaults to either
- * the matching content color for [containerColor], or to the current [LocalContentColor] if
- * [containerColor] is not a color from the theme.
- * @param tonalElevation The tonal elevation of this bottom sheet.
- * @param scrimColor Color of the scrim that obscures content when the bottom sheet is open.
- * @param dragHandle Optional visual marker to swipe the bottom sheet.
- * @param windowInsets window insets to be passed to the bottom sheet window via [PaddingValues]
- * params.
- * @param properties [ModalBottomSheetProperties2] for further customization of this
- * modal bottom sheet's behavior.
- * @param content The content to be displayed inside the bottom sheet.
- */
-@Composable
-@ExperimentalMaterial3Api
-fun ModalBottomSheetFix(
-    onDismissRequest: () -> Unit,
-    modifier: Modifier = Modifier,
-    sheetState: SheetState2 = rememberModalBottomSheetState(),
-    sheetMaxWidth: Dp = BottomSheetDefaults.SheetMaxWidth,
-    shape: Shape = BottomSheetDefaults.ExpandedShape,
-    containerColor: Color = BottomSheetDefaults.ContainerColor,
-    contentColor: Color = contentColorFor(containerColor),
-    tonalElevation: Dp = BottomSheetDefaults.Elevation,
-    scrimColor: Color = BottomSheetDefaults.ScrimColor,
-    dragHandle: @Composable (() -> Unit)? = { BottomSheetDefaults.DragHandle() },
-    windowInsets: WindowInsets = BottomSheetDefaults.windowInsets,
-    properties: ModalBottomSheetProperties2 = ModalBottomSheetDefaults2.properties(),
-    content: @Composable ColumnScope.() -> Unit,
-) {
-    // b/291735717 Remove this once deprecated methods without density are removed
-    val density = LocalDensity.current
-    SideEffect {
-        sheetState.density = density
-    }
-    val scope = rememberCoroutineScope()
-    val animateToDismiss: () -> Unit = {
-        if (sheetState.confirmValueChange(SheetValue.Hidden)) {
-            scope.launch { sheetState.hide() }.invokeOnCompletion {
-                if (!sheetState.isVisible) {
-                    onDismissRequest()
-                }
-            }
-        }
-    }
-    LaunchedEffect(sheetState) {
-        snapshotFlow {
-            sheetState.targetValue == SheetValue.Hidden && !sheetState.isVisible
-        }.drop(1).collectLatest {
-            if (it) onDismissRequest()
-        }
-    }
-    val settleToDismiss: (velocity: Float) -> Unit = {
-        scope.launch { sheetState.settle(it) }.invokeOnCompletion {
-            if (!sheetState.isVisible) onDismissRequest()
-        }
-    }
-
-    val popupOnDismissRequest: () -> Unit = {
-        if (sheetState.currentValue == SheetValue.Expanded && sheetState.hasPartiallyExpandedState) {
-            scope.launch { sheetState.partialExpand() }
-        } else { // Is expanded without collapsed state or is collapsed.
-            scope.launch { sheetState.hide() }.invokeOnCompletion { onDismissRequest() }
-        }
-    }
-
-    ModalBottomSheetPopup(
-        properties = properties,
-        onDismissRequest = popupOnDismissRequest,
-        windowInsets = windowInsets,
-    ) {
-        val configuration = LocalConfiguration.current
-        val widthDp = configuration.screenWidthDp.dp
-        val height = configuration.screenHeightDp.dp
-        val predictiveState by animateFloatMergeOneWayPredictiveBackAsState(true) {
-            sheetState.hide()
-            onDismissRequest()
-        }
-        val predictiveModifier = Modifier.graphicsLayer {
-            val scale = lerp(1f, 0.90f, predictiveState.absoluteValue)
-            scaleX = scale
-            scaleY = scale
-        }.offset {
-            val ofsY = lerp(0f, height.toPx() * 0.0625f, predictiveState.absoluteValue).roundToInt()
-            val ofsX = lerp(0f, widthDp.toPx() * 0.025f, predictiveState).roundToInt()
-            IntOffset(ofsX, ofsY)
-        }
-        BoxWithConstraints(Modifier.fillMaxSize()) {
-            val fullHeight = constraints.maxHeight
-            Scrim(
-                color = scrimColor,
-                onDismissRequest = animateToDismiss,
-                visible = sheetState.targetValue != SheetValue.Hidden,
-            )
-            Surface(
-                modifier = modifier
-                    .widthIn(max = sheetMaxWidth)
-                    .fillMaxWidth()
-                    .align(Alignment.TopCenter)
-                    .offset {
-                        IntOffset(
-                            0,
-                            sheetState
-                                .requireOffset()
-                                .toInt(),
-                        )
-                    } then predictiveModifier
-                    .nestedScroll(
-                        remember(sheetState) {
-                            ConsumeSwipeWithinBottomSheetBoundsNestedScrollConnection(
-                                sheetState = sheetState,
-                                orientation = Orientation.Vertical,
-                                onFling = settleToDismiss,
-                            )
-                        },
-                    )
-                    .anchoredDraggable(
-                        state = sheetState.anchoredDraggableState,
-                        orientation = Orientation.Vertical,
-                        enabled = sheetState.isVisible,
-                        startDragImmediately = sheetState.anchoredDraggableState.isAnimationRunning,
-                    )
-                    .modalBottomSheetAnchors(
-                        sheetState = sheetState,
-                        fullHeight = fullHeight.toFloat(),
-                    ),
-                shape = shape,
-                color = containerColor,
-                contentColor = contentColor,
-                tonalElevation = tonalElevation,
-            ) {
-                Column(Modifier.fillMaxWidth()) {
-                    if (dragHandle != null) {
-                        Box(Modifier.align(Alignment.CenterHorizontally)) {
-                            dragHandle()
-                        }
-                    }
-                    content()
-                }
-            }
-        }
-    }
-    if (sheetState.hasExpandedState) {
-        LaunchedEffect(sheetState) {
-            sheetState.show()
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-internal fun ConsumeSwipeWithinBottomSheetBoundsNestedScrollConnection(
-    sheetState: SheetState2,
-    orientation: Orientation,
-    onFling: (velocity: Float) -> Unit,
-): NestedScrollConnection = object : NestedScrollConnection {
-    override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-        val delta = available.toFloat()
-        return if (delta < 0 && source == NestedScrollSource.Drag) {
-            sheetState.anchoredDraggableState.dispatchRawDelta(delta).toOffset()
-        } else {
-            Offset.Zero
-        }
-    }
-
-    override fun onPostScroll(
-        consumed: Offset,
-        available: Offset,
-        source: NestedScrollSource,
-    ): Offset {
-        return if (source == NestedScrollSource.Drag) {
-            sheetState.anchoredDraggableState.dispatchRawDelta(available.toFloat()).toOffset()
-        } else {
-            Offset.Zero
-        }
-    }
-
-    override suspend fun onPreFling(available: Velocity): Velocity {
-        val toFling = available.toFloat()
-        val currentOffset = sheetState.requireOffset()
-        val minAnchor = sheetState.anchoredDraggableState.anchors.minAnchor()
-        return if (toFling < 0 && currentOffset > minAnchor) {
-            onFling(toFling)
-            // since we go to the anchor with tween settling, consume all for the best UX
-            available
-        } else {
-            Velocity.Zero
-        }
-    }
-
-    override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
-        onFling(available.toFloat())
-        return available
-    }
-
-    private fun Float.toOffset(): Offset = Offset(
-        x = if (orientation == Orientation.Horizontal) this else 0f,
-        y = if (orientation == Orientation.Vertical) this else 0f,
-    )
-
-    @JvmName("velocityToFloat")
-    private fun Velocity.toFloat() = if (orientation == Orientation.Horizontal) x else y
-
-    @JvmName("offsetToFloat")
-    private fun Offset.toFloat(): Float = if (orientation == Orientation.Horizontal) x else y
-}
-
-/**
- * Properties used to customize the behavior of a [ModalBottomSheetFix].
- *
- * @param securePolicy Policy for setting [WindowManager.LayoutParams.FLAG_SECURE] on the bottom
- * sheet's window.
- * @param isFocusable Whether the modal bottom sheet is focusable. When true,
- * the modal bottom sheet will receive IME events and key presses, such as when
- * the back button is pressed.
- * @param shouldDismissOnBackPress Whether the modal bottom sheet can be dismissed by pressing
- * the back button. If true, pressing the back button will call onDismissRequest.
- * Note that [isFocusable] must be set to true in order to receive key events such as
- * the back button - if the modal bottom sheet is not focusable then this property does nothing.
- */
-@ExperimentalMaterial3Api
-class ModalBottomSheetProperties2(
-    val securePolicy: SecureFlagPolicy,
-    val isFocusable: Boolean,
-    val shouldDismissOnBackPress: Boolean,
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is ModalBottomSheetProperties2) return false
-
-        if (securePolicy != other.securePolicy) return false
-        if (isFocusable != other.isFocusable) return false
-        if (shouldDismissOnBackPress != other.shouldDismissOnBackPress) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = securePolicy.hashCode()
-        result = 31 * result + isFocusable.hashCode()
-        result = 31 * result + shouldDismissOnBackPress.hashCode()
-        return result
-    }
-}
-
-/**
- * Default values for [ModalBottomSheetFix]
- */
-@Immutable
-@ExperimentalMaterial3Api
-object ModalBottomSheetDefaults2 {
-    /**
-     * Properties used to customize the behavior of a [ModalBottomSheetFix].
-     *
-     * @param securePolicy Policy for setting [WindowManager.LayoutParams.FLAG_SECURE] on the bottom
-     * sheet's window.
-     * @param isFocusable Whether the modal bottom sheet is focusable. When true,
-     * the modal bottom sheet will receive IME events and key presses, such as when
-     * the back button is pressed.
-     * @param shouldDismissOnBackPress Whether the modal bottom sheet can be dismissed by pressing
-     * the back button. If true, pressing the back button will call onDismissRequest.
-     * Note that [isFocusable] must be set to true in order to receive key events such as
-     * the back button - if the modal bottom sheet is not focusable then this property does nothing.
-     */
-    fun properties(
-        securePolicy: SecureFlagPolicy = SecureFlagPolicy.Inherit,
-        isFocusable: Boolean = true,
-        shouldDismissOnBackPress: Boolean = true,
-    ) = ModalBottomSheetProperties2(securePolicy, isFocusable, shouldDismissOnBackPress)
-}
-
-/**
- * Create and [remember] a [SheetState2] for [ModalBottomSheetFix].
- *
- * @param skipPartiallyExpanded Whether the partially expanded state, if the sheet is tall enough,
- * should be skipped. If true, the sheet will always expand to the [Expanded] state and move to the
- * [Hidden] state when hiding the sheet, either programmatically or by user interaction.
- * @param confirmValueChange Optional callback invoked to confirm or veto a pending state change.
- */
-@Composable
-@ExperimentalMaterial3Api
-fun rememberModalBottomSheetState(
-    skipPartiallyExpanded: Boolean = false,
-    confirmValueChange: (SheetValue) -> Boolean = { true },
-) = rememberSheetState(skipPartiallyExpanded, confirmValueChange, SheetValue.Hidden)
-
-@Composable
-@ExperimentalMaterial3Api
-internal fun rememberSheetState(
-    skipPartiallyExpanded: Boolean = false,
-    confirmValueChange: (SheetValue) -> Boolean = { true },
-    initialValue: SheetValue = SheetValue.Hidden,
-    skipHiddenState: Boolean = false,
-): SheetState2 {
-    val density = LocalDensity.current
-    return rememberSaveable(
-        skipPartiallyExpanded,
-        confirmValueChange,
-        saver = SheetState2.Saver(
-            skipPartiallyExpanded = skipPartiallyExpanded,
-            confirmValueChange = confirmValueChange,
-            density = density,
-        ),
-    ) {
-        SheetState2(
-            skipPartiallyExpanded,
-            density,
-            initialValue,
-            confirmValueChange,
-            skipHiddenState,
-        )
-    }
-}
-
-@Composable
-private fun Scrim(
-    color: Color,
-    onDismissRequest: () -> Unit,
-    visible: Boolean,
-) {
-    if (color.isSpecified) {
-        val alpha by animateFloatAsState(
-            targetValue = if (visible) 1f else 0f,
-            animationSpec = TweenSpec(),
-            label = "scrim",
-        )
-        val dismissSheet = if (visible) {
-            Modifier
-                .pointerInput(onDismissRequest) {
-                    detectTapGestures {
-                        onDismissRequest()
-                    }
-                }
-                .clearAndSetSemantics {}
-        } else {
-            Modifier
-        }
-        Canvas(
-            Modifier
-                .fillMaxSize()
-                .then(dismissSheet),
-        ) {
-            drawRect(color = color, alpha = alpha)
-        }
-    }
-}
-
-@ExperimentalMaterial3Api
-private fun Modifier.modalBottomSheetAnchors(
-    sheetState: SheetState2,
-    fullHeight: Float,
-) = onSizeChanged { sheetSize ->
-
-    val newAnchors = DraggableAnchors {
-        SheetValue.Hidden at fullHeight
-        if (sheetSize.height > (fullHeight / 2) && !sheetState.skipPartiallyExpanded) {
-            SheetValue.PartiallyExpanded at fullHeight / 2f
-        }
-        if (sheetSize.height != 0) {
-            SheetValue.Expanded at max(0f, fullHeight - sheetSize.height)
-        }
-    }
-
-    val newTarget = when (sheetState.anchoredDraggableState.targetValue) {
-        SheetValue.Hidden -> SheetValue.Hidden
-        SheetValue.PartiallyExpanded, SheetValue.Expanded -> {
-            val hasPartiallyExpandedState = newAnchors.hasAnchorFor(SheetValue.PartiallyExpanded)
-            val newTarget = if (hasPartiallyExpandedState) {
-                SheetValue.PartiallyExpanded
-            } else if (newAnchors.hasAnchorFor(SheetValue.Expanded)) SheetValue.Expanded else SheetValue.Hidden
-            newTarget
-        }
-    }
-
-    sheetState.anchoredDraggableState.updateAnchors(newAnchors, newTarget)
-}
-
-/**
- * Popup specific for modal bottom sheet.
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-internal fun ModalBottomSheetPopup(
-    properties: ModalBottomSheetProperties2,
-    onDismissRequest: () -> Unit,
-    windowInsets: WindowInsets,
-    content: @Composable () -> Unit,
-) {
-    val view = LocalView.current
-    val id = rememberSaveable { UUID.randomUUID() }
-    val parentComposition = rememberCompositionContext()
-    val currentContent by rememberUpdatedState(content)
-    val layoutDirection = LocalLayoutDirection.current
-    val configuration = LocalConfiguration.current
-    val modalBottomSheetWindow = remember(configuration) {
-        ModalBottomSheetWindow2(
-            properties = properties,
-            onDismissRequest = onDismissRequest,
-            composeView = view,
-            saveId = id,
-        ).apply {
-            setCustomContent(
-                parent = parentComposition,
-                content = {
-                    Box(
-                        Modifier
-                            .semantics { this.popup() }
-                            .windowInsetsPadding(windowInsets)
-                            .then(
-                                // TODO(b/290893168): Figure out a solution for APIs < 30.
-                                if (Build.VERSION.SDK_INT >= 33) {
-                                    Modifier.imePadding()
-                                } else {
-                                    Modifier
-                                },
-                            ),
-                    ) {
-                        currentContent()
-                    }
-                },
-            )
-        }
-    }
-
-    DisposableEffect(modalBottomSheetWindow) {
-        modalBottomSheetWindow.show()
-        modalBottomSheetWindow.superSetLayoutDirection(layoutDirection)
-        onDispose {
-            modalBottomSheetWindow.disposeComposition()
-            modalBottomSheetWindow.dismiss()
-        }
-    }
-}
-
-/** Custom compose view for [ModalBottomSheetFix] */
-@SuppressLint("ViewConstructor")
-@OptIn(ExperimentalMaterial3Api::class)
-private class ModalBottomSheetWindow2(
-    private val properties: ModalBottomSheetProperties2,
-    private var onDismissRequest: () -> Unit,
-    private val composeView: View,
-    saveId: UUID,
-) : AbstractComposeView(composeView.context),
-    ViewTreeObserver.OnGlobalLayoutListener,
-    ViewRootForInspector,
-    OnBackPressedDispatcherOwner {
-
-    init {
-        id = android.R.id.content
-        // Set up view owners
-        setViewTreeLifecycleOwner(composeView.findViewTreeLifecycleOwner())
-        setViewTreeViewModelStoreOwner(composeView.findViewTreeViewModelStoreOwner())
-        setViewTreeSavedStateRegistryOwner(composeView.findViewTreeSavedStateRegistryOwner())
-        setTag(androidx.compose.ui.R.id.compose_view_saveable_id_tag, "Popup:$saveId")
-        // Enable children to draw their shadow by not clipping them
-        clipChildren = false
-    }
-
-    override val lifecycle = composeView.findViewTreeLifecycleOwner()!!.lifecycle
-    override val onBackPressedDispatcher = OnBackPressedDispatcher {
-        onDismissRequest()
-    }
-
-    private val windowManager =
-        composeView.context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-
-    private val displayWidth: Int
-        get() = context.resources.displayMetrics.widthPixels
-
-    private val params: WindowManager.LayoutParams =
-        WindowManager.LayoutParams().apply {
-            // Position bottom sheet from the bottom of the screen
-            gravity = Gravity.BOTTOM or Gravity.START
-            // Application panel window
-            type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
-            // Fill up the entire app view
-            width = displayWidth
-            height = WindowManager.LayoutParams.MATCH_PARENT
-
-            // Format of screen pixels
-            format = PixelFormat.TRANSLUCENT
-            // Title used as fallback for a11y services
-            // TODO: Provide bottom sheet window resource
-            title = composeView.context.resources.getString(
-                androidx.compose.ui.R.string.default_popup_window_title,
-            )
-            // Get the Window token from the parent view
-            token = composeView.applicationWindowToken
-
-            // Flags specific to modal bottom sheet.
-            flags = flags and (
-                WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES or
-                    WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM
-                ).inv()
-
-            flags = flags or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-
-            // Security flag
-            val secureFlagEnabled =
-                properties.securePolicy.shouldApplySecureFlag(composeView.isFlagSecureEnabled())
-            if (secureFlagEnabled) {
-                flags = flags or WindowManager.LayoutParams.FLAG_SECURE
-            } else {
-                flags = flags and (WindowManager.LayoutParams.FLAG_SECURE.inv())
-            }
-
-            // Focusable
-            if (!properties.isFocusable) {
-                flags = flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-            } else {
-                flags = flags and (WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE.inv())
-            }
-        }
-
-    private var content: @Composable () -> Unit by mutableStateOf({})
-
-    override var shouldCreateCompositionOnAttachedToWindow: Boolean = false
-        private set
-
-    @Composable
-    override fun Content() {
-        CompositionLocalProvider(LocalOnBackPressedDispatcherOwner provides this) {
-            content()
-        }
-    }
-
-    fun setCustomContent(
-        parent: CompositionContext? = null,
-        content: @Composable () -> Unit,
-    ) {
-        parent?.let { setParentCompositionContext(it) }
-        this.content = content
-        shouldCreateCompositionOnAttachedToWindow = true
-    }
-
-    fun show() {
-        windowManager.addView(this, params)
-        if (isAtLeastT) {
-            onBackPressedDispatcher.setOnBackInvokedDispatcher(findOnBackInvokedDispatcher()!!)
-        }
-    }
-
-    fun dismiss() {
-        setViewTreeLifecycleOwner(null)
-        setViewTreeSavedStateRegistryOwner(null)
-        composeView.viewTreeObserver.removeOnGlobalLayoutListener(this)
-        windowManager.removeViewImmediate(this)
-    }
-
-    override fun onGlobalLayout() {
-        // No-op
-    }
-
-    override fun setLayoutDirection(layoutDirection: Int) {
-        // Do nothing. ViewRootImpl will call this method attempting to set the layout direction
-        // from the context's locale, but we have one already from the parent composition.
-    }
-
-    // Sets the "real" layout direction for our content that we obtain from the parent composition.
-    fun superSetLayoutDirection(layoutDirection: LayoutDirection) {
-        val direction = when (layoutDirection) {
-            LayoutDirection.Ltr -> android.util.LayoutDirection.LTR
-            LayoutDirection.Rtl -> android.util.LayoutDirection.RTL
-        }
-        super.setLayoutDirection(direction)
-    }
-}
-
-// Taken from AndroidPopup.android.kt
-private fun View.isFlagSecureEnabled(): Boolean {
-    val windowParams = rootView.layoutParams as? WindowManager.LayoutParams
-    if (windowParams != null) {
-        return (windowParams.flags and WindowManager.LayoutParams.FLAG_SECURE) != 0
-    }
-    return false
-}
-
-// Taken from AndroidPopup.android.kt
-private fun SecureFlagPolicy.shouldApplySecureFlag(isSecureFlagSetOnParent: Boolean): Boolean {
-    return when (this) {
-        SecureFlagPolicy.SecureOff -> false
-        SecureFlagPolicy.SecureOn -> true
-        SecureFlagPolicy.Inherit -> isSecureFlagSetOnParent
-    }
-}

app/src/main/kotlin/androidx/compose/material3/NavigationDrawer2.kt

@@ -1,525 +0,0 @@
-@file:Suppress("ktlint:standard:property-naming", "ktlint:standard:function-naming")
-
-package androidx.compose.material3
-
-import androidx.compose.animation.core.AnimationSpec
-import androidx.compose.animation.core.TweenSpec
-import androidx.compose.animation.core.animate
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.AnchoredDraggableState
-import androidx.compose.foundation.gestures.DraggableAnchors
-import androidx.compose.foundation.gestures.awaitEachGesture
-import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.awaitHorizontalTouchSlopOrCancellation
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.gestures.horizontalDrag
-import androidx.compose.foundation.gestures.snapTo
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.BlurEffect
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.RectangleShape
-import androidx.compose.ui.graphics.TileMode
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.input.pointer.positionChange
-import androidx.compose.ui.input.pointer.util.VelocityTracker
-import androidx.compose.ui.input.pointer.util.addPointerInputChange
-import androidx.compose.ui.layout.layout
-import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.lerp
-import androidx.compose.ui.util.lerp
-import com.hippo.ehviewer.ui.tools.animateFloatMergeOneWayPredictiveBackAsState
-import kotlin.math.roundToInt
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.launch
-
-private val AnimationSpec = TweenSpec<Float>(durationMillis = 256)
-private const val DrawerPositionalThreshold = 0.5f
-private val DrawerVelocityThreshold = 400.dp
-private val ContainerWidth = 360.0.dp
-
-@Suppress("NotCloseable")
-@Stable
-class DrawerState2(
-    initialValue: DrawerValue,
-    val confirmStateChange: (DrawerValue) -> Boolean = { true },
-) {
-
-    val anchoredDraggableState = AnchoredDraggableState(
-        initialValue = initialValue,
-        animationSpec = AnimationSpec,
-        confirmValueChange = confirmStateChange,
-        positionalThreshold = { distance -> distance * DrawerPositionalThreshold },
-        velocityThreshold = { with(requireDensity()) { DrawerVelocityThreshold.toPx() } },
-    )
-
-    /**
-     * Whether the drawer is open.
-     */
-    val isOpen: Boolean
-        get() = currentValue == DrawerValue.Open
-
-    /**
-     * Whether the drawer is closed.
-     */
-    val isClosed: Boolean
-        get() = currentValue == DrawerValue.Closed
-
-    /**
-     * The current value of the state.
-     *
-     * If no swipe or animation is in progress, this corresponds to the start the drawer
-     * currently in. If a swipe or an animation is in progress, this corresponds the state drawer
-     * was in before the swipe or animation started.
-     */
-    val currentValue: DrawerValue
-        get() {
-            return anchoredDraggableState.currentValue
-        }
-
-    /**
-     * Whether the state is currently animating.
-     */
-    val isAnimationRunning: Boolean
-        get() {
-            return anchoredDraggableState.isAnimationRunning
-        }
-
-    /**
-     * Open the drawer with animation and suspend until it if fully opened or animation has been
-     * cancelled. This method will throw [CancellationException] if the animation is
-     * interrupted
-     *
-     * @return the reason the open animation ended
-     */
-    suspend fun open() = animateTo(DrawerValue.Open)
-
-    /**
-     * Close the drawer with animation and suspend until it if fully closed or animation has been
-     * cancelled. This method will throw [CancellationException] if the animation is
-     * interrupted
-     *
-     * @return the reason the close animation ended
-     */
-    suspend fun close() = animateTo(DrawerValue.Closed)
-
-    /**
-     * Set the state of the drawer with specific animation
-     *
-     * @param targetValue The new value to animate to.
-     * @param anim The animation that will be used to animate to the new value.
-     */
-    @Deprecated(
-        message = "This method has been replaced by the open and close methods. The animation " +
-            "spec is now an implementation detail of ModalDrawer.",
-    )
-    suspend fun animateTo(targetValue: DrawerValue, anim: AnimationSpec<Float>) {
-        animateTo(targetValue = targetValue, animationSpec = anim)
-    }
-
-    /**
-     * Set the state without any animation and suspend until it's set
-     *
-     * @param targetValue The new target value
-     */
-    suspend fun snapTo(targetValue: DrawerValue) {
-        anchoredDraggableState.snapTo(targetValue)
-    }
-
-    /**
-     * The target value of the drawer state.
-     *
-     * If a swipe is in progress, this is the value that the Drawer would animate to if the
-     * swipe finishes. If an animation is running, this is the target value of that animation.
-     * Finally, if no swipe or animation is in progress, this is the same as the [currentValue].
-     */
-    val targetValue: DrawerValue
-        get() = anchoredDraggableState.targetValue
-
-    /**
-     * The current position (in pixels) of the drawer sheet, or Float.NaN before the offset is
-     * initialized.
-     *
-     * @see [AnchoredDraggableState.offset] for more information.
-     */
-    @Deprecated(
-        message = "Please access the offset through currentOffset, which returns the value " +
-            "directly instead of wrapping it in a state object.",
-        replaceWith = ReplaceWith("currentOffset"),
-    )
-    val offset: State<Float> = object : State<Float> {
-        override val value: Float get() = anchoredDraggableState.offset
-    }
-
-    /**
-     * The current position (in pixels) of the drawer sheet, or Float.NaN before the offset is
-     * initialized.
-     *
-     * @see [AnchoredDraggableState.offset] for more information.
-     */
-    val currentOffset: Float get() = anchoredDraggableState.offset
-
-    internal var density: Density? by mutableStateOf(null)
-
-    private fun requireDensity() = requireNotNull(density) {
-        "The density on BottomDrawerState ($this) was not set. Did you use BottomDrawer" +
-            " with the BottomDrawer composable?"
-    }
-
-    internal fun requireOffset(): Float = anchoredDraggableState.requireOffset()
-
-    private suspend fun animateTo(
-        targetValue: DrawerValue,
-        animationSpec: AnimationSpec<Float> = AnimationSpec,
-        velocity: Float = anchoredDraggableState.lastVelocity,
-    ) {
-        anchoredDraggableState.anchoredDrag(targetValue = targetValue) { anchors, latestTarget ->
-            val targetOffset = anchors.positionOf(latestTarget)
-            if (!targetOffset.isNaN()) {
-                var prev = if (currentOffset.isNaN()) 0f else currentOffset
-                animate(prev, targetOffset, velocity, animationSpec) { value, velocity ->
-                    // Our onDrag coerces the value within the bounds, but an animation may
-                    // overshoot, for example a spring animation or an overshooting interpolator
-                    // We respect the user's intention and allow the overshoot, but still use
-                    // DraggableState's drag for its mutex.
-                    dragTo(value, velocity)
-                    prev = value
-                }
-            }
-        }
-    }
-
-    companion object {
-        /**
-         * The default [Saver] implementation for [DrawerState2].
-         */
-        fun Saver(confirmStateChange: (DrawerValue) -> Boolean) =
-            Saver<DrawerState2, DrawerValue>(
-                save = { it.currentValue },
-                restore = { DrawerState2(it, confirmStateChange) },
-            )
-    }
-}
-
-/**
- * Create and [remember] a [DrawerState2].
- *
- * @param initialValue The initial value of the state.
- * @param confirmStateChange Optional callback invoked to confirm or veto a pending state change.
- */
-@Composable
-fun rememberDrawerState(
-    initialValue: DrawerValue,
-    confirmStateChange: (DrawerValue) -> Boolean = { true },
-): DrawerState2 {
-    return rememberSaveable(saver = DrawerState2.Saver(confirmStateChange)) {
-        DrawerState2(initialValue, confirmStateChange)
-    }
-}
-
-@Composable
-fun ModalNavigationDrawer(
-    drawerContent: @Composable () -> Unit,
-    modifier: Modifier = Modifier,
-    drawerState: DrawerState2 = rememberDrawerState(DrawerValue.Closed),
-    gesturesEnabled: Boolean = true,
-    scrimColor: Color = DrawerDefaults.scrimColor,
-    content: @Composable () -> Unit,
-) {
-    val scope = rememberCoroutineScope()
-    val density = LocalDensity.current
-    var minValue by remember { mutableStateOf(-with(density) { ContainerWidth.toPx() }) }
-    val maxValue = 0f
-
-    SideEffect {
-        drawerState.density = density
-        drawerState.anchoredDraggableState.updateAnchors(
-            DraggableAnchors {
-                DrawerValue.Closed at minValue
-                DrawerValue.Open at maxValue
-            },
-        )
-    }
-
-    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
-    val velocityTracker = remember { VelocityTracker() }
-    val dragModifier = if (gesturesEnabled) {
-        Modifier.pointerInput(isRtl) {
-            val multiplier = if (isRtl) -1 else 1
-            awaitEachGesture {
-                fun canConsume(slop: Float) = (slop > 0 && drawerState.isClosed) || (slop < 0 && drawerState.isOpen)
-                val down = awaitFirstDown(requireUnconsumed = false)
-                var ignore = false
-                val drag = awaitHorizontalTouchSlopOrCancellation(down.id) { change, over ->
-                    val overSlop = over * multiplier
-                    val canConsume = canConsume(overSlop)
-                    if (canConsume && !ignore) {
-                        velocityTracker.addPointerInputChange(change)
-                        change.consume()
-                        drawerState.anchoredDraggableState.dispatchRawDelta(overSlop)
-                    } else {
-                        ignore = true
-                    }
-                }
-                if (drag != null) {
-                    horizontalDrag(drag.id) {
-                        velocityTracker.addPointerInputChange(it)
-                        drawerState.anchoredDraggableState.dispatchRawDelta(it.positionChange().x * multiplier)
-                    }
-                    val velocity = velocityTracker.calculateVelocity()
-                    velocityTracker.resetTracking()
-                    scope.launch {
-                        drawerState.anchoredDraggableState.settle(velocity.x * multiplier)
-                    }
-                }
-            }
-        }
-    } else {
-        Modifier
-    }
-    Box(modifier.fillMaxSize().then(dragModifier)) {
-        val blurModifier = Modifier.graphicsLayer {
-            val step = calculateFraction(minValue, maxValue, drawerState.currentOffset)
-            val radius = lerp(0.dp, 10.dp, step)
-            if (radius != 0.dp) {
-                renderEffect = BlurEffect(radius.toPx(), radius.toPx(), TileMode.Clamp)
-                shape = RectangleShape
-                clip = true
-            }
-        }
-        Box(modifier = blurModifier) {
-            content()
-        }
-        Scrim(
-            open = drawerState.isOpen,
-            onClose = {
-                if (gesturesEnabled && drawerState.confirmStateChange(DrawerValue.Closed)) {
-                    scope.launch { drawerState.close() }
-                }
-            },
-            fraction = {
-                calculateFraction(minValue, maxValue, drawerState.requireOffset())
-            },
-            color = scrimColor,
-        )
-        val predictiveState by animateFloatMergeOneWayPredictiveBackAsState(drawerState.isOpen) {
-            drawerState.close()
-        }
-        val absoluteElevation = LocalAbsoluteTonalElevation.current + DrawerDefaults.ModalDrawerElevation
-        val predictiveModifier = if (drawerState.isOpen) {
-            if (predictiveState > 0) {
-                Modifier.layout { measurable, constraints ->
-                    val placeable = measurable.measure(constraints)
-                    val multiplierX = lerp(1f, 1.05f, predictiveState)
-                    val multiplierY = lerp(1f, 0.95f, predictiveState)
-                    val scaledWidth = (multiplierX * placeable.width).roundToInt()
-                    val scaledHeight = (multiplierY * placeable.height).roundToInt()
-                    val reMeasured = measurable.measure(Constraints.fixed(scaledWidth, scaledHeight))
-                    layout(scaledWidth, scaledHeight) {
-                        reMeasured.placeRelative(scaledWidth - placeable.width, 0)
-                    }
-                }.background(
-                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(absoluteElevation),
-                    shape = DrawerDefaults.shape,
-                )
-            } else {
-                Modifier.graphicsLayer {
-                    val scale = lerp(1f, 0.95f, -predictiveState)
-                    scaleX = scale
-                    scaleY = scale
-                }.offset {
-                    IntOffset(lerp(0f, minValue * 0.05f, -predictiveState).roundToInt(), 0)
-                }
-            }
-        } else {
-            Modifier.onGloballyPositioned {
-                val w = it.size.width
-                if (w != 0) {
-                    minValue = -it.size.width.toFloat()
-                }
-            }
-        }
-        Box(
-            modifier = Modifier.offset {
-                IntOffset(drawerState.requireOffset().roundToInt(), 0)
-            } then predictiveModifier.align(Alignment.CenterStart),
-            contentAlignment = Alignment.CenterEnd,
-        ) {
-            drawerContent()
-        }
-    }
-}
-
-@Composable
-fun SideDrawer(
-    drawerContent: @Composable () -> Unit,
-    modifier: Modifier = Modifier,
-    drawerState: DrawerState2 = rememberDrawerState(DrawerValue.Closed),
-    gesturesEnabled: Boolean = true,
-    scrimColor: Color = DrawerDefaults.scrimColor,
-    content: @Composable () -> Unit,
-) {
-    val scope = rememberCoroutineScope()
-    val density = LocalDensity.current
-    var minValue by remember { mutableStateOf(with(density) { ContainerWidth.toPx() }) }
-    val maxValue = 0f
-
-    SideEffect {
-        drawerState.density = density
-        drawerState.anchoredDraggableState.updateAnchors(
-            DraggableAnchors {
-                DrawerValue.Closed at minValue
-                DrawerValue.Open at maxValue
-            },
-        )
-    }
-
-    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
-    val velocityTracker = remember { VelocityTracker() }
-    val dragModifier = if (gesturesEnabled) {
-        Modifier.pointerInput(isRtl) {
-            val multiplier = if (isRtl) -1 else 1
-            awaitEachGesture {
-                fun canConsume(slop: Float) = (slop > 0 && drawerState.isOpen) || (slop < 0 && drawerState.isClosed)
-                val down = awaitFirstDown(requireUnconsumed = false)
-                var ignore = false
-                val drag = awaitHorizontalTouchSlopOrCancellation(down.id) { change, over ->
-                    val overSlop = over * multiplier
-                    val canConsume = canConsume(overSlop)
-                    if (canConsume && !ignore) {
-                        velocityTracker.addPointerInputChange(change)
-                        change.consume()
-                        drawerState.anchoredDraggableState.dispatchRawDelta(overSlop)
-                    } else {
-                        ignore = true
-                    }
-                }
-                if (drag != null) {
-                    horizontalDrag(drag.id) {
-                        velocityTracker.addPointerInputChange(it)
-                        drag.consume()
-                        drawerState.anchoredDraggableState.dispatchRawDelta(it.positionChange().x * multiplier)
-                    }
-                    val velocity = velocityTracker.calculateVelocity()
-                    velocityTracker.resetTracking()
-                    scope.launch {
-                        drawerState.anchoredDraggableState.settle(velocity.x * multiplier)
-                    }
-                }
-            }
-        }
-    } else {
-        Modifier
-    }
-    Box(modifier.fillMaxSize().then(dragModifier)) {
-        val blurModifier = Modifier.graphicsLayer {
-            val step = calculateFraction(minValue, maxValue, drawerState.currentOffset)
-            val radius = lerp(0.dp, 10.dp, step)
-            if (radius != 0.dp) {
-                renderEffect = BlurEffect(radius.toPx(), radius.toPx(), TileMode.Clamp)
-                shape = RectangleShape
-                clip = true
-            }
-        }
-        Box(modifier = blurModifier) {
-            content()
-        }
-        Scrim(
-            open = drawerState.isOpen,
-            onClose = {
-                if (gesturesEnabled && drawerState.confirmStateChange(DrawerValue.Closed)) {
-                    scope.launch { drawerState.close() }
-                }
-            },
-            fraction = {
-                calculateFraction(minValue, maxValue, drawerState.requireOffset())
-            },
-            color = scrimColor,
-        )
-        val predictiveState by animateFloatMergeOneWayPredictiveBackAsState(drawerState.isOpen) {
-            drawerState.close()
-        }
-        val absoluteElevation = LocalAbsoluteTonalElevation.current + DrawerDefaults.ModalDrawerElevation
-        val predictiveModifier = if (drawerState.isOpen) {
-            if (predictiveState < 0) {
-                Modifier.layout { measurable, constraints ->
-                    val placeable = measurable.measure(constraints)
-                    val multiplierX = lerp(1f, 1.05f, -predictiveState)
-                    val multiplierY = lerp(1f, 0.95f, -predictiveState)
-                    val scaledWidth = (multiplierX * placeable.width).roundToInt()
-                    val scaledHeight = (multiplierY * placeable.height).roundToInt()
-                    val reMeasured = measurable.measure(Constraints.fixed(scaledWidth, scaledHeight))
-                    layout(scaledWidth, scaledHeight) {
-                        reMeasured.placeRelative(-(scaledWidth - placeable.width), 0)
-                    }
-                }.background(
-                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(absoluteElevation),
-                    shape = ShapeDefaults.Large.copy(topEnd = CornerSize(0), bottomEnd = CornerSize(0)),
-                )
-            } else {
-                Modifier.graphicsLayer {
-                    val scale = lerp(1f, 0.95f, predictiveState)
-                    scaleX = scale
-                    scaleY = scale
-                }.offset {
-                    IntOffset(lerp(0f, minValue * 0.05f, predictiveState).roundToInt(), 0)
-                }
-            }
-        } else {
-            Modifier.onGloballyPositioned {
-                val w = it.size.width
-                if (w != 0) {
-                    minValue = it.size.width.toFloat()
-                }
-            }
-        }
-        Box(
-            modifier = Modifier.offset {
-                IntOffset(drawerState.requireOffset().roundToInt(), 0)
-            }.align(Alignment.CenterEnd) then predictiveModifier,
-            contentAlignment = Alignment.CenterStart,
-        ) {
-            drawerContent()
-        }
-    }
-}
-
-@Suppress("SameParameterValue")
-private fun calculateFraction(a: Float, b: Float, pos: Float) = ((pos - a) / (b - a)).coerceIn(0f, 1f)
-
-@Composable
-private fun Scrim(open: Boolean, onClose: () -> Unit, fraction: () -> Float, color: Color) {
-    val dismissDrawer = if (open) {
-        Modifier.pointerInput(onClose) { detectTapGestures { onClose() } }
-    } else {
-        Modifier
-    }
-
-    Canvas(Modifier.fillMaxSize().then(dismissDrawer)) {
-        drawRect(color, alpha = fraction())
-    }
-}

app/src/main/kotlin/androidx/compose/material3/SearchBar2.kt

@@ -1,502 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-@file:Suppress("ktlint:standard:property-naming")
-
-package androidx.compose.material3
-
-import androidx.activity.BackEventCompat
-import androidx.activity.compose.PredictiveBackHandler
-import androidx.compose.animation.core.Animatable
-import androidx.compose.animation.core.CubicBezierEasing
-import androidx.compose.animation.core.EaseOut
-import androidx.compose.animation.core.FiniteAnimationSpec
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.MutatorMutex
-import androidx.compose.foundation.interaction.Interaction
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.MutableWindowInsets
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.foundation.layout.exclude
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.onConsumedWindowInsetsChanged
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.GenericShape
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text2.BasicTextField2
-import androidx.compose.foundation.text2.input.TextFieldLineLimits
-import androidx.compose.foundation.text2.input.TextFieldState
-import androidx.compose.material3.SearchBarDefaults.InputFieldHeight
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.structuralEqualityPolicy
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.geometry.CornerRadius
-import androidx.compose.ui.geometry.RoundRect
-import androidx.compose.ui.geometry.toRect
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.graphics.takeOrElse
-import androidx.compose.ui.layout.layout
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.semantics.onClick
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.lerp
-import androidx.compose.ui.unit.offset
-import androidx.compose.ui.util.lerp
-import androidx.compose.ui.zIndex
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
-import kotlin.math.sign
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.delay
-
-/**
- * <a href="https://m3.material.io/components/search/overview" class="external" target="_blank">Material Design search</a>.
- *
- * A search bar represents a floating search field that allows users to enter a keyword or phrase
- * and get relevant information. It can be used as a way to navigate through an app via search
- * queries.
- *
- * An active search bar expands into a search "view" and can be used to display dynamic suggestions.
- *
- * ![Search bar image](https://developer.android.com/images/reference/androidx/compose/material3/search-bar.png)
- *
- * A [SearchBar] expands to occupy the entirety of its allowed size when active. For full-screen
- * behavior as specified by Material guidelines, parent layouts of the [SearchBar] must not pass
- * any [Constraints] that limit its size, and the host activity should set
- * `WindowCompat.setDecorFitsSystemWindows(window, false)`.
- *
- * If this expansion behavior is undesirable, for example on large tablet screens, [DockedSearchBar]
- * can be used instead.
- *
- * @param state the query text to be shown in the search bar's input field
- * @param onSearch the callback to be invoked when the input service triggers the [ImeAction.Search]
- * action.
- * @param active whether this search bar is active
- * @param onActiveChange the callback to be invoked when this search bar's active state is changed
- * @param modifier the [Modifier] to be applied to this search bar
- * @param enabled controls the enabled state of this search bar. When `false`, this component will
- * not respond to user input, and it will appear visually disabled and disabled to accessibility
- * services.
- * @param placeholder the placeholder to be displayed when the search bar's query is empty.
- * @param leadingIcon the leading icon to be displayed at the beginning of the search bar container
- * @param trailingIcon the trailing icon to be displayed at the end of the search bar container
- * @param shape the shape of this search bar when it is not [active]. When [active], the shape will
- * always be [SearchBarDefaults.fullScreenShape].
- * @param colors [SearchBarColors] that will be used to resolve the colors used for this search bar
- * in different states. See [SearchBarDefaults.colors].
- * @param tonalElevation when [SearchBarColors.containerColor] is [ColorScheme.surface], a
- * translucent primary color overlay is applied on top of the container. A higher tonal elevation
- * value will result in a darker color in light theme and lighter color in dark theme. See also:
- * [Surface].
- * @param shadowElevation the elevation for the shadow below the search bar
- * @param windowInsets the window insets that the search bar will respect
- * @param interactionSource the [MutableInteractionSource] representing the stream of [Interaction]s
- * for this search bar. You can create and pass in your own `remember`ed instance to observe
- * [Interaction]s and customize the appearance / behavior of this search bar in different states.
- * @param content the content of this search bar that will be displayed below the input field
- */
-@ExperimentalMaterial3Api
-@Composable
-fun SearchBar(
-    state: TextFieldState,
-    onSearch: () -> Unit,
-    active: Boolean,
-    onActiveChange: (Boolean) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    title: @Composable (() -> Unit)? = null,
-    placeholder: @Composable (() -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    shape: Shape = SearchBarDefaults.inputFieldShape,
-    colors: SearchBarColors = SearchBarDefaults.colors(),
-    tonalElevation: Dp = SearchBarDefaults.TonalElevation,
-    shadowElevation: Dp = SearchBarDefaults.ShadowElevation,
-    windowInsets: WindowInsets = SearchBarDefaults.windowInsets,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    content: @Composable ColumnScope.() -> Unit,
-) {
-    val animationProgress = remember { Animatable(initialValue = if (active) 1f else 0f) }
-    var firstBackEvent by remember { mutableStateOf<BackEventCompat?>(null) }
-    var currentBackEvent by remember { mutableStateOf<BackEventCompat?>(null) }
-
-    val focusManager = LocalFocusManager.current
-    val density = LocalDensity.current
-
-    val defaultInputFieldShape = SearchBarDefaults.inputFieldShape
-    val defaultFullScreenShape = SearchBarDefaults.fullScreenShape
-    val useFullScreenShape by remember {
-        derivedStateOf(structuralEqualityPolicy()) { animationProgress.value == 1f }
-    }
-    val animatedShape = remember(useFullScreenShape, shape) {
-        when {
-            shape == defaultInputFieldShape ->
-                // The shape can only be animated if it's the default spec value
-                GenericShape { size, _ ->
-                    val radius = with(density) {
-                        (SearchBarCornerRadius * (1 - animationProgress.value)).toPx()
-                    }
-                    addRoundRect(RoundRect(size.toRect(), CornerRadius(radius)))
-                }
-            useFullScreenShape -> defaultFullScreenShape
-            else -> shape
-        }
-    }
-
-    // The main animation complexity is allowing the component to smoothly expand while keeping the
-    // input field at the same relative location on screen. `Modifier.windowInsetsPadding` does not
-    // support animation and thus is not suitable. Instead, we convert the insets to a padding
-    // applied to the Surface, which gradually becomes padding applied to the input field as the
-    // animation proceeds.
-    val unconsumedInsets = remember { MutableWindowInsets() }
-    val topPadding = remember(density) {
-        derivedStateOf {
-            SearchBarVerticalPadding +
-                unconsumedInsets.asPaddingValues(density).calculateTopPadding()
-        }
-    }
-
-    Surface(
-        shape = animatedShape,
-        color = colors.containerColor,
-        contentColor = contentColorFor(colors.containerColor),
-        tonalElevation = tonalElevation,
-        shadowElevation = shadowElevation,
-        modifier = modifier
-            .padding(horizontal = lerp(SearchBarHorizontalPadding, 0.dp, animationProgress.value))
-            .zIndex(1f)
-            .onConsumedWindowInsetsChanged { consumedInsets ->
-                unconsumedInsets.insets = windowInsets.exclude(consumedInsets)
-            }
-            .consumeWindowInsets(unconsumedInsets)
-            .layout { measurable, constraints ->
-                val animatedTopPadding =
-                    lerp(topPadding.value, 0.dp, animationProgress.value).roundToPx()
-
-                val startWidth: Int
-                val startHeight: Int
-                if (currentBackEvent == null) {
-                    startWidth = max(constraints.minWidth, SearchBarMinWidth.roundToPx())
-                        .coerceAtMost(min(constraints.maxWidth, SearchBarMaxWidth.roundToPx()))
-                    startHeight = max(constraints.minHeight, InputFieldHeight.roundToPx())
-                        .coerceAtMost(constraints.maxHeight)
-                } else {
-                    startWidth =
-                        (constraints.maxWidth * SearchBarPredictiveBackMinScale).roundToInt()
-                    startHeight =
-                        (constraints.maxHeight * SearchBarPredictiveBackMinScale).roundToInt()
-                }
-                val endWidth = constraints.maxWidth
-                val endHeight = constraints.maxHeight
-
-                val width = lerp(startWidth, endWidth, animationProgress.value)
-                val height =
-                    lerp(startHeight, endHeight, animationProgress.value) + animatedTopPadding
-
-                val minOffsetMargin = SearchBarPredictiveBackMinMargin.roundToPx()
-                val predictiveBackOffsetX = calculatePredictiveBackOffsetX(
-                    constraints,
-                    minOffsetMargin,
-                    currentBackEvent,
-                    animationProgress.value,
-                )
-                val predictiveBackOffsetY = calculatePredictiveBackOffsetY(
-                    constraints,
-                    minOffsetMargin,
-                    currentBackEvent,
-                    firstBackEvent,
-                    height,
-                    SearchBarPredictiveBackMaxOffsetY.roundToPx(),
-                )
-                val placeable = measurable.measure(
-                    Constraints
-                        .fixed(width, height)
-                        .offset(
-                            vertical = -animatedTopPadding,
-                        ),
-                )
-                layout(width, height) {
-                    placeable.placeRelative(
-                        predictiveBackOffsetX,
-                        animatedTopPadding + predictiveBackOffsetY,
-                    )
-                }
-            },
-    ) {
-        Column {
-            val animatedInputFieldPadding = remember {
-                AnimatedPaddingValues2(animationProgress.asState(), topPadding)
-            }
-            SearchBarInputField(
-                state = state,
-                onSearch = onSearch,
-                onActiveChange = onActiveChange,
-                modifier = Modifier.padding(paddingValues = animatedInputFieldPadding),
-                enabled = enabled,
-                label = title.takeUnless { active || animationProgress.value > 0 || state.text.isNotEmpty() },
-                placeholder = placeholder,
-                leadingIcon = leadingIcon,
-                trailingIcon = trailingIcon,
-                colors = colors.inputFieldColors,
-                interactionSource = interactionSource,
-            )
-
-            val showResults by remember {
-                derivedStateOf(structuralEqualityPolicy()) { animationProgress.value > 0 }
-            }
-            if (showResults) {
-                Column(Modifier.graphicsLayer { alpha = animationProgress.value }) {
-                    HorizontalDivider(color = colors.dividerColor)
-                    content()
-                }
-            }
-        }
-    }
-
-    val isFocused = interactionSource.collectIsFocusedAsState().value
-    val shouldClearFocus = !active && isFocused
-    if (shouldClearFocus) {
-        LaunchedEffect(true) {
-            // Not strictly needed according to the motion spec, but since the animation already has
-            // a delay, this works around b/261632544.
-            delay(AnimationDelayMillis.toLong())
-            focusManager.clearFocus()
-        }
-    }
-
-    LaunchedEffect(active) {
-        val animationInProgress = animationProgress.value > 0 && animationProgress.value < 1
-        val animationSpec =
-            if (animationInProgress) {
-                AnimationPredictiveBackExitFloatSpec
-            } else if (active) {
-                AnimationEnterFloatSpec
-            } else {
-                AnimationExitFloatSpec
-            }
-        animationProgress.animateTo(
-            targetValue = if (active) 1f else 0f,
-            animationSpec = animationSpec,
-        )
-    }
-    val mutatorMutex = remember { MutatorMutex() }
-    if (active) {
-        PredictiveBackHandler(true) { progress ->
-            mutatorMutex.mutate {
-                var canceled = false
-                try {
-                    progress.collect { backEvent ->
-                        if (firstBackEvent == null) {
-                            firstBackEvent = backEvent
-                        }
-                        currentBackEvent = backEvent
-                        val interpolatedProgress = EaseOut.transform(backEvent.progress)
-                        animationProgress.snapTo(targetValue = 1 - interpolatedProgress)
-                    }
-                } catch (e: CancellationException) {
-                    canceled = true
-                } finally {
-                    firstBackEvent = null
-                    currentBackEvent = null
-                    onActiveChange(canceled)
-                }
-            }
-        }
-    }
-}
-
-private fun calculatePredictiveBackOffsetX(
-    constraints: Constraints,
-    minMargin: Int,
-    currentBackEvent: BackEventCompat?,
-    progress: Float,
-): Int {
-    if (currentBackEvent == null) {
-        return 0
-    }
-    val directionMultiplier = if (currentBackEvent.swipeEdge == BackEventCompat.EDGE_LEFT) 1 else -1
-    val maxOffsetX =
-        (constraints.maxWidth * SearchBarPredictiveBackMaxOffsetXRatio) - minMargin
-    return (maxOffsetX * (1 - progress)).toInt() * directionMultiplier
-}
-
-private fun calculatePredictiveBackOffsetY(
-    constraints: Constraints,
-    minMargin: Int,
-    currentBackEvent: BackEventCompat?,
-    firstBackEvent: BackEventCompat?,
-    height: Int,
-    maxOffsetY: Int,
-): Int {
-    if (firstBackEvent == null || currentBackEvent == null) {
-        return 0
-    }
-    val availableVerticalSpace = max(0, (constraints.maxHeight - height) / 2 - minMargin)
-    val adjustedMaxOffsetY = min(availableVerticalSpace, maxOffsetY)
-    val yDelta = currentBackEvent.touchY - firstBackEvent.touchY
-    val yProgress = abs(yDelta) / constraints.maxHeight
-    val directionMultiplier = sign(yDelta)
-    return (lerp(0, adjustedMaxOffsetY, yProgress) * directionMultiplier).roundToInt()
-}
-
-@Composable
-private fun SearchBarInputField(
-    state: TextFieldState,
-    onSearch: () -> Unit,
-    onActiveChange: (Boolean) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    label: @Composable (() -> Unit)? = null,
-    placeholder: @Composable (() -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    colors: TextFieldColors = SearchBarDefaults.inputFieldColors(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-) {
-    val focusRequester = remember { FocusRequester() }
-    val focused by interactionSource.collectIsFocusedAsState()
-    val textColor = LocalTextStyle.current.color.takeOrElse {
-        if (focused) colors.focusedTextColor else colors.unfocusedTextColor
-    }
-
-    BasicTextField2(
-        state = state,
-        modifier = modifier
-            .height(InputFieldHeight)
-            .fillMaxWidth()
-            .focusRequester(focusRequester)
-            .onFocusChanged { if (it.isFocused) onActiveChange(true) }
-            .semantics {
-                onClick {
-                    focusRequester.requestFocus()
-                    true
-                }
-            },
-        enabled = enabled,
-        lineLimits = TextFieldLineLimits.SingleLine,
-        textStyle = LocalTextStyle.current.merge(TextStyle(color = textColor)),
-        cursorBrush = SolidColor(colors.cursorColor),
-        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-        keyboardActions = KeyboardActions(onSearch = { onSearch() }),
-        interactionSource = interactionSource,
-        decorator = @Composable { innerTextField ->
-            TextFieldDefaults.DecorationBox(
-                value = state.text.toString(),
-                innerTextField = innerTextField,
-                enabled = enabled,
-                singleLine = true,
-                visualTransformation = VisualTransformation.None,
-                interactionSource = interactionSource,
-                label = label,
-                placeholder = placeholder,
-                leadingIcon = leadingIcon?.let { leading ->
-                    {
-                        Box(Modifier.offset(x = SearchBarIconOffsetX)) { leading() }
-                    }
-                },
-                trailingIcon = trailingIcon?.let { trailing ->
-                    {
-                        Box(Modifier.offset(x = -SearchBarIconOffsetX)) { trailing() }
-                    }
-                },
-                shape = SearchBarDefaults.inputFieldShape,
-                colors = colors,
-                contentPadding = TextFieldDefaults.contentPaddingWithoutLabel(),
-                container = {},
-            )
-        },
-    )
-}
-
-@Stable
-private class AnimatedPaddingValues2(
-    val animationProgress: State<Float>,
-    val topPadding: State<Dp>,
-) : PaddingValues {
-    override fun calculateTopPadding(): Dp = topPadding.value * animationProgress.value
-    override fun calculateBottomPadding(): Dp = SearchBarVerticalPadding * animationProgress.value
-
-    override fun calculateLeftPadding(layoutDirection: LayoutDirection): Dp = 0.dp
-    override fun calculateRightPadding(layoutDirection: LayoutDirection): Dp = 0.dp
-}
-
-// Measurement specs
-private val SearchBarCornerRadius: Dp = InputFieldHeight / 2
-internal val SearchBarMinWidth: Dp = 360.dp
-private val SearchBarMaxWidth: Dp = 720.dp
-internal val SearchBarVerticalPadding: Dp = 8.dp
-internal val SearchBarHorizontalPadding: Dp = 16.dp
-
-// Search bar has 16dp padding between icons and start/end, while by default text field has 12dp.
-private val SearchBarIconOffsetX: Dp = 4.dp
-
-private const val SearchBarPredictiveBackMinScale: Float = 9f / 10f
-private val SearchBarPredictiveBackMinMargin: Dp = 8.dp
-private const val SearchBarPredictiveBackMaxOffsetXRatio: Float = 1f / 20f
-private val SearchBarPredictiveBackMaxOffsetY: Dp = 24.dp
-
-// Animation specs
-private const val AnimationEnterDurationMillis: Int = 600
-private const val AnimationExitDurationMillis: Int = 350
-private const val AnimationDelayMillis: Int = 100
-private val AnimationEnterEasing = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1.0f)
-private val AnimationExitEasing = CubicBezierEasing(0.0f, 1.0f, 0.0f, 1.0f)
-private val AnimationEnterFloatSpec: FiniteAnimationSpec<Float> = tween(
-    durationMillis = AnimationEnterDurationMillis,
-    delayMillis = AnimationDelayMillis,
-    easing = AnimationEnterEasing,
-)
-private val AnimationExitFloatSpec: FiniteAnimationSpec<Float> = tween(
-    durationMillis = AnimationExitDurationMillis,
-    delayMillis = AnimationDelayMillis,
-    easing = AnimationExitEasing,
-)
-private val AnimationPredictiveBackExitFloatSpec: FiniteAnimationSpec<Float> = tween(
-    durationMillis = AnimationExitDurationMillis,
-    easing = AnimationExitEasing,
-)

app/src/main/kotlin/androidx/navigation/compose/ComposeNavGraphNavigator.kt

@@ -1,63 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.navigation.compose
-
-import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavGraph
-import androidx.navigation.NavGraphNavigator
-import androidx.navigation.Navigator
-import androidx.navigation.NavigatorProvider
-
-/**
- * Custom subclass of [NavGraphNavigator] that adds support for defining
- * transitions at the navigation graph level.
- */
-@Navigator.Name("navigation")
-internal class ComposeNavGraphNavigator(
-    navigatorProvider: NavigatorProvider,
-) : NavGraphNavigator(navigatorProvider) {
-    override fun createDestination(): NavGraph {
-        return ComposeNavGraph(this)
-    }
-
-    internal class ComposeNavGraph(
-        navGraphNavigator: Navigator<out NavGraph>,
-    ) : NavGraph(navGraphNavigator) {
-        internal var enterTransition: (
-            @JvmSuppressWildcards
-            AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
-        )? = null
-
-        internal var exitTransition: (
-            @JvmSuppressWildcards
-            AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
-        )? = null
-
-        internal var popEnterTransition: (
-            @JvmSuppressWildcards
-            AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
-        )? = null
-
-        internal var popExitTransition: (
-            @JvmSuppressWildcards
-            AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
-        )? = null
-    }
-}

app/src/main/kotlin/androidx/navigation/compose/ComposeNavigator.kt

@@ -1,128 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.navigation.compose
-
-import androidx.compose.animation.AnimatedContentScope
-import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavDestination
-import androidx.navigation.NavOptions
-import androidx.navigation.Navigator
-import androidx.navigation.compose.ComposeNavigator.Destination
-
-/**
- * Navigator that navigates through [Composable]s. Every destination using this Navigator must
- * set a valid [Composable] by setting it directly on an instantiated [Destination] or calling
- * [composable].
- */
-@Navigator.Name("composable")
-public class ComposeNavigator : Navigator<Destination>() {
-
-    /**
-     * Get the map of transitions currently in progress from the [state].
-     */
-    internal val transitionsInProgress get() = state.transitionsInProgress
-
-    /**
-     * Get the back stack from the [state].
-     */
-    public val backStack get() = state.backStack
-
-    internal val isPop = mutableStateOf(false)
-
-    override fun navigate(
-        entries: List<NavBackStackEntry>,
-        navOptions: NavOptions?,
-        navigatorExtras: Extras?,
-    ) {
-        entries.forEach { entry ->
-            state.pushWithTransition(entry)
-        }
-        isPop.value = false
-    }
-
-    override fun createDestination(): Destination {
-        return Destination(this) { }
-    }
-
-    override fun popBackStack(popUpTo: NavBackStackEntry, savedState: Boolean) {
-        state.popWithTransition(popUpTo, savedState)
-        isPop.value = true
-    }
-
-    /**
-     * Callback to mark a navigation in transition as complete.
-     *
-     * This should be called in conjunction with [navigate] and [popBackStack] as those
-     * calls merely start a transition to the target destination, and requires manually marking
-     * the transition as complete by calling this method.
-     *
-     * Failing to call this method could result in entries being prevented from reaching their
-     * final [Lifecycle.State].
-     */
-    public fun onTransitionComplete(entry: NavBackStackEntry) {
-        state.markTransitionComplete(entry)
-    }
-
-    /**
-     * NavDestination specific to [ComposeNavigator]
-     */
-    @NavDestination.ClassType(Composable::class)
-    public class Destination(
-        navigator: ComposeNavigator,
-        internal val content:
-        @Composable AnimatedContentScope.(@JvmSuppressWildcards NavBackStackEntry) -> Unit,
-    ) : NavDestination(navigator) {
-
-        @Deprecated(
-            message = "Deprecated in favor of Destination that supports AnimatedContent",
-            level = DeprecationLevel.HIDDEN,
-        )
-        constructor(
-            navigator: ComposeNavigator,
-            content: @Composable (NavBackStackEntry) -> @JvmSuppressWildcards Unit,
-        ) : this(navigator, content = { entry -> content(entry) })
-
-        internal var enterTransition: (
-            @JvmSuppressWildcards
-            AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
-        )? = null
-
-        internal var exitTransition: (
-            @JvmSuppressWildcards
-            AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
-        )? = null
-
-        internal var popEnterTransition: (
-            @JvmSuppressWildcards
-            AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
-        )? = null
-
-        internal var popExitTransition: (
-            @JvmSuppressWildcards
-            AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
-        )? = null
-    }
-
-    internal companion object {
-        internal const val NAME = "composable"
-    }
-}

app/src/main/kotlin/androidx/navigation/compose/DialogHost.kt

@@ -1,137 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.navigation.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveableStateHolder
-import androidx.compose.runtime.snapshots.SnapshotStateList
-import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.window.Dialog
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.compose.DialogNavigator.Destination
-
-/**
- * Show each [Destination] on the [DialogNavigator]'s back stack as a [Dialog].
- *
- * Note that [NavHost] will call this for you; you do not need to call it manually.
- */
-@Composable
-public fun DialogHost(dialogNavigator: DialogNavigator) {
-    val saveableStateHolder = rememberSaveableStateHolder()
-    val dialogBackStack by dialogNavigator.backStack.collectAsState()
-    val visibleBackStack = rememberVisibleList(dialogBackStack)
-    visibleBackStack.PopulateVisibleList(dialogBackStack)
-
-    val transitionInProgress by dialogNavigator.transitionInProgress.collectAsState()
-    val dialogsToDispose = remember { mutableStateListOf<NavBackStackEntry>() }
-
-    visibleBackStack.forEach { backStackEntry ->
-        val destination = backStackEntry.destination as Destination
-        Dialog(
-            onDismissRequest = { dialogNavigator.dismiss(backStackEntry) },
-            properties = destination.dialogProperties,
-        ) {
-            DisposableEffect(backStackEntry) {
-                dialogsToDispose.add(backStackEntry)
-                onDispose {
-                    dialogNavigator.onTransitionComplete(backStackEntry)
-                    dialogsToDispose.remove(backStackEntry)
-                }
-            }
-
-            // while in the scope of the composable, we provide the navBackStackEntry as the
-            // ViewModelStoreOwner and LifecycleOwner
-            backStackEntry.LocalOwnersProvider(saveableStateHolder) {
-                destination.content(backStackEntry)
-            }
-        }
-    }
-    // Dialogs may have been popped before it was composed. To prevent leakage, we need to
-    // mark popped entries as complete here. Check that we don't accidentally complete popped
-    // entries that were composed, unless they were disposed of already.
-    LaunchedEffect(transitionInProgress, dialogsToDispose) {
-        transitionInProgress.forEach { entry ->
-            if (!dialogNavigator.backStack.value.contains(entry) &&
-                !dialogsToDispose.contains(entry)
-            ) {
-                dialogNavigator.onTransitionComplete(entry)
-            }
-        }
-    }
-}
-
-@Composable
-internal fun MutableList<NavBackStackEntry>.PopulateVisibleList(
-    backStack: Collection<NavBackStackEntry>,
-) {
-    val isInspecting = LocalInspectionMode.current
-    backStack.forEach { entry ->
-        DisposableEffect(entry.lifecycle) {
-            val observer = LifecycleEventObserver { _, event ->
-                // show dialog in preview
-                if (isInspecting && !contains(entry)) {
-                    add(entry)
-                }
-                // ON_START -> add to visibleBackStack, ON_STOP -> remove from visibleBackStack
-                if (event == Lifecycle.Event.ON_START) {
-                    // We want to treat the visible lists as Sets but we want to keep
-                    // the functionality of mutableStateListOf() so that we recompose in response
-                    // to adds and removes.
-                    if (!contains(entry)) {
-                        add(entry)
-                    }
-                }
-                if (event == Lifecycle.Event.ON_STOP) {
-                    remove(entry)
-                }
-            }
-            entry.lifecycle.addObserver(observer)
-            onDispose {
-                entry.lifecycle.removeObserver(observer)
-            }
-        }
-    }
-}
-
-@Composable
-internal fun rememberVisibleList(
-    backStack: Collection<NavBackStackEntry>,
-): SnapshotStateList<NavBackStackEntry> {
-    // show dialog in preview
-    val isInspecting = LocalInspectionMode.current
-    return remember(backStack) {
-        mutableStateListOf<NavBackStackEntry>().also {
-            it.addAll(
-                backStack.filter { entry ->
-                    if (isInspecting) {
-                        true
-                    } else {
-                        entry.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)
-                    }
-                },
-            )
-        }
-    }
-}

app/src/main/kotlin/androidx/navigation/compose/DialogNavigator.kt

@@ -1,96 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.navigation.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.navigation.FloatingWindow
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavDestination
-import androidx.navigation.NavOptions
-import androidx.navigation.Navigator
-import androidx.navigation.compose.DialogNavigator.Destination
-
-/**
- * Navigator that navigates through [Composable]s that will be hosted within a
- * [Dialog]. Every destination using this Navigator must  set a valid [Composable] by setting it
- * directly on an instantiated [Destination] or calling [dialog].
- */
-@Navigator.Name("dialog")
-public class DialogNavigator : Navigator<Destination>() {
-
-    /**
-     * Get the back stack from the [state].
-     */
-    internal val backStack get() = state.backStack
-
-    /**
-     * Get the transitioning dialogs from the [state].
-     */
-    internal val transitionInProgress get() = state.transitionsInProgress
-
-    /**
-     * Dismiss the dialog destination associated with the given [backStackEntry].
-     */
-    internal fun dismiss(backStackEntry: NavBackStackEntry) {
-        popBackStack(backStackEntry, false)
-    }
-
-    override fun navigate(
-        entries: List<NavBackStackEntry>,
-        navOptions: NavOptions?,
-        navigatorExtras: Extras?,
-    ) {
-        entries.forEach { entry ->
-            state.push(entry)
-        }
-    }
-
-    override fun createDestination(): Destination {
-        return Destination(this) { }
-    }
-
-    override fun popBackStack(popUpTo: NavBackStackEntry, savedState: Boolean) {
-        state.popWithTransition(popUpTo, savedState)
-        // When popping, the incoming dialog is marked transitioning to hold it in
-        // STARTED. With pop complete, we can remove it from transition so it can move to RESUMED.
-        val popIndex = state.transitionsInProgress.value.indexOf(popUpTo)
-        // do not mark complete for entries up to and including popUpTo
-        state.transitionsInProgress.value.forEachIndexed { index, entry ->
-            if (index > popIndex) onTransitionComplete(entry)
-        }
-    }
-
-    internal fun onTransitionComplete(entry: NavBackStackEntry) {
-        state.markTransitionComplete(entry)
-    }
-
-    /**
-     * NavDestination specific to [DialogNavigator]
-     */
-    @NavDestination.ClassType(Composable::class)
-    public class Destination(
-        navigator: DialogNavigator,
-        internal val dialogProperties: DialogProperties = DialogProperties(),
-        internal val content: @Composable (NavBackStackEntry) -> Unit,
-    ) : NavDestination(navigator), FloatingWindow
-
-    internal companion object {
-        internal const val NAME = "dialog"
-    }
-}

app/src/main/kotlin/androidx/navigation/compose/NavBackStackEntryProvider.kt

@@ -1,88 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@file:Suppress("ktlint:standard:property-naming", "ktlint:standard:function-naming")
-
-package androidx.navigation.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.saveable.SaveableStateHolder
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.platform.LocalSavedStateRegistryOwner
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavBackStackEntry
-import java.lang.ref.WeakReference
-import java.util.UUID
-
-/**
- * Provides [this] [NavBackStackEntry] as [LocalViewModelStoreOwner], [LocalLifecycleOwner] and
- * [LocalSavedStateRegistryOwner] to the [content] and saves the [content]'s saveable states with
- * the given [saveableStateHolder].
- *
- * @param saveableStateHolder The [SaveableStateHolder] that holds the saved states. The same
- * holder should be used for all [NavBackStackEntry]s in the encapsulating [Composable] and the
- * holder should be hoisted.
- * @param content The content [Composable]
- */
-@Composable
-public fun NavBackStackEntry.LocalOwnersProvider(
-    saveableStateHolder: SaveableStateHolder,
-    content: @Composable () -> Unit,
-) {
-    CompositionLocalProvider(
-        LocalViewModelStoreOwner provides this,
-        LocalLifecycleOwner provides this,
-        LocalSavedStateRegistryOwner provides this,
-    ) {
-        saveableStateHolder.SaveableStateProvider(content)
-    }
-}
-
-@Composable
-private fun SaveableStateHolder.SaveableStateProvider(content: @Composable () -> Unit) {
-    val viewModel = viewModel<BackStackEntryIdViewModel>()
-    // Stash a reference to the SaveableStateHolder in the ViewModel so that
-    // it is available when the ViewModel is cleared, marking the permanent removal of this
-    // NavBackStackEntry from the back stack. Which, because of animations,
-    // only happens after this leaves composition. Which means we can't rely on
-    // DisposableEffect to clean up this reference (as it'll be cleaned up too early)
-    viewModel.saveableStateHolderRef = WeakReference(this)
-    SaveableStateProvider(viewModel.id, content)
-}
-
-internal class BackStackEntryIdViewModel(handle: SavedStateHandle) : ViewModel() {
-
-    private val IdKey = "SaveableStateHolder_BackStackEntryKey"
-
-    // we create our own id for each back stack entry to support multiple entries of the same
-    // destination. this id will be restored by SavedStateHandle
-    val id: UUID = handle.get<UUID>(IdKey) ?: UUID.randomUUID().also { handle.set(IdKey, it) }
-
-    lateinit var saveableStateHolderRef: WeakReference<SaveableStateHolder>
-
-    // onCleared will be called on the entries removed from the back stack. here we notify
-    // SaveableStateProvider that we should remove any state is had associated with this
-    // destination as it is no longer needed.
-    override fun onCleared() {
-        super.onCleared()
-        saveableStateHolderRef.get()?.removeState(id)
-        saveableStateHolderRef.clear()
-    }
-}

app/src/main/kotlin/androidx/navigation/compose/NavGraphBuilder.kt

@@ -1,243 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.navigation.compose
-
-import androidx.compose.animation.AnimatedContentScope
-import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.window.DialogProperties
-import androidx.navigation.NamedNavArgument
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavDeepLink
-import androidx.navigation.NavGraph
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.get
-
-/**
- * Add the [Composable] to the [NavGraphBuilder]
- *
- * @param route route for the destination
- * @param arguments list of arguments to associate with destination
- * @param deepLinks list of deep links to associate with the destinations
- * @param content composable for the destination
- */
-@Deprecated(
-    message = "Deprecated in favor of composable builder that supports AnimatedContent",
-    level = DeprecationLevel.HIDDEN,
-)
-public fun NavGraphBuilder.composable(
-    route: String,
-    arguments: List<NamedNavArgument> = emptyList(),
-    deepLinks: List<NavDeepLink> = emptyList(),
-    content: @Composable (NavBackStackEntry) -> Unit,
-) {
-    addDestination(
-        ComposeNavigator.Destination(provider[ComposeNavigator::class]) {
-                entry ->
-            content(entry)
-        }.apply {
-            this.route = route
-            arguments.forEach { (argumentName, argument) ->
-                addArgument(argumentName, argument)
-            }
-            deepLinks.forEach { deepLink ->
-                addDeepLink(deepLink)
-            }
-        },
-    )
-}
-
-/**
- * Add the [Composable] to the [NavGraphBuilder]
- *
- * @param route route for the destination
- * @param arguments list of arguments to associate with destination
- * @param deepLinks list of deep links to associate with the destinations
- * @param enterTransition callback to determine the destination's enter transition
- * @param exitTransition callback to determine the destination's exit transition
- * @param popEnterTransition callback to determine the destination's popEnter transition
- * @param popExitTransition callback to determine the destination's popExit transition
- * @param content composable for the destination
- */
-public fun NavGraphBuilder.composable(
-    route: String,
-    arguments: List<NamedNavArgument> = emptyList(),
-    deepLinks: List<NavDeepLink> = emptyList(),
-    enterTransition: (
-        @JvmSuppressWildcards
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
-    )? = null,
-    exitTransition: (
-        @JvmSuppressWildcards
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
-    )? = null,
-    popEnterTransition: (
-        @JvmSuppressWildcards
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
-    )? =
-        enterTransition,
-    popExitTransition: (
-        @JvmSuppressWildcards
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
-    )? =
-        exitTransition,
-    content: @Composable AnimatedContentScope.(NavBackStackEntry) -> Unit,
-) {
-    addDestination(
-        ComposeNavigator.Destination(
-            provider[ComposeNavigator::class],
-            content,
-        ).apply {
-            this.route = route
-            arguments.forEach { (argumentName, argument) ->
-                addArgument(argumentName, argument)
-            }
-            deepLinks.forEach { deepLink ->
-                addDeepLink(deepLink)
-            }
-            this.enterTransition = enterTransition
-            this.exitTransition = exitTransition
-            this.popEnterTransition = popEnterTransition
-            this.popExitTransition = popExitTransition
-        },
-    )
-}
-
-/**
- * Construct a nested [NavGraph]
- *
- * @sample androidx.navigation.compose.samples.NestedNavInGraphWithArgs
- *
- * @param startDestination the starting destination's route for this NavGraph
- * @param route the destination's unique route
- * @param arguments list of arguments to associate with destination
- * @param deepLinks list of deep links to associate with the destinations
- * @param builder the builder used to construct the graph
- */
-@Deprecated(
-    message = "Deprecated in favor of navigation builder that supports AnimatedContent",
-    level = DeprecationLevel.HIDDEN,
-)
-public fun NavGraphBuilder.navigation(
-    startDestination: String,
-    route: String,
-    arguments: List<NamedNavArgument> = emptyList(),
-    deepLinks: List<NavDeepLink> = emptyList(),
-    builder: NavGraphBuilder.() -> Unit,
-) {
-    addDestination(
-        NavGraphBuilder(provider, startDestination, route).apply(builder).build().apply {
-            arguments.forEach { (argumentName, argument) ->
-                addArgument(argumentName, argument)
-            }
-            deepLinks.forEach { deepLink ->
-                addDeepLink(deepLink)
-            }
-        },
-    )
-}
-
-/**
- * Construct a nested [NavGraph]
- *
- * @param startDestination the starting destination's route for this NavGraph
- * @param route the destination's unique route
- * @param arguments list of arguments to associate with destination
- * @param deepLinks list of deep links to associate with the destinations
- * @param enterTransition callback to define enter transitions for destination in this NavGraph
- * @param exitTransition callback to define exit transitions for destination in this NavGraph
- * @param popEnterTransition callback to define pop enter transitions for destination in this
- * NavGraph
- * @param popExitTransition callback to define pop exit transitions for destination in this NavGraph
- * @param builder the builder used to construct the graph
- *
- * @return the newly constructed nested NavGraph
- */
-public fun NavGraphBuilder.navigation(
-    startDestination: String,
-    route: String,
-    arguments: List<NamedNavArgument> = emptyList(),
-    deepLinks: List<NavDeepLink> = emptyList(),
-    enterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)? =
-        null,
-    exitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?)? =
-        null,
-    popEnterTransition: (
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
-    )? = enterTransition,
-    popExitTransition: (
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
-    )? = exitTransition,
-    builder: NavGraphBuilder.() -> Unit,
-) {
-    addDestination(
-        NavGraphBuilder(provider, startDestination, route).apply(builder).build().apply {
-            arguments.forEach { (argumentName, argument) ->
-                addArgument(argumentName, argument)
-            }
-            deepLinks.forEach { deepLink ->
-                addDeepLink(deepLink)
-            }
-            if (this is ComposeNavGraphNavigator.ComposeNavGraph) {
-                this.enterTransition = enterTransition
-                this.exitTransition = exitTransition
-                this.popEnterTransition = popEnterTransition
-                this.popExitTransition = popExitTransition
-            }
-        },
-    )
-}
-
-/**
- * Add the [Composable] to the [NavGraphBuilder] that will be hosted within a
- * [androidx.compose.ui.window.Dialog]. This is suitable only when this dialog represents
- * a separate screen in your app that needs its own lifecycle and saved state, independent
- * of any other destination in your navigation graph. For use cases such as `AlertDialog`,
- * you should use those APIs directly in the [composable] destination that wants to show that
- * dialog.
- *
- * @param route route for the destination
- * @param arguments list of arguments to associate with destination
- * @param deepLinks list of deep links to associate with the destinations
- * @param dialogProperties properties that should be passed to [androidx.compose.ui.window.Dialog].
- * @param content composable content for the destination that will be hosted within the Dialog
- */
-public fun NavGraphBuilder.dialog(
-    route: String,
-    arguments: List<NamedNavArgument> = emptyList(),
-    deepLinks: List<NavDeepLink> = emptyList(),
-    dialogProperties: DialogProperties = DialogProperties(),
-    content: @Composable (NavBackStackEntry) -> Unit,
-) {
-    addDestination(
-        DialogNavigator.Destination(
-            provider[DialogNavigator::class],
-            dialogProperties,
-            content,
-        ).apply {
-            this.route = route
-            arguments.forEach { (argumentName, argument) ->
-                addArgument(argumentName, argument)
-            }
-            deepLinks.forEach { deepLink ->
-                addDeepLink(deepLink)
-            }
-        },
-    )
-}

app/src/main/kotlin/androidx/navigation/compose/NavHost.kt

@@ -1,424 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.navigation.compose
-
-import android.annotation.SuppressLint
-import androidx.activity.compose.BackHandler
-import androidx.activity.compose.PredictiveBackHandler
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.ContentTransform
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
-import androidx.compose.animation.core.Animatable
-import androidx.compose.animation.core.EaseOut
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.MutableTransitionState
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.core.updateTransition
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.togetherWith
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveableStateHolder
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavDestination
-import androidx.navigation.NavDestination.Companion.hierarchy
-import androidx.navigation.NavGraph
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavHostController
-import androidx.navigation.Navigator
-import androidx.navigation.createGraph
-import androidx.navigation.get
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.collectAsState
-import kotlin.math.roundToLong
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.withContext
-
-/**
- * Provides in place in the Compose hierarchy for self contained navigation to occur.
- *
- * Once this is called, any Composable within the given [NavGraphBuilder] can be navigated to from
- * the provided [navController].
- *
- * The builder passed into this method is [remember]ed. This means that for this NavHost, the
- * contents of the builder cannot be changed.
- *
- * @sample androidx.navigation.compose.samples.NavScaffold
- *
- * @param navController the navController for this host
- * @param startDestination the route for the start destination
- * @param modifier The modifier to be applied to the layout.
- * @param route the route for the graph
- * @param builder the builder used to construct the graph
- */
-@Deprecated(
-    message = "Deprecated in favor of NavHost that supports AnimatedContent",
-    level = DeprecationLevel.HIDDEN,
-)
-@Composable
-public fun NavHost(
-    navController: NavHostController,
-    startDestination: String,
-    modifier: Modifier = Modifier,
-    route: String? = null,
-    builder: NavGraphBuilder.() -> Unit,
-) {
-    NavHost(
-        navController,
-        remember(route, startDestination, builder) {
-            navController.createGraph(startDestination, route, builder)
-        },
-        modifier,
-    )
-}
-
-/**
- * Provides in place in the Compose hierarchy for self contained navigation to occur.
- *
- * Once this is called, any Composable within the given [NavGraphBuilder] can be navigated to from
- * the provided [navController].
- *
- * The builder passed into this method is [remember]ed. This means that for this NavHost, the
- * contents of the builder cannot be changed.
- *
- * @param navController the navController for this host
- * @param startDestination the route for the start destination
- * @param modifier The modifier to be applied to the layout.
- * @param contentAlignment The [Alignment] of the [AnimatedContent]
- * @param route the route for the graph
- * @param enterTransition callback to define enter transitions for destination in this host
- * @param exitTransition callback to define exit transitions for destination in this host
- * @param popEnterTransition callback to define popEnter transitions for destination in this host
- * @param popExitTransition callback to define popExit transitions for destination in this host
- * @param builder the builder used to construct the graph
- */
-@Composable
-public fun NavHost(
-    navController: NavHostController,
-    startDestination: String,
-    modifier: Modifier = Modifier,
-    contentAlignment: Alignment = Alignment.Center,
-    route: String? = null,
-    enterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) =
-        { fadeIn(animationSpec = tween(700)) },
-    exitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) =
-        { fadeOut(animationSpec = tween(700)) },
-    popEnterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) =
-        enterTransition,
-    popExitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) =
-        exitTransition,
-    builder: NavGraphBuilder.() -> Unit,
-) {
-    NavHost(
-        navController,
-        remember(route, startDestination, builder) {
-            navController.createGraph(startDestination, route, builder)
-        },
-        modifier,
-        contentAlignment,
-        enterTransition,
-        exitTransition,
-        popEnterTransition,
-        popExitTransition,
-    )
-}
-
-/**
- * Provides in place in the Compose hierarchy for self contained navigation to occur.
- *
- * Once this is called, any Composable within the given [NavGraphBuilder] can be navigated to from
- * the provided [navController].
- *
- * The graph passed into this method is [remember]ed. This means that for this NavHost, the graph
- * cannot be changed.
- *
- * @param navController the navController for this host
- * @param graph the graph for this host
- * @param modifier The modifier to be applied to the layout.
- */
-@Deprecated(
-    message = "Deprecated in favor of NavHost that supports AnimatedContent",
-    level = DeprecationLevel.HIDDEN,
-)
-@Composable
-public fun NavHost(
-    navController: NavHostController,
-    graph: NavGraph,
-    modifier: Modifier = Modifier,
-) = NavHost(navController, graph, modifier)
-
-/**
- * Provides in place in the Compose hierarchy for self contained navigation to occur.
- *
- * Once this is called, any Composable within the given [NavGraphBuilder] can be navigated to from
- * the provided [navController].
- *
- * @param navController the navController for this host
- * @param graph the graph for this host
- * @param modifier The modifier to be applied to the layout.
- * @param contentAlignment The [Alignment] of the [AnimatedContent]
- * @param enterTransition callback to define enter transitions for destination in this host
- * @param exitTransition callback to define exit transitions for destination in this host
- * @param popEnterTransition callback to define popEnter transitions for destination in this host
- * @param popExitTransition callback to define popExit transitions for destination in this host
- */
-@SuppressLint("StateFlowValueCalledInComposition")
-@Composable
-public fun NavHost(
-    navController: NavHostController,
-    graph: NavGraph,
-    modifier: Modifier = Modifier,
-    contentAlignment: Alignment = Alignment.Center,
-    enterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) =
-        { fadeIn(animationSpec = tween(700)) },
-    exitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) =
-        { fadeOut(animationSpec = tween(700)) },
-    popEnterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) =
-        enterTransition,
-    popExitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) =
-        exitTransition,
-) {
-    val lifecycleOwner = LocalLifecycleOwner.current
-    val viewModelStoreOwner = checkNotNull(LocalViewModelStoreOwner.current) {
-        "NavHost requires a ViewModelStoreOwner to be provided via LocalViewModelStoreOwner"
-    }
-
-    navController.setViewModelStore(viewModelStoreOwner.viewModelStore)
-
-    // Then set the graph
-    navController.graph = graph
-
-    // Find the ComposeNavigator, returning early if it isn't found
-    // (such as is the case when using TestNavHostController)
-    val composeNavigator = navController.navigatorProvider.get<Navigator<out NavDestination>>(
-        ComposeNavigator.NAME,
-    ) as? ComposeNavigator ?: return
-
-    val currentBackStack by composeNavigator.backStack.collectAsState()
-
-    DisposableEffect(lifecycleOwner) {
-        // Setup the navController with proper owners
-        navController.setLifecycleOwner(lifecycleOwner)
-        onDispose { }
-    }
-
-    val saveableStateHolder = rememberSaveableStateHolder()
-
-    val allVisibleEntries by navController.visibleEntries.collectAsState()
-
-    // Intercept back only when there's a destination to pop
-    val visibleEntries by remember {
-        derivedStateOf {
-            allVisibleEntries.filter { entry ->
-                entry.destination.navigatorName == ComposeNavigator.NAME
-            }
-        }
-    }
-
-    val backStackEntry: NavBackStackEntry? = visibleEntries.lastOrNull()
-
-    val zIndices = remember { mutableMapOf<String, Float>() }
-
-    if (backStackEntry != null) {
-        val finalEnter: AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition = {
-            val targetDestination = targetState.destination as ComposeNavigator.Destination
-
-            if (composeNavigator.isPop.value) {
-                targetDestination.hierarchy.firstNotNullOfOrNull { destination ->
-                    destination.createPopEnterTransition(this)
-                } ?: popEnterTransition.invoke(this)
-            } else {
-                targetDestination.hierarchy.firstNotNullOfOrNull { destination ->
-                    destination.createEnterTransition(this)
-                } ?: enterTransition.invoke(this)
-            }
-        }
-
-        val finalExit: AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition = {
-            val initialDestination = initialState.destination as ComposeNavigator.Destination
-
-            if (composeNavigator.isPop.value) {
-                initialDestination.hierarchy.firstNotNullOfOrNull { destination ->
-                    destination.createPopExitTransition(this)
-                } ?: popExitTransition.invoke(this)
-            } else {
-                initialDestination.hierarchy.firstNotNullOfOrNull { destination ->
-                    destination.createExitTransition(this)
-                } ?: exitTransition.invoke(this)
-            }
-        }
-
-        DisposableEffect(true) {
-            onDispose {
-                visibleEntries.forEach { entry ->
-                    composeNavigator.onTransitionComplete(entry)
-                }
-            }
-        }
-
-        val enablePredictiveBack by Settings.predictiveNavAnim.collectAsState()
-        val transition = if (enablePredictiveBack) {
-            val duration = 500000000L
-            val transitionState = remember { MutableTransitionState(backStackEntry) }
-            val transition = updateTransition(transitionState = transitionState, label = "entry")
-            val animatedFraction = remember { Animatable(0f).also { it.updateBounds(lowerBound = 0f, upperBound = 1f) } }
-
-            fun seekToFraction(lState: NavBackStackEntry, rState: NavBackStackEntry) {
-                val fraction = animatedFraction.value
-                val playTimeNanos = (fraction * duration).roundToLong()
-                transition.setPlaytimeAfterInitialAndTargetStateEstablished(lState, rState, playTimeNanos)
-            }
-
-            LaunchedEffect(backStackEntry) {
-                try {
-                    animatedFraction.animateTo(1f, animationSpec = tween(500, easing = LinearEasing)) {
-                        seekToFraction(transitionState.currentState, backStackEntry)
-                    }
-                } finally {
-                    withContext(NonCancellable) {
-                        animatedFraction.snapTo(0f)
-                        transition.setPlaytimeAfterInitialAndTargetStateEstablished(
-                            backStackEntry,
-                            backStackEntry,
-                            0,
-                        )
-                    }
-                }
-            }
-
-            PredictiveBackHandler(currentBackStack.size > 1) { flow ->
-                // Prev can never be null, i.e. BackHandler should not enabled when prev is null
-                val prev = currentBackStack.last { it != backStackEntry }
-                try {
-                    flow.collect {
-                        val interpolated = EaseOut.transform(it.progress)
-                        animatedFraction.snapTo(interpolated)
-                        seekToFraction(backStackEntry, prev)
-                    }
-                    navController.popBackStack()
-                } catch (e: CancellationException) {
-                    withContext(NonCancellable) {
-                        animatedFraction.snapTo(0f)
-                        transition.setPlaytimeAfterInitialAndTargetStateEstablished(
-                            backStackEntry,
-                            backStackEntry,
-                            0,
-                        )
-                    }
-                }
-            }
-            transition
-        } else {
-            BackHandler(currentBackStack.size > 1) {
-                navController.popBackStack()
-            }
-            updateTransition(backStackEntry, label = "entry")
-        }
-
-        transition.AnimatedContent(
-            modifier,
-            transitionSpec = {
-                // If the initialState of the AnimatedContent is not in visibleEntries, we are in
-                // a case where visible has cleared the old state for some reason, so instead of
-                // attempting to animate away from the initialState, we skip the animation.
-                if (initialState in visibleEntries) {
-                    val initialZIndex = zIndices[initialState.id]
-                        ?: 0f.also { zIndices[initialState.id] = 0f }
-                    val targetZIndex = when {
-                        targetState.id == initialState.id -> initialZIndex
-                        composeNavigator.isPop.value -> initialZIndex - 1f
-                        else -> initialZIndex + 1f
-                    }.also { zIndices[targetState.id] = it }
-
-                    ContentTransform(finalEnter(this), finalExit(this), targetZIndex)
-                } else {
-                    EnterTransition.None togetherWith ExitTransition.None
-                }
-            },
-            contentAlignment,
-            contentKey = { it.id },
-        ) {
-            // while in the scope of the composable, we provide the navBackStackEntry as the
-            // ViewModelStoreOwner and LifecycleOwner
-            it.LocalOwnersProvider(saveableStateHolder) {
-                (it.destination as ComposeNavigator.Destination)
-                    .content(this, it)
-            }
-        }
-        LaunchedEffect(transition.currentState, transition.targetState) {
-            if (transition.currentState == transition.targetState) {
-                visibleEntries.forEach { entry ->
-                    composeNavigator.onTransitionComplete(entry)
-                }
-                zIndices
-                    .filter { it.key != transition.targetState.id }
-                    .forEach { zIndices.remove(it.key) }
-            }
-        }
-    }
-
-    val dialogNavigator = navController.navigatorProvider.get<Navigator<out NavDestination>>(
-        DialogNavigator.NAME,
-    ) as? DialogNavigator ?: return
-
-    // Show any dialog destinations
-    DialogHost(dialogNavigator)
-}
-
-private fun NavDestination.createEnterTransition(
-    scope: AnimatedContentTransitionScope<NavBackStackEntry>,
-): EnterTransition? = when (this) {
-    is ComposeNavigator.Destination -> this.enterTransition?.invoke(scope)
-    is ComposeNavGraphNavigator.ComposeNavGraph -> this.enterTransition?.invoke(scope)
-    else -> null
-}
-
-private fun NavDestination.createExitTransition(
-    scope: AnimatedContentTransitionScope<NavBackStackEntry>,
-): ExitTransition? = when (this) {
-    is ComposeNavigator.Destination -> this.exitTransition?.invoke(scope)
-    is ComposeNavGraphNavigator.ComposeNavGraph -> this.exitTransition?.invoke(scope)
-    else -> null
-}
-
-private fun NavDestination.createPopEnterTransition(
-    scope: AnimatedContentTransitionScope<NavBackStackEntry>,
-): EnterTransition? = when (this) {
-    is ComposeNavigator.Destination -> this.popEnterTransition?.invoke(scope)
-    is ComposeNavGraphNavigator.ComposeNavGraph -> this.popEnterTransition?.invoke(scope)
-    else -> null
-}
-private fun NavDestination.createPopExitTransition(
-    scope: AnimatedContentTransitionScope<NavBackStackEntry>,
-): ExitTransition? = when (this) {
-    is ComposeNavigator.Destination -> this.popExitTransition?.invoke(scope)
-    is ComposeNavGraphNavigator.ComposeNavGraph -> this.popExitTransition?.invoke(scope)
-    else -> null
-}

app/src/main/kotlin/androidx/navigation/compose/NavHostController.kt

@@ -1,86 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@file:Suppress("ktlint:standard:property-naming", "ktlint:standard:function-naming")
-
-package androidx.navigation.compose
-
-import android.content.Context
-import android.os.Bundle
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.platform.LocalContext
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavController
-import androidx.navigation.NavDestination
-import androidx.navigation.NavHostController
-import androidx.navigation.Navigator
-
-/**
- * Gets the current navigation back stack entry as a [MutableState]. When the given navController
- * changes the back stack due to a [NavController.navigate] or [NavController.popBackStack] this
- * will trigger a recompose and return the top entry on the back stack.
- *
- * @return a mutable state of the current back stack entry
- */
-@Composable
-public fun NavController.currentBackStackEntryAsState(): State<NavBackStackEntry?> {
-    return currentBackStackEntryFlow.collectAsState(null)
-}
-
-/**
- * Creates a NavHostController that handles the adding of the [ComposeNavigator] and
- * [DialogNavigator]. Additional [Navigator] instances can be passed through [navigators] to
- * be applied to the returned NavController. Note that each [Navigator] must be separately
- * remembered before being passed in here: any changes to those inputs will cause the
- * NavController to be recreated.
- *
- * @see NavHost
- */
-@Composable
-public fun rememberNavController(
-    vararg navigators: Navigator<out NavDestination>,
-): NavHostController {
-    val context = LocalContext.current
-    return rememberSaveable(inputs = navigators, saver = NavControllerSaver(context)) {
-        createNavController(context)
-    }.apply {
-        for (navigator in navigators) {
-            navigatorProvider.addNavigator(navigator)
-        }
-    }
-}
-
-private fun createNavController(context: Context) =
-    NavHostController(context).apply {
-        navigatorProvider.addNavigator(ComposeNavGraphNavigator(navigatorProvider))
-        navigatorProvider.addNavigator(ComposeNavigator())
-        navigatorProvider.addNavigator(DialogNavigator())
-    }
-
-/**
- * Saver to save and restore the NavController across config change and process death.
- */
-private fun NavControllerSaver(
-    context: Context,
-): Saver<NavHostController, *> = Saver<NavHostController, Bundle>(
-    save = { it.saveState() },
-    restore = { createNavController(context).apply { restoreState(it) } },
-)

app/src/main/kotlin/androidx/navigation/ui/NavigationUI.kt

@@ -0,0 +1,38 @@
+package androidx.navigation.ui
+
+import android.annotation.SuppressLint
+import androidx.annotation.IdRes
+import androidx.navigation.ActivityNavigator
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hierarchy
+import androidx.navigation.NavOptions
+
+@SuppressLint("PrivateResource")
+fun onNavDestinationSelected2(@IdRes id: Int, navController: NavController): Boolean {
+    if (navController.currentDestination?.matchDestination(id) == true) return true
+    val builder = NavOptions.Builder().setLaunchSingleTop(true)
+    if (navController.currentDestination!!.parent!!.findNode(id) is ActivityNavigator.Destination) {
+        builder.setEnterAnim(R.anim.nav_default_enter_anim)
+            .setExitAnim(R.anim.nav_default_exit_anim)
+            .setPopEnterAnim(R.anim.nav_default_pop_enter_anim)
+            .setPopExitAnim(R.anim.nav_default_pop_exit_anim)
+    } else {
+        builder.setEnterAnim(androidx.fragment.R.animator.fragment_open_enter)
+            .setExitAnim(androidx.fragment.R.animator.fragment_open_exit)
+            .setPopEnterAnim(androidx.fragment.R.animator.fragment_close_enter)
+            .setPopExitAnim(androidx.fragment.R.animator.fragment_close_exit)
+    }
+    val options = builder.build()
+    return try {
+        // TODO provide proper API instead of using Exceptions as Control-Flow.
+        navController.navigate(id, null, options)
+        // Return true only if the destination we've navigated to matches the MenuItem
+        navController.currentDestination?.matchDestination(id) == true
+    } catch (e: IllegalArgumentException) {
+        false
+    }
+}
+
+fun NavDestination.matchDestination(@IdRes destId: Int): Boolean =
+    hierarchy.any { it.id == destId }

app/src/main/kotlin/androidx/swiperefreshlayout/widget/ThemedSwipeRefreshLayout.kt

@@ -0,0 +1,25 @@
+package androidx.swiperefreshlayout.widget
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.drawable.ShapeDrawable
+import android.util.AttributeSet
+import androidx.core.graphics.ColorUtils
+import rikka.core.res.resolveColor
+
+@SuppressLint("PrivateResource")
+class ThemedSwipeRefreshLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+) : SwipeRefreshLayout(context, attrs) {
+
+    init {
+        val surfaceColor =
+            context.theme.resolveColor(com.google.android.material.R.attr.colorSurface)
+        val overlayColor =
+            context.getColor(com.google.android.material.R.color.m3_popupmenu_overlay_color)
+        val backgroundColor = ColorUtils.compositeColors(overlayColor, surfaceColor)
+        (mCircleView.background as ShapeDrawable).paint.color = backgroundColor
+        setColorSchemeColors(context.theme.resolveColor(com.google.android.material.R.attr.colorAccent))
+    }
+}

app/src/main/kotlin/com/davemorrissey/labs/subscaleview/ImageSource.kt

@@ -0,0 +1,111 @@
+package com.davemorrissey.labs.subscaleview
+
+import android.graphics.Bitmap
+import android.graphics.Rect
+import com.davemorrissey.labs.subscaleview.provider.InputProvider
+
+/**
+ * Helper class used to set the source and additional attributes from a variety of sources. Supports
+ * use of a bitmap, asset, resource, external file or any other URI.
+ *
+ *
+ * When you are using a preview image, you must set the dimensions of the full size image on the
+ * ImageSource object for the full size image using the [.dimensions] method.
+ */
+class ImageSource {
+    val bitmap: Bitmap?
+    val provider: InputProvider?
+
+    private var sWidth = 0
+    private var sHeight = 0
+
+    var sRegion = Rect(0, 0, 0, 0)
+        private set
+    var isCached = false
+        private set
+
+    private constructor(bitmap: Bitmap, cached: Boolean) {
+        this.bitmap = bitmap
+        provider = null
+        sWidth = bitmap.width
+        sHeight = bitmap.height
+        isCached = cached
+    }
+
+    private constructor(provider: InputProvider) {
+        bitmap = null
+        this.provider = provider
+    }
+
+    /**
+     * Use a region of the source image. Region must be set independently for the full size image and the preview if
+     * you are using one.
+     *
+     * @param sRegion the region of the source image to be displayed.
+     * @return this instance for chaining.
+     */
+    fun region(sRegion: Rect): ImageSource {
+        this.sRegion = sRegion
+        setInvariants()
+        return this
+    }
+
+    /**
+     * Declare the dimensions of the image. This is only required for a full size image, when you are specifying a URI
+     * and also a preview image. When displaying a bitmap object, or not using a preview, you do not need to declare
+     * the image dimensions. Note if the declared dimensions are found to be incorrect, the view will reset.
+     *
+     * @param sWidth  width of the source image.
+     * @param sHeight height of the source image.
+     * @return this instance for chaining.
+     */
+    fun dimensions(sWidth: Int, sHeight: Int): ImageSource {
+        if (bitmap == null) {
+            this.sWidth = sWidth
+            this.sHeight = sHeight
+        }
+        setInvariants()
+        return this
+    }
+
+    private fun setInvariants() {
+        if (!sRegion.isEmpty) {
+            sWidth = sRegion.width()
+            sHeight = sRegion.height()
+        }
+    }
+
+    companion object {
+        /**
+         * Create an instance from an input provider.
+         *
+         * @param provider input stream provider.
+         * @return an [ImageSource] instance.
+         */
+        fun provider(provider: InputProvider): ImageSource {
+            return ImageSource(provider)
+        }
+
+        /**
+         * Provide a loaded bitmap for display.
+         *
+         * @param bitmap bitmap to be displayed.
+         * @return an [ImageSource] instance.
+         */
+        fun bitmap(bitmap: Bitmap): ImageSource {
+            return ImageSource(bitmap, false)
+        }
+
+        /**
+         * Provide a loaded and cached bitmap for display. This bitmap will not be recycled when it is no
+         * longer needed. Use this method if you loaded the bitmap with an image loader such as Picasso
+         * or Volley.
+         *
+         * @param bitmap bitmap to be displayed.
+         * @return an [ImageSource] instance.
+         */
+        fun cachedBitmap(bitmap: Bitmap): ImageSource {
+            return ImageSource(bitmap, true)
+        }
+    }
+}

app/src/main/kotlin/com/davemorrissey/labs/subscaleview/ImageViewState.kt

@@ -0,0 +1,15 @@
+package com.davemorrissey.labs.subscaleview
+
+import android.graphics.PointF
+import java.io.Serializable
+
+/**
+ * Wraps the scale, center and orientation of a displayed image for easy restoration on screen rotate.
+ */
+class ImageViewState(val scale: Float, center: PointF) : Serializable {
+    private val centerX: Float = center.x
+    private val centerY: Float = center.y
+
+    val center: PointF
+        get() = PointF(centerX, centerY)
+}

app/src/main/kotlin/com/davemorrissey/labs/subscaleview/decoder/Decoder.kt

@@ -0,0 +1,50 @@
+package com.davemorrissey.labs.subscaleview.decoder
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Point
+import android.graphics.Rect
+import com.davemorrissey.labs.subscaleview.provider.InputProvider
+
+/**
+ * Interface for image decoding classes.
+ */
+interface Decoder {
+    /**
+     * Initialise the decoder. When possible, perform initial setup work once in this method. The
+     * dimensions of the image must be returned.
+     *
+     * @param context  Application context. A reference may be held, but must be cleared on recycle.
+     * @param provider Provider of the image.
+     * @return Dimensions of the image.
+     * @throws Exception if initialisation fails.
+     */
+    fun init(context: Context, provider: InputProvider): Point
+
+    /**
+     * Decode a region of the image with the given sample size. This method is called off the UI
+     * thread so it can safely load the image on the current thread. It is called from
+     * [android.os.AsyncTask]s running in an executor that may have multiple threads, so
+     * implementations must be thread safe. Adding `synchronized` to the method signature
+     * is the simplest way to achieve this, but bear in mind the [.recycle] method can be
+     * called concurrently.
+     *
+     * @param sRect      Source image rectangle to decode.
+     * @param sampleSize Sample size.
+     * @return The decoded region. It is safe to return null if decoding fails.
+     */
+    fun decodeRegion(sRect: Rect, sampleSize: Int): Bitmap
+
+    /**
+     * Status check. Should return false before initialisation and after recycle.
+     *
+     * @return true if the decoder is ready to be used.
+     */
+    val isReady: Boolean
+
+    /**
+     * This method will be called when the decoder is no longer required. It should clean up any
+     * resources still in use.
+     */
+    fun recycle()
+}

app/src/main/kotlin/com/davemorrissey/labs/subscaleview/decoder/ImageDecoder.kt

@@ -0,0 +1,58 @@
+package com.davemorrissey.labs.subscaleview.decoder
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Point
+import android.graphics.Rect
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import com.davemorrissey.labs.subscaleview.provider.InputProvider
+
+class ImageDecoder(private val cropBorders: Boolean, bitmapConfig: Bitmap.Config? = null) : Decoder {
+    init {
+        val globalBitmapConfig = SubsamplingScaleImageView.preferredBitmapConfig
+    }
+
+    /**
+     * Initialise the decoder. When possible, perform initial setup work once in this method. The
+     * dimensions of the image must be returned.
+     *
+     * @param context  Application context. A reference may be held, but must be cleared on recycle.
+     * @param provider Provider of the image.
+     * @return Dimensions of the image.
+     * @throws Exception if initialisation fails.
+     */
+    override fun init(context: Context, provider: InputProvider): Point {
+        TODO()
+    }
+
+    /**
+     * Decode a region of the image with the given sample size. This method is called off the UI
+     * thread so it can safely load the image on the current thread. It is called from
+     * [android.os.AsyncTask]s running in an executor that may have multiple threads, so
+     * implementations must be thread safe. Adding `synchronized` to the method signature
+     * is the simplest way to achieve this, but bear in mind the [.recycle] method can be
+     * called concurrently.
+     *
+     * @param sRect      Source image rectangle to decode.
+     * @param sampleSize Sample size.
+     * @return The decoded region. It is safe to return null if decoding fails.
+     */
+    override fun decodeRegion(sRect: Rect, sampleSize: Int): Bitmap {
+        TODO()
+    }
+
+    /**
+     * Status check. Should return false before initialisation and after recycle.
+     *
+     * @return true if the decoder is ready to be used.
+     */
+    override val isReady: Boolean = TODO()
+
+    /**
+     * This method will be called when the decoder is no longer required. It should clean up any
+     * resources still in use.
+     */
+    override fun recycle() {
+        TODO()
+    }
+}

app/src/main/kotlin/com/davemorrissey/labs/subscaleview/provider/InputProvider.kt

@@ -0,0 +1,3 @@
+package com.davemorrissey.labs.subscaleview.provider
+
+interface InputProvider

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

@@ -20,7 +20,6 @@ import android.app.Application
 import android.content.ComponentCallbacks2
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.LruCache
-import androidx.compose.runtime.snapshots.Snapshot
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.coroutineScope
 import coil.ImageLoaderFactory
@@ -50,13 +49,10 @@ import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
 import com.hippo.ehviewer.util.isAtLeastP
 import com.hippo.ehviewer.util.isAtLeastQ
-import com.hippo.ehviewer.util.isAtLeastS
 import com.hippo.ehviewer.util.isCronetSupported
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
 import eu.kanade.tachiyomi.network.interceptor.UncaughtExceptionInterceptor
 import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.lang.withUIContext
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.launch
 import moe.tarsin.kt.unreachable
 import okhttp3.AsyncDns
@@ -72,12 +68,7 @@ class EhApplication : Application(), ImageLoaderFactory {
     override fun onCreate() {
         // Initialize Settings on first access
         lifecycleScope.launchIO {
-            val mode = Settings.theme
-            if (!isAtLeastS) {
-                withUIContext {
-                    AppCompatDelegate.setDefaultNightMode(mode)
-                }
-            }
+            AppCompatDelegate.setDefaultNightMode(Settings.theme)
         }
         lifecycle.addObserver(lockObserver)
         val handler = Thread.getDefaultUncaughtExceptionHandler()
@@ -119,11 +110,6 @@ class EhApplication : Application(), ImageLoaderFactory {
             }
         }
         cleanObsoleteCache(this)
-        if (BuildConfig.DEBUG) {
-            Snapshot.registerApplyObserver { anies, _ ->
-                logcat { anies.toString() }
-            }
-        }
     }
 
     private suspend fun cleanupDownload() {

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

@@ -130,7 +130,7 @@ object EhDB {
         deleteGalleryInfo(galleryInfo)
     }
 
-    suspend fun removeLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun removeLocalFavorites(galleryInfoList: List<BaseGalleryInfo>) {
         galleryInfoList.forEach {
             removeLocalFavorites(it)
         }
@@ -146,7 +146,7 @@ object EhDB {
         db.localFavoritesDao().upsert(LocalFavoriteInfo(galleryInfo.gid))
     }
 
-    suspend fun putLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun putLocalFavorites(galleryInfoList: List<BaseGalleryInfo>) {
         galleryInfoList.forEach {
             putLocalFavorites(it)
         }
@@ -195,7 +195,7 @@ object EhDB {
         db.historyDao().upsert(HistoryInfo(galleryInfo.gid))
     }
 
-    suspend fun updateFavoriteSlot(gid: Long, slot: Int) {
+    suspend fun modifyHistoryInfoFavslotNonRefresh(gid: Long, slot: Int) {
         val dao = db.galleryDao()
         dao.load(gid)?.let {
             it.favoriteSlot = slot
@@ -292,7 +292,7 @@ object EhDB {
             }
             runCatching {
                 val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
-                DownloadManager.addDownload(downloadInfoList)
+                DownloadManager.addDownload(downloadInfoList, false)
             }
             runCatching {
                 val historyInfoList = oldDB.historyDao().list()

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

@@ -2,13 +2,6 @@
 
 package com.hippo.ehviewer
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisallowComposableCalls
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.remember
 import com.hippo.ehviewer.client.CHROME_USER_AGENT
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
@@ -20,78 +13,9 @@ import kotlinx.coroutines.flow.asFlow
 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()
-    return flow.collectAsState(transform(init))
-}
-
-@Stable
-@Composable
-fun <T> PrefDelegate<T>.collectAsState(): State<T> {
-    val flow = remember { valueFlow() }
-    val init = getValue()
-    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)
-    return remember {
-        object : MutableState<T> {
-            override var value: T
-                get() = readOnly.value
-                set(value) {
-                    setValue(value)
-                }
-            override fun component1() = TODO()
-            override fun component2() = TODO()
-        }
-    }
-}
-
 object Settings : DataStorePreferences(null) {
     private const val KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations"
 
@@ -101,13 +25,6 @@ object Settings : DataStorePreferences(null) {
     var favCount by intArrayPref("fav_count", 10).emitTo(_favFlow)
     var favCloudCount by intPref("fav_cloud", 0).emitTo(_favFlow)
 
-    val listMode = intPref("list_mode_2", 0)
-    val detailSize = intPref("detail_size_2", 0)
-    val thumbColumns = intPref("thumb_columns", 3)
-    val listThumbSize = intPref("list_tile_size", 40)
-    val meteredNetworkWarning = boolPref("cellular_network_warning", false)
-    val predictiveNavAnim = boolPref("predictive_nav_anim", true)
-
     val needSignInFlow: Flow<Boolean>
     var downloadScheme by stringOrNullPref("image_scheme", null)
     var downloadAuthority by stringOrNullPref("image_authority", null)
@@ -121,6 +38,8 @@ object Settings : DataStorePreferences(null) {
     var preloadImage by intPref("preload_image_2", 5)
     var downloadTimeout by intPref("download_timeout", 60)
     var theme by intPref("theme_2", -1).observed { updateWhenThemeChanges() }
+    var listMode by intPref("list_mode_2", 0)
+    var detailSize by intPref("detail_size_2", 0)
     var thumbResolution by intPref("thumb_resolution_2", 0)
     var readCacheSize by intPref("read_cache_size_2", 640)
     var launchPage by intPref("launch_page_2", 0)
@@ -132,6 +51,7 @@ object Settings : DataStorePreferences(null) {
     var showJpnTitle by boolPref("show_jpn_title", false)
     var showGalleryPages by boolPref("show_gallery_pages", true)
     var showTagTranslations by boolPref(KEY_SHOW_TAG_TRANSLATIONS, false).observed { updateWhenTagTranslationChanges() }
+    var meteredNetworkWarning by boolPref("cellular_network_warning", false)
     var appLinkVerifyTip by boolPref("app_link_verify_tip", false)
     var enabledSecurity by boolPref("enable_secure", false)
     var useCIUpdateChannel by boolPref("ci_update_channel", false)
@@ -148,10 +68,12 @@ object Settings : DataStorePreferences(null) {
     var preloadThumbAggressively by boolPref("preload_thumb_aggressively", false)
     var downloadOriginImage by boolPref("download_origin_image", false)
     var enableCronet by boolPref("enable_cronet", true)
+    var thumbSizeDp by intPref("thumb_size_", 120)
     var recentFavCat by intPref("recent_fav_cat", FavListUrlBuilder.FAV_CAT_LOCAL)
     var defaultFavSlot by intPref("default_favorite_slot", -2)
     var securityDelay by intPref("require_unlock_delay", 0)
     var clipboardTextHashCode by intPref("clipboard_text_hash_code", 0)
+    var listThumbSize by intPref("list_tile_size", 40)
     var searchCategory by intPref("search_pref", EhUtils.ALL_CATEGORY)
     var requestNewsTimerHour by intPref("request_news_timer_hour", -1)
     var requestNewsTimerMinute by intPref("request_news_timer_minute", -1)
@@ -165,10 +87,6 @@ object Settings : DataStorePreferences(null) {
     var language by stringPref("app_language", "system").observed { updateWhenLocaleChanges() }
     var lastDawnDay by longPref("last_dawn_day", 0)
     var lastUpdateDay by longPref("last_update_day", 0)
-    var favDialogTheta by floatPref("fav_select_dialog_delta", 0F)
-
-    // TODO: Remove this after swipe gestures are correctly handled in compose
-    var touchSlopFactor by intPref("touch_slop", 3)
 
     init {
         if ("CN" == Locale.getDefault().country) {

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

@@ -1,6 +1,5 @@
 package com.hippo.ehviewer
 
-import android.app.UiModeManager
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY
 import androidx.core.os.LocaleListCompat
@@ -9,7 +8,6 @@ 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 kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -19,7 +17,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 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) } }
@@ -47,14 +44,6 @@ fun updateWhenKeepMediaStatusChanges() {
 fun updateWhenThemeChanges() {
     collectScope.launch {
         delay(100) // Avoid recompose being cancelled
-        if (isAtLeastS) {
-            val mode = when (Settings.theme) {
-                AppCompatDelegate.MODE_NIGHT_NO -> UiModeManager.MODE_NIGHT_NO
-                AppCompatDelegate.MODE_NIGHT_YES -> UiModeManager.MODE_NIGHT_YES
-                else -> UiModeManager.MODE_NIGHT_AUTO
-            }
-            uiModeManager.setApplicationNightMode(mode)
-        }
         AppCompatDelegate.setDefaultNightMode(Settings.theme)
     }
 }
@@ -62,7 +51,7 @@ fun updateWhenThemeChanges() {
 fun updateWhenAmoledModeChanges() {
     collectScope.launch {
         delay(100) // Avoid recompose being cancelled
-        AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_AUTO_BATTERY) // Trigger onNightModeChanged
+        AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_AUTO_BATTERY)
         AppCompatDelegate.setDefaultNightMode(Settings.theme)
     }
 }

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

@@ -21,7 +21,6 @@ import arrow.fx.coroutines.parZip
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.InsufficientFundsException
@@ -48,7 +47,6 @@ import com.hippo.ehviewer.client.parser.VoteTagParser
 import com.hippo.ehviewer.cronet.awaitBodyFully
 import com.hippo.ehviewer.cronet.cronetRequest
 import com.hippo.ehviewer.cronet.execute
-import com.hippo.ehviewer.cronet.withRequestBody
 import com.hippo.ehviewer.dailycheck.showEventNotification
 import com.hippo.ehviewer.dailycheck.today
 import com.hippo.ehviewer.util.AppConfig
@@ -61,7 +59,6 @@ import java.nio.ByteBuffer
 import kotlin.math.ceil
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
-import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.add
 import kotlinx.serialization.json.addJsonArray
 import kotlinx.serialization.json.put
@@ -71,7 +68,6 @@ import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
 import okhttp3.Request
-import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.asRequestBody
 import org.jsoup.Jsoup
 import splitties.init.appCtx
@@ -107,7 +103,7 @@ private fun rethrowExactly(code: Int, body: String, e: Throwable): Nothing {
         throw StatusCodeException(code)
     }
 
-    if (e is ParseException || e is SerializationException) {
+    if (e is ParseException) {
         if ("<" !in body) {
             throw EhException(body)
         } else {
@@ -120,52 +116,26 @@ private fun rethrowExactly(code: Int, body: String, e: Throwable): Nothing {
     throw e
 }
 
-val httpContentPool = DirectByteBufferPool(8, 0x80000)
+val httpContentPool = DirectByteBufferPool(16, 0x20000)
 
-suspend fun <T> fetchCompat(
-    url: String,
-    referer: String? = null,
-    origin: String? = null,
-    reqBody: RequestBody? = null,
-    parser: suspend (ByteBuffer) -> T,
-): T {
-    Log.d(TAG, url)
-    fun commonChecks(body: ByteBuffer) {
-        // Check sad panda(without panda)
-        if (!body.hasRemaining()) {
-            if (EhUtils.isExHentai) {
-                throw EhException("Sad Panda\n(without panda)")
-            } else {
-                throw EhException("IP banned")
-            }
-        }
-    }
+suspend inline fun <T> fetchCompat(url: String, referer: String? = null, crossinline parser: (ByteBuffer) -> T): T {
     return if (isCronetSupported) {
-        cronetRequest(url, referer, origin) {
-            reqBody?.let { withRequestBody(it) }
-        }.execute {
-            @Suppress("NewApi")
-            val code = it.httpStatusCode
-            if (code >= 400) {
-                throw StatusCodeException(code)
-            }
+        cronetRequest(url, referer).execute {
             httpContentPool.useInstance { buffer ->
-                awaitBodyFully(buffer)
+                awaitBodyFully {
+                    buffer.put(it)
+                }
                 buffer.flip()
-                commonChecks(buffer)
                 parser(buffer)
             }
         }
     } else {
-        ehRequest(url, referer, origin) {
-            reqBody?.let { post(it) }
-        }.execute {
+        ehRequest(url, referer).execute {
             httpContentPool.useInstance { buffer ->
                 while (true) {
                     if (body.source().read(buffer) == -1) break
                 }
                 buffer.flip()
-                commonChecks(buffer)
                 parser(buffer)
             }
         }
@@ -199,7 +169,7 @@ object EhEngine {
 
     suspend fun getTorrentList(url: String, gid: Long, token: String?): TorrentResult {
         val referer = EhUrl.getGalleryDetailUrl(gid, token)
-        return fetchCompat(url, referer, parser = TorrentParser::parse)
+        return fetchCompat(url, referer, TorrentParser::parse)
     }
 
     suspend fun getArchiveList(url: String, gid: Long, token: String?) = ehRequest(url, EhUrl.getGalleryDetailUrl(gid, token))
@@ -243,7 +213,8 @@ object EhEngine {
         return ehRequest(url, referer).executeAndParsingWith(GalleryPageParser::parse)
     }
 
-    suspend fun getGalleryList(url: String) = fetchCompat(url, EhUrl.referer, parser = GalleryListParser::parse)
+    suspend fun getGalleryList(url: String) = ehRequest(url, EhUrl.referer)
+        .executeAndParsingWith(GalleryListParser::parse)
         .apply { fillGalleryList(galleryInfoList, url, true) }
         .takeUnless { it.galleryInfoList.isEmpty() } ?: GalleryListParser.emptyResult
 
@@ -259,7 +230,8 @@ object EhEngine {
         GalleryDetailParser.parsePreviewList(this) to GalleryDetailParser.parsePreviewPages(this)
     }
 
-    suspend fun getFavorites(url: String) = fetchCompat(url, EhUrl.referer, parser = FavoritesParser::parse)
+    suspend fun getFavorites(url: String) = ehRequest(url, EhUrl.referer)
+        .executeAndParsingWith(FavoritesParser::parse)
         .apply { fillGalleryList(galleryInfoList, url) }
 
     suspend fun signIn(username: String, password: String): String {
@@ -278,13 +250,13 @@ object EhEngine {
         }.executeAndParsingWith(SignInParser::parse)
     }
 
-    suspend fun commentGallery(url: String, comment: String, id: Long = -1) = ehRequest(url, url, EhUrl.origin) {
+    suspend fun commentGallery(url: String, comment: String, id: String?) = ehRequest(url, url, EhUrl.origin) {
         formBody {
-            if (id == -1L) {
+            if (id == null) {
                 add("commenttext_new", comment)
             } else {
                 add("commenttext_edit", comment)
-                add("edit_comment", id.toString())
+                add("edit_comment", id)
             }
         }
     }.executeAndParsingWith {
@@ -296,21 +268,31 @@ object EhEngine {
         GalleryDetailParser.parseComments(document)
     }
 
-    suspend fun modifyFavorites(gid: Long, token: String?, dstCat: Int = -1, note: String = "") {
+    /**
+     * @param dstCat -1 for delete, 0 - 9 for cloud favorite, others throw Exception
+     * @param note   max 250 characters
+     */
+    suspend fun modifyFavorites(
+        gid: Long,
+        token: String?,
+        dstCat: Int = -1,
+        note: String = "",
+    ) {
         val catStr: String = when (dstCat) {
             -1 -> "favdel"
             in 0..9 -> dstCat.toString()
             else -> throw EhException("Invalid dstCat: $dstCat")
         }
         val url = EhUrl.getAddFavorites(gid, token)
-        val body = formBody {
-            add("favcat", catStr)
-            add("favnote", note)
-            // apply=Add+to+Favorites is not necessary, just use apply=Apply+Changes all the time
-            add("apply", "Apply Changes")
-            add("update", "1")
-        }
-        fetchCompat(url, url, EhUrl.origin, body) { }
+        return ehRequest(url, url, EhUrl.origin) {
+            formBody {
+                add("favcat", catStr)
+                add("favnote", note)
+                // apply=Add+to+Favorites is not necessary, just use apply=Apply+Changes all the time
+                add("apply", "Apply Changes")
+                add("update", "1")
+            }
+        }.executeAndParsingWith { }
     }
 
     suspend fun downloadArchive(
@@ -363,24 +345,18 @@ object EhEngine {
         }
     }.executeAndParsingWith(HomeParser::parseResetLimits)
 
-    suspend fun modifyFavorites(gidArray: LongArray, srcCat: Int, dstCat: Int): FavoritesParser.Result {
-        val url = ehUrl {
-            addPathSegments(EhUrl.FAV_PATH)
-            if (FavListUrlBuilder.isValidFavCat(srcCat)) {
-                addQueryParameter("favcat", srcCat.toString())
-            }
-        }.toString()
+    suspend fun modifyFavorites(url: String, gidArray: LongArray, dstCat: Int): FavoritesParser.Result {
         val catStr: String = when (dstCat) {
             -1 -> "delete"
             in 0..9 -> "fav$dstCat"
             else -> throw EhException("Invalid dstCat: $dstCat")
         }
-        val body = formBody {
-            add("ddact", catStr)
-            gidArray.forEach { add("modifygids[]", it.toString()) }
-        }
-        return fetchCompat(url, url, EhUrl.origin, body, FavoritesParser::parse)
-            .apply { fillGalleryList(galleryInfoList, url) }
+        return ehRequest(url, url, EhUrl.origin) {
+            formBody {
+                add("ddact", catStr)
+                gidArray.forEach { add("modifygids[]", it.toString()) }
+            }
+        }.executeAndParsingWith(FavoritesParser::parse).apply { fillGalleryList(galleryInfoList, url) }
     }
 
     suspend fun getGalleryPageApi(
@@ -419,23 +395,22 @@ object EhEngine {
         }
     }.executeAndParsingWith(String::parseAs)
 
-    suspend fun fillGalleryListByApi(galleryInfoList: List<GalleryInfo>, referer: String) =
-        galleryInfoList.chunked(MAX_REQUEST_SIZE).parMap(concurrency = Settings.multiThreadDownload) {
-            ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
-                jsonBody {
-                    put("method", "gdata")
-                    array("gidlist") {
-                        it.forEach {
-                            addJsonArray {
-                                add(it.gid)
-                                add(it.token)
-                            }
+    suspend fun fillGalleryListByApi(galleryInfoList: List<GalleryInfo>, referer: String) = galleryInfoList.chunked(MAX_REQUEST_SIZE).parMap {
+        ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
+            jsonBody {
+                put("method", "gdata")
+                array("gidlist") {
+                    it.forEach {
+                        addJsonArray {
+                            add(it.gid)
+                            add(it.token)
                         }
                     }
-                    put("namespace", 1)
                 }
-            }.executeAndParsingWith { GalleryApiParser.parse(this, it) }
-        }
+                put("namespace", 1)
+            }
+        }.executeAndParsingWith { GalleryApiParser.parse(this, it) }
+    }
 
     suspend fun voteComment(
         apiUid: Long,
@@ -491,19 +466,15 @@ object EhEngine {
     /**
      * @param image Must be jpeg
      */
-    suspend fun imageSearch(image: File, uss: Boolean, osc: Boolean) = fetchCompat(
-        EhUrl.imageSearchUrl,
-        EhUrl.referer,
-        EhUrl.origin,
+    suspend fun imageSearch(image: File, uss: Boolean, osc: Boolean) = ehRequest(EhUrl.imageSearchUrl, EhUrl.referer, EhUrl.origin) {
         multipartBody {
             setType(MultipartBody.FORM)
             addFormDataPart("sfile", "a.jpg", image.asRequestBody(MEDIA_TYPE_JPEG))
             if (uss) addFormDataPart("fs_similar", "on")
             if (osc) addFormDataPart("fs_covers", "on")
             addFormDataPart("f_sfile", "File Search")
-        },
-        parser = GalleryListParser::parse,
-    ).apply { fillGalleryList(galleryInfoList, EhUrl.imageSearchUrl) }
+        }
+    }.executeAndParsingWith(GalleryListParser::parse).apply { fillGalleryList(galleryInfoList, EhUrl.imageSearchUrl) }
 
     private suspend fun fillGalleryList(list: MutableList<BaseGalleryInfo>, url: String, filter: Boolean = false) {
         // Filter title and uploader
@@ -530,7 +501,7 @@ object EhEngine {
         if (filter) list.removeAllSuspend { EhFilter.filterUploader(it) || EhFilter.filterTag(it) || EhFilter.filterTagNamespace(it) }
     }
 
-    suspend fun addFavorites(galleryList: List<Pair<Long, String>>, dstCat: Int) {
-        galleryList.parMap(concurrency = Settings.multiThreadDownload) { (gid, token) -> modifyFavorites(gid, token, dstCat) }
+    suspend fun modifyFavoritesRange(galleryList: List<Pair<Long, String>>, dstCat: Int) {
+        galleryList.forEach { (gid, token) -> modifyFavorites(gid, token, dstCat) }
     }
 }

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

@@ -52,10 +52,9 @@ inline fun ehRequest(url: String, referer: String? = null, origin: String? = nul
     origin?.let { addHeader("Origin", it) }
 }.apply(builder).build()
 
-inline fun formBody(builder: FormBody.Builder.() -> Unit) = FormBody.Builder().apply(builder).build()
 inline fun Request.Builder.formBody(builder: FormBody.Builder.() -> Unit) = post(FormBody.Builder().apply(builder).build())
 
-inline fun multipartBody(builder: MultipartBody.Builder.() -> Unit) = MultipartBody.Builder().apply(builder).build()
+inline fun Request.Builder.multipartBody(builder: MultipartBody.Builder.() -> Unit) = post(MultipartBody.Builder().apply(builder).build())
 
 val MEDIA_TYPE_JSON: MediaType = "application/json; charset=utf-8".toMediaType()
 

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

@@ -16,13 +16,12 @@
 package com.hippo.ehviewer.client
 
 import android.annotation.SuppressLint
-import androidx.compose.material3.MaterialTheme
+import android.content.Context
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import arrow.core.memoize
+import androidx.compose.ui.platform.LocalContext
+import com.google.android.material.R
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.color.utilities.Hct
 import com.google.android.material.color.utilities.MathUtils
 import com.hippo.ehviewer.Settings
@@ -103,19 +102,17 @@ object EhUtils {
     }
 
     @SuppressLint("RestrictedApi")
-    val harmonizeWithRole = { primaryContainer: Int, src: Int ->
+    fun harmonizeWithRole(context: Context, src: Int): Int {
+        val primary = MaterialColors.getColor(context, R.attr.colorPrimaryContainer, "EhUtils")
         val fromHct = Hct.fromInt(src)
-        val toHct = Hct.fromInt(primaryContainer)
+        val toHct = Hct.fromInt(primary)
         val differenceDegrees = MathUtils.differenceDegrees(fromHct.hue, toHct.hue)
         val rotationDegrees = minOf(differenceDegrees * 0.5, 15.0)
         val outputHue = MathUtils.sanitizeDegreesDouble(fromHct.hue + rotationDegrees * MathUtils.rotationDirection(fromHct.hue, toHct.hue))
-        Hct.from(outputHue, toHct.chroma, toHct.tone).toInt()
-    }.memoize()
+        return Hct.from(outputHue, toHct.chroma, toHct.tone).toInt()
+    }
 
-    @Stable
-    @ReadOnlyComposable
-    @Composable
-    fun getCategoryColor(category: Int): Color {
+    private fun getCategoryColor(context: Context, category: Int): Int {
         val primary = when (category) {
             DOUJINSHI -> BG_COLOR_DOUJINSHI
             MANGA -> BG_COLOR_MANGA
@@ -129,15 +126,16 @@ object EhUtils {
             MISC -> BG_COLOR_MISC
             else -> BG_COLOR_UNKNOWN
         }.toInt()
-        val color = if (Settings.harmonizeCategoryColor) {
-            val primaryContainer = MaterialTheme.colorScheme.primaryContainer.toArgb()
-            harmonizeWithRole(primaryContainer, primary)
+        return if (Settings.harmonizeCategoryColor) {
+            harmonizeWithRole(context, primary)
         } else {
             primary
         }
-        return Color(color)
     }
 
+    @Composable
+    fun getCategoryColor(category: Int) = Color(getCategoryColor(LocalContext.current, category))
+
     val categoryTextColor = Color(0xffe6e0e9)
 
     fun signOut() {

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

@@ -16,7 +16,6 @@
 package com.hippo.ehviewer.client.data
 
 import android.os.Parcelable
-import androidx.annotation.Keep
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Ignore
@@ -26,7 +25,7 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @Entity(tableName = "GALLERIES")
-data class BaseGalleryInfo @Keep constructor(
+data class BaseGalleryInfo(
     @PrimaryKey
     @ColumnInfo(name = "GID")
     override var gid: Long = 0,

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

@@ -22,16 +22,16 @@ import com.hippo.ehviewer.client.ehUrl
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class FavListUrlBuilder(
-    val favCat: Int = FAV_CAT_ALL,
-    val keyword: String? = null,
+class FavListUrlBuilder(
+    var mPrev: String? = null,
+    var mNext: String? = null,
     var jumpTo: String? = null,
-    var prev: String? = null,
-    var next: String? = null,
+    var keyword: String? = null,
+    var favCat: Int = FAV_CAT_ALL,
 ) : Parcelable {
     fun setIndex(index: String?, isNext: Boolean) {
-        next = index.takeIf { isNext }
-        prev = index.takeUnless { isNext }
+        mNext = index.takeIf { isNext }
+        mPrev = index.takeUnless { isNext }
     }
 
     fun build() = ehUrl {
@@ -42,8 +42,8 @@ data class FavListUrlBuilder(
             addQueryParameter("favcat", "all")
         }
         addQueryParameterIfNotBlank("f_search", keyword)
-        addQueryParameterIfNotBlank("prev", prev)
-        addQueryParameterIfNotBlank("next", next)
+        addQueryParameterIfNotBlank("prev", mPrev)
+        addQueryParameterIfNotBlank("next", mNext)
         addQueryParameterIfNotBlank("seek", jumpTo)
     }.toString()
 

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

@@ -0,0 +1,38 @@
+/*
+ * 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 android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+class GalleryApiInfo(
+    var gid: Long = 0,
+    var token: String? = null,
+    var archiverKey: String? = null,
+    var title: String? = null,
+    var titleJpn: String? = null,
+    var category: Int = 0,
+    var thumb: String? = null,
+    var uploader: String? = null,
+    var posted: Long = 0,
+    var filecount: Int = 0,
+    var filesize: Long = 0,
+    var expunged: Boolean = false,
+    var rating: Float = 0f,
+    var torrentcount: Int = 0,
+    var tags: Array<String>?,
+) : Parcelable

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

@@ -19,18 +19,19 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class GalleryComment(
-    val id: Long,
-    val score: Int,
-    val editable: Boolean,
-    val voteUpAble: Boolean,
-    val voteUpEd: Boolean,
-    val voteDownAble: Boolean,
-    val voteDownEd: Boolean,
-    val uploader: Boolean,
-    val voteState: String?,
-    val time: Long,
-    val user: String?,
-    val comment: String,
-    val lastEdited: Long,
+class GalleryComment(
+    // 0 for uploader comment. can't vote
+    var id: Long = 0,
+    var score: Int = 0,
+    var editable: Boolean = false,
+    var voteUpAble: Boolean = false,
+    var voteUpEd: Boolean = false,
+    var voteDownAble: Boolean = false,
+    var voteDownEd: Boolean = false,
+    var uploader: Boolean = false,
+    var voteState: String? = null,
+    var time: Long = 0,
+    var user: String? = null,
+    var comment: String? = null,
+    var lastEdited: Long = 0,
 ) : Parcelable

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

@@ -19,7 +19,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class GalleryCommentList(
-    val comments: List<GalleryComment>,
+class GalleryCommentList(
+    var comments: Array<GalleryComment>,
     val hasMore: Boolean,
 ) : Parcelable

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

@@ -37,7 +37,7 @@ private val LANGUAGES = arrayOf(
 )
 
 @Parcelize
-data class GalleryDetail(
+class GalleryDetail(
     val galleryInfo: BaseGalleryInfo = BaseGalleryInfo(),
     var apiUid: Long = -1L,
     var apiKey: String? = null,
@@ -51,7 +51,7 @@ data class GalleryDetail(
     var size: String? = null,
     var favoriteCount: Int = 0,
     var ratingCount: Int = 0,
-    val tags: List<GalleryTagGroup>,
+    val tags: Array<GalleryTagGroup>,
     var comments: GalleryCommentList,
     val previewPages: Int,
     val previewList: List<GalleryPreview>,

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

@@ -16,7 +16,6 @@
 package com.hippo.ehviewer.client.data
 
 import java.util.regex.Pattern
-import moe.tarsin.kt.unreachable
 
 interface GalleryInfo {
     var gid: Long
@@ -134,15 +133,3 @@ interface GalleryInfo {
         const val LOCAL_FAVORITED = -1
     }
 }
-
-fun GalleryInfo.findBaseInfo(): BaseGalleryInfo {
-    return when (this) {
-        is BaseGalleryInfo -> this
-        is GalleryDetail -> galleryInfo
-        else -> unreachable()
-    }
-}
-
-fun GalleryInfo.asGalleryDetail(): GalleryDetail? {
-    return this as? GalleryDetail
-}

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

@@ -19,7 +19,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class GalleryTagGroup(
+class GalleryTagGroup(
     val groupName: String,
-    private val tagList: MutableList<String> = mutableListOf(),
-) : Parcelable, MutableList<String> by tagList
+    private val mTagList: MutableList<String> = mutableListOf(),
+) : Parcelable, MutableList<String> by mTagList

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

@@ -35,7 +35,6 @@ data class ListUrlBuilder(
     var mode: Int = MODE_NORMAL,
     private var mPrev: String? = null,
     var mNext: String? = null,
-    // Reset to null after initial loading
     var mJumpTo: String? = null,
     var category: Int = EhUtils.NONE,
     private var mKeyword: String? = null,
@@ -49,6 +48,23 @@ data class ListUrlBuilder(
     var isOnlySearchCovers: Boolean = false,
 ) : Parcelable {
 
+    fun reset() {
+        mode = MODE_NORMAL
+        mPrev = null
+        mNext = null
+        mJumpTo = null
+        this.category = EhUtils.NONE
+        mKeyword = null
+        advanceSearch = -1
+        minRating = -1
+        pageFrom = -1
+        pageTo = -1
+        imagePath = null
+        isUseSimilarityScan = false
+        isOnlySearchCovers = false
+        hash = null
+    }
+
     fun setIndex(index: String?, isNext: Boolean = true) {
         mNext = index?.takeIf { isNext }
         mPrev = index?.takeUnless { isNext }
@@ -64,7 +80,8 @@ data class ListUrlBuilder(
             mKeyword = keyword
         }
 
-    constructor(q: QuickSearch) : this() {
+    fun set(q: QuickSearch) {
+        reset()
         mode = q.mode
         this.category = q.category
         mKeyword = q.keyword
@@ -117,8 +134,9 @@ data class ListUrlBuilder(
     /**
      * @param query xxx=yyy&mmm=nnn
      */
-    constructor(query: String?) : this() {
+    fun setQuery(query: String?) {
         // TODO page
+        reset()
         if (query.isNullOrEmpty()) {
             return
         }
@@ -356,7 +374,9 @@ data class ListUrlBuilder(
                 buildString {
                     append(EhUrl.HOST_E)
                     append("toplist.php?tl=")
-                    append(mKeyword!!)
+                    mKeyword.orEmpty().let {
+                        append(encodeUTF8(it))
+                    }
                     mJumpTo?.let {
                         append("&p=").append(it)
                     }

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

@@ -2,16 +2,16 @@ package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.NotLoggedInException
 import com.hippo.ehviewer.client.exception.ParseException
-import java.nio.ByteBuffer
-import moe.tarsin.coroutines.runSuspendCatching
 
 object FavoritesParser {
-    suspend fun parse(body: ByteBuffer): Result {
+    suspend fun parse(body: String): Result {
+        if (body.contains("This page requires you to log on.</p>")) {
+            throw NotLoggedInException()
+        }
         val catArray = arrayOfNulls<String>(10)
-        val countArray = runSuspendCatching {
-            parseFav(body, favCat = catArray).also { check(it.isNotEmpty()) }
+        val countArray = runCatching {
+            parseFav(body, catArray).also { check(it.isNotEmpty()) }
         }.getOrElse {
-            if (it is RuntimeException && it.message == "Not logged in!") throw NotLoggedInException()
             throw ParseException("Parse favorites error", it)
         }
         val result = GalleryListParser.parse(body)
@@ -29,4 +29,4 @@ object FavoritesParser {
     }
 }
 
-private external fun parseFav(body: ByteBuffer, limit: Int = body.limit(), favCat: Array<String?>): IntArray
+private external fun parseFav(body: String, favCat: Array<String?>): IntArray

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

@@ -76,7 +76,8 @@ object GalleryDetailParser {
     private val PATTERN_NEWER_DATE = Regex(", added (.+?)<br />")
     private val PATTERN_FAVORITE_SLOT =
         Regex("/fav.png\\); background-position:0px -(\\d+)px")
-    private val EMPTY_GALLERY_COMMENT_LIST = GalleryCommentList(emptyList(), false)
+    private val EMPTY_GALLERY_TAG_GROUP_ARRAY = arrayOf<GalleryTagGroup>()
+    private val EMPTY_GALLERY_COMMENT_ARRAY = GalleryCommentList(arrayOf(), false)
     private val WEB_COMMENT_DATE_FORMAT = DateTimeFormatter
         .ofPattern("dd MMMM yyyy, HH:mm", Locale.US).withZone(ZoneOffset.UTC)
     private const val OFFENSIVE_STRING =
@@ -307,7 +308,7 @@ object GalleryDetailParser {
     /**
      * Parse tag groups with html parser
      */
-    private fun parseTagGroups(document: Document): List<GalleryTagGroup> {
+    private fun parseTagGroups(document: Document): Array<GalleryTagGroup> {
         return try {
             val taglist = document.getElementById("taglist")!!
             val tagGroups = taglist.child(0).child(0).children()
@@ -315,69 +316,73 @@ object GalleryDetailParser {
         } catch (e: Throwable) {
             ExceptionUtils.throwIfFatal(e)
             e.printStackTrace()
-            emptyList()
+            EMPTY_GALLERY_TAG_GROUP_ARRAY
         }
     }
 
-    private fun parseTagGroups(trs: Elements): List<GalleryTagGroup> {
+    private fun parseTagGroups(trs: Elements): Array<GalleryTagGroup> {
         return try {
-            trs.mapNotNull { parseTagGroup(it) }
+            trs.mapNotNull { parseTagGroup(it) }.toTypedArray()
         } catch (e: Throwable) {
             ExceptionUtils.throwIfFatal(e)
             e.printStackTrace()
-            emptyList()
+            EMPTY_GALLERY_TAG_GROUP_ARRAY
         }
     }
 
     private suspend fun parseComment(element: Element): GalleryComment? {
         return try {
+            val comment = GalleryComment()
             // Id
             val a = element.previousElementSibling()
             val name = a!!.attr("name")
-            val id = name trimAnd { substring(1).toInt().toLong() }
+            comment.id = name trimAnd { substring(1).toInt().toLong() }
             // Editable, vote up and vote down
             val c4 = element.getElementsByClass("c4").first()
-            var voteUpAble = false
-            var voteUpEd = false
-            var voteDownAble = false
-            var voteDownEd = false
-            var editable = false
-            var uploader = false
             if (null != c4) {
                 if ("Uploader Comment" == c4.text()) {
-                    uploader = true
+                    comment.uploader = true
                 }
                 for (e in c4.children()) {
                     when (e.text()) {
                         "Vote+" -> {
-                            voteUpAble = true
-                            voteUpEd = e.attr("style").trim().isNotEmpty()
+                            comment.voteUpAble = true
+                            comment.voteUpEd = e.attr("style").trim().isNotEmpty()
                         }
 
                         "Vote-" -> {
-                            voteDownAble = true
-                            voteDownEd = e.attr("style").trim().isNotEmpty()
+                            comment.voteDownAble = true
+                            comment.voteDownEd = e.attr("style").trim().isNotEmpty()
                         }
 
-                        "Edit" -> editable = true
+                        "Edit" -> comment.editable = true
                     }
                 }
             }
             // Vote state
             val c7 = element.getElementsByClass("c7").first()
-            val voteState = c7?.text()?.trim()
+            if (null != c7) {
+                comment.voteState = c7.text().trim()
+            }
             // Score
             val c5 = element.getElementsByClass("c5").first()
-            val score = c5?.children()?.first()?.text()?.trim()?.toIntOrDefault(0) ?: 0
+            if (null != c5) {
+                val es = c5.children()
+                if (!es.isEmpty()) {
+                    comment.score = es[0].text().trim().toIntOrDefault(0)
+                }
+            }
             // time
             val c3 = element.getElementsByClass("c3").first()
             val temp = c3!!.ownText()
-            val (timeStr, user) = if (temp.endsWith(':')) {
-                temp.substring("Posted on ".length, temp.length - " by:".length) to c3.child(0).text()
+            val time = if (temp.endsWith(':')) {
+                // user
+                comment.user = c3.child(0).text()
+                temp.substring("Posted on ".length, temp.length - " by:".length)
             } else {
-                temp.substring("Posted on ".length) to null
+                temp.substring("Posted on ".length)
             }
-            val time = Instant.from(WEB_COMMENT_DATE_FORMAT.parse(timeStr)).toEpochMilli()
+            comment.time = Instant.from(WEB_COMMENT_DATE_FORMAT.parse(time)).toEpochMilli()
             // comment
             val c6 = element.getElementsByClass("c6").first()
             // fix underline support
@@ -386,21 +391,24 @@ object GalleryDetailParser {
                     e.tagName("u")
                 }
             }
-            val commentHtml = c6.html()
+            comment.comment = c6.html()
             // filter comment
-            if (!uploader) {
+            if (!comment.uploader) {
                 val sEhFilter = EhFilter
-                if (score <= Settings.commentThreshold || sEhFilter.filterCommenter(user.orEmpty()) || sEhFilter.filterComment(commentHtml)) {
+                if (comment.score <= Settings.commentThreshold || sEhFilter.filterCommenter(comment.user!!) || sEhFilter.filterComment(comment.comment!!)) {
                     return null
                 }
             }
             // last edited
             val c8 = element.getElementsByClass("c8").first()
-            val lastEdited = c8?.children()?.first()?.run { Instant.from(WEB_COMMENT_DATE_FORMAT.parse(text())).toEpochMilli() } ?: 0
-            GalleryComment(
-                id, score, editable, voteUpAble, voteUpEd, voteDownAble,
-                voteDownEd, uploader, voteState, time, user, commentHtml, lastEdited,
-            )
+            if (c8 != null) {
+                val e = c8.children().first()
+                if (e != null) {
+                    comment.lastEdited =
+                        Instant.from(WEB_COMMENT_DATE_FORMAT.parse(e.text())).toEpochMilli()
+                }
+            }
+            comment
         } catch (e: Throwable) {
             ExceptionUtils.throwIfFatal(e)
             e.printStackTrace()
@@ -430,11 +438,11 @@ object GalleryDetailParser {
                 },
                 chd!!,
             )
-            GalleryCommentList(list, hasMore)
+            GalleryCommentList(list.toTypedArray(), hasMore)
         } catch (e: Throwable) {
             ExceptionUtils.throwIfFatal(e)
             e.printStackTrace()
-            EMPTY_GALLERY_COMMENT_LIST
+            EMPTY_GALLERY_COMMENT_ARRAY
         }
     }
 

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

@@ -1,6 +1,5 @@
 package com.hippo.ehviewer.client.parser
 
-import androidx.annotation.Keep
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
@@ -8,41 +7,34 @@ 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.client.exception.ParseException
-import java.nio.ByteBuffer
-import moe.tarsin.coroutines.runSuspendCatching
 
 object GalleryListParser {
-    suspend fun parse(body: ByteBuffer) = runSuspendCatching {
-        parseGalleryInfoList(body)
-    }.onFailure {
-        if (it is RuntimeException) {
-            if (it.message?.startsWith("Your IP address") == true) {
-                throw EhException(it.message)
-            }
-            if (it.message == "No watched tags!") {
-                throw EhException(R.string.gallery_list_empty_hit_subscription)
-            }
-            if (it.message == "No hits found!") {
-                throw EhException(R.string.gallery_list_empty_hit)
+    suspend fun parse(body: String) = runCatching {
+        parseGalleryInfoList(body).apply {
+            galleryInfoList.onEach {
+                if (it.favoriteSlot == NOT_FAVORITED && EhDB.containLocalFavorites(it.gid)) {
+                    it.favoriteSlot = LOCAL_FAVORITED
+                }
+                it.generateSLang()
             }
         }
+    }.getOrElse {
+        if (body.contains("<p>You do not have any watched tags")) {
+            throw EhException(R.string.gallery_list_empty_hit_subscription)
+        }
+        if (body.contains("No hits found</p>")) {
+            throw EhException(R.string.gallery_list_empty_hit)
+        }
         throw ParseException("Can't parse gallery list", it)
-    }.getOrThrow().apply {
-        galleryInfoList.onEach {
-            if (it.favoriteSlot == NOT_FAVORITED && EhDB.containLocalFavorites(it.gid)) {
-                it.favoriteSlot = LOCAL_FAVORITED
-            }
-            it.generateSLang()
-        }
     }
 
     val emptyResult = GalleryListResult(null, null, arrayListOf())
 }
 
-class GalleryListResult @Keep constructor(
+class GalleryListResult(
     val prev: String?,
     val next: String?,
     val galleryInfoList: ArrayList<BaseGalleryInfo>,
 )
 
-private external fun parseGalleryInfoList(body: ByteBuffer, size: Int = body.limit()): GalleryListResult
+private external fun parseGalleryInfoList(e: String): GalleryListResult

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

@@ -42,7 +42,9 @@ object GalleryListUrlParser {
         }
         val path = url.path ?: return null
         return if (PATH_NORMAL == path || path.isEmpty()) {
-            ListUrlBuilder(url.query)
+            val builder = ListUrlBuilder()
+            builder.setQuery(url.query)
+            builder
         } else if (path.startsWith(PATH_UPLOADER)) {
             parseUploader(path)
         } else if (path.startsWith(PATH_TAG)) {
@@ -55,7 +57,10 @@ object GalleryListUrlParser {
             } catch (e: NumberFormatException) {
                 return null
             }
-            ListUrlBuilder(url.query).also { it.category = category }
+            val builder = ListUrlBuilder()
+            builder.setQuery(url.query)
+            builder.category = category
+            builder
         } else {
             null
         }

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

@@ -1,7 +1,6 @@
 package com.hippo.ehviewer.client.parser
 
 import android.os.Parcelable
-import androidx.annotation.Keep
 import com.hippo.ehviewer.client.exception.InsufficientFundsException
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
@@ -36,6 +35,6 @@ object HomeParser {
 }
 
 @Parcelize
-data class Limits @Keep constructor(val current: Int, val maximum: Int, val resetCost: Int) : Parcelable
+data class Limits(val current: Int, val maximum: Int, val resetCost: Int) : Parcelable
 
 private external fun parseLimit(body: ByteBuffer, limit: Int = body.limit()): Limits

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

@@ -1,6 +1,5 @@
 package com.hippo.ehviewer.client.parser
 
-import androidx.annotation.Keep
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 
@@ -10,7 +9,7 @@ object TorrentParser {
     }.getOrElse { throw ParseException("Can't parse torrent list", it) }
 }
 
-class Torrent @Keep constructor(
+class Torrent(
     val posted: String,
     val size: String,
     val seeds: Int,
@@ -22,6 +21,6 @@ class Torrent @Keep constructor(
 
 fun Torrent.format() = "[$posted] $name [$size] [↑$seeds ↓$peers ✓$downloads]"
 
-typealias TorrentResult = List<Torrent>
+typealias TorrentResult = ArrayList<Torrent>
 
 private external fun parseTorrent(body: ByteBuffer, size: Int = body.limit()): ArrayList<Torrent>

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

@@ -12,13 +12,10 @@ val pool = DirectByteBufferPool(32)
 
 val cronetHttpClientExecutor = EhApplication.baseOkHttpClient.dispatcher.executorService
 
-@Suppress("NewApi")
 suspend inline fun CronetRequest.awaitBodyFully(crossinline callback: (ByteBuffer) -> Unit) {
     return pool.useInstance { buffer ->
         suspendCancellableCoroutine { cont ->
             consumer = {
-                check(it === buffer)
-                buffer.flip()
                 callback(it)
                 buffer.clear()
                 request.read(buffer)
@@ -30,19 +27,6 @@ suspend inline fun CronetRequest.awaitBodyFully(crossinline callback: (ByteBuffe
     }
 }
 
-@Suppress("NewApi")
-suspend inline fun CronetRequest.awaitBodyFully(buffer: ByteBuffer) {
-    return suspendCancellableCoroutine { cont ->
-        consumer = {
-            request.read(buffer)
-            check(buffer.hasRemaining())
-        }
-        onError = { readerCont.resumeWithException(it) }
-        readerCont = cont
-        request.read(buffer)
-    }
-}
-
 suspend inline fun CronetRequest.copyToChannel(chan: FileChannel, crossinline listener: ((Int) -> Unit) = {}) = awaitBodyFully {
     val bytes = chan.write(it)
     listener(bytes)

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

@@ -18,15 +18,6 @@ package com.hippo.ehviewer.download
 import android.net.Uri
 import android.util.Log
 import android.util.SparseLongArray
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisallowComposableCalls
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.snapshots.SnapshotStateList
-import androidx.compose.runtime.toMutableStateList
 import com.google.android.material.math.MathUtils
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
@@ -41,48 +32,51 @@ import com.hippo.ehviewer.spider.readCompatFromUniFile
 import com.hippo.ehviewer.spider.write
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.ConcurrentPool
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.SimpleHandler
 import com.hippo.ehviewer.util.assertNotMainThread
-import com.hippo.ehviewer.util.mapNotNull
 import com.hippo.ehviewer.util.runAssertingNotMainThread
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.lang.withIOContext
+import eu.kanade.tachiyomi.util.lang.withUIContext
+import java.util.LinkedList
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.transform
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.launch
 import splitties.init.appCtx
 import splitties.preferences.edit
 
 object DownloadManager : OnSpiderListener {
     // All download info list
-    val allInfoList = runAssertingNotMainThread { EhDB.getAllDownloadInfo() }.toMutableStateList()
+    val allInfoList: LinkedList<DownloadInfo> = runAssertingNotMainThread { LinkedList(EhDB.getAllDownloadInfo()) }
 
     // All download info map
     private val mAllInfoMap = allInfoList.associateBy { it.gid } as MutableMap<Long, DownloadInfo>
 
     // label and info list map, without default label info list
-    private val map: MutableMap<String?, SnapshotStateList<DownloadInfo>>
+    private val map: MutableMap<String?, LinkedList<DownloadInfo>>
 
     // All labels without default label
-    val labelList = runAssertingNotMainThread { EhDB.getAllDownloadLabelList() }.toMutableStateList()
+    val labelList = runAssertingNotMainThread { EhDB.getAllDownloadLabelList() } as MutableList<DownloadLabel>
 
     // Store download info with default label
-    private val defaultInfoList: SnapshotStateList<DownloadInfo>
+    val defaultInfoList: LinkedList<DownloadInfo>
 
     // Store download info wait to start
-    private val mWaitList = ArrayDeque<DownloadInfo>()
+    private val mWaitList = LinkedList<DownloadInfo>()
     private val mSpeedReminder = SpeedReminder()
+    private var mDownloadInfoListener: DownloadInfoListener? = null
     private val mNotifyTaskPool = ConcurrentPool<NotifyTask?>(5)
     private var mDownloadListener: DownloadListener? = null
     private var mCurrentTask: DownloadInfo? = null
     private var mCurrentSpider: SpiderQueen? = null
 
-    private val mutableNotifyFlow = MutableSharedFlow<DownloadInfo>(extraBufferCapacity = 1)
-    val notifyFlow = mutableNotifyFlow.asSharedFlow()
-
     init {
         assertNotMainThread()
         map = runAssertingNotMainThread {
@@ -93,16 +87,16 @@ object DownloadManager : OnSpiderListener {
                         labelList.add(EhDB.addDownloadLabel(DownloadLabel(label, labelList.size)))
                     }
                 }
-                it.key to it.value.toMutableStateList()
+                it.key to LinkedList(it.value)
             }
-        } as MutableMap<String?, SnapshotStateList<DownloadInfo>>
-        defaultInfoList = map.remove(null) ?: mutableStateListOf()
+        } as MutableMap<String?, LinkedList<DownloadInfo>>
+        defaultInfoList = map.remove(null) ?: LinkedList()
         labelList.forEach { (label) ->
-            map[label] ?: mutableStateListOf<DownloadInfo>().also { map[label] = it }
+            map[label] ?: LinkedList<DownloadInfo>().also { map[label] = it }
         }
     }
 
-    fun getInfoListForLabel(label: String?) = if (label == null) {
+    private fun getInfoListForLabel(label: String?) = if (label == null) {
         defaultInfoList
     } else {
         map[label]
@@ -122,6 +116,8 @@ object DownloadManager : OnSpiderListener {
 
     fun containDownloadInfo(gid: Long) = mAllInfoMap.containsKey(gid)
 
+    fun getLabelDownloadInfoList(label: String?) = map[label]
+
     fun getDownloadInfo(gid: Long) = mAllInfoMap[gid]
 
     fun getDownloadState(gid: Long): Int {
@@ -162,7 +158,7 @@ object DownloadManager : OnSpiderListener {
                 mDownloadListener!!.onStart(info)
             }
             // Notify state update
-            mutableNotifyFlow.tryEmit(info)
+            mDownloadInfoListener?.onUpdate(info)
         }
     }
 
@@ -183,7 +179,7 @@ object DownloadManager : OnSpiderListener {
                 // Update in DB
                 EhDB.putDownloadInfo(info)
                 // Notify state update
-                mutableNotifyFlow.tryEmit(info)
+                mDownloadInfoListener?.onUpdate(info)
                 // Make sure download is running
                 ensureDownload()
             }
@@ -200,10 +196,10 @@ object DownloadManager : OnSpiderListener {
                 Log.e(TAG, "Can't find download info list with label: $label")
                 return
             }
-            list.add(0, info)
+            list.addFirst(info)
 
             // Add to all download list and map
-            allInfoList.add(0, info)
+            allInfoList.addFirst(info)
             mAllInfoMap[galleryInfo.gid] = info
 
             // Add to wait list
@@ -213,7 +209,7 @@ object DownloadManager : OnSpiderListener {
             EhDB.putDownloadInfo(info)
 
             // Notify
-            mutableNotifyFlow.tryEmit(info)
+            mDownloadInfoListener?.onUpdate(info)
             // Make sure download is running
             ensureDownload()
 
@@ -222,71 +218,90 @@ object DownloadManager : OnSpiderListener {
         }
     }
 
-    suspend fun startRangeDownload(gidList: LongArray) {
-        val updateList = gidList.mapNotNull { mAllInfoMap[it] }
-            .filter {
-                when (it.state) {
-                    DownloadInfo.STATE_NONE, DownloadInfo.STATE_FAILED, DownloadInfo.STATE_FINISH -> true
-                    else -> false
-                }
+    suspend fun startRangeDownload(gidList: LongList) {
+        var update = false
+        for (i in 0 until gidList.size) {
+            val gid = gidList[i]
+            val info = mAllInfoMap[gid]
+            if (null == info) {
+                Log.d(TAG, "Can't get download info with gid: $gid")
+                continue
             }
-        if (updateList.isNotEmpty()) {
-            updateList.onEach {
-                it.state = DownloadInfo.STATE_WAIT
-                EhDB.putDownloadInfo(it)
-                mutableNotifyFlow.tryEmit(it)
+            if (info.state == DownloadInfo.STATE_NONE || info.state == DownloadInfo.STATE_FAILED || info.state == DownloadInfo.STATE_FINISH) {
+                update = true
+                // Set state DownloadInfo.STATE_WAIT
+                info.state = DownloadInfo.STATE_WAIT
+                // Add to wait list
+                mWaitList.add(info)
+                // Update in DB
+                EhDB.putDownloadInfo(info)
             }
-            mWaitList.addAll(updateList)
+        }
+        if (update) {
+            // Notify Listener
+            mDownloadInfoListener?.onUpdateAll()
+            // Ensure download
             ensureDownload()
         }
     }
 
-    @Stable
-    @Composable
-    fun collectDownloadState(gid: Long): State<Int> = remember {
-        notifyFlow.transform { if (it.gid == gid) emit(getDownloadState(gid)) }
-    }.collectAsState(getDownloadState(gid))
+    private val callbackFlowScope = CoroutineScope(Dispatchers.IO)
 
-    @Stable
-    @Composable
-    fun collectContainDownloadInfo(gid: Long): State<Boolean> = remember {
-        notifyFlow.transform { if (it.gid == gid) emit(containDownloadInfo(gid)) }
-    }.collectAsState(containDownloadInfo(gid))
+    private val _stateFlow = callbackFlow {
+        val listener = object : DownloadInfoListener {
+            override fun onUpdate(info: DownloadInfo) {
+                trySend(info.gid)
+            }
 
-    @Stable
-    @Composable
-    inline fun <T> updatedDownloadInfo(info: DownloadInfo, crossinline transform: @DisallowComposableCalls DownloadInfo.() -> T): T = remember {
-        notifyFlow.transform { if (it.gid == info.gid) emit(transform(it)) }
-    }.collectAsState(transform(info)).value
+            override fun onUpdateAll() {
+                trySend(0)
+            }
+        }
+        mDownloadInfoListener = listener
+        awaitClose {
+            mDownloadInfoListener = null
+        }
+    }.shareIn(callbackFlowScope, SharingStarted.Eagerly)
+
+    fun stateFlow(gid: Long) = _stateFlow.filter { it == gid }
+
+    fun stateFlow() = _stateFlow
 
     suspend fun startAllDownload() {
-        val updateList = allInfoList.filter {
-            when (it.state) {
-                DownloadInfo.STATE_NONE, DownloadInfo.STATE_FAILED -> true
-                else -> false
+        var update = false
+        // Start all STATE_NONE and STATE_FAILED item
+        for (info in allInfoList) {
+            if (info.state == DownloadInfo.STATE_NONE || info.state == DownloadInfo.STATE_FAILED) {
+                update = true
+                // Set state DownloadInfo.STATE_WAIT
+                info.state = DownloadInfo.STATE_WAIT
+                // Add to wait list
+                mWaitList.add(info)
+                // Update in DB
+                EhDB.putDownloadInfo(info)
             }
         }
-        if (updateList.isNotEmpty()) {
-            updateList.onEach {
-                it.state = DownloadInfo.STATE_WAIT
-                EhDB.putDownloadInfo(it)
-                mutableNotifyFlow.tryEmit(it)
-            }
-            mWaitList.addAll(updateList)
+        if (update) {
+            // Notify Listener
+            mDownloadInfoListener?.onUpdateAll()
+            // Ensure download
             ensureDownload()
         }
     }
 
-    suspend fun addDownload(downloadInfoList: List<DownloadInfo>) {
+    suspend fun addDownload(downloadInfoList: List<DownloadInfo>, notify: Boolean = true) {
         downloadInfoList.filterNot { containDownloadInfo(it.gid) }.forEach { info ->
             // Ensure download state
-            if (DownloadInfo.STATE_WAIT == info.state || DownloadInfo.STATE_DOWNLOAD == info.state) {
+            if (DownloadInfo.STATE_WAIT == info.state ||
+                DownloadInfo.STATE_DOWNLOAD == info.state
+            ) {
                 info.state = DownloadInfo.STATE_NONE
             }
             info.position = allInfoList.size
 
             // Add to label download list
-            val list = getInfoListForLabel(info.label) ?: addLabel(info.label).let { getInfoListForLabel(info.label)!! }
+            val list = getInfoListForLabel(info.label)
+                ?: addLabel(info.label).let { getInfoListForLabel(info.label)!! }
             list.add(info)
             // Sort
             list.sortByPositionDescending()
@@ -301,12 +316,17 @@ object DownloadManager : OnSpiderListener {
 
         // Sort all download list
         allInfoList.sortByPositionDescending()
+
+        // Notify
+        if (notify) {
+            mDownloadInfoListener?.onUpdateAll()
+        }
     }
 
     suspend fun addDownloadLabel(downloadLabelList: List<DownloadLabel>) {
         val offset = downloadLabelList.size
         downloadLabelList.filterNot { containLabel(it.label) }.forEachIndexed { index, label ->
-            map[label.label] = mutableStateListOf()
+            map[label.label] = LinkedList()
             label.position = index + offset
             labelList.add(EhDB.addDownloadLabel(label))
         }
@@ -319,24 +339,26 @@ object DownloadManager : OnSpiderListener {
 
         // Add to default label download list
         val list = defaultInfoList
-        list.add(0, info)
+        list.addFirst(info)
 
         // Add to all download list and map
-        allInfoList.add(0, info)
+        allInfoList.addFirst(info)
         mAllInfoMap[galleryInfo.gid] = info
 
         // Save to
         EhDB.putDownloadInfo(info)
 
         // Notify
-        mutableNotifyFlow.tryEmit(info)
+        withUIContext {
+            mDownloadInfoListener?.onUpdate(info)
+        }
     }
 
     suspend fun stopDownload(gid: Long) {
         val info = stopDownloadInternal(gid)
         if (info != null) {
             // Update listener
-            mutableNotifyFlow.tryEmit(info)
+            mDownloadInfoListener?.onUpdate(info)
             // Ensure download
             ensureDownload()
         }
@@ -346,19 +368,17 @@ object DownloadManager : OnSpiderListener {
         val info = stopCurrentDownloadInternal()
         if (info != null) {
             // Update listener
-            mutableNotifyFlow.tryEmit(info)
+            mDownloadInfoListener?.onUpdate(info)
             // Ensure download
             ensureDownload()
         }
     }
 
-    suspend fun stopRangeDownload(gidList: LongArray) {
+    suspend fun stopRangeDownload(gidList: LongList) {
         stopRangeDownloadInternal(gidList)
 
         // Update listener
-        gidList.mapNotNull { mAllInfoMap[it] }.forEach {
-            mutableNotifyFlow.tryEmit(it)
-        }
+        mDownloadInfoListener?.onUpdateAll()
 
         // Ensure download
         ensureDownload()
@@ -370,14 +390,14 @@ object DownloadManager : OnSpiderListener {
             info.state = DownloadInfo.STATE_NONE
             // Update in DB
             EhDB.putDownloadInfo(info)
-
-            // Notify
-            mutableNotifyFlow.tryEmit(info)
         }
         mWaitList.clear()
 
         // Stop current
         stopCurrentDownloadInternal()
+
+        // Notify mDownloadInfoListener
+        mDownloadInfoListener?.onUpdateAll()
     }
 
     suspend fun deleteDownload(gid: Long, deleteFiles: Boolean = false) {
@@ -398,7 +418,7 @@ object DownloadManager : OnSpiderListener {
                 if (index >= 0) {
                     list.remove(info)
                     // Update listener
-                    mutableNotifyFlow.tryEmit(info)
+                    mDownloadInfoListener?.onUpdate(info)
                 }
             }
 
@@ -412,7 +432,7 @@ object DownloadManager : OnSpiderListener {
         }
     }
 
-    suspend fun deleteRangeDownload(gidList: LongArray) {
+    suspend fun deleteRangeDownload(gidList: LongList) {
         stopRangeDownloadInternal(gidList)
         val list = gidList.mapNotNull { gid ->
             mAllInfoMap.remove(gid)?.also { getInfoListForLabel(it.label)?.remove(it) }
@@ -421,7 +441,7 @@ object DownloadManager : OnSpiderListener {
         allInfoList.removeAll(list.toSet())
 
         // Update listener
-        list.forEach { mutableNotifyFlow.tryEmit(it) }
+        mDownloadInfoListener?.onUpdateAll()
 
         // Ensure download
         ensureDownload()
@@ -526,11 +546,11 @@ object DownloadManager : OnSpiderListener {
 
     // Update in DB
     // Update mDownloadListener
-    private suspend fun stopRangeDownloadInternal(gidList: LongArray) {
+    private suspend fun stopRangeDownloadInternal(gidList: LongList) {
         // Two way
         if (gidList.size < mWaitList.size) {
-            for (element in gidList) {
-                stopDownloadInternal(element)
+            for (i in 0 until gidList.size) {
+                stopDownloadInternal(gidList[i])
             }
         } else {
             // Check current task
@@ -558,12 +578,12 @@ object DownloadManager : OnSpiderListener {
     /**
      * @param label Not allow new label
      */
-    suspend fun changeLabel(list: Collection<DownloadInfo>, label: String?) {
+    suspend fun changeLabel(list: List<DownloadInfo>, label: String?) {
         if (null != label && !containLabel(label)) {
             Log.e(TAG, "Not exits label: $label")
             return
         }
-        val dstList = getInfoListForLabel(label)
+        val dstList: MutableList<DownloadInfo>? = getInfoListForLabel(label)
         if (dstList == null) {
             Log.e(TAG, "Can't find label with label: $label")
             return
@@ -572,7 +592,7 @@ object DownloadManager : OnSpiderListener {
             if (info.label == label) {
                 continue
             }
-            val srcList = getInfoListForLabel(info.label)
+            val srcList: MutableList<DownloadInfo>? = getInfoListForLabel(info.label)
             if (srcList == null) {
                 Log.e(TAG, "Can't find label with label: " + info.label)
                 continue
@@ -585,6 +605,7 @@ object DownloadManager : OnSpiderListener {
             // Save to DB
             EhDB.putDownloadInfo(info)
         }
+        mDownloadInfoListener?.onUpdateAll()
     }
 
     suspend fun addLabel(label: String?) {
@@ -592,30 +613,41 @@ object DownloadManager : OnSpiderListener {
             return
         }
         labelList.add(EhDB.addDownloadLabel(DownloadLabel(label, labelList.size)))
-        map[label] = mutableStateListOf()
+        map[label] = LinkedList()
     }
 
     suspend fun moveLabel(fromPosition: Int, toPosition: Int) {
         val item = labelList.removeAt(fromPosition)
         labelList.add(toPosition, item)
-        withIOContext {
-            val range = if (fromPosition < toPosition) fromPosition..toPosition else toPosition..fromPosition
-            val list = labelList.slice(range)
-            list.zip(range).forEach { it.first.position = it.second }
-            EhDB.updateDownloadLabel(list)
-        }
+        val range = if (fromPosition < toPosition) fromPosition..toPosition else toPosition..fromPosition
+        val list = labelList.slice(range)
+        list.zip(range).forEach { it.first.position = it.second }
+        EhDB.updateDownloadLabel(list)
     }
 
     suspend fun renameLabel(from: String, to: String) {
-        val index = labelList.indexOfFirst { it.label == from }
-        if (index != -1) {
-            val exist = labelList.removeAt(index)
-            val new = exist.copy(label = to)
-            labelList.add(index, new)
-            EhDB.updateDownloadLabel(new)
-            val list = map.remove(from)?.onEach { it.label = to }
-            if (list != null) map[to] = list
+        // Find in label list
+        var found = false
+        for (raw in labelList) {
+            if (from == raw.label) {
+                found = true
+                raw.label = to
+                // Update in DB
+                EhDB.updateDownloadLabel(raw)
+                break
+            }
         }
+        if (!found) {
+            return
+        }
+        val list = map.remove(from) ?: return
+
+        // Update info label
+        for (info in list) {
+            info.label = to
+        }
+        // Put list back with new label
+        map[to] = list
     }
 
     suspend fun deleteLabel(label: String) {
@@ -722,6 +754,18 @@ object DownloadManager : OnSpiderListener {
         // Ignore
     }
 
+    interface DownloadInfoListener {
+        /**
+         * The special info is changed
+         */
+        fun onUpdate(info: DownloadInfo)
+
+        /**
+         * Maybe all data is changed, but size is the same
+         */
+        fun onUpdateAll()
+    }
+
     interface DownloadListener {
         /**
          * Get 509 error
@@ -826,7 +870,7 @@ object DownloadManager : OnSpiderListener {
                         Log.e(TAG, "Current task is null, but it should not be")
                     } else {
                         info.total = mPages
-                        mutableNotifyFlow.tryEmit(info)
+                        mDownloadInfoListener?.onUpdate(info)
                     }
                 }
 
@@ -855,7 +899,7 @@ object DownloadManager : OnSpiderListener {
                         if (mDownloadListener != null) {
                             mDownloadListener!!.onGetPage(info)
                         }
-                        mutableNotifyFlow.tryEmit(info)
+                        mDownloadInfoListener?.onUpdate(info)
                     }
                 }
 
@@ -868,7 +912,7 @@ object DownloadManager : OnSpiderListener {
                         info.finished = mFinished
                         info.downloaded = mDownloaded
                         info.total = mTotal
-                        mutableNotifyFlow.tryEmit(info)
+                        mDownloadInfoListener?.onUpdate(info)
                     }
                 }
 
@@ -907,7 +951,7 @@ object DownloadManager : OnSpiderListener {
                             if (mDownloadListener != null) {
                                 mDownloadListener!!.onFinish(info)
                             }
-                            mutableNotifyFlow.tryEmit(info)
+                            mDownloadInfoListener?.onUpdate(info)
                             // Start next download
                             ensureDownload()
                         }
@@ -993,7 +1037,7 @@ object DownloadManager : OnSpiderListener {
                 if (mDownloadListener != null) {
                     mDownloadListener!!.onDownload(info)
                 }
-                mutableNotifyFlow.tryEmit(info)
+                mDownloadInfoListener?.onUpdate(info)
             }
             mBytesRead = 0
             if (!mStop) {

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

@@ -35,8 +35,9 @@ import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.ui.MainActivity
-import com.hippo.ehviewer.ui.screen.DownloadsFragment
+import com.hippo.ehviewer.ui.scene.DownloadsScene
 import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.ReadableTime
 import com.hippo.ehviewer.util.SimpleHandler
 import com.hippo.ehviewer.util.getParcelableExtraCompat
@@ -104,7 +105,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
             }
 
             ACTION_START_RANGE -> {
-                val gidList = intent.getLongArrayExtra(KEY_GID_LIST)
+                val gidList = intent.getParcelableExtraCompat<LongList>(KEY_GID_LIST)
                 if (gidList != null) {
                     deferredMgr.await().startRangeDownload(gidList)
                 }
@@ -124,7 +125,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
             ACTION_STOP_CURRENT -> deferredMgr.await().stopCurrentDownload()
 
             ACTION_STOP_RANGE -> {
-                val gidList = intent.getLongArrayExtra(KEY_GID_LIST)
+                val gidList = intent.getParcelableExtraCompat<LongList>(KEY_GID_LIST)
                 if (gidList != null) {
                     deferredMgr.await().stopRangeDownload(gidList)
                 }
@@ -140,7 +141,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
             }
 
             ACTION_DELETE_RANGE -> {
-                val gidList = intent.getLongArrayExtra(KEY_GID_LIST)
+                val gidList = intent.getParcelableExtraCompat<LongList>(KEY_GID_LIST)
                 if (gidList != null) {
                     deferredMgr.await().deleteRangeDownload(gidList)
                 }
@@ -187,7 +188,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
         clearIntent.action = ACTION_CLEAR
         val piClear = PendingIntent.getService(this, 0, clearIntent, PendingIntent.FLAG_IMMUTABLE)
         val bundle = Bundle()
-        bundle.putString(DownloadsFragment.KEY_ACTION, DownloadsFragment.ACTION_CLEAR_DOWNLOAD_SERVICE)
+        bundle.putString(DownloadsScene.KEY_ACTION, DownloadsScene.ACTION_CLEAR_DOWNLOAD_SERVICE)
         val activityIntent = Intent(this, MainActivity::class.java)
         activityIntent.action = ACTION_START_DOWNLOADSCENE
         activityIntent.putExtra(ACTION_START_DOWNLOADSCENE_ARGS, bundle)
@@ -243,7 +244,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
         }
         ensureDownloadingBuilder()
         val bundle = Bundle()
-        bundle.putLong(DownloadsFragment.KEY_GID, info.gid)
+        bundle.putLong(DownloadsScene.KEY_GID, info.gid)
         val activityIntent = Intent(this, MainActivity::class.java)
         activityIntent.action = ACTION_START_DOWNLOADSCENE
         activityIntent.putExtra(ACTION_START_DOWNLOADSCENE_ARGS, bundle)

app/src/main/kotlin/com/hippo/ehviewer/icons/big/Download.kt

@@ -1,44 +0,0 @@
-package com.hippo.ehviewer.icons.big
-
-import androidx.compose.material.icons.materialPath
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.bigIcon
-import com.hippo.ehviewer.util.unsafeLazy
-
-val EhIcons.Big.Filled.Download by unsafeLazy {
-    bigIcon(name = "Download") {
-        materialPath {
-            moveTo(0.0F, 19.0F)
-            verticalLineTo(24.0F)
-            horizontalLineTo(24.0F)
-            verticalLineTo(19.0F)
-            horizontalLineTo(0.0F)
-            close()
-            moveTo(16.0F, 22.0F)
-            horizontalLineTo(15.0F)
-            verticalLineTo(21.0F)
-            horizontalLineTo(16.0F)
-            verticalLineTo(22.0F)
-            close()
-            moveTo(19.0F, 22.0F)
-            horizontalLineTo(18.0F)
-            verticalLineTo(21.0F)
-            horizontalLineTo(19.0F)
-            verticalLineTo(22.0F)
-            close()
-            moveTo(22.0F, 22.0F)
-            horizontalLineTo(21.0F)
-            verticalLineTo(21.0F)
-            horizontalLineTo(22.0F)
-            verticalLineTo(22.0F)
-            moveTo(15.0F, 11.0F)
-            lineTo(15.0F, 0.0F)
-            lineTo(9.0F, 0.0F)
-            lineTo(9.0F, 11.0F)
-            lineTo(5.0F, 11.0F)
-            lineTo(12.0F, 18.0F)
-            lineTo(19.0F, 11.0F)
-            close()
-        }
-    }
-}

app/src/main/kotlin/com/hippo/ehviewer/icons/filled/GoTo.kt

@@ -1,33 +0,0 @@
-package com.hippo.ehviewer.icons.filled
-
-import androidx.compose.material.icons.materialIcon
-import androidx.compose.material.icons.materialPath
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.util.unsafeLazy
-
-val EhIcons.Filled.GoTo by unsafeLazy {
-    materialIcon(name = "GoTo") {
-        materialPath {
-            moveTo(13.0F, 13.0F)
-            lineTo(17.0F, 17.0F)
-            lineTo(21.0F, 13.0F)
-            horizontalLineTo(18.0F)
-            verticalLineTo(10.0F)
-            curveTo(18.0F, 6.1F, 14.9F, 3.0F, 11.0F, 3.0F)
-            reflectiveCurveTo(4.0F, 6.1F, 4.0F, 10.0F)
-            verticalLineTo(17.0F)
-            horizontalLineTo(6.0F)
-            verticalLineTo(10.0F)
-            curveTo(6.0F, 7.2F, 8.2F, 5.0F, 11.0F, 5.0F)
-            reflectiveCurveTo(16.0F, 7.2F, 16.0F, 10.0F)
-            verticalLineTo(13.0F)
-            horizontalLineTo(13.0F)
-            moveTo(16.0F, 19.0F)
-            horizontalLineTo(18.0F)
-            verticalLineTo(21.0F)
-            horizontalLineTo(16.0F)
-            verticalLineTo(19.0F)
-            close()
-        }
-    }
-}

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

@@ -125,7 +125,6 @@ class Image private constructor(drawable: Drawable, private val src: AutoCloseab
                                 colorSpace = if (isAtLeastO) colorSpace else null,
                                 size = Size(targetWidth, targetHeight),
                                 scale = Scale.FILL,
-                                allowInexactSize = true,
                             )
                             val drawable = ImageSource(src.source.openInputStream().source().buffer(), appCtx).use {
                                 BitmapFactoryDecoder(it, options).decode().drawable

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

@@ -127,7 +127,6 @@ class SpiderDen(mGalleryInfo: GalleryInfo) {
         return dir.createFile(perFilename(index, ext))
     }
 
-    @Suppress("NewApi")
     suspend fun makeHttpCallAndSaveImage(
         index: Int,
         url: String,

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

@@ -619,9 +619,8 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
             var originImageUrl: String? = null
             var error: String? = null
             var forceHtml = false
-            val original = Settings.downloadOriginImage || orgImg
             runCatching {
-                repeat(2) { retries ->
+                repeat(2) {
                     var imageUrl: String? = null
                     var localShowKey: String?
 
@@ -631,7 +630,11 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
                             var pageUrl = EhUrl.getPageUrl(mSpiderInfo.gid, index, pToken)
                             // Skipping H@H costs 50 points, only use it as last resort
                             if (skipHathKey != null) {
-                                pageUrl += "?nl=$skipHathKey"
+                                pageUrl += if ("?" in pageUrl) {
+                                    "&nl=$skipHathKey"
+                                } else {
+                                    "?nl=$skipHathKey"
+                                }
                             }
                             EhEngine.getGalleryPage(pageUrl, mSpiderInfo.gid, mSpiderInfo.token)
                                 .let { result ->
@@ -668,10 +671,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
                     val targetImageUrl: String?
                     val referer: String?
 
-                    if (original && originImageUrl != null) {
-                        if (retries == 1 && skipHathKey != null) {
-                            originImageUrl += "?nl=$skipHathKey"
-                        }
+                    if ((Settings.downloadOriginImage || orgImg) && !originImageUrl.isNullOrBlank()) {
                         val pageUrl = EhUrl.getPageUrl(mSpiderInfo.gid, index, pToken)
                         targetImageUrl = EhEngine.getOriginalImageUrl(originImageUrl!!, pageUrl)
                         referer = EhUrl.referer
@@ -771,9 +771,14 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
 private val PTOKEN_FAILED_MESSAGE = appCtx.getString(R.string.error_get_ptoken_error)
 private val ERROR_TIMEOUT = appCtx.getString(R.string.error_timeout)
 private val DECODE_ERROR = appCtx.getString(R.string.error_decoding_failed)
-private val URL_509_PATTERN = Regex("\\.org/.+/509s?\\.gif")
+private val URL_509_ARRAY = arrayOf(
+    "https://ehgt.org/g/509.gif",
+    "https://ehgt.org/g/509s.gif",
+    "https://exhentai.org/img/509.gif",
+    "https://exhentai.org/img/509s.gif",
+)
 private const val WORKER_DEBUG_TAG = "SpiderQueenWorker"
 
 private fun check509(url: String) {
-    if (URL_509_PATTERN in url) throw QuotaExceededException()
+    if (url in URL_509_ARRAY) throw QuotaExceededException()
 }

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

@@ -18,10 +18,10 @@ package com.hippo.ehviewer.ui
 import android.Manifest
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import androidx.appcompat.app.AlertDialog
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.Row
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.DriveFileMove
 import androidx.compose.material.icons.automirrored.filled.MenuBook
@@ -30,15 +30,13 @@ import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.Favorite
 import androidx.compose.material.icons.filled.FavoriteBorder
 import androidx.compose.material.icons.filled.HeartBroken
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.SelectableDates
+import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Text
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
@@ -54,32 +52,137 @@ 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
 import com.hippo.ehviewer.download.downloadLocation
+import com.hippo.ehviewer.ui.legacy.ListCheckBoxDialogBuilder
+import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.ehviewer.ui.tools.DialogState
-import com.hippo.ehviewer.ui.tools.LabeledCheckbox
 import com.hippo.ehviewer.util.FavouriteStatusRouter
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.findActivity
-import com.hippo.ehviewer.util.isAtLeastT
-import com.hippo.ehviewer.util.mapToLongArray
 import com.hippo.ehviewer.util.requestPermission
-import com.hippo.ehviewer.util.toEpochMillis
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
+import eu.kanade.tachiyomi.util.lang.launchNow
 import eu.kanade.tachiyomi.util.lang.withIOContext
 import eu.kanade.tachiyomi.util.lang.withUIContext
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.datetime.Clock
-import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.minus
-import kotlinx.datetime.toLocalDateTime
-import kotlinx.datetime.todayIn
 import moe.tarsin.coroutines.runSuspendCatching
 import splitties.init.appCtx
 
+object CommonOperations {
+    fun startDownload(activity: MainActivity?, galleryInfo: BaseGalleryInfo, forceDefault: Boolean) {
+        startDownload(activity!!, listOf(galleryInfo), forceDefault)
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun startDownload(
+        activity: MainActivity,
+        galleryInfos: List<BaseGalleryInfo>,
+        forceDefault: Boolean,
+    ) {
+        launchNow {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                activity.requestPermission(Manifest.permission.POST_NOTIFICATIONS)
+            }
+            doStartDownload(activity, galleryInfos, forceDefault)
+        }
+    }
+
+    private fun doStartDownload(
+        activity: MainActivity,
+        galleryInfos: List<BaseGalleryInfo>,
+        forceDefault: Boolean,
+    ) {
+        val toStart = LongList()
+        val toAdd: MutableList<BaseGalleryInfo> = ArrayList()
+        for (gi in galleryInfos) {
+            if (DownloadManager.containDownloadInfo(gi.gid)) {
+                toStart.add(gi.gid)
+            } else {
+                toAdd.add(gi)
+            }
+        }
+        if (!toStart.isEmpty()) {
+            val intent = Intent(activity, DownloadService::class.java)
+            intent.action = DownloadService.ACTION_START_RANGE
+            intent.putExtra(DownloadService.KEY_GID_LIST, toStart)
+            ContextCompat.startForegroundService(activity, intent)
+        }
+        if (toAdd.isEmpty()) {
+            activity.showTip(R.string.added_to_download_list, BaseScene.LENGTH_SHORT)
+            return
+        }
+        var justStart = forceDefault
+        var label: String? = null
+        // Get default download label
+        if (!justStart && Settings.hasDefaultDownloadLabel) {
+            label = Settings.defaultDownloadLabel
+            justStart = label == null || DownloadManager.containLabel(label)
+        }
+        // If there is no other label, just use null label
+        if (!justStart && DownloadManager.labelList.isEmpty()) {
+            justStart = true
+            label = null
+        }
+        if (justStart) {
+            // Got default label
+            for (gi in toAdd) {
+                val intent = Intent(activity, DownloadService::class.java)
+                intent.action = DownloadService.ACTION_START
+                intent.putExtra(DownloadService.KEY_LABEL, label)
+                intent.putExtra(DownloadService.KEY_GALLERY_INFO, gi)
+                ContextCompat.startForegroundService(activity, intent)
+            }
+            // Notify
+            activity.showTip(R.string.added_to_download_list, BaseScene.LENGTH_SHORT)
+        } else {
+            // Let use chose label
+            val list = DownloadManager.labelList
+            val items = mutableListOf<String>()
+            items.add(activity.getString(R.string.default_download_label_name))
+            items.addAll(list.map { it.label })
+            ListCheckBoxDialogBuilder(
+                activity,
+                items,
+                { builder: ListCheckBoxDialogBuilder?, _: AlertDialog?, position: Int ->
+                    var label1: String?
+                    if (position == 0) {
+                        label1 = null
+                    } else {
+                        label1 = items[position]
+                        if (!DownloadManager.containLabel(label1)) {
+                            label1 = null
+                        }
+                    }
+                    // Start download
+                    for (gi in toAdd) {
+                        val intent = Intent(activity, DownloadService::class.java)
+                        intent.action = DownloadService.ACTION_START
+                        intent.putExtra(DownloadService.KEY_LABEL, label1)
+                        intent.putExtra(DownloadService.KEY_GALLERY_INFO, gi)
+                        ContextCompat.startForegroundService(activity, intent)
+                    }
+                    // Save settings
+                    if (builder?.isChecked == true) {
+                        Settings.hasDefaultDownloadLabel = true
+                        Settings.defaultDownloadLabel = label1
+                    } else {
+                        Settings.hasDefaultDownloadLabel = false
+                    }
+                    // Notify
+                    activity.showTip(R.string.added_to_download_list, BaseScene.LENGTH_SHORT)
+                },
+                activity.getString(R.string.remember_download_label),
+                false,
+            )
+                .setTitle(R.string.download)
+                .show()
+        }
+    }
+}
+
 private fun removeNoMediaFile(downloadDir: UniFile) {
     val noMedia = downloadDir.subFile(".nomedia") ?: return
     noMedia.delete()
@@ -104,86 +207,6 @@ suspend fun keepNoMediaFileStatus() {
 fun getFavoriteIcon(favorited: Boolean) =
     if (favorited) Icons.Default.Favorite else Icons.Default.FavoriteBorder
 
-suspend fun DialogState.startDownload(
-    context: Context,
-    forceDefault: Boolean,
-    vararg galleryInfos: BaseGalleryInfo,
-) = with(context) {
-    if (isAtLeastT) {
-        requestPermission(Manifest.permission.POST_NOTIFICATIONS)
-    }
-    val (toStart, toAdd) = galleryInfos.partition { DownloadManager.containDownloadInfo(it.gid) }
-    if (toStart.isNotEmpty()) {
-        val intent = Intent(context, DownloadService::class.java)
-        intent.action = DownloadService.ACTION_START_RANGE
-        val list = toStart.mapToLongArray(GalleryInfo::gid)
-        intent.putExtra(DownloadService.KEY_GID_LIST, list)
-        ContextCompat.startForegroundService(context, intent)
-    }
-    if (toAdd.isEmpty()) {
-        return with(findActivity<MainActivity>()) {
-            showTip(R.string.added_to_download_list)
-        }
-    }
-    var justStart = forceDefault
-    var label: String? = null
-    // Get default download label
-    if (!justStart && Settings.hasDefaultDownloadLabel) {
-        label = Settings.defaultDownloadLabel
-        justStart = label == null || DownloadManager.containLabel(label)
-    }
-    // If there is no other label, just use null label
-    if (!justStart && DownloadManager.labelList.isEmpty()) {
-        justStart = true
-        label = null
-    }
-    if (justStart) {
-        // Got default label
-        for (gi in toAdd) {
-            val intent = Intent(context, DownloadService::class.java)
-            intent.action = DownloadService.ACTION_START
-            intent.putExtra(DownloadService.KEY_LABEL, label)
-            intent.putExtra(DownloadService.KEY_GALLERY_INFO, gi)
-            ContextCompat.startForegroundService(context, intent)
-        }
-        // Notify
-        with(findActivity<MainActivity>()) {
-            showTip(R.string.added_to_download_list)
-        }
-    } else {
-        // Let use chose label
-        val list = DownloadManager.labelList
-        val items = arrayOf(
-            getString(R.string.default_download_label_name),
-            *list.map { it.label }.toTypedArray(),
-        )
-        val (selected, checked) = showSelectItemWithCheckBox(
-            *items,
-            title = R.string.download,
-            checkBoxText = R.string.remember_download_label,
-        )
-        val label1 = if (selected == 0) null else items[selected].takeIf { DownloadManager.containLabel(it) }
-        // Start download
-        for (gi in toAdd) {
-            val intent = Intent(context, DownloadService::class.java)
-            intent.action = DownloadService.ACTION_START
-            intent.putExtra(DownloadService.KEY_LABEL, label1)
-            intent.putExtra(DownloadService.KEY_GALLERY_INFO, gi)
-            ContextCompat.startForegroundService(context, intent)
-        }
-        // Save settings
-        if (checked) {
-            Settings.hasDefaultDownloadLabel = true
-            Settings.defaultDownloadLabel = label1
-        } else {
-            Settings.hasDefaultDownloadLabel = false
-        }
-        with(context.findActivity<MainActivity>()) {
-            showTip(R.string.added_to_download_list)
-        }
-    }
-}
-
 suspend fun DialogState.modifyFavorites(galleryInfo: BaseGalleryInfo): Boolean {
     val localFavorited = EhDB.containLocalFavorites(galleryInfo.gid)
     if (EhCookieStore.hasSignedIn()) {
@@ -262,10 +285,7 @@ private suspend fun doModifyFavorites(
     return add
 }
 
-suspend fun removeFromFavorites(galleryInfo: BaseGalleryInfo) = doModifyFavorites(
-    galleryInfo = galleryInfo,
-    localFavorited = EhDB.containLocalFavorites(galleryInfo.gid),
-)
+suspend fun removeFromFavorites(galleryInfo: BaseGalleryInfo) = doModifyFavorites(galleryInfo)
 
 fun Context.navToReader(info: BaseGalleryInfo, page: Int = -1) {
     val intent = Intent(this, ReaderActivity::class.java)
@@ -301,23 +321,23 @@ suspend fun DialogState.doGalleryInfoAction(info: BaseGalleryInfo, context: Cont
                 if (downloaded) {
                     confirmRemoveDownload(info)
                 } else {
-                    startDownload(context, false, info)
+                    CommonOperations.startDownload(this@with, info, false)
                 }
             }
 
             2 -> if (favourite) {
                 runSuspendCatching {
                     removeFromFavorites(info)
-                    showTip(R.string.remove_from_favorite_success)
+                    showTip(R.string.remove_from_favorite_success, BaseScene.LENGTH_SHORT)
                 }.onFailure {
-                    showTip(R.string.remove_from_favorite_failure)
+                    showTip(R.string.remove_from_favorite_failure, BaseScene.LENGTH_LONG)
                 }
             } else {
                 runSuspendCatching {
                     modifyFavorites(info)
-                    showTip(R.string.add_to_favorite_success)
+                    showTip(R.string.add_to_favorite_success, BaseScene.LENGTH_SHORT)
                 }.onFailure {
-                    showTip(R.string.add_to_favorite_failure)
+                    showTip(R.string.add_to_favorite_failure, BaseScene.LENGTH_LONG)
                 }
             }
 
@@ -332,22 +352,17 @@ private const val MAX_FAVNOTE_CHAR = 200
 suspend fun DialogState.confirmRemoveDownload(info: GalleryInfo, onDismiss: () -> Unit = {}) {
     var checked by mutableStateOf(Settings.removeImageFiles)
     awaitPermissionOrCancel(
+        confirmText = android.R.string.ok,
+        dismissText = android.R.string.cancel,
         title = R.string.download_remove_dialog_title,
         onDismiss = onDismiss,
         text = {
             Column {
-                Text(
-                    text = stringResource(id = R.string.download_remove_dialog_message, info.title.orEmpty()),
-                    style = MaterialTheme.typography.titleMedium,
-                )
-                Spacer(modifier = Modifier.height(16.dp))
-                LabeledCheckbox(
-                    modifier = Modifier.fillMaxWidth(),
-                    checked = checked,
-                    onCheckedChange = { checked = it },
-                    label = stringResource(id = R.string.download_remove_dialog_check_text),
-                    indication = null,
-                )
+                Text(text = stringResource(id = R.string.download_remove_dialog_message, info.title.orEmpty()))
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Checkbox(checked = checked, onCheckedChange = { checked = it })
+                    Text(text = stringResource(id = R.string.download_remove_dialog_check_text))
+                }
             }
         },
     )
@@ -357,43 +372,6 @@ suspend fun DialogState.confirmRemoveDownload(info: GalleryInfo, onDismiss: () -
     }
 }
 
-suspend fun DialogState.confirmRemoveDownloadRange(list: Collection<DownloadInfo>) {
-    var checked by mutableStateOf(Settings.removeImageFiles)
-    awaitPermissionOrCancel(
-        title = R.string.download_remove_dialog_title,
-        text = {
-            Column {
-                Text(
-                    text = stringResource(id = R.string.download_remove_dialog_message_2, list.size),
-                    style = MaterialTheme.typography.titleMedium,
-                )
-                Spacer(modifier = Modifier.height(16.dp))
-                LabeledCheckbox(
-                    modifier = Modifier.fillMaxWidth(),
-                    checked = checked,
-                    onCheckedChange = { checked = it },
-                    label = stringResource(id = R.string.download_remove_dialog_check_text),
-                    indication = null,
-                )
-            }
-        },
-    )
-    Settings.removeImageFiles = checked
-    withIOContext {
-        // Delete
-        DownloadManager.deleteRangeDownload(list.mapToLongArray(DownloadInfo::gid))
-        // Delete image files
-        if (checked) {
-            list.forEach { info ->
-                // Delete file
-                info.downloadDir?.delete()
-                // Remove download path
-                EhDB.removeDownloadDirname(info.gid)
-            }
-        }
-    }
-}
-
 suspend fun DialogState.showMoveDownloadLabel(info: GalleryInfo) {
     val defaultLabel = appCtx.getString(R.string.default_download_label_name)
     val labels = DownloadManager.labelList.map { it.label }.toTypedArray()
@@ -402,33 +380,3 @@ suspend fun DialogState.showMoveDownloadLabel(info: GalleryInfo) {
     val label = if (selected == 0) null else labels[selected - 1]
     withUIContext { DownloadManager.changeLabel(listOf(downloadInfo), label) }
 }
-
-suspend fun DialogState.showMoveDownloadLabelList(list: Collection<DownloadInfo>): String? {
-    val defaultLabel = appCtx.getString(R.string.default_download_label_name)
-    val labels = DownloadManager.labelList.map { it.label }.toTypedArray()
-    val selected = showSelectItem(defaultLabel, *labels, title = R.string.download_move_dialog_title)
-    val label = if (selected == 0) null else labels[selected - 1]
-    withUIContext { DownloadManager.changeLabel(list, label) }
-    return label
-}
-
-suspend fun DialogState.showDatePicker(): String? {
-    val initial = LocalDate(2007, 3, 21)
-    val yesterday = Clock.System.todayIn(TimeZone.UTC).minus(1, DateTimeUnit.DAY)
-    val initialMillis = initial.toEpochMillis()
-    val yesterdayMillis = yesterday.toEpochMillis()
-    val dateRange = initialMillis..yesterdayMillis
-    val dateMillis = showDatePicker(
-        title = R.string.go_to,
-        yearRange = initial.year..yesterday.year,
-        selectableDates = object : SelectableDates {
-            override fun isSelectableDate(utcTimeMillis: Long): Boolean {
-                return utcTimeMillis in dateRange
-            }
-        },
-    )
-    val date = dateMillis?.let {
-        kotlinx.datetime.Instant.fromEpochMilliseconds(it).toLocalDateTime(TimeZone.UTC).date.toString()
-    }
-    return date
-}

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

@@ -1,51 +1,126 @@
 package com.hippo.ehviewer.ui
 
-import android.app.Activity
 import android.os.Bundle
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
+import androidx.core.view.WindowCompat
+import androidx.navigation.NavController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhCookieStore
-import com.hippo.ehviewer.ui.destinations.BaseScreenDestination
-import com.hippo.ehviewer.ui.destinations.SelectSiteScreenDestination
-import com.hippo.ehviewer.ui.destinations.SignInScreenDestination
-import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass
-import com.hippo.ehviewer.util.findActivity
-import com.ramcosta.composedestinations.DestinationsNavHost
-import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.rememberNavHostEngine
+import com.hippo.ehviewer.ui.login.CookieSignInScene
+import com.hippo.ehviewer.ui.login.SelectSiteScreen
+import com.hippo.ehviewer.ui.login.SignInScreen
+import com.hippo.ehviewer.ui.login.WebViewSignInScreen
+import com.hippo.ehviewer.ui.settings.AboutScreen
+import com.hippo.ehviewer.ui.settings.AdvancedScreen
+import com.hippo.ehviewer.ui.settings.BaseScreen
+import com.hippo.ehviewer.ui.settings.DownloadScreen
+import com.hippo.ehviewer.ui.settings.EhScreen
+import com.hippo.ehviewer.ui.settings.FilterScreen
+import com.hippo.ehviewer.ui.settings.LicenseScreen
+import com.hippo.ehviewer.ui.settings.MyTagsScreen
+import com.hippo.ehviewer.ui.settings.PrivacyScreen
+import com.hippo.ehviewer.ui.settings.UConfigScreen
 
 class ConfigureActivity : EhActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         setMD3Content {
+            val navController = rememberNavController()
             val windowSizeClass = calculateWindowSizeClass(this)
-            CompositionLocalProvider(LocalWindowSizeClass provides windowSizeClass) {
-                DestinationsNavHost(
-                    navGraph = NavGraphs.root,
-                    modifier = Modifier.imePadding(),
-                    startRoute = if (Settings.needSignIn) {
-                        if (EhCookieStore.hasSignedIn()) SelectSiteScreenDestination else SignInScreenDestination
+            CompositionLocalProvider(LocalNavController provides navController) {
+                NavHost(
+                    navController = navController,
+                    startDestination = if (Settings.needSignIn) {
+                        if (EhCookieStore.hasSignedIn()) SELECT_SITE_ROUTE_NAME else SIGN_IN_ROUTE_NAME
                     } else {
-                        BaseScreenDestination
+                        BASE_SETTINGS_SCREEN
                     },
-                    engine = rememberNavHostEngine(rootDefaultAnimations = ehNavAnim),
-                )
+                    modifier = Modifier.imePadding(),
+                    enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up, tween(200)) },
+                    exitTransition = { fadeOut(tween(200)) },
+                    popEnterTransition = { fadeIn(tween(200)) },
+                    popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down, tween(200)) },
+                ) {
+                    composable(SIGN_IN_ROUTE_NAME) {
+                        SignInScreen(windowSizeClass)
+                    }
+                    composable(WEBVIEW_SIGN_IN_ROUTE_NAME) {
+                        WebViewSignInScreen()
+                    }
+                    composable(COOKIE_SIGN_IN_ROUTE_NAME) {
+                        CookieSignInScene(windowSizeClass)
+                    }
+                    composable(SELECT_SITE_ROUTE_NAME) {
+                        SelectSiteScreen()
+                    }
+                    composable(BASE_SETTINGS_SCREEN) {
+                        BaseScreen()
+                    }
+                    composable(ABOUT_SETTINGS_SCREEN) {
+                        AboutScreen()
+                    }
+                    composable(LICENSE_SCREEN) {
+                        LicenseScreen()
+                    }
+                    composable(PRIVACY_SETTINGS_SCREEN) {
+                        PrivacyScreen()
+                    }
+                    composable(ADVANCED_SETTINGS_SCREEN) {
+                        AdvancedScreen()
+                    }
+                    composable(DOWNLOAD_SETTINGS_SCREEN) {
+                        DownloadScreen()
+                    }
+                    composable(EH_SETTINGS_SCREEN) {
+                        EhScreen()
+                    }
+                    composable(UCONFIG_SCREEN) {
+                        UConfigScreen()
+                    }
+                    composable(MYTAGS_SCREEN) {
+                        MyTagsScreen()
+                    }
+                    composable(FILTER_SCREEN) {
+                        FilterScreen()
+                    }
+                    composable(FINISH_ROUTE_NAME) {
+                        SideEffect {
+                            finish()
+                        }
+                    }
+                }
             }
         }
     }
 }
 
-@Destination
-@Composable
-fun Finish() {
-    val context = LocalContext.current
-    SideEffect {
-        context.findActivity<Activity>().finish()
-    }
-}
+val LocalNavController = compositionLocalOf<NavController> { error("CompositionLocal LocalNavController not present!") }
+
+const val BASE_SETTINGS_SCREEN = "Base"
+const val EH_SETTINGS_SCREEN = "Eh"
+const val DOWNLOAD_SETTINGS_SCREEN = "Download"
+const val PRIVACY_SETTINGS_SCREEN = "Privacy"
+const val ADVANCED_SETTINGS_SCREEN = "Advanced"
+const val ABOUT_SETTINGS_SCREEN = "About"
+const val LICENSE_SCREEN = "License"
+const val UCONFIG_SCREEN = "UConfig"
+const val MYTAGS_SCREEN = "Mytags"
+const val FILTER_SCREEN = "Filter"
+const val SIGN_IN_ROUTE_NAME = "SignIn"
+const val WEBVIEW_SIGN_IN_ROUTE_NAME = "WebViewSignIn"
+const val COOKIE_SIGN_IN_ROUTE_NAME = "CookieSignIn"
+const val SELECT_SITE_ROUTE_NAME = "SelectSite"
+const val FINISH_ROUTE_NAME = "Finish"

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

@@ -17,9 +17,9 @@ package com.hippo.ehviewer.ui
 
 import android.content.res.Resources.Theme
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
 import androidx.navigation.ActivityNavigator
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -33,7 +33,7 @@ abstract class EhActivity : AppCompatActivity() {
     }
 
     override fun onApplyThemeResource(theme: Theme, resid: Int, first: Boolean) {
-        super.onApplyThemeResource(theme, resid, first)
+        theme.applyStyle(resid, true)
         theme.applyStyle(getThemeStyleRes(), true)
     }
 
@@ -43,7 +43,8 @@ abstract class EhActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
+        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = !isNightMode()
+        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightNavigationBars = !isNightMode()
     }
 
     override fun onResume() {

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

@@ -1,22 +1,19 @@
 package com.hippo.ehviewer.ui
 
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
-import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
 import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -24,6 +21,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
@@ -31,9 +30,9 @@ 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.databinding.InfoSheetBinding
+import com.hippo.ehviewer.ui.scene.navWithUrl
 import com.hippo.ehviewer.util.addTextToClipboard
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 
 private const val INDEX_URL = 2
 private const val INDEX_PARENT = 9
@@ -62,39 +61,43 @@ private fun GalleryDetail.generateContent() = arrayOf(
     R.string.favorite_name to favoriteName,
 )
 
-@Composable
-fun GalleryInfoBottomSheet(detail: GalleryDetail, navigator: DestinationsNavigator) {
-    Column(modifier = Modifier.fillMaxWidth()) {
-        val context = LocalContext.current
-        Text(
-            text = stringResource(id = R.string.gallery_info),
-            modifier = Modifier.align(Alignment.CenterHorizontally),
-            style = MaterialTheme.typography.titleLarge,
-        )
-        val data = remember(detail) { detail.generateContent() }
-        ProvideTextStyle(MaterialTheme.typography.labelLarge) {
-            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 {
-                            if (index == INDEX_PARENT) {
-                                if (content != null) {
-                                    navigator.navWithUrl(content)
-                                }
-                            } else {
-                                context.addTextToClipboard(content, true)
-                                if (index == INDEX_URL) {
-                                    // Save it to avoid detect the gallery
-                                    Settings.clipboardTextHashCode = data[index].hashCode()
-                                }
+class GalleryInfoBottomSheet(private val detail: GalleryDetail) : BottomSheetDialogFragment() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) = InfoSheetBinding.inflate(layoutInflater, container, false).apply {
+        content.setMD3Content {
+            Column(modifier = Modifier.fillMaxWidth()) {
+                val context = LocalContext.current
+                val navController = remember { findNavController() }
+                Text(
+                    text = stringResource(id = R.string.gallery_info),
+                    modifier = Modifier.align(Alignment.CenterHorizontally),
+                    style = MaterialTheme.typography.titleLarge,
+                )
+                val data = remember(detail) { detail.generateContent() }
+                ProvideTextStyle(MaterialTheme.typography.labelLarge) {
+                    LazyColumn {
+                        itemsIndexed(data) { index, (key, content) ->
+                            Row(
+                                modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.keyline_margin)).clickable {
+                                    if (index == INDEX_PARENT) {
+                                        if (content != null) {
+                                            navController.navWithUrl(content)
+                                        }
+                                    } else {
+                                        context.addTextToClipboard(content, true)
+                                        if (index == INDEX_URL) {
+                                            // Save it to avoid detect the gallery
+                                            Settings.clipboardTextHashCode = data[index].hashCode()
+                                        }
+                                    }
+                                }.fillMaxWidth(),
+                            ) {
+                                Text(stringResource(id = key), modifier = Modifier.width(90.dp).padding(8.dp))
+                                Text(content.orEmpty(), modifier = Modifier.padding(8.dp))
                             }
-                        }.fillMaxWidth(),
-                    ) {
-                        Text(stringResource(id = key), modifier = Modifier.width(90.dp).padding(8.dp))
-                        Text(content.orEmpty(), modifier = Modifier.padding(8.dp))
+                        }
                     }
                 }
             }
         }
-    }
+    }.root
 }

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

@@ -15,7 +15,6 @@
  */
 package com.hippo.ehviewer.ui
 
-import android.annotation.SuppressLint
 import android.app.assist.AssistContent
 import android.content.DialogInterface
 import android.content.Intent
@@ -27,21 +26,20 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
+import androidx.activity.compose.BackHandler
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Download
@@ -51,125 +49,88 @@ import androidx.compose.material.icons.filled.History
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.filled.Whatshot
-import androidx.compose.material3.DrawerState2
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ModalDrawerSheet
 import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.NavigationDrawerItem
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.ShapeDefaults
-import androidx.compose.material3.SideDrawer
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberDrawerState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.currentCompositeKeyHash
+import androidx.compose.runtime.currentRecomposeScope
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalViewConfiguration
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidViewBinding
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.lifecycle.compose.LifecycleResumeEffect
-import androidx.navigation.compose.rememberNavController
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.onNavDestinationSelected2
+import com.google.android.material.snackbar.Snackbar
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.Settings.launchPage
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
-import com.hippo.ehviewer.collectAsState
+import com.hippo.ehviewer.databinding.ActivityMainBinding
 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.image.Image.Companion.decodeBitmap
-import com.hippo.ehviewer.ui.destinations.DownloadsScreenDestination
-import com.hippo.ehviewer.ui.destinations.FavouritesScreenDestination
-import com.hippo.ehviewer.ui.destinations.GalleryDetailScreenDestination
-import com.hippo.ehviewer.ui.destinations.GalleryListScreenDestination
-import com.hippo.ehviewer.ui.destinations.HistoryScreenDestination
-import com.hippo.ehviewer.ui.destinations.HomePageScreenDestination
-import com.hippo.ehviewer.ui.destinations.ProgressScreenDestination
-import com.hippo.ehviewer.ui.destinations.SubscriptionScreenDestination
-import com.hippo.ehviewer.ui.destinations.ToplistScreenDestination
-import com.hippo.ehviewer.ui.destinations.WhatshotScreenDestination
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
-import com.hippo.ehviewer.ui.screen.TokenArgs
-import com.hippo.ehviewer.ui.screen.navWithUrl
-import com.hippo.ehviewer.ui.screen.navigate
-import com.hippo.ehviewer.ui.settings.showNewVersion
-import com.hippo.ehviewer.ui.tools.IconFix
-import com.hippo.ehviewer.ui.tools.LocalDialogState
+import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
+import com.hippo.ehviewer.ui.scene.BaseScene
+import com.hippo.ehviewer.ui.scene.GalleryDetailScene
+import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
+import com.hippo.ehviewer.ui.scene.ProgressScene
+import com.hippo.ehviewer.ui.scene.navAnimated
+import com.hippo.ehviewer.ui.scene.navWithUrl
 import com.hippo.ehviewer.ui.tools.LocalTouchSlopProvider
-import com.hippo.ehviewer.updater.AppUpdater
 import com.hippo.ehviewer.util.AppConfig
-import com.hippo.ehviewer.util.ExceptionUtils
 import com.hippo.ehviewer.util.addTextToClipboard
+import com.hippo.ehviewer.util.buildWindowInsets
 import com.hippo.ehviewer.util.getParcelableExtraCompat
 import com.hippo.ehviewer.util.getUrlFromClipboard
-import com.hippo.ehviewer.util.isAtLeastQ
-import com.ramcosta.composedestinations.DestinationsNavHost
-import com.ramcosta.composedestinations.rememberNavHostEngine
-import com.ramcosta.composedestinations.utils.currentDestinationAsState
-import eu.kanade.tachiyomi.util.lang.withIOContext
+import com.hippo.ehviewer.util.set
+import eu.kanade.tachiyomi.util.lang.launchUI
+import eu.kanade.tachiyomi.util.lang.withUIContext
 import java.io.File
 import java.io.FileOutputStream
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import moe.tarsin.coroutines.runSuspendCatching
 import splitties.systemservices.clipboardManager
 import splitties.systemservices.connectivityManager
 
 private val navItems = arrayOf(
-    Triple(HomePageScreenDestination, R.string.homepage, Icons.Default.Home),
-    Triple(SubscriptionScreenDestination, R.string.subscription, EhIcons.Default.Subscriptions),
-    Triple(WhatshotScreenDestination, R.string.whats_hot, Icons.Default.Whatshot),
-    Triple(ToplistScreenDestination, R.string.toplist, Icons.Default.FormatListNumbered),
-    Triple(FavouritesScreenDestination, R.string.favourite, Icons.Default.Favorite),
-    Triple(HistoryScreenDestination, R.string.history, Icons.Default.History),
-    Triple(DownloadsScreenDestination, R.string.downloads, Icons.Default.Download),
+    Triple(R.id.nav_homepage, R.string.homepage, Icons.Default.Home),
+    Triple(R.id.nav_subscription, R.string.subscription, EhIcons.Default.Subscriptions),
+    Triple(R.id.nav_whats_hot, R.string.whats_hot, Icons.Default.Whatshot),
+    Triple(R.id.nav_toplist, R.string.toplist, Icons.Default.FormatListNumbered),
+    Triple(R.id.nav_favourite, R.string.favourite, Icons.Default.Favorite),
+    Triple(R.id.nav_history, R.string.history, Icons.Default.History),
+    Triple(R.id.nav_downloads, R.string.downloads, Icons.Default.Download),
+    Triple(R.id.nav_settings, R.string.settings, Icons.Default.Settings),
 )
 
 class MainActivity : EhActivity() {
-    private val sideSheet = mutableStateListOf<@Composable ColumnScope.(DrawerState2) -> Unit>()
-
-    @Composable
-    fun ProvideSideSheetContent(content: @Composable ColumnScope.(DrawerState2) -> Unit) {
-        DisposableEffect(content) {
-            sideSheet.add(0, content)
-            onDispose { sideSheet.remove(content) }
-        }
-    }
-
-    private var shareUrl: String? = null
-
-    @Composable
-    fun ProvideAssistContent(url: String) {
-        val urlState by rememberUpdatedState(url)
-        DisposableEffect(urlState) {
-            shareUrl = urlState
-            onDispose {
-                shareUrl = null
-            }
-        }
-    }
+    private lateinit var navController: NavController
+    private val isInitializedFlow = MutableStateFlow(false)
 
     private fun saveImageToTempFile(uri: Uri): File? {
         val bitmap = runCatching {
@@ -185,221 +146,169 @@ class MainActivity : EhActivity() {
         }
     }
 
-    override fun onNewIntent(intent: Intent) {
+    override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-        intentFlow.tryEmit(intent)
+        lifecycleScope.launchUI {
+            isInitializedFlow.first { it }
+            if (!handleIntent(intent)) {
+                if (intent != null && Intent.ACTION_VIEW == intent.action) {
+                    if (intent.data != null) {
+                        val url = intent.data.toString()
+                        EditTextDialogBuilder(this@MainActivity, url, "")
+                            .setTitle(R.string.error_cannot_parse_the_url)
+                            .setPositiveButton(android.R.string.copy) { _, _ ->
+                                this@MainActivity.addTextToClipboard(url)
+                            }
+                            .show()
+                    }
+                }
+            }
+        }
     }
 
-    private val tipFlow = MutableSharedFlow<String>(extraBufferCapacity = 1)
-    private val intentFlow = MutableSharedFlow<Intent>(extraBufferCapacity = 4)
+    private fun handleIntent(intent: Intent?): Boolean {
+        when (intent?.action) {
+            Intent.ACTION_VIEW -> {
+                val uri = intent.data ?: return false
+                return navController.navWithUrl(uri.toString())
+            }
+
+            Intent.ACTION_SEND -> {
+                val type = intent.type
+                if ("text/plain" == type) {
+                    val builder = ListUrlBuilder()
+                    builder.keyword = intent.getStringExtra(Intent.EXTRA_TEXT)
+                    navController.navAnimated(
+                        R.id.galleryListScene,
+                        builder.toStartArgs(),
+                    )
+                    return true
+                } else if (type != null && type.startsWith("image/")) {
+                    val uri = intent.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)
+                    if (null != uri) {
+                        val temp = saveImageToTempFile(uri)
+                        if (null != temp) {
+                            val builder = ListUrlBuilder()
+                            builder.mode = ListUrlBuilder.MODE_IMAGE_SEARCH
+                            builder.imagePath = temp.path
+                            builder.isUseSimilarityScan = true
+                            navController.navAnimated(
+                                R.id.galleryListScene,
+                                builder.toStartArgs(),
+                            )
+                            return true
+                        }
+                    }
+                }
+            }
+
+            DownloadService.ACTION_START_DOWNLOADSCENE -> {
+                val args = intent.getBundleExtra(DownloadService.ACTION_START_DOWNLOADSCENE_ARGS)
+                navController.navAnimated(R.id.nav_downloads, args)
+            }
+        }
+
+        return false
+    }
+
+    var drawerLocked by mutableStateOf(false)
+    private var openDrawerFlow = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    private var recomposeFlow = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+
+    fun recompose() {
+        recomposeFlow.tryEmit(Unit)
+    }
 
-    @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         setMD3Content {
             val configuration = LocalConfiguration.current
-            val dialogState = LocalDialogState.current
-            val navDrawerState = rememberDrawerState(DrawerValue.Closed)
-            val sideSheetState = rememberDrawerState(DrawerValue.Closed)
+            val drawerState = rememberDrawerState(DrawerValue.Closed)
             val scope = rememberCoroutineScope()
-            val navController = rememberNavController()
-            fun closeDrawer(callback: () -> Unit = {}) = scope.launch {
-                navDrawerState.close()
-                callback()
-            }
-
-            val cannotParse = stringResource(R.string.error_cannot_parse_the_url)
+            val recomposeScope = currentRecomposeScope
+            fun isSelected(id: Int) = ::navController.isInitialized && id == navController.currentDestination?.id
+            fun closeDrawer() = scope.launch { drawerState.close() }
             LaunchedEffect(Unit) {
-                intentFlow.collect {
-                    when (intent?.action) {
-                        Intent.ACTION_VIEW -> {
-                            val url = intent.data?.toString()
-                            if (url != null && !navController.navWithUrl(url)) {
-                                val new = dialogState.awaitInputText(initial = url, title = cannotParse)
-                                addTextToClipboard(new)
-                            }
-                        }
-                        Intent.ACTION_SEND -> {
-                            val type = intent.type
-                            if ("text/plain" == type) {
-                                val keyword = intent.getStringExtra(Intent.EXTRA_TEXT)
-                                navController.navigate(GalleryListScreenDestination(ListUrlBuilder(mKeyword = keyword)))
-                            } else if (type != null && type.startsWith("image/")) {
-                                val uri = intent.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)
-                                if (null != uri) {
-                                    val temp = saveImageToTempFile(uri)
-                                    if (null != temp) {
-                                        val builder = ListUrlBuilder(
-                                            mode = ListUrlBuilder.MODE_IMAGE_SEARCH,
-                                            imagePath = temp.path,
-                                            isUseSimilarityScan = true,
-                                        )
-                                        navController.navigate(GalleryListScreenDestination(builder))
-                                    }
-                                }
-                            }
-                        }
-                        DownloadService.ACTION_START_DOWNLOADSCENE -> {
-                            val args = intent.getBundleExtra(DownloadService.ACTION_START_DOWNLOADSCENE_ARGS)
-                            navController.navigate(DownloadsScreenDestination)
-                        }
-                    }
+                openDrawerFlow.collect {
+                    drawerState.open()
                 }
             }
-
             LaunchedEffect(Unit) {
-                runSuspendCatching {
-                    withIOContext {
-                        AppUpdater.checkForUpdate()?.let {
-                            dialogState.showNewVersion(this@MainActivity, it)
-                        }
-                    }
-                }.onFailure {
-                    showTip(getString(R.string.update_failed, ExceptionUtils.getReadableString(it)))
+                recomposeFlow.collect {
+                    recomposeScope.invalidate()
                 }
             }
-            val snackbarState = remember { SnackbarHostState() }
-            LaunchedEffect(Unit) {
-                tipFlow.collectLatest {
-                    snackbarState.showSnackbar(it)
-                }
+            BackHandler(drawerState.isOpen) {
+                closeDrawer()
             }
-            val warning = stringResource(R.string.metered_network_warning)
-            val settings = stringResource(R.string.settings)
-            val checkMeteredNetwork by Settings.meteredNetworkWarning.collectAsState()
-            if (checkMeteredNetwork) {
-                LaunchedEffect(Unit) {
-                    if (connectivityManager.isActiveNetworkMetered) {
-                        if (isAtLeastQ) {
-                            val ret = snackbarState.showSnackbar(warning, settings)
-                            if (ret == SnackbarResult.ActionPerformed) {
-                                val panelIntent = Intent(android.provider.Settings.Panel.ACTION_INTERNET_CONNECTIVITY)
-                                startActivity(panelIntent)
-                            }
-                        } else {
-                            snackbarState.showSnackbar(warning)
-                        }
-                    }
-                }
-            }
-            val snackMessage = stringResource(R.string.clipboard_gallery_url_snack_message)
-            val snackAction = stringResource(R.string.clipboard_gallery_url_snack_action)
-            LifecycleResumeEffect {
-                scope.launch {
-                    delay(300)
-                    val text = clipboardManager.getUrlFromClipboard(applicationContext)
-                    val hashCode = text?.hashCode() ?: 0
-                    if (text != null && hashCode != 0 && Settings.clipboardTextHashCode != hashCode) {
-                        val result1 = GalleryDetailUrlParser.parse(text, false)
-                        var launch: (() -> Unit)? = null
-                        if (result1 != null) {
-                            launch = { navController.navigate(GalleryDetailScreenDestination(TokenArgs(result1.gid, result1.token))) }
-                        }
-                        val result2 = GalleryPageUrlParser.parse(text, false)
-                        if (result2 != null) {
-                            launch = { navController.navigate(ProgressScreenDestination(result2.gid, result2.pToken, result2.page)) }
-                        }
-                        launch?.let {
-                            val ret = snackbarState.showSnackbar(snackMessage, snackAction)
-                            if (ret == SnackbarResult.ActionPerformed) it()
-                        }
-                    }
-                    Settings.clipboardTextHashCode = hashCode
-                }
-                onPauseOrDispose { }
-            }
-            val currentDestination by navController.currentDestinationAsState()
-            val lockDrawerHandle = remember { mutableStateListOf<Int>() }
-            val drawerLocked = lockDrawerHandle.isNotEmpty()
-            val viewConfiguration = LocalViewConfiguration.current
-            CompositionLocalProvider(
-                LocalNavDrawerState provides navDrawerState,
-                LocalSideSheetState provides sideSheetState,
-                LocalDrawerLockHandle provides lockDrawerHandle,
-            ) {
-                Scaffold(snackbarHost = { SnackbarHost(snackbarState) }) {
-                    LocalTouchSlopProvider(Settings.touchSlopFactor.toFloat()) {
-                        ModalNavigationDrawer(
-                            drawerContent = {
-                                ModalDrawerSheet(
-                                    modifier = Modifier.widthIn(max = (configuration.screenWidthDp - 56).dp),
-                                    windowInsets = WindowInsets.systemBars.only(WindowInsetsSides.Start),
-                                ) {
-                                    val scrollState = rememberScrollState()
-                                    Column(
-                                        modifier = Modifier.verticalScroll(scrollState)
-                                            .windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Bottom)),
-                                    ) {
-                                        Image(
-                                            painter = painterResource(id = R.drawable.sadpanda_low_poly),
-                                            contentDescription = null,
-                                            modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
-                                            contentScale = ContentScale.FillWidth,
-                                        )
-                                        navItems.forEach { (direction, stringId, icon) ->
-                                            NavigationDrawerItem(
-                                                label = {
-                                                    Text(text = stringResource(id = stringId))
-                                                },
-                                                selected = currentDestination === direction,
-                                                onClick = {
-                                                    navController.navigate(direction.route)
-                                                    closeDrawer()
-                                                },
-                                                modifier = Modifier.padding(horizontal = 12.dp),
-                                                icon = {
-                                                    IconFix(imageVector = icon, contentDescription = null)
-                                                },
-                                            )
-                                        }
-                                        NavigationDrawerItem(
-                                            label = {
-                                                Text(text = stringResource(id = R.string.settings))
-                                            },
-                                            selected = false,
-                                            onClick = {
-                                                closeDrawer { startActivity(Intent(applicationContext, ConfigureActivity::class.java)) }
-                                            },
-                                            modifier = Modifier.padding(horizontal = 12.dp),
-                                            icon = {
-                                                Icon(imageVector = Icons.Default.Settings, contentDescription = null)
-                                            },
-                                        )
-                                    }
-                                }
-                            },
-                            drawerState = navDrawerState,
-                            gesturesEnabled = !drawerLocked || navDrawerState.isOpen,
+            LocalTouchSlopProvider(3f) {
+                ModalNavigationDrawer(
+                    drawerContent = {
+                        ModalDrawerSheet(
+                            modifier = Modifier.widthIn(max = (configuration.screenWidthDp - 56).dp),
+                            windowInsets = WindowInsets(0, 0, 0, 0),
                         ) {
-                            val sheet = sideSheet.firstOrNull()
-                            SideDrawer(
-                                drawerContent = {
-                                    if (sheet != null) {
-                                        ModalDrawerSheet(
-                                            modifier = Modifier.widthIn(max = (configuration.screenWidthDp - 112).dp),
-                                            drawerShape = ShapeDefaults.Large.copy(topEnd = CornerSize(0), bottomEnd = CornerSize(0)),
-                                            windowInsets = WindowInsets.systemBars.only(WindowInsetsSides.Top + WindowInsetsSides.End),
-                                        ) {
-                                            CompositionLocalProvider(LocalViewConfiguration provides viewConfiguration) {
-                                                sheet(sideSheetState)
-                                            }
-                                        }
-                                    }
-                                },
-                                drawerState = sideSheetState,
-                                gesturesEnabled = sheet != null && !drawerLocked,
+                            val scrollState = rememberScrollState()
+                            Column(
+                                modifier = Modifier.verticalScroll(scrollState).navigationBarsPadding(),
                             ) {
-                                CompositionLocalProvider(LocalViewConfiguration provides viewConfiguration) {
-                                    DestinationsNavHost(
-                                        navGraph = NavGraphs.root,
-                                        startRoute = navItems[Settings.launchPage].first,
-                                        engine = rememberNavHostEngine(rootDefaultAnimations = ehNavAnim),
-                                        navController = navController,
+                                Image(
+                                    painter = painterResource(id = R.drawable.sadpanda_low_poly),
+                                    contentDescription = null,
+                                    modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
+                                    contentScale = ContentScale.FillWidth,
+                                )
+                                navItems.forEach { (id, stringId, icon) ->
+                                    NavigationDrawerItem(
+                                        label = {
+                                            Text(text = stringResource(id = stringId))
+                                        },
+                                        selected = isSelected(id),
+                                        onClick = {
+                                            closeDrawer()
+                                            onNavDestinationSelected2(id, navController)
+                                        },
+                                        modifier = Modifier.padding(horizontal = 12.dp),
+                                        icon = {
+                                            Icon(imageVector = icon, contentDescription = null)
+                                        },
                                     )
                                 }
                             }
                         }
+                    },
+                    drawerState = drawerState,
+                    gesturesEnabled = !drawerLocked || drawerState.isOpen,
+                ) {
+                    val insets = buildWindowInsets {
+                        set(
+                            WindowInsetsCompat.Type.statusBars(),
+                            WindowInsets.statusBars,
+                        )
+                        set(
+                            WindowInsetsCompat.Type.navigationBars(),
+                            WindowInsets.navigationBars,
+                        )
+                        set(
+                            WindowInsetsCompat.Type.ime(),
+                            WindowInsets.ime,
+                        )
+                    }
+                    AndroidViewBinding(factory = { inflater, parent, attachToParent ->
+                        ActivityMainBinding.inflate(inflater, parent, attachToParent).apply {
+                            val navHostFragment = fragmentContainer.getFragment<NavHostFragment>()
+                            navController = navHostFragment.navController.apply {
+                                graph = navInflater.inflate(R.navigation.nav_graph).apply {
+                                    check(launchPage in 0..3)
+                                    setStartDestination(navItems[launchPage].first)
+                                }
+                            }
+                            isInitializedFlow.value = true
+                        }
+                    }) {
+                        ViewCompat.dispatchApplyWindowInsets(root, insets)
                     }
                 }
             }
@@ -410,6 +319,12 @@ class MainActivity : EhActivity() {
                 onNewIntent(intent)
             }
             checkDownloadLocation()
+            if (Settings.meteredNetworkWarning) {
+                lifecycleScope.launchUI {
+                    isInitializedFlow.first { it }
+                    checkMeteredNetwork()
+                }
+            }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                 if (!Settings.appLinkVerifyTip) {
                     try {
@@ -466,44 +381,107 @@ class MainActivity : EhActivity() {
             .show()
     }
 
+    private fun checkMeteredNetwork() {
+        if (connectivityManager.isActiveNetworkMetered) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                Snackbar.make(
+                    findViewById(R.id.fragment_container),
+                    R.string.metered_network_warning,
+                    Snackbar.LENGTH_LONG,
+                )
+                    .setAction(R.string.settings) {
+                        val panelIntent =
+                            Intent(android.provider.Settings.Panel.ACTION_INTERNET_CONNECTIVITY)
+                        startActivity(panelIntent)
+                    }
+                    .show()
+            } else {
+                showTip(R.string.metered_network_warning, BaseScene.LENGTH_LONG)
+            }
+        }
+    }
+
     override fun onResume() {
         if (Settings.needSignIn) {
             startActivity(Intent(this, ConfigureActivity::class.java))
         }
         super.onResume()
-    }
-
-    fun showTip(@StringRes id: Int, useToast: Boolean = false) {
-        showTip(getString(id), useToast)
-    }
-
-    fun showTip(message: CharSequence, useToast: Boolean = false) {
-        if (useToast || !tipFlow.tryEmit(message.toString())) {
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+        lifecycleScope.launch {
+            delay(300)
+            checkClipboardUrl()
         }
     }
 
-    override fun onProvideAssistContent(outContent: AssistContent?) {
-        super.onProvideAssistContent(outContent)
-        shareUrl?.let { outContent?.webUri = Uri.parse(shareUrl) }
-    }
-}
-
-val LocalNavDrawerState = compositionLocalOf<DrawerState2> { error("CompositionLocal LocalNavDrawerState not present!") }
-val LocalSideSheetState = compositionLocalOf<DrawerState2> { error("CompositionLocal LocalSideSheetState not present!") }
-val LocalDrawerLockHandle = compositionLocalOf<SnapshotStateList<Int>> { error("CompositionLocal LocalSideSheetState not present!") }
-
-@Composable
-fun LockDrawer(value: Boolean) {
-    val updated by rememberUpdatedState(value)
-    if (updated) {
-        val current = currentCompositeKeyHash
-        val handle = LocalDrawerLockHandle.current
-        DisposableEffect(current) {
-            handle.add(current)
-            onDispose {
-                handle.remove(current)
+    private suspend fun checkClipboardUrl() {
+        isInitializedFlow.first { it }
+        val text = clipboardManager.getUrlFromClipboard(this)
+        val hashCode = text?.hashCode() ?: 0
+        if (text != null && hashCode != 0 && Settings.clipboardTextHashCode != hashCode) {
+            val result1 = GalleryDetailUrlParser.parse(text, false)
+            var launch: (() -> Unit)? = null
+            if (result1 != null) {
+                val args = Bundle()
+                args.putString(GalleryDetailScene.KEY_ACTION, GalleryDetailScene.ACTION_GID_TOKEN)
+                args.putLong(GalleryDetailScene.KEY_GID, result1.gid)
+                args.putString(GalleryDetailScene.KEY_TOKEN, result1.token)
+                launch = { navController.navAnimated(R.id.galleryDetailScene, args) }
+            }
+            val result2 = GalleryPageUrlParser.parse(text, false)
+            if (result2 != null) {
+                val args = Bundle()
+                args.putString(ProgressScene.KEY_ACTION, ProgressScene.ACTION_GALLERY_TOKEN)
+                args.putLong(ProgressScene.KEY_GID, result2.gid)
+                args.putString(ProgressScene.KEY_PTOKEN, result2.pToken)
+                args.putInt(ProgressScene.KEY_PAGE, result2.page)
+                launch = { navController.navAnimated(R.id.progressScene, args) }
+            }
+            launch?.let {
+                withUIContext {
+                    val snackbar = Snackbar.make(
+                        findViewById(R.id.fragment_container),
+                        R.string.clipboard_gallery_url_snack_message,
+                        Snackbar.LENGTH_SHORT,
+                    )
+                    snackbar.setAction(R.string.clipboard_gallery_url_snack_action) {
+                        it()
+                    }
+                    snackbar.show()
+                }
             }
         }
+        Settings.clipboardTextHashCode = hashCode
+    }
+
+    fun openDrawer() {
+        openDrawerFlow.tryEmit(Unit)
+    }
+
+    fun showTip(@StringRes id: Int, length: Int, useToast: Boolean = false) {
+        showTip(getString(id), length, useToast)
+    }
+
+    /**
+     * If activity is running, show snack bar, otherwise show toast
+     */
+    fun showTip(message: CharSequence, length: Int, useToast: Boolean = false) {
+        if (!useToast) {
+            Snackbar.make(
+                findViewById(R.id.fragment_container),
+                message,
+                if (length == BaseScene.LENGTH_LONG) Snackbar.LENGTH_LONG else Snackbar.LENGTH_SHORT,
+            ).show()
+        } else {
+            Toast.makeText(
+                this,
+                message,
+                if (length == BaseScene.LENGTH_LONG) Toast.LENGTH_LONG else Toast.LENGTH_SHORT,
+            ).show()
+        }
+    }
+
+    var mShareUrl: String? = null
+    override fun onProvideAssistContent(outContent: AssistContent?) {
+        super.onProvideAssistContent(outContent)
+        mShareUrl?.let { outContent?.webUri = Uri.parse(mShareUrl) }
     }
 }

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

@@ -2,9 +2,6 @@ package com.hippo.ehviewer.ui
 
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
@@ -12,11 +9,10 @@ import androidx.compose.ui.platform.ComposeView
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import com.hippo.ehviewer.ui.tools.DialogState
 import com.hippo.ehviewer.ui.tools.LocalDialogState
-import com.ramcosta.composedestinations.animations.defaults.RootNavGraphDefaultAnimations
 
 // To make sure compose theme and legacy view theme are in sync, we only use Mdc3Theme
 
-inline fun ComposeView.setMD3Content(crossinline content: @Composable () -> Unit) = setContent {
+fun ComposeView.setMD3Content(content: @Composable () -> Unit) = setContent {
     Mdc3Theme {
         val dialogState = remember { DialogState() }
         dialogState.Intercept()
@@ -26,7 +22,7 @@ inline fun ComposeView.setMD3Content(crossinline content: @Composable () -> Unit
     }
 }
 
-inline fun ComponentActivity.setMD3Content(crossinline content: @Composable () -> Unit) = setContent {
+fun ComponentActivity.setMD3Content(content: @Composable () -> Unit) = setContent {
     Mdc3Theme {
         val dialogState = remember { DialogState() }
         dialogState.Intercept()
@@ -35,10 +31,3 @@ inline fun ComponentActivity.setMD3Content(crossinline content: @Composable () -
         }
     }
 }
-
-val ehNavAnim by lazy {
-    RootNavGraphDefaultAnimations(
-        enterTransition = { fadeIn(animationSpec = tween(500)) },
-        exitTransition = { fadeOut(animationSpec = tween(500)) },
-    )
-}

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

@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.PixelFormat
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.google.android.material.math.MathUtils
+import com.hippo.ehviewer.R
+import kotlin.math.roundToInt
+
+/**
+ * @param context used to get the configuration for the drawable from
+ */
+class AddDeleteDrawable(context: Context, color: Int) : Drawable() {
+    private val mPaint = Paint()
+    private val mPath = Path()
+    private val mSize: Int
+    private var mProgress = 0f
+    private var mAutoUpdateMirror = false
+    private var mVerticalMirror = false
+
+    init {
+        val resources = context.resources
+        mSize = resources.getDimensionPixelSize(R.dimen.add_size)
+        val barThickness = resources.getDimension(R.dimen.add_thickness).roundToInt().toFloat()
+        mPaint.color = color
+        mPaint.style = Paint.Style.STROKE
+        mPaint.strokeJoin = Paint.Join.MITER
+        mPaint.strokeCap = Paint.Cap.BUTT
+        mPaint.strokeWidth = barThickness
+        val halfSize = (mSize / 2).toFloat()
+        mPath.moveTo(0f, -halfSize)
+        mPath.lineTo(0f, halfSize)
+        mPath.moveTo(-halfSize, 0f)
+        mPath.lineTo(halfSize, 0f)
+    }
+
+    override fun draw(canvas: Canvas) {
+        val bounds = bounds
+        val canvasRotate = if (mVerticalMirror) {
+            MathUtils.lerp(270f, 135f, mProgress)
+        } else {
+            MathUtils.lerp(0f, 135f, mProgress)
+        }
+        canvas.save()
+        canvas.translate(bounds.centerX().toFloat(), bounds.centerY().toFloat())
+        canvas.rotate(canvasRotate)
+        canvas.drawPath(mPath, mPaint)
+        canvas.restore()
+    }
+
+    fun setColor(color: Int) {
+        mPaint.color = color
+        invalidateSelf()
+    }
+
+    override fun setAlpha(alpha: Int) {
+        mPaint.alpha = alpha
+    }
+
+    override fun setColorFilter(cf: ColorFilter?) {
+        mPaint.colorFilter = cf
+    }
+
+    override fun getIntrinsicHeight(): Int {
+        return mSize * 6 / 5
+    }
+
+    override fun getIntrinsicWidth(): Int {
+        return mSize * 6 / 5
+    }
+
+    /**
+     * If set, canvas is flipped when progress reached to end and going back to start.
+     */
+    private fun setVerticalMirror(verticalMirror: Boolean) {
+        mVerticalMirror = verticalMirror
+    }
+
+    fun setAutoUpdateMirror(autoUpdateMirror: Boolean) {
+        mAutoUpdateMirror = autoUpdateMirror
+    }
+
+    @get:Keep
+    @set:Keep
+    var progress: Float
+        get() = mProgress
+        set(progress) {
+            if (mAutoUpdateMirror) {
+                if (progress == 1f) {
+                    setVerticalMirror(true)
+                } else if (progress == 0f) {
+                    setVerticalMirror(false)
+                }
+            }
+            mProgress = progress
+            invalidateSelf()
+        }
+
+    fun setAdd(duration: Long) {
+        setShape(false, duration)
+    }
+
+    fun setDelete(duration: Long) {
+        setShape(true, duration)
+    }
+
+    private fun setShape(delete: Boolean, duration: Long) {
+        if (!(!delete && mProgress == 0f || delete && mProgress == 1f)) {
+            val endProgress = if (delete) 1f else 0f
+            if (duration <= 0) {
+                progress = endProgress
+            } else {
+                val oa = ObjectAnimator.ofFloat(this, "progress", endProgress)
+                oa.duration = duration
+                oa.setAutoCancel(true)
+                oa.start()
+            }
+        }
+    }
+
+    @Deprecated(
+        "Deprecated in Java",
+        ReplaceWith("PixelFormat.TRANSLUCENT", "android.graphics.PixelFormat"),
+    )
+    override fun getOpacity(): Int {
+        return PixelFormat.TRANSLUCENT
+    }
+}

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

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.view.View
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import com.hippo.ehviewer.Settings
+import kotlin.math.roundToInt
+
+class AutoStaggeredGridLayoutManager(columnSize: Int, orientation: Int) :
+    StaggeredGridLayoutManager(1, orientation) {
+    private var mColumnSize = columnSize
+    private var mColumnSizeChanged = true
+    private var mStrategy = 0
+    var supportsPredictiveItemAnimations = true
+
+    fun setColumnSize(columnSize: Int) {
+        if (columnSize == mColumnSize) {
+            return
+        }
+        mColumnSize = columnSize
+        mColumnSizeChanged = true
+    }
+
+    fun setStrategy(strategy: Int) {
+        if (strategy == mStrategy) {
+            return
+        }
+        mStrategy = strategy
+        mColumnSizeChanged = true
+    }
+
+    override fun supportsPredictiveItemAnimations(): Boolean {
+        return supportsPredictiveItemAnimations && super.supportsPredictiveItemAnimations()
+    }
+
+    override fun onMeasure(
+        recycler: RecyclerView.Recycler,
+        state: RecyclerView.State,
+        widthSpec: Int,
+        heightSpec: Int,
+    ) {
+        if (mColumnSizeChanged && mColumnSize > 0) {
+            val totalSpace = if (orientation == VERTICAL) {
+                check(
+                    View.MeasureSpec.EXACTLY == View.MeasureSpec.getMode(
+                        widthSpec,
+                    ),
+                ) { "RecyclerView need a fixed width for AutoStaggeredGridLayoutManager" }
+                View.MeasureSpec.getSize(widthSpec) - paddingRight - paddingLeft
+            } else {
+                check(
+                    View.MeasureSpec.EXACTLY == View.MeasureSpec.getMode(
+                        heightSpec,
+                    ),
+                ) { "RecyclerView need a fixed height for AutoStaggeredGridLayoutManager" }
+                View.MeasureSpec.getSize(heightSpec) - paddingTop - paddingBottom
+            }
+            val spanCount = when (mStrategy) {
+                STRATEGY_MIN_SIZE -> getSpanCountForMinSize(
+                    totalSpace,
+                    mColumnSize,
+                )
+
+                STRATEGY_SUITABLE_SIZE -> getSpanCountForSuitableSize(
+                    totalSpace,
+                    mColumnSize,
+                )
+
+                else -> getSpanCountForMinSize(
+                    totalSpace,
+                    mColumnSize,
+                )
+            }
+            setSpanCount(spanCount)
+            mColumnSizeChanged = false
+        }
+        super.onMeasure(recycler, state, widthSpec, heightSpec)
+    }
+}
+
+const val STRATEGY_MIN_SIZE = 0
+const val STRATEGY_SUITABLE_SIZE = 1
+fun getSpanCountForSuitableSize(total: Int, single: Int): Int {
+    return (total / single.toFloat()).roundToInt().coerceAtLeast(1)
+}
+
+@Composable
+fun calculateSuitableSpanCount(): Int {
+    val totalSpace = LocalConfiguration.current.screenWidthDp
+    return getSpanCountForSuitableSize(totalSpace, Settings.thumbSizeDp)
+}
+
+fun getSpanCountForMinSize(total: Int, single: Int): Int {
+    return (total / single).coerceAtLeast(1)
+}

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.view.View
+import android.widget.FrameLayout
+
+class BringOutTransition(contentLayout: FrameLayout, mSearchLayout: SearchLayout) :
+    ViewTransition(contentLayout, mSearchLayout) {
+    override fun startAnimations(hiddenView: View, shownView: View) {
+        mAnimator1 = hiddenView.animate().alpha(0f).scaleY(0.7f).scaleX(0.7f).apply {
+            setDuration(ANIMATE_TIME).setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    hiddenView.visibility = View.GONE
+                    mAnimator1 = null
+                }
+            }).start()
+        }
+        shownView.alpha = 0f
+        shownView.scaleX = 0.7f
+        shownView.scaleY = 0.7f
+        shownView.visibility = View.VISIBLE
+        mAnimator2 = shownView.animate().alpha(1f).scaleX(1f).scaleY(1f).apply {
+            setDuration(ANIMATE_TIME).setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    mAnimator2 = null
+                }
+            }).start()
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.widget.CheckBox
+import com.hippo.ehviewer.R
+
+class CheckBoxDialogBuilder(
+    context: Context,
+    message: String?,
+    checkText: String?,
+    checked: Boolean,
+) : BaseDialogBuilder(
+    context,
+) {
+    private val mCheckBox: CheckBox
+    val isChecked: Boolean
+        get() = mCheckBox.isChecked
+
+    init {
+        val view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_checkbox_builder, null)
+        setView(view)
+        setMessage(message)
+        mCheckBox = view.findViewById(R.id.checkbox)
+        mCheckBox.text = checkText
+        mCheckBox.isChecked = checked
+        view.setOnClickListener { mCheckBox.toggle() }
+    }
+}

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.content.Context
+import android.content.DialogInterface
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.widget.EditText
+import android.widget.TextView
+import android.widget.TextView.OnEditorActionListener
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.textfield.TextInputLayout
+import com.hippo.ehviewer.R
+
+class EditTextDialogBuilder(
+    context: Context,
+    text: String?,
+    hint: String?,
+) : BaseDialogBuilder(
+    context,
+),
+    OnEditorActionListener {
+    private val mTextInputLayout: TextInputLayout
+    val editText: EditText
+    private var mDialog: AlertDialog? = null
+    val text: String
+        get() = editText.text.toString()
+
+    fun setError(error: CharSequence?) {
+        mTextInputLayout.error = error
+    }
+
+    override fun create(): AlertDialog {
+        mDialog = super.create()
+        return mDialog as AlertDialog
+    }
+
+    override fun onEditorAction(v: TextView?, p1: Int, event: KeyEvent?): Boolean {
+        return if (mDialog != null) {
+            val button = mDialog!!.getButton(DialogInterface.BUTTON_POSITIVE)
+            button?.performClick()
+            true
+        } else {
+            false
+        }
+    }
+
+    init {
+        val view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_edittext_builder, null)
+        setView(view)
+        mTextInputLayout = view as TextInputLayout
+        editText = view.findViewById(R.id.edit_text)
+        editText.setText(text)
+        editText.setSelection(editText.text.length)
+        editText.setOnEditorActionListener(this)
+        mTextInputLayout.hint = hint
+    }
+}

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

@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.animation.Animator
+import android.content.Context
+import android.os.Bundle
+import android.os.Parcelable
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.Interpolator
+import androidx.activity.ComponentActivity
+import androidx.activity.OnBackPressedCallback
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.util.AnimationUtils
+import com.hippo.ehviewer.util.SimpleAnimatorListener
+import com.hippo.ehviewer.util.getParcelableCompat
+
+class FabLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+) : ViewGroup(context, attrs, defStyleAttr), View.OnClickListener {
+    private var mFabSize = 0
+    private var mFabMiniSize = 0
+    private var mIntervalPrimary = 0
+    private var mIntervalSecondary = 0
+    private var mExpanded = true
+    private var mAutoCancel = true
+    private var mHidePrimaryFab = false
+    private var mMainFabCenterY = -1f
+    private var mOnExpandListeners = arrayListOf<OnExpandListener>()
+    private var mOnClickFabListener: OnClickFabListener? = null
+
+    private val mOnBackPressedCallback = object : OnBackPressedCallback(false), OnExpandListener {
+        override fun handleOnBackPressed() {
+            isExpanded = false
+        }
+
+        override fun onExpand(expanded: Boolean) {
+            isEnabled = expanded
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        (context as ComponentActivity).onBackPressedDispatcher.addCallback(mOnBackPressedCallback)
+        mOnExpandListeners.add(mOnBackPressedCallback)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        mOnBackPressedCallback.remove()
+        mOnExpandListeners.remove(mOnBackPressedCallback)
+    }
+
+    init {
+        isSoundEffectsEnabled = false
+        clipToPadding = false
+        mFabSize = context.resources.getDimensionPixelOffset(R.dimen.fab_size)
+        mFabMiniSize = context.resources.getDimensionPixelOffset(R.dimen.fab_min_size)
+        mIntervalPrimary =
+            context.resources.getDimensionPixelOffset(R.dimen.fab_layout_primary_margin)
+        mIntervalSecondary =
+            context.resources.getDimensionPixelOffset(R.dimen.fab_layout_secondary_margin)
+    }
+
+    override fun addView(child: View, index: Int, params: LayoutParams) {
+        check(child is FloatingActionButton) { "FloatingActionBarLayout should only " + "contain FloatingActionButton, but try to add " + child.javaClass.name }
+        super.addView(child, index, params)
+    }
+
+    val primaryFab: FloatingActionButton?
+        get() = getChildAt(childCount - 1) as? FloatingActionButton
+
+    private val secondaryFabCount: Int
+        get() = 0.coerceAtLeast(childCount - 1)
+
+    private fun getSecondaryFabAt(index: Int): FloatingActionButton? {
+        return if (index < 0 || index >= secondaryFabCount) {
+            null
+        } else {
+            getChildAt(index) as FloatingActionButton
+        }
+    }
+
+    fun setSecondaryFabVisibilityAt(index: Int, visible: Boolean) {
+        getSecondaryFabAt(index)?.run {
+            if (visible && visibility == GONE) {
+                animate().cancel()
+                visibility = if (mExpanded) VISIBLE else INVISIBLE
+            } else if (!visible && visibility != GONE) {
+                animate().cancel()
+                visibility = GONE
+            }
+        }
+    }
+
+    private fun getChildMeasureSpec(parentMeasureSpec: Int): Int {
+        val parentMode = MeasureSpec.getMode(parentMeasureSpec)
+        val parentSize = MeasureSpec.getSize(parentMeasureSpec)
+        val childMode: Int
+        val childSize: Int
+        when (parentMode) {
+            MeasureSpec.AT_MOST, MeasureSpec.EXACTLY -> {
+                childMode = MeasureSpec.AT_MOST
+                childSize = parentSize
+            }
+
+            MeasureSpec.UNSPECIFIED -> {
+                childMode = MeasureSpec.UNSPECIFIED
+                childSize = parentSize
+            }
+
+            else -> {
+                childMode = MeasureSpec.AT_MOST
+                childSize = parentSize
+            }
+        }
+        return MeasureSpec.makeMeasureSpec(childSize, childMode)
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec)
+        val childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec)
+        measureChildren(childWidthMeasureSpec, childHeightMeasureSpec)
+        var maxWidth = 0
+        var maxHeight = 0
+        val count = childCount
+        for (i in 0 until count) {
+            val child = getChildAt(i)
+            if (child.visibility == GONE) {
+                continue
+            }
+            maxWidth = maxWidth.coerceAtLeast(child.measuredWidth)
+            maxHeight += child.measuredHeight
+        }
+        maxWidth += paddingLeft + paddingRight
+        maxHeight += paddingTop + paddingBottom
+        maxHeight = maxHeight.coerceAtLeast(suggestedMinimumHeight)
+        maxWidth = maxWidth.coerceAtLeast(suggestedMinimumWidth)
+        setMeasuredDimension(
+            resolveSizeAndState(maxWidth, widthMeasureSpec, 0),
+            resolveSizeAndState(maxHeight, heightMeasureSpec, 0),
+        )
+    }
+
+    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+        var centerX = 0
+        var bottom = measuredHeight - paddingBottom
+        val count = childCount
+        var i = count
+        while (--i >= 0) {
+            val child = getChildAt(i)
+            if (child.visibility == GONE) {
+                continue
+            }
+            val childWidth = child.measuredWidth
+            val childHeight = child.measuredHeight
+            var layoutBottom: Int
+            var layoutRight: Int
+            if (i == count - 1) {
+                layoutBottom = bottom + (childHeight - mFabSize) / 2
+                layoutRight = measuredWidth - paddingRight + (childWidth - mFabSize) / 2
+                bottom -= mFabSize + mIntervalPrimary
+                centerX = layoutRight - childWidth / 2
+                mMainFabCenterY = layoutBottom - childHeight / 2f
+            } else {
+                layoutBottom = bottom + (childHeight - mFabMiniSize) / 2
+                layoutRight = centerX + childWidth / 2
+                bottom -= mFabMiniSize + mIntervalSecondary
+            }
+            child.layout(
+                layoutRight - childWidth,
+                layoutBottom - childHeight,
+                layoutRight,
+                layoutBottom,
+            )
+        }
+    }
+
+    fun addOnExpandListener(listener: OnExpandListener) {
+        mOnExpandListeners.add(listener)
+    }
+
+    fun setOnClickFabListener(listener: OnClickFabListener?) {
+        mOnClickFabListener = listener
+        if (listener != null) {
+            var i = 0
+            val n = childCount
+            while (i < n) {
+                getChildAt(i).setOnClickListener(this)
+                i++
+            }
+        } else {
+            var i = 0
+            val n = childCount
+            while (i < n) {
+                getChildAt(i).isClickable = false
+                i++
+            }
+        }
+    }
+
+    fun setHidePrimaryFab(hidePrimaryFab: Boolean) {
+        if (mHidePrimaryFab != hidePrimaryFab) {
+            mHidePrimaryFab = hidePrimaryFab
+            val expanded = mExpanded
+            val count = childCount
+            if (!expanded && count > 0) {
+                getChildAt(count - 1).visibility = if (hidePrimaryFab) INVISIBLE else VISIBLE
+            }
+        }
+    }
+
+    fun setAutoCancel(autoCancel: Boolean) {
+        if (mAutoCancel != autoCancel) {
+            mAutoCancel = autoCancel
+            if (mExpanded) {
+                if (autoCancel) {
+                    setOnClickListener(this)
+                } else {
+                    isClickable = false
+                }
+            }
+        }
+    }
+
+    fun toggle() {
+        isExpanded = !mExpanded
+    }
+
+    var isExpanded: Boolean
+        get() = mExpanded
+        set(expanded) {
+            setExpanded(expanded, true)
+        }
+
+    fun setExpanded(expanded: Boolean, animation: Boolean) {
+        if (mExpanded != expanded) {
+            mExpanded = expanded
+            if (mAutoCancel) {
+                if (expanded) {
+                    setOnClickListener(this)
+                } else {
+                    isClickable = false
+                }
+            }
+            val count = childCount
+            if (count > 0) {
+                if (mMainFabCenterY == -1f || !animation) {
+                    // It is before first onLayout
+                    val checkCount = if (mHidePrimaryFab) count else count - 1
+                    for (i in 0 until checkCount) {
+                        val child = getChildAt(i)
+                        if (child.visibility == GONE) {
+                            continue
+                        }
+                        child.visibility = if (expanded) VISIBLE else INVISIBLE
+                        if (expanded) {
+                            child.alpha = 1f
+                        }
+                    }
+                } else {
+                    if (mHidePrimaryFab) {
+                        setPrimaryFabAnimation(getChildAt(count - 1), expanded, !expanded)
+                    }
+                    for (i in 0 until count - 1) {
+                        val child = getChildAt(i)
+                        if (child.visibility == GONE) {
+                            continue
+                        }
+                        setSecondaryFabAnimation(child, expanded, expanded)
+                    }
+                }
+            }
+            mOnExpandListeners.forEach { it.onExpand(expanded) }
+        }
+    }
+
+    private fun setPrimaryFabAnimation(child: View, expanded: Boolean, delay: Boolean) {
+        val startRotation: Float
+        val endRotation: Float
+        val startScale: Float
+        val endScale: Float
+        val interpolator: Interpolator
+        if (expanded) {
+            startRotation = -45.0f
+            endRotation = 0.0f
+            startScale = 0.0f
+            endScale = 1.0f
+            interpolator = AnimationUtils.FAST_SLOW_INTERPOLATOR
+        } else {
+            startRotation = 0.0f
+            endRotation = 0.0f
+            startScale = 1.0f
+            endScale = 0.0f
+            interpolator = AnimationUtils.SLOW_FAST_INTERPOLATOR
+        }
+        child.scaleX = startScale
+        child.scaleY = startScale
+        child.rotation = startRotation
+        child.animate()
+            .scaleX(endScale)
+            .scaleY(endScale)
+            .rotation(endRotation)
+            .setStartDelay(if (delay) ANIMATE_TIME else 0L)
+            .setDuration(ANIMATE_TIME)
+            .setInterpolator(interpolator)
+            .setListener(object : SimpleAnimatorListener() {
+                override fun onAnimationStart(animation: Animator) {
+                    if (expanded) {
+                        child.visibility = VISIBLE
+                    }
+                }
+
+                override fun onAnimationEnd(animation: Animator) {
+                    if (!expanded) {
+                        child.visibility = INVISIBLE
+                    }
+                }
+            }).start()
+    }
+
+    private fun setSecondaryFabAnimation(child: View, expanded: Boolean, delay: Boolean) {
+        val startTranslationY: Float
+        val endTranslationY: Float
+        val startAlpha: Float
+        val endAlpha: Float
+        val interpolator: Interpolator
+        if (expanded) {
+            startTranslationY = mMainFabCenterY - child.top - child.height / 2
+            endTranslationY = 0f
+            startAlpha = 0f
+            endAlpha = 1f
+            interpolator = AnimationUtils.FAST_SLOW_INTERPOLATOR
+        } else {
+            startTranslationY = 0f
+            endTranslationY = mMainFabCenterY - child.top - child.height / 2
+            startAlpha = 1f
+            endAlpha = 0f
+            interpolator = AnimationUtils.SLOW_FAST_INTERPOLATOR
+        }
+        child.alpha = startAlpha
+        child.translationY = startTranslationY
+        child.animate()
+            .alpha(endAlpha)
+            .translationY(endTranslationY)
+            .setStartDelay(if (delay) ANIMATE_TIME else 0L)
+            .setDuration(ANIMATE_TIME)
+            .setInterpolator(interpolator)
+            .setListener(object : SimpleAnimatorListener() {
+                override fun onAnimationStart(animation: Animator) {
+                    if (expanded) {
+                        child.visibility = VISIBLE
+                    }
+                }
+
+                override fun onAnimationEnd(animation: Animator) {
+                    if (!expanded) {
+                        child.visibility = INVISIBLE
+                    }
+                }
+            }).start()
+    }
+
+    override fun onClick(v: View) {
+        if (this === v) {
+            isExpanded = false
+        } else {
+            mOnClickFabListener?.let {
+                val position = indexOfChild(v)
+                if (position == childCount - 1) {
+                    it.onClickPrimaryFab(this, v as FloatingActionButton)
+                } else if (position >= 0 && mExpanded) {
+                    it.onClickSecondaryFab(this, v as FloatingActionButton, position)
+                }
+            }
+        }
+    }
+
+    override fun dispatchSetPressed(pressed: Boolean) {
+        // Don't dispatch it to children
+    }
+
+    override fun onSaveInstanceState(): Parcelable {
+        val state = Bundle()
+        state.putParcelable(STATE_KEY_SUPER, super.onSaveInstanceState())
+        state.putBoolean(STATE_KEY_AUTO_CANCEL, mAutoCancel)
+        state.putBoolean(STATE_KEY_EXPANDED, mExpanded)
+        return state
+    }
+
+    override fun onRestoreInstanceState(state: Parcelable) {
+        if (state is Bundle) {
+            super.onRestoreInstanceState(state.getParcelableCompat(STATE_KEY_SUPER))
+            setAutoCancel(state.getBoolean(STATE_KEY_AUTO_CANCEL))
+            setExpanded(state.getBoolean(STATE_KEY_EXPANDED), false)
+        }
+    }
+
+    fun interface OnExpandListener {
+        fun onExpand(expanded: Boolean)
+    }
+
+    interface OnClickFabListener {
+        fun onClickPrimaryFab(view: FabLayout, fab: FloatingActionButton)
+        fun onClickSecondaryFab(view: FabLayout, fab: FloatingActionButton, position: Int)
+    }
+
+    companion object {
+        private const val ANIMATE_TIME = 300L
+        private const val STATE_KEY_SUPER = "super"
+        private const val STATE_KEY_AUTO_CANCEL = "auto_cancel"
+        private const val STATE_KEY_EXPANDED = "expanded"
+    }
+}

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

@@ -0,0 +1,336 @@
+/*
+ * Copyright 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.animation.Animator
+import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewConfiguration
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
+import com.google.android.material.math.MathUtils.dist
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.util.AnimationUtils
+import com.hippo.ehviewer.util.SimpleAnimatorListener
+import com.hippo.ehviewer.util.SimpleHandler
+import com.hippo.ehviewer.util.dp2px
+import kotlin.math.abs
+
+class FastScroller : View {
+    private var mDraggable = false
+    private var mMinHandlerHeight = 0
+    private var mRecyclerView: RecyclerView? = null
+    private var mOnScrollChangeListener: RecyclerView.OnScrollListener? = null
+    private var mAdapter: RecyclerView.Adapter<*>? = null
+    private var mAdapterDataObserver: AdapterDataObserver? = null
+    private var mHandler: Drawable? = null
+    private var mHandlerOffset = INVALID
+    private var mHandlerHeight = INVALID
+    private var mDownX = INVALID.toFloat()
+    private var mDownY = INVALID.toFloat()
+    private var mLastMotionY = INVALID.toFloat()
+    private var mDragged = false
+    private var mCantDrag = false
+    private var mTouchSlop = 0
+    private var mListener: OnDragHandlerListener? = null
+    private var mShowAnimator: ObjectAnimator? = null
+    private var mHideAnimator: ObjectAnimator? = null
+    private val mHideRunnable = Runnable { mHideAnimator!!.start() }
+
+    constructor(context: Context) : super(context) {
+        init(context, null, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        init(context, attrs, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr,
+    ) {
+        init(context, attrs, defStyleAttr)
+    }
+
+    private fun init(context: Context, attrs: AttributeSet?, defStyleAttr: Int) {
+        val a = context.obtainStyledAttributes(attrs, R.styleable.FastScroller, defStyleAttr, 0)
+        mHandler = a.getDrawable(R.styleable.FastScroller_handler)
+        mDraggable = a.getBoolean(R.styleable.FastScroller_draggable, true)
+        a.recycle()
+        alpha = 0.0f
+        visibility = INVISIBLE
+        mMinHandlerHeight = dp2px(context, MIN_HANDLER_HEIGHT_DP.toFloat())
+        mTouchSlop = ViewConfiguration.get(context).scaledTouchSlop
+        mShowAnimator = ObjectAnimator.ofFloat(this, "alpha", 1.0f).apply {
+            interpolator = AnimationUtils.FAST_SLOW_INTERPOLATOR
+            duration = SCROLL_BAR_FADE_DURATION.toLong()
+        }
+        mHideAnimator = ObjectAnimator.ofFloat(this, "alpha", 0.0f).apply {
+            interpolator = AnimationUtils.SLOW_FAST_INTERPOLATOR
+            duration = SCROLL_BAR_FADE_DURATION.toLong()
+            addListener(object : SimpleAnimatorListener() {
+                private var mCancel = false
+                override fun onAnimationCancel(animation: Animator) {
+                    mCancel = true
+                }
+
+                override fun onAnimationEnd(animation: Animator) {
+                    if (mCancel) {
+                        mCancel = false
+                    } else {
+                        visibility = INVISIBLE
+                    }
+                }
+            })
+        }
+    }
+
+    fun setOnDragHandlerListener(listener: OnDragHandlerListener?) {
+        mListener = listener
+    }
+
+    private fun updatePosition(show: Boolean) {
+        if (mRecyclerView == null) {
+            return
+        }
+        val paddingTop = paddingTop
+        val paddingBottom = paddingBottom
+        val height = height - paddingTop - paddingBottom
+        val offset = mRecyclerView!!.computeVerticalScrollOffset()
+        val extent = mRecyclerView!!.computeVerticalScrollExtent()
+        val range = mRecyclerView!!.computeVerticalScrollRange()
+        if (height <= 0 || extent >= range || extent <= 0) {
+            return
+        }
+        var endOffset = height * offset / range
+        var endHeight = height * extent / range
+        endHeight = endHeight.coerceAtLeast(mMinHandlerHeight)
+        endOffset = endOffset.coerceAtMost(height - endHeight)
+        mHandlerOffset = endOffset + paddingTop
+        mHandlerHeight = endHeight
+        if (show) {
+            if (mHideAnimator!!.isRunning) {
+                mHideAnimator!!.cancel()
+                mShowAnimator!!.start()
+            } else if (visibility != VISIBLE && !mShowAnimator!!.isRunning) {
+                visibility = VISIBLE
+                mShowAnimator!!.start()
+            }
+            SimpleHandler.removeCallbacks(mHideRunnable)
+            if (!mDragged) {
+                SimpleHandler.postDelayed(mHideRunnable, SCROLL_BAR_DELAY.toLong())
+            }
+        }
+    }
+
+    fun setHandlerDrawable(drawable: Drawable?) {
+        mHandler = drawable
+        invalidate()
+    }
+
+    var isDraggable: Boolean
+        get() = mDraggable
+        set(draggable) {
+            mDraggable = draggable
+            if (mDragged) {
+                mDragged = false
+            }
+            SimpleHandler.removeCallbacks(mHideRunnable)
+            mHideRunnable.run()
+        }
+    val isAttached: Boolean
+        get() = mRecyclerView != null
+
+    fun attachToRecyclerView(recyclerView: RecyclerView?) {
+        if (recyclerView == null) {
+            return
+        }
+        check(mRecyclerView == null) {
+            "The FastScroller is already attached to a RecyclerView, " +
+                "call detachedFromRecyclerView first"
+        }
+        mRecyclerView = recyclerView
+        mOnScrollChangeListener = object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {}
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                updatePosition(true)
+                invalidate()
+            }
+        }
+        recyclerView.addOnScrollListener(mOnScrollChangeListener!!)
+        mAdapter = recyclerView.adapter
+        if (mAdapter != null) {
+            mAdapterDataObserver = object : AdapterDataObserver() {
+                override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
+                    super.onItemRangeChanged(positionStart, itemCount)
+                    updatePosition(false)
+                    invalidate()
+                }
+
+                override fun onItemRangeChanged(positionStart: Int, itemCount: Int, payload: Any?) {
+                    super.onItemRangeChanged(positionStart, itemCount, payload)
+                    updatePosition(false)
+                    invalidate()
+                }
+
+                override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+                    super.onItemRangeInserted(positionStart, itemCount)
+                    updatePosition(false)
+                    invalidate()
+                }
+
+                override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
+                    super.onItemRangeRemoved(positionStart, itemCount)
+                    updatePosition(false)
+                    invalidate()
+                }
+
+                override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
+                    super.onItemRangeMoved(fromPosition, toPosition, itemCount)
+                    updatePosition(false)
+                    invalidate()
+                }
+            }
+            mAdapter!!.registerAdapterDataObserver(mAdapterDataObserver!!)
+        }
+    }
+
+    fun detachedFromRecyclerView() {
+        if (mRecyclerView != null && mOnScrollChangeListener != null) {
+            mRecyclerView!!.removeOnScrollListener(mOnScrollChangeListener!!)
+        }
+        mRecyclerView = null
+        mOnScrollChangeListener = null
+        if (mAdapter != null && mAdapterDataObserver != null) {
+            mAdapter!!.unregisterAdapterDataObserver(mAdapterDataObserver!!)
+        }
+        mAdapter = null
+        mAdapterDataObserver = null
+        alpha = 0.0f
+        visibility = INVISIBLE
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        if (mRecyclerView == null || mHandler == null) {
+            return
+        }
+        if (mHandlerHeight == INVALID) {
+            updatePosition(false)
+        }
+        if (mHandlerHeight == INVALID) {
+            return
+        }
+        val paddingLeft = paddingLeft
+        val saved = canvas.save()
+        canvas.translate(paddingLeft.toFloat(), mHandlerOffset.toFloat())
+        mHandler!!.setBounds(0, 0, width - paddingLeft - paddingRight, mHandlerHeight)
+        mHandler!!.draw(canvas)
+        canvas.restoreToCount(saved)
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        if (!mDraggable || visibility != VISIBLE || mRecyclerView == null || mHandlerHeight == INVALID) {
+            return false
+        }
+        val action = event.action
+        if (action == MotionEvent.ACTION_DOWN) {
+            mCantDrag = false
+        }
+        if (mCantDrag) {
+            return false
+        }
+        when (action) {
+            MotionEvent.ACTION_DOWN -> {
+                mDragged = false
+                mDownX = event.x
+                mDownY = event.y
+                if (mDownY < mHandlerOffset || mDownY > mHandlerOffset + mHandlerHeight) {
+                    mCantDrag = true
+                    return false
+                }
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                if (!mDragged) {
+                    val x = event.x
+                    val y = event.y
+                    // Check touch slop
+                    if (dist(x, y, mDownX, mDownY) < mTouchSlop) {
+                        return true
+                    }
+                    if (abs(x - mDownX) > abs(y - mDownY) || y < mHandlerOffset || y > mHandlerOffset + mHandlerHeight) {
+                        mCantDrag = true
+                        return false
+                    } else {
+                        mDragged = true
+                        SimpleHandler.removeCallbacks(mHideRunnable)
+                        // Update mLastMotionY
+                        mLastMotionY =
+                            if (mDownY < mHandlerOffset || mDownY >= mHandlerOffset + mHandlerHeight) {
+                                // the point out of handler, make the point in handler center
+                                (mHandlerOffset + mHandlerHeight / 2).toFloat()
+                            } else {
+                                mDownY
+                            }
+                        // Notify
+                        if (mListener != null) {
+                            mListener!!.onStartDragHandler()
+                        }
+                    }
+                }
+                val range = mRecyclerView!!.computeVerticalScrollRange()
+                if (range <= 0) {
+                    return true
+                }
+                val y = event.y
+                val scroll =
+                    (range * (y - mLastMotionY) / (height - paddingTop - paddingBottom)).toInt()
+                mRecyclerView!!.scrollBy(0, scroll)
+                mLastMotionY = y
+            }
+
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                // Notify
+                if (mDragged && mListener != null) {
+                    mListener!!.onEndDragHandler()
+                }
+                mDragged = false
+                SimpleHandler.postDelayed(mHideRunnable, SCROLL_BAR_DELAY.toLong())
+            }
+        }
+        return true
+    }
+
+    interface OnDragHandlerListener {
+        fun onStartDragHandler()
+        fun onEndDragHandler()
+    }
+
+    companion object {
+        private const val INVALID = -1
+        private const val SCROLL_BAR_FADE_DURATION = 500
+        private const val SCROLL_BAR_DELAY = 1000
+        private const val MIN_HANDLER_HEIGHT_DP = 32
+    }
+}

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

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.PixelFormat
+import android.graphics.RectF
+import android.graphics.drawable.Drawable
+
+class HandlerDrawable : Drawable() {
+    private val mPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val mTemp = RectF()
+    private var mColor = Color.BLACK
+
+    init {
+        mPaint.color = mColor
+        mPaint.style = Paint.Style.FILL
+    }
+
+    override fun draw(canvas: Canvas) {
+        val width = bounds.width()
+        val height = bounds.height()
+        if (width > height) {
+            canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), mPaint)
+        } else {
+            mTemp[0f, 0f, width.toFloat()] = width.toFloat()
+            canvas.drawArc(mTemp, -180f, 180f, true, mPaint)
+            mTemp[0f, (height - width).toFloat(), width.toFloat()] = height.toFloat()
+            canvas.drawArc(mTemp, 0f, 180f, true, mPaint)
+            val halfWidth = width.toFloat() / 2.0f
+            canvas.drawRect(0f, halfWidth, width.toFloat(), height - halfWidth, mPaint)
+        }
+    }
+
+    fun setColor(color: Int) {
+        if (mColor != color) {
+            mColor = color
+            mPaint.color = color
+        }
+    }
+
+    override fun setAlpha(alpha: Int) {
+        mPaint.alpha = alpha
+    }
+
+    override fun setColorFilter(colorFilter: ColorFilter?) {
+        mPaint.colorFilter = colorFilter
+    }
+
+    @Deprecated("Deprecated in Java")
+    override fun getOpacity(): Int {
+        return when (Color.alpha(mColor)) {
+            0xff -> {
+                PixelFormat.OPAQUE
+            }
+
+            0x00 -> {
+                PixelFormat.TRANSPARENT
+            }
+
+            else -> {
+                PixelFormat.TRANSLUCENT
+            }
+        }
+    }
+}

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

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.widget.ListView
+import com.hippo.ehviewer.R
+
+@SuppressLint("CustomViewStyleable")
+class IndicatingListView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+) : ListView(context, attrs) {
+    private val mPaint = Paint()
+    private val mTemp = Rect()
+    private var mIndicatorHeight = 0
+
+    init {
+        val a = context.obtainStyledAttributes(attrs, R.styleable.Indicating)
+        mIndicatorHeight = a.getDimensionPixelOffset(R.styleable.Indicating_indicatorHeight, 1)
+        mPaint.color = a.getColor(
+            R.styleable.Indicating_indicatorColor,
+            Color.BLACK,
+        )
+        mPaint.style = Paint.Style.FILL
+        a.recycle()
+    }
+
+    private fun fillTopIndicatorDrawRect() {
+        mTemp[0, 0, width] = mIndicatorHeight
+    }
+
+    private fun fillBottomIndicatorDrawRect() {
+        mTemp[0, height - mIndicatorHeight, width] = height
+    }
+
+    private fun needShowTopIndicator(): Boolean {
+        return canScrollVertically(-1)
+    }
+
+    private fun needShowBottomIndicator(): Boolean {
+        return canScrollVertically(1)
+    }
+
+    override fun draw(canvas: Canvas) {
+        super.draw(canvas)
+        val restoreCount = canvas.save()
+        canvas.translate(scrollX.toFloat(), scrollY.toFloat())
+
+        // Draw top indicator
+        if (needShowTopIndicator()) {
+            fillTopIndicatorDrawRect()
+            canvas.drawRect(mTemp, mPaint)
+        }
+        // Draw bottom indicator
+        if (needShowBottomIndicator()) {
+            fillBottomIndicatorDrawRect()
+            canvas.drawRect(mTemp, mPaint)
+        }
+        canvas.restoreToCount(restoreCount)
+    }
+}

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

@@ -0,0 +1,153 @@
+/*
+ * Copyright 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.content.Context
+import android.graphics.PointF
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView.LayoutManager
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import com.google.android.material.math.MathUtils
+import com.hippo.ehviewer.util.SimpleHandler
+import java.lang.reflect.InvocationTargetException
+import java.lang.reflect.Method
+import kotlin.math.abs
+
+object LayoutManagerUtils {
+    private var sCsdfp: Method? = null
+
+    init {
+        try {
+            sCsdfp = StaggeredGridLayoutManager::class.java.getDeclaredMethod(
+                "calculateScrollDirectionForPosition",
+                Int::class.javaPrimitiveType,
+            ).apply { isAccessible = true }
+        } catch (e: NoSuchMethodException) {
+            // Ignore
+            e.printStackTrace()
+        }
+    }
+
+    fun scrollToPositionWithOffset(
+        layoutManager: LayoutManager,
+        position: Int,
+        offset: Int,
+    ) {
+        when (layoutManager) {
+            is LinearLayoutManager -> layoutManager.scrollToPositionWithOffset(position, offset)
+
+            is StaggeredGridLayoutManager ->
+                layoutManager.scrollToPositionWithOffset(position, offset)
+
+            else -> throw IllegalStateException("Can't do scrollToPositionWithOffset for " + layoutManager.javaClass.name)
+        }
+    }
+
+    fun smoothScrollToPosition(
+        layoutManager: LayoutManager,
+        context: Context,
+        position: Int,
+        millisecondsPerInch: Int = -1,
+    ) {
+        val smoothScroller: SimpleSmoothScroller
+        when (layoutManager) {
+            is LinearLayoutManager -> {
+                smoothScroller =
+                    object : SimpleSmoothScroller(context, millisecondsPerInch.toFloat()) {
+                        override fun computeScrollVectorForPosition(targetPosition: Int): PointF? {
+                            return layoutManager.computeScrollVectorForPosition(targetPosition)
+                        }
+                    }
+            }
+
+            is StaggeredGridLayoutManager -> {
+                smoothScroller =
+                    object : SimpleSmoothScroller(context, millisecondsPerInch.toFloat()) {
+                        override fun computeScrollVectorForPosition(targetPosition: Int): PointF? {
+                            var direction = 0
+                            try {
+                                direction = sCsdfp!!.invoke(layoutManager, targetPosition) as Int
+                            } catch (e: IllegalAccessException) {
+                                e.printStackTrace()
+                            } catch (e: InvocationTargetException) {
+                                e.printStackTrace()
+                            }
+                            if (direction == 0) {
+                                return null
+                            }
+                            return if (layoutManager.orientation == StaggeredGridLayoutManager.HORIZONTAL) {
+                                PointF(direction.toFloat(), 0f)
+                            } else {
+                                PointF(0f, direction.toFloat())
+                            }
+                        }
+                    }
+            }
+
+            else -> throw IllegalStateException("Can't do smoothScrollToPosition for " + layoutManager.javaClass.name)
+        }
+        smoothScroller.targetPosition = position
+        layoutManager.startSmoothScroll(smoothScroller)
+    }
+
+    fun scrollToPositionProperly(
+        layoutManager: LayoutManager,
+        context: Context,
+        position: Int,
+        listener: OnScrollToPositionListener?,
+    ) {
+        SimpleHandler.postDelayed({
+            val first = layoutManager.firstVisibleItemPosition
+            val last = getLastVisibleItemPosition(layoutManager)
+            val offset = abs(position - first)
+            val max = last - first
+            if (offset < max && max > 0) {
+                smoothScrollToPosition(
+                    layoutManager,
+                    context,
+                    position,
+                    MathUtils.lerp(100F, 25F, (offset / max).toFloat()).toInt(),
+                )
+            } else {
+                scrollToPositionWithOffset(layoutManager, position, 0)
+                listener?.onScrollToPosition(position)
+            }
+        }, 200)
+    }
+
+    val LayoutManager.firstVisibleItemPosition: Int
+        get() = when (this) {
+            is LinearLayoutManager -> findFirstVisibleItemPosition()
+            is StaggeredGridLayoutManager -> findFirstVisibleItemPositions(null).min()
+            else -> error("Can't do getFirstVisibleItemPosition for " + javaClass.name)
+        }
+
+    fun getLastVisibleItemPosition(layoutManager: LayoutManager): Int {
+        return when (layoutManager) {
+            is LinearLayoutManager -> layoutManager.findLastVisibleItemPosition()
+            is StaggeredGridLayoutManager -> {
+                val positions = layoutManager.findLastVisibleItemPositions(null)
+                positions.max()
+            }
+
+            else -> throw IllegalStateException("Can't do getLastVisibleItemPosition for " + layoutManager.javaClass.name)
+        }
+    }
+
+    fun interface OnScrollToPositionListener {
+        fun onScrollToPosition(position: Int)
+    }
+}

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

@@ -15,6 +15,7 @@
  */
 package com.hippo.ehviewer.ui.legacy
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.text.Spanned
 import android.text.style.ClickableSpan
@@ -25,8 +26,15 @@ import androidx.appcompat.widget.AppCompatTextView
 class LinkifyTextView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
-    private val onCurrentSpanUpdate: (ClickableSpan?) -> Unit,
 ) : AppCompatTextView(context, attrs) {
+    var currentSpan: ClickableSpan? = null
+        private set
+
+    fun clearCurrentSpan() {
+        currentSpan = null
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
         // Let the parent or grandparent of TextView to handles click aciton.
         // Otherwise click effect like ripple will not work, and if touch area
@@ -34,8 +42,10 @@ class LinkifyTextView @JvmOverloads constructor(
         // onTouchEven must be called with MotionEvent.ACTION_DOWN for each touch
         // action on it, so we analyze touched url here.
         if (event.action == MotionEvent.ACTION_DOWN) {
-            onCurrentSpanUpdate(null)
+            currentSpan = null
             if (text is Spanned) {
+                // Get this code from android.text.method.LinkMovementMethod.
+                // Work fine !
                 var x = event.x.toInt()
                 var y = event.y.toInt()
                 x -= totalPaddingLeft
@@ -48,7 +58,7 @@ class LinkifyTextView @JvmOverloads constructor(
                     val off = layout.getOffsetForHorizontal(line, x.toFloat())
                     val spans = (text as Spanned).getSpans(off, off, ClickableSpan::class.java)
                     if (spans.isNotEmpty()) {
-                        onCurrentSpanUpdate(spans[0])
+                        currentSpan = spans[0]
                     }
                 }
             }

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import androidx.appcompat.app.AlertDialog
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.databinding.DialogListCheckboxBuilderBinding
+
+class ListCheckBoxDialogBuilder(
+    context: Context,
+    items: List<CharSequence>,
+    listener: (ListCheckBoxDialogBuilder, AlertDialog?, Int) -> Unit,
+    checkText: String?,
+    checked: Boolean,
+) : BaseDialogBuilder(
+    context,
+) {
+    private val binding =
+        DialogListCheckboxBuilderBinding.inflate(LayoutInflater.from(getContext()))
+    private var mDialog: AlertDialog? = null
+    val isChecked get() = binding.checkbox.isChecked
+
+    override fun create(): AlertDialog {
+        mDialog = super.create()
+        return mDialog as AlertDialog
+    }
+
+    init {
+        setView(binding.root)
+        binding.listView.adapter = ArrayAdapter(getContext(), R.layout.item_select_dialog, items)
+        binding.listView.onItemClickListener =
+            AdapterView.OnItemClickListener { _, _, position, _ ->
+                listener(this@ListCheckBoxDialogBuilder, mDialog, position)
+                mDialog?.dismiss()
+            }
+        binding.checkbox.text = checkText
+        binding.checkbox.isChecked = checked
+    }
+}

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

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration
+
+class MarginItemDecoration(
+    margin: Int,
+    paddingLeft: Int,
+    paddingTop: Int,
+    paddingRight: Int,
+    paddingBottom: Int,
+) : ItemDecoration() {
+    private var mMargin = 0
+    private var mPaddingLeft = 0
+    private var mPaddingTop = 0
+    private var mPaddingRight = 0
+    private var mPaddingBottom = 0
+
+    init {
+        setMargin(margin, paddingLeft, paddingTop, paddingRight, paddingBottom)
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State,
+    ) {
+        outRect[mMargin, mMargin, mMargin] = mMargin
+    }
+
+    /**
+     * @param margin        gap between two item
+     * @param paddingLeft   gap between RecyclerView left and left item left
+     * @param paddingTop    gap between RecyclerView top and top item top
+     * @param paddingRight  gap between RecyclerView right and right item right
+     * @param paddingBottom gap between RecyclerView bottom and bottom item bottom
+     */
+    fun setMargin(
+        margin: Int,
+        paddingLeft: Int,
+        paddingTop: Int,
+        paddingRight: Int,
+        paddingBottom: Int,
+    ) {
+        val halfMargin = margin / 2
+        mMargin = halfMargin
+        mPaddingLeft = paddingLeft - halfMargin
+        mPaddingTop = paddingTop - halfMargin
+        mPaddingRight = paddingRight - halfMargin
+        mPaddingBottom = paddingBottom - halfMargin
+    }
+
+    fun applyPaddings(view: View) {
+        view.setPadding(mPaddingLeft, mPaddingTop, mPaddingRight, mPaddingBottom)
+    }
+}

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

@@ -0,0 +1,202 @@
+package com.hippo.ehviewer.ui.legacy
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.net.Uri
+import android.util.AttributeSet
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Tab
+import androidx.compose.material3.TabRow
+import androidx.compose.material3.Text
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.AbstractComposeView
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.findViewTreeViewModelStoreOwner
+import androidx.lifecycle.get
+import com.google.accompanist.themeadapter.material3.Mdc3Theme
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.data.ListUrlBuilder
+import com.hippo.ehviewer.client.exception.EhException
+import com.hippo.ehviewer.image.Image.Companion.decodeBitmap
+import com.hippo.ehviewer.ui.main.AdvancedSearchOption
+import com.hippo.ehviewer.ui.main.ImageSearch
+import com.hippo.ehviewer.ui.main.NormalSearch
+import com.hippo.ehviewer.ui.main.SearchAdvanced
+import com.hippo.ehviewer.util.AppConfig
+import com.hippo.ehviewer.util.findActivity
+import com.hippo.ehviewer.util.pickVisualMedia
+import kotlinx.coroutines.launch
+
+class SearchViewModel : ViewModel() {
+    var isNormalMode by mutableStateOf(true) // else ImageSearch mode
+    var isAdvancedMode by mutableStateOf(false)
+    var mCategory by mutableIntStateOf(Settings.searchCategory)
+    var mSearchMode by mutableIntStateOf(1)
+    var advancedState by mutableStateOf(AdvancedSearchOption())
+    var uss by mutableStateOf(false)
+    var osc by mutableStateOf(false)
+    var path by mutableStateOf("")
+}
+
+class SearchLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0,
+) : AbstractComposeView(context, attrs, defStyle) {
+    private val vm by lazy {
+        ViewModelProvider(findViewTreeViewModelStoreOwner()!!).get<SearchViewModel>()
+    }
+
+    @Composable
+    override fun Content() {
+        val coroutineScope = rememberCoroutineScope()
+        val windowSizeClass = calculateWindowSizeClass(activity = context.findActivity())
+        fun selectImage() = coroutineScope.launch {
+            context.pickVisualMedia(ActivityResultContracts.PickVisualMedia.ImageOnly)?.let {
+                vm.path = it.toString()
+            }
+        }
+        Mdc3Theme {
+            Column(modifier = Modifier.imePadding().verticalScroll(rememberScrollState()).navigationBarsPadding().padding(horizontal = dimensionResource(id = R.dimen.search_layout_margin_h))) {
+                AnimatedVisibility(visible = vm.isNormalMode) {
+                    ElevatedCard(modifier = Modifier.fillMaxWidth().padding(vertical = dimensionResource(id = R.dimen.search_layout_margin_v))) {
+                        Column(modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.search_category_padding_h), vertical = dimensionResource(id = R.dimen.search_category_padding_v))) {
+                            Text(text = stringResource(id = R.string.search_normal), modifier = Modifier.height(dimensionResource(id = R.dimen.search_category_title_height)), fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium)
+                            NormalSearch(
+                                category = vm.mCategory,
+                                onCategoryChanged = {
+                                    Settings.searchCategory = it
+                                    vm.mCategory = it
+                                },
+                                searchMode = vm.mSearchMode,
+                                onSearchModeChanged = { vm.mSearchMode = it },
+                                isAdvanced = vm.isAdvancedMode,
+                                onAdvancedChanged = { vm.isAdvancedMode = it },
+                                showInfo = { BaseDialogBuilder(context).setMessage(R.string.search_tip).show() },
+                                maxItemsInEachRow = when (windowSizeClass.widthSizeClass) {
+                                    WindowWidthSizeClass.Compact -> 2
+                                    WindowWidthSizeClass.Medium -> 3
+                                    else -> 5
+                                },
+                            )
+                        }
+                    }
+                }
+                AnimatedVisibility(visible = vm.isNormalMode && vm.isAdvancedMode) {
+                    ElevatedCard(modifier = Modifier.fillMaxWidth().padding(vertical = dimensionResource(id = R.dimen.search_layout_margin_v))) {
+                        Column(modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.search_category_padding_h), vertical = dimensionResource(id = R.dimen.search_category_padding_v))) {
+                            Text(text = stringResource(id = R.string.search_advance), modifier = Modifier.height(dimensionResource(id = R.dimen.search_category_title_height)), fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium)
+                            SearchAdvanced(
+                                state = vm.advancedState,
+                                onStateChanged = { vm.advancedState = it },
+                            )
+                        }
+                    }
+                }
+                AnimatedVisibility(visible = !vm.isNormalMode) {
+                    ElevatedCard(modifier = Modifier.fillMaxWidth().padding(vertical = dimensionResource(id = R.dimen.search_layout_margin_v))) {
+                        Column(modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.search_category_padding_h), vertical = dimensionResource(id = R.dimen.search_category_padding_v))) {
+                            Text(text = stringResource(id = R.string.search_image), modifier = Modifier.height(dimensionResource(id = R.dimen.search_category_title_height)), fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium)
+                            ImageSearch(
+                                imagePath = vm.path,
+                                onSelectImage = ::selectImage,
+                                uss = vm.uss,
+                                onUssChecked = { vm.uss = it },
+                                osc = vm.osc,
+                                onOscChecked = { vm.osc = it },
+                            )
+                        }
+                    }
+                }
+                TabRow(
+                    selectedTabIndex = if (vm.isNormalMode) 0 else 1,
+                    divider = {},
+                ) {
+                    Tab(
+                        selected = vm.isNormalMode,
+                        onClick = { vm.isNormalMode = true },
+                        text = { Text(text = stringResource(id = R.string.keyword_search)) },
+                    )
+                    Tab(
+                        selected = !vm.isNormalMode,
+                        onClick = { vm.isNormalMode = false },
+                        text = { Text(text = stringResource(id = R.string.search_image)) },
+                    )
+                }
+            }
+        }
+    }
+
+    fun setSearchMyTags(isMyTags: Boolean) {
+        if (isMyTags) vm.mSearchMode = 2
+    }
+
+    fun setCategory(category: Int) {
+        vm.mCategory = category
+    }
+
+    fun formatListUrlBuilder(urlBuilder: ListUrlBuilder, query: String?) {
+        urlBuilder.reset()
+        when (vm.isNormalMode) {
+            true -> {
+                when (vm.mSearchMode) {
+                    1 -> urlBuilder.mode = ListUrlBuilder.MODE_NORMAL
+                    2 -> urlBuilder.mode = ListUrlBuilder.MODE_SUBSCRIPTION
+                    3 -> urlBuilder.mode = ListUrlBuilder.MODE_UPLOADER
+                    4 -> urlBuilder.mode = ListUrlBuilder.MODE_TAG
+                }
+                urlBuilder.keyword = query
+                urlBuilder.category = vm.mCategory
+                if (vm.isAdvancedMode) {
+                    urlBuilder.advanceSearch = vm.advancedState.advanceSearch
+                    urlBuilder.minRating = vm.advancedState.minRating
+                    val pageFrom = vm.advancedState.fromPage
+                    val pageTo = vm.advancedState.toPage
+                    if (pageTo != -1 && pageTo < 10) {
+                        throw EhException(context.getString(R.string.search_sp_err1))
+                    } else if (pageFrom != -1 && pageTo != -1 && pageTo - pageFrom < 20) {
+                        throw EhException(context.getString(R.string.search_sp_err2))
+                    }
+                    urlBuilder.pageFrom = pageFrom
+                    urlBuilder.pageTo = pageTo
+                }
+            }
+
+            false -> {
+                urlBuilder.mode = ListUrlBuilder.MODE_IMAGE_SEARCH
+                if (vm.path.isBlank()) throw EhException(context.getString(R.string.select_image_first))
+                val uri = Uri.parse(vm.path)
+                val temp = AppConfig.createTempFile() ?: return
+                val bitmap = context.decodeBitmap(uri) ?: return
+                temp.outputStream().use { bitmap.compress(Bitmap.CompressFormat.JPEG, 90, it) }
+                urlBuilder.imagePath = temp.path
+                urlBuilder.isUseSimilarityScan = vm.uss
+                urlBuilder.isOnlySearchCovers = vm.osc
+            }
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.hippo.ehviewer.ui.legacy
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.AbstractComposeView
+import com.google.accompanist.themeadapter.material3.Mdc3Theme
+import com.hippo.ehviewer.ui.tools.GalleryListCardRating
+
+class SimpleRatingView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0,
+) : AbstractComposeView(context, attrs, defStyle) {
+    var rating by mutableFloatStateOf(0f)
+
+    @Composable
+    override fun Content() {
+        Mdc3Theme {
+            GalleryListCardRating(rating)
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.content.Context
+import androidx.recyclerview.widget.LinearSmoothScroller
+import kotlin.math.abs
+import kotlin.math.ceil
+
+abstract class SimpleSmoothScroller(context: Context, millisecondsPerInch: Float) :
+    LinearSmoothScroller(context) {
+    private val mMillisecondsPerPx: Float
+
+    init {
+        mMillisecondsPerPx = millisecondsPerInch / context.resources.displayMetrics.densityDpi
+    }
+
+    override fun calculateTimeForScrolling(dx: Int): Int {
+        return if (mMillisecondsPerPx <= 0) {
+            super.calculateTimeForScrolling(dx)
+        } else {
+            ceil((abs(dx) * mMillisecondsPerPx).toDouble()).toInt()
+        }
+    }
+}

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

@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.view.View
+import android.view.ViewPropertyAnimator
+
+open class ViewTransition(vararg views: View) {
+    private val mViews: Array<View>
+    protected var mAnimator1: ViewPropertyAnimator? = null
+    protected var mAnimator2: ViewPropertyAnimator? = null
+    var shownViewIndex = -1
+        private set
+    private var mOnShowViewListener: OnShowViewListener? = null
+
+    init {
+        check(views.size >= 2) { "You must pass view to ViewTransition" }
+        mViews = arrayOf(*views)
+        showView(0, false)
+    }
+
+    fun setOnShowViewListener(listener: OnShowViewListener?) {
+        mOnShowViewListener = listener
+    }
+
+    fun showView(shownView: Int, animation: Boolean = true): Boolean {
+        val views = mViews
+        val length = views.size
+        if (shownView >= length || shownView < 0) {
+            throw IndexOutOfBoundsException(
+                "Only " + length + " view(s) in " +
+                    "the ViewTransition, but attempt to show " + shownView,
+            )
+        }
+        return if (shownViewIndex != shownView) {
+            val oldShownView = shownViewIndex
+            shownViewIndex = shownView
+
+            // Cancel animation
+            if (mAnimator1 != null) {
+                mAnimator1!!.cancel()
+            }
+            if (mAnimator2 != null) {
+                mAnimator2!!.cancel()
+            }
+            if (animation) {
+                startAnimations(views[oldShownView], views[shownView])
+            } else {
+                for (i in 0 until length) {
+                    val v = views[i]
+                    if (i == shownView) {
+                        v.alpha = 1f
+                        v.visibility = View.VISIBLE
+                    } else {
+                        v.alpha = 0f
+                        v.visibility = View.GONE
+                    }
+                }
+            }
+            if (null != mOnShowViewListener) {
+                mOnShowViewListener!!.onShowView(views[oldShownView], views[shownView])
+            }
+            true
+        } else {
+            false
+        }
+    }
+
+    protected open fun startAnimations(hiddenView: View, shownView: View) {
+        mAnimator1 = hiddenView.animate().alpha(0f)
+        mAnimator1!!.setDuration(ANIMATE_TIME).setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                hiddenView.visibility = View.GONE
+                mAnimator1 = null
+            }
+        }).start()
+        shownView.alpha = 0f
+        shownView.visibility = View.VISIBLE
+        mAnimator2 = shownView.animate().alpha(1f)
+        mAnimator2!!.setDuration(ANIMATE_TIME).setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                mAnimator2 = null
+            }
+        }).start()
+    }
+
+    interface OnShowViewListener {
+        fun onShowView(hiddenView: View, shownView: View)
+    }
+
+    companion object {
+        const val ANIMATE_TIME = 300L
+    }
+}

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

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2022 Tarsin Norbin
+ *
+ * This file is part of EhViewer
+ *
+ * EhViewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * EhViewer is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with EhViewer.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.hippo.ehviewer.ui.legacy
+
+import android.view.View
+import androidx.core.view.WindowInsetsAnimationCompat
+import androidx.core.view.WindowInsetsAnimationCompat.BoundsCompat
+import androidx.core.view.WindowInsetsCompat
+import com.google.android.material.math.MathUtils
+
+class WindowInsetsAnimationHelper(dispatchMode: Int, vararg views: View) :
+    WindowInsetsAnimationCompat.Callback(dispatchMode) {
+    private val views: Array<View>
+    private val startPaddings = HashMap<View, Int>()
+    private val endPaddings = HashMap<View, Int>()
+    var animation: WindowInsetsAnimationCompat? = null
+
+    init {
+        this.views = arrayOf(*views)
+    }
+
+    override fun onPrepare(animation: WindowInsetsAnimationCompat) {
+        super.onPrepare(animation)
+        this.animation = animation
+        for (view in views) {
+            startPaddings[view] = view.paddingBottom
+        }
+    }
+
+    override fun onStart(
+        animation: WindowInsetsAnimationCompat,
+        bounds: BoundsCompat,
+    ): BoundsCompat {
+        this.animation = animation
+        for (view in views) {
+            endPaddings[view] = view.paddingBottom
+            val startPadding = if (startPaddings.containsKey(view)) startPaddings[view]!! else 0
+            view.translationY = -(startPadding - view.paddingBottom).toFloat()
+        }
+        return bounds
+    }
+
+    override fun onProgress(
+        insets: WindowInsetsCompat,
+        runningAnimations: List<WindowInsetsAnimationCompat>,
+    ): WindowInsetsCompat {
+        if (animation == null) {
+            return insets
+        }
+        var imeAnimation: WindowInsetsAnimationCompat? = null
+        for (animation in runningAnimations) {
+            if (animation.typeMask and WindowInsetsCompat.Type.ime() != 0) {
+                imeAnimation = animation
+                break
+            }
+        }
+        if (imeAnimation != null) {
+            for (view in views) {
+                val startPadding = if (startPaddings.containsKey(view)) startPaddings[view]!! else 0
+                val endPadding = if (endPaddings.containsKey(view)) endPaddings[view]!! else 0
+                view.translationY = MathUtils.lerp(
+                    (endPadding - startPadding).toFloat(),
+                    0f,
+                    animation!!.interpolatedFraction,
+                )
+            }
+        }
+        return insets
+    }
+
+    override fun onEnd(animation: WindowInsetsAnimationCompat) {
+        super.onEnd(animation)
+        startPaddings.clear()
+        endPaddings.clear()
+        this.animation = null
+        for (view in views) {
+            view.translationY = 0f
+        }
+    }
+}

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

@@ -28,6 +28,7 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -55,13 +56,11 @@ import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.destinations.FinishDestination
-import com.hippo.ehviewer.ui.destinations.SelectSiteScreenDestination
+import com.hippo.ehviewer.ui.FINISH_ROUTE_NAME
+import com.hippo.ehviewer.ui.LocalNavController
+import com.hippo.ehviewer.ui.SELECT_SITE_ROUTE_NAME
 import com.hippo.ehviewer.ui.tools.LocalDialogState
-import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass
 import com.hippo.ehviewer.util.ExceptionUtils
-import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
 import eu.kanade.tachiyomi.util.lang.withUIContext
@@ -70,10 +69,9 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import okhttp3.Cookie
 
-@Destination
 @Composable
-fun CookieSignInScene(navigator: DestinationsNavigator) {
-    val windowSizeClass = LocalWindowSizeClass.current
+fun CookieSignInScene(windowSizeClass: WindowSizeClass) {
+    val navController = LocalNavController.current
     val clipboardManager = LocalClipboardManager.current
     val focusManager = LocalFocusManager.current
     val snackbarHostState = remember { SnackbarHostState() }
@@ -126,12 +124,11 @@ fun CookieSignInScene(navigator: DestinationsNavigator) {
                 EhEngine.getProfile()
             }.onSuccess {
                 val canEx = withNonCancellableContext { postLogin() }
-                withUIContext { navigator.navigate(if (canEx) SelectSiteScreenDestination else FinishDestination) }
+                withUIContext { navController.navigate(if (canEx) SELECT_SITE_ROUTE_NAME else FINISH_ROUTE_NAME) }
             }.onFailure {
                 EhCookieStore.signOut()
                 dialogState.awaitPermissionOrCancel(
                     confirmText = R.string.get_it,
-                    showCancelButton = false,
                     title = R.string.sign_in_failed,
                     text = {
                         Text(

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

@@ -29,14 +29,13 @@ import androidx.compose.ui.unit.dp
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.ui.destinations.FinishDestination
-import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.hippo.ehviewer.ui.FINISH_ROUTE_NAME
+import com.hippo.ehviewer.ui.LocalNavController
 
-@Destination
 @Composable
-fun SelectSiteScreen(navigator: DestinationsNavigator) {
+fun SelectSiteScreen() {
     var siteEx by remember { mutableStateOf(true) }
+    val navController = LocalNavController.current
     val context = LocalContext.current
 
     BackHandler {
@@ -71,7 +70,7 @@ fun SelectSiteScreen(navigator: DestinationsNavigator) {
                     // Gallery site was set to ex in sad panda check
                     if (!siteEx) Settings.gallerySite = EhUrl.SITE_E
                     Settings.needSignIn = false
-                    navigator.navigate(FinishDestination)
+                    navController.navigate(FINISH_ROUTE_NAME)
                 },
                 modifier = Modifier.fillMaxWidth(),
             ) {

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

@@ -32,6 +32,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -61,25 +62,22 @@ import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.destinations.CookieSignInSceneDestination
-import com.hippo.ehviewer.ui.destinations.FinishDestination
-import com.hippo.ehviewer.ui.destinations.SelectSiteScreenDestination
-import com.hippo.ehviewer.ui.destinations.WebViewSignInScreenDestination
+import com.hippo.ehviewer.ui.COOKIE_SIGN_IN_ROUTE_NAME
+import com.hippo.ehviewer.ui.FINISH_ROUTE_NAME
+import com.hippo.ehviewer.ui.LocalNavController
+import com.hippo.ehviewer.ui.SELECT_SITE_ROUTE_NAME
+import com.hippo.ehviewer.ui.WEBVIEW_SIGN_IN_ROUTE_NAME
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.ui.tools.LocalDialogState
-import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass
 import com.hippo.ehviewer.util.ExceptionUtils
-import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.Job
 
-@Destination
 @Composable
-fun SignInScreen(navigator: DestinationsNavigator) {
-    val windowSizeClass = LocalWindowSizeClass.current
+fun SignInScreen(windowSizeClass: WindowSizeClass) {
+    val navController = LocalNavController.current
     val coroutineScope = rememberCoroutineScope()
     val focusManager = LocalFocusManager.current
     var isProgressIndicatorVisible by rememberSaveable { mutableStateOf(false) }
@@ -122,7 +120,6 @@ fun SignInScreen(navigator: DestinationsNavigator) {
                     focusManager.clearFocus()
                     dialogState.awaitPermissionOrCancel(
                         confirmText = R.string.get_it,
-                        showCancelButton = false,
                         title = R.string.sign_in_failed,
                         text = {
                             Text(
@@ -137,7 +134,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
                 }
             }.onSuccess {
                 val canEx = withNonCancellableContext { postLogin() }
-                withUIContext { navigator.navigate(if (canEx) SelectSiteScreenDestination else FinishDestination) }
+                withUIContext { navController.navigate(if (canEx) SELECT_SITE_ROUTE_NAME else FINISH_ROUTE_NAME) }
             }
         }
     }
@@ -219,7 +216,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
                     }
                     Row(modifier = Modifier.padding(horizontal = 4.dp)) {
                         TextButton(
-                            onClick = { navigator.navigate(WebViewSignInScreenDestination) },
+                            onClick = { navController.navigate(WEBVIEW_SIGN_IN_ROUTE_NAME) },
                             modifier = Modifier.padding(horizontal = 8.dp),
                         ) {
                             Text(
@@ -233,7 +230,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
                             )
                         }
                         TextButton(
-                            onClick = { navigator.navigate(CookieSignInSceneDestination) },
+                            onClick = { navController.navigate(COOKIE_SIGN_IN_ROUTE_NAME) },
                             modifier = Modifier.padding(horizontal = 8.dp),
                         ) {
                             Text(
@@ -251,7 +248,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
                         onClick = {
                             Settings.needSignIn = false
                             Settings.gallerySite = EhUrl.SITE_E
-                            navigator.navigate(FinishDestination)
+                            navController.navigate(FINISH_ROUTE_NAME)
                         },
                     ) {
                         Text(
@@ -315,7 +312,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
                         Spacer(modifier = Modifier.height(8.dp))
                         Row(horizontalArrangement = Arrangement.Center) {
                             TextButton(
-                                onClick = { navigator.navigate(CookieSignInSceneDestination) },
+                                onClick = { navController.navigate(COOKIE_SIGN_IN_ROUTE_NAME) },
                                 modifier = Modifier.padding(horizontal = 4.dp),
                             ) {
                                 Text(
@@ -329,7 +326,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
                                 )
                             }
                             TextButton(
-                                onClick = { navigator.navigate(WebViewSignInScreenDestination) },
+                                onClick = { navController.navigate(WEBVIEW_SIGN_IN_ROUTE_NAME) },
                                 modifier = Modifier.padding(horizontal = 4.dp),
                             ) {
                                 Text(
@@ -347,7 +344,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
                             onClick = {
                                 Settings.needSignIn = false
                                 Settings.gallerySite = EhUrl.SITE_E
-                                navigator.navigate(FinishDestination)
+                                navController.navigate(FINISH_ROUTE_NAME)
                             },
                             modifier = Modifier.padding(horizontal = 4.dp),
                         ) {

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

@@ -14,19 +14,18 @@ import com.google.accompanist.web.rememberWebViewState
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.destinations.FinishDestination
-import com.hippo.ehviewer.ui.destinations.SelectSiteScreenDestination
+import com.hippo.ehviewer.ui.FINISH_ROUTE_NAME
+import com.hippo.ehviewer.ui.LocalNavController
+import com.hippo.ehviewer.ui.SELECT_SITE_ROUTE_NAME
 import com.hippo.ehviewer.util.setDefaultSettings
-import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import okhttp3.HttpUrl.Companion.toHttpUrl
 
-@Destination
 @Composable
-fun WebViewSignInScreen(navigator: DestinationsNavigator) {
+fun WebViewSignInScreen() {
+    val navController = LocalNavController.current
     val coroutineScope = rememberCoroutineScope()
     val state = rememberWebViewState(url = EhUrl.URL_SIGN_IN)
     val client = remember {
@@ -50,7 +49,7 @@ fun WebViewSignInScreen(navigator: DestinationsNavigator) {
                     present = true
                     coroutineScope.launchIO {
                         val canEx = withNonCancellableContext { postLogin() }
-                        withUIContext { navigator.navigate(if (canEx) SelectSiteScreenDestination else FinishDestination) }
+                        withUIContext { navController.navigate(if (canEx) SELECT_SITE_ROUTE_NAME else FINISH_ROUTE_NAME) }
                     }
                 }
             }

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

@@ -1,20 +1,16 @@
 package com.hippo.ehviewer.ui.main
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
 object AdvanceTable {
     const val SH = 0x1
     const val STO = 0x2
-    const val SFL = 0x4
-    const val SFU = 0x8
-    const val SFT = 0x10
+    const val SFL = 0x100
+    const val SFU = 0x200
+    const val SFT = 0x400
 }
 
-@Parcelize
 data class AdvancedSearchOption(
     val advanceSearch: Int = 0,
     val minRating: Int = -1,
     val fromPage: Int = -1,
     val toPage: Int = -1,
-) : Parcelable
+)

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

@@ -1,11 +1,11 @@
 package com.hippo.ehviewer.ui.main
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Checkbox
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.ExposedDropdownMenuDefaults
@@ -28,35 +28,32 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.ui.tools.LabeledCheckbox
 import com.hippo.ehviewer.util.toIntOrDefault
 
 @Composable
 fun SearchAdvanced(
-    modifier: Modifier = Modifier,
     state: AdvancedSearchOption,
     onStateChanged: (AdvancedSearchOption) -> Unit,
-) = FlowRow(modifier = modifier, horizontalArrangement = Arrangement.Center, maxItemsInEachRow = 2) {
+) = Column {
     ProvideTextStyle(MaterialTheme.typography.bodyMedium) {
         val adv = state.advanceSearch
         fun checked(bit: Int) = adv and bit != 0
-        fun AdvancedSearchOption.inv(bit: Int) = onStateChanged(copy(advanceSearch = advanceSearch xor bit))
-        LabeledCheckbox(
-            checked = checked(AdvanceTable.SH),
-            onCheckedChange = { state.inv(AdvanceTable.SH) },
-            label = stringResource(id = R.string.search_sh),
-        )
-        LabeledCheckbox(
-            checked = checked(AdvanceTable.STO),
-            onCheckedChange = { state.inv(AdvanceTable.STO) },
-            label = stringResource(id = R.string.search_sto),
-        )
+        fun AdvancedSearchOption.inv(checked: Boolean, bit: Int) = onStateChanged(copy(advanceSearch = if (!checked) advanceSearch xor bit else advanceSearch or bit))
+        Row {
+            Row(modifier = Modifier.weight(1f)) {
+                Checkbox(checked = checked(AdvanceTable.SH), onCheckedChange = { state.inv(it, AdvanceTable.SH) })
+                Text(text = stringResource(id = R.string.search_sh), modifier = Modifier.align(Alignment.CenterVertically))
+            }
+            Row(modifier = Modifier.weight(1f)) {
+                Checkbox(checked = checked(AdvanceTable.STO), onCheckedChange = { state.inv(it, AdvanceTable.STO) })
+                Text(text = stringResource(id = R.string.search_sto), modifier = Modifier.align(Alignment.CenterVertically))
+            }
+        }
         val minRatingItems = stringArrayResource(id = R.array.search_min_rating)
         var expanded by remember { mutableStateOf(false) }
         ExposedDropdownMenuBox(
             expanded = expanded,
             onExpandedChange = { expanded = !expanded },
-            modifier = Modifier.align(Alignment.CenterVertically).padding(12.dp),
         ) {
             val softwareKeyboardController = LocalSoftwareKeyboardController.current
             OutlinedTextField(
@@ -90,11 +87,8 @@ fun SearchAdvanced(
         }
         Row(verticalAlignment = Alignment.CenterVertically) {
             var enabled by rememberSaveable { mutableStateOf(false) }
-            LabeledCheckbox(
-                checked = enabled,
-                onCheckedChange = { enabled = it },
-                label = stringResource(id = R.string.search_sp),
-            )
+            Checkbox(checked = enabled, onCheckedChange = { enabled = it })
+            Text(text = stringResource(id = R.string.search_sp), modifier = Modifier.align(Alignment.CenterVertically))
             OutlinedTextField(
                 keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword),
                 value = if (enabled && state.fromPage != -1) state.fromPage.toString() else "",
@@ -103,7 +97,7 @@ fun SearchAdvanced(
                 singleLine = true,
                 enabled = enabled,
             )
-            Text(text = stringResource(id = R.string.search_sp_to))
+            Text(text = stringResource(id = R.string.search_sp_to), modifier = Modifier.align(Alignment.CenterVertically))
             OutlinedTextField(
                 keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword),
                 value = if (enabled && state.toPage != -1) state.toPage.toString() else "",
@@ -112,25 +106,22 @@ fun SearchAdvanced(
                 singleLine = true,
                 enabled = enabled,
             )
-            Text(text = stringResource(id = R.string.search_sp_suffix))
+            Text(text = stringResource(id = R.string.search_sp_suffix), modifier = Modifier.align(Alignment.CenterVertically))
         }
-        Text(text = stringResource(id = R.string.search_sf), modifier = Modifier.align(Alignment.CenterVertically))
-        FlowRow {
-            LabeledCheckbox(
-                checked = checked(AdvanceTable.SFL),
-                onCheckedChange = { state.inv(AdvanceTable.SFL) },
-                label = stringResource(id = R.string.search_sfl),
-            )
-            LabeledCheckbox(
-                checked = checked(AdvanceTable.SFU),
-                onCheckedChange = { state.inv(AdvanceTable.SFU) },
-                label = stringResource(id = R.string.search_sfu),
-            )
-            LabeledCheckbox(
-                checked = checked(AdvanceTable.SFT),
-                onCheckedChange = { state.inv(AdvanceTable.SFT) },
-                label = stringResource(id = R.string.search_sft),
-            )
+        Text(text = stringResource(id = R.string.search_sf))
+        Row {
+            Row(modifier = Modifier.weight(1f)) {
+                Checkbox(checked = checked(AdvanceTable.SFL), onCheckedChange = { state.inv(it, AdvanceTable.SFL) })
+                Text(text = stringResource(id = R.string.search_sfl), modifier = Modifier.align(Alignment.CenterVertically))
+            }
+            Row(modifier = Modifier.weight(1f)) {
+                Checkbox(checked = checked(AdvanceTable.SFU), onCheckedChange = { state.inv(it, AdvanceTable.SFU) })
+                Text(text = stringResource(id = R.string.search_sfu), modifier = Modifier.align(Alignment.CenterVertically))
+            }
+            Row(modifier = Modifier.weight(1f)) {
+                Checkbox(checked = checked(AdvanceTable.SFT), onCheckedChange = { state.inv(it, AdvanceTable.SFT) })
+                Text(text = stringResource(id = R.string.search_sft), modifier = Modifier.align(Alignment.CenterVertically))
+            }
         }
     }
 }

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

@@ -1,269 +0,0 @@
-package com.hippo.ehviewer.ui.main
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Pause
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material3.Card
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ProvideTextStyle
-import androidx.compose.material3.ShapeDefaults
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-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 androidx.constraintlayout.compose.ConstraintLayout
-import coil.compose.AsyncImage
-import coil.compose.AsyncImagePainter
-import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.coil.read
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.download.downloadDir
-import com.hippo.ehviewer.ktbuilder.imageRequest
-import com.hippo.ehviewer.ui.tools.CropDefaults
-import com.hippo.ehviewer.ui.tools.CrystalCard
-import com.hippo.ehviewer.ui.tools.DragHandle
-import com.hippo.ehviewer.ui.tools.GalleryListCardRating
-import com.hippo.ehviewer.util.FileUtils
-import com.hippo.ehviewer.util.sendTo
-import com.hippo.unifile.UniFile
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import sh.calvin.reorderable.ReorderableItemScope
-
-@Composable
-private fun AsyncThumb(
-    info: DownloadInfo,
-    modifier: Modifier = Modifier,
-) {
-    val path = remember(info.gid) { info.downloadDir?.subFile(".thumb") }
-    var contentScale by remember(info.gid) { mutableStateOf(ContentScale.Fit) }
-    val coroutineScope = rememberCoroutineScope { Dispatchers.IO }
-    val context = LocalContext.current
-    var localReq by remember(info.gid) {
-        path?.takeIf { it.isFile }?.uri?.let {
-            context.imageRequest {
-                data(it.toString())
-                memoryCacheKey(info.thumbKey)
-            }
-        }.let { mutableStateOf(it) }
-    }
-    AsyncImage(
-        model = localReq ?: requestOf(info),
-        contentDescription = null,
-        modifier = modifier,
-        onState = { state ->
-            if (state is AsyncImagePainter.State.Success) {
-                state.result.drawable.run {
-                    if (CropDefaults.shouldCrop(intrinsicWidth, intrinsicHeight)) {
-                        contentScale = ContentScale.Crop
-                    }
-                }
-                path?.let {
-                    coroutineScope.launch {
-                        runCatching {
-                            if (!path.exists() && path.ensureFile()) {
-                                val key = info.thumbKey!!
-                                EhApplication.imageCache.read(key) {
-                                    UniFile.fromFile(data.toFile())!!.openFileDescriptor("r").use { src ->
-                                        path.openFileDescriptor("w").use { dst ->
-                                            src sendTo dst
-                                        }
-                                    }
-                                }
-                            }
-                        }.onFailure {
-                            it.printStackTrace()
-                        }
-                    }
-                }
-            }
-            if (state is AsyncImagePainter.State.Error) {
-                path?.let {
-                    coroutineScope.launch {
-                        if (path.exists()) {
-                            path.delete()
-                            localReq = null
-                        }
-                    }
-                }
-            }
-        },
-        contentScale = contentScale,
-    )
-}
-
-@Composable
-fun ReorderableItemScope.DownloadCard(
-    onClick: () -> Unit,
-    onThumbClick: () -> Unit,
-    onLongClick: () -> Unit,
-    onStart: () -> Unit,
-    onStop: () -> Unit,
-    info: DownloadInfo,
-    modifier: Modifier = Modifier,
-) {
-    CrystalCard(
-        modifier = modifier,
-        onClick = onClick,
-        onLongClick = onLongClick,
-    ) {
-        Row {
-            Card(onClick = onThumbClick) {
-                AsyncThumb(
-                    info = info,
-                    modifier = Modifier.aspectRatio(DEFAULT_ASPECT).fillMaxSize(),
-                )
-            }
-
-            val stateFailed = stringResource(R.string.download_state_failed)
-            val stateFailed2 = stringResource(R.string.download_state_failed_2, info.legacy)
-            val downloadState by DownloadManager.collectDownloadState(info.gid)
-            val stateText = when (downloadState) {
-                DownloadInfo.STATE_NONE -> stringResource(R.string.download_state_none)
-                DownloadInfo.STATE_WAIT -> stringResource(R.string.download_state_wait)
-                DownloadInfo.STATE_DOWNLOAD -> null
-                DownloadInfo.STATE_FAILED -> if (info.legacy <= 0) stateFailed else stateFailed2
-                DownloadInfo.STATE_FINISH -> stringResource(R.string.download_state_finish)
-                else -> null // Chill, will be removed soon
-            }
-            ConstraintLayout(modifier = Modifier.padding(8.dp, 4.dp).fillMaxSize()) {
-                val (
-                    titleRef, uploaderRef, ratingRef, categoryRef, actionsRef, stateTextRef,
-                    progressBarRef, progressTextRef, speedRef,
-                ) = createRefs()
-                Text(
-                    text = EhUtils.getSuitableTitle(info),
-                    maxLines = 2,
-                    modifier = Modifier.constrainAs(titleRef) {
-                        top.linkTo(parent.top)
-                        start.linkTo(parent.start)
-                    }.fillMaxWidth(),
-                    overflow = TextOverflow.Ellipsis,
-                    style = MaterialTheme.typography.titleSmall,
-                )
-                if (downloadState != DownloadInfo.STATE_DOWNLOAD) {
-                    ProvideTextStyle(MaterialTheme.typography.labelLarge) {
-                        info.uploader?.let {
-                            Text(
-                                text = it,
-                                modifier = Modifier.constrainAs(uploaderRef) {
-                                    start.linkTo(parent.start)
-                                    bottom.linkTo(ratingRef.top)
-                                }.alpha(if (info.disowned) 0.5f else 1f),
-                                maxLines = 1,
-                                overflow = TextOverflow.Ellipsis,
-                            )
-                        }
-                        GalleryListCardRating(
-                            rating = info.rating,
-                            modifier = Modifier.constrainAs(ratingRef) {
-                                start.linkTo(parent.start)
-                                bottom.linkTo(categoryRef.top)
-                            },
-                        )
-                        val categoryColor = EhUtils.getCategoryColor(info.category)
-                        val categoryText = EhUtils.getCategory(info.category).uppercase()
-                        Text(
-                            text = categoryText,
-                            modifier = Modifier.constrainAs(categoryRef) {
-                                start.linkTo(parent.start)
-                                bottom.linkTo(parent.bottom)
-                            }.clip(ShapeDefaults.Small).background(categoryColor).padding(vertical = 2.dp, horizontal = 8.dp),
-                            color = if (Settings.harmonizeCategoryColor) Color.Unspecified else EhUtils.categoryTextColor,
-                            textAlign = TextAlign.Center,
-                        )
-                    }
-                } else {
-                    val (total, finished, speed) = DownloadManager.updatedDownloadInfo(info) {
-                        Triple(total, finished, speed)
-                    }
-                    ProvideTextStyle(MaterialTheme.typography.labelMedium) {
-                        if (total <= 0 || finished < 0) {
-                            LinearProgressIndicator(
-                                modifier = Modifier.constrainAs(progressBarRef) {
-                                    bottom.linkTo(actionsRef.top)
-                                }.fillMaxWidth(),
-                            )
-                        } else {
-                            LinearProgressIndicator(
-                                progress = { finished.toFloat() / total.toFloat() },
-                                modifier = Modifier.constrainAs(progressBarRef) {
-                                    bottom.linkTo(actionsRef.top)
-                                }.fillMaxWidth(),
-                            )
-                            Text(
-                                text = "$finished/$total",
-                                modifier = Modifier.constrainAs(progressTextRef) {
-                                    bottom.linkTo(progressBarRef.top)
-                                    start.linkTo(progressBarRef.start)
-                                },
-                            )
-                        }
-                        Text(
-                            text = FileUtils.humanReadableByteCount(speed.coerceAtLeast(0), false) + "/S",
-                            modifier = Modifier.constrainAs(speedRef) {
-                                bottom.linkTo(progressBarRef.top)
-                                end.linkTo(progressBarRef.end)
-                            },
-                        )
-                    }
-                }
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.constrainAs(actionsRef) {
-                        end.linkTo(parent.end)
-                        bottom.linkTo(parent.bottom)
-                    },
-                ) {
-                    DragHandle()
-                    if (downloadState == DownloadInfo.STATE_WAIT || downloadState == DownloadInfo.STATE_DOWNLOAD) {
-                        IconButton(onClick = onStop) {
-                            Icon(imageVector = Icons.Default.Pause, contentDescription = null)
-                        }
-                    } else {
-                        IconButton(onClick = onStart) {
-                            Icon(imageVector = Icons.Default.PlayArrow, contentDescription = null)
-                        }
-                    }
-                }
-                if (stateText != null) {
-                    Text(
-                        text = stateText,
-                        modifier = Modifier.constrainAs(stateTextRef) {
-                            end.linkTo(parent.end, 16.dp)
-                            bottom.linkTo(actionsRef.top)
-                        },
-                        style = MaterialTheme.typography.titleSmall,
-                    )
-                }
-            }
-        }
-    }
-}

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

@@ -1,222 +0,0 @@
-package com.hippo.ehviewer.ui.main
-
-import androidx.activity.compose.PredictiveBackHandler
-import androidx.compose.animation.core.Animatable
-import androidx.compose.animation.core.AnimationSpec
-import androidx.compose.animation.core.EaseOut
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.MutatePriority
-import androidx.compose.foundation.MutatorMutex
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.SmallFloatingActionButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.snapshotFlow
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.layout
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.lerp
-import eu.kanade.tachiyomi.util.lang.launchIO
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import moe.tarsin.coroutines.runSuspendCatching
-
-enum class FabLayoutValue {
-    Hidden,
-    Primary,
-    Expand,
-}
-
-@Composable
-fun rememberFabLayoutState(initialValue: FabLayoutValue = FabLayoutValue.Primary): FabLayoutState {
-    return remember { FabLayoutState(initialValue) }
-}
-
-@Stable
-class FabLayoutState(
-    initialValue: FabLayoutValue,
-    private val animationSpec: AnimationSpec<Float> = tween(FAB_ANIMATE_TIME),
-) {
-    val mutatorMutex = MutatorMutex()
-
-    val appearProgress = Animatable(if (initialValue != FabLayoutValue.Hidden) 1f else 0f)
-        .apply { updateBounds(0f, 1f) }
-
-    val expandProgress = Animatable(if (initialValue == FabLayoutValue.Expand) 1f else 0f)
-        .apply { updateBounds(0f, 1f) }
-
-    private suspend fun downTo(value: FabLayoutValue, priority: MutatePriority) {
-        mutatorMutex.mutate(priority) {
-            if (expandProgress.value != 0f) expandProgress.animateTo(0f, animationSpec)
-            if (value == FabLayoutValue.Hidden) {
-                appearProgress.animateTo(0f, animationSpec)
-            }
-        }
-    }
-
-    private suspend fun upTo(value: FabLayoutValue, priority: MutatePriority) {
-        mutatorMutex.mutate(priority) {
-            if (appearProgress.value != 1f) appearProgress.animateTo(1f, animationSpec)
-            if (value == FabLayoutValue.Expand) {
-                expandProgress.animateTo(1f, animationSpec)
-            }
-        }
-    }
-
-    suspend fun waitCollapse() {
-        if (expandProgress.value != 0f) {
-            snapshotFlow { expandProgress.value }.first { it == 0f }
-        }
-    }
-    suspend fun show(priority: MutatePriority = MutatePriority.Default) = upTo(FabLayoutValue.Primary, priority)
-    suspend fun hide(priority: MutatePriority = MutatePriority.Default) = downTo(FabLayoutValue.Hidden, priority)
-    suspend fun collapse(priority: MutatePriority = MutatePriority.Default) = downTo(FabLayoutValue.Primary, priority)
-    suspend fun expand(priority: MutatePriority = MutatePriority.Default) = upTo(FabLayoutValue.Expand, priority)
-}
-
-fun interface FabBuilder {
-    fun onClick(icon: ImageVector, that: suspend () -> Unit)
-}
-
-@Composable
-fun FabLayout(
-    hidden: Boolean,
-    expanded: Boolean,
-    onExpandChanged: (Boolean) -> Unit,
-    autoCancel: Boolean,
-    rotateWhenExpand: Boolean = true,
-    fabBuilder: FabBuilder.() -> Unit,
-) {
-    val updatedHidden by rememberUpdatedState(hidden)
-    val updatedExpanded by rememberUpdatedState(expanded)
-    val newState = when {
-        updatedHidden -> FabLayoutValue.Hidden
-        updatedExpanded -> FabLayoutValue.Expand
-        else -> FabLayoutValue.Primary
-    }
-    val state = rememberFabLayoutState(newState)
-    LaunchedEffect(newState) {
-        when (newState) {
-            FabLayoutValue.Expand -> state.expand()
-            FabLayoutValue.Hidden -> state.hide()
-            FabLayoutValue.Primary -> {
-                state.collapse()
-                state.show()
-            }
-        }
-    }
-    val builder by rememberUpdatedState(fabBuilder)
-
-    fun buildFab(builder: FabBuilder.() -> Unit) = buildList {
-        builder { icon, action ->
-            add(icon to action)
-        }
-    }
-
-    val secondaryFab by remember {
-        snapshotFlow { builder }.map { one ->
-            state.waitCollapse()
-            buildFab(one)
-        }
-    }.collectAsState(remember { buildFab(fabBuilder) })
-    val coroutineScope = rememberCoroutineScope()
-    if (updatedExpanded && autoCancel) {
-        Spacer(
-            modifier = Modifier.fillMaxSize().pointerInput(Unit) {
-                detectTapGestures { onExpandChanged(false) }
-            },
-        )
-    }
-    val appearState by state.appearProgress.asState()
-    Box(
-        modifier = Modifier.fillMaxSize().navigationBarsPadding().padding(16.dp),
-        contentAlignment = Alignment.BottomEnd,
-    ) {
-        Box(
-            modifier = Modifier.graphicsLayer {
-                rotationZ = lerp(-90f, 0f, appearState)
-                scaleX = appearState
-                scaleY = appearState
-            },
-            contentAlignment = Alignment.Center,
-        ) {
-            val animatedProgress by state.expandProgress.asState()
-            PredictiveBackHandler(updatedExpanded) { flow ->
-                try {
-                    state.mutatorMutex.mutate(MutatePriority.UserInput) {
-                        flow.collect {
-                            val eased = EaseOut.transform(it.progress)
-                            state.expandProgress.snapTo(1 - eased)
-                        }
-                    }
-                    onExpandChanged(false)
-                } catch (e: CancellationException) {
-                    coroutineScope.launch {
-                        state.expand()
-                    }
-                }
-            }
-            FloatingActionButton(onClick = { onExpandChanged(!updatedExpanded) }) {
-                Icon(
-                    imageVector = Icons.Default.Close,
-                    contentDescription = null,
-                    modifier = if (rotateWhenExpand) {
-                        Modifier.graphicsLayer {
-                            rotationZ = lerp(-135f, 0f, animatedProgress)
-                        }
-                    } else {
-                        Modifier
-                    },
-                )
-            }
-            secondaryFab.run {
-                forEachIndexed { index, (imageVector, onClick) ->
-                    SmallFloatingActionButton(
-                        onClick = {
-                            coroutineScope.launchIO {
-                                runSuspendCatching {
-                                    onClick()
-                                }
-                                onExpandChanged(false)
-                            }
-                        },
-                        modifier = Modifier.layout { measurable, constraints ->
-                            val placeable = measurable.measure(constraints)
-                            layout(placeable.width, placeable.height) {
-                                val distance = lerp(0, 150 * (size - index) + 50, animatedProgress)
-                                placeable.placeRelative(0, -distance, -(size - index).toFloat())
-                            }
-                        }.graphicsLayer {
-                            alpha = animatedProgress
-                        },
-                    ) {
-                        Icon(imageVector = imageVector, contentDescription = null)
-                    }
-                }
-            }
-        }
-    }
-}
-
-const val FAB_ANIMATE_TIME = 300

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

@@ -1,79 +0,0 @@
-package com.hippo.ehviewer.ui.main
-
-import android.text.style.ClickableSpan
-import android.text.style.URLSpan
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Card
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ProvideTextStyle
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.constraintlayout.compose.ConstraintLayout
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.data.GalleryComment
-import com.hippo.ehviewer.ui.legacy.LinkifyTextView
-import com.hippo.ehviewer.util.ReadableTime
-
-@Composable
-fun GalleryCommentCard(
-    modifier: Modifier = Modifier,
-    comment: GalleryComment,
-    onCardClick: () -> Unit,
-    onUserClick: () -> Unit,
-    onUrlClick: (String) -> Unit,
-    update: LinkifyTextView.() -> Unit,
-) = comment.run {
-    var currentSpan by remember(comment) { mutableStateOf<ClickableSpan?>(null) }
-    Card(
-        onClick = {
-            val span = currentSpan.apply { currentSpan = null }
-            if (span is URLSpan) {
-                onUrlClick(span.url)
-            } else {
-                onCardClick()
-            }
-        },
-        modifier = modifier,
-    ) {
-        val keylineMargin = dimensionResource(id = R.dimen.keyline_margin)
-        ConstraintLayout(modifier = Modifier.padding(horizontal = keylineMargin, vertical = 8.dp).fillMaxWidth()) {
-            val (userRef, timeRef, commentRef) = createRefs()
-            ProvideTextStyle(value = MaterialTheme.typography.titleSmall) {
-                val userText = if (uploader) stringResource(id = R.string.comment_user_uploader, user.orEmpty()) else user.orEmpty()
-                Text(
-                    text = userText,
-                    modifier = Modifier.constrainAs(userRef) {
-                        top.linkTo(parent.top)
-                        start.linkTo(parent.start)
-                    }.clickable(onClick = onUserClick),
-                )
-                Text(
-                    text = ReadableTime.getTimeAgo(time),
-                    modifier = Modifier.constrainAs(timeRef) {
-                        top.linkTo(parent.top)
-                        end.linkTo(parent.end)
-                    },
-                )
-            }
-            AndroidView(
-                factory = { context -> LinkifyTextView(context) { currentSpan = it } },
-                modifier = Modifier.constrainAs(commentRef) {
-                    start.linkTo(parent.start)
-                    top.linkTo(userRef.bottom, margin = 8.dp)
-                },
-                update = update,
-            )
-        }
-    }
-}

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

@@ -17,6 +17,7 @@ import androidx.compose.material.icons.filled.NoAccounts
 import androidx.compose.material3.AssistChip
 import androidx.compose.material3.Card
 import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
 import androidx.compose.material3.Text
@@ -35,7 +36,6 @@ 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.IconFix
 
 @Composable
 fun GalleryDetailHeaderInfoCard(
@@ -131,7 +131,7 @@ fun GalleryDetailHeaderCard(
                 label = { Text(text = categoryText, maxLines = 1) },
                 modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.keyline_margin)),
                 leadingIcon = {
-                    IconFix(
+                    Icon(
                         imageVector = Icons.AutoMirrored.Default.Label,
                         contentDescription = null,
                     )
@@ -143,7 +143,7 @@ fun GalleryDetailHeaderCard(
                 label = { Text(text = uploaderText, maxLines = 1) },
                 modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.keyline_margin)),
                 leadingIcon = {
-                    IconFix(
+                    Icon(
                         imageVector = Icons.Default.NoAccounts,
                         contentDescription = null,
                         modifier = Modifier.clickable(onClick = onBlockUploaderIconClick),
@@ -160,7 +160,7 @@ fun GalleryDetailErrorTip(error: String, onClick: () -> Unit) = Column(
     horizontalAlignment = Alignment.CenterHorizontally,
     verticalArrangement = Arrangement.Center,
 ) {
-    IconFix(
+    Icon(
         imageVector = EhIcons.Big.Default.SadAndroid,
         contentDescription = null,
         modifier = Modifier.clickable(onClick = onClick),

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

@@ -24,6 +24,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -66,6 +67,9 @@ fun GalleryInfoListItem(
                     modifier = Modifier.aspectRatio(DEFAULT_ASPECT).fillMaxSize(),
                 )
             }
+            val showFav by FavouriteStatusRouter.collectAsState(info) {
+                it != NOT_FAVORITED && !isInFavScene
+            }
             ConstraintLayout(modifier = Modifier.padding(8.dp, 4.dp).fillMaxSize()) {
                 val (titleRef, uploaderRef, ratingRef, categoryRef, postedRef, favRef, iconsRef) = createRefs()
                 Text(
@@ -116,7 +120,13 @@ fun GalleryInfoListItem(
                             bottom.linkTo(postedRef.top)
                         },
                     ) {
-                        val download by DownloadManager.collectContainDownloadInfo(info.gid)
+                        val download by produceState(false, info.gid) {
+                            // Workaround ComposeView in RecyclerView, since view is reused, remembered value will not update when setContent with similar @Composable lambda, since composer group key is the same
+                            value = DownloadManager.containDownloadInfo(info.gid)
+                            DownloadManager.stateFlow(info.gid).collect {
+                                value = DownloadManager.containDownloadInfo(info.gid)
+                            }
+                        }
                         if (download) {
                             Icon(
                                 Icons.Default.Download,
@@ -142,16 +152,14 @@ fun GalleryInfoListItem(
                                 text = info.favoriteNote.orEmpty(),
                                 fontStyle = FontStyle.Italic,
                             )
-                        } else {
-                            val showFav by FavouriteStatusRouter.collectAsState(info) { it != NOT_FAVORITED }
-                            if (showFav) {
-                                Icon(
-                                    Icons.Default.Favorite,
-                                    contentDescription = null,
-                                    modifier = Modifier.size(16.dp),
-                                )
-                                Text(text = info.favoriteName.orEmpty())
-                            }
+                        }
+                        if (showFav) {
+                            Icon(
+                                Icons.Default.Favorite,
+                                contentDescription = null,
+                                modifier = Modifier.size(16.dp),
+                            )
+                            Text(text = info.favoriteName.orEmpty())
                         }
                     }
                     Text(

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

@@ -1,253 +0,0 @@
-package com.hippo.ehviewer.ui.main
-
-import android.content.Intent
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.calculateEndPadding
-import androidx.compose.foundation.layout.calculateStartPadding
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.GridItemSpan
-import androidx.compose.foundation.lazy.grid.LazyGridItemScope
-import androidx.compose.foundation.lazy.grid.LazyGridState
-import androidx.compose.foundation.lazy.grid.rememberLazyGridState
-import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope
-import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
-import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
-import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
-import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ShapeDefaults
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.material3.pulltorefresh.PullToRefreshState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.res.dimensionResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-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.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.exception.CloudflareBypassException
-import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.big.SadAndroid
-import com.hippo.ehviewer.ui.WebViewActivity
-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.ui.tools.LocalDialogState
-import com.hippo.ehviewer.util.ExceptionUtils
-import kotlinx.coroutines.CoroutineScope
-
-@Composable
-fun GalleryList(
-    modifier: Modifier = Modifier,
-    data: LazyPagingItems<BaseGalleryInfo>,
-    contentModifier: Modifier = Modifier,
-    contentPadding: PaddingValues = PaddingValues(0.dp),
-    listMode: Int,
-    detailListState: LazyGridState = rememberLazyGridState(),
-    detailItemContent: @Composable (LazyGridItemScope.(BaseGalleryInfo) -> Unit),
-    thumbListState: LazyStaggeredGridState = rememberLazyStaggeredGridState(),
-    thumbItemContent: @Composable (LazyStaggeredGridItemScope.(BaseGalleryInfo) -> Unit),
-    refreshState: PullToRefreshState,
-    onRefresh: suspend CoroutineScope.() -> Unit,
-    onLoading: suspend CoroutineScope.() -> Unit,
-) {
-    val context = LocalContext.current
-    val layoutDirection = LocalLayoutDirection.current
-    val marginH = dimensionResource(id = R.dimen.gallery_list_margin_h)
-    val marginV = dimensionResource(id = R.dimen.gallery_list_margin_v)
-    val realPadding = PaddingValues(
-        top = contentPadding.calculateTopPadding() + marginV,
-        bottom = contentPadding.calculateBottomPadding() + marginV,
-        start = contentPadding.calculateStartPadding(layoutDirection) + marginH,
-        end = contentPadding.calculateEndPadding(layoutDirection) + marginH,
-    )
-    val combinedModifier = contentModifier.nestedScroll(refreshState.nestedScrollConnection)
-    Box(modifier = modifier.fillMaxSize()) {
-        if (listMode == 0) {
-            val columnWidth by collectDetailSizeAsState()
-            FastScrollLazyVerticalGrid(
-                columns = GridCells.Adaptive(columnWidth),
-                modifier = combinedModifier,
-                state = detailListState,
-                contentPadding = realPadding,
-                verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.gallery_list_interval)),
-                horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.gallery_list_interval)),
-            ) {
-                items(
-                    count = data.itemCount,
-                    key = data.itemKey(key = { item -> item.gid }),
-                    contentType = data.itemContentType(),
-                ) { index ->
-                    val info = data[index]
-                    if (info != null) {
-                        detailItemContent(info)
-                    }
-                }
-                if (data.loadState.append !is LoadState.NotLoading) {
-                    item(span = { GridItemSpan(maxLineSpan) }) {
-                        LoadStateIndicator(state = data.loadState.append) {
-                            data.retry()
-                        }
-                    }
-                }
-            }
-        } else {
-            val gridInterval = dimensionResource(R.dimen.gallery_grid_interval)
-            val thumbColumns by Settings.thumbColumns.collectAsState()
-            FastScrollLazyVerticalStaggeredGrid(
-                columns = StaggeredGridCells.Fixed(thumbColumns),
-                modifier = combinedModifier,
-                state = thumbListState,
-                verticalItemSpacing = gridInterval,
-                horizontalArrangement = Arrangement.spacedBy(gridInterval),
-                contentPadding = realPadding,
-            ) {
-                items(
-                    count = data.itemCount,
-                    key = data.itemKey(key = { item -> item.gid }),
-                    contentType = data.itemContentType(),
-                ) { index ->
-                    val info = data[index]
-                    if (info != null) {
-                        thumbItemContent(info)
-                    }
-                }
-                if (data.loadState.append !is LoadState.NotLoading) {
-                    item(span = StaggeredGridItemSpan.FullLine) {
-                        LoadStateIndicator(state = data.loadState.append) {
-                            data.retry()
-                        }
-                    }
-                }
-            }
-        }
-
-        var isLoading by remember { mutableStateOf(false) }
-        if (refreshState.isRefreshing) {
-            LaunchedEffect(Unit) {
-                if (data.loadState.prepend.endOfPaginationReached) {
-                    onRefresh()
-                } else {
-                    data.retry()
-                }
-            }
-            LaunchedEffect(data.loadState) {
-                if (data.loadState.prepend is LoadState.Loading ||
-                    data.loadState.refresh is LoadState.Loading
-                ) {
-                    isLoading = true
-                } else {
-                    if (isLoading) {
-                        refreshState.endRefresh()
-                        isLoading = false
-                    }
-                }
-            }
-        }
-
-        val dialogState = LocalDialogState.current
-        when (val state = data.loadState.refresh) {
-            is LoadState.Loading -> if (!refreshState.isRefreshing) {
-                LaunchedEffect(Unit) {
-                    onLoading()
-                }
-                LaunchedEffect(Unit) {
-                    if (listMode == 0) {
-                        detailListState.scrollToItem(0)
-                    } else {
-                        thumbListState.scrollToItem(0)
-                    }
-                }
-                Surface {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        CircularProgressIndicator()
-                    }
-                }
-            }
-
-            is LoadState.Error -> {
-                Surface {
-                    LaunchedEffect(state) {
-                        if (state.error.cause is CloudflareBypassException) {
-                            dialogState.awaitPermissionOrCancel(title = R.string.cloudflare_bypass_failed) {
-                                Text(text = stringResource(id = R.string.open_in_webview))
-                            }
-                            context.startActivity(
-                                Intent(context, WebViewActivity::class.java).apply {
-                                    putExtra(WebViewActivity.KEY_URL, EhUrl.host)
-                                },
-                            )
-                        }
-                    }
-                    ErrorTip(
-                        modifier = Modifier.widthIn(max = 228.dp)
-                            .clip(ShapeDefaults.Small).clickable { data.retry() },
-                        text = ExceptionUtils.getReadableString(state.error),
-                    )
-                }
-            }
-
-            is LoadState.NotLoading -> if (data.itemCount == 0) {
-                // Only for local favorites as empty gallery lists from network are treated as error
-                ErrorTip(modifier = Modifier.widthIn(max = 228.dp), text = stringResource(id = R.string.gallery_list_empty_hit))
-            }
-        }
-    }
-}
-
-@Composable
-fun ErrorTip(modifier: Modifier = Modifier, text: String) {
-    Box(
-        modifier = Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center,
-    ) {
-        Column(
-            modifier = modifier,
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Icon(
-                imageVector = EhIcons.Big.Default.SadAndroid,
-                contentDescription = null,
-                modifier = Modifier.padding(16.dp).size(120.dp),
-                tint = MaterialTheme.colorScheme.tertiary,
-            )
-            Text(
-                text = text,
-                style = MaterialTheme.typography.bodyLarge,
-                textAlign = TextAlign.Center,
-            )
-        }
-    }
-}

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

@@ -22,7 +22,7 @@ import com.hippo.ehviewer.ui.tools.includeFontPadding
 
 @Composable
 fun GalleryTags(
-    tagGroups: List<GalleryTagGroup>,
+    tagGroups: Array<GalleryTagGroup>,
     onTagClick: (String) -> Unit,
     onTagLongClick: (String, String) -> Unit,
     modifier: Modifier = Modifier,

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

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.material3.Card
+import androidx.compose.material3.Checkbox
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
@@ -19,7 +20,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.ui.tools.LabeledCheckbox
 
 @Composable
 fun ImageSearch(
@@ -29,10 +29,7 @@ fun ImageSearch(
     onUssChecked: (Boolean) -> Unit,
     osc: Boolean,
     onOscChecked: (Boolean) -> Unit,
-) = Column(
-    modifier = Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.CenterHorizontally,
-) {
+) = Column(modifier = Modifier.fillMaxWidth()) {
     AnimatedVisibility(visible = imagePath.isNotBlank(), modifier = Modifier.align(Alignment.CenterHorizontally)) {
         Card {
             val maxSize = dimensionResource(id = R.dimen.image_search_max_size)
@@ -51,16 +48,14 @@ fun ImageSearch(
     }
     ProvideTextStyle(MaterialTheme.typography.bodyMedium) {
         Row {
-            LabeledCheckbox(
-                checked = uss,
-                onCheckedChange = onUssChecked,
-                label = stringResource(id = R.string.search_uss),
-            )
-            LabeledCheckbox(
-                checked = osc,
-                onCheckedChange = onOscChecked,
-                label = stringResource(id = R.string.search_osc),
-            )
+            Row(modifier = Modifier.weight(1f)) {
+                Checkbox(checked = uss, onCheckedChange = onUssChecked)
+                Text(text = stringResource(id = R.string.search_uss), modifier = Modifier.align(Alignment.CenterVertically))
+            }
+            Row(modifier = Modifier.weight(1f)) {
+                Checkbox(checked = osc, onCheckedChange = onOscChecked)
+                Text(text = stringResource(id = R.string.search_osc), modifier = Modifier.align(Alignment.CenterVertically))
+            }
         }
     }
 }

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

@@ -1,37 +0,0 @@
-package com.hippo.ehviewer.ui.main
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material3.Button
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-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.hippo.ehviewer.util.ExceptionUtils
-
-@Composable
-fun LoadStateIndicator(
-    modifier: Modifier = Modifier,
-    state: LoadState,
-    retry: () -> Unit,
-) {
-    when (state) {
-        is LoadState.Loading -> {
-            LinearProgressIndicator(modifier = modifier)
-        }
-
-        is LoadState.Error -> {
-            Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) {
-                Text(text = ExceptionUtils.getReadableString(state.error))
-                Button(onClick = retry) {
-                    Text(text = stringResource(id = R.string.action_retry))
-                }
-            }
-        }
-
-        is LoadState.NotLoading -> Unit
-    }
-}

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

@@ -1,16 +1,18 @@
 package com.hippo.ehviewer.ui.main
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Help
 import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.Checkbox
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -21,12 +23,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.tools.LabeledCheckbox
 
 private val categoryTable = arrayOf(
     EhUtils.DOUJINSHI to R.string.doujinshi,
@@ -50,7 +50,6 @@ private val modeTable = arrayOf(
 
 @Composable
 fun NormalSearch(
-    modifier: Modifier = Modifier,
     category: Int,
     onCategoryChanged: (Int) -> Unit,
     searchMode: Int,
@@ -61,7 +60,7 @@ fun NormalSearch(
     maxItemsInEachRow: Int,
 ) {
     FlowRow(
-        modifier = modifier.wrapContentHeight(align = Alignment.Top),
+        modifier = Modifier.wrapContentHeight(align = Alignment.Top),
         maxItemsInEachRow = maxItemsInEachRow,
     ) {
         categoryTable.forEach {
@@ -75,37 +74,37 @@ fun NormalSearch(
                         Icon(imageVector = Icons.Default.Check, contentDescription = null)
                     }
                 },
-                modifier = Modifier.padding(horizontal = 4.dp).widthIn(min = 142.dp)
-                    .align(alignment = Alignment.CenterVertically).weight(1f),
+                modifier = Modifier.padding(horizontal = 4.dp).align(alignment = Alignment.CenterVertically).widthIn(min = 145.dp),
             )
         }
     }
     ProvideTextStyle(MaterialTheme.typography.bodyMedium) {
-        FlowRow(
-            horizontalArrangement = Arrangement.SpaceBetween,
-            maxItemsInEachRow = maxItemsInEachRow,
-        ) {
+        FlowRow {
             modeTable.forEach {
                 Row(
-                    modifier = Modifier.clip(MaterialTheme.shapes.small)
-                        .clickable { onSearchModeChanged(it.first) }.padding(end = 12.dp),
+                    modifier = Modifier.weight(1F).width(112.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     RadioButton(
                         selected = it.first == searchMode,
                         onClick = { onSearchModeChanged(it.first) },
                     )
-                    Text(text = stringResource(id = it.second))
+                    Text(
+                        text = stringResource(id = it.second),
+                    )
                 }
             }
-            IconButton(onClick = showInfo) {
-                Icon(imageVector = Icons.AutoMirrored.Default.Help, contentDescription = null)
+        }
+        Row(horizontalArrangement = Arrangement.Start) {
+            Box(modifier = Modifier.weight(1f)) {
+                IconButton(onClick = showInfo) {
+                    Icon(imageVector = Icons.AutoMirrored.Default.Help, contentDescription = null)
+                }
+            }
+            Row(modifier = Modifier.weight(1f)) {
+                Checkbox(checked = isAdvanced, onCheckedChange = onAdvancedChanged)
+                Text(text = stringResource(id = R.string.search_enable_advance), modifier = Modifier.align(Alignment.CenterVertically))
             }
-            LabeledCheckbox(
-                checked = isAdvanced,
-                onCheckedChange = onAdvancedChanged,
-                label = stringResource(id = R.string.search_enable_advance),
-            )
         }
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/ui/scene/BaseScene.kt

@@ -0,0 +1,161 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.scene
+
+import android.content.res.Resources.Theme
+import android.os.Bundle
+import android.os.Parcelable
+import android.util.SparseArray
+import android.view.LayoutInflater
+import android.view.View
+import androidx.annotation.StringRes
+import androidx.core.view.SoftwareKeyboardControllerCompat
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeViewModelStoreOwner
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.google.android.material.sidesheet.SideSheetBehavior
+import com.google.android.material.sidesheet.SideSheetDialog
+import com.hippo.ehviewer.ui.MainActivity
+import com.hippo.ehviewer.util.getSparseParcelableArrayCompat
+import rikka.core.res.resolveDrawable
+
+abstract class BaseScene : Fragment() {
+    private var drawerView: View? = null
+    private var drawerViewState: SparseArray<Parcelable>? = null
+    private var sideSheetDialog: SideSheetDialog? = null
+
+    val isDrawerLocked
+        get() = mainActivity?.drawerLocked == true
+
+    fun lockDrawer() {
+        mainActivity?.drawerLocked = true
+    }
+
+    fun unlockDrawer() {
+        mainActivity?.drawerLocked = false
+    }
+
+    fun openDrawer() {
+        mainActivity?.openDrawer()
+    }
+
+    fun openSideSheet() {
+        sideSheetDialog!!.show()
+        val behavior = sideSheetDialog!!.behavior
+        if (behavior.state == SideSheetBehavior.STATE_HIDDEN) {
+            behavior.expand()
+        }
+    }
+    fun closeSideSheet() = sideSheetDialog!!.hide()
+
+    fun showTip(message: CharSequence?, length: Int) {
+        mainActivity?.showTip(message!!, length)
+    }
+
+    fun showTip(@StringRes id: Int, length: Int) {
+        mainActivity?.showTip(id, length)
+    }
+
+    open val enableDrawerGestures = false
+
+    private fun createDrawerView(savedInstanceState: Bundle?): View? {
+        drawerView = onCreateDrawerView(layoutInflater)
+        if (drawerView != null) {
+            val saved = drawerViewState ?: savedInstanceState?.getSparseParcelableArrayCompat(KEY_DRAWER_VIEW_STATE)
+            saved?.let {
+                drawerView!!.restoreHierarchyState(saved)
+            }
+        }
+        return drawerView
+    }
+
+    open fun onCreateDrawerView(inflater: LayoutInflater): View? {
+        return null
+    }
+
+    private fun destroyDrawerView() {
+        if (drawerView != null) {
+            drawerViewState = SparseArray()
+            drawerView!!.saveHierarchyState(drawerViewState)
+        }
+        onDestroyDrawerView()
+        drawerView = null
+    }
+
+    open fun onDestroyDrawerView() {
+        sideSheetDialog?.dismiss()
+        sideSheetDialog = null
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        view.background = requireActivity().theme.resolveDrawable(android.R.attr.windowBackground)
+
+        // Update left drawer locked state
+        if (enableDrawerGestures) {
+            unlockDrawer()
+        } else {
+            lockDrawer()
+        }
+        hideSoftInput()
+        createDrawerView(savedInstanceState)?.let {
+            sideSheetDialog = object : SideSheetDialog(requireContext()) {
+                // Dirty workaround
+                override fun cancel() = hide()
+            }.apply {
+                window?.decorView?.apply {
+                    val owner = viewLifecycleOwner
+                    setViewTreeLifecycleOwner(owner)
+                    setViewTreeViewModelStoreOwner(owner as ViewModelStoreOwner)
+                    setViewTreeSavedStateRegistryOwner(owner as SavedStateRegistryOwner)
+                }
+                setContentView(it)
+            }
+        }
+        mainActivity?.recompose()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        destroyDrawerView()
+    }
+
+    val mainActivity: MainActivity?
+        get() = activity as? MainActivity
+
+    fun hideSoftInput() = activity?.window?.decorView?.run { SoftwareKeyboardControllerCompat(this) }?.hide()
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        if (drawerView != null) {
+            drawerViewState = SparseArray()
+            drawerView!!.saveHierarchyState(drawerViewState)
+            outState.putSparseParcelableArray(KEY_DRAWER_VIEW_STATE, drawerViewState)
+        }
+    }
+
+    val theme: Theme
+        get() = requireActivity().theme
+
+    companion object {
+        const val LENGTH_SHORT = 0
+        const val LENGTH_LONG = 1
+        const val KEY_DRAWER_VIEW_STATE = "com.hippo.ehviewer.ui.scene.BaseScene:DRAWER_VIEW_STATE"
+    }
+}

app/src/main/kotlin/com/hippo/ehviewer/ui/scene/BaseToolbarScene.kt

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui.scene
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import com.hippo.ehviewer.databinding.SceneToolbarBinding
+
+abstract class BaseToolbarScene : BaseScene(), ToolBarScene {
+    private var _binding: SceneToolbarBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        _binding = SceneToolbarBinding.inflate(inflater, container, false)
+        onCreateViewWithToolbar(inflater, binding.root, savedInstanceState)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.toolbar.apply {
+            val menuResId = getMenuResId()
+            if (menuResId != 0) {
+                inflateMenu(menuResId)
+                setOnMenuItemClickListener { item: MenuItem -> onMenuItemClick(item) }
+            }
+            setNavigationOnClickListener { onNavigationClick() }
+        }
+    }
+
+    override fun getMenuResId(): Int {
+        return 0
+    }
+
+    override fun onMenuItemClick(item: MenuItem): Boolean {
+        return false
+    }
+
+    override fun onNavigationClick() {
+        requireActivity().onBackPressedDispatcher.onBackPressed()
+    }
+
+    fun setNavigationIcon(@DrawableRes resId: Int) {
+        binding.toolbar.setNavigationIcon(resId)
+    }
+
+    fun setTitle(@StringRes resId: Int) {
+        setTitle(getString(resId))
+    }
+
+    fun setTitle(title: CharSequence?) {
+        _binding ?: return
+        binding.toolbar.title = title
+    }
+
+    override fun setLiftOnScrollTargetView(view: View?) {
+        binding.appbar.setLiftOnScrollTargetView(view)
+    }
+}