Statistics filters

Currently translated at 100.0% (597 of 597 strings)

Co-authored-by: abc0922001 <abc0922001@hotmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/zh_Hant/
Translation: Kotatsu/Strings

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-ko_fi: xtimms
-custom: ["https://yoomoney.ru/to/410012543938752"]

.gitignore

@@ -10,11 +10,13 @@
 /.idea/compiler.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
+/.idea/ktlint-plugin.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
 /.idea/kotlinc.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/androidTestResultsUserPreferences.xml
+/.idea/deploymentTargetSelector.xml
 /.idea/render.experimental.xml
 /.idea/inspectionProfiles/
 .DS_Store

CONTRIBUTING.md

@@ -1,11 +1,12 @@
 ## Kotatsu contribution guidelines
 
-- If you want to fix bug or implement a new feature, that already mention in the [issues](https://github.com/KotatsuApp/Kotatsu/issues), please, assign this issue to you and/or comment about it.
-- Whether you have to implement new feature, please, open an issue or discussion regarding it to ensure it will be accepted.
-- Translations have to be managed using the [Weblate](https://hosted.weblate.org/engage/kotatsu/) platform.
-- In case you want to add a new manga source, refer to the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers).
++ If you want to **fix bugs** or **implement new features** that **already have an [issue card](https://github.com/KotatsuApp/Kotatsu/issues):** please assign this issue to you and/or comment about it.
++ If you want to **implement a new feature:** open an issue or discussion regarding it to ensure it will be accepted.
++ **Translations** have to be managed using the [Weblate](https://hosted.weblate.org/engage/kotatsu/) platform.
++ In case you want to **add a new manga source,** refer to the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers).
 
-Refactoring or some dev-faces improvements are also might be accepted, however please stick to the following principles:
-- Performance matters. In the case of choosing between source code beauty and performance, performance should be a priority. 
-- Please, do not modify readme and other information files (except for typos).
-- Avoid adding new dependencies unless required. APK size is important.
+**Refactoring** or some **dev-faces improvements** might also be accepted. However, please stick to the following principles:
+
++ **Performance matters.** In the case of choosing between source code beauty and performance, performance should be a priority. 
++ Please, **do not modify readme and other information files** (except for typos).
++ **Avoid adding new dependencies** unless required. APK size is important.

README.md

@@ -19,7 +19,7 @@ Kotatsu is a free and open source manga reader for Android.
 * Tablet-optimized Material You UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
-* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
 * Password/fingerprint protect access to the app
 * History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 

app/build.gradle

@@ -16,13 +16,13 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 601
-		versionName = '6.4.1'
+		versionCode = 626
+		versionName = '6.7.4'
 		generatedDensities = []
-		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
+		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
-//			arg("room.generateKotlin", "true") TODO: enable later
-			arg("room.schemaLocation", "$projectDir/schemas")
+			arg('room.generateKotlin', 'true')
+			arg('room.schemaLocation', "$projectDir/schemas")
 		}
 		androidResources {
 			generateLocaleConfig true
@@ -82,33 +82,32 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:3bb10ee948') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:103f578c61') {
 		exclude group: 'org.json', module: 'json'
 	}
 
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.12.0'
-	implementation 'androidx.activity:activity-ktx:1.8.1'
+	implementation 'androidx.activity:activity-ktx:1.8.2'
 	implementation 'androidx.fragment:fragment-ktx:1.6.2'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
+	implementation 'androidx.collection:collection:1.4.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-service:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.10.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
+	implementation 'com.google.android.material:material:1.12.0-alpha03'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
 
-	// TODO https://issuetracker.google.com/issues/254846063
-	implementation 'androidx.work:work-runtime-ktx:2.8.1'
+	implementation 'androidx.work:work-runtime:2.9.0'
 	//noinspection GradleDependency
 	implementation('com.google.guava:guava:32.0.1-android') {
 		exclude group: 'com.google.guava', module: 'failureaccess'
@@ -116,47 +115,51 @@ dependencies {
 		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
 	}
 
-	implementation 'androidx.room:room-runtime:2.6.0'
-	implementation 'androidx.room:room-ktx:2.6.0'
-	ksp 'androidx.room:room-compiler:2.6.0'
+	implementation 'androidx.room:room-runtime:2.6.1'
+	implementation 'androidx.room:room-ktx:2.6.1'
+	ksp 'androidx.room:room-compiler:2.6.1'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
-	implementation 'com.squareup.okio:okio:3.6.0'
+	implementation 'com.squareup.okio:okio:3.8.0'
 
 	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.48.1'
-	kapt 'com.google.dagger:hilt-compiler:2.48.1'
-	implementation 'androidx.hilt:hilt-work:1.1.0'
-	kapt 'androidx.hilt:hilt-compiler:1.1.0'
+	implementation 'com.google.dagger:hilt-android:2.51'
+	kapt 'com.google.dagger:hilt-compiler:2.51'
+	implementation 'androidx.hilt:hilt-work:1.2.0'
+	kapt 'androidx.hilt:hilt-compiler:1.2.0'
 
-	implementation 'io.coil-kt:coil-base:2.5.0'
-	implementation 'io.coil-kt:coil-svg:2.5.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:771c8753ae'
+	implementation 'io.coil-kt:coil-base:2.6.0'
+	implementation 'io.coil-kt:coil-svg:2.6.0'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:02e6d6cfe9'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
 	implementation 'ch.acra:acra-http:5.11.3'
 	implementation 'ch.acra:acra-dialog:5.11.3'
+	compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
+	ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.1.0'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+	implementation 'org.conscrypt:conscrypt-android:2.5.2'
+
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20231013'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+	testImplementation 'org.json:json:20240205'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
 
 	androidTestImplementation 'androidx.test:runner:1.5.2'
 	androidTestImplementation 'androidx.test:rules:1.5.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
 
-	androidTestImplementation 'androidx.room:room-testing:2.6.0'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
+	androidTestImplementation 'androidx.room:room-testing:2.6.1'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.1'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.48.1'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.48.1'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.51'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51'
 }

app/src/androidTest/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt

@@ -57,6 +57,7 @@ class AppShortcutManagerTest {
 			page = 4,
 			scroll = 2,
 			percent = 0.3f,
+			force = false,
 		)
 		awaitUpdate()
 

app/src/androidTest/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt

@@ -7,7 +7,9 @@ import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -61,6 +63,7 @@ class AppBackupAgentTest {
 			page = 3,
 			scroll = 40,
 			percent = 0.2f,
+			force = false,
 		)
 		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
 

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

@@ -36,7 +36,7 @@ class KotatsuApp : BaseApp() {
 		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
 			.penaltyDeath()
 			.detectFragmentReuse()
-			// .detectWrongFragmentContainer() FIXME: migrate to ViewPager2
+			.detectWrongFragmentContainer()
 			.detectRetainInstanceUsage()
 			.detectSetUserVisibleHint()
 			.detectFragmentTagUsage()

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

@@ -10,6 +10,8 @@ class CurlLoggingInterceptor(
 	private val curlOptions: String? = null
 ) : Interceptor {
 
+	private val escapeRegex = Regex("([\\[\\]\"])")
+
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val request = chain.request()
 		var isCompressed = false
@@ -40,7 +42,7 @@ class CurlLoggingInterceptor(
 		if (isCompressed) {
 			curlCmd.append(" --compressed")
 		}
-		curlCmd.append(" \"").append(request.url).append('"')
+		curlCmd.append(" \"").append(request.url.toString().escape()).append('"')
 
 		log("---cURL (" + request.url + ")")
 		log(curlCmd.toString())
@@ -48,7 +50,12 @@ class CurlLoggingInterceptor(
 		return chain.proceed(request)
 	}
 
-	private fun String.escape() = replace("\"", "\\\"")
+	private fun String.escape() = replace(escapeRegex) { match ->
+		"\\" + match.value
+	}
+		// .replace("\"", "\\\"")
+		// .replace("[", "\\[")
+		// .replace("]", "\\]")
 
 	private fun log(msg: String) {
 		Log.d("CURL", msg)

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.bookmarks.data
 
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.Date
+import java.time.Instant
 
 fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	manga = manga,
@@ -11,7 +11,7 @@ fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	page = page,
 	scroll = scroll,
 	imageUrl = imageUrl,
-	createdAt = Date(createdAt),
+	createdAt = Instant.ofEpochMilli(createdAt),
 	percent = percent,
 )
 
@@ -22,7 +22,7 @@ fun Bookmark.toEntity() = BookmarkEntity(
 	page = page,
 	scroll = scroll,
 	imageUrl = imageUrl,
-	createdAt = createdAt.time,
+	createdAt = createdAt.toEpochMilli(),
 	percent = percent,
 )
 

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt

@@ -4,7 +4,7 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.local.data.hasImageExtension
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import java.util.Date
+import java.time.Instant
 
 data class Bookmark(
 	val manga: Manga,
@@ -13,7 +13,7 @@ data class Bookmark(
 	val page: Int,
 	val scroll: Int,
 	val imageUrl: String,
-	val createdAt: Date,
+	val createdAt: Instant,
 	val percent: Float,
 ) : ListModel {
 

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

@@ -13,7 +13,6 @@ import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class BookmarksAdapter(
@@ -32,13 +31,6 @@ class BookmarksAdapter(
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
-		val list = items
-		for (i in (0..position).reversed()) {
-			val item = list.getOrNull(i) ?: continue
-			if (item is ListHeader) {
-				return item.getText(context)
-			}
-		}
-		return null
+		return findHeader(position)?.getText(context)
 	}
 }

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

@@ -14,7 +14,6 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.network.UserAgents
 import com.google.android.material.R as materialR
@@ -26,7 +25,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
+		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
 			return
 		}
 		supportActionBar?.run {

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

@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class CaptchaNotifier(
 	private val context: Context,
@@ -58,16 +59,27 @@ class CaptchaNotifier(
 		manager.notify(TAG, exception.source.hashCode(), notification)
 	}
 
+	fun dismiss(source: MangaSource) {
+		NotificationManagerCompat.from(context).cancel(TAG, source.hashCode())
+	}
+
 	override fun onError(request: ImageRequest, result: ErrorResult) {
 		super.onError(request, result)
 		val e = result.throwable
-		if (e is CloudFlareProtectedException) {
+		if (e is CloudFlareProtectedException && request.parameters.value<Boolean>(PARAM_IGNORE_CAPTCHA) != true) {
 			notify(e)
 		}
 	}
 
-	private companion object {
+	companion object {
 
+		fun ImageRequest.Builder.ignoreCaptchaErrors() = setParameter(
+			key = PARAM_IGNORE_CAPTCHA,
+			value = true,
+			memoryCacheKey = null,
+		)
+
+		private const val PARAM_IGNORE_CAPTCHA = "ignore_captcha"
 		private const val CHANNEL_ID = "captcha"
 		private const val TAG = CHANNEL_ID
 	}

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

@@ -27,7 +27,6 @@ import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
-import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.network.UserAgents
 import javax.inject.Inject
@@ -45,13 +44,7 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability {
-				setContentView(
-					ActivityBrowserBinding.inflate(
-						layoutInflater,
-					),
-				)
-			}) {
+		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
 			return
 		}
 		supportActionBar?.run {

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core
 
 import android.app.Application
 import android.content.Context
+import android.os.Build
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.hilt.work.HiltWorkerFactory
@@ -11,6 +12,7 @@ import androidx.work.WorkManager
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.acra.ACRA
 import org.acra.ReportField
 import org.acra.config.dialog
@@ -18,6 +20,7 @@ import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
+import org.conscrypt.Conscrypt
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.MangaDatabase
@@ -26,6 +29,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
+import java.security.Security
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -39,7 +43,7 @@ open class BaseApp : Application(), Configuration.Provider {
 	lateinit var activityLifecycleCallbacks: Set<@JvmSuppressWildcards ActivityLifecycleCallbacks>
 
 	@Inject
-	lateinit var database: MangaDatabase
+	lateinit var database: Provider<MangaDatabase>
 
 	@Inject
 	lateinit var settings: AppSettings
@@ -56,12 +60,26 @@ open class BaseApp : Application(), Configuration.Provider {
 	@Inject
 	lateinit var workManagerProvider: Provider<WorkManager>
 
+	override val workManagerConfiguration: Configuration
+		get() = Configuration.Builder()
+			.setWorkerFactory(workerFactory)
+			.build()
+
 	override fun onCreate() {
 		super.onCreate()
-		ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.toString())
 		AppCompatDelegate.setDefaultNightMode(settings.theme)
 		AppCompatDelegate.setApplicationLocales(settings.appLocales)
+		// TLS 1.3 support for Android < 10
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+			Security.insertProviderAt(Conscrypt.newProvider(), 1)
+		}
 		setupActivityLifecycleCallbacks()
+		processLifecycleScope.launch {
+			val isOriginalApp = withContext(Dispatchers.Default) {
+				appValidator.isOriginalApp
+			}
+			ACRA.errorReporter.putCustomData("isOriginalApp", isOriginalApp.toString())
+		}
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
 		}
@@ -74,13 +92,6 @@ open class BaseApp : Application(), Configuration.Provider {
 		initAcra {
 			buildConfigClass = BuildConfig::class.java
 			reportFormat = StringFormat.JSON
-			excludeMatchingSharedPreferencesKeys = listOf(
-				"sources_\\w+",
-				AppSettings.KEY_APP_PASSWORD,
-				AppSettings.KEY_PROXY_LOGIN,
-				AppSettings.KEY_PROXY_ADDRESS,
-				AppSettings.KEY_PROXY_PASSWORD,
-			)
 			httpSender {
 				uri = getString(R.string.url_error_report)
 				basicAuthLogin = getString(R.string.acra_login)
@@ -97,7 +108,6 @@ open class BaseApp : Application(), Configuration.Provider {
 				ReportField.STACK_TRACE,
 				ReportField.CRASH_CONFIGURATION,
 				ReportField.CUSTOM_DATA,
-				ReportField.SHARED_PREFERENCES,
 			)
 
 			dialog {
@@ -110,15 +120,9 @@ open class BaseApp : Application(), Configuration.Provider {
 		}
 	}
 
-	override fun getWorkManagerConfiguration(): Configuration {
-		return Configuration.Builder()
-			.setWorkerFactory(workerFactory)
-			.build()
-	}
-
 	@WorkerThread
 	private fun setupDatabaseObservers() {
-		val tracker = database.invalidationTracker
+		val tracker = database.get().invalidationTracker
 		databaseObservers.forEach {
 			tracker.addObserver(it)
 		}

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

@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.core
+
+import android.content.Context
+import com.google.auto.service.AutoService
+import org.acra.builder.ReportBuilder
+import org.acra.config.CoreConfiguration
+import org.acra.config.ReportingAdministrator
+
+@AutoService(ReportingAdministrator::class)
+class ErrorReportingAdmin : ReportingAdministrator {
+
+	override fun shouldStartCollecting(
+		context: Context,
+		config: CoreConfiguration,
+		reportBuilder: ReportBuilder
+	): Boolean {
+		return reportBuilder.exception?.isDeadOs() != true
+	}
+
+	private fun Throwable.isDeadOs(): Boolean {
+		val className = javaClass.simpleName
+		return className == "DeadSystemException" || className == "DeadSystemRuntimeException" || cause?.isDeadOs() == true
+	}
+}

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

@@ -3,17 +3,20 @@ package org.koitharu.kotatsu.core.backup
 import org.json.JSONArray
 
 class BackupEntry(
-	val name: String,
+	val name: Name,
 	val data: JSONArray
 ) {
 
-	companion object Names {
+	enum class Name(
+		val key: String,
+	) {
 
-		const val INDEX = "index"
-		const val HISTORY = "history"
-		const val CATEGORIES = "categories"
-		const val FAVOURITES = "favourites"
-		const val SETTINGS = "settings"
-		const val BOOKMARKS = "bookmarks"
+		INDEX("index"),
+		HISTORY("history"),
+		CATEGORIES("categories"),
+		FAVOURITES("favourites"),
+		SETTINGS("settings"),
+		BOOKMARKS("bookmarks"),
+		SOURCES("sources"),
 	}
 }

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

@@ -7,8 +7,10 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import java.util.Date
 import javax.inject.Inject
 
 private const val PAGE_SIZE = 10
@@ -20,7 +22,7 @@ class BackupRepository @Inject constructor(
 
 	suspend fun dumpHistory(): BackupEntry {
 		var offset = 0
-		val entry = BackupEntry(BackupEntry.HISTORY, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.HISTORY, JSONArray())
 		while (true) {
 			val history = db.getHistoryDao().findAll(offset, PAGE_SIZE)
 			if (history.isEmpty()) {
@@ -41,7 +43,7 @@ class BackupRepository @Inject constructor(
 	}
 
 	suspend fun dumpCategories(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.CATEGORIES, JSONArray())
 		val categories = db.getFavouriteCategoriesDao().findAll()
 		for (item in categories) {
 			entry.data.put(JsonSerializer(item).toJson())
@@ -51,9 +53,9 @@ class BackupRepository @Inject constructor(
 
 	suspend fun dumpFavourites(): BackupEntry {
 		var offset = 0
-		val entry = BackupEntry(BackupEntry.FAVOURITES, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.FAVOURITES, JSONArray())
 		while (true) {
-			val favourites = db.getFavouritesDao().findAll(offset, PAGE_SIZE)
+			val favourites = db.getFavouritesDao().findAllRaw(offset, PAGE_SIZE)
 			if (favourites.isEmpty()) {
 				break
 			}
@@ -72,7 +74,7 @@ class BackupRepository @Inject constructor(
 	}
 
 	suspend fun dumpBookmarks(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.BOOKMARKS, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.BOOKMARKS, JSONArray())
 		val all = db.getBookmarksDao().findAll()
 		for ((m, b) in all) {
 			val json = JSONObject()
@@ -90,7 +92,7 @@ class BackupRepository @Inject constructor(
 	}
 
 	fun dumpSettings(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.SETTINGS, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.SETTINGS, JSONArray())
 		val settingsDump = settings.getAllValues().toMutableMap()
 		settingsDump.remove(AppSettings.KEY_APP_PASSWORD)
 		settingsDump.remove(AppSettings.KEY_PROXY_PASSWORD)
@@ -101,8 +103,18 @@ class BackupRepository @Inject constructor(
 		return entry
 	}
 
+	suspend fun dumpSources(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.Name.SOURCES, JSONArray())
+		val all = db.getSourcesDao().findAll()
+		for (source in all) {
+			val json = JsonSerializer(source).toJson()
+			entry.data.put(json)
+		}
+		return entry
+	}
+
 	fun createIndex(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.INDEX, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.INDEX, JSONArray())
 		val json = JSONObject()
 		json.put("app_id", BuildConfig.APPLICATION_ID)
 		json.put("app_version", BuildConfig.VERSION_CODE)
@@ -111,6 +123,11 @@ class BackupRepository @Inject constructor(
 		return entry
 	}
 
+	fun getBackupDate(entry: BackupEntry?): Date? {
+		val timestamp = entry?.data?.optJSONObject(0)?.getLongOrDefault("created_at", 0) ?: 0
+		return if (timestamp == 0L) null else Date(timestamp)
+	}
+
 	suspend fun restoreHistory(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
 		for (item in entry.data.JSONIterator()) {
@@ -184,6 +201,17 @@ class BackupRepository @Inject constructor(
 		return result
 	}
 
+	suspend fun restoreSources(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val source = JsonDeserializer(item).toMangaSourceEntity()
+			result += runCatchingCancellable {
+				db.getSourcesDao().upsert(source)
+			}
+		}
+		return result
+	}
+
 	fun restoreSettings(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
 		for (item in entry.data.JSONIterator()) {

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

@@ -1,25 +1,44 @@
 package org.koitharu.kotatsu.core.backup
 
+import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runInterruptible
 import okio.Closeable
 import org.json.JSONArray
+import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import java.io.File
+import java.util.EnumSet
 import java.util.zip.ZipFile
 
 class BackupZipInput(val file: File) : Closeable {
 
 	private val zipFile = ZipFile(file)
 
-	suspend fun getEntry(name: String): BackupEntry? = runInterruptible(Dispatchers.IO) {
-		val entry = zipFile.getEntry(name) ?: return@runInterruptible null
+	suspend fun getEntry(name: BackupEntry.Name): BackupEntry? = runInterruptible(Dispatchers.IO) {
+		val entry = zipFile.getEntry(name.key) ?: return@runInterruptible null
 		val json = zipFile.getInputStream(entry).use {
 			JSONArray(it.bufferedReader().readText())
 		}
 		BackupEntry(name, json)
 	}
 
+	suspend fun entries(): Set<BackupEntry.Name> = runInterruptible(Dispatchers.IO) {
+		zipFile.entries().toList().mapNotNullTo(EnumSet.noneOf(BackupEntry.Name::class.java)) { ze ->
+			BackupEntry.Name.entries.find { it.key == ze.name }
+		}
+	}
+
 	override fun close() {
 		zipFile.close()
 	}
+
+	fun cleanupAsync() {
+		processLifecycleScope.launch(Dispatchers.IO, CoroutineStart.ATOMIC) {
+			runCatching {
+				close()
+				file.delete()
+			}
+		}
+	}
 }

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

@@ -5,10 +5,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okio.Closeable
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.format
 import org.koitharu.kotatsu.core.zip.ZipOutput
 import java.io.File
-import java.util.Date
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 import java.util.Locale
 import java.util.zip.Deflater
 
@@ -17,7 +17,7 @@ class BackupZipOutput(val file: File) : Closeable {
 	private val output = ZipOutput(file, Deflater.BEST_COMPRESSION)
 
 	suspend fun put(entry: BackupEntry) = runInterruptible(Dispatchers.IO) {
-		output.put(entry.name, entry.data.toString(2))
+		output.put(entry.name.key, entry.data.toString(2))
 	}
 
 	suspend fun finish() = runInterruptible(Dispatchers.IO) {
@@ -39,7 +39,7 @@ suspend fun BackupZipOutput(context: Context): BackupZipOutput = runInterruptibl
 	val filename = buildString {
 		append(context.getString(R.string.app_name).replace(' ', '_').lowercase(Locale.ROOT))
 		append('_')
-		append(Date().format("ddMMyyyy"))
+		append(LocalDate.now().format(DateTimeFormatter.ofPattern("ddMMyyyy")))
 		append(".bk.zip")
 	}
 	BackupZipOutput(File(dir, filename))

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.backup
 import org.json.JSONObject
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
@@ -53,6 +54,7 @@ class JsonDeserializer(private val json: JSONObject) {
 		page = json.getInt("page"),
 		scroll = json.getDouble("scroll").toFloat(),
 		percent = json.getFloatOrDefault("percent", -1f),
+		chaptersCount = json.getIntOrDefault("chapters", -1),
 		deletedAt = 0L,
 	)
 
@@ -78,6 +80,12 @@ class JsonDeserializer(private val json: JSONObject) {
 		percent = json.getDouble("percent").toFloat(),
 	)
 
+	fun toMangaSourceEntity() = MangaSourceEntity(
+		source = json.getString("source"),
+		isEnabled = json.getBoolean("enabled"),
+		sortKey = json.getInt("sort_key"),
+	)
+
 	fun toMap(): Map<String, Any?> {
 		val map = mutableMapOf<String, Any?>()
 		val keys = json.keys()

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.backup
 import org.json.JSONObject
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
@@ -40,6 +41,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("page", e.page)
 			put("scroll", e.scroll)
 			put("percent", e.percent)
+			put("chapters", e.chaptersCount)
 		},
 	)
 
@@ -82,6 +84,14 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 		},
 	)
 
+	constructor(e: MangaSourceEntity) : this(
+		JSONObject().apply {
+			put("source", e.source)
+			put("enabled", e.isEnabled)
+			put("sort_key", e.sortKey)
+		},
+	)
+
 	constructor(m: Map<String, *>) : this(
 		JSONObject(m),
 	)

app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ExpiringLruCache.kt

@@ -12,7 +12,7 @@ class ExpiringLruCache<T>(
 	private val cache = LruCache<ContentCache.Key, ExpiringValue<T>>(maxSize)
 
 	operator fun get(key: ContentCache.Key): T? {
-		val value = cache.get(key) ?: return null
+		val value = cache[key] ?: return null
 		if (value.isExpired) {
 			cache.remove(key)
 		}

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

@@ -29,6 +29,8 @@ import org.koitharu.kotatsu.core.db.migrations.Migration13To14
 import org.koitharu.kotatsu.core.db.migrations.Migration14To15
 import org.koitharu.kotatsu.core.db.migrations.Migration15To16
 import org.koitharu.kotatsu.core.db.migrations.Migration16To17
+import org.koitharu.kotatsu.core.db.migrations.Migration17To18
+import org.koitharu.kotatsu.core.db.migrations.Migration18To19
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
@@ -47,20 +49,22 @@ import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingDao
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingEntity
+import org.koitharu.kotatsu.stats.data.StatsDao
+import org.koitharu.kotatsu.stats.data.StatsEntity
 import org.koitharu.kotatsu.suggestions.data.SuggestionDao
 import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 17
+const val DATABASE_VERSION = 19
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
-		ScrobblingEntity::class, MangaSourceEntity::class,
+		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -89,6 +93,8 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract fun getScrobblingDao(): ScrobblingDao
 
 	abstract fun getSourcesDao(): MangaSourcesDao
+
+	abstract fun getStatsDao(): StatsDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
@@ -108,6 +114,8 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration14To15(),
 	Migration15To16(),
 	Migration16To17(context),
+	Migration17To18(),
+	Migration18To19(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
@@ -23,6 +24,10 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE public_url = :publicUrl")
 	abstract suspend fun findByPublicUrl(publicUrl: String): MangaWithTags?
 
+	@Transaction
+	@Query("SELECT * FROM manga WHERE source = :source")
+	abstract suspend fun findAllBySource(source: String): List<MangaWithTags>
+
 	@Transaction
 	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND manga_id IN (SELECT manga_id FROM favourites UNION SELECT manga_id FROM history) LIMIT :limit")
 	abstract suspend fun searchByTitle(query: String, limit: Int): List<MangaWithTags>
@@ -43,6 +48,10 @@ abstract class MangaDao {
 	@Query("DELETE FROM manga_tags WHERE manga_id = :mangaId")
 	abstract suspend fun clearTagRelation(mangaId: Long)
 
+	@Transaction
+	@Delete
+	abstract suspend fun delete(subjects: Collection<MangaEntity>)
+
 	@Transaction
 	open suspend fun upsert(manga: MangaEntity, tags: Iterable<TagEntity>? = null) {
 		upsert(manga)

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

@@ -31,6 +31,16 @@ abstract class TagsDao {
 	)
 	abstract suspend fun findPopularTags(source: String, limit: Int): List<TagEntity>
 
+	@Query(
+		"""SELECT tags.* FROM tags
+		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE tags.source = :source  
+		GROUP BY tags.title
+		ORDER BY COUNT(manga_id) ASC 
+		LIMIT :limit""",
+	)
+	abstract suspend fun findRareTags(source: String, limit: Int): List<TagEntity>
+
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 

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

@@ -24,4 +24,5 @@ data class MangaPrefsEntity(
 	@ColumnInfo(name = "cf_brightness") val cfBrightness: Float,
 	@ColumnInfo(name = "cf_contrast") val cfContrast: Float,
 	@ColumnInfo(name = "cf_invert") val cfInvert: Boolean,
+	@ColumnInfo(name = "cf_grayscale") val cfGrayscale: Boolean,
 )

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

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration17To18 : Migration(17, 18) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_grayscale` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration18To19 : Migration(18, 19) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE history ADD COLUMN `chapters` INTEGER NOT NULL DEFAULT -1")
+		db.execSQL("CREATE TABLE IF NOT EXISTS `stats` (`manga_id` INTEGER NOT NULL, `started_at` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `pages` INTEGER NOT NULL, PRIMARY KEY(`manga_id`, `started_at`), FOREIGN KEY(`manga_id`) REFERENCES `history`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+	}
+}

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

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
-
-class CompositeException(val errors: Collection<Throwable>) : Exception() {
-
-	override val message: String = errors.mapNotNullToSet { it.message }.joinToString()
-}

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

@@ -1,13 +1,13 @@
 package org.koitharu.kotatsu.core.exceptions
 
 import okio.IOException
-import java.util.Date
+import java.time.Instant
+import java.time.temporal.ChronoUnit
 
 class TooManyRequestExceptions(
 	val url: String,
-	val retryAt: Date?,
+	val retryAt: Instant?,
 ) : IOException() {
-
 	val retryAfter: Long
-		get() = if (retryAt == null) 0 else (retryAt.time - System.currentTimeMillis()).coerceAtLeast(0)
+		get() = retryAt?.until(Instant.now(), ChronoUnit.MILLIS) ?: 0
 }

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

@@ -20,8 +20,9 @@ import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.io.File
 import java.io.FileOutputStream
-import java.text.SimpleDateFormat
-import java.util.Date
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
 import java.util.Locale
 import java.util.concurrent.ConcurrentLinkedQueue
 
@@ -41,11 +42,7 @@ class FileLogger(
 	}
 	val isEnabled: Boolean
 		get() = settings.isLoggingEnabled
-	private val dateFormat = SimpleDateFormat.getDateTimeInstance(
-		SimpleDateFormat.SHORT,
-		SimpleDateFormat.SHORT,
-		Locale.ROOT,
-	)
+	private val dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).withLocale(Locale.ROOT)
 	private val buffer = ConcurrentLinkedQueue<String>()
 	private val mutex = Mutex()
 	private var flushJob: Job? = null
@@ -55,7 +52,7 @@ class FileLogger(
 			return
 		}
 		val text = buildString {
-			append(dateFormat.format(Date()))
+			append(dateTimeFormatter.format(LocalDateTime.now()))
 			append(": ")
 			if (e != null) {
 				append("E!")

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

@@ -5,7 +5,7 @@ import kotlinx.parcelize.Parcelize
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import java.util.Date
+import java.time.Instant
 
 @Parcelize
 data class FavouriteCategory(
@@ -13,7 +13,7 @@ data class FavouriteCategory(
 	val title: String,
 	val sortKey: Int,
 	val order: ListSortOrder,
-	val createdAt: Date,
+	val createdAt: Instant,
 	val isTrackingEnabled: Boolean,
 	val isVisibleInLibrary: Boolean,
 ) : Parcelable, ListModel {

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

@@ -1,16 +1,22 @@
 package org.koitharu.kotatsu.core.model
 
 import android.net.Uri
+import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
+import androidx.collection.MutableObjectIntMap
 import androidx.core.os.LocaleListCompat
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.iterator
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
+import org.koitharu.kotatsu.parsers.model.ContentRating
 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.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.util.mapToSet
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import com.google.android.material.R as materialR
 
 @JvmName("mangaIds")
 fun Collection<Manga>.ids() = mapToSet { it.id }
@@ -26,12 +32,14 @@ fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
 	if (size <= 1) {
 		return size
 	}
-	val acc = HashMap<String?, Int>()
+	val acc = MutableObjectIntMap<String?>()
 	for (item in this) {
 		val branch = item.chapter.branch
-		acc[branch] = (acc[branch] ?: 0) + 1
+		acc[branch] = acc.getOrDefault(branch, 0) + 1
 	}
-	return acc.values.max()
+	var max = 0
+	acc.forEachValue { x -> if (x > max) max = x }
+	return max
 }
 
 @get:StringRes
@@ -41,6 +49,25 @@ val MangaState.titleResId: Int
 		MangaState.FINISHED -> R.string.state_finished
 		MangaState.ABANDONED -> R.string.state_abandoned
 		MangaState.PAUSED -> R.string.state_paused
+		MangaState.UPCOMING -> R.string.state_upcoming
+	}
+
+@get:DrawableRes
+val MangaState.iconResId: Int
+	get() = when (this) {
+		MangaState.ONGOING -> R.drawable.ic_play
+		MangaState.FINISHED -> R.drawable.ic_state_finished
+		MangaState.ABANDONED -> R.drawable.ic_state_abandoned
+		MangaState.PAUSED -> R.drawable.ic_action_pause
+		MangaState.UPCOMING -> materialR.drawable.ic_clock_black_24dp
+	}
+
+@get:StringRes
+val ContentRating.titleResId: Int
+	get() = when (this) {
+		ContentRating.SAFE -> R.string.rating_safe
+		ContentRating.SUGGESTIVE -> R.string.rating_suggestive
+		ContentRating.ADULT -> R.string.rating_adult
 	}
 
 fun Manga.findChapter(id: Long): MangaChapter? {
@@ -91,3 +118,16 @@ val Manga.appUrl: Uri
 		.appendQueryParameter("name", title)
 		.appendQueryParameter("url", url)
 		.build()
+
+private val chaptersNumberFormat = DecimalFormat("#.#").also { f ->
+	f.decimalFormatSymbols = DecimalFormatSymbols.getInstance().also {
+		it.decimalSeparator = '.'
+	}
+}
+
+fun MangaChapter.formatNumber(): String? {
+	if (number <= 0f) {
+		return null
+	}
+	return chaptersNumberFormat.format(number.toDouble())
+}

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

@@ -2,14 +2,14 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.time.Instant
 
 @Parcelize
 data class MangaHistory(
-	val createdAt: Date,
-	val updatedAt: Date,
+	val createdAt: Instant,
+	val updatedAt: Instant,
 	val chapterId: Long,
 	val page: Int,
 	val scroll: Int,
 	val percent: Float,
-) : Parcelable
+) : Parcelable

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

@@ -1,17 +1,23 @@
 package org.koitharu.kotatsu.core.model
 
 import android.content.Context
+import android.graphics.Color
+import android.text.SpannableStringBuilder
+import android.text.style.ForegroundColorSpan
+import android.text.style.RelativeSizeSpan
+import android.text.style.SuperscriptSpan
 import androidx.annotation.StringRes
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.getDisplayName
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import java.util.Locale
-
-fun MangaSource.getLocaleTitle(): String? {
-	val lc = Locale(locale ?: return null)
-	return lc.getDisplayLanguage(lc).toTitleCase(lc)
-}
+import com.google.android.material.R as materialR
 
 fun MangaSource(name: String): MangaSource {
 	MangaSource.entries.forEach {
@@ -33,6 +39,24 @@ val ContentType.titleResId
 
 fun MangaSource.getSummary(context: Context): String {
 	val type = context.getString(contentType.titleResId)
-	val locale = getLocaleTitle() ?: context.getString(R.string.various_languages)
+	val locale = locale?.toLocale().getDisplayName(context)
 	return context.getString(R.string.source_summary_pattern, type, locale)
 }
+
+fun MangaSource.getTitle(context: Context): CharSequence = if (isNsfw()) {
+	buildSpannedString {
+		append(title)
+		append(' ')
+		appendNsfwLabel(context)
+	}
+} else {
+	title
+}
+
+private fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
+	ForegroundColorSpan(context.getThemeColor(materialR.attr.colorError, Color.RED)),
+	RelativeSizeSpan(0.74f),
+	SuperscriptSpan(),
+) {
+	append(context.getString(R.string.nsfw))
+}

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

@@ -19,7 +19,8 @@ data class ParcelableChapter(
 			MangaChapter(
 				id = parcel.readLong(),
 				name = parcel.readString().orEmpty(),
-				number = parcel.readInt(),
+				number = parcel.readFloat(),
+				volume = parcel.readInt(),
 				url = parcel.readString().orEmpty(),
 				scanlator = parcel.readString(),
 				uploadDate = parcel.readLong(),
@@ -31,7 +32,8 @@ data class ParcelableChapter(
 		override fun ParcelableChapter.write(parcel: Parcel, flags: Int) = with(chapter) {
 			parcel.writeLong(id)
 			parcel.writeString(name)
-			parcel.writeInt(number)
+			parcel.writeFloat(number)
+			parcel.writeInt(volume)
 			parcel.writeString(url)
 			parcel.writeString(scanlator)
 			parcel.writeLong(uploadDate)

app/src/main/kotlin/org/koitharu/kotatsu/core/network/ImageProxyInterceptor.kt

@@ -7,6 +7,7 @@ import coil.request.ErrorResult
 import coil.request.ImageResult
 import coil.request.SuccessResult
 import coil.size.Dimension
+import coil.size.isOriginal
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
@@ -46,11 +47,13 @@ class ImageProxyInterceptor @Inject constructor(
 			.scheme("https")
 			.host("wsrv.nl")
 			.addQueryParameter("url", url.toString())
-			.addQueryParameter("fit", "outside")
 			.addQueryParameter("we", null)
 		val size = request.sizeResolver.size()
-		(size.height as? Dimension.Pixels)?.let { newUrl.addQueryParameter("h", it.toString()) }
-		(size.width as? Dimension.Pixels)?.let { newUrl.addQueryParameter("w", it.toString()) }
+		if (!size.isOriginal) {
+			newUrl.addQueryParameter("crop", "cover")
+			(size.height as? Dimension.Pixels)?.let { newUrl.addQueryParameter("h", it.toString()) }
+			(size.width as? Dimension.Pixels)?.let { newUrl.addQueryParameter("w", it.toString()) }
+		}
 
 		val newRequest = request.newBuilder()
 			.data(newUrl.build())

app/src/main/kotlin/org/koitharu/kotatsu/core/network/RateLimitInterceptor.kt

@@ -4,15 +4,11 @@ import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.internal.closeQuietly
 import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.concurrent.TimeUnit
+import java.time.Instant
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
 
 class RateLimitInterceptor : Interceptor {
-
-	private val dateFormat = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ZZZ", Locale.ENGLISH)
-
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val response = chain.proceed(chain.request())
 		if (response.code == 429) {
@@ -27,10 +23,8 @@ class RateLimitInterceptor : Interceptor {
 		return response
 	}
 
-	private fun String.parseRetryDate(): Date? {
-		toIntOrNull()?.let {
-			return Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(it.toLong()))
-		}
-		return dateFormat.parse(this)
+	private fun String.parseRetryDate(): Instant? {
+		return toLongOrNull()?.let { Instant.now().plusSeconds(it) }
+			?: ZonedDateTime.parse(this, DateTimeFormatter.RFC_1123_DATE_TIME).toInstant()
 	}
 }

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

@@ -1,16 +1,9 @@
 package org.koitharu.kotatsu.core.os
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
+import androidx.core.content.pm.PackageInfoCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
-import java.io.ByteArrayInputStream
-import java.io.InputStream
-import java.security.MessageDigest
-import java.security.cert.CertificateFactory
-import java.security.cert.X509Certificate
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -18,29 +11,13 @@ import javax.inject.Singleton
 class AppValidator @Inject constructor(
 	@ApplicationContext private val context: Context,
 ) {
-
+	@Suppress("NewApi")
 	val isOriginalApp by lazy {
-		getCertificateSHA1Fingerprint() == CERT_SHA1
+		val certificates = mapOf(CERT_SHA256.hexToByteArray() to PackageManager.CERT_INPUT_SHA256)
+		PackageInfoCompat.hasSignatures(context.packageManager, context.packageName, certificates, false)
 	}
 
-	@Suppress("DEPRECATION")
-	@SuppressLint("PackageManagerGetSignatures")
-	private fun getCertificateSHA1Fingerprint(): String? = runCatching {
-		val packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES)
-		val signatures = requireNotNull(packageInfo?.signatures)
-		val cert: ByteArray = signatures.first().toByteArray()
-		val input: InputStream = ByteArrayInputStream(cert)
-		val cf = CertificateFactory.getInstance("X509")
-		val c = cf.generateCertificate(input) as X509Certificate
-		val md: MessageDigest = MessageDigest.getInstance("SHA1")
-		val publicKey: ByteArray = md.digest(c.encoded)
-		return publicKey.byte2HexFormatted()
-	}.onFailure { error ->
-		error.printStackTraceDebug()
-	}.getOrNull()
-
 	private companion object {
-
-		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 CERT_SHA256 = "67e15100bb809301783edcb6348fa3bbf83034d91e62868a91053dbd70db3f18"
 	}
 }

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.parser
 
+import androidx.core.net.toUri
 import androidx.room.withTransaction
 import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
@@ -13,6 +14,7 @@ import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.prefs.ReaderMode
+import org.koitharu.kotatsu.core.util.ext.toFileOrNull
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
@@ -97,9 +99,18 @@ class MangaDataRepository @Inject constructor(
 		return db.getTagsDao().findTags(source.name).toMangaTags()
 	}
 
+	suspend fun cleanupLocalManga() {
+		val dao = db.getMangaDao()
+		val broken = dao.findAllBySource(MangaSource.LOCAL.name)
+			.filter { x -> x.manga.url.toUri().toFileOrNull()?.exists() == false }
+		if (broken.isNotEmpty()) {
+			dao.delete(broken.map { it.manga })
+		}
+	}
+
 	private fun MangaPrefsEntity.getColorFilterOrNull(): ReaderColorFilter? {
-		return if (cfBrightness != 0f || cfContrast != 0f || cfInvert) {
-			ReaderColorFilter(cfBrightness, cfContrast, cfInvert)
+		return if (cfBrightness != 0f || cfContrast != 0f || cfInvert || cfGrayscale) {
+			ReaderColorFilter(cfBrightness, cfContrast, cfInvert, cfGrayscale)
 		} else {
 			null
 		}
@@ -111,5 +122,6 @@ class MangaDataRepository @Inject constructor(
 		cfBrightness = 0f,
 		cfContrast = 0f,
 		cfInvert = false,
+		cfGrayscale = false,
 	)
 }

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

@@ -5,6 +5,7 @@ import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.core.network.MirrorSwitchInterceptor
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
@@ -15,6 +16,7 @@ import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.lang.ref.WeakReference
 import java.util.EnumMap
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.set
@@ -27,10 +29,16 @@ interface MangaRepository {
 
 	val states: Set<MangaState>
 
+	val contentRatings: Set<ContentRating>
+
 	var defaultSortOrder: SortOrder
 
 	val isMultipleTagsSupported: Boolean
 
+	val isTagsExclusionSupported: Boolean
+
+	val isSearchSupported: Boolean
+
 	suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga>
 
 	suspend fun getDetails(manga: Manga): Manga
@@ -41,6 +49,8 @@ interface MangaRepository {
 
 	suspend fun getTags(): Set<MangaTag>
 
+	suspend fun getLocales(): Set<Locale>
+
 	suspend fun getRelated(seed: Manga): List<Manga>
 
 	@Singleton

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.parser
 
 import android.util.Log
+import androidx.collection.MutableLongSet
 import coil.request.CachePolicy
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -21,6 +22,7 @@ import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.exception.ParseException
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Favicons
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
@@ -32,6 +34,7 @@ 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.parsers.util.runCatchingCancellable
+import java.util.Locale
 
 class RemoteMangaRepository(
 	private val parser: MangaParser,
@@ -48,6 +51,9 @@ class RemoteMangaRepository(
 	override val states: Set<MangaState>
 		get() = parser.availableStates
 
+	override val contentRatings: Set<ContentRating>
+		get() = parser.availableContentRating
+
 	override var defaultSortOrder: SortOrder
 		get() = getConfig().defaultSortOrder ?: sortOrders.first()
 		set(value) {
@@ -57,6 +63,12 @@ class RemoteMangaRepository(
 	override val isMultipleTagsSupported: Boolean
 		get() = parser.isMultipleTagsSupported
 
+	override val isSearchSupported: Boolean
+		get() = parser.isSearchSupported
+
+	override val isTagsExclusionSupported: Boolean
+		get() = parser.isTagsExclusionSupported
+
 	var domain: String
 		get() = parser.domain
 		set(value) {
@@ -104,6 +116,10 @@ class RemoteMangaRepository(
 		parser.getAvailableTags()
 	}
 
+	override suspend fun getLocales(): Set<Locale> {
+		return parser.getAvailableLocales()
+	}
+
 	suspend fun getFavicons(): Favicons = mirrorSwitchInterceptor.withMirrorSwitching {
 		parser.getFavicons()
 	}
@@ -151,6 +167,10 @@ class RemoteMangaRepository(
 		return parser.configKeyDomain.presetValues.toList()
 	}
 
+	fun isSlowdownEnabled(): Boolean {
+		return getConfig().isSlowdownEnabled
+	}
+
 	private fun getConfig() = parser.config as SourceSettings
 
 	private suspend fun <T> asyncSafe(block: suspend CoroutineScope.() -> T): SafeDeferred<T> {
@@ -170,7 +190,7 @@ class RemoteMangaRepository(
 			return emptyList()
 		}
 		val result = ArrayList<MangaPage>(size)
-		val set = HashSet<Long>(size)
+		val set = MutableLongSet(size)
 		for (page in this) {
 			if (set.add(page.id)) {
 				result.add(page)
@@ -207,6 +227,5 @@ class RemoteMangaRepository(
 		}
 	}
 
-	private fun Result<*>.isValidResult() = exceptionOrNull() !is ParseException
-		&& (getOrNull() as? Collection<*>)?.isEmpty() != true
+	private fun Result<*>.isValidResult() = isSuccess && (getOrNull() as? Collection<*>)?.isEmpty() != true
 }

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

@@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.ArraySet
 import androidx.core.content.edit
 import androidx.core.os.LocaleListCompat
+import androidx.documentfile.provider.DocumentFile
 import androidx.preference.PreferenceManager
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.json.JSONArray
@@ -26,8 +27,10 @@ import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.find
+import org.koitharu.kotatsu.parsers.util.isNumeric
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.parsers.util.mapToSet
+import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 import java.io.File
 import java.net.Proxy
 import java.util.Locale
@@ -69,6 +72,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			}
 		}
 
+	val isNavLabelsVisible: Boolean
+		get() = prefs.getBoolean(KEY_NAV_LABELS, true)
+
 	var gridSize: Int
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
@@ -100,14 +106,21 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			}
 		}
 
-	val readerPageSwitch: Set<String>
-		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
+	var isReaderDoubleOnLandscape: Boolean
+		get() = prefs.getBoolean(KEY_READER_DOUBLE_PAGES, false)
+		set(value) = prefs.edit { putBoolean(KEY_READER_DOUBLE_PAGES, value) }
+
+	val isReaderVolumeButtonsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_VOLUME_BUTTONS, false)
 
 	val isReaderZoomButtonsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_ZOOM_BUTTONS, false)
 
-	val isReaderTapsAdaptive: Boolean
-		get() = !prefs.getBoolean(KEY_READER_TAPS_LTR, false)
+	val isReaderControlAlwaysLTR: Boolean
+		get() = prefs.getBoolean(KEY_READER_CONTROL_LTR, false)
+
+	val isReaderFullscreenEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_FULLSCREEN, true)
 
 	val isReaderOptimizationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_OPTIMIZE, false)
@@ -179,11 +192,13 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	var appPassword: String?
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
 		set(value) = prefs.edit {
-			if (value != null) putString(KEY_APP_PASSWORD, value) else remove(
-				KEY_APP_PASSWORD,
-			)
+			if (value != null) putString(KEY_APP_PASSWORD, value) else remove(KEY_APP_PASSWORD)
 		}
 
+	var isAppPasswordNumeric: Boolean
+		get() = prefs.getBoolean(KEY_APP_PASSWORD_NUMERIC, false)
+		set(value) = prefs.edit { putBoolean(KEY_APP_PASSWORD_NUMERIC, value) }
+
 	val isLoggingEnabled: Boolean
 		get() = prefs.getBoolean(KEY_LOGGING_ENABLED, false)
 
@@ -203,6 +218,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isUnstableUpdatesAllowed: Boolean
 		get() = prefs.getBoolean(KEY_UPDATES_UNSTABLE, false)
 
+	val defaultDetailsTab: Int
+		get() = prefs.getString(KEY_DETAILS_TAB, null)?.toIntOrNull()?.coerceIn(0, 1) ?: 0
+
 	val isContentPrefetchEnabled: Boolean
 		get() {
 			if (isBackgroundNetworkRestricted()) {
@@ -259,12 +277,12 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			}
 		}
 
-	val isDownloadsSlowdownEnabled: Boolean
-		get() = prefs.getBoolean(KEY_DOWNLOADS_SLOWDOWN, false)
-
 	val isDownloadsWiFiOnly: Boolean
 		get() = prefs.getBoolean(KEY_DOWNLOADS_WIFI, false)
 
+	val preferredDownloadFormat: DownloadFormat
+		get() = prefs.getEnumValue(KEY_DOWNLOADS_FORMAT, DownloadFormat.AUTOMATIC)
+
 	var isSuggestionsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_SUGGESTIONS, false)
 		set(value) = prefs.edit { putBoolean(KEY_SUGGESTIONS, value) }
@@ -296,6 +314,24 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isReaderKeepScreenOn: Boolean
 		get() = prefs.getBoolean(KEY_READER_SCREEN_ON, true)
 
+	var readerColorFilter: ReaderColorFilter?
+		get() = runCatching {
+			val brightness = prefs.getFloat(KEY_CF_BRIGHTNESS, ReaderColorFilter.EMPTY.brightness)
+			val contrast = prefs.getFloat(KEY_CF_CONTRAST, ReaderColorFilter.EMPTY.contrast)
+			val inverted = prefs.getBoolean(KEY_CF_INVERTED, ReaderColorFilter.EMPTY.isInverted)
+			val grayscale = prefs.getBoolean(KEY_CF_GRAYSCALE, ReaderColorFilter.EMPTY.isGrayscale)
+			ReaderColorFilter(brightness, contrast, inverted, grayscale).takeUnless { it.isEmpty }
+		}.getOrNull()
+		set(value) {
+			prefs.edit {
+				val cf = value ?: ReaderColorFilter.EMPTY
+				putFloat(KEY_CF_BRIGHTNESS, cf.brightness)
+				putFloat(KEY_CF_CONTRAST, cf.contrast)
+				putBoolean(KEY_CF_INVERTED, cf.isInverted)
+				putBoolean(KEY_CF_GRAYSCALE, cf.isGrayscale)
+			}
+		}
+
 	val isImagesProxyEnabled: Boolean
 		get() = prefs.getBoolean(KEY_IMAGES_PROXY, false)
 
@@ -328,15 +364,23 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
 
 	var historySortOrder: ListSortOrder
-		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.UPDATED)
+		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.LAST_READ)
 		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
 
+	var allFavoritesSortOrder: ListSortOrder
+		get() = prefs.getEnumValue(KEY_FAVORITES_ORDER, ListSortOrder.NEWEST)
+		set(value) = prefs.edit { putEnumValue(KEY_FAVORITES_ORDER, value) }
+
 	val isRelatedMangaEnabled: Boolean
 		get() = prefs.getBoolean(KEY_RELATED_MANGA, true)
 
 	val isWebtoonZoomEnable: Boolean
 		get() = prefs.getBoolean(KEY_WEBTOON_ZOOM, true)
 
+	@get:FloatRange(from = 0.0, to = 0.5)
+	val defaultWebtoonZoomOut: Float
+		get() = prefs.getInt(KEY_WEBTOON_ZOOM_OUT, 0).coerceIn(0, 50) / 100f
+
 	@get:FloatRange(from = 0.0, to = 1.0)
 	var readerAutoscrollSpeed: Float
 		get() = prefs.getFloat(KEY_READER_AUTOSCROLL_SPEED, 0f)
@@ -372,6 +416,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getString(KEY_BACKUP_PERIODICAL_OUTPUT, null)?.toUriOrNull()
 		set(value) = prefs.edit { putString(KEY_BACKUP_PERIODICAL_OUTPUT, value?.toString()) }
 
+	val isReadingTimeEstimationEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READING_TIME, true)
+
+	val isPagesSavingAskEnabled: Boolean
+		get() = prefs.getBoolean(KEY_PAGES_SAVE_ASK, true)
+
+	val isStatsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_STATS_ENABLED, false)
+
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -384,6 +437,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		prefs.edit { putStringSet(KEY_TIPS_CLOSED, closedTips + tip) }
 	}
 
+	fun getPagesSaveDir(context: Context): DocumentFile? =
+		prefs.getString(KEY_PAGES_SAVE_DIR, null)?.toUriOrNull()?.let {
+			DocumentFile.fromTreeUri(context, it)?.takeIf { it.canWrite() }
+		}
+
+	fun setPagesSaveDir(uri: Uri?) {
+		prefs.edit { putString(KEY_PAGES_SAVE_DIR, uri?.toString()) }
+	}
+
 	fun subscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
 		prefs.registerOnSharedPreferenceChangeListener(listener)
 	}
@@ -430,7 +492,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 
 	companion object {
 
-		const val PAGE_SWITCH_TAPS = "taps"
 		const val PAGE_SWITCH_VOLUME_KEYS = "volume"
 
 		const val TRACK_HISTORY = "history"
@@ -453,8 +514,11 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_GRID_SIZE = "grid_size"
 		const val KEY_REMOTE_SOURCES = "remote_sources"
 		const val KEY_LOCAL_STORAGE = "local_storage"
-		const val KEY_READER_SWITCHERS = "reader_switchers"
+		const val KEY_READER_DOUBLE_PAGES = "reader_double_pages"
 		const val KEY_READER_ZOOM_BUTTONS = "reader_zoom_buttons"
+		const val KEY_READER_CONTROL_LTR = "reader_taps_ltr"
+		const val KEY_READER_FULLSCREEN = "reader_fullscreen"
+		const val KEY_READER_VOLUME_BUTTONS = "reader_volume_buttons"
 		const val KEY_TRACKER_ENABLED = "tracker_enabled"
 		const val KEY_TRACKER_WIFI_ONLY = "tracker_wifi"
 		const val KEY_TRACK_SOURCES = "track_sources"
@@ -470,6 +534,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_APP_PASSWORD = "app_password"
+		const val KEY_APP_PASSWORD_NUMERIC = "app_password_num"
 		const val KEY_PROTECT_APP = "protect_app"
 		const val KEY_PROTECT_APP_BIOMETRIC = "protect_app_bio"
 		const val KEY_APP_VERSION = "app_version"
@@ -495,8 +560,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SHIKIMORI = "shikimori"
 		const val KEY_ANILIST = "anilist"
 		const val KEY_MAL = "mal"
-		const val KEY_DOWNLOADS_SLOWDOWN = "downloads_slowdown"
+		const val KEY_KITSU = "kitsu"
 		const val KEY_DOWNLOADS_WIFI = "downloads_wifi"
+		const val KEY_DOWNLOADS_FORMAT = "downloads_format"
 		const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible"
 		const val KEY_DOH = "doh"
 		const val KEY_EXIT_CONFIRM = "exit_confirm"
@@ -508,11 +574,13 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_BACKGROUND = "reader_background"
 		const val KEY_READER_SCREEN_ON = "reader_screen_on"
 		const val KEY_SHORTCUTS = "dynamic_shortcuts"
-		const val KEY_READER_TAPS_LTR = "reader_taps_ltr"
+		const val KEY_READER_TAP_ACTIONS = "reader_tap_actions"
 		const val KEY_READER_OPTIMIZE = "reader_optimize"
 		const val KEY_LOCAL_LIST_ORDER = "local_order"
 		const val KEY_HISTORY_ORDER = "history_order"
+		const val KEY_FAVORITES_ORDER = "fav_order"
 		const val KEY_WEBTOON_ZOOM = "webtoon_zoom"
+		const val KEY_WEBTOON_ZOOM_OUT = "webtoon_zoom_out"
 		const val KEY_PREFETCH_CONTENT = "prefetch_content"
 		const val KEY_APP_LOCALE = "app_locale"
 		const val KEY_LOGGING_ENABLED = "logging"
@@ -536,11 +604,20 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_DISABLE_NSFW = "no_nsfw"
 		const val KEY_RELATED_MANGA = "related_manga"
 		const val KEY_NAV_MAIN = "nav_main"
+		const val KEY_NAV_LABELS = "nav_labels"
 		const val KEY_32BIT_COLOR = "enhanced_colors"
 		const val KEY_SOURCES_ORDER = "sources_sort_order"
 		const val KEY_SOURCES_CATALOG = "sources_catalog"
-
-		// About
+		const val KEY_CF_BRIGHTNESS = "cf_brightness"
+		const val KEY_CF_CONTRAST = "cf_contrast"
+		const val KEY_CF_INVERTED = "cf_inverted"
+		const val KEY_CF_GRAYSCALE = "cf_grayscale"
+		const val KEY_IGNORE_DOZE = "ignore_dose"
+		const val KEY_DETAILS_TAB = "details_tab"
+		const val KEY_READING_TIME = "reading_time"
+		const val KEY_PAGES_SAVE_DIR = "pages_dir"
+		const val KEY_PAGES_SAVE_ASK = "pages_dir_ask"
+		const val KEY_STATS_ENABLED = "stats_on"
 		const val KEY_APP_UPDATE = "app_update"
 		const val KEY_APP_TRANSLATION = "about_app_translation"
 	}

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

@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.prefs
+
+enum class DownloadFormat {
+
+	AUTOMATIC,
+	SINGLE_CBZ,
+	MULTIPLE_CBZ,
+}

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

@@ -4,13 +4,12 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.list.ui.model.ListModel
 
 enum class NavItem(
 	@IdRes val id: Int,
 	@StringRes val title: Int,
 	@DrawableRes val icon: Int,
-) : ListModel {
+) {
 
 	HISTORY(R.id.nav_history, R.string.history, R.drawable.ic_history_selector),
 	FAVORITES(R.id.nav_favorites, R.string.favourites, R.drawable.ic_favourites_selector),
@@ -21,10 +20,6 @@ enum class NavItem(
 	BOOKMARKS(R.id.nav_bookmarks, R.string.bookmarks, R.drawable.ic_bookmark_selector),
 	;
 
-	override fun areItemsTheSame(other: ListModel): Boolean {
-		return other is NavItem && ordinal == other.ordinal
-	}
-
 	fun isAvailable(settings: AppSettings): Boolean = when (this) {
 		SUGGESTIONS -> settings.isSuggestionsEnabled
 		FEED -> settings.isTrackerEnabled

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

@@ -4,7 +4,9 @@ enum class ReaderMode(val id: Int) {
 
 	STANDARD(1),
 	REVERSED(3),
-	WEBTOON(2);
+	VERTICAL(4),
+	WEBTOON(2),
+	;
 
 	companion object {
 

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

@@ -11,6 +11,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.SortOrder
 
 private const val KEY_SORT_ORDER = "sort_order"
+private const val KEY_SLOWDOWN = "slowdown"
 
 class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig {
 
@@ -20,6 +21,9 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 		get() = prefs.getEnumValue(KEY_SORT_ORDER, SortOrder::class.java)
 		set(value) = prefs.edit { putEnumValue(KEY_SORT_ORDER, value) }
 
+	val isSlowdownEnabled: Boolean
+		get() = prefs.getBoolean(KEY_SLOWDOWN, false)
+
 	@Suppress("UNCHECKED_CAST")
 	override fun <T> get(key: ConfigKey<T>): T {
 		return when (key) {

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

@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
@@ -29,6 +30,7 @@ import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.core.ui.util.BaseActivityEntryPoint
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.isWebViewUnavailable
 
 @Suppress("LeakingThis")
 abstract class BaseActivity<B : ViewBinding> :
@@ -164,6 +166,21 @@ abstract class BaseActivity<B : ViewBinding> :
 		intent?.putExtra(EXTRA_DATA, intent.data)
 	}
 
+	protected fun setContentViewWebViewSafe(viewBindingProducer: () -> B): Boolean {
+		return try {
+			setContentView(viewBindingProducer())
+			true
+		} catch (e: Exception) {
+			if (e.isWebViewUnavailable()) {
+				Toast.makeText(this, R.string.web_view_unavailable, Toast.LENGTH_LONG).show()
+				finishAfterTransition()
+				false
+			} else {
+				throw e
+			}
+		}
+	}
+
 	companion object {
 
 		const val EXTRA_DATA = "data"

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

@@ -29,7 +29,6 @@ abstract class BaseFullscreenActivity<B : ViewBinding> :
 					WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 			}
 		}
-		// insetsControllerCompat.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
 		systemUiController.setSystemUiVisible(true)
 	}
 }

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

@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.FlowCollector
 import org.koitharu.kotatsu.core.util.ContinuationResumeRunnable
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import kotlin.coroutines.suspendCoroutine
 
@@ -28,11 +29,23 @@ open class BaseListAdapter<T : ListModel> : AsyncListDifferDelegationAdapter<T>(
 		return this
 	}
 
-	fun addListListener(listListener: ListListener<T>) {
+	fun addListListener(listListener: ListListener<T>): BaseListAdapter<T> {
 		differ.addListListener(listListener)
+		return this
 	}
 
 	fun removeListListener(listListener: ListListener<T>) {
 		differ.removeListListener(listListener)
 	}
+
+	fun findHeader(position: Int): ListHeader? {
+		val snapshot = items
+		for (i in (0..position).reversed()) {
+			val item = snapshot.getOrNull(i) ?: continue
+			if (item is ListHeader) {
+				return item
+			}
+		}
+		return null
+	}
 }

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

@@ -1,5 +1,7 @@
 package org.koitharu.kotatsu.core.ui
 
+import android.content.ActivityNotFoundException
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.CallSuper
@@ -8,7 +10,9 @@ import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
@@ -62,4 +66,12 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	protected fun setTitle(title: CharSequence?) {
 		(activity as? SettingsActivity)?.setSectionTitle(title)
 	}
+
+	protected fun startActivitySafe(intent: Intent) {
+		try {
+			startActivity(intent)
+		} catch (_: ActivityNotFoundException) {
+			Snackbar.make(listView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT).show()
+		}
+	}
 }

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

@@ -68,6 +68,13 @@ abstract class BaseViewModel : ViewModel() {
 		errorEvent.call(error)
 	}
 
+	protected inline suspend fun <T> withLoading(block: () -> T): T = try {
+		loadingCounter.increment()
+		block()
+	} finally {
+		loadingCounter.decrement()
+	}
+
 	protected fun MutableStateFlow<Int>.increment() = update { it + 1 }
 
 	protected fun MutableStateFlow<Int>.decrement() = update { it - 1 }

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

@@ -0,0 +1,75 @@
+package org.koitharu.kotatsu.core.ui
+
+import androidx.recyclerview.widget.AsyncListDiffer.ListListener
+import androidx.recyclerview.widget.DiffUtil
+import com.hannesdorfmann.adapterdelegates4.AdapterDelegate
+import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import java.util.Collections
+import java.util.LinkedList
+
+open class ReorderableListAdapter<T : ListModel> : ListDelegationAdapter<List<T>>(), FlowCollector<List<T>?> {
+
+	private val listListeners = LinkedList<ListListener<T>>()
+
+	override suspend fun emit(value: List<T>?) {
+		val oldList = items.orEmpty()
+		val newList = value.orEmpty()
+		val diffResult = withContext(Dispatchers.Default) {
+			val diffCallback = DiffCallback(oldList, newList)
+			DiffUtil.calculateDiff(diffCallback)
+		}
+		super.setItems(newList)
+		diffResult.dispatchUpdatesTo(this)
+		listListeners.forEach { it.onCurrentListChanged(oldList, newList) }
+	}
+
+	@Deprecated("Use emit() to dispatch list updates", level = DeprecationLevel.ERROR)
+	override fun setItems(items: List<T>?) {
+		super.setItems(items)
+	}
+
+	fun reorderItems(oldPos: Int, newPos: Int) {
+		Collections.swap(items ?: return, oldPos, newPos)
+		notifyItemMoved(oldPos, newPos)
+	}
+
+	fun addDelegate(type: ListItemType, delegate: AdapterDelegate<List<T>>): ReorderableListAdapter<T> {
+		delegatesManager.addDelegate(type.ordinal, delegate)
+		return this
+	}
+
+	fun addListListener(listListener: ListListener<T>) {
+		listListeners.add(listListener)
+	}
+
+	fun removeListListener(listListener: ListListener<T>) {
+		listListeners.remove(listListener)
+	}
+
+	protected class DiffCallback<T : ListModel>(
+		val oldList: List<T>,
+		val newList: List<T>,
+	) : DiffUtil.Callback() {
+
+		override fun getOldListSize(): Int = oldList.size
+
+		override fun getNewListSize(): Int = newList.size
+
+		override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+			val oldItem = oldList[oldItemPosition]
+			val newItem = newList[newItemPosition]
+			return newItem.areItemsTheSame(oldItem)
+		}
+
+		override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+			val oldItem = oldList[oldItemPosition]
+			val newItem = newList[newItemPosition]
+			return newItem == oldItem
+		}
+	}
+}

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

@@ -68,6 +68,14 @@ class RecyclerViewAlertDialog private constructor(
 			return this
 		}
 
+		fun setNeutralButton(
+			@StringRes textId: Int,
+			listener: DialogInterface.OnClickListener,
+		): Builder<T> {
+			delegate.setNeutralButton(textId, listener)
+			return this
+		}
+
 		fun setCancelable(isCancelable: Boolean): Builder<T> {
 			delegate.setCancelable(isCancelable)
 			return this

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

@@ -1,100 +0,0 @@
-package org.koitharu.kotatsu.core.ui.drawable
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.ColorFilter
-import android.graphics.Paint
-import android.graphics.PixelFormat
-import android.graphics.Typeface
-import android.graphics.drawable.Drawable
-import android.os.Build
-import android.text.Layout
-import android.text.StaticLayout
-import android.text.TextPaint
-import androidx.annotation.ColorInt
-import androidx.annotation.Px
-import androidx.annotation.StyleRes
-import androidx.core.graphics.withTranslation
-import com.google.android.material.resources.TextAppearance
-import com.google.android.material.resources.TextAppearanceFontCallback
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
-
-class TextDrawable(
-	val text: CharSequence,
-) : Drawable() {
-
-	private val paint = TextPaint(Paint.ANTI_ALIAS_FLAG)
-	private var cachedLayout: StaticLayout? = null
-
-	@SuppressLint("RestrictedApi")
-	constructor(context: Context, text: CharSequence, @StyleRes textAppearanceId: Int) : this(text) {
-		val ta = TextAppearance(context, textAppearanceId)
-		paint.color = ta.textColor?.defaultColor ?: context.getThemeColor(android.R.attr.textColorPrimary, Color.BLACK)
-		paint.typeface = ta.fallbackFont
-		ta.getFontAsync(
-			context, paint,
-			object : TextAppearanceFontCallback() {
-				override fun onFontRetrieved(typeface: Typeface?, fontResolvedSynchronously: Boolean) = Unit
-				override fun onFontRetrievalFailed(reason: Int) = Unit
-			},
-		)
-		paint.letterSpacing = ta.letterSpacing
-	}
-
-	var alignment = Layout.Alignment.ALIGN_NORMAL
-
-	var lineSpacingMultiplier = 1f
-
-	@Px
-	var lineSpacingExtra = 0f
-
-	@get:ColorInt
-	var textColor: Int
-		get() = paint.color
-		set(@ColorInt value) {
-			paint.color = value
-		}
-
-	override fun draw(canvas: Canvas) {
-		val b = bounds
-		if (b.isEmpty) {
-			return
-		}
-		canvas.withTranslation(x = b.left.toFloat(), y = b.top.toFloat()) {
-			obtainLayout().draw(canvas)
-		}
-	}
-
-	override fun setAlpha(alpha: Int) {
-		paint.alpha = alpha
-	}
-
-	override fun setColorFilter(colorFilter: ColorFilter?) {
-		paint.setColorFilter(colorFilter)
-	}
-
-	@Suppress("DeprecatedCallableAddReplaceWith")
-	@Deprecated("Deprecated in Java")
-	override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
-
-	private fun obtainLayout(): StaticLayout {
-		val width = bounds.width()
-		cachedLayout?.let {
-			if (it.width == width) {
-				return it
-			}
-		}
-		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			StaticLayout.Builder.obtain(text, 0, text.length, paint, width)
-				.setAlignment(alignment)
-				.setLineSpacing(lineSpacingExtra, lineSpacingMultiplier)
-				.setIncludePad(true)
-				.build()
-		} else {
-			@Suppress("DEPRECATION")
-			StaticLayout(text, paint, width, alignment, lineSpacingMultiplier, lineSpacingExtra, true)
-		}.also { cachedLayout = it }
-	}
-}

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

@@ -12,11 +12,10 @@ import android.graphics.RectF
 import android.graphics.drawable.Drawable
 import androidx.annotation.StyleRes
 import androidx.core.content.withStyledAttributes
-import androidx.core.graphics.ColorUtils
 import androidx.core.graphics.withClip
 import com.google.android.material.color.MaterialColors
 import org.koitharu.kotatsu.R
-import kotlin.math.absoluteValue
+import org.koitharu.kotatsu.core.util.KotatsuColors
 
 class FaviconDrawable(
 	context: Context,
@@ -44,7 +43,7 @@ class FaviconDrawable(
 		}
 		paint.textAlign = Paint.Align.CENTER
 		paint.isFakeBoldText = true
-		colorForeground = MaterialColors.harmonize(colorOfString(name), colorBackground)
+		colorForeground = MaterialColors.harmonize(KotatsuColors.random(name), colorBackground)
 	}
 
 	override fun draw(canvas: Canvas) {
@@ -104,9 +103,4 @@ class FaviconDrawable(
 		paint.getTextBounds(text, 0, text.length, tempRect)
 		return testTextSize * width / tempRect.width()
 	}
-
-	private fun colorOfString(str: String): Int {
-		val hue = (str.hashCode() % 360).absoluteValue.toFloat()
-		return ColorUtils.HSLToColor(floatArrayOf(hue, 0.5f, 0.5f))
-	}
 }

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

@@ -38,4 +38,12 @@ abstract class BoundsScrollListener(
 		firstVisibleItemPosition: Int,
 		visibleItemCount: Int
 	) = Unit
+
+	fun invalidate(recyclerView: RecyclerView) {
+		onScrolled(recyclerView, 0, 0)
+	}
+
+	fun postInvalidate(recyclerView: RecyclerView) = recyclerView.post {
+		invalidate(recyclerView)
+	}
 }

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

@@ -1,64 +0,0 @@
-package org.koitharu.kotatsu.core.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/kotlin/org/koitharu/kotatsu/core/ui/list/SectionedSelectionController.kt

@@ -1,237 +1,4 @@
 package org.koitharu.kotatsu.core.ui.list
 
-import android.app.Activity
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.ActionMode
-import androidx.collection.ArrayMap
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import androidx.savedstate.SavedStateRegistry
-import androidx.savedstate.SavedStateRegistryOwner
-import kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
-import kotlin.coroutines.EmptyCoroutineContext
-
 private const val PROVIDER_NAME = "selection_decoration_sectioned"
 
-class SectionedSelectionController<T : Any>(
-	private val activity: Activity,
-	private val owner: SavedStateRegistryOwner,
-	private val callback: Callback<T>,
-) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
-
-	private var actionMode: ActionMode? = null
-
-	private var pendingData: MutableMap<String, Collection<Long>>? = null
-	private val decorations = ArrayMap<T, AbstractSelectionItemDecoration>()
-
-	val count: Int
-		get() = decorations.values.sumOf { it.checkedItemsCount }
-
-	init {
-		owner.lifecycle.addObserver(StateEventObserver())
-	}
-
-	fun snapshot(): Map<T, Set<Long>> {
-		return decorations.mapValues { it.value.checkedItemsIds.toSet() }
-	}
-
-	fun peekCheckedIds(): Map<T, Set<Long>> {
-		return decorations.mapValues { it.value.checkedItemsIds }
-	}
-
-	fun clear() {
-		decorations.values.forEach {
-			it.clearSelection()
-		}
-		notifySelectionChanged()
-	}
-
-	fun attachToRecyclerView(section: T, recyclerView: RecyclerView) {
-		val decoration = getDecoration(section)
-		val pendingIds = pendingData?.remove(section.toString())
-		if (!pendingIds.isNullOrEmpty()) {
-			decoration.checkAll(pendingIds)
-			startActionMode()
-			notifySelectionChanged()
-		}
-		var shouldAddDecoration = true
-		for (i in (0 until recyclerView.itemDecorationCount).reversed()) {
-			val decor = recyclerView.getItemDecorationAt(i)
-			if (decor === decoration) {
-				shouldAddDecoration = false
-				break
-			} else if (decor.javaClass == decoration.javaClass) {
-				recyclerView.removeItemDecorationAt(i)
-			}
-		}
-		if (shouldAddDecoration) {
-			recyclerView.addItemDecoration(decoration)
-		}
-		if (pendingData?.isEmpty() == true) {
-			pendingData = null
-		}
-	}
-
-	override fun saveState(): Bundle {
-		val bundle = Bundle(decorations.size)
-		for ((k, v) in decorations) {
-			bundle.putLongArray(k.toString(), v.checkedItemsIds.toLongArray())
-		}
-		return bundle
-	}
-
-	fun onItemClick(section: T, id: Long): Boolean {
-		val decoration = getDecoration(section)
-		if (isInSelectionMode()) {
-			decoration.toggleItemChecked(id)
-			if (isInSelectionMode()) {
-				actionMode?.invalidate()
-			} else {
-				actionMode?.finish()
-			}
-			notifySelectionChanged()
-			return true
-		}
-		return false
-	}
-
-	fun onItemLongClick(section: T, id: Long): Boolean {
-		val decoration = getDecoration(section)
-		startActionMode()
-		return actionMode?.also {
-			decoration.setItemIsChecked(id, true)
-			notifySelectionChanged()
-		} != null
-	}
-
-	fun getSectionCount(section: T): Int {
-		return decorations[section]?.checkedItemsCount ?: 0
-	}
-
-	fun addToSelection(section: T, ids: Collection<Long>): Boolean {
-		val decoration = getDecoration(section)
-		startActionMode()
-		return actionMode?.also {
-			decoration.checkAll(ids)
-			notifySelectionChanged()
-		} != null
-	}
-
-	fun clearSelection(section: T) {
-		decorations[section]?.clearSelection() ?: return
-		notifySelectionChanged()
-	}
-
-	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onCreateActionMode(this, mode, menu)
-	}
-
-	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onPrepareActionMode(this, mode, menu)
-	}
-
-	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-		return callback.onActionItemClicked(this, mode, item)
-	}
-
-	override fun onDestroyActionMode(mode: ActionMode) {
-		callback.onDestroyActionMode(this, mode)
-		clear()
-		actionMode = null
-	}
-
-	private fun startActionMode() {
-		if (actionMode == null) {
-			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
-		}
-	}
-
-	private fun isInSelectionMode(): Boolean {
-		return decorations.values.any { x -> x.checkedItemsCount > 0 }
-	}
-
-	private fun notifySelectionChanged() {
-		val count = this.count
-		callback.onSelectionChanged(this, count)
-		if (count == 0) {
-			actionMode?.finish()
-		} else {
-			actionMode?.invalidate()
-		}
-	}
-
-	private fun restoreState(ids: MutableMap<String, Collection<Long>>) {
-		if (ids.isEmpty() || isInSelectionMode()) {
-			return
-		}
-		for ((k, v) in decorations) {
-			val items = ids.remove(k.toString())
-			if (!items.isNullOrEmpty()) {
-				v.checkAll(items)
-			}
-		}
-		pendingData = ids
-		if (isInSelectionMode()) {
-			startActionMode()
-			notifySelectionChanged()
-		}
-	}
-
-	private fun getDecoration(section: T): AbstractSelectionItemDecoration {
-		return decorations.getOrPut(section) {
-			callback.onCreateItemDecoration(this, section)
-		}
-	}
-
-	interface Callback<T : Any> {
-
-		fun onSelectionChanged(controller: SectionedSelectionController<T>, count: Int)
-
-		fun onCreateActionMode(controller: SectionedSelectionController<T>, mode: ActionMode, menu: Menu): Boolean
-
-		fun onPrepareActionMode(controller: SectionedSelectionController<T>, mode: ActionMode, menu: Menu): Boolean {
-			mode.title = controller.count.toString()
-			return true
-		}
-
-		fun onDestroyActionMode(controller: SectionedSelectionController<T>, mode: ActionMode) = Unit
-
-		fun onActionItemClicked(
-			controller: SectionedSelectionController<T>,
-			mode: ActionMode,
-			item: MenuItem,
-		): Boolean
-
-		fun onCreateItemDecoration(
-			controller: SectionedSelectionController<T>,
-			section: T,
-		): AbstractSelectionItemDecoration
-	}
-
-	private inner class StateEventObserver : LifecycleEventObserver {
-
-		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-			if (event == Lifecycle.Event.ON_CREATE) {
-				val registry = owner.savedStateRegistry
-				registry.registerSavedStateProvider(PROVIDER_NAME, this@SectionedSelectionController)
-				val state = registry.consumeRestoredStateForKey(PROVIDER_NAME)
-				if (state != null) {
-					Dispatchers.Main.dispatch(EmptyCoroutineContext) { // == Handler.post
-						if (source.lifecycle.currentState.isAtLeast(Lifecycle.State.CREATED)) {
-							restoreState(
-								state.keySet()
-									.associateWithTo(HashMap()) { state.getLongArray(it)?.toList().orEmpty() },
-							)
-						}
-					}
-				}
-			}
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/decor/AbstractSelectionItemDecoration.kt

@@ -91,7 +91,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 		canvas.restoreToCount(checkpoint)
 	}
 
-	protected open fun getItemId(parent: RecyclerView, child: View) = parent.getChildItemId(child)
+	abstract fun getItemId(parent: RecyclerView, child: View): Long
 
 	protected open fun onDrawBackground(
 		canvas: Canvas,

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

@@ -4,8 +4,10 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.ViewGroup
 import androidx.annotation.AttrRes
+import androidx.core.view.ancestors
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
 import org.koitharu.kotatsu.R
 
 class FastScrollRecyclerView @JvmOverloads constructor(
@@ -15,6 +17,16 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 ) : RecyclerView(context, attrs, defStyleAttr) {
 
 	val fastScroller = FastScroller(context, attrs)
+	var isVP2BugWorkaroundEnabled = false
+		set(value) {
+			field = value
+			if (value && isAttachedToWindow) {
+				checkIfInVP2()
+			} else if (!value) {
+				applyVP2Workaround = false
+			}
+		}
+	private var applyVP2Workaround = false
 
 	var isFastScrollerEnabled: Boolean = true
 		set(value) {
@@ -43,10 +55,29 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 	override fun onAttachedToWindow() {
 		super.onAttachedToWindow()
 		fastScroller.attachRecyclerView(this)
+		if (isVP2BugWorkaroundEnabled) {
+			checkIfInVP2()
+		}
 	}
 
 	override fun onDetachedFromWindow() {
 		fastScroller.detachRecyclerView()
 		super.onDetachedFromWindow()
+		applyVP2Workaround = false
+	}
+
+	override fun isLayoutRequested(): Boolean {
+		return if (applyVP2Workaround) false else super.isLayoutRequested()
+	}
+
+	override fun requestLayout() {
+		super.requestLayout()
+		if (applyVP2Workaround && parent?.isLayoutRequested == true) {
+			parent?.requestLayout()
+		}
+	}
+
+	private fun checkIfInVP2() {
+		applyVP2Workaround = ancestors.any { it is ViewPager2 } == true
 	}
 }

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

@@ -12,7 +12,12 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
-import androidx.annotation.*
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.annotation.DimenRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.Px
+import androidx.annotation.StyleableRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -131,19 +136,19 @@ class FastScroller @JvmOverloads constructor(
 
 		var showTrack = false
 
-		context.withStyledAttributes(attrs, R.styleable.FastScroller, defStyleAttr) {
-			bubbleColor = getColor(R.styleable.FastScroller_bubbleColor, bubbleColor)
-			handleColor = getColor(R.styleable.FastScroller_thumbColor, handleColor)
-			trackColor = getColor(R.styleable.FastScroller_trackColor, trackColor)
-			textColor = getColor(R.styleable.FastScroller_bubbleTextColor, textColor)
-			hideScrollbar = getBoolean(R.styleable.FastScroller_hideScrollbar, hideScrollbar)
-			showBubble = getBoolean(R.styleable.FastScroller_showBubble, showBubble)
-			showBubbleAlways = getBoolean(R.styleable.FastScroller_showBubbleAlways, showBubbleAlways)
-			showTrack = getBoolean(R.styleable.FastScroller_showTrack, showTrack)
-			bubbleSize = getBubbleSize(R.styleable.FastScroller_bubbleSize, BubbleSize.NORMAL)
-			val textSize = getDimension(R.styleable.FastScroller_bubbleTextSize, bubbleSize.textSize)
+		context.withStyledAttributes(attrs, R.styleable.FastScrollRecyclerView, defStyleAttr) {
+			bubbleColor = getColor(R.styleable.FastScrollRecyclerView_bubbleColor, bubbleColor)
+			handleColor = getColor(R.styleable.FastScrollRecyclerView_thumbColor, handleColor)
+			trackColor = getColor(R.styleable.FastScrollRecyclerView_trackColor, trackColor)
+			textColor = getColor(R.styleable.FastScrollRecyclerView_bubbleTextColor, textColor)
+			hideScrollbar = getBoolean(R.styleable.FastScrollRecyclerView_hideScrollbar, hideScrollbar)
+			showBubble = getBoolean(R.styleable.FastScrollRecyclerView_showBubble, showBubble)
+			showBubbleAlways = getBoolean(R.styleable.FastScrollRecyclerView_showBubbleAlways, showBubbleAlways)
+			showTrack = getBoolean(R.styleable.FastScrollRecyclerView_showTrack, showTrack)
+			bubbleSize = getBubbleSize(R.styleable.FastScrollRecyclerView_bubbleSize, BubbleSize.NORMAL)
+			val textSize = getDimension(R.styleable.FastScrollRecyclerView_bubbleTextSize, bubbleSize.textSize)
 			binding.bubble.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
-			offset = getDimensionPixelOffset(R.styleable.FastScroller_scrollerOffset, offset)
+			offset = getDimensionPixelOffset(R.styleable.FastScrollRecyclerView_scrollerOffset, offset)
 		}
 
 		setTrackColor(trackColor)

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

@@ -2,9 +2,8 @@ package org.koitharu.kotatsu.core.ui.model
 
 import android.content.res.Resources
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.daysDiff
-import org.koitharu.kotatsu.core.util.ext.format
-import java.util.Date
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 
 sealed class DateTimeAgo {
 
@@ -74,28 +73,22 @@ sealed class DateTimeAgo {
 		}
 	}
 
-	class Absolute(private val date: Date) : DateTimeAgo() {
-
-		private val day = date.daysDiff(0)
-
+	data class Absolute(private val date: LocalDate) : DateTimeAgo() {
 		override fun format(resources: Resources): String {
-			return date.format("d MMMM")
+			return if (date == EPOCH_DATE) {
+				resources.getString(R.string.unknown)
+			} else {
+				date.format(formatter)
+			}
 		}
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
+		override fun toString() = "abs_${date.toEpochDay()}"
 
-			other as Absolute
-
-			return day == other.day
+		companion object {
+			// TODO: Use Java 9's LocalDate.EPOCH.
+			private val EPOCH_DATE = LocalDate.of(1970, 1, 1)
+			private val formatter = DateTimeFormatter.ofPattern("d MMMM")
 		}
-
-		override fun hashCode(): Int {
-			return day
-		}
-
-		override fun toString() = "abs_$day"
 	}
 
 	object LongAgo : DateTimeAgo() {

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

@@ -12,4 +12,5 @@ val SortOrder.titleRes: Int
 		SortOrder.RATING -> R.string.by_rating
 		SortOrder.NEWEST -> R.string.newest
 		SortOrder.ALPHABETICAL -> R.string.by_name
+		SortOrder.ALPHABETICAL_DESC -> R.string.by_name_reverse
 	}

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

@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.core.ui.util
+
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.widget.PopupMenu
+import androidx.core.view.MenuProvider
+import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
+
+class PopupMenuMediator(
+	private val provider: MenuProvider,
+) : View.OnLongClickListener, PopupMenu.OnMenuItemClickListener, PopupMenu.OnDismissListener {
+
+	override fun onLongClick(v: View): Boolean {
+		val menu = PopupMenu(v.context, v)
+		provider.onCreateMenu(menu.menu, menu.menuInflater)
+		provider.onPrepareMenu(menu.menu)
+		if (!menu.menu.hasVisibleItems()) {
+			return false
+		}
+		menu.setOnMenuItemClickListener(this)
+		menu.setOnDismissListener(this)
+		menu.show()
+		return true
+	}
+
+	override fun onMenuItemClick(item: MenuItem): Boolean {
+		return provider.onMenuItemSelected(item)
+	}
+
+	override fun onDismiss(menu: PopupMenu) {
+		provider.onMenuClosed(menu.menu)
+	}
+
+	fun attach(view: View) {
+		view.setOnLongClickListener(this)
+		view.setOnContextClickListenerCompat(this)
+	}
+}

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

@@ -7,12 +7,16 @@ import org.koitharu.kotatsu.R
 
 class ReversibleActionObserver(
 	private val snackbarHost: View,
+	private val snackbarAnchor: View? = null,
 ) : FlowCollector<ReversibleAction> {
 
 	override suspend fun emit(value: ReversibleAction) {
 		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 (snackbarAnchor?.isShown == true) {
+			snackbar.anchorView = snackbarAnchor
+		}
 		if (handle != null) {
 			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
 		}

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

@@ -70,7 +70,7 @@ class WindowInsetsDelegate : OnApplyWindowInsetsListener, View.OnLayoutChangeLis
 		lastInsets = null
 	}
 
-	interface WindowInsetsListener {
+	fun interface WindowInsetsListener {
 
 		fun onWindowInsetsChanged(insets: Insets)
 	}

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

@@ -1,21 +1,16 @@
 package org.koitharu.kotatsu.core.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.ColorRes
 import androidx.annotation.DrawableRes
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.getColorStateListOrThrow
 import androidx.core.view.children
 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.core.util.ext.castOrNull
-import com.google.android.material.R as materialR
 
 class ChipsView @JvmOverloads constructor(
 	context: Context,
@@ -31,9 +26,7 @@ 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
+	private val chipStyle: Int
 	var onChipClickListener: OnChipClickListener? = null
 		set(value) {
 			field = value
@@ -48,12 +41,17 @@ class ChipsView @JvmOverloads constructor(
 		}
 
 	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()
+		val ta = context.obtainStyledAttributes(attrs, R.styleable.ChipsView, defStyleAttr, 0)
+		chipStyle = ta.getResourceId(R.styleable.ChipsView_chipStyle, R.style.Widget_Kotatsu_Chip)
+		ta.recycle()
+
+		if (isInEditMode) {
+			setChips(
+				List(5) {
+					ChipModel(0, "Chip $it", 0, isCheckable = false, isChecked = false)
+				},
+			)
+		}
 	}
 
 	override fun requestLayout() {
@@ -91,15 +89,6 @@ class ChipsView @JvmOverloads constructor(
 
 	private fun bindChip(chip: Chip, model: ChipModel) {
 		chip.text = model.title
-		val tint = if (model.tint == 0) {
-			null
-		} else {
-			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
 		if (model.icon == 0) {
@@ -115,15 +104,13 @@ class ChipsView @JvmOverloads constructor(
 
 	private fun addChip(): Chip {
 		val chip = Chip(context)
-		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
+		val drawable = ChipDrawable.createFromAttributes(context, null, 0, chipStyle)
 		chip.setChipDrawable(drawable)
 		chip.isCheckedIconVisible = true
 		chip.isChipIconVisible = false
-		chip.setCheckedIconResource(R.drawable.ic_check)
-		chip.checkedIconTint = defaultChipIconTint
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
-		chip.setEnsureMinTouchTargetSize(false)
+		chip.setEnsureMinTouchTargetSize(false) // TODO remove
 		chip.setOnClickListener(chipOnClickListener)
 		addView(chip)
 		return chip

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

@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.core.ui.widgets
 
 import android.content.Context
-import android.util.ArrayMap
 import android.util.AttributeSet
+import androidx.collection.MutableScatterMap
 import com.google.android.material.slider.Slider
 import kotlin.math.cbrt
 import kotlin.math.pow
@@ -12,7 +12,7 @@ class CubicSlider @JvmOverloads constructor(
 	attrs: AttributeSet? = null,
 ) : Slider(context, attrs) {
 
-	private val changeListeners = ArrayMap<OnChangeListener, OnChangeListenerMapper>(1)
+	private val changeListeners = MutableScatterMap<OnChangeListener, OnChangeListenerMapper>(1)
 
 	override fun setValue(value: Float) {
 		super.setValue(value.unmap())

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

@@ -0,0 +1,44 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.core.content.withStyledAttributes
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.R
+
+class NestedRecyclerView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null
+) : RecyclerView(context, attrs) {
+
+	private var maxHeight: Int = 0
+
+	init {
+		context.withStyledAttributes(attrs, R.styleable.NestedRecyclerView) {
+			maxHeight = getDimensionPixelSize(R.styleable.NestedRecyclerView_maxHeight, maxHeight)
+		}
+	}
+
+	@SuppressLint("ClickableViewAccessibility")
+	override fun onTouchEvent(e: MotionEvent?): Boolean {
+		if (e?.actionMasked == MotionEvent.ACTION_UP) {
+			requestDisallowInterceptTouchEvent(false)
+		} else {
+			requestDisallowInterceptTouchEvent(true)
+		}
+		return super.onTouchEvent(e)
+	}
+
+	override fun onMeasure(widthSpec: Int, heightSpec: Int) {
+		super.onMeasure(
+			widthSpec,
+			if (maxHeight == 0) {
+				heightSpec
+			} else {
+				MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.AT_MOST)
+			},
+		)
+	}
+}

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

@@ -1,397 +0,0 @@
-package org.koitharu.kotatsu.core.ui.widgets
-
-import android.animation.ValueAnimator
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.CornerPathEffect
-import android.graphics.Paint
-import android.graphics.Rect
-import android.graphics.RectF
-import android.graphics.Typeface
-import android.os.Build
-import android.os.Parcelable
-import android.text.Layout
-import android.text.StaticLayout
-import android.text.TextDirectionHeuristic
-import android.text.TextDirectionHeuristics
-import android.text.TextPaint
-import android.util.AttributeSet
-import android.view.View
-import androidx.annotation.RequiresApi
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.draw
-import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
-import org.koitharu.kotatsu.core.util.ext.resolveDp
-import org.koitharu.kotatsu.core.util.ext.resolveSp
-
-class PieChart @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	defStyleAttr: Int = 0
-) : View(context, attrs, defStyleAttr), PieChartInterface {
-
-	private var marginTextFirst: Float = context.resources.resolveDp(DEFAULT_MARGIN_TEXT_1)
-	private var marginTextSecond: Float = context.resources.resolveDp(DEFAULT_MARGIN_TEXT_2)
-	private var marginTextThird: Float = context.resources.resolveDp(DEFAULT_MARGIN_TEXT_3)
-	private var marginSmallCircle: Float = context.resources.resolveDp(DEFAULT_MARGIN_SMALL_CIRCLE)
-	private val marginText: Float = marginTextFirst + marginTextSecond
-	private val circleRect = RectF()
-	private var circleStrokeWidth: Float = context.resources.resolveDp(6f)
-	private var circleRadius: Float = 0f
-	private var circlePadding: Float = context.resources.resolveDp(8f)
-	private var circlePaintRoundSize: Boolean = true
-	private var circleSectionSpace: Float = 3f
-	private var circleCenterX: Float = 0f
-	private var circleCenterY: Float = 0f
-	private var numberTextPaint: TextPaint = TextPaint()
-	private var descriptionTextPain: TextPaint = TextPaint()
-	private var amountTextPaint: TextPaint = TextPaint()
-	private var textStartX: Float = 0f
-	private var textStartY: Float = 0f
-	private var textHeight: Int = 0
-	private var textCircleRadius: Float = context.resources.resolveDp(4f)
-	private var textAmountStr: String = ""
-	private var textAmountY: Float = 0f
-	private var textAmountXNumber: Float = 0f
-	private var textAmountXDescription: Float = 0f
-	private var textAmountYDescription: Float = 0f
-	private var totalAmount: Int = 0
-	private var pieChartColors: List<String> = listOf()
-	private var percentageCircleList: List<PieChartModel> = listOf()
-	private var textRowList: MutableList<StaticLayout> = mutableListOf()
-	private var dataList: List<Pair<Int, String>> = listOf()
-	private var animationSweepAngle: Int = 0
-
-	init {
-		var textAmountSize: Float = context.resources.resolveSp(22f)
-		var textNumberSize: Float = context.resources.resolveSp(20f)
-		var textDescriptionSize: Float = context.resources.resolveSp(14f)
-		var textAmountColor: Int = Color.WHITE
-		var textNumberColor: Int = Color.WHITE
-		var textDescriptionColor: Int = Color.GRAY
-
-		if (attrs != null) {
-			val typeArray = context.obtainStyledAttributes(attrs, R.styleable.PieChart)
-
-			val colorResId = typeArray.getResourceId(R.styleable.PieChart_pieChartColors, 0)
-			pieChartColors = typeArray.resources.getStringArray(colorResId).toList()
-
-			marginTextFirst = typeArray.getDimension(R.styleable.PieChart_pieChartMarginTextFirst, marginTextFirst)
-			marginTextSecond = typeArray.getDimension(R.styleable.PieChart_pieChartMarginTextSecond, marginTextSecond)
-			marginTextThird = typeArray.getDimension(R.styleable.PieChart_pieChartMarginTextThird, marginTextThird)
-			marginSmallCircle =
-				typeArray.getDimension(R.styleable.PieChart_pieChartMarginSmallCircle, marginSmallCircle)
-
-			circleStrokeWidth =
-				typeArray.getDimension(R.styleable.PieChart_pieChartCircleStrokeWidth, circleStrokeWidth)
-			circlePadding = typeArray.getDimension(R.styleable.PieChart_pieChartCirclePadding, circlePadding)
-			circlePaintRoundSize =
-				typeArray.getBoolean(R.styleable.PieChart_pieChartCirclePaintRoundSize, circlePaintRoundSize)
-			circleSectionSpace = typeArray.getFloat(R.styleable.PieChart_pieChartCircleSectionSpace, circleSectionSpace)
-
-			textCircleRadius = typeArray.getDimension(R.styleable.PieChart_pieChartTextCircleRadius, textCircleRadius)
-			textAmountSize = typeArray.getDimension(R.styleable.PieChart_pieChartTextAmountSize, textAmountSize)
-			textNumberSize = typeArray.getDimension(R.styleable.PieChart_pieChartTextNumberSize, textNumberSize)
-			textDescriptionSize =
-				typeArray.getDimension(R.styleable.PieChart_pieChartTextDescriptionSize, textDescriptionSize)
-			textAmountColor = typeArray.getColor(R.styleable.PieChart_pieChartTextAmountColor, textAmountColor)
-			textNumberColor = typeArray.getColor(R.styleable.PieChart_pieChartTextNumberColor, textNumberColor)
-			textDescriptionColor =
-				typeArray.getColor(R.styleable.PieChart_pieChartTextDescriptionColor, textDescriptionColor)
-			textAmountStr = typeArray.getString(R.styleable.PieChart_pieChartTextAmount) ?: ""
-
-			typeArray.recycle()
-		}
-
-		circlePadding += circleStrokeWidth
-
-		// Инициализация кистей View
-		initPaints(amountTextPaint, textAmountSize, textAmountColor)
-		initPaints(numberTextPaint, textNumberSize, textNumberColor)
-		initPaints(descriptionTextPain, textDescriptionSize, textDescriptionColor, true)
-	}
-
-	@RequiresApi(Build.VERSION_CODES.M)
-	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-		textRowList.clear()
-
-		val initSizeWidth = resolveDefaultSize(widthMeasureSpec, DEFAULT_VIEW_SIZE_WIDTH)
-
-		val textTextWidth = (initSizeWidth * TEXT_WIDTH_PERCENT)
-		val initSizeHeight = calculateViewHeight(heightMeasureSpec, textTextWidth.toInt())
-
-		textStartX = initSizeWidth - textTextWidth.toFloat()
-		textStartY = initSizeHeight.toFloat() / 2 - textHeight / 2
-
-		calculateCircleRadius(initSizeWidth, initSizeHeight)
-
-		setMeasuredDimension(initSizeWidth, initSizeHeight)
-	}
-
-	override fun onDraw(canvas: Canvas) {
-		super.onDraw(canvas)
-
-		drawCircle(canvas)
-		drawText(canvas)
-	}
-
-	override fun onRestoreInstanceState(state: Parcelable?) {
-		val pieChartState = state as? PieChartState
-		super.onRestoreInstanceState(pieChartState?.superState ?: state)
-
-		dataList = pieChartState?.dataList ?: listOf()
-	}
-
-	override fun onSaveInstanceState(): Parcelable {
-		val superState = super.onSaveInstanceState()
-		return PieChartState(superState, dataList)
-	}
-
-	override fun setDataChart(list: List<Pair<Int, String>>) {
-		dataList = list
-		calculatePercentageOfData()
-	}
-
-	override fun startAnimation() {
-		val animator = ValueAnimator.ofInt(0, 360).apply {
-			duration = context.getAnimationDuration(android.R.integer.config_longAnimTime)
-			interpolator = FastOutSlowInInterpolator()
-			addUpdateListener { valueAnimator ->
-				animationSweepAngle = valueAnimator.animatedValue as Int
-				invalidate()
-			}
-		}
-		animator.start()
-	}
-
-	private fun drawCircle(canvas: Canvas) {
-		for (percent in percentageCircleList) {
-			if (animationSweepAngle > percent.percentToStartAt + percent.percentOfCircle) {
-				canvas.drawArc(circleRect, percent.percentToStartAt, percent.percentOfCircle, false, percent.paint)
-			} else if (animationSweepAngle > percent.percentToStartAt) {
-				canvas.drawArc(
-					circleRect,
-					percent.percentToStartAt,
-					animationSweepAngle - percent.percentToStartAt,
-					false,
-					percent.paint,
-				)
-			}
-		}
-	}
-
-	private fun drawText(canvas: Canvas) {
-		var textBuffY = textStartY
-		textRowList.forEachIndexed { index, staticLayout ->
-			if (index % 2 == 0) {
-				staticLayout.draw(canvas, textStartX + marginSmallCircle + textCircleRadius, textBuffY)
-				canvas.drawCircle(
-					textStartX + marginSmallCircle / 2,
-					textBuffY + staticLayout.height / 2 + textCircleRadius / 2,
-					textCircleRadius,
-					Paint().apply { color = Color.parseColor(pieChartColors[(index / 2) % pieChartColors.size]) },
-				)
-				textBuffY += staticLayout.height + marginTextFirst
-			} else {
-				staticLayout.draw(canvas, textStartX, textBuffY)
-				textBuffY += staticLayout.height + marginTextSecond
-			}
-		}
-
-		canvas.drawText(totalAmount.toString(), textAmountXNumber, textAmountY, amountTextPaint)
-		canvas.drawText(textAmountStr, textAmountXDescription, textAmountYDescription, descriptionTextPain)
-	}
-
-	private fun initPaints(textPaint: TextPaint, textSize: Float, textColor: Int, isDescription: Boolean = false) {
-		textPaint.color = textColor
-		textPaint.textSize = textSize
-		textPaint.isAntiAlias = true
-
-		if (!isDescription) textPaint.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
-	}
-
-	private fun resolveDefaultSize(spec: Int, defValue: Int): Int {
-		return when (MeasureSpec.getMode(spec)) {
-			MeasureSpec.UNSPECIFIED -> resources.resolveDp(defValue)
-			else -> MeasureSpec.getSize(spec)
-		}
-	}
-
-	@RequiresApi(Build.VERSION_CODES.M)
-	private fun calculateViewHeight(heightMeasureSpec: Int, textWidth: Int): Int {
-		val initSizeHeight = resolveDefaultSize(heightMeasureSpec, DEFAULT_VIEW_SIZE_HEIGHT)
-		textHeight = (dataList.size * marginText + getTextViewHeight(textWidth)).toInt()
-
-		val textHeightWithPadding = textHeight + paddingTop + paddingBottom
-		return if (textHeightWithPadding > initSizeHeight) textHeightWithPadding else initSizeHeight
-	}
-
-	private fun calculateCircleRadius(width: Int, height: Int) {
-		val circleViewWidth = (width * CIRCLE_WIDTH_PERCENT)
-		circleRadius = if (circleViewWidth > height) {
-			(height.toFloat() - circlePadding) / 2
-		} else {
-			circleViewWidth.toFloat() / 2
-		}
-
-		with(circleRect) {
-			left = circlePadding
-			top = height / 2 - circleRadius
-			right = circleRadius * 2 + circlePadding
-			bottom = height / 2 + circleRadius
-		}
-
-		circleCenterX = (circleRadius * 2 + circlePadding + circlePadding) / 2
-		circleCenterY = (height / 2 + circleRadius + (height / 2 - circleRadius)) / 2
-
-		textAmountY = circleCenterY
-
-		val sizeTextAmountNumber = getWidthOfAmountText(
-			totalAmount.toString(),
-			amountTextPaint,
-		)
-
-		textAmountXNumber = circleCenterX - sizeTextAmountNumber.width() / 2
-		textAmountXDescription = circleCenterX - getWidthOfAmountText(textAmountStr, descriptionTextPain).width() / 2
-		textAmountYDescription = circleCenterY + sizeTextAmountNumber.height() + marginTextThird
-	}
-
-	@RequiresApi(Build.VERSION_CODES.M)
-	private fun getTextViewHeight(maxWidth: Int): Int {
-		var textHeight = 0
-		dataList.forEach {
-			val textLayoutNumber = getMultilineText(
-				text = it.first.toString(),
-				textPaint = numberTextPaint,
-				width = maxWidth,
-			)
-			val textLayoutDescription = getMultilineText(
-				text = it.second,
-				textPaint = descriptionTextPain,
-				width = maxWidth,
-			)
-			textRowList.apply {
-				add(textLayoutNumber)
-				add(textLayoutDescription)
-			}
-			textHeight += textLayoutNumber.height + textLayoutDescription.height
-		}
-
-		return textHeight
-	}
-
-	private fun calculatePercentageOfData() {
-		totalAmount = dataList.fold(0) { res, value -> res + value.first }
-
-		var startAt = circleSectionSpace
-		percentageCircleList = dataList.mapIndexed { index, pair ->
-			var percent = pair.first * 100 / totalAmount.toFloat() - circleSectionSpace
-			percent = if (percent < 0f) 0f else percent
-
-			val resultModel = PieChartModel(
-				percentOfCircle = percent,
-				percentToStartAt = startAt,
-				colorOfLine = Color.parseColor(pieChartColors[index % pieChartColors.size]),
-				stroke = circleStrokeWidth,
-				paintRound = circlePaintRoundSize,
-			)
-			if (percent != 0f) startAt += percent + circleSectionSpace
-			resultModel
-		}
-	}
-
-	private fun getWidthOfAmountText(text: String, textPaint: TextPaint): Rect {
-		val bounds = Rect()
-		textPaint.getTextBounds(text, 0, text.length, bounds)
-		return bounds
-	}
-
-	@RequiresApi(Build.VERSION_CODES.M)
-	private fun getMultilineText(
-		text: CharSequence,
-		textPaint: TextPaint,
-		width: Int,
-		start: Int = 0,
-		end: Int = text.length,
-		alignment: Layout.Alignment = Layout.Alignment.ALIGN_NORMAL,
-		textDir: TextDirectionHeuristic = TextDirectionHeuristics.LTR,
-		spacingMult: Float = 1f,
-		spacingAdd: Float = 0f
-	): StaticLayout {
-
-		return StaticLayout.Builder
-			.obtain(text, start, end, textPaint, width)
-			.setAlignment(alignment)
-			.setTextDirection(textDir)
-			.setLineSpacing(spacingAdd, spacingMult)
-			.build()
-	}
-
-	companion object {
-		private const val DEFAULT_MARGIN_TEXT_1 = 2f
-		private const val DEFAULT_MARGIN_TEXT_2 = 10f
-		private const val DEFAULT_MARGIN_TEXT_3 = 2f
-		private const val DEFAULT_MARGIN_SMALL_CIRCLE = 12f
-
-		private const val TEXT_WIDTH_PERCENT = 0.40
-		private const val CIRCLE_WIDTH_PERCENT = 0.50
-
-		const val DEFAULT_VIEW_SIZE_HEIGHT = 150
-		const val DEFAULT_VIEW_SIZE_WIDTH = 250
-	}
-}
-
-interface PieChartInterface {
-
-	fun setDataChart(list: List<Pair<Int, String>>)
-
-	fun startAnimation()
-}
-
-data class PieChartModel(
-	var percentOfCircle: Float = 0f,
-	var percentToStartAt: Float = 0f,
-	var colorOfLine: Int = 0,
-	var stroke: Float = 0f,
-	var paint: Paint = Paint(),
-	var paintRound: Boolean = true
-) {
-
-	init {
-		if (percentOfCircle < 0 || percentOfCircle > 100) {
-			percentOfCircle = 100f
-		}
-
-		percentOfCircle = 360 * percentOfCircle / 100
-
-		if (percentToStartAt < 0 || percentToStartAt > 100) {
-			percentToStartAt = 0f
-		}
-
-		percentToStartAt = 360 * percentToStartAt / 100
-
-		if (colorOfLine == 0) {
-			colorOfLine = Color.parseColor("#000000")
-		}
-
-		paint = Paint()
-		paint.color = colorOfLine
-		paint.isAntiAlias = true
-		paint.style = Paint.Style.STROKE
-		paint.strokeWidth = stroke
-		paint.isDither = true
-
-		if (paintRound) {
-			paint.strokeJoin = Paint.Join.ROUND
-			paint.strokeCap = Paint.Cap.ROUND
-			paint.pathEffect = CornerPathEffect(8f)
-		}
-	}
-}
-
-class PieChartState(
-	superSavedState: Parcelable?,
-	val dataList: List<Pair<Int, String>>
-) : View.BaseSavedState(superSavedState), Parcelable

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

@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewOutlineProvider
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
+import androidx.collection.MutableFloatList
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
@@ -25,7 +26,7 @@ class SegmentedBarView @JvmOverloads constructor(
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val segmentsData = ArrayList<Segment>()
-	private val segmentsSizes = ArrayList<Float>()
+	private val segmentsSizes = MutableFloatList()
 	private var cornerSize = 0f
 	private var scaleFactor = 1f
 	private var scaleAnimator: ValueAnimator? = null

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

@@ -22,7 +22,6 @@ import org.koitharu.kotatsu.core.util.ext.getThemeColorStateList
 import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ViewTipBinding
-import com.google.android.material.R as materialR
 
 class TipView @JvmOverloads constructor(
 	context: Context,

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

@@ -9,10 +9,8 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks
 import org.acra.ACRA
 import org.koitharu.kotatsu.core.ui.DefaultActivityLifecycleCallbacks
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
+import java.time.LocalTime
+import java.time.temporal.ChronoUnit
 import java.util.WeakHashMap
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -20,7 +18,6 @@ import javax.inject.Singleton
 @Singleton
 class AcraScreenLogger @Inject constructor() : FragmentLifecycleCallbacks(), DefaultActivityLifecycleCallbacks {
 
-	private val timeFormat = SimpleDateFormat.getTimeInstance(DateFormat.DEFAULT, Locale.ROOT)
 	private val keys = WeakHashMap<Any, String>()
 
 	override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
@@ -47,11 +44,10 @@ class AcraScreenLogger @Inject constructor() : FragmentLifecycleCallbacks(), Def
 	}
 
 	private fun Any.key() = keys.getOrPut(this) {
-		"${time()}: ${javaClass.simpleName}"
+		val time = LocalTime.now().truncatedTo(ChronoUnit.SECONDS)
+		"$time: ${javaClass.simpleName}"
 	}
 
-	private fun time() = timeFormat.format(Date())
-
 	@Suppress("DEPRECATION")
 	private fun Bundle?.contentToString() = this?.keySet()?.joinToString { k ->
 		val v = get(k)

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

@@ -1,70 +0,0 @@
-package org.koitharu.kotatsu.core.util
-
-import android.content.Context
-import android.view.GestureDetector
-import android.view.MotionEvent
-import kotlin.math.roundToInt
-
-class GridTouchHelper(
-	context: Context,
-	private val listener: OnGridTouchListener,
-) : GestureDetector.SimpleOnGestureListener() {
-
-	private val detector = GestureDetector(context, this)
-	private val width = context.resources.displayMetrics.widthPixels
-	private val height = context.resources.displayMetrics.heightPixels
-	private var isDispatching = false
-
-	init {
-		detector.setIsLongpressEnabled(true)
-		detector.setOnDoubleTapListener(this)
-	}
-
-	fun dispatchTouchEvent(event: MotionEvent) {
-		if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-			isDispatching = listener.onProcessTouch(event.rawX.toInt(), event.rawY.toInt())
-		}
-		detector.onTouchEvent(event)
-	}
-
-	override fun onSingleTapConfirmed(event: MotionEvent): Boolean {
-		if (!isDispatching) {
-			return true
-		}
-		val xIndex = (event.rawX * 2f / width).roundToInt()
-		val yIndex = (event.rawY * 2f / height).roundToInt()
-		listener.onGridTouch(
-			when (xIndex) {
-				0 -> AREA_LEFT
-				1 -> {
-					when (yIndex) {
-						0 -> AREA_TOP
-						1 -> AREA_CENTER
-						2 -> AREA_BOTTOM
-						else -> return false
-					}
-				}
-
-				2 -> AREA_RIGHT
-				else -> return false
-			},
-		)
-		return true
-	}
-
-	companion object {
-
-		const val AREA_CENTER = 1
-		const val AREA_LEFT = 2
-		const val AREA_RIGHT = 3
-		const val AREA_TOP = 4
-		const val AREA_BOTTOM = 5
-	}
-
-	interface OnGridTouchListener {
-
-		fun onGridTouch(area: Int)
-
-		fun onProcessTouch(rawX: Int, rawY: Int): Boolean
-	}
-}

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

@@ -0,0 +1,55 @@
+package org.koitharu.kotatsu.core.util
+
+import android.content.Context
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.core.graphics.ColorUtils
+import com.google.android.material.R
+import com.google.android.material.color.MaterialColors
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.parsers.model.Manga
+import kotlin.math.absoluteValue
+
+object KotatsuColors {
+
+	@ColorInt
+	fun segmentColor(context: Context, @AttrRes resId: Int): Int {
+		val colorHex = String.format("%06x", context.getThemeColor(resId))
+		val hue = getHue(colorHex)
+		val color = ColorUtils.HSLToColor(floatArrayOf(hue, 0.5f, 0.5f))
+		val backgroundColor = context.getThemeColor(R.attr.colorSurfaceContainerHigh)
+		return MaterialColors.harmonize(color, backgroundColor)
+	}
+
+	@ColorInt
+	fun random(seed: Any): Int {
+		val hue = (seed.hashCode() % 360).absoluteValue.toFloat()
+		return ColorUtils.HSLToColor(floatArrayOf(hue, 0.5f, 0.5f))
+	}
+
+	@ColorInt
+	fun ofManga(context: Context, manga: Manga?): Int {
+		val color = if (manga != null) {
+			val hue = (manga.id.absoluteValue % 360).toFloat()
+			ColorUtils.HSLToColor(floatArrayOf(hue, 0.5f, 0.5f))
+		} else {
+			context.getThemeColor(R.attr.colorSurface)
+		}
+		val backgroundColor = context.getThemeColor(R.attr.colorSurfaceContainerHigh)
+		return MaterialColors.harmonize(color, backgroundColor)
+	}
+
+	private fun getHue(hex: String): Float {
+		val r = (hex.substring(0, 2).toInt(16)).toFloat()
+		val g = (hex.substring(2, 4).toInt(16)).toFloat()
+		val b = (hex.substring(4, 6).toInt(16)).toFloat()
+
+		var hue = 0F
+		if ((r >= g) && (g >= b)) {
+			hue = 60 * (g - b) / (r - b)
+		} else if ((g > r) && (r >= b)) {
+			hue = 60 * (2 - (r - b) / (g - b))
+		}
+		return hue
+	}
+}

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

@@ -4,23 +4,20 @@ import androidx.core.os.LocaleListCompat
 import org.koitharu.kotatsu.core.util.ext.map
 import java.util.Locale
 
-class LocaleComparator : Comparator<Locale?> {
+class LocaleComparator : Comparator<Locale> {
 
 	private val deviceLocales = LocaleListCompat.getAdjustedDefault()//LocaleManagerCompat.getSystemLocales(context)
 		.map { it.language }
 		.distinct()
 
-	override fun compare(a: Locale?, b: Locale?): Int {
-		return if (a === b) {
-			0
-		} else {
-			val indexA = if (a == null) -1 else deviceLocales.indexOf(a.language)
-			val indexB = if (b == null) -1 else deviceLocales.indexOf(b.language)
-			if (indexA < 0 && indexB < 0) {
-				compareValues(a?.language, b?.language)
-			} else {
-				-2 - (indexA - indexB)
-			}
+	override fun compare(a: Locale, b: Locale): Int {
+		val indexA = deviceLocales.indexOf(a.language)
+		val indexB = deviceLocales.indexOf(b.language)
+		return when {
+			indexA < 0 && indexB < 0 -> compareValues(a.language, b.language)
+			indexA < 0 -> 1
+			indexB < 0 -> -1
+			else -> compareValues(indexA, indexB)
 		}
 	}
 }

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

@@ -21,7 +21,11 @@ class ViewBadge(
 		get() = badgeDrawable?.number ?: 0
 		set(value) {
 			val badge = badgeDrawable ?: initBadge()
-			badge.number = value
+			if (maxCharacterCount != 0) {
+				badge.number = value
+			} else {
+				badge.clearNumber()
+			}
 			badge.isVisible = value > 0
 		}
 
@@ -51,7 +55,13 @@ class ViewBadge(
 
 	fun setMaxCharacterCount(value: Int) {
 		maxCharacterCount = value
-		badgeDrawable?.maxCharacterCount = value
+		badgeDrawable?.let {
+			if (value == 0) {
+				it.clearNumber()
+			} else {
+				it.maxCharacterCount = value
+			}
+		}
 	}
 
 	private fun initBadge(): BadgeDrawable {

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.util
 
 import android.annotation.SuppressLint
-import androidx.lifecycle.asFlow
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.WorkQuery
@@ -27,8 +26,7 @@ class WorkServiceStopHelper(
 	fun setup() {
 		processLifecycleScope.launch(Dispatchers.Default) {
 			workManagerProvider.get()
-				.getWorkInfosLiveData(WorkQuery.fromStates(WorkInfo.State.RUNNING))
-				.asFlow()
+				.getWorkInfosFlow(WorkQuery.fromStates(WorkInfo.State.RUNNING))
 				.map { it.isEmpty() }
 				.distinctUntilChanged()
 				.collectLatest {

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

@@ -17,6 +17,7 @@ import android.content.SyncResult
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.database.SQLException
+import android.graphics.Bitmap
 import android.graphics.Color
 import android.net.Uri
 import android.os.Build
@@ -26,9 +27,9 @@ import android.provider.Settings
 import android.view.View
 import android.view.ViewPropertyAnimator
 import android.view.Window
-import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IntegerRes
+import androidx.annotation.WorkerThread
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
@@ -37,6 +38,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
 import androidx.work.CoroutineWorker
 import com.google.android.material.elevation.ElevationOverlayProvider
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.delay
@@ -45,7 +47,9 @@ import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
 import okio.IOException
+import okio.use
 import org.json.JSONException
 import org.jsoup.internal.StringUtil.StringJoiner
 import org.koitharu.kotatsu.BuildConfig
@@ -53,6 +57,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.xmlpull.v1.XmlPullParser
 import org.xmlpull.v1.XmlPullParserException
+import java.io.File
 import kotlin.math.roundToLong
 
 val Context.activityManager: ActivityManager?
@@ -130,7 +135,7 @@ fun Window.setNavigationBarTransparentCompat(context: Context, elevation: Float,
 	} else {
 		// Set navbar scrim 70% of navigationBarColor
 		ElevationOverlayProvider(context).compositeOverlayIfNeeded(
-			context.getThemeColor(android.R.attr.navigationBarColor, alphaFactor),
+			context.getThemeColor(R.attr.m3ColorBottomMenuBackground, alphaFactor),
 			elevation,
 		)
 	}
@@ -210,23 +215,23 @@ fun Context.findActivity(): Activity? = when (this) {
 	else -> null
 }
 
-inline fun Activity.catchingWebViewUnavailability(block: () -> Unit): Boolean {
-	return try {
-		block()
-		true
-	} catch (e: Exception) {
-		if (e.isWebViewUnavailable()) {
-			Toast.makeText(this, R.string.web_view_unavailable, Toast.LENGTH_LONG).show()
-			finishAfterTransition()
-			false
-		} else {
-			throw e
-		}
-	}
-}
-
 fun Context.checkNotificationPermission(): Boolean = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
 	ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
 } else {
 	NotificationManagerCompat.from(this).areNotificationsEnabled()
 }
+
+@WorkerThread
+suspend fun Bitmap.compressToPNG(output: File) = runInterruptible(Dispatchers.IO) {
+	output.outputStream().use { os ->
+		if (!compress(Bitmap.CompressFormat.PNG, 100, os)) {
+			throw IOException("Failed to encode bitmap into PNG format")
+		}
+	}
+}
+
+fun Context.ensureRamAtLeast(requiredSize: Long) {
+	if (ramAvailable < requiredSize) {
+		throw IllegalStateException("Not enough free memory")
+	}
+}

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

@@ -24,11 +24,15 @@ inline fun <reified T : Parcelable> Intent.getParcelableExtraCompat(key: String)
 }
 
 inline fun <reified T : Serializable> Intent.getSerializableExtraCompat(key: String): T? {
-	return getSerializableExtra(key) as T?
+	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+		getSerializableExtra(key, T::class.java)
+	} else {
+		getSerializableExtra(key) as T?
+	}
 }
 
 inline fun <reified T : Serializable> Bundle.getSerializableCompat(key: String): T? {
-	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
 		getSerializable(key, T::class.java)
 	} else {
 		getSerializable(key) as T?

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

@@ -25,7 +25,7 @@ fun ImageView.newImageRequest(lifecycleOwner: LifecycleOwner, data: Any?): Image
 	}
 	// disposeImageRequest()
 	return ImageRequest.Builder(context)
-		.data(data)
+		.data(data?.takeUnless { it == "" })
 		.lifecycle(lifecycleOwner)
 		.crossfade(context)
 		.target(this)

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

@@ -50,7 +50,7 @@ private fun getVolumePathBeforeAndroid11(volumeId: String, context: Context): St
 	val length = ArrayReflect.getLength(checkNotNull(result))
 	(0 until length).firstNotNullOfOrNull { i ->
 		val storageVolumeElement = ArrayReflect.get(result, i)
-		val uuid = getUuid.invoke(storageVolumeElement) as String
+		val uuid = getUuid.invoke(storageVolumeElement) as String?
 		val primary = isPrimary.invoke(storageVolumeElement) as Boolean
 		when {
 			primary && volumeId == PRIMARY_VOLUME_NAME -> getPath.invoke(storageVolumeElement) as String

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

@@ -1,30 +1,32 @@
 package org.koitharu.kotatsu.core.util.ext
 
-import android.annotation.SuppressLint
-import android.text.format.DateUtils
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.TimeUnit
+import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
+import java.time.Instant
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.temporal.ChronoUnit
 
-@SuppressLint("SimpleDateFormat")
-fun Date.format(pattern: String): String = SimpleDateFormat(pattern).format(this)
+fun calculateTimeAgo(instant: Instant, showMonths: Boolean = false): DateTimeAgo {
+	// TODO: Use Java 9's LocalDate.ofInstant().
+	val localDate = LocalDateTime.ofInstant(instant, ZoneId.systemDefault()).toLocalDate()
+	val now = LocalDate.now()
+	val diffDays = localDate.until(now, ChronoUnit.DAYS)
 
-fun Date.formatRelative(minResolution: Long): CharSequence = DateUtils.getRelativeTimeSpanString(
-	time, System.currentTimeMillis(), minResolution,
-)
-
-fun Date.daysDiff(other: Long): Int {
-	val thisDay = time / TimeUnit.DAYS.toMillis(1L)
-	val otherDay = other / TimeUnit.DAYS.toMillis(1L)
-	return (thisDay - otherDay).toInt()
-}
-
-fun Date.startOfDay(): Long {
-	val calendar = Calendar.getInstance()
-	calendar.time = this
-	calendar[Calendar.HOUR_OF_DAY] = 0
-	calendar[Calendar.MINUTE] = 0
-	calendar[Calendar.SECOND] = 0
-	calendar[Calendar.MILLISECOND] = 0
-	return calendar.timeInMillis
+	return when {
+		diffDays == 0L -> {
+			if (instant.until(Instant.now(), ChronoUnit.MINUTES) < 3) DateTimeAgo.JustNow
+			else DateTimeAgo.Today
+		}
+		diffDays == 1L -> DateTimeAgo.Yesterday
+		diffDays < 6 -> DateTimeAgo.DaysAgo(diffDays.toInt())
+		else -> {
+			val diffMonths = localDate.until(now, ChronoUnit.MONTHS)
+			if (showMonths && diffMonths <= 6) {
+				DateTimeAgo.MonthsAgo(diffMonths.toInt())
+			} else {
+				DateTimeAgo.Absolute(localDate)
+			}
+		}
+	}
 }

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

@@ -19,6 +19,7 @@ import java.nio.file.attribute.BasicFileAttributes
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.PathWalkOption
 import kotlin.io.path.readAttributes
 import kotlin.io.path.walk
 
@@ -72,7 +73,7 @@ fun ContentResolver.resolveName(uri: Uri): String? {
 }
 
 suspend fun File.computeSize(): Long = runInterruptible(Dispatchers.IO) {
-	walkCompat().sumOf { it.length() }
+	walkCompat(includeDirectories = false).sumOf { it.length() }
 }
 
 fun File.children() = FileSequence(this)
@@ -87,10 +88,16 @@ val File.creationTime
 	}
 
 @OptIn(ExperimentalPathApi::class)
-fun File.walkCompat() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+fun File.walkCompat(includeDirectories: Boolean): Sequence<File> = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 	// Use lazy loading on Android 8.0 and later
-	toPath().walk().map { it.toFile() }
+	val walk = if (includeDirectories) {
+		toPath().walk(PathWalkOption.INCLUDE_DIRECTORIES)
+	} else {
+		toPath().walk()
+	}
+	walk.map { it.toFile() }
 } else {
 	// Directories are excluded by default in Path.walk(), so do it here as well
-	walk().filter { it.isFile }
+	val walk = walk()
+	if (includeDirectories) walk else walk.filter { it.isFile }
 }

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

@@ -11,8 +11,10 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.flow.transformLatest
 import org.koitharu.kotatsu.R
+import java.util.concurrent.atomic.AtomicInteger
 
 fun <T> Flow<T>.onFirst(action: suspend (T) -> Unit): Flow<T> {
 	var isFirstCall = true
@@ -37,6 +39,14 @@ fun <T> Flow<T>.onEachWhile(action: suspend (T) -> Boolean): Flow<T> {
 	}
 }
 
+fun <T> Flow<T>.onEachIndexed(action: suspend (index: Int, T) -> Unit): Flow<T> {
+	val counter = AtomicInteger(0)
+	return transform { value ->
+		action(counter.getAndIncrement(), value)
+		return@transform emit(value)
+	}
+}
+
 inline fun <T, R> Flow<List<T>>.mapItems(crossinline transform: (T) -> R): Flow<List<R>> {
 	return map { list -> list.map(transform) }
 }

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

@@ -20,12 +20,13 @@ inline fun <T> LocaleListCompat.mapToSet(block: (Locale) -> T): Set<T> {
 
 fun LocaleListCompat.getOrThrow(index: Int) = get(index) ?: throw NoSuchElementException()
 
-fun String?.getLocaleDisplayName(context: Context): String {
+fun String.toLocale() = Locale(this)
+
+fun Locale?.getDisplayName(context: Context): String {
 	if (this == null) {
 		return context.getString(R.string.various_languages)
 	}
-	val lc = Locale(this)
-	return lc.getDisplayLanguage(lc).toTitleCase(lc)
+	return getDisplayLanguage(this).toTitleCase(this)
 }
 
 private class LocaleListCompatIterator(private val list: LocaleListCompat) : ListIterator<Locale> {

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

@@ -3,18 +3,18 @@ package org.koitharu.kotatsu.core.util.ext
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Resources
-import android.util.TypedValue
 import androidx.annotation.Px
+import androidx.core.util.TypedValueCompat
 import kotlin.math.roundToInt
 
 @Px
-fun Resources.resolveDp(dp: Int) = (dp * displayMetrics.density).roundToInt()
+fun Resources.resolveDp(dp: Int) = resolveDp(dp.toFloat()).roundToInt()
 
 @Px
-fun Resources.resolveDp(dp: Float) = dp * displayMetrics.density
+fun Resources.resolveDp(dp: Float) = TypedValueCompat.dpToPx(dp, displayMetrics)
 
 @Px
-fun Resources.resolveSp(sp: Float) = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, displayMetrics)
+fun Resources.resolveSp(sp: Float) = TypedValueCompat.spToPx(sp, displayMetrics)
 
 @SuppressLint("DiscouragedApi")
 fun Context.getSystemBoolean(resName: String, fallback: Boolean): Boolean {

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

@@ -8,9 +8,11 @@ import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
 import androidx.annotation.Px
+import androidx.annotation.StyleRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.use
 import androidx.core.graphics.ColorUtils
+import com.google.android.material.R as materialR
 
 fun Context.getThemeDrawable(
 	@AttrRes resId: Int,
@@ -75,3 +77,7 @@ fun TypedArray.getDrawableCompat(context: Context, index: Int): Drawable? {
 	val resId = getResourceId(index, 0)
 	return if (resId != 0) ContextCompat.getDrawable(context, resId) else null
 }
+
+@get:StyleRes
+val DIALOG_THEME_CENTERED: Int
+	inline get() = materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered

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

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.core.util.ext
 
 import android.content.ActivityNotFoundException
 import android.content.res.Resources
-import android.util.AndroidRuntimeException
 import androidx.annotation.DrawableRes
 import androidx.collection.arraySetOf
 import coil.network.HttpException
@@ -19,6 +18,11 @@ import org.koitharu.kotatsu.core.exceptions.SyncApiException
 import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
+import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_BOTH_LOCALE_GENRES_NOT_SUPPORTED
+import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_BOTH_STATES_GENRES_NOT_SUPPORTED
+import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_MULTIPLE_GENRES_NOT_SUPPORTED
+import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_MULTIPLE_STATES_NOT_SUPPORTED
+import org.koitharu.kotatsu.parsers.ErrorMessages.SEARCH_NOT_SUPPORTED
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.ContentUnavailableException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
@@ -28,9 +32,6 @@ import java.net.UnknownHostException
 
 private const val MSG_NO_SPACE_LEFT = "No space left on device"
 private const val IMAGE_FORMAT_NOT_SUPPORTED = "Image format not supported"
-private const val MULTIPLE_GENRES_NOT_SUPPORTED = "Multiple genres are not supported by this source"
-private const val MULTIPLE_STATES_NOT_SUPPORTED = "Multiple states are not supported by this source"
-private const val SEARCH_NOT_SUPPORTED = "Search is not supported by this source"
 
 fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is AuthRequiredException -> resources.getString(R.string.auth_required)
@@ -85,9 +86,11 @@ private fun getDisplayMessage(msg: String?, resources: Resources): String? = whe
 	msg.isNullOrEmpty() -> null
 	msg.contains(MSG_NO_SPACE_LEFT) -> resources.getString(R.string.error_no_space_left)
 	msg.contains(IMAGE_FORMAT_NOT_SUPPORTED) -> resources.getString(R.string.error_corrupted_file)
-	msg == MULTIPLE_GENRES_NOT_SUPPORTED -> resources.getString(R.string.error_multiple_genres_not_supported)
-	msg == MULTIPLE_STATES_NOT_SUPPORTED -> resources.getString(R.string.error_multiple_states_not_supported)
+	msg == FILTER_MULTIPLE_GENRES_NOT_SUPPORTED -> resources.getString(R.string.error_multiple_genres_not_supported)
+	msg == FILTER_MULTIPLE_STATES_NOT_SUPPORTED -> resources.getString(R.string.error_multiple_states_not_supported)
 	msg == SEARCH_NOT_SUPPORTED -> resources.getString(R.string.error_search_not_supported)
+	msg == FILTER_BOTH_LOCALE_GENRES_NOT_SUPPORTED -> resources.getString(R.string.error_filter_locale_genre_not_supported)
+	msg == FILTER_BOTH_STATES_GENRES_NOT_SUPPORTED -> resources.getString(R.string.error_filter_states_genre_not_supported)
 	else -> null
 }
 
@@ -111,8 +114,8 @@ private val reportableExceptions = arraySetOf<Class<*>>(
 )
 
 fun Throwable.isWebViewUnavailable(): Boolean {
-	return (this is AndroidRuntimeException && message?.contains("WebView") == true) ||
-		cause?.isWebViewUnavailable() == true
+	val trace = stackTraceToString()
+	return trace.contains("android.webkit.WebView.<init>")
 }
 
 @Suppress("FunctionName")

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

@@ -1,32 +1,33 @@
 package org.koitharu.kotatsu.core.util.ext
 
-import android.app.Activity
 import android.graphics.Rect
 import android.os.Build
 import android.view.View
 import android.view.View.MeasureSpec
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
 import android.widget.Checkable
+import androidx.appcompat.widget.ActionMenuView
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.SoftwareKeyboardControllerCompat
 import androidx.core.view.children
 import androidx.core.view.descendants
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import com.google.android.material.slider.Slider
 import com.google.android.material.tabs.TabLayout
 import kotlin.math.roundToInt
 
 fun View.hideKeyboard() {
-	val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-	imm.hideSoftInputFromWindow(this.windowToken, 0)
+	SoftwareKeyboardControllerCompat(this).hide()
 }
 
 fun View.showKeyboard() {
-	val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-	imm.showSoftInput(this, 0)
+	SoftwareKeyboardControllerCompat(this).show()
 }
 
 fun View.hasGlobalPoint(x: Int, y: Int): Boolean {
@@ -104,6 +105,7 @@ fun RecyclerView.invalidateNestedItemDecorations() {
 val View.parentView: ViewGroup?
 	get() = parent as? ViewGroup
 
+@Suppress("UnusedReceiverParameter")
 fun View.measureDimension(desiredSize: Int, measureSpec: Int): Int {
 	var result: Int
 	val specMode = MeasureSpec.getMode(measureSpec)
@@ -152,3 +154,18 @@ fun View.setOnContextClickListenerCompat(listener: View.OnLongClickListener) {
 		setOnContextClickListener(listener::onLongClick)
 	}
 }
+
+val Toolbar.menuView: ActionMenuView?
+	get() {
+		menu // to call ensureMenu()
+		return children.firstNotNullOfOrNull { it as? ActionMenuView }
+	}
+
+fun MaterialButton.setProgressIcon() {
+	val progressDrawable = CircularProgressDrawable(context)
+	progressDrawable.strokeWidth = resources.resolveDp(2f)
+	progressDrawable.setColorSchemeColors(currentTextColor)
+	progressDrawable.setTintList(textColors)
+	icon = progressDrawable
+	progressDrawable.start()
+}

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

@@ -1,12 +1,14 @@
 package org.koitharu.kotatsu.core.util.ext
 
 import android.annotation.SuppressLint
+import androidx.work.Data
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.WorkQuery
 import androidx.work.WorkRequest
 import androidx.work.await
 import androidx.work.impl.WorkManagerImpl
+import androidx.work.impl.model.WorkSpec
 import java.util.UUID
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -69,5 +71,24 @@ suspend fun WorkManager.awaitUpdateWork(request: WorkRequest): WorkManager.Updat
 	return updateWork(request).await()
 }
 
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.getWorkSpec(id: UUID): WorkSpec? = suspendCoroutine { cont ->
+	workManagerImpl.workTaskExecutor.executeOnTaskThread {
+		try {
+			val spec = workManagerImpl.workDatabase.workSpecDao().getWorkSpec(id.toString())
+			cont.resume(spec)
+		} catch (e: Exception) {
+			cont.resumeWithException(e)
+		}
+	}
+}
+
+
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.getWorkInputData(id: UUID): Data? = getWorkSpec(id)?.input
+
+val Data.isEmpty: Boolean
+	get() = this == Data.EMPTY
+
 private val WorkManager.workManagerImpl
 	@SuppressLint("RestrictedApi") inline get() = this as WorkManagerImpl

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

@@ -1,26 +0,0 @@
-package org.koitharu.kotatsu.core.util.progress
-
-import androidx.annotation.AnyThread
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.StateFlow
-import org.koitharu.kotatsu.download.ui.worker.PausingHandle
-
-class PausingProgressJob<P>(
-	job: Job,
-	progress: StateFlow<P>,
-	private val pausingHandle: PausingHandle,
-) : ProgressJob<P>(job, progress) {
-
-	@get:AnyThread
-	val isPaused: Boolean
-		get() = pausingHandle.isPaused
-
-	@AnyThread
-	suspend fun awaitResumed() = pausingHandle.awaitResumed()
-
-	@AnyThread
-	fun pause() = pausingHandle.pause()
-
-	@AnyThread
-	fun resume() = pausingHandle.resume()
-}

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

@@ -1,16 +0,0 @@
-package org.koitharu.kotatsu.core.util.progress
-
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-
-open class ProgressJob<P>(
-	private val job: Job,
-	private val progress: StateFlow<P>,
-) : Job by job {
-
-	val progressValue: P
-		get() = progress.value
-
-	fun progressAsFlow(): Flow<P> = progress
-}

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

@@ -1,6 +1,8 @@
 package org.koitharu.kotatsu.core.util.progress
 
 import android.os.SystemClock
+import androidx.collection.IntList
+import androidx.collection.MutableIntList
 import java.util.concurrent.TimeUnit
 import kotlin.math.roundToInt
 import kotlin.math.roundToLong
@@ -10,7 +12,7 @@ private const val NO_TIME = -1L
 
 class TimeLeftEstimator {
 
-	private var times = ArrayList<Int>()
+	private var times = MutableIntList()
 	private var lastTick: Tick? = null
 	private val tooLargeTime = TimeUnit.DAYS.toMillis(1)
 
@@ -50,6 +52,15 @@ class TimeLeftEstimator {
 		return if (etl == NO_TIME) NO_TIME else System.currentTimeMillis() + etl
 	}
 
+	private fun IntList.average(): Double {
+		if (isEmpty()) {
+			return 0.0
+		}
+		var acc = 0L
+		forEach { acc += it }
+		return acc / size.toDouble()
+	}
+
 	private class Tick(
 		@JvmField val value: Int,
 		@JvmField val total: Int,

app/src/main/kotlin/org/koitharu/kotatsu/details/data/MangaDetails.kt

@@ -21,8 +21,7 @@ data class MangaDetails(
 	val branches: Set<String?>
 		get() = chapters.keys
 
-	val allChapters: List<MangaChapter>
-		get() = manga.chapters.orEmpty()
+	val allChapters: List<MangaChapter> by lazy { mergeChapters() }
 
 	val isLocal
 		get() = manga.isLocal
@@ -40,4 +39,26 @@ data class MangaDetails(
 		description = description,
 		isLoaded = isLoaded,
 	)
+
+	private fun mergeChapters(): List<MangaChapter> {
+		val chapters = manga.chapters
+		val localChapters = local?.manga?.chapters.orEmpty()
+		if (chapters.isNullOrEmpty()) {
+			return localChapters
+		}
+		val localMap = if (localChapters.isNotEmpty()) {
+			localChapters.associateByTo(LinkedHashMap(localChapters.size)) { it.id }
+		} else {
+			null
+		}
+		val result = ArrayList<MangaChapter>(chapters.size)
+		for (chapter in chapters) {
+			val local = localMap?.remove(chapter.id)
+			result += local ?: chapter
+		}
+		if (!localMap.isNullOrEmpty()) {
+			result.addAll(localMap.values)
+		}
+		return result
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/details/data/ReadingTime.kt

@@ -0,0 +1,22 @@
+package org.koitharu.kotatsu.details.data
+
+import android.content.res.Resources
+import org.koitharu.kotatsu.R
+
+data class ReadingTime(
+	val minutes: Int,
+	val hours: Int,
+	val isContinue: Boolean,
+) {
+
+	fun format(resources: Resources): String = when {
+		hours == 0 && minutes == 0 -> resources.getString(R.string.less_than_minute)
+		hours == 0 -> resources.getQuantityString(R.plurals.minutes, minutes, minutes)
+		minutes == 0 -> resources.getQuantityString(R.plurals.hours, hours, hours)
+		else -> resources.getString(
+			R.string.remaining_time_pattern,
+			resources.getQuantityString(R.plurals.hours, hours, hours),
+			resources.getQuantityString(R.plurals.minutes, minutes, minutes),
+		)
+	}
+}