Statistics filters

Currently translated at 100.0% (597 of 597 strings)

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

CONTRIBUTING.md

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

README.md

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

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 614
-		versionName = '6.6.3'
+		versionCode = 626
+		versionName = '6.7.4'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,29 +82,30 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:a2979753a9') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:103f578c61') {
 		exclude group: 'org.json', module: 'json'
 	}
 
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.12.0'
 	implementation 'androidx.activity:activity-ktx:1.8.2'
 	implementation 'androidx.fragment:fragment-ktx:1.6.2'
-	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.collection:collection:1.4.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-service:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.11.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
+	implementation 'com.google.android.material:material:1.12.0-alpha03'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
 
 	implementation 'androidx.work:work-runtime:2.9.0'
 	//noinspection GradleDependency
@@ -120,18 +121,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.7.0'
+	implementation 'com.squareup.okio:okio:3.8.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'com.google.dagger:hilt-android:2.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 'com.google.dagger:hilt-android:2.51'
+	kapt 'com.google.dagger:hilt-compiler:2.51'
+	implementation 'androidx.hilt:hilt-work:1.2.0'
+	kapt 'androidx.hilt:hilt-compiler:1.2.0'
 
-	implementation 'io.coil-kt:coil-base:2.5.0'
-	implementation 'io.coil-kt:coil-svg:2.5.0'
+	implementation 'io.coil-kt:coil-base:2.6.0'
+	implementation 'io.coil-kt:coil-svg:2.6.0'
 	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:02e6d6cfe9'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
@@ -141,22 +142,24 @@ 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'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20231013'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+	testImplementation 'org.json:json:20240205'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
 
 	androidTestImplementation 'androidx.test:runner:1.5.2'
 	androidTestImplementation 'androidx.test:rules:1.5.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
 
 	androidTestImplementation 'androidx.room:room-testing:2.6.1'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.1'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.50'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.50'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.51'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51'
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core
 
 import android.app.Application
 import android.content.Context
+import android.os.Build
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.hilt.work.HiltWorkerFactory
@@ -19,6 +20,7 @@ import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
+import org.conscrypt.Conscrypt
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.MangaDatabase
@@ -27,6 +29,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
+import java.security.Security
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -52,7 +55,7 @@ open class BaseApp : Application(), Configuration.Provider {
 	lateinit var appValidator: AppValidator
 
 	@Inject
-	lateinit var workScheduleManager: Provider<WorkScheduleManager>
+	lateinit var workScheduleManager: WorkScheduleManager
 
 	@Inject
 	lateinit var workManagerProvider: Provider<WorkManager>
@@ -66,6 +69,10 @@ 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) {
@@ -76,7 +83,7 @@ open class BaseApp : Application(), Configuration.Provider {
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
 		}
-		workScheduleManager.get().init()
+		workScheduleManager.init()
 		WorkServiceStopHelper(workManagerProvider).setup()
 	}
 

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

@@ -54,6 +54,7 @@ class JsonDeserializer(private val json: JSONObject) {
 		page = json.getInt("page"),
 		scroll = json.getDouble("scroll").toFloat(),
 		percent = json.getFloatOrDefault("percent", -1f),
+		chaptersCount = json.getIntOrDefault("chapters", -1),
 		deletedAt = 0L,
 	)
 

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

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

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

@@ -30,6 +30,7 @@ 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
@@ -48,20 +49,22 @@ import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingDao
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingEntity
+import org.koitharu.kotatsu.stats.data.StatsDao
+import org.koitharu.kotatsu.stats.data.StatsEntity
 import org.koitharu.kotatsu.suggestions.data.SuggestionDao
 import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 18
+const val DATABASE_VERSION = 19
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
-		ScrobblingEntity::class, MangaSourceEntity::class,
+		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -90,6 +93,8 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract fun getScrobblingDao(): ScrobblingDao
 
 	abstract fun getSourcesDao(): MangaSourcesDao
+
+	abstract fun getStatsDao(): StatsDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
@@ -110,6 +115,7 @@ 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/migrations/Migration18To19.kt

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

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

@@ -3,6 +3,7 @@ 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
@@ -13,6 +14,8 @@ 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")
@@ -29,12 +32,14 @@ fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
 	if (size <= 1) {
 		return size
 	}
-	val acc = HashMap<String?, Int>()
+	val acc = MutableObjectIntMap<String?>()
 	for (item in this) {
 		val branch = item.chapter.branch
-		acc[branch] = (acc[branch] ?: 0) + 1
+		acc[branch] = acc.getOrDefault(branch, 0) + 1
 	}
-	return acc.values.max()
+	var max = 0
+	acc.forEachValue { x -> if (x > max) max = x }
+	return max
 }
 
 @get:StringRes
@@ -113,3 +118,16 @@ val Manga.appUrl: Uri
 		.appendQueryParameter("name", title)
 		.appendQueryParameter("url", url)
 		.build()
+
+private val chaptersNumberFormat = DecimalFormat("#.#").also { f ->
+	f.decimalFormatSymbols = DecimalFormatSymbols.getInstance().also {
+		it.decimalSeparator = '.'
+	}
+}
+
+fun MangaChapter.formatNumber(): String? {
+	if (number <= 0f) {
+		return null
+	}
+	return chaptersNumberFormat.format(number.toDouble())
+}

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.parser
 
 import android.util.Log
+import androidx.collection.MutableLongSet
 import coil.request.CachePolicy
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -189,7 +190,7 @@ class RemoteMangaRepository(
 			return emptyList()
 		}
 		val result = ArrayList<MangaPage>(size)
-		val set = HashSet<Long>(size)
+		val set = MutableLongSet(size)
 		for (page in this) {
 			if (set.add(page.id)) {
 				result.add(page)
@@ -226,6 +227,5 @@ class RemoteMangaRepository(
 		}
 	}
 
-	private fun Result<*>.isValidResult() = exceptionOrNull() !is ParseException
-		&& (getOrNull() as? Collection<*>)?.isEmpty() != true
+	private fun Result<*>.isValidResult() = isSuccess && (getOrNull() as? Collection<*>)?.isEmpty() != true
 }

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

@@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.ArraySet
 import androidx.core.content.edit
 import androidx.core.os.LocaleListCompat
+import androidx.documentfile.provider.DocumentFile
 import androidx.preference.PreferenceManager
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.json.JSONArray
@@ -26,6 +27,7 @@ import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.find
+import org.koitharu.kotatsu.parsers.util.isNumeric
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
@@ -70,6 +72,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			}
 		}
 
+	val isNavLabelsVisible: Boolean
+		get() = prefs.getBoolean(KEY_NAV_LABELS, true)
+
 	var gridSize: Int
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
@@ -101,14 +106,21 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			}
 		}
 
-	val readerPageSwitch: Set<String>
-		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
+	var isReaderDoubleOnLandscape: Boolean
+		get() = prefs.getBoolean(KEY_READER_DOUBLE_PAGES, false)
+		set(value) = prefs.edit { putBoolean(KEY_READER_DOUBLE_PAGES, value) }
+
+	val isReaderVolumeButtonsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_VOLUME_BUTTONS, false)
 
 	val isReaderZoomButtonsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_ZOOM_BUTTONS, false)
 
-	val isReaderTapsAdaptive: Boolean
-		get() = !prefs.getBoolean(KEY_READER_TAPS_LTR, false)
+	val isReaderControlAlwaysLTR: Boolean
+		get() = prefs.getBoolean(KEY_READER_CONTROL_LTR, false)
+
+	val isReaderFullscreenEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_FULLSCREEN, true)
 
 	val isReaderOptimizationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_OPTIMIZE, false)
@@ -180,11 +192,13 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	var appPassword: String?
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
 		set(value) = prefs.edit {
-			if (value != null) putString(KEY_APP_PASSWORD, value) else remove(
-				KEY_APP_PASSWORD,
-			)
+			if (value != null) putString(KEY_APP_PASSWORD, value) else remove(KEY_APP_PASSWORD)
 		}
 
+	var isAppPasswordNumeric: Boolean
+		get() = prefs.getBoolean(KEY_APP_PASSWORD_NUMERIC, false)
+		set(value) = prefs.edit { putBoolean(KEY_APP_PASSWORD_NUMERIC, value) }
+
 	val isLoggingEnabled: Boolean
 		get() = prefs.getBoolean(KEY_LOGGING_ENABLED, false)
 
@@ -266,6 +280,9 @@ 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) }
@@ -347,15 +364,23 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
 
 	var historySortOrder: ListSortOrder
-		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.UPDATED)
+		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.LAST_READ)
 		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
 
+	var allFavoritesSortOrder: ListSortOrder
+		get() = prefs.getEnumValue(KEY_FAVORITES_ORDER, ListSortOrder.NEWEST)
+		set(value) = prefs.edit { putEnumValue(KEY_FAVORITES_ORDER, value) }
+
 	val isRelatedMangaEnabled: Boolean
 		get() = prefs.getBoolean(KEY_RELATED_MANGA, true)
 
 	val isWebtoonZoomEnable: Boolean
 		get() = prefs.getBoolean(KEY_WEBTOON_ZOOM, true)
 
+	@get:FloatRange(from = 0.0, to = 0.5)
+	val defaultWebtoonZoomOut: Float
+		get() = prefs.getInt(KEY_WEBTOON_ZOOM_OUT, 0).coerceIn(0, 50) / 100f
+
 	@get:FloatRange(from = 0.0, to = 1.0)
 	var readerAutoscrollSpeed: Float
 		get() = prefs.getFloat(KEY_READER_AUTOSCROLL_SPEED, 0f)
@@ -391,6 +416,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getString(KEY_BACKUP_PERIODICAL_OUTPUT, null)?.toUriOrNull()
 		set(value) = prefs.edit { putString(KEY_BACKUP_PERIODICAL_OUTPUT, value?.toString()) }
 
+	val isReadingTimeEstimationEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READING_TIME, true)
+
+	val isPagesSavingAskEnabled: Boolean
+		get() = prefs.getBoolean(KEY_PAGES_SAVE_ASK, true)
+
+	val isStatsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_STATS_ENABLED, false)
+
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -403,6 +437,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		prefs.edit { putStringSet(KEY_TIPS_CLOSED, closedTips + tip) }
 	}
 
+	fun getPagesSaveDir(context: Context): DocumentFile? =
+		prefs.getString(KEY_PAGES_SAVE_DIR, null)?.toUriOrNull()?.let {
+			DocumentFile.fromTreeUri(context, it)?.takeIf { it.canWrite() }
+		}
+
+	fun setPagesSaveDir(uri: Uri?) {
+		prefs.edit { putString(KEY_PAGES_SAVE_DIR, uri?.toString()) }
+	}
+
 	fun subscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
 		prefs.registerOnSharedPreferenceChangeListener(listener)
 	}
@@ -449,7 +492,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 
 	companion object {
 
-		const val PAGE_SWITCH_TAPS = "taps"
 		const val PAGE_SWITCH_VOLUME_KEYS = "volume"
 
 		const val TRACK_HISTORY = "history"
@@ -472,8 +514,11 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_GRID_SIZE = "grid_size"
 		const val KEY_REMOTE_SOURCES = "remote_sources"
 		const val KEY_LOCAL_STORAGE = "local_storage"
-		const val KEY_READER_SWITCHERS = "reader_switchers"
+		const val KEY_READER_DOUBLE_PAGES = "reader_double_pages"
 		const val KEY_READER_ZOOM_BUTTONS = "reader_zoom_buttons"
+		const val KEY_READER_CONTROL_LTR = "reader_taps_ltr"
+		const val KEY_READER_FULLSCREEN = "reader_fullscreen"
+		const val KEY_READER_VOLUME_BUTTONS = "reader_volume_buttons"
 		const val KEY_TRACKER_ENABLED = "tracker_enabled"
 		const val KEY_TRACKER_WIFI_ONLY = "tracker_wifi"
 		const val KEY_TRACK_SOURCES = "track_sources"
@@ -489,6 +534,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_APP_PASSWORD = "app_password"
+		const val KEY_APP_PASSWORD_NUMERIC = "app_password_num"
 		const val KEY_PROTECT_APP = "protect_app"
 		const val KEY_PROTECT_APP_BIOMETRIC = "protect_app_bio"
 		const val KEY_APP_VERSION = "app_version"
@@ -514,7 +560,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SHIKIMORI = "shikimori"
 		const val KEY_ANILIST = "anilist"
 		const val KEY_MAL = "mal"
+		const val KEY_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"
@@ -526,11 +574,13 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_BACKGROUND = "reader_background"
 		const val KEY_READER_SCREEN_ON = "reader_screen_on"
 		const val KEY_SHORTCUTS = "dynamic_shortcuts"
-		const val KEY_READER_TAPS_LTR = "reader_taps_ltr"
+		const val KEY_READER_TAP_ACTIONS = "reader_tap_actions"
 		const val KEY_READER_OPTIMIZE = "reader_optimize"
 		const val KEY_LOCAL_LIST_ORDER = "local_order"
 		const val KEY_HISTORY_ORDER = "history_order"
+		const val KEY_FAVORITES_ORDER = "fav_order"
 		const val KEY_WEBTOON_ZOOM = "webtoon_zoom"
+		const val KEY_WEBTOON_ZOOM_OUT = "webtoon_zoom_out"
 		const val KEY_PREFETCH_CONTENT = "prefetch_content"
 		const val KEY_APP_LOCALE = "app_locale"
 		const val KEY_LOGGING_ENABLED = "logging"
@@ -554,6 +604,7 @@ 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"
@@ -563,8 +614,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_CF_GRAYSCALE = "cf_grayscale"
 		const val KEY_IGNORE_DOZE = "ignore_dose"
 		const val KEY_DETAILS_TAB = "details_tab"
-
-		// About
+		const val KEY_READING_TIME = "reading_time"
+		const val KEY_PAGES_SAVE_DIR = "pages_dir"
+		const val KEY_PAGES_SAVE_ASK = "pages_dir_ask"
+		const val KEY_STATS_ENABLED = "stats_on"
 		const val KEY_APP_UPDATE = "app_update"
 		const val KEY_APP_TRANSLATION = "about_app_translation"
 	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -110,7 +110,7 @@ class ChipsView @JvmOverloads constructor(
 		chip.isChipIconVisible = false
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
-		chip.setEnsureMinTouchTargetSize(false)
+		chip.setEnsureMinTouchTargetSize(false) // TODO remove
 		chip.setOnClickListener(chipOnClickListener)
 		addView(chip)
 		return chip

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

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

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

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

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

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

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

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

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

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

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

@@ -27,7 +27,6 @@ import android.provider.Settings
 import android.view.View
 import android.view.ViewPropertyAnimator
 import android.view.Window
-import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IntegerRes
 import androidx.annotation.WorkerThread
@@ -216,21 +215,6 @@ 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 {

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.core.util.ext
 
 import android.content.ActivityNotFoundException
 import android.content.res.Resources
-import android.util.AndroidRuntimeException
 import androidx.annotation.DrawableRes
 import androidx.collection.arraySetOf
 import coil.network.HttpException
@@ -115,8 +114,8 @@ private val reportableExceptions = arraySetOf<Class<*>>(
 )
 
 fun Throwable.isWebViewUnavailable(): Boolean {
-	return (this is AndroidRuntimeException && message?.contains("WebView") == true) ||
-		cause?.isWebViewUnavailable() == true
+	val trace = stackTraceToString()
+	return trace.contains("android.webkit.WebView.<init>")
 }
 
 @Suppress("FunctionName")

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

@@ -1,34 +1,33 @@
 package org.koitharu.kotatsu.core.util.ext
 
-import android.app.Activity
 import android.graphics.Rect
 import android.os.Build
 import android.view.View
 import android.view.View.MeasureSpec
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
 import android.widget.Checkable
 import androidx.appcompat.widget.ActionMenuView
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.SoftwareKeyboardControllerCompat
 import androidx.core.view.children
 import androidx.core.view.descendants
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import com.google.android.material.slider.Slider
 import com.google.android.material.tabs.TabLayout
 import kotlin.math.roundToInt
 
 fun View.hideKeyboard() {
-	val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-	imm.hideSoftInputFromWindow(this.windowToken, 0)
+	SoftwareKeyboardControllerCompat(this).hide()
 }
 
 fun View.showKeyboard() {
-	val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-	imm.showSoftInput(this, 0)
+	SoftwareKeyboardControllerCompat(this).show()
 }
 
 fun View.hasGlobalPoint(x: Int, y: Int): Boolean {
@@ -161,3 +160,12 @@ 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()
+}

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

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

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

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

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

@@ -0,0 +1,53 @@
+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,12 +8,15 @@ 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 {
@@ -75,8 +78,7 @@ class ChaptersBottomSheetMediator(
 
 	fun lock() {
 		lockCounter++
-		behavior.isDraggable = lockCounter <= 0
-		pager.isUserInputEnabled = lockCounter <= 0
+		updateLock()
 	}
 
 	fun unlock() {
@@ -84,7 +86,12 @@ 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,10 +1,14 @@
 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(
@@ -61,3 +65,22 @@ fun MangaDetails.mapChapters(
 	}
 	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/DetailsActivity.kt

@@ -4,7 +4,9 @@ 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
@@ -107,7 +109,7 @@ class DetailsActivity :
 
 		if (viewBinding.layoutBottom != null) {
 			val behavior = BottomSheetBehavior.from(checkNotNull(viewBinding.layoutBottom))
-			val bsMediator = ChaptersBottomSheetMediator(behavior, viewBinding.pager)
+			val bsMediator = ChaptersBottomSheetMediator(behavior, viewBinding.pager, viewBinding.tabs)
 			actionModeDelegate.addListener(bsMediator)
 			checkNotNull(viewBinding.layoutBsHeader).addOnLayoutChangeListener(bsMediator)
 			onBackPressedDispatcher.addCallback(bsMediator)
@@ -136,7 +138,10 @@ class DetailsActivity :
 				},
 			),
 		)
-		viewModel.onActionDone.observeEvent(this, ReversibleActionObserver(viewBinding.containerDetails))
+		viewModel.onActionDone.observeEvent(
+			this,
+			ReversibleActionObserver(viewBinding.containerDetails, viewBinding.layoutBottom),
+		)
 		viewModel.onShowTip.observeEvent(this) { showTip() }
 		viewModel.historyInfo.observe(this, ::onHistoryChanged)
 		viewModel.selectedBranch.observe(this) {
@@ -148,6 +153,7 @@ class DetailsActivity :
 		viewModel.isChaptersEmpty.observe(this, chaptersMenuInvalidator)
 		val menuInvalidator = MenuInvalidator(this)
 		viewModel.favouriteCategories.observe(this, menuInvalidator)
+		viewModel.isStatsEnabled.observe(this, menuInvalidator)
 		viewModel.remoteManga.observe(this, menuInvalidator)
 		viewModel.branches.observe(this) {
 			viewBinding.buttonDropdown.isVisible = it.size > 1
@@ -185,6 +191,9 @@ 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()
@@ -201,6 +210,11 @@ class DetailsActivity :
 				true
 			}
 
+			R.id.action_forget -> {
+				viewModel.removeFromHistory()
+				true
+			}
+
 			R.id.action_pages_thumbs -> {
 				val history = viewModel.historyInfo.value.history
 				PagesThumbnailsSheet.show(
@@ -318,6 +332,18 @@ 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(' ')
@@ -363,8 +389,9 @@ class DetailsActivity :
 	}
 
 	private fun initPager() {
-		viewBinding.pager.recyclerView?.isNestedScrollingEnabled = false
 		val adapter = DetailsPagerAdapter(this)
+		viewBinding.pager.recyclerView?.isNestedScrollingEnabled = false
+		viewBinding.pager.offscreenPageLimit = 1
 		viewBinding.pager.adapter = adapter
 		TabLayoutMediator(viewBinding.tabs, viewBinding.pager, adapter).attach()
 		viewBinding.pager.setCurrentItem(settings.defaultDetailsTab, false)

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

@@ -48,6 +48,7 @@ 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
@@ -61,6 +62,7 @@ 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
@@ -101,6 +103,7 @@ 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()
@@ -118,6 +121,7 @@ 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) {
@@ -211,6 +215,19 @@ 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()) {
@@ -309,6 +326,10 @@ 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

@@ -23,6 +23,7 @@ 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,
@@ -43,6 +44,7 @@ class DetailsMenuProvider(
 		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.isStatsEnabled.value
 		menu.findItem(R.id.action_favourite).setIcon(
 			if (viewModel.favouriteCategories.value) R.drawable.ic_heart else R.drawable.ic_heart_outline,
 		)
@@ -101,6 +103,12 @@ class DetailsMenuProvider(
 				}
 			}
 
+			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

@@ -25,6 +25,7 @@ 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
@@ -42,6 +43,7 @@ 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
@@ -76,6 +78,7 @@ class DetailsViewModel @Inject constructor(
 	private val extraProvider: ListExtraProvider,
 	private val detailsLoadUseCase: DetailsLoadUseCase,
 	private val progressUpdateUseCase: ProgressUpdateUseCase,
+	private val readingTimeUseCase: ReadingTimeUseCase,
 ) : BaseViewModel() {
 
 	private val intent = MangaIntent(savedStateHandle)
@@ -97,6 +100,10 @@ class DetailsViewModel @Inject constructor(
 	val favouriteCategories = interactor.observeIsFavourite(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
 
+	val isStatsEnabled = settings.observeAsStateFlow(viewModelScope + Dispatchers.Default, AppSettings.KEY_STATS_ENABLED) {
+		isStatsEnabled
+	}
+
 	val remoteManga = MutableStateFlow<Manga?>(null)
 
 	val newChaptersCount = details.flatMapLatest { d ->
@@ -169,10 +176,21 @@ class DetailsViewModel @Inject constructor(
 	val branches: StateFlow<List<MangaBranch>> = combine(
 		details,
 		selectedBranch,
-	) { m, b ->
-		(m?.chapters ?: return@combine emptyList())
-			.map { x -> MangaBranch(x.key, x.value.size, x.key == b) }
-			.sortedWith(BranchComparator())
+		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())
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
 	val isChaptersEmpty: StateFlow<Boolean> = details.map {
@@ -200,6 +218,14 @@ 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
 
@@ -298,6 +324,7 @@ class DetailsViewModel @Inject constructor(
 				page = 0,
 				scroll = 0,
 				percent = percent,
+				force = true,
 			)
 		}
 	}
@@ -324,6 +351,13 @@ 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,6 +8,7 @@ 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,
@@ -57,6 +58,9 @@ 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/ChapterListItemAD.kt

@@ -1,5 +1,6 @@
 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
@@ -7,15 +8,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.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.getThemeColorStateList
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemChapterBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import com.google.android.material.R as materialR
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import com.google.android.material.R as MR
 
 fun chapterListItemAD(
 	clickListener: OnListItemClickListener<ChapterListItem>,
-) = adapterDelegateViewBinding<ChapterListItem, ChapterListItem, ItemChapterBinding>(
+) = adapterDelegateViewBinding<ChapterListItem, ListModel, ItemChapterBinding>(
 	{ inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) },
 ) {
 
@@ -26,31 +28,38 @@ fun chapterListItemAD(
 	bind { payloads ->
 		if (payloads.isEmpty()) {
 			binding.textViewTitle.text = item.chapter.name
-			binding.textViewNumber.text = item.chapter.number.toString()
-			binding.textViewDescription.textAndVisible = item.description()
+			binding.textViewDescription.textAndVisible = item.description
 		}
 		when {
 			item.isCurrent -> {
-				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_primary)
-				binding.textViewNumber.setTextColor(context.getThemeColor(materialR.attr.colorOnPrimary))
+				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
 			}
 
 			item.isUnread -> {
-				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_default)
-				binding.textViewNumber.setTextColor(context.getThemeColor(materialR.attr.colorOnTertiary))
+				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
 			}
 
 			else -> {
-				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_outline)
-				binding.textViewNumber.setTextColor(context.getThemeColor(android.R.attr.textColorTertiary))
+				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.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,22 +5,20 @@ 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(
 	onItemClickListener: OnListItemClickListener<ChapterListItem>,
-) : BaseListAdapter<ChapterListItem>(), FastScroller.SectionIndexer {
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	init {
-		setHasStableIds(true)
-		delegatesManager.addDelegate(chapterListItemAD(onItemClickListener))
-	}
-
-	override fun getItemId(position: Int): Long {
-		return items[position].chapter.id
+		addDelegate(ListItemType.CHAPTER, chapterListItemAD(onItemClickListener))
+		addDelegate(ListItemType.HEADER, listHeaderAD(null))
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
-		val item = items.getOrNull(position) ?: return null
-		return item.chapter.number.toString()
+		return findHeader(position)?.getText(context)
 	}
 }

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

@@ -9,7 +9,9 @@ import android.view.View
 import androidx.core.graphics.ColorUtils
 import androidx.recyclerview.widget.RecyclerView
 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() {
@@ -25,6 +27,12 @@ class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecor
 		paint.style = Paint.Style.FILL
 	}
 
+	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(
 		canvas: Canvas,
 		parent: RecyclerView,

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

@@ -1,6 +1,8 @@
 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
 
@@ -10,6 +12,14 @@ 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() {
@@ -38,13 +48,20 @@ data class ChapterListItem(
 	val isNew: Boolean
 		get() = hasFlag(FLAG_NEW)
 
-	fun description(): CharSequence? {
-		val scanlator = chapter.scanlator?.takeUnless { it.isBlank() }
-		return when {
-			uploadDate != null && scanlator != null -> "$uploadDate • $scanlator"
-			scanlator != null -> scanlator
-			else -> uploadDate
+	private fun buildDescription(): String {
+		val joiner = StringJoiner(" • ")
+		chapter.formatNumber()?.let {
+			joiner.add("#").append(it)
 		}
+		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 {

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

@@ -7,6 +7,7 @@ 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/chapters/ChaptersFragment.kt

@@ -12,6 +12,9 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
 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
@@ -26,6 +29,9 @@ 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
@@ -57,12 +63,17 @@ class ChaptersFragment :
 			callback = this,
 		)
 		with(binding.recyclerViewChapters) {
+			addItemDecoration(TypedListSpacingDecoration(context, true))
 			checkNotNull(selectionController).attachToRecyclerView(this)
 			setHasFixedSize(true)
+			isNestedScrollingEnabled = false
 			adapter = chaptersAdapter
 		}
 		viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
-		viewModel.chapters.observe(viewLifecycleOwner, this::onChaptersChanged)
+		viewModel.chapters
+			.map { it.withVolumeHeaders(requireContext()) }
+			.flowOn(Dispatchers.Default)
+			.observe(viewLifecycleOwner, this::onChaptersChanged)
 		viewModel.isChaptersEmpty.observe(viewLifecycleOwner) {
 			binding.textViewHolder.isVisible = it
 		}
@@ -83,6 +94,17 @@ 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
@@ -132,6 +154,9 @@ 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()) {
@@ -147,7 +172,13 @@ class ChaptersFragment :
 			}
 
 			R.id.action_select_all -> {
-				val ids = chaptersAdapter?.items?.map { it.chapter.id } ?: return false
+				val ids = chaptersAdapter?.items?.mapNotNull {
+					if (it is ChapterListItem) {
+						it.chapter.id
+					} else {
+						null
+					}
+				} ?: return false
 				controller.addAll(ids)
 				true
 			}
@@ -171,7 +202,15 @@ 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().filter { (_, x) -> x.chapter.id in selectedIds }
+		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
+			}
+		}
 		var canSave = true
 		var canDelete = true
 		items.forEach { (_, x) ->
@@ -195,15 +234,15 @@ class ChaptersFragment :
 	}
 
 	override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
-		requireViewBinding().recyclerViewChapters.invalidateItemDecorations()
+		viewBinding?.recyclerViewChapters?.invalidateItemDecorations()
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) = Unit
 
-	private fun onChaptersChanged(list: List<ChapterListItem>) {
+	private fun onChaptersChanged(list: List<ListModel>) {
 		val adapter = chaptersAdapter ?: return
 		if (adapter.itemCount == 0) {
-			val position = list.indexOfFirst { it.isCurrent } - 1
+			val position = list.indexOfFirst { it is ChapterListItem && 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,7 +13,9 @@ 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
@@ -65,11 +67,12 @@ class PagesFragment :
 			detailsViewModel.selectedBranch,
 		) { details, history, branch ->
 			if (details != null && (details.isLoaded || details.chapters.isNotEmpty())) {
-				PagesViewModel.State(details, history, branch)
+				PagesViewModel.State(details.filterChapters(branch), history, branch)
 			} else {
 				null
 			}
-		}.observe(this, viewModel::updateState)
+		}.flowOn(Dispatchers.Default)
+			.observe(this, viewModel::updateState)
 	}
 
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentPagesBinding {
@@ -88,6 +91,7 @@ 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 })
@@ -112,6 +116,17 @@ 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/DownloadsMenuProvider.kt

@@ -7,6 +7,7 @@ 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(
@@ -41,10 +42,8 @@ class DownloadsMenuProvider(
 	}
 
 	private fun confirmCancelAll() {
-		MaterialAlertDialogBuilder(
-			context,
-			com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered,
-		).setTitle(R.string.cancel_all)
+		MaterialAlertDialogBuilder(context, DIALOG_THEME_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)
@@ -54,10 +53,8 @@ class DownloadsMenuProvider(
 	}
 
 	private fun confirmRemoveCompleted() {
-		MaterialAlertDialogBuilder(
-			context,
-			com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered,
-		).setTitle(R.string.remove_completed)
+		MaterialAlertDialogBuilder(context, DIALOG_THEME_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,6 +21,7 @@ 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
@@ -306,7 +307,7 @@ class DownloadsViewModel @Inject constructor(
 			return chapters.mapNotNullTo(ArrayList(size)) {
 				if (chapterIds == null || it.id in chapterIds) {
 					DownloadChapter(
-						number = it.number,
+						number = it.formatNumber(),
 						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: Int,
+	val number: String?,
 	val name: String,
 	val isDownloaded: Boolean,
 ) : ListModel {

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadSlowdownDispatcher.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.download.ui.worker
 
+import androidx.collection.MutableObjectLongMap
 import kotlinx.coroutines.delay
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
@@ -9,7 +10,7 @@ class DownloadSlowdownDispatcher(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val defaultDelay: Long,
 ) {
-	private val timeMap = HashMap<MangaSource, Long>()
+	private val timeMap = MutableObjectLongMap<MangaSource>()
 
 	suspend fun delay(source: MangaSource) {
 		val repo = mangaRepositoryFactory.create(source) as? RemoteMangaRepository ?: return
@@ -17,7 +18,7 @@ class DownloadSlowdownDispatcher(
 			return
 		}
 		val lastRequest = synchronized(timeMap) {
-			val res = timeMap[source] ?: 0L
+			val res = timeMap.getOrDefault(source, 0L)
 			timeMap[source] = System.currentTimeMillis()
 			res
 		}

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt

@@ -91,6 +91,7 @@ class DownloadWorker @AssistedInject constructor(
 	private val localMangaRepository: LocalMangaRepository,
 	private val mangaDataRepository: MangaDataRepository,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val settings: AppSettings,
 	@LocalStorageChanges private val localStorageChanges: MutableSharedFlow<LocalManga?>,
 	notificationFactoryFactory: DownloadNotificationFactory.Factory,
 ) : CoroutineWorker(appContext, params) {
@@ -182,7 +183,7 @@ class DownloadWorker @AssistedInject constructor(
 				}
 				val repo = mangaRepositoryFactory.create(manga.source)
 				val mangaDetails = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
-				output = LocalMangaOutput.getOrCreate(destination, mangaDetails)
+				output = LocalMangaOutput.getOrCreate(destination, mangaDetails, settings.preferredDownloadFormat)
 				val coverUrl = mangaDetails.largeCoverUrl.ifNullOrEmpty { mangaDetails.coverUrl }
 				if (coverUrl.isNotEmpty()) {
 					downloadFile(coverUrl, destination, repo.source).let { file ->
@@ -193,12 +194,12 @@ class DownloadWorker @AssistedInject constructor(
 				val chapters = getChapters(mangaDetails, includedIds)
 				for ((chapterIndex, chapter) in chapters.withIndex()) {
 					checkIsPaused()
-					if (chaptersToSkip.remove(chapter.id)) {
+					if (chaptersToSkip.remove(chapter.value.id)) {
 						publishState(currentState.copy(downloadedChapters = currentState.downloadedChapters + 1))
 						continue
 					}
 					val pages = runFailsafe {
-						repo.getPages(chapter)
+						repo.getPages(chapter.value)
 					} ?: continue
 					val pageCounter = AtomicInteger(0)
 					channelFlow {
@@ -237,7 +238,7 @@ class DownloadWorker @AssistedInject constructor(
 							),
 						)
 					}
-					if (output.flushChapter(chapter)) {
+					if (output.flushChapter(chapter.value)) {
 						runCatchingCancellable {
 							localStorageChanges.emit(LocalMangaInput.of(output.rootFile).getManga())
 						}.onFailure(Throwable::printStackTraceDebug)
@@ -377,19 +378,26 @@ class DownloadWorker @AssistedInject constructor(
 	private fun getChapters(
 		manga: Manga,
 		includedIds: LongArray?,
-	): List<MangaChapter> {
-		val chapters = checkNotNull(manga.chapters) {
-			"Chapters list must not be null"
-		}.toMutableList()
-		if (includedIds != null) {
-			val chaptersIdsSet = includedIds.toMutableSet()
-			chapters.retainAll { x -> chaptersIdsSet.remove(x.id) }
+	): List<IndexedValue<MangaChapter>> {
+		val chapters = checkNotNull(manga.chapters) { "Chapters list must not be null" }
+		val chaptersIdsSet = includedIds?.toMutableSet()
+		val result = ArrayList<IndexedValue<MangaChapter>>((chaptersIdsSet ?: chapters).size)
+		val counters = HashMap<String?, Int>()
+		for (chapter in chapters) {
+			val index = counters[chapter.branch] ?: 0
+			counters[chapter.branch] = index + 1
+			if (chaptersIdsSet != null && !chaptersIdsSet.remove(chapter.id)) {
+				continue
+			}
+			result.add(IndexedValue(index, chapter))
+		}
+		if (chaptersIdsSet != null) {
 			check(chaptersIdsSet.isEmpty()) {
 				"${chaptersIdsSet.size} of ${includedIds.size} requested chapters not found in manga"
 			}
 		}
-		check(chapters.isNotEmpty()) { "Chapters list must not be empty" }
-		return chapters
+		check(result.isNotEmpty()) { "Chapters list must not be empty" }
+		return result
 	}
 
 	private suspend inline fun <T> withMangaLock(manga: Manga, block: () -> T) = try {

app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt

@@ -57,7 +57,7 @@ class MangaSourcesRepository @Inject constructor(
 			observeIsNsfwDisabled(),
 			dao.observeEnabled(SourcesSortOrder.MANUAL),
 		) { skipNsfw, sources ->
-			sources.count { skipNsfw || !MangaSource(it.source).isNsfw() }
+			sources.count { !skipNsfw || !MangaSource(it.source).isNsfw() }
 		}.distinctUntilChanged()
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt

@@ -1,9 +1,7 @@
 package org.koitharu.kotatsu.explore.ui.adapter
 
-import android.graphics.Color
 import android.view.View
 import androidx.lifecycle.LifecycleOwner
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
@@ -15,10 +13,9 @@ 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.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
+import org.koitharu.kotatsu.core.util.ext.setProgressIcon
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemExploreButtonsBinding
@@ -30,7 +27,6 @@ import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.explore.ui.model.RecommendationsItem
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import com.google.android.material.R as materialR
 
 fun exploreButtonsAD(
 	clickListener: View.OnClickListener,
@@ -45,16 +41,7 @@ fun exploreButtonsAD(
 
 	bind {
 		if (item.isRandomLoading) {
-			val icon = CircularProgressDrawable(context)
-			icon.strokeWidth = context.resources.resolveDp(2f)
-			icon.setColorSchemeColors(
-				context.getThemeColor(
-					materialR.attr.colorPrimary,
-					Color.DKGRAY,
-				),
-			)
-			binding.buttonRandom.icon = icon
-			icon.start()
+			binding.buttonRandom.setProgressIcon()
 		} else {
 			binding.buttonRandom.setIconResource(R.drawable.ic_dice)
 		}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt

@@ -95,6 +95,22 @@ abstract class FavouritesDao {
 		return findCoversImpl(query)
 	}
 
+	suspend fun findCovers(order: ListSortOrder, limit: Int): List<Cover> {
+		val orderBy = getOrderBy(order)
+
+		@Language("RoomSql")
+		val query = SimpleSQLiteQuery(
+			"SELECT manga.cover_url AS url, manga.source AS source FROM favourites " +
+				"LEFT JOIN manga ON favourites.manga_id = manga.manga_id " +
+				"WHERE deleted_at = 0 GROUP BY manga.manga_id ORDER BY $orderBy LIMIT ?",
+			arrayOf<Any>(limit),
+		)
+		return findCoversImpl(query)
+	}
+
+	@Query("SELECT COUNT(DISTINCT manga_id) FROM favourites WHERE deleted_at = 0")
+	abstract fun observeMangaCount(): Flow<Int>
+
 	@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites WHERE deleted_at = 0)")
 	abstract suspend fun findAllManga(): List<MangaEntity>
 
@@ -175,9 +191,10 @@ abstract class FavouritesDao {
 		ListSortOrder.RATING -> "manga.rating DESC"
 		ListSortOrder.NEWEST -> "favourites.created_at DESC"
 		ListSortOrder.ALPHABETIC -> "manga.title ASC"
-		ListSortOrder.NEW_CHAPTERS -> "(SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id) DESC"
-		ListSortOrder.UPDATED, // for legacy support
-		ListSortOrder.PROGRESS -> "(SELECT percent FROM history WHERE history.manga_id = manga.manga_id) DESC"
+		ListSortOrder.ALPHABETIC_REVERSE -> "manga.title DESC"
+		ListSortOrder.NEW_CHAPTERS -> "IFNULL((SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
+		ListSortOrder.PROGRESS -> "IFNULL((SELECT percent FROM history WHERE history.manga_id = manga.manga_id), 0) DESC"
+		ListSortOrder.LAST_READ -> "IFNULL((SELECT updated_at FROM history WHERE history.manga_id = manga.manga_id), 0) DESC"
 
 		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
 	}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt

@@ -60,6 +60,11 @@ class FavouritesRepository @Inject constructor(
 			.flatMapLatest { order -> observeAll(categoryId, order) }
 	}
 
+	fun observeMangaCount(): Flow<Int> {
+		return db.getFavouritesDao().observeMangaCount()
+			.distinctUntilChanged()
+	}
+
 	fun observeCategories(): Flow<List<FavouriteCategory>> {
 		return db.getFavouriteCategoriesDao().observeAll().mapItems {
 			it.toFavouriteCategory()
@@ -89,6 +94,10 @@ class FavouritesRepository @Inject constructor(
 			}
 	}
 
+	suspend fun getAllFavoritesCovers(order: ListSortOrder, limit: Int): List<Cover> {
+		return db.getFavouritesDao().findCovers(order, limit)
+	}
+
 	fun observeCategory(id: Long): Flow<FavouriteCategory?> {
 		return db.getFavouriteCategoriesDao().observe(id)
 			.map { it?.toFavouriteCategory() }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt

@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
-import com.google.android.material.R as materialR
+import org.koitharu.kotatsu.core.util.ext.DIALOG_THEME_CENTERED
 
 class CategoriesSelectionCallback(
 	private val recyclerView: RecyclerView,
@@ -75,7 +75,7 @@ class CategoriesSelectionCallback(
 
 	private fun confirmDeleteCategories(ids: Set<Long>, mode: ActionMode) {
 		val context = recyclerView.context
-		MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
+		MaterialAlertDialogBuilder(context, DIALOG_THEME_CENTERED)
 			.setMessage(R.string.categories_delete_confirm)
 			.setTitle(R.string.remove_category)
 			.setIcon(R.drawable.ic_delete)

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt

@@ -76,7 +76,13 @@ class FavouriteCategoriesActivity :
 		}
 	}
 
-	override fun onItemClick(item: FavouriteCategory, view: View) {
+	override fun onItemClick(item: FavouriteCategory?, view: View) {
+		if (item == null) {
+			if (selectionController.count == 0) {
+				startActivity(FavouritesActivity.newIntent(view.context))
+			}
+			return
+		}
 		if (selectionController.onItemClick(item.id)) {
 			return
 		}
@@ -92,8 +98,12 @@ class FavouriteCategoriesActivity :
 		startActivity(intent)
 	}
 
-	override fun onItemLongClick(item: FavouriteCategory, view: View): Boolean {
-		return selectionController.onItemLongClick(item.id)
+	override fun onItemLongClick(item: FavouriteCategory?, view: View): Boolean {
+		return item != null && selectionController.onItemLongClick(item.id)
+	}
+
+	override fun onShowAllClick(isChecked: Boolean) {
+		viewModel.setAllCategoriesVisible(isChecked)
 	}
 
 	override fun onDragHandleTouch(holder: RecyclerView.ViewHolder): Boolean {

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesListListener.kt

@@ -5,9 +5,11 @@ import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 
-interface FavouriteCategoriesListListener : OnListItemClickListener<FavouriteCategory> {
+interface FavouriteCategoriesListListener : OnListItemClickListener<FavouriteCategory?> {
 
 	fun onDragHandleTouch(holder: RecyclerView.ViewHolder): Boolean
 
 	fun onEditClick(item: FavouriteCategory, view: View)
+
+	fun onShowAllClick(isChecked: Boolean)
 }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt

@@ -5,17 +5,21 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.requireValue
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.domain.model.Cover
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.AllCategoriesListModel
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -30,9 +34,13 @@ class FavouritesCategoriesViewModel @Inject constructor(
 
 	private var commitJob: Job? = null
 
-	val content = repository.observeCategoriesWithCovers()
-		.map { it.toUiList() }
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
+	val content = combine(
+		repository.observeCategoriesWithCovers(),
+		observeAllCategories(),
+		settings.observeAsFlow(AppSettings.KEY_ALL_FAVOURITES_VISIBLE) { isAllFavouritesVisible },
+	) { cats, all, showAll ->
+		cats.toUiList(all, showAll)
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
 
 	fun deleteCategories(ids: Set<Long>) {
 		launchJob(Dispatchers.Default) {
@@ -74,21 +82,46 @@ class FavouritesCategoriesViewModel @Inject constructor(
 		}
 	}
 
-	private fun Map<FavouriteCategory, List<Cover>>.toUiList(): List<ListModel> = map { (category, covers) ->
-		CategoryListModel(
-			mangaCount = covers.size,
-			covers = covers.take(3),
-			category = category,
-			isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
-		)
-	}.ifEmpty {
-		listOf(
-			EmptyState(
-				icon = R.drawable.ic_empty_favourites,
-				textPrimary = R.string.text_empty_holder_primary,
-				textSecondary = R.string.empty_favourite_categories,
-				actionStringRes = 0,
+	private fun Map<FavouriteCategory, List<Cover>>.toUiList(
+		allFavorites: Pair<Int, List<Cover>>,
+		showAll: Boolean
+	): List<ListModel> {
+		if (isEmpty()) {
+			return listOf(
+				EmptyState(
+					icon = R.drawable.ic_empty_favourites,
+					textPrimary = R.string.text_empty_holder_primary,
+					textSecondary = R.string.empty_favourite_categories,
+					actionStringRes = 0,
+				),
+			)
+		}
+		val result = ArrayList<ListModel>(size + 1)
+		result.add(
+			AllCategoriesListModel(
+				mangaCount = allFavorites.first,
+				covers = allFavorites.second,
+				isVisible = showAll,
 			),
 		)
+		mapTo(result) { (category, covers) ->
+			CategoryListModel(
+				mangaCount = covers.size,
+				covers = covers.take(3),
+				category = category,
+				isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
+			)
+		}
+		return result
+	}
+
+	private fun observeAllCategories(): Flow<Pair<Int, List<Cover>>> {
+		return settings.observeAsFlow(AppSettings.KEY_FAVORITES_ORDER) {
+			allFavoritesSortOrder
+		}.mapLatest { order ->
+			repository.getAllFavoritesCovers(order, limit = 3)
+		}.combine(repository.observeMangaCount()) { covers, count ->
+			count to covers
+		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/AllCategoriesListModel.kt

@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.favourites.ui.categories.adapter
+
+import org.koitharu.kotatsu.favourites.domain.model.Cover
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+data class AllCategoriesListModel(
+	val mangaCount: Int,
+	val covers: List<Cover>,
+	val isVisible: Boolean,
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is AllCategoriesListModel
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return if (previousState is AllCategoriesListModel && previousState.isVisible != isVisible) {
+			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+		} else {
+			super.getChangePayload(previousState)
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoriesAdapter.kt

@@ -19,6 +19,7 @@ class CategoriesAdapter(
 
 	init {
 		addDelegate(ListItemType.CATEGORY_LARGE, categoryAD(coil, lifecycleOwner, onItemClickListener))
+		addDelegate(ListItemType.NAV_ITEM, allCategoriesAD(coil, lifecycleOwner, onItemClickListener))
 		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listListener))
 		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
 	}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt

@@ -21,6 +21,7 @@ import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
+import org.koitharu.kotatsu.databinding.ItemCategoriesAllBinding
 import org.koitharu.kotatsu.databinding.ItemCategoryBinding
 import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesListListener
 import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -92,3 +93,68 @@ fun categoryAD(
 		}
 	}
 }
+
+fun allCategoriesAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	clickListener: FavouriteCategoriesListListener,
+) = adapterDelegateViewBinding<AllCategoriesListModel, ListModel, ItemCategoriesAllBinding>(
+	{ inflater, parent -> ItemCategoriesAllBinding.inflate(inflater, parent, false) },
+) {
+	val eventListener = OnClickListener { v ->
+		if (v.id == R.id.imageView_visible) {
+			clickListener.onShowAllClick(!item.isVisible)
+		} else {
+			clickListener.onItemClick(null, v)
+		}
+	}
+	val backgroundColor = context.getThemeColor(android.R.attr.colorBackground)
+	ImageViewCompat.setImageTintList(
+		binding.imageViewCover3,
+		ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153)),
+	)
+	ImageViewCompat.setImageTintList(
+		binding.imageViewCover2,
+		ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76)),
+	)
+	binding.imageViewCover2.backgroundTintList =
+		ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76))
+	binding.imageViewCover3.backgroundTintList =
+		ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153))
+	val fallback = ColorDrawable(Color.TRANSPARENT)
+	val coverViews = arrayOf(binding.imageViewCover1, binding.imageViewCover2, binding.imageViewCover3)
+	val crossFadeDuration = context.getAnimationDuration(R.integer.config_defaultAnimTime).toInt()
+	itemView.setOnClickListener(eventListener)
+	binding.imageViewVisible.setOnClickListener(eventListener)
+
+	bind {
+		binding.textViewSubtitle.text = if (item.mangaCount == 0) {
+			getString(R.string.empty)
+		} else {
+			context.resources.getQuantityString(
+				R.plurals.items,
+				item.mangaCount,
+				item.mangaCount,
+			)
+		}
+		binding.imageViewVisible.setImageResource(
+			if (item.isVisible) {
+				R.drawable.ic_eye
+			} else {
+				R.drawable.ic_eye_off
+			},
+		)
+		repeat(coverViews.size) { i ->
+			val cover = item.covers.getOrNull(i)
+			coverViews[i].newImageRequest(lifecycleOwner, cover?.url)?.run {
+				placeholder(R.drawable.ic_placeholder)
+				fallback(fallback)
+				source(cover?.mangaSource)
+				crossfade(crossFadeDuration * (i + 1))
+				error(R.drawable.ic_error_placeholder)
+				allowRgb565(true)
+				enqueueWith(coil)
+			}
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt

@@ -68,9 +68,8 @@ class FavouritesCategoryEditActivity :
 
 	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
 		super.onRestoreInstanceState(savedInstanceState)
-		val order = savedInstanceState.getSerializableCompat<ListSortOrder>(KEY_SORT_ORDER)
-		if (order != null) {
-			selectedSortOrder = order
+		savedInstanceState.getSerializableCompat<ListSortOrder>(KEY_SORT_ORDER)?.let { 
+		    selectedSortOrder = it
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouriteTabModel.kt

@@ -4,7 +4,7 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 
 data class FavouriteTabModel(
 	val id: Long,
-	val title: String,
+	val title: String?,
 ) : ListModel {
 
 	override fun areItemsTheSame(other: ListModel): Boolean {

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouriteTabPopupMenuProvider.kt

@@ -0,0 +1,53 @@
+package org.koitharu.kotatsu.favourites.ui.container
+
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+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.favourites.ui.categories.edit.FavouritesCategoryEditActivity
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
+
+class FavouriteTabPopupMenuProvider(
+	private val context: Context,
+	private val viewModel: FavouritesContainerViewModel,
+	private val categoryId: Long
+) : MenuProvider {
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		val menuResId = if (categoryId == NO_ID) {
+			R.menu.popup_fav_tab_all
+		} else {
+			R.menu.popup_fav_tab
+		}
+		menuInflater.inflate(menuResId, menu)
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+		when (menuItem.itemId) {
+			R.id.action_hide -> viewModel.hide(categoryId)
+			R.id.action_edit -> context.startActivity(
+				FavouritesCategoryEditActivity.newIntent(context, categoryId),
+			)
+
+			R.id.action_delete -> confirmDelete()
+
+			else -> return false
+		}
+		return true
+	}
+
+	private fun confirmDelete() {
+		MaterialAlertDialogBuilder(context, DIALOG_THEME_CENTERED)
+			.setMessage(R.string.categories_delete_confirm)
+			.setTitle(R.string.remove_category)
+			.setIcon(R.drawable.ic_delete)
+			.setNegativeButton(android.R.string.cancel, null)
+			.setPositiveButton(R.string.remove) { _, _ ->
+				viewModel.deleteCategory(categoryId)
+			}.show()
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerAdapter.kt

@@ -1,33 +1,46 @@
 package org.koitharu.kotatsu.favourites.ui.container
 
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.recyclerview.widget.AdapterListUpdateCallback
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.AsyncListDiffer
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
 import kotlinx.coroutines.flow.FlowCollector
+import org.koitharu.kotatsu.core.util.ContinuationResumeRunnable
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
-import org.koitharu.kotatsu.parsers.util.replaceWith
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import kotlin.coroutines.suspendCoroutine
 
-@Suppress("DEPRECATION")
-class FavouritesContainerAdapter(
-	fm: FragmentManager
-) : FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT),
+class FavouritesContainerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment),
 	FlowCollector<List<FavouriteTabModel>> {
 
-	private val dataSet = ArrayList<FavouriteTabModel>()
+	private val differ = AsyncListDiffer(
+		AdapterListUpdateCallback(this),
+		AsyncDifferConfig.Builder(ListModelDiffCallback<FavouriteTabModel>())
+			.setBackgroundThreadExecutor(Dispatchers.Default.limitedParallelism(2).asExecutor())
+			.build(),
+	)
 
-	override fun getCount(): Int = dataSet.size
+	override fun getItemCount(): Int = differ.currentList.size
 
-	override fun getItem(position: Int): Fragment {
-		val item = dataSet[position]
+	override fun getItemId(position: Int): Long {
+		return differ.currentList[position].id
+	}
+
+	override fun containsItem(itemId: Long): Boolean {
+		return differ.currentList.any { x -> x.id == itemId }
+	}
+
+	override fun createFragment(position: Int): Fragment {
+		val item = differ.currentList[position]
 		return FavouritesListFragment.newInstance(item.id)
 	}
 
-	override fun getPageTitle(position: Int): CharSequence {
-		return dataSet[position].title
+	override suspend fun emit(value: List<FavouriteTabModel>) = suspendCoroutine { cont ->
+		differ.submitList(value, ContinuationResumeRunnable(cont))
 	}
 
-	override suspend fun emit(value: List<FavouriteTabModel>) {
-		dataSet.replaceWith(value)
-		notifyDataSetChanged()
-	}
+	fun getItem(position: Int): FavouriteTabModel = differ.currentList[position]
 }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerAdapter2.kt

@@ -1,55 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.container
-
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.AdapterListUpdateCallback
-import androidx.recyclerview.widget.AsyncDifferConfig
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator.TabConfigurationStrategy
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.asExecutor
-import kotlinx.coroutines.flow.FlowCollector
-import org.koitharu.kotatsu.core.util.ContinuationResumeRunnable
-import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
-import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
-import kotlin.coroutines.suspendCoroutine
-
-// FIXME migrate to ViewPager2 in FavouritesContainerFragment
-class FavouritesContainerAdapter2(fragment: Fragment) :
-	FragmentStateAdapter(fragment.childFragmentManager, fragment.viewLifecycleOwner.lifecycle),
-	TabConfigurationStrategy,
-	FlowCollector<List<FavouriteTabModel>> {
-
-	private val differ = AsyncListDiffer(
-		AdapterListUpdateCallback(this),
-		AsyncDifferConfig.Builder(ListModelDiffCallback<FavouriteTabModel>())
-			.setBackgroundThreadExecutor(Dispatchers.Default.limitedParallelism(2).asExecutor())
-			.build(),
-	)
-
-	override fun getItemCount(): Int = differ.currentList.size
-
-	override fun getItemId(position: Int): Long {
-		return differ.currentList[position].id
-	}
-
-	override fun containsItem(itemId: Long): Boolean {
-		return differ.currentList.any { x -> x.id == itemId }
-	}
-
-	override fun createFragment(position: Int): Fragment {
-		val item = differ.currentList[position]
-		return FavouritesListFragment.newInstance(item.id)
-	}
-
-	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
-		val item = differ.currentList[position]
-		tab.text = item.title
-		tab.tag = item
-	}
-
-	override suspend fun emit(value: List<FavouriteTabModel>) = suspendCoroutine { cont ->
-		differ.submitList(value, ContinuationResumeRunnable(cont))
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerFragment.kt

@@ -12,14 +12,18 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
 import coil.ImageLoader
+import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.util.ActionModeListener
+import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.recyclerView
 import org.koitharu.kotatsu.core.util.ext.setTabsEnabled
 import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
 import org.koitharu.kotatsu.databinding.FragmentFavouritesContainerBinding
@@ -43,15 +47,21 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesContainerBind
 
 	override fun onViewBindingCreated(binding: FragmentFavouritesContainerBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		val adapter = FavouritesContainerAdapter(childFragmentManager)
-		binding.pager.adapter = adapter
-		binding.tabs.setupWithViewPager(binding.pager)
+		val pagerAdapter = FavouritesContainerAdapter(this)
+		binding.pager.adapter = pagerAdapter
 		binding.pager.offscreenPageLimit = 1
+		binding.pager.recyclerView?.isNestedScrollingEnabled = false
+		TabLayoutMediator(
+			binding.tabs,
+			binding.pager,
+			FavouritesTabConfigurationStrategy(pagerAdapter, viewModel),
+		).attach()
 		binding.stubEmpty.setOnInflateListener(this)
 		actionModeDelegate.addListener(this)
-		viewModel.categories.observe(viewLifecycleOwner, adapter)
+		viewModel.categories.observe(viewLifecycleOwner, pagerAdapter)
 		viewModel.isEmpty.observe(viewLifecycleOwner, ::onEmptyStateChanged)
 		addMenuProvider(FavouritesContainerMenuProvider(binding.root.context))
+		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.pager))
 	}
 
 	override fun onDestroyView() {

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerViewModel.kt

@@ -4,30 +4,80 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.util.ext.mapItems
+import org.koitharu.kotatsu.core.ui.util.ReversibleAction
+import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
+import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
+import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
 import javax.inject.Inject
 
 @HiltViewModel
 class FavouritesContainerViewModel @Inject constructor(
-	favouritesRepository: FavouritesRepository,
+	private val settings: AppSettings,
+	private val favouritesRepository: FavouritesRepository,
 ) : BaseViewModel() {
 
+	val onActionDone = MutableEventFlow<ReversibleAction>()
+
 	private val categoriesStateFlow = favouritesRepository.observeCategoriesForLibrary()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
-	val categories = categoriesStateFlow.filterNotNull()
-		.mapItems { FavouriteTabModel(it.id, it.title) }
-		.distinctUntilChanged()
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
+	val categories = combine(
+		categoriesStateFlow.filterNotNull(),
+		observeAllFavouritesVisibility(),
+	) { list, showAll ->
+		list.toUi(showAll)
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
 	val isEmpty = categoriesStateFlow.map {
 		it?.isEmpty() == true
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+
+	private fun List<FavouriteCategory>.toUi(showAll: Boolean): List<FavouriteTabModel> {
+		if (isEmpty()) {
+			return emptyList()
+		}
+		val result = ArrayList<FavouriteTabModel>(if (showAll) size + 1 else size)
+		if (showAll) {
+			result.add(FavouriteTabModel(NO_ID, null))
+		}
+		mapTo(result) { FavouriteTabModel(it.id, it.title) }
+		return result
+	}
+
+	fun hide(categoryId: Long) {
+		launchJob(Dispatchers.Default) {
+			if (categoryId == NO_ID) {
+				settings.isAllFavouritesVisible = false
+			} else {
+				favouritesRepository.updateCategory(categoryId, isVisibleInLibrary = false)
+				val reverse = ReversibleHandle {
+					favouritesRepository.updateCategory(categoryId, isVisibleInLibrary = true)
+				}
+				onActionDone.call(ReversibleAction(R.string.category_hidden_done, reverse))
+			}
+		}
+	}
+
+	fun deleteCategory(categoryId: Long) {
+		launchJob(Dispatchers.Default) {
+			favouritesRepository.removeCategories(setOf(categoryId))
+		}
+	}
+
+	private fun observeAllFavouritesVisibility() = settings.observeAsFlow(
+		key = AppSettings.KEY_ALL_FAVOURITES_VISIBLE,
+		valueProducer = { isAllFavouritesVisible },
+	)
 }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesTabConfigurationStrategy.kt

@@ -0,0 +1,19 @@
+package org.koitharu.kotatsu.favourites.ui.container
+
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator.TabConfigurationStrategy
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.util.PopupMenuMediator
+
+class FavouritesTabConfigurationStrategy(
+	private val adapter: FavouritesContainerAdapter,
+	private val viewModel: FavouritesContainerViewModel,
+) : TabConfigurationStrategy {
+
+	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
+		val item = adapter.getItem(position)
+		tab.text = item.title ?: tab.view.context.getString(R.string.all_favourites)
+		tab.tag = item
+		PopupMenuMediator(FavouriteTabPopupMenuProvider(tab.view.context, viewModel, item.id)).attach(tab.view)
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt

@@ -11,7 +11,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
-import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.FragmentListBinding
@@ -31,9 +30,7 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		if (viewModel.categoryId != NO_ID) {
-			addMenuProvider(FavouritesListMenuProvider(binding.root.context, viewModel))
-		}
+		binding.recyclerView.isVP2BugWorkaroundEnabled = true
 	}
 
 	override fun onScrolledToEnd() = Unit

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListMenuProvider.kt

@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.list
-
-import android.content.Context
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import androidx.core.view.MenuProvider
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
-
-class FavouritesListMenuProvider(
-	private val context: Context,
-	private val viewModel: FavouritesListViewModel,
-) : MenuProvider {
-
-	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-		menuInflater.inflate(R.menu.opt_favourites, menu)
-	}
-
-	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-		return when (menuItem.itemId) {
-			R.id.action_edit -> {
-				context.startActivity(FavouritesCategoryEditActivity.newIntent(context, viewModel.categoryId))
-				true
-			}
-
-			else -> false
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt

@@ -9,6 +9,8 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
@@ -49,16 +51,19 @@ class FavouritesListViewModel @Inject constructor(
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.favoritesListMode)
 
 	val sortOrder: StateFlow<ListSortOrder?> = if (categoryId == NO_ID) {
-		MutableStateFlow(null)
+		settings.observeAsFlow(AppSettings.KEY_FAVORITES_ORDER) {
+			allFavoritesSortOrder
+		}
 	} else {
 		repository.observeCategory(categoryId)
 			.map { it?.order }
-			.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
-	}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	override val content = combine(
 		if (categoryId == NO_ID) {
-			repository.observeAll(ListSortOrder.NEWEST)
+			sortOrder.filterNotNull().flatMapLatest {
+				repository.observeAll(it)
+			}
 		} else {
 			repository.observeAll(categoryId)
 		},

app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryDao.kt

@@ -35,11 +35,12 @@ abstract class HistoryDao {
 
 	fun observeAll(order: ListSortOrder): Flow<List<HistoryWithManga>> {
 		val orderBy = when (order) {
-			ListSortOrder.UPDATED -> "history.updated_at DESC"
+			ListSortOrder.LAST_READ -> "history.updated_at DESC"
 			ListSortOrder.NEWEST -> "history.created_at DESC"
 			ListSortOrder.PROGRESS -> "history.percent DESC"
 			ListSortOrder.ALPHABETIC -> "manga.title"
-			ListSortOrder.NEW_CHAPTERS -> "(SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id) DESC"
+			ListSortOrder.ALPHABETIC_REVERSE -> "manga.title DESC"
+			ListSortOrder.NEW_CHAPTERS -> "IFNULL((SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
 			else -> throw IllegalArgumentException("Sort order $order is not supported")
 		}
 

app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryEntity.kt

@@ -15,8 +15,8 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 			parentColumns = ["manga_id"],
 			childColumns = ["manga_id"],
 			onDelete = ForeignKey.CASCADE,
-		)
-	]
+		),
+	],
 )
 data class HistoryEntity(
 	@PrimaryKey(autoGenerate = false)
@@ -28,4 +28,5 @@ data class HistoryEntity(
 	@ColumnInfo(name = "scroll") val scroll: Float,
 	@ColumnInfo(name = "percent") val percent: Float,
 	@ColumnInfo(name = "deleted_at") val deletedAt: Long,
+	@ColumnInfo(name = "chapters") val chaptersCount: Int,
 )

app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryRepository.kt

@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.core.model.findById
 import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
@@ -89,10 +90,11 @@ class HistoryRepository @Inject constructor(
 			.distinctUntilChanged()
 	}
 
-	suspend fun addOrUpdate(manga: Manga, chapterId: Long, page: Int, scroll: Int, percent: Float) {
-		if (shouldSkip(manga)) {
+	suspend fun addOrUpdate(manga: Manga, chapterId: Long, page: Int, scroll: Int, percent: Float, force: Boolean) {
+		if (!force && shouldSkip(manga)) {
 			return
 		}
+		assert(manga.chapters != null)
 		db.withTransaction {
 			mangaRepository.storeManga(manga)
 			db.getHistoryDao().upsert(
@@ -104,14 +106,12 @@ class HistoryRepository @Inject constructor(
 					page = page,
 					scroll = scroll.toFloat(), // we migrate to int, but decide to not update database
 					percent = percent,
+					chaptersCount = manga.chapters?.size ?: -1,
 					deletedAt = 0L,
 				),
 			)
 			trackingRepository.syncWithHistory(manga, chapterId)
-			val chapter = manga.chapters?.findById(chapterId)
-			if (chapter != null) {
-				scrobblers.forEach { it.tryScrobble(manga.id, chapter) }
-			}
+			scrobblers.forEach { it.tryScrobble(manga, chapterId) }
 		}
 	}
 
@@ -161,7 +161,7 @@ class HistoryRepository @Inject constructor(
 	}
 
 	fun shouldSkip(manga: Manga): Boolean {
-		return manga.isNsfw && settings.isHistoryExcludeNsfw || settings.isIncognitoModeEnabled
+		return ((manga.source.isNsfw() || manga.isNsfw) && settings.isHistoryExcludeNsfw) || settings.isIncognitoModeEnabled
 	}
 
 	fun observeShouldSkip(manga: Manga): Flow<Boolean> {

app/src/main/kotlin/org/koitharu/kotatsu/history/domain/HistoryUpdateUseCase.kt

@@ -24,6 +24,7 @@ class HistoryUpdateUseCase @Inject constructor(
 			page = readerState.page,
 			scroll = readerState.scroll,
 			percent = percent,
+			force = false,
 		)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/history/domain/MarkAsReadUseCase.kt

@@ -30,6 +30,7 @@ class MarkAsReadUseCase @Inject constructor(
 			page = pages.lastIndex,
 			scroll = 0,
 			percent = 1f,
+			force = true,
 		)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListAdapter.kt

@@ -6,7 +6,6 @@ import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
-import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.size.ItemSizeResolver
 
 class HistoryListAdapter(
@@ -17,13 +16,6 @@ class HistoryListAdapter(
 ) : MangaListAdapter(coil, lifecycleOwner, listener, sizeResolver), FastScroller.SectionIndexer {
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
-		val list = items
-		for (i in (0..position).reversed()) {
-			val item = list.getOrNull(i) ?: continue
-			if (item is ListHeader) {
-				return item.getText(context)
-			}
-		}
-		return null
+		return findHeader(position)?.getText(context)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt

@@ -5,12 +5,15 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.view.ActionMode
 import androidx.fragment.app.viewModels
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkManageIntent
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.RecyclerScrollKeeper
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
+import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.list.ui.size.DynamicItemSizeResolver
@@ -26,6 +29,7 @@ class HistoryListFragment : MangaListFragment() {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		RecyclerScrollKeeper(binding.recyclerView).attach()
 		addMenuProvider(HistoryListMenuProvider(binding.root.context, viewModel))
+		viewModel.isStatsEnabled.observe(viewLifecycleOwner, MenuInvalidator(requireActivity()))
 	}
 
 	override fun onScrolledToEnd() = Unit
@@ -54,6 +58,18 @@ class HistoryListFragment : MangaListFragment() {
 				true
 			}
 
+			R.id.action_mark_current -> {
+				MaterialAlertDialogBuilder(context ?: return false)
+					.setTitle(item.title)
+					.setMessage(R.string.mark_as_completed_prompt)
+					.setNegativeButton(android.R.string.cancel, null)
+					.setPositiveButton(android.R.string.ok) { _, _ ->
+						viewModel.markAsRead(selectedItems)
+						mode.finish()
+					}.show()
+				true
+			}
+
 			else -> super.onActionItemClicked(controller, mode, item)
 		}
 	}