Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (554 of 554 strings)

Co-authored-by: Zero O <godarms2010@live.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/zh_Hans/
Translation: Kotatsu/Strings

.idea/gradle.xml

@@ -4,8 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

CONTRIBUTING.md

@@ -1,12 +1,11 @@
 ## Kotatsu contribution guidelines
 
-+ 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).
+- 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).
 
-**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.
+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.

LICENSE

@@ -619,3 +619,56 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

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, Kitsu
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
 * Password/fingerprint protect access to the app
 * History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 631
-		versionName = '6.8.1'
+		versionCode = 612
+		versionName = '6.6.1'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,31 +82,29 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:9821e93d25') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:0e8579017b') {
 		exclude group: 'org.json', module: 'json'
 	}
 
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.12.0'
 	implementation 'androidx.activity:activity-ktx:1.8.2'
 	implementation 'androidx.fragment:fragment-ktx:1.6.2'
-	implementation 'androidx.collection:collection-ktx: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.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
 	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.12.0-beta01'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
-	implementation 'androidx.webkit:webkit:1.10.0'
+	implementation 'com.google.android.material:material:1.11.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
 
 	implementation 'androidx.work:work-runtime:2.9.0'
 	//noinspection GradleDependency
@@ -122,18 +120,18 @@ dependencies {
 
 	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
-	implementation 'com.squareup.okio:okio:3.9.0'
+	implementation 'com.squareup.okio:okio:3.7.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.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 'com.google.dagger:hilt-android:2.50'
+	kapt 'com.google.dagger:hilt-compiler:2.50'
+	implementation 'androidx.hilt:hilt-work:1.1.0'
+	kapt 'androidx.hilt:hilt-compiler:1.1.0'
 
-	implementation 'io.coil-kt:coil-base:2.6.0'
-	implementation 'io.coil-kt:coil-svg:2.6.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:02e6d6cfe9'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
@@ -143,24 +141,22 @@ dependencies {
 	compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
 	ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.1.0'
 
-	implementation 'org.conscrypt:conscrypt-android:2.5.2'
-
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20240303'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
+	testImplementation 'org.json:json:20231013'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
 	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.8.0'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
 	androidTestImplementation 'androidx.room:room-testing:2.6.1'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.1'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.51'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.50'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.50'
 }

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

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

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

@@ -7,9 +7,7 @@ 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.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
+import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -63,7 +61,6 @@ 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()
+			// .detectWrongFragmentContainer() FIXME: migrate to ViewPager2
 			.detectRetainInstanceUsage()
 			.detectSetUserVisibleHint()
 			.detectFragmentTagUsage()

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

@@ -10,8 +10,6 @@ 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
@@ -42,7 +40,7 @@ class CurlLoggingInterceptor(
 		if (isCompressed) {
 			curlCmd.append(" --compressed")
 		}
-		curlCmd.append(" \"").append(request.url.toString().escape()).append('"')
+		curlCmd.append(" \"").append(request.url).append('"')
 
 		log("---cURL (" + request.url + ")")
 		log(curlCmd.toString())
@@ -50,12 +48,7 @@ class CurlLoggingInterceptor(
 		return chain.proceed(request)
 	}
 
-	private fun String.escape() = replace(escapeRegex) { match ->
-		"\\" + match.value
-	}
-		// .replace("\"", "\\\"")
-		// .replace("[", "\\[")
-		// .replace("]", "\\]")
+	private fun String.escape() = replace("\"", "\\\"")
 
 	private fun log(msg: String) {
 		Log.d("CURL", msg)

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.core.parser
 
-import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.config.ConfigKey
@@ -19,20 +18,24 @@ import java.util.EnumSet
 class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("localhost")
+		get() = ConfigKey.Domain("")
 
 	override val availableSortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)
 
-	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
+	override suspend fun getDetails(manga: Manga): Manga {
+		TODO("Not yet implemented")
+	}
 
-	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = stub(null)
+	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> {
+		TODO("Not yet implemented")
+	}
 
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = stub(null)
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		TODO("Not yet implemented")
+	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> = stub(null)
-
-	private fun stub(manga: Manga?): Nothing {
-		throw UnsupportedSourceException("Usage of Dummy parser", manga)
+	override suspend fun getAvailableTags(): Set<MangaTag> {
+		TODO("Not yet implemented")
 	}
 }

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

@@ -1,85 +0,0 @@
-package org.koitharu.kotatsu.alternatives.domain
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Semaphore
-import kotlinx.coroutines.sync.withPermit
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.util.ext.almostEquals
-import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import javax.inject.Inject
-
-private const val MAX_PARALLELISM = 4
-private const val MATCH_THRESHOLD = 0.2f
-
-class AlternativesUseCase @Inject constructor(
-	private val sourcesRepository: MangaSourcesRepository,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-) {
-
-	suspend operator fun invoke(manga: Manga): Flow<Manga> {
-		val sources = getSources(manga.source)
-		if (sources.isEmpty()) {
-			return emptyFlow()
-		}
-		val semaphore = Semaphore(MAX_PARALLELISM)
-		return channelFlow {
-			for (source in sources) {
-				val repository = mangaRepositoryFactory.create(source)
-				if (!repository.isSearchSupported) {
-					continue
-				}
-				launch {
-					val list = runCatchingCancellable {
-						semaphore.withPermit {
-							repository.getList(offset = 0, filter = MangaListFilter.Search(manga.title))
-						}
-					}.getOrDefault(emptyList())
-					for (item in list) {
-						if (item.matches(manga)) {
-							send(item)
-						}
-					}
-				}
-			}
-		}.map {
-			runCatchingCancellable {
-				mangaRepositoryFactory.create(it.source).getDetails(it)
-			}.getOrDefault(it)
-		}
-	}
-
-	private suspend fun getSources(ref: MangaSource): List<MangaSource> {
-		val result = ArrayList<MangaSource>(MangaSource.entries.size - 2)
-		result.addAll(sourcesRepository.getEnabledSources())
-		result.sortByDescending { it.priority(ref) }
-		result.addAll(sourcesRepository.getDisabledSources().sortedByDescending { it.priority(ref) })
-		return result
-	}
-
-	private fun Manga.matches(ref: Manga): Boolean {
-		return matchesTitles(title, ref.title) ||
-			matchesTitles(title, ref.altTitle) ||
-			matchesTitles(altTitle, ref.title) ||
-			matchesTitles(altTitle, ref.altTitle)
-
-	}
-
-	private fun matchesTitles(a: String?, b: String?): Boolean {
-		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, MATCH_THRESHOLD)
-	}
-
-	private fun MangaSource.priority(ref: MangaSource): Int {
-		var res = 0
-		if (locale == ref.locale) res += 2
-		if (contentType == ref.contentType) res++
-		return res
-	}
-}

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

@@ -1,129 +0,0 @@
-package org.koitharu.kotatsu.alternatives.domain
-
-import androidx.room.withTransaction
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.model.getPreferredBranch
-import org.koitharu.kotatsu.core.parser.MangaDataRepository
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.details.domain.ProgressUpdateUseCase
-import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.history.data.PROGRESS_NONE
-import org.koitharu.kotatsu.history.data.toMangaHistory
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import javax.inject.Inject
-
-class MigrateUseCase @Inject constructor(
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-	private val mangaDataRepository: MangaDataRepository,
-	private val database: MangaDatabase,
-	private val progressUpdateUseCase: ProgressUpdateUseCase,
-) {
-
-	suspend operator fun invoke(oldManga: Manga, newManga: Manga) {
-		val oldDetails = if (oldManga.chapters.isNullOrEmpty()) {
-			runCatchingCancellable {
-				mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
-			}.getOrDefault(oldManga)
-		} else {
-			oldManga
-		}
-		val newDetails = if (newManga.chapters.isNullOrEmpty()) {
-			mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
-		} else {
-			newManga
-		}
-		mangaDataRepository.storeManga(newDetails)
-		database.withTransaction {
-			// replace favorites
-			val favoritesDao = database.getFavouritesDao()
-			val oldFavourites = favoritesDao.findAllRaw(oldDetails.id)
-			if (oldFavourites.isNotEmpty()) {
-				favoritesDao.delete(oldManga.id)
-				for (f in oldFavourites) {
-					val e = f.copy(
-						mangaId = newManga.id,
-					)
-					favoritesDao.upsert(e)
-				}
-			}
-			// replace history
-			val historyDao = database.getHistoryDao()
-			val oldHistory = historyDao.find(oldDetails.id)
-			if (oldHistory != null) {
-				val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
-				historyDao.delete(oldDetails.id)
-				historyDao.upsert(newHistory)
-			}
-		}
-		progressUpdateUseCase(newManga)
-	}
-
-	private fun makeNewHistory(
-		oldManga: Manga,
-		newManga: Manga,
-		history: HistoryEntity,
-	): HistoryEntity {
-		if (oldManga.chapters.isNullOrEmpty()) { // probably broken manga/source
-			val branch = newManga.getPreferredBranch(null)
-			val chapters = checkNotNull(newManga.getChapters(branch))
-			val currentChapter = if (history.percent in 0f..1f) {
-				chapters[(chapters.lastIndex * history.percent).toInt()]
-			} else {
-				chapters.first()
-			}
-			return HistoryEntity(
-				mangaId = newManga.id,
-				createdAt = history.createdAt,
-				updatedAt = System.currentTimeMillis(),
-				chapterId = currentChapter.id,
-				page = history.page,
-				scroll = history.scroll,
-				percent = history.percent,
-				deletedAt = 0,
-				chaptersCount = chapters.size,
-			)
-		}
-		val branch = oldManga.getPreferredBranch(history.toMangaHistory())
-		val oldChapters = checkNotNull(oldManga.getChapters(branch))
-		var index = oldChapters.indexOfFirst { it.id == history.chapterId }
-		if (index < 0) {
-			index = if (history.percent in 0f..1f) {
-				(oldChapters.lastIndex * history.percent).toInt()
-			} else {
-				0
-			}
-		}
-		val newChapters = checkNotNull(newManga.chapters).groupBy { it.branch }
-		val newBranch = if (newChapters.containsKey(branch)) {
-			branch
-		} else {
-			newManga.getPreferredBranch(null)
-		}
-		val newChapterId = checkNotNull(newChapters[newBranch]).let {
-			val oldChapter = oldChapters[index]
-			it.findByNumber(oldChapter.volume, oldChapter.number) ?: it.getOrNull(index) ?: it.last()
-		}.id
-
-		return HistoryEntity(
-			mangaId = newManga.id,
-			createdAt = history.createdAt,
-			updatedAt = System.currentTimeMillis(),
-			chapterId = newChapterId,
-			page = history.page,
-			scroll = history.scroll,
-			percent = PROGRESS_NONE,
-			deletedAt = 0,
-			chaptersCount = checkNotNull(newChapters[newBranch]).size,
-		)
-	}
-
-	private fun List<MangaChapter>.findByNumber(volume: Int, number: Float): MangaChapter? {
-		return if (number <= 0f) {
-			null
-		} else {
-			firstOrNull { it.volume == volume && it.number == number }
-		}
-	}
-}

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

@@ -1,92 +0,0 @@
-package org.koitharu.kotatsu.alternatives.ui
-
-import android.text.style.ForegroundColorSpan
-import androidx.core.content.ContextCompat
-import androidx.core.text.buildSpannedString
-import androidx.core.text.inSpans
-import androidx.lifecycle.LifecycleOwner
-import coil.ImageLoader
-import coil.request.ImageRequest
-import coil.transform.CircleCropTransformation
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.parser.favicon.faviconUri
-import org.koitharu.kotatsu.core.ui.image.ChipIconTarget
-import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
-import org.koitharu.kotatsu.core.ui.image.TrimTransformation
-import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.core.util.ext.source
-import org.koitharu.kotatsu.databinding.ItemMangaAlternativeBinding
-import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import kotlin.math.sign
-import com.google.android.material.R as materialR
-
-fun alternativeAD(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	listener: OnListItemClickListener<MangaAlternativeModel>,
-) = adapterDelegateViewBinding<MangaAlternativeModel, ListModel, ItemMangaAlternativeBinding>(
-	{ inflater, parent -> ItemMangaAlternativeBinding.inflate(inflater, parent, false) },
-) {
-
-	val colorGreen = ContextCompat.getColor(context, R.color.common_green)
-	val colorRed = ContextCompat.getColor(context, R.color.common_red)
-	val clickListener = AdapterDelegateClickListenerAdapter(this, listener)
-	itemView.setOnClickListener(clickListener)
-	binding.buttonMigrate.setOnClickListener(clickListener)
-	binding.chipSource.setOnClickListener(clickListener)
-
-	bind { payloads ->
-		binding.textViewTitle.text = item.manga.title
-		binding.textViewSubtitle.text = buildSpannedString {
-			if (item.chaptersCount > 0) {
-				append(context.resources.getQuantityString(R.plurals.chapters, item.chaptersCount, item.chaptersCount))
-			} else {
-				append(context.getString(R.string.no_chapters))
-			}
-			when (item.chaptersDiff.sign) {
-				-1 -> inSpans(ForegroundColorSpan(colorRed)) {
-					append("  ▼ ")
-					append(item.chaptersDiff.toString())
-				}
-
-				1 -> inSpans(ForegroundColorSpan(colorGreen)) {
-					append("  ▲ +")
-					append(item.chaptersDiff.toString())
-				}
-			}
-		}
-		binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
-		binding.chipSource.also { chip ->
-			chip.text = item.manga.source.title
-			ImageRequest.Builder(context)
-				.data(item.manga.source.faviconUri())
-				.lifecycle(lifecycleOwner)
-				.crossfade(false)
-				.size(context.resources.getDimensionPixelSize(materialR.dimen.m3_chip_icon_size))
-				.target(ChipIconTarget(chip))
-				.placeholder(R.drawable.ic_web)
-				.fallback(R.drawable.ic_web)
-				.error(R.drawable.ic_web)
-				.source(item.manga.source)
-				.transformations(CircleCropTransformation())
-				.allowRgb565(true)
-				.enqueueWith(coil)
-		}
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
-			size(CoverSizeResolver(binding.imageViewCover))
-			placeholder(R.drawable.ic_placeholder)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
-			transformations(TrimTransformation())
-			allowRgb565(true)
-			tag(item.manga)
-			source(item.manga.source)
-			enqueueWith(coil)
-		}
-	}
-}

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

@@ -1,114 +0,0 @@
-package org.koitharu.kotatsu.alternatives.ui
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.core.graphics.Insets
-import androidx.core.view.updatePadding
-import coil.ImageLoader
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.parser.MangaIntent
-import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.DIALOG_THEME_CENTERED
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.databinding.ActivityAlternativesBinding
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
-import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
-import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
-import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
-import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.search.ui.SearchActivity
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
-	OnListItemClickListener<MangaAlternativeModel> {
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	private val viewModel by viewModels<AlternativesViewModel>()
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(ActivityAlternativesBinding.inflate(layoutInflater))
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(true)
-			subtitle = viewModel.manga.title
-		}
-		val listAdapter = BaseListAdapter<ListModel>()
-			.addDelegate(ListItemType.MANGA_LIST_DETAILED, alternativeAD(coil, this, this))
-			.addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, this, null))
-			.addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
-			.addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
-		with(viewBinding.recyclerView) {
-			setHasFixedSize(true)
-			addItemDecoration(TypedListSpacingDecoration(context, addHorizontalPadding = false))
-			adapter = listAdapter
-		}
-
-		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
-		viewModel.content.observe(this, listAdapter)
-		viewModel.onMigrated.observeEvent(this) {
-			Toast.makeText(this, R.string.migration_completed, Toast.LENGTH_SHORT).show()
-			startActivity(DetailsActivity.newIntent(this, it))
-			finishAfterTransition()
-		}
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-		)
-		viewBinding.recyclerView.updatePadding(
-			bottom = insets.bottom + viewBinding.recyclerView.paddingTop,
-		)
-	}
-
-	override fun onItemClick(item: MangaAlternativeModel, view: View) {
-		when (view.id) {
-			R.id.chip_source -> startActivity(SearchActivity.newIntent(this, item.manga.source, viewModel.manga.title))
-			R.id.button_migrate -> confirmMigration(item.manga)
-			else -> startActivity(DetailsActivity.newIntent(this, item.manga))
-		}
-	}
-
-	private fun confirmMigration(target: Manga) {
-		MaterialAlertDialogBuilder(this, DIALOG_THEME_CENTERED)
-			.setIcon(R.drawable.ic_replace)
-			.setTitle(R.string.manga_migration)
-			.setMessage(
-				getString(
-					R.string.migrate_confirmation,
-					viewModel.manga.title,
-					viewModel.manga.source.title,
-					target.title,
-					target.source.title,
-				),
-			)
-			.setNegativeButton(android.R.string.cancel, null)
-			.setPositiveButton(R.string.migrate) { _, _ ->
-				viewModel.migrate(target)
-			}.show()
-	}
-
-	companion object {
-
-		fun newIntent(context: Context, manga: Manga) = Intent(context, AlternativesActivity::class.java)
-			.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
-	}
-}

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

@@ -1,98 +0,0 @@
-package org.koitharu.kotatsu.alternatives.ui
-
-import androidx.lifecycle.SavedStateHandle
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEmpty
-import kotlinx.coroutines.flow.runningFold
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.alternatives.domain.AlternativesUseCase
-import org.koitharu.kotatsu.alternatives.domain.MigrateUseCase
-import org.koitharu.kotatsu.core.model.chaptersCount
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.parser.MangaIntent
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
-import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.core.util.ext.require
-import org.koitharu.kotatsu.list.domain.ListExtraProvider
-import org.koitharu.kotatsu.list.ui.model.EmptyState
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
-import org.koitharu.kotatsu.list.ui.model.LoadingState
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import javax.inject.Inject
-
-@HiltViewModel
-class AlternativesViewModel @Inject constructor(
-	savedStateHandle: SavedStateHandle,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-	private val alternativesUseCase: AlternativesUseCase,
-	private val migrateUseCase: MigrateUseCase,
-	private val extraProvider: ListExtraProvider,
-) : BaseViewModel() {
-
-	val manga = savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga
-
-	val onMigrated = MutableEventFlow<Manga>()
-	val content = MutableStateFlow<List<ListModel>>(listOf(LoadingState))
-	private var migrationJob: Job? = null
-
-	init {
-		launchJob(Dispatchers.Default) {
-			val ref = runCatchingCancellable {
-				mangaRepositoryFactory.create(manga.source).getDetails(manga)
-			}.getOrDefault(manga)
-			val refCount = ref.chaptersCount()
-			alternativesUseCase(ref)
-				.map {
-					MangaAlternativeModel(
-						manga = it,
-						progress = extraProvider.getProgress(it.id),
-						referenceChapters = refCount,
-					)
-				}.runningFold<MangaAlternativeModel, List<ListModel>>(listOf(LoadingState)) { acc, item ->
-					acc.filterIsInstance<MangaAlternativeModel>() + item + LoadingFooter()
-				}.onEmpty {
-					emit(
-						listOf(
-							EmptyState(
-								icon = R.drawable.ic_empty_common,
-								textPrimary = R.string.nothing_found,
-								textSecondary = R.string.text_search_holder_secondary,
-								actionStringRes = 0,
-							),
-						),
-					)
-				}.collect {
-					content.value = it
-				}
-			content.value = content.value.filterNot { it is LoadingFooter }
-		}
-	}
-
-	fun migrate(target: Manga) {
-		if (migrationJob?.isActive == true) {
-			return
-		}
-		migrationJob = launchLoadingJob(Dispatchers.Default) {
-			migrateUseCase(manga, target)
-			onMigrated.call(target)
-		}
-	}
-
-	private suspend fun mapList(list: List<Manga>, refCount: Int): List<MangaAlternativeModel> {
-		return list.map {
-			MangaAlternativeModel(
-				manga = it,
-				progress = extraProvider.getProgress(it.id),
-				referenceChapters = refCount,
-			)
-		}
-	}
-}

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

@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.alternatives.ui
-
-import org.koitharu.kotatsu.core.model.chaptersCount
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-
-data class MangaAlternativeModel(
-	val manga: Manga,
-	val progress: Float,
-	private val referenceChapters: Int,
-) : ListModel {
-
-	val chaptersCount = manga.chaptersCount()
-
-	val chaptersDiff: Int
-		get() = if (referenceChapters == 0 || chaptersCount == 0) 0 else chaptersCount - referenceChapters
-
-	override fun areItemsTheSame(other: ListModel): Boolean {
-		return other is MangaAlternativeModel && other.manga.id == manga.id
-	}
-}

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

@@ -13,6 +13,7 @@ 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(
@@ -31,6 +32,13 @@ class BookmarksAdapter(
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
-		return findHeader(position)?.getText(context)
+		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
 	}
 }

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

@@ -14,9 +14,9 @@ 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.configureForParser
-import org.koitharu.kotatsu.core.util.ext.toUriOrNull
+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
 
 @SuppressLint("SetJavaScriptEnabled")
@@ -26,14 +26,17 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
+		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
 			return
 		}
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		viewBinding.webView.configureForParser(null)
+		with(viewBinding.webView.settings) {
+			javaScriptEnabled = true
+			userAgentString = UserAgents.CHROME_MOBILE
+		}
 		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
 		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
@@ -78,14 +81,11 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 
 		R.id.action_browser -> {
-			val url = viewBinding.webView.url?.toUriOrNull()
-			if (url != null) {
-				val intent = Intent(Intent.ACTION_VIEW)
-				intent.data = url
-				try {
-					startActivity(Intent.createChooser(intent, item.title))
-				} catch (_: ActivityNotFoundException) {
-				}
+			val intent = Intent(Intent.ACTION_VIEW)
+			intent.data = Uri.parse(viewBinding.webView.url)
+			try {
+				startActivity(Intent.createChooser(intent, item.title))
+			} catch (_: ActivityNotFoundException) {
 			}
 			true
 		}

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

@@ -27,8 +27,9 @@ 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.configureForParser
+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
 import com.google.android.material.R as materialR
 
@@ -40,12 +41,17 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 	@Inject
 	lateinit var cookieJar: MutableCookieJar
 
-	private lateinit var cfClient: CloudFlareClient
 	private var onBackPressedCallback: WebViewBackPressedCallback? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
+		if (!catchingWebViewUnavailability {
+				setContentView(
+					ActivityBrowserBinding.inflate(
+						layoutInflater,
+					),
+				)
+			}) {
 			return
 		}
 		supportActionBar?.run {
@@ -53,9 +59,13 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
 		val url = intent?.dataString.orEmpty()
-		cfClient = CloudFlareClient(cookieJar, this, url)
-		viewBinding.webView.configureForParser(intent?.getStringExtra(ARG_UA))
-		viewBinding.webView.webViewClient = cfClient
+		with(viewBinding.webView.settings) {
+			javaScriptEnabled = true
+			domStorageEnabled = true
+			databaseEnabled = true
+			userAgentString = intent?.getStringExtra(ARG_UA) ?: UserAgents.CHROME_MOBILE
+		}
+		viewBinding.webView.webViewClient = CloudFlareClient(cookieJar, this, url)
 		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView).also {
 			onBackPressedDispatcher.addCallback(it)
 		}
@@ -115,7 +125,15 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		}
 
 		R.id.action_retry -> {
-			restartCheck()
+			lifecycleScope.launch {
+				viewBinding.webView.stopLoading()
+				yield()
+				val targetUrl = intent?.dataString?.toHttpUrlOrNull()
+				if (targetUrl != null) {
+					clearCfCookies(targetUrl)
+					viewBinding.webView.loadUrl(targetUrl.toString())
+				}
+			}
 			true
 		}
 
@@ -141,10 +159,6 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		viewBinding.progressBar.isInvisible = true
 	}
 
-	override fun onLoopDetected() {
-		restartCheck()
-	}
-
 	override fun onCheckPassed() {
 		pendingResult = RESULT_OK
 		finishAfterTransition()
@@ -164,23 +178,10 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
 	}
 
-	private fun restartCheck() {
-		lifecycleScope.launch {
-			viewBinding.webView.stopLoading()
-			yield()
-			cfClient.reset()
-			val targetUrl = intent?.dataString?.toHttpUrlOrNull()
-			if (targetUrl != null) {
-				clearCfCookies(targetUrl)
-				viewBinding.webView.loadUrl(targetUrl.toString())
-			}
-		}
-	}
-
 	private suspend fun clearCfCookies(url: HttpUrl) = runInterruptible(Dispatchers.Default) {
 		cookieJar.removeCookies(url) { cookie ->
 			val name = cookie.name
-			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf") || name == "csrftoken"
+			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf")
 		}
 	}
 

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

@@ -11,6 +11,4 @@ interface CloudFlareCallback : BrowserCallback {
 	fun onPageLoaded()
 
 	fun onCheckPassed()
-
-	fun onLoopDetected()
 }

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

@@ -7,7 +7,6 @@ import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 
 private const val CF_CLEARANCE = "cf_clearance"
-private const val LOOP_COUNTER = 3
 
 class CloudFlareClient(
 	private val cookieJar: MutableCookieJar,
@@ -16,7 +15,6 @@ class CloudFlareClient(
 ) : BrowserClient(callback) {
 
 	private val oldClearance = getClearance()
-	private var counter = 0
 
 	override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
 		super.onPageStarted(view, url, favicon)
@@ -33,20 +31,10 @@ class CloudFlareClient(
 		callback.onPageLoaded()
 	}
 
-	fun reset() {
-		counter = 0
-	}
-
 	private fun checkClearance() {
 		val clearance = getClearance()
 		if (clearance != null && clearance != oldClearance) {
 			callback.onCheckPassed()
-		} else {
-			counter++
-			if (counter >= LOOP_COUNTER) {
-				reset()
-				callback.onLoopDetected()
-			}
 		}
 	}
 

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

@@ -2,7 +2,6 @@ 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
@@ -20,7 +19,6 @@ 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
@@ -29,7 +27,6 @@ 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
 
@@ -55,7 +52,7 @@ open class BaseApp : Application(), Configuration.Provider {
 	lateinit var appValidator: AppValidator
 
 	@Inject
-	lateinit var workScheduleManager: WorkScheduleManager
+	lateinit var workScheduleManager: Provider<WorkScheduleManager>
 
 	@Inject
 	lateinit var workManagerProvider: Provider<WorkManager>
@@ -69,10 +66,6 @@ open class BaseApp : Application(), Configuration.Provider {
 		super.onCreate()
 		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) {
@@ -83,7 +76,7 @@ open class BaseApp : Application(), Configuration.Provider {
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
 		}
-		workScheduleManager.init()
+		workScheduleManager.get().init()
 		WorkServiceStopHelper(workManagerProvider).setup()
 	}
 

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

@@ -54,7 +54,6 @@ 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,
 	)
 

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

@@ -41,7 +41,6 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("page", e.page)
 			put("scroll", e.scroll)
 			put("percent", e.percent)
-			put("chapters", e.chaptersCount)
 		},
 	)
 

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

@@ -20,8 +20,6 @@ interface ContentCache {
 
 	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>)
 
-	fun clear(source: MangaSource)
-
 	data class Key(
 		val source: MangaSource,
 		val url: String,

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

@@ -7,12 +7,10 @@ class ExpiringLruCache<T>(
 	val maxSize: Int,
 	private val lifetime: Long,
 	private val timeUnit: TimeUnit,
-) : Iterable<ContentCache.Key> {
+) {
 
 	private val cache = LruCache<ContentCache.Key, ExpiringValue<T>>(maxSize)
 
-	override fun iterator(): Iterator<ContentCache.Key> = cache.snapshot().keys.iterator()
-
 	operator fun get(key: ContentCache.Key): T? {
 		val value = cache[key] ?: return null
 		if (value.isExpired) {
@@ -32,8 +30,4 @@ class ExpiringLruCache<T>(
 	fun trimToSize(size: Int) {
 		cache.trimToSize(size)
 	}
-
-	fun remove(key: ContentCache.Key) {
-		cache.remove(key)
-	}
 }

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

@@ -44,12 +44,6 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 		relatedMangaCache[ContentCache.Key(source, url)] = related
 	}
 
-	override fun clear(source: MangaSource) {
-		clearCache(detailsCache, source)
-		clearCache(pagesCache, source)
-		clearCache(relatedMangaCache, source)
-	}
-
 	override fun onConfigurationChanged(newConfig: Configuration) = Unit
 
 	override fun onLowMemory() = Unit
@@ -73,12 +67,4 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 			else -> cache.trimToSize(cache.maxSize / 2)
 		}
 	}
-
-	private fun clearCache(cache: ExpiringLruCache<*>, source: MangaSource) {
-		cache.forEach { key ->
-			if (key.source == source) {
-				cache.remove(key)
-			}
-		}
-	}
 }

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

@@ -19,6 +19,4 @@ class StubContentCache : ContentCache {
 	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? = null
 
 	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) = Unit
-
-	override fun clear(source: MangaSource) = Unit
 }

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

@@ -30,7 +30,6 @@ 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
@@ -49,22 +48,20 @@ 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 = 19
+const val DATABASE_VERSION = 18
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
-		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class,
+		ScrobblingEntity::class, MangaSourceEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -93,8 +90,6 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract fun getScrobblingDao(): ScrobblingDao
 
 	abstract fun getSourcesDao(): MangaSourcesDao
-
-	abstract fun getStatsDao(): StatsDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
@@ -115,7 +110,6 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration15To16(),
 	Migration16To17(context),
 	Migration17To18(),
-	Migration18To19(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

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

@@ -29,9 +29,6 @@ abstract class MangaSourcesDao {
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
 
-	@Query("SELECT enabled FROM sources WHERE source = :source")
-	abstract fun observeIsEnabled(source: String): Flow<Boolean>
-
 	@Query("SELECT IFNULL(MAX(sort_key),0) FROM sources")
 	abstract suspend fun getMaxSortKey(): Int
 

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

@@ -1,12 +0,0 @@
-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/UnsupportedSourceException.kt

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import org.koitharu.kotatsu.parsers.model.Manga
-
-class UnsupportedSourceException(
-	message: String?,
-	val manga: Manga?,
-) : IllegalArgumentException(message)

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

@@ -21,7 +21,7 @@ abstract class ErrorObserver(
 	private val onResolved: Consumer<Boolean>?,
 ) : FlowCollector<Throwable> {
 
-	protected open val activity = host.context.findActivity()
+	protected val activity = host.context.findActivity()
 
 	private val lifecycleScope: LifecycleCoroutineScope
 		get() = checkNotNull(fragment?.viewLifecycleScope ?: (activity as? LifecycleOwner)?.lifecycle?.coroutineScope)
@@ -36,7 +36,7 @@ abstract class ErrorObserver(
 	private fun isAlive(): Boolean {
 		return when {
 			fragment != null -> fragment.view != null
-			activity != null -> activity?.isDestroyed == false
+			activity != null -> !activity.isDestroyed
 			else -> true
 		}
 	}

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

@@ -8,16 +8,13 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import okhttp3.Headers
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
 import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
-import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import kotlin.coroutines.Continuation
@@ -62,11 +59,6 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 			false
 		}
 
-		is UnsupportedSourceException -> {
-			e.manga?.let { openAlternatives(it) }
-			false
-		}
-
 		else -> false
 	}
 
@@ -85,11 +77,6 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 		context.startActivity(BrowserActivity.newIntent(context, url, null))
 	}
 
-	private fun openAlternatives(manga: Manga) {
-		val context = activity ?: fragment?.activity ?: return
-		context.startActivity(AlternativesActivity.newIntent(context, manga))
-	}
-
 	private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
 
 	companion object {
@@ -99,7 +86,6 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 			is CloudFlareProtectedException -> R.string.captcha_solve
 			is AuthRequiredException -> R.string.sign_in
 			is NotFoundException -> if (e.url.isNotEmpty()) R.string.open_in_browser else 0
-			is UnsupportedSourceException -> if (e.manga != null) R.string.alternatives else 0
 			else -> 0
 		}
 

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

@@ -3,7 +3,6 @@ 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
@@ -14,8 +13,6 @@ 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")
@@ -32,14 +29,12 @@ fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
 	if (size <= 1) {
 		return size
 	}
-	val acc = MutableObjectIntMap<String?>()
+	val acc = HashMap<String?, Int>()
 	for (item in this) {
 		val branch = item.chapter.branch
-		acc[branch] = acc.getOrDefault(branch, 0) + 1
+		acc[branch] = (acc[branch] ?: 0) + 1
 	}
-	var max = 0
-	acc.forEachValue { x -> if (x > max) max = x }
-	return max
+	return acc.values.max()
 }
 
 @get:StringRes
@@ -118,32 +113,3 @@ 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())
-}
-
-fun Manga.chaptersCount(): Int {
-	if (chapters.isNullOrEmpty()) {
-		return 0
-	}
-	val counters = MutableObjectIntMap<String?>()
-	var max = 0
-	chapters?.forEach { x ->
-		val c = counters.getOrDefault(x.branch, 0) + 1
-		counters[x.branch] = c
-		if (max < c) {
-			max = c
-		}
-	}
-	return max
-}

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

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

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

@@ -7,11 +7,11 @@ import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.network.UserAgents
 import org.koitharu.kotatsu.parsers.util.mergeWith
 import java.net.IDN
 import javax.inject.Inject
@@ -20,7 +20,6 @@ import javax.inject.Singleton
 @Singleton
 class CommonHeadersInterceptor @Inject constructor(
 	private val mangaRepositoryFactoryLazy: Lazy<MangaRepository.Factory>,
-	private val mangaLoaderContextLazy: Lazy<MangaLoaderContextImpl>,
 ) : Interceptor {
 
 	override fun intercept(chain: Interceptor.Chain): Response {
@@ -39,7 +38,7 @@ class CommonHeadersInterceptor @Inject constructor(
 			headersBuilder.mergeWith(it, replaceExisting = false)
 		}
 		if (headersBuilder[CommonHeaders.USER_AGENT] == null) {
-			headersBuilder[CommonHeaders.USER_AGENT] = mangaLoaderContextLazy.get().getDefaultUserAgent()
+			headersBuilder[CommonHeaders.USER_AGENT] = UserAgents.CHROME_MOBILE
 		}
 		if (headersBuilder[CommonHeaders.REFERER] == null && repository != null) {
 			val idn = IDN.toASCII(repository.domain)

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

@@ -7,7 +7,6 @@ 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
@@ -47,13 +46,11 @@ class ImageProxyInterceptor @Inject constructor(
 			.scheme("https")
 			.host("wsrv.nl")
 			.addQueryParameter("url", url.toString())
+			.addQueryParameter("fit", "outside")
 			.addQueryParameter("we", null)
 		val size = request.sizeResolver.size()
-		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()) }
-		}
+		(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/os/AppValidator.kt

@@ -1,9 +1,16 @@
 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
 
@@ -11,13 +18,29 @@ import javax.inject.Singleton
 class AppValidator @Inject constructor(
 	@ApplicationContext private val context: Context,
 ) {
-	@Suppress("NewApi")
+
 	val isOriginalApp by lazy {
-		val certificates = mapOf(CERT_SHA256.hexToByteArray() to PackageManager.CERT_INPUT_SHA256)
-		PackageInfoCompat.hasSignatures(context.packageManager, context.packageName, certificates, false)
+		getCertificateSHA1Fingerprint() == CERT_SHA1
 	}
 
+	@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_SHA256 = "67e15100bb809301783edcb6348fa3bbf83034d91e62868a91053dbd70db3f18"
+
+		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"
 	}
 }

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

@@ -4,25 +4,18 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Base64
 import android.webkit.WebView
-import androidx.annotation.MainThread
 import androidx.core.os.LocaleListCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.core.util.ext.configureForParser
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.core.util.ext.sanitizeHeaderValue
 import org.koitharu.kotatsu.core.util.ext.toList
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import java.lang.ref.WeakReference
 import java.util.Locale
 import javax.inject.Inject
@@ -39,15 +32,12 @@ class MangaLoaderContextImpl @Inject constructor(
 
 	private var webViewCached: WeakReference<WebView>? = null
 
-	private val userAgentLazy = SuspendLazy {
-		withContext(Dispatchers.Main) {
-			obtainWebView().settings.userAgentString
-		}.sanitizeHeaderValue()
-	}
-
 	@SuppressLint("SetJavaScriptEnabled")
 	override suspend fun evaluateJs(script: String): String? = withContext(Dispatchers.Main) {
-		val webView = obtainWebView()
+		val webView = webViewCached?.get() ?: WebView(androidContext).also {
+			it.settings.javaScriptEnabled = true
+			webViewCached = WeakReference(it)
+		}
 		suspendCoroutine { cont ->
 			webView.evaluateJavascript(script) { result ->
 				cont.resume(result?.takeUnless { it == "null" })
@@ -55,14 +45,6 @@ class MangaLoaderContextImpl @Inject constructor(
 		}
 	}
 
-	override fun getDefaultUserAgent(): String = runCatching {
-		runBlocking {
-			userAgentLazy.get()
-		}
-	}.onFailure { e ->
-		e.printStackTraceDebug()
-	}.getOrDefault(UserAgents.FIREFOX_MOBILE)
-
 	override fun getConfig(source: MangaSource): MangaSourceConfig {
 		return SourceSettings(androidContext, source)
 	}
@@ -78,12 +60,4 @@ class MangaLoaderContextImpl @Inject constructor(
 	override fun getPreferredLocales(): List<Locale> {
 		return LocaleListCompat.getAdjustedDefault().toList()
 	}
-
-	@MainThread
-	private fun obtainWebView(): WebView {
-		return webViewCached?.get() ?: WebView(androidContext).also {
-			it.configureForParser(null)
-			webViewCached = WeakReference(it)
-		}
-	}
 }

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

@@ -1,7 +1,6 @@
 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
@@ -171,11 +170,7 @@ class RemoteMangaRepository(
 		return getConfig().isSlowdownEnabled
 	}
 
-	fun invalidateCache() {
-		cache.clear(source)
-	}
-
-	fun getConfig() = parser.config as SourceSettings
+	private fun getConfig() = parser.config as SourceSettings
 
 	private suspend fun <T> asyncSafe(block: suspend CoroutineScope.() -> T): SafeDeferred<T> {
 		var dispatcher = currentCoroutineContext()[CoroutineDispatcher.Key]
@@ -194,7 +189,7 @@ class RemoteMangaRepository(
 			return emptyList()
 		}
 		val result = ArrayList<MangaPage>(size)
-		val set = MutableLongSet(size)
+		val set = HashSet<Long>(size)
 		for (page in this) {
 			if (set.add(page.id)) {
 				result.add(page)
@@ -231,5 +226,6 @@ class RemoteMangaRepository(
 		}
 	}
 
-	private fun Result<*>.isValidResult() = isSuccess && (getOrNull() as? Collection<*>)?.isEmpty() != true
+	private fun Result<*>.isValidResult() = exceptionOrNull() !is ParseException
+		&& (getOrNull() as? Collection<*>)?.isEmpty() != true
 }

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

@@ -11,7 +11,6 @@ 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
@@ -71,9 +70,6 @@ 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) }
@@ -105,21 +101,14 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			}
 		}
 
-	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 readerPageSwitch: Set<String>
+		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
 
 	val isReaderZoomButtonsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_ZOOM_BUTTONS, false)
 
-	val isReaderControlAlwaysLTR: Boolean
-		get() = prefs.getBoolean(KEY_READER_CONTROL_LTR, false)
-
-	val isReaderFullscreenEnabled: Boolean
-		get() = prefs.getBoolean(KEY_READER_FULLSCREEN, true)
+	val isReaderTapsAdaptive: Boolean
+		get() = !prefs.getBoolean(KEY_READER_TAPS_LTR, false)
 
 	val isReaderOptimizationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_OPTIMIZE, false)
@@ -178,14 +167,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_INCOGNITO_MODE, false)
 		set(value) = prefs.edit { putBoolean(KEY_INCOGNITO_MODE, value) }
 
-	var isChaptersReverse: Boolean
+	var chaptersReverse: Boolean
 		get() = prefs.getBoolean(KEY_REVERSE_CHAPTERS, false)
 		set(value) = prefs.edit { putBoolean(KEY_REVERSE_CHAPTERS, value) }
 
-	var isChaptersGridView: Boolean
-		get() = prefs.getBoolean(KEY_GRID_VIEW_CHAPTERS, false)
-		set(value) = prefs.edit { putBoolean(KEY_GRID_VIEW_CHAPTERS, value) }
-
 	val zoomMode: ZoomMode
 		get() = prefs.getEnumValue(KEY_ZOOM_MODE, ZoomMode.FIT_CENTER)
 
@@ -195,13 +180,11 @@ 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)
 
@@ -221,15 +204,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isUnstableUpdatesAllowed: Boolean
 		get() = prefs.getBoolean(KEY_UPDATES_UNSTABLE, false)
 
-	val isPagesTabEnabled: Boolean
-		get() = prefs.getBoolean(KEY_PAGES_TAB, true)
-
 	val defaultDetailsTab: Int
-		get() = if (isPagesTabEnabled) {
-			prefs.getString(KEY_DETAILS_TAB, null)?.toIntOrNull()?.coerceIn(0, 1) ?: 0
-		} else {
-			0
-		}
+		get() = prefs.getString(KEY_DETAILS_TAB, null)?.toIntOrNull()?.coerceIn(0, 1) ?: 0
 
 	val isContentPrefetchEnabled: Boolean
 		get() {
@@ -290,9 +266,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	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) }
@@ -374,23 +347,15 @@ 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.LAST_READ)
+		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.UPDATED)
 		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)
@@ -426,18 +391,6 @@ 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)
-
-	val isAutoLocalChaptersCleanupEnabled: Boolean
-		get() = prefs.getBoolean(KEY_CHAPTERS_CLEAR_AUTO, false)
-
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -450,15 +403,6 @@ 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)
 	}
@@ -505,6 +449,7 @@ 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"
@@ -521,19 +466,14 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PAGES_CACHE_CLEAR = "pages_cache_clear"
 		const val KEY_HTTP_CACHE_CLEAR = "http_cache_clear"
 		const val KEY_COOKIES_CLEAR = "cookies_clear"
-		const val KEY_CHAPTERS_CLEAR = "chapters_clear"
-		const val KEY_CHAPTERS_CLEAR_AUTO = "chapters_clear_auto"
 		const val KEY_THUMBS_CACHE_CLEAR = "thumbs_cache_clear"
 		const val KEY_SEARCH_HISTORY_CLEAR = "search_history_clear"
 		const val KEY_UPDATES_FEED_CLEAR = "updates_feed_clear"
 		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_DOUBLE_PAGES = "reader_double_pages"
+		const val KEY_READER_SWITCHERS = "reader_switchers"
 		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"
@@ -549,7 +489,6 @@ 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"
@@ -563,7 +502,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_HISTORY_GROUPING = "history_grouping"
 		const val KEY_READING_INDICATORS = "reading_indicators"
 		const val KEY_REVERSE_CHAPTERS = "reverse_chapters"
-		const val KEY_GRID_VIEW_CHAPTERS = "grid_view_chapters"
 		const val KEY_HISTORY_EXCLUDE_NSFW = "history_exclude_nsfw"
 		const val KEY_PAGES_NUMBERS = "pages_numbers"
 		const val KEY_SCREENSHOTS_POLICY = "screenshots_policy"
@@ -576,9 +514,7 @@ 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_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"
@@ -590,13 +526,11 @@ 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_TAP_ACTIONS = "reader_tap_actions"
+		const val KEY_READER_TAPS_LTR = "reader_taps_ltr"
 		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"
@@ -620,7 +554,6 @@ 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"
@@ -629,12 +562,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_CF_INVERTED = "cf_inverted"
 		const val KEY_CF_GRAYSCALE = "cf_grayscale"
 		const val KEY_IGNORE_DOZE = "ignore_dose"
-		const val KEY_PAGES_TAB = "pages_tab"
 		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"
+
+		// About
 		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

@@ -1,8 +0,0 @@
-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,12 +4,13 @@ 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),
@@ -20,6 +21,10 @@ 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,9 +4,7 @@ enum class ReaderMode(val id: Int) {
 
 	STANDARD(1),
 	REVERSED(3),
-	VERTICAL(4),
-	WEBTOON(2),
-	;
+	WEBTOON(2);
 
 	companion object {
 

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

@@ -1,18 +1,18 @@
 package org.koitharu.kotatsu.core.prefs
 
 import android.content.Context
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import androidx.core.content.edit
-import okhttp3.internal.isSensitiveHeader
 import org.koitharu.kotatsu.core.util.ext.getEnumValue
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.core.util.ext.putEnumValue
-import org.koitharu.kotatsu.core.util.ext.sanitizeHeaderValue
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 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 {
 
 	private val prefs = context.getSharedPreferences(source.name, Context.MODE_PRIVATE)
@@ -27,13 +27,9 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 	@Suppress("UNCHECKED_CAST")
 	override fun <T> get(key: ConfigKey<T>): T {
 		return when (key) {
-			is ConfigKey.UserAgent -> prefs.getString(key.key, key.defaultValue)
-				.ifNullOrEmpty { key.defaultValue }
-				.sanitizeHeaderValue()
-
+			is ConfigKey.UserAgent -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
 			is ConfigKey.Domain -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
 			is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue)
-			is ConfigKey.SplitByTranslations -> prefs.getBoolean(key.key, key.defaultValue)
 		} as T
 	}
 
@@ -41,22 +37,7 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 		when (key) {
 			is ConfigKey.Domain -> putString(key.key, value as String?)
 			is ConfigKey.ShowSuspiciousContent -> putBoolean(key.key, value as Boolean)
-			is ConfigKey.UserAgent -> putString(key.key, (value as String?)?.sanitizeHeaderValue())
-			is ConfigKey.SplitByTranslations -> putBoolean(key.key, value as Boolean)
+			is ConfigKey.UserAgent -> putString(key.key, value as String?)
 		}
 	}
-
-	fun subscribe(listener: OnSharedPreferenceChangeListener) {
-		prefs.registerOnSharedPreferenceChangeListener(listener)
-	}
-
-	fun unsubscribe(listener: OnSharedPreferenceChangeListener) {
-		prefs.unregisterOnSharedPreferenceChangeListener(listener)
-	}
-
-	companion object {
-
-		const val KEY_SORT_ORDER = "sort_order"
-		const val KEY_SLOWDOWN = "slowdown"
-	}
 }

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

@@ -8,7 +8,6 @@ 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
@@ -30,7 +29,6 @@ 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> :
@@ -60,11 +58,11 @@ abstract class BaseActivity<B : ViewBinding> :
 		if (isAmoledTheme) {
 			setTheme(R.style.ThemeOverlay_Kotatsu_Amoled)
 		}
-		putDataToExtras(intent)
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)
 		insetsDelegate.handleImeInsets = true
 		insetsDelegate.addInsetsListener(this)
+		putDataToExtras(intent)
 	}
 
 	override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -166,21 +164,6 @@ 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,6 +29,7 @@ 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,7 +10,6 @@ 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
 
@@ -29,23 +28,11 @@ open class BaseListAdapter<T : ListModel> : AsyncListDifferDelegationAdapter<T>(
 		return this
 	}
 
-	fun addListListener(listListener: ListListener<T>): BaseListAdapter<T> {
+	fun addListListener(listListener: ListListener<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/BaseViewModel.kt

@@ -68,13 +68,6 @@ 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/dialog/RecyclerViewAlertDialog.kt

@@ -68,14 +68,6 @@ 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/image/ChipIconTarget.kt

@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.ui.image
-
-import android.graphics.drawable.Drawable
-import coil.target.GenericViewTarget
-import com.google.android.material.chip.Chip
-
-class ChipIconTarget(override val view: Chip) : GenericViewTarget<Chip>() {
-
-	override var drawable: Drawable?
-		get() = view.chipIcon
-		set(value) {
-			view.chipIcon = value
-		}
-}

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

@@ -12,10 +12,11 @@ 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 org.koitharu.kotatsu.core.util.KotatsuColors
+import kotlin.math.absoluteValue
 
 class FaviconDrawable(
 	context: Context,
@@ -43,7 +44,7 @@ class FaviconDrawable(
 		}
 		paint.textAlign = Paint.Align.CENTER
 		paint.isFakeBoldText = true
-		colorForeground = MaterialColors.harmonize(KotatsuColors.random(name), colorBackground)
+		colorForeground = MaterialColors.harmonize(colorOfString(name), colorBackground)
 	}
 
 	override fun draw(canvas: Canvas) {
@@ -103,4 +104,9 @@ 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/decor/AbstractSelectionItemDecoration.kt

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

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

@@ -4,10 +4,8 @@ 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(
@@ -17,16 +15,6 @@ 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) {
@@ -55,29 +43,10 @@ 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/util/PopupMenuMediator.kt

@@ -1,38 +0,0 @@
-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,16 +7,12 @@ 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/widgets/ChipsView.kt

@@ -110,7 +110,7 @@ class ChipsView @JvmOverloads constructor(
 		chip.isChipIconVisible = false
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
-		chip.setEnsureMinTouchTargetSize(false) // TODO remove
+		chip.setEnsureMinTouchTargetSize(false)
 		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 = MutableScatterMap<OnChangeListener, OnChangeListenerMapper>(1)
+	private val changeListeners = ArrayMap<OnChangeListener, OnChangeListenerMapper>(1)
 
 	override fun setValue(value: Float) {
 		super.setValue(value.unmap())

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

@@ -0,0 +1,397 @@
+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,7 +11,6 @@ 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
@@ -26,7 +25,7 @@ class SegmentedBarView @JvmOverloads constructor(
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val segmentsData = ArrayList<Segment>()
-	private val segmentsSizes = MutableFloatList()
+	private val segmentsSizes = ArrayList<Float>()
 	private var cornerSize = 0f
 	private var scaleFactor = 1f
 	private var scaleAnimator: ValueAnimator? = null

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

@@ -0,0 +1,70 @@
+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

@@ -1,55 +0,0 @@
-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.colorOutline)
-		}
-		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/ext/Android.kt

@@ -27,7 +27,7 @@ import android.provider.Settings
 import android.view.View
 import android.view.ViewPropertyAnimator
 import android.view.Window
-import android.webkit.WebView
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IntegerRes
 import androidx.annotation.WorkerThread
@@ -216,6 +216,21 @@ 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 {
@@ -236,13 +251,3 @@ fun Context.ensureRamAtLeast(requiredSize: Long) {
 		throw IllegalStateException("Not enough free memory")
 	}
 }
-
-fun WebView.configureForParser(userAgentOverride: String?) = with(settings) {
-	javaScriptEnabled = true
-	domStorageEnabled = true
-	mediaPlaybackRequiresUserGesture = false
-	databaseEnabled = true
-	if (userAgentOverride != null) {
-		userAgentString = userAgentOverride
-	}
-}

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

@@ -24,15 +24,11 @@ inline fun <reified T : Parcelable> Intent.getParcelableExtraCompat(key: String)
 }
 
 inline fun <reified T : Serializable> Intent.getSerializableExtraCompat(key: String): T? {
-	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-		getSerializableExtra(key, T::class.java)
-	} else {
-		getSerializableExtra(key) as T?
-	}
+	return getSerializableExtra(key) as T?
 }
 
 inline fun <reified T : Serializable> Bundle.getSerializableCompat(key: String): T? {
-	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
 		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?.takeUnless { it == "" })
+		.data(data)
 		.lifecycle(lifecycleOwner)
 		.crossfade(context)
 		.target(this)

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

@@ -10,6 +10,7 @@ import android.provider.OpenableColumns
 import androidx.core.database.getStringOrNull
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.fs.FileSequence
 import java.io.File
@@ -18,7 +19,6 @@ 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
 
@@ -52,7 +52,7 @@ fun File.getStorageName(context: Context): String = runCatching {
 
 fun Uri.toFileOrNull() = if (scheme == URI_SCHEME_FILE) path?.let(::File) else null
 
-suspend fun File.deleteAwait() = runInterruptible(Dispatchers.IO) {
+suspend fun File.deleteAwait() = withContext(Dispatchers.IO) {
 	delete() || deleteRecursively()
 }
 
@@ -72,7 +72,7 @@ fun ContentResolver.resolveName(uri: Uri): String? {
 }
 
 suspend fun File.computeSize(): Long = runInterruptible(Dispatchers.IO) {
-	walkCompat(includeDirectories = false).sumOf { it.length() }
+	walkCompat().sumOf { it.length() }
 }
 
 fun File.children() = FileSequence(this)
@@ -87,16 +87,10 @@ val File.creationTime
 	}
 
 @OptIn(ExperimentalPathApi::class)
-fun File.walkCompat(includeDirectories: Boolean): Sequence<File> = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+fun File.walkCompat() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 	// Use lazy loading on Android 8.0 and later
-	val walk = if (includeDirectories) {
-		toPath().walk(PathWalkOption.INCLUDE_DIRECTORIES)
-	} else {
-		toPath().walk()
-	}
-	walk.map { it.toFile() }
+	toPath().walk().map { it.toFile() }
 } else {
 	// Directories are excluded by default in Path.walk(), so do it here as well
-	val walk = walk()
-	if (includeDirectories) walk else walk.filter { it.isFile }
+	walk().filter { it.isFile }
 }

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

@@ -11,10 +11,8 @@ 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
@@ -39,14 +37,6 @@ 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/Http.kt

@@ -1,13 +1,11 @@
 package org.koitharu.kotatsu.core.util.ext
 
 import okhttp3.Cookie
-import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import okhttp3.internal.closeQuietly
-import okhttp3.internal.isSensitiveHeader
 import okio.IOException
 import org.json.JSONObject
 import org.jsoup.HttpStatusException
@@ -61,16 +59,3 @@ fun Cookie.newBuilder(): Cookie.Builder = Cookie.Builder().also { c ->
 		c.httpOnly()
 	}
 }
-
-fun String.sanitizeHeaderValue(): String {
-	return if (all(Char::isValidForHeaderValue)) {
-		this // fast path
-	} else {
-		filter(Char::isValidForHeaderValue)
-	}
-}
-
-private fun Char.isValidForHeaderValue(): Boolean {
-	// from okhttp3.Headers$Companion.checkValue
-	return this == '\t' || this in '\u0020'..'\u007e'
-}

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

@@ -8,11 +8,9 @@ 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,
@@ -77,7 +75,3 @@ 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,6 +2,7 @@ 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
@@ -17,7 +18,6 @@ import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 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.UnsupportedSourceException
 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
@@ -57,7 +57,6 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 
 	is WrongPasswordException -> resources.getString(R.string.wrong_password)
 	is NotFoundException -> resources.getString(R.string.not_found_404)
-	is UnsupportedSourceException -> resources.getString(R.string.unsupported_source)
 
 	is HttpException -> getHttpDisplayMessage(response.code, resources)
 	is HttpStatusException -> getHttpDisplayMessage(statusCode, resources)
@@ -100,16 +99,14 @@ fun Throwable.isReportable(): Boolean {
 	return this is Error || this.javaClass in reportableExceptions
 }
 
-fun Throwable.isNetworkError(): Boolean {
-	return this is UnknownHostException || this is SocketTimeoutException
-}
-
 fun Throwable.report() {
 	val exception = CaughtException(this, "${javaClass.simpleName}($message)")
 	exception.sendWithAcra()
 }
 
 private val reportableExceptions = arraySetOf<Class<*>>(
+	ParseException::class.java,
+	JSONException::class.java,
 	RuntimeException::class.java,
 	IllegalStateException::class.java,
 	IllegalArgumentException::class.java,
@@ -118,8 +115,8 @@ private val reportableExceptions = arraySetOf<Class<*>>(
 )
 
 fun Throwable.isWebViewUnavailable(): Boolean {
-	val trace = stackTraceToString()
-	return trace.contains("android.webkit.WebView.<init>")
+	return (this is AndroidRuntimeException && message?.contains("WebView") == true) ||
+		cause?.isWebViewUnavailable() == true
 }
 
 @Suppress("FunctionName")

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

@@ -1,34 +1,34 @@
 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.chip.Chip
 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() {
-	SoftwareKeyboardControllerCompat(this).hide()
+	val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+	imm.hideSoftInputFromWindow(this.windowToken, 0)
 }
 
 fun View.showKeyboard() {
-	SoftwareKeyboardControllerCompat(this).show()
+	val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+	imm.showSoftInput(this, 0)
 }
 
 fun View.hasGlobalPoint(x: Int, y: Int): Boolean {
@@ -161,20 +161,3 @@ val Toolbar.menuView: ActionMenuView?
 		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()
-}
-
-fun Chip.setProgressIcon() {
-	val progressDrawable = CircularProgressDrawable(context)
-	progressDrawable.strokeWidth = resources.resolveDp(2f)
-	progressDrawable.setColorSchemeColors(currentTextColor)
-	chipIcon = progressDrawable
-	progressDrawable.start()
-}

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

@@ -1,8 +1,6 @@
 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
@@ -12,7 +10,7 @@ private const val NO_TIME = -1L
 
 class TimeLeftEstimator {
 
-	private var times = MutableIntList()
+	private var times = ArrayList<Int>()
 	private var lastTick: Tick? = null
 	private val tooLargeTime = TimeUnit.DAYS.toMillis(1)
 
@@ -52,15 +50,6 @@ 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/ReadingTime.kt

@@ -1,22 +0,0 @@
-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),
-		)
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/details/domain/ReadingTimeUseCase.kt

@@ -1,53 +0,0 @@
-package org.koitharu.kotatsu.details.domain
-
-import org.koitharu.kotatsu.core.model.MangaHistory
-import org.koitharu.kotatsu.core.model.findById
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.details.data.MangaDetails
-import org.koitharu.kotatsu.details.data.ReadingTime
-import org.koitharu.kotatsu.stats.data.StatsRepository
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import kotlin.math.roundToInt
-
-class ReadingTimeUseCase @Inject constructor(
-	private val settings: AppSettings,
-	private val statsRepository: StatsRepository,
-) {
-
-	suspend fun invoke(manga: MangaDetails?, branch: String?, history: MangaHistory?): ReadingTime? {
-		if (!settings.isReadingTimeEstimationEnabled) {
-			return null
-		}
-		val chapters = manga?.chapters?.get(branch)
-		if (chapters.isNullOrEmpty()) {
-			return null
-		}
-		val isOnHistoryBranch = history != null && chapters.findById(history.chapterId) != null
-		// Impossible task, I guess. Good luck on this.
-		var averageTimeSec: Int = 20 /* pages */ * getSecondsPerPage(manga.id) * chapters.size
-		if (isOnHistoryBranch) {
-			averageTimeSec = (averageTimeSec * (1f - checkNotNull(history).percent)).roundToInt()
-		}
-		if (averageTimeSec < 60) {
-			return null
-		}
-		return ReadingTime(
-			minutes = (averageTimeSec / 60) % 60,
-			hours = averageTimeSec / 3600,
-			isContinue = isOnHistoryBranch,
-		)
-	}
-
-	private suspend fun getSecondsPerPage(mangaId: Long): Int {
-		var time = if (settings.isStatsEnabled) {
-			TimeUnit.MILLISECONDS.toSeconds(statsRepository.getTimePerPage(mangaId)).toInt()
-		} else {
-			0
-		}
-		if (time == 0) {
-			time = 10 // default
-		}
-		return time
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/ChaptersBottomSheetMediator.kt

@@ -8,15 +8,12 @@ import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.view.ActionMode
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.tabs.TabLayout
 import org.koitharu.kotatsu.core.ui.util.ActionModeListener
 import org.koitharu.kotatsu.core.util.ext.doOnExpansionsChanged
-import org.koitharu.kotatsu.core.util.ext.setTabsEnabled
 
 class ChaptersBottomSheetMediator(
 	private val behavior: BottomSheetBehavior<*>,
 	private val pager: ViewPager2,
-	private val tabLayout: TabLayout,
 ) : OnBackPressedCallback(false),
 	ActionModeListener,
 	OnLayoutChangeListener, View.OnGenericMotionListener {
@@ -78,7 +75,8 @@ class ChaptersBottomSheetMediator(
 
 	fun lock() {
 		lockCounter++
-		updateLock()
+		behavior.isDraggable = lockCounter <= 0
+		pager.isUserInputEnabled = lockCounter <= 0
 	}
 
 	fun unlock() {
@@ -86,12 +84,7 @@ class ChaptersBottomSheetMediator(
 		if (lockCounter < 0) {
 			lockCounter = 0
 		}
-		updateLock()
-	}
-
-	private fun updateLock() {
 		behavior.isDraggable = lockCounter <= 0
 		pager.isUserInputEnabled = lockCounter <= 0
-		tabLayout.setTabsEnabled(lockCounter <= 0)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/ChaptersMapper.kt

@@ -1,14 +1,10 @@
 package org.koitharu.kotatsu.details.ui
 
-import android.content.Context
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.details.data.MangaDetails
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.toListItem
-import org.koitharu.kotatsu.list.ui.model.ListHeader
-import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.util.mapToSet
 
 fun MangaDetails.mapChapters(
@@ -16,7 +12,6 @@ fun MangaDetails.mapChapters(
 	newCount: Int,
 	branch: String?,
 	bookmarks: List<Bookmark>,
-	isGrid: Boolean,
 ): List<ChapterListItem> {
 	val remoteChapters = chapters[branch].orEmpty()
 	val localChapters = local?.manga?.getChapters(branch).orEmpty()
@@ -48,7 +43,6 @@ fun MangaDetails.mapChapters(
 			isNew = isUnread && result.size >= newFrom,
 			isDownloaded = local != null,
 			isBookmarked = chapter.id in bookmarked,
-			isGrid = isGrid,
 		)
 	}
 	if (!localMap.isNullOrEmpty()) {
@@ -62,28 +56,8 @@ fun MangaDetails.mapChapters(
 				isNew = false,
 				isDownloaded = !isLocal,
 				isBookmarked = chapter.id in bookmarked,
-				isGrid = isGrid,
 			)
 		}
 	}
 	return result
 }
-
-fun List<ChapterListItem>.withVolumeHeaders(context: Context): List<ListModel> {
-	var prevVolume = 0
-	val result = ArrayList<ListModel>((size * 1.4).toInt())
-	for (item in this) {
-		val chapter = item.chapter
-		if (chapter.volume != prevVolume) {
-			val text = if (chapter.volume == 0) {
-				context.getString(R.string.volume_unknown)
-			} else {
-				context.getString(R.string.volume_, chapter.volume)
-			}
-			result.add(ListHeader(text))
-			prevVolume = chapter.volume
-		}
-		result.add(item)
-	}
-	return result
-}

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/ChaptersMenuProvider.kt

@@ -28,9 +28,8 @@ class ChaptersMenuProvider(
 	}
 
 	override fun onPrepareMenu(menu: Menu) {
-		menu.findItem(R.id.action_search)?.isVisible = viewModel.isChaptersEmpty.value == false
 		menu.findItem(R.id.action_reversed)?.isChecked = viewModel.isChaptersReversed.value == true
-		menu.findItem(R.id.action_grid_view)?.isChecked = viewModel.isChaptersInGridView.value == true
+		menu.findItem(R.id.action_search)?.isVisible = viewModel.isChaptersEmpty.value == false
 	}
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
@@ -38,10 +37,6 @@ class ChaptersMenuProvider(
 			viewModel.setChaptersReversed(!menuItem.isChecked)
 			true
 		}
-		R.id.action_grid_view-> {
-			viewModel.setChaptersInGridView(!menuItem.isChecked)
-			true
-		}
 
 		else -> false
 	}

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

@@ -4,9 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.text.style.DynamicDrawableSpan
 import android.text.style.ForegroundColorSpan
-import android.text.style.ImageSpan
 import android.text.style.RelativeSizeSpan
 import android.transition.AutoTransition
 import android.transition.Slide
@@ -36,6 +34,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.parser.MangaIntent
@@ -108,7 +107,7 @@ class DetailsActivity :
 
 		if (viewBinding.layoutBottom != null) {
 			val behavior = BottomSheetBehavior.from(checkNotNull(viewBinding.layoutBottom))
-			val bsMediator = ChaptersBottomSheetMediator(behavior, viewBinding.pager, viewBinding.tabs)
+			val bsMediator = ChaptersBottomSheetMediator(behavior, viewBinding.pager)
 			actionModeDelegate.addListener(bsMediator)
 			checkNotNull(viewBinding.layoutBsHeader).addOnLayoutChangeListener(bsMediator)
 			onBackPressedDispatcher.addCallback(bsMediator)
@@ -124,11 +123,20 @@ class DetailsActivity :
 		viewModel.manga.filterNotNull().observe(this, ::onMangaUpdated)
 		viewModel.onMangaRemoved.observeEvent(this, ::onMangaRemoved)
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
-		viewModel.onError.observeEvent(this, DetailsErrorObserver(this, viewModel, exceptionResolver))
-		viewModel.onActionDone.observeEvent(
+		viewModel.onError.observeEvent(
 			this,
-			ReversibleActionObserver(viewBinding.containerDetails, viewBinding.layoutBottom),
+			SnackbarErrorObserver(
+				host = viewBinding.containerDetails,
+				fragment = null,
+				resolver = exceptionResolver,
+				onResolved = { isResolved ->
+					if (isResolved) {
+						viewModel.reload()
+					}
+				},
+			),
 		)
+		viewModel.onActionDone.observeEvent(this, ReversibleActionObserver(viewBinding.containerDetails))
 		viewModel.onShowTip.observeEvent(this) { showTip() }
 		viewModel.historyInfo.observe(this, ::onHistoryChanged)
 		viewModel.selectedBranch.observe(this) {
@@ -140,7 +148,6 @@ class DetailsActivity :
 		viewModel.isChaptersEmpty.observe(this, chaptersMenuInvalidator)
 		val menuInvalidator = MenuInvalidator(this)
 		viewModel.favouriteCategories.observe(this, menuInvalidator)
-		viewModel.isStatsAvailable.observe(this, menuInvalidator)
 		viewModel.remoteManga.observe(this, menuInvalidator)
 		viewModel.branches.observe(this) {
 			viewBinding.buttonDropdown.isVisible = it.size > 1
@@ -178,9 +185,6 @@ class DetailsActivity :
 			buttonTip = null
 			val menu = PopupMenu(v.context, v)
 			menu.inflate(R.menu.popup_read)
-			menu.menu.findItem(R.id.action_forget)?.isVisible = viewModel.historyInfo.value.run {
-				!isIncognitoMode && history != null
-			}
 			menu.setOnMenuItemClickListener(this)
 			menu.setForceShowIcon(true)
 			menu.show()
@@ -197,11 +201,6 @@ class DetailsActivity :
 				true
 			}
 
-			R.id.action_forget -> {
-				viewModel.removeFromHistory()
-				true
-			}
-
 			R.id.action_pages_thumbs -> {
 				val history = viewModel.historyInfo.value.history
 				PagesThumbnailsSheet.show(
@@ -319,18 +318,6 @@ class DetailsActivity :
 		val branches = viewModel.branches.value
 		for ((i, branch) in branches.withIndex()) {
 			val title = buildSpannedString {
-				if (branch.isCurrent) {
-					inSpans(
-						ImageSpan(
-							this@DetailsActivity,
-							R.drawable.ic_current_chapter,
-							DynamicDrawableSpan.ALIGN_BASELINE,
-						),
-					) {
-						append(' ')
-					}
-					append(' ')
-				}
 				append(branch.name ?: getString(R.string.system_default))
 				append(' ')
 				append(' ')
@@ -376,13 +363,11 @@ class DetailsActivity :
 	}
 
 	private fun initPager() {
-		val adapter = DetailsPagerAdapter(this, settings)
 		viewBinding.pager.recyclerView?.isNestedScrollingEnabled = false
-		viewBinding.pager.offscreenPageLimit = 1
+		val adapter = DetailsPagerAdapter(this)
 		viewBinding.pager.adapter = adapter
 		TabLayoutMediator(viewBinding.tabs, viewBinding.pager, adapter).attach()
 		viewBinding.pager.setCurrentItem(settings.defaultDetailsTab, false)
-		viewBinding.tabs.isVisible = adapter.itemCount > 1
 	}
 
 	private fun showBottomSheet(isVisible: Boolean) {

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsErrorObserver.kt

@@ -1,56 +0,0 @@
-package org.koitharu.kotatsu.details.ui
-
-import com.google.android.material.snackbar.Snackbar
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
-import org.koitharu.kotatsu.core.exceptions.resolve.ErrorObserver
-import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
-import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
-import org.koitharu.kotatsu.core.util.ext.isNetworkError
-import org.koitharu.kotatsu.parsers.exception.NotFoundException
-import org.koitharu.kotatsu.parsers.exception.ParseException
-
-class DetailsErrorObserver(
-	override val activity: DetailsActivity,
-	private val viewModel: DetailsViewModel,
-	resolver: ExceptionResolver?,
-) : ErrorObserver(
-	activity.viewBinding.containerDetails, null, resolver,
-	{ isResolved ->
-		if (isResolved) {
-			viewModel.reload()
-		}
-	},
-) {
-
-	override suspend fun emit(value: Throwable) {
-		val snackbar = Snackbar.make(host, value.getDisplayMessage(host.context.resources), Snackbar.LENGTH_SHORT)
-		if (value is NotFoundException || value is UnsupportedSourceException) {
-			snackbar.duration = Snackbar.LENGTH_INDEFINITE
-		}
-		when {
-			canResolve(value) -> {
-				snackbar.setAction(ExceptionResolver.getResolveStringId(value)) {
-					resolve(value)
-				}
-			}
-
-			value is ParseException -> {
-				val fm = fragmentManager
-				if (fm != null) {
-					snackbar.setAction(R.string.details) {
-						ErrorDetailsDialog.show(fm, value, value.url)
-					}
-				}
-			}
-
-			value.isNetworkError() -> {
-				snackbar.setAction(R.string.try_again) {
-					viewModel.reload()
-				}
-			}
-		}
-		snackbar.show()
-	}
-}

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

@@ -48,7 +48,6 @@ import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.core.util.ext.showOrHide
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
-import org.koitharu.kotatsu.details.data.ReadingTime
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
 import org.koitharu.kotatsu.details.ui.related.RelatedMangaActivity
@@ -62,7 +61,6 @@ import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaItemModel
 import org.koitharu.kotatsu.list.ui.size.StaticItemSizeResolver
-import org.koitharu.kotatsu.local.ui.info.LocalInfoDialog
 import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -103,7 +101,6 @@ class DetailsFragment :
 		binding.buttonScrobblingMore.setOnClickListener(this)
 		binding.buttonRelatedMore.setOnClickListener(this)
 		binding.infoLayout.textViewSource.setOnClickListener(this)
-		binding.infoLayout.textViewSize.setOnClickListener(this)
 		binding.textViewDescription.addOnLayoutChangeListener(this)
 		binding.textViewDescription.viewTreeObserver.addOnDrawListener(this)
 		binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
@@ -121,7 +118,6 @@ class DetailsFragment :
 		viewModel.localSize.observe(viewLifecycleOwner, ::onLocalSizeChanged)
 		viewModel.relatedManga.observe(viewLifecycleOwner, ::onRelatedMangaChanged)
 		viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
-		viewModel.readingTime.observe(viewLifecycleOwner, ::onReadingTimeChanged)
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
@@ -215,19 +211,6 @@ class DetailsFragment :
 		}
 	}
 
-	private fun onReadingTimeChanged(time: ReadingTime?) {
-		val binding = viewBinding ?: return
-		if (time == null) {
-			binding.approximateReadTimeLayout.isVisible = false
-			return
-		}
-		binding.approximateReadTime.text = time.format(resources)
-		binding.approximateReadTimeTitle.setText(
-			if (time.isContinue) R.string.approximate_remaining_time else R.string.approximate_reading_time
-		)
-		binding.approximateReadTimeLayout.isVisible = true
-	}
-
 	private fun onDescriptionChanged(description: CharSequence?) {
 		val tv = requireViewBinding().textViewDescription
 		if (description.isNullOrBlank()) {
@@ -326,10 +309,6 @@ class DetailsFragment :
 				)
 			}
 
-			R.id.textView_size -> {
-				LocalInfoDialog.show(parentFragmentManager, manga)
-			}
-
 			R.id.imageView_cover -> {
 				startActivity(
 					ImageActivity.newIntent(

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

@@ -14,7 +14,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
@@ -24,7 +23,6 @@ import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteSheet
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
-import org.koitharu.kotatsu.stats.ui.sheet.MangaStatsSheet
 
 class DetailsMenuProvider(
 	private val activity: FragmentActivity,
@@ -42,11 +40,9 @@ class DetailsMenuProvider(
 		menu.findItem(R.id.action_save).isVisible = manga?.source != null && manga.source != MangaSource.LOCAL
 		menu.findItem(R.id.action_delete).isVisible = manga?.source == MangaSource.LOCAL
 		menu.findItem(R.id.action_browser).isVisible = manga?.source != MangaSource.LOCAL
-		menu.findItem(R.id.action_alternatives).isVisible = manga?.source != MangaSource.LOCAL
 		menu.findItem(R.id.action_shortcut).isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(activity)
 		menu.findItem(R.id.action_scrobbling).isVisible = viewModel.isScrobblingAvailable
 		menu.findItem(R.id.action_online).isVisible = viewModel.remoteManga.value != null
-		menu.findItem(R.id.action_stats).isVisible = viewModel.isStatsAvailable.value
 		menu.findItem(R.id.action_favourite).setIcon(
 			if (viewModel.favouriteCategories.value) R.drawable.ic_heart else R.drawable.ic_heart_outline,
 		)
@@ -105,18 +101,6 @@ class DetailsMenuProvider(
 				}
 			}
 
-			R.id.action_alternatives -> {
-				viewModel.manga.value?.let {
-					activity.startActivity(AlternativesActivity.newIntent(activity, it))
-				}
-			}
-
-			R.id.action_stats -> {
-				viewModel.manga.value?.let {
-					MangaStatsSheet.show(activity.supportFragmentManager, it)
-				}
-			}
-
 			R.id.action_scrobbling -> {
 				viewModel.manga.value?.let {
 					ScrobblingSelectorSheet.show(activity.supportFragmentManager, it, null)

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

@@ -18,7 +18,6 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.plus
@@ -26,7 +25,6 @@ import okio.FileNotFoundException
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-import org.koitharu.kotatsu.core.model.findById
 import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -36,7 +34,6 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.core.util.ext.combine
 import org.koitharu.kotatsu.core.util.ext.computeSize
 import org.koitharu.kotatsu.core.util.ext.onEachWhile
 import org.koitharu.kotatsu.core.util.ext.requireValue
@@ -45,7 +42,6 @@ import org.koitharu.kotatsu.details.domain.BranchComparator
 import org.koitharu.kotatsu.details.domain.DetailsInteractor
 import org.koitharu.kotatsu.details.domain.DetailsLoadUseCase
 import org.koitharu.kotatsu.details.domain.ProgressUpdateUseCase
-import org.koitharu.kotatsu.details.domain.ReadingTimeUseCase
 import org.koitharu.kotatsu.details.domain.RelatedMangaUseCase
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
@@ -63,7 +59,6 @@ import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
-import org.koitharu.kotatsu.stats.data.StatsRepository
 import javax.inject.Inject
 
 @HiltViewModel
@@ -81,8 +76,6 @@ class DetailsViewModel @Inject constructor(
 	private val extraProvider: ListExtraProvider,
 	private val detailsLoadUseCase: DetailsLoadUseCase,
 	private val progressUpdateUseCase: ProgressUpdateUseCase,
-	private val readingTimeUseCase: ReadingTimeUseCase,
-	private val statsRepository: StatsRepository,
 ) : BaseViewModel() {
 
 	private val intent = MangaIntent(savedStateHandle)
@@ -104,9 +97,6 @@ class DetailsViewModel @Inject constructor(
 	val favouriteCategories = interactor.observeIsFavourite(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
 
-	val isStatsAvailable = statsRepository.observeHasStats(mangaId)
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
-
 	val remoteManga = MutableStateFlow<Manga?>(null)
 
 	val newChaptersCount = details.flatMapLatest { d ->
@@ -123,13 +113,7 @@ class DetailsViewModel @Inject constructor(
 	val isChaptersReversed = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.Default,
 		key = AppSettings.KEY_REVERSE_CHAPTERS,
-		valueProducer = { isChaptersReverse },
-	)
-
-	val isChaptersInGridView = settings.observeAsStateFlow(
-		scope = viewModelScope + Dispatchers.Default,
-		key = AppSettings.KEY_GRID_VIEW_CHAPTERS,
-		valueProducer = { isChaptersGridView },
+		valueProducer = { chaptersReverse },
 	)
 
 	val historyInfo: StateFlow<HistoryInfo> = combine(
@@ -152,7 +136,6 @@ class DetailsViewModel @Inject constructor(
 	val localSize = details
 		.map { it?.local }
 		.distinctUntilChanged()
-		.combine(localStorageChanges.onStart { emit(null) }) { x, _ -> x }
 		.map { local ->
 			if (local != null) {
 				runCatchingCancellable {
@@ -186,21 +169,10 @@ class DetailsViewModel @Inject constructor(
 	val branches: StateFlow<List<MangaBranch>> = combine(
 		details,
 		selectedBranch,
-		history,
-	) { m, b, h ->
-		val c = m?.chapters
-		if (c.isNullOrEmpty()) {
-			return@combine emptyList()
-		}
-		val currentBranch = h?.let { m.allChapters.findById(it.chapterId) }?.branch
-		c.map { x ->
-			MangaBranch(
-				name = x.key,
-				count = x.value.size,
-				isSelected = x.key == b,
-				isCurrent = h != null && x.key == currentBranch,
-			)
-		}.sortedWith(BranchComparator())
+	) { m, b ->
+		(m?.chapters ?: return@combine emptyList())
+			.map { x -> MangaBranch(x.key, x.value.size, x.key == b) }
+			.sortedWith(BranchComparator())
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
 	val isChaptersEmpty: StateFlow<Boolean> = details.map {
@@ -214,14 +186,12 @@ class DetailsViewModel @Inject constructor(
 			selectedBranch,
 			newChaptersCount,
 			bookmarks,
-			isChaptersInGridView,
-		) { manga, history, branch, news, bookmarks, grid ->
+		) { manga, history, branch, news, bookmarks ->
 			manga?.mapChapters(
 				history,
 				news,
 				branch,
 				bookmarks,
-				grid,
 			).orEmpty()
 		},
 		isChaptersReversed,
@@ -230,14 +200,6 @@ class DetailsViewModel @Inject constructor(
 		(if (reversed) list.asReversed() else list).filterSearch(query)
 	}.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
 
-	val readingTime = combine(
-		details,
-		selectedBranch,
-		history,
-	) { m, b, h ->
-		readingTimeUseCase.invoke(m, b, h)
-	}.stateIn(viewModelScope, SharingStarted.Lazily, null)
-
 	val selectedBranchValue: String?
 		get() = selectedBranch.value
 
@@ -291,11 +253,7 @@ class DetailsViewModel @Inject constructor(
 	}
 
 	fun setChaptersReversed(newValue: Boolean) {
-		settings.isChaptersReverse = newValue
-	}
-
-	fun setChaptersInGridView(newValue: Boolean) {
-		settings.isChaptersGridView = newValue
+		settings.chaptersReverse = newValue
 	}
 
 	fun setSelectedBranch(branch: String?) {
@@ -340,7 +298,6 @@ class DetailsViewModel @Inject constructor(
 				page = 0,
 				scroll = 0,
 				percent = percent,
-				force = true,
 			)
 		}
 	}
@@ -367,13 +324,6 @@ class DetailsViewModel @Inject constructor(
 		settings.closeTip(DetailsActivity.TIP_BUTTON)
 	}
 
-	fun removeFromHistory() {
-		launchJob(Dispatchers.Default) {
-			val handle = historyRepository.delete(setOf(mangaId))
-			onActionDone.call(ReversibleAction(R.string.removed_from_history, handle))
-		}
-	}
-
 	private fun doLoad() = launchLoadingJob(Dispatchers.Default) {
 		detailsLoadUseCase.invoke(intent)
 			.onEachWhile {

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DownloadDialogHelper.kt

@@ -8,7 +8,6 @@ import org.koitharu.kotatsu.core.ui.dialog.RecyclerViewAlertDialog
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.download.ui.dialog.DownloadOption
 import org.koitharu.kotatsu.download.ui.dialog.downloadOptionAD
-import org.koitharu.kotatsu.settings.SettingsActivity
 
 class DownloadDialogHelper(
 	private val host: View,
@@ -58,9 +57,6 @@ class DownloadDialogHelper(
 			.setCancelable(true)
 			.setTitle(R.string.download)
 			.setNegativeButton(android.R.string.cancel)
-			.setNeutralButton(R.string.settings) { _, _ ->
-				host.context.startActivity(SettingsActivity.newDownloadsSettingsIntent(host.context))
-			}
 			.setItems(options)
 			.create()
 			.also { it.show() }

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChapterGridItemAD.kt

@@ -1,52 +0,0 @@
-package org.koitharu.kotatsu.details.ui.adapter
-
-import android.graphics.Typeface
-import androidx.core.view.isVisible
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.core.model.formatNumber
-import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.getThemeColorStateList
-import org.koitharu.kotatsu.databinding.ItemChapterGridBinding
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-fun chapterGridItemAD(
-	clickListener: OnListItemClickListener<ChapterListItem>,
-) = adapterDelegateViewBinding<ChapterListItem, ListModel, ItemChapterGridBinding>(
-	viewBinding = { inflater, parent -> ItemChapterGridBinding.inflate(inflater, parent, false) },
-	on = { item, _, _ -> item is ChapterListItem && item.isGrid },
-) {
-
-	val eventListener = AdapterDelegateClickListenerAdapter(this, clickListener)
-	itemView.setOnClickListener(eventListener)
-	itemView.setOnLongClickListener(eventListener)
-
-	bind { payloads ->
-		if (payloads.isEmpty()) {
-			binding.textViewTitle.text = item.chapter.formatNumber() ?: "?"
-		}
-		binding.imageViewNew.isVisible = item.isNew
-		binding.imageViewCurrent.isVisible = item.isCurrent
-		binding.imageViewBookmarked.isVisible = item.isBookmarked
-		binding.imageViewDownloaded.isVisible = item.isDownloaded
-
-		when {
-			item.isCurrent -> {
-				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorPrimary))
-				binding.textViewTitle.typeface = Typeface.DEFAULT_BOLD
-			}
-
-			item.isUnread -> {
-				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorPrimary))
-				binding.textViewTitle.typeface = Typeface.DEFAULT
-			}
-
-			else -> {
-				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorHint))
-				binding.textViewTitle.typeface = Typeface.DEFAULT
-			}
-		}
-	}
-}
-

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.details.ui.adapter
 
-import android.graphics.Typeface
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -8,18 +7,16 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.drawableStart
-import org.koitharu.kotatsu.core.util.ext.getThemeColorStateList
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemChapterBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import com.google.android.material.R as MR
+import com.google.android.material.R as materialR
 
 fun chapterListItemAD(
 	clickListener: OnListItemClickListener<ChapterListItem>,
-) = adapterDelegateViewBinding<ChapterListItem, ListModel, ItemChapterBinding>(
-	viewBinding = { inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) },
-	on = { item, _, _ -> item is ChapterListItem && !item.isGrid }
+) = adapterDelegateViewBinding<ChapterListItem, ChapterListItem, ItemChapterBinding>(
+	{ inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) },
 ) {
 
 	val eventListener = AdapterDelegateClickListenerAdapter(this, clickListener)
@@ -29,38 +26,31 @@ fun chapterListItemAD(
 	bind { payloads ->
 		if (payloads.isEmpty()) {
 			binding.textViewTitle.text = item.chapter.name
-			binding.textViewDescription.textAndVisible = item.description
+			binding.textViewNumber.text = item.chapter.number.toString()
+			binding.textViewDescription.textAndVisible = item.description()
 		}
 		when {
 			item.isCurrent -> {
-				binding.textViewTitle.drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_current_chapter)
-				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorPrimary))
-				binding.textViewDescription.setTextColor(context.getThemeColorStateList(android.R.attr.textColorPrimary))
-				binding.textViewTitle.typeface = Typeface.DEFAULT_BOLD
-				binding.textViewDescription.typeface = Typeface.DEFAULT_BOLD
+				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_primary)
+				binding.textViewNumber.setTextColor(context.getThemeColor(materialR.attr.colorOnPrimary))
 			}
 
 			item.isUnread -> {
-				binding.textViewTitle.drawableStart = if (item.isNew) {
-					ContextCompat.getDrawable(context, R.drawable.ic_new)
-				} else {
-					null
-				}
-				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorPrimary))
-				binding.textViewDescription.setTextColor(context.getThemeColorStateList(MR.attr.colorOutline))
-				binding.textViewTitle.typeface = Typeface.DEFAULT
-				binding.textViewDescription.typeface = Typeface.DEFAULT
+				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_default)
+				binding.textViewNumber.setTextColor(context.getThemeColor(materialR.attr.colorOnTertiary))
 			}
 
 			else -> {
-				binding.textViewTitle.drawableStart = null
-				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorHint))
-				binding.textViewDescription.setTextColor(context.getThemeColorStateList(android.R.attr.textColorHint))
-				binding.textViewTitle.typeface = Typeface.DEFAULT
-				binding.textViewDescription.typeface = Typeface.DEFAULT
+				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_outline)
+				binding.textViewNumber.setTextColor(context.getThemeColor(android.R.attr.textColorTertiary))
 			}
 		}
 		binding.imageViewBookmarked.isVisible = item.isBookmarked
 		binding.imageViewDownloaded.isVisible = item.isDownloaded
+		binding.textViewTitle.drawableStart = if (item.isNew) {
+			ContextCompat.getDrawable(context, R.drawable.ic_new)
+		} else {
+			null
+		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt

@@ -5,21 +5,22 @@ import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
-import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
-import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class ChaptersAdapter(
-	private val onItemClickListener: OnListItemClickListener<ChapterListItem>,
-) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
+	onItemClickListener: OnListItemClickListener<ChapterListItem>,
+) : BaseListAdapter<ChapterListItem>(), FastScroller.SectionIndexer {
 
 	init {
-		addDelegate(ListItemType.HEADER, listHeaderAD(null))
-		addDelegate(ListItemType.CHAPTER_LIST, chapterListItemAD(onItemClickListener))
-		addDelegate(ListItemType.CHAPTER_GRID, chapterGridItemAD(onItemClickListener))
+		setHasStableIds(true)
+		delegatesManager.addDelegate(chapterListItemAD(onItemClickListener))
+	}
+
+	override fun getItemId(position: Int): Long {
+		return items[position].chapter.id
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
-		return findHeader(position)?.getText(context)
+		val item = items.getOrNull(position) ?: return null
+		return item.chapter.number.toString()
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt

@@ -6,29 +6,16 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.RectF
 import android.view.View
-import androidx.cardview.widget.CardView
-import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
-import org.koitharu.kotatsu.core.util.ext.getItem
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import com.google.android.material.R as materialR
 
 class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val radius = context.resources.getDimension(materialR.dimen.abc_control_corner_material)
-	private val checkIcon = ContextCompat.getDrawable(context, materialR.drawable.ic_mtrl_checked_circle)
-	private val iconOffset = context.resources.getDimensionPixelOffset(R.dimen.chapter_check_offset)
-	private val iconSize = context.resources.getDimensionPixelOffset(R.dimen.chapter_check_size)
-	private val strokeColor = context.getThemeColor(materialR.attr.colorPrimary, Color.RED)
-	private val fillColor = ColorUtils.setAlphaComponent(
-		ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
-		0x74,
-	)
 
 	init {
 		paint.color = ColorUtils.setAlphaComponent(
@@ -36,18 +23,6 @@ class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecor
 			98,
 		)
 		paint.style = Paint.Style.FILL
-		hasBackground = true
-		hasForeground = true
-		isIncludeDecorAndMargins = false
-
-		paint.strokeWidth = context.resources.getDimension(R.dimen.selection_stroke_width)
-		checkIcon?.setTint(strokeColor)
-	}
-
-	override fun getItemId(parent: RecyclerView, child: View): Long {
-		val holder = parent.getChildViewHolder(child) ?: return RecyclerView.NO_ID
-		val item = holder.getItem(ChapterListItem::class.java) ?: return RecyclerView.NO_ID
-		return item.chapter.id
 	}
 
 	override fun onDrawBackground(
@@ -57,37 +32,6 @@ class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecor
 		bounds: RectF,
 		state: RecyclerView.State,
 	) {
-		if (child is CardView) {
-			return
-		}
 		canvas.drawRoundRect(bounds, radius, radius, paint)
 	}
-
-	override fun onDrawForeground(
-		canvas: Canvas,
-		parent: RecyclerView,
-		child: View,
-		bounds: RectF,
-		state: RecyclerView.State
-	) {
-		if (child !is CardView) {
-			return
-		}
-		val radius = child.radius
-		paint.color = fillColor
-		paint.style = Paint.Style.FILL
-		canvas.drawRoundRect(bounds, radius, radius, paint)
-		paint.color = strokeColor
-		paint.style = Paint.Style.STROKE
-		canvas.drawRoundRect(bounds, radius, radius, paint)
-		checkIcon?.run {
-			setBounds(
-				(bounds.right - iconSize - iconOffset).toInt(),
-				(bounds.top + iconOffset).toInt(),
-				(bounds.right - iconOffset).toInt(),
-				(bounds.top + iconOffset + iconSize).toInt(),
-			)
-			draw(canvas)
-		}
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt

@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.details.ui.model
 
 import android.text.format.DateUtils
-import org.jsoup.internal.StringUtil.StringJoiner
-import org.koitharu.kotatsu.core.model.formatNumber
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 
@@ -12,14 +10,6 @@ data class ChapterListItem(
 	private val uploadDateMs: Long,
 ) : ListModel {
 
-	var description: String? = null
-		private set
-		get() {
-			if (field != null) return field
-			field = buildDescription()
-			return field
-		}
-
 	var uploadDate: CharSequence? = null
 		private set
 		get() {
@@ -48,23 +38,13 @@ data class ChapterListItem(
 	val isNew: Boolean
 		get() = hasFlag(FLAG_NEW)
 
-	val isGrid: Boolean
-		get() = hasFlag(FLAG_GRID)
-
-	private fun buildDescription(): String {
-		val joiner = StringJoiner(" • ")
-		chapter.formatNumber()?.let {
-			joiner.add("#").append(it)
+	fun description(): CharSequence? {
+		val scanlator = chapter.scanlator?.takeUnless { it.isBlank() }
+		return when {
+			uploadDate != null && scanlator != null -> "$uploadDate • $scanlator"
+			scanlator != null -> scanlator
+			else -> uploadDate
 		}
-		uploadDate?.let { date ->
-			joiner.add(date.toString())
-		}
-		chapter.scanlator?.let { scanlator ->
-			if (scanlator.isNotBlank()) {
-				joiner.add(scanlator)
-			}
-		}
-		return joiner.complete()
 	}
 
 	private fun hasFlag(flag: Int): Boolean {
@@ -93,6 +73,5 @@ data class ChapterListItem(
 		const val FLAG_NEW = 8
 		const val FLAG_BOOKMARKED = 16
 		const val FLAG_DOWNLOADED = 32
-		const val FLAG_GRID = 64
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.details.ui.model
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_BOOKMARKED
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_CURRENT
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_DOWNLOADED
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_GRID
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_NEW
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_UNREAD
 import org.koitharu.kotatsu.parsers.model.MangaChapter
@@ -14,7 +13,6 @@ fun MangaChapter.toListItem(
 	isNew: Boolean,
 	isDownloaded: Boolean,
 	isBookmarked: Boolean,
-	isGrid: Boolean,
 ): ChapterListItem {
 	var flags = 0
 	if (isCurrent) flags = flags or FLAG_CURRENT
@@ -22,7 +20,6 @@ fun MangaChapter.toListItem(
 	if (isNew) flags = flags or FLAG_NEW
 	if (isBookmarked) flags = flags or FLAG_BOOKMARKED
 	if (isDownloaded) flags = flags or FLAG_DOWNLOADED
-	if (isGrid) flags = flags or FLAG_GRID
 	return ChapterListItem(
 		chapter = this,
 		flags = flags,

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/MangaBranch.kt

@@ -7,7 +7,6 @@ data class MangaBranch(
 	val name: String?,
 	val count: Int,
 	val isSelected: Boolean,
-	val isCurrent: Boolean,
 ) : ListModel {
 
 	override fun areItemsTheSame(other: ListModel): Boolean {

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/DetailsPagerAdapter.kt

@@ -6,19 +6,13 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.details.ui.pager.chapters.ChaptersFragment
 import org.koitharu.kotatsu.details.ui.pager.pages.PagesFragment
 
-class DetailsPagerAdapter(
-	activity: FragmentActivity,
-	settings: AppSettings,
-) : FragmentStateAdapter(activity),
+class DetailsPagerAdapter(activity: FragmentActivity) : FragmentStateAdapter(activity),
 	TabLayoutMediator.TabConfigurationStrategy {
 
-	val isPagesTabEnabled = settings.isPagesTabEnabled
-
-	override fun getItemCount(): Int = if (isPagesTabEnabled) 2 else 1
+	override fun getItemCount(): Int = 2
 
 	override fun createFragment(position: Int): Fragment = when (position) {
 		0 -> ChaptersFragment()

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/chapters/ChapterGridSpanHelper.kt

@@ -1,63 +0,0 @@
-package org.koitharu.kotatsu.details.ui.pager.chapters
-
-import android.view.View
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
-import kotlin.math.roundToInt
-
-class ChapterGridSpanHelper private constructor() : View.OnLayoutChangeListener {
-
-	override fun onLayoutChange(
-		v: View?,
-		left: Int,
-		top: Int,
-		right: Int,
-		bottom: Int,
-		oldLeft: Int,
-		oldTop: Int,
-		oldRight: Int,
-		oldBottom: Int
-	) {
-		val rv = v as? RecyclerView ?: return
-		if (rv.width > 0) {
-			apply(rv)
-		}
-	}
-
-	private fun apply(rv: RecyclerView) {
-		(rv.layoutManager as? GridLayoutManager)?.spanCount = getSpanCount(rv)
-	}
-
-	class SpanSizeLookup(
-		private val recyclerView: RecyclerView
-	) : GridLayoutManager.SpanSizeLookup() {
-
-		override fun getSpanSize(position: Int): Int {
-			return when (recyclerView.adapter?.getItemViewType(position)) {
-				ListItemType.CHAPTER_LIST.ordinal, // for smooth transition
-				ListItemType.HEADER.ordinal -> getTotalSpans()
-
-				else -> 1
-			}
-		}
-
-		private fun getTotalSpans() = (recyclerView.layoutManager as? GridLayoutManager)?.spanCount ?: 1
-	}
-
-	companion object {
-
-		fun attach(view: RecyclerView) {
-			val helper = ChapterGridSpanHelper()
-			view.addOnLayoutChangeListener(helper)
-			helper.apply(view)
-		}
-
-		fun getSpanCount(view: RecyclerView): Int {
-			val cellWidth = view.resources.getDimension(R.dimen.chapter_grid_width)
-			val estimatedCount = (view.width / cellWidth).roundToInt()
-			return estimatedCount.coerceAtLeast(2)
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/chapters/ChaptersFragment.kt

@@ -11,12 +11,7 @@ import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
@@ -31,9 +26,6 @@ import org.koitharu.kotatsu.details.ui.DetailsViewModel
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.details.ui.withVolumeHeaders
-import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
-import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
@@ -64,28 +56,13 @@ class ChaptersFragment :
 			registryOwner = this,
 			callback = this,
 		)
-		viewModel.isChaptersInGridView.observe(viewLifecycleOwner) { chaptersInGridView ->
-			binding.recyclerViewChapters.layoutManager = if (chaptersInGridView) {
-				GridLayoutManager(context, ChapterGridSpanHelper.getSpanCount(binding.recyclerViewChapters)).apply {
-					spanSizeLookup = ChapterGridSpanHelper.SpanSizeLookup(binding.recyclerViewChapters)
-				}
-			} else {
-				LinearLayoutManager(context)
-			}
-		}
 		with(binding.recyclerViewChapters) {
-			addItemDecoration(TypedListSpacingDecoration(context, true))
 			checkNotNull(selectionController).attachToRecyclerView(this)
 			setHasFixedSize(true)
-			isNestedScrollingEnabled = false
 			adapter = chaptersAdapter
-			ChapterGridSpanHelper.attach(this)
 		}
 		viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
-		viewModel.chapters
-			.map { it.withVolumeHeaders(requireContext()) }
-			.flowOn(Dispatchers.Default)
-			.observe(viewLifecycleOwner, this::onChaptersChanged)
+		viewModel.chapters.observe(viewLifecycleOwner, this::onChaptersChanged)
 		viewModel.isChaptersEmpty.observe(viewLifecycleOwner) {
 			binding.textViewHolder.isVisible = it
 		}
@@ -106,17 +83,6 @@ class ChaptersFragment :
 		super.onDestroyView()
 	}
 
-	override fun onPause() {
-		// required for BottomSheetBehavior
-		requireViewBinding().recyclerViewChapters.isNestedScrollingEnabled = false
-		super.onPause()
-	}
-
-	override fun onResume() {
-		requireViewBinding().recyclerViewChapters.isNestedScrollingEnabled = true
-		super.onResume()
-	}
-
 	override fun onItemClick(item: ChapterListItem, view: View) {
 		if (selectionController?.onItemClick(item.chapter.id) == true) {
 			return
@@ -166,9 +132,6 @@ class ChaptersFragment :
 				val buffer = HashSet<Long>()
 				var isAdding = false
 				for (x in items) {
-					if (x !is ChapterListItem) {
-						continue
-					}
 					if (x.chapter.id in ids) {
 						isAdding = true
 						if (buffer.isNotEmpty()) {
@@ -184,13 +147,7 @@ class ChaptersFragment :
 			}
 
 			R.id.action_select_all -> {
-				val ids = chaptersAdapter?.items?.mapNotNull {
-					if (it is ChapterListItem) {
-						it.chapter.id
-					} else {
-						null
-					}
-				} ?: return false
+				val ids = chaptersAdapter?.items?.map { it.chapter.id } ?: return false
 				controller.addAll(ids)
 				true
 			}
@@ -214,15 +171,7 @@ class ChaptersFragment :
 	override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
 		val selectedIds = selectionController?.peekCheckedIds() ?: return false
 		val allItems = chaptersAdapter?.items.orEmpty()
-		val items = allItems.withIndex().mapNotNull<IndexedValue<ListModel>, IndexedValue<ChapterListItem>> { x ->
-			val value = x.value
-			@Suppress("UNCHECKED_CAST")
-			if (value is ChapterListItem && value.chapter.id in selectedIds) {
-				x as IndexedValue<ChapterListItem>
-			} else {
-				null
-			}
-		}
+		val items = allItems.withIndex().filter { (_, x) -> x.chapter.id in selectedIds }
 		var canSave = true
 		var canDelete = true
 		items.forEach { (_, x) ->
@@ -246,15 +195,15 @@ class ChaptersFragment :
 	}
 
 	override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
-		viewBinding?.recyclerViewChapters?.invalidateItemDecorations()
+		requireViewBinding().recyclerViewChapters.invalidateItemDecorations()
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) = Unit
 
-	private fun onChaptersChanged(list: List<ListModel>) {
+	private fun onChaptersChanged(list: List<ChapterListItem>) {
 		val adapter = chaptersAdapter ?: return
 		if (adapter.itemCount == 0) {
-			val position = list.indexOfFirst { it is ChapterListItem && it.isCurrent } - 1
+			val position = list.indexOfFirst { it.isCurrent } - 1
 			if (position > 0) {
 				val offset = (resources.getDimensionPixelSize(R.dimen.chapter_list_item_height) * 0.6).roundToInt()
 				adapter.setItems(

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/pages/PagesFragment.kt

@@ -13,9 +13,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flowOn
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -67,12 +65,11 @@ class PagesFragment :
 			detailsViewModel.selectedBranch,
 		) { details, history, branch ->
 			if (details != null && (details.isLoaded || details.chapters.isNotEmpty())) {
-				PagesViewModel.State(details.filterChapters(branch), history, branch)
+				PagesViewModel.State(details, history, branch)
 			} else {
 				null
 			}
-		}.flowOn(Dispatchers.Default)
-			.observe(this, viewModel::updateState)
+		}.observe(this, viewModel::updateState)
 	}
 
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentPagesBinding {
@@ -91,7 +88,6 @@ class PagesFragment :
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 			adapter = thumbnailsAdapter
 			setHasFixedSize(true)
-			isNestedScrollingEnabled = false
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver?.setGridSize(settings.gridSize / 100f, this)
 			addOnScrollListener(ScrollListener().also { scrollListener = it })
@@ -116,17 +112,6 @@ class PagesFragment :
 		super.onDestroyView()
 	}
 
-	override fun onPause() {
-		// required for BottomSheetBehavior
-		requireViewBinding().recyclerView.isNestedScrollingEnabled = false
-		super.onPause()
-	}
-
-	override fun onResume() {
-		requireViewBinding().recyclerView.isNestedScrollingEnabled = true
-		super.onResume()
-	}
-
 	override fun onWindowInsetsChanged(insets: Insets) = Unit
 
 	override fun onItemClick(item: PageThumbnail, view: View) {

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemAD.kt

@@ -59,7 +59,7 @@ fun downloadItemAD(
 		}
 	}
 	val chaptersAdapter = BaseListAdapter<DownloadChapter>()
-		.addDelegate(ListItemType.CHAPTER_LIST, downloadChapterAD())
+		.addDelegate(ListItemType.CHAPTER, downloadChapterAD())
 
 	binding.recyclerViewChapters.addItemDecoration(DividerItemDecoration(context, RecyclerView.VERTICAL))
 	binding.recyclerViewChapters.adapter = chaptersAdapter

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsMenuProvider.kt

@@ -7,7 +7,6 @@ import android.view.MenuItem
 import androidx.core.view.MenuProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.DIALOG_THEME_CENTERED
 import org.koitharu.kotatsu.settings.SettingsActivity
 
 class DownloadsMenuProvider(
@@ -42,8 +41,10 @@ class DownloadsMenuProvider(
 	}
 
 	private fun confirmCancelAll() {
-		MaterialAlertDialogBuilder(context, DIALOG_THEME_CENTERED)
-			.setTitle(R.string.cancel_all)
+		MaterialAlertDialogBuilder(
+			context,
+			com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered,
+		).setTitle(R.string.cancel_all)
 			.setMessage(R.string.cancel_all_downloads_confirm)
 			.setIcon(R.drawable.ic_cancel_multiple)
 			.setNegativeButton(android.R.string.cancel, null)
@@ -53,8 +54,10 @@ class DownloadsMenuProvider(
 	}
 
 	private fun confirmRemoveCompleted() {
-		MaterialAlertDialogBuilder(context, DIALOG_THEME_CENTERED)
-			.setTitle(R.string.remove_completed)
+		MaterialAlertDialogBuilder(
+			context,
+			com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered,
+		).setTitle(R.string.remove_completed)
 			.setMessage(R.string.remove_completed_downloads_confirm)
 			.setIcon(R.drawable.ic_clear_all)
 			.setNegativeButton(android.R.string.cancel, null)

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt

@@ -21,7 +21,6 @@ import kotlinx.coroutines.plus
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.formatNumber
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
@@ -307,7 +306,7 @@ class DownloadsViewModel @Inject constructor(
 			return chapters.mapNotNullTo(ArrayList(size)) {
 				if (chapterIds == null || it.id in chapterIds) {
 					DownloadChapter(
-						number = it.formatNumber(),
+						number = it.number,
 						name = it.name,
 						isDownloaded = it.id in localChapters,
 					)

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/chapters/DownloadChapter.kt

@@ -4,7 +4,7 @@ import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 data class DownloadChapter(
-	val number: String?,
+	val number: Int,
 	val name: String,
 	val isDownloaded: Boolean,
 ) : ListModel {