Use feature flags in compose compiler plugin

And slight cleanup (cherry picked from commit 8f9a325895bb7b94c2ec92dd969094fc30b3b5e2)
fix(deps): update dependency com.android.tools.build:gradle to v8.6.0 (#1178 )
2024-09-01 11:39:34 -04:00 · 2024-09-01 11:39:27 -04:00 · 2024-09-01 11:39:20 -04:00 · 2024-09-01 11:39:12 -04:00 · 2024-09-01 11:38:46 -04:00 · 2024-09-01 11:38:36 -04:00
535 changed files with 7371 additions and 5692 deletions
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "labels": ["Dependencies"],
+  "includePaths": [".github/workflows/*", "gradle/sy.versions.toml"],
+}
@@ -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: |
@@ -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,4 +1,5 @@
 .gradle
+.kotlin
 /local.properties
 /.idea/workspace.xml
 .DS_Store
@@ -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)
- 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
+    - Change the `applicationId` in [`build.gradle.kts`](/app/build.gradle.kts)


 ### 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>
@@ -21,7 +21,7 @@ if (gradle.startParameter.taskRequests.toString().contains("Standard")) {

 // 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"
@@ -29,7 +29,7 @@ android {
    defaultConfig {
        applicationId = "eu.kanade.tachiyomi.sy"

-        versionCode = 68
+        versionCode = 69
        versionName = "1.10.5"

        buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
@@ -38,7 +38,7 @@ android {
        buildConfigField("boolean", "INCLUDE_UPDATER", "false")

        ndk {
-            abiFilters += SUPPORTED_ABIS
+            abiFilters += supportedAbis
        }
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -47,7 +47,7 @@ android {
        abi {
            isEnable = true
            reset()
-            include(*SUPPORTED_ABIS.toTypedArray())
+            include(*supportedAbis.toTypedArray())
            isUniversalApk = true
        }
    }
@@ -163,12 +163,14 @@ dependencies {
    implementation(compose.ui.util)
    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)
@@ -210,10 +212,6 @@ dependencies {
    // Disk
    implementation(libs.disklrucache)
    implementation(libs.unifile)
-    implementation(libs.bundles.archive)
-    // SY -->
-    implementation(libs.zip4j)
-    // SY <--

    // Preferences
    implementation(libs.preferencektx)
@@ -245,10 +243,6 @@ dependencies {
    implementation(libs.compose.webview)
    implementation(libs.compose.grid)

-
-    implementation(libs.google.api.services.drive)
-    implementation(libs.google.api.client.oauth)
-
    // Logging
    implementation(libs.logcat)

@@ -281,6 +275,10 @@ dependencies {
    // RatingBar (SY)
    implementation(sylibs.ratingbar)
    implementation(sylibs.composeRatingbar)
+
+    // Google drive
+    implementation(sylibs.google.api.services.drive)
+    implementation(sylibs.google.api.client.oauth)
 }

 androidComponents {
@@ -302,7 +300,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",
@@ -127,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.** { *; }
@@ -3,4 +3,4 @@
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    <monochrome android:drawable="@drawable/ic_tachi_monochrome_launcher" />
-</adaptive-icon>
+</adaptive-icon>
@@ -3,4 +3,4 @@
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    <monochrome android:drawable="@drawable/ic_tachi_monochrome_launcher" />
-</adaptive-icon>
+</adaptive-icon>
@@ -24,6 +24,7 @@ import eu.kanade.domain.track.interactor.RefreshTracks
 import eu.kanade.domain.track.interactor.SyncChapterProgressWithTrack
 import eu.kanade.domain.track.interactor.TrackChapter
 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
@@ -152,6 +153,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()) }
@@ -32,10 +32,11 @@ class GetEnabledSources(
            ) { a, b, c -> Triple(a, b, c) },
            // SY <--
            repository.getSources(),
-        ) { pinnedSourceIds,
-            (enabledLanguages, disabledSources, lastUsedSource),
-            (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter),
-            sources,
+        ) {
+                pinnedSourceIds,
+                (enabledLanguages, disabledSources, lastUsedSource),
+                (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,7 +13,7 @@ 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 lastSyncEtag() = preferenceStore.getString("sync_etag", "")

    fun syncInterval() = preferenceStore.getInt("sync_interval", 0)
    fun syncService() = preferenceStore.getInt("sync_service", 0)
@@ -29,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()
@@ -53,12 +53,14 @@ 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()
+            readEntries = preferenceStore.getBoolean("readEntries", true).get(),
+            savedSearches = preferenceStore.getBoolean("savedSearches", true).get(),
            // SY <--
        )
    }
@@ -70,12 +72,14 @@ 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 <--
    }

@@ -7,11 +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 readEntries: Boolean = true,
+    val savedSearches: Boolean = true,
    // SY <--
 )
@@ -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)
@@ -240,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) {
@@ -250,8 +250,8 @@ private fun DetailsHeader(
                                Update available: ${extension.hasUpdate}
                                Obsolete: ${extension.isObsolete}
                                Shared: ${extension.isShared}
-                                Repository: ${extension.repoUrl} 
-                                """.trimIndent()
+                                Repository: ${extension.repoUrl}
+                                """.trimIndent(),
                            )
                        }
                    }
@@ -219,7 +219,9 @@ private fun ExtensionContent(
                        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 +243,9 @@ private fun ExtensionContent(
                                    onOpenExtension(it)
                                }
                            }
-                            is Extension.Untrusted -> { trustState = it }
+                            is Extension.Untrusted -> {
+                                trustState = it
+                            }
                        }
                    },
                )
@@ -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
@@ -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
@@ -79,7 +79,7 @@ fun TabbedDialog(
                modifier = Modifier.animateContentSize(),
                state = pagerState,
                verticalAlignment = Alignment.Top,
-                pageContent = { page -> content(page) }
+                pageContent = { page -> content(page) },
            )
        }
    }
@@ -155,7 +155,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 +188,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) {
@@ -206,12 +207,11 @@ private fun ColumnScope.SortPage(
    }.collectAsState(initial = screenModel.libraryPreferences.sortTagsForLibrary().get().isNotEmpty())
    // SY <--

-    val trackerSortOption =
-        if (screenModel.trackers.isEmpty()) {
-            emptyList()
-        } else {
-            listOf(MR.strings.action_sort_tracker_score to LibrarySort.Type.TrackerMean)
-        }
+    val trackerSortOption = if (trackers.isEmpty()) {
+        emptyList()
+    } else {
+        listOf(MR.strings.action_sort_tracker_score to LibrarySort.Type.TrackerMean)
+    }

    listOfNotNull(
        MR.strings.action_sort_alpha to LibrarySort.Type.Alphabetical,
@@ -346,12 +346,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,
-            modifier = Modifier.size(ContinueReadingButtonSize),
+            onClick = onClick,
            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),
            )
        }
    }
@@ -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
@@ -578,6 +579,7 @@ private fun MangaScreenSmallImpl(

                    sharedChapterItems(
                        manga = state.manga,
+                        mergedData = state.mergedData,
                        chapters = listItem,
                        isAnyChapterSelected = chapters.fastAny { it.selected },
                        chapterSwipeStartAction = chapterSwipeStartAction,
@@ -880,6 +882,7 @@ fun MangaScreenLargeImpl(

                            sharedChapterItems(
                                manga = state.manga,
+                                mergedData = state.mergedData,
                                chapters = listItem,
                                isAnyChapterSelected = chapters.fastAny { it.selected },
                                chapterSwipeStartAction = chapterSwipeStartAction,
@@ -944,6 +947,7 @@ private fun SharedMangaBottomActionMenu(

 private fun LazyListScope.sharedChapterItems(
    manga: Manga,
+    mergedData: MergedMangaData?,
    chapters: List<ChapterList>,
    isAnyChapterSelected: Boolean,
    chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
@@ -995,7 +999,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 +1017,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,
@@ -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),
    )
 }
@@ -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.SecondaryItemAlpha
+import tachiyomi.presentation.core.components.material.DISABLED_ALPHA
+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)) {
-                    ProvideTextStyle(value = MaterialTheme.typography.bodySmall) {
+                Row {
+                    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
@@ -102,9 +102,12 @@ fun SetIntervalDialog(
                            ),
                        ),
                    )
-
-                    Spacer(Modifier.height(MaterialTheme.padding.small))
+                } else {
+                    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
@@ -81,6 +82,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
@@ -180,7 +182,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 +291,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("") }
@@ -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(
@@ -111,8 +111,14 @@ fun ScanlatorFilterDialog(
                }
            } else {
                FlowRow {
-                    TextButton(onClick = mutableExcludedScanlators::clear) {
-                        Text(text = stringResource(MR.strings.action_reset))
+                    if (mutableExcludedScanlators.isEmpty()) {
+                        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) {
@@ -75,7 +75,7 @@ private fun NewUpdateScreenPreview() {
            changelogInfo = """
                ## Yay
                Foobar
-                
+
                ### More info
                - Hello
                - World
@@ -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>()
-                    .trackUsername(item.tracker)
-                    .collectAsState()
-                item.tracker.run {
-                    TrackingPreferenceWidget(
-                        tracker = this,
-                        checked = uName.isNotEmpty(),
-                        onClick = { if (isLoggedIn) item.logout() else item.login() },
-                    )
+                val isLoggedIn by item.tracker.let { tracker ->
+                    tracker.isLoggedInFlow.collectAsState(tracker.isLoggedIn)
                }
+                TrackingPreferenceWidget(
+                    tracker = item.tracker,
+                    checked = isLoggedIn,
+                    onClick = { if (isLoggedIn) item.logout() else item.login() },
+                )
            }
            is Preference.PreferenceItem.InfoPreference -> {
                InfoWidget(text = item.title)
@@ -3,7 +3,6 @@ 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
@@ -376,7 +375,7 @@ object SettingsAdvancedScreen : SearchableSettings {
                        chooseColorProfile.launch(arrayOf("*/*"))
                    },
                ),
-            )
+            ),
        )
    }

@@ -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(
-                        SYMR.plurals.row_count,
-                        previewsRowCount,
-                        previewsRowCount,
-                    ) else stringResource(MR.strings.disabled),
+                    subtitle = if (previewsRowCount > 0) {
+                        pluralStringResource(
+                            SYMR.plurals.row_count,
+                            previewsRowCount,
+                            previewsRowCount,
+                        )
+                    } else {
+                        stringResource(MR.strings.disabled)
+                    },
                    min = 0,
                    max = 10,
                    onValueChanged = {
@@ -94,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(),
                    ),
                ),
            ),
@@ -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())
@@ -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
@@ -505,7 +527,7 @@ object SettingsDataScreen : SearchableSettings {

    @Composable
    private fun getSyncNowPref(): Preference.PreferenceGroup {
-        val navigator = LocalNavigator.currentOrThrow
+        val context = LocalContext.current
        return Preference.PreferenceGroup(
            title = stringResource(SYMR.strings.pref_sync_now_group_title),
            preferenceItems = persistentListOf(
@@ -514,7 +536,11 @@ object SettingsDataScreen : SearchableSettings {
                    title = stringResource(SYMR.strings.pref_sync_now),
                    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)
+                        }
                    },
                ),
            ),
@@ -120,6 +120,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 +153,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(
@@ -84,9 +84,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 +105,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
@@ -88,12 +89,8 @@ object SettingsReaderScreen : SearchableSettings {
                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),
@@ -156,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(
@@ -37,7 +37,7 @@ class OpenSourceLicensesScreen : Screen() {
                            name = it.name,
                            website = it.website,
                            license = it.licenses.firstOrNull()?.htmlReadyLicenseContent.orEmpty(),
-                        )
+                        ),
                    )
                },
            )
@@ -8,6 +8,7 @@ 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
@@ -32,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) {
@@ -67,7 +68,6 @@ class ExtensionReposScreen(
                    repo = dialog.repo,
                )
            }
-
            is RepoDialog.Conflict -> {
                ExtensionRepoConflictDialog(
                    onDismissRequest = screenModel::dismissDialog,
@@ -76,6 +76,13 @@ class ExtensionReposScreen(
                    newRepo = dialog.newRepo,
                )
            }
+            is RepoDialog.Confirm -> {
+                ExtensionRepoConfirmDialog(
+                    onDismissRequest = screenModel::dismissDialog,
+                    onCreate = { screenModel.createRepo(dialog.url) },
+                    repo = dialog.url,
+                )
+            }
        }

        LaunchedEffect(Unit) {
@@ -125,6 +125,7 @@ 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 {
@@ -152,3 +152,35 @@ fun ExtensionRepoConflictDialog(
        },
    )
 }
+
+@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))
+            }
+        },
+    )
+}
@@ -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,7 +15,6 @@ 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
@@ -32,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()
@@ -48,15 +45,10 @@ class SyncSettingsSelector : Screen() {
        ) { contentPadding ->
            LazyColumnWithAction(
                contentPadding = contentPadding,
-                actionLabel = stringResource(SYMR.strings.label_sync),
-                actionEnabled = state.options.anyEnabled(),
+                actionLabel = stringResource(MR.strings.action_save),
+                actionEnabled = true,
                onClickAction = {
-                    if (!SyncDataJob.isRunning(context)) {
-                        model.syncNow(context)
-                        navigator.pop()
-                    } else {
-                        context.toast(SYMR.strings.sync_in_progress)
-                    }
+                    navigator.pop()
                },
            ) {
                item {
@@ -122,12 +114,14 @@ 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 <--
            )
        }
@@ -140,12 +134,14 @@ 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 <--
            )
        }
@@ -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()
@@ -34,7 +34,9 @@ import tachiyomi.presentation.core.util.isScrolledToEnd
 import tachiyomi.presentation.core.util.isScrolledToStart

 private enum class State {
-    CHECKED, INVERSED, UNCHECKED
+    CHECKED,
+    INVERSED,
+    UNCHECKED,
 }

@Composable
@@ -15,7 +15,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
+import tachiyomi.presentation.core.components.material.SECONDARY_ALPHA
 import tachiyomi.presentation.core.components.material.padding

@Composable
@@ -73,7 +73,7 @@ private fun RowScope.BaseStatsItem(
            style = subtitleStyle
                .copy(
                    color = MaterialTheme.colorScheme.onSurface
-                        .copy(alpha = SecondaryItemAlpha),
+                        .copy(alpha = SECONDARY_ALPHA),
                ),
            textAlign = TextAlign.Center,
        )
@@ -226,7 +226,7 @@ private fun ChapterText(
        Text(
            text = buildAnnotatedString {
                if (downloaded) {
-                    appendInlineContent(DownloadedIconContentId)
+                    appendInlineContent(DOWNLOADED_ICON_ID)
                    append(' ')
                }
                append(name)
@@ -236,7 +236,7 @@ private fun ChapterText(
            overflow = TextOverflow.Ellipsis,
            style = MaterialTheme.typography.titleLarge,
            inlineContent = persistentMapOf(
-                DownloadedIconContentId to InlineTextContent(
+                DOWNLOADED_ICON_ID to InlineTextContent(
                    Placeholder(
                        width = 22.sp,
                        height = 22.sp,
@@ -273,7 +273,7 @@ private val CardColor: CardColors
    )

 private val VerticalSpacerSize = 24.dp
-private const val DownloadedIconContentId = "downloaded"
+private const val DOWNLOADED_ICON_ID = "downloaded"

 private fun previewChapter(name: String, scanlator: String, chapterNumber: Double) = Chapter.create().copy(
    id = 0L,
@@ -7,19 +7,42 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import kotlinx.coroutines.delay
-import kotlin.time.Duration.Companion.seconds
+import tachiyomi.presentation.core.util.collectAsState
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import kotlin.time.Duration.Companion.milliseconds

@Stable
 class DisplayRefreshHost {

    internal var currentDisplayRefresh by mutableStateOf(false)
+    private val readerPreferences = Injekt.get<ReaderPreferences>()
+
+    internal val flashMillis = readerPreferences.flashDurationMillis()
+    internal val flashMode = readerPreferences.flashColor()
+
+    internal val flashIntervalPref = readerPreferences.flashPageInterval()
+
+    // Internal State for Flash
+    private var flashInterval = flashIntervalPref.get()
+    private var timesCalled = 0

    fun flash() {
-        currentDisplayRefresh = true
+        if (timesCalled % flashInterval == 0) {
+            currentDisplayRefresh = true
+        }
+        timesCalled += 1
+    }
+
+    fun setInterval(interval: Int) {
+        flashInterval = interval
+        timesCalled = 0
    }
 }

@@ -29,18 +52,39 @@ fun DisplayRefreshHost(
    modifier: Modifier = Modifier,
 ) {
    val currentDisplayRefresh = hostState.currentDisplayRefresh
+    val refreshDuration by hostState.flashMillis.collectAsState()
+    val flashMode by hostState.flashMode.collectAsState()
+    val flashInterval by hostState.flashIntervalPref.collectAsState()
+
+    var currentColor by remember { mutableStateOf<Color?>(null) }
+
    LaunchedEffect(currentDisplayRefresh) {
-        if (currentDisplayRefresh) {
-            delay(1.5.seconds)
-            hostState.currentDisplayRefresh = false
+        if (!currentDisplayRefresh) {
+            currentColor = null
+            return@LaunchedEffect
        }
+
+        val refreshDurationHalf = refreshDuration.milliseconds / 2
+        currentColor = if (flashMode == ReaderPreferences.FlashColor.BLACK) {
+            Color.Black
+        } else {
+            Color.White
+        }
+        delay(refreshDurationHalf)
+        if (flashMode == ReaderPreferences.FlashColor.WHITE_BLACK) {
+            currentColor = Color.Black
+        }
+        delay(refreshDurationHalf)
+        hostState.currentDisplayRefresh = false
+    }
+
+    LaunchedEffect(flashInterval) {
+        hostState.setInterval(flashInterval)
    }

    Canvas(
        modifier = modifier.fillMaxSize(),
    ) {
-        if (currentDisplayRefresh) {
-            drawRect(Color.Black)
-        }
+        currentColor?.let { drawRect(it) }
    }
 }
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ContentCopy
 import androidx.compose.material.icons.outlined.Photo
 import androidx.compose.material.icons.outlined.Save
 import androidx.compose.material.icons.outlined.Share
@@ -31,9 +32,9 @@ fun ReaderPageActionsDialog(
    onDismissRequest: () -> Unit,
    // SY -->
    onSetAsCover: (useExtraPage: Boolean) -> Unit,
-    onShare: (useExtraPage: Boolean) -> Unit,
+    onShare: (copy: Boolean, useExtraPage: Boolean) -> Unit,
    onSave: (useExtraPage: Boolean) -> Unit,
-    onShareCombined: () -> Unit,
+    onShareCombined: (copy: Boolean) -> Unit,
    onSaveCombined: () -> Unit,
    hasExtraPage: Boolean,
    // SY <--
@@ -62,6 +63,25 @@ fun ReaderPageActionsDialog(
                    icon = Icons.Outlined.Photo,
                    onClick = { showSetCoverDialog = true },
                )
+                ActionButton(
+                    modifier = Modifier.weight(1f),
+                    title = stringResource(
+                        // SY -->
+                        if (hasExtraPage) {
+                            SYMR.strings.action_copy_first_page
+                        } else {
+                            MR.strings.action_copy_to_clipboard
+                        },
+                        // SY <--
+                    ),
+                    icon = Icons.Outlined.ContentCopy,
+                    onClick = {
+                        // SY -->
+                        onShare(true, false)
+                        // SY <--
+                        onDismissRequest()
+                    },
+                )
                ActionButton(
                    modifier = Modifier.weight(1f),
                    title = stringResource(
@@ -76,7 +96,7 @@ fun ReaderPageActionsDialog(
                    icon = Icons.Outlined.Share,
                    onClick = {
                        // SY -->
-                        onShare(false)
+                        onShare(false, false)
                        // SY <--
                        onDismissRequest()
                    },
@@ -114,12 +134,21 @@ fun ReaderPageActionsDialog(
                            showSetCoverDialog = true
                        },
                    )
+                    ActionButton(
+                        modifier = Modifier.weight(1f),
+                        title = stringResource(SYMR.strings.action_copy_second_page),
+                        icon = Icons.Outlined.ContentCopy,
+                        onClick = {
+                            onShare(true, true)
+                            onDismissRequest()
+                        },
+                    )
                    ActionButton(
                        modifier = Modifier.weight(1f),
                        title = stringResource(SYMR.strings.action_share_second_page),
                        icon = Icons.Outlined.Share,
                        onClick = {
-                            onShare(true)
+                            onShare(false, true)
                            onDismissRequest()
                        },
                    )
@@ -136,12 +165,21 @@ fun ReaderPageActionsDialog(
                Row(
                    horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
                ) {
+                    ActionButton(
+                        modifier = Modifier.weight(1f),
+                        title = stringResource(SYMR.strings.action_copy_combined_page),
+                        icon = Icons.Outlined.ContentCopy,
+                        onClick = {
+                            onShareCombined(true)
+                            onDismissRequest()
+                        },
+                    )
                    ActionButton(
                        modifier = Modifier.weight(1f),
                        title = stringResource(SYMR.strings.action_share_combined_page),
                        icon = Icons.Outlined.Share,
                        onClick = {
-                            onShareCombined()
+                            onShareCombined(false)
                            onDismissRequest()
                        },
                    )
@@ -63,7 +63,7 @@ fun ExhUtils(
        modifier
            .fillMaxWidth()
            .background(backgroundColor),
-        horizontalAlignment = Alignment.CenterHorizontally
+        horizontalAlignment = Alignment.CenterHorizontally,
    ) {
        AnimatedVisibility(visible = isVisible) {
            Column {
@@ -84,7 +84,7 @@ fun ExhUtils(
                    ) {
                        Column(
                            Modifier.weight(3f),
-                            horizontalAlignment = Alignment.CenterHorizontally
+                            horizontalAlignment = Alignment.CenterHorizontally,
                        ) {
                            Text(
                                text = stringResource(SYMR.strings.eh_autoscroll),
@@ -93,17 +93,17 @@ fun ExhUtils(
                                fontFamily = FontFamily.SansSerif,
                                style = MaterialTheme.typography.labelLarge,
                                modifier = Modifier.fillMaxWidth(0.75f),
-                                textAlign = TextAlign.Center
+                                textAlign = TextAlign.Center,
                            )
                        }
                        Column(
                            Modifier.weight(1f),
-                            horizontalAlignment = Alignment.CenterHorizontally
+                            horizontalAlignment = Alignment.CenterHorizontally,
                        ) {
                            Switch(
                                checked = isAutoScroll,
                                onCheckedChange = null,
-                                enabled = isAutoScrollEnabled
+                                enabled = isAutoScrollEnabled,
                            )
                        }
                    }
@@ -114,7 +114,7 @@ fun ExhUtils(
                    ) {
                        Column(
                            Modifier.weight(3f),
-                            horizontalAlignment = Alignment.CenterHorizontally
+                            horizontalAlignment = Alignment.CenterHorizontally,
                        ) {
                            var autoScrollFrequencyState by remember {
                                mutableStateOf(autoScrollFrequency)
@@ -5,11 +5,14 @@ import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.CheckboxItem
 import tachiyomi.presentation.core.components.SettingsChipRow
+import tachiyomi.presentation.core.components.SliderItem
+import tachiyomi.presentation.core.i18n.pluralStringResource
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState

@@ -20,9 +23,27 @@ private val themes = listOf(
    MR.strings.automatic_background to 3,
 )

+private val flashColors = listOf(
+    MR.strings.pref_flash_style_black to ReaderPreferences.FlashColor.BLACK,
+    MR.strings.pref_flash_style_white to ReaderPreferences.FlashColor.WHITE,
+    MR.strings.pref_flash_style_white_black to ReaderPreferences.FlashColor.WHITE_BLACK,
+)
+
@Composable
 internal fun ColumnScope.GeneralPage(screenModel: ReaderSettingsScreenModel) {
    val readerTheme by screenModel.preferences.readerTheme().collectAsState()
+
+    val flashPageState by screenModel.preferences.flashOnPageChange().collectAsState()
+
+    val flashMillisPref = screenModel.preferences.flashDurationMillis()
+    val flashMillis by flashMillisPref.collectAsState()
+
+    val flashIntervalPref = screenModel.preferences.flashPageInterval()
+    val flashInterval by flashIntervalPref.collectAsState()
+
+    val flashColorPref = screenModel.preferences.flashColor()
+    val flashColor by flashColorPref.collectAsState()
+
    SettingsChipRow(MR.strings.pref_reader_theme) {
        themes.map { (labelRes, value) ->
            FilterChip(
@@ -95,6 +116,35 @@ internal fun ColumnScope.GeneralPage(screenModel: ReaderSettingsScreenModel) {
        label = stringResource(MR.strings.pref_flash_page),
        pref = screenModel.preferences.flashOnPageChange(),
    )
+    if (flashPageState) {
+        SliderItem(
+            value = flashMillis / ReaderPreferences.MILLI_CONVERSION,
+            label = stringResource(MR.strings.pref_flash_duration),
+            valueText = stringResource(MR.strings.pref_flash_duration_summary, flashMillis),
+            onChange = { flashMillisPref.set(it * ReaderPreferences.MILLI_CONVERSION) },
+            min = 1,
+            max = 15,
+        )
+        SliderItem(
+            value = flashInterval,
+            label = stringResource(MR.strings.pref_flash_page_interval),
+            valueText = pluralStringResource(MR.plurals.pref_pages, flashInterval, flashInterval),
+            onChange = {
+                flashIntervalPref.set(it)
+            },
+            min = 1,
+            max = 10,
+        )
+        SettingsChipRow(MR.strings.pref_flash_with) {
+            flashColors.map { (labelRes, value) ->
+                FilterChip(
+                    selected = flashColor == value,
+                    onClick = { flashColorPref.set(value) },
+                    label = { Text(stringResource(labelRes)) },
+                )
+            }
+        }
+    }

    // SY -->
    CheckboxItem(
@@ -19,8 +19,8 @@ internal object NordColorScheme : BaseColorScheme() {
        inversePrimary = Color(0xFF397E91),
        secondary = Color(0xFF81A1C1), // Unread badge
        onSecondary = Color(0xFF2E3440), // Unread badge text
-        secondaryContainer = Color(0xFF81A1C1), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF2E3440), // Navigation bar selector icon
+        secondaryContainer = Color(0xFF506275), // Navigation bar selector pill & progress indicator (remaining)
+        onSecondaryContainer = Color(0xFF88C0D0), // Navigation bar selector icon
        tertiary = Color(0xFF5E81AC), // Downloaded badge
        onTertiary = Color(0xFF000000), // Downloaded badge text
        tertiaryContainer = Color(0xFF5E81AC),
@@ -54,7 +54,7 @@ internal object NordColorScheme : BaseColorScheme() {
        inversePrimary = Color(0xFF8CA8CD),
        secondary = Color(0xFF81A1C1), // Unread badge
        onSecondary = Color(0xFF2E3440), // Unread badge text
-        secondaryContainer = Color(0xFF81A1C1), // Navigation bar selector pill & progress indicator (remaining)
+        secondaryContainer = Color(0xFF91B4D7), // Navigation bar selector pill & progress indicator (remaining)
        onSecondaryContainer = Color(0xFF2E3440), // Navigation bar selector icon
        tertiary = Color(0xFF88C0D0), // Downloaded badge
        onTertiary = Color(0xFF2E3440), // Downloaded badge text
@@ -38,7 +38,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.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextAlign
@@ -58,8 +57,6 @@ import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import java.time.format.DateTimeFormatter

-private const val UnsetStatusTextAlpha = 0.5F
-
@Composable
 fun TrackInfoDialogHome(
    trackItems: List<TrackItem>,
@@ -72,6 +69,7 @@ fun TrackInfoDialogHome(
    onNewSearch: (TrackItem) -> Unit,
    onOpenInBrowser: (TrackItem) -> Unit,
    onRemoved: (TrackItem) -> Unit,
+    onCopyLink: (TrackItem) -> Unit,
 ) {
    Column(
        modifier = Modifier
@@ -116,6 +114,7 @@ fun TrackInfoDialogHome(
                    onNewSearch = { onNewSearch(item) },
                    onOpenInBrowser = { onOpenInBrowser(item) },
                    onRemoved = { onRemoved(item) },
+                    onCopyLink = { onCopyLink(item) },
                )
            } else {
                TrackInfoItemEmpty(
@@ -144,6 +143,7 @@ private fun TrackInfoItem(
    onNewSearch: () -> Unit,
    onOpenInBrowser: () -> Unit,
    onRemoved: () -> Unit,
+    onCopyLink: () -> Unit,
 ) {
    val context = LocalContext.current
    Column {
@@ -153,6 +153,7 @@ private fun TrackInfoItem(
            TrackLogoIcon(
                tracker = tracker,
                onClick = onOpenInBrowser,
+                onLongClick = onCopyLink,
            )
            Box(
                modifier = Modifier
@@ -179,6 +180,7 @@ private fun TrackInfoItem(
            TrackInfoItemMenu(
                onOpenInBrowser = onOpenInBrowser,
                onRemoved = onRemoved,
+                onCopyLink = onCopyLink,
            )
        }

@@ -206,10 +208,9 @@ private fun TrackInfoItem(
                    if (onScoreClick != null) {
                        VerticalDivider()
                        TrackDetailsItem(
-                            modifier = Modifier
-                                .weight(1f)
-                                .alpha(if (score == null) UnsetStatusTextAlpha else 1f),
-                            text = score ?: stringResource(MR.strings.score),
+                            modifier = Modifier.weight(1f),
+                            text = score,
+                            placeholder = stringResource(MR.strings.score),
                            onClick = onScoreClick,
                        )
                    }
@@ -238,6 +239,8 @@ private fun TrackInfoItem(
    }
 }

+private const val UNSET_TEXT_ALPHA = 0.5F
+
@Composable
 private fun TrackDetailsItem(
    text: String?,
@@ -258,7 +261,7 @@ private fun TrackDetailsItem(
            overflow = TextOverflow.Ellipsis,
            style = MaterialTheme.typography.bodyMedium,
            textAlign = TextAlign.Center,
-            color = MaterialTheme.colorScheme.onSurface.copy(alpha = if (text == null) UnsetStatusTextAlpha else 1f),
+            color = MaterialTheme.colorScheme.onSurface.copy(alpha = if (text == null) UNSET_TEXT_ALPHA else 1f),
        )
    }
 }
@@ -287,6 +290,7 @@ private fun TrackInfoItemEmpty(
 private fun TrackInfoItemMenu(
    onOpenInBrowser: () -> Unit,
    onRemoved: () -> Unit,
+    onCopyLink: () -> Unit,
 ) {
    var expanded by remember { mutableStateOf(false) }
    Box(modifier = Modifier.wrapContentSize(Alignment.TopStart)) {
@@ -307,6 +311,13 @@ private fun TrackInfoItemMenu(
                    expanded = false
                },
            )
+            DropdownMenuItem(
+                text = { Text(stringResource(MR.strings.action_copy_link)) },
+                onClick = {
+                    onCopyLink()
+                    expanded = false
+                },
+            )
            DropdownMenuItem(
                text = { Text(stringResource(MR.strings.action_remove)) },
                onClick = {
@@ -56,6 +56,7 @@ internal class TrackInfoDialogHomePreviewProvider :
            onNewSearch = {},
            onOpenInBrowser = {},
            onRemoved = {},
+            onCopyLink = {},
        )
    }

@@ -71,6 +72,7 @@ internal class TrackInfoDialogHomePreviewProvider :
            onNewSearch = {},
            onOpenInBrowser = {},
            onRemoved = {},
+            onCopyLink = {},
        )
    }

@@ -224,6 +224,7 @@ private fun SearchResultItem(
 ) {
    val context = LocalContext.current
    val clipboardManager: ClipboardManager = LocalClipboardManager.current
+    val focusManager = LocalFocusManager.current
    val type = trackSearch.publishing_type.toLowerCase(Locale.current).capitalize(Locale.current)
    val status = trackSearch.publishing_status.toLowerCase(Locale.current).capitalize(Locale.current)
    val description = trackSearch.summary.trim()
@@ -243,7 +244,10 @@ private fun SearchResultItem(
            )
            .combinedClickable(
                onLongClick = { dropDownMenuExpanded = true },
-                onClick = onClick,
+                onClick = {
+                    focusManager.clearFocus()
+                    onClick()
+                },
            )
            .padding(12.dp),
    ) {
@@ -22,9 +22,10 @@ import tachiyomi.presentation.core.util.clickableNoIndication
 fun TrackLogoIcon(
    tracker: Tracker,
    onClick: (() -> Unit)? = null,
+    onLongClick: (() -> Unit)? = null,
 ) {
    val modifier = if (onClick != null) {
-        Modifier.clickableNoIndication(onClick = onClick)
+        Modifier.clickableNoIndication(onClick = onClick, onLongClick = onLongClick)
    } else {
        Modifier
    }
@@ -53,6 +54,7 @@ private fun TrackLogoIconPreviews(
        TrackLogoIcon(
            tracker = tracker,
            onClick = null,
+            onLongClick = null,
        )
    }
 }
@@ -43,7 +43,7 @@ import eu.kanade.tachiyomi.ui.updates.UpdatesItem
 import tachiyomi.domain.updates.model.UpdatesWithRelations
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.ListGroupHeader
-import tachiyomi.presentation.core.components.material.ReadItemAlpha
+import tachiyomi.presentation.core.components.material.DISABLED_ALPHA
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.selectedBackground
@@ -107,8 +107,10 @@ internal fun LazyListScope.updatesUiItems(
                    readProgress = updatesItem.update.lastPageRead
                        .takeIf {
                            /* SY --> */(
-                                !updatesItem.update.read || (preserveReadingPosition && updatesItem.isEhBasedUpdate())
-                                )/* SY <-- */ && it > 0L
+                                !updatesItem.update.read ||
+                                    (preserveReadingPosition && updatesItem.isEhBasedUpdate())
+                                )/* SY <-- */ &&
+                                it > 0L
                        }
                        ?.let {
                            stringResource(
@@ -152,7 +154,7 @@ private fun UpdatesUiItem(
    modifier: Modifier = Modifier,
 ) {
    val haptic = LocalHapticFeedback.current
-    val textAlpha = if (update.read) ReadItemAlpha else 1f
+    val textAlpha = if (update.read) DISABLED_ALPHA else 1f

    Row(
        modifier = modifier
@@ -226,7 +228,7 @@ private fun UpdatesUiItem(
                    Text(
                        text = readProgress,
                        maxLines = 1,
-                        color = LocalContentColor.current.copy(alpha = ReadItemAlpha),
+                        color = LocalContentColor.current.copy(alpha = DISABLED_ALPHA),
                        overflow = TextOverflow.Ellipsis,
                    )
                }
@@ -1,6 +1,5 @@
 package eu.kanade.presentation.util

-import android.annotation.SuppressLint
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.ContentTransform
@@ -28,7 +27,6 @@ import soup.compose.material.motion.animation.rememberSlideDistance
 /**
 * For invoking back press to the parent activity
 */
-@SuppressLint("ComposeCompositionLocalUsage")
 val LocalBackPress: ProvidableCompositionLocal<(() -> Unit)?> = staticCompositionLocalOf { null }

 interface Tab : cafe.adriel.voyager.navigator.tab.Tab {
@@ -174,8 +174,7 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor

        val syncPreferences: SyncPreferences = Injekt.get()
        val syncTriggerOpt = syncPreferences.getSyncTriggerOptions()
-        if (syncPreferences.isSyncEnabled() && syncTriggerOpt.syncOnAppStart
-        ) {
+        if (syncPreferences.isSyncEnabled() && syncTriggerOpt.syncOnAppStart) {
            SyncDataJob.startNow(this@App)
        }

@@ -203,26 +202,34 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor
        return ImageLoader.Builder(this).apply {
            val callFactoryLazy = lazy { Injekt.get<NetworkHelper>().client }
            components {
+                // NetworkFetcher.Factory
                add(OkHttpNetworkFetcherFactory(callFactoryLazy::value))
+                // Decoder.Factory
                add(TachiyomiImageDecoder.Factory())
-                add(MangaCoverFetcher.MangaFactory(callFactoryLazy))
-                add(MangaCoverFetcher.MangaCoverFactory(callFactoryLazy))
-                add(MangaKeyer())
-                add(MangaCoverKeyer())
+                // Fetcher.Factory
                add(BufferedSourceFetcher.Factory())
+                add(MangaCoverFetcher.MangaCoverFactory(callFactoryLazy))
+                add(MangaCoverFetcher.MangaFactory(callFactoryLazy))
                // SY -->
-                add(PagePreviewKeyer())
                add(PagePreviewFetcher.Factory(callFactoryLazy))
                // SY <--
+                // Keyer
+                add(MangaCoverKeyer())
+                add(MangaKeyer())
+                // SY -->
+                add(PagePreviewKeyer())
+                // SY <--
            }
+
            crossfade((300 * this@App.animatorDurationScale).toInt())
            allowRgb565(DeviceUtil.isLowRamDevice(this@App))
            if (networkPreferences.verboseLogging().get()) logger(DebugLogger())

            // Coil spawns a new thread for every image load by default
-            fetcherDispatcher(Dispatchers.IO.limitedParallelism(8))
-            decoderDispatcher(Dispatchers.IO.limitedParallelism(2))
-        }.build()
+            fetcherCoroutineContext(Dispatchers.IO.limitedParallelism(8))
+            decoderCoroutineContext(Dispatchers.IO.limitedParallelism(3))
+        }
+            .build()
    }

    override fun onStart(owner: LifecycleOwner) {
@@ -230,8 +237,7 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor

        val syncPreferences: SyncPreferences = Injekt.get()
        val syncTriggerOpt = syncPreferences.getSyncTriggerOptions()
-        if (syncPreferences.isSyncEnabled() && syncTriggerOpt.syncOnAppResume
-        ) {
+        if (syncPreferences.isSyncEnabled() && syncTriggerOpt.syncOnAppResume) {
            SyncDataJob.startNow(this@App)
        }
    }
@@ -330,7 +336,7 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor
            """
                App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE})
                Preview build: $syDebugVersion
-                Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}) 
+                Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT})
                Android build ID: ${Build.DISPLAY}
                Device brand: ${Build.BRAND}
                Device manufacturer: ${Build.MANUFACTURER}
@@ -3,19 +3,21 @@ package eu.kanade.tachiyomi.data.backup
 import android.content.Context
 import android.net.Uri
 import eu.kanade.tachiyomi.data.backup.models.Backup
-import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
+import kotlinx.serialization.SerializationException
 import kotlinx.serialization.protobuf.ProtoBuf
 import okio.buffer
 import okio.gzip
 import okio.source
+import tachiyomi.core.common.i18n.stringResource
+import tachiyomi.i18n.MR
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.io.IOException

 class BackupDecoder(
    private val context: Context,
    private val parser: ProtoBuf = Injekt.get(),
 ) {
-
    /**
     * Decode a potentially-gzipped backup.
     */
@@ -27,13 +29,25 @@ class BackupDecoder(
                require(2)
            }
            val id1id2 = peeked.readShort()
-            val backupString = if (id1id2.toInt() == 0x1f8b) { // 0x1f8b is gzip magic bytes
-                source.gzip().buffer()
-            } else {
-                source
+            val backupString = when (id1id2.toInt()) {
+                0x1f8b -> source.gzip().buffer() // 0x1f8b is gzip magic bytes
+                MAGIC_JSON_SIGNATURE1, MAGIC_JSON_SIGNATURE2, MAGIC_JSON_SIGNATURE3 -> {
+                    throw IOException(context.stringResource(MR.strings.invalid_backup_file_json))
+                }
+                else -> source
            }.use { it.readByteArray() }

-            parser.decodeFromByteArray(BackupSerializer, backupString)
+            try {
+                parser.decodeFromByteArray(Backup.serializer(), backupString)
+            } catch (_: SerializationException) {
+                throw IOException(context.stringResource(MR.strings.invalid_backup_file_unknown))
+            }
        }
    }
+
+    companion object {
+        private const val MAGIC_JSON_SIGNATURE1 = 0x7b7d // `{}`
+        private const val MAGIC_JSON_SIGNATURE2 = 0x7b22 // `{"`
+        private const val MAGIC_JSON_SIGNATURE3 = 0x7b0a // `{\n`
+    }
 }
@@ -6,16 +6,17 @@ import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.data.backup.BackupFileValidator
 import eu.kanade.tachiyomi.data.backup.create.creators.CategoriesBackupCreator
+import eu.kanade.tachiyomi.data.backup.create.creators.ExtensionRepoBackupCreator
 import eu.kanade.tachiyomi.data.backup.create.creators.MangaBackupCreator
 import eu.kanade.tachiyomi.data.backup.create.creators.PreferenceBackupCreator
 import eu.kanade.tachiyomi.data.backup.create.creators.SavedSearchBackupCreator
 import eu.kanade.tachiyomi.data.backup.create.creators.SourcesBackupCreator
 import eu.kanade.tachiyomi.data.backup.models.Backup
 import eu.kanade.tachiyomi.data.backup.models.BackupCategory
+import eu.kanade.tachiyomi.data.backup.models.BackupExtensionRepos
 import eu.kanade.tachiyomi.data.backup.models.BackupManga
 import eu.kanade.tachiyomi.data.backup.models.BackupPreference
 import eu.kanade.tachiyomi.data.backup.models.BackupSavedSearch
-import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
 import eu.kanade.tachiyomi.data.backup.models.BackupSource
 import eu.kanade.tachiyomi.data.backup.models.BackupSourcePreferences
 import kotlinx.serialization.protobuf.ProtoBuf
@@ -51,58 +52,61 @@ class BackupCreator(
    private val categoriesBackupCreator: CategoriesBackupCreator = CategoriesBackupCreator(),
    private val mangaBackupCreator: MangaBackupCreator = MangaBackupCreator(),
    private val preferenceBackupCreator: PreferenceBackupCreator = PreferenceBackupCreator(),
+    private val extensionRepoBackupCreator: ExtensionRepoBackupCreator = ExtensionRepoBackupCreator(),
    private val sourcesBackupCreator: SourcesBackupCreator = SourcesBackupCreator(),
    // SY -->
    private val savedSearchBackupCreator: SavedSearchBackupCreator = SavedSearchBackupCreator(),
    private val getMergedManga: GetMergedManga = Injekt.get(),
-    private val handler: DatabaseHandler = Injekt.get()
+    private val handler: DatabaseHandler = Injekt.get(),
    // SY <--
 ) {

    suspend fun backup(uri: Uri, options: BackupOptions): String {
        var file: UniFile? = null
        try {
-            file = (
-                if (isAutoBackup) {
-                    // Get dir of file and create
-                    val dir = UniFile.fromUri(context, uri)
+            file = if (isAutoBackup) {
+                // Get dir of file and create
+                val dir = UniFile.fromUri(context, uri)

-                    // Delete older backups
-                    dir?.listFiles { _, filename -> FILENAME_REGEX.matches(filename) }
-                        .orEmpty()
-                        .sortedByDescending { it.name }
-                        .drop(MAX_AUTO_BACKUPS - 1)
-                        .forEach { it.delete() }
+                // Delete older backups
+                dir?.listFiles { _, filename -> FILENAME_REGEX.matches(filename) }
+                    .orEmpty()
+                    .sortedByDescending { it.name }
+                    .drop(MAX_AUTO_BACKUPS - 1)
+                    .forEach { it.delete() }

-                    // Create new file to place backup
-                    dir?.createFile(getFilename())
-                } else {
-                    UniFile.fromUri(context, uri)
-                }
-                )
+                // Create new file to place backup
+                dir?.createFile(getFilename())
+            } else {
+                UniFile.fromUri(context, uri)
+            }

            if (file == null || !file.isFile) {
                throw IllegalStateException(context.stringResource(MR.strings.create_backup_file_error))
            }

-            val databaseManga = getFavorites.await() /* SY --> */ +
-            if (options.readEntries) {
-                handler.awaitList { mangasQueries.getReadMangaNotInLibrary(MangaMapper::mapManga) }
-            } else {
-                emptyList()
-            } + getMergedManga.await() // SY <--
+            val backupManga = backupMangas(
+                getFavorites.await() /* SY --> */ +
+                    if (options.readEntries) {
+                        handler.awaitList { mangasQueries.getReadMangaNotInLibrary(MangaMapper::mapManga) }
+                    } else {
+                        emptyList()
+                    } + getMergedManga.await(), // SY <--
+                options,
+            )
            val backup = Backup(
-                backupManga = backupMangas(databaseManga, options),
+                backupManga = backupManga,
                backupCategories = backupCategories(options),
-                backupSources = backupSources(databaseManga),
+                backupSources = backupSources(backupManga),
                backupPreferences = backupAppPreferences(options),
+                backupExtensionRepo = backupExtensionRepos(options),
                backupSourcePreferences = backupSourcePreferences(options),
                // SY -->
-                backupSavedSearches = backupSavedSearches(),
+                backupSavedSearches = backupSavedSearches(options),
                // SY <--
            )

-            val byteArray = parser.encodeToByteArray(BackupSerializer, backup)
+            val byteArray = parser.encodeToByteArray(Backup.serializer(), backup)
            if (byteArray.isEmpty()) {
                throw IllegalStateException(context.stringResource(MR.strings.empty_backup_error))
            }
@@ -135,32 +139,42 @@ class BackupCreator(
    suspend fun backupCategories(options: BackupOptions): List<BackupCategory> {
        if (!options.categories) return emptyList()

-        return categoriesBackupCreator.backupCategories()
+        return categoriesBackupCreator()
    }

    suspend fun backupMangas(mangas: List<Manga>, options: BackupOptions): List<BackupManga> {
-        return mangaBackupCreator.backupMangas(mangas, options)
+        if (!options.libraryEntries) return emptyList()
+
+        return mangaBackupCreator(mangas, options)
    }

-    fun backupSources(mangas: List<Manga>): List<BackupSource> {
-        return sourcesBackupCreator.backupSources(mangas)
+    fun backupSources(mangas: List<BackupManga>): List<BackupSource> {
+        return sourcesBackupCreator(mangas)
    }

    fun backupAppPreferences(options: BackupOptions): List<BackupPreference> {
        if (!options.appSettings) return emptyList()

-        return preferenceBackupCreator.backupAppPreferences(includePrivatePreferences = options.privateSettings)
+        return preferenceBackupCreator.createApp(includePrivatePreferences = options.privateSettings)
    }

    fun backupSourcePreferences(options: BackupOptions): List<BackupSourcePreferences> {
        if (!options.sourceSettings) return emptyList()

-        return preferenceBackupCreator.backupSourcePreferences(includePrivatePreferences = options.privateSettings)
+        return preferenceBackupCreator.createSource(includePrivatePreferences = options.privateSettings)
+    }
+
+    suspend fun backupExtensionRepos(options: BackupOptions): List<BackupExtensionRepos> {
+        if (!options.extensionRepoSettings) return emptyList()
+
+        return extensionRepoBackupCreator()
    }

    // SY -->
-    suspend fun backupSavedSearches(): List<BackupSavedSearch> {
-        return savedSearchBackupCreator.backupSavedSearches()
+    suspend fun backupSavedSearches(options: BackupOptions): List<BackupSavedSearch> {
+        if (!options.savedSearches) return emptyList()
+
+        return savedSearchBackupCreator()
    }
    // SY <--

@@ -12,11 +12,13 @@ data class BackupOptions(
    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 <--
 ) {

@@ -27,15 +29,18 @@ data class BackupOptions(
        tracking,
        history,
        appSettings,
+        extensionRepoSettings,
        sourceSettings,
        privateSettings,
        // SY -->
        customInfo,
        readEntries,
+        savedSearches,
        // SY <--
    )

-    fun anyEnabled() = libraryEntries || appSettings || sourceSettings
+    fun canCreate() =
+        libraryEntries || categories || appSettings || extensionRepoSettings || sourceSettings || savedSearches

    companion object {
        val libraryOptions = persistentListOf(
@@ -44,12 +49,6 @@ data class BackupOptions(
                getter = BackupOptions::libraryEntries,
                setter = { options, enabled -> options.copy(libraryEntries = enabled) },
            ),
-            Entry(
-                label = MR.strings.categories,
-                getter = BackupOptions::categories,
-                setter = { options, enabled -> options.copy(categories = enabled) },
-                enabled = { it.libraryEntries },
-            ),
            Entry(
                label = MR.strings.chapters,
                getter = BackupOptions::chapters,
@@ -68,6 +67,11 @@ data class BackupOptions(
                setter = { options, enabled -> options.copy(history = enabled) },
                enabled = { it.libraryEntries },
            ),
+            Entry(
+                label = MR.strings.categories,
+                getter = BackupOptions::categories,
+                setter = { options, enabled -> options.copy(categories = enabled) },
+            ),
            // SY -->
            Entry(
                label = SYMR.strings.custom_entry_info,
@@ -81,6 +85,11 @@ data class BackupOptions(
                setter = { options, enabled -> options.copy(readEntries = enabled) },
                enabled = { it.libraryEntries },
            ),
+            Entry(
+                label = SYMR.strings.saved_searches,
+                getter = BackupOptions::savedSearches,
+                setter = { options, enabled -> options.copy(savedSearches = enabled) },
+            ),
            // SY <--
        )

@@ -90,6 +99,11 @@ data class BackupOptions(
                getter = BackupOptions::appSettings,
                setter = { options, enabled -> options.copy(appSettings = enabled) },
            ),
+            Entry(
+                label = MR.strings.extensionRepo_settings,
+                getter = BackupOptions::extensionRepoSettings,
+                setter = { options, enabled -> options.copy(extensionRepoSettings = enabled) },
+            ),
            Entry(
                label = MR.strings.source_settings,
                getter = BackupOptions::sourceSettings,
@@ -110,11 +124,13 @@ data class BackupOptions(
            tracking = array[3],
            history = array[4],
            appSettings = array[5],
-            sourceSettings = array[6],
-            privateSettings = array[7],
+            extensionRepoSettings = array[6],
+            sourceSettings = array[7],
+            privateSettings = array[8],
            // SY -->
-            customInfo = array[8],
-            readEntries = array[9],
+            customInfo = array[9],
+            readEntries = array[10],
+            savedSearches = array[11],
            // SY <--
        )
    }
@@ -11,7 +11,7 @@ class CategoriesBackupCreator(
    private val getCategories: GetCategories = Injekt.get(),
 ) {

-    suspend fun backupCategories(): List<BackupCategory> {
+    suspend operator fun invoke(): List<BackupCategory> {
        return getCategories.await()
            .filterNot(Category::isSystemCategory)
            .map(backupCategoryMapper)
@@ -0,0 +1,17 @@
+package eu.kanade.tachiyomi.data.backup.create.creators
+
+import eu.kanade.tachiyomi.data.backup.models.BackupExtensionRepos
+import eu.kanade.tachiyomi.data.backup.models.backupExtensionReposMapper
+import mihon.domain.extensionrepo.interactor.GetExtensionRepo
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class ExtensionRepoBackupCreator(
+    private val getExtensionRepos: GetExtensionRepo = Injekt.get(),
+) {
+
+    suspend operator fun invoke(): List<BackupExtensionRepos> {
+        return getExtensionRepos.getAll()
+            .map(backupExtensionReposMapper)
+    }
+}
@@ -34,7 +34,7 @@ class MangaBackupCreator(
    // SY <--
 ) {

-    suspend fun backupMangas(mangas: List<Manga>, options: BackupOptions): List<BackupManga> {
+    suspend operator fun invoke(mangas: List<Manga>, options: BackupOptions): List<BackupManga> {
        return mangas.map {
            backupManga(it, options)
        }
@@ -22,12 +22,12 @@ class PreferenceBackupCreator(
    private val preferenceStore: PreferenceStore = Injekt.get(),
 ) {

-    fun backupAppPreferences(includePrivatePreferences: Boolean): List<BackupPreference> {
+    fun createApp(includePrivatePreferences: Boolean): List<BackupPreference> {
        return preferenceStore.getAll().toBackupPreferences()
            .withPrivatePreferences(includePrivatePreferences)
    }

-    fun backupSourcePreferences(includePrivatePreferences: Boolean): List<BackupSourcePreferences> {
+    fun createSource(includePrivatePreferences: Boolean): List<BackupSourcePreferences> {
        return sourceManager.getCatalogueSources()
            .filterIsInstance<ConfigurableSource>()
            .map {
@@ -7,10 +7,10 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

 class SavedSearchBackupCreator(
-    private val handler: DatabaseHandler = Injekt.get()
+    private val handler: DatabaseHandler = Injekt.get(),
 ) {

-    suspend fun backupSavedSearches(): List<BackupSavedSearch> {
+    suspend operator fun invoke(): List<BackupSavedSearch> {
        return handler.awaitList { saved_searchQueries.selectAll(backupSavedSearchMapper) }
    }
 }
@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.data.backup.create.creators

+import eu.kanade.tachiyomi.data.backup.models.BackupManga
 import eu.kanade.tachiyomi.data.backup.models.BackupSource
 import eu.kanade.tachiyomi.source.Source
-import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.source.service.SourceManager
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -11,10 +11,10 @@ class SourcesBackupCreator(
    private val sourceManager: SourceManager = Injekt.get(),
 ) {

-    fun backupSources(mangas: List<Manga>): List<BackupSource> {
+    operator fun invoke(mangas: List<BackupManga>): List<BackupSource> {
        return mangas
            .asSequence()
-            .map(Manga::source)
+            .map(BackupManga::source)
            .distinct()
            .map(sourceManager::getOrStub)
            .map { it.toBackupSource() }
@@ -1,20 +1,17 @@
 package eu.kanade.tachiyomi.data.backup.models

 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Serializer
 import kotlinx.serialization.protobuf.ProtoNumber

-@Serializer(forClass = Backup::class)
-object BackupSerializer
-
@Serializable
 data class Backup(
    @ProtoNumber(1) val backupManga: List<BackupManga>,
    @ProtoNumber(2) var backupCategories: List<BackupCategory> = emptyList(),
-    @ProtoNumber(100) var backupBrokenSources: List<BrokenBackupSource> = emptyList(),
+    // @ProtoNumber(100) var backupBrokenSources, legacy source model with non-compliant proto number,
    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList(),
    @ProtoNumber(104) var backupPreferences: List<BackupPreference> = emptyList(),
    @ProtoNumber(105) var backupSourcePreferences: List<BackupSourcePreferences> = emptyList(),
+    @ProtoNumber(106) var backupExtensionRepo: List<BackupExtensionRepos> = emptyList(),
    // SY specific values
    @ProtoNumber(600) var backupSavedSearches: List<BackupSavedSearch> = emptyList(),
 )
@@ -4,7 +4,6 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
 import tachiyomi.domain.chapter.model.Chapter

-@Suppress("MagicNumber")
@Serializable
 data class BackupChapter(
    // in 1.x some of these values have different names
@@ -0,0 +1,24 @@
+package eu.kanade.tachiyomi.data.backup.models
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+import mihon.domain.extensionrepo.model.ExtensionRepo
+
+@Serializable
+class BackupExtensionRepos(
+    @ProtoNumber(1) var baseUrl: String,
+    @ProtoNumber(2) var name: String,
+    @ProtoNumber(3) var shortName: String?,
+    @ProtoNumber(4) var website: String,
+    @ProtoNumber(5) var signingKeyFingerprint: String,
+)
+
+val backupExtensionReposMapper = { repo: ExtensionRepo ->
+    BackupExtensionRepos(
+        baseUrl = repo.baseUrl,
+        name = repo.name,
+        shortName = repo.shortName,
+        website = repo.website,
+        signingKeyFingerprint = repo.signingKeyFingerprint,
+    )
+}
@@ -18,15 +18,3 @@ data class BackupHistory(
        )
    }
 }
-
-@Deprecated("Replaced with BackupHistory. This is retained for legacy reasons.")
-@Serializable
-data class BrokenBackupHistory(
-    @ProtoNumber(0) var url: String,
-    @ProtoNumber(1) var lastRead: Long,
-    @ProtoNumber(2) var readDuration: Long = 0,
-) {
-    fun toBackupHistory(): BackupHistory {
-        return BackupHistory(url, lastRead, readDuration)
-    }
-}
@@ -3,13 +3,9 @@ package eu.kanade.tachiyomi.data.backup.models
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
-import tachiyomi.domain.manga.model.CustomMangaInfo
 import tachiyomi.domain.manga.model.Manga

-@Suppress(
-    "DEPRECATION",
-    "MagicNumber",
-)
+@Suppress("DEPRECATION")
@Serializable
 data class BackupManga(
    // in 1.x some of these values have different names
@@ -36,7 +32,7 @@ data class BackupManga(
    // Bump by 100 for values that are not saved/implemented in 1.x but are used in 0.x
    @ProtoNumber(100) var favorite: Boolean = true,
    @ProtoNumber(101) var chapterFlags: Int = 0,
-    @ProtoNumber(102) var brokenHistory: List<BrokenBackupHistory> = emptyList(),
+    // @ProtoNumber(102) var brokenHistory, legacy history model with non-compliant proto number
    @ProtoNumber(103) var viewer_flags: Int? = null,
    @ProtoNumber(104) var history: List<BackupHistory> = emptyList(),
    @ProtoNumber(105) var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
@@ -36,7 +36,8 @@ data class BackupMergedMangaReference(
 }

 val backupMergedMangaReferenceMapper =
-    { _: Long,
+    {
+            _: Long,
            isInfoManga: Boolean,
            getChapterUpdates: Boolean,
            chapterSortMode: Long,
@@ -8,11 +8,3 @@ data class BackupSource(
    @ProtoNumber(1) var name: String = "",
    @ProtoNumber(2) var sourceId: Long,
 )
-
-@Serializable
-data class BrokenBackupSource(
-    @ProtoNumber(0) var name: String = "",
-    @ProtoNumber(1) var sourceId: Long,
-) {
-    fun toBackupSource() = BackupSource(name, sourceId)
-}
@@ -53,7 +53,20 @@ data class BackupTracking(
 }

 val backupTrackMapper = {
-        _: Long, _: Long, syncId: Long, mediaId: Long, libraryId: Long?, title: String, lastChapterRead: Double, totalChapters: Long, status: Long, score: Double, remoteUrl: String, startDate: Long, finishDate: Long ->
+        _: Long,
+        _: Long,
+        syncId: Long,
+        mediaId: Long,
+        libraryId: Long?,
+        title: String,
+        lastChapterRead: Double,
+        totalChapters: Long,
+        status: Long,
+        score: Double,
+        remoteUrl: String,
+        startDate: Long,
+        finishDate: Long,
+    ->
    BackupTracking(
        syncId = syncId.toInt(),
        mediaId = mediaId,
@@ -5,11 +5,13 @@ import android.net.Uri
 import eu.kanade.tachiyomi.data.backup.BackupDecoder
 import eu.kanade.tachiyomi.data.backup.BackupNotifier
 import eu.kanade.tachiyomi.data.backup.models.BackupCategory
+import eu.kanade.tachiyomi.data.backup.models.BackupExtensionRepos
 import eu.kanade.tachiyomi.data.backup.models.BackupManga
 import eu.kanade.tachiyomi.data.backup.models.BackupPreference
 import eu.kanade.tachiyomi.data.backup.models.BackupSavedSearch
 import eu.kanade.tachiyomi.data.backup.models.BackupSourcePreferences
 import eu.kanade.tachiyomi.data.backup.restore.restorers.CategoriesRestorer
+import eu.kanade.tachiyomi.data.backup.restore.restorers.ExtensionRepoRestorer
 import eu.kanade.tachiyomi.data.backup.restore.restorers.MangaRestorer
 import eu.kanade.tachiyomi.data.backup.restore.restorers.PreferenceRestorer
 import eu.kanade.tachiyomi.data.backup.restore.restorers.SavedSearchRestorer
@@ -34,6 +36,7 @@ class BackupRestorer(

    private val categoriesRestorer: CategoriesRestorer = CategoriesRestorer(),
    private val preferenceRestorer: PreferenceRestorer = PreferenceRestorer(context),
+    private val extensionRepoRestorer: ExtensionRepoRestorer = ExtensionRepoRestorer(),
    private val mangaRestorer: MangaRestorer = MangaRestorer(isSync),
    // SY -->
    private val savedSearchRestorer: SavedSearchRestorer = SavedSearchRestorer(),
@@ -71,11 +74,14 @@ class BackupRestorer(
        val backup = BackupDecoder(context).decode(uri)

        // Store source mapping for error messages
-        val backupMaps = backup.backupSources + backup.backupBrokenSources.map { it.toBackupSource() }
+        val backupMaps = backup.backupSources
        sourceMapping = backupMaps.associate { it.sourceId to it.name }

-        if (options.library) {
-            restoreAmount += backup.backupManga.size + 1 // +1 for categories
+        if (options.libraryEntries) {
+            restoreAmount += backup.backupManga.size
+        }
+        if (options.categories) {
+            restoreAmount += 1
        }
        // SY -->
        if (options.savedSearches) {
@@ -85,12 +91,15 @@ class BackupRestorer(
        if (options.appSettings) {
            restoreAmount += 1
        }
+        if (options.extensionRepoSettings) {
+            restoreAmount += backup.backupExtensionRepo.size
+        }
        if (options.sourceSettings) {
            restoreAmount += 1
        }

        coroutineScope {
-            if (options.library) {
+            if (options.categories) {
                restoreCategories(backup.backupCategories)
            }
            // SY -->
@@ -104,8 +113,11 @@ class BackupRestorer(
            if (options.sourceSettings) {
                restoreSourcePreferences(backup.backupSourcePreferences)
            }
-            if (options.library) {
-                restoreManga(backup.backupManga, backup.backupCategories)
+            if (options.libraryEntries) {
+                restoreManga(backup.backupManga, if (options.categories) backup.backupCategories else emptyList())
+            }
+            if (options.extensionRepoSettings) {
+                restoreExtensionRepos(backup.backupExtensionRepo)
            }

            // TODO: optionally trigger online library + tracker update
@@ -114,7 +126,7 @@ class BackupRestorer(

    private fun CoroutineScope.restoreCategories(backupCategories: List<BackupCategory>) = launch {
        ensureActive()
-        categoriesRestorer.restoreCategories(backupCategories)
+        categoriesRestorer(backupCategories)

        restoreProgress += 1
        notifier.showRestoreProgress(
@@ -150,7 +162,7 @@ class BackupRestorer(
                ensureActive()

                try {
-                    mangaRestorer.restoreManga(it, backupCategories)
+                    mangaRestorer.restore(it, backupCategories)
                } catch (e: Exception) {
                    val sourceName = sourceMapping[it.source] ?: it.source.toString()
                    errors.add(Date() to "${it.title} [$sourceName]: ${e.message}")
@@ -163,7 +175,7 @@ class BackupRestorer(

    private fun CoroutineScope.restoreAppPreferences(preferences: List<BackupPreference>) = launch {
        ensureActive()
-        preferenceRestorer.restoreAppPreferences(preferences)
+        preferenceRestorer.restoreApp(preferences)

        restoreProgress += 1
        notifier.showRestoreProgress(
@@ -176,7 +188,7 @@ class BackupRestorer(

    private fun CoroutineScope.restoreSourcePreferences(preferences: List<BackupSourcePreferences>) = launch {
        ensureActive()
-        preferenceRestorer.restoreSourcePreferences(preferences)
+        preferenceRestorer.restoreSource(preferences)

        restoreProgress += 1
        notifier.showRestoreProgress(
@@ -187,10 +199,33 @@ class BackupRestorer(
        )
    }

+    private fun CoroutineScope.restoreExtensionRepos(
+        backupExtensionRepo: List<BackupExtensionRepos>,
+    ) = launch {
+        backupExtensionRepo
+            .forEach {
+                ensureActive()
+
+                try {
+                    extensionRepoRestorer(it)
+                } catch (e: Exception) {
+                    errors.add(Date() to "Error Adding Repo: ${it.name} : ${e.message}")
+                }
+
+                restoreProgress += 1
+                notifier.showRestoreProgress(
+                    context.stringResource(MR.strings.extensionRepo_settings),
+                    restoreProgress,
+                    restoreAmount,
+                    isSync,
+                )
+            }
+    }
+
    private fun writeErrorLog(): File {
        try {
            if (errors.isNotEmpty()) {
-                val file = context.createFileInCacheDir("tachiyomi_restore.txt")
+                val file = context.createFileInCacheDir("mihon_restore_error.txt")
                val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault())

                file.bufferedWriter().use { out ->
@@ -6,8 +6,10 @@ import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR

 data class RestoreOptions(
-    val library: Boolean = true,
+    val libraryEntries: Boolean = true,
+    val categories: Boolean = true,
    val appSettings: Boolean = true,
+    val extensionRepoSettings: Boolean = true,
    val sourceSettings: Boolean = true,
    // SY -->
    val savedSearches: Boolean = true,
@@ -15,28 +17,46 @@ data class RestoreOptions(
 ) {

    fun asBooleanArray() = booleanArrayOf(
-        library,
+        libraryEntries,
+        categories,
        appSettings,
+        extensionRepoSettings,
        sourceSettings,
        // SY -->
-        savedSearches
+        savedSearches,
        // SY <--
    )

-    fun anyEnabled() = library || appSettings || sourceSettings /* SY --> */ || savedSearches /* SY <-- */
+    fun canRestore() =
+        libraryEntries ||
+            categories ||
+            appSettings ||
+            extensionRepoSettings ||
+            sourceSettings /* SY --> */ ||
+            savedSearches /* SY <-- */

    companion object {
        val options = persistentListOf(
            Entry(
                label = MR.strings.label_library,
-                getter = RestoreOptions::library,
-                setter = { options, enabled -> options.copy(library = enabled) },
+                getter = RestoreOptions::libraryEntries,
+                setter = { options, enabled -> options.copy(libraryEntries = enabled) },
+            ),
+            Entry(
+                label = MR.strings.categories,
+                getter = RestoreOptions::categories,
+                setter = { options, enabled -> options.copy(categories = enabled) },
            ),
            Entry(
                label = MR.strings.app_settings,
                getter = RestoreOptions::appSettings,
                setter = { options, enabled -> options.copy(appSettings = enabled) },
            ),
+            Entry(
+                label = MR.strings.extensionRepo_settings,
+                getter = RestoreOptions::extensionRepoSettings,
+                setter = { options, enabled -> options.copy(extensionRepoSettings = enabled) },
+            ),
            Entry(
                label = MR.strings.source_settings,
                getter = RestoreOptions::sourceSettings,
@@ -52,11 +72,13 @@ data class RestoreOptions(
        )

        fun fromBooleanArray(array: BooleanArray) = RestoreOptions(
-            library = array[0],
-            appSettings = array[1],
-            sourceSettings = array[2],
+            libraryEntries = array[0],
+            categories = array[1],
+            appSettings = array[2],
+            extensionRepoSettings = array[3],
+            sourceSettings = array[4],
            // SY -->
-            savedSearches = array[3]
+            savedSearches = array[5],
            // SY <--
        )
    }
@@ -13,7 +13,7 @@ class CategoriesRestorer(
    private val libraryPreferences: LibraryPreferences = Injekt.get(),
 ) {

-    suspend fun restoreCategories(backupCategories: List<BackupCategory>) {
+    suspend operator fun invoke(backupCategories: List<BackupCategory>) {
        if (backupCategories.isNotEmpty()) {
            val dbCategories = getCategories.await()
            val dbCategoriesByName = dbCategories.associateBy { it.name }
@@ -21,14 +21,15 @@ class CategoriesRestorer(

            val categories = backupCategories
                .sortedBy { it.order }
-                .distinctBy { it.name }
                .map {
-                    val newOrder = nextOrder++
-                    dbCategoriesByName[it.name]
-                        ?: handler.awaitOneExecutable {
-                            categoriesQueries.insert(it.name, newOrder, it.flags)
-                            categoriesQueries.selectLastInsertedRowId()
-                        }.let { id -> it.toCategory(id).copy(order = newOrder) }
+                    val dbCategory = dbCategoriesByName[it.name]
+                    if (dbCategory != null) return@map dbCategory
+                    val order = nextOrder++
+                    handler.awaitOneExecutable {
+                        categoriesQueries.insert(it.name, order, it.flags)
+                        categoriesQueries.selectLastInsertedRowId()
+                    }
+                        .let { id -> it.toCategory(id).copy(order = order) }
                }

            libraryPreferences.categorizedDisplaySettings().set(
@@ -0,0 +1,40 @@
+package eu.kanade.tachiyomi.data.backup.restore.restorers
+
+import eu.kanade.tachiyomi.data.backup.models.BackupExtensionRepos
+import mihon.domain.extensionrepo.interactor.GetExtensionRepo
+import tachiyomi.data.DatabaseHandler
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class ExtensionRepoRestorer(
+    private val handler: DatabaseHandler = Injekt.get(),
+    private val getExtensionRepos: GetExtensionRepo = Injekt.get(),
+) {
+
+    suspend operator fun invoke(
+        backupRepo: BackupExtensionRepos,
+    ) {
+        val dbRepos = getExtensionRepos.getAll()
+        val existingReposBySHA = dbRepos.associateBy { it.signingKeyFingerprint }
+        val existingReposByUrl = dbRepos.associateBy { it.baseUrl }
+
+        val urlExists = existingReposByUrl[backupRepo.baseUrl]
+        val shaExists = existingReposBySHA[backupRepo.signingKeyFingerprint]
+
+        if (urlExists != null && urlExists.signingKeyFingerprint != backupRepo.signingKeyFingerprint) {
+            error("Already Exists with different signing key fingerprint")
+        } else if (shaExists != null) {
+            error("${shaExists.name} has the same signing key fingerprint")
+        } else {
+            handler.await {
+                extension_reposQueries.insert(
+                    backupRepo.baseUrl,
+                    backupRepo.name,
+                    backupRepo.shortName,
+                    backupRepo.website,
+                    backupRepo.signingKeyFingerprint,
+                )
+            }
+        }
+    }
+}
@@ -68,7 +68,7 @@ class MangaRestorer(
            )
    }

-    suspend fun restoreManga(
+    suspend fun restore(
        backupManga: BackupManga,
        backupCategories: List<BackupCategory>,
    ) {
@@ -89,7 +89,7 @@ class MangaRestorer(
                chapters = backupManga.chapters,
                categories = backupManga.categories,
                backupCategories = backupCategories,
-                history = backupManga.history + backupManga.brokenHistory.map { it.toBackupHistory() },
+                history = backupManga.history,
                tracks = backupManga.tracking,
                excludedScanlators = backupManga.excludedScanlators,
                // SY -->
@@ -22,14 +22,14 @@ class PreferenceRestorer(
    private val preferenceStore: PreferenceStore = Injekt.get(),
 ) {

-    fun restoreAppPreferences(preferences: List<BackupPreference>) {
+    fun restoreApp(preferences: List<BackupPreference>) {
        restorePreferences(preferences, preferenceStore)

        LibraryUpdateJob.setupTask(context)
        BackupCreateJob.setupTask(context)
    }

-    fun restoreSourcePreferences(preferences: List<BackupSourcePreferences>) {
+    fun restoreSource(preferences: List<BackupSourcePreferences>) {
        preferences.forEach {
            val sourcePrefs = AndroidPreferenceStore(context, sourcePreferences(it.sourceKey))
            restorePreferences(it.prefs, sourcePrefs)
@@ -36,8 +36,8 @@ class ChapterCache(
    private val context: Context,
    private val json: Json,
    // SY -->
-    readerPreferences: ReaderPreferences
-    //S Y <--
+    readerPreferences: ReaderPreferences,
+    // SY <--
 ) {

    // --> EH
@@ -21,7 +21,6 @@ import okhttp3.CacheControl
 import okhttp3.Call
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.internal.http.HTTP_NOT_MODIFIED
 import okio.FileSystem
 import okio.Path.Companion.toOkioPath
 import okio.Source
@@ -46,7 +45,6 @@ import java.io.IOException
 * Available request parameter:
 * - [USE_CUSTOM_COVER_KEY]: Use custom cover if set by user, default is true
 */
-@Suppress("LongParameterList")
 class MangaCoverFetcher(
    private val url: String?,
    private val isLibraryManga: Boolean,
@@ -87,7 +85,7 @@ class MangaCoverFetcher(
            source = ImageSource(
                file = file.toOkioPath(),
                fileSystem = FileSystem.SYSTEM,
-                diskCacheKey = diskCacheKey
+                diskCacheKey = diskCacheKey,
            ),
            mimeType = "image/*",
            dataSource = DataSource.DISK,
@@ -348,5 +346,7 @@ class MangaCoverFetcher(

        private val CACHE_CONTROL_NO_STORE = CacheControl.Builder().noStore().build()
        private val CACHE_CONTROL_NO_NETWORK_NO_CACHE = CacheControl.Builder().noCache().onlyIfCached().build()
+
+        private const val HTTP_NOT_MODIFIED = 304
    }
 }
@@ -18,7 +18,6 @@ import okhttp3.CacheControl
 import okhttp3.Call
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.internal.http.HTTP_NOT_MODIFIED
 import okio.FileSystem
 import okio.Path.Companion.toOkioPath
 import okio.Source
@@ -59,7 +58,7 @@ class PagePreviewFetcher(
            source = ImageSource(
                file = file.toOkioPath(),
                fileSystem = FileSystem.SYSTEM,
-                diskCacheKey = diskCacheKey
+                diskCacheKey = diskCacheKey,
            ),
            mimeType = "image/*",
            dataSource = DataSource.DISK,
@@ -231,7 +230,7 @@ class PagePreviewFetcher(
            file = data,
            fileSystem = FileSystem.SYSTEM,
            diskCacheKey = diskCacheKey,
-            closeable = this
+            closeable = this,
        )
    }

@@ -260,5 +259,7 @@ class PagePreviewFetcher(
    companion object {
        private val CACHE_CONTROL_NO_STORE = CacheControl.Builder().noStore().build()
        private val CACHE_CONTROL_NO_NETWORK_NO_CACHE = CacheControl.Builder().noCache().onlyIfCached().build()
+
+        private const val HTTP_NOT_MODIFIED = 304
    }
 }
@@ -1,9 +1,10 @@
 package eu.kanade.tachiyomi.data.coil

+import android.app.Application
 import android.graphics.Bitmap
 import android.os.Build
 import coil3.ImageLoader
-import coil3.asCoilImage
+import coil3.asImage
 import coil3.decode.DecodeResult
 import coil3.decode.DecodeUtils
 import coil3.decode.Decoder
@@ -11,37 +12,37 @@ import coil3.decode.ImageSource
 import coil3.fetch.SourceFetchResult
 import coil3.request.Options
 import coil3.request.bitmapConfig
+import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.storage.CbzCrypto
+import eu.kanade.tachiyomi.util.storage.CbzCrypto.getCoverStream
 import eu.kanade.tachiyomi.util.system.GLUtil
-import net.lingala.zip4j.ZipFile
-import net.lingala.zip4j.model.FileHeader
+import mihon.core.common.archive.archiveReader
 import okio.BufferedSource
 import tachiyomi.core.common.util.system.ImageUtil
 import tachiyomi.decoder.ImageDecoder
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.io.BufferedInputStream

 /**
 * A [Decoder] that uses built-in [ImageDecoder] to decode images that is not supported by the system.
 */
 class TachiyomiImageDecoder(private val resources: ImageSource, private val options: Options) : Decoder {
+    private val context = Injekt.get<Application>()

    override suspend fun decode(): DecodeResult {
        // SY -->
-        var zip4j: ZipFile? = null
-        var entry: FileHeader? = null
-
+        var coverStream: BufferedInputStream? = null
        if (resources.sourceOrNull()?.peek()?.use { CbzCrypto.detectCoverImageArchive(it.inputStream()) } == true) {
            if (resources.source().peek().use { ImageUtil.findImageType(it.inputStream()) == null }) {
-                zip4j = ZipFile(resources.file().toFile().absolutePath)
-                entry = zip4j.fileHeaders.firstOrNull {
-                    it.fileName.equals(CbzCrypto.DEFAULT_COVER_NAME, ignoreCase = true)
-                }
-
-                if (zip4j.isEncrypted) zip4j.setPassword(CbzCrypto.getDecryptedPasswordCbz())
+                coverStream = UniFile.fromFile(resources.file().toFile())
+                    ?.archiveReader(context = context)
+                    ?.getCoverStream()
            }
        }
        val decoder = resources.sourceOrNull()?.use {
-            zip4j.use { zipFile ->
-                ImageDecoder.newInstance(zipFile?.getInputStream(entry) ?: it.inputStream(), options.cropBorders, displayProfile)
+            coverStream.use { coverStream ->
+                ImageDecoder.newInstance(coverStream ?: it.inputStream(), options.cropBorders, displayProfile)
            }
        }
        // SY <--
@@ -80,7 +81,7 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti
        }

        return DecodeResult(
-            image = bitmap.asCoilImage(),
+            image = bitmap.asImage(),
            isSampled = sampleSize > 1,
        )
    }
@@ -1,3 +1,5 @@
+@file:Suppress("PropertyName", "ktlint:standard:property-naming")
+
 package eu.kanade.tachiyomi.data.database.models

 import eu.kanade.tachiyomi.source.model.SChapter
@@ -1,3 +1,5 @@
+@file:Suppress("PropertyName", "ktlint:standard:property-naming")
+
 package eu.kanade.tachiyomi.data.database.models

 class ChapterImpl : Chapter {
@@ -1,3 +1,5 @@
+@file:Suppress("PropertyName", "ktlint:standard:property-naming")
+
 package eu.kanade.tachiyomi.data.database.models

 import java.io.Serializable
@@ -1,3 +1,5 @@
+@file:Suppress("PropertyName", "ktlint:standard:property-naming")
+
 package eu.kanade.tachiyomi.data.database.models

 class TrackImpl : Track {
@@ -21,6 +21,7 @@ import logcat.LogPriority
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.core.common.storage.extension
 import tachiyomi.core.common.util.lang.launchIO
+import tachiyomi.core.common.util.system.ImageUtil
 import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.chapter.model.Chapter
@@ -170,7 +171,7 @@ class DownloadManager(
            source,
        )
        val files = chapterDir?.listFiles().orEmpty()
-            .filter { "image" in it.type.orEmpty() }
+            .filter { it.isFile && ImageUtil.isImage(it.name) { it.openInputStream() } }

        if (files.isEmpty()) {
            throw Exception(context.stringResource(MR.strings.page_list_empty_error))
@@ -83,6 +83,11 @@ internal class DownloadNotifier(private val context: Context) {
                    context.stringResource(MR.strings.action_pause),
                    NotificationReceiver.pauseDownloadsPendingBroadcast(context),
                )
+                addAction(
+                    R.drawable.ic_book_24dp,
+                    context.stringResource(MR.strings.action_show_manga),
+                    NotificationReceiver.openEntryPendingActivity(context, download.manga.id),
+                )
            }

            val downloadingProgressText = context.stringResource(
@@ -160,9 +165,10 @@ internal class DownloadNotifier(private val context: Context) {
     *
     * @param reason the text to show.
     * @param timeout duration after which to automatically dismiss the notification.
+     * @param mangaId the id of the entry being warned about
     * Only works on Android 8+.
     */
-    fun onWarning(reason: String, timeout: Long? = null, contentIntent: PendingIntent? = null) {
+    fun onWarning(reason: String, timeout: Long? = null, contentIntent: PendingIntent? = null, mangaId: Long? = null) {
        with(errorNotificationBuilder) {
            setContentTitle(context.stringResource(MR.strings.download_notifier_downloader_title))
            setStyle(NotificationCompat.BigTextStyle().bigText(reason))
@@ -170,6 +176,13 @@ internal class DownloadNotifier(private val context: Context) {
            setAutoCancel(true)
            clearActions()
            setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
+            if (mangaId != null) {
+                addAction(
+                    R.drawable.ic_book_24dp,
+                    context.stringResource(MR.strings.action_show_manga),
+                    NotificationReceiver.openEntryPendingActivity(context, mangaId),
+                )
+            }
            setProgress(0, 0, false)
            timeout?.let { setTimeoutAfter(it) }
            contentIntent?.let { setContentIntent(it) }
@@ -187,8 +200,9 @@ internal class DownloadNotifier(private val context: Context) {
     *
     * @param error string containing error information.
     * @param chapter string containing chapter title.
+     * @param mangaId the id of the entry that the error occurred on
     */
-    fun onError(error: String? = null, chapter: String? = null, mangaTitle: String? = null) {
+    fun onError(error: String? = null, chapter: String? = null, mangaTitle: String? = null, mangaId: Long? = null) {
        // Create notification
        with(errorNotificationBuilder) {
            setContentTitle(
@@ -198,6 +212,13 @@ internal class DownloadNotifier(private val context: Context) {
            setSmallIcon(R.drawable.ic_warning_white_24dp)
            clearActions()
            setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
+            if (mangaId != null) {
+                addAction(
+                    R.drawable.ic_book_24dp,
+                    context.stringResource(MR.strings.action_show_manga),
+                    NotificationReceiver.openEntryPendingActivity(context, mangaId),
+                )
+            }
            setProgress(0, 0, false)

            show(Notifications.ID_DOWNLOAD_CHAPTER_ERROR)
@@ -121,7 +121,8 @@ class DownloadProvider(
                getValidChapterDirNames(chp.name, chp.scanlator).any { dir ->
                    mangaDir.findFile(dir) != null
                }
-            } == null || it.name?.endsWith(Downloader.TMP_DIR_SUFFIX) == true
+            } == null ||
+                it.name?.endsWith(Downloader.TMP_DIR_SUFFIX) == true
        }
    }
    // SY <--
--- a/Show More
+++ b/Show More