Revert case insensitive source folder check

Lint fixes/ignore some errors
Release 0.10.10
2025-06-28 12:07:52 +02:00 · 2021-04-11 18:19:41 -04:00 · 2021-04-11 18:16:15 -04:00 · 2021-04-11 17:59:07 -04:00 · 2021-04-11 16:19:56 -04:00 · 2021-04-11 16:03:03 -04:00
228 changed files with 5491 additions and 2453 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -2,7 +2,7 @@
 I acknowledge that:
- I have updated to the latest version of the app (stable is v0.10.9)
+- I have updated to the latest version of the app (stable is v0.10.10)
 - I have updated all extensions
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
@ -24,3 +24,5 @@ I acknowledge that:
 ## Other details
 Additional details and attachments.
 If you're experiencing crashes, share the crash logs from More → Settings → Advanced → Dump crash logs.
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -9,7 +9,7 @@ labels: "bug"
 I acknowledge that:
- I have updated to the latest version of the app (stable is v0.10.9)
+- I have updated to the latest version of the app (stable is v0.10.10)
 - I have updated all extensions
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
@ -34,3 +34,5 @@ This happened instead.
 ## Other details
 Additional details and attachments.
 If you're experiencing crashes, share the crash logs from More → Settings → Advanced → Dump crash logs.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -9,7 +9,7 @@ labels: "feature"
 I acknowledge that:
- I have updated to the latest version of the app (stable is v0.10.9)
+- I have updated to the latest version of the app (stable is v0.10.10)
 - I have updated all extensions
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -71,25 +71,24 @@ jobs:
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
          keyPassword: ${{ secrets.KEY_PASSWORD }}
-      - name: Create release
+      - name: Clean up build artifacts
        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
-        id: create_release
+        run: |
-        uses: actions/create-release@v1
+          cp ${{ env.SIGNED_RELEASE_FILE }} tachiyomi-${{ env.VERSION_TAG }}.apk
-        env:
+          md5=`md5sum tachiyomi-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          echo "APK_MD5=$md5" >> $GITHUB_ENV
      - name: Create Release
        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
        uses: softprops/action-gh-release@v1
        with:
          tag_name: ${{ env.VERSION_TAG }}
-          release_name: Tachiyomi ${{ env.VERSION_TAG }}
+          name: Tachiyomi ${{ env.VERSION_TAG }}
-          draft: true
+          body: |
            MD5: ${{ env.APK_MD5 }}
          files: |
            tachiyomi-${{ env.VERSION_TAG }}.apk
          draft: ${{ github.event.inputs.dry-run != '' }}
          prerelease: false
      - name: Upload APK to release
        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
          asset_path: ${{ env.SIGNED_RELEASE_FILE }}
          asset_name: tachiyomi-${{ env.VERSION_TAG }}.apk
          asset_content_type: application/vnd.android.package-archive
--- a/.github/workflows/issue_closer.yml
+++ b/.github/workflows/issue_closer.yml
@ -7,31 +7,30 @@ jobs:
  autoclose:
    runs-on: ubuntu-latest
    steps:
-    - name: Autoclose when created in wrong repo
+      - name: Autoclose issues
-      uses: arkon/issue-closer-action@v1.1
+        uses: arkon/issue-closer-action@v3.0
-      with:
+        with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
-        type: title
+          rules: |
-        regex: ".*THIS ISSUE IS IN THE WRONG REPO.*"
+            [
-        message: "@${issue.user.login} this issue was automatically closed because it was not opened in the correct repo, as the template mentioned."
+              {
-    - name: Autoclose when no short description provided
+                "type": "title",
-      uses: arkon/issue-closer-action@v1.1
+                "regex": ".*THIS ISSUE IS IN THE WRONG REPO.*",
-      with:
+                "message": "It was not opened in the correct repo, as the template mentioned."
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+              },
-        type: title
+              {
-        regex: ".*<Write short description here>*"
+                "type": "title",
-        message: "@${issue.user.login} this issue was automatically closed because you did not fill out the description in the title."
+                "regex": ".*<Write short description here>*",
-    - name: Autoclose when body acknowledgement section not removed
+                "message": "The description in the title was not filled out."
-      uses: arkon/issue-closer-action@v1.1
+              },
-      with:
+              {
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+                "type": "body",
-        type: body
+                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
-        regex: ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*"
+                "message": "The acknowledgment section was not removed."
-        message: "@${issue.user.login} this issue was automatically closed because the acknowledgment section was not removed."
+              },
-    - name: Autoclose when body requested information not filled out
+              {
-      uses: arkon/issue-closer-action@v1.1
+                "type": "body",
-      with:
+                "regex": ".*\\* (Tachiyomi version|Android version|Device): \\?.*",
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+                "message": "Requested information in the template was not filled out."
-        type: body
+              }
-        regex: ".*\\* (Tachiyomi version|Android version|Device): \\?.*"
+            ]
        message: "@${issue.user.login} this issue was automatically closed because the requested information was not filled out."
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@ -0,0 +1,19 @@
 name: Lock threads
 on:
  # Daily
  schedule:
    - cron: '0 * * * *'
  # Manual trigger
  workflow_dispatch:
    inputs:
 jobs:
  lock:
    runs-on: ubuntu-latest
    steps:
      - uses: dessant/lock-threads@v2
        with:
          github-token: ${{ github.token }}
          issue-lock-inactive-days: '2'
          pr-lock-inactive-days: '2'
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -0,0 +1,76 @@
 # Code of Conduct
 ## Our Pledge
 In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
 size, disability, ethnicity, sex characteristics, gender identity and expression,
 level of experience, education, socio-economic status, nationality, personal
 appearance, race, religion, or sexual identity and orientation.
 ## Our Standards
 Examples of behavior that contributes to creating a positive environment
 include:
 * Using welcoming and inclusive language
 * Being respectful of differing viewpoints and experiences
 * Gracefully accepting constructive criticism
 * Focusing on what is best for the community
 * Showing empathy towards other community members
 Examples of unacceptable behavior by participants include:
 * The use of sexualized language or imagery and unwelcome sexual attention or
 advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
 address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
 professional setting
 ## Our Responsibilities
 Project maintainers are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
 response to any instances of unacceptable behavior.
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
 that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 ## Scope
 This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community. Examples of
 representing a project or community include using an official project e-mail
 address, posting via an official social media account, or acting as an appointed
 representative at an online or offline event. Representation of a project may be
 further defined and clarified by project maintainers.
 ## Enforcement
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting the project team at the Tachiyomi [Discord server](https://discord.gg/tachiyomi). All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
 Further details of specific enforcement policies may be posted separately.
 Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
 members of the project's leadership.
 ## Attribution
 This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
 available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 [homepage]: https://www.contributor-covenant.org
 For answers to common questions about this code of conduct, see
 https://www.contributor-covenant.org/faq
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 | Build | Stable | Weekly Preview | Contribute | Support Server |
 |-------|----------|---------|------------|---------|
-| ![CI](https://github.com/tachiyomiorg/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest weekly build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) |
+| ![CI](https://github.com/tachiyomiorg/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest weekly build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/tachiyomi) |
 # ![app icon](./.github/readme-images/app-icon.png)Tachiyomi
@ -63,7 +63,12 @@ Source requests should be created at https://github.com/tachiyomiorg/tachiyomi-e
 <details><summary>Contributing</summary>
-See [CONTRIBUTING.md](https://github.com/tachiyomiorg/tachiyomi/blob/master/CONTRIBUTING.md).
+See [CONTRIBUTING.md](./CONTRIBUTING.md).
 </details>
 <details><summary>Code of Conduct</summary>
 See [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md).
 </details>
 ## FAQ
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -29,8 +29,8 @@ android {
        minSdkVersion(AndroidConfig.minSdk)
        targetSdkVersion(AndroidConfig.targetSdk)
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        versionCode = 56
+        versionCode = 57
-        versionName = "0.10.9"
+        versionName = "0.10.10"
        buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
        buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
@ -91,6 +91,7 @@ android {
        exclude("META-INF/LICENSE")
        exclude("META-INF/LICENSE.txt")
        exclude("META-INF/NOTICE")
        exclude("META-INF/*.kotlin_module")
    }
    dependenciesInfo {
@ -119,20 +120,20 @@ dependencies {
    implementation("tachiyomi.sourceapi:source-api:1.1")
    // AndroidX libraries
-    implementation("androidx.annotation:annotation:1.2.0-beta01")
+    implementation("androidx.annotation:annotation:1.3.0-alpha01")
-    implementation("androidx.appcompat:appcompat:1.3.0-beta01")
+    implementation("androidx.appcompat:appcompat:1.3.0-rc01")
-    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha02")
+    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03")
    implementation("androidx.browser:browser:1.3.0")
    implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.0-alpha2")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta01")
    implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
-    implementation("androidx.core:core-ktx:1.5.0-beta01")
+    implementation("androidx.core:core-ktx:1.3.2")
    implementation("androidx.multidex:multidex:2.0.1")
    implementation("androidx.preference:preference-ktx:1.1.1")
-    implementation("androidx.recyclerview:recyclerview:1.2.0-beta01")
+    implementation("androidx.recyclerview:recyclerview:1.2.0")
    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
-    val lifecycleVersion = "2.3.0-rc01"
+    val lifecycleVersion = "2.3.0"
    implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
    implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion")
    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
@ -143,7 +144,7 @@ dependencies {
    // UI library
    implementation("com.google.android.material:material:1.3.0")
-    "standardImplementation"("com.google.firebase:firebase-core:18.0.2")
+    "standardImplementation"("com.google.firebase:firebase-core:18.0.3")
    // ReactiveX
    implementation("io.reactivex:rxandroid:1.2.1")
@ -152,7 +153,7 @@ dependencies {
    implementation("com.github.pwittchen:reactivenetwork:0.13.0")
    // Network client
-    val okhttpVersion = "4.10.0-RC1"
+    val okhttpVersion = "5.0.0-alpha.2"
    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
    implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
@ -173,7 +174,7 @@ dependencies {
    // Disk
    implementation("com.jakewharton:disklrucache:2.0.2")
-    implementation("com.github.inorichi:unifile:e9ee588")
+    implementation("com.github.tachiyomiorg:unifile:e9e3a40")
    implementation("com.github.junrar:junrar:7.4.0")
    // HTML parser
@ -186,7 +187,7 @@ dependencies {
    implementation("io.requery:sqlite-android:3.33.0")
    // Preferences
-    implementation("com.github.tfcporciuncula.flow-preferences:flow-preferences:1.3.3")
+    implementation("com.github.tfcporciuncula.flow-preferences:flow-preferences:1.3.4")
    // Model View Presenter
    val nucleusVersion = "3.0.0"
@ -197,14 +198,12 @@ dependencies {
    implementation("com.github.inorichi.injekt:injekt-core:65b0440")
    // Image library
-    val glideVersion = "4.11.0"
+    val glideVersion = "4.12.0"
    implementation("com.github.bumptech.glide:glide:$glideVersion")
    implementation("com.github.bumptech.glide:okhttp3-integration:$glideVersion")
    kapt("com.github.bumptech.glide:compiler:$glideVersion")
-    implementation("com.github.tachiyomiorg:subsampling-scale-image-view:6caf219")
+    implementation("com.github.tachiyomiorg:subsampling-scale-image-view:547d9c0")
    // TODO: switch to new decoder for stable releases
    // implementation("com.github.tachiyomiorg:subsampling-scale-image-view:ca26317")
    // Logging
    implementation("com.jakewharton.timber:timber:4.7.1")
@ -222,7 +221,8 @@ dependencies {
    implementation("eu.davidea:flexible-adapter-ui:1.0.0")
    implementation("com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0")
    implementation("com.github.chrisbanes:PhotoView:2.3.0")
-    implementation("com.github.tachiyomiorg:DirectionalViewPager:7d0617d")
+    implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0")
    implementation("dev.chrisbanes.insetter:insetter:0.5.0")
    // 3.2.0+ introduces weird UI blinking or cut off issues on some devices
    val materialDialogsVersion = "3.1.1"
@ -235,7 +235,7 @@ dependencies {
    implementation("com.bluelinelabs:conductor-support:2.1.5") {
        exclude(group = "com.android.support")
    }
-    implementation("com.github.tachiyomiorg:conductor-support-preference:1.1.1")
+    implementation("com.github.tachiyomiorg:conductor-support-preference:2.0.1")
    // FlowBinding
    val flowbindingVersion = "0.12.0"
@ -249,7 +249,7 @@ dependencies {
    implementation("com.mikepenz:aboutlibraries:${BuildPluginsVersion.ABOUTLIB_PLUGIN}")
    // Tests
-    testImplementation("junit:junit:4.13.1")
+    testImplementation("junit:junit:4.13.2")
    testImplementation("org.assertj:assertj-core:3.16.1")
    testImplementation("org.mockito:mockito-core:1.10.19")
--- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.updater.UpdaterJob
 import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
 import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
 import eu.kanade.tachiyomi.ui.library.LibrarySort
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView
@ -127,6 +128,17 @@ object Migrations {
                    context.toast(R.string.myanimelist_relogin)
                }
            }
            if (oldVersion < 57) {
                // Migrate DNS over HTTPS setting
                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
                val wasDohEnabled = prefs.getBoolean("enable_doh", false)
                if (wasDohEnabled) {
                    prefs.edit {
                        putInt(PreferenceKeys.dohProvider, PREF_DOH_CLOUDFLARE)
                        remove("enable_doh")
                    }
                }
            }
            return true
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt
@ -24,6 +24,7 @@ class BackupNotifier(private val context: Context) {
        setSmallIcon(R.drawable.ic_tachi)
        setAutoCancel(false)
        setOngoing(true)
        setOnlyAlertOnce(true)
    }
    private val completeNotificationBuilder = context.notificationBuilder(Notifications.CHANNEL_BACKUP_RESTORE_COMPLETE) {
@ -41,7 +42,6 @@ class BackupNotifier(private val context: Context) {
            setContentTitle(context.getString(R.string.creating_backup))
            setProgress(0, 0, true)
            setOnlyAlertOnce(true)
        }
        builder.show(Notifications.ID_BACKUP_PROGRESS)
@ -141,7 +141,7 @@ class BackupNotifier(private val context: Context) {
                addAction(
                    R.drawable.ic_folder_24dp,
-                    context.getString(R.string.action_open_log),
+                    context.getString(R.string.action_show_errors),
                    NotificationReceiver.openErrorLogPendingActivity(context, uri)
                )
            }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
@ -43,12 +43,11 @@ class BackupRestoreService : Service() {
         * @param context context of application
         * @param uri path of Uri
         */
-        fun start(context: Context, uri: Uri, mode: Int, online: Boolean?) {
+        fun start(context: Context, uri: Uri, mode: Int) {
            if (!isRunning(context)) {
                val intent = Intent(context, BackupRestoreService::class.java).apply {
                    putExtra(BackupConst.EXTRA_URI, uri)
                    putExtra(BackupConst.EXTRA_MODE, mode)
                    online?.let { putExtra(BackupConst.EXTRA_TYPE, it) }
                }
                ContextCompat.startForegroundService(context, intent)
            }
@ -119,13 +118,12 @@ class BackupRestoreService : Service() {
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        val uri = intent?.getParcelableExtra<Uri>(BackupConst.EXTRA_URI) ?: return START_NOT_STICKY
        val mode = intent.getIntExtra(BackupConst.EXTRA_MODE, BackupConst.BACKUP_TYPE_FULL)
        val online = intent.getBooleanExtra(BackupConst.EXTRA_TYPE, true)
        // Cancel any previous job if needed.
        backupRestore?.job?.cancel()
        backupRestore = when (mode) {
-            BackupConst.BACKUP_TYPE_FULL -> FullBackupRestore(this, notifier, online)
+            BackupConst.BACKUP_TYPE_FULL -> FullBackupRestore(this, notifier)
            else -> LegacyBackupRestore(this, notifier)
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
@ -26,9 +26,6 @@ import eu.kanade.tachiyomi.data.database.models.History
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaCategory
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.database.models.toMangaInfo
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.toSManga
 import kotlinx.serialization.protobuf.ProtoBuf
 import okio.buffer
 import okio.gzip
@ -183,24 +180,13 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
    /**
     * Fetches manga information
     *
     * @param source source of manga
     * @param manga manga that needs updating
     * @return Updated manga info.
     */
-    suspend fun restoreMangaFetch(source: Source?, manga: Manga, online: Boolean): Manga {
+    fun restoreManga(manga: Manga): Manga {
-        return if (online && source != null) {
+        return manga.also {
-            val networkManga = source.getMangaDetails(manga.toMangaInfo())
+            it.initialized = it.description != null
-            manga.also {
+            it.id = insertManga(it)
                it.copyFrom(networkManga.toSManga())
                it.favorite = manga.favorite
                it.initialized = true
                it.id = insertManga(manga)
            }
        } else {
            manga.also {
                it.initialized = it.description != null
                it.id = insertManga(it)
            }
        }
    }
@ -309,29 +295,26 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
        val trackToUpdate = mutableListOf<Track>()
        tracks.forEach { track ->
-            val service = trackManager.getService(track.sync_id)
+            var isInDatabase = false
-            if (service != null && service.isLogged) {
+            for (dbTrack in dbTracks) {
-                var isInDatabase = false
+                if (track.sync_id == dbTrack.sync_id) {
-                for (dbTrack in dbTracks) {
+                    // The sync is already in the db, only update its fields
-                    if (track.sync_id == dbTrack.sync_id) {
+                    if (track.media_id != dbTrack.media_id) {
-                        // The sync is already in the db, only update its fields
+                        dbTrack.media_id = track.media_id
                        if (track.media_id != dbTrack.media_id) {
                            dbTrack.media_id = track.media_id
                        }
                        if (track.library_id != dbTrack.library_id) {
                            dbTrack.library_id = track.library_id
                        }
                        dbTrack.last_chapter_read = max(dbTrack.last_chapter_read, track.last_chapter_read)
                        isInDatabase = true
                        trackToUpdate.add(dbTrack)
                        break
                    }
                    if (track.library_id != dbTrack.library_id) {
                        dbTrack.library_id = track.library_id
                    }
                    dbTrack.last_chapter_read = max(dbTrack.last_chapter_read, track.last_chapter_read)
                    isInDatabase = true
                    trackToUpdate.add(dbTrack)
                    break
                }
-                if (!isInDatabase) {
+            }
-                    // Insert new sync. Let the db assign the id
+            if (!isInDatabase) {
-                    track.id = null
+                // Insert new sync. Let the db assign the id
-                    trackToUpdate.add(track)
+                track.id = null
-                }
+                trackToUpdate.add(track)
            }
        }
        // Update database
@ -340,47 +323,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
        }
    }
-    /**
+    internal fun restoreChaptersForManga(manga: Manga, chapters: List<Chapter>) {
     * Restore the chapters for manga if chapters already in database
     *
     * @param manga manga of chapters
     * @param chapters list containing chapters that get restored
     * @return boolean answering if chapter fetch is not needed
     */
    internal fun restoreChaptersForManga(manga: Manga, chapters: List<Chapter>): Boolean {
        val dbChapters = databaseHelper.getChapters(manga).executeAsBlocking()
        // Return if fetch is needed
        if (dbChapters.isEmpty() || dbChapters.size < chapters.size) {
            return false
        }
        chapters.forEach { chapter ->
            val dbChapter = dbChapters.find { it.url == chapter.url }
            if (dbChapter != null) {
                chapter.id = dbChapter.id
                chapter.copyFrom(dbChapter)
                if (dbChapter.read && !chapter.read) {
                    chapter.read = dbChapter.read
                    chapter.last_page_read = dbChapter.last_page_read
                } else if (chapter.last_page_read == 0 && dbChapter.last_page_read != 0) {
                    chapter.last_page_read = dbChapter.last_page_read
                }
                if (!chapter.bookmark && dbChapter.bookmark) {
                    chapter.bookmark = dbChapter.bookmark
                }
            }
            chapter.manga_id = manga.id
        }
        // Filter the chapters that couldn't be found.
        updateChapters(chapters.filter { it.id != null })
        return true
    }
    internal fun restoreChaptersForMangaOffline(manga: Manga, chapters: List<Chapter>) {
        val dbChapters = databaseHelper.getChapters(manga).executeAsBlocking()
        chapters.forEach { chapter ->
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
@ -12,13 +12,12 @@ import eu.kanade.tachiyomi.data.backup.full.models.BackupSerializer
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.source.Source
 import okio.buffer
 import okio.gzip
 import okio.source
 import java.util.Date
-class FullBackupRestore(context: Context, notifier: BackupNotifier, private val online: Boolean) : AbstractBackupRestore<FullBackupManager>(context, notifier) {
+class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBackupRestore<FullBackupManager>(context, notifier) {
    override suspend fun performRestore(uri: Uri): Boolean {
        backupManager = FullBackupManager(context)
@ -42,9 +41,11 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
                return false
            }
-            restoreManga(it, backup.backupCategories, online)
+            restoreManga(it, backup.backupCategories)
        }
        // TODO: optionally trigger online library + tracker update
        return true
    }
@ -57,23 +58,17 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
        showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.categories))
    }
-    private suspend fun restoreManga(backupManga: BackupManga, backupCategories: List<BackupCategory>, online: Boolean) {
+    private fun restoreManga(backupManga: BackupManga, backupCategories: List<BackupCategory>) {
        val manga = backupManga.getMangaImpl()
        val chapters = backupManga.getChaptersImpl()
        val categories = backupManga.categories
        val history = backupManga.history
        val tracks = backupManga.getTrackingImpl()
        val source = backupManager.sourceManager.get(manga.source)
        val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
        try {
-            if (source != null || !online) {
+            restoreMangaData(manga, chapters, categories, history, tracks, backupCategories)
                restoreMangaData(manga, source, chapters, categories, history, tracks, backupCategories, online)
            } else {
                errors.add(Date() to "${manga.title} [$sourceName]: ${context.getString(R.string.source_not_found_name, sourceName)}")
            }
        } catch (e: Exception) {
            val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
            errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")
        }
@ -85,33 +80,30 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
     * Returns a manga restore observable
     *
     * @param manga manga data from json
     * @param source source to get manga data from
     * @param chapters chapters data from json
     * @param categories categories data from json
     * @param history history data from json
     * @param tracks tracking data from json
     */
-    private suspend fun restoreMangaData(
+    private fun restoreMangaData(
        manga: Manga,
        source: Source?,
        chapters: List<Chapter>,
        categories: List<Int>,
        history: List<BackupHistory>,
        tracks: List<Track>,
-        backupCategories: List<BackupCategory>,
+        backupCategories: List<BackupCategory>
        online: Boolean
    ) {
        val dbManga = backupManager.getMangaFromDatabase(manga)
        db.inTransaction {
            val dbManga = backupManager.getMangaFromDatabase(manga)
            if (dbManga == null) {
                // Manga not in database
-                restoreMangaFetch(source, manga, chapters, categories, history, tracks, backupCategories, online)
+                restoreMangaFetch(manga, chapters, categories, history, tracks, backupCategories)
-            } else { // Manga in database
+            } else {
                // Manga in database
                // Copy information from manga already in database
                backupManager.restoreMangaNoFetch(manga, dbManga)
                // Fetch rest of manga information
-                restoreMangaNoFetch(source, manga, chapters, categories, history, tracks, backupCategories, online)
+                restoreMangaNoFetch(manga, chapters, categories, history, tracks, backupCategories)
            }
        }
    }
@ -123,55 +115,37 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
     * @param chapters chapters of manga that needs updating
     * @param categories categories that need updating
     */
-    private suspend fun restoreMangaFetch(
+    private fun restoreMangaFetch(
        source: Source?,
        manga: Manga,
        chapters: List<Chapter>,
        categories: List<Int>,
        history: List<BackupHistory>,
        tracks: List<Track>,
-        backupCategories: List<BackupCategory>,
+        backupCategories: List<BackupCategory>
        online: Boolean
    ) {
        try {
-            val fetchedManga = backupManager.restoreMangaFetch(source, manga, online)
+            val fetchedManga = backupManager.restoreManga(manga)
            fetchedManga.id ?: return
-            if (online && source != null) {
+            backupManager.restoreChaptersForManga(fetchedManga, chapters)
                updateChapters(source, fetchedManga, chapters)
            } else {
                backupManager.restoreChaptersForMangaOffline(fetchedManga, chapters)
            }
            restoreExtraForManga(fetchedManga, categories, history, tracks, backupCategories)
            updateTracking(fetchedManga, tracks)
        } catch (e: Exception) {
            errors.add(Date() to "${manga.title} - ${e.message}")
        }
    }
-    private suspend fun restoreMangaNoFetch(
+    private fun restoreMangaNoFetch(
        source: Source?,
        backupManga: Manga,
        chapters: List<Chapter>,
        categories: List<Int>,
        history: List<BackupHistory>,
        tracks: List<Track>,
-        backupCategories: List<BackupCategory>,
+        backupCategories: List<BackupCategory>
        online: Boolean
    ) {
-        if (online && source != null) {
+        backupManager.restoreChaptersForManga(backupManga, chapters)
            if (!backupManager.restoreChaptersForManga(backupManga, chapters)) {
                updateChapters(source, backupManga, chapters)
            }
        } else {
            backupManager.restoreChaptersForMangaOffline(backupManga, chapters)
        }
        restoreExtraForManga(backupManga, categories, history, tracks, backupCategories)
        updateTracking(backupManga, tracks)
    }
    private fun restoreExtraForManga(manga: Manga, categories: List<Int>, history: List<BackupHistory>, tracks: List<Track>, backupCategories: List<BackupCategory>) {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
@ -164,4 +164,14 @@ interface MangaQueries : DbProvider {
                .build()
        )
        .prepare()
    fun getChapterFetchDateManga() = db.get()
        .listOfObjects(Manga::class.java)
        .withQuery(
            RawQuery.builder()
                .query(getChapterFetchDateMangaQuery())
                .observesTables(MangaTable.TABLE)
                .build()
        )
        .prepare()
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
@ -122,6 +122,16 @@ fun getLatestChapterMangaQuery() =
    ORDER by max DESC
 """
 fun getChapterFetchDateMangaQuery() =
    """
    SELECT ${Manga.TABLE}.*, MAX(${Chapter.TABLE}.${Chapter.COL_DATE_FETCH}) AS max
    FROM ${Manga.TABLE}
    JOIN ${Chapter.TABLE}
    ON ${Manga.TABLE}.${Manga.COL_ID} = ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}
    GROUP BY ${Manga.TABLE}.${Manga.COL_ID}
    ORDER by max DESC
 """
 /**
 * Query to get the categories for a manga.
 */
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.util.lang.launchIO
 import rx.Observable
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
@ -211,16 +212,16 @@ class DownloadManager(private val context: Context) {
     */
    fun deleteChapters(chapters: List<Chapter>, manga: Manga, source: Source): List<Chapter> {
        val filteredChapters = getChaptersToDelete(chapters)
        launchIO {
            removeFromDownloadQueue(filteredChapters)
-        removeFromDownloadQueue(filteredChapters)
+            val chapterDirs = provider.findChapterDirs(filteredChapters, manga, source)
-
+            chapterDirs.forEach { it.delete() }
-        val chapterDirs = provider.findChapterDirs(filteredChapters, manga, source)
+            cache.removeChapters(filteredChapters, manga)
-        chapterDirs.forEach { it.delete() }
+            if (cache.getDownloadCount(manga) == 0) { // Delete manga directory if empty
-        cache.removeChapters(filteredChapters, manga)
+                chapterDirs.firstOrNull()?.parentFile?.delete()
-        if (cache.getDownloadCount(manga) == 0) { // Delete manga directory if empty
+            }
            chapterDirs.firstOrNull()?.parentFile?.delete()
        }
        return filteredChapters
    }
@ -249,9 +250,11 @@ class DownloadManager(private val context: Context) {
     * @param source the source of the manga.
     */
    fun deleteManga(manga: Manga, source: Source) {
-        downloader.queue.remove(manga)
+        launchIO {
-        provider.findMangaDir(manga, source)?.delete()
+            downloader.queue.remove(manga)
-        cache.removeManga(manga)
+            provider.findMangaDir(manga, source)?.delete()
            cache.removeManga(manga)
        }
    }
    /**
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
@ -27,6 +27,9 @@ internal class DownloadNotifier(private val context: Context) {
    private val progressNotificationBuilder by lazy {
        context.notificationBuilder(Notifications.CHANNEL_DOWNLOADER_PROGRESS) {
            setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
            setAutoCancel(false)
            setOngoing(true)
            setOnlyAlertOnce(true)
        }
    }
@ -84,7 +87,6 @@ internal class DownloadNotifier(private val context: Context) {
            // Check if first call.
            if (!isDownloading) {
                setSmallIcon(android.R.drawable.stat_sys_download)
                setAutoCancel(false)
                clearActions()
                // Open download manager when clicked
                setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
@ -127,7 +129,6 @@ internal class DownloadNotifier(private val context: Context) {
            setContentTitle(context.getString(R.string.chapter_paused))
            setContentText(context.getString(R.string.download_notifier_download_paused))
            setSmallIcon(R.drawable.ic_pause_24dp)
            setAutoCancel(false)
            setProgress(0, 0, false)
            clearActions()
            // Open download manager when clicked
@ -217,7 +218,6 @@ internal class DownloadNotifier(private val context: Context) {
            setContentText(error ?: context.getString(R.string.download_notifier_unknown_error))
            setSmallIcon(android.R.drawable.stat_sys_warning)
            clearActions()
            setAutoCancel(false)
            setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
            setProgress(0, 0, false)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
@ -53,8 +53,8 @@ class DownloadProvider(private val context: Context) {
            return downloadsDir
                .createDirectory(getSourceDirName(source))
                .createDirectory(getMangaDirName(manga))
-        } catch (e: NullPointerException) {
+        } catch (e: Throwable) {
-            Timber.w(e)
+            Timber.e(e, "Invalid download directory")
            throw Exception(context.getString(R.string.invalid_download_dir))
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
@ -110,7 +110,7 @@ class LibraryUpdateNotifier(private val context: Context) {
                setContentIntent(errorLogIntent)
                addAction(
                    R.drawable.ic_folder_24dp,
-                    context.getString(R.string.action_open_log),
+                    context.getString(R.string.action_show_errors),
                    errorLogIntent
                )
            }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@ -71,6 +71,7 @@ class LibraryUpdateService(
    private lateinit var notifier: LibraryUpdateNotifier
    private lateinit var ioScope: CoroutineScope
    private var mangaToUpdate: List<LibraryManga> = mutableListOf()
    private var updateJob: Job? = null
    /**
@ -86,6 +87,8 @@ class LibraryUpdateService(
    companion object {
        private var instance: LibraryUpdateService? = null
        /**
         * Key for category to update.
         */
@ -116,17 +119,18 @@ class LibraryUpdateService(
         * @return true if service newly started, false otherwise
         */
        fun start(context: Context, category: Category? = null, target: Target = Target.CHAPTERS): Boolean {
-            if (!isRunning(context)) {
+            return if (!isRunning(context)) {
                val intent = Intent(context, LibraryUpdateService::class.java).apply {
                    putExtra(KEY_TARGET, target)
                    category?.let { putExtra(KEY_CATEGORY, it.id) }
                }
                ContextCompat.startForegroundService(context, intent)
-                return true
+                true
            } else {
                instance?.addMangaToQueue(category?.id ?: -1, target)
                false
            }
            return false
        }
        /**
@ -163,6 +167,9 @@ class LibraryUpdateService(
        if (wakeLock.isHeld) {
            wakeLock.release()
        }
        if (instance == this) {
            instance = null
        }
        super.onDestroy()
    }
@ -186,23 +193,25 @@ class LibraryUpdateService(
        val target = intent.getSerializableExtra(KEY_TARGET) as? Target
            ?: return START_NOT_STICKY
-        // Unsubscribe from any previous subscription if needed.
+        instance = this
        // Unsubscribe from any previous subscription if needed
        updateJob?.cancel()
-        // Update favorite manga. Destroy service when completed or in case of an error.
+        // Update favorite manga
-        val selectedScheme = preferences.libraryUpdatePrioritization().get()
+        val categoryId = intent.getIntExtra(KEY_CATEGORY, -1)
-        val mangaList = getMangaToUpdate(intent, target)
+        addMangaToQueue(categoryId, target)
            .sortedWith(rankingScheme[selectedScheme])
        // Destroy service when completed or in case of an error.
        val handler = CoroutineExceptionHandler { _, exception ->
            Timber.e(exception)
            stopSelf(startId)
        }
        updateJob = ioScope.launch(handler) {
            when (target) {
-                Target.CHAPTERS -> updateChapterList(mangaList)
+                Target.CHAPTERS -> updateChapterList()
-                Target.COVERS -> updateCovers(mangaList)
+                Target.COVERS -> updateCovers()
-                Target.TRACKING -> updateTrackings(mangaList)
+                Target.TRACKING -> updateTrackings()
            }
        }
        updateJob?.invokeOnCompletion { stopSelf(startId) }
@ -211,32 +220,41 @@ class LibraryUpdateService(
    }
    /**
-     * Returns the list of manga to be updated.
+     * Adds list of manga to be updated.
     *
-     * @param intent the update intent.
+     * @param category the ID of the category to update, or -1 if no category specified.
     * @param target the target to update.
     * @return a list of manga to update
     */
-    fun getMangaToUpdate(intent: Intent, target: Target): List<LibraryManga> {
+    fun addMangaToQueue(categoryId: Int, target: Target) {
-        val categoryId = intent.getIntExtra(KEY_CATEGORY, -1)
+        val libraryManga = db.getLibraryMangas().executeAsBlocking()
        var listToUpdate = if (categoryId != -1) {
-            db.getLibraryMangas().executeAsBlocking().filter { it.category == categoryId }
+            libraryManga.filter { it.category == categoryId }
        } else {
            val categoriesToUpdate = preferences.libraryUpdateCategories().get().map(String::toInt)
-            if (categoriesToUpdate.isNotEmpty()) {
+            val listToInclude = if (categoriesToUpdate.isNotEmpty()) {
-                db.getLibraryMangas().executeAsBlocking()
+                libraryManga.filter { it.category in categoriesToUpdate }
                    .filter { it.category in categoriesToUpdate }
                    .distinctBy { it.id }
            } else {
-                db.getLibraryMangas().executeAsBlocking().distinctBy { it.id }
+                libraryManga
            }
            val categoriesToExclude = preferences.libraryUpdateCategoriesExclude().get().map(String::toInt)
            val listToExclude = if (categoriesToExclude.isNotEmpty()) {
                libraryManga.filter { it.category in categoriesToExclude }
            } else {
                emptyList()
            }
            listToInclude.minus(listToExclude)
        }
        if (target == Target.CHAPTERS && preferences.updateOnlyNonCompleted()) {
-            listToUpdate = listToUpdate.filter { it.status != SManga.COMPLETED }
+            listToUpdate = listToUpdate.filterNot { it.status == SManga.COMPLETED }
        }
-        return listToUpdate
+        val selectedScheme = preferences.libraryUpdatePrioritization().get()
        mangaToUpdate = listToUpdate
            .distinctBy { it.id }
            .sortedWith(rankingScheme[selectedScheme])
    }
    /**
@ -248,7 +266,7 @@ class LibraryUpdateService(
     * @param mangaToUpdate the list to update
     * @return an observable delivering the progress of each update.
     */
-    suspend fun updateChapterList(mangaToUpdate: List<LibraryManga>) {
+    suspend fun updateChapterList() {
        val progressCount = AtomicInteger(0)
        val newUpdates = mutableListOf<Pair<LibraryManga, Array<Chapter>>>()
        val failedUpdates = mutableListOf<Pair<Manga, String?>>()
@ -342,7 +360,7 @@ class LibraryUpdateService(
        return syncChaptersWithSource(db, chapters, manga, source)
    }
-    private suspend fun updateCovers(mangaToUpdate: List<LibraryManga>) {
+    private suspend fun updateCovers() {
        var progressCount = 0
        mangaToUpdate.forEach { manga ->
@ -375,7 +393,7 @@ class LibraryUpdateService(
     * Method that updates the metadata of the connected tracking services. It's called in a
     * background thread, so it's safe to do heavy operations or network calls here.
     */
-    private suspend fun updateTrackings(mangaToUpdate: List<LibraryManga>) {
+    private suspend fun updateTrackings() {
        var progressCount = 0
        val loggedServices = trackManager.services.filter { it.isLogged }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
@ -73,7 +73,7 @@ class NotificationReceiver : BroadcastReceiver() {
                shareFile(
                    context,
                    intent.getParcelableExtra(EXTRA_URI),
-                    if (intent.getBooleanExtra(EXTRA_IS_LEGACY_BACKUP, false)) "application/json" else "application/octet-stream+gzip",
+                    if (intent.getBooleanExtra(EXTRA_IS_LEGACY_BACKUP, false)) "application/json" else "application/x-protobuf+gzip",
                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                )
            ACTION_CANCEL_RESTORE -> cancelRestore(
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@ -23,7 +23,13 @@ object PreferenceKeys {
    const val showPageNumber = "pref_show_page_number_key"
-    const val dualPageSplit = "pref_dual_page_split"
+    const val dualPageSplitPaged = "pref_dual_page_split"
    const val dualPageSplitWebtoon = "pref_dual_page_split_webtoon"
    const val dualPageInvertPaged = "pref_dual_page_invert"
    const val dualPageInvertWebtoon = "pref_dual_page_invert_webtoon"
    const val showReadingMode = "pref_show_reading_mode"
@ -73,6 +79,10 @@ object PreferenceKeys {
    const val navigationModeWebtoon = "reader_navigation_mode_webtoon"
    const val showNavigationOverlayNewUser = "reader_navigation_overlay_new_user"
    const val showNavigationOverlayOnStart = "reader_navigation_overlay_on_start"
    const val webtoonSidePadding = "webtoon_side_padding"
    const val portraitColumns = "pref_library_columns_portrait_key"
@ -114,6 +124,7 @@ object PreferenceKeys {
    const val libraryUpdateRestriction = "library_update_restriction"
    const val libraryUpdateCategories = "library_update_categories"
    const val libraryUpdateCategoriesExclude = "library_update_categories_exclude"
    const val libraryUpdatePrioritization = "library_update_prioritization"
@ -154,6 +165,7 @@ object PreferenceKeys {
    const val downloadNew = "download_new"
    const val downloadNewCategories = "download_new_categories"
    const val downloadNewCategoriesExclude = "download_new_categories_exclude"
    const val libraryDisplayMode = "pref_display_mode_library"
@ -179,7 +191,7 @@ object PreferenceKeys {
    const val searchPinnedSourcesOnly = "search_pinned_sources_only"
-    const val enableDoh = "enable_doh"
+    const val dohProvider = "doh_provider"
    const val defaultChapterFilterByRead = "default_chapter_filter_by_read"
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
@ -5,6 +5,8 @@ package eu.kanade.tachiyomi.data.preference
 */
 object PreferenceValues {
    /* ktlint-disable experimental:enum-entry-name-case */
    // Keys are lowercase to match legacy string values
    enum class ThemeMode {
        light,
@ -25,6 +27,8 @@ object PreferenceValues {
        amoled,
    }
    /* ktlint-enable experimental:enum-entry-name-case */
    enum class DisplayMode {
        COMPACT_GRID,
        COMFORTABLE_GRID,
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@ -22,7 +22,7 @@ import java.util.Locale
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values
-fun <T> Preference<T>.asImmediateFlow(block: (value: T) -> Unit): Flow<T> {
+fun <T> Preference<T>.asImmediateFlow(block: (T) -> Unit): Flow<T> {
    block(get())
    return asFlow()
        .onEach { block(it) }
@ -36,6 +36,10 @@ operator fun <T> Preference<Set<T>>.minusAssign(item: T) {
    set(get() - item)
 }
 fun Preference<Boolean>.toggle() {
    set(!get())
 }
 class PreferencesHelper(val context: Context) {
    private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
@ -89,7 +93,13 @@ class PreferencesHelper(val context: Context) {
    fun showPageNumber() = flowPrefs.getBoolean(Keys.showPageNumber, true)
-    fun dualPageSplit() = flowPrefs.getBoolean(Keys.dualPageSplit, false)
+    fun dualPageSplitPaged() = flowPrefs.getBoolean(Keys.dualPageSplitPaged, false)
    fun dualPageSplitWebtoon() = flowPrefs.getBoolean(Keys.dualPageSplitWebtoon, false)
    fun dualPageInvertPaged() = flowPrefs.getBoolean(Keys.dualPageInvertPaged, false)
    fun dualPageInvertWebtoon() = flowPrefs.getBoolean(Keys.dualPageInvertWebtoon, false)
    fun showReadingMode() = prefs.getBoolean(Keys.showReadingMode, true)
@ -143,6 +153,10 @@ class PreferencesHelper(val context: Context) {
    fun navigationModeWebtoon() = flowPrefs.getInt(Keys.navigationModeWebtoon, 0)
    fun showNavigationOverlayNewUser() = flowPrefs.getBoolean(Keys.showNavigationOverlayNewUser, true)
    fun showNavigationOverlayOnStart() = flowPrefs.getBoolean(Keys.showNavigationOverlayOnStart, false)
    fun portraitColumns() = flowPrefs.getInt(Keys.portraitColumns, 0)
    fun landscapeColumns() = flowPrefs.getInt(Keys.landscapeColumns, 0)
@ -204,6 +218,7 @@ class PreferencesHelper(val context: Context) {
    fun libraryUpdateRestriction() = prefs.getStringSet(Keys.libraryUpdateRestriction, setOf("wifi"))
    fun libraryUpdateCategories() = flowPrefs.getStringSet(Keys.libraryUpdateCategories, emptySet())
    fun libraryUpdateCategoriesExclude() = flowPrefs.getStringSet(Keys.libraryUpdateCategoriesExclude, emptySet())
    fun libraryUpdatePrioritization() = flowPrefs.getInt(Keys.libraryUpdatePrioritization, 0)
@ -250,6 +265,7 @@ class PreferencesHelper(val context: Context) {
    fun downloadNew() = flowPrefs.getBoolean(Keys.downloadNew, false)
    fun downloadNewCategories() = flowPrefs.getStringSet(Keys.downloadNewCategories, emptySet())
    fun downloadNewCategoriesExclude() = flowPrefs.getStringSet(Keys.downloadNewCategoriesExclude, emptySet())
    fun lang() = prefs.getString(Keys.lang, "")
@ -263,7 +279,7 @@ class PreferencesHelper(val context: Context) {
    fun trustedSignatures() = flowPrefs.getStringSet("trusted_signatures", emptySet())
-    fun enableDoh() = prefs.getBoolean(Keys.enableDoh, false)
+    fun dohProvider() = prefs.getInt(Keys.dohProvider, -1)
    fun lastSearchQuerySearchSettings() = flowPrefs.getString("last_search_query", "")
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
@ -35,6 +35,8 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
    private val api by lazy { AnilistApi(client, interceptor) }
    override val supportsReadingDates: Boolean = true
    private val scorePreference = preferences.anilistScoreType()
    init {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt
@ -2,6 +2,9 @@ package eu.kanade.tachiyomi.data.track.anilist
 import android.net.Uri
 import androidx.core.net.toUri
 import com.afollestad.date.dayOfMonth
 import com.afollestad.date.month
 import com.afollestad.date.year
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.network.POST
@ -9,6 +12,7 @@ import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.network.jsonMime
 import eu.kanade.tachiyomi.network.parseAs
 import eu.kanade.tachiyomi.util.lang.withIOContext
 import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.contentOrNull
@ -30,8 +34,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
    suspend fun addLibManga(track: Track): Track {
        return withIOContext {
-            val query =
+            val query = """
                """
            |mutation AddManga(${'$'}mangaId: Int, ${'$'}progress: Int, ${'$'}status: MediaListStatus) {
                |SaveMediaListEntry (mediaId: ${'$'}mangaId, progress: ${'$'}progress, status: ${'$'}status) { 
                |   id 
@ -65,10 +68,15 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
    suspend fun updateLibManga(track: Track): Track {
        return withIOContext {
-            val query =
+            val query = """
-                """
+            |mutation UpdateManga(
-            |mutation UpdateManga(${'$'}listId: Int, ${'$'}progress: Int, ${'$'}status: MediaListStatus, ${'$'}score: Int) {
+                |${'$'}listId: Int, ${'$'}progress: Int, ${'$'}status: MediaListStatus,
-                |SaveMediaListEntry (id: ${'$'}listId, progress: ${'$'}progress, status: ${'$'}status, scoreRaw: ${'$'}score) {
+                |${'$'}score: Int, ${'$'}startedAt: FuzzyDateInput, ${'$'}completedAt: FuzzyDateInput
            |) {
                |SaveMediaListEntry(
                    |id: ${'$'}listId, progress: ${'$'}progress, status: ${'$'}status,
                    |scoreRaw: ${'$'}score, startedAt: ${'$'}startedAt, completedAt: ${'$'}completedAt
                |) {
                    |id
                    |status
                    |progress
@ -82,6 +90,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
                    put("progress", track.last_chapter_read)
                    put("status", track.toAnilistStatus())
                    put("score", track.score.toInt())
                    put("startedAt", createDate(track.started_reading_date))
                    put("completedAt", createDate(track.finished_reading_date))
                }
            }
            authClient.newCall(POST(apiUrl, body = payload.toString().toRequestBody(jsonMime)))
@ -92,8 +102,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
    suspend fun search(search: String): List<TrackSearch> {
        return withIOContext {
-            val query =
+            val query = """
                """
            |query Search(${'$'}query: String) {
                |Page (perPage: 50) {
                    |media(search: ${'$'}query, type: MANGA, format_not_in: [NOVEL]) {
@ -143,8 +152,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
    suspend fun findLibManga(track: Track, userid: Int): Track? {
        return withIOContext {
-            val query =
+            val query = """
                """
            |query (${'$'}id: Int!, ${'$'}manga_id: Int!) {
                |Page {
                    |mediaList(userId: ${'$'}id, type: MANGA, mediaId: ${'$'}manga_id) {
@ -152,6 +160,16 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
                        |status
                        |scoreRaw: score(format: POINT_100)
                        |progress
                        |startedAt {
                            |year
                            |month
                            |day
                        |}
                        |completedAt {
                            |year
                            |month
                            |day
                        |}
                        |media {
                            |id
                            |title {
@ -209,8 +227,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
    suspend fun getCurrentUser(): Pair<Int, String> {
        return withIOContext {
-            val query =
+            val query = """
                """
            |query User {
                |Viewer {
                    |id
@ -243,21 +260,6 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
    }
    private fun jsonToALManga(struct: JsonObject): ALManga {
        val date = try {
            val date = Calendar.getInstance()
            date.set(
                struct["startDate"]!!.jsonObject["year"]!!.jsonPrimitive.intOrNull ?: 0,
                (
                    struct["startDate"]!!.jsonObject["month"]!!.jsonPrimitive.intOrNull
                        ?: 0
                    ) - 1,
                struct["startDate"]!!.jsonObject["day"]!!.jsonPrimitive.intOrNull ?: 0
            )
            date.timeInMillis
        } catch (_: Exception) {
            0L
        }
        return ALManga(
            struct["id"]!!.jsonPrimitive.int,
            struct["title"]!!.jsonObject["romaji"]!!.jsonPrimitive.content,
@ -265,7 +267,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
            struct["description"]!!.jsonPrimitive.contentOrNull,
            struct["type"]!!.jsonPrimitive.content,
            struct["status"]!!.jsonPrimitive.contentOrNull ?: "",
-            date,
+            parseDate(struct, "startDate"),
            struct["chapters"]!!.jsonPrimitive.intOrNull ?: 0
        )
    }
@ -276,10 +278,44 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
            struct["status"]!!.jsonPrimitive.content,
            struct["scoreRaw"]!!.jsonPrimitive.int,
            struct["progress"]!!.jsonPrimitive.int,
            parseDate(struct, "startedAt"),
            parseDate(struct, "completedAt"),
            jsonToALManga(struct["media"]!!.jsonObject)
        )
    }
    private fun parseDate(struct: JsonObject, dateKey: String): Long {
        return try {
            val date = Calendar.getInstance()
            date.set(
                struct[dateKey]!!.jsonObject["year"]!!.jsonPrimitive.int,
                struct[dateKey]!!.jsonObject["month"]!!.jsonPrimitive.int - 1,
                struct[dateKey]!!.jsonObject["day"]!!.jsonPrimitive.int
            )
            date.timeInMillis
        } catch (_: Exception) {
            0L
        }
    }
    private fun createDate(dateValue: Long): JsonObject {
        if (dateValue == 0L) {
            return buildJsonObject {
                put("year", JsonNull)
                put("month", JsonNull)
                put("day", JsonNull)
            }
        }
        val calendar = Calendar.getInstance()
        calendar.timeInMillis = dateValue
        return buildJsonObject {
            put("year", calendar.year)
            put("month", calendar.month + 1)
            put("day", calendar.dayOfMonth)
        }
    }
    companion object {
        private const val clientId = "385"
        private const val apiUrl = "https://graphql.anilist.co/"
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt
@ -44,6 +44,8 @@ data class ALUserManga(
    val list_status: String,
    val score_raw: Int,
    val chapters_read: Int,
    val start_date_fuzzy: Long,
    val completed_date_fuzzy: Long,
    val manga: ALManga
 ) {
@ -51,6 +53,8 @@ data class ALUserManga(
        media_id = manga.media_id
        status = toTrackStatus()
        score = score_raw.toFloat()
        started_reading_date = start_date_fuzzy
        finished_reading_date = completed_date_fuzzy
        last_chapter_read = chapters_read
        library_id = this@ALUserManga.library_id
        total_chapters = manga.total_chapters
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
@ -45,8 +45,10 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
        return if (remoteTrack != null && statusTrack != null) {
            track.copyPersonalFrom(remoteTrack)
            track.library_id = remoteTrack.library_id
-            track.status = remoteTrack.status
+            track.status = statusTrack.status
-            track.last_chapter_read = remoteTrack.last_chapter_read
+            track.score = statusTrack.score
            track.last_chapter_read = statusTrack.last_chapter_read
            track.total_chapters = remoteTrack.total_chapters
            refresh(track)
        } else {
            // Set default fields if it's not found in the list
@ -66,7 +68,6 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
        track.copyPersonalFrom(remoteStatusTrack!!)
        api.findLibManga(track)?.let { remoteTrack ->
            track.total_chapters = remoteTrack.total_chapters
            track.status = remoteTrack.status
        }
        return track
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt
@ -13,6 +13,7 @@ import eu.kanade.tachiyomi.util.lang.withIOContext
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.int
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
@ -46,6 +47,7 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept
        return withIOContext {
            // read status update
            val sbody = FormBody.Builder()
                .add("rating", track.score.toInt().toString())
                .add("status", track.toBangumiStatus())
                .build()
            authClient.newCall(POST("$apiUrl/collection/${track.media_id}/update", body = sbody))
@ -91,12 +93,24 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept
    }
    private fun jsonToSearch(obj: JsonObject): TrackSearch {
        val coverUrl = if (obj["images"] is JsonObject) {
            obj["images"]?.jsonObject?.get("common")?.jsonPrimitive?.contentOrNull ?: ""
        } else {
            // Sometimes JsonNull
            ""
        }
        val totalChapters = if (obj["eps_count"] != null) {
            obj["eps_count"]!!.jsonPrimitive.int
        } else {
            0
        }
        return TrackSearch.create(TrackManager.BANGUMI).apply {
            media_id = obj["id"]!!.jsonPrimitive.int
            title = obj["name_cn"]!!.jsonPrimitive.content
-            cover_url = obj["images"]!!.jsonObject["common"]!!.jsonPrimitive.content
+            cover_url = coverUrl
            summary = obj["name"]!!.jsonPrimitive.content
            tracking_url = obj["url"]!!.jsonPrimitive.content
            total_chapters = totalChapters
        }
    }
@ -119,14 +133,21 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept
                .build()
            // TODO: get user readed chapter here
-            authClient.newCall(requestUserRead)
+            var response = authClient.newCall(requestUserRead).await()
-                .await()
+            var responseBody = response.body?.string().orEmpty()
-                .parseAs<Collection>()
+            if (responseBody.isEmpty()) {
-                .let {
+                throw Exception("Null Response")
            }
            if (responseBody.contains("\"code\":400")) {
                null
            } else {
                json.decodeFromString<Collection>(responseBody).let {
                    track.status = it.status?.id!!
                    track.last_chapter_read = it.ep_status!!
                    track.score = it.rating!!
                    track
                }
            }
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Collection.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Collection.kt
@ -8,7 +8,7 @@ data class Collection(
    val comment: String? = "",
    val ep_status: Int? = 0,
    val lasttouch: Int? = 0,
-    val rating: Int? = 0,
+    val rating: Float? = 0f,
    val status: Status? = Status(),
    val tag: List<String?>? = listOf(),
    val user: User? = User(),
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt
@ -163,7 +163,7 @@ internal object ExtensionLoader {
                        else -> throw Exception("Unknown source class type! ${obj.javaClass}")
                    }
                } catch (e: Throwable) {
-                    Timber.e(e, "Extension load error: $extName.")
+                    Timber.w(e, "Extension load error: $extName ($it)")
                    return LoadResult.Error(e)
                }
            }
--- a/app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
@ -171,6 +171,6 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
    companion object {
        private val SERVER_CHECK = arrayOf("cloudflare-nginx", "cloudflare")
-        private val COOKIE_NAMES = listOf("__cfduid", "cf_clearance")
+        private val COOKIE_NAMES = listOf("cf_clearance")
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/network/DohProviders.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/DohProviders.kt
@ -0,0 +1,40 @@
 package eu.kanade.tachiyomi.network
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.dnsoverhttps.DnsOverHttps
 import java.net.InetAddress
 /**
 * Based on https://github.com/square/okhttp/blob/ef5d0c83f7bbd3a0c0534e7ca23cbc4ee7550f3b/okhttp-dnsoverhttps/src/test/java/okhttp3/dnsoverhttps/DohProviders.java
 */
 const val PREF_DOH_CLOUDFLARE = 1
 const val PREF_DOH_GOOGLE = 2
 fun OkHttpClient.Builder.dohCloudflare() = dns(
    DnsOverHttps.Builder().client(build())
        .url("https://cloudflare-dns.com/dns-query".toHttpUrl())
        .bootstrapDnsHosts(
            InetAddress.getByName("162.159.36.1"),
            InetAddress.getByName("162.159.46.1"),
            InetAddress.getByName("1.1.1.1"),
            InetAddress.getByName("1.0.0.1"),
            InetAddress.getByName("162.159.132.53"),
            InetAddress.getByName("2606:4700:4700::1111"),
            InetAddress.getByName("2606:4700:4700::1001"),
            InetAddress.getByName("2606:4700:4700::0064"),
            InetAddress.getByName("2606:4700:4700::6400")
        )
        .build()
 )
 fun OkHttpClient.Builder.dohGoogle() = dns(
    DnsOverHttps.Builder().client(build())
        .url("https://dns.google/dns-query".toHttpUrl())
        .bootstrapDnsHosts(
            InetAddress.getByName("8.8.4.4"),
            InetAddress.getByName("8.8.8.8")
        )
        .build()
 )
--- a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
@ -4,13 +4,10 @@ import android.content.Context
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import okhttp3.Cache
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.dnsoverhttps.DnsOverHttps
 import okhttp3.logging.HttpLoggingInterceptor
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.net.InetAddress
 import java.util.concurrent.TimeUnit
 class NetworkHelper(context: Context) {
@ -38,25 +35,9 @@ class NetworkHelper(context: Context) {
            builder.addInterceptor(httpLoggingInterceptor)
        }
-        if (preferences.enableDoh()) {
+        when (preferences.dohProvider()) {
-            builder.dns(
+            PREF_DOH_CLOUDFLARE -> builder.dohCloudflare()
-                DnsOverHttps.Builder().client(builder.build())
+            PREF_DOH_GOOGLE -> builder.dohGoogle()
                    .url("https://cloudflare-dns.com/dns-query".toHttpUrl())
                    .bootstrapDnsHosts(
                        listOf(
                            InetAddress.getByName("162.159.36.1"),
                            InetAddress.getByName("162.159.46.1"),
                            InetAddress.getByName("1.1.1.1"),
                            InetAddress.getByName("1.0.0.1"),
                            InetAddress.getByName("162.159.132.53"),
                            InetAddress.getByName("2606:4700:4700::1111"),
                            InetAddress.getByName("2606:4700:4700::1001"),
                            InetAddress.getByName("2606:4700:4700::0064"),
                            InetAddress.getByName("2606:4700:4700::6400")
                        )
                    )
                    .build()
            )
        }
        builder.build()
--- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
@ -27,7 +27,7 @@ import java.util.zip.ZipFile
 class LocalSource(private val context: Context) : CatalogueSource {
    companion object {
        const val ID = 0L
-        const val HELP_URL = "https://tachiyomi.org/help/guides/reading-local-manga/"
+        const val HELP_URL = "https://tachiyomi.org/help/guides/local-manga/"
        private const val COVER_NAME = "cover.jpg"
        private val SUPPORTED_ARCHIVE_TYPES = setOf("zip", "rar", "cbr", "cbz", "epub")
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
@ -13,7 +13,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
    val preferences: PreferencesHelper by injectLazy()
-    private val isDarkMode: Boolean by lazy {
+    val isDarkMode: Boolean by lazy {
        val themeMode = preferences.themeMode().get()
        (themeMode == Values.ThemeMode.dark) ||
            (
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
@ -121,7 +121,7 @@ abstract class BaseController<VB : ViewBinding>(bundle: Bundle? = null) :
     * [expandActionViewFromInteraction] should be set to true in [onOptionsItemSelected] when the expandable item is selected
     * This method should be called as part of [MenuItem.OnActionExpandListener.onMenuItemActionExpand]
     */
-    fun invalidateMenuOnExpand(): Boolean {
+    open fun invalidateMenuOnExpand(): Boolean {
        return if (expandActionViewFromInteraction) {
            activity?.invalidateOptionsMenu()
            false
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
@ -1,11 +1,14 @@
 package eu.kanade.tachiyomi.ui.base.controller
 import android.content.Intent
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.bluelinelabs.conductor.Controller
 import com.bluelinelabs.conductor.Router
 import com.bluelinelabs.conductor.RouterTransaction
 import eu.kanade.tachiyomi.util.system.toast
 fun Router.popControllerWithTag(tag: String): Boolean {
    val controller = getControllerWithTag(tag)
@ -32,3 +35,12 @@ fun Controller.withFadeTransaction(): RouterTransaction {
        .pushChangeHandler(OneWayFadeChangeHandler())
        .popChangeHandler(OneWayFadeChangeHandler())
 }
 fun Controller.openInBrowser(url: String) {
    try {
        val intent = Intent(Intent.ACTION_VIEW, url.toUri())
        startActivity(intent)
    } catch (e: Throwable) {
        activity?.toast(e.message)
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt
@ -0,0 +1,196 @@
 package eu.kanade.tachiyomi.ui.base.controller
 import android.app.Activity
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.SearchView
 import androidx.viewbinding.ViewBinding
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.appcompat.QueryTextEvent
 import reactivecircus.flowbinding.appcompat.queryTextEvents
 /**
 * Implementation of the NucleusController that has a built-in ViewSearch
 */
 abstract class SearchableNucleusController<VB : ViewBinding, P : BasePresenter<*>>
 (bundle: Bundle? = null) : NucleusController<VB, P>(bundle) {
    enum class SearchViewState { LOADING, LOADED, COLLAPSING, FOCUSED }
    /**
     * Used to bypass the initial searchView being set to empty string after an onResume
     */
    private var currentSearchViewState: SearchViewState = SearchViewState.LOADING
    /**
     * Store the query text that has not been submitted to reassign it after an onResume, UI-only
     */
    protected var nonSubmittedQuery: String = ""
    /**
     * To be called by classes that extend this subclass in onCreateOptionsMenu
     */
    protected fun createOptionsMenu(
        menu: Menu,
        inflater: MenuInflater,
        menuId: Int,
        searchItemId: Int,
        @StringRes queryHint: Int? = null,
        restoreCurrentQuery: Boolean = true
    ) {
        // Inflate menu
        inflater.inflate(menuId, menu)
        // Initialize search option.
        val searchItem = menu.findItem(searchItemId)
        val searchView = searchItem.actionView as SearchView
        searchItem.fixExpand(onExpand = { invalidateMenuOnExpand() })
        searchView.maxWidth = Int.MAX_VALUE
        searchView.queryTextEvents()
            .onEach {
                val newText = it.queryText.toString()
                if (newText.isNotBlank() or acceptEmptyQuery()) {
                    if (it is QueryTextEvent.QuerySubmitted) {
                        // Abstract function for implementation
                        // Run it first in case the old query data is needed (like BrowseSourceController)
                        onSearchViewQueryTextSubmit(newText)
                        presenter.query = newText
                        nonSubmittedQuery = ""
                    } else if ((it is QueryTextEvent.QueryChanged) && (presenter.query != newText)) {
                        nonSubmittedQuery = newText
                        // Abstract function for implementation
                        onSearchViewQueryTextChange(newText)
                    }
                }
                // clear the collapsing flag
                setCurrentSearchViewState(SearchViewState.LOADED, SearchViewState.COLLAPSING)
            }
            .launchIn(viewScope)
        val query = presenter.query
        // Restoring a query the user had not submitted
        if (nonSubmittedQuery.isNotBlank() and (nonSubmittedQuery != query)) {
            searchItem.expandActionView()
            searchView.setQuery(nonSubmittedQuery, false)
            onSearchViewQueryTextChange(nonSubmittedQuery)
        } else {
            if (queryHint != null) {
                searchView.queryHint = applicationContext?.getString(queryHint)
            }
            if (restoreCurrentQuery) {
                // Restoring a query the user had submitted
                if (query.isNotBlank()) {
                    searchItem.expandActionView()
                    searchView.setQuery(query, true)
                    searchView.clearFocus()
                    onSearchViewQueryTextChange(query)
                    onSearchViewQueryTextSubmit(query)
                }
            }
        }
        // Workaround for weird behavior where searchView gets empty text change despite
        // query being set already, prevents the query from being cleared
        binding.root.post {
            setCurrentSearchViewState(SearchViewState.LOADED, SearchViewState.LOADING)
        }
        searchView.setOnQueryTextFocusChangeListener { _, hasFocus ->
            if (hasFocus) {
                setCurrentSearchViewState(SearchViewState.FOCUSED)
            } else {
                setCurrentSearchViewState(SearchViewState.LOADED, SearchViewState.FOCUSED)
            }
        }
        searchItem.setOnActionExpandListener(
            object : MenuItem.OnActionExpandListener {
                override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
                    onSearchMenuItemActionExpand(item)
                    return true
                }
                override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
                    val localSearchView = searchItem.actionView as SearchView
                    // if it is blank the flow event won't trigger so we would stay in a COLLAPSING state
                    if (localSearchView.toString().isNotBlank()) {
                        setCurrentSearchViewState(SearchViewState.COLLAPSING)
                    }
                    onSearchMenuItemActionCollapse(item)
                    return true
                }
            }
        )
    }
    override fun onActivityResumed(activity: Activity) {
        super.onActivityResumed(activity)
        // Until everything is up and running don't accept empty queries
        setCurrentSearchViewState(SearchViewState.LOADING)
    }
    private fun acceptEmptyQuery(): Boolean {
        return when (currentSearchViewState) {
            SearchViewState.COLLAPSING, SearchViewState.FOCUSED -> true
            else -> false
        }
    }
    private fun setCurrentSearchViewState(to: SearchViewState, from: SearchViewState? = null) {
        // When loading ignore all requests other than loaded
        if ((currentSearchViewState == SearchViewState.LOADING) && (to != SearchViewState.LOADED)) {
            return
        }
        // Prevent changing back to an unwanted state when using async flows (ie onFocus event doing
        // COLLAPSING -> LOADED)
        if ((from != null) && (currentSearchViewState != from)) {
            return
        }
        currentSearchViewState = to
    }
    /**
     * Called by the SearchView since since the implementation of these can vary in subclasses
     * Not abstract as they are optional
     */
    protected open fun onSearchViewQueryTextChange(newText: String?) {
    }
    protected open fun onSearchViewQueryTextSubmit(query: String?) {
    }
    protected open fun onSearchMenuItemActionExpand(item: MenuItem?) {
    }
    protected open fun onSearchMenuItemActionCollapse(item: MenuItem?) {
    }
    /**
     * During the conversion to SearchableNucleusController (after which I plan to merge its code
     * into BaseController) this addresses an issue where the searchView.onTextFocus event is not
     * triggered
     */
    override fun invalidateMenuOnExpand(): Boolean {
        return if (expandActionViewFromInteraction) {
            activity?.invalidateOptionsMenu()
            setCurrentSearchViewState(SearchViewState.FOCUSED) // we are technically focused here
            false
        } else {
            true
        }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt
@ -12,6 +12,11 @@ open class BasePresenter<V> : RxPresenter<V>() {
    lateinit var presenterScope: CoroutineScope
    /**
     * Query from the view where applicable
     */
    var query: String = ""
    override fun onCreate(savedState: Bundle?) {
        try {
            super.onCreate(savedState)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
@ -10,6 +10,7 @@ import androidx.appcompat.widget.SearchView
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bluelinelabs.conductor.ControllerChangeHandler
 import com.bluelinelabs.conductor.ControllerChangeType
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
@ -58,6 +59,11 @@ open class ExtensionController :
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = ExtensionControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
@ -104,6 +110,8 @@ open class ExtensionController :
    override fun onButtonClick(position: Int) {
        val extension = (adapter?.getItem(position) as? ExtensionItem)?.extension ?: return
        when (extension) {
            is Extension.Available -> presenter.installExtension(extension)
            is Extension.Untrusted -> openTrustDialog(extension)
            is Extension.Installed -> {
                if (!extension.hasUpdate) {
                    openDetails(extension)
@ -111,12 +119,6 @@ open class ExtensionController :
                    presenter.updateExtension(extension)
                }
            }
            is Extension.Available -> {
                presenter.installExtension(extension)
            }
            is Extension.Untrusted -> {
                openTrustDialog(extension)
            }
        }
    }
@ -147,12 +149,11 @@ open class ExtensionController :
    override fun onItemClick(view: View, position: Int): Boolean {
        val extension = (adapter?.getItem(position) as? ExtensionItem)?.extension ?: return false
-        if (extension is Extension.Installed) {
+        when (extension) {
-            openDetails(extension)
+            is Extension.Available -> presenter.installExtension(extension)
-        } else if (extension is Extension.Untrusted) {
+            is Extension.Untrusted -> openTrustDialog(extension)
-            openTrustDialog(extension)
+            is Extension.Installed -> openDetails(extension)
        }
        return false
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
@ -14,7 +14,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.preference.Preference
 import androidx.preference.PreferenceGroupAdapter
@ -23,6 +22,7 @@ import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import dev.chrisbanes.insetter.applyInsetter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.EmptyPreferenceDataStore
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@ -36,6 +36,7 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.getPreferenceKey
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.ToolbarLiftOnScrollController
 import eu.kanade.tachiyomi.ui.base.controller.openInBrowser
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.util.preference.DSL
 import eu.kanade.tachiyomi.util.preference.onChange
@ -67,6 +68,11 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        val themedInflater = inflater.cloneInContext(getPreferenceThemeContext())
        binding = ExtensionDetailControllerBinding.inflate(themedInflater)
        binding.extensionPrefsRecycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
@ -213,8 +219,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
            !pkgFactory.isNullOrEmpty() -> "$URL_EXTENSION_COMMITS/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/$pkgFactory"
            else -> "$URL_EXTENSION_COMMITS/src/${pkgName.replace(".", "/")}"
        }
-        val intent = Intent(Intent.ACTION_VIEW, url.toUri())
+        openInBrowser(url)
        startActivity(intent)
    }
    private fun openInSettings() {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
@ -5,10 +5,13 @@ import android.os.Bundle
 import androidx.core.view.isVisible
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.list.listItemsMultiChoice
 import com.bluelinelabs.conductor.Controller
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchPresenter
@ -39,16 +42,16 @@ class SearchController(
        newManga = savedInstanceState.getSerializable(::newManga.name) as? Manga
    }
-    fun migrateManga() {
+    fun migrateManga(manga: Manga? = null, newManga: Manga?) {
-        val manga = manga ?: return
+        manga ?: return
-        val newManga = newManga ?: return
+        newManga ?: return
        (presenter as? SearchPresenter)?.migrateManga(manga, newManga, true)
    }
-    fun copyManga() {
+    fun copyManga(manga: Manga? = null, newManga: Manga?) {
-        val manga = manga ?: return
+        manga ?: return
-        val newManga = newManga ?: return
+        newManga ?: return
        (presenter as? SearchPresenter)?.migrateManga(manga, newManga, false)
    }
@ -56,7 +59,7 @@ class SearchController(
    override fun onMangaClick(manga: Manga) {
        newManga = manga
        val dialog =
-            MigrationDialog()
+            MigrationDialog(this.manga, newManga, this)
        dialog.targetController = this
        dialog.showDialog(router)
    }
@ -75,7 +78,7 @@ class SearchController(
        }
    }
-    class MigrationDialog : DialogController() {
+    class MigrationDialog(private val manga: Manga? = null, private val newManga: Manga? = null, private val callingController: Controller? = null) : DialogController() {
        private val preferences: PreferencesHelper by injectLazy()
@ -88,7 +91,7 @@ class SearchController(
                )
            return MaterialDialog(activity!!)
-                .message(R.string.migration_dialog_what_to_include)
+                .title(R.string.migration_dialog_what_to_include)
                .listItemsMultiChoice(
                    items = MigrationFlags.titles.map { resources?.getString(it) as CharSequence },
                    initialSelection = preselected.toIntArray()
@ -101,12 +104,28 @@ class SearchController(
                    preferences.migrateFlags().set(newValue)
                }
                .positiveButton(R.string.migrate) {
-                    (targetController as? SearchController)?.migrateManga()
+                    if (callingController != null) {
                        if (callingController.javaClass == SourceSearchController::class.java) {
                            router.popController(callingController)
                        }
                    }
                    (targetController as? SearchController)?.migrateManga(manga, newManga)
                }
                .negativeButton(R.string.copy) {
-                    (targetController as? SearchController)?.copyManga()
+                    if (callingController != null) {
                        if (callingController.javaClass == SourceSearchController::class.java) {
                            router.popController(callingController)
                        }
                    }
                    (targetController as? SearchController)?.copyManga(manga, newManga)
                }
                .neutralButton(android.R.string.cancel)
        }
    }
    override fun onTitleClick(source: CatalogueSource) {
        presenter.preferences.lastUsedSource().set(source.id)
        router.pushController(SourceSearchController(manga, source, presenter.query).withFadeTransaction())
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
@ -17,6 +17,8 @@ import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchPresenter
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import eu.kanade.tachiyomi.util.system.toast
 import java.util.Date
 class SearchPresenter(
@ -56,11 +58,15 @@ class SearchPresenter(
        replacingMangaRelay.call(true)
        presenterScope.launchIO {
-            val chapters = source.getChapterList(manga.toMangaInfo())
+            try {
-                .map { it.toSChapter() }
+                val chapters = source.getChapterList(manga.toMangaInfo())
                    .map { it.toSChapter() }
                migrateMangaInternal(source, chapters, prevManga, manga, replace)
            } catch (e: Throwable) {
                withUIContext { view?.applicationContext?.toast(e.message) }
            }
            migrateMangaInternal(source, chapters, prevManga, manga, replace)
        }.invokeOnCompletion {
            presenterScope.launchUI { replacingMangaRelay.call(false) }
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
@ -0,0 +1,39 @@
 package eu.kanade.tachiyomi.ui.browse.migration.search
 import android.os.Bundle
 import android.view.View
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.browse.source.browse.SourceItem
 class SourceSearchController(
    bundle: Bundle
 ) : BrowseSourceController(bundle) {
    constructor(manga: Manga? = null, source: CatalogueSource, searchQuery: String? = null) : this(
        Bundle().apply {
            putLong(SOURCE_ID_KEY, source.id)
            putSerializable(MANGA_KEY, manga)
            if (searchQuery != null) {
                putString(SEARCH_QUERY_KEY, searchQuery)
            }
        }
    )
    private var oldManga: Manga? = args.getSerializable(MANGA_KEY) as Manga?
    private var newManga: Manga? = null
    override fun onItemClick(view: View, position: Int): Boolean {
        val item = adapter?.getItem(position) as? SourceItem ?: return false
        newManga = item.manga
        val searchController = router.backstack.findLast { it.controller().javaClass == SearchController::class.java }?.controller() as SearchController?
        val dialog =
            SearchController.MigrationDialog(oldManga, newManga, this)
        dialog.targetController = searchController
        dialog.showDialog(router)
        return true
    }
    private companion object {
        const val MANGA_KEY = "oldManga"
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
@ -7,6 +7,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.MigrationSourcesControllerBinding
@ -31,6 +32,11 @@ class MigrationSourcesController :
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = MigrationSourcesControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt
@ -27,9 +27,14 @@ class MigrationSourcesPresenter(
    private fun findSourcesWithManga(library: List<Manga>): List<SourceItem> {
        val header = SelectionHeader()
-        return library.asSequence().map { it.source }.toSet()
+        return library
-            .mapNotNull { if (it != LocalSource.ID) sourceManager.getOrStub(it) else null }
+            .groupBy { it.source }
-            .sortedBy { it.name.toLowerCase() }
+            .filterKeys { it != LocalSource.ID }
-            .map { SourceItem(it, header) }.toList()
+            .map {
                val source = sourceManager.getOrStub(it.key)
                SourceItem(source, it.value.size, header)
            }
            .sortedBy { it.source.name.toLowerCase() }
            .toList()
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
@ -15,8 +15,8 @@ class SourceHolder(view: View, val adapter: SourceAdapter) :
    fun bind(item: SourceItem) {
        val source = item.source
-        binding.title.text = source.name
+        binding.title.text = "${source.name} (${item.mangaCount})"
-        binding.subtitle.isVisible = true
+        binding.subtitle.isVisible = source.lang != ""
        binding.subtitle.text = LocaleHelper.getDisplayName(source.lang)
        itemView.post {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt
@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.source.Source
 * @param source Instance of [Source] containing source information.
 * @param header The header for this item.
 */
-data class SourceItem(val source: Source, val header: SelectionHeader) :
+data class SourceItem(val source: Source, val mangaCount: Int, val header: SelectionHeader) :
    AbstractSectionableItem<SourceHolder, SelectionHeader>(header) {
    /**
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
@ -9,12 +9,12 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.list.listItems
 import com.bluelinelabs.conductor.ControllerChangeHandler
 import com.bluelinelabs.conductor.ControllerChangeType
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
@ -26,18 +26,13 @@ import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
-import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController
 import eu.kanade.tachiyomi.ui.base.controller.requestPermissionsSafe
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.BrowseController
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.appcompat.QueryTextEvent
 import reactivecircus.flowbinding.appcompat.queryTextEvents
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@ -48,7 +43,7 @@ import uy.kohesive.injekt.api.get
 * [SourceAdapter.OnLatestClickListener] call function data on latest item click
 */
 class SourceController :
-    NucleusController<SourceMainControllerBinding, SourcePresenter>(),
+    SearchableNucleusController<SourceMainControllerBinding, SourcePresenter>(),
    FlexibleAdapter.OnItemClickListener,
    FlexibleAdapter.OnItemLongClickListener,
    SourceAdapter.OnSourceClickListener {
@ -81,6 +76,11 @@ class SourceController :
     */
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = SourceMainControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
@ -200,37 +200,6 @@ class SourceController :
        parentController!!.router.pushController(controller.withFadeTransaction())
    }
    /**
     * Adds items to the options menu.
     *
     * @param menu menu containing options.
     * @param inflater used to load the menu xml.
     */
    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
        // Inflate menu
        inflater.inflate(R.menu.source_main, menu)
        // Initialize search option.
        val searchItem = menu.findItem(R.id.action_search)
        val searchView = searchItem.actionView as SearchView
        searchView.maxWidth = Int.MAX_VALUE
        // Change hint to show global search.
        searchView.queryHint = applicationContext?.getString(R.string.action_global_search_hint)
        // Create query listener which opens the global search view.
        searchView.queryTextEvents()
            .filterIsInstance<QueryTextEvent.QuerySubmitted>()
            .onEach { performGlobalSearch(it.queryText.toString()) }
            .launchIn(viewScope)
    }
    private fun performGlobalSearch(query: String) {
        parentController!!.router.pushController(
            GlobalSearchController(query).withFadeTransaction()
        )
    }
    /**
     * Called when an option menu item has been selected by the user.
     *
@ -290,4 +259,21 @@ class SourceController :
                }
        }
    }
    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
        createOptionsMenu(
            menu,
            inflater,
            R.menu.source_main,
            R.id.action_search,
            R.string.action_global_search_hint,
            false // GlobalSearch handles the searching here
        )
    }
    override fun onSearchViewQueryTextSubmit(query: String?) {
        parentController!!.router.pushController(
            GlobalSearchController(query).withFadeTransaction()
        )
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt
@ -49,12 +49,17 @@ data class SourceItem(
    override fun equals(other: Any?): Boolean {
        if (other is SourceItem) {
-            return source.id == other.source.id && getHeader()?.code == other.getHeader()?.code
+            return source.id == other.source.id &&
                getHeader()?.code == other.getHeader()?.code &&
                isPinned == other.isPinned
        }
        return false
    }
    override fun hashCode(): Int {
-        return source.id.hashCode() + (getHeader()?.code?.hashCode() ?: 0).toInt()
+        var result = source.id.hashCode()
        result = 31 * result + (header?.hashCode() ?: 0)
        result = 31 * result + isPinned.hashCode()
        return result
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
@ -8,7 +8,6 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.GridLayoutManager
@ -19,6 +18,7 @@ import com.afollestad.materialdialogs.list.listItems
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import com.tfcporciuncula.flow.Preference
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
@ -33,7 +33,7 @@ import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.ui.base.controller.FabController
-import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
@ -51,12 +51,8 @@ import eu.kanade.tachiyomi.widget.AutofitRecyclerView
 import eu.kanade.tachiyomi.widget.EmptyView
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.appcompat.QueryTextEvent
 import reactivecircus.flowbinding.appcompat.queryTextEvents
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
@ -64,7 +60,7 @@ import uy.kohesive.injekt.injectLazy
 * Controller to manage the catalogues available in the app.
 */
 open class BrowseSourceController(bundle: Bundle) :
-    NucleusController<SourceControllerBinding, BrowseSourcePresenter>(bundle),
+    SearchableNucleusController<SourceControllerBinding, BrowseSourcePresenter>(bundle),
    FabController,
    FlexibleAdapter.OnItemClickListener,
    FlexibleAdapter.OnItemLongClickListener,
@ -86,7 +82,7 @@ open class BrowseSourceController(bundle: Bundle) :
    /**
     * Adapter containing the list of manga from the catalogue.
     */
-    private var adapter: FlexibleAdapter<IFlexible<*>>? = null
+    protected var adapter: FlexibleAdapter<IFlexible<*>>? = null
    private var actionFab: ExtendedFloatingActionButton? = null
    private var actionFabScrollListener: RecyclerView.OnScrollListener? = null
@ -247,6 +243,11 @@ open class BrowseSourceController(bundle: Bundle) :
            actionFab?.shrinkOnScroll(recycler)
        }
        recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        recycler.setHasFixedSize(true)
        recycler.adapter = adapter
@ -259,25 +260,8 @@ open class BrowseSourceController(bundle: Bundle) :
    }
    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.source_browse, menu)
+        createOptionsMenu(menu, inflater, R.menu.source_browse, R.id.action_search)
        // Initialize search menu
        val searchItem = menu.findItem(R.id.action_search)
        val searchView = searchItem.actionView as SearchView
        searchView.maxWidth = Int.MAX_VALUE
        val query = presenter.query
        if (query.isNotBlank()) {
            searchItem.expandActionView()
            searchView.setQuery(query, true)
            searchView.clearFocus()
        }
        searchView.queryTextEvents()
            .filter { router.backstack.lastOrNull()?.controller() == this@BrowseSourceController }
            .filterIsInstance<QueryTextEvent.QuerySubmitted>()
            .onEach { searchWithQuery(it.queryText.toString()) }
            .launchIn(viewScope)
        searchItem.fixExpand(
            onExpand = { invalidateMenuOnExpand() },
@ -300,6 +284,10 @@ open class BrowseSourceController(bundle: Bundle) :
        menu.findItem(displayItem).isChecked = true
    }
    override fun onSearchViewQueryTextSubmit(query: String?) {
        searchWithQuery(query ?: "")
    }
    override fun onPrepareOptionsMenu(menu: Menu) {
        super.onPrepareOptionsMenu(menu)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
@ -66,12 +66,6 @@ open class BrowseSourcePresenter(
     */
    lateinit var source: CatalogueSource
    /**
     * Query from the view.
     */
    var query = searchQuery ?: ""
        private set
    /**
     * Modifiable list of filters.
     */
@ -108,6 +102,10 @@ open class BrowseSourcePresenter(
     */
    private var pageSubscription: Subscription? = null
    init {
        query = searchQuery ?: ""
    }
    override fun onCreate(savedState: Bundle?) {
        super.onCreate(savedState)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/TextItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/TextItem.kt
@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.browse.source.filter
 import android.view.View
 import android.widget.EditText
 import androidx.core.widget.doOnTextChanged
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.textfield.TextInputLayout
 import eu.davidea.flexibleadapter.FlexibleAdapter
@ -10,7 +11,6 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.widget.SimpleTextWatcher
 open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem<TextItem.Holder>() {
@ -25,11 +25,9 @@ open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem<TextItem.Hol
    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>, holder: Holder, position: Int, payloads: List<Any?>?) {
        holder.wrapper.hint = filter.name
        holder.edit.setText(filter.state)
-        holder.edit.addTextChangedListener(object : SimpleTextWatcher() {
+        holder.edit.doOnTextChanged { text, _, _, _ ->
-            override fun onTextChanged(text: CharSequence, start: Int, before: Int, count: Int) {
+            filter.state = text.toString()
-                filter.state = text.toString()
+        }
            }
        })
    }
    override fun equals(other: Any?): Boolean {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
@ -10,20 +10,16 @@ import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import dev.chrisbanes.insetter.applyInsetter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.GlobalSearchControllerBinding
 import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.appcompat.QueryTextEvent
 import reactivecircus.flowbinding.appcompat.queryTextEvents
 import uy.kohesive.injekt.injectLazy
 /**
@ -34,7 +30,7 @@ import uy.kohesive.injekt.injectLazy
 open class GlobalSearchController(
    protected val initialQuery: String? = null,
    protected val extensionFilter: String? = null
-) : NucleusController<GlobalSearchControllerBinding, GlobalSearchPresenter>(),
+) : SearchableNucleusController<GlobalSearchControllerBinding, GlobalSearchPresenter>(),
    GlobalSearchCardAdapter.OnMangaClickListener,
    GlobalSearchAdapter.OnTitleClickListener {
@ -45,6 +41,11 @@ open class GlobalSearchController(
     */
    protected var adapter: GlobalSearchAdapter? = null
    /**
     * Ref to the OptionsMenu.SearchItem created in onCreateOptionsMenu
     */
    private var optionsMenuSearchItem: MenuItem? = null
    init {
        setHasOptionsMenu(true)
    }
@ -58,6 +59,11 @@ open class GlobalSearchController(
     */
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = GlobalSearchControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
@ -100,36 +106,32 @@ open class GlobalSearchController(
     * @param inflater used to load the menu xml.
     */
    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        // Inflate menu.
+        createOptionsMenu(
-        inflater.inflate(R.menu.global_search, menu)
+            menu,
-
+            inflater,
-        // Initialize search menu
+            R.menu.global_search,
-        val searchItem = menu.findItem(R.id.action_search)
+            R.id.action_search,
-        val searchView = searchItem.actionView as SearchView
+            null,
-        searchView.maxWidth = Int.MAX_VALUE
+            false // the onMenuItemActionExpand will handle this
        searchItem.setOnActionExpandListener(
            object : MenuItem.OnActionExpandListener {
                override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
                    searchView.onActionViewExpanded() // Required to show the query in the view
                    searchView.setQuery(presenter.query, false)
                    return true
                }
                override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
                    return true
                }
            }
        )
-        searchView.queryTextEvents()
+        optionsMenuSearchItem = menu.findItem(R.id.action_search)
-            .filterIsInstance<QueryTextEvent.QuerySubmitted>()
+    }
-            .onEach {
+
-                presenter.search(it.queryText.toString())
+    override fun onSearchMenuItemActionExpand(item: MenuItem?) {
-                searchItem.collapseActionView()
+        super.onSearchMenuItemActionExpand(item)
-                setTitle() // Update toolbar title
+        val searchView = optionsMenuSearchItem?.actionView as SearchView
-            }
+        searchView.onActionViewExpanded() // Required to show the query in the view
-            .launchIn(viewScope)
+
        if (nonSubmittedQuery.isBlank()) {
            searchView.setQuery(presenter.query, false)
        }
    }
    override fun onSearchViewQueryTextSubmit(query: String?) {
        presenter.search(query ?: "")
        optionsMenuSearchItem?.collapseActionView()
        setTitle() // Update toolbar title
    }
    /**
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
@ -47,12 +47,6 @@ open class GlobalSearchPresenter(
     */
    val sources by lazy { getSourcesToQuery() }
    /**
     * Query from the view.
     */
    var query = ""
        private set
    /**
     * Fetches the different sources by user settings.
     */
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt
@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.SelectableAdapter
 import eu.davidea.flexibleadapter.helpers.UndoHelper
@ -75,6 +76,11 @@ class CategoryController :
     */
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = CategoriesControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt
@ -10,6 +10,7 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import dev.chrisbanes.insetter.applyInsetter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.DownloadService
 import eu.kanade.tachiyomi.data.download.model.Download
@ -56,6 +57,11 @@ class DownloadController :
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = DownloadControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt
@ -14,9 +14,7 @@ class ChangeMangaCategoriesDialog<T>(bundle: Bundle? = null) :
    DialogController(bundle) where T : Controller, T : ChangeMangaCategoriesDialog.Listener {
    private var mangas = emptyList<Manga>()
    private var categories = emptyList<Category>()
    private var preselected = emptyArray<Int>()
    constructor(
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
@ -6,6 +6,7 @@ import android.view.View
 import android.widget.FrameLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.SelectableAdapter
 import eu.kanade.tachiyomi.R
@ -82,6 +83,12 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att
            }
        }
        recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        adapter = LibraryCategoryAdapter(this)
        recycler.setHasFixedSize(true)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@ -10,7 +10,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.isVisible
 import com.bluelinelabs.conductor.ControllerChangeHandler
@ -27,8 +26,8 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.databinding.LibraryControllerBinding
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.RootController
 import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController
 import eu.kanade.tachiyomi.ui.base.controller.TabbedController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
@ -37,11 +36,9 @@ import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import reactivecircus.flowbinding.appcompat.queryTextChanges
 import reactivecircus.flowbinding.viewpager.pageSelections
 import rx.Subscription
 import uy.kohesive.injekt.Injekt
@ -50,7 +47,7 @@ import uy.kohesive.injekt.api.get
 class LibraryController(
    bundle: Bundle? = null,
    private val preferences: PreferencesHelper = Injekt.get()
-) : NucleusController<LibraryControllerBinding, LibraryPresenter>(bundle),
+) : SearchableNucleusController<LibraryControllerBinding, LibraryPresenter>(bundle),
    RootController,
    TabbedController,
    ActionMode.Callback,
@ -67,11 +64,6 @@ class LibraryController(
     */
    private var actionMode: ActionMode? = null
    /**
     * Library search query.
     */
    private var query: String = ""
    /**
     * Currently selected mangas.
     */
@ -212,12 +204,12 @@ class LibraryController(
        binding.btnGlobalSearch.clicks()
            .onEach {
                router.pushController(
-                    GlobalSearchController(query).withFadeTransaction()
+                    GlobalSearchController(presenter.query).withFadeTransaction()
                )
            }
            .launchIn(viewScope)
-        (activity!! as MainActivity).fixViewToBottom(binding.actionToolbar)
+        (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
    }
    override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
@ -230,7 +222,7 @@ class LibraryController(
    override fun onDestroyView(view: View) {
        destroyActionModeIfNeeded()
-        (activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar)
+        (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
        binding.actionToolbar.destroy()
        adapter?.onDestroy()
        adapter = null
@ -384,52 +376,21 @@ class LibraryController(
    }
    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.library, menu)
+        createOptionsMenu(menu, inflater, R.menu.library, R.id.action_search)
        val searchItem = menu.findItem(R.id.action_search)
        val searchView = searchItem.actionView as SearchView
        searchView.maxWidth = Int.MAX_VALUE
        searchItem.fixExpand(onExpand = { invalidateMenuOnExpand() })
        if (query.isNotEmpty()) {
            searchItem.expandActionView()
            searchView.setQuery(query, true)
            searchView.clearFocus()
            performSearch()
            // Workaround for weird behavior where searchview gets empty text change despite
            // query being set already
            searchView.postDelayed({ initSearchHandler(searchView) }, 500)
        } else {
            initSearchHandler(searchView)
        }
        // Mutate the filter icon because it needs to be tinted and the resource is shared.
        menu.findItem(R.id.action_filter).icon.mutate()
    }
    fun search(query: String) {
-        this.query = query
+        presenter.query = query
    }
    private fun initSearchHandler(searchView: SearchView) {
        searchView.queryTextChanges()
            // Ignore events if this controller isn't at the top to avoid query being reset
            .filter { router.backstack.lastOrNull()?.controller() == this }
            .onEach {
                query = it.toString()
                performSearch()
            }
            .launchIn(viewScope)
    }
    private fun performSearch() {
-        searchRelay.call(query)
+        searchRelay.call(presenter.query)
-        if (query.isNotEmpty()) {
+        if (presenter.query.isNotEmpty()) {
            binding.btnGlobalSearch.isVisible = true
            binding.btnGlobalSearch.text =
-                resources?.getString(R.string.action_global_search_query, query)
+                resources?.getString(R.string.action_global_search_query, presenter.query)
        } else {
            binding.btnGlobalSearch.isVisible = false
        }
@ -611,4 +572,12 @@ class LibraryController(
            selectInverseRelay.call(it)
        }
    }
    override fun onSearchViewQueryTextChange(newText: String?) {
        // Ignore events if this controller isn't at the top to avoid query being reset
        if (router.backstack.lastOrNull()?.controller() == this) {
            presenter.query = newText ?: ""
            performSearch()
        }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
@ -90,6 +90,7 @@ class LibraryItem(val manga: LibraryManga, private val libraryDisplayMode: Prefe
        return manga.title.contains(constraint, true) ||
            (manga.author?.contains(constraint, true) ?: false) ||
            (manga.artist?.contains(constraint, true) ?: false) ||
            (manga.description?.contains(constraint, true) ?: false) ||
            sourceManager.getOrStub(manga.source).name.contains(constraint, true) ||
            if (constraint.contains(",")) {
                constraint.split(",").all { containsGenre(it.trim(), manga.getGenres()) }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@ -235,7 +235,12 @@ class LibraryPresenter(
            var counter = 0
            db.getLatestChapterManga().executeAsBlocking().associate { it.id!! to counter++ }
        }
        val chapterFetchDateManga by lazy {
            var counter = 0
            db.getChapterFetchDateManga().executeAsBlocking().associate { it.id!! to counter++ }
        }
        val sortAscending = preferences.librarySortingAscending().get()
        val sortFn: (LibraryItem, LibraryItem) -> Int = { i1, i2 ->
            when (sortingMode) {
                LibrarySort.ALPHA -> i1.manga.title.compareTo(i2.manga.title, true)
@ -246,7 +251,13 @@ class LibraryPresenter(
                    manga1LastRead.compareTo(manga2LastRead)
                }
                LibrarySort.LAST_CHECKED -> i2.manga.last_update.compareTo(i1.manga.last_update)
-                LibrarySort.UNREAD -> i1.manga.unread.compareTo(i2.manga.unread)
+                LibrarySort.UNREAD -> when {
                    // Ensure unread content comes first
                    i1.manga.unread == i2.manga.unread -> 0
                    i1.manga.unread == 0 -> if (sortAscending) 1 else -1
                    i2.manga.unread == 0 -> if (sortAscending) -1 else 1
                    else -> i1.manga.unread.compareTo(i2.manga.unread)
                }
                LibrarySort.TOTAL -> {
                    val manga1TotalChapter = totalChapterManga[i1.manga.id!!] ?: 0
                    val mange2TotalChapter = totalChapterManga[i2.manga.id!!] ?: 0
@ -259,12 +270,19 @@ class LibraryPresenter(
                        ?: latestChapterManga.size
                    manga1latestChapter.compareTo(manga2latestChapter)
                }
                LibrarySort.CHAPTER_FETCH_DATE -> {
                    val manga1chapterFetchDate = chapterFetchDateManga[i1.manga.id!!]
                        ?: chapterFetchDateManga.size
                    val manga2chapterFetchDate = chapterFetchDateManga[i2.manga.id!!]
                        ?: chapterFetchDateManga.size
                    manga1chapterFetchDate.compareTo(manga2chapterFetchDate)
                }
                LibrarySort.DATE_ADDED -> i2.manga.date_added.compareTo(i1.manga.date_added)
                else -> throw Exception("Unknown sorting mode")
            }
        }
-        val comparator = if (preferences.librarySortingAscending().get()) {
+        val comparator = if (sortAscending) {
            Comparator(sortFn)
        } else {
            Collections.reverseOrder(sortFn)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
@ -20,7 +20,7 @@ class LibrarySettingsSheet(
    router: Router,
    private val trackManager: TrackManager = Injekt.get(),
    onGroupClickListener: (ExtendedNavigationView.Group) -> Unit
-) : TabbedBottomSheetDialog(router) {
+) : TabbedBottomSheetDialog(router.activity!!) {
    val filters: Filter
    private val sort: Sort
@ -157,11 +157,12 @@ class LibrarySettingsSheet(
            private val lastChecked = Item.MultiSort(R.string.action_sort_last_checked, this)
            private val unread = Item.MultiSort(R.string.action_filter_unread, this)
            private val latestChapter = Item.MultiSort(R.string.action_sort_latest_chapter, this)
            private val chapterFetchDate = Item.MultiSort(R.string.action_sort_chapter_fetch_date, this)
            private val dateAdded = Item.MultiSort(R.string.action_sort_date_added, this)
            override val header = null
            override val items =
-                listOf(alphabetically, lastRead, lastChecked, unread, total, latestChapter, dateAdded)
+                listOf(alphabetically, lastRead, lastChecked, unread, total, latestChapter, chapterFetchDate, dateAdded)
            override val footer = null
            override fun initModels() {
@ -184,6 +185,8 @@ class LibrarySettingsSheet(
                    if (sorting == LibrarySort.TOTAL) order else Item.MultiSort.SORT_NONE
                latestChapter.state =
                    if (sorting == LibrarySort.LATEST_CHAPTER) order else Item.MultiSort.SORT_NONE
                chapterFetchDate.state =
                    if (sorting == LibrarySort.CHAPTER_FETCH_DATE) order else Item.MultiSort.SORT_NONE
                dateAdded.state =
                    if (sorting == LibrarySort.DATE_ADDED) order else Item.MultiSort.SORT_NONE
            }
@ -211,6 +214,7 @@ class LibrarySettingsSheet(
                        unread -> LibrarySort.UNREAD
                        total -> LibrarySort.TOTAL
                        latestChapter -> LibrarySort.LATEST_CHAPTER
                        chapterFetchDate -> LibrarySort.CHAPTER_FETCH_DATE
                        dateAdded -> LibrarySort.DATE_ADDED
                        else -> throw Exception("Unknown sorting")
                    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
@ -8,6 +8,7 @@ object LibrarySort {
    const val UNREAD = 3
    const val TOTAL = 4
    const val LATEST_CHAPTER = 6
    const val CHAPTER_FETCH_DATE = 8
    const val DATE_ADDED = 7
    @Deprecated("Removed in favor of searching by source")
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@ -2,11 +2,16 @@ package eu.kanade.tachiyomi.ui.main
 import android.app.SearchManager
 import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
@ -18,6 +23,7 @@ import com.bluelinelabs.conductor.Router
 import com.bluelinelabs.conductor.RouterTransaction
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.behavior.HideBottomViewOnScrollBehavior
 import dev.chrisbanes.insetter.applyInsetter
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.Migrations
 import eu.kanade.tachiyomi.R
@ -43,6 +49,7 @@ import eu.kanade.tachiyomi.ui.recent.history.HistoryController
 import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import timber.log.Timber
@ -84,6 +91,35 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
        setContentView(binding.root)
        setSupportActionBar(binding.toolbar)
        // Draw edge-to-edge
        WindowCompat.setDecorFitsSystemWindows(window, false)
        binding.appbar.applyInsetter {
            type(navigationBars = true, statusBars = true) {
                padding(left = true, top = true, right = true)
            }
        }
        binding.bottomNav.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        binding.rootFab.applyInsetter {
            type(navigationBars = true) {
                margin()
            }
        }
        // Make sure navigation bar is on bottom when making it transparent
        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, insets ->
            if (insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom > 0) {
                // Keep scrim on light theme if windowLightNavigationBar is not available
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 || isDarkMode) {
                    window.navigationBarColor = Color.TRANSPARENT
                }
            }
            insets
        }
        tabAnimator = ViewHeightAnimator(binding.tabs, 0L)
        bottomNavAnimator = ViewHeightAnimator(binding.bottomNav)
@ -301,11 +337,8 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
    private suspend fun resetExitConfirmation() {
        isConfirmingExit = true
-        val toast = Toast.makeText(this, R.string.confirm_exit, Toast.LENGTH_LONG)
+        val toast = toast(R.string.confirm_exit, Toast.LENGTH_LONG)
        toast.show()
        delay(2000)
        toast.cancel()
        isConfirmingExit = false
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt
@ -1,13 +1,12 @@
 package eu.kanade.tachiyomi.ui.main
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.net.toUri
 import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.openInBrowser
 class WhatsNewDialogController(bundle: Bundle? = null) : DialogController(bundle) {
@ -16,9 +15,7 @@ class WhatsNewDialogController(bundle: Bundle? = null) : DialogController(bundle
            .title(text = activity!!.getString(R.string.updated_version, BuildConfig.VERSION_NAME))
            .positiveButton(android.R.string.ok)
            .neutralButton(R.string.whats_new) {
-                val url = "https://github.com/tachiyomiorg/tachiyomi/releases/tag/v${BuildConfig.VERSION_NAME}"
+                openInBrowser("https://github.com/tachiyomiorg/tachiyomi/releases/tag/v${BuildConfig.VERSION_NAME}")
                val intent = Intent(Intent.ACTION_VIEW, url.toUri())
                startActivity(intent)
            }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
@ -26,6 +26,7 @@ import com.bluelinelabs.conductor.ControllerChangeHandler
 import com.bluelinelabs.conductor.ControllerChangeType
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.SelectableAdapter
 import eu.kanade.tachiyomi.R
@ -72,6 +73,7 @@ import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController
 import eu.kanade.tachiyomi.ui.webview.WebViewActivity
 import eu.kanade.tachiyomi.util.chapter.NoChaptersException
 import eu.kanade.tachiyomi.util.hasCustomCover
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.view.getCoordinates
@ -199,6 +201,11 @@ class MangaController :
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = MangaControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
@ -242,7 +249,7 @@ class MangaController :
            }
            .launchIn(viewScope)
-        (activity!! as MainActivity).fixViewToBottom(binding.actionToolbar)
+        (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
        settingsSheet = ChaptersSettingsSheet(router, presenter) { group ->
            if (group is ChaptersSettingsSheet.Filter.FilterGroup) {
@ -321,7 +328,7 @@ class MangaController :
    override fun onDestroyView(view: View) {
        destroyActionModeIfNeeded()
-        (activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar)
+        (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
        binding.actionToolbar.destroy()
        mangaInfoAdapter = null
        chaptersHeaderAdapter = null
@ -608,8 +615,9 @@ class MangaController :
    override fun openMangaCoverPicker(manga: Manga) {
        if (manga.favorite) {
-            val intent = Intent(Intent.ACTION_GET_CONTENT)
+            val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-            intent.type = "image/*"
+                type = "image/*"
            }
            startActivityForResult(
                Intent.createChooser(
                    intent,
@ -988,7 +996,9 @@ class MangaController :
        chapters.forEach {
            chaptersAdapter?.updateItem(it)
        }
-        chaptersAdapter?.notifyDataSetChanged()
+        launchUI {
            chaptersAdapter?.notifyDataSetChanged()
        }
    }
    fun onChaptersDeletedError(error: Throwable) {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
@ -17,7 +17,7 @@ class ChaptersSettingsSheet(
    private val router: Router,
    private val presenter: MangaPresenter,
    onGroupClickListener: (ExtendedNavigationView.Group) -> Unit
-) : TabbedBottomSheetDialog(router) {
+) : TabbedBottomSheetDialog(router.activity!!) {
    val filters: Filter
    private val sort: Sort
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
@ -55,24 +55,24 @@ class TrackSearchAdapter(context: Context) :
                    .into(binding.trackSearchCover)
            }
-            if (track.publishing_status.isBlank()) {
+            val hasStatus = track.publishing_status.isNotBlank()
-                binding.trackSearchStatus.isVisible = false
+            binding.trackSearchStatus.isVisible = hasStatus
-                binding.trackSearchStatusResult.isVisible = false
+            binding.trackSearchStatusResult.isVisible = hasStatus
-            } else {
+            if (hasStatus) {
                binding.trackSearchStatusResult.text = track.publishing_status.capitalize()
            }
-            if (track.publishing_type.isBlank()) {
+            val hasType = track.publishing_type.isNotBlank()
-                binding.trackSearchType.isVisible = false
+            binding.trackSearchType.isVisible = hasType
-                binding.trackSearchTypeResult.isVisible = false
+            binding.trackSearchTypeResult.isVisible = hasType
-            } else {
+            if (hasType) {
                binding.trackSearchTypeResult.text = track.publishing_type.capitalize()
            }
-            if (track.start_date.isBlank()) {
+            val hasStartDate = track.start_date.isNotBlank()
-                binding.trackSearchStart.isVisible = false
+            binding.trackSearchStart.isVisible = hasStartDate
-                binding.trackSearchStartResult.isVisible = false
+            binding.trackSearchStartResult.isVisible = hasStartDate
-            } else {
+            if (hasStartDate) {
                binding.trackSearchStartResult.text = track.start_date
            }
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt
@ -1,13 +1,12 @@
 package eu.kanade.tachiyomi.ui.manga.track
 import android.content.Intent
 import android.os.Bundle
 import android.view.ViewGroup
 import androidx.core.net.toUri
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.databinding.TrackControllerBinding
 import eu.kanade.tachiyomi.ui.base.controller.openInBrowser
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
@ -65,7 +64,7 @@ class TrackSheet(
        val track = adapter.getItem(position)?.track ?: return
        if (track.tracking_url.isNotBlank()) {
-            controller.activity?.startActivity(Intent(Intent.ACTION_VIEW, track.tracking_url.toUri()))
+            controller.openInBrowser(track.tracking_url)
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
@ -1,10 +1,8 @@
 package eu.kanade.tachiyomi.ui.more
 import android.app.Dialog
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.preference.PreferenceScreen
 import com.afollestad.materialdialogs.MaterialDialog
@ -15,6 +13,7 @@ import eu.kanade.tachiyomi.data.updater.UpdateResult
 import eu.kanade.tachiyomi.data.updater.UpdaterService
 import eu.kanade.tachiyomi.data.updater.github.GithubUpdateChecker
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.openInBrowser
 import eu.kanade.tachiyomi.ui.setting.SettingsController
 import eu.kanade.tachiyomi.util.lang.launchNow
 import eu.kanade.tachiyomi.util.lang.toDateTimestampString
@ -76,19 +75,15 @@ class AboutController : SettingsController() {
                } else {
                    "https://github.com/tachiyomiorg/tachiyomi/releases/tag/v${BuildConfig.VERSION_NAME}"
                }
-
+                openInBrowser(url)
                val intent = Intent(Intent.ACTION_VIEW, url.toUri())
                startActivity(intent)
            }
        }
        if (BuildConfig.DEBUG) {
            preference {
                key = "pref_about_notices"
                titleRes = R.string.notices
                onClick {
-                    val intent = Intent(Intent.ACTION_VIEW, "https://github.com/tachiyomiorg/tachiyomi/blob/master/PREVIEW_RELEASE_NOTES.md".toUri())
+                    openInBrowser("https://github.com/tachiyomiorg/tachiyomi/blob/master/PREVIEW_RELEASE_NOTES.md")
                    startActivity(intent)
                }
            }
        }
@ -97,47 +92,46 @@ class AboutController : SettingsController() {
            preference {
                key = "pref_about_website"
                titleRes = R.string.website
-                val url = "https://tachiyomi.org"
+                "https://tachiyomi.org".also {
-                summary = url
+                    summary = it
-                onClick {
+                    onClick { openInBrowser(it) }
-                    val intent = Intent(Intent.ACTION_VIEW, url.toUri())
+                }
-                    startActivity(intent)
+            }
            preference {
                key = "pref_about_twitter"
                title = "Twitter"
                "https://twitter.com/tachiyomiorg".also {
                    summary = it
                    onClick { openInBrowser(it) }
                }
            }
            preference {
                key = "pref_about_discord"
                title = "Discord"
-                val url = "https://discord.gg/tachiyomi"
+                "https://discord.gg/tachiyomi".also {
-                summary = url
+                    summary = it
-                onClick {
+                    onClick { openInBrowser(it) }
                    val intent = Intent(Intent.ACTION_VIEW, url.toUri())
                    startActivity(intent)
                }
            }
            preference {
                key = "pref_about_github"
                title = "GitHub"
-                val url = "https://github.com/tachiyomiorg/tachiyomi"
+                "https://github.com/tachiyomiorg/tachiyomi".also {
-                summary = url
+                    summary = it
-                onClick {
+                    onClick { openInBrowser(it) }
                    val intent = Intent(Intent.ACTION_VIEW, url.toUri())
                    startActivity(intent)
                }
            }
            preference {
                key = "pref_about_label_extensions"
                titleRes = R.string.label_extensions
-                val url = "https://github.com/tachiyomiorg/tachiyomi-extensions"
+                "https://github.com/tachiyomiorg/tachiyomi-extensions".also {
-                summary = url
+                    summary = it
-                onClick {
+                    onClick { openInBrowser(it) }
                    val intent = Intent(Intent.ACTION_VIEW, url.toUri())
                    startActivity(intent)
                }
            }
            preference {
                key = "pref_about_licenses"
                titleRes = R.string.licenses
                onClick {
                    LibsBuilder()
                        .withActivityTitle(activity!!.getString(R.string.licenses))
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
@ -78,7 +78,7 @@ class MoreController :
                }
            }
            preference {
-                titleRes = R.string.label_categories
+                titleRes = R.string.categories
                iconRes = R.drawable.ic_label_24dp
                iconTint = tintColor
                onClick {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@ -6,28 +6,26 @@ import android.app.ProgressDialog
 import android.content.ClipData
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.Gravity
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.SeekBar
 import android.widget.Toast
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.core.view.setPadding
 import androidx.lifecycle.lifecycleScope
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.google.android.material.snackbar.Snackbar
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
@ -35,14 +33,20 @@ import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.data.preference.toggle
 import eu.kanade.tachiyomi.databinding.ReaderActivityBinding
 import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.ui.reader.ReaderPresenter.SetAsCoverResult.AddToLibraryFirst
 import eu.kanade.tachiyomi.ui.reader.ReaderPresenter.SetAsCoverResult.Error
 import eu.kanade.tachiyomi.ui.reader.ReaderPresenter.SetAsCoverResult.Success
 import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsSheet
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 import eu.kanade.tachiyomi.ui.reader.viewer.BaseViewer
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.L2RPagerViewer
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer
@ -55,8 +59,8 @@ import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.view.defaultBar
 import eu.kanade.tachiyomi.util.view.hideBar
 import eu.kanade.tachiyomi.util.view.isDefaultBar
 import eu.kanade.tachiyomi.util.view.setTooltip
 import eu.kanade.tachiyomi.util.view.showBar
 import eu.kanade.tachiyomi.util.view.snack
 import eu.kanade.tachiyomi.widget.SimpleAnimationListener
 import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
 import kotlinx.coroutines.delay
@ -77,6 +81,16 @@ import kotlin.math.abs
@RequiresPresenter(ReaderPresenter::class)
 class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>() {
    companion object {
        fun newIntent(context: Context, manga: Manga, chapter: Chapter): Intent {
            return Intent(context, ReaderActivity::class.java).apply {
                putExtra("manga", manga.id)
                putExtra("chapter", chapter.id)
                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
            }
        }
    }
    private val preferences: PreferencesHelper by injectLazy()
    /**
@ -109,22 +123,9 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
    @Suppress("DEPRECATION")
    private var progressDialog: ProgressDialog? = null
-    companion object {
+    private var menuToggleToast: Toast? = null
        @Suppress("unused")
        const val LEFT_TO_RIGHT = 1
        const val RIGHT_TO_LEFT = 2
        const val VERTICAL = 3
        const val WEBTOON = 4
        const val VERTICAL_PLUS = 5
-        fun newIntent(context: Context, manga: Manga, chapter: Chapter): Intent {
+    private var readingModeToast: Toast? = null
            return Intent(context, ReaderActivity::class.java).apply {
                putExtra("manga", manga.id)
                putExtra("chapter", chapter.id)
                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
            }
        }
    }
    /**
     * Called when the activity is created. Initializes the presenter and configuration.
@ -174,6 +175,8 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
        viewer?.destroy()
        viewer = null
        config = null
        menuToggleToast?.cancel()
        readingModeToast?.cancel()
        progressDialog?.dismiss()
        progressDialog = null
    }
@ -237,18 +240,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
                presenter.bookmarkCurrentChapter(false)
                invalidateOptionsMenu()
            }
            R.id.action_settings -> ReaderSettingsSheet(this).show()
            R.id.action_custom_filter -> {
                val sheet = ReaderColorFilterSheet(this)
                    // Remove dimmed backdrop so changes can be previewed
                    .apply { window?.setDimAmount(0f) }
                // Hide toolbars while sheet is open for better preview
                sheet.setOnDismissListener { setMenuVisibility(true) }
                setMenuVisibility(false)
                sheet.show()
            }
        }
        return super.onOptionsItemSelected(item)
    }
@ -294,7 +285,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
     * Initializes the reader menu. It sets up click listeners and the initial visibility.
     */
    private fun initializeMenu() {
        // Set toolbar
        setSupportActionBar(binding.toolbar)
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        binding.toolbar.setNavigationOnClickListener {
@ -314,6 +304,18 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
            insets
        }
        binding.toolbar.setOnClickListener {
            presenter.manga?.id?.let { id ->
                startActivity(
                    Intent(this, MainActivity::class.java).apply {
                        action = MainActivity.SHORTCUT_MANGA
                        putExtra(MangaController.MANGA_EXTRA, id)
                        addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
                    }
                )
            }
        }
        // Init listeners on bottom menu
        binding.pageSeekbar.setOnSeekBarChangeListener(
            object : SimpleSeekBarListener() {
@ -343,15 +345,105 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
            }
        }
        initBottomShortcuts()
        // Set initial visibility
        setMenuVisibility(menuVisible)
    }
    private fun initBottomShortcuts() {
        // Reading mode
        with(binding.actionReadingMode) {
            setTooltip(R.string.viewer)
            setOnClickListener {
                val newReadingMode =
                    ReadingModeType.getNextReadingMode(presenter.getMangaViewer(resolveDefault = false))
                presenter.setMangaViewer(newReadingMode.prefValue)
                menuToggleToast?.cancel()
                if (!preferences.showReadingMode()) {
                    menuToggleToast = toast(newReadingMode.stringRes)
                }
            }
        }
        // Rotation
        with(binding.actionRotation) {
            setTooltip(R.string.pref_rotation_type)
            setOnClickListener {
                val newOrientation =
                    OrientationType.getNextOrientation(preferences.rotation().get(), resources)
                preferences.rotation().set(newOrientation.prefValue)
                setOrientation(newOrientation.flag)
                menuToggleToast?.cancel()
                menuToggleToast = toast(newOrientation.stringRes)
            }
        }
        preferences.rotation().asImmediateFlow { updateRotationShortcut(it) }
            .launchIn(lifecycleScope)
        // Crop borders
        with(binding.actionCropBorders) {
            setTooltip(R.string.pref_crop_borders)
            setOnClickListener {
                val isPagerType = ReadingModeType.isPagerType(presenter.getMangaViewer())
                if (isPagerType) {
                    preferences.cropBorders().toggle()
                } else {
                    preferences.cropBordersWebtoon().toggle()
                }
            }
        }
        updateCropBordersShortcut()
        listOf(preferences.cropBorders(), preferences.cropBordersWebtoon())
            .forEach { pref ->
                pref.asFlow()
                    .onEach { updateCropBordersShortcut() }
                    .launchIn(lifecycleScope)
            }
        // Settings sheet
        with(binding.actionSettings) {
            setTooltip(R.string.action_settings)
            setOnClickListener {
                ReaderSettingsSheet(this@ReaderActivity).show()
            }
        }
    }
    private fun updateRotationShortcut(preference: Int) {
        val orientation = OrientationType.fromPreference(preference, resources)
        binding.actionRotation.setImageResource(orientation.iconRes)
    }
    private fun updateCropBordersShortcut() {
        val isPagerType = ReadingModeType.isPagerType(presenter.getMangaViewer())
        val enabled = if (isPagerType) {
            preferences.cropBorders().get()
        } else {
            preferences.cropBordersWebtoon().get()
        }
        binding.actionCropBorders.setImageResource(
            if (enabled) {
                R.drawable.ic_crop_24dp
            } else {
                R.drawable.ic_crop_off_24dp
            }
        )
    }
    /**
     * Sets the visibility of the menu according to [visible] and with an optional parameter to
     * [animate] the views.
     */
-    private fun setMenuVisibility(visible: Boolean, animate: Boolean = true) {
+    fun setMenuVisibility(visible: Boolean, animate: Boolean = true) {
        menuVisible = visible
        if (visible) {
            if (preferences.fullscreen().get()) {
@ -366,7 +458,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
                toolbarAnimation.setAnimationListener(
                    object : SimpleAnimationListener() {
                        override fun onAnimationStart(animation: Animation) {
-// Fix status bar being translucent the first time it's opened.
+                            // Fix status bar being translucent the first time it's opened.
                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
                        }
                    }
@ -422,12 +514,16 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
     */
    fun setManga(manga: Manga) {
        val prevViewer = viewer
        val viewerMode = ReadingModeType.fromPreference(presenter.getMangaViewer(resolveDefault = false))
        binding.actionReadingMode.setImageResource(viewerMode.iconRes)
        val newViewer = when (presenter.getMangaViewer()) {
-            RIGHT_TO_LEFT -> R2LPagerViewer(this)
+            ReadingModeType.LEFT_TO_RIGHT.prefValue -> L2RPagerViewer(this)
-            VERTICAL -> VerticalPagerViewer(this)
+            ReadingModeType.VERTICAL.prefValue -> VerticalPagerViewer(this)
-            WEBTOON -> WebtoonViewer(this)
+            ReadingModeType.WEBTOON.prefValue -> WebtoonViewer(this)
-            VERTICAL_PLUS -> WebtoonViewer(this, isContinuous = false)
+            ReadingModeType.CONTINUOUS_VERTICAL.prefValue -> WebtoonViewer(this, isContinuous = false)
-            else -> L2RPagerViewer(this)
+            else -> R2LPagerViewer(this)
        }
        // Destroy previous viewer if there was one
@ -439,20 +535,30 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
        binding.viewerContainer.addView(newViewer.getView())
        if (preferences.showReadingMode()) {
-            showReadingModeSnackbar(presenter.getMangaViewer())
+            showReadingModeToast(presenter.getMangaViewer())
        }
        binding.toolbar.title = manga.title
        binding.pageSeekbar.isRTL = newViewer is R2LPagerViewer
        if (newViewer is R2LPagerViewer) {
            binding.leftChapter.setTooltip(R.string.action_next_chapter)
            binding.rightChapter.setTooltip(R.string.action_previous_chapter)
        } else {
            binding.leftChapter.setTooltip(R.string.action_previous_chapter)
            binding.rightChapter.setTooltip(R.string.action_next_chapter)
        }
        binding.pleaseWait.isVisible = true
        binding.pleaseWait.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in_long))
    }
-    private fun showReadingModeSnackbar(mode: Int) {
+    private fun showReadingModeToast(mode: Int) {
        val strings = resources.getStringArray(R.array.viewers_selector)
-        binding.root.snack(strings[mode], Snackbar.LENGTH_SHORT)
+        readingModeToast?.cancel()
        readingModeToast = toast(strings[mode]) {
            it.setGravity(Gravity.CENTER_VERTICAL or Gravity.CENTER_HORIZONTAL, 0, 0)
        }
    }
    /**
@ -652,6 +758,16 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
        )
    }
    /**
     * Forces the user preferred [orientation] on the activity.
     */
    private fun setOrientation(orientation: Int) {
        val newOrientation = OrientationType.fromPreference(orientation, resources)
        if (newOrientation.flag != requestedOrientation) {
            requestedOrientation = newOrientation.flag
        }
    }
    /**
     * Class that handles the user preferences of the reader.
     */
@ -705,38 +821,11 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
                .launchIn(lifecycleScope)
        }
        /**
         * Forces the user preferred [orientation] on the activity.
         */
        private fun setOrientation(orientation: Int) {
            val newOrientation = when (orientation) {
                // Lock in current orientation
                2 -> {
                    val currentOrientation = resources.configuration.orientation
                    if (currentOrientation == Configuration.ORIENTATION_PORTRAIT) {
                        ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
                    } else {
                        ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
                    }
                }
                // Lock in portrait
                3 -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
                // Lock in landscape
                4 -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
                // Rotation free
                else -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
            }
            if (newOrientation != requestedOrientation) {
                requestedOrientation = newOrientation
            }
        }
        /**
         * Sets the visibility of the bottom page indicator according to [visible].
         */
        fun setPageNumberVisibility(visible: Boolean) {
-            binding.pageNumber.visibility = if (visible) View.VISIBLE else View.INVISIBLE
+            binding.pageNumber.isVisible = visible
        }
        /**
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
@ -0,0 +1,119 @@
 package eu.kanade.tachiyomi.ui.reader
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewPropertyAnimator
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import eu.kanade.tachiyomi.ui.reader.viewer.ViewerNavigation
 import kotlin.math.abs
 class ReaderNavigationOverlayView(context: Context, attributeSet: AttributeSet) : View(context, attributeSet) {
    private var viewPropertyAnimator: ViewPropertyAnimator? = null
    private var navigation: ViewerNavigation? = null
    fun setNavigation(navigation: ViewerNavigation, showOnStart: Boolean) {
        if (!showOnStart && this.navigation == null) {
            this.navigation = navigation
            isVisible = false
            return
        }
        this.navigation = navigation
        invalidate()
        if (isVisible) return
        viewPropertyAnimator = animate()
            .alpha(1f)
            .setDuration(FADE_DURATION)
            .withStartAction {
                isVisible = true
            }
            .withEndAction {
                viewPropertyAnimator = null
            }
        viewPropertyAnimator?.start()
    }
    private val regionPaint = Paint()
    private val textPaint = Paint().apply {
        textAlign = Paint.Align.CENTER
        color = Color.WHITE
        textSize = 64f
    }
    private val textBorderPaint = Paint().apply {
        textAlign = Paint.Align.CENTER
        color = Color.BLACK
        textSize = 64f
        style = Paint.Style.STROKE
        strokeWidth = 8f
    }
    override fun onDraw(canvas: Canvas?) {
        if (navigation == null) return
        navigation?.regions?.forEach { region ->
            val rect = region.rectF
            canvas?.save()
            // Scale rect from 1f,1f to screen width and height
            canvas?.scale(width.toFloat(), height.toFloat())
            regionPaint.color = ContextCompat.getColor(context, region.type.colorRes)
            canvas?.drawRect(rect, regionPaint)
            canvas?.restore()
            // Don't want scale anymore because it messes with drawText
            canvas?.save()
            // Translate origin to rect start (left, top)
            canvas?.translate((width * rect.left), (height * rect.top))
            // Calculate center of rect width on screen
            val x = width * (abs(rect.left - rect.right) / 2)
            // Calculate center of rect height on screen
            val y = height * (abs(rect.top - rect.bottom) / 2)
            canvas?.drawText(context.getString(region.type.nameRes), x, y, textBorderPaint)
            canvas?.drawText(context.getString(region.type.nameRes), x, y, textPaint)
            canvas?.restore()
        }
    }
    override fun performClick(): Boolean {
        super.performClick()
        if (viewPropertyAnimator == null && isVisible) {
            viewPropertyAnimator = animate()
                .alpha(0f)
                .setDuration(FADE_DURATION)
                .withEndAction {
                    isVisible = false
                    viewPropertyAnimator = null
                }
            viewPropertyAnimator?.start()
        }
        return true
    }
    override fun onTouchEvent(event: MotionEvent?): Boolean {
        // Hide overlay if user start tapping or swiping
        performClick()
        return super.onTouchEvent(event)
    }
 }
 private const val FADE_DURATION = 1000L
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@ -489,9 +489,9 @@ class ReaderPresenter(
    /**
     * Returns the viewer position used by this manga or the default one.
     */
-    fun getMangaViewer(): Int {
+    fun getMangaViewer(resolveDefault: Boolean = true): Int {
        val manga = manga ?: return preferences.defaultViewer()
-        return if (manga.viewer == 0) preferences.defaultViewer() else manga.viewer
+        return if (resolveDefault && manga.viewer == 0) preferences.defaultViewer() else manga.viewer
    }
    /**
@ -559,7 +559,7 @@ class ReaderPresenter(
        val destDir = File(
            Environment.getExternalStorageDirectory().absolutePath +
                File.separator + Environment.DIRECTORY_PICTURES +
-                File.separator + "Tachiyomi"
+                File.separator + context.getString(R.string.app_name)
        )
        // Copy file in background.
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
@ -1,157 +0,0 @@
 package eu.kanade.tachiyomi.ui.reader
 import android.os.Bundle
 import android.widget.CompoundButton
 import android.widget.Spinner
 import androidx.annotation.ArrayRes
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
 import com.tfcporciuncula.flow.Preference
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.ReaderSettingsSheetBinding
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer
 import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
 import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
 import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
 import uy.kohesive.injekt.injectLazy
 /**
 * Sheet to show reader and viewer preferences.
 */
 class ReaderSettingsSheet(private val activity: ReaderActivity) : BaseBottomSheetDialog(activity) {
    private val preferences: PreferencesHelper by injectLazy()
    private val binding = ReaderSettingsSheetBinding.inflate(activity.layoutInflater, null, false)
    init {
        val scroll = NestedScrollView(activity)
        scroll.addView(binding.root)
        setContentView(scroll)
    }
    /**
     * Called when the sheet is created. It initializes the listeners and values of the preferences.
     */
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        initGeneralPreferences()
        when (activity.viewer) {
            is PagerViewer -> initPagerPreferences()
            is WebtoonViewer -> initWebtoonPreferences()
        }
    }
    /**
     * Init general reader preferences.
     */
    private fun initGeneralPreferences() {
        binding.viewer.onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
            activity.presenter.setMangaViewer(position)
            val mangaViewer = activity.presenter.getMangaViewer()
            if (mangaViewer == ReaderActivity.WEBTOON || mangaViewer == ReaderActivity.VERTICAL_PLUS) {
                initWebtoonPreferences()
            } else {
                initPagerPreferences()
            }
        }
        binding.viewer.setSelection(activity.presenter.manga?.viewer ?: 0, false)
        binding.rotationMode.bindToPreference(preferences.rotation(), 1)
        binding.backgroundColor.bindToIntPreference(preferences.readerTheme(), R.array.reader_themes_values)
        binding.showPageNumber.bindToPreference(preferences.showPageNumber())
        binding.fullscreen.bindToPreference(preferences.fullscreen())
        binding.dualPageSplit.bindToPreference(preferences.dualPageSplit())
        binding.keepscreen.bindToPreference(preferences.keepScreenOn())
        binding.longTap.bindToPreference(preferences.readWithLongTap())
        binding.alwaysShowChapterTransition.bindToPreference(preferences.alwaysShowChapterTransition())
        binding.pageTransitions.bindToPreference(preferences.pageTransitions())
        // If the preference is explicitly disabled, that means the setting was configured since there is a cutout
        if (activity.hasCutout || !preferences.cutoutShort().get()) {
            binding.cutoutShort.isVisible = true
            binding.cutoutShort.bindToPreference(preferences.cutoutShort())
        }
    }
    /**
     * Init the preferences for the pager reader.
     */
    private fun initPagerPreferences() {
        binding.webtoonPrefsGroup.root.isVisible = false
        binding.pagerPrefsGroup.root.isVisible = true
        binding.pagerPrefsGroup.tappingPrefsGroup.isVisible = preferences.readWithTapping().get()
        binding.pagerPrefsGroup.tappingInverted.bindToPreference(preferences.pagerNavInverted())
        binding.pagerPrefsGroup.pagerNav.bindToPreference(preferences.navigationModePager())
        binding.pagerPrefsGroup.scaleType.bindToPreference(preferences.imageScaleType(), 1)
        binding.pagerPrefsGroup.zoomStart.bindToPreference(preferences.zoomStart(), 1)
        binding.pagerPrefsGroup.cropBorders.bindToPreference(preferences.cropBorders())
    }
    /**
     * Init the preferences for the webtoon reader.
     */
    private fun initWebtoonPreferences() {
        binding.pagerPrefsGroup.root.isVisible = false
        binding.webtoonPrefsGroup.root.isVisible = true
        binding.webtoonPrefsGroup.tappingPrefsGroup.isVisible = preferences.readWithTapping().get()
        binding.webtoonPrefsGroup.tappingInverted.bindToPreference(preferences.webtoonNavInverted())
        binding.webtoonPrefsGroup.webtoonNav.bindToPreference(preferences.navigationModeWebtoon())
        binding.webtoonPrefsGroup.cropBordersWebtoon.bindToPreference(preferences.cropBordersWebtoon())
        binding.webtoonPrefsGroup.webtoonSidePadding.bindToIntPreference(preferences.webtoonSidePadding(), R.array.webtoon_side_padding_values)
    }
    /**
     * Binds a checkbox or switch view with a boolean preference.
     */
    private fun CompoundButton.bindToPreference(pref: Preference<Boolean>) {
        isChecked = pref.get()
        setOnCheckedChangeListener { _, isChecked -> pref.set(isChecked) }
    }
    /**
     * Binds a spinner to an int preference with an optional offset for the value.
     */
    private fun Spinner.bindToPreference(pref: Preference<Int>, offset: Int = 0) {
        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
            pref.set(position + offset)
        }
        setSelection(pref.get() - offset, false)
    }
    /**
     * Binds a spinner to an enum preference.
     */
    private inline fun <reified T : Enum<T>> Spinner.bindToPreference(pref: Preference<T>) {
        val enumConstants = T::class.java.enumConstants
        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
            enumConstants?.get(position)?.let { pref.set(it) }
        }
        enumConstants?.indexOf(pref.get())?.let { setSelection(it, false) }
    }
    /**
     * Binds a spinner to an int preference. The position of the spinner item must
     * correlate with the [intValues] resource item (in arrays.xml), which is a <string-array>
     * of int values that will be parsed here and applied to the preference.
     */
    private fun Spinner.bindToIntPreference(pref: Preference<Int>, @ArrayRes intValuesResource: Int) {
        val intValues = resources.getStringArray(intValuesResource).map { it.toIntOrNull() }
        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
            pref.set(intValues[position]!!)
        }
        setSelection(intValues.indexOf(pref.get()), false)
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt
@ -0,0 +1,43 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.content.res.Resources
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.lang.next
 enum class OrientationType(val prefValue: Int, val flag: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
    FREE(1, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, R.string.rotation_free, R.drawable.ic_screen_rotation_24dp),
    LOCKED_PORTRAIT(2, ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT, R.string.rotation_lock, R.drawable.ic_screen_lock_rotation_24dp),
    LOCKED_LANDSCAPE(2, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, R.string.rotation_lock, R.drawable.ic_screen_lock_rotation_24dp),
    PORTRAIT(3, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, R.string.rotation_force_portrait, R.drawable.ic_screen_lock_portrait_24dp),
    LANDSCAPE(4, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, R.string.rotation_force_landscape, R.drawable.ic_screen_lock_landscape_24dp);
    companion object {
        fun fromPreference(preference: Int, resources: Resources): OrientationType = when (preference) {
            2 -> {
                val currentOrientation = resources.configuration.orientation
                if (currentOrientation == Configuration.ORIENTATION_PORTRAIT) {
                    LOCKED_PORTRAIT
                } else {
                    LOCKED_LANDSCAPE
                }
            }
            3 -> PORTRAIT
            4 -> LANDSCAPE
            else -> FREE
        }
        fun getNextOrientation(preference: Int, resources: Resources): OrientationType {
            val current = if (preference == 2) {
                // Avoid issue due to 2 types having the same prefValue
                LOCKED_LANDSCAPE
            } else {
                fromPreference(preference, resources)
            }
            return current.next()
        }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt
@ -1,19 +1,21 @@
-package eu.kanade.tachiyomi.ui.reader
+package eu.kanade.tachiyomi.ui.reader.setting
-import android.view.ViewGroup
+import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.SeekBar
 import androidx.annotation.ColorInt
 import androidx.core.graphics.alpha
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
 import androidx.core.widget.NestedScrollView
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.databinding.ReaderColorFilterSheetBinding
+import eu.kanade.tachiyomi.databinding.ReaderColorFilterSettingsBinding
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
 import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
 import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.sample
@ -22,30 +24,27 @@ import uy.kohesive.injekt.injectLazy
 /**
 * Color filter sheet to toggle custom filter and brightness overlay.
 */
-class ReaderColorFilterSheet(private val activity: ReaderActivity) : BaseBottomSheetDialog(activity) {
+class ReaderColorFilterSettings @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
    NestedScrollView(context, attrs) {
    private val preferences: PreferencesHelper by injectLazy()
-    private var sheetBehavior: BottomSheetBehavior<*>? = null
+    private val binding = ReaderColorFilterSettingsBinding.inflate(LayoutInflater.from(context), this, false)
    private val binding = ReaderColorFilterSheetBinding.inflate(activity.layoutInflater, null, false)
    init {
-        setContentView(binding.root)
+        addView(binding.root)
        sheetBehavior = BottomSheetBehavior.from(binding.root.parent as ViewGroup)
        preferences.colorFilter().asFlow()
            .onEach { setColorFilter(it) }
-            .launchIn(activity.lifecycleScope)
+            .launchIn((context as ReaderActivity).lifecycleScope)
        preferences.colorFilterMode().asFlow()
            .onEach { setColorFilter(preferences.colorFilter().get()) }
-            .launchIn(activity.lifecycleScope)
+            .launchIn(context.lifecycleScope)
        preferences.customBrightness().asFlow()
            .onEach { setCustomBrightness(it) }
-            .launchIn(activity.lifecycleScope)
+            .launchIn(context.lifecycleScope)
        // Get color and update values
        val color = preferences.colorFilterValue().get()
@ -130,12 +129,6 @@ class ReaderColorFilterSheet(private val activity: ReaderActivity) : BaseBottomS
        )
    }
    override fun onStart() {
        super.onStart()
        sheetBehavior?.skipCollapsed = true
        sheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED
    }
    /**
     * Set enabled status of seekBars belonging to color filter
     * @param enabled determines if seekBar gets enabled
@ -183,7 +176,7 @@ class ReaderColorFilterSheet(private val activity: ReaderActivity) : BaseBottomS
            preferences.customBrightnessValue().asFlow()
                .sample(100)
                .onEach { setCustomBrightnessValue(it) }
-                .launchIn(activity.lifecycleScope)
+                .launchIn((context as ReaderActivity).lifecycleScope)
        } else {
            setCustomBrightnessValue(0, true)
        }
@ -211,7 +204,7 @@ class ReaderColorFilterSheet(private val activity: ReaderActivity) : BaseBottomS
            preferences.colorFilterValue().asFlow()
                .sample(100)
                .onEach { setColorFilterValue(it) }
-                .launchIn(activity.lifecycleScope)
+                .launchIn((context as ReaderActivity).lifecycleScope)
        }
        setColorFilterSeekBar(enabled)
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt
@ -0,0 +1,50 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.ReaderGeneralSettingsBinding
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.preference.bindToPreference
 import uy.kohesive.injekt.injectLazy
 /**
 * Sheet to show reader and viewer preferences.
 */
 class ReaderGeneralSettings @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
    NestedScrollView(context, attrs) {
    private val preferences: PreferencesHelper by injectLazy()
    private val binding = ReaderGeneralSettingsBinding.inflate(LayoutInflater.from(context), this, false)
    init {
        addView(binding.root)
        initGeneralPreferences()
    }
    /**
     * Init general reader preferences.
     */
    private fun initGeneralPreferences() {
        binding.rotationMode.bindToPreference(preferences.rotation(), 1)
        binding.backgroundColor.bindToIntPreference(preferences.readerTheme(), R.array.reader_themes_values)
        binding.showPageNumber.bindToPreference(preferences.showPageNumber())
        binding.fullscreen.bindToPreference(preferences.fullscreen())
        binding.keepscreen.bindToPreference(preferences.keepScreenOn())
        binding.longTap.bindToPreference(preferences.readWithLongTap())
        binding.alwaysShowChapterTransition.bindToPreference(preferences.alwaysShowChapterTransition())
        binding.pageTransitions.bindToPreference(preferences.pageTransitions())
        // If the preference is explicitly disabled, that means the setting was configured since there is a cutout
        if ((context as ReaderActivity).hasCutout || !preferences.cutoutShort().get()) {
            binding.cutoutShort.isVisible = true
            binding.cutoutShort.bindToPreference(preferences.cutoutShort())
        }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
@ -0,0 +1,104 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
 import androidx.lifecycle.lifecycleScope
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.databinding.ReaderReadingModeSettingsBinding
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer
 import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
 import eu.kanade.tachiyomi.util.preference.bindToPreference
 import kotlinx.coroutines.flow.launchIn
 import uy.kohesive.injekt.injectLazy
 /**
 * Sheet to show reader and viewer preferences.
 */
 class ReaderReadingModeSettings @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
    NestedScrollView(context, attrs) {
    private val preferences: PreferencesHelper by injectLazy()
    private val binding = ReaderReadingModeSettingsBinding.inflate(LayoutInflater.from(context), this, false)
    init {
        addView(binding.root)
        initGeneralPreferences()
        when ((context as ReaderActivity).viewer) {
            is PagerViewer -> initPagerPreferences()
            is WebtoonViewer -> initWebtoonPreferences()
        }
    }
    /**
     * Init general reader preferences.
     */
    private fun initGeneralPreferences() {
        binding.viewer.onItemSelectedListener = { position ->
            (context as ReaderActivity).presenter.setMangaViewer(position)
            val mangaViewer = (context as ReaderActivity).presenter.getMangaViewer()
            if (mangaViewer == ReadingModeType.WEBTOON.prefValue || mangaViewer == ReadingModeType.CONTINUOUS_VERTICAL.prefValue) {
                initWebtoonPreferences()
            } else {
                initPagerPreferences()
            }
        }
        binding.viewer.setSelection((context as ReaderActivity).presenter.manga?.viewer ?: 0)
    }
    /**
     * Init the preferences for the pager reader.
     */
    private fun initPagerPreferences() {
        binding.webtoonPrefsGroup.root.isVisible = false
        binding.pagerPrefsGroup.root.isVisible = true
        binding.pagerPrefsGroup.tappingPrefsGroup.isVisible = preferences.readWithTapping().get()
        binding.pagerPrefsGroup.tappingInverted.bindToPreference(preferences.pagerNavInverted())
        binding.pagerPrefsGroup.pagerNav.bindToPreference(preferences.navigationModePager())
        binding.pagerPrefsGroup.scaleType.bindToPreference(preferences.imageScaleType(), 1)
        binding.pagerPrefsGroup.zoomStart.bindToPreference(preferences.zoomStart(), 1)
        binding.pagerPrefsGroup.cropBorders.bindToPreference(preferences.cropBorders())
        // Makes so that dual page invert gets hidden away when turning of dual page split
        binding.pagerPrefsGroup.dualPageSplit.bindToPreference(preferences.dualPageSplitPaged())
        preferences.dualPageSplitPaged()
            .asImmediateFlow { binding.pagerPrefsGroup.dualPageInvert.isVisible = it }
            .launchIn((context as ReaderActivity).lifecycleScope)
        binding.pagerPrefsGroup.dualPageInvert.bindToPreference(preferences.dualPageInvertPaged())
    }
    /**
     * Init the preferences for the webtoon reader.
     */
    private fun initWebtoonPreferences() {
        binding.pagerPrefsGroup.root.isVisible = false
        binding.webtoonPrefsGroup.root.isVisible = true
        binding.webtoonPrefsGroup.tappingPrefsGroup.isVisible = preferences.readWithTapping().get()
        binding.webtoonPrefsGroup.tappingInverted.bindToPreference(preferences.webtoonNavInverted())
        binding.webtoonPrefsGroup.webtoonNav.bindToPreference(preferences.navigationModeWebtoon())
        binding.webtoonPrefsGroup.cropBordersWebtoon.bindToPreference(preferences.cropBordersWebtoon())
        binding.webtoonPrefsGroup.webtoonSidePadding.bindToIntPreference(preferences.webtoonSidePadding(), R.array.webtoon_side_padding_values)
        // Makes so that dual page invert gets hidden away when turning of dual page split
        binding.webtoonPrefsGroup.dualPageSplit.bindToPreference(preferences.dualPageSplitWebtoon())
        preferences.dualPageSplitWebtoon()
            .asImmediateFlow { binding.webtoonPrefsGroup.dualPageInvert.isVisible = it }
            .launchIn((context as ReaderActivity).lifecycleScope)
        binding.webtoonPrefsGroup.dualPageInvert.bindToPreference(preferences.dualPageInvertWebtoon())
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
@ -0,0 +1,56 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.tabs.TabLayout
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.widget.SimpleTabSelectedListener
 import eu.kanade.tachiyomi.widget.sheet.TabbedBottomSheetDialog
 class ReaderSettingsSheet(private val activity: ReaderActivity) : TabbedBottomSheetDialog(activity) {
    private val readingModeSettings = ReaderReadingModeSettings(activity)
    private val generalSettings = ReaderGeneralSettings(activity)
    private val colorFilterSettings = ReaderColorFilterSettings(activity)
    private val sheetBackgroundDim = window?.attributes?.dimAmount ?: 0.25f
    init {
        val sheetBehavior = BottomSheetBehavior.from(binding.root.parent as ViewGroup)
        sheetBehavior.isFitToContents = false
        sheetBehavior.halfExpandedRatio = 0.5f
        val filterTabIndex = getTabViews().indexOf(colorFilterSettings)
        binding.tabs.addOnTabSelectedListener(object : SimpleTabSelectedListener() {
            override fun onTabSelected(tab: TabLayout.Tab?) {
                val isFilterTab = tab?.position == filterTabIndex
                // Remove dimmed backdrop so color filter changes can be previewed
                window?.setDimAmount(if (isFilterTab) 0f else sheetBackgroundDim)
                // Hide toolbars
                if (activity.menuVisible != !isFilterTab) {
                    activity.setMenuVisibility(!isFilterTab)
                }
                // Partially collapse the sheet for better preview
                if (isFilterTab) {
                    sheetBehavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
                }
            }
        })
    }
    override fun getTabViews() = listOf(
        readingModeSettings,
        generalSettings,
        colorFilterSettings,
    )
    override fun getTabTitles() = listOf(
        R.string.pref_category_reading_mode,
        R.string.pref_category_general,
        R.string.custom_filter,
    )
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReadingModeType.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReadingModeType.kt
@ -0,0 +1,30 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.lang.next
 enum class ReadingModeType(val prefValue: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
    DEFAULT(0, R.string.default_viewer, R.drawable.ic_reader_default_24dp),
    LEFT_TO_RIGHT(1, R.string.left_to_right_viewer, R.drawable.ic_reader_ltr_24dp),
    RIGHT_TO_LEFT(2, R.string.right_to_left_viewer, R.drawable.ic_reader_rtl_24dp),
    VERTICAL(3, R.string.vertical_viewer, R.drawable.ic_reader_vertical_24dp),
    WEBTOON(4, R.string.webtoon_viewer, R.drawable.ic_reader_webtoon_24dp),
    CONTINUOUS_VERTICAL(5, R.string.vertical_plus_viewer, R.drawable.ic_reader_continuous_vertical_24dp),
    ;
    companion object {
        fun fromPreference(preference: Int): ReadingModeType = values().find { it.prefValue == preference } ?: DEFAULT
        fun getNextReadingMode(preference: Int): ReadingModeType {
            val current = fromPreference(preference)
            return current.next()
        }
        fun isPagerType(preference: Int): Boolean {
            val mode = fromPreference(preference)
            return mode == LEFT_TO_RIGHT || mode == RIGHT_TO_LEFT || mode == VERTICAL
        }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/SpinnerPreference.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/SpinnerPreference.kt
@ -0,0 +1,133 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 import android.content.Context
 import android.util.AttributeSet
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.widget.FrameLayout
 import androidx.annotation.ArrayRes
 import androidx.appcompat.widget.PopupMenu
 import com.tfcporciuncula.flow.Preference
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.SpinnerPreferenceBinding
 class SpinnerPreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
    FrameLayout(context, attrs) {
    private var entries = emptyList<String>()
    private var popup: PopupMenu? = null
    var onItemSelectedListener: ((Int) -> Unit)? = null
        set(value) {
            field = value
            if (value != null) {
                popup = makeSettingsPopup()
                setOnTouchListener(popup?.dragToOpenListener)
                setOnClickListener {
                    popup?.show()
                }
            }
        }
    private val binding = SpinnerPreferenceBinding.inflate(LayoutInflater.from(context), this, false)
    init {
        addView(binding.root)
        val attr = context.obtainStyledAttributes(attrs, R.styleable.SpinnerPreference)
        val title = attr.getString(R.styleable.SpinnerPreference_title).orEmpty()
        binding.title.text = title
        val entries = (attr.getTextArray(R.styleable.SpinnerPreference_android_entries) ?: emptyArray()).map { it.toString() }
        this.entries = entries
        binding.details.text = entries.firstOrNull().orEmpty()
        attr.recycle()
    }
    fun setSelection(selection: Int) {
        binding.details.text = entries.getOrNull(selection).orEmpty()
    }
    fun bindToPreference(pref: Preference<Int>, offset: Int = 0, block: ((Int) -> Unit)? = null) {
        setSelection(pref.get() - offset)
        popup = makeSettingsPopup(pref, offset, block)
        setOnTouchListener(popup?.dragToOpenListener)
        setOnClickListener {
            popup?.show()
        }
    }
    inline fun <reified T : Enum<T>> bindToPreference(pref: Preference<T>) {
        val enumConstants = T::class.java.enumConstants
        enumConstants?.indexOf(pref.get())?.let { setSelection(it) }
        val popup = makeSettingsPopup(pref)
        setOnTouchListener(popup.dragToOpenListener)
        setOnClickListener {
            popup.show()
        }
    }
    fun bindToIntPreference(pref: Preference<Int>, @ArrayRes intValuesResource: Int, block: ((Int) -> Unit)? = null) {
        val intValues = resources.getStringArray(intValuesResource).map { it.toIntOrNull() }
        setSelection(intValues.indexOf(pref.get()))
        popup = makeSettingsPopup(pref, intValues, block)
        setOnTouchListener(popup?.dragToOpenListener)
        setOnClickListener {
            popup?.show()
        }
    }
    inline fun <reified T : Enum<T>> makeSettingsPopup(preference: Preference<T>): PopupMenu {
        return createPopupMenu { pos ->
            onItemSelectedListener?.invoke(pos)
            val enumConstants = T::class.java.enumConstants
            enumConstants?.get(pos)?.let { enumValue -> preference.set(enumValue) }
        }
    }
    private fun makeSettingsPopup(preference: Preference<Int>, intValues: List<Int?>, block: ((Int) -> Unit)? = null): PopupMenu {
        return createPopupMenu { pos ->
            preference.set(intValues[pos] ?: 0)
            block?.invoke(pos)
        }
    }
    private fun makeSettingsPopup(preference: Preference<Int>, offset: Int = 0, block: ((Int) -> Unit)? = null): PopupMenu {
        return createPopupMenu { pos ->
            preference.set(pos + offset)
            block?.invoke(pos)
        }
    }
    private fun makeSettingsPopup(): PopupMenu {
        return createPopupMenu { pos ->
            onItemSelectedListener?.invoke(pos)
        }
    }
    private fun menuClicked(menuItem: MenuItem): Int {
        val pos = menuItem.itemId
        setSelection(pos)
        return pos
    }
    fun createPopupMenu(onItemClick: (Int) -> Unit): PopupMenu {
        val popup = PopupMenu(context, this, Gravity.END, R.attr.actionOverflowMenuStyle, 0)
        entries.forEachIndexed { index, entry ->
            popup.menu.add(0, index, 0, entry)
        }
        popup.setOnMenuItemClickListener { menuItem ->
            val pos = menuClicked(menuItem)
            onItemClick(pos)
            true
        }
        return popup
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt
@ -41,13 +41,13 @@ class ReaderTransitionView @JvmOverloads constructor(context: Context, attrs: At
        if (hasPrevChapter) {
            binding.upperText.textAlignment = TEXT_ALIGNMENT_TEXT_START
            binding.upperText.text = buildSpannedString {
                bold { append(context.getString(R.string.transition_current)) }
                append("\n${transition.from.chapter.name}")
            }
            binding.lowerText.text = buildSpannedString {
                bold { append(context.getString(R.string.transition_previous)) }
                append("\n${prevChapter!!.chapter.name}")
            }
            binding.lowerText.text = buildSpannedString {
                bold { append(context.getString(R.string.transition_current)) }
                append("\n${transition.from.chapter.name}")
            }
        } else {
            binding.upperText.textAlignment = TEXT_ALIGNMENT_CENTER
            binding.upperText.text = context.getString(R.string.transition_no_previous)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
@ -15,6 +15,8 @@ abstract class ViewerConfig(preferences: PreferencesHelper, private val scope: C
    var imagePropertyChangedListener: (() -> Unit)? = null
    var navigationModeChangedListener: (() -> Unit)? = null
    var tappingEnabled = true
    var tappingInverted = TappingInvertMode.NONE
    var longTapEnabled = true
@ -24,10 +26,19 @@ abstract class ViewerConfig(preferences: PreferencesHelper, private val scope: C
    var volumeKeysInverted = false
    var trueColor = false
    var alwaysShowChapterTransition = true
    var dualPageSplit = false
    var navigationMode = 0
        protected set
    var forceNavigationOverlay = false
    var navigationOverlayOnStart = false
    var dualPageSplit = false
        protected set
    var dualPageInvert = false
        protected set
    abstract var navigator: ViewerNavigation
        protected set
@ -56,8 +67,13 @@ abstract class ViewerConfig(preferences: PreferencesHelper, private val scope: C
        preferences.alwaysShowChapterTransition()
            .register({ alwaysShowChapterTransition = it })
-        preferences.dualPageSplit()
+        forceNavigationOverlay = preferences.showNavigationOverlayNewUser().get()
-            .register({ dualPageSplit = it }, { imagePropertyChangedListener?.invoke() })
+        if (forceNavigationOverlay) {
            preferences.showNavigationOverlayNewUser().set(false)
        }
        preferences.showNavigationOverlayOnStart()
            .register({ navigationOverlayOnStart = it })
    }
    protected abstract fun defaultNavigation(): ViewerNavigation
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt
@ -2,13 +2,19 @@ package eu.kanade.tachiyomi.ui.reader.viewer
 import android.graphics.PointF
 import android.graphics.RectF
 import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.util.lang.invert
 abstract class ViewerNavigation {
-    enum class NavigationRegion {
+    sealed class NavigationRegion(@StringRes val nameRes: Int, val colorRes: Int) {
-        NEXT, PREV, MENU, RIGHT, LEFT
+        object MENU : NavigationRegion(R.string.action_menu, R.color.navigation_menu)
        object PREV : NavigationRegion(R.string.nav_zone_prev, R.color.navigation_prev)
        object NEXT : NavigationRegion(R.string.nav_zone_next, R.color.navigation_next)
        object LEFT : NavigationRegion(R.string.nav_zone_left, R.color.navigation_left)
        object RIGHT : NavigationRegion(R.string.nav_zone_right, R.color.navigation_right)
    }
    data class Region(
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
@ -8,6 +8,9 @@ import eu.kanade.tachiyomi.ui.reader.viewer.navigation.KindlishNavigation
 import eu.kanade.tachiyomi.ui.reader.viewer.navigation.LNavigation
 import eu.kanade.tachiyomi.ui.reader.viewer.navigation.RightAndLeftNavigation
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@ -20,6 +23,8 @@ class PagerConfig(
    preferences: PreferencesHelper = Injekt.get()
 ) : ViewerConfig(preferences, scope) {
    var dualPageSplitChangedListener: ((Boolean) -> Unit)? = null
    var imageScaleType = 1
        private set
@ -44,6 +49,22 @@ class PagerConfig(
        preferences.pagerNavInverted()
            .register({ tappingInverted = it }, { navigator.invertMode = it })
        preferences.pagerNavInverted().asFlow()
            .drop(1)
            .onEach { navigationModeChangedListener?.invoke() }
            .launchIn(scope)
        preferences.dualPageSplitPaged()
            .register(
                { dualPageSplit = it },
                {
                    imagePropertyChangedListener?.invoke()
                    dualPageSplitChangedListener?.invoke(it)
                }
            )
        preferences.dualPageInvertPaged()
            .register({ dualPageInvert = it }, { imagePropertyChangedListener?.invoke() })
    }
    private fun zoomTypeFromPreference(value: Int) {
@ -84,6 +105,7 @@ class PagerConfig(
            4 -> RightAndLeftNavigation()
            else -> defaultNavigation()
        }
        navigationModeChangedListener?.invoke()
    }
    enum class ZoomType {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
@ -264,24 +264,29 @@ class PagerPageHolder(
            else -> ImageUtil.isDoublePage(inputStream)
        }
        inputStream = stream
        if (isDoublePage) {
            val side = when {
                viewer is L2RPagerViewer && page is InsertPage -> ImageUtil.Side.RIGHT
                viewer is R2LPagerViewer && page is InsertPage -> ImageUtil.Side.LEFT
                viewer is L2RPagerViewer && page !is InsertPage -> ImageUtil.Side.LEFT
                viewer is R2LPagerViewer && page !is InsertPage -> ImageUtil.Side.RIGHT
                viewer is VerticalPagerViewer && page !is InsertPage -> ImageUtil.Side.RIGHT
                viewer is VerticalPagerViewer && page is InsertPage -> ImageUtil.Side.LEFT
                else -> error("We should choose a side!")
            }
-            if (page !is InsertPage) {
+        if (!isDoublePage) return inputStream
                onPageSplit()
            }
-            inputStream = ImageUtil.splitInHalf(inputStream, side)
+        var side = when {
            viewer is L2RPagerViewer && page is InsertPage -> ImageUtil.Side.RIGHT
            (viewer is R2LPagerViewer || viewer is VerticalPagerViewer) && page is InsertPage -> ImageUtil.Side.LEFT
            viewer is L2RPagerViewer && page !is InsertPage -> ImageUtil.Side.LEFT
            (viewer is R2LPagerViewer || viewer is VerticalPagerViewer) && page !is InsertPage -> ImageUtil.Side.RIGHT
            else -> error("We should choose a side!")
        }
-        return inputStream
+
        if (viewer.config.dualPageInvert) {
            side = when (side) {
                ImageUtil.Side.RIGHT -> ImageUtil.Side.LEFT
                ImageUtil.Side.LEFT -> ImageUtil.Side.RIGHT
            }
        }
        if (page !is InsertPage) {
            onPageSplit()
        }
        return ImageUtil.splitInHalf(inputStream, side)
    }
    private fun onPageSplit() {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
@ -116,9 +116,20 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
            false
        }
        config.dualPageSplitChangedListener = { enabled ->
            if (!enabled) {
                cleanupPageSplit()
            }
        }
        config.imagePropertyChangedListener = {
            refreshAdapter()
        }
        config.navigationModeChangedListener = {
            val showOnStart = config.navigationOverlayOnStart || config.forceNavigationOverlay
            activity.binding.navigationOverlay.setNavigation(config.navigator, showOnStart)
        }
    }
    override fun destroy() {
@ -376,4 +387,8 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
    fun onPageSplit(currentPage: ReaderPage, newPage: InsertPage) {
        adapter.onPageSplit(currentPage, newPage, this::class.java)
    }
    private fun cleanupPageSplit() {
        adapter.cleanupPageSplit()
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
@ -151,4 +151,10 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() {
        notifyDataSetChanged()
    }
    fun cleanupPageSplit() {
        val insertPages = items.filterIsInstance(InsertPage::class.java)
        items.removeAll(insertPages)
        notifyDataSetChanged()
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
@ -8,6 +8,9 @@ import eu.kanade.tachiyomi.ui.reader.viewer.navigation.KindlishNavigation
 import eu.kanade.tachiyomi.ui.reader.viewer.navigation.LNavigation
 import eu.kanade.tachiyomi.ui.reader.viewer.navigation.RightAndLeftNavigation
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@ -37,6 +40,16 @@ class WebtoonConfig(
        preferences.webtoonNavInverted()
            .register({ tappingInverted = it }, { navigator.invertMode = it })
        preferences.webtoonNavInverted().asFlow()
            .drop(1)
            .onEach { navigationModeChangedListener?.invoke() }
            .launchIn(scope)
        preferences.dualPageSplitWebtoon()
            .register({ dualPageSplit = it }, { imagePropertyChangedListener?.invoke() })
        preferences.dualPageInvertWebtoon()
            .register({ dualPageInvert = it }, { imagePropertyChangedListener?.invoke() })
    }
    override var navigator: ViewerNavigation = defaultNavigation()
@ -57,5 +70,6 @@ class WebtoonConfig(
            4 -> RightAndLeftNavigation()
            else -> defaultNavigation()
        }
        navigationModeChangedListener?.invoke()
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
@ -66,6 +66,7 @@ class WebtoonPageHolder(
     * Image view that supports subsampling on zoom.
     */
    private var subsamplingImageView: SubsamplingScaleImageView? = null
    private var cropBorders: Boolean = false
    /**
     * Simple image view only used on GIFs.
@ -292,7 +293,8 @@ class WebtoonPageHolder(
                    openStream = if (!isDoublePage) {
                        stream
                    } else {
-                        ImageUtil.splitAndMerge(stream)
+                        val upperSide = if (viewer.config.dualPageInvert) ImageUtil.Side.LEFT else ImageUtil.Side.RIGHT
                        ImageUtil.splitAndMerge(stream, upperSide)
                    }
                }
                if (!isAnimated) {
@ -359,17 +361,25 @@ class WebtoonPageHolder(
     * Initializes a subsampling scale view.
     */
    private fun initSubsamplingImageView(): SubsamplingScaleImageView {
        if (subsamplingImageView != null) return subsamplingImageView!!
        val config = viewer.config
        if (subsamplingImageView != null) {
            if (config.imageCropBorders != cropBorders) {
                cropBorders = config.imageCropBorders
                subsamplingImageView!!.setCropBorders(config.imageCropBorders)
            }
            return subsamplingImageView!!
        }
        cropBorders = config.imageCropBorders
        subsamplingImageView = WebtoonSubsamplingImageView(context).apply {
            setMaxTileSize(viewer.activity.maxBitmapSize)
            setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE)
            setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_FIT_WIDTH)
            setMinimumDpi(90)
            setMinimumTileDpi(180)
-            setCropBorders(config.imageCropBorders)
+            setCropBorders(cropBorders)
            setOnImageEventListener(
                object : SubsamplingScaleImageView.DefaultOnImageEventListener() {
                    override fun onReady() {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
@ -136,6 +136,11 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr
            refreshAdapter()
        }
        config.navigationModeChangedListener = {
            val showOnStart = config.navigationOverlayOnStart || config.forceNavigationOverlay
            activity.binding.navigationOverlay.setNavigation(config.navigator, showOnStart)
        }
        frame.layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
        frame.addView(recycler)
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt
@ -1,18 +1,25 @@
 package eu.kanade.tachiyomi.ui.recent.history
 import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.BackupRestoreService
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.History
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.databinding.HistoryControllerBinding
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.NoToolbarElevationController
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.RootController
@ -25,6 +32,7 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.appcompat.queryTextChanges
 import uy.kohesive.injekt.injectLazy
 /**
 * Fragment that shows recently read manga.
@ -42,6 +50,8 @@ class HistoryController :
    HistoryAdapter.OnItemClickListener,
    RemoveHistoryDialog.Listener {
    private val db: DatabaseHelper by injectLazy()
    /**
     * Adapter containing the recent manga.
     */
@ -68,6 +78,11 @@ class HistoryController :
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = HistoryControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
@ -196,4 +211,32 @@ class HistoryController :
            onExpand = { invalidateMenuOnExpand() }
        )
    }
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
            R.id.action_clear_history -> {
                val ctrl = ClearHistoryDialogController()
                ctrl.targetController = this@HistoryController
                ctrl.showDialog(router)
            }
        }
        return super.onOptionsItemSelected(item)
    }
    class ClearHistoryDialogController : DialogController() {
        override fun onCreateDialog(savedViewState: Bundle?): Dialog {
            return MaterialDialog(activity!!)
                .message(R.string.clear_history_confirmation)
                .positiveButton(android.R.string.ok) {
                    (targetController as? HistoryController)?.clearHistory()
                }
                .negativeButton(android.R.string.cancel)
        }
    }
    private fun clearHistory() {
        db.deleteHistory().executeAsBlocking()
        activity?.toast(R.string.clear_history_completed)
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
@ -9,6 +9,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.recyclerview.widget.LinearLayoutManager
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.SelectableAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
@ -76,6 +77,11 @@ class UpdatesController :
    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
        binding = UpdatesControllerBinding.inflate(inflater)
        binding.recycler.applyInsetter {
            type(navigationBars = true) {
                padding()
            }
        }
        return binding.root
    }
@ -109,12 +115,12 @@ class UpdatesController :
            }
            .launchIn(viewScope)
-        (activity!! as MainActivity).fixViewToBottom(binding.actionToolbar)
+        (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
    }
    override fun onDestroyView(view: View) {
        destroyActionModeIfNeeded()
-        (activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar)
+        (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
        binding.actionToolbar.destroy()
        adapter = null
        super.onDestroyView(view)
@ -210,6 +216,7 @@ class UpdatesController :
     */
    private fun downloadChapters(chapters: List<UpdatesItem>) {
        presenter.downloadChapters(chapters)
        destroyActionModeIfNeeded()
    }
    /**
@ -251,6 +258,7 @@ class UpdatesController :
        if (presenter.preferences.removeAfterMarkedAsRead()) {
            deleteChapters(chapters)
        }
        destroyActionModeIfNeeded()
    }
    /**
@ -259,10 +267,12 @@ class UpdatesController :
     */
    private fun markAsUnread(chapters: List<UpdatesItem>) {
        presenter.markChapterRead(chapters, false)
        destroyActionModeIfNeeded()
    }
    override fun deleteChapters(chaptersToDelete: List<UpdatesItem>) {
        presenter.deleteChapters(chaptersToDelete)
        destroyActionModeIfNeeded()
    }
    private fun destroyActionModeIfNeeded() {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricUnlockActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricUnlockActivity.kt
@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.biometric.BiometricPrompt
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.system.BiometricUtil
 import uy.kohesive.injekt.injectLazy
 import java.util.Date
 import java.util.concurrent.Executors
@ -38,12 +39,15 @@ class BiometricUnlockActivity : AppCompatActivity() {
            }
        )
-        val promptInfo = BiometricPrompt.PromptInfo.Builder()
+        var promptInfo = BiometricPrompt.PromptInfo.Builder()
            .setTitle(getString(R.string.unlock_app))
-            .setDeviceCredentialAllowed(true)
+            .setAllowedAuthenticators(BiometricUtil.getSupportedAuthenticators(this))
            .setConfirmationRequired(false)
            .build()
-        biometricPrompt.authenticate(promptInfo)
+        if (!BiometricUtil.isDeviceCredentialAllowed(this)) {
            promptInfo = promptInfo.setNegativeButtonText(getString(R.string.action_cancel))
        }
        biometricPrompt.authenticate(promptInfo.build())
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
@ -2,10 +2,10 @@ package eu.kanade.tachiyomi.ui.security
 import android.content.Intent
 import android.view.WindowManager
 import androidx.biometric.BiometricManager
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.system.BiometricUtil
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import uy.kohesive.injekt.injectLazy
@ -29,7 +29,7 @@ class SecureActivityDelegate(private val activity: FragmentActivity) {
    fun onResume() {
        val lockApp = preferences.useBiometricLock().get()
-        if (lockApp && BiometricManager.from(activity).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS) {
+        if (lockApp && BiometricUtil.isSupported(activity)) {
            if (isAppLocked()) {
                val intent = Intent(activity, BiometricUnlockActivity::class.java)
                activity.startActivity(intent)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
@ -17,9 +17,13 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Target
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
 import eu.kanade.tachiyomi.network.PREF_DOH_GOOGLE
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.util.CrashLogUtil
 import eu.kanade.tachiyomi.util.preference.defaultValue
 import eu.kanade.tachiyomi.util.preference.intListPreference
 import eu.kanade.tachiyomi.util.preference.onChange
 import eu.kanade.tachiyomi.util.preference.onClick
 import eu.kanade.tachiyomi.util.preference.preference
 import eu.kanade.tachiyomi.util.preference.preferenceCategory
@ -110,16 +114,6 @@ class SettingsAdvancedController : SettingsController() {
                    ctrl.showDialog(router)
                }
            }
            preference {
                titleRes = R.string.pref_clear_history
                summaryRes = R.string.pref_clear_history_summary
                onClick {
                    val ctrl = ClearHistoryDialogController()
                    ctrl.targetController = this@SettingsAdvancedController
                    ctrl.showDialog(router)
                }
            }
        }
        preferenceCategory {
@ -134,11 +128,26 @@ class SettingsAdvancedController : SettingsController() {
                    activity?.toast(R.string.cookies_cleared)
                }
            }
-            switchPreference {
+            intListPreference {
-                key = Keys.enableDoh
+                key = Keys.dohProvider
                titleRes = R.string.pref_dns_over_https
-                summaryRes = R.string.requires_app_restart
+                entries = arrayOf(
-                defaultValue = false
+                    context.getString(R.string.disabled),
                    "Cloudflare",
                    "Google",
                )
                entryValues = arrayOf(
                    "-1",
                    PREF_DOH_CLOUDFLARE.toString(),
                    PREF_DOH_GOOGLE.toString(),
                )
                defaultValue = "-1"
                summary = "%s"
                onChange {
                    activity?.toast(R.string.requires_app_restart)
                    true
                }
            }
        }
@ -197,22 +206,6 @@ class SettingsAdvancedController : SettingsController() {
        }
    }
    class ClearHistoryDialogController : DialogController() {
        override fun onCreateDialog(savedViewState: Bundle?): Dialog {
            return MaterialDialog(activity!!)
                .message(R.string.clear_history_confirmation)
                .positiveButton(android.R.string.ok) {
                    (targetController as? SettingsAdvancedController)?.clearHistory()
                }
                .negativeButton(android.R.string.cancel)
        }
    }
    private fun clearHistory() {
        db.deleteHistory().executeAsBlocking()
        activity?.toast(R.string.clear_history_completed)
    }
    private fun clearDatabase() {
        db.deleteMangasNotInLibrary().executeAsBlocking()
        db.deleteHistoryNoLastRead().executeAsBlocking()
--- a/Show More
+++ b/Show More