Update parsers

Currently translated at 91.4% (398 of 435 strings)

Co-authored-by: Dawid Jarubas <jarubas.dawid@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pl/
Translation: Kotatsu/Strings

.gitignore

@@ -12,9 +12,11 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
+/.idea/kotlinc.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/androidTestResultsUserPreferences.xml
 /.idea/render.experimental.xml
+/.idea/inspectionProfiles/
 .DS_Store
 /build
 /captures

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/gradle.xml

@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/inspectionProfiles/Project_Default.xml

@@ -1,17 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="BooleanLiteralArgument" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="Destructure" enabled="true" level="INFO" enabled_by_default="true" />
-    <inspection_tool class="FillClass" enabled="true" level="INFORMATION" enabled_by_default="true">
-      <option name="withoutDefaultValues" value="true" />
-    </inspection_tool>
-    <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="KotlinFunctionArgumentsHelper" enabled="true" level="INFORMATION" enabled_by_default="true">
-      <option name="withoutDefaultValues" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ReplaceCollectionCountWithSize" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="TrailingComma" enabled="true" level="INFORMATION" enabled_by_default="true" />
-    <inspection_tool class="ZeroLengthArrayInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

.idea/kotlinc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Kotlin2JvmCompilerArguments">
-    <option name="jvmTarget" value="1.8" />
-  </component>
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.0" />
-  </component>
-</project>

README.md

@@ -2,21 +2,16 @@
 
 Kotatsu is a free and open source manga reader for Android.
 
-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![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)
 
 ### Download
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-alt="Get it on F-Droid"
-height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)
-
-Download APK directly from GitHub:
-
-- **[Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)**
+- **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.
 
 ### Main Features
 
-* Online manga catalogues
+* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers)
 * Search manga by name and genres
 * Reading history and bookmarks
 * Favourites organized by user-defined categories
@@ -24,7 +19,7 @@ Download APK directly from GitHub:
 * Tablet-optimized Material You UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
-* Shikimori integration (manga tracking)
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
 * Password/fingerprint protect access to the app
 * History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 

app/build.gradle

@@ -7,16 +7,16 @@ plugins {
 }
 
 android {
-	compileSdkVersion 33
-	buildToolsVersion '33.0.0'
-	namespace 'org.koitharu.kotatsu'
+	compileSdk = 33
+	buildToolsVersion = '33.0.2'
+	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 509
-		versionName '4.2'
+		versionCode 539
+		versionName '5.0.1'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -25,12 +25,6 @@ android {
 				arg 'room.schemaLocation', "$projectDir/schemas".toString()
 			}
 		}
-
-		// define this values in your local.properties file
-		buildConfigField 'String', 'SHIKIMORI_CLIENT_ID', "\"${localProperty('shikimori.clientId')}\""
-		buildConfigField 'String', 'SHIKIMORI_CLIENT_SECRET', "\"${localProperty('shikimori.clientSecret')}\""
-		resValue "string", "acra_login", "${localProperty('acra.login')}"
-		resValue "string", "acra_password", "${localProperty('acra.password')}"
 	}
 	buildTypes {
 		debug {
@@ -50,21 +44,21 @@ android {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_1_8.toString()
+		jvmTarget = JavaVersion.VERSION_17.toString()
 		freeCompilerArgs += [
+			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
 			'-opt-in=coil.annotation.ExperimentalCoilApi',
-			'-opt-in=com.google.android.material.badge.ExperimentalBadgeUtils',
 		]
 	}
 	lint {
-		abortOnError false
+		abortOnError true
 		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
@@ -83,34 +77,36 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation('com.github.KotatsuApp:kotatsu-parsers:cf00732023') {
+	//noinspection GradleDependency
+	implementation('com.github.KotatsuApp:kotatsu-parsers:3e349d3db3') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.0'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.21'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
-	implementation 'androidx.core:core-ktx:1.9.0'
-	implementation 'androidx.activity:activity-ktx:1.6.1'
-	implementation 'androidx.fragment:fragment-ktx:1.5.5'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
+	implementation 'androidx.appcompat:appcompat:1.6.1'
+	implementation 'androidx.core:core-ktx:1.10.0'
+	implementation 'androidx.activity:activity-ktx:1.7.1'
+	implementation 'androidx.fragment:fragment-ktx:1.5.7'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.6.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.2.1'
+	implementation 'androidx.recyclerview:recyclerview:1.3.0'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 	implementation 'androidx.preference:preference-ktx:1.2.0'
-	implementation 'androidx.work:work-runtime-ktx:2.7.1'
+	implementation 'androidx.work:work-runtime-ktx:2.8.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.7.0'
+	implementation 'com.google.android.material:material:1.8.0'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.6.1'
 
-	implementation 'androidx.room:room-runtime:2.4.3'
-	implementation 'androidx.room:room-ktx:2.4.3'
-	kapt 'androidx.room:room-compiler:2.4.3'
+	implementation 'androidx.room:room-runtime:2.5.1'
+	implementation 'androidx.room:room-ktx:2.5.1'
+	kapt 'androidx.room:room-compiler:2.5.1'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
@@ -119,15 +115,16 @@ dependencies {
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'com.google.dagger:hilt-android:2.44.2'
-	kapt 'com.google.dagger:hilt-compiler:2.44.2'
+	implementation 'com.google.dagger:hilt-android:2.45'
+	kapt 'com.google.dagger:hilt-compiler:2.45'
 	implementation 'androidx.hilt:hilt-work:1.0.0'
 	kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
-	implementation 'io.coil-kt:coil-base:2.2.2'
-	implementation 'io.coil-kt:coil-svg:2.2.2'
+	implementation 'io.coil-kt:coil-base:2.3.0'
+	implementation 'io.coil-kt:coil-svg:2.3.0'
 	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:1b19231b2f'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
+	implementation 'io.noties.markwon:core:4.6.2'
 
 	implementation 'ch.acra:acra-http:5.9.7'
 	implementation 'ch.acra:acra-dialog:5.9.7'
@@ -135,7 +132,7 @@ dependencies {
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20220924'
+	testImplementation 'org.json:json:20230227'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
 	androidTestImplementation 'androidx.test:runner:1.5.2'
@@ -145,9 +142,9 @@ dependencies {
 
 	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
-	androidTestImplementation 'androidx.room:room-testing:2.4.3'
+	androidTestImplementation 'androidx.room:room-testing:2.5.1'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.44.2'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.44.2'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.45'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.45'
 }

app/proguard-rules.pro

@@ -1,5 +1,4 @@
 -optimizationpasses 8
--dontobfuscate
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
 	public static void checkExpressionValueIsNotNull(...);
 	public static void checkNotNullExpressionValue(...);
@@ -10,7 +9,10 @@
 }
 -keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
--dontwarn okhttp3.internal.platform.ConscryptPlatform
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
 
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
 -keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment

app/src/debug/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt

@@ -0,0 +1,56 @@
+package org.koitharu.kotatsu.core.network
+
+import android.util.Log
+import okhttp3.Interceptor
+import okhttp3.Response
+import okio.Buffer
+import org.koitharu.kotatsu.core.network.CommonHeaders.ACCEPT_ENCODING
+
+class CurlLoggingInterceptor(
+	private val curlOptions: String? = null
+) : Interceptor {
+
+	override fun intercept(chain: Interceptor.Chain): Response {
+		val request = chain.request()
+		var isCompressed = false
+
+		val curlCmd = StringBuilder()
+		curlCmd.append("curl")
+		if (curlOptions != null) {
+			curlCmd.append(' ').append(curlOptions)
+		}
+		curlCmd.append(" -X ").append(request.method)
+
+		for ((name, value) in request.headers) {
+			if (name.equals(ACCEPT_ENCODING, ignoreCase = true) && value.equals("gzip", ignoreCase = true)) {
+				isCompressed = true
+			}
+			curlCmd.append(" -H \"").append(name).append(": ").append(value.escape()).append('\"')
+		}
+
+		val body = request.body
+		if (body != null) {
+			val buffer = Buffer()
+			body.writeTo(buffer)
+			val charset = body.contentType()?.charset() ?: Charsets.UTF_8
+			curlCmd.append(" --data-raw '")
+				.append(buffer.readString(charset).replace("\n", "\\n"))
+				.append("'")
+		}
+		if (isCompressed) {
+			curlCmd.append(" --compressed")
+		}
+		curlCmd.append(" \"").append(request.url).append('"')
+
+		log("---cURL (" + request.url + ")")
+		log(curlCmd.toString())
+
+		return chain.proceed(request)
+	}
+
+	private fun String.escape() = replace("\"", "\\\"")
+
+	private fun log(msg: String) {
+		Log.d("CURL", msg)
+	}
+}

app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt

@@ -1,15 +1,20 @@
 package org.koitharu.kotatsu.core.parser
 
-import java.util.*
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+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 java.util.EnumSet
 
 /**
  * This parser is just for parser development, it should not be used in releases
  */
-class DummyParser(override val context: MangaLoaderContext) : MangaParser(MangaSource.DUMMY) {
+class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
 		get() = ConfigKey.Domain("", null)
@@ -37,4 +42,4 @@ class DummyParser(override val context: MangaLoaderContext) : MangaParser(MangaS
 	override suspend fun getTags(): Set<MangaTag> {
 		TODO("Not yet implemented")
 	}
-}
+}

app/src/debug/res/values/bools.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 	<bool name="leak_canary_add_launcher_icon" tools:node="replace">false</bool>
-</resources>
+</resources>

app/src/debug/res/values/constants.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="account_type_sync" translatable="false">org.kotatsu.debug.sync</string>
+	<string name="sync_authority_history" translatable="false">org.koitharu.kotatsu.debug.history</string>
+	<string name="sync_authority_favourites" translatable="false">org.koitharu.kotatsu.debug.favourites</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -24,6 +24,7 @@
 		android:allowBackup="true"
 		android:backupAgent="org.koitharu.kotatsu.settings.backup.AppBackupAgent"
 		android:dataExtractionRules="@xml/backup_rules"
+		android:enableOnBackInvokedCallback="true"
 		android:fullBackupContent="@xml/backup_content"
 		android:fullBackupOnly="true"
 		android:icon="@mipmap/ic_launcher"
@@ -93,6 +94,7 @@
 				<category android:name="android.intent.category.BROWSABLE" />
 
 				<data android:scheme="kotatsu" />
+				<data android:host="about" />
 			</intent-filter>
 		</activity>
 		<activity
@@ -140,13 +142,31 @@
 		<activity
 			android:name="org.koitharu.kotatsu.shelf.ui.config.ShelfSettingsActivity"
 			android:label="@string/settings" />
+		<activity
+			android:name="org.koitharu.kotatsu.scrobbling.common.ui.config.ScrobblerConfigActivity"
+			android:exported="true"
+			android:label="@string/settings"
+			android:launchMode="singleTop">
+
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+				<data android:host="shikimori-auth" />
+				<data android:host="anilist-auth" />
+				<data android:host="mal-auth" />
+			</intent-filter>
+
+		</activity>
 
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
 			android:foregroundServiceType="dataSync"
 			android:stopWithTask="false" />
 		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
-		<service android:name="org.koitharu.kotatsu.local.ui.ImportService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
@@ -207,13 +227,13 @@
 		</provider>
 		<provider
 			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncProvider"
-			android:authorities="org.koitharu.kotatsu.favourites"
+			android:authorities="@string/sync_authority_favourites"
 			android:exported="false"
 			android:label="@string/favourites"
 			android:syncable="true" />
 		<provider
 			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncProvider"
-			android:authorities="org.koitharu.kotatsu.history"
+			android:authorities="@string/sync_authority_history"
 			android:exported="false"
 			android:label="@string/history"
 			android:syncable="true" />

app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt

@@ -23,6 +23,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import javax.inject.Inject
 
@@ -50,6 +51,7 @@ class KotatsuApp : Application(), Configuration.Provider {
 			enableStrictMode()
 		}
 		AppCompatDelegate.setDefaultNightMode(settings.theme)
+		AppCompatDelegate.setApplicationLocales(settings.appLocales)
 		setupActivityLifecycleCallbacks()
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
@@ -124,6 +126,7 @@ class KotatsuApp : Application(), Configuration.Provider {
 				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
 				.setClassInstanceLimit(PagesCache::class.java, 1)
 				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+				.setClassInstanceLimit(PageLoader::class.java, 1)
 				.penaltyLog()
 				.build(),
 		)

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt

@@ -4,11 +4,7 @@ import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Size
 import androidx.room.withTransaction
-import java.io.File
-import java.io.InputStream
-import java.util.zip.ZipFile
-import javax.inject.Inject
-import kotlin.math.roundToInt
+import dagger.Reusable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -17,7 +13,11 @@ import kotlinx.coroutines.runInterruptible
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
+import org.koitharu.kotatsu.core.db.entity.toEntities
+import org.koitharu.kotatsu.core.db.entity.toEntity
+import org.koitharu.kotatsu.core.db.entity.toManga
+import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.ReaderMode
@@ -27,9 +27,15 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
+import java.io.File
+import java.io.InputStream
+import java.util.zip.ZipFile
+import javax.inject.Inject
+import kotlin.math.roundToInt
 
 private const val MIN_WEBTOON_RATIO = 2
 
+@Reusable
 class MangaDataRepository @Inject constructor(
 	private val okHttpClient: OkHttpClient,
 	private val db: MangaDatabase,
@@ -121,8 +127,8 @@ class MangaDataRepository @Inject constructor(
 			val request = Request.Builder()
 				.url(url)
 				.get()
-				.header(CommonHeaders.REFERER, page.referer)
-				.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
+				.tag(MangaSource::class.java, page.source)
+				.cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE)
 				.build()
 			okHttpClient.newCall(request).await().use {
 				runInterruptible(Dispatchers.IO) {

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt

@@ -3,15 +3,17 @@ package org.koitharu.kotatsu.base.domain
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import androidx.lifecycle.SavedStateHandle
+import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.getParcelableCompat
 import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
 
 class MangaIntent private constructor(
-	val manga: Manga?,
-	val mangaId: Long,
-	val uri: Uri?,
+	@JvmField val manga: Manga?,
+	@JvmField val mangaId: Long,
+	@JvmField val uri: Uri?,
 ) {
 
 	constructor(intent: Intent?) : this(
@@ -20,6 +22,12 @@ class MangaIntent private constructor(
 		uri = intent?.data,
 	)
 
+	constructor(savedStateHandle: SavedStateHandle) : this(
+		manga = savedStateHandle.get<ParcelableManga>(KEY_MANGA)?.manga,
+		mangaId = savedStateHandle[KEY_ID] ?: ID_NONE,
+		uri = savedStateHandle[BaseActivity.EXTRA_DATA],
+	)
+
 	constructor(args: Bundle?) : this(
 		manga = args?.getParcelableCompat<ParcelableManga>(KEY_MANGA)?.manga,
 		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,

app/src/main/java/org/koitharu/kotatsu/base/ui/AlertDialogFragment.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -39,6 +40,8 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 
 	open fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder = builder
 
+	open fun onDialogCreated(dialog: AlertDialog) = Unit
+
 	protected fun bindingOrNull(): B? = viewBinding
 
 	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.base.ui
 
+import android.content.Intent
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.MenuItem
@@ -12,6 +12,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.ActionBarContextView
 import androidx.appcompat.widget.Toolbar
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.ViewCompat
@@ -25,42 +26,49 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.base.ui.util.BaseActivityEntryPoint
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
-import org.koitharu.kotatsu.base.ui.util.inject
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.utils.ext.getThemeColor
-import javax.inject.Inject
 
+@Suppress("LeakingThis")
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
 	WindowInsetsDelegate.WindowInsetsListener {
 
-	@Inject
-	lateinit var settings: AppSettings
+	private var isAmoledTheme = false
 
 	protected lateinit var binding: B
 		private set
 
-	@Suppress("LeakingThis")
+	@JvmField
 	protected val exceptionResolver = ExceptionResolver(this)
 
-	@Suppress("LeakingThis")
+	@JvmField
 	protected val insetsDelegate = WindowInsetsDelegate(this)
 
+	@JvmField
 	val actionModeDelegate = ActionModeDelegate()
 
 	override fun onCreate(savedInstanceState: Bundle?) {
-		EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).inject(this)
-		val isAmoled = settings.isAmoledTheme
-		val isDynamic = settings.isDynamicTheme
-		when {
-			isAmoled && isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet_Amoled)
-			isAmoled -> setTheme(R.style.Theme_Kotatsu_Amoled)
-			isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet)
+		val settings = EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).settings
+		isAmoledTheme = settings.isAmoledTheme
+		setTheme(settings.colorScheme.styleResId)
+		if (isAmoledTheme) {
+			setTheme(R.style.ThemeOverlay_Kotatsu_Amoled)
 		}
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)
 		insetsDelegate.handleImeInsets = true
+		putDataToExtras(intent)
+	}
+
+	override fun onPostCreate(savedInstanceState: Bundle?) {
+		super.onPostCreate(savedInstanceState)
+		onBackPressedDispatcher.addCallback(actionModeDelegate)
+	}
+
+	override fun onNewIntent(intent: Intent?) {
+		putDataToExtras(intent)
+		super.onNewIntent(intent)
 	}
 
 	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
@@ -84,14 +92,14 @@ abstract class BaseActivity<B : ViewBinding> :
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
+		@Suppress("DEPRECATION")
 		onBackPressed()
 		true
 	} else super.onOptionsItemSelected(item)
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) { // TODO remove
-			// ActivityCompat.recreate(this)
-			TODO("Test error")
+		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+			ActivityCompat.recreate(this)
 			return true
 		}
 		return super.onKeyDown(keyCode, event)
@@ -104,7 +112,7 @@ abstract class BaseActivity<B : ViewBinding> :
 	protected fun isDarkAmoledTheme(): Boolean {
 		val uiMode = resources.configuration.uiMode
 		val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-		return isNight && settings.isAmoledTheme
+		return isNight && isAmoledTheme
 	}
 
 	@CallSuper
@@ -133,16 +141,12 @@ abstract class BaseActivity<B : ViewBinding> :
 		window.statusBarColor = getThemeColor(android.R.attr.statusBarColor)
 	}
 
-	@Suppress("OVERRIDE_DEPRECATION", "DEPRECATION")
-	override fun onBackPressed() {
-		if ( // https://issuetracker.google.com/issues/139738913
-			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&
-			isTaskRoot &&
-			supportFragmentManager.backStackEntryCount == 0
-		) {
-			finishAfterTransition()
-		} else {
-			super.onBackPressed()
-		}
+	private fun putDataToExtras(intent: Intent?) {
+		intent?.putExtra(EXTRA_DATA, intent.data)
+	}
+
+	companion object {
+
+		const val EXTRA_DATA = "data"
 	}
 }

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt

@@ -2,20 +2,21 @@ package org.koitharu.kotatsu.base.ui
 
 import android.app.Dialog
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
+import androidx.activity.OnBackPressedDispatcher
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
-import com.google.android.material.R as materialR
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
-import org.koitharu.kotatsu.utils.ext.displayCompat
+import org.koitharu.kotatsu.utils.ext.findActivity
+import org.koitharu.kotatsu.utils.ext.getDisplaySize
+import com.google.android.material.R as materialR
 
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 
@@ -27,6 +28,12 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	protected val behavior: BottomSheetBehavior<*>?
 		get() = (dialog as? BottomSheetDialog)?.behavior
 
+	val isExpanded: Boolean
+		get() = behavior?.state == BottomSheetBehavior.STATE_EXPANDED
+
+	val onBackPressedDispatcher: OnBackPressedDispatcher
+		get() = (requireDialog() as AppBottomSheetDialog).onBackPressedDispatcher
+
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -34,21 +41,20 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	): View {
 		val binding = onInflateView(inflater, container)
 		viewBinding = binding
+		return binding.root
+	}
 
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
 		// Enforce max width for tablets
 		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
 		if (width > 0) {
 			behavior?.maxWidth = width
 		}
-
-		// Set peek height to 50% display height
-		requireContext().displayCompat?.let {
-			val metrics = DisplayMetrics()
-			it.getRealMetrics(metrics)
-			behavior?.peekHeight = (metrics.heightPixels * 0.4).toInt()
+		// Set peek height to 40% display height
+		binding.root.context.findActivity()?.getDisplaySize()?.let {
+			behavior?.peekHeight = (it.height() * 0.4).toInt()
 		}
-
-		return binding.root
 	}
 
 	override fun onDestroyView() {

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt

@@ -10,6 +10,7 @@ import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 
+@Suppress("LeakingThis")
 abstract class BaseFragment<B : ViewBinding> :
 	Fragment(),
 	WindowInsetsDelegate.WindowInsetsListener {
@@ -19,10 +20,10 @@ abstract class BaseFragment<B : ViewBinding> :
 	protected val binding: B
 		get() = checkNotNull(viewBinding)
 
-	@Suppress("LeakingThis")
+	@JvmField
 	protected val exceptionResolver = ExceptionResolver(this)
 
-	@Suppress("LeakingThis")
+	@JvmField
 	protected val insetsDelegate = WindowInsetsDelegate(this)
 
 	protected val actionModeDelegate: ActionModeDelegate

app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt

@@ -9,12 +9,13 @@ import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.settings.SettingsHeadersFragment
+import javax.inject.Inject
 
+@Suppress("LeakingThis")
 @AndroidEntryPoint
 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	PreferenceFragmentCompat(),
@@ -24,7 +25,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	@Inject
 	lateinit var settings: AppSettings
 
-	@Suppress("LeakingThis")
+	@JvmField
 	protected val insetsDelegate = WindowInsetsDelegate(this)
 
 	override val recyclerView: RecyclerView
@@ -55,7 +56,6 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 		)
 	}
 
-	@Suppress("UsePropertyAccessSyntax")
 	protected fun setTitle(title: CharSequence) {
 		(parentFragment as? SettingsHeadersFragment)?.setTitle(title)
 			?: activity?.setTitle(title)

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt

@@ -3,16 +3,24 @@ package org.koitharu.kotatsu.base.ui
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.base.ui.util.CountedBooleanLiveData
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 abstract class BaseViewModel : ViewModel() {
 
+	@JvmField
 	protected val loadingCounter = CountedBooleanLiveData()
+
+	@JvmField
 	protected val errorEvent = SingleLiveEvent<Throwable>()
 
 	val onError: LiveData<Throwable>
@@ -46,4 +54,4 @@ abstract class BaseViewModel : ViewModel() {
 			errorEvent.postCall(throwable)
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.base.ui
 
-import android.app.Service
 import android.content.Intent
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.CoroutineDispatcher
@@ -20,7 +19,7 @@ abstract class CoroutineIntentService : BaseService() {
 	final override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
 		launchCoroutine(intent, startId)
-		return Service.START_REDELIVER_INTENT
+		return START_REDELIVER_INTENT
 	}
 
 	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch(errorHandler(startId)) {

app/src/main/java/org/koitharu/kotatsu/base/ui/list/BoundsScrollListener.kt

@@ -6,8 +6,6 @@ import androidx.recyclerview.widget.RecyclerView
 abstract class BoundsScrollListener(private val offsetTop: Int, private val offsetBottom: Int) :
 	RecyclerView.OnScrollListener() {
 
-	constructor(offset: Int = 0) : this(offset, offset)
-
 	override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
 		super.onScrolled(recyclerView, dx, dy)
 		val layoutManager = (recyclerView.layoutManager as? LinearLayoutManager) ?: return
@@ -28,4 +26,4 @@ abstract class BoundsScrollListener(private val offsetTop: Int, private val offs
 	abstract fun onScrolledToStart(recyclerView: RecyclerView)
 
 	abstract fun onScrolledToEnd(recyclerView: RecyclerView)
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/list/NestedScrollStateHandle.kt

@@ -0,0 +1,64 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.util.SparseArray
+import androidx.core.os.BundleCompat
+import androidx.core.view.doOnNextLayout
+import androidx.recyclerview.widget.RecyclerView
+import java.util.Collections
+import java.util.WeakHashMap
+
+class NestedScrollStateHandle(
+	savedInstanceState: Bundle?,
+	private val key: String,
+) {
+
+	private val storage: SparseArray<Parcelable?> = savedInstanceState?.let {
+		BundleCompat.getSparseParcelableArray(it, key, Parcelable::class.java)
+	} ?: SparseArray<Parcelable?>()
+	private val controllers = Collections.newSetFromMap<Controller>(WeakHashMap())
+
+	fun attach(recycler: RecyclerView) = Controller(recycler).also(controllers::add)
+
+	fun onSaveInstanceState(outState: Bundle) {
+		controllers.forEach {
+			it.saveState()
+		}
+		outState.putSparseParcelableArray(key, storage)
+	}
+
+	inner class Controller(
+		private val recycler: RecyclerView
+	) {
+
+		private var lastPosition: Int = -1
+
+		fun onBind(position: Int) {
+			if (position != lastPosition) {
+				saveState()
+				lastPosition = position
+				storage[position]?.let {
+					restoreState(it)
+				}
+			}
+		}
+
+		fun onRecycled() {
+			saveState()
+			lastPosition = -1
+		}
+
+		fun saveState() {
+			if (lastPosition != -1) {
+				storage[lastPosition] = recycler.layoutManager?.onSaveInstanceState()
+			}
+		}
+
+		private fun restoreState(state: Parcelable) {
+			recycler.doOnNextLayout {
+				recycler.layoutManager?.onRestoreInstanceState(state)
+			}
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/list/OnTipCloseListener.kt

@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.base.ui.list
+
+interface OnTipCloseListener<T> {
+
+	fun onCloseTip(tip: T)
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeDelegate.kt

@@ -1,10 +1,11 @@
 package org.koitharu.kotatsu.base.ui.util
 
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.view.ActionMode
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 
-class ActionModeDelegate {
+class ActionModeDelegate : OnBackPressedCallback(false) {
 
 	private var activeActionMode: ActionMode? = null
 	private var listeners: MutableList<ActionModeListener>? = null
@@ -12,13 +13,19 @@ class ActionModeDelegate {
 	val isActionModeStarted: Boolean
 		get() = activeActionMode != null
 
+	override fun handleOnBackPressed() {
+		activeActionMode?.finish()
+	}
+
 	fun onSupportActionModeStarted(mode: ActionMode) {
 		activeActionMode = mode
+		isEnabled = true
 		listeners?.forEach { it.onActionModeStarted(mode) }
 	}
 
 	fun onSupportActionModeFinished(mode: ActionMode) {
 		activeActionMode = null
+		isEnabled = false
 		listeners?.forEach { it.onActionModeFinished(mode) }
 	}
 
@@ -47,4 +54,4 @@ class ActionModeDelegate {
 			removeListener(listener)
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActivityRecreationHandle.kt

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.base.ui.util
 
 import android.app.Activity
 import android.os.Bundle
+import androidx.core.app.ActivityCompat
 import org.koitharu.kotatsu.base.ui.DefaultActivityLifecycleCallbacks
 import java.util.WeakHashMap
 import javax.inject.Inject
@@ -22,6 +23,6 @@ class ActivityRecreationHandle @Inject constructor() : DefaultActivityLifecycleC
 
 	fun recreateAll() {
 		val snapshot = activities.keys.toList()
-		snapshot.forEach { it.recreate() }
+		snapshot.forEach { ActivityCompat.recreate(it) }
 	}
 }

app/src/main/java/org/koitharu/kotatsu/base/ui/util/BaseActivityEntryPoint.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.base.ui.util
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.prefs.AppSettings
 
 @EntryPoint
@@ -11,8 +10,3 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 interface BaseActivityEntryPoint {
 	val settings: AppSettings
 }
-
-// Hilt cannot inject into parametrized classes
-fun BaseActivityEntryPoint.inject(activity: BaseActivity<*>) {
-	activity.settings = settings
-}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/CollapseActionViewCallback.kt

@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.view.MenuItem
+import android.view.MenuItem.OnActionExpandListener
+import androidx.activity.OnBackPressedCallback
+
+class CollapseActionViewCallback(
+	private val menuItem: MenuItem
+) : OnBackPressedCallback(menuItem.isActionViewExpanded), OnActionExpandListener {
+
+	override fun handleOnBackPressed() {
+		menuItem.collapseActionView()
+	}
+
+	override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+		isEnabled = true
+		return true
+	}
+
+	override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+		isEnabled = false
+		return true
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/DefaultTextWatcher.kt

@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.text.Editable
+import android.text.TextWatcher
+
+interface DefaultTextWatcher : TextWatcher {
+
+	override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+	override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit
+
+	override fun afterTextChanged(s: Editable?) = Unit
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleActionObserver.kt

@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.view.View
+import androidx.lifecycle.Observer
+import com.google.android.material.snackbar.Snackbar
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.domain.reverseAsync
+import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
+import org.koitharu.kotatsu.utils.ext.findActivity
+
+class ReversibleActionObserver(
+	private val snackbarHost: View,
+) : Observer<ReversibleAction?> {
+
+	override fun onChanged(value: ReversibleAction?) {
+		if (value == null) {
+			return
+		}
+		val handle = value.handle
+		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
+		val snackbar = Snackbar.make(snackbarHost, value.stringResId, length)
+		if (handle != null) {
+			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
+		}
+		(snackbarHost.context.findActivity() as? BottomNavOwner)?.let {
+			snackbar.anchorView = it.bottomNav
+		}
+		snackbar.show()
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/ShrinkOnScrollBehavior.kt

@@ -8,10 +8,12 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior
 import androidx.core.view.ViewCompat
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 
-class ShrinkOnScrollBehavior : Behavior<ExtendedFloatingActionButton> {
+open class ShrinkOnScrollBehavior : Behavior<ExtendedFloatingActionButton> {
 
-	@Suppress("unused") constructor() : super()
-	@Suppress("unused") constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
+	@Suppress("unused")
+	constructor() : super()
+	@Suppress("unused")
+	constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
 
 	override fun onStartNestedScroll(
 		coordinatorLayout: CoordinatorLayout,
@@ -45,4 +47,4 @@ class ShrinkOnScrollBehavior : Behavior<ExtendedFloatingActionButton> {
 			}
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/SpanSizeResolver.kt

@@ -0,0 +1,55 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.view.View
+import androidx.annotation.Px
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.parsers.util.toIntUp
+import kotlin.math.abs
+
+class SpanSizeResolver(
+	private val recyclerView: RecyclerView,
+	@Px private val minItemWidth: Int,
+) : View.OnLayoutChangeListener {
+
+	fun attach() {
+		recyclerView.addOnLayoutChangeListener(this)
+	}
+
+	fun detach() {
+		recyclerView.removeOnLayoutChangeListener(this)
+	}
+
+	override fun onLayoutChange(
+		v: View?,
+		left: Int,
+		top: Int,
+		right: Int,
+		bottom: Int,
+		oldLeft: Int,
+		oldTop: Int,
+		oldRight: Int,
+		oldBottom: Int,
+	) {
+		invalidateInternal(abs(right - left))
+	}
+
+	fun invalidate() {
+		invalidateInternal(recyclerView.width)
+	}
+
+	private fun invalidateInternal(width: Int) {
+		if (width <= 0) {
+			return
+		}
+		val lm = recyclerView.layoutManager as? GridLayoutManager ?: return
+		val estimatedCount = (width / minItemWidth.toFloat()).toIntUp()
+		if (lm.spanCount != estimatedCount) {
+			lm.spanCount = estimatedCount
+			lm.spanSizeLookup?.run {
+				invalidateSpanGroupIndexCache()
+				invalidateSpanIndexCache()
+			}
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt

@@ -10,8 +10,10 @@ class WindowInsetsDelegate(
 	private val listener: WindowInsetsListener,
 ) : OnApplyWindowInsetsListener, View.OnLayoutChangeListener {
 
+	@JvmField
 	var handleImeInsets: Boolean = false
 
+	@JvmField
 	var interceptingWindowInsetsListener: OnApplyWindowInsetsListener? = null
 
 	private var lastInsets: Insets? = null
@@ -63,4 +65,4 @@ class WindowInsetsDelegate(
 
 		fun onWindowInsetsChanged(insets: Insets)
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/BottomSheetHeaderBar.kt

@@ -4,10 +4,12 @@ import android.animation.LayoutTransition
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowInsets
 import androidx.annotation.AttrRes
+import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -15,16 +17,16 @@ import androidx.core.content.withStyledAttributes
 import androidx.core.view.*
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
-import com.google.android.material.R as materialR
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import java.util.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.databinding.LayoutSheetHeaderBinding
 import org.koitharu.kotatsu.utils.ext.getAnimationDuration
 import org.koitharu.kotatsu.utils.ext.getThemeDrawable
 import org.koitharu.kotatsu.utils.ext.parents
+import java.util.*
+import com.google.android.material.R as materialR
 
 private const val THROTTLE_DELAY = 200L
 
@@ -53,6 +55,9 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 	val toolbar: MaterialToolbar
 		get() = binding.toolbar
 
+	val menu: Menu
+		get() = binding.toolbar.menu
+
 	var title: CharSequence?
 		get() = binding.toolbar.title
 		set(value) {
@@ -140,6 +145,10 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 		binding.toolbar.invalidateMenu()
 	}
 
+	fun inflateMenu(@MenuRes resId: Int) {
+		binding.toolbar.inflateMenu(resId)
+	}
+
 	fun setNavigationOnClickListener(onClickListener: OnClickListener) {
 		binding.toolbar.setNavigationOnClickListener(onClickListener)
 	}
@@ -258,6 +267,7 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 				}
 				lp
 			}
+
 			else -> Toolbar.LayoutParams(params)
 		}
 	}
@@ -282,7 +292,7 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 		suppressLayoutCompat(false)
 	}
 
-	private inner class Callback : BottomSheetBehavior.BottomSheetCallback(), View.OnClickListener {
+	private inner class Callback : BottomSheetBehavior.BottomSheetCallback(), OnClickListener {
 
 		override fun onStateChanged(bottomSheet: View, newState: Int) {
 			onBottomSheetStateChanged(newState)

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableButtonGroup.kt

@@ -1,119 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import androidx.annotation.AttrRes
-import androidx.annotation.IdRes
-import androidx.core.view.children
-import com.google.android.material.R as materialR
-import com.google.android.material.button.MaterialButton
-import com.google.android.material.shape.ShapeAppearanceModel
-
-class CheckableButtonGroup @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = materialR.attr.materialButtonToggleGroupStyle,
-) : LinearLayout(context, attrs, defStyleAttr, materialR.style.Widget_MaterialComponents_MaterialButtonToggleGroup),
-	View.OnClickListener {
-
-	private val originalCornerData = ArrayList<CornerData>()
-
-	var onCheckedChangeListener: OnCheckedChangeListener? = null
-
-	override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
-		if (child is MaterialButton) {
-			setupButton(child)
-		}
-		super.addView(child, index, params)
-	}
-
-	override fun onFinishInflate() {
-		super.onFinishInflate()
-		updateChildShapes()
-	}
-
-	override fun onClick(v: View) {
-		setCheckedId(v.id)
-	}
-
-	fun setCheckedId(@IdRes viewRes: Int) {
-		children.forEach {
-			(it as? MaterialButton)?.isChecked = it.id == viewRes
-		}
-		onCheckedChangeListener?.onCheckedChanged(this, viewRes)
-	}
-
-	private fun updateChildShapes() {
-		val childCount = childCount
-		val firstVisibleChildIndex = 0
-		val lastVisibleChildIndex = childCount - 1
-		for (i in 0 until childCount) {
-			val button: MaterialButton = getChildAt(i) as? MaterialButton ?: continue
-			if (button.visibility == GONE) {
-				continue
-			}
-			val builder = button.shapeAppearanceModel.toBuilder()
-			val newCornerData: CornerData? =
-				getNewCornerData(i, firstVisibleChildIndex, lastVisibleChildIndex)
-			updateBuilderWithCornerData(builder, newCornerData)
-			button.shapeAppearanceModel = builder.build()
-		}
-	}
-
-	private fun setupButton(button: MaterialButton) {
-		button.setOnClickListener(this)
-		button.isElegantTextHeight = false
-		// Saves original corner data
-		val shapeAppearanceModel: ShapeAppearanceModel = button.shapeAppearanceModel
-		originalCornerData.add(
-			CornerData(
-				shapeAppearanceModel.topLeftCornerSize,
-				shapeAppearanceModel.bottomLeftCornerSize,
-				shapeAppearanceModel.topRightCornerSize,
-				shapeAppearanceModel.bottomRightCornerSize,
-			),
-		)
-	}
-
-	private fun getNewCornerData(
-		index: Int,
-		firstVisibleChildIndex: Int,
-		lastVisibleChildIndex: Int,
-	): CornerData? {
-		val cornerData: CornerData = originalCornerData.get(index)
-
-		// If only one (visible) child exists, use its original corners
-		if (firstVisibleChildIndex == lastVisibleChildIndex) {
-			return cornerData
-		}
-		val isHorizontal = orientation == HORIZONTAL
-		if (index == firstVisibleChildIndex) {
-			return if (isHorizontal) cornerData.start(this) else cornerData.top()
-		}
-		return if (index == lastVisibleChildIndex) {
-			if (isHorizontal) cornerData.end(this) else cornerData.bottom()
-		} else null
-	}
-
-	private fun updateBuilderWithCornerData(
-		shapeAppearanceModelBuilder: ShapeAppearanceModel.Builder,
-		cornerData: CornerData?,
-	) {
-		if (cornerData == null) {
-			shapeAppearanceModelBuilder.setAllCornerSizes(0f)
-			return
-		}
-		shapeAppearanceModelBuilder
-			.setTopLeftCornerSize(cornerData.topLeft)
-			.setBottomLeftCornerSize(cornerData.bottomLeft)
-			.setTopRightCornerSize(cornerData.topRight)
-			.setBottomRightCornerSize(cornerData.bottomRight)
-	}
-
-	fun interface OnCheckedChangeListener {
-		fun onCheckedChanged(group: CheckableButtonGroup, checkedId: Int)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt

@@ -1,17 +1,20 @@
 package org.koitharu.kotatsu.base.ui.widgets
 
+import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.View.OnClickListener
-import androidx.annotation.DrawableRes
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.getColorStateListOrThrow
 import androidx.core.view.children
-import com.google.android.material.R as materialR
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.utils.ext.castOrNull
-import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
+import com.google.android.material.R as materialR
 
 class ChipsView @JvmOverloads constructor(
 	context: Context,
@@ -27,6 +30,9 @@ class ChipsView @JvmOverloads constructor(
 	private val chipOnCloseListener = OnClickListener {
 		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
 	}
+	private val defaultChipStrokeColor: ColorStateList
+	private val defaultChipTextColor: ColorStateList
+	private val defaultChipIconTint: ColorStateList
 	var onChipClickListener: OnChipClickListener? = null
 		set(value) {
 			field = value
@@ -40,6 +46,15 @@ class ChipsView @JvmOverloads constructor(
 			children.forEach { (it as? Chip)?.isCloseIconVisible = isCloseIconVisible }
 		}
 
+	init {
+		@SuppressLint("CustomViewStyleable")
+		val a = context.obtainStyledAttributes(null, materialR.styleable.Chip, 0, R.style.Widget_Kotatsu_Chip)
+		defaultChipStrokeColor = a.getColorStateListOrThrow(materialR.styleable.Chip_chipStrokeColor)
+		defaultChipTextColor = a.getColorStateListOrThrow(materialR.styleable.Chip_android_textColor)
+		defaultChipIconTint = a.getColorStateListOrThrow(materialR.styleable.Chip_chipIconTint)
+		a.recycle()
+	}
+
 	override fun requestLayout() {
 		if (isLayoutSuppressedCompat) {
 			isLayoutCalledOnSuppressed = true
@@ -75,12 +90,15 @@ class ChipsView @JvmOverloads constructor(
 
 	private fun bindChip(chip: Chip, model: ChipModel) {
 		chip.text = model.title
-		if (model.icon == 0) {
-			chip.isChipIconVisible = false
+		val tint = if (model.tint == 0) {
+			null
 		} else {
-			chip.isChipIconVisible = true
-			chip.setChipIconResource(model.icon)
+			ContextCompat.getColorStateList(context, model.tint)
 		}
+		chip.chipIconTint = tint ?: defaultChipIconTint
+		chip.checkedIconTint = tint ?: defaultChipIconTint
+		chip.chipStrokeColor = tint ?: defaultChipStrokeColor
+		chip.setTextColor(tint ?: defaultChipTextColor)
 		chip.isClickable = onChipClickListener != null || model.isCheckable
 		chip.isCheckable = model.isCheckable
 		chip.isChecked = model.isChecked
@@ -92,8 +110,9 @@ class ChipsView @JvmOverloads constructor(
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
 		chip.setChipDrawable(drawable)
 		chip.isCheckedIconVisible = true
+		chip.isChipIconVisible = false
 		chip.setCheckedIconResource(R.drawable.ic_check)
-		chip.checkedIconTint = context.getThemeColorStateList(materialR.attr.colorControlNormal)
+		chip.checkedIconTint = defaultChipIconTint
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
@@ -113,7 +132,7 @@ class ChipsView @JvmOverloads constructor(
 	}
 
 	class ChipModel(
-		@DrawableRes val icon: Int,
+		@ColorRes val tint: Int,
 		val title: CharSequence,
 		val isCheckable: Boolean,
 		val isChecked: Boolean,
@@ -126,7 +145,7 @@ class ChipsView @JvmOverloads constructor(
 
 			other as ChipModel
 
-			if (icon != other.icon) return false
+			if (tint != other.tint) return false
 			if (title != other.title) return false
 			if (isCheckable != other.isCheckable) return false
 			if (isChecked != other.isChecked) return false
@@ -136,7 +155,7 @@ class ChipsView @JvmOverloads constructor(
 		}
 
 		override fun hashCode(): Int {
-			var result = icon
+			var result = tint.hashCode()
 			result = 31 * result + title.hashCode()
 			result = 31 * result + isCheckable.hashCode()
 			result = 31 * result + isChecked.hashCode()

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CornerData.kt

@@ -1,47 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.view.View
-import androidx.core.view.ViewCompat
-import com.google.android.material.shape.AbsoluteCornerSize
-import com.google.android.material.shape.CornerSize
-
-class CornerData(
-	var topLeft: CornerSize,
-	var bottomLeft: CornerSize,
-	var topRight: CornerSize,
-	var bottomRight: CornerSize,
-) {
-
-	fun start(view: View): CornerData {
-		return if (isLayoutRtl(view)) right() else left()
-	}
-
-	fun end(view: View): CornerData {
-		return if (isLayoutRtl(view)) left() else right()
-	}
-
-	fun left(): CornerData {
-		return CornerData(topLeft, bottomLeft, noCorner, noCorner)
-	}
-
-	fun right(): CornerData {
-		return CornerData(noCorner, noCorner, topRight, bottomRight)
-	}
-
-	fun top(): CornerData {
-		return CornerData(topLeft, noCorner, topRight, noCorner)
-	}
-
-	fun bottom(): CornerData {
-		return CornerData(noCorner, bottomLeft, noCorner, bottomRight)
-	}
-
-	private companion object {
-
-		val noCorner: CornerSize = AbsoluteCornerSize(0f)
-
-		fun isLayoutRtl(view: View): Boolean {
-			return ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_RTL
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SegmentedBarView.kt

@@ -1,5 +1,7 @@
 package org.koitharu.kotatsu.base.ui.widgets
 
+import android.animation.Animator
+import android.animation.ValueAnimator
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Outline
@@ -7,48 +9,34 @@ import android.graphics.Paint
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewOutlineProvider
+import android.view.animation.DecelerateInterpolator
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
-import androidx.core.graphics.ColorUtils
-import com.google.android.material.R as materialR
-import kotlin.random.Random
 import org.koitharu.kotatsu.parsers.util.replaceWith
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
 import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.utils.ext.resolveDp
+import com.google.android.material.R as materialR
 
 class SegmentedBarView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
 	defStyleAttr: Int = 0,
-) : View(context, attrs, defStyleAttr) {
+) : View(context, attrs, defStyleAttr), ValueAnimator.AnimatorUpdateListener, Animator.AnimatorListener {
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val segmentsData = ArrayList<Segment>()
 	private val segmentsSizes = ArrayList<Float>()
 	private val outlineColor = context.getThemeColor(materialR.attr.colorOutline)
 	private var cornerSize = 0f
-
-	var segments: List<Segment>
-		get() = segmentsData
-		set(value) {
-			segmentsData.replaceWith(value)
-			updateSizes()
-			invalidate()
-		}
+	private var scaleFactor = 1f
+	private var scaleAnimator: ValueAnimator? = null
 
 	init {
 		paint.strokeWidth = context.resources.resolveDp(1f)
 		outlineProvider = OutlineProvider()
 		clipToOutline = true
-
-		if (isInEditMode) {
-			segments = List(Random.nextInt(3, 5)) {
-				Segment(
-					percent = Random.nextFloat(),
-					color = ColorUtils.HSLToColor(floatArrayOf(Random.nextInt(0, 360).toFloat(), 0.5f, 0.5f)),
-				)
-			}
-		}
 	}
 
 	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
@@ -79,12 +67,56 @@ class SegmentedBarView @JvmOverloads constructor(
 		canvas.drawRoundRect(0f, 0f, w, height.toFloat(), cornerSize, cornerSize, paint)
 	}
 
+	override fun onAnimationStart(animation: Animator) = Unit
+
+	override fun onAnimationEnd(animation: Animator) {
+		if (scaleAnimator === animation) {
+			scaleAnimator = null
+		}
+	}
+
+	override fun onAnimationUpdate(animation: ValueAnimator) {
+		scaleFactor = animation.animatedValue as Float
+		updateSizes()
+		invalidate()
+	}
+
+	override fun onAnimationCancel(animation: Animator) = Unit
+
+	override fun onAnimationRepeat(animation: Animator) = Unit
+
+	fun animateSegments(value: List<Segment>) {
+		scaleAnimator?.cancel()
+		segmentsData.replaceWith(value)
+		if (!context.isAnimationsEnabled) {
+			scaleAnimator = null
+			scaleFactor = 1f
+			updateSizes()
+			invalidate()
+			return
+		}
+		scaleFactor = 0f
+		updateSizes()
+		invalidate()
+		val animator = ValueAnimator.ofFloat(0f, 1f)
+		animator.duration = context.getAnimationDuration(android.R.integer.config_longAnimTime)
+		animator.interpolator = DecelerateInterpolator()
+		animator.addUpdateListener(this@SegmentedBarView)
+		animator.addListener(this@SegmentedBarView)
+		scaleAnimator = animator
+		animator.start()
+	}
+
 	private fun updateSizes() {
 		segmentsSizes.clear()
 		segmentsSizes.ensureCapacity(segmentsData.size + 1)
 		var w = width.toFloat()
-		for (segment in segmentsData) {
-			val segmentWidth = (w * segment.percent).coerceAtLeast(cornerSize)
+		val maxScale = (scaleFactor * (segmentsData.size - 1)).coerceAtLeast(1f)
+		for ((index, segment) in segmentsData.withIndex()) {
+			val scale = (scaleFactor * (index + 1) / maxScale).coerceAtMost(1f)
+			val segmentWidth = (w * segment.percent).coerceAtLeast(
+				if (index == 0) height.toFloat() else cornerSize,
+			) * scale
 			segmentsSizes.add(segmentWidth)
 			w -= segmentWidth
 		}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ShapeView.kt

@@ -0,0 +1,94 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Outline
+import android.graphics.Paint
+import android.graphics.Path
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewOutlineProvider
+import androidx.core.content.withStyledAttributes
+import androidx.core.graphics.withClip
+import com.google.android.material.drawable.DrawableUtils
+import org.koitharu.kotatsu.R
+
+class ShapeView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0,
+) : View(context, attrs, defStyleAttr) {
+
+	private val corners = FloatArray(8)
+	private val outlinePath = Path()
+	private val strokePaint = Paint(Paint.ANTI_ALIAS_FLAG)
+
+	init {
+		context.withStyledAttributes(attrs, R.styleable.ShapeView, defStyleAttr) {
+			val cornerSize = getDimension(R.styleable.ShapeView_cornerSize, 0f)
+			corners[0] = getDimension(R.styleable.ShapeView_cornerSizeTopLeft, cornerSize)
+			corners[1] = corners[0]
+			corners[2] = getDimension(R.styleable.ShapeView_cornerSizeTopRight, cornerSize)
+			corners[3] = corners[2]
+			corners[4] = getDimension(R.styleable.ShapeView_cornerSizeBottomRight, cornerSize)
+			corners[5] = corners[4]
+			corners[6] = getDimension(R.styleable.ShapeView_cornerSizeBottomLeft, cornerSize)
+			corners[7] = corners[6]
+			strokePaint.color = getColor(R.styleable.ShapeView_strokeColor, Color.TRANSPARENT)
+			strokePaint.strokeWidth = getDimension(R.styleable.ShapeView_strokeWidth, 0f)
+			strokePaint.style = Paint.Style.STROKE
+		}
+		outlineProvider = OutlineProvider()
+	}
+
+	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+		super.onSizeChanged(w, h, oldw, oldh)
+		if (w != oldw || h != oldh) {
+			rebuildPath()
+		}
+	}
+
+	override fun draw(canvas: Canvas) {
+		canvas.withClip(outlinePath) {
+			super.draw(canvas)
+		}
+	}
+
+	override fun onDraw(canvas: Canvas) {
+		super.onDraw(canvas)
+		if (strokePaint.strokeWidth > 0f) {
+			canvas.drawPath(outlinePath, strokePaint)
+		}
+	}
+
+	private fun rebuildPath() {
+		outlinePath.reset()
+		val w = width
+		val h = height
+		if (w > 0 && h > 0) {
+			outlinePath.addRoundRect(0f, 0f, w.toFloat(), h.toFloat(), corners, Path.Direction.CW)
+		}
+	}
+
+	private inner class OutlineProvider : ViewOutlineProvider() {
+
+		@SuppressLint("RestrictedApi")
+		override fun getOutline(view: View?, outline: Outline) {
+			val corner = corners[0]
+			var isRoundRect = true
+			for (item in corners) {
+				if (item != corner) {
+					isRoundRect = false
+					break
+				}
+			}
+			if (isRoundRect) {
+				outline.setRoundRect(0, 0, width, height, corner)
+			} else {
+				DrawableUtils.setOutlineToPath(outline, outlinePath)
+			}
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/TwoLinesItemView.kt

@@ -0,0 +1,104 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.graphics.Color
+import android.graphics.drawable.InsetDrawable
+import android.graphics.drawable.RippleDrawable
+import android.graphics.drawable.ShapeDrawable
+import android.graphics.drawable.shapes.RoundRectShape
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import androidx.annotation.AttrRes
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.updateLayoutParams
+import androidx.core.widget.ImageViewCompat
+import androidx.core.widget.TextViewCompat
+import com.google.android.material.ripple.RippleUtils
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.google.android.material.shape.ShapeAppearanceModel
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ViewTwoLinesItemBinding
+import org.koitharu.kotatsu.utils.ext.resolveDp
+
+@SuppressLint("RestrictedApi")
+class TwoLinesItemView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = 0,
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+	private val binding = ViewTwoLinesItemBinding.inflate(LayoutInflater.from(context), this)
+
+	init {
+		var textColors: ColorStateList? = null
+		context.withStyledAttributes(
+			set = attrs,
+			attrs = R.styleable.TwoLinesItemView,
+			defStyleAttr = defStyleAttr,
+			defStyleRes = R.style.Widget_Kotatsu_TwoLinesItemView,
+		) {
+			val itemRippleColor = getRippleColor(context)
+			val shape = createShapeDrawable(this)
+			val roundCorners = FloatArray(8) { resources.resolveDp(16f) }
+			background = RippleDrawable(
+				RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
+				shape,
+				ShapeDrawable(RoundRectShape(roundCorners, null, null)),
+			)
+			val drawablePadding = getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_drawablePadding, 0)
+			binding.layoutText.updateLayoutParams<MarginLayoutParams> { marginStart = drawablePadding }
+			setIconResource(getResourceId(R.styleable.TwoLinesItemView_icon, 0))
+			binding.title.text = getText(R.styleable.TwoLinesItemView_title)
+			binding.subtitle.text = getText(R.styleable.TwoLinesItemView_subtitle)
+			textColors = getColorStateList(R.styleable.TwoLinesItemView_android_textColor)
+			val textAppearanceFallback = androidx.appcompat.R.style.TextAppearance_AppCompat
+			TextViewCompat.setTextAppearance(
+				binding.title,
+				getResourceId(R.styleable.TwoLinesItemView_titleTextAppearance, textAppearanceFallback),
+			)
+			TextViewCompat.setTextAppearance(
+				binding.subtitle,
+				getResourceId(R.styleable.TwoLinesItemView_subtitleTextAppearance, textAppearanceFallback),
+			)
+		}
+		if (textColors == null) {
+			textColors = binding.title.textColors
+		}
+		binding.title.setTextColor(textColors)
+		binding.subtitle.setTextColor(textColors)
+		ImageViewCompat.setImageTintList(binding.icon, textColors)
+	}
+
+	fun setIconResource(@DrawableRes resId: Int) {
+		val icon = if (resId != 0) ContextCompat.getDrawable(context, resId) else null
+		binding.icon.setImageDrawable(icon)
+	}
+
+	private fun createShapeDrawable(ta: TypedArray): InsetDrawable {
+		val shapeAppearance = ShapeAppearanceModel.builder(
+			context,
+			ta.getResourceId(R.styleable.TwoLinesItemView_shapeAppearance, 0),
+			ta.getResourceId(R.styleable.TwoLinesItemView_shapeAppearanceOverlay, 0),
+		).build()
+		val shapeDrawable = MaterialShapeDrawable(shapeAppearance)
+		shapeDrawable.fillColor = ta.getColorStateList(R.styleable.TwoLinesItemView_backgroundFillColor)
+		return InsetDrawable(
+			shapeDrawable,
+			ta.getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_insetLeft, 0),
+			ta.getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_insetTop, 0),
+			ta.getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_insetRight, 0),
+			ta.getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_insetBottom, 0),
+		)
+	}
+
+	private fun getRippleColor(context: Context): ColorStateList {
+		return ContextCompat.getColorStateList(context, R.color.selector_overlay)
+			?: ColorStateList.valueOf(Color.TRANSPARENT)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.bookmarks.domain
 
 import android.database.SQLException
 import androidx.room.withTransaction
-import javax.inject.Inject
+import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.base.domain.ReversibleHandle
@@ -17,7 +17,9 @@ import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.mapItems
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import javax.inject.Inject
 
+@Reusable
 class BookmarksRepository @Inject constructor(
 	private val db: MangaDatabase,
 ) {

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt

@@ -1,7 +1,12 @@
 package org.koitharu.kotatsu.bookmarks.ui
 
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
 import androidx.appcompat.view.ActionMode
 import androidx.core.graphics.Insets
 import androidx.core.view.updateLayoutParams
@@ -10,7 +15,6 @@ import androidx.fragment.app.viewModels
 import coil.ImageLoader
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.reverseAsync
 import org.koitharu.kotatsu.base.ui.BaseFragment
@@ -24,6 +28,7 @@ import org.koitharu.kotatsu.bookmarks.data.ids
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksGroupAdapter
 import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
@@ -32,9 +37,9 @@ import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.invalidateNestedItemDecorations
 import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class BookmarksFragment :
@@ -76,7 +81,7 @@ class BookmarksFragment :
 		binding.recyclerView.addItemDecoration(spacingDecoration)
 
 		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
-		viewModel.onError.observe(viewLifecycleOwner, ::onError)
+		viewModel.onError.observe(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
 		viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone)
 	}
 
@@ -90,6 +95,7 @@ class BookmarksFragment :
 		if (selectionController?.onItemClick(item.manga, item.pageId) != true) {
 			val intent = ReaderActivity.newIntent(view.context, item)
 			startActivity(intent, scaleUpActivityOptionsOf(view).toBundle())
+			Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 		}
 	}
 
@@ -132,6 +138,7 @@ class BookmarksFragment :
 				mode.finish()
 				true
 			}
+
 			else -> false
 		}
 	}
@@ -154,14 +161,6 @@ class BookmarksFragment :
 		adapter?.items = list
 	}
 
-	private fun onError(e: Throwable) {
-		Snackbar.make(
-			binding.recyclerView,
-			e.getDisplayMessage(resources),
-			Snackbar.LENGTH_SHORT,
-		).show()
-	}
-
 	private fun onActionDone(action: ReversibleAction) {
 		val handle = action.handle
 		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.bookmarks.ui
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
@@ -18,7 +17,8 @@ import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.SingleLiveEvent
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+import org.koitharu.kotatsu.utils.asFlowLiveData
+import javax.inject.Inject
 
 @HiltViewModel
 class BookmarksViewModel @Inject constructor(
@@ -43,12 +43,12 @@ class BookmarksViewModel @Inject constructor(
 			}
 		}
 		.catch { e -> emit(listOf(e.toErrorState(canRetry = false))) }
-		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
+		.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
 
 	fun removeBookmarks(ids: Map<Manga, Set<Long>>) {
 		launchJob(Dispatchers.Default) {
 			val handle = repository.removeBookmarks(ids)
-			onActionDone.postCall(ReversibleAction(R.string.bookmarks_removed, handle))
+			onActionDone.emitCall(ReversibleAction(R.string.bookmarks_removed, handle))
 		}
 	}
 }

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

@@ -8,10 +8,12 @@ import org.koitharu.kotatsu.base.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.databinding.ItemBookmarkBinding
+import org.koitharu.kotatsu.utils.ext.decodeRegion
 import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
-import org.koitharu.kotatsu.utils.ext.referer
+import org.koitharu.kotatsu.utils.ext.source
+import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
 fun bookmarkListAD(
 	coil: ImageLoader,
@@ -26,13 +28,14 @@ fun bookmarkListAD(
 	binding.root.setOnLongClickListener(listener)
 
 	bind {
-		binding.imageViewThumb.newImageRequest(item.imageUrl)?.run {
-			referer(item.manga.publicUrl)
+		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageUrl)?.run {
+			size(CoverSizeResolver(binding.imageViewThumb))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
-			lifecycle(lifecycleOwner)
+			decodeRegion(item.scroll)
+			source(item.manga.source)
 			enqueueWith(coil)
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAD.kt

@@ -14,7 +14,12 @@ import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
 import org.koitharu.kotatsu.databinding.ItemBookmarksGroupBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.ext.clearItemDecorations
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
+import org.koitharu.kotatsu.utils.ext.enqueueWith
+import org.koitharu.kotatsu.utils.ext.newImageRequest
+import org.koitharu.kotatsu.utils.ext.source
+import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
 fun bookmarksGroupAD(
 	coil: ImageLoader,
@@ -45,13 +50,13 @@ fun bookmarksGroupAD(
 			binding.recyclerView.addItemDecoration(spacingDecoration)
 			selectionController.attachToRecyclerView(item.manga, binding.recyclerView)
 		}
-		binding.imageViewCover.newImageRequest(item.manga.coverUrl)?.run {
-			referer(item.manga.publicUrl)
+		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
-			lifecycle(lifecycleOwner)
+			size(CoverSizeResolver(binding.imageViewCover))
+			source(item.manga.source)
 			enqueueWith(coil)
 		}
 		binding.textViewTitle.text = item.manga.title

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAdapter.kt

@@ -5,14 +5,18 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import kotlin.jvm.internal.Intrinsics
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.list.ui.adapter.*
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
+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 kotlin.jvm.internal.Intrinsics
 
 class BookmarksGroupAdapter(
 	coil: ImageLoader,
@@ -38,7 +42,7 @@ class BookmarksGroupAdapter(
 			)
 			.addDelegate(loadingStateAD())
 			.addDelegate(loadingFooterAD())
-			.addDelegate(emptyStateListAD(coil, listener))
+			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listener))
 			.addDelegate(errorStateListAD(listener))
 	}
 
@@ -49,6 +53,7 @@ class BookmarksGroupAdapter(
 				oldItem is BookmarksGroup && newItem is BookmarksGroup -> {
 					oldItem.manga.id == newItem.manga.id
 				}
+
 				else -> oldItem.javaClass == newItem.javaClass
 			}
 		}

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

@@ -8,20 +8,20 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.ViewGroup
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
-import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.core.network.UserAgentInterceptor
+import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
+import com.google.android.material.R as materialR
 
 @SuppressLint("SetJavaScriptEnabled")
 class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
+	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityBrowserBinding.inflate(layoutInflater))
@@ -31,10 +31,12 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 		with(binding.webView.settings) {
 			javaScriptEnabled = true
-			userAgentString = UserAgentInterceptor.userAgent
+			userAgentString = CommonHeadersInterceptor.userAgentChrome
 		}
 		binding.webView.webViewClient = BrowserClient(this)
 		binding.webView.webChromeClient = ProgressChromeClient(binding.progressBar)
+		onBackPressedCallback = WebViewBackPressedCallback(binding.webView)
+		onBackPressedDispatcher.addCallback(onBackPressedCallback)
 		if (savedInstanceState != null) {
 			return
 		}
@@ -72,6 +74,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			finishAfterTransition()
 			true
 		}
+
 		R.id.action_browser -> {
 			val intent = Intent(Intent.ACTION_VIEW)
 			intent.data = Uri.parse(binding.webView.url)
@@ -81,15 +84,8 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			}
 			true
 		}
-		else -> super.onOptionsItemSelected(item)
-	}
 
-	override fun onBackPressed() {
-		if (binding.webView.canGoBack()) {
-			binding.webView.goBack()
-		} else {
-			super.onBackPressed()
-		}
+		else -> super.onOptionsItemSelected(item)
 	}
 
 	override fun onPause() {
@@ -116,6 +112,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		supportActionBar?.subtitle = subtitle
 	}
 
+	override fun onHistoryChanged() {
+		onBackPressedCallback.onHistoryChanged()
+	}
+
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.appbar.updatePadding(
 			top = insets.top,

app/src/main/java/org/koitharu/kotatsu/browser/BrowserCallback.kt

@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.browser
 
-interface BrowserCallback {
+interface BrowserCallback : OnHistoryChangedListener {
 
 	fun onLoadingStateChanged(isLoading: Boolean)
 
 	fun onTitleChanged(title: CharSequence, subtitle: CharSequence?)
-}
+}

app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt

@@ -4,7 +4,7 @@ import android.graphics.Bitmap
 import android.webkit.WebView
 import android.webkit.WebViewClient
 
-class BrowserClient(private val callback: BrowserCallback) : WebViewClient() {
+open class BrowserClient(private val callback: BrowserCallback) : WebViewClient() {
 
 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)
@@ -20,4 +20,9 @@ class BrowserClient(private val callback: BrowserCallback) : WebViewClient() {
 		super.onPageCommitVisible(view, url)
 		callback.onTitleChanged(view.title.orEmpty(), url)
 	}
-}
+
+	override fun doUpdateVisitedHistory(view: WebView?, url: String?, isReload: Boolean) {
+		super.doUpdateVisitedHistory(view, url, isReload)
+		callback.onHistoryChanged()
+	}
+}

app/src/main/java/org/koitharu/kotatsu/browser/OnHistoryChangedListener.kt

@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.browser
+
+fun interface OnHistoryChangedListener {
+
+	fun onHistoryChanged()
+}

app/src/main/java/org/koitharu/kotatsu/browser/ProgressChromeClient.kt

@@ -2,14 +2,13 @@ package org.koitharu.kotatsu.browser
 
 import android.webkit.WebChromeClient
 import android.webkit.WebView
-import android.widget.ProgressBar
 import androidx.core.view.isVisible
-import org.koitharu.kotatsu.utils.ext.setProgressCompat
+import com.google.android.material.progressindicator.BaseProgressIndicator
 
 private const val PROGRESS_MAX = 100
 
 class ProgressChromeClient(
-	private val progressIndicator: ProgressBar,
+	private val progressIndicator: BaseProgressIndicator<*>,
 ) : WebChromeClient() {
 
 	init {
@@ -28,4 +27,4 @@ class ProgressChromeClient(
 			progressIndicator.isIndeterminate = true
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/browser/WebViewBackPressedCallback.kt

@@ -0,0 +1,21 @@
+package org.koitharu.kotatsu.browser
+
+import android.webkit.WebView
+import androidx.activity.OnBackPressedCallback
+
+class WebViewBackPressedCallback(
+	private val webView: WebView,
+) : OnBackPressedCallback(false), OnHistoryChangedListener {
+
+	init {
+		onHistoryChanged()
+	}
+
+	override fun handleOnBackPressed() {
+		webView.goBack()
+	}
+
+	override fun onHistoryChanged() {
+		isEnabled = webView.canGoBack()
+	}
+}

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareCallback.kt

@@ -1,8 +1,14 @@
 package org.koitharu.kotatsu.browser.cloudflare
 
-interface CloudFlareCallback {
+import org.koitharu.kotatsu.browser.BrowserCallback
+
+interface CloudFlareCallback : BrowserCallback {
+
+	override fun onLoadingStateChanged(isLoading: Boolean) = Unit
+
+	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) = Unit
 
 	fun onPageLoaded()
 
 	fun onCheckPassed()
-}
+}

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt

@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.browser.cloudflare
 
 import android.graphics.Bitmap
 import android.webkit.WebView
-import android.webkit.WebViewClient
 import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 
 private const val CF_CLEARANCE = "cf_clearance"
@@ -12,22 +12,22 @@ class CloudFlareClient(
 	private val cookieJar: MutableCookieJar,
 	private val callback: CloudFlareCallback,
 	private val targetUrl: String,
-) : WebViewClient() {
+) : BrowserClient(callback) {
 
 	private val oldClearance = getClearance()
 
-	override fun onPageStarted(view: WebView, url: String?, favicon: Bitmap?) {
+	override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
 		super.onPageStarted(view, url, favicon)
 		checkClearance()
 	}
 
-	override fun onPageCommitVisible(view: WebView?, url: String?) {
+	override fun onPageCommitVisible(view: WebView, url: String?) {
 		super.onPageCommitVisible(view, url)
 		callback.onPageLoaded()
 	}
 
-	override fun onPageFinished(view: WebView?, url: String?) {
-		super.onPageFinished(view, url)
+	override fun onPageFinished(webView: WebView, url: String) {
+		super.onPageFinished(webView, url)
 		callback.onPageLoaded()
 	}
 

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt

@@ -8,27 +8,37 @@ import android.view.View
 import android.view.ViewGroup
 import android.webkit.CookieManager
 import android.webkit.WebSettings
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isInvisible
 import androidx.fragment.app.setFragmentResult
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
+import okhttp3.Headers
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.network.UserAgentInterceptor
+import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
-import org.koitharu.kotatsu.utils.ext.stringArgument
 import org.koitharu.kotatsu.utils.ext.withArgs
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
 
-	private val url by stringArgument(ARG_URL)
+	private lateinit var url: String
 	private val pendingResult = Bundle(1)
 
 	@Inject
 	lateinit var cookieJar: MutableCookieJar
 
+	private var onBackPressedCallback: WebViewBackPressedCallback? = null
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		url = requireArguments().getString(ARG_URL).orEmpty()
+	}
+
 	override fun onInflateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -42,20 +52,21 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 			cacheMode = WebSettings.LOAD_DEFAULT
 			domStorageEnabled = true
 			databaseEnabled = true
-			userAgentString = UserAgentInterceptor.userAgent
+			userAgentString = arguments?.getString(ARG_UA) ?: CommonHeadersInterceptor.userAgentChrome
 		}
-		binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url.orEmpty())
+		binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url)
 		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
-		if (url.isNullOrEmpty()) {
+		if (url.isEmpty()) {
 			dismissAllowingStateLoss()
 		} else {
-			binding.webView.loadUrl(url.orEmpty())
+			binding.webView.loadUrl(url)
 		}
 	}
 
 	override fun onDestroyView() {
 		binding.webView.stopLoading()
 		binding.webView.destroy()
+		onBackPressedCallback = null
 		super.onDestroyView()
 	}
 
@@ -63,6 +74,13 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 		return super.onBuildDialog(builder).setNegativeButton(android.R.string.cancel, null)
 	}
 
+	override fun onDialogCreated(dialog: AlertDialog) {
+		super.onDialogCreated(dialog)
+		onBackPressedCallback = WebViewBackPressedCallback(binding.webView).also {
+			dialog.onBackPressedDispatcher.addCallback(it)
+		}
+	}
+
 	override fun onResume() {
 		super.onResume()
 		binding.webView.onResume()
@@ -87,14 +105,22 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 		dismissAllowingStateLoss()
 	}
 
+	override fun onHistoryChanged() {
+		onBackPressedCallback?.onHistoryChanged()
+	}
+
 	companion object {
 
 		const val TAG = "CloudFlareDialog"
 		const val EXTRA_RESULT = "result"
 		private const val ARG_URL = "url"
+		private const val ARG_UA = "ua"
 
-		fun newInstance(url: String) = CloudFlareDialog().withArgs(1) {
+		fun newInstance(url: String, headers: Headers?) = CloudFlareDialog().withArgs(2) {
 			putString(ARG_URL, url)
+			headers?.get(CommonHeaders.USER_AGENT)?.let {
+				putString(ARG_UA, it)
+			}
 		}
 	}
 }

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

@@ -20,6 +20,9 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import dagger.multibindings.ElementsIntoSet
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import okhttp3.CookieJar
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.BuildConfig
@@ -40,6 +43,8 @@ import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
+import org.koitharu.kotatsu.local.data.LocalManga
+import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
@@ -85,6 +90,8 @@ interface AppModule {
 		@Singleton
 		fun provideOkHttpClient(
 			localStorageManager: LocalStorageManager,
+			commonHeadersInterceptor: CommonHeadersInterceptor,
+			mirrorSwitchInterceptor: MirrorSwitchInterceptor,
 			cookieJar: CookieJar,
 			settings: AppSettings,
 		): OkHttpClient {
@@ -95,10 +102,17 @@ interface AppModule {
 				writeTimeout(20, TimeUnit.SECONDS)
 				cookieJar(cookieJar)
 				dns(DoHManager(cache, settings))
+				if (settings.isSSLBypassEnabled) {
+					bypassSSLErrors()
+				}
 				cache(cache)
 				addInterceptor(GZipInterceptor())
-				addInterceptor(UserAgentInterceptor())
+				addInterceptor(commonHeadersInterceptor)
 				addInterceptor(CloudFlareInterceptor())
+				addInterceptor(mirrorSwitchInterceptor)
+				if (BuildConfig.DEBUG) {
+					addInterceptor(CurlLoggingInterceptor())
+				}
 			}.build()
 		}
 
@@ -160,7 +174,6 @@ interface AppModule {
 		}
 
 		@Provides
-		@Singleton
 		@ElementsIntoSet
 		fun provideDatabaseObservers(
 			widgetUpdater: WidgetUpdater,
@@ -175,7 +188,6 @@ interface AppModule {
 		)
 
 		@Provides
-		@Singleton
 		@ElementsIntoSet
 		fun provideActivityLifecycleCallbacks(
 			appProtectHelper: AppProtectHelper,
@@ -198,5 +210,16 @@ interface AppModule {
 				MemoryContentCache(application)
 			}
 		}
+
+		@Provides
+		@Singleton
+		@LocalStorageChanges
+		fun provideMutableLocalStorageChangesFlow(): MutableSharedFlow<LocalManga?> = MutableSharedFlow()
+
+		@Provides
+		@LocalStorageChanges
+		fun provideLocalStorageChangesFlow(
+			@LocalStorageChanges flow: MutableSharedFlow<LocalManga?>,
+		): SharedFlow<LocalManga?> = flow.asSharedFlow()
 	}
 }

app/src/main/java/org/koitharu/kotatsu/core/cache/DeferredLruCache.kt

@@ -2,15 +2,4 @@ package org.koitharu.kotatsu.core.cache
 
 import androidx.collection.LruCache
 
-class DeferredLruCache<T>(maxSize: Int) : LruCache<ContentCache.Key, SafeDeferred<T>>(maxSize) {
-
-	override fun entryRemoved(
-		evicted: Boolean,
-		key: ContentCache.Key,
-		oldValue: SafeDeferred<T>,
-		newValue: SafeDeferred<T>?,
-	) {
-		super.entryRemoved(evicted, key, oldValue, newValue)
-		oldValue.cancel()
-	}
-}
+class DeferredLruCache<T>(maxSize: Int) : LruCache<ContentCache.Key, SafeDeferred<T>>(maxSize)

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

@@ -19,15 +19,28 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.db.migrations.*
+import org.koitharu.kotatsu.core.db.migrations.Migration10To11
+import org.koitharu.kotatsu.core.db.migrations.Migration11To12
+import org.koitharu.kotatsu.core.db.migrations.Migration12To13
+import org.koitharu.kotatsu.core.db.migrations.Migration13To14
+import org.koitharu.kotatsu.core.db.migrations.Migration14To15
+import org.koitharu.kotatsu.core.db.migrations.Migration1To2
+import org.koitharu.kotatsu.core.db.migrations.Migration2To3
+import org.koitharu.kotatsu.core.db.migrations.Migration3To4
+import org.koitharu.kotatsu.core.db.migrations.Migration4To5
+import org.koitharu.kotatsu.core.db.migrations.Migration5To6
+import org.koitharu.kotatsu.core.db.migrations.Migration6To7
+import org.koitharu.kotatsu.core.db.migrations.Migration7To8
+import org.koitharu.kotatsu.core.db.migrations.Migration8To9
+import org.koitharu.kotatsu.core.db.migrations.Migration9To10
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoriesDao
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.favourites.data.FavouritesDao
 import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.scrobbling.data.ScrobblingDao
-import org.koitharu.kotatsu.scrobbling.data.ScrobblingEntity
+import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingDao
+import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingEntity
 import org.koitharu.kotatsu.suggestions.data.SuggestionDao
 import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 import org.koitharu.kotatsu.tracker.data.TrackEntity

app/src/main/java/org/koitharu/kotatsu/core/db/dao/PreferencesDao.kt

@@ -13,16 +13,6 @@ abstract class PreferencesDao {
 	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
 	abstract fun observe(mangaId: Long): Flow<MangaPrefsEntity?>
 
-	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	abstract suspend fun insert(pref: MangaPrefsEntity): Long
-
-	@Update
-	abstract suspend fun update(pref: MangaPrefsEntity): Int
-
-	@Transaction
-	open suspend fun upsert(pref: MangaPrefsEntity) {
-		if (update(pref) == 0) {
-			insert(pref)
-		}
-	}
+	@Upsert
+	abstract suspend fun upsert(pref: MangaPrefsEntity)
 }

app/src/main/java/org/koitharu/kotatsu/core/db/dao/TagsDao.kt

@@ -14,7 +14,7 @@ abstract class TagsDao {
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
 		GROUP BY tags.title 
 		ORDER BY COUNT(manga_id) DESC 
-		LIMIT :limit"""
+		LIMIT :limit""",
 	)
 	abstract suspend fun findPopularTags(limit: Int): List<TagEntity>
 
@@ -24,7 +24,7 @@ abstract class TagsDao {
 		WHERE tags.source = :source 
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
-		LIMIT :limit"""
+		LIMIT :limit""",
 	)
 	abstract suspend fun findPopularTags(source: String, limit: Int): List<TagEntity>
 
@@ -34,7 +34,7 @@ abstract class TagsDao {
 		WHERE tags.source = :source AND title LIKE :query
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
-		LIMIT :limit"""
+		LIMIT :limit""",
 	)
 	abstract suspend fun findTags(source: String, query: String, limit: Int): List<TagEntity>
 
@@ -44,22 +44,10 @@ abstract class TagsDao {
 		WHERE title LIKE :query
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
-		LIMIT :limit"""
+		LIMIT :limit""",
 	)
 	abstract suspend fun findTags(query: String, limit: Int): List<TagEntity>
 
-	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	abstract suspend fun insert(tag: TagEntity): Long
-
-	@Update(onConflict = OnConflictStrategy.IGNORE)
-	abstract suspend fun update(tag: TagEntity): Int
-
-	@Transaction
-	open suspend fun upsert(tags: Iterable<TagEntity>) {
-		tags.forEach { tag ->
-			if (update(tag) <= 0) {
-				insert(tag)
-			}
-		}
-	}
-}
+	@Upsert
+	abstract suspend fun upsert(tags: Iterable<TagEntity>)
+}

app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt

@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.core.exceptions
 
+import okhttp3.Headers
 import okio.IOException
 
 class CloudFlareProtectedException(
-	val url: String
-) : IOException("Protected by CloudFlare")
+	val url: String,
+	@Transient val headers: Headers,
+) : IOException("Protected by CloudFlare")

app/src/main/java/org/koitharu/kotatsu/core/exceptions/WrongPasswordException.kt

@@ -1,3 +1,3 @@
 package org.koitharu.kotatsu.core.exceptions
 
-class WrongPasswordException : SecurityException()
+class WrongPasswordException : IllegalArgumentException()

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

@@ -0,0 +1,66 @@
+package org.koitharu.kotatsu.core.exceptions.resolve
+
+import android.content.DialogInterface
+import android.view.View
+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.ErrorDetailsDialog
+import org.koitharu.kotatsu.parsers.exception.ParseException
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+
+class DialogErrorObserver(
+	host: View,
+	fragment: Fragment?,
+	resolver: ExceptionResolver?,
+	private val onResolved: Consumer<Boolean>?,
+) : ErrorObserver(host, fragment, resolver, onResolved) {
+
+	constructor(
+		host: View,
+		fragment: Fragment?,
+	) : this(host, fragment, null, null)
+
+	override fun onChanged(value: Throwable?) {
+		if (value == null) {
+			return
+		}
+		val listener = DialogListener(value)
+		val dialogBuilder = MaterialAlertDialogBuilder(activity ?: host.context)
+			.setMessage(value.getDisplayMessage(host.context.resources))
+			.setNegativeButton(R.string.close, listener)
+			.setOnCancelListener(listener)
+		if (canResolve(value)) {
+			dialogBuilder.setPositiveButton(ExceptionResolver.getResolveStringId(value), listener)
+		} else if (value is ParseException) {
+			val fm = fragmentManager
+			if (fm != null) {
+				dialogBuilder.setPositiveButton(R.string.details) { _, _ ->
+					ErrorDetailsDialog.show(fm, value, value.url)
+				}
+			}
+		}
+		val dialog = dialogBuilder.create()
+		if (activity != null) {
+			dialog.setOwnerActivity(activity)
+		}
+		dialog.show()
+	}
+
+	private inner class DialogListener(
+		private val error: Throwable,
+	) : DialogInterface.OnClickListener, DialogInterface.OnCancelListener {
+
+		override fun onClick(dialog: DialogInterface?, which: Int) {
+			when (which) {
+				DialogInterface.BUTTON_NEGATIVE -> onResolved?.accept(false)
+				DialogInterface.BUTTON_POSITIVE -> resolve(error)
+			}
+		}
+
+		override fun onCancel(dialog: DialogInterface?) {
+			onResolved?.accept(false)
+		}
+	}
+}

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

@@ -0,0 +1,44 @@
+package org.koitharu.kotatsu.core.exceptions.resolve
+
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.util.Consumer
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.coroutineScope
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.utils.ext.findActivity
+import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
+
+abstract class ErrorObserver(
+	protected val host: View,
+	protected val fragment: Fragment?,
+	private val resolver: ExceptionResolver?,
+	private val onResolved: Consumer<Boolean>?,
+) : Observer<Throwable?> {
+
+	protected val activity = host.context.findActivity()
+
+	private val lifecycleScope: LifecycleCoroutineScope
+		get() = checkNotNull(fragment?.viewLifecycleScope ?: (activity as? LifecycleOwner)?.lifecycle?.coroutineScope)
+
+	protected val fragmentManager: FragmentManager?
+		get() = fragment?.childFragmentManager ?: (activity as? AppCompatActivity)?.supportFragmentManager
+
+	protected fun canResolve(error: Throwable): Boolean {
+		return resolver != null && ExceptionResolver.canResolve(error)
+	}
+
+	protected fun resolve(error: Throwable) {
+		lifecycleScope.launch {
+			val isResolved = resolver?.resolve(error) ?: false
+			if (isActive) {
+				onResolved?.accept(isResolved)
+			}
+		}
+	}
+}

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

@@ -7,10 +7,12 @@ import androidx.collection.ArrayMap
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import kotlinx.coroutines.suspendCancellableCoroutine
+import okhttp3.Headers
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.ui.ErrorDetailsDialog
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -37,13 +39,16 @@ class ExceptionResolver private constructor(
 		sourceAuthContract = fragment.registerForActivityResult(SourceAuthActivity.Contract(), this)
 	}
 
-	override fun onActivityResult(result: TaggedActivityResult?) {
-		result ?: return
+	override fun onActivityResult(result: TaggedActivityResult) {
 		continuations.remove(result.tag)?.resume(result.isSuccess)
 	}
 
+	fun showDetails(e: Throwable, url: String?) {
+		ErrorDetailsDialog.show(getFragmentManager(), e, url)
+	}
+
 	suspend fun resolve(e: Throwable): Boolean = when (e) {
-		is CloudFlareProtectedException -> resolveCF(e.url)
+		is CloudFlareProtectedException -> resolveCF(e.url, e.headers)
 		is AuthRequiredException -> resolveAuthException(e.source)
 		is NotFoundException -> {
 			openInBrowser(e.url)
@@ -53,8 +58,8 @@ class ExceptionResolver private constructor(
 		else -> false
 	}
 
-	private suspend fun resolveCF(url: String): Boolean {
-		val dialog = CloudFlareDialog.newInstance(url)
+	private suspend fun resolveCF(url: String, headers: Headers): Boolean {
+		val dialog = CloudFlareDialog.newInstance(url, headers)
 		val fm = getFragmentManager()
 		return suspendCancellableCoroutine { cont ->
 			fm.clearFragmentResult(CloudFlareDialog.TAG)

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

@@ -0,0 +1,47 @@
+package org.koitharu.kotatsu.core.exceptions.resolve
+
+import android.view.View
+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.ErrorDetailsDialog
+import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
+import org.koitharu.kotatsu.parsers.exception.ParseException
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+
+class SnackbarErrorObserver(
+	host: View,
+	fragment: Fragment?,
+	resolver: ExceptionResolver?,
+	onResolved: Consumer<Boolean>?,
+) : ErrorObserver(host, fragment, resolver, onResolved) {
+
+	constructor(
+		host: View,
+		fragment: Fragment?,
+	) : this(host, fragment, null, null)
+
+	override fun onChanged(value: Throwable?) {
+		if (value == null) {
+			return
+		}
+		val snackbar = Snackbar.make(host, value.getDisplayMessage(host.context.resources), Snackbar.LENGTH_SHORT)
+		if (activity is BottomNavOwner) {
+			snackbar.anchorView = activity.bottomNav
+		}
+		if (canResolve(value)) {
+			snackbar.setAction(ExceptionResolver.getResolveStringId(value)) {
+				resolve(value)
+			}
+		} else if (value is ParseException) {
+			val fm = fragmentManager
+			if (fm != null) {
+				snackbar.setAction(R.string.details) {
+					ErrorDetailsDialog.show(fm, value, value.url)
+				}
+			}
+		}
+		snackbar.show()
+	}
+}

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

@@ -10,7 +10,10 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
 import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
@@ -27,10 +30,12 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 private const val CERT_SHA1 = "2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE"
+private const val CONTENT_TYPE_APK = "application/vnd.android.package-archive"
 
 @Singleton
 class AppUpdateRepository @Inject constructor(
 	@ApplicationContext private val context: Context,
+	private val settings: AppSettings,
 	private val okHttp: OkHttpClient,
 ) {
 
@@ -44,7 +49,9 @@ class AppUpdateRepository @Inject constructor(
 			.url("https://api.github.com/repos/KotatsuApp/Kotatsu/releases?page=1&per_page=10")
 		val jsonArray = okHttp.newCall(request.build()).await().parseJsonArray()
 		return jsonArray.mapJSONNotNull { json ->
-			val asset = json.optJSONArray("assets")?.optJSONObject(0) ?: return@mapJSONNotNull null
+			val asset = json.optJSONArray("assets")?.find { jo ->
+				jo.optString("content_type") == CONTENT_TYPE_APK
+			} ?: return@mapJSONNotNull null
 			AppVersion(
 				id = json.getLong("id"),
 				url = json.getString("html_url"),
@@ -64,7 +71,7 @@ class AppUpdateRepository @Inject constructor(
 			val currentVersion = VersionId(BuildConfig.VERSION_NAME)
 			val available = getAvailableVersions().asArrayList()
 			available.sortBy { it.versionId }
-			if (currentVersion.isStable) {
+			if (currentVersion.isStable && !settings.isUnstableUpdatesAllowed) {
 				available.retainAll { it.versionId.isStable }
 			}
 			available.maxByOrNull { it.versionId }
@@ -80,6 +87,12 @@ class AppUpdateRepository @Inject constructor(
 		return BuildConfig.DEBUG || getCertificateSHA1Fingerprint() == CERT_SHA1
 	}
 
+	suspend fun getCurrentVersionChangelog(): String? {
+		val currentVersion = VersionId(BuildConfig.VERSION_NAME)
+		val available = getAvailableVersions()
+		return available.find { x -> x.versionId == currentVersion }?.description
+	}
+
 	@Suppress("DEPRECATION")
 	@SuppressLint("PackageManagerGetSignatures")
 	private fun getCertificateSHA1Fingerprint(): String? = runCatching {
@@ -95,4 +108,15 @@ class AppUpdateRepository @Inject constructor(
 	}.onFailure { error ->
 		error.printStackTraceDebug()
 	}.getOrNull()
+
+	private inline fun JSONArray.find(predicate: (JSONObject) -> Boolean): JSONObject? {
+		val size = length()
+		for (i in 0 until size) {
+			val jo = getJSONObject(i)
+			if (predicate(jo)) {
+				return jo
+			}
+		}
+		return null
+	}
 }

app/src/main/java/org/koitharu/kotatsu/core/logs/FileLogger.kt

@@ -0,0 +1,134 @@
+package org.koitharu.kotatsu.core.logs
+
+import android.content.Context
+import androidx.annotation.WorkerThread
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import org.koitharu.kotatsu.utils.ext.subdir
+import java.io.File
+import java.io.FileOutputStream
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.concurrent.ConcurrentLinkedQueue
+
+private const val DIR = "logs"
+private const val FLUSH_DELAY = 2_000L
+private const val MAX_SIZE_BYTES = 1024 * 1024 // 1 MB
+
+class FileLogger(
+	context: Context,
+	private val settings: AppSettings,
+	name: String,
+) {
+
+	val file by lazy {
+		val dir = context.getExternalFilesDir(DIR) ?: context.filesDir.subdir(DIR)
+		File(dir, "$name.log")
+	}
+	val isEnabled: Boolean
+		get() = settings.isLoggingEnabled
+	private val dateFormat = SimpleDateFormat.getDateTimeInstance(
+		SimpleDateFormat.SHORT,
+		SimpleDateFormat.SHORT,
+		Locale.ROOT,
+	)
+	private val buffer = ConcurrentLinkedQueue<String>()
+	private val mutex = Mutex()
+	private var flushJob: Job? = null
+
+	fun log(message: String, e: Throwable? = null) {
+		if (!isEnabled) {
+			return
+		}
+		val text = buildString {
+			append(dateFormat.format(Date()))
+			append(": ")
+			if (e != null) {
+				append("E!")
+			}
+			append(message)
+			if (e != null) {
+				append(' ')
+				append(e.stackTraceToString())
+				appendLine()
+			}
+		}
+		buffer.add(text)
+		postFlush()
+	}
+
+	inline fun log(messageProducer: () -> String) {
+		if (isEnabled) {
+			log(messageProducer())
+		}
+	}
+
+	suspend fun flush() {
+		if (!isEnabled) {
+			return
+		}
+		flushJob?.cancelAndJoin()
+		flushImpl()
+	}
+
+	private fun postFlush() {
+		if (flushJob?.isActive == true) {
+			return
+		}
+		flushJob = processLifecycleScope.launch(Dispatchers.Default) {
+			delay(FLUSH_DELAY)
+			runCatchingCancellable {
+				flushImpl()
+			}.onFailure {
+				it.printStackTraceDebug()
+			}
+		}
+	}
+
+	private suspend fun flushImpl() {
+		mutex.withLock {
+			if (buffer.isEmpty()) {
+				return
+			}
+			runInterruptible(Dispatchers.IO) {
+				if (file.length() > MAX_SIZE_BYTES) {
+					rotate()
+				}
+				FileOutputStream(file, true).use {
+					while (true) {
+						val message = buffer.poll() ?: break
+						it.write(message.toByteArray())
+						it.write('\n'.code)
+					}
+					it.flush()
+				}
+			}
+		}
+	}
+
+	@WorkerThread
+	private fun rotate() {
+		val length = file.length()
+		val bakFile = File(file.parentFile, file.name + ".bak")
+		file.renameTo(bakFile)
+		bakFile.inputStream().use { input ->
+			input.skip(length - MAX_SIZE_BYTES / 2)
+			file.outputStream().use { output ->
+				input.copyTo(output)
+				output.flush()
+			}
+		}
+		bakFile.delete()
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/logs/Loggers.kt

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.logs
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class TrackerLogger
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class SyncLogger

app/src/main/java/org/koitharu/kotatsu/core/logs/LoggersModule.kt

@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.core.logs
+
+import android.content.Context
+import androidx.collection.arraySetOf
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import dagger.multibindings.ElementsIntoSet
+import org.koitharu.kotatsu.core.prefs.AppSettings
+
+@Module
+@InstallIn(SingletonComponent::class)
+object LoggersModule {
+
+	@Provides
+	@TrackerLogger
+	fun provideTrackerLogger(
+		@ApplicationContext context: Context,
+		settings: AppSettings,
+	) = FileLogger(context, settings, "tracker")
+
+	@Provides
+	@SyncLogger
+	fun provideSyncLogger(
+		@ApplicationContext context: Context,
+		settings: AppSettings,
+	) = FileLogger(context, settings, "sync")
+
+	@Provides
+	@ElementsIntoSet
+	fun provideAllLoggers(
+		@TrackerLogger trackerLogger: FileLogger,
+		@SyncLogger syncLogger: FileLogger,
+	): Set<@JvmSuppressWildcards FileLogger> = arraySetOf(
+		trackerLogger,
+		syncLogger,
+	)
+}

app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.model
 
 import androidx.core.os.LocaleListCompat
+import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
@@ -8,6 +9,18 @@ import org.koitharu.kotatsu.utils.ext.iterator
 
 fun Collection<Manga>.ids() = mapToSet { it.id }
 
+fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
+	if (size <= 1) {
+		return size
+	}
+	val acc = HashMap<String?, Int>()
+	for (item in this) {
+		val branch = item.chapter.branch
+		acc[branch] = (acc[branch] ?: 0) + 1
+	}
+	return acc.values.max()
+}
+
 fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 	val ch = chapters
 	if (ch.isNullOrEmpty()) {
@@ -31,4 +44,4 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 		}
 	}
 	return groups.maxByOrNull { it.value.size }?.key
-}
+}

app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt

@@ -52,7 +52,6 @@ fun Parcel.readManga() = Manga(
 fun MangaPage.writeToParcel(out: Parcel) {
 	out.writeLong(id)
 	out.writeString(url)
-	out.writeString(referer)
 	out.writeString(preview)
 	out.writeSerializable(source)
 }
@@ -60,7 +59,6 @@ fun MangaPage.writeToParcel(out: Parcel) {
 fun Parcel.readMangaPage() = MangaPage(
 	id = readLong(),
 	url = requireNotNull(readString()),
-	referer = requireNotNull(readString()),
 	preview = readString(),
 	source = checkNotNull(readSerializableCompat()),
 )

app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt

@@ -5,8 +5,8 @@ import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.Manga
 
 // Limits to avoid TransactionTooLargeException
-private const val MAX_SAFE_SIZE = 1024 * 512 // Assume that 512 kb is safe parcel size
-private const val MAX_SAFE_CHAPTERS_COUNT = 32 // this is 100% safe
+private const val MAX_SAFE_SIZE = 1024 * 100 // Assume that 100 kb is safe parcel size
+private const val MAX_SAFE_CHAPTERS_COUNT = 24 // this is 100% safe
 
 class ParcelableManga(
 	val manga: Manga,

app/src/main/java/org/koitharu/kotatsu/core/network/CloudFlareInterceptor.kt

@@ -13,13 +13,17 @@ private const val SERVER_CLOUDFLARE = "cloudflare"
 class CloudFlareInterceptor : Interceptor {
 
 	override fun intercept(chain: Interceptor.Chain): Response {
-		val response = chain.proceed(chain.request())
+		val request = chain.request()
+		val response = chain.proceed(request)
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
 			if (response.header(HEADER_SERVER)?.startsWith(SERVER_CLOUDFLARE) == true) {
 				response.closeQuietly()
-				throw CloudFlareProtectedException(response.request.url.toString())
+				throw CloudFlareProtectedException(
+					url = response.request.url.toString(),
+					headers = request.headers,
+				)
 			}
 		}
 		return response
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt

@@ -7,11 +7,13 @@ object CommonHeaders {
 	const val REFERER = "Referer"
 	const val USER_AGENT = "User-Agent"
 	const val ACCEPT = "Accept"
+	const val CONTENT_TYPE = "Content-Type"
 	const val CONTENT_DISPOSITION = "Content-Disposition"
 	const val COOKIE = "Cookie"
 	const val CONTENT_ENCODING = "Content-Encoding"
+	const val ACCEPT_ENCODING = "Accept-Encoding"
 	const val AUTHORIZATION = "Authorization"
 
-	val CACHE_CONTROL_DISABLED: CacheControl
+	val CACHE_CONTROL_NO_STORE: CacheControl
 		get() = CacheControl.Builder().noStore().build()
 }

app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeadersInterceptor.kt

@@ -0,0 +1,85 @@
+package org.koitharu.kotatsu.core.network
+
+import android.os.Build
+import android.util.Log
+import dagger.Lazy
+import okhttp3.Headers
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mergeWith
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CommonHeadersInterceptor @Inject constructor(
+	private val mangaRepositoryFactoryLazy: Lazy<MangaRepository.Factory>,
+) : Interceptor {
+
+	override fun intercept(chain: Interceptor.Chain): Response {
+		val request = chain.request()
+		val source = request.tag(MangaSource::class.java)
+		val repository = if (source != null) {
+			mangaRepositoryFactoryLazy.get().create(source) as? RemoteMangaRepository
+		} else {
+			if (BuildConfig.DEBUG) {
+				Log.w("Http", "Request without source tag: ${request.url}")
+			}
+			null
+		}
+		val headersBuilder = request.headers.newBuilder()
+		repository?.headers?.let {
+			headersBuilder.mergeWith(it, replaceExisting = false)
+		}
+		if (headersBuilder[CommonHeaders.USER_AGENT] == null) {
+			headersBuilder[CommonHeaders.USER_AGENT] = userAgentFallback
+		}
+		if (headersBuilder[CommonHeaders.REFERER] == null && repository != null) {
+			headersBuilder.trySet(CommonHeaders.REFERER, "https://${repository.domain}/")
+		}
+		val newRequest = request.newBuilder().headers(headersBuilder.build()).build()
+		return repository?.intercept(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
+	}
+
+	private fun Headers.Builder.trySet(name: String, value: String) = try {
+		set(name, value)
+	} catch (e: IllegalArgumentException) {
+		e.printStackTraceDebug()
+	}
+
+	private class ProxyChain(
+		private val delegate: Interceptor.Chain,
+		private val request: Request,
+	) : Interceptor.Chain by delegate {
+
+		override fun request(): Request = request
+	}
+
+	companion object {
+
+		val userAgentFallback
+			get() = "Kotatsu/%s (Android %s; %s; %s %s; %s)".format(
+				BuildConfig.VERSION_NAME,
+				Build.VERSION.RELEASE,
+				Build.MODEL,
+				Build.BRAND,
+				Build.DEVICE,
+				Locale.getDefault().language,
+			)
+
+		val userAgentChrome
+			get() = (
+				"Mozilla/5.0 (Linux; Android %s; %s) AppleWebKit/537.36 (KHTML, like Gecko) " +
+					"Chrome/100.0.4896.127 Mobile Safari/537.36"
+				).format(
+					Build.VERSION.RELEASE,
+					Build.MODEL,
+				)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/network/MirrorSwitchInterceptor.kt

@@ -0,0 +1,102 @@
+package org.koitharu.kotatsu.core.network
+
+import dagger.Lazy
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.toResponseBody
+import okhttp3.internal.canParseAsIpAddress
+import okhttp3.internal.closeQuietly
+import okhttp3.internal.publicsuffix.PublicSuffixDatabase
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MirrorSwitchInterceptor @Inject constructor(
+	private val mangaRepositoryFactoryLazy: Lazy<MangaRepository.Factory>,
+) : Interceptor {
+
+	override fun intercept(chain: Interceptor.Chain): Response {
+		val request = chain.request()
+		return try {
+			val response = chain.proceed(request)
+			if (response.isFailed) {
+				val responseCopy = response.copy()
+				response.closeQuietly()
+				trySwitchMirror(request, chain)?.also {
+					responseCopy.closeQuietly()
+				} ?: responseCopy
+			} else {
+				response
+			}
+		} catch (e: Exception) {
+			trySwitchMirror(request, chain) ?: throw e
+		}
+	}
+
+	private fun trySwitchMirror(request: Request, chain: Interceptor.Chain): Response? {
+		val source = request.tag(MangaSource::class.java) ?: return null
+		val repository = mangaRepositoryFactoryLazy.get().create(source) as? RemoteMangaRepository ?: return null
+		val mirrors = repository.getAvailableMirrors()
+		if (mirrors.isEmpty()) {
+			return null
+		}
+		return tryMirrors(repository, mirrors, chain, request)
+	}
+
+	private fun tryMirrors(
+		repository: RemoteMangaRepository,
+		mirrors: List<String>,
+		chain: Interceptor.Chain,
+		request: Request,
+	): Response? {
+		val url = request.url
+		val currentDomain = url.topPrivateDomain()
+		if (currentDomain !in mirrors) {
+			return null
+		}
+		val urlBuilder = url.newBuilder()
+		for (mirror in mirrors) {
+			if (mirror == currentDomain) {
+				continue
+			}
+			val newHost = hostOf(url.host, mirror) ?: continue
+			val newRequest = request.newBuilder()
+				.url(urlBuilder.host(newHost).build())
+				.build()
+			val response = chain.proceed(newRequest)
+			if (response.isFailed) {
+				response.closeQuietly()
+			} else {
+				repository.domain = mirror
+				return response
+			}
+		}
+		return null
+	}
+
+	private val Response.isFailed: Boolean
+		get() = code in 400..599
+
+	private fun hostOf(host: String, newDomain: String): String? {
+		if (newDomain.canParseAsIpAddress()) {
+			return newDomain
+		}
+		val domain = PublicSuffixDatabase.get().getEffectiveTldPlusOne(host) ?: return null
+		return host.removeSuffix(domain) + newDomain
+	}
+
+	private fun Response.copy(): Response {
+		return newBuilder()
+			.body(body?.copy())
+			.build()
+	}
+
+	private fun ResponseBody.copy(): ResponseBody {
+		return source().readByteArray().toResponseBody(contentType())
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/network/SSLBypass.kt

@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.core.network
+
+import android.annotation.SuppressLint
+import okhttp3.OkHttpClient
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import java.security.SecureRandom
+import java.security.cert.X509Certificate
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.X509TrustManager
+
+@SuppressLint("CustomX509TrustManager")
+fun OkHttpClient.Builder.bypassSSLErrors() = also { builder ->
+	runCatching {
+		val trustAllCerts = object : X509TrustManager {
+			override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) = Unit
+
+			override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) = Unit
+
+			override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
+		}
+		val sslContext = SSLContext.getInstance("SSL")
+		sslContext.init(null, arrayOf(trustAllCerts), SecureRandom())
+		val sslSocketFactory: SSLSocketFactory = sslContext.socketFactory
+		builder.sslSocketFactory(sslSocketFactory, trustAllCerts)
+		builder.hostnameVerifier { _, _ -> true }
+	}.onFailure {
+		it.printStackTraceDebug()
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt

@@ -1,43 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.os.Build
-import java.util.*
-import okhttp3.Interceptor
-import okhttp3.Response
-import org.koitharu.kotatsu.BuildConfig
-
-class UserAgentInterceptor : Interceptor {
-
-	override fun intercept(chain: Interceptor.Chain): Response {
-		val request = chain.request()
-		return chain.proceed(
-			if (request.header(CommonHeaders.USER_AGENT) == null) {
-				request.newBuilder()
-					.addHeader(CommonHeaders.USER_AGENT, userAgent)
-					.build()
-			} else request
-		)
-	}
-
-	companion object {
-
-		val userAgent
-			get() = "Kotatsu/%s (Android %s; %s; %s %s; %s)".format(
-				BuildConfig.VERSION_NAME,
-				Build.VERSION.RELEASE,
-				Build.MODEL,
-				Build.BRAND,
-				Build.DEVICE,
-				Locale.getDefault().language
-			)
-
-		val userAgentChrome
-			get() = (
-				"Mozilla/5.0 (Linux; Android %s; %s) AppleWebKit/537.36 (KHTML, like Gecko) " +
-					"Chrome/100.0.4896.127 Mobile Safari/537.36"
-				).format(
-				Build.VERSION.RELEASE,
-				Build.MODEL,
-			)
-	}
-}

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

@@ -3,23 +3,28 @@ package org.koitharu.kotatsu.core.os
 import android.net.ConnectivityManager
 import android.net.ConnectivityManager.NetworkCallback
 import android.net.Network
+import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import kotlinx.coroutines.flow.first
 import org.koitharu.kotatsu.utils.MediatorStateFlow
-import org.koitharu.kotatsu.utils.ext.isNetworkAvailable
+import org.koitharu.kotatsu.utils.ext.isOnline
 
 class NetworkState(
 	private val connectivityManager: ConnectivityManager,
-) : MediatorStateFlow<Boolean>(connectivityManager.isNetworkAvailable) {
+) : MediatorStateFlow<Boolean>(connectivityManager.isOnline()) {
 
 	private val callback = NetworkCallbackImpl()
 
+	@Synchronized
 	override fun onActive() {
 		invalidate()
-		val request = NetworkRequest.Builder().build()
+		val request = NetworkRequest.Builder()
+			.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+			.build()
 		connectivityManager.registerNetworkCallback(request, callback)
 	}
 
+	@Synchronized
 	override fun onInactive() {
 		connectivityManager.unregisterNetworkCallback(callback)
 	}
@@ -32,7 +37,7 @@ class NetworkState(
 	}
 
 	private fun invalidate() {
-		publishValue(connectivityManager.isNetworkAvailable)
+		publishValue(connectivityManager.isOnline())
 	}
 
 	private inner class NetworkCallbackImpl : NetworkCallback() {

app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt

@@ -118,6 +118,7 @@ class ShortcutsUpdater @Inject constructor(
 				ImageRequest.Builder(context)
 					.data(manga.coverUrl)
 					.size(iconSize.width, iconSize.height)
+					.tag(manga.source)
 					.precision(Precision.EXACT)
 					.scale(Scale.FILL)
 					.build(),

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

@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.toList
+import java.lang.ref.WeakReference
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -28,10 +29,14 @@ class MangaLoaderContextImpl @Inject constructor(
 	@ApplicationContext private val androidContext: Context,
 ) : MangaLoaderContext() {
 
+	private var webViewCached: WeakReference<WebView>? = null
+
 	@SuppressLint("SetJavaScriptEnabled")
 	override suspend fun evaluateJs(script: String): String? = withContext(Dispatchers.Main) {
-		val webView = WebView(androidContext)
-		webView.settings.javaScriptEnabled = true
+		val webView = webViewCached?.get() ?: WebView(androidContext).also {
+			it.settings.javaScriptEnabled = true
+			webViewCached = WeakReference(it)
+		}
 		suspendCoroutine { cont ->
 			webView.evaluateJavascript(script) { result ->
 				cont.resume(result?.takeUnless { it == "null" })

app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.parser
 
+import androidx.annotation.AnyThread
 import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
@@ -42,6 +43,7 @@ interface MangaRepository {
 
 		private val cache = EnumMap<MangaSource, WeakReference<RemoteMangaRepository>>(MangaSource::class.java)
 
+		@AnyThread
 		fun create(source: MangaSource): MangaRepository {
 			if (source == MangaSource.LOCAL) {
 				return localMangaRepository

app/src/main/java/org/koitharu/kotatsu/core/parser/MangaTagHighlighter.kt

@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.content.Context
+import androidx.annotation.ColorRes
+import dagger.Reusable
+import dagger.hilt.android.qualifiers.ApplicationContext
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import javax.inject.Inject
+
+@Reusable
+class MangaTagHighlighter @Inject constructor(
+	@ApplicationContext context: Context,
+) {
+
+	private val dict by lazy {
+		context.resources.openRawResource(R.raw.tags_redlist).use {
+			val set = HashSet<String>()
+			it.bufferedReader().forEachLine { x ->
+				val line = x.trim()
+				if (line.isNotEmpty()) {
+					set.add(line)
+				}
+			}
+			set
+		}
+	}
+
+	@ColorRes
+	fun getTint(tag: MangaTag): Int {
+		return if (tag.title.lowercase() in dict) {
+			R.color.warning
+		} else {
+			0
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt

@@ -1,8 +1,16 @@
 package org.koitharu.kotatsu.core.parser
 
+import android.util.Log
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainCoroutineDispatcher
 import kotlinx.coroutines.async
+import kotlinx.coroutines.currentCoroutineContext
+import okhttp3.Headers
+import okhttp3.Interceptor
+import okhttp3.Response
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.core.cache.SafeDeferred
 import org.koitharu.kotatsu.core.prefs.SourceSettings
@@ -16,13 +24,14 @@ 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.domain
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class RemoteMangaRepository(
 	private val parser: MangaParser,
 	private val cache: ContentCache,
-) : MangaRepository {
+) : MangaRepository, Interceptor {
 
 	override val source: MangaSource
 		get() = parser.source
@@ -36,6 +45,23 @@ class RemoteMangaRepository(
 			getConfig().defaultSortOrder = value
 		}
 
+	var domain: String
+		get() = parser.domain
+		set(value) {
+			getConfig()[parser.configKeyDomain] = value
+		}
+
+	val headers: Headers?
+		get() = parser.headers
+
+	override fun intercept(chain: Interceptor.Chain): Response {
+		return if (parser is Interceptor) {
+			parser.intercept(chain)
+		} else {
+			chain.proceed(chain.request())
+		}
+	}
+
 	override suspend fun getList(offset: Int, query: String): List<Manga> {
 		return parser.getList(offset, query)
 	}
@@ -56,7 +82,7 @@ class RemoteMangaRepository(
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
 		cache.getPages(source, chapter.url)?.let { return it }
 		val pages = asyncSafe {
-			parser.getPages(chapter)
+			parser.getPages(chapter).distinctById()
 		}
 		cache.putPages(source, chapter.url, pages)
 		return pages.await()
@@ -74,11 +100,37 @@ class RemoteMangaRepository(
 		parser.onCreateConfig(it)
 	}
 
+	fun getAvailableMirrors(): List<String> {
+		return parser.configKeyDomain.presetValues?.toList().orEmpty()
+	}
+
 	private fun getConfig() = parser.config as SourceSettings
 
-	private fun <T> asyncSafe(block: suspend CoroutineScope.() -> T) = SafeDeferred(
-		processLifecycleScope.async(Dispatchers.Default) {
-			runCatchingCancellable { block() }
-		},
-	)
+	private suspend fun <T> asyncSafe(block: suspend CoroutineScope.() -> T): SafeDeferred<T> {
+		var dispatcher = currentCoroutineContext()[CoroutineDispatcher.Key]
+		if (dispatcher == null || dispatcher is MainCoroutineDispatcher) {
+			dispatcher = Dispatchers.Default
+		}
+		return SafeDeferred(
+			processLifecycleScope.async(dispatcher) {
+				runCatchingCancellable { block() }
+			},
+		)
+	}
+
+	private fun List<MangaPage>.distinctById(): List<MangaPage> {
+		if (isEmpty()) {
+			return emptyList()
+		}
+		val result = ArrayList<MangaPage>(size)
+		val set = HashSet<Long>(size)
+		for (page in this) {
+			if (set.add(page.id)) {
+				result.add(page)
+			} else if (BuildConfig.DEBUG) {
+				Log.w(null, "Duplicate page: $page")
+			}
+		}
+		return result
+	}
 }

app/src/main/java/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt

@@ -20,7 +20,6 @@ import okhttp3.Response
 import okhttp3.ResponseBody
 import okhttp3.internal.closeQuietly
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.local.data.CacheDir
@@ -53,7 +52,7 @@ class FaviconFetcher(
 			options.size.height.pxOrElse { FALLBACK_SIZE },
 		)
 		val icon = checkNotNull(favicons.find(sizePx)) { "No favicons found" }
-		val response = loadIcon(icon.url, favicons.referer)
+		val response = loadIcon(icon.url, mangaSource)
 		val responseBody = response.requireBody()
 		val source = writeToDiskCache(responseBody)?.toImageSource() ?: responseBody.toImageSource()
 		return SourceResult(
@@ -63,11 +62,11 @@ class FaviconFetcher(
 		)
 	}
 
-	private suspend fun loadIcon(url: String, referer: String): Response {
+	private suspend fun loadIcon(url: String, source: MangaSource): Response {
 		val request = Request.Builder()
 			.url(url)
 			.get()
-			.header(CommonHeaders.REFERER, referer)
+			.tag(MangaSource::class.java, source)
 		@Suppress("UNCHECKED_CAST")
 		options.tags.asMap().forEach { request.tag(it.key as Class<Any>, it.value) }
 		val response = okHttpClient.newCall(request.build()).await()

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

@@ -4,11 +4,12 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.net.Uri
 import android.provider.Settings
+import androidx.annotation.FloatRange
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.arraySetOf
 import androidx.core.content.edit
+import androidx.core.os.LocaleListCompat
 import androidx.preference.PreferenceManager
-import com.google.android.material.color.DynamicColors
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.ZoomMode
@@ -17,13 +18,12 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.shelf.domain.ShelfSection
 import org.koitharu.kotatsu.utils.ext.connectivityManager
+import org.koitharu.kotatsu.utils.ext.filterToSet
 import org.koitharu.kotatsu.utils.ext.getEnumValue
 import org.koitharu.kotatsu.utils.ext.observe
 import org.koitharu.kotatsu.utils.ext.putEnumValue
 import org.koitharu.kotatsu.utils.ext.toUriOrNull
 import java.io.File
-import java.text.DateFormat
-import java.text.SimpleDateFormat
 import java.util.Collections
 import java.util.EnumSet
 import java.util.Locale
@@ -69,8 +69,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val theme: Int
 		get() = prefs.getString(KEY_THEME, null)?.toIntOrNull() ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 
-	val isDynamicTheme: Boolean
-		get() = DynamicColors.isDynamicColorAvailable() && prefs.getBoolean(KEY_DYNAMIC_THEME, false)
+	val colorScheme: ColorScheme
+		get() = prefs.getEnumValue(KEY_COLOR_THEME, ColorScheme.default)
 
 	val isAmoledTheme: Boolean
 		get() = prefs.getBoolean(KEY_THEME_AMOLED, false)
@@ -79,6 +79,17 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
 
+	var appLocales: LocaleListCompat
+		get() {
+			val raw = prefs.getString(KEY_APP_LOCALE, null)
+			return LocaleListCompat.forLanguageTags(raw)
+		}
+		set(value) {
+			prefs.edit {
+				putString(KEY_APP_LOCALE, value.toLanguageTags())
+			}
+		}
+
 	val readerPageSwitch: Set<String>
 		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
 
@@ -147,6 +158,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
 		set(value) = prefs.edit { if (value != null) putString(KEY_APP_PASSWORD, value) else remove(KEY_APP_PASSWORD) }
 
+	val isLoggingEnabled: Boolean
+		get() = prefs.getBoolean(KEY_LOGGING_ENABLED, false)
+
 	var isBiometricProtectionEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PROTECT_APP_BIOMETRIC, true)
 		set(value) = prefs.edit { putBoolean(KEY_PROTECT_APP_BIOMETRIC, value) }
@@ -157,6 +171,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isDynamicShortcutsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_SHORTCUTS, true)
 
+	val isUnstableUpdatesAllowed: Boolean
+		get() = prefs.getBoolean(KEY_UPDATES_UNSTABLE, false)
+
 	fun isContentPrefetchEnabled(): Boolean {
 		val policy = NetworkPolicy.from(prefs.getString(KEY_PREFETCH_CONTENT, null), NetworkPolicy.NEVER)
 		return policy.isNetworkAllowed(connectivityManager)
@@ -171,7 +188,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		}
 
 	var hiddenSources: Set<String>
-		get() = prefs.getStringSet(KEY_SOURCES_HIDDEN, null) ?: emptySet()
+		get() = prefs.getStringSet(KEY_SOURCES_HIDDEN, null)?.filterToSet { name ->
+			remoteSources.any { it.name == name }
+		}.orEmpty()
 		set(value) = prefs.edit { putStringSet(KEY_SOURCES_HIDDEN, value) }
 
 	val isSourcesSelected: Boolean
@@ -191,6 +210,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		sourcesOrder = (sourcesOrder + sources.map { it.name }).distinct()
 	}
 
+	var isSourcesGridMode: Boolean
+		get() = prefs.getBoolean(KEY_SOURCES_GRID, false)
+		set(value) = prefs.edit { putBoolean(KEY_SOURCES_GRID, value) }
+
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
 
@@ -233,6 +256,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val dnsOverHttps: DoHProvider
 		get() = prefs.getEnumValue(KEY_DOH, DoHProvider.NONE)
 
+	val isSSLBypassEnabled: Boolean
+		get() = prefs.getBoolean(KEY_SSL_BYPASS, false)
+
 	var localListOrder: SortOrder
 		get() = prefs.getEnumValue(KEY_LOCAL_LIST_ORDER, SortOrder.NEWEST)
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
@@ -240,17 +266,16 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isWebtoonZoomEnable: Boolean
 		get() = prefs.getBoolean(KEY_WEBTOON_ZOOM, true)
 
+	@get:FloatRange(from = 0.0, to = 1.0)
+	var readerAutoscrollSpeed: Float
+		get() = prefs.getFloat(KEY_READER_AUTOSCROLL_SPEED, 0f)
+		set(@FloatRange(from = 0.0, to = 1.0) value) = prefs.edit { putFloat(KEY_READER_AUTOSCROLL_SPEED, value) }
+
 	fun isPagesPreloadEnabled(): Boolean {
 		val policy = NetworkPolicy.from(prefs.getString(KEY_PAGES_PRELOAD, null), NetworkPolicy.NON_METERED)
 		return policy.isNetworkAllowed(connectivityManager)
 	}
 
-	fun getDateFormat(format: String = prefs.getString(KEY_DATE_FORMAT, "").orEmpty()): DateFormat =
-		when (format) {
-			"" -> DateFormat.getDateInstance(DateFormat.SHORT)
-			else -> SimpleDateFormat(format, Locale.getDefault())
-		}
-
 	fun getSuggestionsTagsBlacklistRegex(): Regex? {
 		val string = prefs.getString(KEY_SUGGESTIONS_EXCLUDE_TAGS, null)?.trimEnd(' ', ',')
 		if (string.isNullOrEmpty()) {
@@ -277,6 +302,18 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		return list
 	}
 
+	fun isTipEnabled(tip: String): Boolean {
+		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
+	}
+
+	fun closeTip(tip: String) {
+		val closedTips = prefs.getStringSet(KEY_TIPS_CLOSED, emptySet()).orEmpty()
+		if (tip in closedTips) {
+			return
+		}
+		prefs.edit { putStringSet(KEY_TIPS_CLOSED, closedTips + tip) }
+	}
+
 	fun subscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
 		prefs.registerOnSharedPreferenceChangeListener(listener)
 	}
@@ -297,9 +334,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 
 		const val KEY_LIST_MODE = "list_mode_2"
 		const val KEY_THEME = "theme"
-		const val KEY_DYNAMIC_THEME = "dynamic_theme"
+		const val KEY_COLOR_THEME = "color_theme"
 		const val KEY_THEME_AMOLED = "amoled_theme"
-		const val KEY_DATE_FORMAT = "date_format"
 		const val KEY_SOURCES_ORDER = "sources_order_2"
 		const val KEY_SOURCES_HIDDEN = "sources_hidden"
 		const val KEY_TRAFFIC_WARNING = "traffic_warning"
@@ -343,6 +379,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SUGGESTIONS_EXCLUDE_NSFW = "suggestions_exclude_nsfw"
 		const val KEY_SUGGESTIONS_EXCLUDE_TAGS = "suggestions_exclude_tags"
 		const val KEY_SHIKIMORI = "shikimori"
+		const val KEY_ANILIST = "anilist"
+		const val KEY_MAL = "mal"
 		const val KEY_DOWNLOADS_PARALLELISM = "downloads_parallelism"
 		const val KEY_DOWNLOADS_SLOWDOWN = "downloads_slowdown"
 		const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible"
@@ -358,6 +396,14 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_WEBTOON_ZOOM = "webtoon_zoom"
 		const val KEY_SHELF_SECTIONS = "shelf_sections_2"
 		const val KEY_PREFETCH_CONTENT = "prefetch_content"
+		const val KEY_APP_LOCALE = "app_locale"
+		const val KEY_LOGGING_ENABLED = "logging"
+		const val KEY_LOGS_SHARE = "logs_share"
+		const val KEY_SOURCES_GRID = "sources_grid"
+		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
+		const val KEY_TIPS_CLOSED = "tips_closed"
+		const val KEY_SSL_BYPASS = "ssl_bypass"
+		const val KEY_READER_AUTOSCROLL_SPEED = "as_speed"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettingsObserver.kt

@@ -1,8 +1,13 @@
 package org.koitharu.kotatsu.core.prefs
 
 import androidx.lifecycle.liveData
-import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transform
+import kotlin.coroutines.CoroutineContext
 
 fun <T> AppSettings.observeAsFlow(key: String, valueProducer: AppSettings.() -> T) = flow {
 	var lastValue: T = valueProducer()
@@ -33,3 +38,13 @@ fun <T> AppSettings.observeAsLiveData(
 		}
 	}
 }
+
+fun <T> AppSettings.observeAsStateFlow(
+	key: String,
+	scope: CoroutineScope,
+	valueProducer: AppSettings.() -> T,
+): StateFlow<T> = observe().transform {
+	if (it == key) {
+		emit(valueProducer())
+	}
+}.stateIn(scope, SharingStarted.Eagerly, valueProducer())

app/src/main/java/org/koitharu/kotatsu/core/prefs/ColorScheme.kt

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.core.prefs
+
+import androidx.annotation.StringRes
+import androidx.annotation.StyleRes
+import com.google.android.material.color.DynamicColors
+import org.koitharu.kotatsu.R
+
+enum class ColorScheme(
+	@StyleRes val styleResId: Int,
+	@StringRes val titleResId: Int,
+) {
+
+	DEFAULT(R.style.Theme_Kotatsu, R.string.system_default),
+	MONET(R.style.Theme_Kotatsu_Monet, R.string.theme_name_dynamic),
+	MIKU(R.style.Theme_Kotatsu_Miku, R.string.theme_name_miku),
+	RENA(R.style.Theme_Kotatsu_Asuka, R.string.theme_name_asuka),
+	FROG(R.style.Theme_Kotatsu_Mion, R.string.theme_name_mion),
+	BLUEBERRY(R.style.Theme_Kotatsu_Rikka, R.string.theme_name_rikka),
+	NAME2(R.style.Theme_Kotatsu_Sakura, R.string.theme_name_sakura),
+	MAMIMI(R.style.Theme_Kotatsu_Mamimi, R.string.theme_name_mamimi),
+	KANADE(R.style.Theme_Kotatsu_Kanade, R.string.theme_name_kanade)
+	;
+
+	companion object {
+
+		val default: ColorScheme
+			get() = if (DynamicColors.isDynamicColorAvailable()) {
+				MONET
+			} else {
+				DEFAULT
+			}
+
+		fun getAvailableList(): List<ColorScheme> {
+			val list = enumValues<ColorScheme>().toMutableList()
+			if (!DynamicColors.isDynamicColorAvailable()) {
+				list.remove(MONET)
+			}
+			return list
+		}
+
+		fun safeValueOf(name: String): ColorScheme? {
+			return enumValues<ColorScheme>().find { it.name == name }
+		}
+	}
+}

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

@@ -23,7 +23,17 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 	@Suppress("UNCHECKED_CAST")
 	override fun <T> get(key: ConfigKey<T>): T {
 		return when (key) {
+			is ConfigKey.UserAgent -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
 			is ConfigKey.Domain -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
+			is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue)
 		} as T
 	}
-}
+
+	operator fun <T> set(key: ConfigKey<T>, value: T) = prefs.edit {
+		when (key) {
+			is ConfigKey.Domain -> putString(key.key, value as String?)
+			is ConfigKey.ShowSuspiciousContent -> putBoolean(key.key, value as Boolean)
+			is ConfigKey.UserAgent -> putString(key.key, value as String?)
+		}
+	}
+}

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

@@ -5,7 +5,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.utils.ext.daysDiff
 import org.koitharu.kotatsu.utils.ext.format
-import java.util.*
+import java.util.Date
 
 sealed class DateTimeAgo : ListModel {
 
@@ -17,6 +17,8 @@ sealed class DateTimeAgo : ListModel {
 		}
 
 		override fun toString() = "just_now"
+
+		override fun equals(other: Any?): Boolean = other === JustNow
 	}
 
 	class MinutesAgo(val minutes: Int) : DateTimeAgo() {
@@ -60,6 +62,8 @@ sealed class DateTimeAgo : ListModel {
 		}
 
 		override fun toString() = "today"
+
+		override fun equals(other: Any?): Boolean = other === Today
 	}
 
 	object Yesterday : DateTimeAgo() {
@@ -68,6 +72,8 @@ sealed class DateTimeAgo : ListModel {
 		}
 
 		override fun toString() = "yesterday"
+
+		override fun equals(other: Any?): Boolean = other === Yesterday
 	}
 
 	class DaysAgo(val days: Int) : DateTimeAgo() {
@@ -119,5 +125,7 @@ sealed class DateTimeAgo : ListModel {
 		}
 
 		override fun toString() = "long_ago"
+
+		override fun equals(other: Any?): Boolean = other === LongAgo
 	}
-}
+}

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

@@ -1,5 +1,8 @@
 package org.koitharu.kotatsu.core.ui
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
@@ -12,28 +15,24 @@ import androidx.fragment.app.FragmentManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.databinding.DialogMangaErrorBinding
-import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.databinding.DialogErrorDetailsBinding
+import org.koitharu.kotatsu.utils.ext.isReportable
 import org.koitharu.kotatsu.utils.ext.report
-import org.koitharu.kotatsu.utils.ext.requireParcelable
 import org.koitharu.kotatsu.utils.ext.requireSerializable
 import org.koitharu.kotatsu.utils.ext.withArgs
 
-class MangaErrorDialog : AlertDialogFragment<DialogMangaErrorBinding>() {
+class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
 
-	private lateinit var error: Throwable
-	private lateinit var manga: Manga
+	private lateinit var exception: Throwable
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		val args = requireArguments()
-		manga = args.requireParcelable<ParcelableManga>(ARG_MANGA).manga
-		error = args.requireSerializable(ARG_ERROR)
+		exception = args.requireSerializable(ARG_ERROR)
 	}
 
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): DialogMangaErrorBinding {
-		return DialogMangaErrorBinding.inflate(inflater, container, false)
+	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): DialogErrorDetailsBinding {
+		return DialogErrorDetailsBinding.inflate(inflater, container, false)
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -42,31 +41,47 @@ class MangaErrorDialog : AlertDialogFragment<DialogMangaErrorBinding>() {
 			movementMethod = LinkMovementMethod.getInstance()
 			text = context.getString(
 				R.string.manga_error_description_pattern,
-				this@MangaErrorDialog.error.message?.htmlEncode().orEmpty(),
-				manga.publicUrl,
+				exception.message?.htmlEncode().orEmpty(),
+				arguments?.getString(ARG_URL),
 			).parseAsHtml(HtmlCompat.FROM_HTML_MODE_LEGACY)
 		}
 	}
 
+	@Suppress("NAME_SHADOWING")
 	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder)
+		val builder = super.onBuildDialog(builder)
 			.setCancelable(true)
 			.setNegativeButton(android.R.string.cancel, null)
-			.setPositiveButton(R.string.report) { _, _ ->
+			.setTitle(R.string.error_occurred)
+			.setNeutralButton(androidx.preference.R.string.copy) { _, _ ->
+				copyToClipboard()
+			}
+		if (exception.isReportable()) {
+			builder.setPositiveButton(R.string.report) { _, _ ->
 				dismiss()
-				error.report()
-			}.setTitle(R.string.error_occurred)
+				exception.report()
+			}
+		}
+		return builder
+	}
+
+	private fun copyToClipboard() {
+		val clipboardManager = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
+			?: return
+		clipboardManager.setPrimaryClip(
+			ClipData.newPlainText(getString(R.string.error), exception.stackTraceToString()),
+		)
 	}
 
 	companion object {
 
-		private const val TAG = "MangaErrorDialog"
+		private const val TAG = "ErrorDetailsDialog"
 		private const val ARG_ERROR = "error"
-		private const val ARG_MANGA = "manga"
+		private const val ARG_URL = "url"
 
-		fun show(fm: FragmentManager, manga: Manga, error: Throwable) = MangaErrorDialog().withArgs(2) {
-			putParcelable(ARG_MANGA, ParcelableManga(manga, false))
+		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/java/org/koitharu/kotatsu/details/service/MangaPrefetchService.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.EntryPointAccessors
-import kotlinx.coroutines.coroutineScope
 import org.koitharu.kotatsu.base.ui.CoroutineIntentService
 import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
@@ -15,6 +14,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import javax.inject.Inject
 
@@ -47,7 +47,7 @@ class MangaPrefetchService : CoroutineIntentService() {
 
 	override fun onError(startId: Int, error: Throwable) = Unit
 
-	private suspend fun prefetchDetails(manga: Manga) = coroutineScope {
+	private suspend fun prefetchDetails(manga: Manga) {
 		val source = mangaRepositoryFactory.create(manga.source)
 		runCatchingCancellable { source.getDetails(manga) }
 	}
@@ -96,7 +96,12 @@ class MangaPrefetchService : CoroutineIntentService() {
 			val intent = Intent(context, MangaPrefetchService::class.java)
 			intent.action = ACTION_PREFETCH_PAGES
 			intent.putExtra(EXTRA_CHAPTER, ParcelableMangaChapters(listOf(chapter)))
-			context.startService(intent)
+			try {
+				context.startService(intent)
+			} catch (e: IllegalStateException) {
+				// probably app is in background
+				e.printStackTraceDebug()
+			}
 		}
 
 		fun prefetchLast(context: Context) {

app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt

@@ -1,15 +1,16 @@
 package org.koitharu.kotatsu.details.ui
 
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.view.ActionMode
-import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
-import kotlin.math.roundToInt
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.ListSelectionController
@@ -24,8 +25,8 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.utils.RecyclerViewScrollCallback
-import org.koitharu.kotatsu.utils.ext.parents
 import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
+import kotlin.math.roundToInt
 
 class ChaptersFragment :
 	BaseFragment<FragmentChaptersBinding>(),
@@ -95,13 +96,14 @@ class ChaptersFragment :
 		return when (item.itemId) {
 			R.id.action_save -> {
 				DownloadService.start(
-					context ?: return false,
+					binding.recyclerViewChapters,
 					viewModel.getRemoteManga() ?: viewModel.manga.value ?: return false,
 					selectionController?.snapshot(),
 				)
 				mode.finish()
 				true
 			}
+
 			R.id.action_delete -> {
 				val ids = selectionController?.peekCheckedIds()
 				val manga = viewModel.manga.value
@@ -120,6 +122,7 @@ class ChaptersFragment :
 				mode.finish()
 				true
 			}
+
 			R.id.action_select_range -> {
 				val items = chaptersAdapter?.items ?: return false
 				val ids = HashSet(controller.peekCheckedIds())
@@ -139,11 +142,20 @@ class ChaptersFragment :
 				controller.addAll(ids)
 				true
 			}
+
 			R.id.action_select_all -> {
 				val ids = chaptersAdapter?.items?.map { it.chapter.id } ?: return false
-				selectionController?.addAll(ids)
+				controller.addAll(ids)
 				true
 			}
+
+			R.id.action_mark_current -> {
+				val id = controller.peekCheckedIds().singleOrNull() ?: return false
+				viewModel.markChapterAsCurrent(id)
+				mode.finish()
+				true
+			}
+
 			else -> false
 		}
 	}
@@ -164,6 +176,7 @@ class ChaptersFragment :
 			x.chapter.source == MangaSource.LOCAL
 		}
 		menu.findItem(R.id.action_select_all).isVisible = items.size < allItems.size
+		menu.findItem(R.id.action_mark_current).isVisible = items.size == 1
 		mode.title = items.size.toString()
 		var hasGap = false
 		for (i in 0 until items.size - 1) {

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt

@@ -1,9 +1,7 @@
 package org.koitharu.kotatsu.details.ui
 
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.os.Bundle
 import android.transition.Slide
 import android.transition.TransitionManager
@@ -13,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.Toast
+import androidx.activity.viewModels
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
 import androidx.core.view.isGone
@@ -29,10 +28,9 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.base.ui.widgets.BottomSheetHeaderBar
-import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.os.ShortcutsUpdater
-import org.koitharu.kotatsu.core.ui.MangaErrorDialog
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 import org.koitharu.kotatsu.details.service.MangaPrefetchService
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -43,9 +41,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.utils.ViewBadge
-import org.koitharu.kotatsu.utils.ext.assistedViewModels
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.isReportable
 import org.koitharu.kotatsu.utils.ext.setNavigationBarTransparentCompat
 import org.koitharu.kotatsu.utils.ext.textAndVisible
 import javax.inject.Inject
@@ -60,26 +56,14 @@ class DetailsActivity :
 	override val bsHeader: BottomSheetHeaderBar?
 		get() = binding.headerChapters
 
-	@Inject
-	lateinit var viewModelFactory: DetailsViewModel.Factory
-
 	@Inject
 	lateinit var shortcutsUpdater: ShortcutsUpdater
 
 	private lateinit var viewBadge: ViewBadge
 
-	private val viewModel: DetailsViewModel by assistedViewModels {
-		viewModelFactory.create(MangaIntent(intent))
-	}
+	private val viewModel: DetailsViewModel by viewModels()
 	private lateinit var chaptersMenuProvider: ChaptersMenuProvider
 
-	private val downloadReceiver = object : BroadcastReceiver() {
-		override fun onReceive(context: Context?, intent: Intent?) {
-			val downloadedManga = DownloadService.getDownloadedManga(intent) ?: return
-			viewModel.onDownloadComplete(downloadedManga)
-		}
-	}
-
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityDetailsBinding.inflate(layoutInflater))
@@ -105,7 +89,19 @@ class DetailsActivity :
 		viewModel.manga.observe(this, ::onMangaUpdated)
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
-		viewModel.onError.observe(this, ::onError)
+		viewModel.onError.observe(
+			this,
+			SnackbarErrorObserver(
+				host = binding.containerDetails,
+				fragment = null,
+				resolver = exceptionResolver,
+				onResolved = { isResolved ->
+					if (isResolved) {
+						viewModel.reload()
+					}
+				},
+			),
+		)
 		viewModel.onShowToast.observe(this) {
 			makeSnackbar(getString(it), Snackbar.LENGTH_SHORT).show()
 		}
@@ -125,7 +121,6 @@ class DetailsActivity :
 		}
 		viewModel.chapters.observe(this, PrefetchObserver(this))
 
-		registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
 		addMenuProvider(
 			DetailsMenuProvider(
 				activity = this,
@@ -137,11 +132,6 @@ class DetailsActivity :
 		binding.headerChapters?.addOnExpansionChangeListener(this) ?: addMenuProvider(chaptersMenuProvider)
 	}
 
-	override fun onDestroy() {
-		unregisterReceiver(downloadReceiver)
-		super.onDestroy()
-	}
-
 	override fun onClick(v: View) {
 		val manga = viewModel.manga.value ?: return
 		when (v.id) {
@@ -191,37 +181,6 @@ class DetailsActivity :
 		finishAfterTransition()
 	}
 
-	private fun onError(e: Throwable) {
-		val manga = viewModel.manga.value
-		when {
-			ExceptionResolver.canResolve(e) -> {
-				resolveError(e)
-			}
-
-			manga == null -> {
-				Toast.makeText(this, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
-				finishAfterTransition()
-			}
-
-			else -> {
-				val snackbar = makeSnackbar(
-					e.getDisplayMessage(resources),
-					if (viewModel.manga.value?.chapters == null) {
-						Snackbar.LENGTH_INDEFINITE
-					} else {
-						Snackbar.LENGTH_LONG
-					},
-				)
-				if (e.isReportable()) {
-					snackbar.setAction(R.string.details) {
-						MangaErrorDialog.show(supportFragmentManager, manga, e)
-					}
-				}
-				snackbar.show()
-			}
-		}
-	}
-
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.root.updatePadding(
 			left = insets.left,
@@ -277,7 +236,7 @@ class DetailsActivity :
 				)
 			}
 			setNeutralButton(R.string.download) { _, _ ->
-				DownloadService.start(this@DetailsActivity, remoteManga, setOf(chapterId))
+				DownloadService.start(binding.appbar, remoteManga, setOf(chapterId))
 			}
 			setCancelable(true)
 		}.show()
@@ -331,17 +290,17 @@ class DetailsActivity :
 
 	private class PrefetchObserver(
 		private val context: Context,
-	) : Observer<List<ChapterListItem>> {
+	) : Observer<List<ChapterListItem>?> {
 
 		private var isCalled = false
 
-		override fun onChanged(t: List<ChapterListItem>?) {
-			if (t.isNullOrEmpty()) {
+		override fun onChanged(value: List<ChapterListItem>?) {
+			if (value.isNullOrEmpty()) {
 				return
 			}
 			if (!isCalled) {
 				isCalled = true
-				val item = t.find { it.hasFlag(ChapterListItem.FLAG_CURRENT) } ?: t.first()
+				val item = value.find { it.hasFlag(ChapterListItem.FLAG_CURRENT) } ?: value.first()
 				MangaPrefetchService.prefetchPages(context, item.chapter)
 			}
 		}

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -5,10 +5,10 @@ import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
-import androidx.core.net.toUri
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -18,7 +18,6 @@ import coil.request.ImageRequest
 import coil.util.CoilUtils
 import com.google.android.material.chip.Chip
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
@@ -26,6 +25,8 @@ import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
+import org.koitharu.kotatsu.core.model.countChaptersByBranch
+import org.koitharu.kotatsu.core.parser.MangaTagHighlighter
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
@@ -39,23 +40,18 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
+import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.search.ui.SearchActivity
 import org.koitharu.kotatsu.utils.FileSize
-import org.koitharu.kotatsu.utils.ext.computeSize
 import org.koitharu.kotatsu.utils.ext.crossfade
 import org.koitharu.kotatsu.utils.ext.drawableTop
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.utils.ext.measureHeight
-import org.koitharu.kotatsu.utils.ext.referer
 import org.koitharu.kotatsu.utils.ext.resolveDp
 import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.utils.ext.textAndVisible
-import org.koitharu.kotatsu.utils.ext.toFileOrNull
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 import javax.inject.Inject
 
@@ -63,13 +59,15 @@ import javax.inject.Inject
 class DetailsFragment :
 	BaseFragment<FragmentDetailsBinding>(),
 	View.OnClickListener,
-	View.OnLongClickListener,
 	ChipsView.OnChipClickListener,
 	OnListItemClickListener<Bookmark> {
 
 	@Inject
 	lateinit var coil: ImageLoader
 
+	@Inject
+	lateinit var tagHighlighter: MangaTagHighlighter
+
 	private val viewModel by activityViewModels<DetailsViewModel>()
 
 	override fun onInflateView(
@@ -91,6 +89,7 @@ class DetailsFragment :
 		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
 		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
 		viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
+		viewModel.localSize.observe(viewLifecycleOwner, ::onLocalSizeChanged)
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
@@ -98,6 +97,7 @@ class DetailsFragment :
 			ReaderActivity.newIntent(view.context, item),
 			scaleUpActivityOptionsOf(view).toBundle(),
 		)
+		Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 	}
 
 	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
@@ -146,20 +146,9 @@ class DetailsFragment :
 			}
 			if (manga.source == MangaSource.LOCAL) {
 				infoLayout.textViewSource.isVisible = false
-				val file = manga.url.toUri().toFileOrNull()
-				if (file != null) {
-					viewLifecycleScope.launch {
-						val size = file.computeSize()
-						infoLayout.textViewSize.text = FileSize.BYTES.format(requireContext(), size)
-						infoLayout.textViewSize.isVisible = true
-					}
-				} else {
-					infoLayout.textViewSize.isVisible = false
-				}
 			} else {
 				infoLayout.textViewSource.text = manga.source.title
 				infoLayout.textViewSource.isVisible = true
-				infoLayout.textViewSize.isVisible = false
 			}
 
 			infoLayout.textViewNsfw.isVisible = manga.isNsfw
@@ -174,12 +163,9 @@ class DetailsFragment :
 		if (chapters.isNullOrEmpty()) {
 			infoLayout.textViewChapters.isVisible = false
 		} else {
+			val count = chapters.countChaptersByBranch()
 			infoLayout.textViewChapters.isVisible = true
-			infoLayout.textViewChapters.text = resources.getQuantityString(
-				R.plurals.chapters,
-				chapters.size,
-				chapters.size,
-			)
+			infoLayout.textViewChapters.text = resources.getQuantityString(R.plurals.chapters, count, count)
 		}
 	}
 
@@ -191,6 +177,16 @@ class DetailsFragment :
 		}
 	}
 
+	private fun onLocalSizeChanged(size: Long) {
+		val textView = binding.infoLayout.textViewSize
+		if (size == 0L) {
+			textView.isVisible = false
+		} else {
+			textView.text = FileSize.BYTES.format(textView.context, size)
+			textView.isVisible = true
+		}
+	}
+
 	private fun onHistoryChanged(history: HistoryInfo) {
 		binding.progressView.setPercent(history.history?.percent ?: PROGRESS_NONE, animate = true)
 	}
@@ -254,50 +250,17 @@ class DetailsFragment :
 
 			R.id.imageView_cover -> {
 				startActivity(
-					ImageActivity.newIntent(v.context, manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }),
+					ImageActivity.newIntent(
+						v.context,
+						manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl },
+						manga.source,
+					),
 					scaleUpActivityOptionsOf(v).toBundle(),
 				)
 			}
 		}
 	}
 
-	override fun onLongClick(v: View): Boolean {
-		when (v.id) {
-			R.id.button_read -> {
-				if (viewModel.historyInfo.value?.history == null) {
-					return false
-				}
-				val menu = PopupMenu(v.context, v)
-				menu.inflate(R.menu.popup_read)
-				menu.setOnMenuItemClickListener { menuItem ->
-					when (menuItem.itemId) {
-						R.id.action_read -> {
-							val branch = viewModel.selectedBranchValue
-							startActivity(
-								ReaderActivity.newIntent(
-									context = context ?: return@setOnMenuItemClickListener false,
-									manga = viewModel.manga.value ?: return@setOnMenuItemClickListener false,
-									state = viewModel.chapters.value?.firstOrNull { c ->
-										c.chapter.branch == branch
-									}?.let { c ->
-										ReaderState(c.chapter.id, 0, 0)
-									},
-								),
-							)
-							true
-						}
-
-						else -> false
-					}
-				}
-				menu.show()
-				return true
-			}
-
-			else -> return false
-		}
-	}
-
 	override fun onChipClick(chip: Chip, data: Any?) {
 		val tag = data as? MangaTag ?: return
 		startActivity(MangaListActivity.newIntent(requireContext(), setOf(tag)))
@@ -318,7 +281,7 @@ class DetailsFragment :
 			manga.tags.map { tag ->
 				ChipsView.ChipModel(
 					title = tag.title,
-					icon = 0,
+					tint = tagHighlighter.getTint(tag),
 					data = tag,
 					isCheckable = false,
 					isChecked = false,
@@ -337,8 +300,8 @@ class DetailsFragment :
 			.target(binding.imageViewCover)
 			.size(CoverSizeResolver(binding.imageViewCover))
 			.data(imageUrl)
-			.crossfade(context)
-			.referer(manga.publicUrl)
+			.tag(manga.source)
+			.crossfade(requireContext())
 			.lifecycle(viewLifecycleOwner)
 			.placeholderMemoryCacheKey(manga.coverUrl)
 		val previousDrawable = lastResult?.drawable

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt

@@ -21,7 +21,7 @@ import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesB
 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.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
+import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorBottomSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
 import org.koitharu.kotatsu.utils.ShareHelper
 
@@ -42,7 +42,7 @@ class DetailsMenuProvider(
 		menu.findItem(R.id.action_delete).isVisible = manga?.source == MangaSource.LOCAL
 		menu.findItem(R.id.action_browser).isVisible = manga?.source != MangaSource.LOCAL
 		menu.findItem(R.id.action_shortcut).isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(activity)
-		menu.findItem(R.id.action_shiki_track).isVisible = viewModel.isScrobblingAvailable
+		menu.findItem(R.id.action_scrobbling).isVisible = viewModel.isScrobblingAvailable
 		menu.findItem(R.id.action_favourite).setIcon(
 			if (viewModel.favouriteCategories.value == true) R.drawable.ic_heart else R.drawable.ic_heart_outline,
 		)
@@ -60,11 +60,13 @@ class DetailsMenuProvider(
 					}
 				}
 			}
+
 			R.id.action_favourite -> {
 				viewModel.manga.value?.let {
 					FavouriteCategoriesBottomSheet.show(activity.supportFragmentManager, it)
 				}
 			}
+
 			R.id.action_delete -> {
 				val title = viewModel.manga.value?.title.orEmpty()
 				MaterialAlertDialogBuilder(activity)
@@ -76,6 +78,7 @@ class DetailsMenuProvider(
 					.setNegativeButton(android.R.string.cancel, null)
 					.show()
 			}
+
 			R.id.action_save -> {
 				viewModel.manga.value?.let {
 					val chaptersCount = it.chapters?.size ?: 0
@@ -83,25 +86,29 @@ class DetailsMenuProvider(
 					if (chaptersCount > 5 || branches.size > 1) {
 						showSaveConfirmation(it, chaptersCount, branches)
 					} else {
-						DownloadService.start(activity, it)
+						DownloadService.start(snackbarHost, it)
 					}
 				}
 			}
+
 			R.id.action_browser -> {
 				viewModel.manga.value?.let {
 					activity.startActivity(BrowserActivity.newIntent(activity, it.publicUrl, it.title))
 				}
 			}
+
 			R.id.action_related -> {
 				viewModel.manga.value?.let {
 					activity.startActivity(MultiSearchActivity.newIntent(activity, it.title))
 				}
 			}
-			R.id.action_shiki_track -> {
+
+			R.id.action_scrobbling -> {
 				viewModel.manga.value?.let {
-					ScrobblingSelectorBottomSheet.show(activity.supportFragmentManager, it)
+					ScrobblingSelectorBottomSheet.show(activity.supportFragmentManager, it, null)
 				}
 			}
+
 			R.id.action_shortcut -> {
 				viewModel.manga.value?.let {
 					activity.lifecycleScope.launch {
@@ -112,6 +119,7 @@ class DetailsMenuProvider(
 					}
 				}
 			}
+
 			else -> return false
 		}
 		return true
@@ -132,7 +140,7 @@ class DetailsMenuProvider(
 				val chaptersIds = manga.chapters?.mapNotNullToSet { c ->
 					if (c.branch in selectedBranches) c.id else null
 				}
-				DownloadService.start(activity, manga, chaptersIds)
+				DownloadService.start(snackbarHost, manga, chaptersIds)
 			}
 		} else {
 			dialogBuilder.setMessage(
@@ -141,7 +149,7 @@ class DetailsMenuProvider(
 					activity.resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount),
 				),
 			).setPositiveButton(R.string.save) { _, _ ->
-				DownloadService.start(activity, manga)
+				DownloadService.start(snackbarHost, manga)
 			}
 		}
 		dialogBuilder.show()

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt

@@ -4,18 +4,18 @@ import android.text.Html
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ForegroundColorSpan
+import androidx.core.net.toUri
 import androidx.core.text.getSpans
 import androidx.core.text.parseAsHtml
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChangedBy
@@ -28,12 +28,9 @@ import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.details.domain.BranchComparator
@@ -41,44 +38,39 @@ import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.local.data.LocalManga
+import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
-import org.koitharu.kotatsu.scrobbling.domain.Scrobbler
-import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
-import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
+import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
+import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
+import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.asFlowLiveData
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+import org.koitharu.kotatsu.utils.ext.computeSize
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import org.koitharu.kotatsu.utils.ext.toFileOrNull
 import java.io.IOException
+import javax.inject.Inject
 
-class DetailsViewModel @AssistedInject constructor(
-	@Assisted intent: MangaIntent,
+@HiltViewModel
+class DetailsViewModel @Inject constructor(
 	private val historyRepository: HistoryRepository,
 	favouritesRepository: FavouritesRepository,
 	private val localMangaRepository: LocalMangaRepository,
 	trackingRepository: TrackingRepository,
-	mangaDataRepository: MangaDataRepository,
 	private val bookmarksRepository: BookmarksRepository,
 	private val settings: AppSettings,
 	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
 	private val imageGetter: Html.ImageGetter,
-	mangaRepositoryFactory: MangaRepository.Factory,
+	private val delegate: MangaDetailsDelegate,
+	@LocalStorageChanges private val localStorageChanges: SharedFlow<LocalManga?>,
 ) : BaseViewModel() {
 
-	private val delegate = MangaDetailsDelegate(
-		intent = intent,
-		settings = settings,
-		mangaDataRepository = mangaDataRepository,
-		historyRepository = historyRepository,
-		localMangaRepository = localMangaRepository,
-		mangaRepositoryFactory = mangaRepositoryFactory,
-	)
-
 	private var loadingJob: Job
 
 	val onShowToast = SingleLiveEvent<Int>()
@@ -110,18 +102,36 @@ class DetailsViewModel @AssistedInject constructor(
 
 	val historyInfo: LiveData<HistoryInfo> = combine(
 		delegate.manga,
+		delegate.selectedBranch,
 		history,
 		historyRepository.observeShouldSkip(delegate.manga),
-	) { m, h, im ->
-		HistoryInfo(m, h, im)
+	) { m, b, h, im ->
+		HistoryInfo(m, b, h, im)
 	}.asFlowLiveData(
 		context = viewModelScope.coroutineContext + Dispatchers.Default,
-		defaultValue = HistoryInfo(null, null, false),
+		defaultValue = HistoryInfo(null, null, null, false),
 	)
 
 	val bookmarks = delegate.manga.flatMapLatest {
 		if (it != null) bookmarksRepository.observeBookmarks(it) else flowOf(emptyList())
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
+	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
+
+	val localSize = combine(
+		delegate.manga,
+		delegate.relatedManga,
+	) { m1, m2 ->
+		val url = when {
+			m1?.source == MangaSource.LOCAL -> m1.url
+			m2?.source == MangaSource.LOCAL -> m2.url
+			else -> null
+		}
+		if (url != null) {
+			val file = url.toUri().toFileOrNull()
+			file?.computeSize() ?: 0L
+		} else {
+			0L
+		}
+	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, 0)
 
 	val description = delegate.manga
 		.distinctUntilChangedBy { it?.description.orEmpty() }
@@ -133,7 +143,7 @@ class DetailsViewModel @AssistedInject constructor(
 				emit(description.parseAsHtml().filterSpans())
 				emit(description.parseAsHtml(imageGetter = imageGetter).filterSpans())
 			}
-		}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
+		}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, null)
 
 	val onMangaRemoved = SingleLiveEvent<Manga>()
 	val isScrobblingAvailable: Boolean
@@ -155,7 +165,7 @@ class DetailsViewModel @AssistedInject constructor(
 		delegate.selectedBranch,
 	) { branches, selected ->
 		branches.indexOf(selected)
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, -1)
+	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, -1)
 
 	val selectedBranchName = delegate.selectedBranch
 		.asFlowLiveData(viewModelScope.coroutineContext, null)
@@ -165,7 +175,7 @@ class DetailsViewModel @AssistedInject constructor(
 		isLoading.asFlow(),
 	) { m, loading ->
 		m != null && m.chapters.isNullOrEmpty() && !loading
-	}.asLiveDataDistinct(viewModelScope.coroutineContext, false)
+	}.asFlowLiveData(viewModelScope.coroutineContext, false)
 
 	val chapters = combine(
 		combine(
@@ -188,6 +198,10 @@ class DetailsViewModel @AssistedInject constructor(
 
 	init {
 		loadingJob = doLoad()
+		launchJob(Dispatchers.Default) {
+			localStorageChanges
+				.collect { onDownloadComplete(it) }
+		}
 	}
 
 	fun reload() {
@@ -202,14 +216,14 @@ class DetailsViewModel @AssistedInject constructor(
 			return
 		}
 		launchLoadingJob(Dispatchers.Default) {
-			val manga = if (m.source == MangaSource.LOCAL) m else localMangaRepository.findSavedManga(m)
+			val manga = if (m.source == MangaSource.LOCAL) m else localMangaRepository.findSavedManga(m)?.manga
 			checkNotNull(manga) { "Cannot find saved manga for ${m.title}" }
 			val original = localMangaRepository.getRemoteManga(manga)
 			localMangaRepository.delete(manga) || throw IOException("Unable to delete file")
 			runCatchingCancellable {
 				historyRepository.deleteOrSwap(manga, original)
 			}
-			onMangaRemoved.postCall(manga)
+			onMangaRemoved.emitCall(manga)
 		}
 	}
 
@@ -236,48 +250,35 @@ class DetailsViewModel @AssistedInject constructor(
 		chaptersQuery.value = query?.trim().orEmpty()
 	}
 
-	fun onDownloadComplete(downloadedManga: Manga) {
-		val currentManga = delegate.manga.value ?: return
-		if (currentManga.id != downloadedManga.id) {
-			return
-		}
-		if (currentManga.source == MangaSource.LOCAL) {
-			reload()
-		} else {
-			viewModelScope.launch(Dispatchers.Default) {
-				runCatchingCancellable {
-					localMangaRepository.getDetails(downloadedManga)
-				}.onSuccess {
-					delegate.relatedManga.value = it
-				}.onFailure {
-					it.printStackTraceDebug()
-				}
-			}
+	fun updateScrobbling(index: Int, rating: Float, status: ScrobblingStatus?) {
+		val scrobbler = getScrobbler(index) ?: return
+		launchJob(Dispatchers.Default) {
+			scrobbler.updateScrobblingInfo(
+				mangaId = delegate.mangaId,
+				rating = rating,
+				status = status,
+				comment = null,
+			)
 		}
 	}
 
-	fun updateScrobbling(rating: Float, status: ScrobblingStatus?) {
-		for (scrobbler in scrobblers) {
-			if (!scrobbler.isAvailable) continue
-			launchJob(Dispatchers.Default) {
-				scrobbler.updateScrobblingInfo(
-					mangaId = delegate.mangaId,
-					rating = rating,
-					status = status,
-					comment = null,
-				)
-			}
+	fun unregisterScrobbling(index: Int) {
+		val scrobbler = getScrobbler(index) ?: return
+		launchJob(Dispatchers.Default) {
+			scrobbler.unregisterScrobbling(
+				mangaId = delegate.mangaId,
+			)
 		}
 	}
 
-	fun unregisterScrobbling() {
-		for (scrobbler in scrobblers) {
-			if (!scrobbler.isAvailable) continue
-			launchJob(Dispatchers.Default) {
-				scrobbler.unregisterScrobbling(
-					mangaId = delegate.mangaId,
-				)
-			}
+	fun markChapterAsCurrent(chapterId: Long) {
+		launchJob(Dispatchers.Default) {
+			val manga = checkNotNull(delegate.manga.value)
+			val chapters = checkNotNull(manga.getChapters(selectedBranchValue))
+			val chapterIndex = chapters.indexOfFirst { it.id == chapterId }
+			check(chapterIndex in chapters.indices) { "Chapter not found" }
+			val percent = chapterIndex / chapters.size.toFloat()
+			historyRepository.addOrUpdate(manga = manga, chapterId = chapterId, page = 0, scroll = 0, percent = percent)
 		}
 	}
 
@@ -294,6 +295,27 @@ class DetailsViewModel @AssistedInject constructor(
 		}
 	}
 
+	private suspend fun onDownloadComplete(downloadedManga: LocalManga?) {
+		downloadedManga ?: return
+		val currentManga = delegate.manga.value ?: return
+		if (currentManga.id != downloadedManga.manga.id) {
+			return
+		}
+		if (currentManga.source == MangaSource.LOCAL) {
+			reload()
+		} else {
+			viewModelScope.launch(Dispatchers.Default) {
+				runCatchingCancellable {
+					localMangaRepository.getDetails(downloadedManga.manga)
+				}.onSuccess {
+					delegate.relatedManga.value = it
+				}.onFailure {
+					it.printStackTraceDebug()
+				}
+			}
+		}
+	}
+
 	private fun Spanned.filterSpans(): CharSequence {
 		val spannable = SpannableString.valueOf(this)
 		val spans = spannable.getSpans<ForegroundColorSpan>()
@@ -303,9 +325,16 @@ class DetailsViewModel @AssistedInject constructor(
 		return spannable.trim()
 	}
 
-	@AssistedFactory
-	interface Factory {
-
-		fun create(intent: MangaIntent): DetailsViewModel
+	private fun getScrobbler(index: Int): Scrobbler? {
+		val info = scrobblingInfo.value?.getOrNull(index)
+		val scrobbler = if (info != null) {
+			scrobblers.find { it.scrobblerService == info.scrobbler && it.isAvailable }
+		} else {
+			null
+		}
+		if (scrobbler == null) {
+			errorEvent.call(IllegalStateException("Scrobbler [$index] is not available"))
+		}
+		return scrobbler
 	}
 }