Fix locale changing

Translations update from Hosted Weblate

.gitignore

@@ -26,4 +26,4 @@
 .cxx
 /.idea/deviceManager.xml
 /.kotlin/
-/.idea/AndroidProjectSystem.xml
+/.idea/AndroidProjectSystem.xml

.idea/AndroidProjectSystem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>

.idea/gradle.xml

@@ -6,14 +6,13 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

README.md

@@ -1,57 +1,107 @@
-# Kotatsu
+<div align="center">
 
-Kotatsu is a free and open-source manga reader for Android with built-in online content sources.
+<a href="https://kotatsu.app">
+    <img src="./.github/assets/vtuber.png" alt="Kotatsu Logo" title="Kotatsu" width="600"/>
+</a>
 
-[![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) ![F-Droid Version](https://img.shields.io/f-droid/v/org.koitharu.kotatsu) ![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE)
+# [Kotatsu](https://kotatsu.app)
+
+**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is a free and open-source manga reader for Android with built-in online content sources.**
+
+![Downloads count](https://img.shields.io/github/downloads/KotatsuApp/Kotatsu/total?color=1976d2) ![Latest Stable version](https://img.shields.io/github/v/release/KotatsuApp/Kotatsu?color=2596be&label=latest) ![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) [![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF?)](https://t.me/kotatsuapp) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE)
 
 ### Download
 
-- **Recommended:** Download and install APK from **[GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest)**. Application has a built-in self-updating feature.
-- Get it on **[F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu)**. The F-Droid build may be a bit outdated and some fixes might be missing.
-- Also [nightly builds](https://github.com/KotatsuApp/Kotatsu-nightly/releases) are available (very unstable, use at your own risk). 
+<div align="left">
+
+* **Recommended:** Download and install APK from [GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest). Application has a built-in self-updating feature.
+* Get it on [F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu). The F-Droid build may be a bit outdated and some fixes might be missing.
+* Also [nightly builds](https://github.com/KotatsuApp/Kotatsu-nightly/releases) are available (very unstable, use at your own risk).
+
+</div>
 
 ### Main Features
 
-* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers)
+<div align="left">
+
+* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers) (with 1100+ manga sources)
 * Search manga by name, genres, and more filters
-* Reading history and bookmarks
 * Favorites organized by user-defined categories
-* Downloading manga and reading it offline. Third-party CBZ archives also supported
-* Tablet-optimized Material You UI
-* Standard and Webtoon-optimized customizable reader
-* Notifications about new chapters with updates feed
+* Reading history, bookmarks, and incognito mode support
+* Download manga and read it offline. Third-party CBZ archives are also supported
+* Clean and convenient Material You UI, optimized for phones, tablets, and desktop
+* Standard and Webtoon-optimized customizable reader, gesture support on reading interface
+* Notifications about new chapters with updates feed, manga recommendations (with filters)
 * Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
-* Password/fingerprint-protected access to the app
+* Password / fingerprint-protected access to the app
+* Automatically sync app data with other devices on the same account
+* Support for older devices running Android 5+
 
-### Screenshots
+</div>
 
-| ![Screenshot_20200226-210337](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png)                           | ![Screenshot_20200226-210232](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
-|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
-| ![Screenshot_20200226-210405](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png) | ![Screenshot_20200226-210151](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
+### In-App Screenshots
 
-| ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/2.png) |
-|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
+<div align="center">
+    <img src="./metadata/en-US/images/phoneScreenshots/1.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/2.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/3.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/4.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/5.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/6.png" alt="Mobile view" width="250"/>
+</div>
+
+<br>
+
+<div align="center">
+    <img src="./metadata/en-US/images/tenInchScreenshots/1.png" alt="Tablet view" width="400"/>
+    <img src="./metadata/en-US/images/tenInchScreenshots/2.png" alt="Tablet view" width="400"/>
+</div>
 
 ### Localization
 
-[<img src="https://hosted.weblate.org/widgets/kotatsu/-/287x66-white.png" alt="Translation status">](https://hosted.weblate.org/engage/kotatsu/)
+<a href="https://hosted.weblate.org/engage/kotatsu/">
+<img src="https://hosted.weblate.org/widget/kotatsu/horizontal-auto.png" alt="Translation status" />
+</a>
 
-Kotatsu is localized in a number of different languages, if you would like to help improve these or add new languages,
-please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)
+**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is localized in a number of different languages.**<br>
+**📌 If you would like to help improve these or add new languages,
+please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)**
 
 ### Contributing
 
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for the guidelines.
+<br>
+
+<a href="https://github.com/KotatsuApp/Kotatsu">
+  <picture>
+    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
+    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu GitHub Repository">
+  </picture>
+</a>
+<a href="https://github.com/KotatsuApp/Kotatsu-parsers">
+  <picture>
+    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
+    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu-parsers GitHub Repository">
+  </picture>
+</a><br></br>
+
+</br>
+
+**📌 Pull requests are welcome, if you want: See [CONTRIBUTING.md](https://github.com/KotatsuApp/Kotatsu/blob/devel/CONTRIBUTING.md) for the guidelines**
 
 ### License
 
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)
 
-You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications
-to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build &
-install instructions.
+<div align="left">
+
+You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.
+
+</div>
 
 ### DMCA disclaimer
 
-The developers of this application do not have any affiliation with the content available in the app.
-It collects content from sources that are freely available through any web browser
+<div align="left">
+
+The developers of this application do not have any affiliation with the content available in the app. It collects content from sources that are freely available through any web browser.
+
+</div>

app/build.gradle

@@ -7,6 +7,7 @@ plugins {
 	id 'com.google.devtools.ksp'
 	id 'kotlin-parcelize'
 	id 'dagger.hilt.android.plugin'
+	id 'androidx.room'
 }
 
 android {
@@ -18,13 +19,12 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 35
-		versionCode = 700
-		versionName = '7.7.8'
+		versionCode = 1002
+		versionName = '8.0-b2'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
 			arg('room.generateKotlin', 'true')
-			arg('room.schemaLocation', "$projectDir/schemas")
 		}
 		androidResources {
 			generateLocaleConfig true
@@ -74,8 +74,12 @@ android {
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
 			'-opt-in=coil3.annotation.ExperimentalCoilApi',
+			'-opt-in=coil3.annotation.InternalCoilApi',
 		]
 	}
+	room {
+		schemaDirectory "$projectDir/schemas"
+	}
 	lint {
 		abortOnError true
 		disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat'

app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt

@@ -1,9 +1,12 @@
 package org.koitharu.kotatsu
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.os.Build
 import android.os.StrictMode
+import androidx.core.content.edit
 import androidx.fragment.app.strictmode.FragmentStrictMode
+import leakcanary.LeakCanary
 import org.koitharu.kotatsu.core.BaseApp
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.local.data.PagesCache
@@ -13,9 +16,23 @@ import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 
 class KotatsuApp : BaseApp() {
 
+	var isLeakCanaryEnabled: Boolean
+		get() = getDebugPreferences(this).getBoolean(KEY_LEAK_CANARY, true)
+		set(value) {
+			getDebugPreferences(this).edit { putBoolean(KEY_LEAK_CANARY, value) }
+			configureLeakCanary()
+		}
+
 	override fun attachBaseContext(base: Context) {
 		super.attachBaseContext(base)
 		enableStrictMode()
+		configureLeakCanary()
+	}
+
+	private fun configureLeakCanary() {
+		LeakCanary.config = LeakCanary.config.copy(
+			dumpHeap = isLeakCanaryEnabled,
+		)
 	}
 
 	private fun enableStrictMode() {
@@ -55,7 +72,7 @@ class KotatsuApp : BaseApp() {
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
 					penaltyListener(notifier.executor, notifier)
 				}
-			}.build()
+			}.build(),
 		)
 		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder().apply {
 			detectWrongFragmentContainer()
@@ -70,4 +87,13 @@ class KotatsuApp : BaseApp() {
 			}
 		}.build()
 	}
+
+	private companion object {
+
+		const val PREFS_DEBUG = "_debug"
+		const val KEY_LEAK_CANARY = "leak_canary"
+
+		fun getDebugPreferences(context: Context): SharedPreferences =
+			context.getSharedPreferences(PREFS_DEBUG, MODE_PRIVATE)
+	}
 }

app/src/debug/kotlin/org/koitharu/kotatsu/StrictModeNotifier.kt

@@ -55,7 +55,7 @@ class StrictModeNotifier(
 		.setContentIntent(
 			PendingIntentCompat.getActivity(
 				context,
-				0,
+				violation.hashCode(),
 				ShareHelper(context).getShareTextIntent(violation.stackTraceToString()),
 				0,
 				false,

app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt

@@ -0,0 +1,21 @@
+package org.koitharu.kotatsu.core.ui
+
+import android.content.Context
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.LifecycleService
+import leakcanary.AppWatcher
+
+abstract class BaseService : LifecycleService() {
+
+	override fun attachBaseContext(newBase: Context) {
+		super.attachBaseContext(ContextCompat.getContextForLanguage(newBase))
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		AppWatcher.objectWatcher.watch(
+			watchedObject = this,
+			description = "${javaClass.simpleName} service received Service#onDestroy() callback",
+		)
+	}
+}

app/src/debug/kotlin/org/koitharu/kotatsu/settings/SettingsMenuProvider.kt

@@ -6,6 +6,7 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
 import leakcanary.LeakCanary
+import org.koitharu.kotatsu.KotatsuApp
 import org.koitharu.kotatsu.R
 import org.koitharu.workinspector.WorkInspector
 
@@ -13,10 +14,18 @@ class SettingsMenuProvider(
 	private val context: Context,
 ) : MenuProvider {
 
+	private val application: KotatsuApp
+		get() = context.applicationContext as KotatsuApp
+
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
 		menuInflater.inflate(R.menu.opt_settings, menu)
 	}
 
+	override fun onPrepareMenu(menu: Menu) {
+		super.onPrepareMenu(menu)
+		menu.findItem(R.id.action_leakcanary).isChecked = application.isLeakCanaryEnabled
+	}
+
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
 		R.id.action_leaks -> {
 			context.startActivity(LeakCanary.newLeakDisplayActivityIntent())
@@ -28,6 +37,13 @@ class SettingsMenuProvider(
 			true
 		}
 
+		R.id.action_leakcanary -> {
+			val checked = !menuItem.isChecked
+			menuItem.isChecked = checked
+			application.isLeakCanaryEnabled = checked
+			true
+		}
+
 		else -> false
 	}
 }

app/src/debug/res/menu/opt_settings.xml

@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<item
-		android:id="@id/action_leaks"
+		android:id="@+id/action_leakcanary"
+		android:checkable="true"
+		android:title="LeakCanary"
+		app:showAsAction="never"
+		tools:ignore="HardcodedText" />
+
+	<item
+		android:id="@+id/action_leaks"
 		android:title="@string/leak_canary_display_activity_label"
 		app:showAsAction="never" />
 
 	<item
-		android:id="@id/action_works"
+		android:id="@+id/action_works"
 		android:title="@string/wi_lib_name"
 		app:showAsAction="never" />
 

app/src/main/AndroidManifest.xml

@@ -49,6 +49,7 @@
 		android:enableOnBackInvokedCallback="@bool/is_predictive_back_enabled"
 		android:fullBackupContent="@xml/backup_content"
 		android:fullBackupOnly="true"
+		android:hasFragileUserData="true"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:largeHeap="true"
@@ -280,6 +281,10 @@
 		<service
 			android:name="org.koitharu.kotatsu.local.ui.LocalIndexUpdateService"
 			android:label="@string/local_manga_processing" />
+		<service
+			android:name="org.koitharu.kotatsu.settings.backup.RestoreService"
+			android:foregroundServiceType="dataSync"
+			android:label="@string/restore_backup" />
 		<service
 			android:name="org.koitharu.kotatsu.local.ui.ImportService"
 			android:foregroundServiceType="dataSync"

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AlternativesUseCase.kt

@@ -3,32 +3,28 @@ package org.koitharu.kotatsu.alternatives.domain
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.almostEquals
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.search.domain.SearchKind
+import org.koitharu.kotatsu.search.domain.SearchV2Helper
 import javax.inject.Inject
 
 private const val MAX_PARALLELISM = 4
-private const val MATCH_THRESHOLD_DEFAULT = 0.2f
 
 class AlternativesUseCase @Inject constructor(
 	private val sourcesRepository: MangaSourcesRepository,
+	private val searchHelperFactory: SearchV2Helper.Factory,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) {
 
-	suspend operator fun invoke(manga: Manga): Flow<Manga> = invoke(manga, MATCH_THRESHOLD_DEFAULT)
-
-	suspend operator fun invoke(manga: Manga, matchThreshold: Float): Flow<Manga> {
+	suspend operator fun invoke(manga: Manga): Flow<Manga> {
 		val sources = getSources(manga.source)
 		if (sources.isEmpty()) {
 			return emptyFlow()
@@ -36,27 +32,23 @@ class AlternativesUseCase @Inject constructor(
 		val semaphore = Semaphore(MAX_PARALLELISM)
 		return channelFlow {
 			for (source in sources) {
-				val repository = mangaRepositoryFactory.create(source)
-				if (!repository.filterCapabilities.isSearchSupported) {
-					continue
-				}
 				launch {
+					val searchHelper = searchHelperFactory.create(source)
 					val list = runCatchingCancellable {
 						semaphore.withPermit {
-							repository.getList(offset = 0, SortOrder.RELEVANCE, MangaListFilter(query = manga.title))
+							searchHelper(manga.title, SearchKind.TITLE)?.manga
 						}
-					}.getOrDefault(emptyList())
-					for (item in list) {
-						if (item.matches(manga, matchThreshold)) {
-							send(item)
+					}.getOrNull()
+					list?.forEach {
+						launch {
+							val details = runCatchingCancellable {
+								mangaRepositoryFactory.create(it.source).getDetails(it)
+							}.getOrDefault(it)
+							send(details)
 						}
 					}
 				}
 			}
-		}.map {
-			runCatchingCancellable {
-				mangaRepositoryFactory.create(it.source).getDetails(it)
-			}.getOrDefault(it)
 		}
 	}
 
@@ -68,18 +60,6 @@ class AlternativesUseCase @Inject constructor(
 		return result
 	}
 
-	private fun Manga.matches(ref: Manga, threshold: Float): Boolean {
-		return matchesTitles(title, ref.title, threshold) ||
-			matchesTitles(title, ref.altTitle, threshold) ||
-			matchesTitles(altTitle, ref.title, threshold) ||
-			matchesTitles(altTitle, ref.altTitle, threshold)
-
-	}
-
-	private fun matchesTitles(a: String?, b: String?, threshold: Float): Boolean {
-		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, threshold)
-	}
-
 	private fun MangaSource.priority(ref: MangaSource): Int {
 		var res = 0
 		if (this is MangaParserSource && ref is MangaParserSource) {

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AutoFixUseCase.kt

@@ -29,12 +29,13 @@ class AutoFixUseCase @Inject constructor(
 ) {
 
 	suspend operator fun invoke(mangaId: Long): Pair<Manga, Manga?> {
-		val seed = checkNotNull(mangaDataRepository.findMangaById(mangaId)) { "Manga $mangaId not found" }
-			.getDetailsSafe()
+		val seed = checkNotNull(
+			mangaDataRepository.findMangaById(mangaId, withChapters = true),
+		) { "Manga $mangaId not found" }.getDetailsSafe()
 		if (seed.isHealthy()) {
 			return seed to null // no fix required
 		}
-		val replacement = alternativesUseCase(seed, matchThreshold = 0.02f)
+		val replacement = alternativesUseCase(seed)
 			.filter { it.isHealthy() }
 			.runningFold<Manga, Manga?>(null) { best, candidate ->
 				if (best == null || best < candidate) {

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt

@@ -4,6 +4,7 @@ import android.text.style.ForegroundColorSpan
 import androidx.core.content.ContextCompat
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
+import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
 import coil3.ImageLoader
 import coil3.request.ImageRequest
@@ -51,7 +52,13 @@ fun alternativeAD(
 	binding.chipSource.setOnClickListener(clickListener)
 
 	bind { payloads ->
-		binding.textViewTitle.text = item.manga.title
+		binding.textViewTitle.text = item.mangaModel.title
+		with(binding.iconsView) {
+			clearIcons()
+			if (item.mangaModel.isSaved) addIcon(R.drawable.ic_storage)
+			if (item.mangaModel.isFavorite) addIcon(R.drawable.ic_heart_outline)
+			isVisible = iconsCount > 0
+		}
 		binding.textViewSubtitle.text = buildSpannedString {
 			if (item.chaptersCount > 0) {
 				append(context.resources.getQuantityString(R.plurals.chapters, item.chaptersCount, item.chaptersCount))
@@ -70,7 +77,7 @@ fun alternativeAD(
 				}
 			}
 		}
-		binding.progressView.setProgress(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
+		binding.progressView.setProgress(item.mangaModel.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.chipSource.also { chip ->
 			chip.text = item.manga.source.getTitle(chip.context)
 			ImageRequest.Builder(context)

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesActivity.kt

@@ -1,7 +1,5 @@
 package org.koitharu.kotatsu.alternatives.ui
 
-import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -13,8 +11,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.model.getTitle
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.nav.router
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
@@ -22,7 +19,6 @@ import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.ActivityAlternativesBinding
-import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
@@ -30,8 +26,6 @@ import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.search.ui.MangaListActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -65,7 +59,7 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 		viewModel.content.observe(this, listAdapter)
 		viewModel.onMigrated.observeEvent(this) {
 			Toast.makeText(this, R.string.migration_completed, Toast.LENGTH_SHORT).show()
-			startActivity(DetailsActivity.newIntent(this, it))
+			router.openDetails(it)
 			finishAfterTransition()
 		}
 	}
@@ -82,16 +76,9 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 
 	override fun onItemClick(item: MangaAlternativeModel, view: View) {
 		when (view.id) {
-			R.id.chip_source -> startActivity(
-				MangaListActivity.newIntent(
-					this,
-					item.manga.source,
-					MangaListFilter(query = viewModel.manga.title),
-				),
-			)
-
+			R.id.chip_source -> router.openSearch(item.manga.source, viewModel.manga.title)
 			R.id.button_migrate -> confirmMigration(item.manga)
-			else -> startActivity(DetailsActivity.newIntent(this, item.manga))
+			else -> router.openDetails(item.manga)
 		}
 	}
 
@@ -114,10 +101,4 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 			}
 		}.show()
 	}
-
-	companion object {
-
-		fun newIntent(context: Context, manga: Manga) = Intent(context, AlternativesActivity::class.java)
-			.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesViewModel.kt

@@ -13,19 +13,19 @@ import org.koitharu.kotatsu.alternatives.domain.AlternativesUseCase
 import org.koitharu.kotatsu.alternatives.domain.MigrateUseCase
 import org.koitharu.kotatsu.core.model.chaptersCount
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.require
-import org.koitharu.kotatsu.history.data.HistoryRepository
-import org.koitharu.kotatsu.list.domain.ReadingProgress
+import org.koitharu.kotatsu.list.domain.MangaListMapper
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingFooter
 import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.MangaGridModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
@@ -36,11 +36,10 @@ class AlternativesViewModel @Inject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val alternativesUseCase: AlternativesUseCase,
 	private val migrateUseCase: MigrateUseCase,
-	private val historyRepository: HistoryRepository,
-	private val settings: AppSettings,
+	private val mangaListMapper: MangaListMapper,
 ) : BaseViewModel() {
 
-	val manga = savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga
+	val manga = savedStateHandle.require<ParcelableManga>(AppRouter.KEY_MANGA).manga
 
 	val onMigrated = MutableEventFlow<Manga>()
 	val content = MutableStateFlow<List<ListModel>>(listOf(LoadingState))
@@ -55,8 +54,7 @@ class AlternativesViewModel @Inject constructor(
 			alternativesUseCase(ref)
 				.map {
 					MangaAlternativeModel(
-						manga = it,
-						progress = getProgress(it.id),
+						mangaModel = mangaListMapper.toListModel(it, ListMode.GRID) as MangaGridModel,
 						referenceChapters = refCount,
 					)
 				}.runningFold<MangaAlternativeModel, List<ListModel>>(listOf(LoadingState)) { acc, item ->
@@ -88,8 +86,4 @@ class AlternativesViewModel @Inject constructor(
 			onMigrated.call(target)
 		}
 	}
-
-	private suspend fun getProgress(mangaId: Long): ReadingProgress? {
-		return historyRepository.getProgress(mangaId, settings.progressIndicatorMode)
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AutoFixService.kt

@@ -10,7 +10,6 @@ import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
-import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import coil3.ImageLoader
 import coil3.request.ImageRequest
@@ -20,13 +19,15 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.alternatives.domain.AutoFixUseCase
 import org.koitharu.kotatsu.core.ErrorReporterReceiver
 import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.ui.CoroutineIntentService
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
+import org.koitharu.kotatsu.core.util.ext.powerManager
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
-import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.core.util.ext.withPartialWakeLock
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
@@ -52,12 +53,14 @@ class AutoFixService : CoroutineIntentService() {
 		val ids = requireNotNull(intent.getLongArrayExtra(DATA_IDS))
 		startForeground(this)
 		for (mangaId in ids) {
-			val result = runCatchingCancellable {
-				autoFixUseCase.invoke(mangaId)
-			}
-			if (applicationContext.checkNotificationPermission(CHANNEL_ID)) {
-				val notification = buildNotification(result)
-				notificationManager.notify(TAG, startId, notification)
+			powerManager.withPartialWakeLock(TAG) {
+				val result = runCatchingCancellable {
+					autoFixUseCase.invoke(mangaId)
+				}
+				if (applicationContext.checkNotificationPermission(CHANNEL_ID)) {
+					val notification = buildNotification(result)
+					notificationManager.notify(TAG, startId, notification)
+				}
 			}
 		}
 	}
@@ -122,7 +125,7 @@ class AutoFixService : CoroutineIntentService() {
 					).toBitmapOrNull(),
 				)
 				notification.setSubText(replacement.title)
-				val intent = DetailsActivity.newIntent(applicationContext, replacement)
+				val intent = AppRouter.detailsIntent(applicationContext, replacement)
 				notification.setContentIntent(
 					PendingIntentCompat.getActivity(
 						applicationContext,

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/MangaAlternativeModel.kt

@@ -1,16 +1,18 @@
 package org.koitharu.kotatsu.alternatives.ui
 
 import org.koitharu.kotatsu.core.model.chaptersCount
-import org.koitharu.kotatsu.list.domain.ReadingProgress
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.MangaGridModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
 data class MangaAlternativeModel(
-	val manga: Manga,
-	val progress: ReadingProgress?,
+	val mangaModel: MangaGridModel,
 	private val referenceChapters: Int,
 ) : ListModel {
 
+	val manga: Manga
+		get() = mangaModel.manga
+
 	val chaptersCount = manga.chaptersCount()
 
 	val chaptersDiff: Int
@@ -19,4 +21,10 @@ data class MangaAlternativeModel(
 	override fun areItemsTheSame(other: ListModel): Boolean {
 		return other is MangaAlternativeModel && other.manga.id == manga.id
 	}
+
+	override fun getChangePayload(previousState: ListModel): Any? = if (previousState is MangaAlternativeModel) {
+		mangaModel.getChangePayload(previousState.mangaModel)
+	} else {
+		null
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksActivity.kt

@@ -1,7 +1,5 @@
 package org.koitharu.kotatsu.bookmarks.ui
 
-import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.graphics.Insets
@@ -46,9 +44,4 @@ class AllBookmarksActivity :
 			right = insets.right,
 		)
 	}
-
-	companion object {
-
-		fun newIntent(context: Context) = Intent(context, AllBookmarksActivity::class.java)
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksFragment.kt

@@ -20,6 +20,8 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.nav.ReaderIntent
+import org.koitharu.kotatsu.core.nav.router
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
@@ -30,7 +32,6 @@ import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
-import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.GridSpanResolver
 import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
@@ -39,7 +40,6 @@ import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -115,26 +115,26 @@ class AllBookmarksFragment :
 
 	override fun onItemClick(item: Bookmark, view: View) {
 		if (selectionController?.onItemClick(item.pageId) != true) {
-			val intent = ReaderActivity.IntentBuilder(view.context)
+			val intent = ReaderIntent.Builder(view.context)
 				.bookmark(item)
 				.incognito(true)
 				.build()
-			startActivity(intent)
+			router.openReader(intent)
 			Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 		}
 	}
 
 	override fun onListHeaderClick(item: ListHeader, view: View) {
 		val manga = item.payload as? Manga ?: return
-		startActivity(DetailsActivity.newIntent(view.context, manga))
+		router.openDetails(manga)
 	}
 
 	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemLongClick(view, item.pageId) ?: false
+		return selectionController?.onItemLongClick(view, item.pageId) == true
 	}
 
 	override fun onItemContextClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemContextClick(view, item.pageId) ?: false
+		return selectionController?.onItemContextClick(view, item.pageId) == true
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
@@ -208,16 +208,4 @@ class AllBookmarksFragment :
 			invalidateSpanIndexCache()
 		}
 	}
-
-	companion object {
-
-		@Deprecated(
-			"",
-			ReplaceWith(
-				"BookmarksFragment()",
-				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment",
-			),
-		)
-		fun newInstance() = AllBookmarksFragment()
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt

@@ -1,38 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
-
-import androidx.lifecycle.LifecycleOwner
-import coil3.ImageLoader
-import coil3.request.allowRgb565
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
-import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.bookmarkExtra
-import org.koitharu.kotatsu.core.util.ext.decodeRegion
-import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
-import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.databinding.ItemBookmarkBinding
-
-// TODO check usages
-fun bookmarkListAD(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	clickListener: OnListItemClickListener<Bookmark>,
-) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
-	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) },
-) {
-	AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
-
-	bind {
-		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {
-			size(CoverSizeResolver(binding.imageViewThumb))
-			defaultPlaceholders(context)
-			allowRgb565(true)
-			bookmarkExtra(item)
-			decodeRegion(item.scroll)
-			enqueueWith(coil)
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksAdapter.kt

@@ -10,6 +10,7 @@ import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
@@ -25,6 +26,7 @@ class BookmarksAdapter(
 	init {
 		addDelegate(ListItemType.PAGE_THUMB, bookmarkLargeAD(coil, lifecycleOwner, clickListener))
 		addDelegate(ListItemType.HEADER, listHeaderAD(headerClickListener))
+		addDelegate(ListItemType.STATE_ERROR, errorStateListAD(null))
 		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
 		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
 		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, null))

app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt

@@ -1,27 +1,23 @@
 package org.koitharu.kotatsu.browser
 
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.webkit.CookieManager
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.nav.router
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.ParserMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.configureForParser
-import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.model.MangaSource
 import javax.inject.Inject
 import com.google.android.material.R as materialR
 
@@ -42,11 +38,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		val mangaSource = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
+		val mangaSource = MangaSource(intent?.getStringExtra(AppRouter.KEY_SOURCE))
 		val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository
 		val userAgent = repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT)
 		viewBinding.webView.configureForParser(userAgent)
-		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
 		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
 		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
@@ -59,7 +54,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			finishAfterTransition()
 		} else {
 			onTitleChanged(
-				intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
+				intent?.getStringExtra(AppRouter.KEY_TITLE) ?: getString(R.string.loading_),
 				url,
 			)
 			viewBinding.webView.loadUrl(url)
@@ -80,14 +75,8 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 
 		R.id.action_browser -> {
-			val url = viewBinding.webView.url?.toUriOrNull()
-			if (url != null) {
-				val intent = Intent(Intent.ACTION_VIEW)
-				intent.data = url
-				try {
-					startActivity(Intent.createChooser(intent, item.title))
-				} catch (_: ActivityNotFoundException) {
-				}
+			if (!router.openExternalBrowser(viewBinding.webView.url.orEmpty(), item.title)) {
+				Snackbar.make(viewBinding.webView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT).show()
 			}
 			true
 		}
@@ -136,17 +125,4 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			bottom = insets.bottom,
 		)
 	}
-
-	companion object {
-
-		private const val EXTRA_TITLE = "title"
-		private const val EXTRA_SOURCE = "source"
-
-		fun newIntent(context: Context, url: String, source: MangaSource?, title: String?): Intent {
-			return Intent(context, BrowserActivity::class.java)
-				.setData(Uri.parse(url))
-				.putExtra(EXTRA_TITLE, title)
-				.putExtra(EXTRA_SOURCE, source?.name)
-		}
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CaptchaNotifier.kt

@@ -17,6 +17,8 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.model.isNsfw
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.prefs.SourceSettings
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
@@ -28,6 +30,9 @@ class CaptchaNotifier(
 		if (!context.checkNotificationPermission(CHANNEL_ID)) {
 			return
 		}
+		if (exception.source != null && SourceSettings(context, exception.source).isCaptchaNotificationsDisabled) {
+			return
+		}
 		val manager = NotificationManagerCompat.from(context)
 		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
 			.setName(context.getString(R.string.captcha_required))
@@ -38,7 +43,7 @@ class CaptchaNotifier(
 			.build()
 		manager.createNotificationChannel(channel)
 
-		val intent = CloudFlareActivity.newIntent(context, exception)
+		val intent = AppRouter.cloudFlareResolveIntent(context, exception)
 			.setData(exception.url.toUri())
 		val notification = NotificationCompat.Builder(context, CHANNEL_ID)
 			.setContentTitle(channel.name)

app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt

@@ -1,15 +1,12 @@
 package org.koitharu.kotatsu.browser.cloudflare
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.webkit.CookieManager
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.core.graphics.Insets
-import androidx.core.net.toUri
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -19,19 +16,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.yield
-import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.network.CloudFlareHelper
 import javax.inject.Inject
 import com.google.android.material.R as materialR
@@ -62,12 +57,11 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			return
 		}
 		cfClient = CloudFlareClient(cookieJar, this, url)
-		viewBinding.webView.configureForParser(intent?.getStringExtra(ARG_UA))
+		viewBinding.webView.configureForParser(intent?.getStringExtra(AppRouter.KEY_USER_AGENT))
 		viewBinding.webView.webViewClient = cfClient
 		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView).also {
 			onBackPressedDispatcher.addCallback(it)
 		}
-		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		if (savedInstanceState == null) {
 			onTitleChanged(getString(R.string.loading_), url)
 			viewBinding.webView.loadUrl(url)
@@ -140,7 +134,7 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	override fun onCheckPassed() {
 		pendingResult = RESULT_OK
-		val source = intent?.getStringExtra(ARG_SOURCE)
+		val source = intent?.getStringExtra(AppRouter.KEY_SOURCE)
 		if (source != null) {
 			CaptchaNotifier(this).dismiss(MangaSource(source))
 		}
@@ -182,38 +176,16 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	class Contract : ActivityResultContract<CloudFlareProtectedException, Boolean>() {
 		override fun createIntent(context: Context, input: CloudFlareProtectedException): Intent {
-			return newIntent(context, input)
+			return AppRouter.cloudFlareResolveIntent(context, input)
 		}
 
 		override fun parseResult(resultCode: Int, intent: Intent?): Boolean {
-			return resultCode == Activity.RESULT_OK
+			return resultCode == RESULT_OK
 		}
 	}
 
 	companion object {
 
 		const val TAG = "CloudFlareActivity"
-		private const val ARG_UA = "ua"
-		private const val ARG_SOURCE = "_source"
-
-		fun newIntent(context: Context, exception: CloudFlareProtectedException) = newIntent(
-			context = context,
-			url = exception.url,
-			source = exception.source,
-			headers = exception.headers,
-		)
-
-		private fun newIntent(
-			context: Context,
-			url: String,
-			source: MangaSource?,
-			headers: Headers?,
-		) = Intent(context, CloudFlareActivity::class.java).apply {
-			data = url.toUri()
-			putExtra(ARG_SOURCE, source?.name)
-			headers?.get(CommonHeaders.USER_AGENT)?.let {
-				putExtra(ARG_UA, it)
-			}
-		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt

@@ -6,6 +6,7 @@ import android.os.Build
 import android.provider.SearchRecentSuggestions
 import android.text.Html
 import androidx.collection.arraySetOf
+import androidx.core.content.ContextCompat
 import androidx.room.InvalidationTracker
 import androidx.work.WorkManager
 import coil3.ImageLoader
@@ -76,6 +77,12 @@ interface AppModule {
 
 	companion object {
 
+		@Provides
+		@LocalizedAppContext
+		fun provideLocalizedContext(
+			@ApplicationContext context: Context,
+		): Context = ContextCompat.getContextForLanguage(context)
+
 		@Provides
 		@Singleton
 		fun provideNetworkState(

app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt

@@ -13,7 +13,6 @@ import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.acra.ACRA
 import org.acra.ReportField
 import org.acra.config.dialog
@@ -26,12 +25,14 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.os.AppValidator
+import org.koitharu.kotatsu.core.os.RomCompat
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.data.index.LocalMangaIndex
 import org.koitharu.kotatsu.local.domain.model.LocalManga
+import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrNull
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
 import java.security.Security
 import javax.inject.Inject
@@ -82,17 +83,14 @@ open class BaseApp : Application(), Configuration.Provider {
 			return
 		}
 		AppCompatDelegate.setDefaultNightMode(settings.theme)
-		AppCompatDelegate.setApplicationLocales(settings.appLocales)
 		// TLS 1.3 support for Android < 10
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
 			Security.insertProviderAt(Conscrypt.newProvider(), 1)
 		}
 		setupActivityLifecycleCallbacks()
 		processLifecycleScope.launch {
-			val isOriginalApp = withContext(Dispatchers.Default) {
-				appValidator.isOriginalApp
-			}
-			ACRA.errorReporter.putCustomData("isOriginalApp", isOriginalApp.toString())
+			ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.getOrNull().toString())
+			ACRA.errorReporter.putCustomData("isMiui", RomCompat.isMiui.getOrNull().toString())
 		}
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()

app/src/main/kotlin/org/koitharu/kotatsu/core/ErrorReporterReceiver.kt

@@ -8,6 +8,7 @@ import android.net.Uri
 import android.os.BadParcelableException
 import androidx.core.app.PendingIntentCompat
 import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.report
@@ -15,20 +16,19 @@ import org.koitharu.kotatsu.core.util.ext.report
 class ErrorReporterReceiver : BroadcastReceiver() {
 
 	override fun onReceive(context: Context?, intent: Intent?) {
-		val e = intent?.getSerializableExtraCompat<Throwable>(EXTRA_ERROR) ?: return
+		val e = intent?.getSerializableExtraCompat<Throwable>(AppRouter.KEY_ERROR) ?: return
 		e.report()
 	}
 
 	companion object {
 
-		private const val EXTRA_ERROR = "err"
 		private const val ACTION_REPORT = "${BuildConfig.APPLICATION_ID}.action.REPORT_ERROR"
 
 		fun getPendingIntent(context: Context, e: Throwable): PendingIntent? = try {
 			val intent = Intent(context, ErrorReporterReceiver::class.java)
 			intent.setAction(ACTION_REPORT)
 			intent.setData(Uri.parse("err://${e.hashCode()}"))
-			intent.putExtra(EXTRA_ERROR, e)
+			intent.putExtra(AppRouter.KEY_ERROR, e)
 			PendingIntentCompat.getBroadcast(context, 0, intent, 0, false)
 		} catch (e: BadParcelableException) {
 			e.printStackTraceDebug()

app/src/main/kotlin/org/koitharu/kotatsu/core/LocalizedAppContext.kt

@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Target(
+	AnnotationTarget.FUNCTION,
+	AnnotationTarget.PROPERTY_GETTER,
+	AnnotationTarget.PROPERTY_SETTER,
+	AnnotationTarget.VALUE_PARAMETER,
+	AnnotationTarget.FIELD,
+)
+annotation class LocalizedAppContext

app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt

@@ -16,6 +16,7 @@ class BackupEntry(
 		CATEGORIES("categories"),
 		FAVOURITES("favourites"),
 		SETTINGS("settings"),
+		SETTINGS_READER_GRID("reader_grid"),
 		BOOKMARKS("bookmarks"),
 		SOURCES("sources"),
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt

@@ -1,15 +1,18 @@
 package org.koitharu.kotatsu.core.backup
 
 import androidx.room.withTransaction
+import kotlinx.coroutines.flow.FlowCollector
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.progress.Progress
 import org.koitharu.kotatsu.parsers.util.json.asTypedList
 import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.reader.data.TapGridSettings
 import java.util.Date
 import javax.inject.Inject
 
@@ -18,6 +21,7 @@ private const val PAGE_SIZE = 10
 class BackupRepository @Inject constructor(
 	private val db: MangaDatabase,
 	private val settings: AppSettings,
+	private val tapGridSettings: TapGridSettings,
 ) {
 
 	suspend fun dumpHistory(): BackupEntry {
@@ -103,6 +107,14 @@ class BackupRepository @Inject constructor(
 		return entry
 	}
 
+	fun dumpReaderGridSettings(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.Name.SETTINGS_READER_GRID, JSONArray())
+		val settingsDump = tapGridSettings.getAllValues()
+		val json = JsonSerializer(settingsDump).toJson()
+		entry.data.put(json)
+		return entry
+	}
+
 	suspend fun dumpSources(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.Name.SOURCES, JSONArray())
 		val all = db.getSourcesDao().findAll()
@@ -128,9 +140,11 @@ class BackupRepository @Inject constructor(
 		return if (timestamp == 0L) null else Date(timestamp)
 	}
 
-	suspend fun restoreHistory(entry: BackupEntry): CompositeResult {
+	suspend fun restoreHistory(entry: BackupEntry, outProgress: FlowCollector<Progress>?): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data.asTypedList<JSONObject>()) {
+		val list = entry.data.asTypedList<JSONObject>()
+		outProgress?.emit(Progress(progress = 0, total = list.size))
+		for ((index, item) in list.withIndex()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = JsonDeserializer(mangaJson).toMangaEntity()
 			val tags = mangaJson.getJSONArray("tags").mapJSON {
@@ -144,6 +158,7 @@ class BackupRepository @Inject constructor(
 					db.getHistoryDao().upsert(history)
 				}
 			}
+			outProgress?.emit(Progress(progress = index, total = list.size))
 		}
 		return result
 	}
@@ -159,9 +174,11 @@ class BackupRepository @Inject constructor(
 		return result
 	}
 
-	suspend fun restoreFavourites(entry: BackupEntry): CompositeResult {
+	suspend fun restoreFavourites(entry: BackupEntry, outProgress: FlowCollector<Progress>?): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data.asTypedList<JSONObject>()) {
+		val list = entry.data.asTypedList<JSONObject>()
+		outProgress?.emit(Progress(progress = 0, total = list.size))
+		for ((index, item) in list.withIndex()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = JsonDeserializer(mangaJson).toMangaEntity()
 			val tags = mangaJson.getJSONArray("tags").mapJSON {
@@ -175,6 +192,7 @@ class BackupRepository @Inject constructor(
 					db.getFavouritesDao().upsert(favourite)
 				}
 			}
+			outProgress?.emit(Progress(progress = index, total = list.size))
 		}
 		return result
 	}
@@ -221,4 +239,14 @@ class BackupRepository @Inject constructor(
 		}
 		return result
 	}
+
+	fun restoreReaderGridSettings(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.asTypedList<JSONObject>()) {
+			result += runCatchingCancellable {
+				tapGridSettings.upsertAll(JsonDeserializer(item).toMap())
+			}
+		}
+		return result
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/backup/CompositeResult.kt

@@ -27,6 +27,10 @@ class CompositeResult {
 		}
 	}
 
+	operator fun plusAssign(error: Throwable) {
+		errors.add(error)
+	}
+
 	operator fun plusAssign(other: CompositeResult) {
 		this.successCount += other.successCount
 		this.errors += other.errors

app/src/main/kotlin/org/koitharu/kotatsu/core/backup/TelegramBackupUploader.kt

@@ -0,0 +1,93 @@
+package org.koitharu.kotatsu.core.backup
+
+import android.content.Context
+import androidx.annotation.CheckResult
+import dagger.hilt.android.qualifiers.ApplicationContext
+import okhttp3.HttpUrl
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.Response
+import okhttp3.internal.closeQuietly
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.network.BaseHttpClient
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.parseJson
+import java.io.File
+import javax.inject.Inject
+
+class TelegramBackupUploader @Inject constructor(
+	private val settings: AppSettings,
+	@BaseHttpClient private val client: OkHttpClient,
+	@ApplicationContext private val context: Context,
+) {
+
+	private val botToken = context.getString(R.string.tg_backup_bot_token)
+
+	suspend fun uploadBackup(file: File) {
+		val requestBody = file.asRequestBody("application/zip".toMediaTypeOrNull())
+		val multipartBody = MultipartBody.Builder()
+			.setType(MultipartBody.FORM)
+			.addFormDataPart("chat_id", requireChatId())
+			.addFormDataPart("document", file.name, requestBody)
+			.build()
+		val request = Request.Builder()
+			.url(urlOf("sendDocument").build())
+			.post(multipartBody)
+			.build()
+		client.newCall(request).await().consume()
+	}
+
+	suspend fun sendTestMessage() {
+		val request = Request.Builder()
+			.url(urlOf("getMe").build())
+			.build()
+		client.newCall(request).await().consume()
+		sendMessage(context.getString(R.string.backup_tg_echo))
+	}
+
+	@CheckResult
+	fun openBotInApp(router: AppRouter): Boolean {
+		val botUsername = context.getString(R.string.tg_backup_bot_name)
+		return router.openExternalBrowser("tg://resolve?domain=$botUsername") ||
+			router.openExternalBrowser("https://t.me/$botUsername")
+	}
+
+	private suspend fun sendMessage(message: String) {
+		val url = urlOf("sendMessage")
+			.addQueryParameter("chat_id", requireChatId())
+			.addQueryParameter("text", message)
+			.build()
+		val request = Request.Builder()
+			.url(url)
+			.build()
+		client.newCall(request).await().consume()
+	}
+
+	private fun requireChatId() = checkNotNull(settings.backupTelegramChatId) {
+		"Telegram chat ID not set in settings"
+	}
+
+	private fun Response.consume() {
+		if (isSuccessful) {
+			closeQuietly()
+			return
+		}
+		val jo = parseJson()
+		if (!jo.getBooleanOrDefault("ok", true)) {
+			throw RuntimeException(jo.getStringOrNull("description"))
+		}
+	}
+
+	private fun urlOf(method: String) = HttpUrl.Builder()
+		.scheme("https")
+		.host("api.telegram.org")
+		.addPathSegment("bot$botToken")
+		.addPathSegment(method)
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt

@@ -12,11 +12,13 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
+import org.koitharu.kotatsu.core.db.dao.ChaptersDao
 import org.koitharu.kotatsu.core.db.dao.MangaDao
 import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.dao.PreferencesDao
 import org.koitharu.kotatsu.core.db.dao.TagsDao
 import org.koitharu.kotatsu.core.db.dao.TrackLogsDao
+import org.koitharu.kotatsu.core.db.entity.ChapterEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
@@ -36,6 +38,8 @@ import org.koitharu.kotatsu.core.db.migrations.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration20To21
 import org.koitharu.kotatsu.core.db.migrations.Migration21To22
 import org.koitharu.kotatsu.core.db.migrations.Migration22To23
+import org.koitharu.kotatsu.core.db.migrations.Migration23To24
+import org.koitharu.kotatsu.core.db.migrations.Migration24To23
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
 import org.koitharu.kotatsu.core.db.migrations.Migration4To5
@@ -63,14 +67,14 @@ import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 23
+const val DATABASE_VERSION = 24
 
 @Database(
 	entities = [
-		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
-		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
-		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
-		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class, LocalMangaIndexEntity::class,
+		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class, ChapterEntity::class,
+		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class, TrackEntity::class,
+		TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class, ScrobblingEntity::class,
+		MangaSourceEntity::class, StatsEntity::class, LocalMangaIndexEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -103,6 +107,8 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract fun getStatsDao(): StatsDao
 
 	abstract fun getLocalMangaIndexDao(): LocalMangaIndexDao
+
+	abstract fun getChaptersDao(): ChaptersDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
@@ -128,6 +134,8 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration20To21(),
 	Migration21To22(),
 	Migration22To23(),
+	Migration23To24(),
+	Migration24To23(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

app/src/main/kotlin/org/koitharu/kotatsu/core/db/Tables.kt

@@ -7,3 +7,4 @@ const val TABLE_FAVOURITE_CATEGORIES = "favourite_categories"
 const val TABLE_HISTORY = "history"
 const val TABLE_MANGA_TAGS = "manga_tags"
 const val TABLE_SOURCES = "sources"
+const val TABLE_CHAPTERS = "chapters"

app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/ChaptersDao.kt

@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import org.koitharu.kotatsu.core.db.entity.ChapterEntity
+
+@Dao
+abstract class ChaptersDao {
+
+	@Query("SELECT * FROM chapters WHERE manga_id = :mangaId ORDER BY `index` ASC")
+	abstract suspend fun findAll(mangaId: Long): List<ChapterEntity>
+
+	@Query("DELETE FROM chapters WHERE manga_id = :mangaId")
+	abstract suspend fun deleteAll(mangaId: Long)
+
+	@Query("DELETE FROM chapters WHERE manga_id NOT IN (SELECT manga_id FROM history WHERE deleted_at = 0) AND manga_id NOT IN (SELECT manga_id FROM favourites WHERE deleted_at = 0)")
+	abstract suspend fun gc()
+
+	@Transaction
+	open suspend fun replaceAll(mangaId: Long, entities: Collection<ChapterEntity>) {
+		deleteAll(mangaId)
+		insert(entities)
+	}
+
+	@Insert(onConflict = OnConflictStrategy.REPLACE)
+	protected abstract suspend fun insert(entities: Collection<ChapterEntity>)
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaDao.kt

@@ -20,6 +20,9 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE manga_id = :id")
 	abstract suspend fun find(id: Long): MangaWithTags?
 
+	@Query("SELECT EXISTS(SELECT * FROM manga WHERE manga_id = :id)")
+	abstract suspend operator fun contains(id: Long): Boolean
+
 	@Transaction
 	@Query("SELECT * FROM manga WHERE public_url = :publicUrl")
 	abstract suspend fun findByPublicUrl(publicUrl: String): MangaWithTags?
@@ -55,6 +58,19 @@ abstract class MangaDao {
 	@Delete
 	abstract suspend fun delete(subjects: Collection<MangaEntity>)
 
+	@Query(
+		"""
+		DELETE FROM manga WHERE NOT EXISTS(SELECT * FROM history WHERE history.manga_id == manga.manga_id) 
+			AND NOT EXISTS(SELECT * FROM favourites WHERE favourites.manga_id == manga.manga_id)
+			AND NOT EXISTS(SELECT * FROM bookmarks WHERE bookmarks.manga_id == manga.manga_id)
+			AND NOT EXISTS(SELECT * FROM suggestions WHERE suggestions.manga_id == manga.manga_id)
+			AND NOT EXISTS(SELECT * FROM scrobblings WHERE scrobblings.manga_id == manga.manga_id)
+			AND NOT EXISTS(SELECT * FROM local_index WHERE local_index.manga_id == manga.manga_id)
+			AND manga.manga_id NOT IN (:idsToKeep)
+		""",
+	)
+	abstract suspend fun cleanup(idsToKeep: Set<Long>)
+
 	@Transaction
 	open suspend fun upsert(manga: MangaEntity, tags: Iterable<TagEntity>? = null) {
 		upsert(manga)

app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaSourcesDao.kt

@@ -10,7 +10,6 @@ import androidx.room.Upsert
 import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
-import org.intellij.lang.annotations.Language
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.explore.data.SourcesSortOrder
@@ -61,21 +60,11 @@ abstract class MangaSourcesDao {
 	@Query("SELECT * FROM sources WHERE pinned = 1")
 	abstract suspend fun findAllPinned(): List<MangaSourceEntity>
 
-	fun observeEnabled(order: SourcesSortOrder): Flow<List<MangaSourceEntity>> {
-		val orderBy = getOrderBy(order)
+	fun observeAll(enabledOnly: Boolean, order: SourcesSortOrder): Flow<List<MangaSourceEntity>> =
+		observeImpl(getQuery(enabledOnly, order))
 
-		@Language("RoomSql")
-		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
-		return observeImpl(query)
-	}
-
-	suspend fun findAllEnabled(order: SourcesSortOrder): List<MangaSourceEntity> {
-		val orderBy = getOrderBy(order)
-
-		@Language("RoomSql")
-		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
-		return findAllImpl(query)
-	}
+	suspend fun findAll(enabledOnly: Boolean, order: SourcesSortOrder): List<MangaSourceEntity> =
+		findAllImpl(getQuery(enabledOnly, order))
 
 	@Transaction
 	open suspend fun setEnabled(source: String, isEnabled: Boolean) {
@@ -101,6 +90,17 @@ abstract class MangaSourcesDao {
 	@RawQuery
 	protected abstract suspend fun findAllImpl(query: SupportSQLiteQuery): List<MangaSourceEntity>
 
+	private fun getQuery(enabledOnly: Boolean, order: SourcesSortOrder) = SimpleSQLiteQuery(
+		buildString {
+			append("SELECT * FROM sources ")
+			if (enabledOnly) {
+				append("WHERE enabled = 1 ")
+			}
+			append("ORDER BY pinned DESC, ")
+			append(getOrderBy(order))
+		},
+	)
+
 	private fun getOrderBy(order: SourcesSortOrder) = when (order) {
 		SourcesSortOrder.ALPHABETIC -> "source ASC"
 		SourcesSortOrder.POPULARITY -> "(SELECT COUNT(*) FROM manga WHERE source = sources.source) DESC"

app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/ChapterEntity.kt

@@ -0,0 +1,32 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import org.koitharu.kotatsu.core.db.TABLE_CHAPTERS
+
+@Entity(
+	tableName = TABLE_CHAPTERS,
+	primaryKeys = ["manga_id", "chapter_id"],
+	foreignKeys = [
+		ForeignKey(
+			entity = MangaEntity::class,
+			parentColumns = ["manga_id"],
+			childColumns = ["manga_id"],
+			onDelete = ForeignKey.CASCADE,
+		),
+	],
+)
+data class ChapterEntity(
+	@ColumnInfo(name = "chapter_id") val chapterId: Long,
+	@ColumnInfo(name = "manga_id") val mangaId: Long,
+	@ColumnInfo(name = "name") val name: String,
+	@ColumnInfo(name = "number") val number: Float,
+	@ColumnInfo(name = "volume") val volume: Int,
+	@ColumnInfo(name = "url") val url: String,
+	@ColumnInfo(name = "scanlator") val scanlator: String?,
+	@ColumnInfo(name = "upload_date") val uploadDate: Long,
+	@ColumnInfo(name = "branch") val branch: String?,
+	@ColumnInfo(name = "source") val source: String,
+	@ColumnInfo(name = "index") val index: Int,
+)

app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.db.entity
 
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
@@ -21,7 +22,7 @@ fun Collection<TagEntity>.toMangaTags() = mapToSet(TagEntity::toMangaTag)
 
 fun Collection<TagEntity>.toMangaTagsList() = map(TagEntity::toMangaTag)
 
-fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
+fun MangaEntity.toManga(tags: Set<MangaTag>, chapters: List<ChapterEntity>?) = Manga( // TODO
 	id = this.id,
 	title = this.title,
 	altTitle = this.altTitle,
@@ -35,12 +36,27 @@ fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 	author = this.author,
 	source = MangaSource(this.source),
 	tags = tags,
+	chapters = chapters?.toMangaChapters(),
 )
 
-fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())
+fun MangaWithTags.toManga(chapters: List<ChapterEntity>? = null) = manga.toManga(tags.toMangaTags(), chapters)
 
 fun Collection<MangaWithTags>.toMangaList() = map { it.toManga() }
 
+fun ChapterEntity.toMangaChapter() = MangaChapter(
+	id = chapterId,
+	name = name,
+	number = number,
+	volume = volume,
+	url = url,
+	scanlator = scanlator,
+	uploadDate = uploadDate,
+	branch = branch,
+	source = MangaSource(source),
+)
+
+fun Collection<ChapterEntity>.toMangaChapters() = map { it.toMangaChapter() }
+
 // Model to entity
 
 fun Manga.toEntity() = MangaEntity(
@@ -67,6 +83,22 @@ fun MangaTag.toEntity() = TagEntity(
 
 fun Collection<MangaTag>.toEntities() = map(MangaTag::toEntity)
 
+fun Iterable<IndexedValue<MangaChapter>>.toEntities(mangaId: Long) = map { (index, chapter) ->
+	ChapterEntity(
+		chapterId = chapter.id,
+		mangaId = mangaId,
+		name = chapter.name,
+		number = chapter.number,
+		volume = chapter.volume,
+		url = chapter.url,
+		scanlator = chapter.scanlator,
+		uploadDate = chapter.uploadDate,
+		branch = chapter.branch,
+		source = chapter.source.name,
+		index = index,
+	)
+}
+
 // Other
 
 fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {

app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration23To24.kt

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration23To24 : Migration(23, 24) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE IF NOT EXISTS `chapters` (`chapter_id` INTEGER NOT NULL, `manga_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `number` REAL NOT NULL, `volume` INTEGER NOT NULL, `url` TEXT NOT NULL, `scanlator` TEXT, `upload_date` INTEGER NOT NULL, `branch` TEXT, `source` TEXT NOT NULL, `index` INTEGER NOT NULL, PRIMARY KEY(`manga_id`, `chapter_id`), FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration24To23.kt

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration24To23 : Migration(24, 23) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("DROP TABLE IF EXISTS `chapters`")
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/DialogErrorObserver.kt

@@ -6,7 +6,6 @@ import androidx.core.util.Consumer
 import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.isSerializable
 import org.koitharu.kotatsu.parsers.exception.ParseException
@@ -32,10 +31,10 @@ class DialogErrorObserver(
 		if (canResolve(value)) {
 			dialogBuilder.setPositiveButton(ExceptionResolver.getResolveStringId(value), listener)
 		} else if (value is ParseException) {
-			val fm = fragmentManager
-			if (fm != null && value.isSerializable()) {
+			val router = router()
+			if (router != null && value.isSerializable()) {
 				dialogBuilder.setPositiveButton(R.string.details) { _, _ ->
-					ErrorDetailsDialog.show(fm, value, value.url)
+					router.showErrorDialog(value)
 				}
 			}
 		}

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/ErrorObserver.kt

@@ -4,6 +4,7 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.util.Consumer
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.LifecycleOwner
@@ -11,6 +12,7 @@ import androidx.lifecycle.coroutineScope
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.core.nav.router
 import org.koitharu.kotatsu.core.util.ext.findActivity
 import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
 
@@ -33,6 +35,8 @@ abstract class ErrorObserver(
 		return resolver != null && ExceptionResolver.canResolve(error)
 	}
 
+	protected fun router() = fragment?.router ?: (activity as? FragmentActivity)?.router
+
 	private fun isAlive(): Boolean {
 		return when {
 			fragment != null -> fragment.view != null
@@ -44,7 +48,7 @@ abstract class ErrorObserver(
 	protected fun resolve(error: Throwable) {
 		if (isAlive()) {
 			lifecycleScope.launch {
-				val isResolved = resolver?.resolve(error) ?: false
+				val isResolved = resolver?.resolve(error) == true
 				if (isActive) {
 					onResolved?.accept(isResolved)
 				}

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt

@@ -5,19 +5,20 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultCaller
 import androidx.annotation.StringRes
 import androidx.collection.MutableScatterMap
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
-import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.ProxyConfigException
 import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.nav.router
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
 import org.koitharu.kotatsu.core.util.ext.restartApplication
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
@@ -26,7 +27,6 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.scrobbling.common.domain.ScrobblerAuthRequiredException
 import org.koitharu.kotatsu.scrobbling.common.ui.ScrobblerAuthHelper
-import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import java.security.cert.CertPathValidatorException
 import javax.inject.Provider
@@ -49,8 +49,8 @@ class ExceptionResolver @AssistedInject constructor(
 		handleActivityResult(CloudFlareActivity.TAG, it)
 	}
 
-	fun showDetails(e: Throwable, url: String?) {
-		ErrorDetailsDialog.show(host.getChildFragmentManager(), e, url)
+	fun showErrorDetails(e: Throwable, url: String? = null) {
+		host.router()?.showErrorDialog(e, url)
 	}
 
 	suspend fun resolve(e: Throwable): Boolean = when (e) {
@@ -63,9 +63,7 @@ class ExceptionResolver @AssistedInject constructor(
 		}
 
 		is ProxyConfigException -> {
-			host.withContext {
-				startActivity(SettingsActivity.newProxySettingsIntent(this))
-			}
+			host.router()?.openProxySettings()
 			false
 		}
 
@@ -85,9 +83,7 @@ class ExceptionResolver @AssistedInject constructor(
 				true
 			} else {
 				host.withContext {
-					authHelper.startAuth(this, e.scrobbler).onFailure {
-						showDetails(it, null)
-					}
+					authHelper.startAuth(this, e.scrobbler).onFailure(::showErrorDetails)
 				}
 				false
 			}
@@ -106,12 +102,12 @@ class ExceptionResolver @AssistedInject constructor(
 		sourceAuthContract.launch(source)
 	}
 
-	private fun openInBrowser(url: String) = host.withContext {
-		startActivity(BrowserActivity.newIntent(this, url, null, null))
+	private fun openInBrowser(url: String) {
+		host.router()?.openBrowser(url, null, null)
 	}
 
-	private fun openAlternatives(manga: Manga) = host.withContext {
-		startActivity(AlternativesActivity.newIntent(this, manga))
+	private fun openAlternatives(manga: Manga) {
+		host.router()?.openAlternatives(manga)
 	}
 
 	private fun handleActivityResult(tag: String, result: Boolean) {
@@ -140,6 +136,12 @@ class ExceptionResolver @AssistedInject constructor(
 		getContext()?.apply(block)
 	}
 
+	private fun Host.router(): AppRouter? = when (this) {
+		is FragmentActivity -> router
+		is Fragment -> router
+		else -> null
+	}
+
 	interface Host : ActivityResultCaller {
 
 		fun getChildFragmentManager(): FragmentManager

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/SnackbarErrorObserver.kt

@@ -5,7 +5,6 @@ import androidx.core.util.Consumer
 import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.isSerializable
 import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
@@ -33,10 +32,10 @@ class SnackbarErrorObserver(
 				resolve(value)
 			}
 		} else if (value is ParseException) {
-			val fm = fragmentManager
-			if (fm != null && value.isSerializable()) {
+			val router = router()
+			if (router != null && value.isSerializable()) {
 				snackbar.setAction(R.string.details) {
-					ErrorDetailsDialog.show(fm, value, value.url)
+					router.showErrorDialog(value)
 				}
 			}
 		}

app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt

@@ -21,6 +21,7 @@ import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
 import org.koitharu.kotatsu.parsers.util.parseJsonArray
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrNull
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -85,8 +86,8 @@ class AppUpdateRepository @Inject constructor(
 	}
 
 	@Suppress("KotlinConstantConditions")
-	fun isUpdateSupported(): Boolean {
-		return BuildConfig.BUILD_TYPE != BUILD_TYPE_RELEASE || appValidator.isOriginalApp
+	suspend fun isUpdateSupported(): Boolean {
+		return BuildConfig.BUILD_TYPE != BUILD_TYPE_RELEASE || appValidator.isOriginalApp.getOrNull() == true
 	}
 
 	suspend fun getCurrentVersionChangelog(): String? {

app/src/main/kotlin/org/koitharu/kotatsu/core/image/BitmapDecoderCompat.kt

@@ -4,26 +4,26 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.ImageDecoder
 import android.os.Build
-import android.webkit.MimeTypeMap
 import androidx.annotation.RequiresApi
 import com.davemorrissey.labs.subscaleview.decoder.ImageDecodeException
-import okhttp3.MediaType
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import org.aomedia.avif.android.AvifDecoder
 import org.aomedia.avif.android.AvifDecoder.Info
 import org.jetbrains.annotations.Blocking
+import org.koitharu.kotatsu.core.util.MimeTypes
+import org.koitharu.kotatsu.core.util.ext.MimeType
 import org.koitharu.kotatsu.core.util.ext.toByteBuffer
+import org.koitharu.kotatsu.core.util.ext.toMimeTypeOrNull
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.io.File
 import java.io.InputStream
 import java.nio.ByteBuffer
-import java.nio.file.Files
 
 object BitmapDecoderCompat {
 
 	private const val FORMAT_AVIF = "avif"
 
 	@Blocking
-	fun decode(file: File): Bitmap = when (val format = getMimeType(file)?.subtype) {
+	fun decode(file: File): Bitmap = when (val format = probeMimeType(file)?.subtype) {
 		FORMAT_AVIF -> file.inputStream().use { decodeAvif(it.toByteBuffer()) }
 		else -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
 			ImageDecoder.decodeBitmap(ImageDecoder.createSource(file))
@@ -33,7 +33,7 @@ object BitmapDecoderCompat {
 	}
 
 	@Blocking
-	fun decode(stream: InputStream, type: MediaType?, isMutable: Boolean = false): Bitmap {
+	fun decode(stream: InputStream, type: MimeType?, isMutable: Boolean = false): Bitmap {
 		val format = type?.subtype
 		if (format == FORMAT_AVIF) {
 			return decodeAvif(stream.toByteBuffer())
@@ -51,12 +51,20 @@ object BitmapDecoderCompat {
 		}
 	}
 
-	private fun getMimeType(file: File): MediaType? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-		Files.probeContentType(file.toPath())?.toMediaTypeOrNull()
-	} else {
-		MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.extension)?.toMediaTypeOrNull()
+	@Blocking
+	fun probeMimeType(file: File): MimeType? {
+		return MimeTypes.probeMimeType(file) ?: detectBitmapType(file)
 	}
 
+	@Blocking
+	private fun detectBitmapType(file: File): MimeType? = runCatchingCancellable {
+		val options = BitmapFactory.Options().apply {
+			inJustDecodeBounds = true
+		}
+		BitmapFactory.decodeFile(file.path, options)?.recycle()
+		return options.outMimeType?.toMimeTypeOrNull()
+	}.getOrNull()
+
 	private fun checkBitmapNotNull(bitmap: Bitmap?, format: String?): Bitmap =
 		bitmap ?: throw ImageDecodeException(null, format)
 

app/src/main/kotlin/org/koitharu/kotatsu/core/image/CbzFetcher.kt

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.image
 
 import android.net.Uri
-import android.webkit.MimeTypeMap
 import coil3.ImageLoader
 import coil3.decode.DataSource
 import coil3.decode.ImageSource
@@ -12,6 +11,7 @@ import coil3.toAndroidUri
 import kotlinx.coroutines.runInterruptible
 import okio.Path.Companion.toPath
 import okio.openZip
+import org.koitharu.kotatsu.core.util.MimeTypes
 import org.koitharu.kotatsu.core.util.ext.isZipUri
 import coil3.Uri as CoilUri
 
@@ -23,9 +23,10 @@ class CbzFetcher(
 	override suspend fun fetch() = runInterruptible {
 		val filePath = uri.schemeSpecificPart.toPath()
 		val entryName = requireNotNull(uri.fragment)
+		val fs = options.fileSystem.openZip(filePath)
 		SourceFetchResult(
-			source = ImageSource(entryName.toPath(), options.fileSystem.openZip(filePath)),
-			mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(entryName.substringAfterLast('.', "")),
+			source = ImageSource(entryName.toPath(), fs, closeable = fs),
+			mimeType = MimeTypes.getMimeTypeFromExtension(entryName)?.toString(),
 			dataSource = DataSource.DISK,
 		)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt

@@ -2,11 +2,16 @@ package org.koitharu.kotatsu.core.model
 
 import android.content.Context
 import android.graphics.Color
+import android.os.Build
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
+import android.text.style.ImageSpan
 import android.text.style.RelativeSizeSpan
 import android.text.style.SuperscriptSpan
+import android.widget.TextView
+import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
 import androidx.core.text.inSpans
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.external.ExternalMangaSource
@@ -100,3 +105,16 @@ fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
 ) {
 	append(context.getString(R.string.nsfw))
 }
+
+fun SpannableStringBuilder.appendIcon(textView: TextView, @DrawableRes resId: Int): SpannableStringBuilder {
+	val icon = ContextCompat.getDrawable(textView.context, resId) ?: return this
+	icon.setTintList(textView.textColors)
+	val size = textView.lineHeight
+	icon.setBounds(0, 0, size, size)
+	val alignment = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		ImageSpan.ALIGN_CENTER
+	} else {
+		ImageSpan.ALIGN_BOTTOM
+	}
+	return inSpans(ImageSpan(icon, alignment)) { append(' ') }
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/model/QuickFilter.kt

@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core.model
+
+import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.list.domain.ListFilterOption
+
+fun ListFilterOption.toChipModel(isChecked: Boolean) = ChipsView.ChipModel(
+	title = titleText,
+	titleResId = titleResId,
+	icon = iconResId,
+	iconData = getIconData(),
+	isChecked = isChecked,
+	data = this,
+)

app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaListFilter.kt

@@ -30,6 +30,7 @@ object MangaListFilterParceler : Parceler<MangaListFilter> {
 		parcel.writeInt(year)
 		parcel.writeInt(yearFrom)
 		parcel.writeInt(yearTo)
+		parcel.writeString(author)
 	}
 
 	override fun create(parcel: Parcel) = MangaListFilter(
@@ -45,6 +46,7 @@ object MangaListFilterParceler : Parceler<MangaListFilter> {
 		year = parcel.readInt(),
 		yearFrom = parcel.readInt(),
 		yearTo = parcel.readInt(),
+		author = parcel.readString(),
 	)
 }
 

app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouter.kt

@@ -0,0 +1,712 @@
+package org.koitharu.kotatsu.core.nav
+
+import android.accounts.Account
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.provider.Settings
+import android.view.View
+import androidx.annotation.CheckResult
+import androidx.annotation.UiContext
+import androidx.core.net.toUri
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.findFragment
+import androidx.lifecycle.LifecycleOwner
+import dagger.hilt.android.EntryPointAccessors
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
+import org.koitharu.kotatsu.bookmarks.ui.AllBookmarksActivity
+import org.koitharu.kotatsu.browser.BrowserActivity
+import org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.model.MangaSourceInfo
+import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaListFilter
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPage
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.external.ExternalMangaSource
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ReaderMode
+import org.koitharu.kotatsu.core.prefs.TriStateOption
+import org.koitharu.kotatsu.core.ui.dialog.BigButtonsAlertDialog
+import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
+import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
+import org.koitharu.kotatsu.core.util.ext.connectivityManager
+import org.koitharu.kotatsu.core.util.ext.findActivity
+import org.koitharu.kotatsu.core.util.ext.toUriOrNull
+import org.koitharu.kotatsu.core.util.ext.withArgs
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.details.ui.pager.ChaptersPagesSheet
+import org.koitharu.kotatsu.details.ui.related.RelatedMangaActivity
+import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingInfoSheet
+import org.koitharu.kotatsu.download.ui.dialog.DownloadDialogFragment
+import org.koitharu.kotatsu.download.ui.list.DownloadsActivity
+import org.koitharu.kotatsu.favourites.ui.FavouritesActivity
+import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
+import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteDialog
+import org.koitharu.kotatsu.filter.ui.FilterCoordinator
+import org.koitharu.kotatsu.filter.ui.sheet.FilterSheetFragment
+import org.koitharu.kotatsu.filter.ui.tags.TagsCatalogSheet
+import org.koitharu.kotatsu.history.ui.HistoryActivity
+import org.koitharu.kotatsu.image.ui.ImageActivity
+import org.koitharu.kotatsu.list.ui.config.ListConfigBottomSheet
+import org.koitharu.kotatsu.list.ui.config.ListConfigSection
+import org.koitharu.kotatsu.local.ui.ImportDialogFragment
+import org.koitharu.kotatsu.local.ui.info.LocalInfoDialog
+import org.koitharu.kotatsu.main.ui.MainActivity
+import org.koitharu.kotatsu.main.ui.welcome.WelcomeSheet
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.isNullOrEmpty
+import org.koitharu.kotatsu.parsers.util.mapToArray
+import org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity
+import org.koitharu.kotatsu.reader.ui.config.ReaderConfigSheet
+import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService
+import org.koitharu.kotatsu.scrobbling.common.ui.config.ScrobblerConfigActivity
+import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
+import org.koitharu.kotatsu.search.domain.SearchKind
+import org.koitharu.kotatsu.search.ui.MangaListActivity
+import org.koitharu.kotatsu.search.ui.multi.SearchActivity
+import org.koitharu.kotatsu.settings.SettingsActivity
+import org.koitharu.kotatsu.settings.about.AppUpdateActivity
+import org.koitharu.kotatsu.settings.backup.BackupDialogFragment
+import org.koitharu.kotatsu.settings.backup.RestoreDialogFragment
+import org.koitharu.kotatsu.settings.reader.ReaderTapGridConfigActivity
+import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
+import org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity
+import org.koitharu.kotatsu.settings.storage.MangaDirectorySelectDialog
+import org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity
+import org.koitharu.kotatsu.settings.tracker.categories.TrackerCategoriesConfigSheet
+import org.koitharu.kotatsu.stats.ui.StatsActivity
+import org.koitharu.kotatsu.stats.ui.sheet.MangaStatsSheet
+import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
+import org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity
+
+class AppRouter private constructor(
+	private val activity: FragmentActivity?,
+	private val fragment: Fragment?,
+) {
+
+	constructor(activity: FragmentActivity) : this(activity, null)
+
+	constructor(fragment: Fragment) : this(null, fragment)
+
+	private val settings: AppSettings by lazy {
+		EntryPointAccessors.fromApplication<AppRouterEntryPoint>(checkNotNull(contextOrNull())).settings
+	}
+
+	/** Activities **/
+
+	fun openList(source: MangaSource, filter: MangaListFilter?, sortOrder: SortOrder?) {
+		startActivity(listIntent(contextOrNull() ?: return, source, filter, sortOrder))
+	}
+
+	fun openList(tag: MangaTag) = openList(tag.source, MangaListFilter(tags = setOf(tag)), null)
+
+	fun openSearch(query: String, kind: SearchKind = SearchKind.SIMPLE) {
+		startActivity(
+			Intent(contextOrNull() ?: return, SearchActivity::class.java)
+				.putExtra(KEY_QUERY, query)
+				.putExtra(KEY_KIND, kind),
+		)
+	}
+
+	fun openSearch(source: MangaSource, query: String) = openList(source, MangaListFilter(query = query), null)
+
+	fun openDetails(manga: Manga) {
+		startActivity(detailsIntent(contextOrNull() ?: return, manga))
+	}
+
+	fun openDetails(mangaId: Long) {
+		startActivity(detailsIntent(contextOrNull() ?: return, mangaId))
+	}
+
+	fun openDetails(link: Uri) {
+		startActivity(
+			Intent(contextOrNull() ?: return, DetailsActivity::class.java)
+				.setData(link),
+		)
+	}
+
+	fun openReader(manga: Manga, anchor: View? = null) {
+		openReader(
+			ReaderIntent.Builder(contextOrNull() ?: return)
+				.manga(manga)
+				.build(),
+			anchor,
+		)
+	}
+
+	fun openReader(intent: ReaderIntent, anchor: View? = null) {
+		startActivity(intent.intent, anchor?.let { view -> scaleUpActivityOptionsOf(view) })
+	}
+
+	fun openAlternatives(manga: Manga) {
+		startActivity(
+			Intent(contextOrNull() ?: return, AlternativesActivity::class.java)
+				.putExtra(KEY_MANGA, ParcelableManga(manga)),
+		)
+	}
+
+	fun openRelated(manga: Manga) {
+		startActivity(
+			Intent(contextOrNull(), RelatedMangaActivity::class.java)
+				.putExtra(KEY_MANGA, ParcelableManga(manga)),
+		)
+	}
+
+	fun openImage(url: String, source: MangaSource?, anchor: View? = null) {
+		startActivity(
+			Intent(contextOrNull(), ImageActivity::class.java)
+				.setData(url.toUri())
+				.putExtra(KEY_SOURCE, source?.name),
+			anchor?.let { scaleUpActivityOptionsOf(it) },
+		)
+	}
+
+	fun openBookmarks() = startActivity(AllBookmarksActivity::class.java)
+
+	fun openAppUpdate() = startActivity(AppUpdateActivity::class.java)
+
+	fun openSuggestions() {
+		startActivity(suggestionsIntent(contextOrNull() ?: return))
+	}
+
+	fun openSourcesCatalog() = startActivity(SourcesCatalogActivity::class.java)
+
+	fun openDownloads() = startActivity(DownloadsActivity::class.java)
+
+	fun openDirectoriesSettings() = startActivity(MangaDirectoriesActivity::class.java)
+
+	fun openBrowser(url: String, source: MangaSource?, title: String?) {
+		startActivity(
+			Intent(contextOrNull() ?: return, BrowserActivity::class.java)
+				.setData(url.toUri())
+				.putExtra(KEY_TITLE, title)
+				.putExtra(KEY_SOURCE, source?.name),
+		)
+	}
+
+	fun openColorFilterConfig(manga: Manga, page: MangaPage) {
+		startActivity(
+			Intent(contextOrNull(), ColorFilterConfigActivity::class.java)
+				.putExtra(KEY_MANGA, ParcelableManga(manga))
+				.putExtra(KEY_PAGES, ParcelableMangaPage(page)),
+		)
+	}
+
+	fun openHistory() = startActivity(HistoryActivity::class.java)
+
+	fun openFavorites() = startActivity(FavouritesActivity::class.java)
+
+	fun openFavorites(category: FavouriteCategory) {
+		startActivity(
+			Intent(contextOrNull() ?: return, FavouritesActivity::class.java)
+				.putExtra(KEY_ID, category.id)
+				.putExtra(KEY_TITLE, category.title),
+		)
+	}
+
+	fun openFavoriteCategories() = startActivity(FavouriteCategoriesActivity::class.java)
+
+	fun openFavoriteCategoryEdit(categoryId: Long) {
+		startActivity(
+			Intent(contextOrNull() ?: return, FavouritesCategoryEditActivity::class.java)
+				.putExtra(KEY_ID, categoryId),
+		)
+	}
+
+	fun openFavoriteCategoryCreate() = openFavoriteCategoryEdit(FavouritesCategoryEditActivity.NO_ID)
+
+	fun openMangaUpdates() {
+		startActivity(mangaUpdatesIntent(contextOrNull() ?: return))
+	}
+
+	fun openSettings() = startActivity(SettingsActivity::class.java)
+
+	fun openReaderSettings() {
+		startActivity(readerSettingsIntent(contextOrNull() ?: return))
+	}
+
+	fun openProxySettings() {
+		startActivity(proxySettingsIntent(contextOrNull() ?: return))
+	}
+
+	fun openDownloadsSetting() {
+		startActivity(downloadsSettingsIntent(contextOrNull() ?: return))
+	}
+
+	fun openSourceSettings(source: MangaSource) {
+		startActivity(sourceSettingsIntent(contextOrNull() ?: return, source))
+	}
+
+	fun openSuggestionsSettings() {
+		startActivity(suggestionsSettingsIntent(contextOrNull() ?: return))
+	}
+
+	fun openSourcesSettings() {
+		startActivity(sourcesSettingsIntent(contextOrNull() ?: return))
+	}
+
+	fun openReaderTapGridSettings() = startActivity(ReaderTapGridConfigActivity::class.java)
+
+	fun openScrobblerSettings(scrobbler: ScrobblerService) {
+		startActivity(
+			Intent(contextOrNull() ?: return, ScrobblerConfigActivity::class.java)
+				.putExtra(KEY_ID, scrobbler.id),
+		)
+	}
+
+	fun openSourceAuth(source: MangaSource) {
+		startActivity(sourceAuthIntent(contextOrNull() ?: return, source))
+	}
+
+	fun openManageSources() {
+		startActivity(
+			manageSourcesIntent(contextOrNull() ?: return),
+		)
+	}
+
+	fun openStatistic() = startActivity(StatsActivity::class.java)
+
+	@CheckResult
+	fun openExternalBrowser(url: String, chooserTitle: CharSequence? = null): Boolean {
+		val intent = Intent(Intent.ACTION_VIEW)
+		intent.data = url.toUriOrNull() ?: return false
+		return startActivitySafe(
+			if (!chooserTitle.isNullOrEmpty()) {
+				Intent.createChooser(intent, chooserTitle)
+			} else {
+				intent
+			},
+		)
+	}
+
+	@CheckResult
+	fun openSystemSyncSettings(account: Account): Boolean {
+		val args = Bundle(1)
+		args.putParcelable(ACCOUNT_KEY, account)
+		val intent = Intent(ACTION_ACCOUNT_SYNC_SETTINGS)
+		intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args)
+		return startActivitySafe(intent)
+	}
+
+	/** Dialogs **/
+
+	fun showDownloadDialog(manga: Manga, snackbarHost: View?) = showDownloadDialog(setOf(manga), snackbarHost)
+
+	fun showDownloadDialog(manga: Collection<Manga>, snackbarHost: View?) {
+		if (manga.isEmpty()) {
+			return
+		}
+		val fm = getFragmentManager() ?: return
+		if (snackbarHost != null) {
+			getLifecycleOwner()?.let { lifecycleOwner ->
+				DownloadDialogFragment.registerCallback(fm, lifecycleOwner, snackbarHost)
+			}
+		} else {
+			DownloadDialogFragment.unregisterCallback(fm)
+		}
+		DownloadDialogFragment().withArgs(1) {
+			putParcelableArray(KEY_MANGA, manga.mapToArray { ParcelableManga(it, withDescription = false) })
+		}.showDistinct()
+	}
+
+	fun showLocalInfoDialog(manga: Manga) {
+		LocalInfoDialog().withArgs(1) {
+			putParcelable(KEY_MANGA, ParcelableManga(manga))
+		}.showDistinct()
+	}
+
+	fun showDirectorySelectDialog() {
+		MangaDirectorySelectDialog().showDistinct()
+	}
+
+	fun showFavoriteDialog(manga: Manga) = showFavoriteDialog(setOf(manga))
+
+	fun showFavoriteDialog(manga: Collection<Manga>) {
+		if (manga.isEmpty()) {
+			return
+		}
+		FavoriteDialog().withArgs(1) {
+			putParcelableArrayList(
+				KEY_MANGA_LIST,
+				manga.mapTo(ArrayList(manga.size)) { ParcelableManga(it, withDescription = false) },
+			)
+		}.showDistinct()
+	}
+
+	fun showTagDialog(tag: MangaTag) {
+		buildAlertDialog(contextOrNull() ?: return) {
+			setTitle(tag.title)
+			setItems(
+				arrayOf(
+					context.getString(R.string.search_on_s, tag.source.getTitle(context)),
+					context.getString(R.string.search_everywhere),
+				),
+			) { _, which ->
+				when (which) {
+					0 -> openList(tag)
+					1 -> openSearch(tag.title, SearchKind.TAG)
+				}
+			}
+			setNegativeButton(R.string.close, null)
+			setCancelable(true)
+		}.show()
+	}
+
+	fun showErrorDialog(error: Throwable, url: String? = null) {
+		ErrorDetailsDialog().withArgs(2) {
+			putSerializable(KEY_ERROR, error)
+			putString(KEY_URL, url)
+		}.show()
+	}
+
+	fun showBackupRestoreDialog(fileUri: Uri) {
+		RestoreDialogFragment().withArgs(1) {
+			putString(KEY_FILE, fileUri.toString())
+		}.show()
+	}
+
+	fun showBackupCreateDialog() {
+		BackupDialogFragment().show()
+	}
+
+	fun showImportDialog() {
+		ImportDialogFragment().showDistinct()
+	}
+
+	fun showFilterSheet(): Boolean = if (isFilterSupported()) {
+		FilterSheetFragment().showDistinct()
+	} else {
+		false
+	}
+
+	fun showTagsCatalogSheet(excludeMode: Boolean) {
+		if (!isFilterSupported()) {
+			return
+		}
+		TagsCatalogSheet().withArgs(1) {
+			putBoolean(KEY_EXCLUDE, excludeMode)
+		}.showDistinct()
+	}
+
+	fun showListConfigSheet(section: ListConfigSection) {
+		ListConfigBottomSheet().withArgs(1) {
+			putParcelable(KEY_LIST_SECTION, section)
+		}.showDistinct()
+	}
+
+	fun showStatisticSheet(manga: Manga) {
+		MangaStatsSheet().withArgs(1) {
+			putParcelable(KEY_MANGA, ParcelableManga(manga))
+		}.showDistinct()
+	}
+
+	fun showReaderConfigSheet(mode: ReaderMode) {
+		ReaderConfigSheet().withArgs(1) {
+			putInt(KEY_READER_MODE, mode.id)
+		}.showDistinct()
+	}
+
+	fun showWelcomeSheet() {
+		WelcomeSheet().showDistinct()
+	}
+
+	fun showChapterPagesSheet() {
+		ChaptersPagesSheet().showDistinct()
+	}
+
+	fun showChapterPagesSheet(defaultTab: Int) {
+		ChaptersPagesSheet().withArgs(1) {
+			putInt(KEY_TAB, defaultTab)
+		}.showDistinct()
+	}
+
+	fun showScrobblingSelectorSheet(manga: Manga, scrobblerService: ScrobblerService?) {
+		ScrobblingSelectorSheet().withArgs(2) {
+			putParcelable(KEY_MANGA, ParcelableManga(manga))
+			if (scrobblerService != null) {
+				putInt(KEY_ID, scrobblerService.id)
+			}
+		}.show()
+	}
+
+	fun showScrobblingInfoSheet(index: Int) {
+		ScrobblingInfoSheet().withArgs(1) {
+			putInt(KEY_INDEX, index)
+		}.showDistinct()
+	}
+
+	fun showTrackerCategoriesConfigSheet() {
+		TrackerCategoriesConfigSheet().showDistinct()
+	}
+
+	fun askForDownloadOverMeteredNetwork(onConfirmed: (allow: Boolean) -> Unit) {
+		val context = contextOrNull() ?: return
+		when (settings.allowDownloadOnMeteredNetwork) {
+			TriStateOption.ENABLED -> onConfirmed(true)
+			TriStateOption.DISABLED -> onConfirmed(false)
+			TriStateOption.ASK -> {
+				if (!context.connectivityManager.isActiveNetworkMetered) {
+					onConfirmed(true)
+					return
+				}
+				val listener = DialogInterface.OnClickListener { _, which ->
+					when (which) {
+						DialogInterface.BUTTON_POSITIVE -> {
+							settings.allowDownloadOnMeteredNetwork = TriStateOption.ENABLED
+							onConfirmed(true)
+						}
+
+						DialogInterface.BUTTON_NEUTRAL -> {
+							onConfirmed(true)
+						}
+
+						DialogInterface.BUTTON_NEGATIVE -> {
+							settings.allowDownloadOnMeteredNetwork = TriStateOption.DISABLED
+							onConfirmed(false)
+						}
+					}
+				}
+				BigButtonsAlertDialog.Builder(context)
+					.setIcon(R.drawable.ic_network_cellular)
+					.setTitle(R.string.download_cellular_confirm)
+					.setPositiveButton(R.string.allow_always, listener)
+					.setNeutralButton(R.string.allow_once, listener)
+					.setNegativeButton(R.string.dont_allow, listener)
+					.create()
+					.show()
+			}
+		}
+	}
+
+	/** Public utils **/
+
+	fun isFilterSupported(): Boolean = when {
+		fragment != null -> fragment.activity is FilterCoordinator.Owner
+		activity != null -> activity is FilterCoordinator.Owner
+		else -> false
+	}
+
+	fun isChapterPagesSheetShown(): Boolean {
+		val sheet = getFragmentManager()?.findFragmentByTag(fragmentTag<ChaptersPagesSheet>()) as? ChaptersPagesSheet
+		return sheet?.dialog?.isShowing == true
+	}
+
+	fun closeWelcomeSheet(): Boolean {
+		val tag = fragmentTag<WelcomeSheet>()
+		val sheet = fragment?.findFragmentByTagRecursive(tag)
+			?: activity?.supportFragmentManager?.findFragmentByTag(tag)
+			?: return false
+		return if (sheet is WelcomeSheet) {
+			sheet.dismissAllowingStateLoss()
+			true
+		} else {
+			false
+		}
+	}
+
+	/** Private utils **/
+
+	private fun startActivity(intent: Intent, options: Bundle? = null) {
+		fragment?.startActivity(intent, options)
+			?: activity?.startActivity(intent, options)
+	}
+
+	private fun startActivitySafe(intent: Intent): Boolean = try {
+		startActivity(intent)
+		true
+	} catch (_: ActivityNotFoundException) {
+		false
+	}
+
+	private fun startActivity(activityClass: Class<out Activity>) {
+		startActivity(Intent(contextOrNull() ?: return, activityClass))
+	}
+
+	private fun getFragmentManager(): FragmentManager? {
+		return fragment?.childFragmentManager ?: activity?.supportFragmentManager
+	}
+
+	@UiContext
+	private fun contextOrNull(): Context? = activity ?: fragment?.context
+
+	private fun getLifecycleOwner(): LifecycleOwner? = activity ?: fragment?.viewLifecycleOwner
+
+	private fun DialogFragment.showDistinct(): Boolean {
+		val fm = this@AppRouter.getFragmentManager() ?: return false
+		val tag = javaClass.fragmentTag()
+		val existing = fm.findFragmentByTag(tag) as? DialogFragment?
+		if (existing != null && existing.isVisible && existing.arguments == this.arguments) {
+			return false
+		}
+		show(fm, tag)
+		return true
+	}
+
+	private fun DialogFragment.show() {
+		show(
+			this@AppRouter.getFragmentManager() ?: return,
+			javaClass.fragmentTag(),
+		)
+	}
+
+	private fun Fragment.findFragmentByTagRecursive(fragmentTag: String): Fragment? {
+		childFragmentManager.findFragmentByTag(fragmentTag)?.let {
+			return it
+		}
+		val parent = parentFragment
+		return if (parent != null) {
+			parent.findFragmentByTagRecursive(fragmentTag)
+		} else {
+			parentFragmentManager.findFragmentByTag(fragmentTag)
+		}
+	}
+
+	companion object {
+
+		fun from(view: View): AppRouter? = runCatching {
+			AppRouter(view.findFragment<Fragment>())
+		}.getOrElse {
+			(view.context.findActivity() as? FragmentActivity)?.let(::AppRouter)
+		}
+
+		fun detailsIntent(context: Context, manga: Manga) = Intent(context, DetailsActivity::class.java)
+			.putExtra(KEY_MANGA, ParcelableManga(manga))
+
+		fun detailsIntent(context: Context, mangaId: Long) = Intent(context, DetailsActivity::class.java)
+			.putExtra(KEY_ID, mangaId)
+
+		fun listIntent(context: Context, source: MangaSource, filter: MangaListFilter?, sortOrder: SortOrder?): Intent =
+			Intent(context, MangaListActivity::class.java)
+				.setAction(ACTION_MANGA_EXPLORE)
+				.putExtra(KEY_SOURCE, source.name)
+				.apply {
+					if (!filter.isNullOrEmpty()) {
+						putExtra(KEY_FILTER, ParcelableMangaListFilter(filter))
+					}
+					if (sortOrder != null) {
+						putExtra(KEY_SORT_ORDER, sortOrder)
+					}
+				}
+
+		fun cloudFlareResolveIntent(context: Context, exception: CloudFlareProtectedException): Intent =
+			Intent(context, CloudFlareActivity::class.java).apply {
+				data = exception.url.toUri()
+				putExtra(KEY_SOURCE, exception.source?.name)
+				exception.headers[CommonHeaders.USER_AGENT]?.let {
+					putExtra(KEY_USER_AGENT, it)
+				}
+			}
+
+		fun suggestionsIntent(context: Context) = Intent(context, SuggestionsActivity::class.java)
+
+		fun homeIntent(context: Context) = Intent(context, MainActivity::class.java)
+
+		fun mangaUpdatesIntent(context: Context) = Intent(context, UpdatesActivity::class.java)
+
+		fun readerSettingsIntent(context: Context) =
+			Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_READER)
+
+		fun suggestionsSettingsIntent(context: Context) =
+			Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_SUGGESTIONS)
+
+		fun trackerSettingsIntent(context: Context) =
+			Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_TRACKER)
+
+		fun proxySettingsIntent(context: Context) =
+			Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_PROXY)
+
+		fun historySettingsIntent(context: Context) =
+			Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_HISTORY)
+
+		fun sourcesSettingsIntent(context: Context) =
+			Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_SOURCES)
+
+		fun manageSourcesIntent(context: Context) =
+			Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_MANAGE_SOURCES)
+
+		fun downloadsSettingsIntent(context: Context) =
+			Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_MANAGE_DOWNLOADS)
+
+		fun sourceSettingsIntent(context: Context, source: MangaSource): Intent = when (source) {
+			is MangaSourceInfo -> sourceSettingsIntent(context, source.mangaSource)
+			is ExternalMangaSource -> Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+				.setData(Uri.fromParts("package", source.packageName, null))
+
+			else -> Intent(context, SettingsActivity::class.java)
+				.setAction(ACTION_SOURCE)
+				.putExtra(KEY_SOURCE, source.name)
+		}
+
+		fun sourceAuthIntent(context: Context, source: MangaSource): Intent {
+			return Intent(context, SourceAuthActivity::class.java)
+				.putExtra(KEY_SOURCE, source.name)
+		}
+
+		const val KEY_DATA = "data"
+		const val KEY_ENTRIES = "entries"
+		const val KEY_ERROR = "error"
+		const val KEY_EXCLUDE = "exclude"
+		const val KEY_FILE = "file"
+		const val KEY_FILTER = "filter"
+		const val KEY_ID = "id"
+		const val KEY_INDEX = "index"
+		const val KEY_KIND = "kind"
+		const val KEY_LIST_SECTION = "list_section"
+		const val KEY_MANGA = "manga"
+		const val KEY_MANGA_LIST = "manga_list"
+		const val KEY_PAGES = "pages"
+		const val KEY_QUERY = "query"
+		const val KEY_READER_MODE = "reader_mode"
+		const val KEY_SORT_ORDER = "sort_order"
+		const val KEY_SOURCE = "source"
+		const val KEY_TAB = "tab"
+		const val KEY_TITLE = "title"
+		const val KEY_URL = "url"
+		const val KEY_USER_AGENT = "user_agent"
+
+		const val ACTION_HISTORY = "${BuildConfig.APPLICATION_ID}.action.MANAGE_HISTORY"
+		const val ACTION_MANAGE_DOWNLOADS = "${BuildConfig.APPLICATION_ID}.action.MANAGE_DOWNLOADS"
+		const val ACTION_MANAGE_SOURCES = "${BuildConfig.APPLICATION_ID}.action.MANAGE_SOURCES_LIST"
+		const val ACTION_MANGA_EXPLORE = "${BuildConfig.APPLICATION_ID}.action.EXPLORE_MANGA"
+		const val ACTION_PROXY = "${BuildConfig.APPLICATION_ID}.action.MANAGE_PROXY"
+		const val ACTION_READER = "${BuildConfig.APPLICATION_ID}.action.MANAGE_READER_SETTINGS"
+		const val ACTION_SOURCE = "${BuildConfig.APPLICATION_ID}.action.MANAGE_SOURCE_SETTINGS"
+		const val ACTION_SOURCES = "${BuildConfig.APPLICATION_ID}.action.MANAGE_SOURCES"
+		const val ACTION_SUGGESTIONS = "${BuildConfig.APPLICATION_ID}.action.MANAGE_SUGGESTIONS"
+		const val ACTION_TRACKER = "${BuildConfig.APPLICATION_ID}.action.MANAGE_TRACKER"
+
+		private const val ACCOUNT_KEY = "account"
+		private const val ACTION_ACCOUNT_SYNC_SETTINGS = "android.settings.ACCOUNT_SYNC_SETTINGS"
+		private const val EXTRA_SHOW_FRAGMENT_ARGUMENTS = ":settings:show_fragment_args"
+
+		private fun Class<out Fragment>.fragmentTag() = name // TODO
+
+		private inline fun <reified F : Fragment> fragmentTag() = F::class.java.fragmentTag()
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouterEntryPoint.kt

@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core.nav
+
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.koitharu.kotatsu.core.prefs.AppSettings
+
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface AppRouterEntryPoint {
+
+	val settings: AppSettings
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/nav/MangaIntent.kt

@@ -1,11 +1,12 @@
-package org.koitharu.kotatsu.core.parser
+package org.koitharu.kotatsu.core.nav
 
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.lifecycle.SavedStateHandle
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.nav.AppRouter.Companion.KEY_ID
+import org.koitharu.kotatsu.core.nav.AppRouter.Companion.KEY_MANGA
 import org.koitharu.kotatsu.core.util.ext.getParcelableCompat
 import org.koitharu.kotatsu.core.util.ext.getParcelableExtraCompat
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -25,7 +26,7 @@ class MangaIntent private constructor(
 	constructor(savedStateHandle: SavedStateHandle) : this(
 		manga = savedStateHandle.get<ParcelableManga>(KEY_MANGA)?.manga,
 		id = savedStateHandle[KEY_ID] ?: ID_NONE,
-		uri = savedStateHandle[BaseActivity.EXTRA_DATA],
+		uri = savedStateHandle[AppRouter.KEY_DATA],
 	)
 
 	constructor(args: Bundle?) : this(
@@ -41,9 +42,6 @@ class MangaIntent private constructor(
 
 		const val ID_NONE = 0L
 
-		const val KEY_MANGA = "manga"
-		const val KEY_ID = "id"
-
 		fun of(manga: Manga) = MangaIntent(manga, manga.id, null)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/nav/NavUtil.kt

@@ -0,0 +1,39 @@
+package org.koitharu.kotatsu.core.nav
+
+import android.app.ActivityOptions
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
+
+inline val FragmentActivity.router: AppRouter
+	get() = AppRouter(this)
+
+inline val Fragment.router: AppRouter
+	get() = AppRouter(this)
+
+tailrec fun Fragment.dismissParentDialog(): Boolean {
+	return when (val parent = parentFragment) {
+		null -> return false
+		is DialogFragment -> {
+			parent.dismiss()
+			true
+		}
+
+		else -> parent.dismissParentDialog()
+	}
+}
+
+fun scaleUpActivityOptionsOf(view: View): Bundle? = if (view.context.isAnimationsEnabled) {
+	ActivityOptions.makeScaleUpAnimation(
+		view,
+		0,
+		0,
+		view.width,
+		view.height,
+	).toBundle()
+} else {
+	null
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/nav/ReaderIntent.kt

@@ -0,0 +1,61 @@
+package org.koitharu.kotatsu.core.nav
+
+import android.content.Context
+import android.content.Intent
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.reader.ui.ReaderState
+
+@JvmInline
+value class ReaderIntent private constructor(
+	val intent: Intent,
+) {
+
+	class Builder(context: Context) {
+
+		private val intent = Intent(context, ReaderActivity::class.java)
+			.setAction(ACTION_MANGA_READ)
+
+		fun manga(manga: Manga) = apply {
+			intent.putExtra(AppRouter.KEY_MANGA, ParcelableManga(manga))
+		}
+
+		fun mangaId(mangaId: Long) = apply {
+			intent.putExtra(AppRouter.KEY_ID, mangaId)
+		}
+
+		fun incognito(incognito: Boolean) = apply {
+			intent.putExtra(EXTRA_INCOGNITO, incognito)
+		}
+
+		fun branch(branch: String?) = apply {
+			intent.putExtra(EXTRA_BRANCH, branch)
+		}
+
+		fun state(state: ReaderState?) = apply {
+			intent.putExtra(EXTRA_STATE, state)
+		}
+
+		fun bookmark(bookmark: Bookmark) = manga(
+			bookmark.manga,
+		).state(
+			ReaderState(
+				chapterId = bookmark.chapterId,
+				page = bookmark.page,
+				scroll = bookmark.scroll,
+			),
+		)
+
+		fun build() = ReaderIntent(intent)
+	}
+
+	companion object {
+		const val ACTION_MANGA_READ = "${BuildConfig.APPLICATION_ID}.action.READ_MANGA"
+		const val EXTRA_STATE = "state"
+		const val EXTRA_BRANCH = "branch"
+		const val EXTRA_INCOGNITO = "incognito"
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManager.kt

@@ -23,6 +23,8 @@ import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.TABLE_HISTORY
 import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.nav.ReaderIntent
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -36,8 +38,6 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.search.ui.MangaListActivity
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -155,9 +155,10 @@ class AppShortcutManager @Inject constructor(
 			.setIcon(icon)
 			.setLongLived(true)
 			.setIntent(
-				ReaderActivity.IntentBuilder(context)
+				ReaderIntent.Builder(context)
 					.mangaId(manga.id)
-					.build(),
+					.build()
+					.intent,
 			)
 			.build()
 	}
@@ -181,7 +182,7 @@ class AppShortcutManager @Inject constructor(
 			.setLongLabel(title)
 			.setIcon(icon)
 			.setLongLived(true)
-			.setIntent(MangaListActivity.newIntent(context, source, null))
+			.setIntent(AppRouter.listIntent(context, source, null, null))
 			.build()
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppValidator.kt

@@ -1,9 +1,12 @@
 package org.koitharu.kotatsu.core.os
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.content.pm.PackageInfoCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -11,8 +14,8 @@ import javax.inject.Singleton
 class AppValidator @Inject constructor(
 	@ApplicationContext private val context: Context,
 ) {
-	@Suppress("NewApi")
-	val isOriginalApp by lazy {
+	@SuppressLint("InlinedApi")
+	val isOriginalApp = suspendLazy(Dispatchers.Default) {
 		val certificates = mapOf(CERT_SHA256.hexToByteArray() to PackageManager.CERT_INPUT_SHA256)
 		PackageInfoCompat.hasSignatures(context.packageManager, context.packageName, certificates, false)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/os/NetworkState.kt

@@ -69,7 +69,7 @@ class NetworkState(
 				return true
 			}
 			return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-				activeNetwork?.let { isOnline(it) } ?: false
+				activeNetwork?.let { isOnline(it) } == true
 			} else {
 				@Suppress("DEPRECATION")
 				activeNetworkInfo?.isConnected == true

app/src/main/kotlin/org/koitharu/kotatsu/core/os/OpenDocumentTreeHelper.kt

@@ -0,0 +1,92 @@
+package org.koitharu.kotatsu.core.os
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.storage.StorageManager
+import android.provider.DocumentsContract
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.ActivityResultCaller
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.core.app.ActivityOptionsCompat
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+
+// https://stackoverflow.com/questions/77555641/saf-no-activity-found-to-handle-intent-android-intent-action-open-document-tr
+class OpenDocumentTreeHelper(
+	activityResultCaller: ActivityResultCaller,
+	flags: Int,
+	callback: ActivityResultCallback<Uri?>
+) : ActivityResultLauncher<Uri?>() {
+
+	constructor(activityResultCaller: ActivityResultCaller, callback: ActivityResultCallback<Uri?>) : this(
+		activityResultCaller,
+		0,
+		callback,
+	)
+
+	private val pickFileTreeLauncherQ = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		activityResultCaller.registerForActivityResult(OpenDocumentTreeContractQ(flags), callback)
+	} else {
+		null
+	}
+	private val pickFileTreeLauncherLegacy = activityResultCaller.registerForActivityResult(
+		contract = OpenDocumentTreeContractLegacy(flags),
+		callback = callback,
+	)
+
+	override fun launch(input: Uri?, options: ActivityOptionsCompat?) {
+		if (pickFileTreeLauncherQ == null) {
+			pickFileTreeLauncherLegacy.launch(input, options)
+			return
+		}
+		try {
+			pickFileTreeLauncherQ.launch(input, options)
+		} catch (e: Exception) {
+			e.printStackTraceDebug()
+			pickFileTreeLauncherLegacy.launch(input, options)
+		}
+	}
+
+	override fun unregister() {
+		pickFileTreeLauncherQ?.unregister()
+		pickFileTreeLauncherLegacy.unregister()
+	}
+
+	override val contract: ActivityResultContract<Uri?, *>
+		get() = pickFileTreeLauncherQ?.contract ?: pickFileTreeLauncherLegacy.contract
+
+	private open class OpenDocumentTreeContractLegacy(
+		private val flags: Int,
+	) : ActivityResultContracts.OpenDocumentTree() {
+
+		override fun createIntent(context: Context, input: Uri?): Intent {
+			val intent = super.createIntent(context, input)
+			intent.addFlags(flags)
+			return intent
+		}
+	}
+
+	@RequiresApi(Build.VERSION_CODES.Q)
+	private class OpenDocumentTreeContractQ(
+		private val flags: Int,
+	) : OpenDocumentTreeContractLegacy(flags) {
+
+		override fun createIntent(context: Context, input: Uri?): Intent {
+			val intent = (context.getSystemService(Context.STORAGE_SERVICE) as? StorageManager)
+				?.primaryStorageVolume
+				?.createOpenDocumentTreeIntent()
+			if (intent == null) { // fallback
+				return super.createIntent(context, input)
+			}
+			intent.addFlags(flags)
+			if (input != null) {
+				intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, input)
+			}
+			return intent
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/os/RomCompat.kt

@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.core.os
+
+import kotlinx.coroutines.Dispatchers
+import org.jetbrains.annotations.Blocking
+import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy
+import java.io.InputStreamReader
+
+object RomCompat {
+
+	val isMiui = suspendLazy<Boolean>(Dispatchers.IO) {
+		getProp("ro.miui.ui.version.name").isNotEmpty()
+	}
+
+	@Blocking
+	private fun getProp(propName: String) = Runtime.getRuntime().exec("getprop $propName").inputStream.use {
+		it.reader().use(InputStreamReader::readText).trim()
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt

@@ -14,6 +14,8 @@ import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.nav.MangaIntent
+import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.ext.toFileOrNull
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -27,6 +29,7 @@ import javax.inject.Provider
 class MangaDataRepository @Inject constructor(
 	private val db: MangaDatabase,
 	private val resolverProvider: Provider<MangaLinkResolver>,
+	private val appShortcutManagerProvider: Provider<AppShortcutManager>,
 ) {
 
 	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
@@ -45,8 +48,8 @@ class MangaDataRepository @Inject constructor(
 				entity.copy(
 					cfBrightness = colorFilter?.brightness ?: 0f,
 					cfContrast = colorFilter?.contrast ?: 0f,
-					cfInvert = colorFilter?.isInverted ?: false,
-					cfGrayscale = colorFilter?.isGrayscale ?: false,
+					cfInvert = colorFilter?.isInverted == true,
+					cfGrayscale = colorFilter?.isGrayscale == true,
 				),
 			)
 		}
@@ -70,8 +73,13 @@ class MangaDataRepository @Inject constructor(
 			.distinctUntilChanged()
 	}
 
-	suspend fun findMangaById(mangaId: Long): Manga? {
-		return db.getMangaDao().find(mangaId)?.toManga()
+	suspend fun findMangaById(mangaId: Long, withChapters: Boolean): Manga? {
+		val chapters = if (withChapters) {
+			db.getChaptersDao().findAll(mangaId).takeUnless { it.isEmpty() }
+		} else {
+			null
+		}
+		return db.getMangaDao().find(mangaId)?.toManga(chapters)
 	}
 
 	suspend fun findMangaByPublicUrl(publicUrl: String): Manga? {
@@ -80,7 +88,7 @@ class MangaDataRepository @Inject constructor(
 
 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
 		intent.manga != null -> intent.manga
-		intent.mangaId != 0L -> findMangaById(intent.mangaId)
+		intent.mangaId != 0L -> findMangaById(intent.mangaId, true)
 		intent.uri != null -> resolverProvider.get().resolve(intent.uri)
 		else -> null
 	}
@@ -97,10 +105,26 @@ class MangaDataRepository @Inject constructor(
 				val tags = manga.tags.toEntities()
 				db.getTagsDao().upsert(tags)
 				db.getMangaDao().upsert(manga.toEntity(), tags)
+				if (!manga.isLocal) {
+					manga.chapters?.let { chapters ->
+						db.getChaptersDao().replaceAll(manga.id, chapters.withIndex().toEntities(manga.id))
+					}
+				}
 			}
 		}
 	}
 
+	suspend fun updateChapters(manga: Manga) {
+		val chapters = manga.chapters
+		if (!chapters.isNullOrEmpty() && manga.id in db.getMangaDao()) {
+			db.getChaptersDao().replaceAll(manga.id, chapters.withIndex().toEntities(manga.id))
+		}
+	}
+
+	suspend fun gcChaptersCache() {
+		db.getChaptersDao().gc()
+	}
+
 	suspend fun findTags(source: MangaSource): Set<MangaTag> {
 		return db.getTagsDao().findTags(source.name).toMangaTags()
 	}
@@ -114,6 +138,14 @@ class MangaDataRepository @Inject constructor(
 		}
 	}
 
+	suspend fun cleanupDatabase() {
+		db.withTransaction {
+			gcChaptersCache()
+			val idsFromShortcuts = appShortcutManagerProvider.get().getMangaShortcuts()
+			db.getMangaDao().cleanup(idsFromShortcuts)
+		}
+	}
+
 	private fun MangaPrefsEntity.getColorFilterOrNull(): ReaderColorFilter? {
 		return if (cfBrightness != 0f || cfContrast != 0f || cfInvert || cfGrayscale) {
 			ReaderColorFilter(cfBrightness, cfContrast, cfInvert, cfGrayscale)

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLinkResolver.kt

@@ -6,6 +6,7 @@ import dagger.Reusable
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.UnknownMangaSource
 import org.koitharu.kotatsu.core.model.isNsfw
+import org.koitharu.kotatsu.core.util.ext.isHttpUrl
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -109,4 +110,11 @@ class MangaLinkResolver @Inject constructor(
 		chapters = null,
 		source = source,
 	)
+
+	companion object {
+
+		fun isValidLink(str: String): Boolean {
+			return str.isHttpUrl() || str.startsWith("kotatsu://", ignoreCase = true)
+		}
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt

@@ -23,6 +23,7 @@ import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.sanitizeHeaderValue
 import org.koitharu.kotatsu.core.util.ext.toList
+import org.koitharu.kotatsu.core.util.ext.toMimeType
 import org.koitharu.kotatsu.core.util.ext.use
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.bitmap.Bitmap
@@ -78,13 +79,14 @@ class MangaLoaderContextImpl @Inject constructor(
 
 	override fun redrawImageResponse(response: Response, redraw: (image: Bitmap) -> Bitmap): Response {
 		return response.map { body ->
-			BitmapDecoderCompat.decode(body.byteStream(), body.contentType(), isMutable = true).use { bitmap ->
-				(redraw(BitmapWrapper.create(bitmap)) as BitmapWrapper).use { result ->
-					Buffer().also {
-						result.compressTo(it.outputStream())
-					}.asResponseBody("image/jpeg".toMediaType())
+			BitmapDecoderCompat.decode(body.byteStream(), body.contentType()?.toMimeType(), isMutable = true)
+				.use { bitmap ->
+					(redraw(BitmapWrapper.create(bitmap)) as BitmapWrapper).use { result ->
+						Buffer().also {
+							result.compressTo(it.outputStream())
+						}.asResponseBody("image/jpeg".toMediaType())
+					}
 				}
-			}
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt

@@ -42,7 +42,7 @@ class ExternalMangaRepository(
 
 	override var defaultSortOrder: SortOrder
 		get() = capabilities?.availableSortOrders?.firstOrNull() ?: SortOrder.ALPHABETICAL
-		set(_) = Unit
+		set(value) = Unit
 
 	override suspend fun getFilterOptions(): MangaListFilterOptions = filterOptions.get()
 

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt

@@ -15,12 +15,13 @@ import androidx.core.os.LocaleListCompat
 import androidx.documentfile.provider.DocumentFile
 import androidx.preference.PreferenceManager
 import dagger.hilt.android.qualifiers.ApplicationContext
-import org.json.JSONArray
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.network.DoHProvider
 import org.koitharu.kotatsu.core.util.ext.connectivityManager
 import org.koitharu.kotatsu.core.util.ext.getEnumValue
 import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.putAll
 import org.koitharu.kotatsu.core.util.ext.putEnumValue
 import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
@@ -44,6 +45,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 
 	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
 	private val connectivityManager = context.connectivityManager
+	private val mangaListBadgesDefault = ArraySet(context.resources.getStringArray(R.array.values_list_badges))
 
 	var listMode: ListMode
 		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.GRID)
@@ -141,6 +143,11 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isReaderOptimizationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_OPTIMIZE, false)
 
+	val readerControls: Set<ReaderControl>
+		get() = prefs.getStringSet(KEY_READER_CONTROLS, null)?.mapNotNullTo(EnumSet.noneOf(ReaderControl::class.java)) {
+			ReaderControl.entries.find(it)
+		} ?: ReaderControl.DEFAULT
+
 	val isOfflineCheckDisabled: Boolean
 		get() = prefs.getBoolean(KEY_OFFLINE_DISABLED, false)
 
@@ -299,6 +306,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getInt(KEY_SOURCES_VERSION, 0)
 		set(value) = prefs.edit { putInt(KEY_SOURCES_VERSION, value) }
 
+	var isAllSourcesEnabled: Boolean
+		get() = prefs.getBoolean(KEY_SOURCES_ENABLED_ALL, false)
+		set(value) = prefs.edit { putBoolean(KEY_SOURCES_ENABLED_ALL, value) }
+
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
 
@@ -363,8 +374,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isReaderBarEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_BAR, true)
 
-	val isReaderSliderEnabled: Boolean
-		get() = prefs.getBoolean(KEY_READER_SLIDER, true)
+	val isReaderBarTransparent: Boolean
+		get() = prefs.getBoolean(KEY_READER_BAR_TRANSPARENT, true)
 
 	val isReaderKeepScreenOn: Boolean
 		get() = prefs.getBoolean(KEY_READER_SCREEN_ON, true)
@@ -489,6 +500,12 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getString(KEY_BACKUP_PERIODICAL_OUTPUT, null)?.toUriOrNull()
 		set(value) = prefs.edit { putString(KEY_BACKUP_PERIODICAL_OUTPUT, value?.toString()) }
 
+	val isBackupTelegramUploadEnabled: Boolean
+		get() = prefs.getBoolean(KEY_BACKUP_TG_ENABLED, false)
+
+	val backupTelegramChatId: String?
+		get() = prefs.getString(KEY_BACKUP_TG_CHAT, null)?.nullIfEmpty()
+
 	val isReadingTimeEstimationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READING_TIME, true)
 
@@ -531,6 +548,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		prefs.edit { putString(KEY_PAGES_SAVE_DIR, uri?.toString()) }
 	}
 
+	fun getMangaListBadges(): Int {
+		val raw = prefs.getStringSet(KEY_MANGA_LIST_BADGES, mangaListBadgesDefault).orEmpty()
+		var result = 0
+		for (item in raw) {
+			result = result or item.toInt()
+		}
+		return result
+	}
+
 	fun subscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
 		prefs.registerOnSharedPreferenceChangeListener(listener)
 	}
@@ -543,20 +569,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 
 	fun getAllValues(): Map<String, *> = prefs.all
 
-	fun upsertAll(m: Map<String, *>) {
-		prefs.edit {
-			m.forEach { e ->
-				when (val v = e.value) {
-					is Boolean -> putBoolean(e.key, v)
-					is Int -> putInt(e.key, v)
-					is Long -> putLong(e.key, v)
-					is Float -> putFloat(e.key, v)
-					is String -> putString(e.key, v)
-					is JSONArray -> putStringSet(e.key, v.toStringSet())
-				}
-			}
-		}
-	}
+	fun upsertAll(m: Map<String, *>) = prefs.edit { putAll(m) }
 
 	private fun isBackgroundNetworkRestricted(): Boolean {
 		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -566,15 +579,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		}
 	}
 
-	private fun JSONArray.toStringSet(): Set<String> {
-		val len = length()
-		val result = ArraySet<String>(len)
-		for (i in 0 until len) {
-			result.add(getString(i))
-		}
-		return result
-	}
-
 	companion object {
 
 		const val TRACK_HISTORY = "history"
@@ -621,6 +625,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_NOTIFICATIONS_LIGHT = "notifications_light"
 		const val KEY_NOTIFICATIONS_INFO = "tracker_notifications_info"
 		const val KEY_READER_ANIMATION = "reader_animation2"
+		const val KEY_READER_CONTROLS = "reader_controls"
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_READER_CROP = "reader_crop"
@@ -664,7 +669,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SYNC = "sync"
 		const val KEY_SYNC_SETTINGS = "sync_settings"
 		const val KEY_READER_BAR = "reader_bar"
-		const val KEY_READER_SLIDER = "reader_slider"
+		const val KEY_READER_BAR_TRANSPARENT = "reader_bar_transparent"
 		const val KEY_READER_BACKGROUND = "reader_background"
 		const val KEY_READER_SCREEN_ON = "reader_screen_on"
 		const val KEY_SHORTCUTS = "dynamic_shortcuts"
@@ -715,13 +720,16 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_FEED_HEADER = "feed_header"
 		const val KEY_SEARCH_SUGGESTION_TYPES = "search_suggest_types"
 		const val KEY_SOURCES_VERSION = "sources_version"
+		const val KEY_SOURCES_ENABLED_ALL = "sources_enabled_all"
 		const val KEY_QUICK_FILTER = "quick_filter"
+		const val KEY_BACKUP_TG_ENABLED = "backup_periodic_tg_enabled"
+		const val KEY_BACKUP_TG_CHAT = "backup_periodic_tg_chat_id"
+		const val KEY_MANGA_LIST_BADGES = "manga_list_badges"
 
 		// keys for non-persistent preferences
 		const val KEY_APP_VERSION = "app_version"
 		const val KEY_IGNORE_DOZE = "ignore_dose"
 		const val KEY_TRACKER_DEBUG = "tracker_debug"
-		const val KEY_APP_UPDATE = "app_update"
 		const val KEY_LINK_WEBLATE = "about_app_translation"
 		const val KEY_LINK_TELEGRAM = "about_telegram"
 		const val KEY_LINK_GITHUB = "about_github"
@@ -729,6 +737,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PROXY_TEST = "proxy_test"
 		const val KEY_OPEN_BROWSER = "open_browser"
 		const val KEY_HANDLE_LINKS = "handle_links"
+		const val KEY_BACKUP_TG_OPEN = "backup_periodic_tg_open"
+		const val KEY_BACKUP_TG_TEST = "backup_periodic_tg_test"
+		const val KEY_CLEAR_MANGA_DATA = "manga_data_clear"
+		const val KEY_STORAGE_USAGE = "storage_usage"
 
 		// old keys are for migration only
 		private const val KEY_IMAGES_PROXY_OLD = "images_proxy"

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderBackground.kt

@@ -1,11 +1,13 @@
 package org.koitharu.kotatsu.core.prefs
 
 import android.content.Context
+import android.graphics.drawable.Drawable
 import android.view.ContextThemeWrapper
 import androidx.annotation.Keep
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
 import org.koitharu.kotatsu.core.util.ext.getThemeDrawable
+import org.koitharu.kotatsu.core.util.ext.isNightMode
 import com.google.android.material.R as materialR
 
 @Keep
@@ -13,7 +15,7 @@ enum class ReaderBackground {
 
 	DEFAULT, LIGHT, DARK, WHITE, BLACK;
 
-	fun resolve(context: Context) = when (this) {
+	fun resolve(context: Context): Drawable? = when (this) {
 		DEFAULT -> context.getThemeDrawable(android.R.attr.windowBackground)
 		LIGHT -> ContextThemeWrapper(context, materialR.style.ThemeOverlay_Material3_Light)
 			.getThemeDrawable(android.R.attr.windowBackground)
@@ -24,4 +26,14 @@ enum class ReaderBackground {
 		WHITE -> ContextCompat.getColor(context, android.R.color.white).toDrawable()
 		BLACK -> ContextCompat.getColor(context, android.R.color.black).toDrawable()
 	}
+
+	fun isLight(context: Context): Boolean = when (this) {
+		DEFAULT -> !context.resources.isNightMode
+
+		LIGHT,
+		WHITE -> true
+
+		DARK,
+		BLACK -> false
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderControl.kt

@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.core.prefs
+
+import java.util.EnumSet
+
+enum class ReaderControl {
+
+	PREV_CHAPTER, NEXT_CHAPTER, SLIDER, PAGES_SHEET, SCREEN_ROTATION, SAVE_PAGE;
+
+	companion object {
+
+		val DEFAULT: Set<ReaderControl> = EnumSet.of(
+			PREV_CHAPTER, NEXT_CHAPTER, SLIDER, PAGES_SHEET,
+		)
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/SourceSettings.kt

@@ -25,6 +25,9 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 	val isSlowdownEnabled: Boolean
 		get() = prefs.getBoolean(KEY_SLOWDOWN, false)
 
+	val isCaptchaNotificationsDisabled: Boolean
+		get() = prefs.getBoolean(KEY_NO_CAPTCHA, false)
+
 	@Suppress("UNCHECKED_CAST")
 	override fun <T> get(key: ConfigKey<T>): T {
 		return when (key) {
@@ -65,5 +68,6 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 
 		const val KEY_SORT_ORDER = "sort_order"
 		const val KEY_SLOWDOWN = "slowdown"
+		const val KEY_NO_CAPTCHA = "no_captcha"
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt

@@ -1,14 +1,16 @@
 package org.koitharu.kotatsu.core.ui
 
+import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
-import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
 import android.widget.Toast
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
@@ -21,6 +23,7 @@ import kotlinx.coroutines.flow.flowOf
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.isWebViewUnavailable
@@ -46,10 +49,17 @@ abstract class BaseActivity<B : ViewBinding> :
 	@JvmField
 	val actionModeDelegate = ActionModeDelegate()
 
-	private var defaultStatusBarColor = Color.TRANSPARENT
+	private lateinit var entryPoint: BaseActivityEntryPoint
+
+	override fun attachBaseContext(newBase: Context) {
+		entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(newBase.applicationContext)
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+			AppCompatDelegate.setApplicationLocales(entryPoint.settings.appLocales)
+		}
+		super.attachBaseContext(newBase)
+	}
 
 	override fun onCreate(savedInstanceState: Bundle?) {
-		val entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(this)
 		val settings = entryPoint.settings
 		isAmoledTheme = settings.isAmoledTheme
 		setTheme(settings.colorScheme.styleResId)
@@ -159,7 +169,7 @@ abstract class BaseActivity<B : ViewBinding> :
 	override fun isNsfwContent(): Flow<Boolean> = flowOf(false)
 
 	private fun putDataToExtras(intent: Intent?) {
-		intent?.putExtra(EXTRA_DATA, intent.data)
+		intent?.putExtra(AppRouter.KEY_DATA, intent.data)
 	}
 
 	protected fun setContentViewWebViewSafe(viewBindingProducer: () -> B): Boolean {
@@ -178,9 +188,4 @@ abstract class BaseActivity<B : ViewBinding> :
 	}
 
 	protected fun hasViewBinding() = ::viewBinding.isInitialized
-
-	companion object {
-
-		const val EXTRA_DATA = "data"
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt

@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.core.ui
 
-import android.content.ActivityNotFoundException
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.CallSuper
@@ -14,10 +12,8 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
 import androidx.preference.get
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.EntryPointAccessors
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
@@ -89,14 +85,6 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 		(activity as? SettingsActivity)?.setSectionTitle(title)
 	}
 
-	protected fun startActivitySafe(intent: Intent): Boolean = try {
-		startActivity(intent)
-		true
-	} catch (_: ActivityNotFoundException) {
-		Snackbar.make(listView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT).show()
-		false
-	}
-
 	private fun focusPreference(key: String) {
 		val pref = findPreference<Preference>(key)
 		if (pref == null) {

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt

@@ -1,5 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import androidx.lifecycle.LifecycleService
-
-abstract class BaseService : LifecycleService()

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/CoroutineIntentService.kt

@@ -14,6 +14,7 @@ import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -42,6 +43,8 @@ abstract class CoroutineIntentService : BaseService() {
 						intentJobContext.processIntent(intent)
 					}
 				}
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Throwable) {
 				e.printStackTraceDebug()
 				intentJobContext.onError(e)

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/AlertDialogs.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.widget.CompoundButton.OnCheckedChangeListener
 import androidx.annotation.StringRes
+import androidx.annotation.UiContext
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -17,7 +18,7 @@ import org.koitharu.kotatsu.databinding.DialogCheckboxBinding
 import com.google.android.material.R as materialR
 
 inline fun buildAlertDialog(
-	context: Context,
+	@UiContext context: Context,
 	isCentered: Boolean = false,
 	block: MaterialAlertDialogBuilder.() -> Unit,
 ): AlertDialog = MaterialAlertDialogBuilder(

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/CommonAlertDialogs.kt

@@ -1,58 +0,0 @@
-package org.koitharu.kotatsu.core.ui.dialog
-
-import android.content.Context
-import android.content.DialogInterface
-import androidx.annotation.UiContext
-import androidx.core.net.ConnectivityManagerCompat
-import dagger.Lazy
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.TriStateOption
-import org.koitharu.kotatsu.core.util.ext.connectivityManager
-import javax.inject.Inject
-
-class CommonAlertDialogs @Inject constructor(
-	private val settings: Lazy<AppSettings>,
-) {
-
-	fun askForDownloadOverMeteredNetwork(
-		@UiContext context: Context,
-		onConfirmed: (allow: Boolean) -> Unit
-	) {
-		when (settings.get().allowDownloadOnMeteredNetwork) {
-			TriStateOption.ENABLED -> onConfirmed(true)
-			TriStateOption.DISABLED -> onConfirmed(false)
-			TriStateOption.ASK -> {
-				if (!ConnectivityManagerCompat.isActiveNetworkMetered(context.connectivityManager)) {
-					onConfirmed(true)
-					return
-				}
-				val listener = DialogInterface.OnClickListener { _, which ->
-					when (which) {
-						DialogInterface.BUTTON_POSITIVE -> {
-							settings.get().allowDownloadOnMeteredNetwork = TriStateOption.ENABLED
-							onConfirmed(true)
-						}
-
-						DialogInterface.BUTTON_NEUTRAL -> {
-							onConfirmed(true)
-						}
-
-						DialogInterface.BUTTON_NEGATIVE -> {
-							settings.get().allowDownloadOnMeteredNetwork = TriStateOption.DISABLED
-							onConfirmed(false)
-						}
-					}
-				}
-				BigButtonsAlertDialog.Builder(context)
-					.setIcon(R.drawable.ic_network_cellular)
-					.setTitle(R.string.download_cellular_confirm)
-					.setPositiveButton(R.string.allow_always, listener)
-					.setNeutralButton(R.string.allow_once, listener)
-					.setNegativeButton(R.string.dont_allow, listener)
-					.create()
-					.show()
-			}
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/ErrorDetailsDialog.kt

@@ -10,14 +10,14 @@ import androidx.core.text.HtmlCompat
 import androidx.core.text.htmlEncode
 import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.core.text.parseAsHtml
-import androidx.fragment.app.FragmentManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.ui.AlertDialogFragment
+import org.koitharu.kotatsu.core.util.ext.getCauseUrl
 import org.koitharu.kotatsu.core.util.ext.isReportable
 import org.koitharu.kotatsu.core.util.ext.report
 import org.koitharu.kotatsu.core.util.ext.requireSerializable
-import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.DialogErrorDetailsBinding
 
 class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
@@ -27,7 +27,7 @@ class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		val args = requireArguments()
-		exception = args.requireSerializable(ARG_ERROR)
+		exception = args.requireSerializable(AppRouter.KEY_ERROR)
 	}
 
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): DialogErrorDetailsBinding {
@@ -41,7 +41,7 @@ class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
 			text = context.getString(
 				R.string.manga_error_description_pattern,
 				exception.message?.htmlEncode().orEmpty(),
-				arguments?.getString(ARG_URL),
+				arguments?.getString(AppRouter.KEY_URL) ?: exception.getCauseUrl(),
 			).parseAsHtml(HtmlCompat.FROM_HTML_MODE_LEGACY)
 		}
 	}
@@ -71,16 +71,4 @@ class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
 			ClipData.newPlainText(getString(R.string.error), exception.stackTraceToString()),
 		)
 	}
-
-	companion object {
-
-		private const val TAG = "ErrorDetailsDialog"
-		private const val ARG_ERROR = "error"
-		private const val ARG_URL = "url"
-
-		fun show(fm: FragmentManager, error: Throwable, url: String?) = ErrorDetailsDialog().withArgs(2) {
-			putSerializable(ARG_ERROR, error)
-			putString(ARG_URL, url)
-		}.show(fm, TAG)
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/AnimatedFaviconDrawable.kt

@@ -6,11 +6,16 @@ import android.graphics.Canvas
 import android.graphics.drawable.Animatable
 import androidx.annotation.StyleRes
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import coil3.Image
+import coil3.asImage
+import coil3.getExtra
+import coil3.request.ImageRequest
 import com.google.android.material.animation.ArgbEvaluatorCompat
 import com.google.android.material.color.MaterialColors
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.KotatsuColors
+import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
+import org.koitharu.kotatsu.core.util.ext.mangaSourceKey
 import kotlin.math.abs
 
 class AnimatedFaviconDrawable(
@@ -23,12 +28,12 @@ class AnimatedFaviconDrawable(
 	private val period = context.getAnimationDuration(R.integer.config_longAnimTime) * 2
 	private val timeAnimator = TimeAnimator()
 
-	private val colorHigh = MaterialColors.harmonize(KotatsuColors.random(name), colorBackground)
-	private val colorLow = ArgbEvaluatorCompat.getInstance().evaluate(0.3f, colorHigh, colorBackground)
+	private var colorHigh = MaterialColors.harmonize(colorForeground, currentBackgroundColor)
+	private var colorLow = ArgbEvaluatorCompat.getInstance().evaluate(0.3f, colorHigh, currentBackgroundColor)
 
 	init {
 		timeAnimator.setTimeListener(this)
-		updateColor()
+		onStateChange(state)
 	}
 
 	override fun draw(canvas: Canvas) {
@@ -39,9 +44,11 @@ class AnimatedFaviconDrawable(
 		super.draw(canvas)
 	}
 
-	override fun setAlpha(alpha: Int) = Unit
-
-	override fun getAlpha(): Int = 255
+	// override fun setAlpha(alpha: Int) = Unit
+	//
+	// override fun getAlpha(): Int = 255
+	//
+	// override fun isOpaque(): Boolean = false
 
 	override fun onTimeUpdate(animation: TimeAnimator?, totalTime: Long, deltaTime: Long) {
 		callback?.also {
@@ -60,13 +67,33 @@ class AnimatedFaviconDrawable(
 
 	override fun isRunning(): Boolean = timeAnimator.isStarted
 
+	override fun onStateChange(state: IntArray): Boolean {
+		val res = super.onStateChange(state)
+		colorHigh = MaterialColors.harmonize(currentForegroundColor, currentBackgroundColor)
+		colorLow = ArgbEvaluatorCompat.getInstance().evaluate(0.3f, colorHigh, currentBackgroundColor)
+		updateColor()
+		return res
+	}
+
 	private fun updateColor() {
 		if (period <= 0f) {
 			return
 		}
 		val ph = period / 2
 		val fraction = abs((System.currentTimeMillis() % period) - ph) / ph.toFloat()
-		colorForeground = ArgbEvaluatorCompat.getInstance()
+		currentForegroundColor = ArgbEvaluatorCompat.getInstance()
 			.evaluate(interpolator.getInterpolation(fraction), colorLow, colorHigh)
 	}
+
+	class Factory(
+		@StyleRes private val styleResId: Int,
+	) : ((ImageRequest) -> Image?) {
+
+		override fun invoke(request: ImageRequest): Image? {
+			val source = request.getExtra(mangaSourceKey) ?: return null
+			val context = request.context
+			val title = source.getTitle(context)
+			return AnimatedFaviconDrawable(context, styleResId, title).asImage()
+		}
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/AnimatedPlaceholderDrawable.kt

@@ -7,6 +7,7 @@ import android.graphics.ColorFilter
 import android.graphics.PixelFormat
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
+import androidx.core.graphics.ColorUtils
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.google.android.material.animation.ArgbEvaluatorCompat
 import org.koitharu.kotatsu.R
@@ -23,6 +24,7 @@ class AnimatedPlaceholderDrawable(context: Context) : Drawable(), Animatable, Ti
 	private val interpolator = FastOutSlowInInterpolator()
 	private val period = context.getAnimationDuration(R.integer.config_longAnimTime) * 2
 	private val timeAnimator = TimeAnimator()
+	private var currentAlpha: Int = 255
 
 	init {
 		timeAnimator.setTimeListener(this)
@@ -38,16 +40,17 @@ class AnimatedPlaceholderDrawable(context: Context) : Drawable(), Animatable, Ti
 	}
 
 	override fun setAlpha(alpha: Int) {
-		// this.alpha = alpha FIXME coil's crossfade
+		currentAlpha = alpha
+		updateColor()
 	}
 
-	override fun setColorFilter(colorFilter: ColorFilter?) = Unit
-
 	@Suppress("DeprecatedCallableAddReplaceWith")
 	@Deprecated("Deprecated in Java")
-	override fun getOpacity(): Int = PixelFormat.OPAQUE
+	override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
 
-	override fun getAlpha(): Int = 255
+	override fun getAlpha(): Int = currentAlpha
+
+	override fun setColorFilter(colorFilter: ColorFilter?) = Unit
 
 	override fun onTimeUpdate(animation: TimeAnimator?, totalTime: Long, deltaTime: Long) {
 		callback?.also {
@@ -72,7 +75,10 @@ class AnimatedPlaceholderDrawable(context: Context) : Drawable(), Animatable, Ti
 		}
 		val ph = period / 2
 		val fraction = abs((System.currentTimeMillis() % period) - ph) / ph.toFloat()
-		currentColor = ArgbEvaluatorCompat.getInstance()
-			.evaluate(interpolator.getInterpolation(fraction), colorLow, colorHigh)
+		currentColor = ColorUtils.setAlphaComponent(
+			ArgbEvaluatorCompat.getInstance()
+				.evaluate(interpolator.getInterpolation(fraction), colorLow, colorHigh),
+			currentAlpha
+		)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/FaviconDrawable.kt

@@ -1,34 +1,47 @@
 package org.koitharu.kotatsu.core.ui.image
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Canvas
 import android.graphics.Color
-import android.graphics.ColorFilter
 import android.graphics.Paint
 import android.graphics.Path
-import android.graphics.PixelFormat
 import android.graphics.Rect
 import android.graphics.RectF
-import android.graphics.drawable.Drawable
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.annotation.StyleRes
 import androidx.core.content.withStyledAttributes
 import androidx.core.graphics.withClip
+import coil3.Image
+import coil3.asImage
+import coil3.getExtra
+import coil3.request.ImageRequest
 import com.google.android.material.color.MaterialColors
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.util.KotatsuColors
+import org.koitharu.kotatsu.core.util.ext.hasFocusStateSpecified
+import org.koitharu.kotatsu.core.util.ext.mangaSourceKey
 
 open class FaviconDrawable(
 	context: Context,
 	@StyleRes styleResId: Int,
 	name: String,
-) : Drawable() {
+) : PaintDrawable() {
 
-	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-	protected var colorBackground = Color.WHITE
+	override val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.SUBPIXEL_TEXT_FLAG)
+	protected var currentBackgroundColor = Color.WHITE
+		private set
+	private var colorBackground: ColorStateList = ColorStateList.valueOf(currentBackgroundColor)
 	protected var colorForeground = Color.DKGRAY
-	private var colorStroke = Color.LTGRAY
+	protected var currentForegroundColor = Color.DKGRAY
+	protected var currentStrokeColor = Color.LTGRAY
+		private set
+	private var colorStroke: ColorStateList = ColorStateList.valueOf(currentStrokeColor)
 	private val letter = name.take(1).uppercase()
 	private var cornerSize = 0f
+	private var intrinsicSize = -1
 	private val textBounds = Rect()
 	private val tempRect = Rect()
 	private val boundsF = RectF()
@@ -36,14 +49,17 @@ open class FaviconDrawable(
 
 	init {
 		context.withStyledAttributes(styleResId, R.styleable.FaviconFallbackDrawable) {
-			colorBackground = getColor(R.styleable.FaviconFallbackDrawable_backgroundColor, colorBackground)
-			colorStroke = getColor(R.styleable.FaviconFallbackDrawable_strokeColor, colorStroke)
+			colorBackground = getColorStateList(R.styleable.FaviconFallbackDrawable_backgroundColor) ?: colorBackground
+			colorStroke = getColorStateList(R.styleable.FaviconFallbackDrawable_strokeColor) ?: colorStroke
 			cornerSize = getDimension(R.styleable.FaviconFallbackDrawable_cornerSize, cornerSize)
 			paint.strokeWidth = getDimension(R.styleable.FaviconFallbackDrawable_strokeWidth, 0f) * 2f
+			intrinsicSize = getDimensionPixelSize(R.styleable.FaviconFallbackDrawable_drawableSize, intrinsicSize)
 		}
 		paint.textAlign = Paint.Align.CENTER
 		paint.isFakeBoldText = true
-		colorForeground = MaterialColors.harmonize(KotatsuColors.random(name), colorBackground)
+		colorForeground = KotatsuColors.random(name)
+		currentForegroundColor = MaterialColors.harmonize(colorForeground, colorBackground.defaultColor)
+		onStateChange(state)
 	}
 
 	override fun draw(canvas: Canvas) {
@@ -67,31 +83,42 @@ open class FaviconDrawable(
 		clipPath.close()
 	}
 
-	override fun setAlpha(alpha: Int) {
-		paint.alpha = alpha
-	}
+	override fun getIntrinsicWidth(): Int = intrinsicSize
 
-	override fun setColorFilter(colorFilter: ColorFilter?) {
-		paint.colorFilter = colorFilter
-	}
+	override fun getIntrinsicHeight(): Int = intrinsicSize
 
-	@Suppress("DeprecatedCallableAddReplaceWith")
-	@Deprecated("Deprecated in Java")
-	override fun getOpacity() = PixelFormat.TRANSPARENT
+	override fun isOpaque(): Boolean = cornerSize == 0f && colorBackground.isOpaque
+
+	override fun isStateful(): Boolean = colorStroke.isStateful || colorBackground.isStateful
+
+	@RequiresApi(Build.VERSION_CODES.S)
+	override fun hasFocusStateSpecified(): Boolean =
+		colorBackground.hasFocusStateSpecified() || colorStroke.hasFocusStateSpecified()
+
+	override fun onStateChange(state: IntArray): Boolean {
+		val prevStrokeColor = currentStrokeColor
+		val prevBackgroundColor = currentBackgroundColor
+		currentStrokeColor = colorStroke.getColorForState(state, colorStroke.defaultColor)
+		currentBackgroundColor = colorBackground.getColorForState(state, colorBackground.defaultColor)
+		if (currentBackgroundColor != prevBackgroundColor) {
+			currentForegroundColor = MaterialColors.harmonize(colorForeground, currentBackgroundColor)
+		}
+		return prevBackgroundColor != currentBackgroundColor || prevStrokeColor != currentStrokeColor
+	}
 
 	private fun doDraw(canvas: Canvas) {
 		// background
-		paint.color = colorBackground
+		paint.color = currentBackgroundColor
 		paint.style = Paint.Style.FILL
 		canvas.drawPaint(paint)
 		// letter
-		paint.color = colorForeground
+		paint.color = currentForegroundColor
 		val cx = (boundsF.left + boundsF.right) * 0.6f
 		val ty = boundsF.bottom * 0.7f + textBounds.height() * 0.5f - textBounds.bottom
 		canvas.drawText(letter, cx, ty, paint)
 		if (paint.strokeWidth > 0f) {
 			// stroke
-			paint.color = colorStroke
+			paint.color = currentStrokeColor
 			paint.style = Paint.Style.STROKE
 			canvas.drawPath(clipPath, paint)
 		}
@@ -103,4 +130,16 @@ open class FaviconDrawable(
 		paint.getTextBounds(text, 0, text.length, tempRect)
 		return testTextSize * width / tempRect.width()
 	}
+
+	class Factory(
+		@StyleRes private val styleResId: Int,
+	) : ((ImageRequest) -> Image?) {
+
+		override fun invoke(request: ImageRequest): Image? {
+			val source = request.getExtra(mangaSourceKey) ?: return null
+			val context = request.context
+			val title = source.getTitle(context)
+			return FaviconDrawable(context, styleResId, title).asImage()
+		}
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/PaintDrawable.kt

@@ -0,0 +1,53 @@
+package org.koitharu.kotatsu.core.ui.image
+
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.PixelFormat
+import android.graphics.drawable.Drawable
+
+@Suppress("OVERRIDE_DEPRECATION")
+abstract class PaintDrawable : Drawable() {
+
+	protected abstract val paint: Paint
+
+	override fun setAlpha(alpha: Int) {
+		paint.alpha = alpha
+	}
+
+	override fun getAlpha(): Int {
+		return paint.alpha
+	}
+
+	override fun setColorFilter(colorFilter: ColorFilter?) {
+		paint.colorFilter = colorFilter
+	}
+
+	override fun getColorFilter(): ColorFilter? {
+		return paint.colorFilter
+	}
+
+	override fun setDither(dither: Boolean) {
+		paint.isDither = dither
+	}
+
+	override fun setFilterBitmap(filter: Boolean) {
+		paint.isFilterBitmap = filter
+	}
+
+	override fun isFilterBitmap(): Boolean {
+		return paint.isFilterBitmap
+	}
+
+	override fun getOpacity(): Int {
+		if (paint.colorFilter != null) {
+			return PixelFormat.TRANSLUCENT
+		}
+		return when (paint.alpha) {
+			0 -> PixelFormat.TRANSPARENT
+			255 -> if (isOpaque()) PixelFormat.OPAQUE else PixelFormat.TRANSLUCENT
+			else -> PixelFormat.TRANSLUCENT
+		}
+	}
+
+	protected open fun isOpaque() = false
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/TextDrawable.kt

@@ -0,0 +1,83 @@
+package org.koitharu.kotatsu.core.ui.image
+
+import android.content.res.ColorStateList
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.PointF
+import android.graphics.Rect
+import android.os.Build
+import android.widget.TextView
+import androidx.annotation.RequiresApi
+import androidx.core.graphics.PaintCompat
+import org.koitharu.kotatsu.core.util.ext.hasFocusStateSpecified
+
+class TextDrawable(
+	val text: String,
+) : PaintDrawable() {
+
+	override val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.SUBPIXEL_TEXT_FLAG)
+	private val textBounds = Rect()
+	private val textPoint = PointF()
+
+	var textSize: Float
+		get() = paint.textSize
+		set(value) {
+			paint.textSize = value
+			measureTextBounds()
+		}
+
+	var textColor: ColorStateList = ColorStateList.valueOf(Color.BLACK)
+		set(value) {
+			field = value
+			onStateChange(state)
+		}
+
+	init {
+		onStateChange(state)
+		measureTextBounds()
+	}
+
+	override fun draw(canvas: Canvas) {
+		canvas.drawText(text, textPoint.x, textPoint.y, paint)
+	}
+
+	override fun onBoundsChange(bounds: Rect) {
+		textPoint.set(
+			bounds.exactCenterX() - textBounds.exactCenterX(),
+			bounds.exactCenterY() - textBounds.exactCenterY(),
+		)
+	}
+
+	override fun getIntrinsicWidth(): Int = textBounds.width()
+
+	override fun getIntrinsicHeight(): Int = textBounds.height()
+
+	override fun isStateful(): Boolean = textColor.isStateful
+
+	@RequiresApi(Build.VERSION_CODES.S)
+	override fun hasFocusStateSpecified(): Boolean = textColor.hasFocusStateSpecified()
+
+	override fun onStateChange(state: IntArray): Boolean {
+		val prevColor = paint.color
+		paint.color = textColor.getColorForState(state, textColor.defaultColor)
+		return paint.color != prevColor
+	}
+
+	private fun measureTextBounds() {
+		paint.getTextBounds(text, 0, text.length, textBounds)
+		onBoundsChange(bounds)
+	}
+
+	companion object {
+
+		fun compound(textView: TextView, text: String): TextDrawable? {
+			val drawable = TextDrawable(text)
+			drawable.textSize = textView.textSize
+			drawable.textColor = textView.textColors
+			return drawable.takeIf {
+				PaintCompat.hasGlyph(drawable.paint, text)
+			}
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/TextViewTarget.kt

@@ -0,0 +1,41 @@
+package org.koitharu.kotatsu.core.ui.image
+
+import android.graphics.drawable.Drawable
+import android.view.Gravity
+import android.widget.TextView
+import androidx.annotation.GravityInt
+import coil3.target.GenericViewTarget
+
+class TextViewTarget(
+	override val view: TextView,
+	@GravityInt compoundDrawable: Int,
+) : GenericViewTarget<TextView>() {
+
+	private val drawableIndex: Int = when (compoundDrawable) {
+		Gravity.START -> 0
+		Gravity.TOP -> 2
+		Gravity.END -> 3
+		Gravity.BOTTOM -> 4
+		else -> -1
+	}
+
+	override var drawable: Drawable?
+		get() = if (drawableIndex != -1) {
+			view.compoundDrawablesRelative[drawableIndex]
+		} else {
+			null
+		}
+		set(value) {
+			if (drawableIndex == -1) {
+				return
+			}
+			val drawables = view.compoundDrawablesRelative
+			drawables[drawableIndex] = value
+			view.setCompoundDrawablesRelativeWithIntrinsicBounds(
+				drawables[0],
+				drawables[1],
+				drawables[2],
+				drawables[3],
+			)
+		}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScrollRecyclerView.kt

@@ -37,8 +37,8 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 	init {
 		fastScroller.id = R.id.fast_scroller
 		fastScroller.layoutParams = ViewGroup.LayoutParams(
-			ViewGroup.LayoutParams.WRAP_CONTENT,
-			ViewGroup.LayoutParams.MATCH_PARENT,
+			LayoutParams.WRAP_CONTENT,
+			LayoutParams.MATCH_PARENT,
 		)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt

@@ -11,7 +11,9 @@ import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.DimenRes
@@ -162,7 +164,7 @@ class FastScroller @JvmOverloads constructor(
 
 	override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) {
 		super.onSizeChanged(w, h, oldW, oldH)
-		viewHeight = h
+		viewHeight = h - paddingTop - paddingBottom
 	}
 
 	@SuppressLint("ClickableViewAccessibility")
@@ -229,6 +231,7 @@ class FastScroller @JvmOverloads constructor(
 	 *
 	 * @param params The [ViewGroup.LayoutParams] for this view, cannot be null
 	 */
+	@Suppress("RemoveRedundantQualifierName")
 	override fun setLayoutParams(params: ViewGroup.LayoutParams) {
 		params.width = LayoutParams.WRAP_CONTENT
 		super.setLayoutParams(params)
@@ -529,7 +532,7 @@ class FastScroller @JvmOverloads constructor(
 
 	private fun findValidParent(view: View): ViewGroup? = view.ancestors.firstNotNullOfOrNull { p ->
 		if (p is FrameLayout || p is ConstraintLayout || p is CoordinatorLayout || p is RelativeLayout) {
-			p as ViewGroup
+			p
 		} else {
 			null
 		}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/model/DateTimeAgo.kt

@@ -1,17 +1,18 @@
 package org.koitharu.kotatsu.core.ui.model
 
-import android.content.res.Resources
+import android.content.Context
+import android.text.format.DateUtils
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.toMillis
 import java.time.LocalDate
-import java.time.format.DateTimeFormatter
 
 sealed class DateTimeAgo {
 
-	abstract fun format(resources: Resources): String
+	abstract fun format(context: Context): String
 
 	object JustNow : DateTimeAgo() {
-		override fun format(resources: Resources): String {
-			return resources.getString(R.string.just_now)
+		override fun format(context: Context): String {
+			return context.getString(R.string.just_now)
 		}
 
 		override fun toString() = "just_now"
@@ -20,24 +21,32 @@ sealed class DateTimeAgo {
 	}
 
 	data class MinutesAgo(val minutes: Int) : DateTimeAgo() {
-		override fun format(resources: Resources): String {
-			return resources.getQuantityString(R.plurals.minutes_ago, minutes, minutes)
+		override fun format(context: Context): String {
+			return context.resources.getQuantityString(
+				R.plurals.minutes_ago,
+				minutes,
+				minutes,
+			)
 		}
 
 		override fun toString() = "minutes_ago_$minutes"
 	}
 
 	data class HoursAgo(val hours: Int) : DateTimeAgo() {
-		override fun format(resources: Resources): String {
-			return resources.getQuantityString(R.plurals.hours_ago, hours, hours)
+		override fun format(context: Context): String {
+			return context.resources.getQuantityString(
+				R.plurals.hours_ago,
+				hours,
+				hours,
+			)
 		}
 
 		override fun toString() = "hours_ago_$hours"
 	}
 
 	object Today : DateTimeAgo() {
-		override fun format(resources: Resources): String {
-			return resources.getString(R.string.today)
+		override fun format(context: Context): String {
+			return context.getString(R.string.today)
 		}
 
 		override fun toString() = "today"
@@ -46,8 +55,8 @@ sealed class DateTimeAgo {
 	}
 
 	object Yesterday : DateTimeAgo() {
-		override fun format(resources: Resources): String {
-			return resources.getString(R.string.yesterday)
+		override fun format(context: Context): String {
+			return context.getString(R.string.yesterday)
 		}
 
 		override fun toString() = "yesterday"
@@ -56,44 +65,46 @@ sealed class DateTimeAgo {
 	}
 
 	data class DaysAgo(val days: Int) : DateTimeAgo() {
-		override fun format(resources: Resources): String {
-			return resources.getQuantityString(R.plurals.days_ago, days, days)
+		override fun format(context: Context): String {
+			return context.resources.getQuantityString(R.plurals.days_ago, days, days)
 		}
 
 		override fun toString() = "days_ago_$days"
 	}
 
 	data class MonthsAgo(val months: Int) : DateTimeAgo() {
-		override fun format(resources: Resources): String {
+		override fun format(context: Context): String {
 			return if (months == 0) {
-				resources.getString(R.string.this_month)
+				context.getString(R.string.this_month)
 			} else {
-				resources.getQuantityString(R.plurals.months_ago, months, months)
+				context.resources.getQuantityString(
+					R.plurals.months_ago,
+					months,
+					months,
+				)
 			}
 		}
 	}
 
 	data class Absolute(private val date: LocalDate) : DateTimeAgo() {
-		override fun format(resources: Resources): String {
+		override fun format(context: Context): String {
 			return if (date == EPOCH_DATE) {
-				resources.getString(R.string.unknown)
+				context.getString(R.string.unknown)
 			} else {
-				date.format(formatter)
+				DateUtils.formatDateTime(context, date.toMillis(), DateUtils.FORMAT_SHOW_DATE)
 			}
 		}
 
 		override fun toString() = "abs_${date.toEpochDay()}"
 
-		companion object {
-			// TODO: Use Java 9's LocalDate.EPOCH.
-			private val EPOCH_DATE = LocalDate.of(1970, 1, 1)
-			private val formatter = DateTimeFormatter.ofPattern("d MMMM")
+		private companion object {
+			val EPOCH_DATE: LocalDate = LocalDate.of(1970, 1, 1)
 		}
 	}
 
 	object LongAgo : DateTimeAgo() {
-		override fun format(resources: Resources): String {
-			return resources.getString(R.string.long_ago)
+		override fun format(context: Context): String {
+			return context.getString(R.string.long_ago)
 		}
 
 		override fun toString() = "long_ago"

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/BadgeView.kt

@@ -0,0 +1,100 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable
+import android.os.Parcelable.Creator
+import android.util.AttributeSet
+import androidx.core.content.withStyledAttributes
+import androidx.customview.view.AbsSavedState
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.google.android.material.shape.ShapeAppearanceModel
+import com.google.android.material.textview.MaterialTextView
+import org.koitharu.kotatsu.R
+
+class BadgeView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null
+) : MaterialTextView(context, attrs, R.attr.badgeViewStyle) {
+
+	private var maxCharacterCount = Int.MAX_VALUE
+
+	var number: Int = 0
+		set(value) {
+			field = value
+			updateText()
+		}
+
+	init {
+		context.withStyledAttributes(attrs, R.styleable.BadgeView, R.attr.badgeViewStyle) {
+			maxCharacterCount = getInt(R.styleable.BadgeView_maxCharacterCount, maxCharacterCount)
+			number = getInt(R.styleable.BadgeView_number, number)
+			val shape = ShapeAppearanceModel.builder(
+				context,
+				getResourceId(R.styleable.BadgeView_shapeAppearance, 0),
+				0,
+			).build()
+			background = MaterialShapeDrawable(shape).also { bg ->
+				bg.fillColor = getColorStateList(R.styleable.BadgeView_backgroundColor)
+			}
+		}
+	}
+
+	override fun onSaveInstanceState(): Parcelable? {
+		val superState = super.onSaveInstanceState() ?: return null
+		return SavedState(superState, number)
+	}
+
+	override fun onRestoreInstanceState(state: Parcelable?) {
+		if (state is SavedState) {
+			super.onRestoreInstanceState(state.superState)
+			number = state.number
+		} else {
+			super.onRestoreInstanceState(state)
+		}
+	}
+
+	private fun updateText() {
+		if (number <= 0) {
+			text = null
+			return
+		}
+		val numberString = number.toString()
+		text = if (numberString.length > maxCharacterCount) {
+			buildString(maxCharacterCount) {
+				repeat(maxCharacterCount - 1) { append('9') }
+				append('+')
+			}
+		} else {
+			numberString
+		}
+	}
+
+	private class SavedState : AbsSavedState {
+
+		val number: Int
+
+		constructor(superState: Parcelable, number: Int) : super(superState) {
+			this.number = number
+		}
+
+		constructor(source: Parcel, classLoader: ClassLoader?) : super(source, classLoader) {
+			number = source.readInt()
+		}
+
+		override fun writeToParcel(out: Parcel, flags: Int) {
+			super.writeToParcel(out, flags)
+			out.writeInt(number)
+		}
+
+		companion object {
+			@Suppress("unused")
+			@JvmField
+			val CREATOR: Creator<SavedState> = object : Creator<SavedState> {
+				override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader)
+
+				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
+			}
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ChipsView.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.ui.widgets
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
-import android.view.View.OnClickListener
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
@@ -34,7 +33,7 @@ import com.google.android.material.R as materialR
 class ChipsView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle,
+	defStyleAttr: Int = materialR.attr.chipGroupStyle,
 ) : ChipGroup(context, attrs, defStyleAttr) {
 
 	@Inject
@@ -49,6 +48,7 @@ class ChipsView @JvmOverloads constructor(
 		onChipCloseClickListener?.onChipCloseClick(chip, data) ?: onChipClickListener?.onChipClick(chip, data)
 	}
 	private val chipStyle: Int
+	private val iconsVisible: Boolean
 	var onChipClickListener: OnChipClickListener? = null
 		set(value) {
 			field = value
@@ -60,6 +60,7 @@ class ChipsView @JvmOverloads constructor(
 	init {
 		val ta = context.obtainStyledAttributes(attrs, R.styleable.ChipsView, defStyleAttr, 0)
 		chipStyle = ta.getResourceId(R.styleable.ChipsView_chipStyle, R.style.Widget_Kotatsu_Chip)
+		iconsVisible = ta.getBoolean(R.styleable.ChipsView_chipIconVisible, true)
 		ta.recycle()
 
 		if (isInEditMode) {
@@ -170,12 +171,7 @@ class ChipsView @JvmOverloads constructor(
 
 		private fun bindIcon(model: ChipModel) {
 			when {
-				model.isChecked -> {
-					imageRequest?.dispose()
-					imageRequest = null
-					chipIcon = null
-					isChipIconVisible = false
-				}
+				model.isChecked -> disposeIcon()
 
 				model.isLoading -> {
 					imageRequest?.dispose()
@@ -184,6 +180,8 @@ class ChipsView @JvmOverloads constructor(
 					setProgressIcon()
 				}
 
+				!iconsVisible -> disposeIcon()
+
 				model.iconData != null -> {
 					val placeholder = model.icon.ifZero { materialR.drawable.navigation_empty_icon }
 					imageRequest = ImageRequest.Builder(context)
@@ -207,14 +205,16 @@ class ChipsView @JvmOverloads constructor(
 					isChipIconVisible = true
 				}
 
-				else -> {
-					imageRequest?.dispose()
-					imageRequest = null
-					chipIcon = null
-					isChipIconVisible = false
-				}
+				else -> disposeIcon()
 			}
 		}
+
+		private fun disposeIcon() {
+			imageRequest?.dispose()
+			imageRequest = null
+			chipIcon = null
+			isChipIconVisible = false
+		}
 	}
 
 	private inner class InternalChipClickListener : OnClickListener {

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/DotsIndicator.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.ui.widgets
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
@@ -11,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
 import androidx.viewpager2.widget.ViewPager2
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.getThemeColorStateList
 import org.koitharu.kotatsu.core.util.ext.measureDimension
 import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.parsers.util.toIntUp
@@ -30,6 +31,7 @@ class DotsIndicator @JvmOverloads constructor(
 	private var smallDotAlpha = 0.6f
 	private var positionOffset: Float = 0f
 	private var position: Int = 0
+	private var dotsColor: ColorStateList = ColorStateList.valueOf(Color.DKGRAY)
 	private val inset = context.resources.resolveDp(1f)
 
 	var max: Int = 6
@@ -52,10 +54,10 @@ class DotsIndicator @JvmOverloads constructor(
 	init {
 		paint.style = Paint.Style.FILL
 		context.withStyledAttributes(attrs, R.styleable.DotsIndicator, defStyleAttr) {
-			paint.color = getColor(
-				R.styleable.DotsIndicator_dotColor,
-				context.getThemeColor(materialR.attr.colorOnBackground, Color.DKGRAY),
-			)
+			dotsColor = getColorStateList(R.styleable.DotsIndicator_dotColor)
+				?: context.getThemeColorStateList(materialR.attr.colorOnBackground)
+					?: dotsColor
+			paint.color = dotsColor.getColorForState(drawableState, dotsColor.defaultColor)
 			indicatorSize = getDimension(R.styleable.DotsIndicator_dotSize, indicatorSize)
 			dotSpacing = getDimension(R.styleable.DotsIndicator_dotSpacing, dotSpacing)
 			smallDotScale = getFloat(R.styleable.DotsIndicator_dotScale, smallDotScale).coerceIn(0f, 1f)
@@ -89,6 +91,13 @@ class DotsIndicator @JvmOverloads constructor(
 		}
 	}
 
+	override fun drawableStateChanged() {
+		if (dotsColor.isStateful) {
+			paint.color = dotsColor.getColorForState(drawableState, dotsColor.defaultColor)
+		}
+		super.drawableStateChanged()
+	}
+
 	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
 		val dotSize = getDotSize()
 		val desiredHeight = (dotSize + paddingTop + paddingBottom).toIntUp()

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/IconsView.kt

@@ -0,0 +1,90 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.widget.ImageView
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.isVisible
+import org.koitharu.kotatsu.R
+
+class IconsView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+) : LinearLayout(context, attrs) {
+
+	private var iconSize = LayoutParams.WRAP_CONTENT
+	private var iconSpacing = 0
+
+	val iconsCount: Int
+		get() {
+			var count = 0
+			repeat(childCount) { i ->
+				if (getChildAt(i).isVisible) {
+					count++
+				}
+			}
+			return count
+		}
+
+	init {
+		context.withStyledAttributes(attrs, R.styleable.IconsView) {
+			iconSize = getDimensionPixelSize(R.styleable.IconsView_iconSize, iconSize)
+			iconSpacing = getDimensionPixelOffset(R.styleable.IconsView_iconSpacing, iconSpacing)
+		}
+	}
+
+	fun setIcons(icons: Iterable<Drawable>) {
+		var index = 0
+		for (icon in icons) {
+			val imageView = (getChildAt(index) as ImageView?) ?: addImageView()
+			imageView.setImageDrawable(icon)
+			imageView.isVisible = true
+			index++
+		}
+		for (i in index until childCount) {
+			val imageView = getChildAt(i) as? ImageView ?: continue
+			imageView.setImageDrawable(null)
+			imageView.isVisible = false
+		}
+	}
+
+	fun clearIcons() {
+		repeat(childCount) { i ->
+			getChildAt(i).isVisible = false
+		}
+	}
+
+	fun addIcon(drawable: Drawable) {
+		val imageView = getNextImageView()
+		imageView.setImageDrawable(drawable)
+		imageView.isVisible = true
+	}
+
+	fun addIcon(@DrawableRes resId: Int) {
+		val imageView = getNextImageView()
+		imageView.setImageResource(resId)
+		imageView.isVisible = true
+	}
+
+	private fun getNextImageView(): ImageView {
+		repeat(childCount) { i ->
+			val child = getChildAt(i)
+			if (child is ImageView && !child.isVisible) {
+				return child
+			}
+		}
+		return addImageView()
+	}
+
+	private fun addImageView() = ImageView(context).also {
+		it.scaleType = ImageView.ScaleType.FIT_CENTER
+		val lp = LayoutParams(iconSize, iconSize)
+		if (childCount != 0) {
+			lp.marginStart = iconSpacing
+		}
+		addView(it, lp)
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ProgressButton.kt

@@ -1,182 +0,0 @@
-package org.koitharu.kotatsu.core.ui.widgets
-
-import android.animation.ValueAnimator
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Outline
-import android.graphics.Paint
-import android.util.AttributeSet
-import android.view.Gravity
-import android.view.View
-import android.view.ViewOutlineProvider
-import android.view.animation.AccelerateDecelerateInterpolator
-import android.widget.TextView
-import androidx.annotation.StringRes
-import androidx.appcompat.widget.LinearLayoutCompat
-import androidx.core.content.withStyledAttributes
-import androidx.core.graphics.ColorUtils
-import androidx.core.view.children
-import androidx.core.widget.TextViewCompat
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
-import org.koitharu.kotatsu.core.util.ext.getThemeColorStateList
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
-import org.koitharu.kotatsu.core.util.ext.resolveDp
-import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
-import org.koitharu.kotatsu.core.util.ext.textAndVisible
-import com.google.android.material.R as materialR
-
-class ProgressButton @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	defStyleAttr: Int = 0,
-) : LinearLayoutCompat(context, attrs, defStyleAttr), ValueAnimator.AnimatorUpdateListener {
-
-	private val textViewTitle = TextView(context)
-	private val textViewSubtitle = TextView(context)
-	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-
-	private var progress = 0f
-	private var targetProgress = 0f
-	private var colorBase: ColorStateList = ColorStateList.valueOf(Color.TRANSPARENT)
-	private var colorProgress: ColorStateList = ColorStateList.valueOf(Color.TRANSPARENT)
-	private var progressAnimator: ValueAnimator? = null
-
-	private var colorBaseCurrent = colorProgress.defaultColor
-	private var colorProgressCurrent = colorProgress.defaultColor
-
-	var title: CharSequence?
-		get() = textViewTitle.textAndVisible
-		set(value) {
-			textViewTitle.textAndVisible = value
-		}
-
-	var subtitle: CharSequence?
-		get() = textViewSubtitle.textAndVisible
-		set(value) {
-			textViewSubtitle.textAndVisible = value
-		}
-
-	init {
-		orientation = VERTICAL
-		outlineProvider = OutlineProvider()
-		clipToOutline = true
-
-		context.withStyledAttributes(attrs, R.styleable.ProgressButton, defStyleAttr) {
-			val textAppearanceFallback = androidx.appcompat.R.style.TextAppearance_AppCompat
-			TextViewCompat.setTextAppearance(
-				textViewTitle,
-				getResourceId(R.styleable.ProgressButton_titleTextAppearance, textAppearanceFallback),
-			)
-			TextViewCompat.setTextAppearance(
-				textViewSubtitle,
-				getResourceId(R.styleable.ProgressButton_subtitleTextAppearance, textAppearanceFallback),
-			)
-			textViewTitle.text = getText(R.styleable.ProgressButton_title)
-			textViewSubtitle.text = getText(R.styleable.ProgressButton_subtitle)
-			colorBase = getColorStateList(R.styleable.ProgressButton_baseColor)
-				?: context.getThemeColorStateList(materialR.attr.colorPrimaryContainer) ?: colorBase
-			colorProgress = getColorStateList(R.styleable.ProgressButton_progressColor)
-				?: context.getThemeColorStateList(materialR.attr.colorPrimary) ?: colorProgress
-			getColorStateList(R.styleable.ProgressButton_android_textColor)?.let { colorText ->
-				textViewTitle.setTextColor(colorText)
-				textViewSubtitle.setTextColor(colorText)
-			}
-			progress = getInt(R.styleable.ProgressButton_android_progress, 0).toFloat() /
-				getInt(R.styleable.ProgressButton_android_max, 100).toFloat()
-		}
-
-		addView(textViewTitle, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
-		addView(
-			textViewSubtitle,
-			LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).also { lp ->
-				lp.topMargin = context.resources.resolveDp(2)
-			},
-		)
-
-		paint.style = Paint.Style.FILL
-		applyGravity()
-		setWillNotDraw(false)
-	}
-
-	override fun onDraw(canvas: Canvas) {
-		super.onDraw(canvas)
-		canvas.drawColor(colorBaseCurrent)
-		if (progress > 0f) {
-			canvas.drawRect(0f, 0f, width * progress, height.toFloat(), paint)
-		}
-	}
-
-	override fun drawableStateChanged() {
-		super.drawableStateChanged()
-		val state = drawableState
-		colorBaseCurrent = colorBase.getColorForState(state, colorBase.defaultColor)
-		colorProgressCurrent = colorProgress.getColorForState(state, colorProgress.defaultColor)
-		colorProgressCurrent = ColorUtils.setAlphaComponent(colorProgressCurrent, 84 /* 255 * 0.33F */)
-		paint.color = colorProgressCurrent
-	}
-
-	override fun setGravity(gravity: Int) {
-		super.setGravity(gravity)
-		if (childCount != 0) {
-			applyGravity()
-		}
-	}
-
-	override fun setEnabled(enabled: Boolean) {
-		super.setEnabled(enabled)
-		children.forEach { it.isEnabled = enabled }
-	}
-
-	override fun onAnimationUpdate(animation: ValueAnimator) {
-		if (animation === progressAnimator) {
-			progress = animation.animatedValue as Float
-			invalidate()
-		}
-	}
-
-	fun setTitle(@StringRes titleResId: Int) {
-		textViewTitle.setTextAndVisible(titleResId)
-	}
-
-	fun setSubtitle(@StringRes titleResId: Int) {
-		textViewSubtitle.setTextAndVisible(titleResId)
-	}
-
-	fun setProgress(value: Float, animate: Boolean) {
-		val prevAnimator = progressAnimator
-		if (animate && context.isAnimationsEnabled) {
-			if (value == targetProgress) {
-				return
-			}
-			targetProgress = value
-			progressAnimator = ValueAnimator.ofFloat(progress, value).apply {
-				duration = context.getAnimationDuration(android.R.integer.config_mediumAnimTime)
-				interpolator = AccelerateDecelerateInterpolator()
-				addUpdateListener(this@ProgressButton)
-			}
-			progressAnimator?.start()
-		} else {
-			progressAnimator = null
-			progress = value
-			targetProgress = value
-			invalidate()
-		}
-		prevAnimator?.cancel()
-	}
-
-	private fun applyGravity() {
-		val value = (gravity and Gravity.HORIZONTAL_GRAVITY_MASK) or Gravity.CENTER_VERTICAL
-		textViewTitle.gravity = value
-		textViewSubtitle.gravity = value
-	}
-
-	private class OutlineProvider : ViewOutlineProvider() {
-
-		override fun getOutline(view: View, outline: Outline) {
-			outline.setRoundRect(0, 0, view.width, view.height, view.height / 2f)
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SlidingBottomNavigationView.kt

@@ -77,6 +77,11 @@ class SlidingBottomNavigationView @JvmOverloads constructor(
 		}
 	}
 
+	override fun setMinimumHeight(minHeight: Int) {
+		super.setMinimumHeight(minHeight)
+		getChildAt(0)?.minimumHeight = minHeight
+	}
+
 	fun show() {
 		if (currentState == STATE_UP) {
 			return

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ZoomControl.kt

@@ -4,14 +4,14 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.LinearLayout
+import com.google.android.material.button.MaterialButtonGroup
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.databinding.ViewZoomBinding
 
 class ZoomControl @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-) : LinearLayout(context, attrs), View.OnClickListener {
+) : MaterialButtonGroup(context, attrs), View.OnClickListener {
 
 	private val binding = ViewZoomBinding.inflate(LayoutInflater.from(context), this)
 

app/src/main/kotlin/org/koitharu/kotatsu/core/util/EditTextValidator.kt

@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.core.util
 
 import android.content.Context
 import android.text.Editable
-import android.text.TextWatcher
 import android.widget.EditText
 import androidx.annotation.CallSuper
+import org.koitharu.kotatsu.core.ui.util.DefaultTextWatcher
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import java.lang.ref.WeakReference
 
-abstract class EditTextValidator : TextWatcher {
+abstract class EditTextValidator : DefaultTextWatcher {
 
 	private var editTextRef: WeakReference<EditText>? = null
 
@@ -17,10 +17,6 @@ abstract class EditTextValidator : TextWatcher {
 			"EditTextValidator is not attached to EditText"
 		}
 
-	override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
-
-	override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit
-
 	@CallSuper
 	override fun afterTextChanged(s: Editable?) {
 		val editText = editTextRef?.get() ?: return

app/src/main/kotlin/org/koitharu/kotatsu/core/util/KotatsuColors.kt

@@ -13,6 +13,7 @@ import kotlin.math.absoluteValue
 object KotatsuColors {
 
 	@ColorInt
+	@Deprecated("")
 	fun segmentColor(context: Context, @AttrRes resId: Int): Int {
 		val colorHex = String.format("%06x", context.getThemeColor(resId))
 		val hue = getHue(colorHex)
@@ -21,6 +22,13 @@ object KotatsuColors {
 		return MaterialColors.harmonize(color, backgroundColor)
 	}
 
+	@ColorInt
+	fun segmentColorRandom(context: Context, seed: Any): Int {
+		val color = random(seed)
+		val backgroundColor = context.getThemeColor(R.attr.colorSurfaceContainerHigh)
+		return MaterialColors.harmonize(color, backgroundColor)
+	}
+
 	@ColorInt
 	fun random(seed: Any): Int {
 		val hue = (seed.hashCode() % 360).absoluteValue.toFloat()

app/src/main/kotlin/org/koitharu/kotatsu/core/util/LocaleStringComparator.kt

@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.util
+
+import androidx.core.os.LocaleListCompat
+import org.koitharu.kotatsu.core.util.ext.indexOfContains
+import org.koitharu.kotatsu.core.util.ext.iterator
+
+class LocaleStringComparator : Comparator<String?> {
+
+	private val deviceLocales: List<String?>
+
+	init {
+		val localeList = LocaleListCompat.getAdjustedDefault()
+		deviceLocales = buildList(localeList.size() + 1) {
+			add(null)
+			val set = HashSet<String?>(localeList.size() + 1)
+			set.add(null)
+			for (locale in localeList) {
+				val lang = locale.getDisplayLanguage(locale)
+				if (set.add(lang)) {
+					add(lang)
+				}
+			}
+		}
+	}
+
+	override fun compare(a: String?, b: String?): Int {
+		val indexA = deviceLocales.indexOfContains(a, true)
+		val indexB = deviceLocales.indexOfContains(b, true)
+		return when {
+			indexA < 0 && indexB < 0 -> compareValues(a, b)
+			indexA < 0 -> 1
+			indexB < 0 -> -1
+			else -> compareValues(indexA, indexB)
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/LocaleUtils.kt

@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.core.util
+
+import android.graphics.Paint
+import androidx.core.graphics.PaintCompat
+import org.koitharu.kotatsu.parsers.util.ifNullOrEmpty
+import java.util.Locale
+
+object LocaleUtils {
+
+	private val paint = Paint()
+
+	fun getEmojiFlag(locale: Locale): String? {
+		val code = when (val c = locale.country.ifNullOrEmpty { locale.toLanguageTag() }.uppercase(Locale.ENGLISH)) {
+			"EN" -> "GB"
+			"JA" -> "JP"
+			"VI" -> "VN"
+			"ZH" -> "CN"
+			else -> c
+		}
+		val emoji = countryCodeToEmojiFlag(code)
+		return if (PaintCompat.hasGlyph(paint, emoji)) {
+			emoji
+		} else {
+			null
+		}
+	}
+
+	private fun countryCodeToEmojiFlag(countryCode: String): String {
+		return countryCode.map { char ->
+			Character.codePointAt("$char", 0) - 0x41 + 0x1F1E6
+		}.map { codePoint ->
+			Character.toChars(codePoint)
+		}.joinToString(separator = "") { charArray ->
+			String(charArray)
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/MimeTypes.kt

@@ -0,0 +1,46 @@
+package org.koitharu.kotatsu.core.util
+
+import android.os.Build
+import android.webkit.MimeTypeMap
+import org.jetbrains.annotations.Blocking
+import org.koitharu.kotatsu.core.util.ext.MimeType
+import org.koitharu.kotatsu.core.util.ext.toMimeTypeOrNull
+import org.koitharu.kotatsu.parsers.util.nullIfEmpty
+import org.koitharu.kotatsu.parsers.util.removeSuffix
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import java.io.File
+import java.nio.file.Files
+import coil3.util.MimeTypeMap as CoilMimeTypeMap
+
+object MimeTypes {
+
+	fun getMimeTypeFromExtension(fileName: String): MimeType? {
+		return CoilMimeTypeMap.getMimeTypeFromExtension(getNormalizedExtension(fileName) ?: return null)
+			?.toMimeTypeOrNull()
+	}
+
+	fun getMimeTypeFromUrl(url: String): MimeType? {
+		return CoilMimeTypeMap.getMimeTypeFromUrl(url)?.toMimeTypeOrNull()
+	}
+
+	fun getExtension(mimeType: MimeType?): String? {
+		return MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType?.toString() ?: return null)?.nullIfEmpty()
+	}
+
+	@Blocking
+	fun probeMimeType(file: File): MimeType? {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			runCatchingCancellable {
+				Files.probeContentType(file.toPath())?.toMimeTypeOrNull()
+			}.getOrNull()?.let { return it }
+		}
+		return getMimeTypeFromExtension(file.name)
+	}
+
+	fun getNormalizedExtension(name: String): String? = name
+		.lowercase()
+		.removeSuffix('~')
+		.removeSuffix(".tmp")
+		.substringAfterLast('.', "")
+		.takeIf { it.length in 2..5 }
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt

@@ -5,7 +5,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.ActivityManager
 import android.app.ActivityManager.MemoryInfo
-import android.app.ActivityOptions
 import android.app.LocaleConfig
 import android.content.ComponentName
 import android.content.Context
@@ -14,32 +13,27 @@ import android.content.Context.POWER_SERVICE
 import android.content.ContextWrapper
 import android.content.Intent
 import android.content.OperationApplicationException
-import android.content.SharedPreferences
 import android.content.SyncResult
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.content.pm.ResolveInfo
 import android.database.SQLException
 import android.graphics.Bitmap
-import android.graphics.Color
 import android.net.ConnectivityManager
 import android.os.Build
-import android.os.Bundle
 import android.os.PowerManager
 import android.provider.Settings
-import android.view.View
 import android.view.ViewPropertyAnimator
-import android.view.Window
+import android.webkit.CookieManager
 import android.webkit.WebView
 import androidx.activity.result.ActivityResultLauncher
+import androidx.annotation.CheckResult
 import androidx.annotation.IntegerRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDialog
-import androidx.core.app.ActivityCompat
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
 import androidx.core.os.LocaleListCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
@@ -48,15 +42,8 @@ import androidx.lifecycle.coroutineScope
 import androidx.webkit.WebViewCompat
 import androidx.webkit.WebViewFeature
 import androidx.work.CoroutineWorker
-import com.google.android.material.elevation.ElevationOverlayProvider
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runInterruptible
 import okio.IOException
@@ -69,8 +56,8 @@ import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.xmlpull.v1.XmlPullParser
 import org.xmlpull.v1.XmlPullParserException
 import java.io.File
+import java.util.concurrent.TimeUnit
 import kotlin.math.roundToLong
-import com.google.android.material.R as materialR
 
 val Context.activityManager: ActivityManager?
 	get() = getSystemService(ACTIVITY_SERVICE) as? ActivityManager
@@ -86,12 +73,14 @@ suspend fun CoroutineWorker.trySetForeground(): Boolean = runCatchingCancellable
 	setForeground(info)
 }.isSuccess
 
+@CheckResult
 fun <I> ActivityResultLauncher<I>.resolve(context: Context, input: I): ResolveInfo? {
 	val pm = context.packageManager
 	val intent = contract.createIntent(context, input)
 	return pm.resolveActivity(intent, 0)
 }
 
+@CheckResult
 fun <I> ActivityResultLauncher<I>.tryLaunch(
 	input: I,
 	options: ActivityOptionsCompat? = null,
@@ -101,25 +90,6 @@ fun <I> ActivityResultLauncher<I>.tryLaunch(
 	e.printStackTraceDebug()
 }.isSuccess
 
-fun SharedPreferences.observe(): Flow<String?> = callbackFlow {
-	val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-		trySendBlocking(key)
-	}
-	registerOnSharedPreferenceChangeListener(listener)
-	awaitClose {
-		unregisterOnSharedPreferenceChangeListener(listener)
-	}
-}
-
-fun <T> SharedPreferences.observe(key: String, valueProducer: suspend () -> T): Flow<T> = flow {
-	emit(valueProducer())
-	observe().collect { upstreamKey ->
-		if (upstreamKey == key) {
-			emit(valueProducer())
-		}
-	}
-}.distinctUntilChanged()
-
 fun Lifecycle.postDelayed(delay: Long, runnable: Runnable) {
 	coroutineScope.launch {
 		delay(delay)
@@ -139,23 +109,6 @@ fun SyncResult.onError(error: Throwable) {
 	error.printStackTraceDebug()
 }
 
-fun Window.setNavigationBarTransparentCompat(context: Context, elevation: Float, alphaFactor: Float = 0.7f) {
-	navigationBarColor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
-		!context.getSystemBoolean("config_navBarNeedsScrim", true)
-	) {
-		Color.TRANSPARENT
-	} else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1) {
-		val baseColor = context.getThemeColor(android.R.attr.navigationBarColor)
-		ColorUtils.setAlphaComponent(baseColor, (Color.alpha(baseColor) * alphaFactor).toInt())
-	} else {
-		// Set navbar scrim 70% of navigationBarColor
-		ElevationOverlayProvider(context).compositeOverlayIfNeeded(
-			context.getThemeColor(materialR.attr.colorSurfaceContainer, alphaFactor),
-			elevation,
-		)
-	}
-}
-
 val Context.animatorDurationScale: Float
 	get() = Settings.Global.getFloat(this.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f)
 
@@ -171,7 +124,7 @@ fun Context.getAnimationDuration(@IntegerRes resId: Int): Long {
 }
 
 fun Context.isLowRamDevice(): Boolean {
-	return activityManager?.isLowRamDevice ?: false
+	return activityManager?.isLowRamDevice == true
 }
 
 fun Context.isPowerSaveMode(): Boolean {
@@ -185,18 +138,6 @@ val Context.ramAvailable: Long
 		return result.availMem
 	}
 
-fun scaleUpActivityOptionsOf(view: View): Bundle? = if (view.context.isAnimationsEnabled) {
-	ActivityOptions.makeScaleUpAnimation(
-		view,
-		0,
-		0,
-		view.width,
-		view.height,
-	).toBundle()
-} else {
-	null
-}
-
 @SuppressLint("DiscouragedApi")
 fun Context.getLocalesConfig(): LocaleListCompat {
 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -277,6 +218,9 @@ fun WebView.configureForParser(userAgentOverride: String?) = with(settings) {
 	if (userAgentOverride != null) {
 		userAgentString = userAgentOverride
 	}
+	val cookieManager = CookieManager.getInstance()
+	cookieManager.setAcceptCookie(true)
+	cookieManager.setAcceptThirdPartyCookies(this@configureForParser, true)
 }
 
 fun Context.restartApplication() {
@@ -285,3 +229,21 @@ fun Context.restartApplication() {
 	startActivity(intent)
 	activity?.finishAndRemoveTask()
 }
+
+internal inline fun <R> PowerManager?.withPartialWakeLock(tag: String, body: (PowerManager.WakeLock?) -> R): R {
+	val wakeLock = newPartialWakeLock(tag)
+	return try {
+		wakeLock?.acquire(TimeUnit.HOURS.toMillis(1))
+		body(wakeLock)
+	} finally {
+		wakeLock?.release()
+	}
+}
+
+private fun PowerManager?.newPartialWakeLock(tag: String): PowerManager.WakeLock? {
+	return if (this != null && isWakeLockLevelSupported(PowerManager.PARTIAL_WAKE_LOCK)) {
+		newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, tag)
+	} else {
+		null
+	}
+}