Bump version

Currently translated at 100.0% (7 of 7 strings)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/nb_NO/
Translation: Kotatsu/plurals

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 577
-		versionName = '6.1'
+		versionCode = 587
+		versionName = '6.2'
 		generatedDensities = []
 		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
 		ksp {
@@ -81,7 +81,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:aae3fa3b05') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:a61e441e79') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -89,21 +89,21 @@ dependencies {
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation 'androidx.core:core-ktx:1.10.1'
-	implementation 'androidx.activity:activity-ktx:1.7.2'
+	implementation 'androidx.core:core-ktx:1.12.0'
+	implementation 'androidx.activity:activity-ktx:1.8.0'
 	implementation 'androidx.fragment:fragment-ktx:1.6.1'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.1'
 	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.9.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.1'
+	implementation 'com.google.android.material:material:1.10.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
 
 	// TODO https://issuetracker.google.com/issues/254846063
 	implementation 'androidx.work:work-runtime-ktx:2.8.1'
@@ -120,24 +120,24 @@ dependencies {
 
 	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
-	implementation 'com.squareup.okio:okio:3.5.0'
+	implementation 'com.squareup.okio:okio:3.6.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.47'
-	kapt 'com.google.dagger:hilt-compiler:2.47'
+	implementation 'com.google.dagger:hilt-android:2.48.1'
+	kapt 'com.google.dagger:hilt-compiler:2.48.1'
 	implementation 'androidx.hilt:hilt-work:1.0.0'
 	kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
 	implementation 'io.coil-kt:coil-base:2.4.0'
 	implementation 'io.coil-kt:coil-svg:2.4.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:9b1d20be67'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:cf089a264d'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.1'
-	implementation 'ch.acra:acra-dialog:5.11.1'
+	implementation 'ch.acra:acra-http:5.11.2'
+	implementation 'ch.acra:acra-dialog:5.11.2'
 
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
@@ -155,6 +155,6 @@ dependencies {
 	androidTestImplementation 'androidx.room:room-testing:2.5.2'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.47'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.47'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.48.1'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.48.1'
 }

app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
 	<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 	<uses-permission
 		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
 		android:maxSdkVersion="29" />
@@ -95,7 +96,12 @@
 			android:label="@string/search" />
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
-			android:label="@string/search_manga" />
+			android:exported="true"
+			android:label="@string/manga_list">
+			<intent-filter>
+				<action android:name="${applicationId}.action.EXPLORE_MANGA" />
+			</intent-filter>
+		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.history.ui.HistoryActivity"
 			android:label="@string/history" />
@@ -138,8 +144,8 @@
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity"
-			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:autoRemoveFromRecents="true"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
@@ -314,6 +320,13 @@
 				android:name="android.appwidget.provider"
 				android:resource="@xml/widget_recent" />
 		</receiver>
+		<receiver
+			android:name="org.koitharu.kotatsu.settings.about.UpdateDownloadReceiver"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
+			</intent-filter>
+		</receiver>
 
 		<meta-data
 			android:name="android.webkit.WebView.EnableSafeBrowsing"

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

@@ -14,7 +14,6 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import coil.ImageLoader
-import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
@@ -25,8 +24,7 @@ import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.core.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.ui.util.reverseAsync
+import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
@@ -38,7 +36,6 @@ import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import javax.inject.Inject
@@ -105,7 +102,7 @@ class BookmarksFragment :
 			viewLifecycleOwner,
 			SnackbarErrorObserver(binding.recyclerView, this)
 		)
-		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ::onActionDone)
+		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
 	}
 
 	override fun onDestroyView() {
@@ -184,17 +181,6 @@ class BookmarksFragment :
 		}
 	}
 
-	private fun onActionDone(action: ReversibleAction) {
-		val handle = action.handle
-		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
-		val snackbar =
-			Snackbar.make((activity as SnackbarOwner).snackbarHost, action.stringResId, length)
-		if (handle != null) {
-			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
-		}
-		snackbar.show()
-	}
-
 	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup(), Runnable {
 
 		init {

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

@@ -35,6 +35,7 @@ class BookmarksSheetViewModel @Inject constructor(
 
 	val content: StateFlow<List<ListModel>> = bookmarksRepository.observeBookmarks(manga)
 		.map { mapList(it) }
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, listOf(LoadingFooter()))
 
 	private suspend fun mapList(bookmarks: List<Bookmark>): List<ListModel> {

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

@@ -51,6 +51,28 @@ abstract class TagsDao {
 	)
 	abstract suspend fun findTags(query: String, limit: Int): List<TagEntity>
 
+	@Query(
+		"""
+		SELECT tags.* FROM manga_tags 
+		LEFT JOIN tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE manga_tags.manga_id IN (SELECT manga_id FROM manga_tags WHERE tag_id = :tagId)
+		GROUP BY tags.tag_id 
+		ORDER BY COUNT(manga_id) DESC;
+	""",
+	)
+	abstract suspend fun findRelatedTags(tagId: Long): List<TagEntity>
+
+	@Query(
+		"""
+		SELECT tags.* FROM manga_tags 
+		LEFT JOIN tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE manga_tags.manga_id IN (SELECT manga_id FROM manga_tags WHERE tag_id IN (:ids))
+		GROUP BY tags.tag_id 
+		ORDER BY COUNT(manga_id) DESC;
+	""",
+	)
+	abstract suspend fun findRelatedTags(ids: Set<Long>): List<TagEntity>
+
 	@Upsert
 	abstract suspend fun upsert(tags: Iterable<TagEntity>)
 }

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

@@ -19,6 +19,8 @@ fun TagEntity.toMangaTag() = MangaTag(
 
 fun Collection<TagEntity>.toMangaTags() = mapToSet(TagEntity::toMangaTag)
 
+fun Collection<TagEntity>.toMangaTagsList() = map(TagEntity::toMangaTag)
+
 fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 	id = this.id,
 	title = this.title,

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

@@ -2,9 +2,9 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.Date
 
 @Parcelize
@@ -12,7 +12,7 @@ data class FavouriteCategory(
 	val id: Long,
 	val title: String,
 	val sortKey: Int,
-	val order: SortOrder,
+	val order: ListSortOrder,
 	val createdAt: Date,
 	val isTrackingEnabled: Boolean,
 	val isVisibleInLibrary: Boolean,

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

@@ -1,6 +1,9 @@
 package org.koitharu.kotatsu.core.network
 
+import androidx.collection.ArraySet
 import dagger.Lazy
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
@@ -13,6 +16,7 @@ import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import java.util.EnumMap
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -22,9 +26,15 @@ class MirrorSwitchInterceptor @Inject constructor(
 	private val settings: AppSettings,
 ) : Interceptor {
 
+	private val locks = EnumMap<MangaSource, Any>(MangaSource::class.java)
+	private val blacklist = EnumMap<MangaSource, MutableSet<String>>(MangaSource::class.java)
+
+	val isEnabled: Boolean
+		get() = settings.isMirrorSwitchingAvailable
+
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val request = chain.request()
-		if (!settings.isMirrorSwitchingAvailable) {
+		if (!isEnabled) {
 			return chain.proceed(request)
 		}
 		return try {
@@ -43,6 +53,30 @@ class MirrorSwitchInterceptor @Inject constructor(
 		}
 	}
 
+	suspend fun trySwitchMirror(repository: RemoteMangaRepository): Boolean = runInterruptible(Dispatchers.Default) {
+		if (!isEnabled) {
+			return@runInterruptible false
+		}
+		val mirrors = repository.getAvailableMirrors()
+		if (mirrors.size <= 1) {
+			return@runInterruptible false
+		}
+		synchronized(obtainLock(repository.source)) {
+			val currentMirror = repository.domain
+			addToBlacklist(repository.source, currentMirror)
+			val newMirror = mirrors.firstOrNull { x ->
+				x != currentMirror && !isBlacklisted(repository.source, x)
+			} ?: return@synchronized false
+			repository.domain = newMirror
+			true
+		}
+	}
+
+	fun rollback(repository: RemoteMangaRepository, oldMirror: String) = synchronized(obtainLock(repository.source)) {
+		blacklist[repository.source]?.remove(oldMirror)
+		repository.domain = oldMirror
+	}
+
 	private fun trySwitchMirror(request: Request, chain: Interceptor.Chain): Response? {
 		val source = request.tag(MangaSource::class.java) ?: return null
 		val repository = mangaRepositoryFactoryLazy.get().create(source) as? RemoteMangaRepository ?: return null
@@ -50,7 +84,9 @@ class MirrorSwitchInterceptor @Inject constructor(
 		if (mirrors.isEmpty()) {
 			return null
 		}
-		return tryMirrors(repository, mirrors, chain, request)
+		return synchronized(obtainLock(repository.source)) {
+			tryMirrors(repository, mirrors, chain, request)
+		}
 	}
 
 	private fun tryMirrors(
@@ -66,7 +102,7 @@ class MirrorSwitchInterceptor @Inject constructor(
 		}
 		val urlBuilder = url.newBuilder()
 		for (mirror in mirrors) {
-			if (mirror == currentDomain) {
+			if (mirror == currentDomain || isBlacklisted(repository.source, mirror)) {
 				continue
 			}
 			val newHost = hostOf(url.host, mirror) ?: continue
@@ -75,6 +111,7 @@ class MirrorSwitchInterceptor @Inject constructor(
 				.build()
 			val response = chain.proceed(newRequest)
 			if (response.isFailed) {
+				addToBlacklist(repository.source, mirror)
 				response.closeQuietly()
 			} else {
 				repository.domain = mirror
@@ -104,4 +141,18 @@ class MirrorSwitchInterceptor @Inject constructor(
 	private fun ResponseBody.copy(): ResponseBody {
 		return source().readByteArray().toResponseBody(contentType())
 	}
+
+	private fun obtainLock(source: MangaSource): Any = locks.getOrPut(source) {
+		Any()
+	}
+
+	private fun isBlacklisted(source: MangaSource, domain: String): Boolean {
+		return blacklist[source]?.contains(domain) == true
+	}
+
+	private fun addToBlacklist(source: MangaSource, domain: String) {
+		blacklist.getOrPut(source) {
+			ArraySet(2)
+		}.add(domain)
+	}
 }

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

@@ -21,6 +21,7 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.TABLE_HISTORY
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.image.ThumbnailTransformation
 import org.koitharu.kotatsu.core.util.ext.getDrawableOrThrow
@@ -29,8 +30,10 @@ import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.search.ui.MangaListActivity
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -73,8 +76,18 @@ class AppShortcutManager @Inject constructor(
 		}
 	}
 
-	suspend fun requestPinShortcut(manga: Manga): Boolean {
-		return ShortcutManagerCompat.requestPinShortcut(context, buildShortcutInfo(manga), null)
+	suspend fun requestPinShortcut(manga: Manga): Boolean = try {
+		ShortcutManagerCompat.requestPinShortcut(context, buildShortcutInfo(manga), null)
+	} catch (e: IllegalStateException) {
+		e.printStackTraceDebug()
+		false
+	}
+
+	suspend fun requestPinShortcut(source: MangaSource): Boolean = try {
+		ShortcutManagerCompat.requestPinShortcut(context, buildShortcutInfo(source), null)
+	} catch (e: IllegalStateException) {
+		e.printStackTraceDebug()
+		false
 	}
 
 	@VisibleForTesting
@@ -86,6 +99,11 @@ class AppShortcutManager @Inject constructor(
 		ShortcutManagerCompat.reportShortcutUsed(context, mangaId.toString())
 	}
 
+	fun isDynamicShortcutsAvailable(): Boolean {
+		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 &&
+			context.getSystemService(ShortcutManager::class.java).maxShortcutCountPerActivity > 0
+	}
+
 	private suspend fun updateShortcutsImpl() = runCatchingCancellable {
 		val maxShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context).coerceAtLeast(5)
 		val shortcuts = historyRepository.getList(0, maxShortcuts)
@@ -132,8 +150,25 @@ class AppShortcutManager @Inject constructor(
 			.build()
 	}
 
-	fun isDynamicShortcutsAvailable(): Boolean {
-		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 &&
-			context.getSystemService(ShortcutManager::class.java).maxShortcutCountPerActivity > 0
+	private suspend fun buildShortcutInfo(source: MangaSource): ShortcutInfoCompat {
+		val icon = runCatchingCancellable {
+			coil.execute(
+				ImageRequest.Builder(context)
+					.data(source.faviconUri())
+					.size(iconSize)
+					.scale(Scale.FIT)
+					.build(),
+			).getDrawableOrThrow().toBitmap()
+		}.fold(
+			onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
+			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) },
+		)
+		return ShortcutInfoCompat.Builder(context, source.name)
+			.setShortLabel(source.title)
+			.setLongLabel(source.title)
+			.setIcon(icon)
+			.setLongLived(true)
+			.setIntent(MangaListActivity.newIntent(context, source))
+			.build()
 	}
 }

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

@@ -43,5 +43,7 @@ class MangaIntent private constructor(
 
 		const val KEY_MANGA = "manga"
 		const val KEY_ID = "id"
+
+		fun of(manga: Manga) = MangaIntent(manga, manga.id, null)
 	}
 }

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

@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.lang.ref.WeakReference
-import java.util.*
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.coroutines.resume
@@ -50,7 +50,7 @@ class MangaLoaderContextImpl @Inject constructor(
 	}
 
 	override fun encodeBase64(data: ByteArray): String {
-		return Base64.encodeToString(data, Base64.NO_PADDING)
+		return Base64.encodeToString(data, Base64.NO_WRAP)
 	}
 
 	override fun decodeBase64(data: String): ByteArray {

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.parser
 
 import androidx.annotation.AnyThread
 import org.koitharu.kotatsu.core.cache.ContentCache
+import org.koitharu.kotatsu.core.network.MirrorSwitchInterceptor
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -43,6 +44,7 @@ interface MangaRepository {
 		private val localMangaRepository: LocalMangaRepository,
 		private val loaderContext: MangaLoaderContext,
 		private val contentCache: ContentCache,
+		private val mirrorSwitchInterceptor: MirrorSwitchInterceptor,
 	) {
 
 		private val cache = EnumMap<MangaSource, WeakReference<RemoteMangaRepository>>(MangaSource::class.java)
@@ -55,7 +57,11 @@ interface MangaRepository {
 			cache[source]?.get()?.let { return it }
 			return synchronized(cache) {
 				cache[source]?.get()?.let { return it }
-				val repository = RemoteMangaRepository(MangaParser(source, loaderContext), contentCache)
+				val repository = RemoteMangaRepository(
+					parser = MangaParser(source, loaderContext),
+					cache = contentCache,
+					mirrorSwitchInterceptor = mirrorSwitchInterceptor,
+				)
 				cache[source] = WeakReference(repository)
 				repository
 			}

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

@@ -13,11 +13,13 @@ import okhttp3.Response
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.core.cache.SafeDeferred
+import org.koitharu.kotatsu.core.network.MirrorSwitchInterceptor
 import org.koitharu.kotatsu.core.prefs.SourceSettings
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
 import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.exception.ParseException
 import org.koitharu.kotatsu.parsers.model.Favicons
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
@@ -31,6 +33,7 @@ import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 class RemoteMangaRepository(
 	private val parser: MangaParser,
 	private val cache: ContentCache,
+	private val mirrorSwitchInterceptor: MirrorSwitchInterceptor,
 ) : MangaRepository, Interceptor {
 
 	override val source: MangaSource
@@ -66,11 +69,15 @@ class RemoteMangaRepository(
 	}
 
 	override suspend fun getList(offset: Int, query: String): List<Manga> {
-		return parser.getList(offset, query)
+		return mirrorSwitchInterceptor.withMirrorSwitching {
+			parser.getList(offset, query)
+		}
 	}
 
 	override suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
-		return parser.getList(offset, tags, sortOrder)
+		return mirrorSwitchInterceptor.withMirrorSwitching {
+			parser.getList(offset, tags, sortOrder)
+		}
 	}
 
 	override suspend fun getDetails(manga: Manga): Manga = getDetails(manga, withCache = true)
@@ -78,17 +85,25 @@ class RemoteMangaRepository(
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
 		cache.getPages(source, chapter.url)?.let { return it }
 		val pages = asyncSafe {
-			parser.getPages(chapter).distinctById()
+			mirrorSwitchInterceptor.withMirrorSwitching {
+				parser.getPages(chapter).distinctById()
+			}
 		}
 		cache.putPages(source, chapter.url, pages)
 		return pages.await()
 	}
 
-	override suspend fun getPageUrl(page: MangaPage): String = parser.getPageUrl(page)
+	override suspend fun getPageUrl(page: MangaPage): String = mirrorSwitchInterceptor.withMirrorSwitching {
+		parser.getPageUrl(page)
+	}
 
-	override suspend fun getTags(): Set<MangaTag> = parser.getTags()
+	override suspend fun getTags(): Set<MangaTag> = mirrorSwitchInterceptor.withMirrorSwitching {
+		parser.getTags()
+	}
 
-	suspend fun getFavicons(): Favicons = parser.getFavicons()
+	suspend fun getFavicons(): Favicons = mirrorSwitchInterceptor.withMirrorSwitching {
+		parser.getFavicons()
+	}
 
 	override suspend fun getRelated(seed: Manga): List<Manga> {
 		cache.getRelatedManga(source, seed.url)?.let { return it }
@@ -105,7 +120,9 @@ class RemoteMangaRepository(
 		}
 		cache.getDetails(source, manga.url)?.let { return it }
 		val details = asyncSafe {
-			parser.getDetails(manga)
+			mirrorSwitchInterceptor.withMirrorSwitching {
+				parser.getDetails(manga)
+			}
 		}
 		cache.putDetails(source, manga.url, details)
 		return details.await()
@@ -155,4 +172,33 @@ class RemoteMangaRepository(
 		}
 		return result
 	}
+
+	private suspend fun <R> MirrorSwitchInterceptor.withMirrorSwitching(block: suspend () -> R): R {
+		if (!isEnabled) {
+			return block()
+		}
+		val initialMirror = domain
+		val result = runCatchingCancellable {
+			block()
+		}
+		if (result.isValidResult()) {
+			return result.getOrThrow()
+		}
+		return if (trySwitchMirror(this@RemoteMangaRepository)) {
+			val newResult = runCatchingCancellable {
+				block()
+			}
+			if (newResult.isValidResult()) {
+				return newResult.getOrThrow()
+			} else {
+				rollback(this@RemoteMangaRepository, initialMirror)
+				return result.getOrThrow()
+			}
+		} else {
+			result.getOrThrow()
+		}
+	}
+
+	private fun Result<*>.isValidResult() = exceptionOrNull() !is ParseException
+		&& (getOrNull() as? Collection<*>)?.isEmpty() != true
 }

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

@@ -22,7 +22,7 @@ import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.putEnumValue
 import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
-import org.koitharu.kotatsu.history.domain.model.HistoryOrder
+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.mapNotNullToSet
@@ -72,6 +72,18 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
 
+	var historyListMode: ListMode
+		get() = prefs.getEnumValue(KEY_LIST_MODE_HISTORY, listMode)
+		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_HISTORY, value) }
+
+	var suggestionsListMode: ListMode
+		get() = prefs.getEnumValue(KEY_LIST_MODE_SUGGESTIONS, listMode)
+		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_SUGGESTIONS, value) }
+
+	var favoritesListMode: ListMode
+		get() = prefs.getEnumValue(KEY_LIST_MODE_FAVORITES, listMode)
+		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_FAVORITES, value) }
+
 	var isNsfwContentDisabled: Boolean
 		get() = prefs.getBoolean(KEY_DISABLE_NSFW, false)
 		set(value) = prefs.edit { putBoolean(KEY_DISABLE_NSFW, value) }
@@ -90,6 +102,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val readerPageSwitch: Set<String>
 		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
 
+	val isReaderZoomButtonsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_ZOOM_BUTTONS, false)
+
 	val isReaderTapsAdaptive: Boolean
 		get() = !prefs.getBoolean(KEY_READER_TAPS_LTR, false)
 
@@ -161,7 +176,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
 		set(value) = prefs.edit {
 			if (value != null) putString(KEY_APP_PASSWORD, value) else remove(
-				KEY_APP_PASSWORD
+				KEY_APP_PASSWORD,
 			)
 		}
 
@@ -173,7 +188,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		set(value) = prefs.edit { putBoolean(KEY_PROTECT_APP_BIOMETRIC, value) }
 
 	val isMirrorSwitchingAvailable: Boolean
-		get() = prefs.getBoolean(KEY_MIRROR_SWITCHING, true)
+		get() = prefs.getBoolean(KEY_MIRROR_SWITCHING, false)
 
 	val isExitConfirmationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_EXIT_CONFIRM, false)
@@ -198,6 +213,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_SOURCES_GRID, false)
 		set(value) = prefs.edit { putBoolean(KEY_SOURCES_GRID, value) }
 
+	val isNewSourcesTipEnabled: Boolean
+		get() = prefs.getBoolean(KEY_SOURCES_NEW, true)
+
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
 
@@ -267,6 +285,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isReaderSliderEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_SLIDER, true)
 
+	val isReaderKeepScreenOn: Boolean
+		get() = prefs.getBoolean(KEY_READER_SCREEN_ON, true)
+
 	val isImagesProxyEnabled: Boolean
 		get() = prefs.getBoolean(KEY_IMAGES_PROXY, false)
 
@@ -298,8 +319,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_LOCAL_LIST_ORDER, SortOrder.NEWEST)
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
 
-	var historySortOrder: HistoryOrder
-		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, HistoryOrder.UPDATED)
+	var historySortOrder: ListSortOrder
+		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.UPDATED)
 		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
 
 	val isRelatedMangaEnabled: Boolean
@@ -314,7 +335,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		set(@FloatRange(from = 0.0, to = 1.0) value) = prefs.edit {
 			putFloat(
 				KEY_READER_AUTOSCROLL_SPEED,
-				value
+				value,
 			)
 		}
 
@@ -325,11 +346,14 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			}
 			val policy = NetworkPolicy.from(
 				prefs.getString(KEY_PAGES_PRELOAD, null),
-				NetworkPolicy.NON_METERED
+				NetworkPolicy.NON_METERED,
 			)
 			return policy.isNetworkAllowed(connectivityManager)
 		}
 
+	val is32BitColorsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_32BIT_COLOR, false)
+
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -395,6 +419,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val TRACK_FAVOURITES = "favourites"
 
 		const val KEY_LIST_MODE = "list_mode_2"
+		const val KEY_LIST_MODE_HISTORY = "list_mode_history"
+		const val KEY_LIST_MODE_FAVORITES = "list_mode_favorites"
+		const val KEY_LIST_MODE_SUGGESTIONS = "list_mode_suggestions"
 		const val KEY_THEME = "theme"
 		const val KEY_COLOR_THEME = "color_theme"
 		const val KEY_THEME_AMOLED = "amoled_theme"
@@ -409,6 +436,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		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_ZOOM_BUTTONS = "reader_zoom_buttons"
 		const val KEY_TRACKER_ENABLED = "tracker_enabled"
 		const val KEY_TRACKER_WIFI_ONLY = "tracker_wifi"
 		const val KEY_TRACK_SOURCES = "track_sources"
@@ -456,6 +484,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_BAR = "reader_bar"
 		const val KEY_READER_SLIDER = "reader_slider"
 		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_LOCAL_LIST_ORDER = "local_order"
@@ -466,6 +495,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_LOGGING_ENABLED = "logging"
 		const val KEY_LOGS_SHARE = "logs_share"
 		const val KEY_SOURCES_GRID = "sources_grid"
+		const val KEY_SOURCES_NEW = "sources_new"
 		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
 		const val KEY_TIPS_CLOSED = "tips_closed"
 		const val KEY_SSL_BYPASS = "ssl_bypass"
@@ -483,6 +513,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_32BIT_COLOR = "enhanced_colors"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

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

@@ -19,13 +19,13 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
 import androidx.core.view.GravityCompat
+import androidx.core.view.ancestors
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.isLayoutReversed
-import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.databinding.FastScrollerBinding
 import kotlin.math.roundToInt
 import com.google.android.material.R as materialR
@@ -522,7 +522,7 @@ class FastScroller @JvmOverloads constructor(
 		return BubbleSize.entries.getOrNull(ordinal) ?: defaultValue
 	}
 
-	private fun findValidParent(view: View): ViewGroup? = view.parents.firstNotNullOfOrNull { p ->
+	private fun findValidParent(view: View): ViewGroup? = view.ancestors.firstNotNullOfOrNull { p ->
 		if (p is FrameLayout || p is ConstraintLayout || p is CoordinatorLayout || p is RelativeLayout) {
 			p as ViewGroup
 		} else {

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

@@ -104,6 +104,7 @@ sealed class AdaptiveSheetBehavior {
 	companion object {
 
 		const val STATE_EXPANDED = SideSheetBehavior.STATE_EXPANDED
+		const val STATE_COLLAPSED = BottomSheetBehavior.STATE_COLLAPSED
 		const val STATE_SETTLING = SideSheetBehavior.STATE_SETTLING
 		const val STATE_DRAGGING = SideSheetBehavior.STATE_DRAGGING
 		const val STATE_HIDDEN = SideSheetBehavior.STATE_HIDDEN
@@ -114,10 +115,11 @@ sealed class AdaptiveSheetBehavior {
 			else -> null
 		}
 
-		fun from(lp: CoordinatorLayout.LayoutParams): AdaptiveSheetBehavior? = when (val behavior = lp.behavior) {
-			is BottomSheetBehavior<*> -> Bottom(behavior)
-			is SideSheetBehavior<*> -> Side(behavior)
-			else -> null
-		}
+		fun from(lp: CoordinatorLayout.LayoutParams): AdaptiveSheetBehavior? =
+			when (val behavior = lp.behavior) {
+				is BottomSheetBehavior<*> -> Bottom(behavior)
+				is SideSheetBehavior<*> -> Side(behavior)
+				else -> null
+			}
 	}
 }

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

@@ -2,17 +2,19 @@ package org.koitharu.kotatsu.core.ui.sheet
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.InputDevice
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.widget.LinearLayout
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.withStyledAttributes
+import androidx.core.view.ancestors
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.databinding.LayoutSheetHeaderAdaptiveBinding
 
 class AdaptiveSheetHeaderBar @JvmOverloads constructor(
@@ -21,7 +23,8 @@ class AdaptiveSheetHeaderBar @JvmOverloads constructor(
 	@AttrRes defStyleAttr: Int = 0,
 ) : LinearLayout(context, attrs, defStyleAttr), AdaptiveSheetCallback {
 
-	private val binding = LayoutSheetHeaderAdaptiveBinding.inflate(LayoutInflater.from(context), this)
+	private val binding =
+		LayoutSheetHeaderAdaptiveBinding.inflate(LayoutInflater.from(context), this)
 	private var sheetBehavior: AdaptiveSheetBehavior? = null
 
 	var title: CharSequence?
@@ -60,6 +63,28 @@ class AdaptiveSheetHeaderBar @JvmOverloads constructor(
 		super.onDetachedFromWindow()
 	}
 
+	override fun onGenericMotionEvent(event: MotionEvent): Boolean {
+		val behavior = sheetBehavior ?: return super.onGenericMotionEvent(event)
+		if (event.source and InputDevice.SOURCE_CLASS_POINTER != 0) {
+			if (event.actionMasked == MotionEvent.ACTION_SCROLL) {
+				if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0f) {
+					behavior.state = if (
+						behavior is AdaptiveSheetBehavior.Bottom
+						&& behavior.state == AdaptiveSheetBehavior.STATE_EXPANDED
+					) {
+						AdaptiveSheetBehavior.STATE_COLLAPSED
+					} else {
+						AdaptiveSheetBehavior.STATE_HIDDEN
+					}
+				} else {
+					behavior.state = AdaptiveSheetBehavior.STATE_EXPANDED
+				}
+				return true
+			}
+		}
+		return super.onGenericMotionEvent(event)
+	}
+
 	override fun onStateChanged(sheet: View, newState: Int) {
 
 	}
@@ -81,14 +106,9 @@ class AdaptiveSheetHeaderBar @JvmOverloads constructor(
 	}
 
 	private fun findParentSheetBehavior(): AdaptiveSheetBehavior? {
-		for (p in parents) {
-			val layoutParams = (p as? View)?.layoutParams
-			if (layoutParams is CoordinatorLayout.LayoutParams) {
-				AdaptiveSheetBehavior.from(layoutParams)?.let {
-					return it
-				}
-			}
+		return ancestors.firstNotNullOfOrNull {
+			((it as? View)?.layoutParams as? CoordinatorLayout.LayoutParams)
+				?.let { params -> AdaptiveSheetBehavior.from(params) }
 		}
-		return null
 	}
 }

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

@@ -65,6 +65,9 @@ class SlidingBottomNavigationView @JvmOverloads constructor(
 	}
 
 	fun show() {
+		if (currentState == STATE_UP) {
+			return
+		}
 		currentAnimator?.cancel()
 		clearAnimation()
 
@@ -77,6 +80,9 @@ class SlidingBottomNavigationView @JvmOverloads constructor(
 	}
 
 	fun hide() {
+		if (currentState == STATE_DOWN) {
+			return
+		}
 		currentAnimator?.cancel()
 		clearAnimation()
 
@@ -117,6 +123,7 @@ class SlidingBottomNavigationView @JvmOverloads constructor(
 	}
 
 	internal class SavedState : AbsSavedState {
+
 		var currentState = STATE_UP
 		var translationY = 0F
 

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

@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ViewZoomBinding
+
+class ZoomControl @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+) : LinearLayout(context, attrs), View.OnClickListener {
+
+	private val binding = ViewZoomBinding.inflate(LayoutInflater.from(context), this)
+
+	var listener: ZoomControlListener? = null
+
+	init {
+		binding.buttonZoomIn.setOnClickListener(this)
+		binding.buttonZoomOut.setOnClickListener(this)
+	}
+
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_zoom_in -> listener?.onZoomIn()
+			R.id.button_zoom_out -> listener?.onZoomOut()
+		}
+	}
+
+	interface ZoomControlListener {
+
+		fun onZoomIn()
+
+		fun onZoomOut()
+	}
+}

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

@@ -8,6 +8,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlin.coroutines.coroutineContext
 
+@Deprecated("", replaceWith = ReplaceWith("CompositeMutex2"))
 class CompositeMutex<T : Any> : Set<T> {
 
 	private val state = ArrayMap<T, MutableStateFlow<Boolean>>()

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

@@ -15,6 +15,7 @@ class ViewBadge(
 ) : View.OnLayoutChangeListener, DefaultLifecycleObserver {
 
 	private var badgeDrawable: BadgeDrawable? = null
+	private var maxCharacterCount: Int = -1
 
 	var counter: Int
 		get() = badgeDrawable?.number ?: 0
@@ -48,8 +49,16 @@ class ViewBadge(
 		clearBadge()
 	}
 
+	fun setMaxCharacterCount(value: Int) {
+		maxCharacterCount = value
+		badgeDrawable?.maxCharacterCount = value
+	}
+
 	private fun initBadge(): BadgeDrawable {
 		val badge = BadgeDrawable.create(anchor.context)
+		if (maxCharacterCount > 0) {
+			badge.maxCharacterCount = maxCharacterCount
+		}
 		anchor.addOnLayoutChangeListener(this)
 		BadgeUtils.attachBadgeDrawable(badge, anchor)
 		badgeDrawable = badge

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

@@ -55,3 +55,5 @@ inline fun <reified E : Enum<E>> Collection<E>.toEnumSet(): EnumSet<E> = if (isE
 } else {
 	EnumSet.copyOf(this)
 }
+
+fun <E : Enum<E>> Collection<E>.sortedByOrdinal() = sortedBy { it.ordinal }

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

@@ -14,6 +14,7 @@ import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import kotlin.coroutines.EmptyCoroutineContext
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -79,3 +80,11 @@ fun <T> Deferred<T>.getCompletionResultOrNull(): Result<T>? = if (isCompleted) {
 } else {
 	null
 }
+
+fun <T> Deferred<T>.peek(): T? = if (isCompleted) {
+	runCatchingCancellable {
+		getCompleted()
+	}.getOrNull()
+} else {
+	null
+}

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

@@ -2,13 +2,14 @@ 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.ViewParent
 import android.view.inputmethod.InputMethodManager
 import android.widget.Checkable
 import androidx.core.view.children
+import androidx.core.view.descendants
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
@@ -89,23 +90,8 @@ fun Slider.setValueRounded(newValue: Float) {
 	value = roundedValue.coerceIn(valueFrom, valueTo)
 }
 
-fun <T : View> ViewGroup.findViewsByType(clazz: Class<T>): Sequence<T> {
-	if (childCount == 0) {
-		return emptySequence()
-	}
-	return sequence {
-		for (view in children) {
-			if (clazz.isInstance(view)) {
-				yield(clazz.cast(view)!!)
-			} else if (view is ViewGroup && view.childCount != 0) {
-				yieldAll(view.findViewsByType(clazz))
-			}
-		}
-	}
-}
-
 fun RecyclerView.invalidateNestedItemDecorations() {
-	findViewsByType(RecyclerView::class.java).forEach {
+	descendants.filterIsInstance<RecyclerView>().forEach {
 		it.invalidateItemDecorations()
 	}
 }
@@ -113,15 +99,6 @@ fun RecyclerView.invalidateNestedItemDecorations() {
 val View.parentView: ViewGroup?
 	get() = parent as? ViewGroup
 
-val View.parents: Sequence<ViewParent>
-	get() = sequence {
-		var p: ViewParent? = parent
-		while (p != null) {
-			yield(p)
-			p = p.parent
-		}
-	}
-
 fun View.measureDimension(desiredSize: Int, measureSpec: Int): Int {
 	var result: Int
 	val specMode = MeasureSpec.getMode(measureSpec)
@@ -164,3 +141,9 @@ fun BaseProgressIndicator<*>.showOrHide(value: Boolean) {
 		if (isVisible) hide()
 	}
 }
+
+fun View.setOnContextClickListenerCompat(listener: View.OnLongClickListener) {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+		setOnContextClickListener(listener::onLongClick)
+	}
+}

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

@@ -0,0 +1,43 @@
+package org.koitharu.kotatsu.details.data
+
+import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.local.domain.model.LocalManga
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.reader.data.filterChapters
+
+data class MangaDetails(
+	private val manga: Manga,
+	private val localManga: LocalManga?,
+	val description: CharSequence?,
+	val isLoaded: Boolean,
+) {
+
+	val id: Long
+		get() = manga.id
+
+	val chapters: Map<String?, List<MangaChapter>> = manga.chapters?.groupBy { it.branch }.orEmpty()
+
+	val branches: Set<String?>
+		get() = chapters.keys
+
+	val allChapters: List<MangaChapter>
+		get() = manga.chapters.orEmpty()
+
+	val isLocal
+		get() = manga.isLocal
+
+	val local: LocalManga?
+		get() = localManga ?: if (manga.isLocal) LocalManga(manga) else null
+
+	fun toManga() = manga
+
+	fun filterChapters(branch: String?) = MangaDetails(
+		manga = manga.filterChapters(branch),
+		localManga = localManga?.run {
+			copy(manga = manga.filterChapters(branch))
+		},
+		description = description,
+		isLoaded = isLoaded,
+	)
+}

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

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
-import org.koitharu.kotatsu.details.domain.model.DoubleManga
+import org.koitharu.kotatsu.details.data.MangaDetails
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
@@ -20,7 +20,7 @@ import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import javax.inject.Inject
 
-@Deprecated("")
+/* TODO: remove */
 class DetailsInteractor @Inject constructor(
 	private val historyRepository: HistoryRepository,
 	private val favouritesRepository: FavouritesRepository,
@@ -66,13 +66,22 @@ class DetailsInteractor @Inject constructor(
 			}
 	}
 
-	suspend fun updateLocal(subject: DoubleManga?, localManga: LocalManga): DoubleManga? {
-		return if (subject?.any?.id == localManga.manga.id) {
-			subject.copy(
-				localManga = runCatchingCancellable {
-					localMangaRepository.getDetails(localManga.manga)
-				},
-			)
+	suspend fun updateLocal(subject: MangaDetails?, localManga: LocalManga): MangaDetails? {
+		subject ?: return null
+		return if (subject.id == localManga.manga.id) {
+			if (subject.isLocal) {
+				subject.copy(
+					manga = localManga.manga,
+				)
+			} else {
+				subject.copy(
+					localManga = runCatchingCancellable {
+						localManga.copy(
+							manga = localMangaRepository.getDetails(localManga.manga),
+						)
+					}.getOrNull() ?: subject.local,
+				)
+			}
 		} else {
 			subject
 		}

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

@@ -0,0 +1,85 @@
+package org.koitharu.kotatsu.details.domain
+
+import android.text.Html
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.style.ForegroundColorSpan
+import androidx.core.text.getSpans
+import androidx.core.text.parseAsHtml
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.runInterruptible
+import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.util.ext.peek
+import org.koitharu.kotatsu.core.util.ext.sanitize
+import org.koitharu.kotatsu.details.data.MangaDetails
+import org.koitharu.kotatsu.explore.domain.RecoverMangaUseCase
+import org.koitharu.kotatsu.local.data.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.exception.NotFoundException
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.recoverNotNull
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import javax.inject.Inject
+
+class DetailsLoadUseCase @Inject constructor(
+	private val mangaDataRepository: MangaDataRepository,
+	private val localMangaRepository: LocalMangaRepository,
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val recoverUseCase: RecoverMangaUseCase,
+	private val imageGetter: Html.ImageGetter,
+) {
+
+	operator fun invoke(intent: MangaIntent): Flow<MangaDetails> = channelFlow {
+		val manga = requireNotNull(mangaDataRepository.resolveIntent(intent)) {
+			"Cannot resolve intent $intent"
+		}
+		val local = if (!manga.isLocal) {
+			async {
+				localMangaRepository.findSavedManga(manga)
+			}
+		} else {
+			null
+		}
+		send(MangaDetails(manga, null, null, false))
+		val details = getDetails(manga)
+		send(MangaDetails(details, local?.peek(), details.description?.parseAsHtml(withImages = false), false))
+		send(MangaDetails(details, local?.await(), details.description?.parseAsHtml(withImages = true), true))
+	}
+
+	private suspend fun getDetails(seed: Manga) = runCatchingCancellable {
+		val repository = mangaRepositoryFactory.create(seed.source)
+		repository.getDetails(seed)
+	}.recoverNotNull { e ->
+		if (e is NotFoundException) {
+			recoverUseCase(seed)
+		} else {
+			null
+		}
+	}.getOrThrow()
+
+	private suspend fun String.parseAsHtml(withImages: Boolean): CharSequence? {
+		return if (withImages) {
+			runInterruptible(Dispatchers.IO) {
+				parseAsHtml(imageGetter = imageGetter)
+			}.filterSpans()
+		} else {
+			runInterruptible(Dispatchers.Default) {
+				parseAsHtml()
+			}.filterSpans().sanitize()
+		}.takeUnless { it.isBlank() }
+	}
+
+	private fun Spanned.filterSpans(): Spanned {
+		val spannable = SpannableString.valueOf(this)
+		val spans = spannable.getSpans<ForegroundColorSpan>()
+		for (span in spans) {
+			spannable.removeSpan(span)
+		}
+		return spannable
+	}
+}

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

@@ -1,91 +0,0 @@
-package org.koitharu.kotatsu.details.domain
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
-import org.koitharu.kotatsu.core.model.isLocal
-import org.koitharu.kotatsu.core.parser.MangaDataRepository
-import org.koitharu.kotatsu.core.parser.MangaIntent
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.details.domain.model.DoubleManga
-import org.koitharu.kotatsu.explore.domain.RecoverMangaUseCase
-import org.koitharu.kotatsu.local.data.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.exception.NotFoundException
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.util.recoverNotNull
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import javax.inject.Inject
-
-class DoubleMangaLoadUseCase @Inject constructor(
-	private val mangaDataRepository: MangaDataRepository,
-	private val localMangaRepository: LocalMangaRepository,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-	private val recoverUseCase: RecoverMangaUseCase,
-) {
-
-	operator fun invoke(manga: Manga): Flow<DoubleManga> = flow<DoubleManga> {
-		var lastValue: DoubleManga? = null
-		var emitted = false
-		invokeImpl(manga).collect {
-			lastValue = it
-			if (it.any != null) {
-				emitted = true
-				emit(it)
-			}
-		}
-		if (!emitted) {
-			lastValue?.requireAny()
-		}
-	}.flowOn(Dispatchers.Default)
-
-	operator fun invoke(mangaId: Long): Flow<DoubleManga> = flow {
-		emit(mangaDataRepository.findMangaById(mangaId) ?: throwNFE())
-	}.flatMapLatest { invoke(it) }
-
-	operator fun invoke(intent: MangaIntent): Flow<DoubleManga> = flow {
-		emit(mangaDataRepository.resolveIntent(intent) ?: throwNFE())
-	}.flatMapLatest { invoke(it) }
-
-	private suspend fun loadLocal(manga: Manga): Result<Manga>? {
-		return runCatchingCancellable {
-			if (manga.isLocal) {
-				localMangaRepository.getDetails(manga)
-			} else {
-				localMangaRepository.findSavedManga(manga)?.manga
-			} ?: return null
-		}
-	}
-
-	private suspend fun loadRemote(manga: Manga): Result<Manga>? {
-		return runCatchingCancellable {
-			val seed = if (manga.isLocal) {
-				localMangaRepository.getRemoteManga(manga)
-			} else {
-				manga
-			} ?: return null
-			val repository = mangaRepositoryFactory.create(seed.source)
-			repository.getDetails(seed)
-		}.recoverNotNull { e ->
-			if (e is NotFoundException) {
-				recoverUseCase(manga)
-			} else {
-				null
-			}
-		}
-	}
-
-	private fun invokeImpl(manga: Manga): Flow<DoubleManga> = combine(
-		flow { emit(null); emit(loadRemote(manga)) },
-		flow { emit(null); emit(loadLocal(manga)) },
-	) { remote, local ->
-		DoubleManga(
-			remoteManga = remote,
-			localManga = local,
-		)
-	}
-
-	private fun throwNFE(): Nothing = throw NotFoundException("Cannot find manga", "")
-}

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

@@ -0,0 +1,55 @@
+package org.koitharu.kotatsu.details.domain
+
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.model.findChapter
+import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.history.data.PROGRESS_NONE
+import org.koitharu.kotatsu.local.data.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import javax.inject.Inject
+
+class ProgressUpdateUseCase @Inject constructor(
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val database: MangaDatabase,
+	private val localMangaRepository: LocalMangaRepository,
+) {
+
+	suspend operator fun invoke(manga: Manga): Float {
+		val history = database.historyDao.find(manga.id) ?: return PROGRESS_NONE
+		val seed = if (manga.isLocal) {
+			localMangaRepository.getRemoteManga(manga) ?: manga
+		} else {
+			manga
+		}
+		val repo = mangaRepositoryFactory.create(seed.source)
+		val details = if (manga.source != seed.source || seed.chapters.isNullOrEmpty()) {
+			repo.getDetails(seed)
+		} else {
+			seed
+		}
+		val chapter = details.findChapter(history.chapterId) ?: return PROGRESS_NONE
+		val chapters = details.getChapters(chapter.branch) ?: return PROGRESS_NONE
+		val chaptersCount = chapters.size
+		if (chaptersCount == 0) {
+			return PROGRESS_NONE
+		}
+		val chapterIndex = chapters.indexOfFirst { x -> x.id == history.chapterId }
+		val pagesCount = repo.getPages(chapter).size
+		if (pagesCount == 0) {
+			return PROGRESS_NONE
+		}
+		val pagePercent = (history.page + 1) / pagesCount.toFloat()
+		val ppc = 1f / chaptersCount
+		val result = ppc * chapterIndex + ppc * pagePercent
+		if (result != history.percent) {
+			database.historyDao.update(
+				history.copy(
+					chapterId = chapter.id,
+					percent = result,
+				),
+			)
+		}
+		return result
+	}
+}

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

@@ -1,81 +0,0 @@
-package org.koitharu.kotatsu.details.domain.model
-
-import org.koitharu.kotatsu.core.model.findById
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.reader.data.filterChapters
-
-data class DoubleManga(
-	private val remoteManga: Result<Manga>?,
-	private val localManga: Result<Manga>?,
-) {
-
-	constructor(manga: Manga) : this(
-		remoteManga = if (manga.source != MangaSource.LOCAL) Result.success(manga) else null,
-		localManga = if (manga.source == MangaSource.LOCAL) Result.success(manga) else null,
-	)
-
-	val remote: Manga?
-		get() = remoteManga?.getOrNull()
-
-	val local: Manga?
-		get() = localManga?.getOrNull()
-
-	val any: Manga?
-		get() = remote ?: local
-
-	val hasRemote: Boolean
-		get() = remoteManga?.isSuccess == true
-
-	val hasLocal: Boolean
-		get() = localManga?.isSuccess == true
-
-	val chapters: List<MangaChapter>? by lazy(LazyThreadSafetyMode.PUBLICATION) {
-		mergeChapters()
-	}
-
-	fun hasChapter(id: Long): Boolean {
-		return local?.chapters?.findById(id) != null || remote?.chapters?.findById(id) != null
-	}
-
-	fun requireAny(): Manga {
-		val result = remoteManga?.getOrNull() ?: localManga?.getOrNull()
-		if (result != null) {
-			return result
-		}
-		throw (
-			remoteManga?.exceptionOrNull()
-				?: localManga?.exceptionOrNull()
-				?: IllegalStateException("No online either local manga available")
-			)
-	}
-
-	fun filterChapters(branch: String?) = DoubleManga(
-		remoteManga?.map { it.filterChapters(branch) },
-		localManga?.map { it.filterChapters(branch) },
-	)
-
-	private fun mergeChapters(): List<MangaChapter>? {
-		val remoteChapters = remote?.chapters
-		val localChapters = local?.chapters
-		if (localChapters == null && remoteChapters == null) {
-			return null
-		}
-		val localMap = if (!localChapters.isNullOrEmpty()) {
-			localChapters.associateByTo(LinkedHashMap(localChapters.size)) { it.id }
-		} else {
-			null
-		}
-		val result = ArrayList<MangaChapter>(maxOf(remoteChapters?.size ?: 0, localChapters?.size ?: 0))
-		remoteChapters?.forEach { r ->
-			localMap?.remove(r.id)?.let { l ->
-				result.add(l)
-			} ?: result.add(r)
-		}
-		localMap?.values?.let {
-			result.addAll(it)
-		}
-		return result
-	}
-}

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

@@ -1,5 +1,7 @@
 package org.koitharu.kotatsu.details.ui
 
+import android.view.InputDevice
+import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnLayoutChangeListener
 import androidx.activity.OnBackPressedCallback
@@ -12,7 +14,7 @@ class ChaptersBottomSheetMediator(
 	private val behavior: BottomSheetBehavior<*>,
 ) : OnBackPressedCallback(false),
 	ActionModeListener,
-	OnLayoutChangeListener {
+	OnLayoutChangeListener, View.OnGenericMotionListener {
 
 	private var lockCounter = 0
 
@@ -55,6 +57,20 @@ class ChaptersBottomSheetMediator(
 		}
 	}
 
+	override fun onGenericMotion(v: View?, event: MotionEvent): Boolean {
+		if (event.source and InputDevice.SOURCE_CLASS_POINTER != 0) {
+			if (event.actionMasked == MotionEvent.ACTION_SCROLL) {
+				if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0f) {
+					behavior.state = BottomSheetBehavior.STATE_COLLAPSED
+				} else {
+					behavior.state = BottomSheetBehavior.STATE_EXPANDED
+				}
+				return true
+			}
+		}
+		return false
+	}
+
 	fun lock() {
 		lockCounter++
 		behavior.isDraggable = lockCounter <= 0

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

@@ -2,33 +2,30 @@ package org.koitharu.kotatsu.details.ui
 
 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.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.mapToSet
 
-fun mapChapters(
-	remoteManga: Manga?,
-	localManga: Manga?,
+fun MangaDetails.mapChapters(
 	history: MangaHistory?,
 	newCount: Int,
 	branch: String?,
 	bookmarks: List<Bookmark>,
 ): List<ChapterListItem> {
-	val remoteChapters = remoteManga?.getChapters(branch).orEmpty()
-	val localChapters = localManga?.getChapters(branch).orEmpty()
+	val remoteChapters = chapters[branch].orEmpty()
+	val localChapters = local?.manga?.getChapters(branch).orEmpty()
 	if (remoteChapters.isEmpty() && localChapters.isEmpty()) {
 		return emptyList()
 	}
 	val bookmarked = bookmarks.mapToSet { it.chapterId }
 	val currentId = history?.chapterId ?: 0L
 	val newFrom = if (newCount == 0 || remoteChapters.isEmpty()) Int.MAX_VALUE else remoteChapters.size - newCount
-	val chaptersSize = maxOf(remoteChapters.size, localChapters.size)
-	val ids = buildSet(chaptersSize) {
+	val ids = buildSet(maxOf(remoteChapters.size, localChapters.size)) {
 		remoteChapters.mapTo(this) { it.id }
 		localChapters.mapTo(this) { it.id }
 	}
-	val result = ArrayList<ChapterListItem>(chaptersSize)
+	val result = ArrayList<ChapterListItem>(ids.size)
 	val localMap = if (localChapters.isNotEmpty()) {
 		localChapters.associateByTo(LinkedHashMap(localChapters.size)) { it.id }
 	} else {
@@ -40,7 +37,7 @@ fun mapChapters(
 		if (chapter.id == currentId) {
 			isUnread = true
 		}
-		result += chapter.toListItem(
+		result += (local ?: chapter).toListItem(
 			isCurrent = chapter.id == currentId,
 			isUnread = isUnread,
 			isNew = isUnread && result.size >= newFrom,
@@ -57,7 +54,7 @@ fun mapChapters(
 				isCurrent = chapter.id == currentId,
 				isUnread = isUnread,
 				isNew = false,
-				isDownloaded = remoteManga != null,
+				isDownloaded = !isLocal,
 				isBookmarked = chapter.id in bookmarked,
 			)
 		}

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

@@ -39,7 +39,6 @@ import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
-import org.koitharu.kotatsu.core.util.ViewBadge
 import org.koitharu.kotatsu.core.util.ext.doOnExpansionsChanged
 import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
@@ -49,6 +48,7 @@ import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.setNavigationBarTransparentCompat
 import org.koitharu.kotatsu.core.util.ext.setNavigationIconSafe
+import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 import org.koitharu.kotatsu.details.service.MangaPrefetchService
@@ -74,7 +74,6 @@ class DetailsActivity :
 	@Inject
 	lateinit var appShortcutManager: AppShortcutManager
 
-	private lateinit var viewBadge: ViewBadge
 	private var buttonTip: WeakReference<ButtonTip>? = null
 
 	private val viewModel: DetailsViewModel by viewModels()
@@ -89,8 +88,8 @@ class DetailsActivity :
 		}
 		viewBinding.buttonRead.setOnClickListener(this)
 		viewBinding.buttonRead.setOnLongClickListener(this)
+		viewBinding.buttonRead.setOnContextClickListenerCompat(this)
 		viewBinding.buttonDropdown.setOnClickListener(this)
-		viewBadge = ViewBadge(viewBinding.buttonRead, this)
 
 		if (viewBinding.layoutBottom != null) {
 			val behavior = BottomSheetBehavior.from(checkNotNull(viewBinding.layoutBottom))
@@ -103,6 +102,7 @@ class DetailsActivity :
 			viewBinding.toolbarChapters?.setNavigationOnClickListener {
 				behavior.state = BottomSheetBehavior.STATE_COLLAPSED
 			}
+			viewBinding.toolbarChapters?.setOnGenericMotionListener(bsMediator)
 		} else {
 			chaptersMenuProvider = ChaptersMenuProvider(viewModel, null)
 			addMenuProvider(chaptersMenuProvider)
@@ -110,7 +110,6 @@ class DetailsActivity :
 		onBackPressedDispatcher.addCallback(chaptersMenuProvider)
 
 		viewModel.manga.filterNotNull().observe(this, ::onMangaUpdated)
-		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onMangaRemoved.observeEvent(this, ::onMangaRemoved)
 		viewModel.onError.observeEvent(
 			this,
@@ -134,13 +133,19 @@ class DetailsActivity :
 			viewBinding.toolbarChapters?.subtitle = it
 			viewBinding.textViewSubtitle?.textAndVisible = it
 		}
-		viewModel.isChaptersReversed.observe(this, MenuInvalidator(viewBinding.toolbarChapters ?: this))
+		viewModel.isChaptersReversed.observe(
+			this,
+			MenuInvalidator(viewBinding.toolbarChapters ?: this),
+		)
 		viewModel.favouriteCategories.observe(this, MenuInvalidator(this))
 		viewModel.branches.observe(this) {
 			viewBinding.buttonDropdown.isVisible = it.size > 1
 		}
 		viewModel.chapters.observe(this, PrefetchObserver(this))
-		viewModel.onDownloadStarted.observeEvent(this, DownloadStartedObserver(viewBinding.containerDetails))
+		viewModel.onDownloadStarted.observeEvent(
+			this,
+			DownloadStartedObserver(viewBinding.containerDetails),
+		)
 
 		addMenuProvider(
 			DetailsMenuProvider(
@@ -243,7 +248,11 @@ class DetailsActivity :
 			right = insets.right,
 		)
 		if (insets.bottom > 0) {
-			window.setNavigationBarTransparentCompat(this, viewBinding.layoutBottom?.elevation ?: 0f, 0.9f)
+			window.setNavigationBarTransparentCompat(
+				this,
+				viewBinding.layoutBottom?.elevation ?: 0f,
+				0.9f,
+			)
 		}
 		viewBinding.cardChapters?.updateLayoutParams<MarginLayoutParams> {
 			bottomMargin = insets.bottom + marginEnd
@@ -265,18 +274,23 @@ class DetailsActivity :
 		}
 		val text = when {
 			!info.isValid -> getString(R.string.loading_)
-			info.currentChapter >= 0 -> getString(R.string.chapter_d_of_d, info.currentChapter + 1, info.totalChapters)
+			info.currentChapter >= 0 -> getString(
+				R.string.chapter_d_of_d,
+				info.currentChapter + 1,
+				info.totalChapters,
+			)
+
 			info.totalChapters == 0 -> getString(R.string.no_chapters)
-			else -> resources.getQuantityString(R.plurals.chapters, info.totalChapters, info.totalChapters)
+			else -> resources.getQuantityString(
+				R.plurals.chapters,
+				info.totalChapters,
+				info.totalChapters,
+			)
 		}
 		viewBinding.toolbarChapters?.title = text
 		viewBinding.textViewTitle?.text = text
 	}
 
-	private fun onNewChaptersChanged(newChapters: Int) {
-		viewBadge.counter = newChapters
-	}
-
 	private fun showBranchPopupMenu(v: View) {
 		val menu = PopupMenu(v.context, v)
 		val branches = viewModel.branches.value
@@ -286,7 +300,12 @@ class DetailsActivity :
 				append(' ')
 				append(' ')
 				inSpans(
-					ForegroundColorSpan(v.context.getThemeColor(android.R.attr.textColorSecondary, Color.LTGRAY)),
+					ForegroundColorSpan(
+						v.context.getThemeColor(
+							android.R.attr.textColorSecondary,
+							Color.LTGRAY,
+						),
+					),
 					RelativeSizeSpan(0.74f),
 				) {
 					append(branch.count.toString())
@@ -305,7 +324,8 @@ class DetailsActivity :
 		val manga = viewModel.manga.value ?: return
 		val chapterId = viewModel.historyInfo.value.history?.chapterId
 		if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
-			val snackbar = makeSnackbar(getString(R.string.chapter_is_missing), Snackbar.LENGTH_SHORT)
+			val snackbar =
+				makeSnackbar(getString(R.string.chapter_is_missing), Snackbar.LENGTH_SHORT)
 			snackbar.show()
 		} else {
 			startActivity(
@@ -331,7 +351,10 @@ class DetailsActivity :
 		view.isVisible = isVisible
 	}
 
-	private fun makeSnackbar(text: CharSequence, @BaseTransientBottomBar.Duration duration: Int): Snackbar {
+	private fun makeSnackbar(
+		text: CharSequence,
+		@BaseTransientBottomBar.Duration duration: Int,
+	): Snackbar {
 		val sb = Snackbar.make(viewBinding.containerDetails, text, duration)
 		if (viewBinding.layoutBottom?.isVisible == true) {
 			sb.anchorView = viewBinding.toolbarChapters

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

@@ -11,6 +11,8 @@ import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
+import androidx.core.text.buildSpannedString
+import androidx.core.text.color
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -21,6 +23,7 @@ import coil.request.SuccessResult
 import coil.util.CoilUtils
 import com.google.android.material.chip.Chip
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
@@ -37,6 +40,7 @@ import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.ext.crossfade
 import org.koitharu.kotatsu.core.util.ext.drawableTop
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.core.util.ext.isTextTruncated
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -70,6 +74,7 @@ import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorShee
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.search.ui.SearchActivity
 import javax.inject.Inject
+import com.google.android.material.R as materialR
 
 @AndroidEntryPoint
 class DetailsFragment :
@@ -113,9 +118,9 @@ class DetailsFragment :
 		viewModel.bookmarks.observe(viewLifecycleOwner, ::onBookmarksChanged)
 		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
 		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
-		viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
 		viewModel.localSize.observe(viewLifecycleOwner, ::onLocalSizeChanged)
 		viewModel.relatedManga.observe(viewLifecycleOwner, ::onRelatedMangaChanged)
+		combine(viewModel.chapters, viewModel.newChaptersCount, ::Pair).observe(viewLifecycleOwner, ::onChaptersChanged)
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
@@ -160,21 +165,22 @@ class DetailsFragment :
 			}
 
 			when (manga.state) {
-				MangaState.FINISHED -> {
-					infoLayout.textViewState.apply {
-						textAndVisible = resources.getString(R.string.state_finished)
-						drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_finished)
-					}
+				MangaState.FINISHED -> infoLayout.textViewState.apply {
+					textAndVisible = resources.getString(R.string.state_finished)
+					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_finished)
 				}
 
-				MangaState.ONGOING -> {
-					infoLayout.textViewState.apply {
-						textAndVisible = resources.getString(R.string.state_ongoing)
-						drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_ongoing)
-					}
+				MangaState.ONGOING -> infoLayout.textViewState.apply {
+					textAndVisible = resources.getString(R.string.state_ongoing)
+					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_ongoing)
 				}
 
-				else -> infoLayout.textViewState.isVisible = false
+				MangaState.ABANDONED -> infoLayout.textViewState.apply {
+					textAndVisible = resources.getString(R.string.state_abandoned)
+					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_abandoned)
+				}
+
+				null -> infoLayout.textViewState.isVisible = false
 			}
 			if (manga.source == MangaSource.LOCAL) {
 				infoLayout.textViewSource.isVisible = false
@@ -190,14 +196,28 @@ class DetailsFragment :
 		}
 	}
 
-	private fun onChaptersChanged(chapters: List<ChapterListItem>?) {
+	private fun onChaptersChanged(data: Pair<List<ChapterListItem>?, Int>) {
+		val (chapters, newChapters) = data
 		val infoLayout = requireViewBinding().infoLayout
 		if (chapters.isNullOrEmpty()) {
 			infoLayout.textViewChapters.isVisible = false
 		} else {
 			val count = chapters.countChaptersByBranch()
 			infoLayout.textViewChapters.isVisible = true
-			infoLayout.textViewChapters.text = resources.getQuantityString(R.plurals.chapters, count, count)
+			val chaptersText = resources.getQuantityString(R.plurals.chapters, count, count)
+			infoLayout.textViewChapters.text = if (newChapters == 0) {
+				chaptersText
+			} else {
+				buildSpannedString {
+					append(chaptersText)
+					append(' ')
+					color(infoLayout.textViewChapters.context.getThemeColor(materialR.attr.colorError)) {
+						append("(+")
+						append(newChapters.toString())
+						append(')')
+					}
+				}
+			}
 		}
 	}
 

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

@@ -1,12 +1,5 @@
 package org.koitharu.kotatsu.details.ui
 
-import android.text.Html
-import android.text.SpannableString
-import android.text.Spanned
-import android.text.style.ForegroundColorSpan
-import androidx.core.net.toUri
-import androidx.core.text.getSpans
-import androidx.core.text.parseAsHtml
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -17,22 +10,21 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.plus
 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.getPreferredBranch
-import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
@@ -40,17 +32,15 @@ import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.core.util.ext.combine
 import org.koitharu.kotatsu.core.util.ext.computeSize
 import org.koitharu.kotatsu.core.util.ext.onFirst
 import org.koitharu.kotatsu.core.util.ext.requireValue
-import org.koitharu.kotatsu.core.util.ext.sanitize
-import org.koitharu.kotatsu.core.util.ext.toFileOrNull
+import org.koitharu.kotatsu.details.data.MangaDetails
 import org.koitharu.kotatsu.details.domain.BranchComparator
 import org.koitharu.kotatsu.details.domain.DetailsInteractor
-import org.koitharu.kotatsu.details.domain.DoubleMangaLoadUseCase
+import org.koitharu.kotatsu.details.domain.DetailsLoadUseCase
+import org.koitharu.kotatsu.details.domain.ProgressUpdateUseCase
 import org.koitharu.kotatsu.details.domain.RelatedMangaUseCase
-import org.koitharu.kotatsu.details.domain.model.DoubleManga
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
 import org.koitharu.kotatsu.details.ui.model.MangaBranch
@@ -74,22 +64,19 @@ class DetailsViewModel @Inject constructor(
 	private val bookmarksRepository: BookmarksRepository,
 	private val settings: AppSettings,
 	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
-	private val imageGetter: Html.ImageGetter,
 	@LocalStorageChanges private val localStorageChanges: SharedFlow<LocalManga?>,
 	private val downloadScheduler: DownloadWorker.Scheduler,
 	private val interactor: DetailsInteractor,
 	savedStateHandle: SavedStateHandle,
 	private val deleteLocalMangaUseCase: DeleteLocalMangaUseCase,
-	private val doubleMangaLoadUseCase: DoubleMangaLoadUseCase,
 	private val relatedMangaUseCase: RelatedMangaUseCase,
 	private val extraProvider: ListExtraProvider,
-	networkState: NetworkState,
+	private val detailsLoadUseCase: DetailsLoadUseCase,
+	private val progressUpdateUseCase: ProgressUpdateUseCase,
 ) : BaseViewModel() {
 
 	private val intent = MangaIntent(savedStateHandle)
 	private val mangaId = intent.mangaId
-	private val doubleManga: MutableStateFlow<DoubleManga?> =
-		MutableStateFlow(intent.manga?.let { DoubleManga(it) })
 	private var loadingJob: Job
 
 	val onShowToast = MutableEventFlow<Int>()
@@ -97,8 +84,9 @@ class DetailsViewModel @Inject constructor(
 	val onSelectChapter = MutableEventFlow<Long>()
 	val onDownloadStarted = MutableEventFlow<Unit>()
 
-	val manga = doubleManga.map { it?.any }
-		.stateIn(viewModelScope, SharingStarted.Eagerly, doubleManga.value?.any)
+	val details = MutableStateFlow(intent.manga?.let { MangaDetails(it, null, null, false) })
+	val manga = details.map { x -> x?.toManga() }
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	val history = historyRepository.observeOne(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
@@ -106,8 +94,13 @@ class DetailsViewModel @Inject constructor(
 	val favouriteCategories = interactor.observeIsFavourite(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
 
-	val newChaptersCount = interactor.observeNewChapters(mangaId)
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
+	val newChaptersCount = details.flatMapLatest { d ->
+		if (d?.isLocal == false) {
+			interactor.observeNewChapters(mangaId)
+		} else {
+			flowOf(0)
+		}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
 
 	private val chaptersQuery = MutableStateFlow("")
 	val selectedBranch = MutableStateFlow<String?>(null)
@@ -135,28 +128,17 @@ class DetailsViewModel @Inject constructor(
 		if (it != null) bookmarksRepository.observeBookmarks(it) else flowOf(emptyList())
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, emptyList())
 
-	val localSize = doubleManga
-		.map {
-			val local = it?.local
-			if (local != null) {
-				val file = local.url.toUri().toFileOrNull()
-				file?.computeSize() ?: 0L
-			} else {
-				0L
-			}
+	val localSize = details
+		.map { it?.local }
+		.distinctUntilChanged()
+		.map { local ->
+			local?.file?.computeSize() ?: 0L
 		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.WhileSubscribed(), 0)
 
-	val description = manga
-		.distinctUntilChangedBy { it?.description.orEmpty() }
-		.transformLatest {
-			val description = it?.description
-			if (description.isNullOrEmpty()) {
-				emit(null)
-			} else {
-				emit(description.parseAsHtml().filterSpans().sanitize())
-				emit(description.parseAsHtml(imageGetter = imageGetter).filterSpans())
-			}
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.WhileSubscribed(5000), null)
+	@Deprecated("")
+	val description = details
+		.map { it?.description }
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, null)
 
 	val onMangaRemoved = MutableEventFlow<Manga>()
 	val isScrobblingAvailable: Boolean
@@ -165,9 +147,7 @@ class DetailsViewModel @Inject constructor(
 	val scrobblingInfo: StateFlow<List<ScrobblingInfo>> = interactor.observeScrobblingInfo(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
-	val relatedManga: StateFlow<List<MangaItemModel>> = doubleManga.map {
-		it?.remote
-	}.distinctUntilChangedBy { it?.id }
+	val relatedManga: StateFlow<List<MangaItemModel>> = manga
 		.mapLatest {
 			if (it != null && settings.isRelatedMangaEnabled) {
 				relatedMangaUseCase.invoke(it)?.toUi(ListMode.GRID, extraProvider).orEmpty()
@@ -178,40 +158,32 @@ class DetailsViewModel @Inject constructor(
 		.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
 	val branches: StateFlow<List<MangaBranch>> = combine(
-		doubleManga,
+		details,
 		selectedBranch,
 	) { m, b ->
-		val chapters = m?.chapters
-		if (chapters.isNullOrEmpty()) return@combine emptyList()
-		chapters.groupBy { x -> x.branch }
+		(m?.chapters ?: return@combine emptyList())
 			.map { x -> MangaBranch(x.key, x.value.size, x.key == b) }
 			.sortedWith(BranchComparator())
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
-	val isChaptersEmpty: StateFlow<Boolean> = combine(
-		doubleManga,
-		isLoading,
-	) { manga, loading ->
-		manga?.any != null && manga.chapters.isNullOrEmpty() && !loading
+	val isChaptersEmpty: StateFlow<Boolean> = details.map {
+		it != null && it.isLoaded && it.allChapters.isEmpty()
 	}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false)
 
 	val chapters = combine(
 		combine(
-			doubleManga,
+			details,
 			history,
 			selectedBranch,
 			newChaptersCount,
 			bookmarks,
-			networkState,
-		) { manga, history, branch, news, bookmarks, isOnline ->
-			mapChapters(
-				manga?.remote?.takeIf { isOnline },
-				manga?.local,
+		) { manga, history, branch, news, bookmarks ->
+			manga?.mapChapters(
 				history,
 				news,
 				branch,
 				bookmarks,
-			)
+			).orEmpty()
 		},
 		isChaptersReversed,
 		chaptersQuery,
@@ -234,6 +206,13 @@ class DetailsViewModel @Inject constructor(
 				onShowTip.call(Unit)
 			}
 		}
+		launchJob(Dispatchers.Default) {
+			val manga = details.firstOrNull { !it?.chapters.isNullOrEmpty() } ?: return@launchJob
+			val h = history.firstOrNull()
+			if (h != null) {
+				progressUpdateUseCase(manga.toManga())
+			}
+		}
 	}
 
 	fun reload() {
@@ -242,7 +221,7 @@ class DetailsViewModel @Inject constructor(
 	}
 
 	fun deleteLocal() {
-		val m = doubleManga.value?.local
+		val m = details.value?.local?.manga
 		if (m == null) {
 			onShowToast.call(R.string.file_not_found)
 			return
@@ -295,13 +274,13 @@ class DetailsViewModel @Inject constructor(
 
 	fun markChapterAsCurrent(chapterId: Long) {
 		launchJob(Dispatchers.Default) {
-			val manga = checkNotNull(doubleManga.value)
-			val chapters = checkNotNull(manga.filterChapters(selectedBranchValue).chapters)
+			val manga = checkNotNull(details.value)
+			val chapters = checkNotNull(manga.chapters[selectedBranchValue])
 			val chapterIndex = chapters.indexOfFirst { it.id == chapterId }
 			check(chapterIndex in chapters.indices) { "Chapter not found" }
 			val percent = chapterIndex / chapters.size.toFloat()
 			historyRepository.addOrUpdate(
-				manga = manga.requireAny(),
+				manga = manga.toManga(),
 				chapterId = chapterId,
 				page = 0,
 				scroll = 0,
@@ -313,7 +292,7 @@ class DetailsViewModel @Inject constructor(
 	fun download(chaptersIds: Set<Long>?) {
 		launchJob(Dispatchers.Default) {
 			downloadScheduler.schedule(
-				doubleManga.requireValue().requireAny(),
+				details.requireValue().toManga(),
 				chaptersIds,
 			)
 			onDownloadStarted.call(Unit)
@@ -333,14 +312,14 @@ class DetailsViewModel @Inject constructor(
 	}
 
 	private fun doLoad() = launchLoadingJob(Dispatchers.Default) {
-		doubleMangaLoadUseCase.invoke(intent)
+		detailsLoadUseCase.invoke(intent)
 			.onFirst {
-				val manga = it.requireAny()
+				val manga = it.toManga()
 				// find default branch
 				val hist = historyRepository.getOne(manga)
 				selectedBranch.value = manga.getPreferredBranch(hist)
 			}.collect {
-				doubleManga.value = it
+				details.value = it
 			}
 	}
 
@@ -356,21 +335,12 @@ class DetailsViewModel @Inject constructor(
 	private suspend fun onDownloadComplete(downloadedManga: LocalManga?) {
 		downloadedManga ?: return
 		launchJob {
-			doubleManga.update {
+			details.update {
 				interactor.updateLocal(it, downloadedManga)
 			}
 		}
 	}
 
-	private fun Spanned.filterSpans(): CharSequence {
-		val spannable = SpannableString.valueOf(this)
-		val spans = spannable.getSpans<ForegroundColorSpan>()
-		for (span in spans) {
-			spannable.removeSpan(span)
-		}
-		return spannable.trim()
-	}
-
 	private fun getScrobbler(index: Int): Scrobbler? {
 		val info = scrobblingInfo.value.getOrNull(index)
 		val scrobbler = if (info != null) {

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

@@ -6,6 +6,7 @@ import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 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.drawableEnd
 import org.koitharu.kotatsu.core.util.ext.drawableStart
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
@@ -47,7 +48,6 @@ fun chapterListItemAD(
 		}
 		binding.imageViewBookmarked.isVisible = item.isBookmarked
 		binding.imageViewDownloaded.isVisible = item.isDownloaded
-		// binding.imageViewNew.isVisible = item.isNew
 		binding.textViewTitle.drawableStart = if (item.isNew) {
 			ContextCompat.getDrawable(context, R.drawable.ic_new)
 		} else {

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

@@ -3,20 +3,22 @@ package org.koitharu.kotatsu.explore.data
 import androidx.room.withTransaction
 import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.move
 import java.util.Collections
 import java.util.EnumSet
 import javax.inject.Inject
@@ -76,14 +78,6 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	suspend fun setSourcesEnabled(sources: Iterable<MangaSource>, isEnabled: Boolean) {
-		db.withTransaction {
-			for (s in sources) {
-				dao.setEnabled(s.name, isEnabled)
-			}
-		}
-	}
-
 	suspend fun disableAllSources() {
 		db.withTransaction {
 			assimilateNewSources()
@@ -99,46 +93,26 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	suspend fun setPosition(source: MangaSource, index: Int) {
-		db.withTransaction {
-			val all = dao.findAll().toMutableList()
-			val sourceIndex = all.indexOfFirst { x -> x.source == source.name }
-			if (sourceIndex !in all.indices) {
-				val entity = MangaSourceEntity(
-					source = source.name,
-					isEnabled = false,
-					sortKey = index,
-				)
-				all.add(index, entity)
-				dao.upsert(entity)
-			} else {
-				all.move(sourceIndex, index)
-			}
-			for ((i, e) in all.withIndex()) {
-				if (e.sortKey != i) {
-					dao.setSortKey(e.source, i)
+	fun observeNewSources(): Flow<Set<MangaSource>> = observeIsNewSourcesEnabled().flatMapLatest {
+		if (it) {
+			combine(
+				dao.observeAll(),
+				observeIsNsfwDisabled(),
+			) { entities, skipNsfw ->
+				val result = EnumSet.copyOf(remoteSources)
+				for (e in entities) {
+					result.remove(MangaSource(e.source))
 				}
-			}
+				if (skipNsfw) {
+					result.removeAll { x -> x.isNsfw() }
+				}
+				result
+			}.distinctUntilChanged()
+		} else {
+			flowOf(emptySet())
 		}
 	}
 
-	fun observeNewSources(): Flow<Set<MangaSource>> = dao.observeAll().map { entities ->
-		val result = EnumSet.copyOf(remoteSources)
-		for (e in entities) {
-			result.remove(MangaSource(e.source))
-		}
-		result
-	}.distinctUntilChanged()
-
-	suspend fun getNewSources(): Set<MangaSource> {
-		val entities = dao.findAll()
-		val result = EnumSet.copyOf(remoteSources)
-		for (e in entities) {
-			result.remove(MangaSource(e.source))
-		}
-		return result
-	}
-
 	suspend fun assimilateNewSources(): Set<MangaSource> {
 		val new = getNewSources()
 		if (new.isEmpty()) {
@@ -153,6 +127,9 @@ class MangaSourcesRepository @Inject constructor(
 			)
 		}
 		dao.insertIfAbsent(entities)
+		if (settings.isNsfwContentDisabled) {
+			new.removeAll { x -> x.isNsfw() }
+		}
 		return new
 	}
 
@@ -160,6 +137,15 @@ class MangaSourcesRepository @Inject constructor(
 		return dao.findAll().isEmpty()
 	}
 
+	private suspend fun getNewSources(): MutableSet<MangaSource> {
+		val entities = dao.findAll()
+		val result = EnumSet.copyOf(remoteSources)
+		for (e in entities) {
+			result.remove(MangaSource(e.source))
+		}
+		return result
+	}
+
 	private fun List<MangaSourceEntity>.toSources(skipNsfwSources: Boolean): List<MangaSource> {
 		val result = ArrayList<MangaSource>(size)
 		for (entity in this) {
@@ -177,4 +163,8 @@ class MangaSourcesRepository @Inject constructor(
 	private fun observeIsNsfwDisabled() = settings.observeAsFlow(AppSettings.KEY_DISABLE_NSFW) {
 		isNsfwContentDisabled
 	}
+
+	private fun observeIsNewSourcesEnabled() = settings.observeAsFlow(AppSettings.KEY_SOURCES_NEW) {
+		isNewSourcesTipEnabled
+	}
 }

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

@@ -7,6 +7,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
@@ -15,9 +16,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.ui.BookmarksActivity
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.dialog.TwoButtonsAlertDialog
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
@@ -28,6 +31,7 @@ import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
 import org.koitharu.kotatsu.databinding.FragmentExploreBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.list.DownloadsActivity
@@ -55,6 +59,9 @@ class ExploreFragment :
 	@Inject
 	lateinit var coil: ImageLoader
 
+	@Inject
+	lateinit var shortcutManager: AppShortcutManager
+
 	private val viewModel by viewModels<ExploreViewModel>()
 	private var exploreAdapter: ExploreAdapter? = null
 
@@ -141,6 +148,8 @@ class ExploreFragment :
 	override fun onItemLongClick(item: MangaSourceItem, view: View): Boolean {
 		val menu = PopupMenu(view.context, view)
 		menu.inflate(R.menu.popup_source)
+		menu.menu.findItem(R.id.action_shortcut)
+			?.isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(view.context)
 		menu.setOnMenuItemClickListener(SourceMenuListener(item))
 		menu.show()
 		return true
@@ -195,6 +204,12 @@ class ExploreFragment :
 					viewModel.hideSource(sourceItem.source)
 				}
 
+				R.id.action_shortcut -> {
+					viewLifecycleScope.launch {
+						shortcutManager.requestPinShortcut(sourceItem.source)
+					}
+				}
+
 				else -> return false
 			}
 			return true

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

@@ -16,6 +16,7 @@ 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.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemExploreButtonsBinding
@@ -44,7 +45,12 @@ fun exploreButtonsAD(
 		if (item.isRandomLoading) {
 			val icon = CircularProgressDrawable(context)
 			icon.strokeWidth = context.resources.resolveDp(2f)
-			icon.setColorSchemeColors(context.getThemeColor(materialR.attr.colorPrimary, Color.DKGRAY))
+			icon.setColorSchemeColors(
+				context.getThemeColor(
+					materialR.attr.colorPrimary,
+					Color.DKGRAY
+				)
+			)
 			binding.buttonRandom.icon = icon
 			icon.start()
 		} else {
@@ -88,7 +94,13 @@ fun exploreSourceListItemAD(
 	listener: OnListItemClickListener<MangaSourceItem>,
 	lifecycleOwner: LifecycleOwner,
 ) = adapterDelegateViewBinding<MangaSourceItem, ListModel, ItemExploreSourceListBinding>(
-	{ layoutInflater, parent -> ItemExploreSourceListBinding.inflate(layoutInflater, parent, false) },
+	{ layoutInflater, parent ->
+		ItemExploreSourceListBinding.inflate(
+			layoutInflater,
+			parent,
+			false
+		)
+	},
 	on = { item, _, _ -> item is MangaSourceItem && !item.isGrid },
 ) {
 
@@ -96,6 +108,7 @@ fun exploreSourceListItemAD(
 
 	binding.root.setOnClickListener(eventListener)
 	binding.root.setOnLongClickListener(eventListener)
+	binding.root.setOnContextClickListenerCompat(eventListener)
 
 	bind {
 		binding.textViewTitle.text = item.source.title
@@ -115,7 +128,13 @@ fun exploreSourceGridItemAD(
 	listener: OnListItemClickListener<MangaSourceItem>,
 	lifecycleOwner: LifecycleOwner,
 ) = adapterDelegateViewBinding<MangaSourceItem, ListModel, ItemExploreSourceGridBinding>(
-	{ layoutInflater, parent -> ItemExploreSourceGridBinding.inflate(layoutInflater, parent, false) },
+	{ layoutInflater, parent ->
+		ItemExploreSourceGridBinding.inflate(
+			layoutInflater,
+			parent,
+			false
+		)
+	},
 	on = { item, _, _ -> item is MangaSourceItem && item.isGrid },
 ) {
 
@@ -123,6 +142,7 @@ fun exploreSourceGridItemAD(
 
 	binding.root.setOnClickListener(eventListener)
 	binding.root.setOnLongClickListener(eventListener)
+	binding.root.setOnContextClickListenerCompat(eventListener)
 
 	bind {
 		binding.textViewTitle.text = item.source.title

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

@@ -1,17 +1,16 @@
 package org.koitharu.kotatsu.favourites.data
 
-import org.koitharu.kotatsu.core.db.entity.SortOrder
 import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import java.util.Date
 
 fun FavouriteCategoryEntity.toFavouriteCategory(id: Long = categoryId.toLong()) = FavouriteCategory(
 	id = id,
 	title = title,
 	sortKey = sortKey,
-	order = SortOrder(order, SortOrder.NEWEST),
+	order = ListSortOrder(order, ListSortOrder.NEWEST),
 	createdAt = Date(createdAt),
 	isTrackingEnabled = track,
 	isVisibleInLibrary = isVisibleInLibrary,

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

@@ -1,13 +1,19 @@
 package org.koitharu.kotatsu.favourites.data
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.RawQuery
+import androidx.room.Transaction
+import androidx.room.Upsert
 import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
 import org.intellij.lang.annotations.Language
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.favourites.domain.model.Cover
-import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 
 @Dao
 abstract class FavouritesDao {
@@ -22,7 +28,7 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites WHERE deleted_at = 0 GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit")
 	abstract suspend fun findLast(limit: Int): List<FavouriteManga>
 
-	fun observeAll(order: SortOrder): Flow<List<FavouriteManga>> {
+	fun observeAll(order: ListSortOrder): Flow<List<FavouriteManga>> {
 		val orderBy = getOrderBy(order)
 
 		@Language("RoomSql")
@@ -47,7 +53,7 @@ abstract class FavouritesDao {
 	)
 	abstract suspend fun findAll(categoryId: Long): List<FavouriteManga>
 
-	fun observeAll(categoryId: Long, order: SortOrder): Flow<List<FavouriteManga>> {
+	fun observeAll(categoryId: Long, order: ListSortOrder): Flow<List<FavouriteManga>> {
 		val orderBy = getOrderBy(order)
 
 		@Language("RoomSql")
@@ -72,13 +78,14 @@ abstract class FavouritesDao {
 	)
 	abstract suspend fun findAllManga(categoryId: Int): List<MangaEntity>
 
-	suspend fun findCovers(categoryId: Long, order: SortOrder): List<Cover> {
+	suspend fun findCovers(categoryId: Long, order: ListSortOrder): List<Cover> {
 		val orderBy = getOrderBy(order)
 
 		@Language("RoomSql")
 		val query = SimpleSQLiteQuery(
-			"SELECT m.cover_url AS url, m.source AS source FROM favourites AS f LEFT JOIN manga AS m ON f.manga_id = m.manga_id " +
-				"WHERE f.category_id = ? AND deleted_at = 0 ORDER BY $orderBy",
+			"SELECT manga.cover_url AS url, manga.source AS source FROM favourites " +
+				"LEFT JOIN manga ON favourites.manga_id = manga.manga_id " +
+				"WHERE favourites.category_id = ? AND deleted_at = 0 ORDER BY $orderBy",
 			arrayOf<Any>(categoryId),
 		)
 		return findCoversImpl(query)
@@ -157,13 +164,12 @@ abstract class FavouritesDao {
 	@Query("UPDATE favourites SET deleted_at = :deletedAt WHERE category_id = :categoryId AND deleted_at = 0")
 	protected abstract suspend fun setDeletedAtAll(categoryId: Long, deletedAt: Long)
 
-	private fun getOrderBy(sortOrder: SortOrder) = when (sortOrder) {
-		SortOrder.RATING -> "rating DESC"
-		SortOrder.NEWEST,
-		SortOrder.UPDATED,
-		-> "created_at DESC"
-
-		SortOrder.ALPHABETICAL -> "title ASC"
+	private fun getOrderBy(sortOrder: ListSortOrder) = when (sortOrder) {
+		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.PROGRESS -> "(SELECT percent FROM history WHERE history.manga_id = manga.manga_id) DESC"
 		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
 	}
 }

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

@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.SortOrder
 import org.koitharu.kotatsu.core.db.entity.toEntities
 import org.koitharu.kotatsu.core.db.entity.toEntity
 import org.koitharu.kotatsu.core.model.FavouriteCategory
@@ -20,8 +19,8 @@ import org.koitharu.kotatsu.favourites.data.toFavouriteCategory
 import org.koitharu.kotatsu.favourites.data.toManga
 import org.koitharu.kotatsu.favourites.data.toMangaList
 import org.koitharu.kotatsu.favourites.domain.model.Cover
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.tracker.work.TrackerNotificationChannels
 import javax.inject.Inject
 
@@ -41,7 +40,7 @@ class FavouritesRepository @Inject constructor(
 		return entities.toMangaList()
 	}
 
-	fun observeAll(order: SortOrder): Flow<List<Manga>> {
+	fun observeAll(order: ListSortOrder): Flow<List<Manga>> {
 		return db.favouritesDao.observeAll(order)
 			.mapItems { it.toManga() }
 	}
@@ -51,7 +50,7 @@ class FavouritesRepository @Inject constructor(
 		return entities.toMangaList()
 	}
 
-	fun observeAll(categoryId: Long, order: SortOrder): Flow<List<Manga>> {
+	fun observeAll(categoryId: Long, order: ListSortOrder): Flow<List<Manga>> {
 		return db.favouritesDao.observeAll(categoryId, order)
 			.mapItems { it.toManga() }
 	}
@@ -105,7 +104,7 @@ class FavouritesRepository @Inject constructor(
 
 	suspend fun createCategory(
 		title: String,
-		sortOrder: SortOrder,
+		sortOrder: ListSortOrder,
 		isTrackerEnabled: Boolean,
 		isVisibleOnShelf: Boolean,
 	): FavouriteCategory {
@@ -128,7 +127,7 @@ class FavouritesRepository @Inject constructor(
 	suspend fun updateCategory(
 		id: Long,
 		title: String,
-		sortOrder: SortOrder,
+		sortOrder: ListSortOrder,
 		isTrackerEnabled: Boolean,
 		isVisibleOnShelf: Boolean,
 	) {
@@ -156,7 +155,7 @@ class FavouritesRepository @Inject constructor(
 		}
 	}
 
-	suspend fun setCategoryOrder(id: Long, order: SortOrder) {
+	suspend fun setCategoryOrder(id: Long, order: ListSortOrder) {
 		db.favouriteCategoriesDao.updateOrder(id, order.name)
 	}
 
@@ -205,10 +204,10 @@ class FavouritesRepository @Inject constructor(
 		return ReversibleHandle { recoverToCategory(categoryId, ids) }
 	}
 
-	private fun observeOrder(categoryId: Long): Flow<SortOrder> {
+	private fun observeOrder(categoryId: Long): Flow<ListSortOrder> {
 		return db.favouriteCategoriesDao.observe(categoryId)
 			.filterNotNull()
-			.map { x -> SortOrder(x.order, SortOrder.NEWEST) }
+			.map { x -> ListSortOrder(x.order, ListSortOrder.NEWEST) }
 			.distinctUntilChanged()
 	}
 

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

@@ -27,7 +27,6 @@ import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEdit
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.SortOrder
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -176,12 +175,6 @@ class FavouriteCategoriesActivity :
 
 	companion object {
 
-		val SORT_ORDERS = arrayOf(
-			SortOrder.ALPHABETICAL,
-			SortOrder.NEWEST,
-			SortOrder.RATING,
-		)
-
 		fun newIntent(context: Context) = Intent(context, FavouriteCategoriesActivity::class.java)
 	}
 }

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

@@ -18,16 +18,15 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.ui.model.titleRes
 import org.koitharu.kotatsu.core.ui.util.DefaultTextWatcher
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.getSerializableCompat
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.setChecked
+import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.databinding.ActivityCategoryEditBinding
-import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
-import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import com.google.android.material.R as materialR
 
 @AndroidEntryPoint
@@ -38,7 +37,8 @@ class FavouritesCategoryEditActivity :
 	DefaultTextWatcher {
 
 	private val viewModel by viewModels<FavouritesCategoryEditViewModel>()
-	private var selectedSortOrder: SortOrder? = null
+	private var selectedSortOrder: ListSortOrder? = null
+	private val sortOrders = ListSortOrder.FAVORITES.sortedByOrdinal()
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -68,7 +68,7 @@ class FavouritesCategoryEditActivity :
 
 	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
 		super.onRestoreInstanceState(savedInstanceState)
-		val order = savedInstanceState.getSerializableCompat<SortOrder>(KEY_SORT_ORDER)
+		val order = savedInstanceState.getSerializableCompat<ListSortOrder>(KEY_SORT_ORDER)
 		if (order != null) {
 			selectedSortOrder = order
 		}
@@ -103,7 +103,7 @@ class FavouritesCategoryEditActivity :
 	}
 
 	override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-		selectedSortOrder = FavouriteCategoriesActivity.SORT_ORDERS.getOrNull(position)
+		selectedSortOrder = sortOrders.getOrNull(position)
 	}
 
 	private fun onCategoryChanged(category: FavouriteCategory?) {
@@ -113,7 +113,7 @@ class FavouritesCategoryEditActivity :
 		}
 		viewBinding.editName.setText(category?.title)
 		selectedSortOrder = category?.order
-		val sortText = getString((category?.order ?: SortOrder.NEWEST).titleRes)
+		val sortText = getString((category?.order ?: ListSortOrder.NEWEST).titleResId)
 		viewBinding.editSort.setText(sortText, false)
 		viewBinding.switchTracker.setChecked(category?.isTrackingEnabled ?: true, false)
 		viewBinding.switchShelf.setChecked(category?.isVisibleInLibrary ?: true, false)
@@ -135,17 +135,17 @@ class FavouritesCategoryEditActivity :
 	}
 
 	private fun initSortSpinner() {
-		val entries = FavouriteCategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
+		val entries = sortOrders.map { getString(it.titleResId) }
 		val adapter = SortAdapter(this, entries)
 		viewBinding.editSort.setAdapter(adapter)
 		viewBinding.editSort.onItemClickListener = this
 	}
 
-	private fun getSelectedSortOrder(): SortOrder {
+	private fun getSelectedSortOrder(): ListSortOrder {
 		selectedSortOrder?.let { return it }
-		val entries = FavouriteCategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
+		val entries = sortOrders.map { getString(it.titleResId) }
 		val index = entries.indexOf(viewBinding.editSort.text.toString())
-		return FavouriteCategoriesActivity.SORT_ORDERS.getOrNull(index) ?: SortOrder.NEWEST
+		return sortOrders.getOrNull(index) ?: ListSortOrder.NEWEST
 	}
 
 	private class SortAdapter(

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

@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity.Companion.EXTRA_ID
 import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity.Companion.NO_ID
-import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import javax.inject.Inject
 
 @HiltViewModel
@@ -48,7 +48,7 @@ class FavouritesCategoryEditViewModel @Inject constructor(
 
 	fun save(
 		title: String,
-		sortOrder: SortOrder,
+		sortOrder: ListSortOrder,
 		isTrackerEnabled: Boolean,
 		isVisibleOnShelf: Boolean,
 	) {

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

@@ -10,13 +10,11 @@ import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
-import org.koitharu.kotatsu.core.ui.model.titleRes
-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.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.FragmentListBinding
-import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
@@ -27,12 +25,14 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 
 	override val isSwipeRefreshEnabled = false
 
+	val categoryId
+		get() = viewModel.categoryId
+
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		if (viewModel.categoryId != NO_ID) {
 			addMenuProvider(FavouritesListMenuProvider(binding.root.context, viewModel))
 		}
-		viewModel.sortOrder.observe(viewLifecycleOwner, MenuInvalidator(requireActivity()))
 	}
 
 	override fun onScrolledToEnd() = Unit
@@ -40,14 +40,15 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 	override fun onFilterClick(view: View?) {
 		val menu = PopupMenu(view?.context ?: return, view)
 		menu.setOnMenuItemClickListener(this)
-		for ((i, item) in FavouriteCategoriesActivity.SORT_ORDERS.withIndex()) {
-			menu.menu.add(Menu.NONE, Menu.NONE, i, item.titleRes)
+		val orders = ListSortOrder.FAVORITES.sortedByOrdinal()
+		for ((i, item) in orders.withIndex()) {
+			menu.menu.add(Menu.NONE, Menu.NONE, i, item.titleResId)
 		}
 		menu.show()
 	}
 
 	override fun onMenuItemClick(item: MenuItem): Boolean {
-		val order = FavouriteCategoriesActivity.SORT_ORDERS.getOrNull(item.order) ?: return false
+		val order = ListSortOrder.FAVORITES.sortedByOrdinal().getOrNull(item.order) ?: return false
 		viewModel.setSortOrder(order)
 		return true
 	}

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

@@ -5,12 +5,8 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
-import androidx.core.view.forEach
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.model.titleRes
-import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
 import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
-import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class FavouritesListMenuProvider(
 	private val context: Context,
@@ -19,34 +15,12 @@ class FavouritesListMenuProvider(
 
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
 		menuInflater.inflate(R.menu.opt_favourites, menu)
-		val subMenu = menu.findItem(R.id.action_order)?.subMenu ?: return
-		for (order in FavouriteCategoriesActivity.SORT_ORDERS) {
-			subMenu.add(R.id.group_order, Menu.NONE, order.ordinal, order.titleRes)
-		}
-		subMenu.setGroupCheckable(R.id.group_order, true, true)
-	}
-
-	override fun onPrepareMenu(menu: Menu) {
-		super.onPrepareMenu(menu)
-		val order = viewModel.sortOrder.value ?: return
-		menu.findItem(R.id.action_order)?.subMenu?.forEach { item ->
-			if (item.order == order.ordinal) {
-				item.isChecked = true
-			}
-		}
 	}
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-		if (menuItem.groupId == R.id.group_order) {
-			val order = SortOrder.entries[menuItem.order]
-			viewModel.setSortOrder(order)
-			return true
-		}
 		return when (menuItem.itemId) {
 			R.id.action_edit -> {
-				context.startActivity(
-					FavouritesCategoryEditActivity.newIntent(context, viewModel.categoryId),
-				)
+				context.startActivity(FavouritesCategoryEditActivity.newIntent(context, viewModel.categoryId))
 				true
 			}
 

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

@@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
@@ -21,12 +22,12 @@ import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.ARG_CATEGORY_ID
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.list.ui.model.toUi
-import org.koitharu.kotatsu.parsers.model.SortOrder
 import javax.inject.Inject
 
 @HiltViewModel
@@ -40,7 +41,10 @@ class FavouritesListViewModel @Inject constructor(
 
 	val categoryId: Long = savedStateHandle[ARG_CATEGORY_ID] ?: NO_ID
 
-	val sortOrder: StateFlow<SortOrder?> = if (categoryId == NO_ID) {
+	override val listMode = settings.observeAsFlow(AppSettings.KEY_LIST_MODE_FAVORITES) { favoritesListMode }
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.favoritesListMode)
+
+	val sortOrder: StateFlow<ListSortOrder?> = if (categoryId == NO_ID) {
 		MutableStateFlow(null)
 	} else {
 		repository.observeCategory(categoryId)
@@ -50,7 +54,7 @@ class FavouritesListViewModel @Inject constructor(
 
 	override val content = combine(
 		if (categoryId == NO_ID) {
-			repository.observeAll(SortOrder.NEWEST)
+			repository.observeAll(ListSortOrder.NEWEST)
 		} else {
 			repository.observeAll(categoryId)
 		},
@@ -94,7 +98,7 @@ class FavouritesListViewModel @Inject constructor(
 		}
 	}
 
-	fun setSortOrder(order: SortOrder) {
+	fun setSortOrder(order: ListSortOrder) {
 		if (categoryId == NO_ID) {
 			return
 		}

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt

@@ -25,6 +25,7 @@ import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.lifecycleScope
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.require
+import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
 import org.koitharu.kotatsu.filter.ui.model.FilterItem
 import org.koitharu.kotatsu.filter.ui.model.FilterState
@@ -131,7 +132,7 @@ class FilterCoordinator @Inject constructor(
 		observeState(),
 		observeAvailableTags(),
 	) { state, available ->
-		val chips = createChipsList(state, available.orEmpty())
+		val chips = createChipsList(state, available.orEmpty(), 8)
 		FilterHeaderModel(chips, state.sortOrder, state.tags.isNotEmpty())
 	}
 
@@ -157,11 +158,16 @@ class FilterCoordinator @Inject constructor(
 	private suspend fun createChipsList(
 		filterState: FilterState,
 		availableTags: Set<MangaTag>,
+		limit: Int,
 	): List<ChipsView.ChipModel> {
 		val selectedTags = filterState.tags.toMutableSet()
-		var tags = searchRepository.getTagsSuggestion("", 6, repository.source)
-		if (tags.isEmpty()) {
-			tags = availableTags.take(6)
+		var tags = if (selectedTags.isEmpty()) {
+			searchRepository.getTagsSuggestion("", limit, repository.source)
+		} else {
+			searchRepository.getTagsSuggestion(selectedTags).take(limit)
+		}
+		if (tags.size < limit) {
+			tags = tags + availableTags.take(limit - tags.size)
 		}
 		if (tags.isEmpty() && selectedTags.isEmpty()) {
 			return emptyList()
@@ -202,7 +208,7 @@ class FilterCoordinator @Inject constructor(
 		state: FilterState,
 		query: String,
 	): List<ListModel> {
-		val sortOrders = repository.sortOrders.sortedBy { it.ordinal }
+		val sortOrders = repository.sortOrders.sortedByOrdinal()
 		val tags = mergeTags(state.tags, allTags.tags).toList()
 		val list = ArrayList<ListModel>(tags.size + sortOrders.size + 3)
 		if (query.isEmpty()) {

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

@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.Flow
 import org.intellij.lang.annotations.Language
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.history.domain.model.HistoryOrder
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 
 @Dao
 abstract class HistoryDao {
@@ -33,12 +33,14 @@ abstract class HistoryDao {
 	@Query("SELECT * FROM history WHERE deleted_at = 0 ORDER BY updated_at DESC LIMIT :limit")
 	abstract fun observeAll(limit: Int): Flow<List<HistoryWithManga>>
 
-	fun observeAll(order: HistoryOrder): Flow<List<HistoryWithManga>> {
+	fun observeAll(order: ListSortOrder): Flow<List<HistoryWithManga>> {
 		val orderBy = when (order) {
-			HistoryOrder.UPDATED -> "history.updated_at DESC"
-			HistoryOrder.CREATED -> "history.created_at DESC"
-			HistoryOrder.PROGRESS -> "history.percent DESC"
-			HistoryOrder.ALPHABETIC -> "manga.title"
+			ListSortOrder.UPDATED -> "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"
+			else -> throw IllegalArgumentException("Sort order $order is not supported")
 		}
 
 		@Language("RoomSql")

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

@@ -18,8 +18,8 @@ import org.koitharu.kotatsu.core.model.findById
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.core.util.ext.mapItems
-import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import org.koitharu.kotatsu.history.domain.model.MangaWithHistory
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
@@ -66,7 +66,7 @@ class HistoryRepository @Inject constructor(
 		}
 	}
 
-	fun observeAllWithHistory(order: HistoryOrder): Flow<List<MangaWithHistory>> {
+	fun observeAllWithHistory(order: ListSortOrder): Flow<List<MangaWithHistory>> {
 		return db.historyDao.observeAll(order).mapItems {
 			MangaWithHistory(
 				it.manga.toManga(it.tags.toMangaTags()),
@@ -93,8 +93,11 @@ class HistoryRepository @Inject constructor(
 		}
 		val tags = manga.tags.toEntities()
 		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
+			val existing = db.mangaDao.find(manga.id)?.manga
+			if (existing == null || existing.source == manga.source.name) {
+				db.tagsDao.upsert(tags)
+				db.mangaDao.upsert(manga.toEntity(), tags)
+			}
 			db.historyDao.upsert(
 				HistoryEntity(
 					mangaId = manga.id,

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

@@ -1,16 +0,0 @@
-package org.koitharu.kotatsu.history.domain.model
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-
-enum class HistoryOrder(
-	@StringRes val titleResId: Int,
-) {
-
-	UPDATED(R.string.updated),
-	CREATED(R.string.order_added),
-	PROGRESS(R.string.progress),
-	ALPHABETIC(R.string.by_name);
-
-	fun isGroupingSupported() = this == UPDATED || this == CREATED || this == PROGRESS
-}

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

@@ -9,9 +9,7 @@ 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.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,9 +24,6 @@ class HistoryListFragment : MangaListFragment() {
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		addMenuProvider(HistoryListMenuProvider(binding.root.context, viewModel))
-		val menuInvalidator = MenuInvalidator(requireActivity())
-		viewModel.isGroupingEnabled.observe(viewLifecycleOwner, menuInvalidator)
-		viewModel.sortOrder.observe(viewLifecycleOwner, menuInvalidator)
 	}
 
 	override fun onScrolledToEnd() = Unit

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

@@ -5,12 +5,10 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
-import androidx.core.view.forEach
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.dialog.RememberSelectionDialogListener
 import org.koitharu.kotatsu.core.util.ext.startOfDay
-import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import java.util.Date
 import java.util.concurrent.TimeUnit
 import com.google.android.material.R as materialR
@@ -22,47 +20,19 @@ class HistoryListMenuProvider(
 
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
 		menuInflater.inflate(R.menu.opt_history, menu)
-		val subMenu = menu.findItem(R.id.action_order)?.subMenu ?: return
-		for (order in HistoryOrder.entries) {
-			subMenu.add(R.id.group_order, Menu.NONE, order.ordinal, order.titleResId)
-		}
-		subMenu.setGroupCheckable(R.id.group_order, true, true)
 	}
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-		if (menuItem.groupId == R.id.group_order) {
-			val order = HistoryOrder.entries[menuItem.order]
-			viewModel.setSortOrder(order)
-			return true
-		}
 		return when (menuItem.itemId) {
 			R.id.action_clear_history -> {
 				showClearHistoryDialog()
 				true
 			}
 
-			R.id.action_history_grouping -> {
-				viewModel.setGrouping(!menuItem.isChecked)
-				true
-			}
-
 			else -> false
 		}
 	}
 
-	override fun onPrepareMenu(menu: Menu) {
-		val order = viewModel.sortOrder.value
-		menu.findItem(R.id.action_order)?.subMenu?.forEach { item ->
-			if (item.order == order.ordinal) {
-				item.isChecked = true
-			}
-		}
-		menu.findItem(R.id.action_history_grouping)?.run {
-			isChecked = viewModel.isGroupingEnabled.value == true
-			isEnabled = order.isGroupingSupported()
-		}
-	}
-
 	private fun showClearHistoryDialog() {
 		val selectionListener = RememberSelectionDialogListener(2)
 		MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)

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

@@ -26,9 +26,9 @@ import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.core.util.ext.onFirst
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.history.data.HistoryRepository
-import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import org.koitharu.kotatsu.history.domain.model.MangaWithHistory
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.EmptyHint
 import org.koitharu.kotatsu.list.ui.model.EmptyState
@@ -54,22 +54,21 @@ class HistoryListViewModel @Inject constructor(
 	downloadScheduler: DownloadWorker.Scheduler,
 ) : MangaListViewModel(settings, downloadScheduler) {
 
-	val sortOrder: StateFlow<HistoryOrder> = settings.observeAsStateFlow(
+	private val sortOrder: StateFlow<ListSortOrder> = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.IO,
 		key = AppSettings.KEY_HISTORY_ORDER,
 		valueProducer = { historySortOrder },
 	)
 
-	val isGroupingEnabled = settings.observeAsFlow(
+	override val listMode = settings.observeAsFlow(AppSettings.KEY_LIST_MODE_HISTORY) { historyListMode }
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.historyListMode)
+
+	private val isGroupingEnabled = settings.observeAsFlow(
 		key = AppSettings.KEY_HISTORY_GROUPING,
 		valueProducer = { isHistoryGroupingEnabled },
 	).combine(sortOrder) { g, s ->
 		g && s.isGroupingSupported()
-	}.stateIn(
-		scope = viewModelScope + Dispatchers.Default,
-		started = SharingStarted.Eagerly,
-		initialValue = settings.isHistoryGroupingEnabled && sortOrder.value.isGroupingSupported(),
-	)
+	}
 
 	override val content = combine(
 		sortOrder.flatMapLatest { repository.observeAllWithHistory(it) },
@@ -101,10 +100,6 @@ class HistoryListViewModel @Inject constructor(
 
 	override fun onRetry() = Unit
 
-	fun setSortOrder(order: HistoryOrder) {
-		settings.historySortOrder = order
-	}
-
 	fun clearHistory(minDate: Long) {
 		launchJob(Dispatchers.Default) {
 			val stringRes = if (minDate <= 0) {
@@ -128,10 +123,6 @@ class HistoryListViewModel @Inject constructor(
 		}
 	}
 
-	fun setGrouping(isGroupingEnabled: Boolean) {
-		settings.isHistoryGroupingEnabled = isGroupingEnabled
-	}
-
 	private suspend fun mapList(
 		list: List<MangaWithHistory>,
 		grouped: Boolean,
@@ -173,10 +164,10 @@ class HistoryListViewModel @Inject constructor(
 		return result
 	}
 
-	private fun MangaHistory.header(order: HistoryOrder): ListHeader? = when (order) {
-		HistoryOrder.UPDATED -> ListHeader(timeAgo(updatedAt))
-		HistoryOrder.CREATED -> ListHeader(timeAgo(createdAt))
-		HistoryOrder.PROGRESS -> ListHeader(
+	private fun MangaHistory.header(order: ListSortOrder): ListHeader? = when (order) {
+		ListSortOrder.UPDATED -> ListHeader(timeAgo(updatedAt))
+		ListSortOrder.NEWEST -> ListHeader(timeAgo(createdAt))
+		ListSortOrder.PROGRESS -> ListHeader(
 			when (percent) {
 				1f -> R.string.status_completed
 				in 0f..0.01f -> R.string.status_planned
@@ -185,7 +176,10 @@ class HistoryListViewModel @Inject constructor(
 			},
 		)
 
-		HistoryOrder.ALPHABETIC -> null
+		ListSortOrder.ALPHABETIC,
+		ListSortOrder.RELEVANCE,
+		ListSortOrder.NEW_CHAPTERS,
+		ListSortOrder.RATING -> null
 	}
 
 	private fun timeAgo(date: Date): DateTimeAgo {

app/src/main/kotlin/org/koitharu/kotatsu/list/domain/ListSortOrder.kt

@@ -0,0 +1,31 @@
+package org.koitharu.kotatsu.list.domain
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.parsers.util.find
+import java.util.EnumSet
+
+enum class ListSortOrder(
+	@StringRes val titleResId: Int,
+) {
+
+	UPDATED(R.string.updated),
+	NEWEST(R.string.order_added),
+	PROGRESS(R.string.progress),
+	ALPHABETIC(R.string.by_name),
+	RATING(R.string.by_rating),
+	RELEVANCE(R.string.by_relevance),
+	NEW_CHAPTERS(R.string.new_chapters),
+	;
+
+	fun isGroupingSupported() = this == UPDATED || this == NEWEST || this == PROGRESS
+
+	companion object {
+
+		val HISTORY: Set<ListSortOrder> = EnumSet.of(UPDATED, NEWEST, PROGRESS, ALPHABETIC, NEW_CHAPTERS)
+		val FAVORITES: Set<ListSortOrder> = EnumSet.of(ALPHABETIC, NEWEST, RATING, NEW_CHAPTERS, PROGRESS)
+		val SUGGESTIONS: Set<ListSortOrder> = EnumSet.of(RELEVANCE)
+
+		operator fun invoke(value: String, fallback: ListSortOrder) = entries.find(value) ?: fallback
+	}
+}

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

@@ -1,78 +0,0 @@
-package org.koitharu.kotatsu.list.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentManager
-import com.google.android.material.button.MaterialButtonToggleGroup
-import com.google.android.material.slider.Slider
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.ListMode
-import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
-import org.koitharu.kotatsu.core.util.ext.setValueRounded
-import org.koitharu.kotatsu.core.util.ext.showDistinct
-import org.koitharu.kotatsu.core.util.progress.IntPercentLabelFormatter
-import org.koitharu.kotatsu.databinding.DialogListModeBinding
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ListModeBottomSheet :
-	BaseAdaptiveSheet<DialogListModeBinding>(),
-	Slider.OnChangeListener,
-	MaterialButtonToggleGroup.OnButtonCheckedListener {
-
-	@Inject
-	lateinit var settings: AppSettings
-
-	override fun onCreateViewBinding(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = DialogListModeBinding.inflate(inflater, container, false)
-
-	override fun onViewBindingCreated(binding: DialogListModeBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		val mode = settings.listMode
-		binding.buttonList.isChecked = mode == ListMode.LIST
-		binding.buttonListDetailed.isChecked = mode == ListMode.DETAILED_LIST
-		binding.buttonGrid.isChecked = mode == ListMode.GRID
-		binding.textViewGridTitle.isVisible = mode == ListMode.GRID
-		binding.sliderGrid.isVisible = mode == ListMode.GRID
-
-		binding.sliderGrid.setLabelFormatter(IntPercentLabelFormatter(binding.root.context))
-		binding.sliderGrid.setValueRounded(settings.gridSize.toFloat())
-		binding.sliderGrid.addOnChangeListener(this)
-
-		binding.checkableGroup.addOnButtonCheckedListener(this)
-	}
-
-	override fun onButtonChecked(group: MaterialButtonToggleGroup?, checkedId: Int, isChecked: Boolean) {
-		if (!isChecked) {
-			return
-		}
-		val mode = when (checkedId) {
-			R.id.button_list -> ListMode.LIST
-			R.id.button_list_detailed -> ListMode.DETAILED_LIST
-			R.id.button_grid -> ListMode.GRID
-			else -> return
-		}
-		requireViewBinding().textViewGridTitle.isVisible = mode == ListMode.GRID
-		requireViewBinding().sliderGrid.isVisible = mode == ListMode.GRID
-		settings.listMode = mode
-	}
-
-	override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
-		if (fromUser) {
-			settings.gridSize = value.toInt()
-		}
-	}
-
-	companion object {
-
-		private const val TAG = "ListModeSelectDialog"
-
-		fun show(fm: FragmentManager) = ListModeBottomSheet().showDistinct(fm, TAG)
-	}
-}

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

@@ -6,6 +6,11 @@ import android.view.MenuItem
 import androidx.core.view.MenuProvider
 import androidx.fragment.app.Fragment
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
+import org.koitharu.kotatsu.history.ui.HistoryListFragment
+import org.koitharu.kotatsu.list.ui.config.ListConfigBottomSheet
+import org.koitharu.kotatsu.list.ui.config.ListConfigSection
+import org.koitharu.kotatsu.suggestions.ui.SuggestionsFragment
 
 class MangaListMenuProvider(
 	private val fragment: Fragment,
@@ -17,7 +22,13 @@ class MangaListMenuProvider(
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
 		R.id.action_list_mode -> {
-			ListModeBottomSheet.show(fragment.childFragmentManager)
+			val section: ListConfigSection = when (fragment) {
+				is HistoryListFragment -> ListConfigSection.History
+				is SuggestionsFragment -> ListConfigSection.Suggestions
+				is FavouritesListFragment -> ListConfigSection.Favorites(fragment.categoryId)
+				else -> ListConfigSection.General
+			}
+			ListConfigBottomSheet.show(fragment.childFragmentManager, section)
 			true
 		}
 

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

@@ -24,7 +24,7 @@ abstract class MangaListViewModel(
 ) : BaseViewModel() {
 
 	abstract val content: StateFlow<List<ListModel>>
-	val listMode = settings.observeAsFlow(AppSettings.KEY_LIST_MODE) { listMode }
+	open val listMode = settings.observeAsFlow(AppSettings.KEY_LIST_MODE) { listMode }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.listMode)
 	val onActionDone = MutableEventFlow<ReversibleAction>()
 	val gridScale = settings.observeAsStateFlow(
@@ -34,6 +34,9 @@ abstract class MangaListViewModel(
 	)
 	val onDownloadStarted = MutableEventFlow<Unit>()
 
+	val isIncognitoModeEnabled: Boolean
+		get() = settings.isIncognitoModeEnabled
+
 	open fun onUpdateFilter(tags: Set<MangaTag>) = Unit
 
 	abstract fun onRefresh()

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
+import android.view.View
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.google.android.material.badge.BadgeDrawable
@@ -10,6 +11,7 @@ import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ItemMangaGridBinding
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
@@ -28,12 +30,13 @@ fun mangaGridItemAD(
 ) {
 	var badge: BadgeDrawable? = null
 
-	itemView.setOnClickListener {
-		clickListener.onItemClick(item.manga, it)
-	}
-	itemView.setOnLongClickListener {
-		clickListener.onItemLongClick(item.manga, it)
+	val eventListener = object : View.OnClickListener, View.OnLongClickListener {
+		override fun onClick(v: View) = clickListener.onItemClick(item.manga, v)
+		override fun onLongClick(v: View): Boolean = clickListener.onItemLongClick(item.manga, v)
 	}
+	itemView.setOnClickListener(eventListener)
+	itemView.setOnLongClickListener(eventListener)
+	itemView.setOnContextClickListenerCompat(eventListener)
 	sizeResolver.attachToView(lifecycleOwner, itemView, binding.textViewTitle, binding.progressView)
 
 	bind { payloads ->

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt

@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemMangaListDetailsBinding
@@ -45,6 +46,7 @@ fun mangaListDetailedItemAD(
 	}
 	itemView.setOnClickListener(listenerAdapter)
 	itemView.setOnLongClickListener(listenerAdapter)
+	itemView.setOnContextClickListenerCompat(listenerAdapter)
 	binding.buttonRead.setOnClickListener(listenerAdapter)
 	binding.chipsTags.onChipClickListener = listenerAdapter
 

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
+import android.view.View
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.google.android.material.badge.BadgeDrawable
@@ -9,6 +10,7 @@ import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemMangaListBinding
@@ -25,12 +27,13 @@ fun mangaListItemAD(
 ) {
 	var badge: BadgeDrawable? = null
 
-	itemView.setOnClickListener {
-		clickListener.onItemClick(item.manga, it)
-	}
-	itemView.setOnLongClickListener {
-		clickListener.onItemLongClick(item.manga, it)
+	val eventListener = object : View.OnClickListener, View.OnLongClickListener {
+		override fun onClick(v: View) = clickListener.onItemClick(item.manga, v)
+		override fun onLongClick(v: View): Boolean = clickListener.onItemLongClick(item.manga, v)
 	}
+	itemView.setOnClickListener(eventListener)
+	itemView.setOnLongClickListener(eventListener)
+	itemView.setOnContextClickListenerCompat(eventListener)
 
 	bind {
 		binding.textViewTitle.text = item.title

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/config/ListConfigBottomSheet.kt

@@ -0,0 +1,132 @@
+package org.koitharu.kotatsu.list.ui.config
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.CompoundButton
+import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
+import com.google.android.material.button.MaterialButtonToggleGroup
+import com.google.android.material.slider.Slider
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ListMode
+import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
+import org.koitharu.kotatsu.core.util.ext.setValueRounded
+import org.koitharu.kotatsu.core.util.ext.showDistinct
+import org.koitharu.kotatsu.core.util.ext.withArgs
+import org.koitharu.kotatsu.core.util.progress.IntPercentLabelFormatter
+import org.koitharu.kotatsu.databinding.SheetListModeBinding
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ListConfigBottomSheet :
+	BaseAdaptiveSheet<SheetListModeBinding>(),
+	Slider.OnChangeListener,
+	MaterialButtonToggleGroup.OnButtonCheckedListener, CompoundButton.OnCheckedChangeListener,
+	AdapterView.OnItemSelectedListener {
+
+	@Inject
+	@Deprecated("")
+	lateinit var settings: AppSettings
+
+	private val viewModel by viewModels<ListConfigViewModel>()
+
+	override fun onCreateViewBinding(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+	) = SheetListModeBinding.inflate(inflater, container, false)
+
+	override fun onViewBindingCreated(binding: SheetListModeBinding, savedInstanceState: Bundle?) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		val mode = viewModel.listMode
+		binding.buttonList.isChecked = mode == ListMode.LIST
+		binding.buttonListDetailed.isChecked = mode == ListMode.DETAILED_LIST
+		binding.buttonGrid.isChecked = mode == ListMode.GRID
+		binding.textViewGridTitle.isVisible = mode == ListMode.GRID
+		binding.sliderGrid.isVisible = mode == ListMode.GRID
+
+		binding.sliderGrid.setLabelFormatter(IntPercentLabelFormatter(binding.root.context))
+		binding.sliderGrid.setValueRounded(viewModel.gridSize.toFloat())
+		binding.sliderGrid.addOnChangeListener(this)
+
+		binding.checkableGroup.addOnButtonCheckedListener(this)
+
+		binding.switchGrouping.isVisible = viewModel.isGroupingAvailable
+		if (viewModel.isGroupingAvailable) {
+			binding.switchGrouping.isEnabled = settings.historySortOrder.isGroupingSupported()
+		}
+		binding.switchGrouping.isChecked = settings.isHistoryGroupingEnabled
+		binding.switchGrouping.setOnCheckedChangeListener(this)
+
+		val sortOrders = viewModel.getSortOrders()
+		if (sortOrders != null) {
+			binding.textViewOrderTitle.isVisible = true
+			binding.spinnerOrder.adapter = ArrayAdapter(
+				binding.spinnerOrder.context,
+				android.R.layout.simple_spinner_dropdown_item,
+				android.R.id.text1,
+				sortOrders.map { binding.spinnerOrder.context.getString(it.titleResId) },
+			)
+			val selected = sortOrders.indexOf(viewModel.getSelectedSortOrder())
+			if (selected >= 0) {
+				binding.spinnerOrder.setSelection(selected, false)
+			}
+			binding.spinnerOrder.onItemSelectedListener = this
+			binding.cardOrder.isVisible = true
+		}
+	}
+
+	override fun onButtonChecked(group: MaterialButtonToggleGroup?, checkedId: Int, isChecked: Boolean) {
+		if (!isChecked) {
+			return
+		}
+		val mode = when (checkedId) {
+			R.id.button_list -> ListMode.LIST
+			R.id.button_list_detailed -> ListMode.DETAILED_LIST
+			R.id.button_grid -> ListMode.GRID
+			else -> return
+		}
+		requireViewBinding().textViewGridTitle.isVisible = mode == ListMode.GRID
+		requireViewBinding().sliderGrid.isVisible = mode == ListMode.GRID
+		viewModel.listMode = mode
+	}
+
+	override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
+		when (buttonView.id) {
+			R.id.switch_grouping -> settings.isHistoryGroupingEnabled = isChecked
+		}
+	}
+
+	override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
+		if (fromUser) {
+			viewModel.gridSize = value.toInt()
+		}
+	}
+
+	override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
+		when (parent.id) {
+			R.id.spinner_order -> {
+				viewModel.setSortOrder(position)
+				viewBinding?.switchGrouping?.isEnabled = settings.historySortOrder.isGroupingSupported()
+			}
+		}
+	}
+
+	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+
+	companion object {
+
+		private const val TAG = "ListModeSelectDialog"
+		const val ARG_SECTION = "section"
+
+		fun show(fm: FragmentManager, section: ListConfigSection) = ListConfigBottomSheet().withArgs(1) {
+			putParcelable(ARG_SECTION, section)
+		}.showDistinct(fm, TAG)
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/config/ListConfigSection.kt

@@ -0,0 +1,21 @@
+package org.koitharu.kotatsu.list.ui.config
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+sealed interface ListConfigSection : Parcelable {
+
+	@Parcelize
+	data object History : ListConfigSection
+
+	@Parcelize
+	data object General : ListConfigSection
+
+	@Parcelize
+	data class Favorites(
+		val categoryId: Long,
+	) : ListConfigSection
+
+	@Parcelize
+	data object Suggestions : ListConfigSection
+}

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/config/ListConfigViewModel.kt

@@ -0,0 +1,76 @@
+package org.koitharu.kotatsu.list.ui.config
+
+import androidx.lifecycle.SavedStateHandle
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.runBlocking
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ListMode
+import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.core.util.ext.require
+import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
+import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.list.domain.ListSortOrder
+import javax.inject.Inject
+
+@HiltViewModel
+class ListConfigViewModel @Inject constructor(
+	savedStateHandle: SavedStateHandle,
+	private val settings: AppSettings,
+	private val favouritesRepository: FavouritesRepository,
+) : BaseViewModel() {
+
+	val section = savedStateHandle.require<ListConfigSection>(ListConfigBottomSheet.ARG_SECTION)
+
+	var listMode: ListMode
+		get() = when (section) {
+			is ListConfigSection.Favorites -> settings.favoritesListMode
+			ListConfigSection.General -> settings.listMode
+			ListConfigSection.History -> settings.historyListMode
+			ListConfigSection.Suggestions -> settings.suggestionsListMode
+		}
+		set(value) {
+			when (section) {
+				is ListConfigSection.Favorites -> settings.favoritesListMode = value
+				ListConfigSection.General -> settings.listMode = value
+				ListConfigSection.History -> settings.historyListMode = value
+				ListConfigSection.Suggestions -> settings.suggestionsListMode = value
+			}
+		}
+
+	var gridSize: Int
+		get() = settings.gridSize
+		set(value) {
+			settings.gridSize = value
+		}
+
+	val isGroupingAvailable: Boolean
+		get() = section == ListConfigSection.History
+
+	fun getSortOrders(): List<ListSortOrder>? = when (section) {
+		is ListConfigSection.Favorites -> ListSortOrder.FAVORITES
+		ListConfigSection.General -> null
+		ListConfigSection.History -> ListSortOrder.HISTORY
+		ListConfigSection.Suggestions -> ListSortOrder.SUGGESTIONS
+	}?.sortedByOrdinal()
+
+	fun getSelectedSortOrder(): ListSortOrder? = when (section) {
+		is ListConfigSection.Favorites -> runBlocking { favouritesRepository.getCategory(section.categoryId).order }
+		ListConfigSection.General -> null
+		ListConfigSection.History -> settings.historySortOrder
+		ListConfigSection.Suggestions -> ListSortOrder.RELEVANCE // TODO
+	}
+
+	fun setSortOrder(position: Int) {
+		val value = getSortOrders()?.getOrNull(position) ?: return
+		when (section) {
+			is ListConfigSection.Favorites -> launchJob {
+				favouritesRepository.setCategoryOrder(section.categoryId, value)
+			}
+
+			ListConfigSection.General -> Unit
+			ListConfigSection.History -> settings.historySortOrder = value
+
+			ListConfigSection.Suggestions -> Unit
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt

@@ -14,7 +14,7 @@ import kotlinx.coroutines.runInterruptible
 import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.CompositeMutex
+import org.koitharu.kotatsu.core.util.CompositeMutex2
 import org.koitharu.kotatsu.core.util.ext.children
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
 import org.koitharu.kotatsu.core.util.ext.filterWith
@@ -45,7 +45,7 @@ class LocalMangaRepository @Inject constructor(
 ) : MangaRepository {
 
 	override val source = MangaSource.LOCAL
-	private val locks = CompositeMutex<Long>()
+	private val locks = CompositeMutex2<Long>()
 
 	override val sortOrders: Set<SortOrder> = EnumSet.of(SortOrder.ALPHABETICAL, SortOrder.RATING, SortOrder.NEWEST)
 
@@ -122,14 +122,18 @@ class LocalMangaRepository @Inject constructor(
 
 	suspend fun getRemoteManga(localManga: Manga): Manga? {
 		return runCatchingCancellable {
-			LocalMangaInput.of(localManga).getMangaInfo()
+			LocalMangaInput.of(localManga).getMangaInfo()?.takeUnless { it.isLocal }
 		}.onFailure {
 			it.printStackTraceDebug()
 		}.getOrNull()
 	}
 
 	suspend fun findSavedManga(remoteManga: Manga): LocalManga? {
-		// TODO fast path by name
+		// fast path
+		LocalMangaInput.find(storageManager.getReadableDirs(), remoteManga)?.let {
+			return it.getManga()
+		}
+		// slow path
 		val files = getAllFiles()
 		return channelFlow {
 			for (file in files) {

app/src/main/kotlin/org/koitharu/kotatsu/local/data/MangaIndex.kt

@@ -4,6 +4,7 @@ import androidx.annotation.WorkerThread
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -21,7 +22,8 @@ class MangaIndex(source: String?) {
 
 	private val json: JSONObject = source?.let(::JSONObject) ?: JSONObject()
 
-	fun setMangaInfo(manga: Manga, append: Boolean) {
+	fun setMangaInfo(manga: Manga) {
+		require(!manga.isLocal) { "Local manga information cannot be stored" }
 		json.put("id", manga.id)
 		json.put("title", manga.title)
 		json.put("title_alt", manga.altTitle)
@@ -46,7 +48,7 @@ class MangaIndex(source: String?) {
 				}
 			},
 		)
-		if (!append || !json.has("chapters")) {
+		if (!json.has("chapters")) {
 			json.put("chapters", JSONObject())
 		}
 		json.put("app_id", BuildConfig.APPLICATION_ID)

app/src/main/kotlin/org/koitharu/kotatsu/local/data/input/LocalMangaInput.kt

@@ -2,12 +2,18 @@ package org.koitharu.kotatsu.local.data.input
 
 import android.net.Uri
 import androidx.core.net.toFile
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.toFileNameSafe
 import java.io.File
 
 sealed class LocalMangaInput(
@@ -37,6 +43,24 @@ sealed class LocalMangaInput(
 			else -> null
 		}
 
+		suspend fun find(roots: Iterable<File>, manga: Manga): LocalMangaInput? = channelFlow {
+			val fileName = manga.title.toFileNameSafe()
+			for (root in roots) {
+				launch {
+					val dir = File(root, fileName)
+					val zip = File(root, "$fileName.cbz")
+					val input = when {
+						dir.isDirectory -> LocalMangaDirInput(dir)
+						zip.isFile -> LocalMangaZipInput(zip)
+						else -> null
+					}
+					if (input?.getMangaInfo()?.id == manga.id) {
+						send(input)
+					}
+				}
+			}
+		}.flowOn(Dispatchers.Default).firstOrNull()
+
 		@JvmStatic
 		protected fun zipUri(file: File, entryName: String): String =
 			Uri.fromParts("cbz", file.path, entryName).toString()

app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaDirOutput.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.local.data.output
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import org.koitharu.kotatsu.core.model.findById
+import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
 import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.zip.ZipOutput
@@ -21,7 +22,9 @@ class LocalMangaDirOutput(
 	private val index = MangaIndex(File(rootFile, ENTRY_NAME_INDEX).takeIfReadable()?.readText())
 
 	init {
-		index.setMangaInfo(manga, append = true)
+		if (!manga.isLocal) {
+			index.setMangaInfo(manga)
+		}
 	}
 
 	override suspend fun mergeWithExisting() = Unit

app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaZipOutput.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.local.data.output
 import androidx.annotation.WorkerThread
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
+import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
 import org.koitharu.kotatsu.core.util.ext.readText
 import org.koitharu.kotatsu.core.zip.ZipOutput
@@ -21,7 +22,9 @@ class LocalMangaZipOutput(
 	private val index = MangaIndex(null)
 
 	init {
-		index.setMangaInfo(manga, false)
+		if (!manga.isLocal) {
+			index.setMangaInfo(manga)
+		}
 	}
 
 	override suspend fun mergeWithExisting() {

app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportDialogFragment.kt

@@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.AlertDialogFragment
+import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.databinding.DialogImportBinding
 
 class ImportDialogFragment : AlertDialogFragment<DialogImportBinding>(), View.OnClickListener {
@@ -40,9 +41,13 @@ class ImportDialogFragment : AlertDialogFragment<DialogImportBinding>(), View.On
 	}
 
 	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_file -> importFileCall.launch(arrayOf("*/*"))
-			R.id.button_dir -> importDirCall.launch(null)
+		val res = when (v.id) {
+			R.id.button_file -> importFileCall.tryLaunch(arrayOf("*/*"))
+			R.id.button_dir -> importDirCall.tryLaunch(null)
+			else -> true
+		}
+		if (!res) {
+			Toast.makeText(v.context, R.string.operation_not_supported, Toast.LENGTH_SHORT).show()
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt

@@ -47,7 +47,7 @@ class LocalChaptersRemoveService : CoroutineIntentService() {
 		startForeground()
 		val mangaWithChapters = localMangaRepository.getDetails(manga)
 		localMangaRepository.deleteChapters(mangaWithChapters, chaptersIds)
-		localStorageChanges.emit(LocalManga(manga))
+		localStorageChanges.emit(LocalManga(localMangaRepository.getDetails(manga)))
 		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalListMenuProvider.kt

@@ -24,7 +24,7 @@ class LocalListMenuProvider(
 				true
 			}
 
-			R.id.action_settings -> {
+			R.id.action_directories -> {
 				context.startActivity(MangaDirectoriesActivity.newIntent(context))
 				true
 			}

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -83,6 +83,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 	private val viewModel by viewModels<MainViewModel>()
 	private val searchSuggestionViewModel by viewModels<SearchSuggestionViewModel>()
 	private val closeSearchCallback = CloseSearchCallback()
+	private val appUpdateDialog = AppUpdateDialog(this)
 	private lateinit var navigationDelegate: MainNavigationDelegate
 	private lateinit var appUpdateBadge: OptionsMenuBadgeHelper
 
@@ -111,7 +112,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 			onFocusChangeListener = this@MainActivity
 			searchSuggestionListener = this@MainActivity
 		}
-		window.statusBarColor = ContextCompat.getColor(this, R.color.dim_statusbar)
 
 		viewBinding.fab?.setOnClickListener(this)
 		viewBinding.navRail?.headerView?.setOnClickListener(this)
@@ -143,6 +143,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		viewModel.onFirstStart.observeEvent(this) {
 			OnboardDialogFragment.show(supportFragmentManager)
 		}
+		viewModel.isIncognitoMode.observe(this) {
+			adjustSearchUI(isSearchOpened(), false)
+		}
 		searchSuggestionViewModel.isIncognitoModeEnabled.observe(this, this::onIncognitoModeChanged)
 	}
 
@@ -198,8 +201,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 
 		R.id.action_app_update -> {
 			viewModel.appUpdate.value?.also {
-				AppUpdateDialog(this)
-					.show(it)
+				appUpdateDialog.show(it)
 			} != null
 		}
 
@@ -239,10 +241,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 
 	override fun onQueryClick(query: String, submit: Boolean) {
 		viewBinding.searchView.query = query
-		if (submit) {
-			if (query.isNotEmpty()) {
-				startActivity(MultiSearchActivity.newIntent(this, query))
-				searchSuggestionViewModel.saveQuery(query)
+		if (submit && query.isNotEmpty()) {
+			startActivity(MultiSearchActivity.newIntent(this, query))
+			searchSuggestionViewModel.saveQuery(query)
+			viewBinding.searchView.post {
+				closeSearchCallback.handleOnBackPressed()
 			}
 		}
 	}
@@ -311,13 +314,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 
 	private fun onSearchOpened() {
 		adjustSearchUI(isOpened = true, animate = true)
-		closeSearchCallback.isEnabled = true
 	}
 
 	private fun onSearchClosed() {
 		viewBinding.searchView.hideKeyboard()
 		adjustSearchUI(isOpened = false, animate = true)
-		closeSearchCallback.isEnabled = false
 	}
 
 	private fun isSearchOpened(): Boolean {
@@ -376,13 +377,23 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		val padding = if (isOpened) 0 else resources.getDimensionPixelOffset(R.dimen.margin_normal)
 		viewBinding.appbar.updatePadding(left = padding, right = padding)
 		adjustFabVisibility(isSearchOpened = isOpened)
-		supportActionBar?.setHomeAsUpIndicator(
-			if (isOpened) materialR.drawable.abc_ic_ab_back_material else materialR.drawable.abc_ic_search_api_material,
-		)
+		supportActionBar?.apply {
+			setHomeAsUpIndicator(
+				when {
+					isOpened -> materialR.drawable.abc_ic_ab_back_material
+					viewModel.isIncognitoMode.value -> R.drawable.ic_incognito
+					else -> materialR.drawable.abc_ic_search_api_material
+				},
+			)
+			setHomeActionContentDescription(
+				if (isOpened) R.string.back else R.string.search,
+			)
+		}
 		viewBinding.searchView.setHintCompat(
 			if (isOpened) R.string.search_hint else R.string.search_manga,
 		)
 		bottomNav?.showOrHide(!isOpened)
+		closeSearchCallback.isEnabled = isOpened
 	}
 
 	private fun requestNotificationsPermission() {
@@ -394,7 +405,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 			ActivityCompat.requestPermissions(
 				this,
 				arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-				1
+				1,
 			)
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt

@@ -72,7 +72,7 @@ class MainNavigationDelegate(
 	}
 
 	override fun handleOnBackPressed() {
-		navBar.selectedItemId = R.id.nav_history
+		navBar.selectedItemId = firstItem()?.itemId ?: return
 	}
 
 	fun onCreate(lifecycleOwner: LifecycleOwner, savedInstanceState: Bundle?) {
@@ -171,7 +171,7 @@ class MainNavigationDelegate(
 	}
 
 	private fun onFragmentChanged(fragment: Fragment, fromUser: Boolean) {
-		isEnabled = fragment !is HistoryListFragment
+		isEnabled = getItemId(fragment) != firstItem()?.itemId
 		listeners.forEach { it.onFragmentChanged(fragment, fromUser) }
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainViewModel.kt

@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.github.AppUpdateRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.NavItem
+import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
@@ -43,6 +44,12 @@ class MainViewModel @Inject constructor(
 		initialValue = false,
 	)
 
+	val isIncognitoMode = settings.observeAsStateFlow(
+		scope = viewModelScope + Dispatchers.Default,
+		key = AppSettings.KEY_INCOGNITO_MODE,
+		valueProducer = { isIncognitoModeEnabled },
+	)
+
 	val appUpdate = appUpdateRepository.observeAvailableUpdate()
 
 	val counters = combine(

app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/ChaptersLoader.kt

@@ -2,16 +2,10 @@ package org.koitharu.kotatsu.reader.domain
 
 import android.util.LongSparseArray
 import dagger.hilt.android.scopes.ViewModelScoped
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.details.domain.model.DoubleManga
+import org.koitharu.kotatsu.details.data.MangaDetails
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import javax.inject.Inject
@@ -23,32 +17,24 @@ class ChaptersLoader @Inject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) {
 
-	private val chapters = MutableStateFlow(LongSparseArray<MangaChapter>(0))
+	private val chapters = LongSparseArray<MangaChapter>()
 	private val chapterPages = ChapterPages()
 	private val mutex = Mutex()
 
-	val size: Int // TODO flow
-		get() = chapters.value.size()
+	val size: Int
+		get() = chapters.size()
 
-	fun init(scope: CoroutineScope, manga: Flow<DoubleManga>) = scope.launch {
-		manga.collect {
-			val ch = it.chapters.orEmpty()
-			val longSparseArray = LongSparseArray<MangaChapter>(ch.size)
-			ch.forEach { x -> longSparseArray.put(x.id, x) }
-			mutex.withLock {
-				chapters.value = longSparseArray
-			}
+	suspend fun init(manga: MangaDetails) = mutex.withLock {
+		chapters.clear()
+		manga.allChapters.forEach {
+			chapters.put(it.id, it)
 		}
 	}
 
-	suspend fun loadPrevNextChapter(manga: DoubleManga, currentId: Long, isNext: Boolean) {
-		val chapters = manga.chapters ?: return
+	suspend fun loadPrevNextChapter(manga: MangaDetails, currentId: Long, isNext: Boolean) {
+		val chapters = manga.allChapters
 		val predicate: (MangaChapter) -> Boolean = { it.id == currentId }
-		val index = if (isNext) {
-			chapters.indexOfFirst(predicate)
-		} else {
-			chapters.indexOfLast(predicate)
-		}
+		val index = if (isNext) chapters.indexOfFirst(predicate) else chapters.indexOfLast(predicate)
 		if (index == -1) return
 		val newChapter = chapters.getOrNull(if (isNext) index + 1 else index - 1) ?: return
 		val newPages = loadChapter(newChapter.id)
@@ -79,11 +65,7 @@ class ChaptersLoader @Inject constructor(
 		}
 	}
 
-	fun peekChapter(chapterId: Long): MangaChapter? = chapters.value[chapterId]
-
-	suspend fun awaitChapter(chapterId: Long): MangaChapter? = chapters.mapNotNull { x ->
-		x[chapterId]
-	}.firstOrNull()
+	fun peekChapter(chapterId: Long): MangaChapter? = chapters[chapterId]
 
 	fun getPages(chapterId: Long): List<ReaderPage> {
 		return chapterPages.subList(chapterId)
@@ -100,7 +82,7 @@ class ChaptersLoader @Inject constructor(
 	fun snapshot() = chapterPages.toList()
 
 	private suspend fun loadChapter(chapterId: Long): List<ReaderPage> {
-		val chapter = checkNotNull(awaitChapter(chapterId)) { "Requested chapter not found" }
+		val chapter = checkNotNull(chapters[chapterId]) { "Requested chapter not found" }
 		val repo = mangaRepositoryFactory.create(chapter.source)
 		return repo.getPages(chapter).mapIndexed { index, page ->
 			ReaderPage(page, index, chapterId)

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ChaptersSheet.kt

@@ -33,13 +33,11 @@ class ChaptersSheet : BaseAdaptiveSheet<SheetChaptersBinding>(),
 	override fun onCreateViewBinding(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
-	): SheetChaptersBinding {
-		return SheetChaptersBinding.inflate(inflater, container, false)
-	}
+	) = SheetChaptersBinding.inflate(inflater, container, false)
 
 	override fun onViewBindingCreated(binding: SheetChaptersBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		val chapters = viewModel.manga?.chapters
+		val chapters = viewModel.manga?.allChapters
 		if (chapters.isNullOrEmpty()) {
 			dismissAllowingStateLoss()
 			return
@@ -61,7 +59,7 @@ class ChaptersSheet : BaseAdaptiveSheet<SheetChaptersBinding>(),
 				val offset =
 					(resources.getDimensionPixelSize(R.dimen.chapter_list_item_height) * 0.6).roundToInt()
 				adapter.setItems(
-					items, RecyclerViewScrollCallback(binding.recyclerView, targetPosition, offset)
+					items, RecyclerViewScrollCallback(binding.recyclerView, targetPosition, offset),
 				)
 			} else {
 				adapter.items = items

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -107,7 +107,7 @@ class ReaderActivity :
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		touchHelper = GridTouchHelper(this, this)
 		scrollTimer = scrollTimerFactory.create(this, this)
-		controlDelegate = ReaderControlDelegate(settings, this, this)
+		controlDelegate = ReaderControlDelegate(resources, settings, this, this)
 		viewBinding.toolbarBottom.setOnMenuItemClickListener(::onOptionsItemSelected)
 		viewBinding.slider.setLabelFormatter(PageLabelFormatter())
 		ReaderSliderListener(this, viewModel).attachToSlider(viewBinding.slider)
@@ -137,6 +137,7 @@ class ReaderActivity :
 			onLoadingStateChanged(viewModel.isLoading.value)
 		}
 		viewModel.isScreenshotsBlockEnabled.observe(this, this::setWindowSecure)
+		viewModel.isKeepScreenOnEnabled.observe(this, this::setKeepScreenOn)
 		viewModel.isInfoBarEnabled.observe(this, ::onReaderBarChanged)
 		viewModel.isBookmarkAdded.observe(this, this::onBookmarkStateChanged)
 		viewModel.onShowToast.observeEvent(this) { msgId ->
@@ -188,7 +189,7 @@ class ReaderActivity :
 				val state = viewModel.getCurrentState() ?: return false
 				PagesThumbnailsSheet.show(
 					supportFragmentManager,
-					viewModel.manga?.any ?: return false,
+					viewModel.manga?.toManga() ?: return false,
 					state.chapterId,
 					state.page,
 				)
@@ -304,6 +305,14 @@ class ReaderActivity :
 		}
 	}
 
+	private fun setKeepScreenOn(isKeep: Boolean) {
+		if (isKeep) {
+			window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+		} else {
+			window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+		}
+	}
+
 	private fun setUiIsVisible(isUiVisible: Boolean) {
 		if (viewBinding.appbarTop.isVisible != isUiVisible) {
 			if (isAnimationsEnabled) {
@@ -347,8 +356,8 @@ class ReaderActivity :
 		readerManager.currentReader?.switchPageBy(delta)
 	}
 
-	override fun scrollBy(delta: Int): Boolean {
-		return readerManager.currentReader?.scrollBy(delta) ?: false
+	override fun scrollBy(delta: Int, smooth: Boolean): Boolean {
+		return readerManager.currentReader?.scrollBy(delta, smooth) ?: false
 	}
 
 	override fun toggleUiVisibility() {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderControlDelegate.kt

@@ -1,16 +1,19 @@
 package org.koitharu.kotatsu.reader.ui
 
 import android.content.SharedPreferences
+import android.content.res.Resources
 import android.view.KeyEvent
 import android.view.SoundEffectConstants
 import android.view.View
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.GridTouchHelper
 
 class ReaderControlDelegate(
+	resources: Resources,
 	private val settings: AppSettings,
 	private val listener: OnInteractionListener,
 	owner: LifecycleOwner,
@@ -19,6 +22,7 @@ class ReaderControlDelegate(
 	private var isTapSwitchEnabled: Boolean = true
 	private var isVolumeKeysSwitchEnabled: Boolean = false
 	private var isReaderTapsAdaptive: Boolean = true
+	private var minScrollDelta = resources.getDimensionPixelSize(R.dimen.reader_scroll_delta_min)
 
 	init {
 		owner.lifecycle.addObserver(this)
@@ -82,8 +86,6 @@ class ReaderControlDelegate(
 
 		KeyEvent.KEYCODE_SPACE,
 		KeyEvent.KEYCODE_PAGE_DOWN,
-		KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN,
-		KeyEvent.KEYCODE_DPAD_DOWN,
 		-> {
 			listener.switchPageBy(1)
 			true
@@ -95,8 +97,6 @@ class ReaderControlDelegate(
 		}
 
 		KeyEvent.KEYCODE_PAGE_UP,
-		KeyEvent.KEYCODE_SYSTEM_NAVIGATION_UP,
-		KeyEvent.KEYCODE_DPAD_UP,
 		-> {
 			listener.switchPageBy(-1)
 			true
@@ -112,6 +112,22 @@ class ReaderControlDelegate(
 			true
 		}
 
+		KeyEvent.KEYCODE_SYSTEM_NAVIGATION_UP,
+		KeyEvent.KEYCODE_DPAD_UP -> {
+			if (!listener.scrollBy(-minScrollDelta, smooth = true)) {
+				listener.switchPageBy(-1)
+			}
+			true
+		}
+
+		KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN,
+		KeyEvent.KEYCODE_DPAD_DOWN -> {
+			if (!listener.scrollBy(minScrollDelta, smooth = true)) {
+				listener.switchPageBy(1)
+			}
+			true
+		}
+
 		else -> false
 	}
 
@@ -139,7 +155,7 @@ class ReaderControlDelegate(
 
 		fun switchPageBy(delta: Int)
 
-		fun scrollBy(delta: Int): Boolean
+		fun scrollBy(delta: Int, smooth: Boolean): Boolean
 
 		fun toggleUiVisibility()
 

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt

@@ -44,12 +44,11 @@ import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.requireValue
-import org.koitharu.kotatsu.details.domain.DoubleMangaLoadUseCase
-import org.koitharu.kotatsu.details.domain.model.DoubleManga
+import org.koitharu.kotatsu.details.data.MangaDetails
+import org.koitharu.kotatsu.details.domain.DetailsLoadUseCase
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.history.domain.HistoryUpdateUseCase
-import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.ChaptersLoader
@@ -74,7 +73,7 @@ class ReaderViewModel @Inject constructor(
 	private val pageLoader: PageLoader,
 	private val chaptersLoader: ChaptersLoader,
 	private val appShortcutManager: AppShortcutManager,
-	private val doubleMangaLoadUseCase: DoubleMangaLoadUseCase,
+	private val detailsLoadUseCase: DetailsLoadUseCase,
 	private val historyUpdateUseCase: HistoryUpdateUseCase,
 	private val detectReaderModeUseCase: DetectReaderModeUseCase,
 ) : BaseViewModel() {
@@ -87,11 +86,10 @@ class ReaderViewModel @Inject constructor(
 	private var pageSaveJob: Job? = null
 	private var bookmarkJob: Job? = null
 	private var stateChangeJob: Job? = null
-	private val currentState =
-		MutableStateFlow<ReaderState?>(savedStateHandle[ReaderActivity.EXTRA_STATE])
-	private val mangaData = MutableStateFlow(intent.manga?.let { DoubleManga(it) })
+	private val currentState = MutableStateFlow<ReaderState?>(savedStateHandle[ReaderActivity.EXTRA_STATE])
+	private val mangaData = MutableStateFlow(intent.manga?.let { MangaDetails(it, null, null, false) })
 	private val mangaFlow: Flow<Manga?>
-		get() = mangaData.map { it?.any }
+		get() = mangaData.map { it?.toManga() }
 
 	val readerMode = MutableStateFlow<ReaderMode?>(null)
 	val onPageSaved = MutableEventFlow<Uri?>()
@@ -99,7 +97,7 @@ class ReaderViewModel @Inject constructor(
 	val uiState = MutableStateFlow<ReaderUiState?>(null)
 
 	val content = MutableStateFlow(ReaderContent(emptyList(), null))
-	val manga: DoubleManga?
+	val manga: MangaDetails?
 		get() = mangaData.value
 
 	val pageAnimation = settings.observeAsStateFlow(
@@ -114,12 +112,24 @@ class ReaderViewModel @Inject constructor(
 		valueProducer = { isReaderBarEnabled },
 	)
 
+	val isKeepScreenOnEnabled = settings.observeAsStateFlow(
+		scope = viewModelScope + Dispatchers.Default,
+		key = AppSettings.KEY_READER_SCREEN_ON,
+		valueProducer = { isReaderKeepScreenOn },
+	)
+
 	val isWebtoonZoomEnabled = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.Default,
 		key = AppSettings.KEY_WEBTOON_ZOOM,
 		valueProducer = { isWebtoonZoomEnable },
 	)
 
+	val isZoomControlEnabled = settings.observeAsStateFlow(
+		scope = viewModelScope + Dispatchers.Default,
+		key = AppSettings.KEY_READER_ZOOM_BUTTONS,
+		valueProducer = { isReaderZoomButtonsEnabled },
+	)
+
 	val readerSettings = ReaderSettings(
 		parentScope = viewModelScope,
 		settings = settings,
@@ -137,7 +147,7 @@ class ReaderViewModel @Inject constructor(
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, false)
 
 	val isBookmarkAdded = currentState.flatMapLatest { state ->
-		val manga = mangaData.value?.any
+		val manga = mangaData.value?.toManga()
 		if (state == null || manga == null) {
 			flowOf(false)
 		} else {
@@ -167,7 +177,7 @@ class ReaderViewModel @Inject constructor(
 
 	fun switchMode(newMode: ReaderMode) {
 		launchJob {
-			val manga = checkNotNull(mangaData.value?.any)
+			val manga = checkNotNull(mangaData.value?.toManga())
 			dataRepository.saveReaderMode(
 				manga = manga,
 				mode = newMode,
@@ -188,7 +198,7 @@ class ReaderViewModel @Inject constructor(
 		}
 		val readerState = state ?: currentState.value ?: return
 		historyUpdateUseCase.invokeAsync(
-			manga = mangaData.value?.any ?: return,
+			manga = mangaData.value?.toManga() ?: return,
 			readerState = readerState,
 			percent = computePercent(readerState.chapterId, readerState.page),
 		)
@@ -284,7 +294,7 @@ class ReaderViewModel @Inject constructor(
 			val state = checkNotNull(currentState.value)
 			val page = checkNotNull(getCurrentPage()) { "Page not found" }
 			val bookmark = Bookmark(
-				manga = checkNotNull(mangaData.value?.any),
+				manga = mangaData.requireValue().toManga(),
 				pageId = page.id,
 				chapterId = state.chapterId,
 				page = state.page,
@@ -304,7 +314,7 @@ class ReaderViewModel @Inject constructor(
 		}
 		bookmarkJob = launchJob {
 			loadingJob?.join()
-			val manga = checkNotNull(mangaData.value?.any)
+			val manga = mangaData.requireValue().toManga()
 			val state = checkNotNull(getCurrentState())
 			bookmarksRepository.removeBookmark(manga.id, state.chapterId, state.page)
 			onShowToast.call(R.string.bookmark_removed)
@@ -313,25 +323,19 @@ class ReaderViewModel @Inject constructor(
 
 	private fun loadImpl() {
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
-			var manga = DoubleManga(
-				dataRepository.resolveIntent(intent)
-					?: throw NotFoundException("Cannot find manga", ""),
-			)
-			mangaData.value = manga
-			val mangaFlow = doubleMangaLoadUseCase(intent)
-			manga = mangaFlow.first { x -> x.any != null }
-			chaptersLoader.init(viewModelScope, mangaFlow)
-			// determine mode
-			val singleManga = manga.requireAny()
+			val details = detailsLoadUseCase.invoke(intent).first { x -> x.isLoaded }
+			mangaData.value = details
+			chaptersLoader.init(details)
+			val manga = details.toManga()
 			// obtain state
 			if (currentState.value == null) {
-				currentState.value = historyRepository.getOne(singleManga)?.let {
+				currentState.value = historyRepository.getOne(manga)?.let {
 					ReaderState(it)
-				} ?: ReaderState(singleManga, preselectedBranch)
+				} ?: ReaderState(manga, preselectedBranch)
 			}
-			val mode = detectReaderModeUseCase.invoke(singleManga, currentState.value)
-			val branch = chaptersLoader.awaitChapter(currentState.value?.chapterId ?: 0L)?.branch
-			mangaData.value = manga.filterChapters(branch)
+			val mode = detectReaderModeUseCase.invoke(manga, currentState.value)
+			val branch = chaptersLoader.peekChapter(currentState.value?.chapterId ?: 0L)?.branch
+			mangaData.value = details.filterChapters(branch)
 			readerMode.value = mode
 
 			chaptersLoader.loadSingleChapter(requireNotNull(currentState.value).chapterId)
@@ -339,7 +343,7 @@ class ReaderViewModel @Inject constructor(
 			if (!isIncognito) {
 				currentState.value?.let {
 					val percent = computePercent(it.chapterId, it.page)
-					historyUpdateUseCase.invoke(singleManga, it, percent)
+					historyUpdateUseCase.invoke(manga, it, percent)
 				}
 			}
 			notifyStateChanged()
@@ -372,11 +376,11 @@ class ReaderViewModel @Inject constructor(
 		val state = getCurrentState()
 		val chapter = state?.chapterId?.let { chaptersLoader.peekChapter(it) }
 		val newState = ReaderUiState(
-			mangaName = manga?.any?.title,
+			mangaName = manga?.toManga()?.title,
 			branch = chapter?.branch,
 			chapterName = chapter?.name,
 			chapterNumber = chapter?.number ?: 0,
-			chaptersTotal = manga?.any?.getChapters(chapter?.branch)?.size ?: 0,
+			chaptersTotal = manga?.chapters?.get(chapter?.branch)?.size ?: 0,
 			totalPages = if (chapter != null) chaptersLoader.getPagesCount(chapter.id) else 0,
 			currentPage = state?.page ?: 0,
 			isSliderEnabled = settings.isReaderSliderEnabled,
@@ -387,7 +391,7 @@ class ReaderViewModel @Inject constructor(
 
 	private fun computePercent(chapterId: Long, pageIndex: Int): Float {
 		val branch = chaptersLoader.peekChapter(chapterId)?.branch
-		val chapters = manga?.any?.getChapters(branch) ?: return PROGRESS_NONE
+		val chapters = manga?.chapters?.get(branch) ?: return PROGRESS_NONE
 		val chaptersCount = chapters.size
 		val chapterIndex = chapters.indexOfFirst { x -> x.id == chapterId }
 		val pagesCount = chaptersLoader.getPagesCount(chapterId)

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ScrollTimer.kt

@@ -96,7 +96,7 @@ class ScrollTimer @AssistedInject constructor(
 				if (!listener.isReaderResumed()) {
 					continue
 				}
-				if (!listener.scrollBy(1)) {
+				if (!listener.scrollBy(1, false)) {
 					accumulator += delayMs
 				}
 				if (accumulator >= pageSwitchDelay) {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.reader.ui.colorfilter
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
+import android.graphics.Bitmap
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
@@ -121,10 +122,10 @@ class ColorFilterConfigActivity :
 			.scale(Scale.FILL)
 			.decodeRegion()
 			.tag(page.source)
+			.bitmapConfig(if (viewModel.is32BitColorsEnabled) Bitmap.Config.ARGB_8888 else Bitmap.Config.RGB_565)
 			.indicator(listOf(viewBinding.progressBefore, viewBinding.progressAfter))
 			.error(R.drawable.ic_error_placeholder)
 			.size(ViewSizeResolver(viewBinding.imageViewBefore))
-			.allowRgb565(false)
 			.target(DoubleViewTarget(viewBinding.imageViewBefore, viewBinding.imageViewAfter))
 			.enqueueWith(coil)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPage
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
@@ -18,6 +19,7 @@ import javax.inject.Inject
 @HiltViewModel
 class ColorFilterConfigViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
+	private val settings: AppSettings,
 	private val mangaDataRepository: MangaDataRepository,
 ) : BaseViewModel() {
 
@@ -31,6 +33,9 @@ class ColorFilterConfigViewModel @Inject constructor(
 	val isChanged: Boolean
 		get() = colorFilter.value != initialColorFilter
 
+	val is32BitColorsEnabled: Boolean
+		get() = settings.is32BitColorsEnabled
+
 	init {
 		launchLoadingJob {
 			initialColorFilter = mangaDataRepository.getColorFilter(manga.id)

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderConfigSheet.kt

@@ -118,7 +118,7 @@ class ReaderConfigSheet :
 
 			R.id.button_color_filter -> {
 				val page = viewModel.getCurrentPage() ?: return
-				val manga = viewModel.manga?.any ?: return
+				val manga = viewModel.manga?.toManga() ?: return
 				startActivity(ColorFilterConfigActivity.newIntent(v.context, manga, page))
 			}
 		}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderSettings.kt

@@ -1,8 +1,14 @@
 package org.koitharu.kotatsu.reader.ui.config
 
 import android.content.SharedPreferences
+import android.graphics.Bitmap
 import android.view.View
+import androidx.annotation.CheckResult
 import androidx.lifecycle.MediatorLiveData
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import com.davemorrissey.labs.subscaleview.decoder.SkiaImageDecoder
+import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder
+import com.davemorrissey.labs.subscaleview.decoder.SkiaPooledImageRegionDecoder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -12,6 +18,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 
 class ReaderSettings(
@@ -29,14 +36,40 @@ class ReaderSettings(
 	val colorFilter: ReaderColorFilter?
 		get() = colorFilterFlow.value?.takeUnless { it.isEmpty }
 
+	val bitmapConfig: Bitmap.Config
+		get() = if (settings.is32BitColorsEnabled) {
+			Bitmap.Config.ARGB_8888
+		} else {
+			Bitmap.Config.RGB_565
+		}
+
 	val isPagesNumbersEnabled: Boolean
 		get() = settings.isPagesNumbersEnabled
 
+	val isZoomControlsEnabled: Boolean
+		get() = settings.isReaderZoomButtonsEnabled
+
 	fun applyBackground(view: View) {
 		val bg = settings.readerBackground
 		view.background = bg.resolve(view.context)
 	}
 
+	@CheckResult
+	fun applyBitmapConfig(ssiv: SubsamplingScaleImageView): Boolean {
+		val config = bitmapConfig
+		return if (ssiv.regionDecoderFactory.bitmapConfig != config) {
+			ssiv.regionDecoderFactory = if (ssiv.context.isLowRamDevice()) {
+				SkiaImageRegionDecoder.Factory(config)
+			} else {
+				SkiaPooledImageRegionDecoder.Factory(config)
+			}
+			ssiv.bitmapDecoderFactory = SkiaImageDecoder.Factory(config)
+			true
+		} else {
+			false
+		}
+	}
+
 	override fun onInactive() {
 		super.onInactive()
 		settings.unsubscribe(internalObserver)
@@ -74,7 +107,9 @@ class ReaderSettings(
 				key == AppSettings.KEY_ZOOM_MODE ||
 				key == AppSettings.KEY_PAGES_NUMBERS ||
 				key == AppSettings.KEY_WEBTOON_ZOOM ||
-				key == AppSettings.KEY_READER_BACKGROUND
+				key == AppSettings.KEY_READER_ZOOM_BUTTONS ||
+				key == AppSettings.KEY_READER_BACKGROUND ||
+				key == AppSettings.KEY_32BIT_COLOR
 			) {
 				notifyChanged()
 			}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BasePageHolder.kt

@@ -13,7 +13,7 @@ import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 abstract class BasePageHolder<B : ViewBinding>(
 	protected val binding: B,
 	loader: PageLoader,
-	private val settings: ReaderSettings,
+	protected val settings: ReaderSettings,
 	networkState: NetworkState,
 	exceptionResolver: ExceptionResolver,
 ) : RecyclerView.ViewHolder(binding.root), PageHolderDelegate.Callback {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt

@@ -66,7 +66,7 @@ abstract class BaseReaderFragment<B : ViewBinding> : BaseFragment<B>() {
 
 	abstract fun switchPageTo(position: Int, smooth: Boolean)
 
-	open fun scrollBy(delta: Int): Boolean = false
+	open fun scrollBy(delta: Int, smooth: Boolean): Boolean = false
 
 	abstract fun getCurrentState(): ReaderState?
 

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt

@@ -84,6 +84,14 @@ class PageHolderDelegate(
 		job?.cancel()
 	}
 
+	fun reload() {
+		if (state == State.SHOWN ) {
+			file?.let {
+				callback.onImageReady(it.toUri())
+			}
+		}
+	}
+
 	override fun onReady() {
 		state = State.SHOWING
 		error = null

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt

@@ -1,7 +1,12 @@
 package org.koitharu.kotatsu.reader.ui.pager.reversed
 
+import android.os.Build
 import android.os.Bundle
+import android.view.InputDevice
+import android.view.KeyEvent
 import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.children
 import com.google.android.material.snackbar.Snackbar
@@ -23,12 +28,15 @@ import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderFragment
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.reader.ui.pager.standard.NoAnimPageTransformer
+import org.koitharu.kotatsu.reader.ui.pager.standard.PagerEventSupplier
 import org.koitharu.kotatsu.reader.ui.pager.standard.PagerReaderFragment
 import javax.inject.Inject
 import kotlin.math.absoluteValue
+import kotlin.math.sign
 
 @AndroidEntryPoint
-class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>() {
+class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>(),
+	View.OnGenericMotionListener {
 
 	@Inject
 	lateinit var networkState: NetworkState
@@ -47,6 +55,11 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 			adapter = readerAdapter
 			offscreenPageLimit = 2
 			doOnPageChanged(::notifyPageChanged)
+			setOnGenericMotionListener(this@ReversedReaderFragment)
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				recyclerView?.defaultFocusHighlightEnabled = false
+			}
+			PagerEventSupplier(this).attach()
 		}
 
 		viewModel.pageAnimation.observe(viewLifecycleOwner) {
@@ -69,6 +82,20 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 		super.onDestroyView()
 	}
 
+	override fun onGenericMotion(v: View?, event: MotionEvent): Boolean {
+		if (event.source and InputDevice.SOURCE_CLASS_POINTER != 0) {
+			if (event.actionMasked == MotionEvent.ACTION_SCROLL) {
+				val axisValue = event.getAxisValue(MotionEvent.AXIS_VSCROLL)
+				val withCtrl = event.metaState and KeyEvent.META_CTRL_MASK != 0
+				if (!withCtrl) {
+					switchPageBy(-axisValue.sign.toInt())
+					return true
+				}
+			}
+		}
+		return false
+	}
+
 	override fun onCreateAdapter() = ReversedPagesAdapter(
 		lifecycleOwner = viewLifecycleOwner,
 		loader = pageLoader,

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt

@@ -40,6 +40,16 @@ open class PageHolder(
 		@Suppress("LeakingThis")
 		bindingInfo.buttonErrorDetails.setOnClickListener(this)
 		binding.textViewNumber.isVisible = settings.isPagesNumbersEnabled
+		binding.zoomControl.listener = SsivZoomListener(binding.ssiv)
+	}
+
+	override fun onConfigChanged() {
+		super.onConfigChanged()
+		binding.zoomControl.isVisible = settings.isZoomControlsEnabled
+		@Suppress("SENSELESS_COMPARISON")
+		if (settings.applyBitmapConfig(binding.ssiv) && delegate != null) {
+			delegate.reload()
+		}
 	}
 
 	@SuppressLint("SetTextI18n")

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerEventSupplier.kt

@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.reader.ui.pager.standard
+
+import android.view.KeyEvent
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.children
+import androidx.viewpager2.widget.ViewPager2
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import org.koitharu.kotatsu.core.util.ext.recyclerView
+
+class PagerEventSupplier(private val pager: ViewPager2) : View.OnKeyListener {
+
+	fun attach() {
+		pager.recyclerView?.setOnKeyListener(this)
+	}
+
+	override fun onKey(v: View?, keyCode: Int, event: KeyEvent?): Boolean {
+		val rootView = pager.recyclerView?.findViewHolderForAdapterPosition(pager.currentItem)?.itemView as? ViewGroup
+			?: return false
+		return rootView.children.firstNotNullOfOrNull { x ->
+			x as? SubsamplingScaleImageView
+		}?.dispatchKeyEvent(event) == true
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt

@@ -1,7 +1,12 @@
 package org.koitharu.kotatsu.reader.ui.pager.standard
 
+import android.os.Build
 import android.os.Bundle
+import android.view.InputDevice
+import android.view.KeyEvent
 import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.children
 import com.google.android.material.snackbar.Snackbar
@@ -24,9 +29,11 @@ import org.koitharu.kotatsu.reader.ui.pager.BaseReaderFragment
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import javax.inject.Inject
 import kotlin.math.absoluteValue
+import kotlin.math.sign
 
 @AndroidEntryPoint
-class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>() {
+class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>(),
+	View.OnGenericMotionListener {
 
 	@Inject
 	lateinit var networkState: NetworkState
@@ -39,12 +46,20 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>()
 		container: ViewGroup?,
 	) = FragmentReaderStandardBinding.inflate(inflater, container, false)
 
-	override fun onViewBindingCreated(binding: FragmentReaderStandardBinding, savedInstanceState: Bundle?) {
+	override fun onViewBindingCreated(
+		binding: FragmentReaderStandardBinding,
+		savedInstanceState: Bundle?,
+	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		with(binding.pager) {
 			adapter = readerAdapter
 			offscreenPageLimit = 2
 			doOnPageChanged(::notifyPageChanged)
+			setOnGenericMotionListener(this@PagerReaderFragment)
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				recyclerView?.defaultFocusHighlightEnabled = false
+			}
+			PagerEventSupplier(this).attach()
 		}
 
 		viewModel.pageAnimation.observe(viewLifecycleOwner) {
@@ -67,28 +82,43 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>()
 		super.onDestroyView()
 	}
 
-	override suspend fun onPagesChanged(pages: List<ReaderPage>, pendingState: ReaderState?) = coroutineScope {
-		val items = async {
-			requireAdapter().setItems(pages)
-			yield()
-		}
-		if (pendingState != null) {
-			val position = pages.indexOfFirst {
-				it.chapterId == pendingState.chapterId && it.index == pendingState.page
+	override fun onGenericMotion(v: View?, event: MotionEvent): Boolean {
+		if (event.source and InputDevice.SOURCE_CLASS_POINTER != 0) {
+			if (event.actionMasked == MotionEvent.ACTION_SCROLL) {
+				val axisValue = event.getAxisValue(MotionEvent.AXIS_VSCROLL)
+				val withCtrl = event.metaState and KeyEvent.META_CTRL_MASK != 0
+				if (!withCtrl) {
+					switchPageBy(-axisValue.sign.toInt())
+					return true
+				}
 			}
-			items.await()
-			if (position != -1) {
-				requireViewBinding().pager.setCurrentItem(position, false)
-				notifyPageChanged(position)
-			} else {
-				Snackbar.make(requireView(), R.string.not_found_404, Snackbar.LENGTH_SHORT)
-					.show()
-			}
-		} else {
-			items.await()
 		}
+		return false
 	}
 
+	override suspend fun onPagesChanged(pages: List<ReaderPage>, pendingState: ReaderState?) =
+		coroutineScope {
+			val items = async {
+				requireAdapter().setItems(pages)
+				yield()
+			}
+			if (pendingState != null) {
+				val position = pages.indexOfFirst {
+					it.chapterId == pendingState.chapterId && it.index == pendingState.page
+				}
+				items.await()
+				if (position != -1) {
+					requireViewBinding().pager.setCurrentItem(position, false)
+					notifyPageChanged(position)
+				} else {
+					Snackbar.make(requireView(), R.string.not_found_404, Snackbar.LENGTH_SHORT)
+						.show()
+				}
+			} else {
+				items.await()
+			}
+		}
+
 	override fun onCreateAdapter() = PagesAdapter(
 		lifecycleOwner = viewLifecycleOwner,
 		loader = pageLoader,

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/SsivZoomListener.kt

@@ -0,0 +1,28 @@
+package org.koitharu.kotatsu.reader.ui.pager.standard
+
+import android.view.animation.DecelerateInterpolator
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import org.koitharu.kotatsu.core.ui.widgets.ZoomControl
+
+class SsivZoomListener(
+	private val ssiv: SubsamplingScaleImageView,
+) : ZoomControl.ZoomControlListener {
+
+	override fun onZoomIn() {
+		scaleBy(1.2f)
+	}
+
+	override fun onZoomOut() {
+		scaleBy(0.8f)
+	}
+
+	private fun scaleBy(factor: Float) {
+		val center = ssiv.getCenter() ?: return
+		val newScale = ssiv.scale * factor
+		ssiv.animateScaleAndCenter(newScale, center)?.apply {
+			withDuration(ssiv.resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
+			withInterpolator(DecelerateInterpolator())
+			start()
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonFrameLayout.kt

@@ -12,8 +12,8 @@ class WebtoonFrameLayout @JvmOverloads constructor(
 	@AttrRes defStyleAttr: Int = 0,
 ) : FrameLayout(context, attrs, defStyleAttr) {
 
-	val target by lazy(LazyThreadSafetyMode.NONE) {
-		findViewById<WebtoonImageView>(R.id.ssiv)
+	val target: WebtoonImageView by lazy(LazyThreadSafetyMode.NONE) {
+		findViewById(R.id.ssiv)
 	}
 
 	fun dispatchVerticalScroll(dy: Int): Int {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt

@@ -6,7 +6,6 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
 import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import com.davemorrissey.labs.subscaleview.decoder.SkiaPooledImageRegionDecoder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.os.NetworkState
@@ -34,12 +33,19 @@ class WebtoonHolder(
 
 	init {
 		binding.ssiv.bindToLifecycle(owner)
-		binding.ssiv.regionDecoderFactory = SkiaPooledImageRegionDecoder.Factory()
 		binding.ssiv.addOnImageEventListener(delegate)
 		bindingInfo.buttonRetry.setOnClickListener(this)
 		bindingInfo.buttonErrorDetails.setOnClickListener(this)
 	}
 
+	override fun onConfigChanged() {
+		super.onConfigChanged()
+		@Suppress("SENSELESS_COMPARISON")
+		if (settings.applyBitmapConfig(binding.ssiv) && delegate != null) {
+			delegate.reload()
+		}
+	}
+
 	override fun onBind(data: ReaderPage) {
 		delegate.onBind(data.toMangaPage())
 	}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt

@@ -3,9 +3,9 @@ package org.koitharu.kotatsu.reader.ui.pager.webtoon
 import android.content.Context
 import android.graphics.PointF
 import android.util.AttributeSet
+import androidx.core.view.ancestors
 import androidx.recyclerview.widget.RecyclerView
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.parsers.util.toIntUp
 
 private const val SCROLL_UNKNOWN = -1
@@ -93,7 +93,7 @@ class WebtoonImageView @JvmOverloads constructor(
 		if (oldh == h || oldw == 0 || oldh == 0 || scrollRange == SCROLL_UNKNOWN) return
 
 		computeScrollRange()
-		val container = parents.firstNotNullOfOrNull { it as? WebtoonFrameLayout } ?: return
+		val container = ancestors.firstNotNullOfOrNull { it as? WebtoonFrameLayout } ?: return
 		val parentHeight = parentHeight()
 		if (scrollPos != 0 && container.bottom < parentHeight) {
 			scrollTo(scrollRange)
@@ -115,6 +115,6 @@ class WebtoonImageView @JvmOverloads constructor(
 	}
 
 	private fun parentHeight(): Int {
-		return parents.firstNotNullOfOrNull { it as? RecyclerView }?.height ?: 0
+		return ancestors.firstNotNullOfOrNull { it as? RecyclerView }?.height ?: 0
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt

@@ -3,11 +3,13 @@ package org.koitharu.kotatsu.reader.ui.pager.webtoon
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import androidx.core.view.isVisible
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.yield
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
@@ -31,7 +33,7 @@ class WebtoonReaderFragment : BaseReaderFragment<FragmentReaderWebtoonBinding>()
 	@Inject
 	lateinit var pageLoader: PageLoader
 
-	private val scrollInterpolator = AccelerateDecelerateInterpolator()
+	private val scrollInterpolator = DecelerateInterpolator()
 
 	override fun onCreateViewBinding(
 		inflater: LayoutInflater,
@@ -45,10 +47,15 @@ class WebtoonReaderFragment : BaseReaderFragment<FragmentReaderWebtoonBinding>()
 			adapter = readerAdapter
 			addOnPageScrollListener(PageScrollListener())
 		}
+		binding.zoomControl.listener = binding.frame
 
 		viewModel.isWebtoonZoomEnabled.observe(viewLifecycleOwner) {
 			binding.frame.isZoomEnable = it
 		}
+		combine(viewModel.isWebtoonZoomEnabled, viewModel.isZoomControlEnabled, Boolean::and)
+			.observe(viewLifecycleOwner) {
+				binding.zoomControl.isVisible = it
+			}
 	}
 
 	override fun onDestroyView() {
@@ -122,8 +129,12 @@ class WebtoonReaderFragment : BaseReaderFragment<FragmentReaderWebtoonBinding>()
 		requireViewBinding().recyclerView.firstVisibleItemPosition = position
 	}
 
-	override fun scrollBy(delta: Int): Boolean {
-		requireViewBinding().recyclerView.nestedScrollBy(0, delta)
+	override fun scrollBy(delta: Int, smooth: Boolean): Boolean {
+		if (smooth && isAnimationEnabled()) {
+			requireViewBinding().recyclerView.smoothScrollBy(0, delta, scrollInterpolator)
+		} else {
+			requireViewBinding().recyclerView.nestedScrollBy(0, delta)
+		}
 		return true
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonScalingFrame.kt

@@ -7,12 +7,19 @@ import android.graphics.Rect
 import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.GestureDetector
+import android.view.InputDevice
+import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.ScaleGestureDetector
+import android.view.ViewConfiguration
 import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.DecelerateInterpolator
 import android.widget.FrameLayout
 import android.widget.OverScroller
 import androidx.core.view.GestureDetectorCompat
+import androidx.core.view.ViewConfigurationCompat
+import org.koitharu.kotatsu.core.ui.widgets.ZoomControl
+import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
 
 private const val MAX_SCALE = 2.5f
 private const val MIN_SCALE = 0.5f
@@ -21,7 +28,9 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
 	defStyles: Int = 0,
-) : FrameLayout(context, attrs, defStyles), ScaleGestureDetector.OnScaleGestureListener {
+) : FrameLayout(context, attrs, defStyles),
+	ScaleGestureDetector.OnScaleGestureListener,
+	ZoomControl.ZoomControlListener {
 
 	private val targetChild by lazy(LazyThreadSafetyMode.NONE) { getChildAt(0) as WebtoonRecyclerView }
 
@@ -40,6 +49,7 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 	private var halfHeight = 0f
 	private val translateBounds = RectF()
 	private val targetHitRect = Rect()
+	private var animator: ValueAnimator? = null
 
 	var isZoomEnable = true
 		set(value) {
@@ -77,10 +87,79 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 		return super.dispatchTouchEvent(ev)
 	}
 
-	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-		super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-		halfWidth = measuredWidth / 2f
-		halfHeight = measuredHeight / 2f
+	override fun onGenericMotionEvent(event: MotionEvent): Boolean {
+		if (isZoomEnable && event.source and InputDevice.SOURCE_CLASS_POINTER != 0) {
+			if (event.actionMasked == MotionEvent.ACTION_SCROLL) {
+				val withCtrl = event.metaState and KeyEvent.META_CTRL_MASK != 0
+				if (withCtrl) {
+					val axisValue =
+						event.getAxisValue(MotionEvent.AXIS_VSCROLL) * ViewConfigurationCompat.getScaledVerticalScrollFactor(
+							ViewConfiguration.get(context), context,
+						)
+					val newScale = (scale + axisValue).coerceIn(MIN_SCALE, MAX_SCALE)
+					scaleChild(newScale, event.x, event.y)
+					return true
+				}
+			}
+		}
+		return super.onGenericMotionEvent(event)
+	}
+
+	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+		if (!isZoomEnable) {
+			return super.onKeyDown(keyCode, event)
+		}
+		return when (keyCode) {
+			KeyEvent.KEYCODE_ZOOM_IN,
+			KeyEvent.KEYCODE_NUMPAD_ADD,
+			KeyEvent.KEYCODE_PLUS -> {
+				onZoomIn()
+				true
+			}
+
+			KeyEvent.KEYCODE_ZOOM_OUT,
+			KeyEvent.KEYCODE_NUMPAD_SUBTRACT,
+			KeyEvent.KEYCODE_MINUS -> {
+				onZoomOut()
+				true
+			}
+
+			KeyEvent.KEYCODE_ESCAPE -> {
+				smoothScaleTo(1f)
+				true
+			}
+
+			else -> super.onKeyDown(keyCode, event)
+		}
+	}
+
+	override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+		return if (isZoomEnable) {
+			keyCode == KeyEvent.KEYCODE_NUMPAD_ADD
+				|| keyCode == KeyEvent.KEYCODE_PLUS
+				|| keyCode == KeyEvent.KEYCODE_NUMPAD_SUBTRACT
+				|| keyCode == KeyEvent.KEYCODE_MINUS
+				|| keyCode == KeyEvent.KEYCODE_ZOOM_IN
+				|| keyCode == KeyEvent.KEYCODE_ZOOM_OUT
+				|| keyCode == KeyEvent.KEYCODE_ESCAPE
+				|| super.onKeyUp(keyCode, event)
+		} else {
+			super.onKeyUp(keyCode, event)
+		}
+	}
+
+	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+		super.onSizeChanged(w, h, oldw, oldh)
+		halfWidth = w / 2f
+		halfHeight = h / 2f
+	}
+
+	override fun onZoomIn() {
+		smoothScaleTo(scale * 1.1f)
+	}
+
+	override fun onZoomOut() {
+		smoothScaleTo(scale * 0.9f)
 	}
 
 	private fun invalidateTarget() {
@@ -154,14 +233,33 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 		return true
 	}
 
-	override fun onScaleBegin(detector: ScaleGestureDetector): Boolean = true
+	override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
+		animator?.cancel()
+		animator = null
+		return true
+	}
 
 	override fun onScaleEnd(p0: ScaleGestureDetector) = Unit
 
+	private fun smoothScaleTo(target: Float) {
+		val newScale = target.coerceIn(MIN_SCALE, MAX_SCALE)
+		animator?.cancel()
+		animator = ValueAnimator.ofFloat(scale, newScale).apply {
+			setDuration(context.getAnimationDuration(android.R.integer.config_shortAnimTime))
+			interpolator = DecelerateInterpolator()
+			addUpdateListener { scaleChild(it.animatedValue as Float, halfWidth, halfHeight) }
+			start()
+		}
+	}
 
 	private inner class GestureListener : GestureDetector.SimpleOnGestureListener(), Runnable {
 
-		override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+		override fun onScroll(
+			e1: MotionEvent?,
+			e2: MotionEvent,
+			distanceX: Float,
+			distanceY: Float,
+		): Boolean {
 			if (scale <= 1f) return false
 			transformMatrix.postTranslate(-distanceX, -distanceY)
 			invalidateTarget()
@@ -181,7 +279,12 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 			return true
 		}
 
-		override fun onFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+		override fun onFling(
+			e1: MotionEvent?,
+			e2: MotionEvent,
+			velocityX: Float,
+			velocityY: Float,
+		): Boolean {
 			if (scale <= 1) return false
 
 			overScroller.fling(
@@ -200,7 +303,10 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 
 		override fun run() {
 			if (overScroller.computeScrollOffset()) {
-				transformMatrix.postTranslate(overScroller.currX - transX, overScroller.currY - transY)
+				transformMatrix.postTranslate(
+					overScroller.currX - transX,
+					overScroller.currY - transY,
+				)
 				invalidateTarget()
 				postOnAnimation(this)
 			}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt

@@ -152,13 +152,6 @@ class PagesThumbnailsSheet :
 		override fun onScrolledToEnd(recyclerView: RecyclerView) {
 			viewModel.loadNextChapter()
 		}
-
-		override fun onPostScrolled(recyclerView: RecyclerView, firstVisibleItemPosition: Int, visibleItemCount: Int) {
-			super.onPostScrolled(recyclerView, firstVisibleItemPosition, visibleItemCount)
-			if (firstVisibleItemPosition > offsetTop) {
-				viewModel.allowLoadAbove()
-			}
-		}
 	}
 
 	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup() {