Translations update from Hosted Weblate (#1289 )

Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy-plurals/zh_Hant/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/ar/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/as/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/es/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/fil/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/id/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/it/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/ru/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/mihon/tachiyomisy/zh_Hant/ Translation: Mihon/TachiyomiSY Translation: Mihon/TachiyomiSY Plurals Co-authored-by: Dexroneum <Rozhenkov69@gmail.com> Co-authored-by: Eji-san <ejierubani@gmail.com> Co-authored-by: Fordas <fordas15@gmail.com> Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com> Co-authored-by: Infy's Tagalog Translations <ced.paltep10@gmail.com> Co-authored-by: Itsmechinmoy <itsmechinmoy@users.noreply.hosted.weblate.org> Co-authored-by: Noah Kenzie Rodriguez-Beus <noahbeus@protonmail.com> Co-authored-by: Sergeev Vladimir Dmitrievich <sekhmych@gmail.com> Co-authored-by: Swyter <swyterzone@gmail.com> Co-authored-by: ZerOriSama <godarms2010@live.com> Co-authored-by: gallegonovato <fran-carro@hotmail.es> Co-authored-by: ɴᴇᴋᴏ <s99095lkjjim@gmail.com>
allow chapter 0 dupe auto mark as read (#1291 )
2024-10-26 23:44:53 -04:00 · 2024-10-26 23:31:44 -04:00 · 2024-10-26 23:30:07 -04:00 · 2024-10-26 23:06:30 -04:00 · 2024-10-26 22:25:23 -04:00 · 2024-10-26 22:25:11 -04:00
799 changed files with 18573 additions and 11431 deletions
@@ -0,0 +1,7 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "extends": ["config:base"],
  "labels": ["Dependencies"],
  "includePaths": [".github/workflows/*", "gradle/sy.versions.toml"],
  "semanticCommits": "disabled"
 }
@@ -15,7 +15,7 @@ jobs:
        uses: actions/checkout@v4
      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
  build:
    name: Build app
@@ -27,19 +27,19 @@ jobs:
        uses: actions/checkout@v4
      - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
        with:
          java-version: 17
          distribution: adopt
      - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
      - name: Build app
-        run: ./gradlew detekt assembleDevDebug
+        run: ./gradlew spotlessCheck assembleDevDebug
      - name: Upload APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: TachiyomiSY-${{ github.sha }}.apk
          path: app/build/outputs/apk/dev/debug/app-dev-debug.apk
@@ -18,7 +18,7 @@ jobs:
        uses: actions/checkout@v4
      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v4
      - name: Setup Android SDK
        run: |
@@ -31,18 +31,18 @@ jobs:
          distribution: adopt
      - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
      # SY <--
      - name: Write google-services.json
-        uses: DamianReeves/write-file-action@v1.2
+        uses: DamianReeves/write-file-action@v1.3
        with:
          path: app/google-services.json
          contents: ${{ secrets.GOOGLE_SERVICES_TEXT }}
          write-mode: overwrite
      - name: Write client_secrets.json
-        uses: DamianReeves/write-file-action@v1.2
+        uses: DamianReeves/write-file-action@v1.3
        with:
          path: app/src/main/assets/client_secrets.json
          contents: ${{ secrets.CLIENT_SECRETS_TEXT }}
@@ -50,7 +50,7 @@ jobs:
      # SY -->
      - name: Build app and run unit tests
-        run: ./gradlew detekt assembleStandardRelease testStandardReleaseUnitTest --stacktrace
+        run: ./gradlew spotlessCheck assembleStandardRelease testStandardReleaseUnitTest --stacktrace
      - name: Sign APK
        uses: r0adkll/sign-android-release@v1
@@ -86,7 +86,7 @@ jobs:
          echo "APK_X86_64_SHA=$sha" >> $GITHUB_ENV
      - name: Create release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ github.run_number }}
          name: TachiyomiSY
@@ -3,12 +3,11 @@ name: Remote Dispatch Action Initiator
 on:
  push:
   branches: 
-    - 'master'
+    - 'preview'
 jobs:
  trigger_preview_build:
    name: Trigger preview build
    if: ${{ github.ref == 'refs/heads/master' }}
    runs-on: ubuntu-latest
    steps:
@@ -16,7 +15,7 @@ jobs:
        uses: actions/checkout@v4
      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
      - name: Create Tag
        run: |
@@ -40,6 +40,12 @@ jobs:
                "ignoreCase": true,
                "labels": ["Cloudflare protected"],
                "message": "Refer to the **Solving Cloudflare issues** section at https://mihon.app/docs/guides/troubleshooting/#cloudflare. If it doesn't work, migrate to other sources or wait until they lower their protection."
              },
              {
                "type": "both",
                "regex": "^.*(myanimelist|mal).*$",
                "ignoreCase": true,
                "message": "For issues with linking MyAnimeList, please follow these steps:\n1. Update Mihon to version 0.16.4 or newer\n2. Change your default User-Agent (`More → Settings → Advanced → Default user agent string`)\n3. Close and restart Mihon\n4. Attempt to link MyAnimeList again\n\nIf you had MyAnimeList linked before, try to unlink it first before trying these steps."
              }
            ]
          auto-close-ignore-label: do-not-autoclose
@@ -0,0 +1,26 @@
 name: Label PRs
 on:
  pull_request:
    types: [opened]
 jobs:
  label_pr:
    runs-on: ubuntu-latest
    steps:
      - name: Check PR and Add Label
        uses: actions/github-script@v7
        with:
          script: |
            const prAuthor = context.payload.pull_request.user.login;
            if (prAuthor === 'weblate') {
              const labels = ['Translations'];
              await github.issues.addLabels({
                owner: context.repo.owner,
                repo: context.repo.repo,
                issue_number: context.payload.pull_request.number,
                labels: labels
              });
            }
@@ -1,25 +1,21 @@
 # Build files
 .gradle
-/local.properties
+.kotlin
-/.idea/workspace.xml
+build
-.DS_Store
+
 # IDE files
 *.iml
 .idea/*
 !.idea/icon.png
 *iml
 *.iml
 /mainframer
 /.mainframer
 # Built files
 */build
 /build
 *.apk
 app/**/output.json
 # Unnecessary file
 *.swp
 TODO.md
 CHANGELOG.md
 /captures
-build.sh
+
 # Configuration files
 local.properties
 # macOS specific files
 .DS_Store
 # SY ignores
 google-services.json
 /app/src/main/assets/client_secrets.json
 *.apk
@@ -1,4 +1,4 @@
-Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/tachiyomiorg/tachiyomi#issues-feature-requests-and-contributing).
+Looking to report an issue/bug or make a feature request? Please refer to the [README file](/README.md#issues-feature-requests-and-contributing).
 ---
@@ -9,7 +9,7 @@ Thanks for your interest in contributing to Tachiyomi!
 Pull requests are welcome!
-If you're interested in taking on [an open issue](https://github.com/tachiyomiorg/tachiyomi/issues), please comment on it so others are aware.
+If you're interested in taking on [an open issue](https://github.com/jobobby04/TachiyomiSY/issues), please comment on it so others are aware.
 You do not need to ask for permission nor an assignment.
 ## Prerequisites
@@ -24,34 +24,27 @@ Before you start, please note that the ability to use following technologies is
 - [Android Studio](https://developer.android.com/studio)
 - Emulator or phone with developer options enabled to test changes.
 ## Linting
 To auto-fix some linting errors, run the `ktlintFormat` Gradle task.
 ## Getting help
- Join [the Discord server](https://discord.gg/tachiyomi) for online help and to ask questions while developing.
+- Join [the Discord server](https://discord.gg/mihon) for online help and to ask questions while developing.
 # Translations
-Translations are done externally via Weblate. See [our website](https://tachiyomi.org/docs/contribute#translation) for more details.
+Translations are done externally via Weblate. See [our website](https://mihon.app/docs/contribute#translation) for more details.
 # Forks
-Forks are allowed so long as they abide by [the project's LICENSE](https://github.com/tachiyomiorg/tachiyomi/blob/master/LICENSE).
+Forks are allowed so long as they abide by [the project's LICENSE](/LICENSE).
 When creating a fork, remember to:
 - To avoid confusion with the main app:
    - Change the app name
    - Change the app icon
-    - Change or disable the [app update checker](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
+    - Change or disable the [app update checker](/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
 - To avoid installation conflicts:
-    - Change the `applicationId` in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts)
+    - Change the `applicationId` in [`build.gradle.kts`](/app/build.gradle.kts)
 - To avoid having your data polluting the main app's analytics and crash report services:
    - If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/standard/google-services.json) with your own
    - If you want to use ACRA crash reporting, replace the `ACRA_URI` endpoint in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts) with your own
 ### Supporting Cloud Sync - Google Drive Implementation
@@ -14,7 +14,7 @@ Features of Mihon(original) include:
 * Online reading from a variety of sources
 * Local reading of downloaded content
 * A configurable reader with multiple viewers, reading directions and other settings.
-* Tracker support: [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [MangaUpdates](https://mangaupdates.com), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) support
+* Tracker support: [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.app/), [MangaUpdates](https://mangaupdates.com), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) support
 * Categories to organize your library
 * Light and dark themes
 * Schedule updating your library for new chapters
@@ -67,13 +67,22 @@ Get the app from our [releases page](https://github.com/jobobby04/tachiyomisy/re
 If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/jobobby04/tachiyomisypreview/releases).
 ## Translation
 Feel free to translate the project on [Weblate](https://hosted.weblate.org/projects/mihon/tachiyomisy/)
 <details><summary>Translation Progress</summary>
 <a href="https://hosted.weblate.org/engage/mihon/">
 <img src="https://hosted.weblate.org/widgets/mihon/-/tachiyomisy/multi-auto.svg" alt="Translation status" />
 </a>
 </details>
 ## Issues, Feature Requests and Contributing
 Please make sure to read the full guidelines. Your issue may be closed without warning if you do not.
 <details><summary>Issues</summary>
-1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/docs/faq/general), the [changelog](https://github.com/jobobby04/tachiyomisy/releases) and the already opened [issues](https://github.com/jobobby04/tachiyomisy/issues).**
+1. **Before reporting a new issue, take a look at the [FAQ](https://mihon.app/docs/faq/general), the [changelog](https://github.com/jobobby04/tachiyomisy/releases) and the already opened [issues](https://github.com/jobobby04/tachiyomisy/issues).**
 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/1195734228319617024.svg)](https://discord.gg/mihon)
 </details>
@@ -88,9 +97,7 @@ Please make sure to read the full guidelines. Your issue may be closed without w
 * If it could be device-dependent, try reproducing on another device (if possible)
 * Don't group unrelated requests into one issue
-DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71
+Use the [issue forms](https://github.com/jobobby04/TachiyomiSY/issues/new/choose) to submit a bug.
 DON'T: https://github.com/tachiyomiorg/tachiyomi/issues/75
 </details>
@@ -1,4 +0,0 @@
 /build
 *iml
 *.iml
 google-services.json
@@ -1,24 +1,28 @@
 import mihon.buildlogic.getBuildTime
 import mihon.buildlogic.getCommitCount
 import mihon.buildlogic.getGitSha
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
-    id("com.android.application")
+    id("mihon.android.application")
-    id("com.mikepenz.aboutlibraries.plugin")
+    id("mihon.android.application.compose")
    kotlin("android")
    kotlin("plugin.parcelize")
    kotlin("plugin.serialization")
    // id("com.github.zellius.shortcut-helper")
    alias(libs.plugins.aboutLibraries)
    id("com.github.ben-manes.versions")
 }
 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
-    apply<com.google.gms.googleservices.GoogleServicesPlugin>()
+    pluginManager.apply {
-    // Firebase Crashlytics
+        apply(libs.plugins.google.services.get().pluginId)
-    apply(plugin = "com.google.firebase.crashlytics")
+        apply(libs.plugins.firebase.crashlytics.get().pluginId)
    }
 }
 // shortcutHelper.setFilePath("./shortcuts.xml")
-val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+val supportedAbis = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 android {
    namespace = "eu.kanade.tachiyomi"
@@ -26,7 +30,7 @@ android {
    defaultConfig {
        applicationId = "eu.kanade.tachiyomi.sy"
-        versionCode = 66
+        versionCode = 69
        versionName = "1.10.5"
        buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
@@ -35,7 +39,7 @@ android {
        buildConfigField("boolean", "INCLUDE_UPDATER", "false")
        ndk {
-            abiFilters += SUPPORTED_ABIS
+            abiFilters += supportedAbis
        }
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -44,7 +48,7 @@ android {
        abi {
            isEnable = true
            reset()
-            include(*SUPPORTED_ABIS.toTypedArray())
+            include(*supportedAbis.toTypedArray())
            isUniversalApk = true
        }
    }
@@ -103,13 +107,16 @@ android {
    packaging {
        resources.excludes.addAll(
            listOf(
                "kotlin-tooling-metadata.json",
                "META-INF/DEPENDENCIES",
                "LICENSE.txt",
                "META-INF/LICENSE",
-                "META-INF/LICENSE.txt",
+                "META-INF/**/LICENSE.txt",
                "META-INF/*.properties",
                "META-INF/**/*.properties",
                "META-INF/README.md",
                "META-INF/NOTICE",
-                "META-INF/*.kotlin_module",
+                "META-INF/*.version",
            ),
        )
    }
@@ -120,7 +127,6 @@ android {
    buildFeatures {
        viewBinding = true
        compose = true
        buildConfig = true
        // Disable some unused things
@@ -133,10 +139,6 @@ android {
        abortOnError = false
        checkReleaseBuilds = false
    }
    composeOptions {
        kotlinCompilerExtensionVersion = compose.versions.compiler.get()
    }
 }
 dependencies {
@@ -154,26 +156,24 @@ dependencies {
    implementation(projects.presentationWidget)
    // Compose
    implementation(platform(compose.bom))
    implementation(compose.activity)
    implementation(compose.foundation)
    implementation(compose.material3.core)
    implementation(compose.material.core)
    implementation(compose.material.icons)
    implementation(compose.animation)
    implementation(compose.animation.graphics)
    debugImplementation(compose.ui.tooling)
    implementation(compose.ui.tooling.preview)
    implementation(compose.ui.util)
-    implementation(compose.accompanist.webview)
+
-    implementation(compose.accompanist.systemuicontroller)
+    implementation(androidx.interpolator)
    implementation(androidx.paging.runtime)
    implementation(androidx.paging.compose)
    implementation(libs.bundles.sqlite)
    // SY -->
-    implementation(libs.sqlcipher)
+    implementation(sylibs.sqlcipher)
    // SY <--
    implementation(kotlinx.reflect)
@@ -215,10 +215,6 @@ dependencies {
    // Disk
    implementation(libs.disklrucache)
    implementation(libs.unifile)
    implementation(libs.bundles.archive)
    // SY -->
    implementation(libs.zip4j)
    // SY <--
    // Preferences
    implementation(libs.preferencektx)
@@ -247,16 +243,16 @@ dependencies {
    implementation(libs.bundles.voyager)
    implementation(libs.compose.materialmotion)
    implementation(libs.swipe)
-
+    implementation(libs.compose.webview)
-    implementation(libs.google.api.services.drive)
+    implementation(libs.compose.grid)
    implementation(libs.google.api.client.oauth)
    // Logging
    implementation(libs.logcat)
    // Crash reports/analytics
-    // implementation(libs.bundles.acra)
+//    "standardImplementation"(platform(libs.firebase.bom))
-    // "standardImplementation"(libs.firebase.analytics)
+//    "standardImplementation"(libs.firebase.analytics)
 //    "standardImplementation"(libs.firebase.crashlytics)
    // Shizuku
    implementation(libs.bundles.shizuku)
@@ -268,13 +264,16 @@ dependencies {
    // debugImplementation(libs.leakcanary.android)
    implementation(libs.leakcanary.plumber)
    testImplementation(kotlinx.coroutines.test)
    // SY -->
    // Text distance (EH)
    implementation(sylibs.simularity)
    // Firebase (EH)
-    implementation(sylibs.firebase.analytics)
+    implementation(platform(libs.firebase.bom))
-    implementation(sylibs.firebase.crashlytics.ktx)
+    implementation(libs.firebase.analytics)
    implementation(libs.firebase.crashlytics)
    // Better logging (EH)
    implementation(sylibs.xlog)
@@ -282,6 +281,14 @@ dependencies {
    // RatingBar (SY)
    implementation(sylibs.ratingbar)
    implementation(sylibs.composeRatingbar)
    // Google drive
    implementation(sylibs.google.api.services.drive)
    implementation(sylibs.google.api.client.oauth)
    // Koin
    implementation(sylibs.koin.core)
    implementation(sylibs.koin.android)
 }
 androidComponents {
@@ -303,7 +310,7 @@ androidComponents {
 tasks {
    // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api(-markers)
    withType<KotlinCompile> {
-        kotlinOptions.freeCompilerArgs += listOf(
+        compilerOptions.freeCompilerArgs.addAll(
            "-Xcontext-receivers",
            "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
            "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
@@ -314,31 +321,11 @@ tasks {
            "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
            "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
            "-opt-in=coil3.annotation.ExperimentalCoilApi",
            "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi",
            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
            "-opt-in=kotlinx.coroutines.FlowPreview",
            "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
        )
        if (project.findProperty("tachiyomi.enableComposeCompilerMetrics") == "true") {
            kotlinOptions.freeCompilerArgs += listOf(
                "-P",
                "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
                    project.layout.buildDirectory.dir("compose_metrics").get().asFile.absolutePath,
            )
            kotlinOptions.freeCompilerArgs += listOf(
                "-P",
                "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
                    project.layout.buildDirectory.dir("compose_metrics").get().asFile.absolutePath,
            )
        }
        // https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.9
        kotlinOptions.freeCompilerArgs += listOf(
            "-P",
            "plugin:androidx.compose.compiler.plugins.kotlin:nonSkippingGroupOptimization=true",
        )
    }
 }
@@ -2,6 +2,7 @@
 -keep,allowoptimization class eu.kanade.**
 -keep,allowoptimization class tachiyomi.**
 -keep,allowoptimization class mihon.**
 # Keep common dependencies used in extensions
 -keep,allowoptimization class androidx.preference.** { public protected *; }
@@ -46,6 +47,10 @@
 -dontnote rx.internal.util.PlatformDependent
 ##---------------End: proguard configuration for RxJava 1.x  ----------
 ##---------------Begin: proguard configuration for okhttp  ----------
 -keepclasseswithmembers class okhttp3.MultipartBody$Builder { *; }
 ##---------------End: proguard configuration for okhttp  ----------
 ##---------------Begin: proguard configuration for kotlinx.serialization  ----------
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.** # core serialization annotations
@@ -122,9 +127,6 @@
 # XmlUtil
 -keep public enum nl.adaptivity.xmlutil.EventType { *; }
 # Apache Commons Compress
 -keep class * extends org.apache.commons.compress.archivers.zip.ZipExtraField { <init>(); }
 # Firebase
 -keep class com.google.firebase.installations.** { *; }
 -keep interface com.google.firebase.installations.** { *; }
@@ -0,0 +1,11 @@
 package mihon.core.firebase
 import android.content.Context
 object FirebaseConfig {
    fun init(context: Context) = Unit
    fun setAnalyticsEnabled(enabled: Boolean) = Unit
    fun setCrashlyticsEnabled(enabled: Boolean) = Unit
 }
@@ -34,11 +34,23 @@
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-    <!-- Remove permission from Firebase dependency -->
+    <!-- Remove unnecessary permissions from Firebase dependency -->
    <uses-permission
        android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"
        tools:node="remove" />
    <uses-permission
        android:name="com.google.android.gms.permission.AD_ID"
        tools:node="remove" />
    <uses-permission
        android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION"
        tools:node="remove" />
    <uses-permission
        android:name="android.permission.ACCESS_ADSERVICES_AD_ID"
        tools:node="remove" />
    <application
        android:name=".App"
        android:allowBackup="false"
@@ -256,6 +268,14 @@
            android:name="android.webkit.WebView.MetricsOptOut"
            android:value="true" />
        <!-- Disable for manual opt-in -->
        <meta-data
            android:name="firebase_analytics_collection_enabled"
            android:value="false" />
        <meta-data
            android:name="firebase_crashlytics_collection_enabled"
            android:value="false" />
        <!-- Disable advertising ID collection for Firebase -->
        <meta-data
            android:name="google_analytics_adid_collection_enabled"
@@ -395,4 +415,7 @@
        </activity>
    </application>
    <uses-sdk tools:overrideLibrary="rikka.shizuku.api"
        tools:ignore="ManifestOrder" />
 </manifest>
@@ -5,7 +5,7 @@ import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 fun <T : R, R : Any> List<T>.insertSeparators(
-    generator: (T?, T?) -> R?,
+    generator: (before: T?, after: T?) -> R?,
 ): List<R> {
    if (isEmpty()) return emptyList()
    val newList = mutableListOf<R>()
@@ -19,6 +19,24 @@ fun <T : R, R : Any> List<T>.insertSeparators(
    return newList
 }
 /**
 * Similar to [eu.kanade.core.util.insertSeparators] but iterates from last to first element
 */
 fun <T : R, R : Any> List<T>.insertSeparatorsReversed(
    generator: (before: T?, after: T?) -> R?,
 ): List<R> {
    if (isEmpty()) return emptyList()
    val newList = mutableListOf<R>()
    for (i in size downTo 0) {
        val after = getOrNull(i)
        after?.let(newList::add)
        val before = getOrNull(i - 1)
        val separator = generator.invoke(before, after)
        separator?.let(newList::add)
    }
    return newList.asReversed()
 }
 fun <E> HashSet<E>.addOrRemove(value: E, shouldAdd: Boolean) {
    if (shouldAdd) {
        add(value)
@@ -4,10 +4,7 @@ import eu.kanade.domain.chapter.interactor.GetAvailableScanlators
 import eu.kanade.domain.chapter.interactor.SetReadStatus
 import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource
 import eu.kanade.domain.download.interactor.DeleteDownload
 import eu.kanade.domain.extension.interactor.CreateExtensionRepo
 import eu.kanade.domain.extension.interactor.DeleteExtensionRepo
 import eu.kanade.domain.extension.interactor.GetExtensionLanguages
 import eu.kanade.domain.extension.interactor.GetExtensionRepos
 import eu.kanade.domain.extension.interactor.GetExtensionSources
 import eu.kanade.domain.extension.interactor.GetExtensionsByType
 import eu.kanade.domain.extension.interactor.TrustExtension
@@ -26,6 +23,20 @@ import eu.kanade.domain.track.interactor.AddTracks
 import eu.kanade.domain.track.interactor.RefreshTracks
 import eu.kanade.domain.track.interactor.SyncChapterProgressWithTrack
 import eu.kanade.domain.track.interactor.TrackChapter
 import eu.kanade.tachiyomi.di.InjektModule
 import eu.kanade.tachiyomi.di.addFactory
 import eu.kanade.tachiyomi.di.addSingletonFactory
 import mihon.data.repository.ExtensionRepoRepositoryImpl
 import mihon.domain.chapter.interactor.FilterChaptersForDownload
 import mihon.domain.extensionrepo.interactor.CreateExtensionRepo
 import mihon.domain.extensionrepo.interactor.DeleteExtensionRepo
 import mihon.domain.extensionrepo.interactor.GetExtensionRepo
 import mihon.domain.extensionrepo.interactor.GetExtensionRepoCount
 import mihon.domain.extensionrepo.interactor.ReplaceExtensionRepo
 import mihon.domain.extensionrepo.interactor.UpdateExtensionRepo
 import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
 import mihon.domain.extensionrepo.service.ExtensionRepoService
 import mihon.domain.upcoming.interactor.GetUpcomingManga
 import tachiyomi.data.category.CategoryRepositoryImpl
 import tachiyomi.data.chapter.ChapterRepositoryImpl
 import tachiyomi.data.history.HistoryRepositoryImpl
@@ -83,11 +94,7 @@ import tachiyomi.domain.track.interactor.InsertTrack
 import tachiyomi.domain.track.repository.TrackRepository
 import tachiyomi.domain.updates.interactor.GetUpdates
 import tachiyomi.domain.updates.repository.UpdatesRepository
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
 import uy.kohesive.injekt.api.addFactory
 import uy.kohesive.injekt.api.addSingletonFactory
 import uy.kohesive.injekt.api.get
 class DomainModule : InjektModule {
@@ -111,6 +118,7 @@ class DomainModule : InjektModule {
        addFactory { GetMangaByUrlAndSourceId(get()) }
        addFactory { GetManga(get()) }
        addFactory { GetNextChapters(get(), get(), get(), get()) }
        addFactory { GetUpcomingManga(get()) }
        addFactory { ResetViewerFlags(get()) }
        addFactory { SetMangaChapterFlags(get()) }
        addFactory { FetchInterval(get()) }
@@ -144,6 +152,7 @@ class DomainModule : InjektModule {
        addFactory { ShouldUpdateDbChapter() }
        addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get(), get()) }
        addFactory { GetAvailableScanlators(get()) }
        addFactory { FilterChaptersForDownload(get(), get(), get(), get()) }
        addSingletonFactory<HistoryRepository> { HistoryRepositoryImpl(get()) }
        addFactory { GetHistory(get()) }
@@ -171,10 +180,15 @@ class DomainModule : InjektModule {
        addFactory { ToggleLanguage(get()) }
        addFactory { ToggleSource(get()) }
        addFactory { ToggleSourcePin(get()) }
-        addFactory { TrustExtension(get()) }
+        addFactory { TrustExtension(get(), get()) }
-        addFactory { CreateExtensionRepo(get()) }
+        addSingletonFactory<ExtensionRepoRepository> { ExtensionRepoRepositoryImpl(get()) }
        addFactory { ExtensionRepoService(get(), get()) }
        addFactory { GetExtensionRepo(get()) }
        addFactory { GetExtensionRepoCount(get()) }
        addFactory { CreateExtensionRepo(get(), get()) }
        addFactory { DeleteExtensionRepo(get()) }
-        addFactory { GetExtensionRepos(get()) }
+        addFactory { ReplaceExtensionRepo(get()) }
        addFactory { UpdateExtensionRepo(get(), get()) }
    }
 }
@@ -14,6 +14,9 @@ import eu.kanade.domain.source.interactor.GetSourceCategories
 import eu.kanade.domain.source.interactor.RenameSourceCategory
 import eu.kanade.domain.source.interactor.SetSourceCategories
 import eu.kanade.domain.source.interactor.ToggleExcludeFromDataSaver
 import eu.kanade.tachiyomi.di.InjektModule
 import eu.kanade.tachiyomi.di.addFactory
 import eu.kanade.tachiyomi.di.addSingletonFactory
 import eu.kanade.tachiyomi.source.online.MetadataSource
 import exh.search.SearchEngine
 import tachiyomi.data.manga.CustomMangaRepositoryImpl
@@ -42,7 +45,7 @@ import tachiyomi.domain.manga.interactor.GetMergedManga
 import tachiyomi.domain.manga.interactor.GetMergedMangaById
 import tachiyomi.domain.manga.interactor.GetMergedMangaForDownloading
 import tachiyomi.domain.manga.interactor.GetMergedReferencesById
-import tachiyomi.domain.manga.interactor.GetReadMangaNotInLibrary
+import tachiyomi.domain.manga.interactor.GetReadMangaNotInLibraryView
 import tachiyomi.domain.manga.interactor.GetSearchMetadata
 import tachiyomi.domain.manga.interactor.GetSearchTags
 import tachiyomi.domain.manga.interactor.GetSearchTitles
@@ -71,11 +74,7 @@ import tachiyomi.domain.source.interactor.InsertSavedSearch
 import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 import tachiyomi.domain.source.repository.SavedSearchRepository
 import tachiyomi.domain.track.interactor.IsTrackUnfollowed
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
 import uy.kohesive.injekt.api.addFactory
 import uy.kohesive.injekt.api.addSingletonFactory
 import uy.kohesive.injekt.api.get
 import xyz.nulldev.ts.api.http.serializer.FilterSerializer
 class SYDomainModule : InjektModule {
@@ -102,7 +101,7 @@ class SYDomainModule : InjektModule {
        addFactory { GetPagePreviews(get(), get()) }
        addFactory { SearchEngine() }
        addFactory { IsTrackUnfollowed() }
-        addFactory { GetReadMangaNotInLibrary(get()) }
+        addFactory { GetReadMangaNotInLibraryView(get()) }
        // Required for [MetadataSource]
        addFactory<MetadataSource.GetMangaId> { GetManga(get()) }
@@ -2,8 +2,6 @@ package eu.kanade.domain.base
 import android.content.Context
 import dev.icerock.moko.resources.StringResource
 import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import eu.kanade.tachiyomi.util.system.isReleaseBuildType
 import tachiyomi.core.common.preference.Preference
 import tachiyomi.core.common.preference.PreferenceStore
 import tachiyomi.i18n.MR
@@ -22,8 +20,6 @@ class BasePreferences(
    fun extensionInstaller() = ExtensionInstallerPreference(context, preferenceStore)
    fun acraEnabled() = preferenceStore.getBoolean("acra.enable", isPreviewBuildType || isReleaseBuildType)
    fun shownOnboardingFlow() = preferenceStore.getBoolean(Preference.appStateKey("onboarding_complete"), false)
    enum class ExtensionInstaller(val titleRes: StringResource, val requiresSystemPermission: Boolean) {
@@ -32,4 +28,6 @@ class BasePreferences(
        SHIZUKU(MR.strings.ext_installer_shizuku, false),
        PRIVATE(MR.strings.ext_installer_private, false),
    }
    fun displayProfile() = preferenceStore.getString("pref_display_profile_key", "")
 }
@@ -1,25 +0,0 @@
 package eu.kanade.domain.extension.interactor
 import eu.kanade.domain.source.service.SourcePreferences
 import tachiyomi.core.common.preference.plusAssign
 class CreateExtensionRepo(private val preferences: SourcePreferences) {
    fun await(name: String): Result {
        // Do not allow invalid formats
        if (!name.matches(repoRegex)) {
            return Result.InvalidUrl
        }
        preferences.extensionRepos() += name.removeSuffix("/index.min.json")
        return Result.Success
    }
    sealed interface Result {
        data object InvalidUrl : Result
        data object Success : Result
    }
 }
 private val repoRegex = """^https://.*/index\.min\.json$""".toRegex()
@@ -1,11 +0,0 @@
 package eu.kanade.domain.extension.interactor
 import eu.kanade.domain.source.service.SourcePreferences
 import tachiyomi.core.common.preference.minusAssign
 class DeleteExtensionRepo(private val preferences: SourcePreferences) {
    fun await(repo: String) {
        preferences.extensionRepos() -= repo
    }
 }
@@ -1,11 +0,0 @@
 package eu.kanade.domain.extension.interactor
 import eu.kanade.domain.source.service.SourcePreferences
 import kotlinx.coroutines.flow.Flow
 class GetExtensionRepos(private val preferences: SourcePreferences) {
    fun subscribe(): Flow<Set<String>> {
        return preferences.extensionRepos().changes()
    }
 }
@@ -20,7 +20,7 @@ class GetExtensionsByType(
            extensionManager.installedExtensionsFlow,
            extensionManager.untrustedExtensionsFlow,
            extensionManager.availableExtensionsFlow,
-        ) { _activeLanguages, _installed, _untrusted, _available ->
+        ) { enabledLanguages, _installed, _untrusted, _available ->
            val (updates, installed) = _installed
                .filter { (showNsfwSources || !it.isNsfw) }
                .sortedWith(
@@ -41,9 +41,9 @@ class GetExtensionsByType(
                }
                .flatMap { ext ->
                    if (ext.sources.isEmpty()) {
-                        return@flatMap if (ext.lang in _activeLanguages) listOf(ext) else emptyList()
+                        return@flatMap if (ext.lang in enabledLanguages) listOf(ext) else emptyList()
                    }
-                    ext.sources.filter { it.lang in _activeLanguages }
+                    ext.sources.filter { it.lang in enabledLanguages }
                        .map {
                            ext.copy(
                                name = it.name,
@@ -3,15 +3,18 @@ package eu.kanade.domain.extension.interactor
 import android.content.pm.PackageInfo
 import androidx.core.content.pm.PackageInfoCompat
 import eu.kanade.domain.source.service.SourcePreferences
 import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
 import tachiyomi.core.common.preference.getAndSet
 class TrustExtension(
    private val extensionRepoRepository: ExtensionRepoRepository,
    private val preferences: SourcePreferences,
 ) {
-    fun isTrusted(pkgInfo: PackageInfo, signatureHash: String): Boolean {
+    suspend fun isTrusted(pkgInfo: PackageInfo, fingerprints: List<String>): Boolean {
-        val key = "${pkgInfo.packageName}:${PackageInfoCompat.getLongVersionCode(pkgInfo)}:$signatureHash"
+        val trustedFingerprints = extensionRepoRepository.getAll().map { it.signingKeyFingerprint }.toHashSet()
-        return key in preferences.trustedExtensions().get()
+        val key = "${pkgInfo.packageName}:${PackageInfoCompat.getLongVersionCode(pkgInfo)}:${fingerprints.last()}"
        return trustedFingerprints.any { fingerprints.contains(it) } || key in preferences.trustedExtensions().get()
    }
    fun trust(pkgName: String, versionCode: Long, signatureHash: String) {
@@ -19,9 +22,7 @@ class TrustExtension(
            // Remove previously trusted versions
            val removed = exts.filterNot { it.startsWith("$pkgName:") }.toMutableSet()
-            removed.also {
+            removed.also { it += "$pkgName:$versionCode:$signatureHash" }
                it += "$pkgName:$versionCode:$signatureHash"
            }
        }
    }
@@ -32,10 +32,11 @@ class GetEnabledSources(
            ) { a, b, c -> Triple(a, b, c) },
            // SY <--
            repository.getSources(),
-        ) { pinnedSourceIds,
+        ) {
-            (enabledLanguages, disabledSources, lastUsedSource),
+                pinnedSourceIds,
-            (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter),
+                (enabledLanguages, disabledSources, lastUsedSource),
-            sources,
+                (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter),
                sources,
            ->
            val sourcesAndCategories = sourcesInCategories.map {
@@ -49,6 +49,11 @@ class SourcePreferences(
        emptySet(),
    )
    fun globalSearchFilterState() = preferenceStore.getBoolean(
        Preference.appStateKey("has_filters_toggle_state"),
        false,
    )
    // SY -->
    fun enableSourceBlacklist() = preferenceStore.getBoolean("eh_enable_source_blacklist", true)
@@ -13,6 +13,8 @@ class SyncPreferences(
    fun clientAPIKey() = preferenceStore.getString("sync_client_api_key", "")
    fun lastSyncTimestamp() = preferenceStore.getLong(Preference.appStateKey("last_sync_timestamp"), 0L)
    fun lastSyncEtag() = preferenceStore.getString("sync_etag", "")
    fun syncInterval() = preferenceStore.getInt("sync_interval", 0)
    fun syncService() = preferenceStore.getInt("sync_service", 0)
@@ -27,7 +29,7 @@ class SyncPreferences(
    )
    fun uniqueDeviceID(): String {
-        val uniqueIDPreference = preferenceStore.getString("unique_device_id", "")
+        val uniqueIDPreference = preferenceStore.getString(Preference.appStateKey("unique_device_id"), "")
        // Retrieve the current value of the preference
        var uniqueID = uniqueIDPreference.get()
@@ -51,8 +53,15 @@ class SyncPreferences(
            tracking = preferenceStore.getBoolean("tracking", true).get(),
            history = preferenceStore.getBoolean("history", true).get(),
            appSettings = preferenceStore.getBoolean("appSettings", true).get(),
            extensionRepoSettings = preferenceStore.getBoolean("extensionRepoSettings", true).get(),
            sourceSettings = preferenceStore.getBoolean("sourceSettings", true).get(),
            privateSettings = preferenceStore.getBoolean("privateSettings", true).get(),
            // SY -->
            customInfo = preferenceStore.getBoolean("customInfo", true).get(),
            readEntries = preferenceStore.getBoolean("readEntries", true).get(),
            savedSearches = preferenceStore.getBoolean("savedSearches", true).get(),
            // SY <--
        )
    }
@@ -63,8 +72,15 @@ class SyncPreferences(
        preferenceStore.getBoolean("tracking", true).set(syncSettings.tracking)
        preferenceStore.getBoolean("history", true).set(syncSettings.history)
        preferenceStore.getBoolean("appSettings", true).set(syncSettings.appSettings)
        preferenceStore.getBoolean("extensionRepoSettings", true).set(syncSettings.extensionRepoSettings)
        preferenceStore.getBoolean("sourceSettings", true).set(syncSettings.sourceSettings)
        preferenceStore.getBoolean("privateSettings", true).set(syncSettings.privateSettings)
        // SY -->
        preferenceStore.getBoolean("customInfo", true).set(syncSettings.customInfo)
        preferenceStore.getBoolean("readEntries", true).set(syncSettings.readEntries)
        preferenceStore.getBoolean("savedSearches", true).set(syncSettings.savedSearches)
        // SY <--
    }
    fun getSyncTriggerOptions(): SyncTriggerOptions {
@@ -7,6 +7,13 @@ data class SyncSettings(
    val tracking: Boolean = true,
    val history: Boolean = true,
    val appSettings: Boolean = true,
    val extensionRepoSettings: Boolean = true,
    val sourceSettings: Boolean = true,
    val privateSettings: Boolean = false,
    // SY -->
    val customInfo: Boolean = true,
    val readEntries: Boolean = true,
    val savedSearches: Boolean = true,
    // SY <--
 )
@@ -5,6 +5,7 @@ import eu.kanade.domain.track.model.toDomainTrack
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.EnhancedTracker
 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 logcat.LogPriority
@@ -14,17 +15,16 @@ import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId
 import tachiyomi.domain.history.interactor.GetHistory
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.track.interactor.GetTracks
 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 getTracks: GetTracks,
    private val insertTrack: InsertTrack,
    private val syncChapterProgressWithTrack: SyncChapterProgressWithTrack,
    private val getChaptersByMangaId: GetChaptersByMangaId,
    private val trackerManager: TrackerManager,
 ) {
    // TODO: update all trackers based on common data
@@ -79,7 +79,7 @@ class AddTracks(
    suspend fun bindEnhancedTrackers(manga: Manga, source: Source) = withNonCancellableContext {
        withIOContext {
-            getTracks.await(manga.id)
+            trackerManager.loggedInTrackers()
                .filterIsInstance<EnhancedTracker>()
                .filter { it.accept(source) }
                .forEach { service ->
@@ -87,11 +87,11 @@ class AddTracks(
                        service.match(manga)?.let { track ->
                            track.manga_id = manga.id
                            (service as Tracker).bind(track)
-                            insertTrack.await(track.toDomainTrack()!!)
+                            insertTrack.await(track.toDomainTrack(idRequired = false)!!)
                            syncChapterProgressWithTrack.await(
                                manga.id,
-                                track.toDomainTrack()!!,
+                                track.toDomainTrack(idRequired = false)!!,
                                service,
                            )
                        }
@@ -10,6 +10,7 @@ import tachiyomi.domain.chapter.interactor.UpdateChapter
 import tachiyomi.domain.chapter.model.toChapterUpdate
 import tachiyomi.domain.track.interactor.InsertTrack
 import tachiyomi.domain.track.model.Track
 import kotlin.math.max
 class SyncChapterProgressWithTrack(
    private val updateChapter: UpdateChapter,
@@ -36,7 +37,8 @@ class SyncChapterProgressWithTrack(
        // only take into account continuous reading
        val localLastRead = sortedChapters.takeWhile { it.read }.lastOrNull()?.chapterNumber ?: 0F
-        val updatedTrack = remoteTrack.copy(lastChapterRead = localLastRead.toDouble())
+        val lastRead = max(remoteTrack.lastChapterRead, localLastRead.toDouble())
        val updatedTrack = remoteTrack.copy(lastChapterRead = lastRead)
        try {
            tracker.update(updatedTrack.toDbTrack())
@@ -0,0 +1,10 @@
 package eu.kanade.domain.track.model
 import dev.icerock.moko.resources.StringResource
 import tachiyomi.i18n.MR
 enum class AutoTrackState(val titleRes: StringResource) {
    ALWAYS(MR.strings.lock_always),
    ASK(MR.strings.default_category_summary),
    NEVER(MR.strings.lock_never),
 }
@@ -1,9 +1,11 @@
 package eu.kanade.domain.track.service
 import eu.kanade.domain.track.model.AutoTrackState
 import eu.kanade.tachiyomi.data.track.Tracker
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
 import tachiyomi.core.common.preference.Preference
 import tachiyomi.core.common.preference.PreferenceStore
 import tachiyomi.core.common.preference.getEnum
 class TrackPreferences(
    private val preferenceStore: PreferenceStore,
@@ -35,4 +37,9 @@ class TrackPreferences(
    fun anilistScoreType() = preferenceStore.getString("anilist_score_type", Anilist.POINT_10)
    fun autoUpdateTrack() = preferenceStore.getBoolean("pref_auto_update_manga_sync_key", true)
    fun autoUpdateTrackOnMarkRead() = preferenceStore.getEnum(
        "pref_auto_update_manga_on_mark_read",
        AutoTrackState.ALWAYS,
    )
 }
@@ -18,12 +18,20 @@ class UiPreferences(
    fun themeMode() = preferenceStore.getEnum(
        "pref_theme_mode_key",
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { ThemeMode.SYSTEM } else { ThemeMode.LIGHT },
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            ThemeMode.SYSTEM
        } else {
            ThemeMode.LIGHT
        },
    )
    fun appTheme() = preferenceStore.getEnum(
        "pref_app_theme",
-        if (DeviceUtil.isDynamicColorAvailable) { AppTheme.MONET } else { AppTheme.DEFAULT },
+        if (DeviceUtil.isDynamicColorAvailable) {
            AppTheme.MONET
        } else {
            AppTheme.DEFAULT
        },
    )
    fun themeDarkAmoled() = preferenceStore.getBoolean("pref_theme_dark_amoled_key", false)
@@ -5,7 +5,6 @@ import android.net.Uri
 import android.provider.Settings
 import android.util.DisplayMetrics
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -199,7 +198,7 @@ private fun ExtensionDetails(
            key = { it.source.id },
        ) { source ->
            SourceSwitchPreference(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItem(),
                source = source,
                onClickSourcePreferences = onClickSourcePreferences,
                onClickSource = onClickSource,
@@ -241,7 +240,7 @@ private fun DetailsHeader(
                            Extension name: ${extension.name} (lang: ${extension.lang}; package: ${extension.pkgName})
                            Extension version: ${extension.versionName} (lib: ${extension.libVersion}; version code: ${extension.versionCode})
                            NSFW: ${extension.isNsfw}
-                            """.trimIndent()
+                            """.trimIndent(),
                        )
                        if (extension is Extension.Installed) {
@@ -252,7 +251,7 @@ private fun DetailsHeader(
                                Obsolete: ${extension.isObsolete}
                                Shared: ${extension.isShared}
                                Repository: ${extension.repoUrl}
-                                """.trimIndent()
+                                """.trimIndent(),
                            )
                        }
                    }
@@ -362,10 +361,8 @@ private fun InfoText(
    primaryTextStyle: TextStyle = MaterialTheme.typography.bodyLarge,
    onClick: (() -> Unit)? = null,
 ) {
    val interactionSource = remember { MutableInteractionSource() }
    val clickableModifier = if (onClick != null) {
-        Modifier.clickable(interactionSource, indication = null) { onClick() }
+        Modifier.clickable(interactionSource = null, indication = null, onClick = onClick)
    } else {
        Modifier
    }
@@ -58,7 +58,7 @@ private fun ExtensionFilterContent(
    ) {
        items(state.languages) { language ->
            SwitchPreferenceWidget(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItem(),
                title = LocaleHelper.getSourceDisplayName(language, context),
                checked = language in state.enabledLanguages,
                onCheckedChanged = { onClickLang(language) },
@@ -48,6 +48,7 @@ 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.ExtensionReposScreen
 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
@@ -91,7 +92,7 @@ fun ExtensionScreen(
    PullRefresh(
        refreshing = state.isRefreshing,
        onRefresh = onRefresh,
-        enabled = { !state.isLoading },
+        enabled = !state.isLoading,
    ) {
        when {
            state.isLoading -> LoadingScreen(Modifier.padding(contentPadding))
@@ -188,14 +189,14 @@ private fun ExtensionContent(
                            }
                        ExtensionHeader(
                            textRes = header.textRes,
-                            modifier = Modifier.animateItemPlacement(),
+                            modifier = Modifier.animateItemFastScroll(),
                            action = action,
                        )
                    }
                    is ExtensionUiModel.Header.Text -> {
                        ExtensionHeader(
                            text = header.text,
-                            modifier = Modifier.animateItemPlacement(),
+                            modifier = Modifier.animateItemFastScroll(),
                        )
                    }
                }
@@ -213,13 +214,15 @@ private fun ExtensionContent(
                },
            ) { item ->
                ExtensionItem(
-                    modifier = Modifier.animateItemPlacement(),
+                    modifier = Modifier.animateItemFastScroll(),
                    item = item,
                    onClickItem = {
                        when (it) {
                            is Extension.Available -> onInstallExtension(it)
                            is Extension.Installed -> onOpenExtension(it)
-                            is Extension.Untrusted -> { trustState = it }
+                            is Extension.Untrusted -> {
                                trustState = it
                            }
                        }
                    },
                    onLongClickItem = onLongClickItem,
@@ -241,7 +244,9 @@ private fun ExtensionContent(
                                    onOpenExtension(it)
                                }
                            }
-                            is Extension.Untrusted -> { trustState = it }
+                            is Extension.Untrusted -> {
                                trustState = it
                            }
                        }
                    },
                )
@@ -70,7 +70,7 @@ fun FeedScreen(
    onClickDelete: (FeedSavedSearch) -> Unit,
    onClickManga: (Manga) -> Unit,
    onRefresh: () -> Unit,
-    getMangaState: @Composable (Manga, CatalogueSource?) -> State<Manga>,
+    getMangaState: @Composable (Manga) -> State<Manga>,
 ) {
    when {
        state.isLoading -> LoadingScreen()
@@ -92,7 +92,7 @@ fun FeedScreen(
                    refreshing = true
                    onRefresh()
                },
-                enabled = { !state.isLoadingItems },
+                enabled = !state.isLoadingItems,
            ) {
                ScrollbarLazyColumn(
                    contentPadding = contentPadding + topSmallPaddingValues,
@@ -103,7 +103,6 @@ fun FeedScreen(
                        key = { it.feed.id },
                    ) { item ->
                        GlobalSearchResultItem(
                            modifier = Modifier.animateItemPlacement(),
                            title = item.title,
                            subtitle = item.subtitle,
                            onLongClick = {
@@ -116,10 +115,11 @@ fun FeedScreen(
                                    onClickSource(item.source)
                                }
                            },
                            modifier = Modifier.animateItem(),
                        ) {
                            FeedItem(
                                item = item,
-                                getMangaState = { getMangaState(it, item.source) },
+                                getMangaState = { getMangaState(it) },
                                onClickManga = onClickManga,
                            )
                        }
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.ui.Modifier
 import eu.kanade.presentation.browse.components.GlobalSearchCardRow
 import eu.kanade.presentation.browse.components.GlobalSearchErrorResultItem
 import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem
@@ -80,6 +81,7 @@ internal fun GlobalSearchContent(
                    } ?: source.name,
                    subtitle = LocaleHelper.getLocalizedDisplayName(source.lang),
                    onClick = { onClickSource(source) },
                    modifier = Modifier.animateItem(),
                ) {
                    when (result) {
                        SearchItemResult.Loading -> {
@@ -144,7 +144,7 @@ private fun MigrateSourceList(
            key = { (source, _) -> "migrate-${source.id}" },
        ) { (source, count) ->
            MigrateSourceItem(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItem(),
                source = source,
                count = count,
                onClickItem = { onClickItem(source) },
@@ -28,6 +28,7 @@ import eu.kanade.presentation.browse.components.MigrationItem
 import eu.kanade.presentation.browse.components.MigrationItemResult
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.util.animateItemFastScroll
 import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -95,7 +96,7 @@ fun MigrationListScreen(
                Row(
                    Modifier
                        .fillMaxWidth()
-                        .animateItemPlacement()
+                        .animateItemFastScroll()
                        .padding(horizontal = 16.dp)
                        .height(IntrinsicSize.Min),
                    horizontalArrangement = Arrangement.SpaceBetween,
@@ -15,6 +15,7 @@ import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem
 import eu.kanade.presentation.browse.components.GlobalSearchResultItem
 import eu.kanade.presentation.components.AppBarTitle
 import eu.kanade.presentation.components.SearchToolbar
 import eu.kanade.presentation.util.animateItemFastScroll
 import kotlinx.collections.immutable.ImmutableList
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.source.model.FeedSavedSearch
@@ -153,7 +154,7 @@ fun SourceFeedList(
            key = { it.id },
        ) { item ->
            GlobalSearchResultItem(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItemFastScroll(),
                title = item.title,
                subtitle = null,
                onLongClick = if (item is SourceFeedUI.SourceSavedSearch) {
@@ -11,6 +11,7 @@ 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.presentation.util.animateItemFastScroll
 import eu.kanade.tachiyomi.ui.browse.source.SourcesFilterScreenModel
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import tachiyomi.domain.source.model.Source
@@ -79,7 +80,7 @@ private fun SourcesFilterContent(
                contentType = "source-filter-header",
            ) {
                SourcesFilterHeader(
-                    modifier = Modifier.animateItemPlacement(),
+                    modifier = Modifier.animateItemFastScroll(),
                    language = language,
                    enabled = enabled,
                    onClickItem = onClickLanguage,
@@ -95,7 +96,7 @@ private fun SourcesFilterContent(
                        sources.none { it.id.toString() in state.disabledSources }
                    }
                    SourcesFilterToggle(
-                        modifier = Modifier.animateItemPlacement(),
+                        modifier = Modifier.animateItem(),
                        isEnabled = toggleEnabled,
                        onClickItem = {
                            onClickSources(!toggleEnabled, sources)
@@ -109,7 +110,7 @@ private fun SourcesFilterContent(
                    contentType = { "source-filter-item" },
                ) { source ->
                    SourcesFilterItem(
-                        modifier = Modifier.animateItemPlacement(),
+                        modifier = Modifier.animateItemFastScroll(),
                        source = source,
                        enabled = "${source.id}" !in state.disabledSources,
                        onClickItem = onClickSource,
@@ -35,7 +35,7 @@ import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.ScrollbarLazyColumn
-import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
+import tachiyomi.presentation.core.components.material.SECONDARY_ALPHA
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.components.material.topSmallPaddingValues
 import tachiyomi.presentation.core.i18n.stringResource
@@ -81,7 +81,7 @@ fun SourcesScreen(
                    when (model) {
                        is SourceUiModel.Header -> {
                            SourceHeader(
-                                modifier = Modifier.animateItemPlacement(),
+                                modifier = Modifier.animateItem(),
                                language = model.language,
                                // SY -->
                                isCategory = model.isCategory,
@@ -89,7 +89,7 @@ fun SourcesScreen(
                            )
                        }
                        is SourceUiModel.Item -> SourceItem(
-                            modifier = Modifier.animateItemPlacement(),
+                            modifier = Modifier.animateItem(),
                            source = model.source,
                            // SY -->
                            showLatest = state.showLatest,
@@ -179,7 +179,7 @@ private fun SourcePinButton(
        MaterialTheme.colorScheme.primary
    } else {
        MaterialTheme.colorScheme.onBackground.copy(
-            alpha = SecondaryItemAlpha,
+            alpha = SECONDARY_ALPHA,
        )
    }
    val description = if (isPinned) MR.strings.action_unpin else MR.strings.action_pin
@@ -127,7 +127,7 @@ private fun Extension.getIcon(density: Int = DisplayMetrics.DENSITY_DEFAULT): St
    return produceState<Result<ImageBitmap>>(initialValue = Result.Loading, this) {
        withIOContext {
            value = try {
-                val appInfo = ExtensionLoader.getExtensionPackageInfoFromPkgName(context, pkgName)!!.applicationInfo
+                val appInfo = ExtensionLoader.getExtensionPackageInfoFromPkgName(context, pkgName)!!.applicationInfo!!
                val appResources = context.packageManager.getResourcesForApplication(appInfo)
                Result.Success(
                    appResources.getDrawableForDensity(appInfo.icon, density, null)!!
@@ -30,9 +30,6 @@ import tachiyomi.presentation.core.i18n.stringResource
@Composable
 fun GlobalSearchResultItem(
    // SY -->
    modifier: Modifier = Modifier,
    // SY <--
    title: String,
    // SY -->
    subtitle: String?,
@@ -41,9 +38,10 @@ fun GlobalSearchResultItem(
    // SY -->
    onLongClick: (() -> Unit)? = null,
    // SY <--
    modifier: Modifier = Modifier,
    content: @Composable () -> Unit,
 ) {
-    Column(modifier) {
+    Column(modifier = modifier) {
        Row(
            modifier = Modifier
                .padding(
@@ -107,7 +107,7 @@ private fun CategoryContent(
            key = { _, category -> "category-${category.id}" },
        ) { index, category ->
            CategoryListItem(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItem(),
                category = category,
                canMoveUp = index != 0,
                canMoveDown = index != categories.lastIndex,
@@ -10,8 +10,7 @@ import androidx.compose.ui.Modifier
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.isScrolledToEnd
+import tachiyomi.presentation.core.util.shouldExpandFAB
 import tachiyomi.presentation.core.util.isScrollingUp
@Composable
 fun CategoryFloatingActionButton(
@@ -23,7 +22,7 @@ fun CategoryFloatingActionButton(
        text = { Text(text = stringResource(MR.strings.action_add)) },
        icon = { Icon(imageVector = Icons.Outlined.Add, contentDescription = null) },
        onClick = onCreate,
-        expanded = lazyListState.isScrollingUp() || lazyListState.isScrolledToEnd(),
+        expanded = lazyListState.shouldExpandFAB(),
        modifier = modifier,
    )
 }
@@ -26,7 +26,7 @@ fun BiometricTimesContent(
    ) {
        items(timeRanges, key = { it.formattedString }) { timeRange ->
            BiometricTimesListItem(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItem(),
                timeRange = timeRange,
                onDelete = { onClickDelete(timeRange) },
            )
@@ -27,7 +27,7 @@ fun SortTagContent(
    ) {
        itemsIndexed(tags, key = { _, tag -> tag }) { index, tag ->
            SortTagListItem(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItem(),
                tag = tag,
                canMoveUp = index != 0,
                canMoveDown = index != tags.lastIndex,
@@ -26,7 +26,7 @@ fun SourceCategoryContent(
    ) {
        items(categories, key = { it }) { category ->
            SourceCategoryListItem(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItem(),
                category = category,
                onRename = { onClickRename(category) },
                onDelete = { onClickDelete(category) },
@@ -7,8 +7,6 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import cafe.adriel.voyager.core.annotation.InternalVoyagerApi
@@ -23,7 +21,6 @@ import tachiyomi.presentation.core.components.AdaptiveSheet as AdaptiveSheetImpl
@Composable
 fun NavigatorAdaptiveSheet(
    screen: Screen,
    tonalElevation: Dp = 1.dp,
    enableSwipeDismiss: (Navigator) -> Boolean = { true },
    onDismissRequest: () -> Unit,
 ) {
@@ -31,7 +28,6 @@ fun NavigatorAdaptiveSheet(
        screen = screen,
        content = { sheetNavigator ->
            AdaptiveSheet(
                tonalElevation = tonalElevation,
                enableSwipeDismiss = enableSwipeDismiss(sheetNavigator),
                onDismissRequest = onDismissRequest,
            ) {
@@ -73,7 +69,6 @@ fun NavigatorAdaptiveSheet(
 fun AdaptiveSheet(
    onDismissRequest: () -> Unit,
    modifier: Modifier = Modifier,
    tonalElevation: Dp = 1.dp,
    enableSwipeDismiss: Boolean = true,
    content: @Composable () -> Unit,
 ) {
@@ -86,7 +81,6 @@ fun AdaptiveSheet(
        AdaptiveSheetImpl(
            modifier = modifier,
            isTabletUi = isTabletUi,
            tonalElevation = tonalElevation,
            enableSwipeDismiss = enableSwipeDismiss,
            onDismissRequest = onDismissRequest,
        ) {
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.Close
@@ -21,6 +20,7 @@ import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PlainTooltip
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.material3.TooltipBox
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.material3.TopAppBar
@@ -179,7 +179,7 @@ fun AppBarTitle(
                maxLines = 1,
                overflow = TextOverflow.Ellipsis,
                modifier = Modifier.basicMarquee(
-                    delayMillis = 2_000,
+                    repeatDelayMillis = 2_000,
                ),
            )
        }
@@ -312,7 +312,7 @@ fun SearchToolbar(
                visualTransformation = visualTransformation,
                interactionSource = interactionSource,
                decorationBox = { innerTextField ->
-                    TextFieldDefaults.TextFieldDecorationBox(
+                    TextFieldDefaults.DecorationBox(
                        value = searchQuery,
                        innerTextField = innerTextField,
                        enabled = true,
@@ -331,6 +331,7 @@ fun SearchToolbar(
                                ),
                            )
                        },
                        container = {},
                    )
                },
            )
@@ -58,6 +58,7 @@ fun TabbedDialog(
                PrimaryTabRow(
                    modifier = Modifier.weight(1f),
                    selectedTabIndex = pagerState.currentPage,
                    containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
                    divider = {},
                ) {
                    tabTitles.fastForEachIndexed { index, tab ->
@@ -78,7 +79,7 @@ fun TabbedDialog(
                modifier = Modifier.animateContentSize(),
                state = pagerState,
                verticalAlignment = Alignment.Top,
-                pageContent = { page -> content(page) }
+                pageContent = { page -> content(page) },
            )
        }
    }
@@ -37,7 +37,7 @@ fun CrashScreen(
        acceptText = stringResource(MR.strings.pref_dump_crash_logs),
        onAcceptClick = {
            scope.launch {
-                CrashLogUtil(context).dumpLogs()
+                CrashLogUtil(context).dumpLogs(exception)
            }
        },
        rejectText = stringResource(MR.strings.crash_screen_restart_application),
@@ -18,6 +18,7 @@ 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.presentation.util.animateItemFastScroll
 import eu.kanade.tachiyomi.ui.history.HistoryScreenModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -114,14 +115,14 @@ private fun HistoryScreenContent(
            when (item) {
                is HistoryUiModel.Header -> {
                    ListGroupHeader(
-                        modifier = Modifier.animateItemPlacement(),
+                        modifier = Modifier.animateItemFastScroll(),
                        text = relativeDateText(item.date),
                    )
                }
                is HistoryUiModel.Item -> {
                    val value = item.item
                    HistoryItem(
-                        modifier = Modifier.animateItemPlacement(),
+                        modifier = Modifier.animateItemFastScroll(),
                        history = value,
                        onClickCover = { onClickCover(value) },
                        onClickResume = { onClickResume(value) },
@@ -6,6 +6,8 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -35,6 +37,7 @@ import tachiyomi.domain.library.model.sort
 import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.BaseSortItem
 import tachiyomi.presentation.core.components.CheckboxItem
 import tachiyomi.presentation.core.components.HeadingItem
 import tachiyomi.presentation.core.components.IconItem
@@ -155,7 +158,7 @@ private fun ColumnScope.FilterPage(
    )
    // SY <--
-    val trackers = remember { screenModel.trackers }
+    val trackers by screenModel.trackersFlow.collectAsState()
    when (trackers.size) {
        0 -> {
            // No trackers
@@ -188,6 +191,7 @@ private fun ColumnScope.SortPage(
    category: Category?,
    screenModel: LibrarySettingsScreenModel,
 ) {
    val trackers by screenModel.trackersFlow.collectAsState()
    // SY -->
    val globalSortMode by screenModel.libraryPreferences.sortingMode().collectAsState()
    val sortingMode = if (screenModel.grouping == LibraryGroup.BY_DEFAULT) {
@@ -196,40 +200,58 @@ private fun ColumnScope.SortPage(
        globalSortMode.type
    }
    val sortDescending = if (screenModel.grouping == LibraryGroup.BY_DEFAULT) {
-        category.sort.isAscending
+        !category.sort.isAscending
    } else {
-        globalSortMode.isAscending
+        !globalSortMode.isAscending
-    }.not()
+    }
    val hasSortTags by remember {
        screenModel.libraryPreferences.sortTagsForLibrary().changes()
            .map { it.isNotEmpty() }
    }.collectAsState(initial = screenModel.libraryPreferences.sortTagsForLibrary().get().isNotEmpty())
    // SY <--
-    val trackerSortOption =
+    val options = remember(trackers.isEmpty()/* SY --> */, hasSortTags/* SY <-- */) {
-        if (screenModel.trackers.isEmpty()) {
+        val trackerMeanPair = if (trackers.isNotEmpty()) {
-            emptyList()
+            MR.strings.action_sort_tracker_score to LibrarySort.Type.TrackerMean
        } else {
-            listOf(MR.strings.action_sort_tracker_score to LibrarySort.Type.TrackerMean)
+            null
        }
    listOfNotNull(
        MR.strings.action_sort_alpha to LibrarySort.Type.Alphabetical,
        MR.strings.action_sort_total to LibrarySort.Type.TotalChapters,
        MR.strings.action_sort_last_read to LibrarySort.Type.LastRead,
        MR.strings.action_sort_last_manga_update to LibrarySort.Type.LastUpdate,
        MR.strings.action_sort_unread_count to LibrarySort.Type.UnreadCount,
        MR.strings.action_sort_latest_chapter to LibrarySort.Type.LatestChapter,
        MR.strings.action_sort_chapter_fetch_date to LibrarySort.Type.ChapterFetchDate,
        MR.strings.action_sort_date_added to LibrarySort.Type.DateAdded,
        // SY -->
-        if (hasSortTags) {
+        val tagSortPair = if (hasSortTags) {
            SYMR.strings.tag_sorting to LibrarySort.Type.TagList
        } else {
            null
-        },
+        }
        // SY <--
-    ).plus(trackerSortOption).map { (titleRes, mode) ->
+        listOfNotNull(
            MR.strings.action_sort_alpha to LibrarySort.Type.Alphabetical,
            MR.strings.action_sort_total to LibrarySort.Type.TotalChapters,
            MR.strings.action_sort_last_read to LibrarySort.Type.LastRead,
            MR.strings.action_sort_last_manga_update to LibrarySort.Type.LastUpdate,
            MR.strings.action_sort_unread_count to LibrarySort.Type.UnreadCount,
            MR.strings.action_sort_latest_chapter to LibrarySort.Type.LatestChapter,
            MR.strings.action_sort_chapter_fetch_date to LibrarySort.Type.ChapterFetchDate,
            MR.strings.action_sort_date_added to LibrarySort.Type.DateAdded,
            trackerMeanPair,
            // SY -->
            tagSortPair,
            // SY <--
            MR.strings.action_sort_random to LibrarySort.Type.Random,
        )
    }
    options.map { (titleRes, mode) ->
        if (mode == LibrarySort.Type.Random) {
            BaseSortItem(
                label = stringResource(titleRes),
                icon = Icons.Default.Refresh
                    .takeIf { sortingMode == LibrarySort.Type.Random },
                onClick = {
                    screenModel.setSort(category, mode, LibrarySort.Direction.Ascending)
                },
            )
            return@map
        }
        SortItem(
            label = stringResource(titleRes),
            sortDescending = sortDescending.takeIf { sortingMode == mode },
@@ -241,7 +263,11 @@ private fun ColumnScope.SortPage(
                    } else {
                        LibrarySort.Direction.Descending
                    }
-                    else -> if (sortDescending) LibrarySort.Direction.Descending else LibrarySort.Direction.Ascending
+                    else -> if (sortDescending) {
                        LibrarySort.Direction.Descending
                    } else {
                        LibrarySort.Direction.Ascending
                    }
                }
                screenModel.setSort(category, mode, direction)
            },
@@ -346,12 +372,13 @@ private fun ColumnScope.GroupPage(
    screenModel: LibrarySettingsScreenModel,
    hasCategories: Boolean,
 ) {
-    val groups = remember(hasCategories, screenModel.trackers) {
+    val trackers by screenModel.trackersFlow.collectAsState()
    val groups = remember(hasCategories, trackers) {
        buildList {
            add(LibraryGroup.BY_DEFAULT)
            add(LibraryGroup.BY_SOURCE)
            add(LibraryGroup.BY_STATUS)
-            if (screenModel.trackers.isNotEmpty()) {
+            if (trackers.isNotEmpty()) {
                add(LibraryGroup.BY_TRACK_STATUS)
            }
            if (hasCategories) {
@@ -35,6 +35,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shadow
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import eu.kanade.presentation.manga.components.MangaCover
@@ -42,19 +43,26 @@ import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.BadgeGroup
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.selectedBackground
 import tachiyomi.domain.manga.model.MangaCover as MangaCoverModel
 object CommonMangaItemDefaults {
    val GridHorizontalSpacer = 4.dp
    val GridVerticalSpacer = 4.dp
    @Suppress("ConstPropertyName")
    const val BrowseFavoriteCoverAlpha = 0.34f
 }
-private val ContinueReadingButtonSize = 28.dp
+private val ContinueReadingButtonSizeSmall = 28.dp
 private val ContinueReadingButtonSizeLarge = 32.dp
 private val ContinueReadingButtonIconSizeSmall = 16.dp
 private val ContinueReadingButtonIconSizeLarge = 20.dp
 private val ContinueReadingButtonGridPadding = 6.dp
 private val ContinueReadingButtonListSpacing = 8.dp
-private const val GridSelectedCoverAlpha = 0.76f
+private const val GRID_SELECTED_COVER_ALPHA = 0.76f
 /**
 * Layout of grid list item with title overlaying the cover.
@@ -62,7 +70,7 @@ private const val GridSelectedCoverAlpha = 0.76f
 */
@Composable
 fun MangaCompactGridItem(
-    coverData: tachiyomi.domain.manga.model.MangaCover,
+    coverData: MangaCoverModel,
    onClick: () -> Unit,
    onLongClick: () -> Unit,
    isSelected: Boolean = false,
@@ -82,7 +90,7 @@ fun MangaCompactGridItem(
                MangaCover.Book(
                    modifier = Modifier
                        .fillMaxWidth()
-                        .alpha(if (isSelected) GridSelectedCoverAlpha else coverAlpha),
+                        .alpha(if (isSelected) GRID_SELECTED_COVER_ALPHA else coverAlpha),
                    data = coverData,
                )
            },
@@ -96,10 +104,12 @@ fun MangaCompactGridItem(
                    )
                } else if (onClickContinueReading != null) {
                    ContinueReadingButton(
                        size = ContinueReadingButtonSizeLarge,
                        iconSize = ContinueReadingButtonIconSizeLarge,
                        onClick = onClickContinueReading,
                        modifier = Modifier
                            .padding(ContinueReadingButtonGridPadding)
                            .align(Alignment.BottomEnd),
                        onClickContinueReading = onClickContinueReading,
                    )
                }
            },
@@ -148,11 +158,13 @@ private fun BoxScope.CoverTextOverlay(
        )
        if (onClickContinueReading != null) {
            ContinueReadingButton(
                size = ContinueReadingButtonSizeSmall,
                iconSize = ContinueReadingButtonIconSizeSmall,
                onClick = onClickContinueReading,
                modifier = Modifier.padding(
                    end = ContinueReadingButtonGridPadding,
                    bottom = ContinueReadingButtonGridPadding,
                ),
                onClickContinueReading = onClickContinueReading,
            )
        }
    }
@@ -163,7 +175,7 @@ private fun BoxScope.CoverTextOverlay(
 */
@Composable
 fun MangaComfortableGridItem(
-    coverData: tachiyomi.domain.manga.model.MangaCover,
+    coverData: MangaCoverModel,
    title: String,
    onClick: () -> Unit,
    onLongClick: () -> Unit,
@@ -185,7 +197,7 @@ fun MangaComfortableGridItem(
                    MangaCover.Book(
                        modifier = Modifier
                            .fillMaxWidth()
-                            .alpha(if (isSelected) GridSelectedCoverAlpha else coverAlpha),
+                            .alpha(if (isSelected) GRID_SELECTED_COVER_ALPHA else coverAlpha),
                        data = coverData,
                    )
                },
@@ -194,10 +206,12 @@ fun MangaComfortableGridItem(
                content = {
                    if (onClickContinueReading != null) {
                        ContinueReadingButton(
                            size = ContinueReadingButtonSizeLarge,
                            iconSize = ContinueReadingButtonIconSizeLarge,
                            onClick = onClickContinueReading,
                            modifier = Modifier
                                .padding(ContinueReadingButtonGridPadding)
                                .align(Alignment.BottomEnd),
                            onClickContinueReading = onClickContinueReading,
                        )
                    }
                },
@@ -309,14 +323,14 @@ private fun GridItemSelectable(
 private fun Modifier.selectedOutline(
    isSelected: Boolean,
    color: Color,
-) = this then drawBehind { if (isSelected) drawRect(color = color) }
+) = drawBehind { if (isSelected) drawRect(color = color) }
 /**
 * Layout of list item.
 */
@Composable
 fun MangaListItem(
-    coverData: tachiyomi.domain.manga.model.MangaCover,
+    coverData: MangaCoverModel,
    title: String,
    onClick: () -> Unit,
    onLongClick: () -> Unit,
@@ -354,8 +368,10 @@ fun MangaListItem(
        BadgeGroup(content = badge)
        if (onClickContinueReading != null) {
            ContinueReadingButton(
                size = ContinueReadingButtonSizeSmall,
                iconSize = ContinueReadingButtonIconSizeSmall,
                onClick = onClickContinueReading,
                modifier = Modifier.padding(start = ContinueReadingButtonListSpacing),
                onClickContinueReading = onClickContinueReading,
            )
        }
    }
@@ -363,23 +379,25 @@ fun MangaListItem(
@Composable
 private fun ContinueReadingButton(
    size: Dp,
    iconSize: Dp,
    onClick: () -> Unit,
    modifier: Modifier = Modifier,
    onClickContinueReading: () -> Unit,
 ) {
    Box(modifier = modifier) {
        FilledIconButton(
-            onClick = onClickContinueReading,
+            onClick = onClick,
            modifier = Modifier.size(ContinueReadingButtonSize),
            shape = MaterialTheme.shapes.small,
            colors = IconButtonDefaults.filledIconButtonColors(
                containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.9f),
                contentColor = contentColorFor(MaterialTheme.colorScheme.primaryContainer),
            ),
            modifier = Modifier.size(size),
        ) {
            Icon(
                imageVector = Icons.Filled.PlayArrow,
                contentDescription = stringResource(MR.strings.action_resume),
-                modifier = Modifier.size(16.dp),
+                modifier = Modifier.size(iconSize),
            )
        }
    }
@@ -95,7 +95,7 @@ fun LibraryContent(
                    isRefreshing = false
                }
            },
-            enabled = { notSelectionMode },
+            enabled = notSelectionMode,
        ) {
            LibraryPager(
                state = pagerState,
@@ -41,6 +41,7 @@ fun LibraryToolbar(
    onClickSyncNow: () -> Unit,
    // SY -->
    onClickSyncExh: (() -> Unit)?,
    isSyncEnabled: Boolean,
    // SY <--
    searchQuery: String?,
    onSearchQueryChange: (String?) -> Unit,
@@ -64,6 +65,7 @@ fun LibraryToolbar(
        onClickSyncNow = onClickSyncNow,
        // SY -->
        onClickSyncExh = onClickSyncExh,
        isSyncEnabled = isSyncEnabled,
        // SY <--
        scrollBehavior = scrollBehavior,
    )
@@ -82,6 +84,7 @@ private fun LibraryRegularToolbar(
    onClickSyncNow: () -> Unit,
    // SY -->
    onClickSyncExh: (() -> Unit)?,
    isSyncEnabled: Boolean,
    // SY <--
    scrollBehavior: TopAppBarScrollBehavior?,
 ) {
@@ -128,10 +131,6 @@ private fun LibraryRegularToolbar(
                        title = stringResource(MR.strings.action_open_random_manga),
                        onClick = onClickOpenRandomManga,
                    ),
                    AppBar.OverflowAction(
                        title = stringResource(MR.strings.sync_library),
                        onClick = onClickSyncNow,
                    ),
                ).builder().apply {
                    // SY -->
                    if (onClickSyncExh != null) {
@@ -142,6 +141,14 @@ private fun LibraryRegularToolbar(
                            ),
                        )
                    }
                    if (isSyncEnabled) {
                        add(
                            AppBar.OverflowAction(
                                title = stringResource(SYMR.strings.sync_library),
                                onClick = onClickSyncNow,
                            ),
                        )
                    }
                    // SY <--
                }.build(),
            )
@@ -1,16 +1,33 @@
 package eu.kanade.presentation.manga
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.material3.AlertDialog
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.Book
 import androidx.compose.material.icons.outlined.SwapVert
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.presentation.components.TabbedDialogPaddings
 import eu.kanade.presentation.more.settings.LocalPreferenceMinHeight
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
@Composable
@@ -18,42 +35,92 @@ fun DuplicateMangaDialog(
    onDismissRequest: () -> Unit,
    onConfirm: () -> Unit,
    onOpenManga: () -> Unit,
    onMigrate: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
-    AlertDialog(
+    val minHeight = LocalPreferenceMinHeight.current
    AdaptiveSheet(
        modifier = modifier,
        onDismissRequest = onDismissRequest,
-        title = {
+    ) {
-            Text(text = stringResource(MR.strings.are_you_sure))
+        Column(
-        },
+            modifier = Modifier
-        text = {
+                .padding(
-            Text(text = stringResource(MR.strings.confirm_add_duplicate_manga))
+                    vertical = TabbedDialogPaddings.Vertical,
-        },
+                    horizontal = TabbedDialogPaddings.Horizontal,
-        confirmButton = {
+                )
-            FlowRow(
+                .fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
+        ) {
            Text(
                modifier = Modifier.padding(TitlePadding),
                text = stringResource(MR.strings.are_you_sure),
                style = MaterialTheme.typography.headlineMedium,
            )
            Text(
                text = stringResource(MR.strings.confirm_add_duplicate_manga),
                style = MaterialTheme.typography.bodyMedium,
            )
            Spacer(Modifier.height(PaddingSize))
            TextPreferenceWidget(
                title = stringResource(MR.strings.action_show_manga),
                icon = Icons.Outlined.Book,
                onPreferenceClick = {
                    onDismissRequest()
                    onOpenManga()
                },
            )
            HorizontalDivider()
            TextPreferenceWidget(
                title = stringResource(MR.strings.action_migrate_duplicate),
                icon = Icons.Outlined.SwapVert,
                onPreferenceClick = {
                    onDismissRequest()
                    onMigrate()
                },
            )
            HorizontalDivider()
            TextPreferenceWidget(
                title = stringResource(MR.strings.action_add_anyway),
                icon = Icons.Outlined.Add,
                onPreferenceClick = {
                    onDismissRequest()
                    onConfirm()
                },
            )
            Row(
                modifier = Modifier
                    .sizeIn(minHeight = minHeight)
                    .clickable { onDismissRequest.invoke() }
                    .padding(ButtonPadding)
                    .fillMaxWidth(),
                verticalAlignment = Alignment.CenterVertically,
                horizontalArrangement = Arrangement.Center,
            ) {
-                TextButton(
+                OutlinedButton(onClick = onDismissRequest, modifier = Modifier.fillMaxWidth()) {
-                    onClick = {
+                    Text(
-                        onDismissRequest()
+                        modifier = Modifier
-                        onOpenManga()
+                            .padding(vertical = 8.dp),
-                    },
+                        text = stringResource(MR.strings.action_cancel),
-                ) {
+                        color = MaterialTheme.colorScheme.primary,
-                    Text(text = stringResource(MR.strings.action_show_manga))
+                        style = MaterialTheme.typography.titleLarge,
-                }
+                        fontSize = 16.sp,
-
+                    )
                Spacer(modifier = Modifier.weight(1f))
                TextButton(onClick = onDismissRequest) {
                    Text(text = stringResource(MR.strings.action_cancel))
                }
                TextButton(
                    onClick = {
                        onDismissRequest()
                        onConfirm()
                    },
                ) {
                    Text(text = stringResource(MR.strings.action_add))
                }
            }
-        },
+        }
-    )
+    }
 }
 private val PaddingSize = 16.dp
 private val ButtonPadding = PaddingValues(top = 16.dp, bottom = 16.dp)
 private val TitlePadding = PaddingValues(bottom = 16.dp, top = 8.dp)
@@ -77,6 +77,7 @@ import eu.kanade.tachiyomi.source.online.english.Pururin
 import eu.kanade.tachiyomi.source.online.english.Tsumino
 import eu.kanade.tachiyomi.ui.manga.ChapterList
 import eu.kanade.tachiyomi.ui.manga.MangaScreenModel
 import eu.kanade.tachiyomi.ui.manga.MergedMangaData
 import eu.kanade.tachiyomi.ui.manga.PagePreviewState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import exh.metadata.MetadataUtil
@@ -102,8 +103,7 @@ import tachiyomi.presentation.core.components.material.ExtendedFloatingActionBut
 import tachiyomi.presentation.core.components.material.PullRefresh
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.isScrolledToEnd
+import tachiyomi.presentation.core.util.shouldExpandFAB
 import tachiyomi.presentation.core.util.isScrollingUp
 import tachiyomi.source.local.isLocal
 import java.time.Instant
 import java.time.ZoneId
@@ -431,7 +431,7 @@ private fun MangaScreenSmallImpl(
                    },
                    icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) },
                    onClick = onContinueReading,
-                    expanded = chapterListState.isScrollingUp() || chapterListState.isScrolledToEnd(),
+                    expanded = chapterListState.shouldExpandFAB(),
                )
            }
        },
@@ -441,7 +441,7 @@ private fun MangaScreenSmallImpl(
        PullRefresh(
            refreshing = state.isRefreshingData,
            onRefresh = onRefresh,
-            enabled = { !isAnySelected },
+            enabled = !isAnySelected,
            indicatorPadding = PaddingValues(top = topPadding),
        ) {
            val layoutDirection = LocalLayoutDirection.current
@@ -466,13 +466,9 @@ private fun MangaScreenSmallImpl(
                        MangaInfoBox(
                            isTabletUi = false,
                            appBarPadding = topPadding,
-                            title = state.manga.title,
+                            manga = state.manga,
                            author = state.manga.author,
                            artist = state.manga.artist,
                            sourceName = remember { state.source.getNameForMangaInfo(state.mergedData?.sources) },
                            isStubSource = remember { state.source is StubSource },
                            coverDataProvider = { state.manga },
                            status = state.manga.status,
                            onCoverClick = onCoverClicked,
                            doSearch = onSearch,
                        )
@@ -578,6 +574,7 @@ private fun MangaScreenSmallImpl(
                    sharedChapterItems(
                        manga = state.manga,
                        mergedData = state.mergedData,
                        chapters = listItem,
                        isAnyChapterSelected = chapters.fastAny { it.selected },
                        chapterSwipeStartAction = chapterSwipeStartAction,
@@ -755,7 +752,7 @@ fun MangaScreenLargeImpl(
                    },
                    icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) },
                    onClick = onContinueReading,
-                    expanded = chapterListState.isScrollingUp() || chapterListState.isScrolledToEnd(),
+                    expanded = chapterListState.shouldExpandFAB(),
                )
            }
        },
@@ -763,7 +760,7 @@ fun MangaScreenLargeImpl(
        PullRefresh(
            refreshing = state.isRefreshingData,
            onRefresh = onRefresh,
-            enabled = { !isAnySelected },
+            enabled = !isAnySelected,
            indicatorPadding = PaddingValues(
                start = insetPadding.calculateStartPadding(layoutDirection),
                top = with(density) { topBarHeight.toDp() },
@@ -784,13 +781,9 @@ fun MangaScreenLargeImpl(
                        MangaInfoBox(
                            isTabletUi = true,
                            appBarPadding = contentPadding.calculateTopPadding(),
-                            title = state.manga.title,
+                            manga = state.manga,
                            author = state.manga.author,
                            artist = state.manga.artist,
                            sourceName = remember { state.source.getNameForMangaInfo(state.mergedData?.sources) },
                            isStubSource = remember { state.source is StubSource },
                            coverDataProvider = { state.manga },
                            status = state.manga.status,
                            onCoverClick = onCoverClicked,
                            doSearch = onSearch,
                        )
@@ -880,6 +873,7 @@ fun MangaScreenLargeImpl(
                            sharedChapterItems(
                                manga = state.manga,
                                mergedData = state.mergedData,
                                chapters = listItem,
                                isAnyChapterSelected = chapters.fastAny { it.selected },
                                chapterSwipeStartAction = chapterSwipeStartAction,
@@ -944,6 +938,7 @@ private fun SharedMangaBottomActionMenu(
 private fun LazyListScope.sharedChapterItems(
    manga: Manga,
    mergedData: MergedMangaData?,
    chapters: List<ChapterList>,
    isAnyChapterSelected: Boolean,
    chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
@@ -995,7 +990,9 @@ private fun LazyListScope.sharedChapterItems(
                            // SY <--
                        },
                    readProgress = item.chapter.lastPageRead
-                        .takeIf { /* SY --> */(!item.chapter.read || alwaysShowReadingProgress)/* SY <-- */ && it > 0L }
+                        .takeIf {
                            /* SY --> */(!item.chapter.read || alwaysShowReadingProgress)/* SY <-- */ && it > 0L
                        }
                        ?.let {
                            stringResource(
                                MR.strings.chapter_progress,
@@ -1011,7 +1008,8 @@ private fun LazyListScope.sharedChapterItems(
                    read = item.chapter.read,
                    bookmark = item.chapter.bookmark,
                    selected = item.selected,
-                    downloadIndicatorEnabled = !isAnyChapterSelected && !manga.isLocal(),
+                    downloadIndicatorEnabled =
                    !isAnyChapterSelected && !(mergedData?.manga?.get(item.chapter.mangaId) ?: manga).isLocal(),
                    downloadStateProvider = { item.downloadState },
                    downloadProgressProvider = { item.downloadProgress },
                    chapterSwipeStartAction = chapterSwipeStartAction,
@@ -9,13 +9,13 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CheckCircle
 import androidx.compose.material.icons.outlined.ArrowDownward
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material.ripple
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProgressIndicatorDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -12,7 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
+import tachiyomi.presentation.core.components.material.SECONDARY_ALPHA
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.pluralStringResource
 import tachiyomi.presentation.core.i18n.stringResource
@@ -60,6 +60,6 @@ private fun MissingChaptersWarning(count: Int) {
        maxLines = 1,
        overflow = TextOverflow.Ellipsis,
        style = MaterialTheme.typography.bodySmall,
-        color = MaterialTheme.colorScheme.error.copy(alpha = SecondaryItemAlpha),
+        color = MaterialTheme.colorScheme.error.copy(alpha = SECONDARY_ALPHA),
    )
 }
@@ -8,7 +8,6 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -33,12 +32,12 @@ import androidx.compose.material.icons.outlined.Label
 import androidx.compose.material.icons.outlined.MoreVert
 import androidx.compose.material.icons.outlined.RemoveDone
 import androidx.compose.material.icons.outlined.SwapCalls
 import androidx.compose.material.ripple
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
@@ -90,7 +89,7 @@ fun MangaBottomActionMenu(
        Surface(
            modifier = modifier,
            shape = MaterialTheme.shapes.large.copy(bottomEnd = ZeroCornerSize, bottomStart = ZeroCornerSize),
-            tonalElevation = 3.dp,
+            color = MaterialTheme.colorScheme.surfaceContainerHigh,
        ) {
            val haptic = LocalHapticFeedback.current
            val confirm = remember { mutableStateListOf(false, false, false, false, false, false, false) }
@@ -199,7 +198,7 @@ private fun RowScope.Button(
            .size(48.dp)
            .weight(animatedWeight)
            .combinedClickable(
-                interactionSource = remember { MutableInteractionSource() },
+                interactionSource = null,
                indication = ripple(bounded = false),
                onLongClick = onLongClick,
                onClick = onClick,
@@ -252,7 +251,7 @@ fun LibraryBottomActionMenu(
        Surface(
            modifier = modifier,
            shape = MaterialTheme.shapes.large.copy(bottomEnd = ZeroCornerSize, bottomStart = ZeroCornerSize),
-            tonalElevation = 3.dp,
+            color = MaterialTheme.colorScheme.surfaceContainerHigh,
        ) {
            val haptic = LocalHapticFeedback.current
            val confirm =
@@ -30,7 +30,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -41,8 +40,8 @@ import eu.kanade.tachiyomi.data.download.model.Download
 import me.saket.swipe.SwipeableActionsBox
 import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.material.ReadItemAlpha
+import tachiyomi.presentation.core.components.material.DISABLED_ALPHA
-import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
+import tachiyomi.presentation.core.components.material.SECONDARY_ALPHA
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.selectedBackground
@@ -69,9 +68,6 @@ fun MangaChapterListItem(
    onChapterSwipe: (LibraryPreferences.ChapterSwipeAction) -> Unit,
    modifier: Modifier = Modifier,
 ) {
    val textAlpha = if (read) ReadItemAlpha else 1f
    val textSubtitleAlpha = if (read) ReadItemAlpha else SecondaryItemAlpha
    val start = getSwipeAction(
        action = chapterSwipeStartAction,
        read = read,
@@ -136,29 +132,39 @@ fun MangaChapterListItem(
                    Text(
                        text = title,
                        style = MaterialTheme.typography.bodyMedium,
                        color = LocalContentColor.current.copy(alpha = textAlpha),
                        maxLines = 1,
                        overflow = TextOverflow.Ellipsis,
                        onTextLayout = { textHeight = it.size.height },
                        color = LocalContentColor.current.copy(alpha = if (read) DISABLED_ALPHA else 1f),
                    )
                }
-                Row(modifier = Modifier.alpha(textSubtitleAlpha)) {
+                Row {
-                    ProvideTextStyle(value = MaterialTheme.typography.bodySmall) {
+                    val subtitleStyle = MaterialTheme.typography.bodySmall
                        .merge(
                            color = LocalContentColor.current
                                .copy(alpha = if (read) DISABLED_ALPHA else SECONDARY_ALPHA),
                        )
                    ProvideTextStyle(value = subtitleStyle) {
                        if (date != null) {
                            Text(
                                text = date,
                                maxLines = 1,
                                overflow = TextOverflow.Ellipsis,
                            )
-                            if (readProgress != null || scanlator != null/* SY --> */ || sourceName != null/* SY <-- */) DotSeparatorText()
+                            if (readProgress != null ||
                                scanlator != null/* SY --> */ ||
                                sourceName != null/* SY <-- */
                            ) {
                                DotSeparatorText()
                            }
                        }
                        if (readProgress != null) {
                            Text(
                                text = readProgress,
                                maxLines = 1,
                                overflow = TextOverflow.Ellipsis,
-                                color = LocalContentColor.current.copy(alpha = ReadItemAlpha),
+                                color = LocalContentColor.current.copy(alpha = DISABLED_ALPHA),
                            )
                            if (scanlator != null/* SY --> */ || sourceName != null/* SY <-- */) DotSeparatorText()
                        }
@@ -38,6 +38,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.core.view.updatePadding
 import coil3.asDrawable
 import coil3.imageLoader
 import coil3.request.CachePolicy
 import coil3.request.ImageRequest
@@ -56,7 +57,7 @@ import tachiyomi.presentation.core.util.clickableNoIndication
@Composable
 fun MangaCoverDialog(
-    coverDataProvider: () -> Manga,
+    manga: Manga,
    isCustomCover: Boolean,
    snackbarHostState: SnackbarHostState,
    onShareClick: () -> Unit,
@@ -166,7 +167,7 @@ fun MangaCoverDialog(
                    },
                    update = { view ->
                        val request = ImageRequest.Builder(view.context)
-                            .data(coverDataProvider())
+                            .data(manga)
                            .size(Size.ORIGINAL)
                            .memoryCachePolicy(CachePolicy.DISABLED)
                            .target { image ->
@@ -102,9 +102,12 @@ fun SetIntervalDialog(
                            ),
                        ),
                    )
-
+                } else {
-                    Spacer(Modifier.height(MaterialTheme.padding.small))
+                    Text(
                        stringResource(MR.strings.manga_interval_expected_update_null),
                    )
                }
                Spacer(Modifier.height(MaterialTheme.padding.small))
                if (onValueChanged != null && (isDevFlavor || isPreviewBuildType)) {
                    Text(stringResource(MR.strings.manga_interval_custom_amount))
@@ -2,6 +2,7 @@ package eu.kanade.presentation.manga.components
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.spring
 import androidx.compose.animation.graphics.res.animatedVectorResource
 import androidx.compose.animation.graphics.res.rememberAnimatedVectorPainter
 import androidx.compose.animation.graphics.vector.AnimatedImageVector
@@ -74,6 +75,8 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import coil3.request.crossfade
 import eu.kanade.presentation.components.DropdownMenu
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.SManga
@@ -81,6 +84,7 @@ import eu.kanade.tachiyomi.util.system.copyToClipboard
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.material.DISABLED_ALPHA
 import tachiyomi.presentation.core.components.material.TextButton
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.pluralStringResource
@@ -97,13 +101,9 @@ private val whitespaceLineRegex = Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTIL
 fun MangaInfoBox(
    isTabletUi: Boolean,
    appBarPadding: Dp,
-    title: String,
+    manga: Manga,
    author: String?,
    artist: String?,
    sourceName: String,
    isStubSource: Boolean,
    coverDataProvider: () -> Manga,
    status: Long,
    onCoverClick: () -> Unit,
    doSearch: (query: String, global: Boolean) -> Unit,
    modifier: Modifier = Modifier,
@@ -115,7 +115,10 @@ fun MangaInfoBox(
            MaterialTheme.colorScheme.background,
        )
        AsyncImage(
-            model = coverDataProvider(),
+            model = ImageRequest.Builder(LocalContext.current)
                .data(manga)
                .crossfade(true)
                .build(),
            contentDescription = null,
            contentScale = ContentScale.Crop,
            modifier = Modifier
@@ -135,28 +138,20 @@ fun MangaInfoBox(
            if (!isTabletUi) {
                MangaAndSourceTitlesSmall(
                    appBarPadding = appBarPadding,
-                    coverDataProvider = coverDataProvider,
+                    manga = manga,
                    onCoverClick = onCoverClick,
                    title = title,
                    doSearch = doSearch,
                    author = author,
                    artist = artist,
                    status = status,
                    sourceName = sourceName,
                    isStubSource = isStubSource,
                    onCoverClick = onCoverClick,
                    doSearch = doSearch,
                )
            } else {
                MangaAndSourceTitlesLarge(
                    appBarPadding = appBarPadding,
-                    coverDataProvider = coverDataProvider,
+                    manga = manga,
                    onCoverClick = onCoverClick,
                    title = title,
                    doSearch = doSearch,
                    author = author,
                    artist = artist,
                    status = status,
                    sourceName = sourceName,
                    isStubSource = isStubSource,
                    onCoverClick = onCoverClick,
                    doSearch = doSearch,
                )
            }
        }
@@ -180,7 +175,7 @@ fun MangaActionRow(
    // SY <--
    modifier: Modifier = Modifier,
 ) {
-    val defaultActionButtonColor = MaterialTheme.colorScheme.onSurface.copy(alpha = .38f)
+    val defaultActionButtonColor = MaterialTheme.colorScheme.onSurface.copy(alpha = DISABLED_ALPHA)
    // TODO: show something better when using custom interval
    val nextUpdateDays = remember(nextUpdate) {
@@ -289,7 +284,8 @@ fun ExpandableMangaDescription(
                modifier = Modifier
                    .padding(top = 8.dp)
                    .padding(vertical = 12.dp)
-                    .animateContentSize(),
+                    .animateContentSize(animationSpec = spring())
                    .fillMaxWidth(),
            ) {
                var showMenu by remember { mutableStateOf(false) }
                var tagSelected by remember { mutableStateOf("") }
@@ -374,15 +370,11 @@ fun ExpandableMangaDescription(
@Composable
 private fun MangaAndSourceTitlesLarge(
    appBarPadding: Dp,
-    coverDataProvider: () -> Manga,
+    manga: Manga,
    onCoverClick: () -> Unit,
    title: String,
    doSearch: (query: String, global: Boolean) -> Unit,
    author: String?,
    artist: String?,
    status: Long,
    sourceName: String,
    isStubSource: Boolean,
    onCoverClick: () -> Unit,
    doSearch: (query: String, global: Boolean) -> Unit,
 ) {
    Column(
        modifier = Modifier
@@ -392,19 +384,22 @@ private fun MangaAndSourceTitlesLarge(
    ) {
        MangaCover.Book(
            modifier = Modifier.fillMaxWidth(0.65f),
-            data = coverDataProvider(),
+            data = ImageRequest.Builder(LocalContext.current)
                .data(manga)
                .crossfade(true)
                .build(),
            contentDescription = stringResource(MR.strings.manga_cover),
            onClick = onCoverClick,
        )
        Spacer(modifier = Modifier.height(16.dp))
        MangaContentInfo(
-            title = title,
+            title = manga.title,
-            doSearch = doSearch,
+            author = manga.author,
-            author = author,
+            artist = manga.artist,
-            artist = artist,
+            status = manga.status,
            status = status,
            sourceName = sourceName,
            isStubSource = isStubSource,
            doSearch = doSearch,
            textAlign = TextAlign.Center,
        )
    }
@@ -413,15 +408,11 @@ private fun MangaAndSourceTitlesLarge(
@Composable
 private fun MangaAndSourceTitlesSmall(
    appBarPadding: Dp,
-    coverDataProvider: () -> Manga,
+    manga: Manga,
    onCoverClick: () -> Unit,
    title: String,
    doSearch: (query: String, global: Boolean) -> Unit,
    author: String?,
    artist: String?,
    status: Long,
    sourceName: String,
    isStubSource: Boolean,
    onCoverClick: () -> Unit,
    doSearch: (query: String, global: Boolean) -> Unit,
 ) {
    Row(
        modifier = Modifier
@@ -434,7 +425,10 @@ private fun MangaAndSourceTitlesSmall(
            modifier = Modifier
                .sizeIn(maxWidth = 100.dp)
                .align(Alignment.Top),
-            data = coverDataProvider(),
+            data = ImageRequest.Builder(LocalContext.current)
                .data(manga)
                .crossfade(true)
                .build(),
            contentDescription = stringResource(MR.strings.manga_cover),
            onClick = onCoverClick,
        )
@@ -442,13 +436,13 @@ private fun MangaAndSourceTitlesSmall(
            verticalArrangement = Arrangement.spacedBy(2.dp),
        ) {
            MangaContentInfo(
-                title = title,
+                title = manga.title,
-                doSearch = doSearch,
+                author = manga.author,
-                author = author,
+                artist = manga.artist,
-                artist = artist,
+                status = manga.status,
                status = status,
                sourceName = sourceName,
                isStubSource = isStubSource,
                doSearch = doSearch,
            )
        }
    }
@@ -457,12 +451,12 @@ private fun MangaAndSourceTitlesSmall(
@Composable
 private fun ColumnScope.MangaContentInfo(
    title: String,
    doSearch: (query: String, global: Boolean) -> Unit,
    author: String?,
    artist: String?,
    status: Long,
    sourceName: String,
    isStubSource: Boolean,
    doSearch: (query: String, global: Boolean) -> Unit,
    textAlign: TextAlign? = LocalTextStyle.current.textAlign,
 ) {
    val context = LocalContext.current
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.LocalMinimumInteractiveComponentEnforcement
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SuggestionChip
 import androidx.compose.material3.Surface
@@ -141,7 +141,7 @@ fun TagsChip(
    border: ChipBorder? = SuggestionChipDefaults.suggestionChipBorder(),
    borderM3: BorderStroke? = SuggestionChipDefaultsM3.suggestionChipBorder(enabled = true),
 ) {
-    CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
+    CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides 0.dp) {
        if (onClick != null) {
            SuggestionChip(
                modifier = modifier,
@@ -44,7 +44,7 @@ import tachiyomi.presentation.core.i18n.stringResource
@Composable
 private fun PagePreviewLoading(
-    setMaxWidth: (Dp) -> Unit
+    setMaxWidth: (Dp) -> Unit,
 ) {
    val density = LocalDensity.current
    Box(
@@ -63,7 +63,7 @@ private fun PagePreviewLoading(
@Composable
 private fun PagePreviewRow(
    onOpenPage: (Int) -> Unit,
-    items: ImmutableList<PagePreview>
+    items: ImmutableList<PagePreview>,
 ) {
    Row(
        modifier = Modifier
@@ -88,7 +88,7 @@ private fun PagePreviewMore(
 ) {
    Box(
        modifier = Modifier.fillMaxWidth(),
-        contentAlignment = Alignment.Center
+        contentAlignment = Alignment.Center,
    ) {
        TextButton(onClick = onMorePreviewsClicked) {
            Text(stringResource(SYMR.strings.more_previews))
@@ -116,7 +116,7 @@ fun PagePreviews(
                pagePreviewState.pagePreviews.take(rowCount * itemPerRowCount).chunked(itemPerRowCount).forEach {
                    PagePreviewRow(
                        onOpenPage = onOpenPage,
-                        items = remember(it) { it.toImmutableList() }
+                        items = remember(it) { it.toImmutableList() },
                    )
                }
@@ -153,7 +153,7 @@ fun LazyListScope.PagePreviewItems(
            ) {
                PagePreviewRow(
                    onOpenPage = onOpenPage,
-                    items = remember(it) { it.toImmutableList() }
+                    items = remember(it) { it.toImmutableList() },
                )
            }
            item(
@@ -32,8 +32,6 @@ import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.TextButton
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.isScrolledToEnd
 import tachiyomi.presentation.core.util.isScrolledToStart
@Composable
 fun ScanlatorFilterDialog(
@@ -97,8 +95,8 @@ fun ScanlatorFilterDialog(
                        }
                    }
                }
-                if (!state.isScrolledToStart()) HorizontalDivider(modifier = Modifier.align(Alignment.TopCenter))
+                if (state.canScrollBackward) HorizontalDivider(modifier = Modifier.align(Alignment.TopCenter))
-                if (!state.isScrolledToEnd()) HorizontalDivider(modifier = Modifier.align(Alignment.BottomCenter))
+                if (state.canScrollForward) HorizontalDivider(modifier = Modifier.align(Alignment.BottomCenter))
            }
        },
        properties = DialogProperties(
@@ -111,8 +109,14 @@ fun ScanlatorFilterDialog(
                }
            } else {
                FlowRow {
-                    TextButton(onClick = mutableExcludedScanlators::clear) {
+                    if (mutableExcludedScanlators.isEmpty()) {
-                        Text(text = stringResource(MR.strings.action_reset))
+                        TextButton(onClick = { mutableExcludedScanlators.addAll(availableScanlators) }) {
                            Text(text = stringResource(MR.strings.action_select_all))
                        }
                    } else {
                        TextButton(onClick = mutableExcludedScanlators::clear) {
                            Text(text = stringResource(MR.strings.action_reset))
                        }
                    }
                    Spacer(modifier = Modifier.weight(1f))
                    TextButton(onClick = onDismissRequest) {
@@ -14,11 +14,13 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -28,19 +30,24 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
 import androidx.core.content.getSystemService
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState
 import eu.kanade.tachiyomi.core.security.PrivacyPreferences
 import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState
 import tachiyomi.presentation.core.util.secondaryItemAlpha
 import uy.kohesive.injekt.injectLazy
 internal class PermissionStep : OnboardingStep {
    private val privacyPreferences: PrivacyPreferences by injectLazy()
    private var notificationGranted by mutableStateOf(false)
    private var batteryGranted by mutableStateOf(false)
@@ -73,7 +80,7 @@ internal class PermissionStep : OnboardingStep {
        }
        Column {
-            PermissionItem(
+            PermissionCheckbox(
                title = stringResource(MR.strings.onboarding_permission_install_apps),
                subtitle = stringResource(MR.strings.onboarding_permission_install_apps_description),
                granted = installGranted,
@@ -89,7 +96,7 @@ internal class PermissionStep : OnboardingStep {
                        // no-op. resulting checks is being done on resume
                    },
                )
-                PermissionItem(
+                PermissionCheckbox(
                    title = stringResource(MR.strings.onboarding_permission_notifications),
                    subtitle = stringResource(MR.strings.onboarding_permission_notifications_description),
                    granted = notificationGranted,
@@ -97,7 +104,7 @@ internal class PermissionStep : OnboardingStep {
                )
            }
-            PermissionItem(
+            PermissionCheckbox(
                title = stringResource(MR.strings.onboarding_permission_ignore_battery_opts),
                subtitle = stringResource(MR.strings.onboarding_permission_ignore_battery_opts_description),
                granted = batteryGranted,
@@ -109,6 +116,29 @@ internal class PermissionStep : OnboardingStep {
                    context.startActivity(intent)
                },
            )
            HorizontalDivider(
                modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp),
                color = MaterialTheme.colorScheme.onPrimaryContainer,
            )
            val crashlyticsPref = privacyPreferences.crashlytics()
            val crashlytics by crashlyticsPref.collectAsState()
            PermissionSwitch(
                title = stringResource(MR.strings.onboarding_permission_crashlytics),
                subtitle = stringResource(MR.strings.onboarding_permission_crashlytics_description),
                granted = crashlytics,
                onToggleChange = crashlyticsPref::set,
            )
            val analyticsPref = privacyPreferences.analytics()
            val analytics by analyticsPref.collectAsState()
            PermissionSwitch(
                title = stringResource(MR.strings.onboarding_permission_analytics),
                subtitle = stringResource(MR.strings.onboarding_permission_analytics_description),
                granted = analytics,
                onToggleChange = analyticsPref::set,
            )
        }
    }
@@ -127,7 +157,7 @@ internal class PermissionStep : OnboardingStep {
    }
    @Composable
-    private fun PermissionItem(
+    private fun PermissionCheckbox(
        title: String,
        subtitle: String,
        granted: Boolean,
@@ -157,4 +187,26 @@ internal class PermissionStep : OnboardingStep {
            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
        )
    }
    @Composable
    private fun PermissionSwitch(
        title: String,
        subtitle: String,
        granted: Boolean,
        modifier: Modifier = Modifier,
        onToggleChange: (Boolean) -> Unit,
    ) {
        ListItem(
            modifier = modifier,
            headlineContent = { Text(text = title) },
            supportingContent = { Text(text = subtitle) },
            trailingContent = {
                Switch(
                    checked = granted,
                    onCheckedChange = onToggleChange,
                )
            },
            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
        )
    }
 }
@@ -7,12 +7,12 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.structuralEqualityPolicy
 import androidx.compose.ui.unit.dp
 import eu.kanade.domain.track.service.TrackPreferences
 import eu.kanade.presentation.more.settings.widget.EditTextPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.InfoWidget
 import eu.kanade.presentation.more.settings.widget.ListPreferenceWidget
@@ -23,8 +23,6 @@ import eu.kanade.presentation.more.settings.widget.TrackingPreferenceWidget
 import kotlinx.coroutines.launch
 import tachiyomi.presentation.core.components.SliderItem
 import tachiyomi.presentation.core.util.collectAsState
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 val LocalPreferenceHighlighted = compositionLocalOf(structuralEqualityPolicy()) { false }
 val LocalPreferenceMinHeight = compositionLocalOf(structuralEqualityPolicy()) { 56.dp }
@@ -156,16 +154,14 @@ internal fun PreferenceItem(
                )
            }
            is Preference.PreferenceItem.TrackerPreference -> {
-                val uName by Injekt.get<TrackPreferences>()
+                val isLoggedIn by item.tracker.let { tracker ->
-                    .trackUsername(item.tracker)
+                    tracker.isLoggedInFlow.collectAsState(tracker.isLoggedIn)
                    .collectAsState()
                item.tracker.run {
                    TrackingPreferenceWidget(
                        tracker = this,
                        checked = uName.isNotEmpty(),
                        onClick = { if (isLoggedIn) item.logout() else item.login() },
                    )
                }
                TrackingPreferenceWidget(
                    tracker = item.tracker,
                    checked = isLoggedIn,
                    onClick = { if (isLoggedIn) item.logout() else item.login() },
                )
            }
            is Preference.PreferenceItem.InfoPreference -> {
                InfoWidget(text = item.title)
@@ -3,11 +3,12 @@ package eu.kanade.presentation.more.settings.screen
 import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Build
 import android.provider.Settings
 import android.webkit.WebStorage
 import android.webkit.WebView
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
@@ -112,71 +113,54 @@ object SettingsAdvancedScreen : SearchableSettings {
        val basePreferences = remember { Injekt.get<BasePreferences>() }
        val networkPreferences = remember { Injekt.get<NetworkPreferences>() }
-        return buildList {
+        return listOf(
-            addAll(
+            Preference.PreferenceItem.TextPreference(
-                listOf(
+                title = stringResource(MR.strings.pref_dump_crash_logs),
-                    /* SY --> Preference.PreferenceItem.SwitchPreference(
+                subtitle = stringResource(MR.strings.pref_dump_crash_logs_summary),
-                        pref = basePreferences.acraEnabled(),
+                onClick = {
-                        title = stringResource(MR.strings.pref_enable_acra),
+                    scope.launch {
-                        subtitle = stringResource(MR.strings.pref_acra_summary),
+                        CrashLogUtil(context).dumpLogs()
-                        enabled = isPreviewBuildType || isReleaseBuildType,
+                    }
-                    ), SY <-- */
+                },
-                    Preference.PreferenceItem.TextPreference(
+            ),
-                        title = stringResource(MR.strings.pref_dump_crash_logs),
+            /* SY --> Preference.PreferenceItem.SwitchPreference(
-                        subtitle = stringResource(MR.strings.pref_dump_crash_logs_summary),
+                pref = networkPreferences.verboseLogging(),
-                        onClick = {
+                title = stringResource(MR.strings.pref_verbose_logging),
-                            scope.launch {
+                subtitle = stringResource(MR.strings.pref_verbose_logging_summary),
-                                CrashLogUtil(context).dumpLogs()
+                onValueChanged = {
-                            }
+                    context.toast(MR.strings.requires_app_restart)
-                        },
+                    true
-                    ),
+                },
-                    /* SY --> Preference.PreferenceItem.SwitchPreference(
+            ), SY <-- */
-                        pref = networkPreferences.verboseLogging(),
+            Preference.PreferenceItem.TextPreference(
-                        title = stringResource(MR.strings.pref_verbose_logging),
+                title = stringResource(MR.strings.pref_debug_info),
-                        subtitle = stringResource(MR.strings.pref_verbose_logging_summary),
+                onClick = { navigator.push(DebugInfoScreen()) },
-                        onValueChanged = {
+            ),
-                            context.toast(MR.strings.requires_app_restart)
+            Preference.PreferenceItem.TextPreference(
-                            true
+                title = stringResource(MR.strings.pref_onboarding_guide),
-                        },
+                onClick = { navigator.push(OnboardingScreen()) },
-                    ), SY <-- */
+            ),
-                    Preference.PreferenceItem.TextPreference(
+            Preference.PreferenceItem.TextPreference(
-                        title = stringResource(MR.strings.pref_debug_info),
+                title = stringResource(MR.strings.pref_manage_notifications),
-                        onClick = { navigator.push(DebugInfoScreen()) },
+                onClick = {
-                    ),
+                    val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
-                    Preference.PreferenceItem.TextPreference(
+                        putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
-                        title = stringResource(MR.strings.pref_onboarding_guide),
+                    }
-                        onClick = { navigator.push(OnboardingScreen()) },
+                    context.startActivity(intent)
-                    ),
+                },
-                ),
+            ),
-            )
+            getBackgroundActivityGroup(),
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            getDataGroup(),
-                add(
+            getNetworkGroup(networkPreferences = networkPreferences),
-                    Preference.PreferenceItem.TextPreference(
+            getLibraryGroup(),
-                        title = stringResource(MR.strings.pref_manage_notifications),
+            getReaderGroup(basePreferences = basePreferences),
-                        onClick = {
+            getExtensionsGroup(basePreferences = basePreferences),
-                            val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
+            // SY -->
-                                putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+            // getDownloaderGroup(),
-                            }
+            getDataSaverGroup(),
-                            context.startActivity(intent)
+            getDeveloperToolsGroup(),
-                        },
+            // SY <--
-                    ),
+        )
                )
            }
            addAll(
                listOf(
                    getBackgroundActivityGroup(),
                    getDataGroup(),
                    getNetworkGroup(networkPreferences = networkPreferences),
                    getLibraryGroup(),
                    getExtensionsGroup(basePreferences = basePreferences),
                    // SY -->
                    // getDownloaderGroup(),
                    getDataSaverGroup(),
                    getDeveloperToolsGroup(),
                    // SY <--
                ),
            )
        }
    }
    @Composable
@@ -315,6 +299,7 @@ object SettingsAdvancedScreen : SearchableSettings {
                        try {
                            // OkHttp checks for valid values internally
                            Headers.Builder().add("User-Agent", it)
                            context.toast(MR.strings.requires_app_restart)
                        } catch (_: IllegalArgumentException) {
                            context.toast(MR.strings.error_user_agent_string_invalid)
                            return@EditTextPreference false
@@ -367,6 +352,34 @@ object SettingsAdvancedScreen : SearchableSettings {
        )
    }
    @Composable
    private fun getReaderGroup(
        basePreferences: BasePreferences,
    ): Preference.PreferenceGroup {
        val context = LocalContext.current
        val chooseColorProfile = rememberLauncherForActivityResult(
            contract = ActivityResultContracts.OpenDocument(),
        ) { uri ->
            uri?.let {
                val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
                context.contentResolver.takePersistableUriPermission(uri, flags)
                basePreferences.displayProfile().set(uri.toString())
            }
        }
        return Preference.PreferenceGroup(
            title = stringResource(MR.strings.pref_category_reader),
            preferenceItems = persistentListOf(
                Preference.PreferenceItem.TextPreference(
                    title = stringResource(MR.strings.pref_display_profile),
                    subtitle = basePreferences.displayProfile().get(),
                    onClick = {
                        chooseColorProfile.launch(arrayOf("*/*"))
                    },
                ),
            ),
        )
    }
    @Composable
    private fun getExtensionsGroup(
        basePreferences: BasePreferences,
@@ -180,11 +180,15 @@ object SettingsAppearanceScreen : SearchableSettings {
                Preference.PreferenceItem.SliderPreference(
                    value = previewsRowCount,
                    title = stringResource(SYMR.strings.pref_previews_row_count),
-                    subtitle = if (previewsRowCount > 0) pluralStringResource(
+                    subtitle = if (previewsRowCount > 0) {
-                        SYMR.plurals.row_count,
+                        pluralStringResource(
-                        previewsRowCount,
+                            SYMR.plurals.row_count,
-                        previewsRowCount,
+                            previewsRowCount,
-                    ) else stringResource(MR.strings.disabled),
+                            previewsRowCount,
                        )
                    } else {
                        stringResource(MR.strings.disabled)
                    },
                    min = 0,
                    max = 10,
                    onValueChanged = {
@@ -2,6 +2,7 @@ package eu.kanade.presentation.more.settings.screen
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -17,6 +18,7 @@ import eu.kanade.presentation.more.settings.screen.browse.ExtensionReposScreen
 import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryScreen
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate
 import kotlinx.collections.immutable.persistentListOf
 import mihon.domain.extensionrepo.interactor.GetExtensionRepoCount
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.domain.UnsortedPreferences
 import tachiyomi.i18n.MR
@@ -39,7 +41,9 @@ object SettingsBrowseScreen : SearchableSettings {
        val navigator = LocalNavigator.currentOrThrow
        val sourcePreferences = remember { Injekt.get<SourcePreferences>() }
-        val reposCount by sourcePreferences.extensionRepos().collectAsState()
+        val getExtensionRepoCount = remember { Injekt.get<GetExtensionRepoCount>() }
        val reposCount by getExtensionRepoCount.subscribe().collectAsState(0)
        // SY -->
        val scope = rememberCoroutineScope()
@@ -90,7 +94,7 @@ object SettingsBrowseScreen : SearchableSettings {
                        pref = uiPreferences.feedTabInFront(),
                        title = stringResource(SYMR.strings.pref_feed_position),
                        subtitle = stringResource(SYMR.strings.pref_feed_position_summery),
-                        enabled = hideFeedTab.not()
+                        enabled = hideFeedTab.not(),
                    ),
                ),
            ),
@@ -104,7 +108,7 @@ object SettingsBrowseScreen : SearchableSettings {
                    ),
                    Preference.PreferenceItem.TextPreference(
                        title = stringResource(MR.strings.label_extension_repos),
-                        subtitle = pluralStringResource(MR.plurals.num_repos, reposCount.size, reposCount.size),
+                        subtitle = pluralStringResource(MR.plurals.num_repos, reposCount, reposCount),
                        onClick = {
                            navigator.push(ExtensionReposScreen())
                        },
@@ -127,7 +127,17 @@ object SettingsDataScreen : SearchableSettings {
                val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                context.contentResolver.takePersistableUriPermission(uri, flags)
+                // For some reason InkBook devices do not implement the SAF properly. Persistable URI grants do not
                // work. However, simply retrieving the URI and using it works fine for these devices. Access is not
                // revoked after the app is closed or the device is restarted.
                // This also holds for some Samsung devices. Thus, we simply execute inside of a try-catch block and
                // ignore the exception if it is thrown.
                try {
                    context.contentResolver.takePersistableUriPermission(uri, flags)
                } catch (e: SecurityException) {
                    logcat(LogPriority.ERROR, e)
                    context.toast(MR.strings.file_picker_uri_permission_unsupported)
                }
                UniFile.fromUri(context, uri)?.let {
                    storageDirPref.set(it.uri.toString())
@@ -349,15 +359,15 @@ object SettingsDataScreen : SearchableSettings {
    private fun getSyncPreferences(syncPreferences: SyncPreferences, syncService: Int): List<Preference> {
        return listOf(
            Preference.PreferenceGroup(
-                title = stringResource(MR.strings.pref_sync_service_category),
+                title = stringResource(SYMR.strings.pref_sync_service_category),
                preferenceItems = persistentListOf(
                    Preference.PreferenceItem.ListPreference(
                        pref = syncPreferences.syncService(),
-                        title = stringResource(MR.strings.pref_sync_service),
+                        title = stringResource(SYMR.strings.pref_sync_service),
                        entries = persistentMapOf(
                            SyncManager.SyncService.NONE.value to stringResource(MR.strings.off),
-                            SyncManager.SyncService.SYNCYOMI.value to stringResource(MR.strings.syncyomi),
+                            SyncManager.SyncService.SYNCYOMI.value to stringResource(SYMR.strings.syncyomi),
-                            SyncManager.SyncService.GOOGLE_DRIVE.value to stringResource(MR.strings.google_drive),
+                            SyncManager.SyncService.GOOGLE_DRIVE.value to stringResource(SYMR.strings.google_drive),
                        ),
                        onValueChanged = { true },
                    ),
@@ -384,11 +394,23 @@ object SettingsDataScreen : SearchableSettings {
        syncServiceType: SyncManager.SyncService,
        syncPreferences: SyncPreferences,
    ): List<Preference> {
-        return when (syncServiceType) {
+        val navigator = LocalNavigator.currentOrThrow
        val preferences = when (syncServiceType) {
            SyncManager.SyncService.NONE -> emptyList()
            SyncManager.SyncService.SYNCYOMI -> getSelfHostPreferences(syncPreferences)
            SyncManager.SyncService.GOOGLE_DRIVE -> getGoogleDrivePreferences()
        }
        return if (syncServiceType != SyncManager.SyncService.NONE) {
            preferences + Preference.PreferenceItem.TextPreference(
                title = stringResource(SYMR.strings.pref_choose_what_to_sync),
                onClick = {
                    navigator.push(SyncSettingsSelector())
                },
            )
        } else {
            preferences
        }
    }
    @Composable
@@ -402,7 +424,7 @@ object SettingsDataScreen : SearchableSettings {
        val googleDriveSync = Injekt.get<GoogleDriveService>()
        return listOf(
            Preference.PreferenceItem.TextPreference(
-                title = stringResource(MR.strings.pref_google_drive_sign_in),
+                title = stringResource(SYMR.strings.pref_google_drive_sign_in),
                onClick = {
                    val intent = googleDriveSync.getSignInIntent()
                    context.startActivity(intent)
@@ -427,19 +449,19 @@ object SettingsDataScreen : SearchableSettings {
                        val result = googleDriveSync.deleteSyncDataFromGoogleDrive()
                        when (result) {
                            GoogleDriveSyncService.DeleteSyncDataStatus.NOT_INITIALIZED -> context.toast(
-                                MR.strings.google_drive_not_signed_in,
+                                SYMR.strings.google_drive_not_signed_in,
                                duration = 5000,
                            )
                            GoogleDriveSyncService.DeleteSyncDataStatus.NO_FILES -> context.toast(
-                                MR.strings.google_drive_sync_data_not_found,
+                                SYMR.strings.google_drive_sync_data_not_found,
                                duration = 5000,
                            )
                            GoogleDriveSyncService.DeleteSyncDataStatus.SUCCESS -> context.toast(
-                                MR.strings.google_drive_sync_data_purged,
+                                SYMR.strings.google_drive_sync_data_purged,
                                duration = 5000,
                            )
                            GoogleDriveSyncService.DeleteSyncDataStatus.ERROR -> context.toast(
-                                MR.strings.google_drive_sync_data_purge_error,
+                                SYMR.strings.google_drive_sync_data_purge_error,
                                duration = 10000,
                            )
                        }
@@ -450,7 +472,7 @@ object SettingsDataScreen : SearchableSettings {
        }
        return Preference.PreferenceItem.TextPreference(
-            title = stringResource(MR.strings.pref_google_drive_purge_sync_data),
+            title = stringResource(SYMR.strings.pref_google_drive_purge_sync_data),
            onClick = { showPurgeDialog = true },
        )
    }
@@ -462,8 +484,8 @@ object SettingsDataScreen : SearchableSettings {
    ) {
        AlertDialog(
            onDismissRequest = onDismissRequest,
-            title = { Text(text = stringResource(MR.strings.pref_purge_confirmation_title)) },
+            title = { Text(text = stringResource(SYMR.strings.pref_purge_confirmation_title)) },
-            text = { Text(text = stringResource(MR.strings.pref_purge_confirmation_message)) },
+            text = { Text(text = stringResource(SYMR.strings.pref_purge_confirmation_message)) },
            dismissButton = {
                TextButton(onClick = onDismissRequest) {
                    Text(text = stringResource(MR.strings.action_cancel))
@@ -482,8 +504,8 @@ object SettingsDataScreen : SearchableSettings {
        val scope = rememberCoroutineScope()
        return listOf(
            Preference.PreferenceItem.EditTextPreference(
-                title = stringResource(MR.strings.pref_sync_host),
+                title = stringResource(SYMR.strings.pref_sync_host),
-                subtitle = stringResource(MR.strings.pref_sync_host_summ),
+                subtitle = stringResource(SYMR.strings.pref_sync_host_summ),
                pref = syncPreferences.clientHost(),
                onValueChanged = { newValue ->
                    scope.launch {
@@ -496,8 +518,8 @@ object SettingsDataScreen : SearchableSettings {
                },
            ),
            Preference.PreferenceItem.EditTextPreference(
-                title = stringResource(MR.strings.pref_sync_api_key),
+                title = stringResource(SYMR.strings.pref_sync_api_key),
-                subtitle = stringResource(MR.strings.pref_sync_api_key_summ),
+                subtitle = stringResource(SYMR.strings.pref_sync_api_key_summ),
                pref = syncPreferences.clientAPIKey(),
            ),
        )
@@ -505,16 +527,20 @@ object SettingsDataScreen : SearchableSettings {
    @Composable
    private fun getSyncNowPref(): Preference.PreferenceGroup {
-        val navigator = LocalNavigator.currentOrThrow
+        val context = LocalContext.current
        return Preference.PreferenceGroup(
-            title = stringResource(MR.strings.pref_sync_now_group_title),
+            title = stringResource(SYMR.strings.pref_sync_now_group_title),
            preferenceItems = persistentListOf(
                getSyncOptionsPref(),
                Preference.PreferenceItem.TextPreference(
-                    title = stringResource(MR.strings.pref_sync_now),
+                    title = stringResource(SYMR.strings.pref_sync_now),
-                    subtitle = stringResource(MR.strings.pref_sync_now_subtitle),
+                    subtitle = stringResource(SYMR.strings.pref_sync_now_subtitle),
                    onClick = {
-                        navigator.push(SyncSettingsSelector())
+                        if (!SyncDataJob.isRunning(context)) {
                            SyncDataJob.startNow(context)
                        } else {
                            context.toast(SYMR.strings.sync_in_progress)
                        }
                    },
                ),
            ),
@@ -525,8 +551,8 @@ object SettingsDataScreen : SearchableSettings {
    private fun getSyncOptionsPref(): Preference.PreferenceItem.TextPreference {
        val navigator = LocalNavigator.currentOrThrow
        return Preference.PreferenceItem.TextPreference(
-            title = stringResource(MR.strings.pref_sync_options),
+            title = stringResource(SYMR.strings.pref_sync_options),
-            subtitle = stringResource(MR.strings.pref_sync_options_summ),
+            subtitle = stringResource(SYMR.strings.pref_sync_options_summ),
            onClick = { navigator.push(SyncTriggerOptionsScreen()) },
        )
    }
@@ -538,16 +564,16 @@ object SettingsDataScreen : SearchableSettings {
        val lastSync by syncPreferences.lastSyncTimestamp().collectAsState()
        return Preference.PreferenceGroup(
-            title = stringResource(MR.strings.pref_sync_automatic_category),
+            title = stringResource(SYMR.strings.pref_sync_automatic_category),
            preferenceItems = persistentListOf(
                Preference.PreferenceItem.ListPreference(
                    pref = syncIntervalPref,
-                    title = stringResource(MR.strings.pref_sync_interval),
+                    title = stringResource(SYMR.strings.pref_sync_interval),
                    entries = persistentMapOf(
                        0 to stringResource(MR.strings.off),
-                        30 to stringResource(MR.strings.update_30min),
+                        30 to stringResource(SYMR.strings.update_30min),
-                        60 to stringResource(MR.strings.update_1hour),
+                        60 to stringResource(SYMR.strings.update_1hour),
-                        180 to stringResource(MR.strings.update_3hour),
+                        180 to stringResource(SYMR.strings.update_3hour),
                        360 to stringResource(MR.strings.update_6hour),
                        720 to stringResource(MR.strings.update_12hour),
                        1440 to stringResource(MR.strings.update_24hour),
@@ -560,7 +586,7 @@ object SettingsDataScreen : SearchableSettings {
                    },
                ),
                Preference.PreferenceItem.InfoPreference(
-                    stringResource(MR.strings.last_synchronization, relativeTimeSpanString(lastSync)),
+                    stringResource(SYMR.strings.last_synchronization, relativeTimeSpanString(lastSync)),
                ),
            ),
        )
@@ -15,7 +15,6 @@ import eu.kanade.presentation.more.settings.widget.TriStateListDialog
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.runBlocking
 import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.download.service.DownloadPreferences
@@ -35,7 +34,7 @@ object SettingsDownloadScreen : SearchableSettings {
    @Composable
    override fun getPreferences(): List<Preference> {
        val getCategories = remember { Injekt.get<GetCategories>() }
-        val allCategories by getCategories.subscribe().collectAsState(initial = runBlocking { getCategories.await() })
+        val allCategories by getCategories.subscribe().collectAsState(initial = emptyList())
        val downloadPreferences = remember { Injekt.get<DownloadPreferences>() }
        return listOf(
@@ -120,6 +119,7 @@ object SettingsDownloadScreen : SearchableSettings {
        allCategories: List<Category>,
    ): Preference.PreferenceGroup {
        val downloadNewChaptersPref = downloadPreferences.downloadNewChapters()
        val downloadNewUnreadChaptersOnlyPref = downloadPreferences.downloadNewUnreadChaptersOnly()
        val downloadNewChapterCategoriesPref = downloadPreferences.downloadNewChapterCategories()
        val downloadNewChapterCategoriesExcludePref = downloadPreferences.downloadNewChapterCategoriesExclude()
@@ -152,6 +152,11 @@ object SettingsDownloadScreen : SearchableSettings {
                    pref = downloadNewChaptersPref,
                    title = stringResource(MR.strings.pref_download_new),
                ),
                Preference.PreferenceItem.SwitchPreference(
                    pref = downloadNewUnreadChaptersOnlyPref,
                    title = stringResource(MR.strings.pref_download_new_unread_chapters_only),
                    enabled = downloadNewChapters,
                ),
                Preference.PreferenceItem.TextPreference(
                    title = stringResource(MR.strings.categories),
                    subtitle = getCategoriesLabel(
@@ -25,7 +25,6 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import tachiyomi.domain.UnsortedPreferences
 import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.category.interactor.ResetCategoryFlags
@@ -57,9 +56,7 @@ object SettingsLibraryScreen : SearchableSettings {
    override fun getPreferences(): List<Preference> {
        val getCategories = remember { Injekt.get<GetCategories>() }
        val libraryPreferences = remember { Injekt.get<LibraryPreferences>() }
-        val allCategories by getCategories.subscribe().collectAsState(
+        val allCategories by getCategories.subscribe().collectAsState(initial = emptyList())
            initial = runBlocking { getCategories.await() },
        )
        // SY -->
        val unsortedPreferences = remember { Injekt.get<UnsortedPreferences>() }
        // SY <--
@@ -84,9 +81,6 @@ object SettingsLibraryScreen : SearchableSettings {
        val scope = rememberCoroutineScope()
        val userCategoriesCount = allCategories.filterNot(Category::isSystemCategory).size
        val defaultCategory by libraryPreferences.defaultCategory().collectAsState()
        val selectedCategory = allCategories.find { it.id == defaultCategory.toLong() }
        // For default category
        val ids = listOf(libraryPreferences.defaultCategory().defaultValue()) +
            allCategories.fastMap { it.id.toInt() }
@@ -108,7 +102,6 @@ object SettingsLibraryScreen : SearchableSettings {
                Preference.PreferenceItem.ListPreference(
                    pref = libraryPreferences.defaultCategory(),
                    title = stringResource(MR.strings.default_category),
                    subtitle = selectedCategory?.visualName ?: stringResource(MR.strings.default_category_summary),
                    entries = ids.zip(labels).toMap().toImmutableMap(),
                ),
                Preference.PreferenceItem.SwitchPreference(
@@ -17,6 +17,7 @@ import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableMap
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.i18n.pluralStringResource
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState
 import uy.kohesive.injekt.Injekt
@@ -35,6 +36,7 @@ object SettingsReaderScreen : SearchableSettings {
        // SY -->
        val forceHorizontalSeekbar by readerPref.forceHorizontalSeekbar().collectAsState()
        // SY <--
        return listOf(
            Preference.PreferenceItem.ListPreference(
                pref = readerPref.defaultReadingMode(),
@@ -81,24 +83,14 @@ object SettingsReaderScreen : SearchableSettings {
                enabled = !forceHorizontalSeekbar,
            ),
            // SY <--
            Preference.PreferenceItem.SwitchPreference(
                pref = readerPref.trueColor(),
                title = stringResource(MR.strings.pref_true_color),
                subtitle = stringResource(MR.strings.pref_true_color_summary),
                enabled = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O,
            ),
            /* SY -->
            Preference.PreferenceItem.SwitchPreference(
                pref = readerPref.pageTransitions(),
                title = stringResource(MR.strings.pref_page_transitions),
            ),
            SY <-- */
            Preference.PreferenceItem.SwitchPreference(
                pref = readerPref.flashOnPageChange(),
                title = stringResource(MR.strings.pref_flash_page),
                subtitle = stringResource(MR.strings.pref_flash_page_summ),
            ),
            getDisplayGroup(readerPreferences = readerPref),
            getEInkGroup(readerPreferences = readerPref),
            getReadingGroup(readerPreferences = readerPref),
            getPagedGroup(readerPreferences = readerPref),
            getWebtoonGroup(readerPreferences = readerPref),
@@ -161,6 +153,65 @@ object SettingsReaderScreen : SearchableSettings {
        )
    }
    @Composable
    private fun getEInkGroup(readerPreferences: ReaderPreferences): Preference.PreferenceGroup {
        val flashPageState by readerPreferences.flashOnPageChange().collectAsState()
        val flashMillisPref = readerPreferences.flashDurationMillis()
        val flashMillis by flashMillisPref.collectAsState()
        val flashIntervalPref = readerPreferences.flashPageInterval()
        val flashInterval by flashIntervalPref.collectAsState()
        val flashColorPref = readerPreferences.flashColor()
        return Preference.PreferenceGroup(
            title = "E-Ink",
            preferenceItems = persistentListOf(
                Preference.PreferenceItem.SwitchPreference(
                    pref = readerPreferences.flashOnPageChange(),
                    title = stringResource(MR.strings.pref_flash_page),
                    subtitle = stringResource(MR.strings.pref_flash_page_summ),
                ),
                Preference.PreferenceItem.SliderPreference(
                    value = flashMillis / ReaderPreferences.MILLI_CONVERSION,
                    min = 1,
                    max = 15,
                    title = stringResource(MR.strings.pref_flash_duration),
                    subtitle = stringResource(MR.strings.pref_flash_duration_summary, flashMillis),
                    onValueChanged = {
                        flashMillisPref.set(it * ReaderPreferences.MILLI_CONVERSION)
                        true
                    },
                    enabled = flashPageState,
                ),
                Preference.PreferenceItem.SliderPreference(
                    value = flashInterval,
                    min = 1,
                    max = 10,
                    title = stringResource(MR.strings.pref_flash_page_interval),
                    subtitle = pluralStringResource(MR.plurals.pref_pages, flashInterval, flashInterval),
                    onValueChanged = {
                        flashIntervalPref.set(it)
                        true
                    },
                    enabled = flashPageState,
                ),
                Preference.PreferenceItem.ListPreference(
                    pref = flashColorPref,
                    title = stringResource(MR.strings.pref_flash_with),
                    entries = persistentMapOf(
                        ReaderPreferences.FlashColor.BLACK to stringResource(MR.strings.pref_flash_style_black),
                        ReaderPreferences.FlashColor.WHITE to stringResource(MR.strings.pref_flash_style_white),
                        ReaderPreferences.FlashColor.WHITE_BLACK
                            to stringResource(MR.strings.pref_flash_style_white_black),
                    ),
                    enabled = flashPageState,
                ),
            ),
        )
    }
    @Composable
    private fun getReadingGroup(readerPreferences: ReaderPreferences): Preference.PreferenceGroup {
        return Preference.PreferenceGroup(
@@ -13,8 +13,10 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.text.input.TextFieldLineLimits
 import androidx.compose.foundation.text.input.clearText
 import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material3.HorizontalDivider
@@ -28,11 +30,8 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.NonRestartableComposable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -43,7 +42,6 @@ import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
@@ -88,9 +86,7 @@ class SettingsSearchScreen : Screen() {
            focusRequester.requestFocus()
        }
-        var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        val textFieldState = rememberTextFieldState()
            mutableStateOf(TextFieldValue())
        }
        Scaffold(
            topBar = {
                Column {
@@ -105,20 +101,19 @@ class SettingsSearchScreen : Screen() {
                        },
                        title = {
                            BasicTextField(
-                                value = textFieldValue,
+                                state = textFieldState,
                                onValueChange = { textFieldValue = it },
                                modifier = Modifier
                                    .fillMaxWidth()
                                    .focusRequester(focusRequester)
                                    .runOnEnterKeyPressed(action = focusManager::clearFocus),
                                textStyle = MaterialTheme.typography.bodyLarge
                                    .copy(color = MaterialTheme.colorScheme.onSurface),
-                                singleLine = true,
+                                lineLimits = TextFieldLineLimits.SingleLine,
                                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-                                keyboardActions = KeyboardActions(onSearch = { focusManager.clearFocus() }),
+                                onKeyboardAction = { focusManager.clearFocus() },
                                cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
-                                decorationBox = {
+                                decorator = {
-                                    if (textFieldValue.text.isEmpty()) {
+                                    if (textFieldState.text.isEmpty()) {
                                        Text(
                                            text = stringResource(MR.strings.action_search_settings),
                                            color = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -130,8 +125,8 @@ class SettingsSearchScreen : Screen() {
                            )
                        },
                        actions = {
-                            if (textFieldValue.text.isNotEmpty()) {
+                            if (textFieldState.text.isNotEmpty()) {
-                                IconButton(onClick = { textFieldValue = TextFieldValue() }) {
+                                IconButton(onClick = { textFieldState.clearText() }) {
                                    Icon(
                                        imageVector = Icons.Outlined.Close,
                                        contentDescription = null,
@@ -146,7 +141,7 @@ class SettingsSearchScreen : Screen() {
            },
        ) { contentPadding ->
            SearchResult(
-                searchKey = textFieldValue.text,
+                searchKey = textFieldState.text.toString(),
                listState = listState,
                contentPadding = contentPadding,
            ) { result ->
@@ -45,6 +45,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import dev.icerock.moko.resources.StringResource
 import eu.kanade.presentation.more.settings.Preference
 import eu.kanade.tachiyomi.core.security.PrivacyPreferences
 import eu.kanade.tachiyomi.core.security.SecurityPreferences
 import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
 import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesScreen
@@ -70,10 +71,20 @@ object SettingsSecurityScreen : SearchableSettings {
    @Composable
    override fun getPreferences(): List<Preference> {
        val context = LocalContext.current
        val securityPreferences = remember { Injekt.get<SecurityPreferences>() }
-        val authSupported = remember { context.isAuthenticationSupported() }
+        val privacyPreferences = remember { Injekt.get<PrivacyPreferences>() }
        return listOf(
            getSecurityGroup(securityPreferences),
            getFirebaseGroup(privacyPreferences),
        )
    }
    @Composable
    private fun getSecurityGroup(
        securityPreferences: SecurityPreferences,
    ): Preference.PreferenceGroup {
        val context = LocalContext.current
        val authSupported = remember { context.isAuthenticationSupported() }
        val useAuthPref = securityPreferences.useAuthenticator()
        val useAuth by useAuthPref.collectAsState()
@@ -81,129 +92,132 @@ object SettingsSecurityScreen : SearchableSettings {
        val isCbzPasswordSet by remember { CbzCrypto.isPasswordSetState(scope) }.collectAsState()
        val passwordProtectDownloads by securityPreferences.passwordProtectDownloads().collectAsState()
-        return listOf(
+        return Preference.PreferenceGroup(
-            Preference.PreferenceItem.SwitchPreference(
+            title = stringResource(MR.strings.pref_security),
-                pref = useAuthPref,
+            preferenceItems = persistentListOf(
-                title = stringResource(MR.strings.lock_with_biometrics),
+                Preference.PreferenceItem.SwitchPreference(
-                enabled = authSupported,
+                    pref = useAuthPref,
-                onValueChanged = {
+                    title = stringResource(MR.strings.lock_with_biometrics),
-                    (context as FragmentActivity).authenticate(
+                    enabled = authSupported,
-                        title = context.stringResource(MR.strings.lock_with_biometrics),
+                    onValueChanged = {
-                    )
+                        (context as FragmentActivity).authenticate(
-                },
+                            title = context.stringResource(MR.strings.lock_with_biometrics),
-            ),
+                        )
-            Preference.PreferenceItem.ListPreference(
+                    },
-                pref = securityPreferences.lockAppAfter(),
+                ),
-                title = stringResource(MR.strings.lock_when_idle),
+                Preference.PreferenceItem.ListPreference(
-                enabled = authSupported && useAuth,
+                    pref = securityPreferences.lockAppAfter(),
-                entries = LockAfterValues
+                    title = stringResource(MR.strings.lock_when_idle),
-                    .associateWith {
+                    enabled = authSupported && useAuth,
-                        when (it) {
+                    entries = LockAfterValues
-                            -1 -> stringResource(MR.strings.lock_never)
+                        .associateWith {
-                            0 -> stringResource(MR.strings.lock_always)
+                            when (it) {
-                            else -> pluralStringResource(MR.plurals.lock_after_mins, count = it, it)
+                                -1 -> stringResource(MR.strings.lock_never)
                                0 -> stringResource(MR.strings.lock_always)
                                else -> pluralStringResource(MR.plurals.lock_after_mins, count = it, it)
                            }
                        }
                        .toImmutableMap(),
                    onValueChanged = {
                        (context as FragmentActivity).authenticate(
                            title = context.stringResource(MR.strings.lock_when_idle),
                        )
                    },
                ),
                Preference.PreferenceItem.SwitchPreference(
                    pref = securityPreferences.hideNotificationContent(),
                    title = stringResource(MR.strings.hide_notification_content),
                ),
                Preference.PreferenceItem.ListPreference(
                    pref = securityPreferences.secureScreen(),
                    title = stringResource(MR.strings.secure_screen),
                    entries = SecurityPreferences.SecureScreenMode.entries
                        .associateWith { stringResource(it.titleRes) }
                        .toImmutableMap(),
                ),
                // SY -->
                Preference.PreferenceItem.SwitchPreference(
                    pref = securityPreferences.passwordProtectDownloads(),
                    title = stringResource(SYMR.strings.password_protect_downloads),
                    subtitle = stringResource(SYMR.strings.password_protect_downloads_summary),
                    enabled = isCbzPasswordSet,
                ),
                Preference.PreferenceItem.ListPreference(
                    pref = securityPreferences.encryptionType(),
                    title = stringResource(SYMR.strings.encryption_type),
                    entries = SecurityPreferences.EncryptionType.entries
                        .associateWith { stringResource(it.titleRes) }
                        .toImmutableMap(),
                    enabled = passwordProtectDownloads,
                ),
                kotlin.run {
                    var dialogOpen by remember { mutableStateOf(false) }
                    if (dialogOpen) {
                        PasswordDialog(
                            onDismissRequest = { dialogOpen = false },
                            onReturnPassword = { password ->
                                dialogOpen = false
                                CbzCrypto.deleteKeyCbz()
                                securityPreferences.cbzPassword().set(CbzCrypto.encryptCbz(password.replace("\n", "")))
                            },
                        )
                    }
-                    .toImmutableMap(),
+                    Preference.PreferenceItem.TextPreference(
-                onValueChanged = {
+                        title = stringResource(SYMR.strings.set_cbz_zip_password),
-                    (context as FragmentActivity).authenticate(
+                        onClick = {
-                        title = context.stringResource(MR.strings.lock_when_idle),
+                            dialogOpen = true
                    )
                },
            ),
            Preference.PreferenceItem.SwitchPreference(
                pref = securityPreferences.hideNotificationContent(),
                title = stringResource(MR.strings.hide_notification_content),
            ),
            Preference.PreferenceItem.ListPreference(
                pref = securityPreferences.secureScreen(),
                title = stringResource(MR.strings.secure_screen),
                entries = SecurityPreferences.SecureScreenMode.entries
                    .associateWith { stringResource(it.titleRes) }
                    .toImmutableMap(),
            ),
            // SY -->
            Preference.PreferenceItem.SwitchPreference(
                pref = securityPreferences.passwordProtectDownloads(),
                title = stringResource(SYMR.strings.password_protect_downloads),
                subtitle = stringResource(SYMR.strings.password_protect_downloads_summary),
                enabled = isCbzPasswordSet,
            ),
            Preference.PreferenceItem.ListPreference(
                pref = securityPreferences.encryptionType(),
                title = stringResource(SYMR.strings.encryption_type),
                entries = SecurityPreferences.EncryptionType.entries
                    .associateWith { stringResource(it.titleRes) }
                    .toImmutableMap(),
                enabled = passwordProtectDownloads,
            ),
            kotlin.run {
                var dialogOpen by remember { mutableStateOf(false) }
                if (dialogOpen) {
                    PasswordDialog(
                        onDismissRequest = { dialogOpen = false },
                        onReturnPassword = { password ->
                            dialogOpen = false
                            CbzCrypto.deleteKeyCbz()
                            securityPreferences.cbzPassword().set(CbzCrypto.encryptCbz(password.replace("\n", "")))
                        },
                    )
                }
                Preference.PreferenceItem.TextPreference(
                    title = stringResource(SYMR.strings.set_cbz_zip_password),
                    onClick = {
                        dialogOpen = true
                    },
                )
            },
            Preference.PreferenceItem.TextPreference(
                title = stringResource(SYMR.strings.delete_cbz_archive_password),
                onClick = {
                    CbzCrypto.deleteKeyCbz()
                    securityPreferences.cbzPassword().set("")
                },
                enabled = isCbzPasswordSet,
            ),
            kotlin.run {
                val navigator = LocalNavigator.currentOrThrow
                val count by securityPreferences.authenticatorTimeRanges().collectAsState()
                Preference.PreferenceItem.TextPreference(
-                    title = stringResource(SYMR.strings.action_edit_biometric_lock_times),
+                    title = stringResource(SYMR.strings.delete_cbz_archive_password),
                    subtitle = pluralStringResource(
                        SYMR.plurals.num_lock_times,
                        count.size,
                        count.size,
                    ),
                    onClick = {
-                        navigator.push(BiometricTimesScreen())
+                        CbzCrypto.deleteKeyCbz()
                        securityPreferences.cbzPassword().set("")
                    },
-                    enabled = useAuth,
+                    enabled = isCbzPasswordSet,
-                )
+                ),
-            },
+                kotlin.run {
-            kotlin.run {
+                    val navigator = LocalNavigator.currentOrThrow
-                val selection by securityPreferences.authenticatorDays().collectAsState()
+                    val count by securityPreferences.authenticatorTimeRanges().collectAsState()
-                var dialogOpen by remember { mutableStateOf(false) }
+                    Preference.PreferenceItem.TextPreference(
-                if (dialogOpen) {
+                        title = stringResource(SYMR.strings.action_edit_biometric_lock_times),
-                    SetLockedDaysDialog(
+                        subtitle = pluralStringResource(
-                        onDismissRequest = { dialogOpen = false },
+                            SYMR.plurals.num_lock_times,
-                        initialSelection = selection,
+                            count.size,
-                        onDaysSelected = {
+                            count.size,
-                            dialogOpen = false
+                        ),
-                            securityPreferences.authenticatorDays().set(it)
+                        onClick = {
                            navigator.push(BiometricTimesScreen())
                        },
                        enabled = useAuth,
                    )
-                }
+                },
-                Preference.PreferenceItem.TextPreference(
+                kotlin.run {
-                    title = stringResource(SYMR.strings.biometric_lock_days),
+                    val selection by securityPreferences.authenticatorDays().collectAsState()
-                    subtitle = stringResource(SYMR.strings.biometric_lock_days_summary),
+                    var dialogOpen by remember { mutableStateOf(false) }
-                    onClick = { dialogOpen = true },
+                    if (dialogOpen) {
-                    enabled = useAuth,
+                        SetLockedDaysDialog(
-                )
+                            onDismissRequest = { dialogOpen = false },
-            },
+                            initialSelection = selection,
-            // SY <--
+                            onDaysSelected = {
-            Preference.PreferenceItem.InfoPreference(stringResource(MR.strings.secure_screen_summary)),
+                                dialogOpen = false
                                securityPreferences.authenticatorDays().set(it)
                            },
                        )
                    }
                    Preference.PreferenceItem.TextPreference(
                        title = stringResource(SYMR.strings.biometric_lock_days),
                        subtitle = stringResource(SYMR.strings.biometric_lock_days_summary),
                        onClick = { dialogOpen = true },
                        enabled = useAuth,
                    )
                },
                // SY <--
                Preference.PreferenceItem.InfoPreference(stringResource(MR.strings.secure_screen_summary)),
            ),
        )
    }
@@ -361,6 +375,28 @@ object SettingsSecurityScreen : SearchableSettings {
        )
    }
    // SY <--
    @Composable
    private fun getFirebaseGroup(
        privacyPreferences: PrivacyPreferences,
    ): Preference.PreferenceGroup {
        return Preference.PreferenceGroup(
            title = stringResource(MR.strings.pref_firebase),
            preferenceItems = persistentListOf(
                Preference.PreferenceItem.SwitchPreference(
                    pref = privacyPreferences.crashlytics(),
                    title = stringResource(MR.strings.onboarding_permission_crashlytics),
                    subtitle = stringResource(MR.strings.onboarding_permission_crashlytics_description),
                ),
                Preference.PreferenceItem.SwitchPreference(
                    pref = privacyPreferences.analytics(),
                    title = stringResource(MR.strings.onboarding_permission_analytics),
                    subtitle = stringResource(MR.strings.onboarding_permission_analytics_description),
                ),
                Preference.PreferenceItem.InfoPreference(stringResource(MR.strings.firebase_summary)),
            ),
        )
    }
 }
 private val LockAfterValues = persistentListOf(
@@ -40,6 +40,7 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import dev.icerock.moko.resources.StringResource
 import eu.kanade.domain.track.model.AutoTrackState
 import eu.kanade.domain.track.service.TrackPreferences
 import eu.kanade.presentation.more.settings.Preference
 import eu.kanade.tachiyomi.data.track.EnhancedTracker
@@ -53,6 +54,7 @@ import eu.kanade.tachiyomi.util.system.openInBrowser
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toPersistentMap
 import tachiyomi.core.common.util.lang.launchIO
 import tachiyomi.core.common.util.lang.withUIContext
 import tachiyomi.domain.source.service.SourceManager
@@ -85,6 +87,7 @@ object SettingsTrackingScreen : SearchableSettings {
        val trackPreferences = remember { Injekt.get<TrackPreferences>() }
        val trackerManager = remember { Injekt.get<TrackerManager>() }
        val sourceManager = remember { Injekt.get<SourceManager>() }
        val autoTrackStatePref = trackPreferences.autoUpdateTrackOnMarkRead()
        var dialog by remember { mutableStateOf<Any?>(null) }
        dialog?.run {
@@ -125,6 +128,13 @@ object SettingsTrackingScreen : SearchableSettings {
                pref = trackPreferences.autoUpdateTrack(),
                title = stringResource(MR.strings.pref_auto_update_manga_sync),
            ),
            Preference.PreferenceItem.ListPreference(
                pref = trackPreferences.autoUpdateTrackOnMarkRead(),
                title = stringResource(MR.strings.pref_auto_update_manga_on_mark_read),
                entries = AutoTrackState.entries
                    .associateWith { stringResource(it.titleRes) }
                    .toPersistentMap(),
            ),
            Preference.PreferenceGroup(
                title = stringResource(MR.strings.services),
                preferenceItems = persistentListOf(
@@ -56,10 +56,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 java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Locale
 object AboutScreen : Screen() {
@@ -293,11 +292,15 @@ object AboutScreen : Screen() {
    internal fun getFormattedBuildTime(): String {
        return try {
-            val df = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm'Z'", Locale.US)
+            LocalDateTime.ofInstant(
-                .withZone(ZoneId.of("UTC"))
+                Instant.parse(BuildConfig.BUILD_TIME),
-            val buildTime = LocalDateTime.from(df.parse(BuildConfig.BUILD_TIME))
+                ZoneId.systemDefault(),
-
+            )
-            buildTime!!.toDateTimestampString(UiPreferences.dateFormat(Injekt.get<UiPreferences>().dateFormat().get()))
+                .toDateTimestampString(
                    UiPreferences.dateFormat(
                        Injekt.get<UiPreferences>().dateFormat().get(),
                    ),
                )
        } catch (e: Exception) {
            BuildConfig.BUILD_TIME
        }
@@ -32,12 +32,13 @@ class OpenSourceLicensesScreen : Screen() {
                    .fillMaxSize(),
                contentPadding = contentPadding,
                onLibraryClick = {
-                    val libraryLicenseScreen = OpenSourceLibraryLicenseScreen(
+                    navigator.push(
-                        name = it.library.name,
+                        OpenSourceLibraryLicenseScreen(
-                        website = it.library.website,
+                            name = it.name,
-                        license = it.library.licenses.firstOrNull()?.htmlReadyLicenseContent.orEmpty(),
+                            website = it.website,
                            license = it.licenses.firstOrNull()?.htmlReadyLicenseContent.orEmpty(),
                        ),
                    )
                    navigator.push(libraryLicenseScreen)
                },
            )
        }
@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dp
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import kotlinx.serialization.Serializable
-import nl.adaptivity.xmlutil.AndroidXmlReader
+import nl.adaptivity.xmlutil.core.AndroidXmlReader
 import nl.adaptivity.xmlutil.serialization.XML
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
@@ -8,11 +8,15 @@ 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.more.settings.screen.browse.components.ExtensionRepoConfirmDialog
 import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionRepoConflictDialog
 import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionRepoCreateDialog
 import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionRepoDeleteDialog
 import eu.kanade.presentation.more.settings.screen.browse.components.ExtensionReposScreen
 import eu.kanade.presentation.util.Screen
 import eu.kanade.tachiyomi.util.system.openInBrowser
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.flow.collectLatest
 import tachiyomi.presentation.core.screens.LoadingScreen
@@ -29,7 +33,7 @@ class ExtensionReposScreen(
        val state by screenModel.state.collectAsState()
        LaunchedEffect(url) {
-            url?.let { screenModel.createRepo(it) }
+            url?.let { screenModel.showDialog(RepoDialog.Confirm(it)) }
        }
        if (state is RepoScreenState.Loading) {
@@ -42,17 +46,19 @@ class ExtensionReposScreen(
        ExtensionReposScreen(
            state = successState,
            onClickCreate = { screenModel.showDialog(RepoDialog.Create) },
            onOpenWebsite = { context.openInBrowser(it.website) },
            onClickDelete = { screenModel.showDialog(RepoDialog.Delete(it)) },
            onClickRefresh = { screenModel.refreshRepos() },
            navigateUp = navigator::pop,
        )
        when (val dialog = successState.dialog) {
            null -> {}
-            RepoDialog.Create -> {
+            is RepoDialog.Create -> {
                ExtensionRepoCreateDialog(
                    onDismissRequest = screenModel::dismissDialog,
                    onCreate = { screenModel.createRepo(it) },
-                    repos = successState.repos,
+                    repoUrls = successState.repos.map { it.baseUrl }.toImmutableSet(),
                )
            }
            is RepoDialog.Delete -> {
@@ -62,6 +68,21 @@ class ExtensionReposScreen(
                    repo = dialog.repo,
                )
            }
            is RepoDialog.Conflict -> {
                ExtensionRepoConflictDialog(
                    onDismissRequest = screenModel::dismissDialog,
                    onMigrate = { screenModel.replaceRepo(dialog.newRepo) },
                    oldRepo = dialog.oldRepo,
                    newRepo = dialog.newRepo,
                )
            }
            is RepoDialog.Confirm -> {
                ExtensionRepoConfirmDialog(
                    onDismissRequest = screenModel::dismissDialog,
                    onCreate = { screenModel.createRepo(dialog.url) },
                    repo = dialog.url,
                )
            }
        }
        LaunchedEffect(Unit) {
@@ -4,24 +4,29 @@ import androidx.compose.runtime.Immutable
 import cafe.adriel.voyager.core.model.StateScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
 import dev.icerock.moko.resources.StringResource
 import eu.kanade.domain.extension.interactor.CreateExtensionRepo
 import eu.kanade.domain.extension.interactor.DeleteExtensionRepo
 import eu.kanade.domain.extension.interactor.GetExtensionRepos
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
 import mihon.domain.extensionrepo.interactor.CreateExtensionRepo
 import mihon.domain.extensionrepo.interactor.DeleteExtensionRepo
 import mihon.domain.extensionrepo.interactor.GetExtensionRepo
 import mihon.domain.extensionrepo.interactor.ReplaceExtensionRepo
 import mihon.domain.extensionrepo.interactor.UpdateExtensionRepo
 import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.core.common.util.lang.launchIO
 import tachiyomi.i18n.MR
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 class ExtensionReposScreenModel(
-    private val getExtensionRepos: GetExtensionRepos = Injekt.get(),
+    private val getExtensionRepo: GetExtensionRepo = Injekt.get(),
    private val createExtensionRepo: CreateExtensionRepo = Injekt.get(),
    private val deleteExtensionRepo: DeleteExtensionRepo = Injekt.get(),
    private val replaceExtensionRepo: ReplaceExtensionRepo = Injekt.get(),
    private val updateExtensionRepo: UpdateExtensionRepo = Injekt.get(),
 ) : StateScreenModel<RepoScreenState>(RepoScreenState.Loading) {
    private val _events: Channel<RepoEvent> = Channel(Int.MAX_VALUE)
@@ -29,7 +34,7 @@ class ExtensionReposScreenModel(
    init {
        screenModelScope.launchIO {
-            getExtensionRepos.subscribe()
+            getExtensionRepo.subscribeAll()
                .collectLatest { repos ->
                    mutableState.update {
                        RepoScreenState.Success(
@@ -43,25 +48,51 @@ class ExtensionReposScreenModel(
    /**
     * Creates and adds a new repo to the database.
     *
-     * @param name The name of the repo to create.
+     * @param baseUrl The baseUrl of the repo to create.
     */
-    fun createRepo(name: String) {
+    fun createRepo(baseUrl: String) {
        screenModelScope.launchIO {
-            when (createExtensionRepo.await(name)) {
+            when (val result = createExtensionRepo.await(baseUrl)) {
-                is CreateExtensionRepo.Result.InvalidUrl -> _events.send(RepoEvent.InvalidUrl)
+                CreateExtensionRepo.Result.InvalidUrl -> _events.send(RepoEvent.InvalidUrl)
                CreateExtensionRepo.Result.RepoAlreadyExists -> _events.send(RepoEvent.RepoAlreadyExists)
                is CreateExtensionRepo.Result.DuplicateFingerprint -> {
                    showDialog(RepoDialog.Conflict(result.oldRepo, result.newRepo))
                }
                else -> {}
            }
        }
    }
    /**
-     * Deletes the given repo from the database.
+     * Inserts a repo to the database, replace a matching repo with the same signing key fingerprint if found.
     *
-     * @param repo The repo to delete.
+     * @param newRepo The repo to insert
     */
-    fun deleteRepo(repo: String) {
+    fun replaceRepo(newRepo: ExtensionRepo) {
        screenModelScope.launchIO {
-            deleteExtensionRepo.await(repo)
+            replaceExtensionRepo.await(newRepo)
        }
    }
    /**
     * Refreshes information for each repository.
     */
    fun refreshRepos() {
        val status = state.value
        if (status is RepoScreenState.Success) {
            screenModelScope.launchIO {
                updateExtensionRepo.awaitAll()
            }
        }
    }
    /**
     * Deletes the given repo from the database
     */
    fun deleteRepo(baseUrl: String) {
        screenModelScope.launchIO {
            deleteExtensionRepo.await(baseUrl)
        }
    }
@@ -87,11 +118,14 @@ class ExtensionReposScreenModel(
 sealed class RepoEvent {
    sealed class LocalizedMessage(val stringRes: StringResource) : RepoEvent()
    data object InvalidUrl : LocalizedMessage(MR.strings.invalid_repo_name)
    data object RepoAlreadyExists : LocalizedMessage(MR.strings.error_repo_exists)
 }
 sealed class RepoDialog {
    data object Create : RepoDialog()
    data class Delete(val repo: String) : RepoDialog()
    data class Conflict(val oldRepo: ExtensionRepo, val newRepo: ExtensionRepo) : RepoDialog()
    data class Confirm(val url: String) : RepoDialog()
 }
 sealed class RepoScreenState {
@@ -101,7 +135,8 @@ sealed class RepoScreenState {
    @Immutable
    data class Success(
-        val repos: ImmutableSet<String>,
+        val repos: ImmutableSet<ExtensionRepo>,
        val oldRepos: ImmutableSet<String>? = null,
        val dialog: RepoDialog? = null,
    ) : RepoScreenState() {
@@ -9,6 +9,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.Label
 import androidx.compose.material.icons.automirrored.outlined.OpenInNew
 import androidx.compose.material.icons.outlined.ContentCopy
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.ElevatedCard
@@ -22,15 +23,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import kotlinx.collections.immutable.ImmutableSet
 import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
@Composable
 fun ExtensionReposContent(
-    repos: ImmutableSet<String>,
+    repos: ImmutableSet<ExtensionRepo>,
    lazyListState: LazyListState,
    paddingValues: PaddingValues,
    onOpenWebsite: (ExtensionRepo) -> Unit,
    onClickDelete: (String) -> Unit,
    modifier: Modifier = Modifier,
 ) {
@@ -43,9 +46,10 @@ fun ExtensionReposContent(
        repos.forEach {
            item {
                ExtensionRepoListItem(
-                    modifier = Modifier.animateItemPlacement(),
+                    modifier = Modifier.animateItem(),
                    repo = it,
-                    onDelete = { onClickDelete(it) },
+                    onOpenWebsite = { onOpenWebsite(it) },
                    onDelete = { onClickDelete(it.baseUrl) },
                )
            }
        }
@@ -54,7 +58,8 @@ fun ExtensionReposContent(
@Composable
 private fun ExtensionRepoListItem(
-    repo: String,
+    repo: ExtensionRepo,
    onOpenWebsite: () -> Unit,
    onDelete: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
@@ -74,16 +79,27 @@ private fun ExtensionRepoListItem(
            verticalAlignment = Alignment.CenterVertically,
        ) {
            Icon(imageVector = Icons.AutoMirrored.Outlined.Label, contentDescription = null)
-            Text(text = repo, modifier = Modifier.padding(start = MaterialTheme.padding.medium))
+            Text(
                text = repo.name,
                modifier = Modifier.padding(start = MaterialTheme.padding.medium),
                style = MaterialTheme.typography.titleMedium,
            )
        }
        Row(
            modifier = Modifier.fillMaxWidth(),
            horizontalArrangement = Arrangement.End,
        ) {
            IconButton(onClick = onOpenWebsite) {
                Icon(
                    imageVector = Icons.AutoMirrored.Outlined.OpenInNew,
                    contentDescription = stringResource(MR.strings.action_open_in_browser),
                )
            }
            IconButton(
                onClick = {
-                    val url = "$repo/index.min.json"
+                    val url = "${repo.baseUrl}/index.min.json"
                    context.copyToClipboard(url, url)
                },
            ) {
@@ -1,6 +1,7 @@
 package eu.kanade.presentation.more.settings.screen.browse.components
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
@@ -14,8 +15,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.text.input.KeyboardType
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.coroutines.delay
 import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import kotlin.time.Duration.Companion.seconds
@@ -24,12 +27,12 @@ import kotlin.time.Duration.Companion.seconds
 fun ExtensionRepoCreateDialog(
    onDismissRequest: () -> Unit,
    onCreate: (String) -> Unit,
-    repos: ImmutableSet<String>,
+    repoUrls: ImmutableSet<String>,
 ) {
    var name by remember { mutableStateOf("") }
    val focusRequester = remember { FocusRequester() }
-    val nameAlreadyExists = remember(name) { repos.contains(name) }
+    val nameAlreadyExists = remember(name) { repoUrls.contains(name) }
    AlertDialog(
        onDismissRequest = onDismissRequest,
@@ -73,6 +76,7 @@ fun ExtensionRepoCreateDialog(
                        Text(text = stringResource(msgRes))
                    },
                    isError = name.isNotEmpty() && nameAlreadyExists,
                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri),
                    singleLine = true,
                )
            }
@@ -115,3 +119,68 @@ fun ExtensionRepoDeleteDialog(
        },
    )
 }
@Composable
 fun ExtensionRepoConflictDialog(
    oldRepo: ExtensionRepo,
    newRepo: ExtensionRepo,
    onDismissRequest: () -> Unit,
    onMigrate: () -> Unit,
 ) {
    AlertDialog(
        onDismissRequest = onDismissRequest,
        confirmButton = {
            TextButton(
                onClick = {
                    onMigrate()
                    onDismissRequest()
                },
            ) {
                Text(text = stringResource(MR.strings.action_replace_repo))
            }
        },
        dismissButton = {
            TextButton(onClick = onDismissRequest) {
                Text(text = stringResource(MR.strings.action_cancel))
            }
        },
        title = {
            Text(text = stringResource(MR.strings.action_replace_repo_title))
        },
        text = {
            Text(text = stringResource(MR.strings.action_replace_repo_message, newRepo.name, oldRepo.name))
        },
    )
 }
@Composable
 fun ExtensionRepoConfirmDialog(
    onDismissRequest: () -> Unit,
    onCreate: () -> Unit,
    repo: String,
 ) {
    AlertDialog(
        onDismissRequest = onDismissRequest,
        title = {
            Text(text = stringResource(MR.strings.action_add_repo))
        },
        text = {
            Text(text = stringResource(MR.strings.add_repo_confirmation, repo))
        },
        confirmButton = {
            TextButton(
                onClick = {
                    onCreate()
                    onDismissRequest()
                },
            ) {
                Text(text = stringResource(MR.strings.action_add))
            }
        },
        dismissButton = {
            TextButton(onClick = onDismissRequest) {
                Text(text = stringResource(MR.strings.action_cancel))
            }
        },
    )
 }
@@ -5,12 +5,17 @@ package eu.kanade.presentation.more.settings.screen.browse.components
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Refresh
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import eu.kanade.presentation.category.components.CategoryFloatingActionButton
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.more.settings.screen.browse.RepoScreenState
 import mihon.domain.extensionrepo.model.ExtensionRepo
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.components.material.padding
@@ -23,7 +28,9 @@ import tachiyomi.presentation.core.util.plus
 fun ExtensionReposScreen(
    state: RepoScreenState.Success,
    onClickCreate: () -> Unit,
    onOpenWebsite: (ExtensionRepo) -> Unit,
    onClickDelete: (String) -> Unit,
    onClickRefresh: () -> Unit,
    navigateUp: () -> Unit,
 ) {
    val lazyListState = rememberLazyListState()
@@ -33,6 +40,14 @@ fun ExtensionReposScreen(
                navigateUp = navigateUp,
                title = stringResource(MR.strings.label_extension_repos),
                scrollBehavior = scrollBehavior,
                actions = {
                    IconButton(onClick = onClickRefresh) {
                        Icon(
                            imageVector = Icons.Outlined.Refresh,
                            contentDescription = stringResource(resource = MR.strings.action_webview_refresh),
                        )
                    }
                },
            )
        },
        floatingActionButton = {
@@ -55,6 +70,7 @@ fun ExtensionReposScreen(
            lazyListState = lazyListState,
            paddingValues = paddingValues + topSmallPaddingValues +
                PaddingValues(horizontal = MaterialTheme.padding.medium),
            onOpenWebsite = onOpenWebsite,
            onClickDelete = onClickDelete,
        )
    }
@@ -6,7 +6,6 @@ import android.content.Intent
 import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.collectAsState
@@ -27,7 +26,6 @@ import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.update
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.LazyColumnWithAction
 import tachiyomi.presentation.core.components.SectionCard
@@ -69,7 +67,7 @@ class CreateBackupScreen : Screen() {
            LazyColumnWithAction(
                contentPadding = contentPadding,
                actionLabel = stringResource(MR.strings.action_create),
-                actionEnabled = state.options.anyEnabled(),
+                actionEnabled = state.options.canCreate(),
                onClickAction = {
                    if (!BackupCreateJob.isManualJobRunning(context)) {
                        try {
@@ -104,7 +102,7 @@ class CreateBackupScreen : Screen() {
    }
    @Composable
-    private fun ColumnScope.Options(
+    private fun Options(
        options: ImmutableList<BackupOptions.Entry>,
        state: CreateBackupScreenModel.State,
        model: CreateBackupScreenModel,
@@ -63,7 +63,7 @@ class RestoreBackupScreen(
            LazyColumnWithAction(
                contentPadding = contentPadding,
                actionLabel = stringResource(MR.strings.action_restore),
-                actionEnabled = state.canRestore && state.options.anyEnabled(),
+                actionEnabled = state.canRestore && state.options.canRestore(),
                onClickAction = {
                    model.startRestore()
                    navigator.pop()
@@ -5,7 +5,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
 import cafe.adriel.voyager.core.model.StateScreenModel
 import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
@@ -16,10 +15,10 @@ import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.util.Screen
 import eu.kanade.tachiyomi.data.backup.create.BackupOptions
 import eu.kanade.tachiyomi.data.sync.SyncDataJob
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.update
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.LazyColumnWithAction
 import tachiyomi.presentation.core.components.SectionCard
@@ -31,7 +30,6 @@ import uy.kohesive.injekt.api.get
 class SyncSettingsSelector : Screen() {
    @Composable
    override fun Content() {
        val context = LocalContext.current
        val navigator = LocalNavigator.currentOrThrow
        val model = rememberScreenModel { SyncSettingsSelectorModel() }
        val state by model.state.collectAsState()
@@ -39,7 +37,7 @@ class SyncSettingsSelector : Screen() {
        Scaffold(
            topBar = {
                AppBar(
-                    title = stringResource(MR.strings.pref_choose_what_to_sync),
+                    title = stringResource(SYMR.strings.pref_choose_what_to_sync),
                    navigateUp = navigator::pop,
                    scrollBehavior = it,
                )
@@ -47,15 +45,10 @@ class SyncSettingsSelector : Screen() {
        ) { contentPadding ->
            LazyColumnWithAction(
                contentPadding = contentPadding,
-                actionLabel = stringResource(MR.strings.label_sync),
+                actionLabel = stringResource(MR.strings.action_save),
-                actionEnabled = state.options.anyEnabled(),
+                actionEnabled = true,
                onClickAction = {
-                    if (!SyncDataJob.isAnyJobRunning(context)) {
+                    navigator.pop()
                        model.syncNow(context)
                        navigator.pop()
                    } else {
                        context.toast(MR.strings.sync_in_progress)
                    }
                },
            ) {
                item {
@@ -121,8 +114,15 @@ private class SyncSettingsSelectorModel(
                tracking = syncSettings.tracking,
                history = syncSettings.history,
                appSettings = syncSettings.appSettings,
                extensionRepoSettings = syncSettings.extensionRepoSettings,
                sourceSettings = syncSettings.sourceSettings,
                privateSettings = syncSettings.privateSettings,
                // SY -->
                customInfo = syncSettings.customInfo,
                readEntries = syncSettings.readEntries,
                savedSearches = syncSettings.savedSearches,
                // SY <--
            )
        }
@@ -134,8 +134,15 @@ private class SyncSettingsSelectorModel(
                tracking = backupOptions.tracking,
                history = backupOptions.history,
                appSettings = backupOptions.appSettings,
                extensionRepoSettings = backupOptions.extensionRepoSettings,
                sourceSettings = backupOptions.sourceSettings,
                privateSettings = backupOptions.privateSettings,
                // SY -->
                customInfo = backupOptions.customInfo,
                readEntries = backupOptions.readEntries,
                savedSearches = backupOptions.savedSearches,
                // SY <--
            )
        }
    }
@@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.data.sync.models.SyncTriggerOptions
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.update
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.LazyColumnWithAction
 import tachiyomi.presentation.core.components.SectionCard
@@ -34,7 +35,7 @@ class SyncTriggerOptionsScreen : Screen() {
        Scaffold(
            topBar = {
                AppBar(
-                    title = stringResource(MR.strings.pref_sync_options),
+                    title = stringResource(SYMR.strings.pref_sync_options),
                    navigateUp = navigator::pop,
                    scrollBehavior = it,
                )
@@ -43,13 +44,13 @@ class SyncTriggerOptionsScreen : Screen() {
            LazyColumnWithAction(
                contentPadding = contentPadding,
                actionLabel = stringResource(MR.strings.action_save),
-                actionEnabled = state.options.anyEnabled(),
+                actionEnabled = true,
                onClickAction = {
                    navigator.pop()
                },
            ) {
                item {
-                    SectionCard(MR.strings.label_triggers) {
+                    SectionCard(SYMR.strings.label_triggers) {
                        Options(SyncTriggerOptions.mainOptions, state, model)
                    }
                }
@@ -28,7 +28,7 @@ import tachiyomi.presentation.core.i18n.stringResource
 class BackupSchemaScreen : Screen() {
    companion object {
-        const val title = "Backup file schema"
+        const val TITLE = "Backup file schema"
    }
    @Composable
@@ -41,7 +41,7 @@ class BackupSchemaScreen : Screen() {
        Scaffold(
            topBar = {
                AppBar(
-                    title = title,
+                    title = TITLE,
                    navigateUp = navigator::pop,
                    actions = {
                        AppBarActions(
@@ -50,7 +50,7 @@ class BackupSchemaScreen : Screen() {
                                    title = stringResource(MR.strings.action_copy_to_clipboard),
                                    icon = Icons.Default.ContentCopy,
                                    onClick = {
-                                        context.copyToClipboard(title, schema)
+                                        context.copyToClipboard(TITLE, schema)
                                    },
                                ),
                            ),
@@ -31,11 +31,11 @@ class DebugInfoScreen : Screen() {
            itemsProvider = {
                listOf(
                    Preference.PreferenceItem.TextPreference(
-                        title = WorkerInfoScreen.title,
+                        title = WorkerInfoScreen.TITLE,
                        onClick = { navigator.push(WorkerInfoScreen()) },
                    ),
                    Preference.PreferenceItem.TextPreference(
-                        title = BackupSchemaScreen.title,
+                        title = BackupSchemaScreen.TITLE,
                        onClick = { navigator.push(BackupSchemaScreen()) },
                    ),
                    getAppInfoGroup(),
@@ -49,7 +49,7 @@ import java.time.ZoneId
 class WorkerInfoScreen : Screen() {
    companion object {
-        const val title = "Worker info"
+        const val TITLE = "Worker info"
    }
    @Composable
@@ -65,7 +65,7 @@ class WorkerInfoScreen : Screen() {
        Scaffold(
            topBar = {
                AppBar(
-                    title = title,
+                    title = TITLE,
                    navigateUp = navigator::pop,
                    actions = {
                        AppBarActions(
@@ -74,7 +74,7 @@ class WorkerInfoScreen : Screen() {
                                    title = stringResource(MR.strings.action_copy_to_clipboard),
                                    icon = Icons.Default.ContentCopy,
                                    onClick = {
-                                        context.copyToClipboard(title, enqueued + finished + running)
+                                        context.copyToClipboard(TITLE, enqueued + finished + running)
                                    },
                                ),
                            ),
@@ -159,7 +159,7 @@ class WorkerInfoScreen : Screen() {
                                    Injekt.get<UiPreferences>().dateFormat().get(),
                                ),
                            )
-                        appendLine("Next scheduled run: $timestamp",)
+                        appendLine("Next scheduled run: $timestamp")
                        appendLine("Attempt #${workInfo.runAttemptCount + 1}")
                    }
                    appendLine()
@@ -29,32 +29,24 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.core.app.ActivityCompat
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.domain.ui.model.AppTheme
 import eu.kanade.presentation.manga.components.MangaCover
 import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.tachiyomi.util.system.DeviceUtil
 import eu.kanade.tachiyomi.util.system.isDynamicColorAvailable
 import tachiyomi.core.common.preference.InMemoryPreferenceStore
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.secondaryItemAlpha
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.fullType
@Composable
 internal fun AppThemePreferenceWidget(
@@ -223,13 +215,12 @@ fun AppThemePreviewItem(
            contentAlignment = Alignment.BottomCenter,
        ) {
            Surface(
-                tonalElevation = 3.dp,
+                color = MaterialTheme.colorScheme.surfaceContainer,
            ) {
                Row(
                    modifier = Modifier
                        .height(32.dp)
                        .fillMaxWidth()
                        .background(MaterialTheme.colorScheme.surfaceVariant)
                        .padding(horizontal = 8.dp),
                    verticalAlignment = Alignment.CenterVertically,
                ) {
@@ -258,18 +249,18 @@ fun AppThemePreviewItem(
    }
 }
-@PreviewLightDark
+// @PreviewLightDark
-@Composable
+// @Composable
-private fun AppThemesListPreview() {
+// private fun AppThemesListPreview() {
-    var appTheme by remember { mutableStateOf(AppTheme.DEFAULT) }
+//    var appTheme by remember { mutableStateOf(AppTheme.DEFAULT) }
-    Injekt.addSingleton(fullType<UiPreferences>(), UiPreferences(InMemoryPreferenceStore()))
+//    Injekt.addSingleton(fullType<UiPreferences>(), UiPreferences(InMemoryPreferenceStore()))
-    TachiyomiTheme(appTheme = appTheme) {
+//    TachiyomiTheme(appTheme = appTheme) {
-        Surface {
+//        Surface {
-            AppThemesList(
+//            AppThemesList(
-                currentTheme = appTheme,
+//                currentTheme = appTheme,
-                amoled = false,
+//                amoled = false,
-                onItemClick = { appTheme = it },
+//                onItemClick = { appTheme = it },
-            )
+//            )
-        }
+//        }
-    }
+//    }
-}
+// }
@@ -26,8 +26,6 @@ import androidx.compose.ui.unit.dp
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.ScrollbarLazyColumn
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.isScrolledToEnd
 import tachiyomi.presentation.core.util.isScrolledToStart
@Composable
 fun <T> ListPreferenceWidget(
@@ -69,8 +67,8 @@ fun <T> ListPreferenceWidget(
                            }
                        }
                    }
-                    if (!state.isScrolledToStart()) HorizontalDivider(modifier = Modifier.align(Alignment.TopCenter))
+                    if (state.canScrollBackward) HorizontalDivider(modifier = Modifier.align(Alignment.TopCenter))
-                    if (!state.isScrolledToEnd()) HorizontalDivider(modifier = Modifier.align(Alignment.BottomCenter))
+                    if (state.canScrollForward) HorizontalDivider(modifier = Modifier.align(Alignment.BottomCenter))
                }
            },
            confirmButton = {
@@ -30,11 +30,11 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.isScrolledToEnd
 import tachiyomi.presentation.core.util.isScrolledToStart
 private enum class State {
-    CHECKED, INVERSED, UNCHECKED
+    CHECKED,
    INVERSED,
    UNCHECKED,
 }
@Composable
@@ -115,16 +115,8 @@ fun <T> TriStateListDialog(
                        }
                    }
-                    if (!listState.isScrolledToStart()) {
+                    if (listState.canScrollBackward) HorizontalDivider(modifier = Modifier.align(Alignment.TopCenter))
-                        HorizontalDivider(
+                    if (listState.canScrollForward) HorizontalDivider(modifier = Modifier.align(Alignment.BottomCenter))
                            modifier = Modifier.align(Alignment.TopCenter),
                        )
                    }
                    if (!listState.isScrolledToEnd()) {
                        HorizontalDivider(
                            modifier = Modifier.align(Alignment.BottomCenter),
                        )
                    }
                }
            }
        },
--- a/Show More
+++ b/Show More