Add fastlane metadata (#3564 )

2026-10-18 14:42:22 -07:00 · 2026-07-11 20:04:06 +06:00
318 changed files with 5482 additions and 6283 deletions
@@ -30,7 +30,7 @@ body:
          required: true
        - label: I have written a short but informative title.
          required: true
-        - label: I have updated the app to version **[0.20.3](https://github.com/mihonapp/mihon/releases/latest)**.
+        - label: I have updated the app to version **[0.20.1](https://github.com/mihonapp/mihon/releases/latest)**.
          required: true
        - label: I will fill out all of the requested information in this form.
          required: true
@@ -52,7 +52,7 @@ body:
      label: Mihon version
      description: You can find your Mihon version in **More → About**.
      placeholder: |
-        Example: "0.20.3"
+        Example: "0.20.1"
    validations:
      required: true

@@ -95,7 +95,7 @@ body:
          required: true
        - label: I have gone through the [FAQ](https://mihon.app/docs/faq/general) and [troubleshooting guide](https://mihon.app/docs/guides/troubleshooting/).
          required: true
-        - label: I have updated the app to version **[0.20.3](https://github.com/mihonapp/mihon/releases/latest)**.
+        - label: I have updated the app to version **[0.20.1](https://github.com/mihonapp/mihon/releases/latest)**.
          required: true
        - label: I have filled out all of the requested information in this form, including specific version numbers.
          required: true
@@ -27,20 +27,20 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

      - name: Dependency Review
        if: github.event_name == 'pull_request'
        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0

      - name: Set up JDK
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+        uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
        with:
          java-version-file: .github/.java-version
          distribution: temurin

      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0

      - name: Check code format
        run: ./gradlew spotlessCheck
@@ -32,16 +32,16 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

      - name: Set up JDK
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+        uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
        with:
          java-version-file: .github/.java-version
          distribution: temurin

      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0

      - name: Build
        run: ./gradlew assembleRelease -Pinclude-telemetry -Penable-updater
@@ -80,16 +80,16 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

      - name: Set up JDK
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+        uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
        with:
          java-version-file: .github/.java-version
          distribution: temurin

      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
        with:
          cache-disabled: true

@@ -134,7 +134,7 @@ jobs:
            mihon-foss

      - name: Create GitHub Release
-        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
+        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
        with:
          tag_name: ${{ needs.get_tag.outputs.tag }}
          name: Mihon ${{ needs.get_tag.outputs.tag }}
@@ -11,48 +11,9 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co
 - `Other` - for technical stuff.

 ## [Unreleased]
-
-## [v0.20.3] - 2026-08-04
-### Added
- Add Category filtering for the Updates tab ([@MajorTanya](https://github.com/MajorTanya)) ([#3589](https://github.com/mihonapp/mihon/pull/3589))
- Add Category filtering for the Upcoming calendar ([@MajorTanya](https://github.com/MajorTanya)) ([#3607](https://github.com/mihonapp/mihon/pull/3607))
-
-### Changed
- Update default user agent to Chrome 149 ([@AntsyLich](https://github.com/AntsyLich)) ([#3678](https://github.com/mihonapp/mihon/pull/3678))
-
-### Improved
- Spoof `Sec-CH-UA` client hints in WebView to match the user agent ([@AntsyLich](https://github.com/AntsyLich)) ([#3678](https://github.com/mihonapp/mihon/pull/3678))
-
-### Fixed
- Fixed extension installation with shizuku installer ([@NGB-Was-Taken](https://github.com/NGB-Was-Taken)) ([#3676](https://github.com/mihonapp/mihon/pull/3676))
- Fixed `X-Requested-With` spoofing leaking to unrelated callers ([@AntsyLich](https://github.com/AntsyLich)) ([#3678](https://github.com/mihonapp/mihon/pull/3678))
- Fixed reader loading indefinitely in some scenarios ([@AntsyLich](https://github.com/AntsyLich)) ([#3686](https://github.com/mihonapp/mihon/pull/3686))
- Fix MyAnimeList error for list entries with partial start/finish reading dates by setting those dates to either Jan 1st or 1st of the month ([@MajorTanya](https://github.com/MajorTanya)) ([#3573](https://github.com/mihonapp/mihon/pull/3573))
-
-## [v0.20.2] - 2026-08-01
 ### Added
 - Support resumable image downloads if supported by source ([@xMohnad](https://github.com/xMohnad)) ([#3167](https://github.com/mihonapp/mihon/pull/3167))
  - Fix HTTP Error 416 not being handled properly ([@AntsyLich](https://github.com/AntsyLich)) ([#3563](https://github.com/mihonapp/mihon/pull/3563))
-  - Fix incorrect progress when resuming downloads ([@xMohnad](https://github.com/xMohnad)) ([#3616](https://github.com/mihonapp/mihon/pull/3616))
- Add Tokyo Night Theme ([@xMohnad](https://github.com/xMohnad)) ([#3502](https://github.com/mihonapp/mihon/pull/3502))
-
-### Changed
- Detect Shizuku with permission check ([@Small-Ku](https://github.com/Small-Ku)) ([#3565](https://github.com/mihonapp/mihon/pull/3565))
- Check for app and extension update on every cold start ([@AntsyLich](https://github.com/AntsyLich)) ([#3658](https://github.com/mihonapp/mihon/pull/3658))
-
-### Improved
- Library search ([@NGB-Was-Taken](https://github.com/NGB-Was-Taken)) ([#3554](https://github.com/mihonapp/mihon/pull/3554))
-  - Support logical operators (`&&`, `||`, `-`), implicit `AND` separators, and nested expressions with `()`
-  - Add comparison operators (`>`, `>=`, `<`, `<=`, `=`) for `id`, `added`, `fetchinterval` / `fi`, `nextupdate` / `nu`, `unread`, `read`, and `total` (Uses `yyyy-MM-dd` dates for `added` and `nextupdate`)
-  - Support field-specific prefixes (`title`, `author`, `artist`, `description` / `desc`, `genre` / `tag`, `source` / `src`, `source_id` / `src_id`, `notes` / `note`, `language` / `lang`) and empty field matching (`""`, `''`)
- Always use Private installer to update privately installed extensions ([@MajorTanya](https://github.com/MajorTanya)) ([#3614](https://github.com/mihonapp/mihon/pull/3614))
- App update prompt flow experience ([@AntsyLich](https://github.com/AntsyLich)) ([#3669](https://github.com/mihonapp/mihon/pull/3669))
-
-### Fixed
- Fixed app bars remaining visible after changing pages by tapping in the paged reader after using the chapter navigator slider ([@AntsyLich](https://github.com/AntsyLich)) ([#3567](https://github.com/mihonapp/mihon/pull/3567))
- Fixed MangaBaka User Agent string ([@MajorTanya](https://github.com/MajorTanya)) ([#3578](https://github.com/mihonapp/mihon/pull/3578))
- Fixed extension installation with shizuku installer ([@NGB-Was-Taken](https://github.com/NGB-Was-Taken)) ([#3630](https://github.com/mihonapp/mihon/pull/3630))
- Fixed backup restore dropping library entries when the backup contains duplicate chapters ([@na-ji](https://github.com/na-ji)) ([#3667](https://github.com/mihonapp/mihon/pull/3667))

 ## [v0.20.1] - 2026-07-09
 ### Added
@@ -618,9 +579,7 @@ Same as v0.19.6
 - Branding to Mihon ([@AntsyLich](https://github.com/AntsyLich))
 - Minimum supported Android version to 8 ([@AntsyLich](https://github.com/AntsyLich)) ([`dfb3091`](https://github.com/mihonapp/mihon/commit/dfb3091e380dda3e9bfb64bf5c9a685cf3a03d0e))

-[unreleased]: https://github.com/mihonapp/mihon/compare/v0.20.3...main
-[v0.20.3]: https://github.com/mihonapp/mihon/compare/v0.20.2...v0.20.3
-[v0.20.2]: https://github.com/mihonapp/mihon/compare/v0.20.1...v0.20.2
+[unreleased]: https://github.com/mihonapp/mihon/compare/v0.20.1...main
 [v0.20.1]: https://github.com/mihonapp/mihon/compare/v0.20.0...v0.20.1
 [v0.20.0]: https://github.com/mihonapp/mihon/compare/v0.19.9...v0.20.0
 [v0.19.9]: https://github.com/mihonapp/mihon/compare/v0.19.8...v0.19.9
@@ -29,7 +29,7 @@ Discover and read manga, webtoons, comics, and more – easier than ever on your

 * Local reading of content.
 * A configurable reader with multiple viewers, reading directions and other settings.
-* Tracker support: [MangaBaka](https://mangabaka.org), [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.app/), [MangaUpdates](https://mangaupdates.com), [Shikimori](https://shikimori.one), [Bangumi](https://bgm.tv/), and [Hikka](https://hikka.io/) support.
+* Tracker support: [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.app/), [MangaUpdates](https://mangaupdates.com), [Shikimori](https://shikimori.one), [Bangumi](https://bgm.tv/) and [Hikka](https://hikka.io/) support.
 * Categories to organize your library.
 * Light and dark themes.
 * Schedule updating your library for new chapters.
@@ -32,8 +32,8 @@ android {
    defaultConfig {
        applicationId = "app.mihon"

-        versionCode = 28
-        versionName = "0.20.3"
+        versionCode = 26
+        versionName = "0.20.1"

        buildConfigField("String", "COMMIT_COUNT", "\"${getLatestCommitCount()}\"")
        buildConfigField("String", "COMMIT_SHA", "\"${getLatestCommitSha()}\"")
@@ -209,7 +209,6 @@ dependencies {
    implementation(projects.i18n)
    implementation(projects.core.archive)
    implementation(projects.core.common)
-    implementation(projects.core.viewmodel)
    implementation(projects.coreMetadata)
    implementation(projects.sourceApi)
    implementation(projects.sourceLocal)
@@ -243,8 +242,6 @@ dependencies {

    implementation(libs.sqldelight.async)

-    implementation(libs.kotlinx.datetime)
-
    // AndroidX libraries
    implementation(libs.androidx.annotation)
    implementation(libs.androidx.appCompat)
@@ -86,12 +86,3 @@
 # Firebase
 -keep class com.google.firebase.installations.** { *; }
 -keep interface com.google.firebase.installations.** { *; }
-
-# KotlinX Datetime
-keep,allowoptimization class kotlinx.datetime.** { public protected *; }
-
-# Methods called by Shizuku only
-keepclassmembers class mihon.app.shizuku.ShellInterface {
-    public <init>();
-    public void destroy();
-}
@@ -1,7 +1,7 @@
 package mihon.app.shizuku;

 interface IShellInterface {
-    void install(in AssetFileDescriptor apk, in IntentSender intentSender) = 1;
+    void install(in AssetFileDescriptor apk) = 1;

    void destroy() = 16777114;
 }
@@ -143,7 +143,7 @@ class DomainModule : InjektModule {
        }

        addSingletonFactory<ReleaseService> { ReleaseServiceImpl(get(), get()) }
-        addFactory { GetApplicationRelease(get()) }
+        addFactory { GetApplicationRelease(get(), get()) }

        addSingletonFactory<TrackRepository> { TrackRepositoryImpl(get()) }
        addFactory { TrackChapter(get(), get(), get(), get()) }
@@ -10,9 +10,6 @@ import eu.kanade.tachiyomi.data.download.DownloadProvider
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.online.HttpSource
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toInstant
-import kotlinx.datetime.toLocalDateTime
 import tachiyomi.data.chapter.ChapterSanitizer
 import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId
 import tachiyomi.domain.chapter.interactor.ShouldUpdateDbChapter
@@ -26,8 +23,8 @@ import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.source.local.isLocal
 import java.lang.Long.max
+import java.time.ZonedDateTime
 import java.util.TreeSet
-import kotlin.time.Clock

 class SyncChaptersWithSource(
    private val downloadManager: DownloadManager,
@@ -60,9 +57,8 @@ class SyncChaptersWithSource(
            throw NoChaptersException()
        }

-        val timeZone = TimeZone.currentSystemDefault()
-        val now = Clock.System.now().toLocalDateTime(timeZone)
-        val nowMillis = now.toInstant(timeZone).toEpochMilliseconds()
+        val now = ZonedDateTime.now()
+        val nowMillis = now.toInstant().toEpochMilli()

        val sourceChapters = rawSourceChapters
            .distinctBy { it.url }
@@ -149,7 +145,6 @@ class SyncChaptersWithSource(
            if (manualFetch || manga.fetchInterval == 0 || manga.nextUpdate < fetchWindow.first) {
                updateManga.awaitUpdateFetchInterval(
                    manga,
-                    timeZone,
                    now,
                    fetchWindow,
                )
@@ -222,7 +217,7 @@ class SyncChaptersWithSource(
            val chapterUpdates = updatedChapters.map { it.toChapterUpdate() }
            updateChapter.awaitAll(chapterUpdates)
        }
-        updateManga.awaitUpdateFetchInterval(manga, timeZone, now, fetchWindow)
+        updateManga.awaitUpdateFetchInterval(manga, now, fetchWindow)

        // Set this manga as updated since chapters were changed
        // Note that last_update actually represents last time the chapter list changed at all
@@ -1,13 +1,11 @@
 package eu.kanade.domain.manga.interactor

-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import tachiyomi.domain.manga.interactor.FetchInterval
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.model.MangaUpdate
 import tachiyomi.domain.manga.repository.MangaRepository
-import kotlin.time.Clock
+import java.time.Instant
+import java.time.ZonedDateTime

 class UpdateManga(
    private val mangaRepository: MangaRepository,
@@ -24,31 +22,25 @@ class UpdateManga(

    suspend fun awaitUpdateFetchInterval(
        manga: Manga,
-        timeZone: TimeZone = TimeZone.currentSystemDefault(),
-        dateTime: LocalDateTime = Clock.System.now().toLocalDateTime(timeZone),
-        window: Pair<Long, Long> = fetchInterval.getWindow(dateTime.date, timeZone),
+        dateTime: ZonedDateTime = ZonedDateTime.now(),
+        window: Pair<Long, Long> = fetchInterval.getWindow(dateTime),
    ): Boolean {
        return mangaRepository.update(
-            fetchInterval.toMangaUpdate(manga, dateTime, timeZone, window),
+            fetchInterval.toMangaUpdate(manga, dateTime, window),
        )
    }

    suspend fun awaitUpdateLastUpdate(mangaId: Long): Boolean {
-        return mangaRepository.update(MangaUpdate(id = mangaId, lastUpdate = Clock.System.now().toEpochMilliseconds()))
+        return mangaRepository.update(MangaUpdate(id = mangaId, lastUpdate = Instant.now().toEpochMilli()))
    }

    suspend fun awaitUpdateCoverLastModified(mangaId: Long): Boolean {
-        return mangaRepository.update(
-            MangaUpdate(
-                id = mangaId,
-                coverLastModified = Clock.System.now().toEpochMilliseconds(),
-            ),
-        )
+        return mangaRepository.update(MangaUpdate(id = mangaId, coverLastModified = Instant.now().toEpochMilli()))
    }

    suspend fun awaitUpdateFavorite(mangaId: Long, favorite: Boolean): Boolean {
        val dateAdded = when (favorite) {
-            true -> Clock.System.now().toEpochMilliseconds()
+            true -> Instant.now().toEpochMilli()
            false -> 0
        }
        return mangaRepository.update(
@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.track.Tracker
 import eu.kanade.tachiyomi.data.track.TrackerManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.util.lang.convertEpochMillisZone
-import kotlinx.datetime.TimeZone
 import logcat.LogPriority
 import tachiyomi.core.common.util.lang.withIOContext
 import tachiyomi.core.common.util.lang.withNonCancellableContext
@@ -19,6 +18,7 @@ import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.track.interactor.InsertTrack
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.time.ZoneOffset

 class AddTracks(
    private val insertTrack: InsertTrack,
@@ -62,8 +62,8 @@ class AddTracks(

                    firstReadChapterDate?.let {
                        val startDate = firstReadChapterDate.time.convertEpochMillisZone(
-                            TimeZone.currentSystemDefault(),
-                            TimeZone.UTC,
+                            ZoneOffset.systemDefault(),
+                            ZoneOffset.UTC,
                        )
                        track = track.copy(
                            startDate = startDate,
@@ -17,7 +17,6 @@ enum class AppTheme(val titleRes: StringResource?) {
    TIDAL_WAVE(MR.strings.theme_tidalwave),
    YINYANG(MR.strings.theme_yinyang),
    YOTSUBA(MR.strings.theme_yotsuba),
-    TOKYONIGHT(MR.strings.theme_tokyonight),
    MONOCHROME(MR.strings.theme_monochrome),

    // Deprecated
@@ -53,7 +53,7 @@ import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.source.ConfigurableSource
-import eu.kanade.tachiyomi.ui.browse.extension.details.ExtensionDetailsViewModel
+import eu.kanade.tachiyomi.ui.browse.extension.details.ExtensionDetailsScreenModel
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import tachiyomi.i18n.MR
@@ -66,7 +66,7 @@ import tachiyomi.presentation.core.screens.EmptyScreen
@Composable
 fun ExtensionDetailsScreen(
    navigateUp: () -> Unit,
-    state: ExtensionDetailsViewModel.State,
+    state: ExtensionDetailsScreenModel.State,
    onClickSourcePreferences: (sourceId: Long) -> Unit,
    onClickEnableAll: () -> Unit,
    onClickDisableAll: () -> Unit,
@@ -48,11 +48,12 @@ import eu.kanade.presentation.browse.components.ExtensionIcon
 import eu.kanade.presentation.components.WarningBanner
 import eu.kanade.presentation.manga.components.DotSeparatorNoSpaceText
 import eu.kanade.presentation.more.settings.screen.browse.ExtensionStoresScreen
+import eu.kanade.presentation.util.animateItemFastScroll
 import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.InstallStep
 import eu.kanade.tachiyomi.ui.browse.extension.ExtensionUiModel
-import eu.kanade.tachiyomi.ui.browse.extension.ExtensionsViewModel
+import eu.kanade.tachiyomi.ui.browse.extension.ExtensionsScreenModel
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission
 import tachiyomi.i18n.MR
@@ -70,7 +71,7 @@ import tachiyomi.presentation.core.util.secondaryItemAlpha

@Composable
 fun ExtensionScreen(
-    state: ExtensionsViewModel.State,
+    state: ExtensionsScreenModel.State,
    contentPadding: PaddingValues,
    searchQuery: String?,
    onLongClickItem: (Extension) -> Unit,
@@ -132,7 +133,7 @@ fun ExtensionScreen(

@Composable
 private fun ExtensionContent(
-    state: ExtensionsViewModel.State,
+    state: ExtensionsScreenModel.State,
    contentPadding: PaddingValues,
    onLongClickItem: (Extension) -> Unit,
    onClickItemCancel: (Extension) -> Unit,
@@ -186,14 +187,14 @@ private fun ExtensionContent(
                            }
                        ExtensionHeader(
                            textRes = header.textRes,
-                            modifier = Modifier.animateItem(),
+                            modifier = Modifier.animateItemFastScroll(),
                            action = action,
                        )
                    }
                    is ExtensionUiModel.Header.Text -> {
                        ExtensionHeader(
                            text = header.text,
-                            modifier = Modifier.animateItem(),
+                            modifier = Modifier.animateItemFastScroll(),
                        )
                    }
                }
@@ -211,7 +212,7 @@ private fun ExtensionContent(
                },
            ) { item ->
                ExtensionItem(
-                    modifier = Modifier.animateItem(),
+                    modifier = Modifier.animateItemFastScroll(),
                    item = item,
                    onClickItem = {
                        when (it) {
@@ -12,7 +12,7 @@ import eu.kanade.presentation.browse.components.GlobalSearchResultItem
 import eu.kanade.presentation.browse.components.GlobalSearchToolbar
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchItemResult
-import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchViewModel
+import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchScreenModel
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SourceFilter
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import tachiyomi.domain.manga.model.Manga
@@ -20,7 +20,7 @@ import tachiyomi.presentation.core.components.material.Scaffold

@Composable
 fun GlobalSearchScreen(
-    state: SearchViewModel.State,
+    state: SearchScreenModel.State,
    navigateUp: () -> Unit,
    onChangeSearchQuery: (String?) -> Unit,
    onSearch: (String) -> Unit,
@@ -4,14 +4,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import eu.kanade.presentation.browse.components.GlobalSearchToolbar
 import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchViewModel
+import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchScreenModel
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SourceFilter
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.presentation.core.components.material.Scaffold

@Composable
 fun MigrateSearchScreen(
-    state: SearchViewModel.State,
+    state: SearchScreenModel.State,
    fromSourceId: Long?,
    navigateUp: () -> Unit,
    onChangeSearchQuery: (String?) -> Unit,
@@ -24,7 +24,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import eu.kanade.domain.source.interactor.SetMigrateSorting
 import eu.kanade.presentation.browse.components.BaseSourceItem
 import eu.kanade.presentation.browse.components.SourceIcon
-import eu.kanade.tachiyomi.ui.browse.migration.sources.MigrateSourceViewModel
+import eu.kanade.tachiyomi.ui.browse.migration.sources.MigrateSourceScreenModel
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import tachiyomi.domain.source.model.Source
 import tachiyomi.i18n.MR
@@ -43,7 +43,7 @@ import tachiyomi.presentation.core.util.secondaryItemAlpha

@Composable
 fun MigrateSourceScreen(
-    state: MigrateSourceViewModel.State,
+    state: MigrateSourceScreenModel.State,
    contentPadding: PaddingValues,
    onClickItem: (Source) -> Unit,
    onToggleSortingDirection: () -> Unit,
@@ -10,7 +10,8 @@ import androidx.compose.ui.platform.LocalContext
 import eu.kanade.presentation.browse.components.BaseSourceItem
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget
-import eu.kanade.tachiyomi.ui.browse.source.SourcesFilterViewModel
+import eu.kanade.presentation.util.animateItemFastScroll
+import eu.kanade.tachiyomi.ui.browse.source.SourcesFilterScreenModel
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import tachiyomi.domain.source.model.Source
 import tachiyomi.i18n.MR
@@ -22,7 +23,7 @@ import tachiyomi.presentation.core.screens.EmptyScreen
@Composable
 fun SourcesFilterScreen(
    navigateUp: () -> Unit,
-    state: SourcesFilterViewModel.State.Success,
+    state: SourcesFilterScreenModel.State.Success,
    onClickLanguage: (String) -> Unit,
    onClickSource: (Source) -> Unit,
 ) {
@@ -54,7 +55,7 @@ fun SourcesFilterScreen(
@Composable
 private fun SourcesFilterContent(
    contentPadding: PaddingValues,
-    state: SourcesFilterViewModel.State.Success,
+    state: SourcesFilterScreenModel.State.Success,
    onClickLanguage: (String) -> Unit,
    onClickSource: (Source) -> Unit,
 ) {
@@ -68,7 +69,7 @@ private fun SourcesFilterContent(
                contentType = "source-filter-header",
            ) {
                SourcesFilterHeader(
-                    modifier = Modifier.animateItem(),
+                    modifier = Modifier.animateItemFastScroll(),
                    language = language,
                    enabled = enabled,
                    onClickItem = onClickLanguage,
@@ -81,7 +82,7 @@ private fun SourcesFilterContent(
                    contentType = { "source-filter-item" },
                ) { source ->
                    SourcesFilterItem(
-                        modifier = Modifier.animateItem(),
+                        modifier = Modifier.animateItemFastScroll(),
                        source = source,
                        enabled = "${source.id}" !in state.disabledSources,
                        onClickItem = onClickSource,
@@ -21,8 +21,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.browse.components.BaseSourceItem
-import eu.kanade.tachiyomi.ui.browse.source.SourcesViewModel
-import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceViewModel.Listing
+import eu.kanade.tachiyomi.ui.browse.source.SourcesScreenModel
+import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel.Listing
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import tachiyomi.domain.source.model.Pin
 import tachiyomi.domain.source.model.Source
@@ -40,7 +40,7 @@ import tachiyomi.source.local.isLocal

@Composable
 fun SourcesScreen(
-    state: SourcesViewModel.State,
+    state: SourcesScreenModel.State,
    contentPadding: PaddingValues,
    onClickItem: (Source, Listing) -> Unit,
    onClickPin: (Source) -> Unit,
@@ -27,11 +27,13 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import eu.kanade.core.preference.asToggleableState
 import eu.kanade.presentation.category.visualName
+import kotlinx.coroutines.delay
 import tachiyomi.core.common.preference.CheckboxState
 import tachiyomi.domain.category.model.Category
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
+import kotlin.time.Duration.Companion.seconds

@Composable
 fun CategoryCreateDialog(
@@ -89,6 +91,8 @@ fun CategoryCreateDialog(
    )

    LaunchedEffect(focusRequester) {
+        // TODO: https://issuetracker.google.com/issues/204502668
+        delay(0.1.seconds)
        focusRequester.requestFocus()
    }
 }
@@ -151,6 +155,8 @@ fun CategoryRenameDialog(
    )

    LaunchedEffect(focusRequester) {
+        // TODO: https://issuetracker.google.com/issues/204502668
+        delay(0.1.seconds)
        focusRequester.requestFocus()
    }
 }
@@ -5,23 +5,23 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.tachiyomi.util.lang.toRelativeString
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import kotlin.time.Instant
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId

@Composable
 fun relativeDateText(
    dateEpochMillis: Long,
 ): String {
    return relativeDateText(
-        localDate = Instant.fromEpochMilliseconds(dateEpochMillis)
-            .toLocalDateTime(TimeZone.currentSystemDefault())
-            .date
+        localDate = LocalDate.ofInstant(
+            Instant.ofEpochMilli(dateEpochMillis),
+            ZoneId.systemDefault(),
+        )
            .takeIf { dateEpochMillis != 0L },
    )
 }
@@ -58,6 +58,7 @@ fun TabbedDialog(
                    modifier = Modifier.weight(1f),
                    selectedTabIndex = pagerState.currentPage,
                    containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
+                    divider = {},
                ) {
                    tabTitles.fastForEachIndexed { index, tab ->
                        Tab(
@@ -71,6 +72,7 @@ fun TabbedDialog(

                tabOverflowMenuContent?.let { MoreMenu(it) }
            }
+            HorizontalDivider()

            HorizontalPager(
                modifier = Modifier.animateContentSize(),
@@ -18,8 +18,8 @@ import eu.kanade.presentation.components.SearchToolbar
 import eu.kanade.presentation.components.relativeDateText
 import eu.kanade.presentation.history.components.HistoryItem
 import eu.kanade.presentation.theme.TachiyomiPreviewTheme
-import eu.kanade.tachiyomi.ui.history.HistoryViewModel
-import kotlinx.datetime.LocalDate
+import eu.kanade.presentation.util.animateItemFastScroll
+import eu.kanade.tachiyomi.ui.history.HistoryScreenModel
 import tachiyomi.domain.history.model.HistoryWithRelations
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.FastScrollLazyColumn
@@ -28,16 +28,17 @@ import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.screens.EmptyScreen
 import tachiyomi.presentation.core.screens.LoadingScreen
+import java.time.LocalDate

@Composable
 fun HistoryScreen(
-    state: HistoryViewModel.State,
+    state: HistoryScreenModel.State,
    snackbarHostState: SnackbarHostState,
    onSearchQueryChange: (String?) -> Unit,
    onClickCover: (mangaId: Long) -> Unit,
    onClickResume: (mangaId: Long, chapterId: Long) -> Unit,
    onClickFavorite: (mangaId: Long) -> Unit,
-    onDialogChange: (HistoryViewModel.Dialog?) -> Unit,
+    onDialogChange: (HistoryScreenModel.Dialog?) -> Unit,
 ) {
    Scaffold(
        topBar = { scrollBehavior ->
@@ -52,7 +53,7 @@ fun HistoryScreen(
                                title = stringResource(MR.strings.pref_clear_history),
                                icon = Icons.Outlined.DeleteSweep,
                                onClick = {
-                                    onDialogChange(HistoryViewModel.Dialog.DeleteAll)
+                                    onDialogChange(HistoryScreenModel.Dialog.DeleteAll)
                                },
                            ),
                        ),
@@ -82,7 +83,7 @@ fun HistoryScreen(
                    contentPadding = contentPadding,
                    onClickCover = { history -> onClickCover(history.mangaId) },
                    onClickResume = { history -> onClickResume(history.mangaId, history.chapterId) },
-                    onClickDelete = { item -> onDialogChange(HistoryViewModel.Dialog.Delete(item)) },
+                    onClickDelete = { item -> onDialogChange(HistoryScreenModel.Dialog.Delete(item)) },
                    onClickFavorite = { history -> onClickFavorite(history.mangaId) },
                )
            }
@@ -115,14 +116,14 @@ private fun HistoryScreenContent(
            when (item) {
                is HistoryUiModel.Header -> {
                    ListGroupHeader(
-                        modifier = Modifier.animateItem(),
+                        modifier = Modifier.animateItemFastScroll(),
                        text = relativeDateText(item.date),
                    )
                }
                is HistoryUiModel.Item -> {
                    val value = item.item
                    HistoryItem(
-                        modifier = Modifier.animateItem(),
+                        modifier = Modifier.animateItemFastScroll(),
                        history = value,
                        onClickCover = { onClickCover(value) },
                        onClickResume = { onClickResume(value) },
@@ -143,8 +144,8 @@ sealed interface HistoryUiModel {
@PreviewLightDark
@Composable
 internal fun HistoryScreenPreviews(
-    @PreviewParameter(HistoryviewModelStateProvider::class)
-    historyState: HistoryViewModel.State,
+    @PreviewParameter(HistoryScreenModelStateProvider::class)
+    historyState: HistoryScreenModel.State,
 ) {
    TachiyomiPreviewTheme {
        HistoryScreen(
@@ -1,35 +1,32 @@
 package eu.kanade.presentation.history

 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import eu.kanade.tachiyomi.ui.history.HistoryViewModel
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
+import eu.kanade.tachiyomi.ui.history.HistoryScreenModel
 import tachiyomi.domain.history.model.HistoryWithRelations
 import tachiyomi.domain.manga.model.MangaCover
+import java.time.Instant
+import java.time.LocalDate
+import java.time.temporal.ChronoUnit
 import java.util.Date
 import kotlin.random.Random
-import kotlin.time.Clock
-import kotlin.time.Duration.Companion.days
-import kotlin.time.Instant
-import kotlin.time.toJavaInstant

-class HistoryviewModelStateProvider : PreviewParameterProvider<HistoryViewModel.State> {
+class HistoryScreenModelStateProvider : PreviewParameterProvider<HistoryScreenModel.State> {

-    private val multiPage = HistoryViewModel.State(
+    private val multiPage = HistoryScreenModel.State(
        searchQuery = null,
        list =
        listOf(HistoryUiModelExamples.headerToday)
            .asSequence()
            .plus(HistoryUiModelExamples.items().take(3))
-            .plus(HistoryUiModelExamples.header { it.minus(1.days) })
+            .plus(HistoryUiModelExamples.header { it.minus(1, ChronoUnit.DAYS) })
            .plus(HistoryUiModelExamples.items().take(1))
-            .plus(HistoryUiModelExamples.header { it.minus(2.days) })
+            .plus(HistoryUiModelExamples.header { it.minus(2, ChronoUnit.DAYS) })
            .plus(HistoryUiModelExamples.items().take(7))
            .toList(),
        dialog = null,
    )

-    private val shortRecent = HistoryViewModel.State(
+    private val shortRecent = HistoryScreenModel.State(
        searchQuery = null,
        list = listOf(
            HistoryUiModelExamples.headerToday,
@@ -38,7 +35,7 @@ class HistoryviewModelStateProvider : PreviewParameterProvider<HistoryViewModel.
        dialog = null,
    )

-    private val shortFuture = HistoryViewModel.State(
+    private val shortFuture = HistoryScreenModel.State(
        searchQuery = null,
        list = listOf(
            HistoryUiModelExamples.headerTomorrow,
@@ -47,23 +44,23 @@ class HistoryviewModelStateProvider : PreviewParameterProvider<HistoryViewModel.
        dialog = null,
    )

-    private val empty = HistoryViewModel.State(
+    private val empty = HistoryScreenModel.State(
        searchQuery = null,
        list = listOf(),
        dialog = null,
    )

-    private val loadingWithSearchQuery = HistoryViewModel.State(
+    private val loadingWithSearchQuery = HistoryScreenModel.State(
        searchQuery = "Example Search Query",
    )

-    private val loading = HistoryViewModel.State(
+    private val loading = HistoryScreenModel.State(
        searchQuery = null,
        list = null,
        dialog = null,
    )

-    override val values: Sequence<HistoryViewModel.State> = sequenceOf(
+    override val values: Sequence<HistoryScreenModel.State> = sequenceOf(
        multiPage,
        shortRecent,
        shortFuture,
@@ -75,12 +72,10 @@ class HistoryviewModelStateProvider : PreviewParameterProvider<HistoryViewModel.
    private object HistoryUiModelExamples {
        val headerToday = header()
        val headerTomorrow =
-            HistoryUiModel.Header(Clock.System.now().plus(1.days).toLocalDateTime(TimeZone.currentSystemDefault()).date)
+            HistoryUiModel.Header(LocalDate.now().plusDays(1))

        fun header(instantBuilder: (Instant) -> Instant = { it }) =
-            HistoryUiModel.Header(
-                instantBuilder(Clock.System.now()).toLocalDateTime(TimeZone.currentSystemDefault()).date,
-            )
+            HistoryUiModel.Header(LocalDate.from(instantBuilder(Instant.now())))

        fun items() = sequence {
            var count = 1
@@ -99,7 +94,7 @@ class HistoryviewModelStateProvider : PreviewParameterProvider<HistoryViewModel.
                        mangaId = Random.nextLong(),
                        title = "Test Title",
                        chapterNumber = Random.nextDouble(),
-                        readAt = Date.from(Clock.System.now().toJavaInstant()),
+                        readAt = Date.from(Instant.now()),
                        readDuration = Random.nextLong(),
                        coverData = MangaCover(
                            mangaId = Random.nextLong(),
@@ -19,7 +19,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import eu.kanade.presentation.components.TabbedDialog
 import eu.kanade.presentation.components.TabbedDialogPaddings
-import eu.kanade.tachiyomi.ui.library.LibrarySettingsViewModel
+import eu.kanade.tachiyomi.ui.library.LibrarySettingsScreenModel
 import eu.kanade.tachiyomi.util.system.isReleaseBuildType
 import tachiyomi.core.common.preference.TriState
 import tachiyomi.domain.category.model.Category
@@ -41,7 +41,7 @@ import tachiyomi.presentation.core.util.collectAsState
@Composable
 fun LibrarySettingsDialog(
    onDismissRequest: () -> Unit,
-    viewModel: LibrarySettingsViewModel,
+    screenModel: LibrarySettingsScreenModel,
    category: Category?,
 ) {
    TabbedDialog(
@@ -59,14 +59,14 @@ fun LibrarySettingsDialog(
        ) {
            when (page) {
                0 -> FilterPage(
-                    viewModel = viewModel,
+                    screenModel = screenModel,
                )
                1 -> SortPage(
                    category = category,
-                    viewModel = viewModel,
+                    screenModel = screenModel,
                )
                2 -> DisplayPage(
-                    viewModel = viewModel,
+                    screenModel = screenModel,
                )
            }
        }
@@ -75,11 +75,11 @@ fun LibrarySettingsDialog(

@Composable
 private fun ColumnScope.FilterPage(
-    viewModel: LibrarySettingsViewModel,
+    screenModel: LibrarySettingsScreenModel,
 ) {
-    val filterDownloaded by viewModel.libraryPreferences.filterDownloaded.collectAsState()
-    val downloadedOnly by viewModel.preferences.downloadedOnly.collectAsState()
-    val autoUpdateMangaRestrictions by viewModel.libraryPreferences.autoUpdateMangaRestrictions.collectAsState()
+    val filterDownloaded by screenModel.libraryPreferences.filterDownloaded.collectAsState()
+    val downloadedOnly by screenModel.preferences.downloadedOnly.collectAsState()
+    val autoUpdateMangaRestrictions by screenModel.libraryPreferences.autoUpdateMangaRestrictions.collectAsState()

    TriStateItem(
        label = stringResource(MR.strings.label_downloaded),
@@ -89,64 +89,64 @@ private fun ColumnScope.FilterPage(
            filterDownloaded
        },
        enabled = !downloadedOnly,
-        onClick = { viewModel.toggleFilter(LibraryPreferences::filterDownloaded) },
+        onClick = { screenModel.toggleFilter(LibraryPreferences::filterDownloaded) },
    )
-    val filterUnread by viewModel.libraryPreferences.filterUnread.collectAsState()
+    val filterUnread by screenModel.libraryPreferences.filterUnread.collectAsState()
    TriStateItem(
        label = stringResource(MR.strings.action_filter_unread),
        state = filterUnread,
-        onClick = { viewModel.toggleFilter(LibraryPreferences::filterUnread) },
+        onClick = { screenModel.toggleFilter(LibraryPreferences::filterUnread) },
    )
-    val filterStarted by viewModel.libraryPreferences.filterStarted.collectAsState()
+    val filterStarted by screenModel.libraryPreferences.filterStarted.collectAsState()
    TriStateItem(
        label = stringResource(MR.strings.label_started),
        state = filterStarted,
-        onClick = { viewModel.toggleFilter(LibraryPreferences::filterStarted) },
+        onClick = { screenModel.toggleFilter(LibraryPreferences::filterStarted) },
    )
-    val filterBookmarked by viewModel.libraryPreferences.filterBookmarked.collectAsState()
+    val filterBookmarked by screenModel.libraryPreferences.filterBookmarked.collectAsState()
    TriStateItem(
        label = stringResource(MR.strings.action_filter_bookmarked),
        state = filterBookmarked,
-        onClick = { viewModel.toggleFilter(LibraryPreferences::filterBookmarked) },
+        onClick = { screenModel.toggleFilter(LibraryPreferences::filterBookmarked) },
    )
-    val filterCompleted by viewModel.libraryPreferences.filterCompleted.collectAsState()
+    val filterCompleted by screenModel.libraryPreferences.filterCompleted.collectAsState()
    TriStateItem(
        label = stringResource(MR.strings.completed),
        state = filterCompleted,
-        onClick = { viewModel.toggleFilter(LibraryPreferences::filterCompleted) },
+        onClick = { screenModel.toggleFilter(LibraryPreferences::filterCompleted) },
    )
    // TODO: re-enable when custom intervals are ready for stable
    if ((!isReleaseBuildType) && LibraryPreferences.MANGA_OUTSIDE_RELEASE_PERIOD in autoUpdateMangaRestrictions) {
-        val filterIntervalCustom by viewModel.libraryPreferences.filterIntervalCustom.collectAsState()
+        val filterIntervalCustom by screenModel.libraryPreferences.filterIntervalCustom.collectAsState()
        TriStateItem(
            label = stringResource(MR.strings.action_filter_interval_custom),
            state = filterIntervalCustom,
-            onClick = { viewModel.toggleFilter(LibraryPreferences::filterIntervalCustom) },
+            onClick = { screenModel.toggleFilter(LibraryPreferences::filterIntervalCustom) },
        )
    }

-    val trackers by viewModel.trackersFlow.collectAsState()
+    val trackers by screenModel.trackersFlow.collectAsState()
    when (trackers.size) {
        0 -> {
            // No trackers
        }
        1 -> {
            val service = trackers[0]
-            val filterTracker by viewModel.libraryPreferences.filterTracking(service.id.toInt()).collectAsState()
+            val filterTracker by screenModel.libraryPreferences.filterTracking(service.id.toInt()).collectAsState()
            TriStateItem(
                label = stringResource(MR.strings.action_filter_tracked),
                state = filterTracker,
-                onClick = { viewModel.toggleTracker(service.id.toInt()) },
+                onClick = { screenModel.toggleTracker(service.id.toInt()) },
            )
        }
        else -> {
            HeadingItem(MR.strings.action_filter_tracked)
            trackers.map { service ->
-                val filterTracker by viewModel.libraryPreferences.filterTracking(service.id.toInt()).collectAsState()
+                val filterTracker by screenModel.libraryPreferences.filterTracking(service.id.toInt()).collectAsState()
                TriStateItem(
                    label = service.name,
                    state = filterTracker,
-                    onClick = { viewModel.toggleTracker(service.id.toInt()) },
+                    onClick = { screenModel.toggleTracker(service.id.toInt()) },
                )
            }
        }
@@ -156,9 +156,9 @@ private fun ColumnScope.FilterPage(
@Composable
 private fun ColumnScope.SortPage(
    category: Category?,
-    viewModel: LibrarySettingsViewModel,
+    screenModel: LibrarySettingsScreenModel,
 ) {
-    val trackers by viewModel.trackersFlow.collectAsState()
+    val trackers by screenModel.trackersFlow.collectAsState()
    val sortingMode = category.sort.type
    val sortDescending = !category.sort.isAscending

@@ -189,7 +189,7 @@ private fun ColumnScope.SortPage(
                icon = Icons.Default.Refresh
                    .takeIf { sortingMode == LibrarySort.Type.Random },
                onClick = {
-                    viewModel.setSort(category, mode, LibrarySort.Direction.Ascending)
+                    screenModel.setSort(category, mode, LibrarySort.Direction.Ascending)
                },
            )
            return@map
@@ -211,7 +211,7 @@ private fun ColumnScope.SortPage(
                        LibrarySort.Direction.Ascending
                    }
                }
-                viewModel.setSort(category, mode, direction)
+                screenModel.setSort(category, mode, direction)
            },
        )
    }
@@ -226,14 +226,14 @@ private val displayModes = listOf(

@Composable
 private fun ColumnScope.DisplayPage(
-    viewModel: LibrarySettingsViewModel,
+    screenModel: LibrarySettingsScreenModel,
 ) {
-    val displayMode by viewModel.libraryPreferences.displayMode.collectAsState()
+    val displayMode by screenModel.libraryPreferences.displayMode.collectAsState()
    SettingsChipRow(MR.strings.action_display_mode) {
        displayModes.map { (titleRes, mode) ->
            FilterChip(
                selected = displayMode == mode,
-                onClick = { viewModel.setDisplayMode(mode) },
+                onClick = { screenModel.setDisplayMode(mode) },
                label = { Text(stringResource(titleRes)) },
            )
        }
@@ -243,9 +243,9 @@ private fun ColumnScope.DisplayPage(
        val configuration = LocalConfiguration.current
        val columnPreference = remember {
            if (configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                viewModel.libraryPreferences.landscapeColumns
+                screenModel.libraryPreferences.landscapeColumns
            } else {
-                viewModel.libraryPreferences.portraitColumns
+                screenModel.libraryPreferences.portraitColumns
            }
        }

@@ -267,32 +267,32 @@ private fun ColumnScope.DisplayPage(
    HeadingItem(MR.strings.overlay_header)
    CheckboxItem(
        label = stringResource(MR.strings.action_display_download_badge),
-        pref = viewModel.libraryPreferences.downloadBadge,
+        pref = screenModel.libraryPreferences.downloadBadge,
    )
    CheckboxItem(
        label = stringResource(MR.strings.action_display_unread_badge),
-        pref = viewModel.libraryPreferences.unreadBadge,
+        pref = screenModel.libraryPreferences.unreadBadge,
    )
    CheckboxItem(
        label = stringResource(MR.strings.action_display_local_badge),
-        pref = viewModel.libraryPreferences.localBadge,
+        pref = screenModel.libraryPreferences.localBadge,
    )
    CheckboxItem(
        label = stringResource(MR.strings.action_display_language_badge),
-        pref = viewModel.libraryPreferences.languageBadge,
+        pref = screenModel.libraryPreferences.languageBadge,
    )
    CheckboxItem(
        label = stringResource(MR.strings.action_display_show_continue_reading_button),
-        pref = viewModel.libraryPreferences.showContinueReadingButton,
+        pref = screenModel.libraryPreferences.showContinueReadingButton,
    )

    HeadingItem(MR.strings.tabs_header)
    CheckboxItem(
        label = stringResource(MR.strings.action_display_show_tabs),
-        pref = viewModel.libraryPreferences.categoryTabs,
+        pref = screenModel.libraryPreferences.categoryTabs,
    )
    CheckboxItem(
        label = stringResource(MR.strings.action_display_show_number_of_items),
-        pref = viewModel.libraryPreferences.categoryNumberOfItems,
+        pref = screenModel.libraryPreferences.categoryNumberOfItems,
    )
 }
@@ -1,11 +1,15 @@
 package eu.kanade.presentation.library.components

+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.pager.PagerState
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PrimaryScrollableTabRow
 import androidx.compose.material3.Tab
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import eu.kanade.presentation.category.visualName
 import tachiyomi.domain.category.model.Category
 import tachiyomi.presentation.core.components.material.TabText
@@ -18,22 +22,29 @@ internal fun LibraryTabs(
    onTabItemClick: (Int) -> Unit,
 ) {
    val currentPageIndex = pagerState.currentPage.coerceAtMost(categories.lastIndex)
-    PrimaryScrollableTabRow(
-        selectedTabIndex = currentPageIndex,
-        edgePadding = 0.dp,
-    ) {
-        categories.forEachIndexed { index, category ->
-            Tab(
-                selected = currentPageIndex == index,
-                onClick = { onTabItemClick(index) },
-                text = {
-                    TabText(
-                        text = category.visualName,
-                        badgeCount = getItemCountForCategory(category),
-                    )
-                },
-                unselectedContentColor = MaterialTheme.colorScheme.onSurface,
-            )
+    Column(modifier = Modifier.zIndex(2f)) {
+        PrimaryScrollableTabRow(
+            selectedTabIndex = currentPageIndex,
+            edgePadding = 0.dp,
+            // TODO: use default when width is fixed upstream
+            // https://issuetracker.google.com/issues/242879624
+            divider = {},
+        ) {
+            categories.forEachIndexed { index, category ->
+                Tab(
+                    selected = currentPageIndex == index,
+                    onClick = { onTabItemClick(index) },
+                    text = {
+                        TabText(
+                            text = category.visualName,
+                            badgeCount = getItemCountForCategory(category),
+                        )
+                    },
+                    unselectedContentColor = MaterialTheme.colorScheme.onSurface,
+                )
+            }
        }
+
+        HorizontalDivider()
    }
 }
@@ -60,7 +60,7 @@ import eu.kanade.presentation.util.formatChapterNumber
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.source.getNameForMangaInfo
 import eu.kanade.tachiyomi.ui.manga.ChapterList
-import eu.kanade.tachiyomi.ui.manga.MangaViewModel
+import eu.kanade.tachiyomi.ui.manga.MangaScreenModel
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.chapter.service.missingChaptersCount
@@ -75,11 +75,11 @@ import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.shouldExpandFAB
 import tachiyomi.source.local.isLocal
-import kotlin.time.Instant
+import java.time.Instant

@Composable
 fun MangaScreen(
-    state: MangaViewModel.State.Success,
+    state: MangaScreenModel.State.Success,
    snackbarHostState: SnackbarHostState,
    nextUpdate: Instant?,
    isTabletUi: Boolean,
@@ -210,7 +210,7 @@ fun MangaScreen(

@Composable
 private fun MangaScreenSmallImpl(
-    state: MangaViewModel.State.Success,
+    state: MangaScreenModel.State.Success,
    snackbarHostState: SnackbarHostState,
    nextUpdate: Instant?,
    chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
@@ -452,7 +452,7 @@ private fun MangaScreenSmallImpl(

@Composable
 fun MangaScreenLargeImpl(
-    state: MangaViewModel.State.Success,
+    state: MangaScreenModel.State.Success,
    snackbarHostState: SnackbarHostState,
    nextUpdate: Instant?,
    chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
@@ -68,7 +68,7 @@ fun MangaCoverDialog(
        onDismissRequest = onDismissRequest,
        properties = DialogProperties(
            usePlatformDefaultWidth = false,
-            decorFitsSystemWindows = false,
+            decorFitsSystemWindows = false, // Doesn't work https://issuetracker.google.com/issues/246909281
        ),
    ) {
        Scaffold(
@@ -20,17 +20,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import eu.kanade.tachiyomi.util.system.isReleaseBuildType
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.daysUntil
 import tachiyomi.domain.manga.interactor.FetchInterval
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.WheelTextPicker
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.pluralStringResource
 import tachiyomi.presentation.core.i18n.stringResource
+import java.time.Instant
+import java.time.temporal.ChronoUnit
 import kotlin.math.absoluteValue
-import kotlin.time.Clock
-import kotlin.time.Instant

@Composable
 fun DeleteChaptersDialog(
@@ -74,8 +72,8 @@ fun SetIntervalDialog(

    val nextUpdateDays = remember(nextUpdate) {
        return@remember if (nextUpdate != null) {
-            val now = Clock.System.now()
-            now.daysUntil(nextUpdate, TimeZone.currentSystemDefault()).coerceAtLeast(0)
+            val now = Instant.now()
+            now.until(nextUpdate, ChronoUnit.DAYS).toInt().coerceAtLeast(0)
        } else {
            null
        }
@@ -91,8 +91,6 @@ import eu.kanade.presentation.components.DropdownMenu
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.daysUntil
 import org.intellij.markdown.MarkdownElementTypes
 import org.intellij.markdown.MarkdownTokenTypes
 import org.intellij.markdown.ast.findChildOfType
@@ -107,9 +105,9 @@ import tachiyomi.presentation.core.util.clickableNoIndication
 import tachiyomi.presentation.core.util.secondaryItemAlpha
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.time.Instant
+import java.time.temporal.ChronoUnit
 import kotlin.math.roundToInt
-import kotlin.time.Clock
-import kotlin.time.Instant

@Composable
 fun MangaInfoBox(
@@ -191,8 +189,8 @@ fun MangaActionRow(
    // TODO: show something better when using custom interval
    val nextUpdateDays = remember(nextUpdate) {
        return@remember if (nextUpdate != null) {
-            val now = Clock.System.now()
-            now.daysUntil(nextUpdate, TimeZone.currentSystemDefault()).coerceAtLeast(0)
+            val now = Instant.now()
+            now.until(nextUpdate, ChronoUnit.DAYS).toInt().coerceAtLeast(0)
        } else {
            null
        }
@@ -13,12 +13,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import eu.kanade.presentation.manga.components.MarkdownRender
 import eu.kanade.presentation.theme.TachiyomiPreviewTheme
-import eu.kanade.tachiyomi.ui.more.NewUpdateScreenModel
 import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
@@ -29,27 +27,16 @@ import tachiyomi.presentation.core.screens.InfoScreen
 fun NewUpdateScreen(
    versionName: String,
    changelogInfo: String,
-    stage: NewUpdateScreenModel.Stage,
-    downloadProgress: () -> Int,
    onOpenInBrowser: () -> Unit,
-    onAcceptUpdate: () -> Unit,
    onRejectUpdate: () -> Unit,
+    onAcceptUpdate: () -> Unit,
 ) {
    InfoScreen(
        icon = Icons.Outlined.NewReleases,
        headingText = stringResource(MR.strings.update_check_notification_update_available),
        subtitleText = versionName,
-        acceptText = when (stage) {
-            NewUpdateScreenModel.Stage.Available -> stringResource(MR.strings.update_check_confirm)
-            NewUpdateScreenModel.Stage.Downloading -> stringResource(
-                MR.strings.downloading_with_progress,
-                downloadProgress(),
-            )
-            NewUpdateScreenModel.Stage.Downloaded -> stringResource(MR.strings.action_install)
-            NewUpdateScreenModel.Stage.Failed -> stringResource(MR.strings.action_retry)
-        },
+        acceptText = stringResource(MR.strings.update_check_confirm),
        onAcceptClick = onAcceptUpdate,
-        canAccept = stage != NewUpdateScreenModel.Stage.Downloading,
        rejectText = stringResource(MR.strings.action_not_now),
        onRejectClick = onRejectUpdate,
    ) {
@@ -60,7 +47,7 @@ fun NewUpdateScreen(
        ) {
            MarkdownRender(
                content = changelogInfo,
-                flavour = remember { GFMFlavourDescriptor() },
+                flavour = GFMFlavourDescriptor(),
            )

            TextButton(
@@ -89,11 +76,9 @@ private fun NewUpdateScreenPreview() {
                - Hello
                - World
            """.trimIndent(),
-            stage = NewUpdateScreenModel.Stage.Available,
-            downloadProgress = { 0 },
            onOpenInBrowser = {},
-            onAcceptUpdate = {},
            onRejectUpdate = {},
+            onAcceptUpdate = {},
        )
    }
 }
@@ -19,15 +19,12 @@ import eu.kanade.presentation.more.settings.screen.appearance.AppLanguageScreen
 import eu.kanade.presentation.more.settings.widget.AppThemeModePreferenceWidget
 import eu.kanade.presentation.more.settings.widget.AppThemePreferenceWidget
 import eu.kanade.tachiyomi.util.system.toast
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toJavaLocalDateTime
-import kotlinx.datetime.toLocalDateTime
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import kotlin.time.Clock
+import java.time.LocalDate

 object SettingsAppearanceScreen : SearchableSettings {

@@ -102,7 +99,7 @@ object SettingsAppearanceScreen : SearchableSettings {
        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow

-        val now = remember { Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).toJavaLocalDateTime() }
+        val now = remember { LocalDate.now() }

        val dateFormat by uiPreferences.dateFormat.collectAsState()
        val formattedNow = remember(dateFormat) {
@@ -40,8 +40,6 @@ import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.system.updaterEnabled
 import kotlinx.coroutines.launch
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import logcat.LogPriority
 import tachiyomi.core.common.Constants
 import tachiyomi.core.common.util.lang.withIOContext
@@ -61,7 +59,9 @@ import tachiyomi.presentation.core.icons.Reddit
 import tachiyomi.presentation.core.icons.X
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import kotlin.time.Instant
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId

 object AboutScreen : Screen() {

@@ -219,7 +219,7 @@ object AboutScreen : Screen() {
        val updateChecker = AppUpdateChecker()
        withUIContext {
            try {
-                when (val result = withIOContext { updateChecker.checkForUpdate(forceCheck = true) }) {
+                when (val result = withIOContext { updateChecker.checkForUpdate(context, forceCheck = true) }) {
                    is GetApplicationRelease.Result.NewUpdate -> {
                        onAvailableUpdate(result)
                    }
@@ -273,14 +273,16 @@ object AboutScreen : Screen() {

    internal fun getFormattedBuildTime(): String {
        return try {
-            Instant.parse(BuildConfig.BUILD_TIME)
-                .toLocalDateTime(TimeZone.currentSystemDefault())
+            LocalDateTime.ofInstant(
+                Instant.parse(BuildConfig.BUILD_TIME),
+                ZoneId.systemDefault(),
+            )
                .toDateTimestampString(
                    UiPreferences.dateFormat(
                        Injekt.get<UiPreferences>().dateFormat.get(),
                    ),
                )
-        } catch (_: Exception) {
+        } catch (e: Exception) {
            BuildConfig.BUILD_TIME
        }
    }
@@ -30,8 +30,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastMap
-import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.model.StateScreenModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
+import cafe.adriel.voyager.core.model.screenModelScope
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.browse.components.SourceIcon
@@ -41,7 +42,6 @@ import eu.kanade.presentation.util.Screen
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
-import mihon.core.viewmodel.StateViewModel
 import tachiyomi.core.common.util.lang.launchIO
 import tachiyomi.core.common.util.lang.launchUI
 import tachiyomi.core.common.util.lang.toLong
@@ -67,13 +67,13 @@ class ClearDatabaseScreen : Screen() {
    override fun Content() {
        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow
-        val viewModel = viewModel<ClearDatabaseViewModel>()
-        val state by viewModel.state.collectAsState()
+        val model = rememberScreenModel { ClearDatabaseScreenModel() }
+        val state by model.state.collectAsState()
        val scope = rememberCoroutineScope()

        when (val s = state) {
-            is ClearDatabaseViewModel.State.Loading -> LoadingScreen()
-            is ClearDatabaseViewModel.State.Ready -> {
+            is ClearDatabaseScreenModel.State.Loading -> LoadingScreen()
+            is ClearDatabaseScreenModel.State.Ready -> {
                if (s.showConfirmation) {
                    var keepReadManga by remember { mutableStateOf(true) }
                    AlertDialog(
@@ -108,14 +108,14 @@ class ClearDatabaseScreen : Screen() {
                                }
                            }
                        },
-                        onDismissRequest = viewModel::hideConfirmation,
+                        onDismissRequest = model::hideConfirmation,
                        confirmButton = {
                            TextButton(
                                onClick = {
                                    scope.launchUI {
-                                        viewModel.removeMangaBySourceId(keepReadManga)
-                                        viewModel.clearSelection()
-                                        viewModel.hideConfirmation()
+                                        model.removeMangaBySourceId(keepReadManga)
+                                        model.clearSelection()
+                                        model.hideConfirmation()
                                        context.toast(MR.strings.clear_database_completed)
                                    }
                                },
@@ -124,7 +124,7 @@ class ClearDatabaseScreen : Screen() {
                            }
                        },
                        dismissButton = {
-                            TextButton(onClick = viewModel::hideConfirmation) {
+                            TextButton(onClick = model::hideConfirmation) {
                                Text(text = stringResource(MR.strings.action_cancel))
                            }
                        },
@@ -143,12 +143,12 @@ class ClearDatabaseScreen : Screen() {
                                            AppBar.Action(
                                                title = stringResource(MR.strings.action_select_all),
                                                icon = Icons.Outlined.SelectAll,
-                                                onClick = viewModel::selectAll,
+                                                onClick = model::selectAll,
                                            ),
                                            AppBar.Action(
                                                title = stringResource(MR.strings.action_select_inverse),
                                                icon = Icons.Outlined.FlipToBack,
-                                                onClick = viewModel::invertSelection,
+                                                onClick = model::invertSelection,
                                            ),
                                        ),
                                    )
@@ -168,14 +168,14 @@ class ClearDatabaseScreen : Screen() {
                            contentPadding = contentPadding,
                            actionLabel = stringResource(MR.strings.action_delete),
                            actionEnabled = s.selection.isNotEmpty(),
-                            onClickAction = viewModel::showConfirmation,
+                            onClickAction = model::showConfirmation,
                        ) {
                            items(s.items) { sourceWithCount ->
                                ClearDatabaseItem(
                                    source = sourceWithCount.source,
                                    count = sourceWithCount.count,
                                    isSelected = s.selection.contains(sourceWithCount.id),
-                                    onClickSelect = { viewModel.toggleSelection(sourceWithCount.source) },
+                                    onClickSelect = { model.toggleSelection(sourceWithCount.source) },
                                )
                            }
                        }
@@ -220,12 +220,12 @@ class ClearDatabaseScreen : Screen() {
    }
 }

-class ClearDatabaseViewModel : StateViewModel<ClearDatabaseViewModel.State>(State.Loading) {
+private class ClearDatabaseScreenModel : StateScreenModel<ClearDatabaseScreenModel.State>(State.Loading) {
    private val getSourcesWithNonLibraryManga: GetSourcesWithNonLibraryManga = Injekt.get()
    private val database: Database = Injekt.get()

    init {
-        viewModelScope.launchIO {
+        screenModelScope.launchIO {
            getSourcesWithNonLibraryManga.subscribe()
                .collectLatest { list ->
                    mutableState.update { old ->
@@ -10,6 +10,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -5,7 +5,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionStoreConfirmDialog
@@ -26,11 +26,11 @@ class ExtensionStoresScreen(
        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow

-        val viewModel = viewModel<ExtensionStoresViewModel>()
-        val state by viewModel.state.collectAsState()
+        val screenModel = rememberScreenModel { ExtensionStoresScreenModel() }
+        val state by screenModel.state.collectAsState()

        LaunchedEffect(url) {
-            url?.let { viewModel.addFromDeeplink(url) }
+            url?.let { screenModel.addFromDeeplink(url) }
        }

        if (state is ExtensionStoreScreenState.Loading) {
@@ -42,12 +42,12 @@ class ExtensionStoresScreen(

        ExtensionStoresScreen(
            state = successState,
-            onClickCreate = { viewModel.showDialog(ExtensionStoreDialog.Create()) },
+            onClickCreate = { screenModel.showDialog(ExtensionStoreDialog.Create()) },
            onCopy = { context.copyToClipboard(it.indexUrl, it.indexUrl) },
            onOpenWebsite = { it.contact.website.let(context::openInBrowser) },
            onOpenDiscord = { it.contact.discord?.let(context::openInBrowser) },
-            onClickDelete = { viewModel.showDialog(ExtensionStoreDialog.Delete(it)) },
-            onClickRefresh = { viewModel.refreshRepos() },
+            onClickDelete = { screenModel.showDialog(ExtensionStoreDialog.Delete(it)) },
+            onClickRefresh = { screenModel.refreshRepos() },
            navigateUp = navigator::pop,
        )

@@ -55,8 +55,8 @@ class ExtensionStoresScreen(
            null -> {}
            is ExtensionStoreDialog.Create -> {
                ExtensionStoreCreateDialog(
-                    onDismissRequest = viewModel::dismissDialog,
-                    onCreate = { viewModel.createRepo(it) },
+                    onDismissRequest = screenModel::dismissDialog,
+                    onCreate = { screenModel.createRepo(it) },
                    storeIndexUrls = successState.stores.map { it.indexUrl }.toSet(),
                    processing = dialog.processing,
                    errorMessage = dialog.errorMessage,
@@ -64,16 +64,16 @@ class ExtensionStoresScreen(
            }
            is ExtensionStoreDialog.Delete -> {
                ExtensionStoreDeleteDialog(
-                    onDismissRequest = viewModel::dismissDialog,
-                    onDelete = { viewModel.deleteRepo(dialog.store.indexUrl) },
+                    onDismissRequest = screenModel::dismissDialog,
+                    onDelete = { screenModel.deleteRepo(dialog.store.indexUrl) },
                    storeName = dialog.store.name,
                    storeIndexUrl = dialog.store.indexUrl,
                )
            }
            is ExtensionStoreDialog.Confirm -> {
                ExtensionStoreConfirmDialog(
-                    onDismissRequest = viewModel::dismissDialog,
-                    onCreate = { viewModel.createRepo(dialog.url) },
+                    onDismissRequest = screenModel::dismissDialog,
+                    onCreate = { screenModel.createRepo(dialog.url) },
                    storeIndexUrl = dialog.url,
                    storeAlreadyExists = dialog.alreadyExists,
                    processing = dialog.processing,
@@ -1,12 +1,12 @@
 package eu.kanade.presentation.more.settings.screen.browse

 import androidx.compose.runtime.Immutable
-import androidx.lifecycle.viewModelScope
+import cafe.adriel.voyager.core.model.StateScreenModel
+import cafe.adriel.voyager.core.model.screenModelScope
 import eu.kanade.tachiyomi.extension.ExtensionManager
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import mihon.core.viewmodel.StateViewModel
 import mihon.domain.extension.interactor.AddExtensionStore
 import mihon.domain.extension.interactor.GetExtensionStores
 import mihon.domain.extension.interactor.RemoveExtensionStore
@@ -16,13 +16,13 @@ import tachiyomi.core.common.util.lang.launchIO
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class ExtensionStoresViewModel(
+class ExtensionStoresScreenModel(
    private val getExtensionStores: GetExtensionStores = Injekt.get(),
    private val addExtensionStore: AddExtensionStore = Injekt.get(),
    private val removeExtensionStore: RemoveExtensionStore = Injekt.get(),
    private val updateExtensionStores: UpdateExtensionStores = Injekt.get(),
    private val extensionManager: ExtensionManager = Injekt.get(),
-) : StateViewModel<ExtensionStoreScreenState>(ExtensionStoreScreenState.Loading) {
+) : StateScreenModel<ExtensionStoreScreenState>(ExtensionStoreScreenState.Loading) {

    private inline fun updateSuccessState(
        func: (ExtensionStoreScreenState.Success) -> ExtensionStoreScreenState.Success,
@@ -36,7 +36,7 @@ class ExtensionStoresViewModel(
    }

    init {
-        viewModelScope.launchIO {
+        screenModelScope.launchIO {
            getExtensionStores.subscribe()
                .collectLatest { stores ->
                    mutableState.update {
@@ -55,7 +55,7 @@ class ExtensionStoresViewModel(
     * @param baseUrl The baseUrl of the repo to create.
     */
    fun createRepo(baseUrl: String) {
-        viewModelScope.launch {
+        screenModelScope.launch {
            updateSuccessState {
                it.copy(
                    dialog = when (it.dialog) {
@@ -97,7 +97,7 @@ class ExtensionStoresViewModel(
        val status = state.value

        if (status is ExtensionStoreScreenState.Success) {
-            viewModelScope.launchIO {
+            screenModelScope.launchIO {
                updateExtensionStores()
            }
        }
@@ -107,7 +107,7 @@ class ExtensionStoresViewModel(
     * Deletes the given repo from the database
     */
    fun deleteRepo(baseUrl: String) {
-        viewModelScope.launchIO {
+        screenModelScope.launchIO {
            removeExtensionStore(baseUrl)
            extensionManager.findAvailableExtensions()
        }
@@ -20,8 +20,10 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.delay
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
+import kotlin.time.Duration.Companion.seconds

@Composable
 fun ExtensionStoreCreateDialog(
@@ -92,6 +94,8 @@ fun ExtensionStoreCreateDialog(
    )

    LaunchedEffect(focusRequester) {
+        // TODO: https://issuetracker.google.com/issues/204502668
+        delay(0.1.seconds)
        focusRequester.requestFocus()
    }
 }
@@ -11,7 +11,8 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.model.StateScreenModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.components.AppBar
@@ -23,7 +24,6 @@ import eu.kanade.tachiyomi.data.backup.create.BackupOptions
 import eu.kanade.tachiyomi.util.system.DeviceUtil
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.coroutines.flow.update
-import mihon.core.viewmodel.StateViewModel
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.LazyColumnWithAction
@@ -37,8 +37,8 @@ class CreateBackupScreen : Screen() {
    override fun Content() {
        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow
-        val viewModel = viewModel<CreateBackupViewModel>()
-        val state by viewModel.state.collectAsState()
+        val model = rememberScreenModel { CreateBackupScreenModel() }
+        val state by model.state.collectAsState()

        val chooseBackupDir = rememberLauncherForActivityResult(
            contract = ActivityResultContracts.CreateDocument("application/*"),
@@ -49,7 +49,7 @@ class CreateBackupScreen : Screen() {
                    Intent.FLAG_GRANT_READ_URI_PERMISSION or
                        Intent.FLAG_GRANT_WRITE_URI_PERMISSION,
                )
-                viewModel.createBackup(context, it)
+                model.createBackup(context, it)
                navigator.pop()
            }
        }
@@ -87,13 +87,13 @@ class CreateBackupScreen : Screen() {

                item {
                    SectionCard(MR.strings.label_library) {
-                        Options(BackupOptions.libraryOptions, state, viewModel)
+                        Options(BackupOptions.libraryOptions, state, model)
                    }
                }

                item {
                    SectionCard(MR.strings.label_settings) {
-                        Options(BackupOptions.settingsOptions, state, viewModel)
+                        Options(BackupOptions.settingsOptions, state, model)
                    }
                }
            }
@@ -103,8 +103,8 @@ class CreateBackupScreen : Screen() {
    @Composable
    private fun Options(
        options: List<BackupOptions.Entry>,
-        state: CreateBackupViewModel.State,
-        model: CreateBackupViewModel,
+        state: CreateBackupScreenModel.State,
+        model: CreateBackupScreenModel,
    ) {
        options.forEach { option ->
            LabeledCheckbox(
@@ -119,7 +119,7 @@ class CreateBackupScreen : Screen() {
    }
 }

-class CreateBackupViewModel : StateViewModel<CreateBackupViewModel.State>(State()) {
+private class CreateBackupScreenModel : StateScreenModel<CreateBackupScreenModel.State>(State()) {

    fun toggle(setter: (BackupOptions, Boolean) -> BackupOptions, enabled: Boolean) {
        mutableState.update {
@@ -1,6 +1,5 @@
 package eu.kanade.presentation.more.settings.screen.data

-import android.app.Application
 import android.content.Context
 import android.net.Uri
 import androidx.compose.foundation.layout.Arrangement
@@ -15,15 +14,14 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.withStyle
 import androidx.core.net.toUri
-import androidx.lifecycle.viewmodel.CreationExtras
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
+import cafe.adriel.voyager.core.model.StateScreenModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.components.AppBar
@@ -34,7 +32,6 @@ import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
 import eu.kanade.tachiyomi.data.backup.restore.RestoreOptions
 import eu.kanade.tachiyomi.util.system.DeviceUtil
 import kotlinx.coroutines.flow.update
-import mihon.core.viewmodel.StateViewModel
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.LazyColumnWithAction
@@ -42,8 +39,6 @@ import tachiyomi.presentation.core.components.SectionCard
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

 class RestoreBackupScreen(
    private val uri: String,
@@ -51,14 +46,10 @@ class RestoreBackupScreen(

    @Composable
    override fun Content() {
+        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow
-        val viewModel = viewModel<RestoreBackupViewModel>(
-            factory = RestoreBackupViewModel.Factory,
-            extras = CreationExtras {
-                set(RestoreBackupViewModel.URI_KEY, uri)
-            },
-        )
-        val state by viewModel.state.collectAsState()
+        val model = rememberScreenModel { RestoreBackupScreenModel(context, uri) }
+        val state by model.state.collectAsState()

        Scaffold(
            topBar = {
@@ -74,7 +65,7 @@ class RestoreBackupScreen(
                actionLabel = stringResource(MR.strings.action_restore),
                actionEnabled = state.canRestore && state.options.canRestore(),
                onClickAction = {
-                    viewModel.startRestore()
+                    model.startRestore()
                    navigator.pop()
                },
            ) {
@@ -92,7 +83,7 @@ class RestoreBackupScreen(
                                    label = stringResource(option.label),
                                    checked = option.getter(state.options),
                                    onCheckedChange = {
-                                        viewModel.toggle(option.setter, it)
+                                        model.toggle(option.setter, it)
                                    },
                                )
                            }
@@ -173,23 +164,10 @@ class RestoreBackupScreen(
    }
 }

-class RestoreBackupViewModel(
+private class RestoreBackupScreenModel(
    private val context: Context,
    private val uri: String,
-) : StateViewModel<RestoreBackupViewModel.State>(State()) {
-
-    companion object {
-        val URI_KEY = CreationExtras.Key<String>()
-
-        val Factory = viewModelFactory {
-            initializer {
-                RestoreBackupViewModel(
-                    context = Injekt.get<Application>(),
-                    uri = get(URI_KEY)!!,
-                )
-            }
-        }
-    }
+) : StateScreenModel<RestoreBackupScreenModel.State>(State()) {

    init {
        validate(uri.toUri())
@@ -1,6 +1,5 @@
 package eu.kanade.presentation.more.settings.screen.debug

-import android.app.Application
 import android.content.Context
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.PaddingValues
@@ -19,34 +18,32 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEach
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
 import androidx.work.WorkInfo
 import androidx.work.WorkQuery
+import cafe.adriel.voyager.core.model.ScreenModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.util.Screen
+import eu.kanade.presentation.util.ioCoroutineScope
 import eu.kanade.tachiyomi.util.lang.toDateTimestampString
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import eu.kanade.tachiyomi.util.system.workManager
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.plus
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import kotlin.time.Instant
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId

 class WorkerInfoScreen : Screen() {

@@ -59,10 +56,10 @@ class WorkerInfoScreen : Screen() {
        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow

-        val viewModel = viewModel<WorkerInfoViewModel>(factory = WorkerInfoViewModel.Factory)
-        val enqueued by viewModel.enqueued.collectAsState()
-        val finished by viewModel.finished.collectAsState()
-        val running by viewModel.running.collectAsState()
+        val screenModel = rememberScreenModel { Model(context) }
+        val enqueued by screenModel.enqueued.collectAsState()
+        val finished by screenModel.finished.collectAsState()
+        val running by screenModel.running.collectAsState()

        Scaffold(
            topBar = {
@@ -120,20 +117,7 @@ class WorkerInfoScreen : Screen() {
        )
    }

-    class WorkerInfoViewModel(
-        context: Context,
-    ) : ViewModel() {
-
-        companion object {
-            val Factory = viewModelFactory {
-                initializer {
-                    WorkerInfoViewModel(
-                        context = Injekt.get<Application>(),
-                    )
-                }
-            }
-        }
-
+    private class Model(context: Context) : ScreenModel {
        private val workManager = context.workManager

        val finished = workManager
@@ -141,17 +125,17 @@ class WorkerInfoScreen : Screen() {
                WorkQuery.fromStates(WorkInfo.State.SUCCEEDED, WorkInfo.State.FAILED, WorkInfo.State.CANCELLED),
            )
            .map(::constructString)
-            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "")
+            .stateIn(ioCoroutineScope, SharingStarted.WhileSubscribed(), "")

        val running = workManager
            .getWorkInfosFlow(WorkQuery.fromStates(WorkInfo.State.RUNNING))
            .map(::constructString)
-            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "")
+            .stateIn(ioCoroutineScope, SharingStarted.WhileSubscribed(), "")

        val enqueued = workManager
            .getWorkInfosFlow(WorkQuery.fromStates(WorkInfo.State.ENQUEUED))
            .map(::constructString)
-            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "")
+            .stateIn(ioCoroutineScope, SharingStarted.WhileSubscribed(), "")

        private fun constructString(list: List<WorkInfo>) = buildString {
            if (list.isEmpty()) {
@@ -165,8 +149,10 @@ class WorkerInfoScreen : Screen() {
                    }
                    appendLine("State: ${workInfo.state}")
                    if (workInfo.state == WorkInfo.State.ENQUEUED) {
-                        val timestamp = Instant.fromEpochMilliseconds(workInfo.nextScheduleTimeMillis)
-                            .toLocalDateTime(TimeZone.currentSystemDefault())
+                        val timestamp = LocalDateTime.ofInstant(
+                            Instant.ofEpochMilli(workInfo.nextScheduleTimeMillis),
+                            ZoneId.systemDefault(),
+                        )
                            .toDateTimestampString(
                                UiPreferences.dateFormat(
                                    Injekt.get<UiPreferences>().dateFormat.get(),
@@ -18,7 +18,7 @@ import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.presentation.reader.components.ModeSelectionDialog
 import eu.kanade.presentation.theme.TachiyomiPreviewTheme
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsViewModel
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.SettingsIconGrid
 import tachiyomi.presentation.core.components.material.IconToggleButton
@@ -29,17 +29,17 @@ private val ReaderOrientationsWithoutDefault = ReaderOrientation.entries - Reade
@Composable
 fun OrientationSelectDialog(
    onDismissRequest: () -> Unit,
-    viewModel: ReaderSettingsViewModel,
+    screenModel: ReaderSettingsScreenModel,
    onChange: (StringResource) -> Unit,
 ) {
-    val manga by viewModel.mangaFlow.collectAsState()
+    val manga by screenModel.mangaFlow.collectAsState()
    val orientation = remember(manga) { ReaderOrientation.fromPreference(manga?.readerOrientation?.toInt()) }

    AdaptiveSheet(onDismissRequest = onDismissRequest) {
        DialogContent(
            orientation = orientation,
            onChangeOrientation = {
-                viewModel.onChangeOrientation(it)
+                screenModel.onChangeOrientation(it)
                onChange(it.stringRes)
                onDismissRequest()
            },
@@ -19,7 +19,7 @@ import eu.kanade.domain.manga.model.readingMode
 import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.presentation.reader.components.ModeSelectionDialog
 import eu.kanade.presentation.theme.TachiyomiPreviewTheme
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsViewModel
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.SettingsIconGrid
@@ -31,17 +31,17 @@ private val ReadingModesWithoutDefault = ReadingMode.entries - ReadingMode.DEFAU
@Composable
 fun ReadingModeSelectDialog(
    onDismissRequest: () -> Unit,
-    viewModel: ReaderSettingsViewModel,
+    screenModel: ReaderSettingsScreenModel,
    onChange: (StringResource) -> Unit,
 ) {
-    val manga by viewModel.mangaFlow.collectAsState()
+    val manga by screenModel.mangaFlow.collectAsState()
    val readingMode = remember(manga) { ReadingMode.fromPreference(manga?.readingMode?.toInt()) }

    AdaptiveSheet(onDismissRequest = onDismissRequest) {
        DialogContent(
            readingMode = readingMode,
            onChangeReadingMode = {
-                viewModel.onChangeReadingMode(it)
+                screenModel.onChangeReadingMode(it)
                onChange(it.stringRes)
                onDismissRequest()
            },
@@ -65,7 +65,6 @@ fun ReaderAppBars(
    currentPage: Int,
    totalPages: Int,
    onPageIndexChange: (Int) -> Unit,
-    onPageIndexChangeFinished: () -> Unit,

    readingMode: ReadingMode,
    onClickReadingMode: () -> Unit,
@@ -129,7 +128,6 @@ fun ReaderAppBars(
                                    currentPage = currentPage,
                                    totalPages = totalPages,
                                    onPageIndexChange = onPageIndexChange,
-                                    onPageIndexChangeFinished = onPageIndexChangeFinished,
                                )
                            }
                        }
@@ -157,7 +155,6 @@ fun ReaderAppBars(
                        currentPage = currentPage,
                        totalPages = totalPages,
                        onPageIndexChange = onPageIndexChange,
-                        onPageIndexChangeFinished = onPageIndexChangeFinished,
                    )
                }
                ReaderBottomBar(
@@ -70,7 +70,6 @@ fun ChapterNavigator(
    currentPage: Int,
    totalPages: Int,
    onPageIndexChange: (Int) -> Unit,
-    onPageIndexChangeFinished: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
    val haptic = LocalHapticFeedback.current
@@ -84,7 +83,6 @@ fun ChapterNavigator(
    }
    state.value = currentPage.toFloat()
    state.onValueChange = { onPageIndexChange(it.roundToInt() - 1) }
-    state.onValueChangeFinished = onPageIndexChangeFinished

    val interactionSource = remember { MutableInteractionSource() }
    val sliderDragged by interactionSource.collectIsDraggedAsState()
@@ -312,7 +310,6 @@ private fun ChapterNavigatorPreview() {
            currentPage = currentPage,
            totalPages = 10,
            onPageIndexChange = { currentPage = (it + 1) },
-            onPageIndexChangeFinished = {},
        )
    }
 }
@@ -11,7 +11,7 @@ import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences.Companion.ColorFilterMode
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsViewModel
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import tachiyomi.core.common.preference.getAndSet
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.CheckboxItem
@@ -21,11 +21,11 @@ import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState

@Composable
-internal fun ColumnScope.ColorFilterPage(viewModel: ReaderSettingsViewModel) {
-    val customBrightness by viewModel.preferences.customBrightness.collectAsState()
+internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel) {
+    val customBrightness by screenModel.preferences.customBrightness.collectAsState()
    CheckboxItem(
        label = stringResource(MR.strings.pref_custom_brightness),
-        pref = viewModel.preferences.customBrightness,
+        pref = screenModel.preferences.customBrightness,
    )

    /*
@@ -35,31 +35,31 @@ internal fun ColumnScope.ColorFilterPage(viewModel: ReaderSettingsViewModel) {
     * 0 sets system brightness and hides the overlay.
     */
    if (customBrightness) {
-        val customBrightnessValue by viewModel.preferences.customBrightnessValue.collectAsState()
+        val customBrightnessValue by screenModel.preferences.customBrightnessValue.collectAsState()
        SliderItem(
            value = customBrightnessValue,
            valueRange = -75..100,
            steps = 0,
            label = stringResource(MR.strings.pref_custom_brightness),
-            onChange = { viewModel.preferences.customBrightnessValue.set(it) },
+            onChange = { screenModel.preferences.customBrightnessValue.set(it) },
            pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
        )
    }

-    val colorFilter by viewModel.preferences.colorFilter.collectAsState()
+    val colorFilter by screenModel.preferences.colorFilter.collectAsState()
    CheckboxItem(
        label = stringResource(MR.strings.pref_custom_color_filter),
-        pref = viewModel.preferences.colorFilter,
+        pref = screenModel.preferences.colorFilter,
    )
    if (colorFilter) {
-        val colorFilterValue by viewModel.preferences.colorFilterValue.collectAsState()
+        val colorFilterValue by screenModel.preferences.colorFilterValue.collectAsState()
        SliderItem(
            value = colorFilterValue.red,
            valueRange = 0..255,
            steps = 0,
            label = stringResource(MR.strings.color_filter_r_value),
            onChange = { newRValue ->
-                viewModel.preferences.colorFilterValue.getAndSet {
+                screenModel.preferences.colorFilterValue.getAndSet {
                    getColorValue(it, newRValue, RED_MASK, 16)
                }
            },
@@ -71,7 +71,7 @@ internal fun ColumnScope.ColorFilterPage(viewModel: ReaderSettingsViewModel) {
            steps = 0,
            label = stringResource(MR.strings.color_filter_g_value),
            onChange = { newGValue ->
-                viewModel.preferences.colorFilterValue.getAndSet {
+                screenModel.preferences.colorFilterValue.getAndSet {
                    getColorValue(it, newGValue, GREEN_MASK, 8)
                }
            },
@@ -83,7 +83,7 @@ internal fun ColumnScope.ColorFilterPage(viewModel: ReaderSettingsViewModel) {
            steps = 0,
            label = stringResource(MR.strings.color_filter_b_value),
            onChange = { newBValue ->
-                viewModel.preferences.colorFilterValue.getAndSet {
+                screenModel.preferences.colorFilterValue.getAndSet {
                    getColorValue(it, newBValue, BLUE_MASK, 0)
                }
            },
@@ -95,19 +95,19 @@ internal fun ColumnScope.ColorFilterPage(viewModel: ReaderSettingsViewModel) {
            steps = 0,
            label = stringResource(MR.strings.color_filter_a_value),
            onChange = { newAValue ->
-                viewModel.preferences.colorFilterValue.getAndSet {
+                screenModel.preferences.colorFilterValue.getAndSet {
                    getColorValue(it, newAValue, ALPHA_MASK, 24)
                }
            },
            pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
        )

-        val colorFilterMode by viewModel.preferences.colorFilterMode.collectAsState()
+        val colorFilterMode by screenModel.preferences.colorFilterMode.collectAsState()
        SettingsChipRow(MR.strings.pref_color_filter_mode) {
            ColorFilterMode.mapIndexed { index, it ->
                FilterChip(
                    selected = colorFilterMode == index,
-                    onClick = { viewModel.preferences.colorFilterMode.set(index) },
+                    onClick = { screenModel.preferences.colorFilterMode.set(index) },
                    label = { Text(stringResource(it.first)) },
                )
            }
@@ -116,11 +116,11 @@ internal fun ColumnScope.ColorFilterPage(viewModel: ReaderSettingsViewModel) {

    CheckboxItem(
        label = stringResource(MR.strings.pref_grayscale),
-        pref = viewModel.preferences.grayscale,
+        pref = screenModel.preferences.grayscale,
    )
    CheckboxItem(
        label = stringResource(MR.strings.pref_inverted_colors),
-        pref = viewModel.preferences.invertedColors,
+        pref = screenModel.preferences.invertedColors,
    )
 }

@@ -8,7 +8,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsViewModel
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
 import eu.kanade.tachiyomi.util.system.hasDisplayCutout
 import tachiyomi.i18n.MR
@@ -33,25 +33,25 @@ private val flashColors = listOf(
 )

@Composable
-internal fun ColumnScope.GeneralPage(viewModel: ReaderSettingsViewModel) {
-    val readerTheme by viewModel.preferences.readerTheme.collectAsState()
+internal fun ColumnScope.GeneralPage(screenModel: ReaderSettingsScreenModel) {
+    val readerTheme by screenModel.preferences.readerTheme.collectAsState()

-    val flashPageState by viewModel.preferences.flashOnPageChange.collectAsState()
+    val flashPageState by screenModel.preferences.flashOnPageChange.collectAsState()

-    val flashMillisPref = viewModel.preferences.flashDurationMillis
+    val flashMillisPref = screenModel.preferences.flashDurationMillis
    val flashMillis by flashMillisPref.collectAsState()

-    val flashIntervalPref = viewModel.preferences.flashPageInterval
+    val flashIntervalPref = screenModel.preferences.flashPageInterval
    val flashInterval by flashIntervalPref.collectAsState()

-    val flashColorPref = viewModel.preferences.flashColor
+    val flashColorPref = screenModel.preferences.flashColor
    val flashColor by flashColorPref.collectAsState()

    SettingsChipRow(MR.strings.pref_reader_theme) {
        themes.map { (labelRes, value) ->
            FilterChip(
                selected = readerTheme == value,
-                onClick = { viewModel.preferences.readerTheme.set(value) },
+                onClick = { screenModel.preferences.readerTheme.set(value) },
                label = { Text(stringResource(labelRes)) },
            )
        }
@@ -59,10 +59,10 @@ internal fun ColumnScope.GeneralPage(viewModel: ReaderSettingsViewModel) {

    CheckboxItem(
        label = stringResource(MR.strings.pref_show_page_number),
-        pref = viewModel.preferences.showPageNumber,
+        pref = screenModel.preferences.showPageNumber,
    )

-    val verticalNavigatorModes by viewModel.preferences.verticalNavigator.collectAsState()
+    val verticalNavigatorModes by screenModel.preferences.verticalNavigator.collectAsState()

    SettingsChipRow(MR.strings.pref_vertical_navigator) {
        ReadingMode.entries.filter { it != ReadingMode.DEFAULT }.forEach { mode ->
@@ -74,7 +74,7 @@ internal fun ColumnScope.GeneralPage(viewModel: ReaderSettingsViewModel) {
                    } else {
                        verticalNavigatorModes + mode
                    }
-                    viewModel.preferences.verticalNavigator.set(newModes)
+                    screenModel.preferences.verticalNavigator.set(newModes)
                },
                label = { Text(stringResource(mode.stringRes)) },
            )
@@ -82,12 +82,12 @@ internal fun ColumnScope.GeneralPage(viewModel: ReaderSettingsViewModel) {
    }

    if (verticalNavigatorModes.isNotEmpty()) {
-        val verticalNavigatorHeightPref = viewModel.preferences.verticalNavigatorHeight
+        val verticalNavigatorHeightPref = screenModel.preferences.verticalNavigatorHeight
        val verticalNavigatorHeight by verticalNavigatorHeightPref.collectAsState()

        CheckboxItem(
            label = stringResource(MR.strings.pref_webtoon_vertical_navigator_on_left),
-            pref = viewModel.preferences.verticalNavigatorOnLeft,
+            pref = screenModel.preferences.verticalNavigatorOnLeft,
        )

        SliderItem(
@@ -101,40 +101,40 @@ internal fun ColumnScope.GeneralPage(viewModel: ReaderSettingsViewModel) {

    CheckboxItem(
        label = stringResource(MR.strings.pref_fullscreen),
-        pref = viewModel.preferences.fullscreen,
+        pref = screenModel.preferences.fullscreen,
    )

-    val isFullscreen by viewModel.preferences.fullscreen.collectAsState()
+    val isFullscreen by screenModel.preferences.fullscreen.collectAsState()
    if (LocalActivity.current?.hasDisplayCutout() == true && isFullscreen) {
        CheckboxItem(
            label = stringResource(MR.strings.pref_cutout_short),
-            pref = viewModel.preferences.drawUnderCutout,
+            pref = screenModel.preferences.drawUnderCutout,
        )
    }

    CheckboxItem(
        label = stringResource(MR.strings.pref_keep_screen_on),
-        pref = viewModel.preferences.keepScreenOn,
+        pref = screenModel.preferences.keepScreenOn,
    )

    CheckboxItem(
        label = stringResource(MR.strings.pref_read_with_long_tap),
-        pref = viewModel.preferences.readWithLongTap,
+        pref = screenModel.preferences.readWithLongTap,
    )

    CheckboxItem(
        label = stringResource(MR.strings.pref_always_show_chapter_transition),
-        pref = viewModel.preferences.alwaysShowChapterTransition,
+        pref = screenModel.preferences.alwaysShowChapterTransition,
    )

    CheckboxItem(
        label = stringResource(MR.strings.pref_page_transitions),
-        pref = viewModel.preferences.pageTransitions,
+        pref = screenModel.preferences.pageTransitions,
    )

    CheckboxItem(
        label = stringResource(MR.strings.pref_flash_page),
-        pref = viewModel.preferences.flashOnPageChange,
+        pref = screenModel.preferences.flashOnPageChange,
    )
    if (flashPageState) {
        SliderItem(
@@ -14,7 +14,7 @@ import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.window.DialogWindowProvider
 import eu.kanade.presentation.components.TabbedDialog
 import eu.kanade.presentation.components.TabbedDialogPaddings
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsViewModel
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource

@@ -23,7 +23,7 @@ fun ReaderSettingsDialog(
    onDismissRequest: () -> Unit,
    onShowMenus: () -> Unit,
    onHideMenus: () -> Unit,
-    viewModel: ReaderSettingsViewModel,
+    screenModel: ReaderSettingsScreenModel,
 ) {
    val tabTitles = listOf(
        stringResource(MR.strings.pref_category_reading_mode),
@@ -60,9 +60,9 @@ fun ReaderSettingsDialog(
                    .verticalScroll(rememberScrollState()),
            ) {
                when (page) {
-                    0 -> ReadingModePage(viewModel)
-                    1 -> GeneralPage(viewModel)
-                    2 -> ColorFilterPage(viewModel)
+                    0 -> ReadingModePage(screenModel)
+                    1 -> GeneralPage(screenModel)
+                    2 -> ColorFilterPage(screenModel)
                }
            }
        }
@@ -12,7 +12,7 @@ import eu.kanade.domain.manga.model.readerOrientation
 import eu.kanade.domain.manga.model.readingMode
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsViewModel
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
 import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
 import tachiyomi.i18n.MR
@@ -25,16 +25,16 @@ import tachiyomi.presentation.core.util.collectAsState
 import java.text.NumberFormat

@Composable
-internal fun ColumnScope.ReadingModePage(viewModel: ReaderSettingsViewModel) {
+internal fun ColumnScope.ReadingModePage(screenModel: ReaderSettingsScreenModel) {
    HeadingItem(MR.strings.pref_category_for_this_series)
-    val manga by viewModel.mangaFlow.collectAsState()
+    val manga by screenModel.mangaFlow.collectAsState()

    val readingMode = remember(manga) { ReadingMode.fromPreference(manga?.readingMode?.toInt()) }
    SettingsChipRow(MR.strings.pref_category_reading_mode) {
        ReadingMode.entries.map {
            FilterChip(
                selected = it == readingMode,
-                onClick = { viewModel.onChangeReadingMode(it) },
+                onClick = { screenModel.onChangeReadingMode(it) },
                label = { Text(stringResource(it.stringRes)) },
            )
        }
@@ -45,50 +45,50 @@ internal fun ColumnScope.ReadingModePage(viewModel: ReaderSettingsViewModel) {
        ReaderOrientation.entries.map {
            FilterChip(
                selected = it == orientation,
-                onClick = { viewModel.onChangeOrientation(it) },
+                onClick = { screenModel.onChangeOrientation(it) },
                label = { Text(stringResource(it.stringRes)) },
            )
        }
    }

-    val viewer by viewModel.viewerFlow.collectAsState()
+    val viewer by screenModel.viewerFlow.collectAsState()
    if (viewer is WebtoonViewer) {
-        WebtoonViewerSettings(viewModel)
+        WebtoonViewerSettings(screenModel)
    } else {
-        PagerViewerSettings(viewModel)
+        PagerViewerSettings(screenModel)
    }
 }

@Composable
-private fun ColumnScope.PagerViewerSettings(viewModel: ReaderSettingsViewModel) {
+private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenModel) {
    HeadingItem(MR.strings.pager_viewer)

-    val navigationModePager by viewModel.preferences.navigationModePager.collectAsState()
-    val pagerNavInverted by viewModel.preferences.pagerNavInverted.collectAsState()
+    val navigationModePager by screenModel.preferences.navigationModePager.collectAsState()
+    val pagerNavInverted by screenModel.preferences.pagerNavInverted.collectAsState()
    TapZonesItems(
        selected = navigationModePager,
-        onSelect = viewModel.preferences.navigationModePager::set,
+        onSelect = screenModel.preferences.navigationModePager::set,
        invertMode = pagerNavInverted,
-        onSelectInvertMode = viewModel.preferences.pagerNavInverted::set,
+        onSelectInvertMode = screenModel.preferences.pagerNavInverted::set,
    )

-    val imageScaleType by viewModel.preferences.imageScaleType.collectAsState()
+    val imageScaleType by screenModel.preferences.imageScaleType.collectAsState()
    SettingsChipRow(MR.strings.pref_image_scale_type) {
        ReaderPreferences.ImageScaleType.mapIndexed { index, it ->
            FilterChip(
                selected = imageScaleType == index + 1,
-                onClick = { viewModel.preferences.imageScaleType.set(index + 1) },
+                onClick = { screenModel.preferences.imageScaleType.set(index + 1) },
                label = { Text(stringResource(it)) },
            )
        }
    }

-    val zoomStart by viewModel.preferences.zoomStart.collectAsState()
+    val zoomStart by screenModel.preferences.zoomStart.collectAsState()
    SettingsChipRow(MR.strings.pref_zoom_start) {
        ReaderPreferences.ZoomStart.mapIndexed { index, it ->
            FilterChip(
                selected = zoomStart == index + 1,
-                onClick = { viewModel.preferences.zoomStart.set(index + 1) },
+                onClick = { screenModel.preferences.zoomStart.set(index + 1) },
                label = { Text(stringResource(it)) },
            )
        }
@@ -96,111 +96,111 @@ private fun ColumnScope.PagerViewerSettings(viewModel: ReaderSettingsViewModel)

    CheckboxItem(
        label = stringResource(MR.strings.pref_crop_borders),
-        pref = viewModel.preferences.cropBorders,
+        pref = screenModel.preferences.cropBorders,
    )

    CheckboxItem(
        label = stringResource(MR.strings.pref_landscape_zoom),
-        pref = viewModel.preferences.landscapeZoom,
+        pref = screenModel.preferences.landscapeZoom,
    )

    CheckboxItem(
        label = stringResource(MR.strings.pref_navigate_pan),
-        pref = viewModel.preferences.navigateToPan,
+        pref = screenModel.preferences.navigateToPan,
    )

-    val dualPageSplitPaged by viewModel.preferences.dualPageSplitPaged.collectAsState()
+    val dualPageSplitPaged by screenModel.preferences.dualPageSplitPaged.collectAsState()
    CheckboxItem(
        label = stringResource(MR.strings.pref_dual_page_split),
-        pref = viewModel.preferences.dualPageSplitPaged,
+        pref = screenModel.preferences.dualPageSplitPaged,
    )

    if (dualPageSplitPaged) {
        CheckboxItem(
            label = stringResource(MR.strings.pref_dual_page_invert),
-            pref = viewModel.preferences.dualPageInvertPaged,
+            pref = screenModel.preferences.dualPageInvertPaged,
        )
    }

-    val dualPageRotateToFit by viewModel.preferences.dualPageRotateToFit.collectAsState()
+    val dualPageRotateToFit by screenModel.preferences.dualPageRotateToFit.collectAsState()
    CheckboxItem(
        label = stringResource(MR.strings.pref_page_rotate),
-        pref = viewModel.preferences.dualPageRotateToFit,
+        pref = screenModel.preferences.dualPageRotateToFit,
    )

    if (dualPageRotateToFit) {
        CheckboxItem(
            label = stringResource(MR.strings.pref_page_rotate_invert),
-            pref = viewModel.preferences.dualPageRotateToFitInvert,
+            pref = screenModel.preferences.dualPageRotateToFitInvert,
        )
    }
 }

@Composable
-private fun ColumnScope.WebtoonViewerSettings(viewModel: ReaderSettingsViewModel) {
+private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenModel) {
    val numberFormat = remember { NumberFormat.getPercentInstance() }

    HeadingItem(MR.strings.webtoon_viewer)

-    val navigationModeWebtoon by viewModel.preferences.navigationModeWebtoon.collectAsState()
-    val webtoonNavInverted by viewModel.preferences.webtoonNavInverted.collectAsState()
+    val navigationModeWebtoon by screenModel.preferences.navigationModeWebtoon.collectAsState()
+    val webtoonNavInverted by screenModel.preferences.webtoonNavInverted.collectAsState()
    TapZonesItems(
        selected = navigationModeWebtoon,
-        onSelect = viewModel.preferences.navigationModeWebtoon::set,
+        onSelect = screenModel.preferences.navigationModeWebtoon::set,
        invertMode = webtoonNavInverted,
-        onSelectInvertMode = viewModel.preferences.webtoonNavInverted::set,
+        onSelectInvertMode = screenModel.preferences.webtoonNavInverted::set,
    )

-    val webtoonSidePadding by viewModel.preferences.webtoonSidePadding.collectAsState()
+    val webtoonSidePadding by screenModel.preferences.webtoonSidePadding.collectAsState()
    SliderItem(
        value = webtoonSidePadding,
        valueRange = ReaderPreferences.let { it.WEBTOON_PADDING_MIN..it.WEBTOON_PADDING_MAX },
        label = stringResource(MR.strings.pref_webtoon_side_padding),
        valueString = numberFormat.format(webtoonSidePadding / 100f),
        onChange = {
-            viewModel.preferences.webtoonSidePadding.set(it)
+            screenModel.preferences.webtoonSidePadding.set(it)
        },
        pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
    )

    CheckboxItem(
        label = stringResource(MR.strings.pref_crop_borders),
-        pref = viewModel.preferences.cropBordersWebtoon,
+        pref = screenModel.preferences.cropBordersWebtoon,
    )

-    val dualPageSplitWebtoon by viewModel.preferences.dualPageSplitWebtoon.collectAsState()
+    val dualPageSplitWebtoon by screenModel.preferences.dualPageSplitWebtoon.collectAsState()
    CheckboxItem(
        label = stringResource(MR.strings.pref_dual_page_split),
-        pref = viewModel.preferences.dualPageSplitWebtoon,
+        pref = screenModel.preferences.dualPageSplitWebtoon,
    )

    if (dualPageSplitWebtoon) {
        CheckboxItem(
            label = stringResource(MR.strings.pref_dual_page_invert),
-            pref = viewModel.preferences.dualPageInvertWebtoon,
+            pref = screenModel.preferences.dualPageInvertWebtoon,
        )
    }

-    val dualPageRotateToFitWebtoon by viewModel.preferences.dualPageRotateToFitWebtoon.collectAsState()
+    val dualPageRotateToFitWebtoon by screenModel.preferences.dualPageRotateToFitWebtoon.collectAsState()
    CheckboxItem(
        label = stringResource(MR.strings.pref_page_rotate),
-        pref = viewModel.preferences.dualPageRotateToFitWebtoon,
+        pref = screenModel.preferences.dualPageRotateToFitWebtoon,
    )

    if (dualPageRotateToFitWebtoon) {
        CheckboxItem(
            label = stringResource(MR.strings.pref_page_rotate_invert),
-            pref = viewModel.preferences.dualPageRotateToFitInvertWebtoon,
+            pref = screenModel.preferences.dualPageRotateToFitInvertWebtoon,
        )
    }

    CheckboxItem(
        label = stringResource(MR.strings.pref_double_tap_zoom),
-        pref = viewModel.preferences.webtoonDoubleTapZoomEnabled,
+        pref = screenModel.preferences.webtoonDoubleTapZoomEnabled,
    )
    CheckboxItem(
        label = stringResource(MR.strings.pref_webtoon_disable_zoom_out),
-        pref = viewModel.preferences.webtoonDisableZoomOut,
+        pref = screenModel.preferences.webtoonDisableZoomOut,
    )
 }

@@ -22,7 +22,6 @@ import eu.kanade.presentation.theme.colorscheme.TachiyomiColorScheme
 import eu.kanade.presentation.theme.colorscheme.TakoColorScheme
 import eu.kanade.presentation.theme.colorscheme.TealTurqoiseColorScheme
 import eu.kanade.presentation.theme.colorscheme.TidalWaveColorScheme
-import eu.kanade.presentation.theme.colorscheme.TokyoNightColorScheme
 import eu.kanade.presentation.theme.colorscheme.YinYangColorScheme
 import eu.kanade.presentation.theme.colorscheme.YotsubaColorScheme
 import uy.kohesive.injekt.Injekt
@@ -91,7 +90,6 @@ private fun getThemeColorScheme(
 private val colorSchemes: Map<AppTheme, BaseColorScheme> = mapOf(
    AppTheme.DEFAULT to TachiyomiColorScheme,
    AppTheme.CATPPUCCIN to CatppuccinColorScheme,
-    AppTheme.TOKYONIGHT to TokyoNightColorScheme,
    AppTheme.GREEN_APPLE to GreenAppleColorScheme,
    AppTheme.LAVENDER to LavenderColorScheme,
    AppTheme.MIDNIGHT_DUSK to MidnightDuskColorScheme,
@@ -1,89 +0,0 @@
-package eu.kanade.presentation.theme.colorscheme
-
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.ui.graphics.Color
-
-/**
- * Colors for Tokyo Night Moon/Day
- *
- * https://github.com/folke/tokyonight.nvim
- */
-internal object TokyoNightColorScheme : BaseColorScheme() {
-
-    override val darkScheme = darkColorScheme(
-        primary = Color(0xFF82AAFF),
-        onPrimary = Color(0xFF1B1D2B),
-        primaryContainer = Color(0xFF444A73),
-        onPrimaryContainer = Color(0xFF9AB8FF),
-        secondary = Color(0xFF86E1FC),
-        onSecondary = Color(0xFF1B1D2B),
-        secondaryContainer = Color(0xFF444A73),
-        onSecondaryContainer = Color(0xFFB2EBFF),
-        tertiary = Color(0xFFC099FF),
-        onTertiary = Color(0xFF1B1D2B),
-        tertiaryContainer = Color(0xFF444A73),
-        onTertiaryContainer = Color(0xFFCAABFF),
-        error = Color(0xFFFF757F),
-        onError = Color(0xFF1B1D2B),
-        errorContainer = Color(0xFFC53B53),
-        onErrorContainer = Color(0xFFFF8D94),
-        background = Color(0xFF222436),
-        onBackground = Color(0xFFC8D3F5),
-        surface = Color(0xFF222436),
-        onSurface = Color(0xFFC8D3F5),
-        surfaceVariant = Color(0xFF444A73),
-        onSurfaceVariant = Color(0xFF828BB8),
-        outline = Color(0xFF828BB8),
-        outlineVariant = Color(0xFF444A73),
-        scrim = Color(0xFF000000),
-        inverseSurface = Color(0xFFC8D3F5),
-        inverseOnSurface = Color(0xFF222436),
-        inversePrimary = Color(0xFF3D5C9E),
-        surfaceContainerLowest = Color(0xFF1E202F),
-        surfaceDim = Color(0xFF222436),
-        surfaceContainerLow = Color(0xFF292C44),
-        surfaceContainer = Color(0xFF2D304B),
-        surfaceContainerHigh = Color(0xFF363B5D),
-        surfaceContainerHighest = Color(0xFF3F466F),
-        surfaceBright = Color(0xFF434A77),
-    )
-
-    override val lightScheme = lightColorScheme(
-        primary = Color(0xFF2E7DE9),
-        onPrimary = Color(0xFFFFFFFF),
-        primaryContainer = Color(0xFF92A6D5),
-        onPrimaryContainer = Color(0xFF15386A),
-        inversePrimary = Color(0xFF7890DD),
-        secondary = Color(0xFF007197),
-        onSecondary = Color(0xFFFFFFFF),
-        secondaryContainer = Color(0xFFA9C6D3),
-        onSecondaryContainer = Color(0xFF006A83),
-        tertiary = Color(0xFF9854F1),
-        onTertiary = Color(0xFFFFFFFF),
-        tertiaryContainer = Color(0xFFCFBFEA),
-        onTertiaryContainer = Color(0xFF7847BD),
-        background = Color(0xFFE1E2E7),
-        onBackground = Color(0xFF3760BF),
-        surface = Color(0xFFE1E2E7),
-        onSurface = Color(0xFF3760BF),
-        surfaceVariant = Color(0xFFC4C8DA),
-        onSurfaceVariant = Color(0xFF6172B0),
-        surfaceTint = Color(0xFF2E7DE9),
-        inverseSurface = Color(0xFF3760BF),
-        inverseOnSurface = Color(0xFFE1E2E7),
-        outline = Color(0xFF68709A),
-        outlineVariant = Color(0xFFA8AECB),
-        error = Color(0xFFF52A65),
-        onError = Color(0xFFFFFFFF),
-        errorContainer = Color(0xFFE6B4C7),
-        onErrorContainer = Color(0xFF6E132D),
-        surfaceDim = Color(0xFF9195B1),
-        surfaceBright = Color(0xFFE1E2E7),
-        surfaceContainerLowest = Color(0xFFE4E5E9),
-        surfaceContainerLow = Color(0xFFD0D5E3),
-        surfaceContainer = Color(0xFFC1C9DF),
-        surfaceContainerHigh = Color(0xFFC4C8DA),
-        surfaceContainerHighest = Color(0xFFA1A6C5),
-    )
-}
@@ -56,10 +56,8 @@ import eu.kanade.presentation.theme.TachiyomiPreviewTheme
 import eu.kanade.presentation.track.components.TrackLogoIcon
 import eu.kanade.tachiyomi.data.track.Tracker
 import eu.kanade.tachiyomi.ui.manga.track.TrackItem
-import eu.kanade.tachiyomi.util.lang.toJavaLocalDate
 import eu.kanade.tachiyomi.util.lang.toLocalDate
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import kotlinx.datetime.toJavaLocalDate
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import java.time.format.DateTimeFormatter
@@ -112,13 +110,11 @@ fun TrackInfoDialogHome(
                        .takeIf { supportsScoring && item.track.score != 0.0 },
                    onScoreClick = { onScoreClick(item) }
                        .takeIf { supportsScoring },
-                    startDate = remember(item.track.startDate) {
-                        dateFormat.format(item.track.startDate.toLocalDate().toJavaLocalDate())
-                    }
+                    startDate = remember(item.track.startDate) { dateFormat.format(item.track.startDate.toLocalDate()) }
                        .takeIf { supportsReadingDates && item.track.startDate != 0L },
                    onStartDateClick = { onStartDateEdit(item) } // TODO
                        .takeIf { supportsReadingDates },
-                    endDate = dateFormat.format(item.track.finishDate.toJavaLocalDate())
+                    endDate = dateFormat.format(item.track.finishDate.toLocalDate())
                        .takeIf { supportsReadingDates && item.track.finishDate != 0L },
                    onEndDateClick = { onEndDateEdit(item) }
                        .takeIf { supportsReadingDates },
@@ -6,12 +6,11 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import java.text.SimpleDateFormat
+import java.time.Instant
+import java.time.temporal.ChronoUnit
 import java.util.Date
 import java.util.Locale
 import kotlin.random.Random
-import kotlin.time.Clock
-import kotlin.time.Duration.Companion.days
-import kotlin.time.toJavaInstant

 internal class TrackerSearchPreviewProvider : PreviewParameterProvider<@Composable () -> Unit> {
    private val fullPageWithSecondSelected = @Composable {
@@ -94,7 +93,7 @@ internal class TrackerSearchPreviewProvider : PreviewParameterProvider<@Composab
        it.finished_reading_date = 0L
        it.tracking_url = "https://example.com/tracker-example"
        it.cover_url = "https://example.com/cover.png"
-        it.start_date = formatter.format(Date.from(Clock.System.now().minus((1L..365).random().days).toJavaInstant()))
+        it.start_date = formatter.format(Date.from(Instant.now().minus((1L..365).random(), ChronoUnit.DAYS)))
        it.summary = lorem((0..40).random()).joinToString()
        it.publishing_status = if (Random.nextBoolean()) "Finished" else ""
        it.publishing_type = if (Random.nextBoolean()) "Oneshot" else ""
@@ -14,19 +14,12 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.toMutableStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.fastForEachIndexed
-import eu.kanade.presentation.category.visualName
 import eu.kanade.presentation.components.TabbedDialog
 import eu.kanade.presentation.components.TabbedDialogPaddings
-import eu.kanade.tachiyomi.ui.updates.UpdatesSettingsViewModel
-import tachiyomi.core.common.preference.TriState
+import eu.kanade.tachiyomi.ui.updates.UpdatesSettingsScreenModel
 import tachiyomi.core.common.preference.getAndSet
 import tachiyomi.domain.updates.service.UpdatesPreferences
 import tachiyomi.i18n.MR
@@ -34,71 +27,66 @@ import tachiyomi.presentation.core.components.SettingsItemsPaddings
 import tachiyomi.presentation.core.components.TriStateItem
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.screens.LoadingScreen
 import tachiyomi.presentation.core.util.collectAsState

@Composable
 fun UpdatesFilterDialog(
    onDismissRequest: () -> Unit,
-    viewModel: UpdatesSettingsViewModel,
+    screenModel: UpdatesSettingsScreenModel,
 ) {
    TabbedDialog(
        onDismissRequest = onDismissRequest,
        tabTitles = listOf(
            stringResource(MR.strings.action_filter),
-            stringResource(MR.strings.categories),
        ),
-    ) { page ->
+    ) {
        Column(
            modifier = Modifier
                .padding(vertical = TabbedDialogPaddings.Vertical)
                .verticalScroll(rememberScrollState()),
        ) {
-            when (page) {
-                0 -> FilterSheet(viewModel = viewModel)
-                1 -> CategoryFilterSheet(viewModel = viewModel)
-            }
+            FilterSheet(screenModel = screenModel)
        }
    }
 }

@Composable
 private fun ColumnScope.FilterSheet(
-    viewModel: UpdatesSettingsViewModel,
+    screenModel: UpdatesSettingsScreenModel,
 ) {
-    val filterDownloaded by viewModel.updatesPreferences.filterDownloaded.collectAsState()
+    val filterDownloaded by screenModel.updatesPreferences.filterDownloaded.collectAsState()
    TriStateItem(
        label = stringResource(MR.strings.label_downloaded),
        state = filterDownloaded,
-        onClick = { viewModel.toggleFilter(UpdatesPreferences::filterDownloaded) },
+        onClick = { screenModel.toggleFilter(UpdatesPreferences::filterDownloaded) },
    )

-    val filterUnread by viewModel.updatesPreferences.filterUnread.collectAsState()
+    val filterUnread by screenModel.updatesPreferences.filterUnread.collectAsState()
    TriStateItem(
        label = stringResource(MR.strings.action_filter_unread),
        state = filterUnread,
-        onClick = { viewModel.toggleFilter(UpdatesPreferences::filterUnread) },
+        onClick = { screenModel.toggleFilter(UpdatesPreferences::filterUnread) },
    )

-    val filterStarted by viewModel.updatesPreferences.filterStarted.collectAsState()
+    val filterStarted by screenModel.updatesPreferences.filterStarted.collectAsState()
    TriStateItem(
        label = stringResource(MR.strings.label_started),
        state = filterStarted,
-        onClick = { viewModel.toggleFilter(UpdatesPreferences::filterStarted) },
+        onClick = { screenModel.toggleFilter(UpdatesPreferences::filterStarted) },
    )

-    val filterBookmarked by viewModel.updatesPreferences.filterBookmarked.collectAsState()
+    val filterBookmarked by screenModel.updatesPreferences.filterBookmarked.collectAsState()
    TriStateItem(
        label = stringResource(MR.strings.action_filter_bookmarked),
        state = filterBookmarked,
-        onClick = { viewModel.toggleFilter(UpdatesPreferences::filterBookmarked) },
+        onClick = { screenModel.toggleFilter(UpdatesPreferences::filterBookmarked) },
    )

    HorizontalDivider(modifier = Modifier.padding(MaterialTheme.padding.small))

-    val filterExcludedScanlators by viewModel.updatesPreferences.filterExcludedScanlators.collectAsState()
+    val filterExcludedScanlators by screenModel.updatesPreferences.filterExcludedScanlators.collectAsState()

-    fun toggleScanlatorFilter() = viewModel.updatesPreferences.filterExcludedScanlators.getAndSet { !it }
+    fun toggleScanlatorFilter() = screenModel.updatesPreferences.filterExcludedScanlators.getAndSet { !it }

    Row(
        modifier = Modifier
@@ -120,55 +108,3 @@ private fun ColumnScope.FilterSheet(
        )
    }
 }
-
-@Composable
-private fun ColumnScope.CategoryFilterSheet(
-    viewModel: UpdatesSettingsViewModel,
-) {
-    Text(
-        stringResource(MR.strings.pref_filter_update_categories_details),
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(
-                horizontal = SettingsItemsPaddings.Horizontal,
-                vertical = SettingsItemsPaddings.Vertical,
-            ),
-    )
-
-    HorizontalDivider(modifier = Modifier.padding(MaterialTheme.padding.extraSmall))
-
-    val allCategories by viewModel.getCategories.subscribe().collectAsState(initial = emptyList())
-
-    if (allCategories.isEmpty()) {
-        // since it includes the system category, this should only happen when loading is required
-        LoadingScreen(modifier = Modifier.padding(16.dp))
-        return
-    }
-
-    val excluded by viewModel.updatesPreferences.filterExcludedCategories.collectAsState()
-    val included by viewModel.updatesPreferences.filterIncludedCategories.collectAsState()
-
-    val selected = remember {
-        allCategories.map { category ->
-            when (category.id) {
-                in included -> TriState.ENABLED_IS
-                in excluded -> TriState.ENABLED_NOT
-                else -> TriState.DISABLED
-            }
-        }.toMutableStateList()
-    }
-
-    Column {
-        allCategories.fastForEachIndexed { idx, category ->
-            val state = selected[idx]
-            TriStateItem(
-                label = category.visualName,
-                state = state,
-                onClick = {
-                    selected[idx] = state.next()
-                    viewModel.cycleCategory(category)
-                },
-            )
-        }
-    }
-}
@@ -29,10 +29,9 @@ import eu.kanade.presentation.manga.components.ChapterDownloadAction
 import eu.kanade.presentation.manga.components.MangaBottomActionMenu
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.ui.updates.UpdatesItem
-import eu.kanade.tachiyomi.ui.updates.UpdatesViewModel
+import eu.kanade.tachiyomi.ui.updates.UpdatesScreenModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.datetime.LocalDate
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.FastScrollLazyColumn
 import tachiyomi.presentation.core.components.material.PullRefresh
@@ -41,11 +40,12 @@ import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.screens.EmptyScreen
 import tachiyomi.presentation.core.screens.LoadingScreen
 import tachiyomi.presentation.core.theme.active
+import java.time.LocalDate
 import kotlin.time.Duration.Companion.seconds

@Composable
 fun UpdateScreen(
-    state: UpdatesViewModel.State,
+    state: UpdatesScreenModel.State,
    snackbarHostState: SnackbarHostState,
    lastUpdated: Long,
    onClickCover: (UpdatesItem) -> Unit,
@@ -37,6 +37,7 @@ import eu.kanade.presentation.manga.components.ChapterDownloadAction
 import eu.kanade.presentation.manga.components.ChapterDownloadIndicator
 import eu.kanade.presentation.manga.components.DotSeparatorText
 import eu.kanade.presentation.manga.components.MangaCover
+import eu.kanade.presentation.util.animateItemFastScroll
 import eu.kanade.presentation.util.relativeTimeSpanString
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.ui.updates.UpdatesItem
@@ -91,14 +92,14 @@ internal fun LazyListScope.updatesUiItems(
        when (item) {
            is UpdatesUiModel.Header -> {
                ListGroupHeader(
-                    modifier = Modifier.animateItem(),
+                    modifier = Modifier.animateItemFastScroll(),
                    text = relativeDateText(item.date),
                )
            }
            is UpdatesUiModel.Item -> {
                val updatesItem = item.item
                UpdatesUiItem(
-                    modifier = Modifier.animateItem(),
+                    modifier = Modifier.animateItemFastScroll(),
                    update = updatesItem.update,
                    selected = updatesItem.selected,
                    readProgress = updatesItem.update.lastPageRead
@@ -0,0 +1,10 @@
+package eu.kanade.presentation.util
+
+import androidx.compose.foundation.lazy.LazyItemScope
+import androidx.compose.ui.Modifier
+
+// https://issuetracker.google.com/352584409
+context(itemScope: LazyItemScope)
+fun Modifier.animateItemFastScroll() = with(itemScope) {
+    this@animateItemFastScroll.animateItem(fadeInSpec = null, fadeOutSpec = null)
+}
@@ -8,12 +8,20 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
+import cafe.adriel.voyager.core.model.ScreenModel
+import cafe.adriel.voyager.core.model.ScreenModelStore
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.core.stack.StackEvent
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.transitions.ScreenTransitionContent
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.plus
 import soup.compose.material.motion.animation.materialSharedAxisX
 import soup.compose.material.motion.animation.rememberSlideDistance

@@ -31,6 +39,18 @@ abstract class Screen : Screen {
    override val key: ScreenKey = uniqueScreenKey
 }

+/**
+ * A variant of ScreenModel.coroutineScope except with the IO dispatcher instead of the
+ * main dispatcher.
+ */
+val ScreenModel.ioCoroutineScope: CoroutineScope
+    get() = ScreenModelStore.getOrPutDependency(
+        screenModel = this,
+        name = "ScreenModelIoCoroutineScope",
+        factory = { key -> CoroutineScope(Dispatchers.IO + SupervisorJob()) + CoroutineName(key) },
+        onDispose = { scope -> scope.cancel() },
+    )
+
 interface AssistContentScreen {
    fun onProvideAssistUrl(): String?
 }
@@ -7,7 +7,7 @@ import androidx.compose.runtime.ReadOnlyComposable
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
-import kotlin.time.Clock
+import java.time.Instant
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes

@@ -29,7 +29,7 @@ fun Duration.toDurationString(context: Context, fallback: String): String {
@Composable
@ReadOnlyComposable
 fun relativeTimeSpanString(epochMillis: Long): String {
-    val now = Clock.System.now().toEpochMilliseconds()
+    val now = Instant.now().toEpochMilli()
    return when {
        epochMillis <= 0L -> stringResource(MR.strings.relative_time_span_never)
        now - epochMillis < 1.minutes.inWholeMilliseconds -> stringResource(
@@ -51,7 +51,6 @@ import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.system.getHtml
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
-import eu.kanade.tachiyomi.util.system.setUserAgent
 import kotlinx.coroutines.launch
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.Scaffold
@@ -73,7 +72,6 @@ fun WebViewScreenContent(
    onNavigateUp: () -> Unit,
    initialTitle: String?,
    url: String,
-    defaultUserAgentProvider: () -> String,
    onShare: (String) -> Unit,
    onOpenInBrowser: (String) -> Unit,
    onClearCookies: (String) -> Unit,
@@ -342,7 +340,9 @@ fun WebViewScreenContent(
                        WebView.setWebContentsDebuggingEnabled(true)
                    }

-                    webView.setUserAgent(headers["user-agent"] ?: defaultUserAgentProvider())
+                    headers["user-agent"]?.let {
+                        webView.settings.userAgentString = it
+                    }
                },
                onDispose = { webView ->
                    val window = windowStack.items.find { it.webView == webView }
@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
+import android.os.Looper
 import android.webkit.WebView
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.DefaultLifecycleObserver
@@ -230,7 +231,7 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor
    override fun getPackageName(): String {
        try {
            // Override the value passed as X-Requested-With in WebView requests
-            val stackTrace = Thread.currentThread().stackTrace
+            val stackTrace = Looper.getMainLooper().thread.stackTrace
            val isChromiumCall = stackTrace.any { trace ->
                trace.className.lowercase() in setOf("org.chromium.base.buildinfo", "org.chromium.base.apkinfo") &&
                    trace.methodName.lowercase() in setOf("getall", "getpackagename", "<init>")
@@ -18,7 +18,7 @@ import tachiyomi.core.common.storage.displayablePath
 import tachiyomi.i18n.MR
 import uy.kohesive.injekt.injectLazy
 import java.io.File
-import kotlin.time.Duration.Companion.milliseconds
+import java.util.concurrent.TimeUnit

 class BackupNotifier(private val context: Context) {

@@ -149,8 +149,10 @@ class BackupNotifier(private val context: Context) {

        val timeString = context.stringResource(
            MR.strings.restore_duration,
-            time.milliseconds.inWholeMinutes,
-            time.milliseconds.inWholeSeconds - (time.milliseconds.inWholeMinutes * 60),
+            TimeUnit.MILLISECONDS.toMinutes(time),
+            TimeUnit.MILLISECONDS.toSeconds(time) - TimeUnit.MINUTES.toSeconds(
+                TimeUnit.MILLISECONDS.toMinutes(time),
+            ),
        )

        with(completeNotificationBuilder) {
@@ -33,9 +33,9 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.FileOutputStream
 import java.text.SimpleDateFormat
+import java.time.Instant
 import java.util.Date
 import java.util.Locale
-import kotlin.time.Clock

 class BackupCreator(
    private val context: Context,
@@ -108,7 +108,7 @@ class BackupCreator(
            BackupFileValidator(context).validate(fileUri)

            if (isAutoBackup) {
-                backupPreferences.lastAutoBackupTimestamp.set(Clock.System.now().toEpochMilliseconds())
+                backupPreferences.lastAutoBackupTimestamp.set(Instant.now().toEpochMilli())
            }

            return fileUri.toString()
@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.data.backup.models
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.protobuf.ProtoNumber
+import mihon.core.common.extensions.EMPTY
 import mihon.core.common.extensions.JsonObjectEmptyBytes
 import tachiyomi.data.MemoColumnAdapter
 import tachiyomi.domain.chapter.model.Chapter
@@ -2,7 +2,9 @@ package eu.kanade.tachiyomi.data.backup.models

 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.protobuf.ProtoNumber
+import mihon.core.common.extensions.EMPTY
 import mihon.core.common.extensions.JsonObjectEmptyBytes
 import tachiyomi.data.MemoColumnAdapter
 import tachiyomi.domain.manga.model.Manga
@@ -148,30 +148,13 @@ class BackupRestorer(
        mangaRestorer.sortByNew(backupMangas)
            .chunked(100)
            .forEach { chunk ->
-                val restoredAsBatch = try {
-                    database.transaction {
-                        chunk.forEach {
-                            ensureActive()
-                            mangaRestorer.restore(it, backupCategories)
-                        }
-                    }
-                    true
-                } catch (e: Exception) {
-                    ensureActive()
-                    logcat(LogPriority.WARN, e) { "Batch restore failed, retrying entry by entry" }
-                    false
-                }
-
-                if (restoredAsBatch) {
-                    restoreProgress.addAndFetch(chunk.size)
-                } else {
+                database.transaction {
                    chunk.forEach {
                        ensureActive()

                        try {
                            mangaRestorer.restore(it, backupCategories)
                        } catch (e: Exception) {
-                            ensureActive()
                            val sourceName = sourceMapping[it.source] ?: it.source.toString()
                            errors.add(Date() to "${it.title} [$sourceName]: ${e.message}")
                        }
@@ -179,7 +162,6 @@ class BackupRestorer(
                        restoreProgress.incrementAndFetch()
                    }
                }
-
                notifier.showRestoreProgress(chunk.last().title, restoreProgress.load(), restoreAmount, isSync)
            }
    }
@@ -9,10 +9,9 @@ import eu.kanade.tachiyomi.data.backup.models.BackupChapter
 import eu.kanade.tachiyomi.data.backup.models.BackupHistory
 import eu.kanade.tachiyomi.data.backup.models.BackupManga
 import eu.kanade.tachiyomi.data.backup.models.BackupTracking
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import tachiyomi.data.Database
 import tachiyomi.data.MemoColumnAdapter
+import tachiyomi.data.MemoColumnAdapter.encode
 import tachiyomi.data.UpdateStrategyColumnAdapter
 import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId
@@ -25,9 +24,9 @@ import tachiyomi.domain.track.interactor.InsertTrack
 import tachiyomi.domain.track.model.Track
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.time.ZonedDateTime
 import java.util.Date
 import kotlin.math.max
-import kotlin.time.Clock

 class MangaRestorer(
    private val database: Database = Injekt.get(),
@@ -40,9 +39,13 @@ class MangaRestorer(
    fetchInterval: FetchInterval = Injekt.get(),
 ) {

-    private val timeZone = TimeZone.currentSystemDefault()
-    private val now = Clock.System.now().toLocalDateTime(timeZone)
-    private val currentFetchWindow = fetchInterval.getWindow(now.date, timeZone)
+    private var now = ZonedDateTime.now()
+    private var currentFetchWindow = fetchInterval.getWindow(now)
+
+    init {
+        now = ZonedDateTime.now()
+        currentFetchWindow = fetchInterval.getWindow(now)
+    }

    suspend fun sortByNew(backupMangas: List<BackupManga>): List<BackupManga> {
        val urlsBySource = database.mangasQueries
@@ -282,9 +285,9 @@ class MangaRestorer(
        restoreCategories(manga, categories, backupCategories)
        restoreChapters(manga, chapters)
        restoreTracking(manga, tracks)
-        restoreHistory(manga, history)
+        restoreHistory(history)
        restoreExcludedScanlators(manga, excludedScanlators)
-        updateManga.awaitUpdateFetchInterval(manga, timeZone, now, currentFetchWindow)
+        updateManga.awaitUpdateFetchInterval(manga, now, currentFetchWindow)
        return manga
    }

@@ -322,16 +325,16 @@ class MangaRestorer(
        }
    }

-    private suspend fun restoreHistory(manga: Manga, backupHistory: List<BackupHistory>) {
+    private suspend fun restoreHistory(backupHistory: List<BackupHistory>) {
        val toUpdate = backupHistory.mapNotNull { history ->
            val dbHistory = database.historyQueries
-                .getHistoryByChapterUrlAndMangaId(history.url, manga.id)
+                .getHistoryByChapterUrl(history.url)
                .awaitAsOneOrNull()
            val item = history.getHistoryImpl()

            if (dbHistory == null) {
                val chapter = database.chaptersQueries
-                    .getChapterByUrlAndMangaId(history.url, manga.id)
+                    .getChapterByUrl(history.url)
                    .awaitAsOneOrNull()
                return@mapNotNull if (chapter == null) {
                    // Chapter doesn't exist; skip
@@ -483,7 +483,7 @@ class Downloader(
                ?: tmpDir.createFile("$filename.tmp")!!

            try {
-                source.getImage(page, file.length()).use {
+                source.getImage(page).use {
                    it.body.source().saveTo(
                        // If the server supports partial downloads (HTTP 206),
                        // append to the existing file.
@@ -35,8 +35,6 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import logcat.LogPriority
 import mihon.domain.chapter.interactor.FilterChaptersForDownload
 import mihon.domain.source.interactor.UpdateMangaFromRemote
@@ -66,13 +64,14 @@ import tachiyomi.i18n.MR
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
+import java.time.Instant
+import java.time.ZonedDateTime
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.atomics.AtomicBoolean
 import kotlin.concurrent.atomics.AtomicInt
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
 import kotlin.concurrent.atomics.incrementAndFetch
-import kotlin.time.Clock

@OptIn(ExperimentalAtomicApi::class)
 class LibraryUpdateJob(private val context: Context, workerParams: WorkerParameters) :
@@ -109,7 +108,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet

        setForegroundSafely()

-        libraryPreferences.lastUpdatedTimestamp.set(Clock.System.now().toEpochMilliseconds())
+        libraryPreferences.lastUpdatedTimestamp.set(Instant.now().toEpochMilli())

        val categoryId = inputData.getLong(KEY_CATEGORY, -1L)
        addMangaToQueue(categoryId)
@@ -168,11 +167,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet

        val restrictions = libraryPreferences.autoUpdateMangaRestrictions.get()
        val skippedUpdates = mutableListOf<Pair<Manga, String?>>()
-        val timeZone = TimeZone.currentSystemDefault()
-        val (_, fetchWindowUpperBound) = fetchInterval.getWindow(
-            Clock.System.now().toLocalDateTime(timeZone).date,
-            timeZone,
-        )
+        val (_, fetchWindowUpperBound) = fetchInterval.getWindow(ZonedDateTime.now())

        mangaToUpdate = listToUpdate
            .filter {
@@ -239,8 +234,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
        val newUpdates = CopyOnWriteArrayList<Pair<Manga, Array<Chapter>>>()
        val failedUpdates = CopyOnWriteArrayList<Pair<Manga, String?>>()
        val hasDownloads = AtomicBoolean(false)
-        val timeZone = TimeZone.currentSystemDefault()
-        val fetchWindow = fetchInterval.getWindow(Clock.System.now().toLocalDateTime(timeZone).date, timeZone)
+        val fetchWindow = fetchInterval.getWindow(ZonedDateTime.now())

        coroutineScope {
            mangaToUpdate.groupBy { it.manga.source }.values
@@ -9,6 +9,7 @@ import androidx.core.net.toUri
 import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
+import eu.kanade.tachiyomi.data.updater.AppUpdateDownloadJob
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.system.cancelNotification
@@ -71,6 +72,10 @@ class NotificationReceiver : BroadcastReceiver() {
            ACTION_CANCEL_RESTORE -> cancelRestore(context)
            // Cancel library update and dismiss notification
            ACTION_CANCEL_LIBRARY_UPDATE -> cancelLibraryUpdate(context)
+            // Start downloading app update
+            ACTION_START_APP_UPDATE -> startDownloadAppUpdate(context, intent)
+            // Cancel downloading app update
+            ACTION_CANCEL_APP_UPDATE_DOWNLOAD -> cancelDownloadAppUpdate(context)
            // Open reader activity
            ACTION_OPEN_CHAPTER -> {
                openChapter(
@@ -173,6 +178,15 @@ class NotificationReceiver : BroadcastReceiver() {
        LibraryUpdateJob.stop(context)
    }

+    private fun startDownloadAppUpdate(context: Context, intent: Intent) {
+        val url = intent.getStringExtra(AppUpdateDownloadJob.EXTRA_DOWNLOAD_URL) ?: return
+        AppUpdateDownloadJob.start(context, url)
+    }
+
+    private fun cancelDownloadAppUpdate(context: Context) {
+        AppUpdateDownloadJob.stop(context)
+    }
+
    /**
     * Method called when user wants to mark manga chapters as read
     *
@@ -227,6 +241,9 @@ class NotificationReceiver : BroadcastReceiver() {

        private const val ACTION_CANCEL_LIBRARY_UPDATE = "$ID.$NAME.CANCEL_LIBRARY_UPDATE"

+        private const val ACTION_START_APP_UPDATE = "$ID.$NAME.ACTION_START_APP_UPDATE"
+        private const val ACTION_CANCEL_APP_UPDATE_DOWNLOAD = "$ID.$NAME.CANCEL_APP_UPDATE_DOWNLOAD"
+
        private const val ACTION_MARK_AS_READ = "$ID.$NAME.MARK_AS_READ"
        private const val ACTION_OPEN_CHAPTER = "$ID.$NAME.ACTION_OPEN_CHAPTER"
        private const val ACTION_DOWNLOAD_CHAPTER = "$ID.$NAME.ACTION_DOWNLOAD_CHAPTER"
@@ -507,6 +524,45 @@ class NotificationReceiver : BroadcastReceiver() {
            )
        }

+        /**
+         * Returns [PendingIntent] that starts the [AppUpdateDownloadJob] to download an app update.
+         *
+         * @param context context of application
+         * @return [PendingIntent]
+         */
+        internal fun downloadAppUpdatePendingBroadcast(
+            context: Context,
+            url: String,
+            title: String? = null,
+        ): PendingIntent {
+            return Intent(context, NotificationReceiver::class.java).run {
+                action = ACTION_START_APP_UPDATE
+                putExtra(AppUpdateDownloadJob.EXTRA_DOWNLOAD_URL, url)
+                title?.let { putExtra(AppUpdateDownloadJob.EXTRA_DOWNLOAD_TITLE, it) }
+                PendingIntent.getBroadcast(
+                    context,
+                    0,
+                    this,
+                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+                )
+            }
+        }
+
+        /**
+         *
+         */
+        internal fun cancelDownloadAppUpdatePendingBroadcast(context: Context): PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_CANCEL_APP_UPDATE_DOWNLOAD
+            }
+            return PendingIntent.getBroadcast(
+                context,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+            )
+        }
+
        /**
         * Returns [PendingIntent] that opens the extensions controller.
         *
@@ -70,6 +70,8 @@ object Notifications {
    private const val GROUP_APK_UPDATES = "group_apk_updates"
    const val CHANNEL_APP_UPDATE = "app_apk_update_channel"
    const val ID_APP_UPDATER = 1
+    const val ID_APP_UPDATE_PROMPT = 2
+    const val ID_APP_UPDATE_ERROR = 3
    const val CHANNEL_EXTENSIONS_UPDATE = "ext_apk_update_channel"
    const val ID_UPDATES_TO_EXTS = -401
    const val ID_EXTENSION_INSTALLER = -402
@@ -24,7 +24,7 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.InputStream
-import kotlin.time.Clock
+import java.time.Instant

 class ImageSaver(
    val context: Context,
@@ -85,7 +85,7 @@ class ImageSaver(
            MediaStore.MediaColumns.RELATIVE_PATH to relativePath,
            MediaStore.MediaColumns.DISPLAY_NAME to if (isMimeTypeSupported) image.name else filename,
            MediaStore.MediaColumns.MIME_TYPE to type.mime,
-            MediaStore.MediaColumns.DATE_MODIFIED to Clock.System.now().epochSeconds,
+            MediaStore.MediaColumns.DATE_MODIFIED to Instant.now().epochSecond,
        )

        val picture = findUriOrDefault(relativePath, filename) {
@@ -15,9 +15,6 @@ import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.network.jsonMime
 import eu.kanade.tachiyomi.network.parseAs
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.number
-import kotlinx.datetime.toLocalDateTime
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
@@ -28,8 +25,10 @@ import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
 import tachiyomi.core.common.util.lang.withIOContext
 import uy.kohesive.injekt.injectLazy
+import java.time.Instant
+import java.time.ZoneId
+import java.time.ZonedDateTime
 import kotlin.time.Duration.Companion.minutes
-import kotlin.time.Instant
 import tachiyomi.domain.track.model.Track as DomainTrack

 class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
@@ -327,11 +326,11 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
            }
        }

-        val dateTime = Instant.fromEpochMilliseconds(dateValue).toLocalDateTime(TimeZone.currentSystemDefault())
+        val dateTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(dateValue), ZoneId.systemDefault())
        return buildJsonObject {
            put("year", dateTime.year)
-            put("month", dateTime.month.number)
-            put("day", dateTime.day)
+            put("month", dateTime.monthValue)
+            put("day", dateTime.dayOfMonth)
        }
    }

@@ -1,9 +1,8 @@
 package eu.kanade.tachiyomi.data.track.anilist.dto

-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.atStartOfDayIn
 import kotlinx.serialization.Serializable
+import java.time.LocalDate
+import java.time.ZoneId

@Serializable
 data class ALFuzzyDate(
@@ -12,9 +11,10 @@ data class ALFuzzyDate(
    val day: Int?,
 ) {
    fun toEpochMilli(): Long = try {
-        LocalDate(year!!, month!!, day!!)
-            .atStartOfDayIn(TimeZone.currentSystemDefault())
-            .toEpochMilliseconds()
+        LocalDate.of(year!!, month!!, day!!)
+            .atStartOfDay(ZoneId.systemDefault())
+            .toInstant()
+            .toEpochMilli()
    } catch (_: Exception) {
        0L
    }
@@ -30,6 +30,7 @@ import okhttp3.Headers.Companion.headersOf
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
 import tachiyomi.core.common.util.lang.withIOContext
+import tachiyomi.i18n.MR
 import uy.kohesive.injekt.injectLazy
 import java.math.RoundingMode
 import java.security.SecureRandom
@@ -51,7 +52,7 @@ class MangaBakaApi(
            .header(
                "User-Agent",
                buildString {
-                    append("Mihon/v${BuildConfig.VERSION_NAME} ")
+                    append("${MR.strings.app_name}/v${BuildConfig.VERSION_NAME} ")
                    append("(${BuildConfig.APPLICATION_ID} ${BuildConfig.COMMIT_SHA}) ")
                    append("(Android) (https://github.com/mihonapp/mihon)")
                },
@@ -245,13 +245,7 @@ class MyAnimeListApi(
    }

    private fun parseDate(isoDate: String): Long {
-        val pattern = when (isoDate.length) {
-            10 -> "yyyy-MM-dd"
-            7 -> "yyyy-MM"
-            4 -> "yyyy"
-            else -> throw IllegalArgumentException("Unsupported date format: \"$isoDate\"")
-        }
-        return SimpleDateFormat(pattern, Locale.US).parse(isoDate)?.time ?: 0L
+        return SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(isoDate)?.time ?: 0L
    }

    private fun convertToIsoDate(epochTime: Long): String? {
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.data.updater

+import android.content.Context
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.util.system.isFossBuildType
 import eu.kanade.tachiyomi.util.system.isPreviewBuildType
@@ -11,7 +12,7 @@ class AppUpdateChecker {

    private val getApplicationRelease: GetApplicationRelease by injectLazy()

-    suspend fun checkForUpdate(forceCheck: Boolean = false): GetApplicationRelease.Result {
+    suspend fun checkForUpdate(context: Context, forceCheck: Boolean = false): GetApplicationRelease.Result {
        // Disable app update checks for older Android versions that we're going to drop support for
        // if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
        //     return GetApplicationRelease.Result.OsTooOld
@@ -29,6 +30,11 @@ class AppUpdateChecker {
                ),
            )

+            when (result) {
+                is GetApplicationRelease.Result.NewUpdate -> AppUpdateNotifier(context).promptUpdate(result.release)
+                else -> {}
+            }
+
            result
        }
    }
@@ -15,26 +15,30 @@ import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.ProgressListener
-import eu.kanade.tachiyomi.network.awaitSuccess
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.network.newCachelessCallWithProgress
+import eu.kanade.tachiyomi.util.storage.getUriCompat
 import eu.kanade.tachiyomi.util.storage.saveTo
-import eu.kanade.tachiyomi.util.system.notificationBuilder
 import eu.kanade.tachiyomi.util.system.setForegroundSafely
 import eu.kanade.tachiyomi.util.system.workManager
-import kotlinx.coroutines.CancellationException
+import okhttp3.internal.http2.ErrorCode
+import okhttp3.internal.http2.StreamResetException
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.core.common.util.lang.withIOContext
 import tachiyomi.i18n.MR
 import uy.kohesive.injekt.injectLazy
 import java.io.File
+import kotlin.coroutines.cancellation.CancellationException

 class AppUpdateDownloadJob(private val context: Context, workerParams: WorkerParameters) :
    CoroutineWorker(context, workerParams) {

+    private val notifier = AppUpdateNotifier(context)
    private val network: NetworkHelper by injectLazy()

    override suspend fun doWork(): Result {
        val url = inputData.getString(EXTRA_DOWNLOAD_URL)
+        val title = inputData.getString(EXTRA_DOWNLOAD_TITLE) ?: context.stringResource(MR.strings.app_name)

        if (url.isNullOrEmpty()) {
            return Result.failure()
@@ -42,27 +46,17 @@ class AppUpdateDownloadJob(private val context: Context, workerParams: WorkerPar

        setForegroundSafely()

-        return try {
-            withIOContext { downloadApk(url) }
-            Result.success(workDataOf(PROGRESS to 100, EXTRA_DOWNLOAD_URL to url))
-        } catch (e: CancellationException) {
-            throw e
-        } catch (_: Exception) {
-            Result.failure()
+        withIOContext {
+            downloadApk(title, url)
        }
+
+        return Result.success()
    }

    override suspend fun getForegroundInfo(): ForegroundInfo {
-        val notification = context.notificationBuilder(Notifications.CHANNEL_APP_UPDATE)
-            .setContentTitle(context.stringResource(MR.strings.update_check_notification_update_available))
-            .setContentText(context.stringResource(MR.strings.update_check_notification_download_in_progress))
-            .setSmallIcon(android.R.drawable.stat_sys_download)
-            .setOngoing(true)
-            .build()
-
        return ForegroundInfo(
            Notifications.ID_APP_UPDATER,
-            notification,
+            notifier.onDownloadStarted().build(),
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
            } else {
@@ -76,7 +70,10 @@ class AppUpdateDownloadJob(private val context: Context, workerParams: WorkerPar
     *
     * @param url url location of file
     */
-    private suspend fun downloadApk(url: String) {
+    private suspend fun downloadApk(title: String, url: String) {
+        // Show notification download starting.
+        notifier.onDownloadStarted(title)
+
        val progressListener = object : ProgressListener {
            // Progress of the download
            var savedProgress = 0
@@ -90,27 +87,45 @@ class AppUpdateDownloadJob(private val context: Context, workerParams: WorkerPar
                if (progress > savedProgress && currentTime - 200 > lastTick) {
                    savedProgress = progress
                    lastTick = currentTime
-                    setProgressAsync(workDataOf(PROGRESS to progress, EXTRA_DOWNLOAD_URL to url))
+                    notifier.onProgressChange(progress)
                }
            }
        }

-        val response = network.client.newCachelessCallWithProgress(GET(url), progressListener).awaitSuccess()
+        try {
+            // Download the new update.
+            val response = network.client.newCachelessCallWithProgress(GET(url), progressListener)
+                .await()

-        val apkFile = updateApk(context)
-        response.body.source().saveTo(apkFile)
+            // File where the apk will be saved.
+            val apkFile = File(context.externalCacheDir, "update.apk")
+
+            if (response.isSuccessful) {
+                response.body.source().saveTo(apkFile)
+            } else {
+                response.close()
+                throw Exception("Unsuccessful response")
+            }
+            notifier.cancel()
+            notifier.promptInstall(apkFile.getUriCompat(context))
+        } catch (e: Exception) {
+            val shouldCancel = e is CancellationException ||
+                (e is StreamResetException && e.errorCode == ErrorCode.CANCEL)
+            if (shouldCancel) {
+                notifier.cancel()
+            } else {
+                notifier.onDownloadError(url)
+            }
+        }
    }

    companion object {
-        const val TAG = "AppUpdateDownload"
-
-        const val PROGRESS = "progress"
+        private const val TAG = "AppUpdateDownload"

        const val EXTRA_DOWNLOAD_URL = "DOWNLOAD_URL"
+        const val EXTRA_DOWNLOAD_TITLE = "DOWNLOAD_TITLE"

-        fun updateApk(context: Context): File = File(context.externalCacheDir, "update.apk")
-
-        fun start(context: Context, url: String) {
+        fun start(context: Context, url: String, title: String? = null) {
            val constraints = Constraints(
                requiredNetworkType = NetworkType.CONNECTED,
            )
@@ -118,7 +133,12 @@ class AppUpdateDownloadJob(private val context: Context, workerParams: WorkerPar
            val request = OneTimeWorkRequestBuilder<AppUpdateDownloadJob>()
                .setConstraints(constraints)
                .addTag(TAG)
-                .setInputData(workDataOf(EXTRA_DOWNLOAD_URL to url))
+                .setInputData(
+                    workDataOf(
+                        EXTRA_DOWNLOAD_URL to url,
+                        EXTRA_DOWNLOAD_TITLE to title,
+                    ),
+                )
                .build()

            context.workManager.enqueueUniqueWork(TAG, ExistingWorkPolicy.REPLACE, request)
@@ -0,0 +1,168 @@
+package eu.kanade.tachiyomi.data.updater
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.core.app.NotificationCompat
+import androidx.core.net.toUri
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.notification.NotificationHandler
+import eu.kanade.tachiyomi.data.notification.NotificationReceiver
+import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.util.system.notificationBuilder
+import eu.kanade.tachiyomi.util.system.notify
+import tachiyomi.core.common.i18n.stringResource
+import tachiyomi.domain.release.model.Release
+import tachiyomi.i18n.MR
+
+internal class AppUpdateNotifier(private val context: Context) {
+
+    private val notificationBuilder = context.notificationBuilder(Notifications.CHANNEL_APP_UPDATE)
+
+    /**
+     * Call to show notification.
+     *
+     * @param id id of the notification channel.
+     */
+    private fun NotificationCompat.Builder.show(id: Int = Notifications.ID_APP_UPDATER) {
+        context.notify(id, build())
+    }
+
+    fun cancel() {
+        NotificationReceiver.dismissNotification(context, Notifications.ID_APP_UPDATER)
+    }
+
+    @SuppressLint("LaunchActivityFromNotification")
+    fun promptUpdate(release: Release) {
+        val updateIntent = NotificationReceiver.downloadAppUpdatePendingBroadcast(
+            context,
+            release.downloadLink,
+            release.version,
+        )
+
+        val releaseIntent = Intent(Intent.ACTION_VIEW, release.releaseLink.toUri()).run {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            PendingIntent.getActivity(
+                context,
+                release.hashCode(),
+                this,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+            )
+        }
+
+        with(notificationBuilder) {
+            setContentTitle(context.stringResource(MR.strings.update_check_notification_update_available))
+            setContentText(release.version)
+            setSmallIcon(android.R.drawable.stat_sys_download_done)
+            setContentIntent(updateIntent)
+
+            clearActions()
+            addAction(
+                android.R.drawable.stat_sys_download_done,
+                context.stringResource(MR.strings.action_download),
+                updateIntent,
+            )
+            addAction(
+                R.drawable.ic_info_24dp,
+                context.stringResource(MR.strings.whats_new),
+                releaseIntent,
+            )
+        }
+        notificationBuilder.show()
+    }
+
+    /**
+     * Call when apk download starts.
+     *
+     * @param title tile of notification.
+     */
+    fun onDownloadStarted(title: String? = null): NotificationCompat.Builder {
+        with(notificationBuilder) {
+            title?.let { setContentTitle(title) }
+            setContentText(context.stringResource(MR.strings.update_check_notification_download_in_progress))
+            setSmallIcon(android.R.drawable.stat_sys_download)
+            setOngoing(true)
+
+            clearActions()
+            addAction(
+                R.drawable.ic_close_24dp,
+                context.stringResource(MR.strings.action_cancel),
+                NotificationReceiver.cancelDownloadAppUpdatePendingBroadcast(context),
+            )
+        }
+        notificationBuilder.show()
+        return notificationBuilder
+    }
+
+    /**
+     * Call when apk download progress changes.
+     *
+     * @param progress progress of download (xx%/100).
+     */
+    fun onProgressChange(progress: Int) {
+        with(notificationBuilder) {
+            setProgress(100, progress, false)
+            setOnlyAlertOnce(true)
+        }
+        notificationBuilder.show()
+    }
+
+    /**
+     * Call when apk download is finished.
+     *
+     * @param uri path location of apk.
+     */
+    fun promptInstall(uri: Uri) {
+        val installIntent = NotificationHandler.installApkPendingActivity(context, uri)
+        with(notificationBuilder) {
+            setContentText(context.stringResource(MR.strings.update_check_notification_download_complete))
+            setSmallIcon(android.R.drawable.stat_sys_download_done)
+            setOnlyAlertOnce(false)
+            setProgress(0, 0, false)
+            setContentIntent(installIntent)
+            setOngoing(true)
+
+            clearActions()
+            addAction(
+                R.drawable.ic_system_update_alt_white_24dp,
+                context.stringResource(MR.strings.action_install),
+                installIntent,
+            )
+            addAction(
+                R.drawable.ic_close_24dp,
+                context.stringResource(MR.strings.action_cancel),
+                NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_APP_UPDATE_PROMPT),
+            )
+        }
+        notificationBuilder.show(Notifications.ID_APP_UPDATE_PROMPT)
+    }
+
+    /**
+     * Call when apk download throws a error
+     *
+     * @param url web location of apk to download.
+     */
+    fun onDownloadError(url: String) {
+        with(notificationBuilder) {
+            setContentText(context.stringResource(MR.strings.update_check_notification_download_error))
+            setSmallIcon(R.drawable.ic_warning_white_24dp)
+            setOnlyAlertOnce(false)
+            setProgress(0, 0, false)
+
+            clearActions()
+            addAction(
+                R.drawable.ic_refresh_24dp,
+                context.stringResource(MR.strings.action_retry),
+                NotificationReceiver.downloadAppUpdatePendingBroadcast(context, url),
+            )
+            addAction(
+                R.drawable.ic_close_24dp,
+                context.stringResource(MR.strings.action_cancel),
+                NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_APP_UPDATE_ERROR),
+            )
+        }
+        notificationBuilder.show(Notifications.ID_APP_UPDATE_ERROR)
+    }
+}
@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.di

 import android.app.Application
-import android.content.Context
 import androidx.core.content.ContextCompat
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import app.cash.sqldelight.db.SqlDriver
@@ -25,7 +24,9 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.protobuf.ProtoBuf
 import nl.adaptivity.xmlutil.XmlDeclMode
 import nl.adaptivity.xmlutil.core.XmlVersion
+import nl.adaptivity.xmlutil.serialization.DefaultXmlSerializationPolicy
 import nl.adaptivity.xmlutil.serialization.XML
+import nl.adaptivity.xmlutil.serialization.XmlConfig
 import tachiyomi.core.common.storage.AndroidStorageFolderProvider
 import tachiyomi.data.Chapters
 import tachiyomi.data.Database
@@ -54,7 +55,6 @@ class AppModule(val app: Application) : InjektModule {

    override fun InjektRegistrar.registerInjectables() {
        addSingleton(app)
-        addSingleton<Context>(app)

        addSingletonFactory<SqlDriver> {
            synchronized(lock) {
@@ -17,7 +17,6 @@ import tachiyomi.domain.backup.service.BackupPreferences
 import tachiyomi.domain.download.service.DownloadPreferences
 import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.domain.storage.service.StoragePreferences
-import tachiyomi.domain.upcoming.service.UpcomingPreferences
 import tachiyomi.domain.updates.service.UpdatesPreferences
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
@@ -48,9 +47,6 @@ class PreferenceModule(val app: Application) : InjektModule {
        addSingletonFactory {
            LibraryPreferences(get())
        }
-        addSingletonFactory {
-            UpcomingPreferences(get())
-        }
        addSingletonFactory {
            UpdatesPreferences(get())
        }
@@ -240,8 +240,7 @@ class ExtensionManager(
     */
    fun updateExtension(extension: Extension.Installed): Flow<InstallStep> {
        val availableExt = availableExtensionMapFlow.value[extension.pkgName] ?: return emptyFlow()
-        val isUpdateForPrivatelyInstalled = !extension.isShared
-        return installer.downloadAndInstall(availableExt.apkUrl, availableExt, isUpdateForPrivatelyInstalled)
+        return installExtension(availableExt)
    }

    fun cancelInstallUpdateExtension(extension: Extension) {
@@ -1,28 +1,53 @@
 package eu.kanade.tachiyomi.extension.api

 import android.content.Context
+import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.LoadResult
 import eu.kanade.tachiyomi.extension.util.ExtensionLoader
 import mihon.domain.extension.interactor.UpdateExtensionStores
 import mihon.domain.extension.repository.ExtensionStoreRepository
+import tachiyomi.core.common.preference.Preference
+import tachiyomi.core.common.preference.PreferenceStore
 import tachiyomi.core.common.util.lang.withIOContext
 import uy.kohesive.injekt.injectLazy
+import java.time.Instant
+import kotlin.time.Duration.Companion.days

 internal class ExtensionApi {

    private val repository: ExtensionStoreRepository by injectLazy()

+    private val preferenceStore: PreferenceStore by injectLazy()
    private val updateExtensionStores: UpdateExtensionStores by injectLazy()
+    private val extensionManager: ExtensionManager by injectLazy()
+
+    private val lastExtCheck: Preference<Long> by lazy {
+        preferenceStore.getLong(Preference.appStateKey("last_ext_check"), 0)
+    }

    suspend fun findExtensions(): List<Extension.Available> {
        return withIOContext { repository.fetchExtensions() }
    }

-    suspend fun checkForUpdates(context: Context) {
+    suspend fun checkForUpdates(
+        context: Context,
+        fromAvailableExtensionList: Boolean = false,
+    ): List<Extension.Installed>? {
+        // Limit checks to once a day at most
+        if (!fromAvailableExtensionList &&
+            Instant.now().toEpochMilli() < lastExtCheck.get() + 1.days.inWholeMilliseconds
+        ) {
+            return null
+        }
+
        updateExtensionStores()

-        val extensions = findExtensions()
+        val extensions = if (fromAvailableExtensionList) {
+            extensionManager.availableExtensionsFlow.value
+        } else {
+            findExtensions().also { lastExtCheck.set(Instant.now().toEpochMilli()) }
+        }

        val installedExtensions = ExtensionLoader.loadExtensions(context)
            .filterIsInstance<LoadResult.Success>()
@@ -43,5 +68,7 @@ internal class ExtensionApi {
        if (extensionsWithUpdate.isNotEmpty()) {
            ExtensionUpdateNotifier(context).promptUpdates(extensionsWithUpdate.map { it.name })
        }
+
+        return extensionsWithUpdate
    }
 }
@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.installer

-import android.app.PendingIntent
 import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.ComponentName
@@ -40,7 +39,6 @@ class ShizukuInstaller(private val service: Service) : Installer(service) {
            .processNameSuffix("shizuku_service")
            .debuggable(BuildConfig.DEBUG)
            .daemon(false)
-            .version(2)
    }

    private val connection = object : ServiceConnection {
@@ -55,13 +53,6 @@ class ShizukuInstaller(private val service: Service) : Installer(service) {
        }
    }

-    private val statusIntent = PendingIntent.getBroadcast(
-        service.applicationContext,
-        0,
-        Intent(ACTION_INSTALL_RESULT).setPackage(BuildConfig.APPLICATION_ID),
-        PendingIntent.FLAG_MUTABLE,
-    )
-
    private val receiver = object : BroadcastReceiver() {
        override fun onReceive(context: Context, intent: Intent) {
            val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, Int.MIN_VALUE)
@@ -119,7 +110,7 @@ class ShizukuInstaller(private val service: Service) : Installer(service) {
        super.processEntry(entry)
        try {
            service.contentResolver.openAssetFileDescriptor(entry.uri, "r").use {
-                shellInterface?.install(it, statusIntent.intentSender)
+                shellInterface?.install(it)
            }
            service.contentResolver.delete(entry.uri, null, null)
        } catch (e: Exception) {
@@ -49,13 +49,8 @@ internal class ExtensionInstaller(
     *
     * @param url The url of the apk.
     * @param extension The extension to install.
-     * @param isUpdateForPrivatelyInstalled If this is an update for a privately installed extension
     */
-    fun downloadAndInstall(
-        url: String,
-        extension: Extension,
-        isUpdateForPrivatelyInstalled: Boolean = false,
-    ): Flow<InstallStep> {
+    fun downloadAndInstall(url: String, extension: Extension): Flow<InstallStep> {
        val downloadId = extension.pkgName.hashCode().toLong()
        cancelInstall(extension.pkgName)

@@ -79,7 +74,7 @@ internal class ExtensionInstaller(
                }

                step.value = InstallStep.Installing
-                installApk(downloadId, tmpFile, isUpdateForPrivatelyInstalled)
+                installApk(downloadId, tmpFile)
            } catch (e: Exception) {
                if (e is InterruptedException) {
                    // Canceled
@@ -104,14 +99,8 @@ internal class ExtensionInstaller(
     * Starts an intent to install the extension at the given uri.
     *
     * @param tempFile The file of the extension to install. Delete after use.
-     * @param isUpdateForPrivatelyInstalled If this install is an update for a privately installed extension
     */
-    private fun installApk(downloadId: Long, tempFile: File, isUpdateForPrivatelyInstalled: Boolean = false) {
-        if (isUpdateForPrivatelyInstalled) {
-            installApkPrivately(downloadId, tempFile)
-            return
-        }
-
+    private fun installApk(downloadId: Long, tempFile: File) {
        when (val installer = extensionInstaller.get()) {
            BasePreferences.ExtensionInstaller.LEGACY -> {
                val intent = Intent(context, ExtensionInstallActivity::class.java)
@@ -121,11 +110,20 @@ internal class ExtensionInstaller(

                context.startActivity(intent)
            }
-
            BasePreferences.ExtensionInstaller.PRIVATE -> {
-                installApkPrivately(downloadId, tempFile)
-            }
+                try {
+                    if (ExtensionLoader.installPrivateExtensionFile(context, tempFile)) {
+                        updateInstallStep(downloadId, InstallStep.Installed)
+                    } else {
+                        updateInstallStep(downloadId, InstallStep.Error)
+                    }
+                } catch (e: Exception) {
+                    logcat(LogPriority.ERROR, e) { "Failed to read downloaded extension file." }
+                    updateInstallStep(downloadId, InstallStep.Error)
+                }

+                tempFile.delete()
+            }
            else -> {
                val intent = ExtensionInstallService.getIntent(
                    context,
@@ -138,21 +136,6 @@ internal class ExtensionInstaller(
        }
    }

-    private fun installApkPrivately(downloadId: Long, tempFile: File) {
-        try {
-            if (ExtensionLoader.installPrivateExtensionFile(context, tempFile)) {
-                updateInstallStep(downloadId, InstallStep.Installed)
-            } else {
-                updateInstallStep(downloadId, InstallStep.Error)
-            }
-        } catch (e: Exception) {
-            logcat(LogPriority.ERROR, e) { "Failed to read downloaded extension file." }
-            updateInstallStep(downloadId, InstallStep.Error)
-        }
-
-        tempFile.delete()
-    }
-
    /**
     * Cancels extension install and remove from download manager and installer.
     */
@@ -31,7 +31,6 @@ class ThemingDelegateImpl : ThemingDelegate {
 private val themeResources: Map<AppTheme, Int> = mapOf(
    AppTheme.MONET to R.style.Theme_Tachiyomi_Monet,
    AppTheme.CATPPUCCIN to R.style.Theme_Tachiyomi_Catppuccin,
-    AppTheme.TOKYONIGHT to R.style.Theme_Tachiyomi_TokyoNight,
    AppTheme.GREEN_APPLE to R.style.Theme_Tachiyomi_GreenApple,
    AppTheme.LAVENDER to R.style.Theme_Tachiyomi_Lavender,
    AppTheme.MIDNIGHT_DUSK to R.style.Theme_Tachiyomi_MidnightDusk,
@@ -9,14 +9,14 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.tab.LocalTabNavigator
 import cafe.adriel.voyager.navigator.tab.TabOptions
 import eu.kanade.presentation.components.TabbedScreen
 import eu.kanade.presentation.util.Tab
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.browse.extension.ExtensionsViewModel
+import eu.kanade.tachiyomi.ui.browse.extension.ExtensionsScreenModel
 import eu.kanade.tachiyomi.ui.browse.extension.extensionsTab
 import eu.kanade.tachiyomi.ui.browse.migration.sources.migrateSourceTab
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchScreen
@@ -58,12 +58,12 @@ data object BrowseTab : Tab {
        val context = LocalContext.current

        // Hoisted for extensions tab's search bar
-        val extensionsViewModel = viewModel<ExtensionsViewModel>()
-        val extensionsState by extensionsViewModel.state.collectAsState()
+        val extensionsScreenModel = rememberScreenModel { ExtensionsScreenModel() }
+        val extensionsState by extensionsScreenModel.state.collectAsState()

        val tabs = listOf(
            sourcesTab(),
-            extensionsTab(extensionsViewModel),
+            extensionsTab(extensionsScreenModel),
            migrateSourceTab(),
        )

@@ -74,7 +74,7 @@ data object BrowseTab : Tab {
            tabs = tabs,
            state = state,
            searchQuery = extensionsState.searchQuery,
-            onChangeSearchQuery = extensionsViewModel::search,
+            onChangeSearchQuery = extensionsScreenModel::search,
        )
        LaunchedEffect(Unit) {
            switchToExtensionTabChannel.receiveAsFlow()
@@ -5,7 +5,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.browse.ExtensionFilterScreen
@@ -21,8 +21,8 @@ class ExtensionFilterScreen : Screen() {
    override fun Content() {
        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow
-        val viewModel = viewModel<ExtensionFilterViewModel>()
-        val state by viewModel.state.collectAsState()
+        val screenModel = rememberScreenModel { ExtensionFilterScreenModel() }
+        val state by screenModel.state.collectAsState()

        if (state is ExtensionFilterState.Loading) {
            LoadingScreen()
@@ -34,11 +34,11 @@ class ExtensionFilterScreen : Screen() {
        ExtensionFilterScreen(
            navigateUp = navigator::pop,
            state = successState,
-            onClickToggle = viewModel::toggle,
+            onClickToggle = screenModel::toggle,
        )

        LaunchedEffect(Unit) {
-            viewModel.events.collectLatest {
+            screenModel.events.collectLatest {
                when (it) {
                    ExtensionFilterEvent.FailedFetchingLanguages -> {
                        context.stringResource(MR.strings.internal_error)
@@ -1,7 +1,8 @@
 package eu.kanade.tachiyomi.ui.browse.extension

 import androidx.compose.runtime.Immutable
-import androidx.lifecycle.viewModelScope
+import cafe.adriel.voyager.core.model.StateScreenModel
+import cafe.adriel.voyager.core.model.screenModelScope
 import eu.kanade.domain.extension.interactor.GetExtensionLanguages
 import eu.kanade.domain.source.interactor.ToggleLanguage
 import eu.kanade.domain.source.service.SourcePreferences
@@ -14,22 +15,21 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import logcat.LogPriority
-import mihon.core.viewmodel.StateViewModel
 import tachiyomi.core.common.util.system.logcat
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class ExtensionFilterViewModel(
+class ExtensionFilterScreenModel(
    private val preferences: SourcePreferences = Injekt.get(),
    private val getExtensionLanguages: GetExtensionLanguages = Injekt.get(),
    private val toggleLanguage: ToggleLanguage = Injekt.get(),
-) : StateViewModel<ExtensionFilterState>(ExtensionFilterState.Loading) {
+) : StateScreenModel<ExtensionFilterState>(ExtensionFilterState.Loading) {

    private val _events: Channel<ExtensionFilterEvent> = Channel()
    val events: Flow<ExtensionFilterEvent> = _events.receiveAsFlow()

    init {
-        viewModelScope.launch {
+        screenModelScope.launch {
            combine(
                getExtensionLanguages.subscribe(),
                preferences.enabledLanguages.changes(),
@@ -2,7 +2,8 @@ package eu.kanade.tachiyomi.ui.browse.extension

 import android.app.Application
 import androidx.compose.runtime.Immutable
-import androidx.lifecycle.viewModelScope
+import cafe.adriel.voyager.core.model.StateScreenModel
+import cafe.adriel.voyager.core.model.screenModelScope
 import dev.icerock.moko.resources.StringResource
 import eu.kanade.domain.base.BasePreferences
 import eu.kanade.domain.extension.interactor.GetExtensionsByType
@@ -27,19 +28,18 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import mihon.core.viewmodel.StateViewModel
 import tachiyomi.core.common.util.lang.launchIO
 import tachiyomi.i18n.MR
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import kotlin.time.Duration.Companion.seconds

-class ExtensionsViewModel(
+class ExtensionsScreenModel(
    preferences: SourcePreferences = Injekt.get(),
    basePreferences: BasePreferences = Injekt.get(),
    private val extensionManager: ExtensionManager = Injekt.get(),
    private val getExtensions: GetExtensionsByType = Injekt.get(),
-) : StateViewModel<ExtensionsViewModel.State>(State()) {
+) : StateScreenModel<ExtensionsScreenModel.State>(State()) {

    private val currentDownloads = MutableStateFlow<Map<String, InstallStep>>(hashMapOf())

@@ -51,7 +51,7 @@ class ExtensionsViewModel(
            }
        }

-        viewModelScope.launchIO {
+        screenModelScope.launchIO {
            combine(
                state.map { it.searchQuery }
                    .distinctUntilChanged()
@@ -95,15 +95,15 @@ class ExtensionsViewModel(
                }
        }

-        viewModelScope.launchIO { findAvailableExtensions() }
+        screenModelScope.launchIO { findAvailableExtensions() }

        preferences.extensionUpdatesCount.changes()
            .onEach { mutableState.update { state -> state.copy(updates = it) } }
-            .launchIn(viewModelScope)
+            .launchIn(screenModelScope)

        basePreferences.extensionInstaller.changes()
            .onEach { mutableState.update { state -> state.copy(installer = it) } }
-            .launchIn(viewModelScope)
+            .launchIn(screenModelScope)
    }

    fun searchQueryPredicate(query: String): (Extension) -> Boolean {
@@ -143,7 +143,7 @@ class ExtensionsViewModel(
    }

    fun updateAllExtensions() {
-        viewModelScope.launchIO {
+        screenModelScope.launchIO {
            state.value.items.values.flatten()
                .map { it.extension }
                .filterIsInstance<Extension.Installed>()
@@ -153,13 +153,13 @@ class ExtensionsViewModel(
    }

    fun installExtension(extension: Extension.Available) {
-        viewModelScope.launchIO {
+        screenModelScope.launchIO {
            extensionManager.installExtension(extension).collectToInstallUpdate(extension)
        }
    }

    fun updateExtension(extension: Extension.Installed) {
-        viewModelScope.launchIO {
+        screenModelScope.launchIO {
            extensionManager.updateExtension(extension).collectToInstallUpdate(extension)
        }
    }
@@ -189,7 +189,7 @@ class ExtensionsViewModel(
    }

    fun findAvailableExtensions() {
-        viewModelScope.launchIO {
+        screenModelScope.launchIO {
            mutableState.update { it.copy(isRefreshing = true) }

            extensionManager.findAvailableExtensions()
@@ -202,7 +202,7 @@ class ExtensionsViewModel(
    }

    fun trustExtension(extension: Extension.Untrusted) {
-        viewModelScope.launch {
+        screenModelScope.launch {
            extensionManager.trust(extension)
        }
    }
@@ -26,12 +26,12 @@ import tachiyomi.presentation.core.i18n.stringResource

@Composable
 fun extensionsTab(
-    extensionsViewModel: ExtensionsViewModel,
+    extensionsScreenModel: ExtensionsScreenModel,
 ): TabContent {
    val navigator = LocalNavigator.currentOrThrow
    val context = LocalContext.current

-    val state by extensionsViewModel.state.collectAsState()
+    val state by extensionsScreenModel.state.collectAsState()
    var privateExtensionToUninstall by remember { mutableStateOf<Extension?>(null) }

    return TabContent(
@@ -50,7 +50,7 @@ fun extensionsTab(
        ),
        content = { contentPadding, _ ->
            BackHandler(enabled = state.searchQuery != null) {
-                extensionsViewModel.search(null)
+                extensionsScreenModel.search(null)
            }

            ExtensionScreen(
@@ -59,18 +59,18 @@ fun extensionsTab(
                searchQuery = state.searchQuery,
                onLongClickItem = { extension ->
                    when (extension) {
-                        is Extension.Available -> extensionsViewModel.installExtension(extension)
+                        is Extension.Available -> extensionsScreenModel.installExtension(extension)
                        else -> {
                            if (context.isPackageInstalled(extension.pkgName)) {
-                                extensionsViewModel.uninstallExtension(extension)
+                                extensionsScreenModel.uninstallExtension(extension)
                            } else {
                                privateExtensionToUninstall = extension
                            }
                        }
                    }
                },
-                onClickItemCancel = extensionsViewModel::cancelInstallUpdateExtension,
-                onClickUpdateAll = extensionsViewModel::updateAllExtensions,
+                onClickItemCancel = extensionsScreenModel::cancelInstallUpdateExtension,
+                onClickUpdateAll = extensionsScreenModel::updateAllExtensions,
                onOpenWebView = { extension ->
                    extension.sources.getOrNull(0)?.let {
                        navigator.push(
@@ -82,19 +82,19 @@ fun extensionsTab(
                        )
                    }
                },
-                onInstallExtension = extensionsViewModel::installExtension,
+                onInstallExtension = extensionsScreenModel::installExtension,
                onOpenExtension = { navigator.push(ExtensionDetailsScreen(it.pkgName)) },
-                onTrustExtension = { extensionsViewModel.trustExtension(it) },
-                onUninstallExtension = { extensionsViewModel.uninstallExtension(it) },
-                onUpdateExtension = extensionsViewModel::updateExtension,
-                onRefresh = extensionsViewModel::findAvailableExtensions,
+                onTrustExtension = { extensionsScreenModel.trustExtension(it) },
+                onUninstallExtension = { extensionsScreenModel.uninstallExtension(it) },
+                onUpdateExtension = extensionsScreenModel::updateExtension,
+                onRefresh = extensionsScreenModel::findAvailableExtensions,
            )

            privateExtensionToUninstall?.let { extension ->
                ExtensionUninstallConfirmation(
                    extensionName = extension.name,
                    onClickConfirm = {
-                        extensionsViewModel.uninstallExtension(extension)
+                        extensionsScreenModel.uninstallExtension(extension)
                    },
                    onDismissRequest = {
                        privateExtensionToUninstall = null
@@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.lifecycle.viewmodel.CreationExtras
-import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.compose.ui.platform.LocalContext
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.browse.ExtensionDetailsScreen
@@ -19,13 +19,9 @@ data class ExtensionDetailsScreen(

    @Composable
    override fun Content() {
-        val viewModel = viewModel<ExtensionDetailsViewModel>(
-            factory = ExtensionDetailsViewModel.Factory,
-            extras = CreationExtras {
-                set(ExtensionDetailsViewModel.PKG_NAME_KEY, pkgName)
-            },
-        )
-        val state by viewModel.state.collectAsState()
+        val context = LocalContext.current
+        val screenModel = rememberScreenModel { ExtensionDetailsScreenModel(pkgName = pkgName, context = context) }
+        val state by screenModel.state.collectAsState()

        if (state.isLoading) {
            LoadingScreen()
@@ -38,16 +34,16 @@ data class ExtensionDetailsScreen(
            navigateUp = navigator::pop,
            state = state,
            onClickSourcePreferences = { navigator.push(SourcePreferencesScreen(it)) },
-            onClickEnableAll = { viewModel.toggleSources(true) },
-            onClickDisableAll = { viewModel.toggleSources(false) },
-            onClickClearCookies = viewModel::clearCookies,
-            onClickUninstall = viewModel::uninstallExtension,
-            onClickSource = viewModel::toggleSource,
-            onClickIncognito = viewModel::toggleIncognito,
+            onClickEnableAll = { screenModel.toggleSources(true) },
+            onClickDisableAll = { screenModel.toggleSources(false) },
+            onClickClearCookies = screenModel::clearCookies,
+            onClickUninstall = screenModel::uninstallExtension,
+            onClickSource = screenModel::toggleSource,
+            onClickIncognito = screenModel::toggleIncognito,
        )

        LaunchedEffect(Unit) {
-            viewModel.events.collectLatest { event ->
+            screenModel.events.collectLatest { event ->
                if (event is ExtensionDetailsEvent.Uninstalled) {
                    navigator.pop()
                }
@@ -1,12 +1,9 @@
 package eu.kanade.tachiyomi.ui.browse.extension.details

-import android.app.Application
 import android.content.Context
 import androidx.compose.runtime.Immutable
-import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.CreationExtras
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
+import cafe.adriel.voyager.core.model.StateScreenModel
+import cafe.adriel.voyager.core.model.screenModelScope
 import eu.kanade.domain.extension.interactor.ExtensionSourceItem
 import eu.kanade.domain.extension.interactor.GetExtensionSources
 import eu.kanade.domain.source.interactor.ToggleIncognito
@@ -27,13 +24,12 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import logcat.LogPriority
-import mihon.core.viewmodel.StateViewModel
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import tachiyomi.core.common.util.system.logcat
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class ExtensionDetailsViewModel(
+class ExtensionDetailsScreenModel(
    pkgName: String,
    context: Context,
    private val network: NetworkHelper = Injekt.get(),
@@ -42,26 +38,13 @@ class ExtensionDetailsViewModel(
    private val toggleSource: ToggleSource = Injekt.get(),
    private val toggleIncognito: ToggleIncognito = Injekt.get(),
    private val preferences: SourcePreferences = Injekt.get(),
-) : StateViewModel<ExtensionDetailsViewModel.State>(State()) {
-
-    companion object {
-        val PKG_NAME_KEY = CreationExtras.Key<String>()
-
-        val Factory = viewModelFactory {
-            initializer {
-                ExtensionDetailsViewModel(
-                    pkgName = get(PKG_NAME_KEY)!!,
-                    context = Injekt.get<Application>(),
-                )
-            }
-        }
-    }
+) : StateScreenModel<ExtensionDetailsScreenModel.State>(State()) {

    private val _events: Channel<ExtensionDetailsEvent> = Channel()
    val events: Flow<ExtensionDetailsEvent> = _events.receiveAsFlow()

    init {
-        viewModelScope.launch {
+        screenModelScope.launch {
            launch {
                extensionManager.installedExtensionsFlow
                    .map { it.firstOrNull { extension -> extension.pkgName == pkgName } }
@@ -19,8 +19,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.lifecycle.viewmodel.CreationExtras
-import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.components.AppBar
@@ -48,14 +47,9 @@ data class MigrateMangaScreen(
    override fun Content() {
        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow
-        val viewModel = viewModel<MigrateMangaViewModel>(
-            factory = MigrateMangaViewModel.Factory,
-            extras = CreationExtras {
-                set(MigrateMangaViewModel.SOURCE_ID_KEY, sourceId)
-            },
-        )
+        val screenModel = rememberScreenModel { MigrateMangaScreenModel(sourceId) }

-        val state by viewModel.state.collectAsState()
+        val state by screenModel.state.collectAsState()

        if (state.isLoading) {
            LoadingScreen()
@@ -63,7 +57,7 @@ data class MigrateMangaScreen(
        }

        BackHandler(enabled = state.selectionMode) {
-            viewModel.clearSelection()
+            screenModel.clearSelection()
        }

        val lazyListState = rememberLazyListState()
@@ -74,7 +68,7 @@ data class MigrateMangaScreen(
                    title = state.source!!.name,
                    navigateUp = {
                        if (state.selectionMode) {
-                            viewModel.clearSelection()
+                            screenModel.clearSelection()
                        } else {
                            navigator.pop()
                        }
@@ -90,7 +84,7 @@ data class MigrateMangaScreen(
                    },
                    onClick = {
                        val selection = state.selection
-                        viewModel.clearSelection()
+                        screenModel.clearSelection()
                        navigator.push(MigrationConfigScreen(selection))
                    },
                    expanded = lazyListState.shouldExpandFAB(),
@@ -113,13 +107,13 @@ data class MigrateMangaScreen(
                lazyListState = lazyListState,
                contentPadding = contentPadding,
                state = state,
-                onClickItem = viewModel::toggleSelection,
+                onClickItem = screenModel::toggleSelection,
                onClickCover = { navigator.push(MangaScreen(it.id)) },
            )
        }

        LaunchedEffect(Unit) {
-            viewModel.events.collectLatest { event ->
+            screenModel.events.collectLatest { event ->
                when (event) {
                    MigrationMangaEvent.FailedFetchingFavorites -> {
                        context.toast(MR.strings.internal_error)
@@ -133,7 +127,7 @@ data class MigrateMangaScreen(
    private fun MigrateMangaContent(
        lazyListState: LazyListState,
        contentPadding: PaddingValues,
-        state: MigrateMangaViewModel.State,
+        state: MigrateMangaScreenModel.State,
        onClickItem: (Manga) -> Unit,
        onClickCover: (Manga) -> Unit,
    ) {
@@ -1,10 +1,8 @@
 package eu.kanade.tachiyomi.ui.browse.migration.manga

 import androidx.compose.runtime.Immutable
-import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.CreationExtras
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
+import cafe.adriel.voyager.core.model.StateScreenModel
+import cafe.adriel.voyager.core.model.screenModelScope
 import eu.kanade.tachiyomi.source.Source
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
@@ -16,7 +14,6 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import logcat.LogPriority
 import mihon.core.common.utils.mutate
-import mihon.core.viewmodel.StateViewModel
 import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.manga.interactor.GetFavorites
 import tachiyomi.domain.manga.model.Manga
@@ -24,29 +21,17 @@ import tachiyomi.domain.source.service.SourceManager
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class MigrateMangaViewModel(
+class MigrateMangaScreenModel(
    private val sourceId: Long,
    private val sourceManager: SourceManager = Injekt.get(),
    private val getFavorites: GetFavorites = Injekt.get(),
-) : StateViewModel<MigrateMangaViewModel.State>(State()) {
-
-    companion object {
-        val SOURCE_ID_KEY = CreationExtras.Key<Long>()
-
-        val Factory = viewModelFactory {
-            initializer {
-                MigrateMangaViewModel(
-                    sourceId = get(SOURCE_ID_KEY)!!,
-                )
-            }
-        }
-    }
+) : StateScreenModel<MigrateMangaScreenModel.State>(State()) {

    private val _events: Channel<MigrationMangaEvent> = Channel()
    val events: Flow<MigrationMangaEvent> = _events.receiveAsFlow()

    init {
-        viewModelScope.launch {
+        screenModelScope.launch {
            mutableState.update { state ->
                state.copy(source = sourceManager.getOrStub(sourceId))
            }
@@ -3,13 +3,12 @@ package eu.kanade.tachiyomi.ui.browse.migration.search
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.lifecycle.viewmodel.CreationExtras
-import androidx.lifecycle.viewmodel.compose.viewModel
+import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.browse.MigrateSearchScreen
 import eu.kanade.presentation.util.Screen
-import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchViewModel
+import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchScreenModel
 import eu.kanade.tachiyomi.ui.manga.MangaScreen
 import mihon.feature.migration.dialog.MigrateMangaDialog
 import mihon.feature.migration.list.MigrationListScreen
@@ -20,23 +19,18 @@ class MigrateSearchScreen(private val mangaId: Long) : Screen() {
    override fun Content() {
        val navigator = LocalNavigator.currentOrThrow

-        val viewModel = viewModel<MigrateSearchViewModel>(
-            factory = MigrateSearchViewModel.Factory,
-            extras = CreationExtras {
-                set(MigrateSearchViewModel.MANGA_ID_KEY, mangaId)
-            },
-        )
-        val state by viewModel.state.collectAsState()
+        val screenModel = rememberScreenModel { MigrateSearchScreenModel(mangaId = mangaId) }
+        val state by screenModel.state.collectAsState()

        MigrateSearchScreen(
            state = state,
            fromSourceId = state.from?.source,
            navigateUp = navigator::pop,
-            onChangeSearchQuery = viewModel::updateSearchQuery,
-            onSearch = { viewModel.search() },
-            getManga = { viewModel.getManga(it) },
-            onChangeSearchFilter = viewModel::setSourceFilter,
-            onToggleResults = viewModel::toggleFilterResults,
+            onChangeSearchQuery = screenModel::updateSearchQuery,
+            onSearch = { screenModel.search() },
+            getManga = { screenModel.getManga(it) },
+            onChangeSearchFilter = screenModel::setSourceFilter,
+            onToggleResults = screenModel::toggleFilterResults,
            onClickSource = { navigator.push(MigrateSourceSearchScreen(state.from!!, it.id, state.searchQuery)) },
            onClickItem = {
                val migrateListScreen = navigator.items
@@ -44,7 +38,7 @@ class MigrateSearchScreen(private val mangaId: Long) : Screen() {
                    .lastOrNull()

                if (migrateListScreen == null) {
-                    viewModel.setMigrateDialog(mangaId, it)
+                    screenModel.setMigrateDialog(mangaId, it)
                } else {
                    migrateListScreen.addMatchOverride(current = mangaId, target = it.id)
                    navigator.popUntil { screen -> screen is MigrationListScreen }
@@ -54,13 +48,13 @@ class MigrateSearchScreen(private val mangaId: Long) : Screen() {
        )

        when (val dialog = state.dialog) {
-            is SearchViewModel.Dialog.Migrate -> {
+            is SearchScreenModel.Dialog.Migrate -> {
                MigrateMangaDialog(
                    current = dialog.current,
                    target = dialog.target,
                    // Initiated from the context of [dialog.current] so we show [dialog.target].
                    onClickTitle = { navigator.push(MangaScreen(dialog.target.id, true)) },
-                    onDismissRequest = { viewModel.clearDialog() },
+                    onDismissRequest = { screenModel.clearDialog() },
                    onComplete = {
                        if (navigator.lastItem is MangaScreen) {
                            val lastItem = navigator.lastItem
--- a/Show More
+++ b/Show More