UI adjust part 1

Currently translated at 100.0% (636 of 636 strings)

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

.idea/.name

@@ -1 +0,0 @@
-Kotatsu

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 627
-		versionName = '6.7.5'
+		versionCode = 633
+		versionName = '6.8.3'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,19 +82,19 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:b7613606c0') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:44ea9fe709') {
 		exclude group: 'org.json', module: 'json'
 	}
 
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.12.0'
 	implementation 'androidx.activity:activity-ktx:1.8.2'
 	implementation 'androidx.fragment:fragment-ktx:1.6.2'
-	implementation 'androidx.collection:collection:1.4.0'
+	implementation 'androidx.collection:collection-ktx:1.4.0'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
 	implementation 'androidx.lifecycle:lifecycle-service:2.7.0'
 	implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
@@ -104,8 +104,9 @@ dependencies {
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.12.0-alpha03'
+	implementation 'com.google.android.material:material:1.12.0-beta01'
 	implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
+	implementation 'androidx.webkit:webkit:1.10.0'
 
 	implementation 'androidx.work:work-runtime:2.9.0'
 	//noinspection GradleDependency
@@ -121,13 +122,13 @@ dependencies {
 
 	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
-	implementation 'com.squareup.okio:okio:3.8.0'
+	implementation 'com.squareup.okio:okio:3.9.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'com.google.dagger:hilt-android:2.51'
-	kapt 'com.google.dagger:hilt-compiler:2.51'
+	implementation 'com.google.dagger:hilt-android:2.51.1'
+	kapt 'com.google.dagger:hilt-compiler:2.51.1'
 	implementation 'androidx.hilt:hilt-work:1.2.0'
 	kapt 'androidx.hilt:hilt-compiler:1.2.0'
 
@@ -147,7 +148,7 @@ dependencies {
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20240205'
+	testImplementation 'org.json:json:20240303'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
 
 	androidTestImplementation 'androidx.test:runner:1.5.2'
@@ -160,6 +161,6 @@ dependencies {
 	androidTestImplementation 'androidx.room:room-testing:2.6.1'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.1'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.51'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.51.1'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51.1'
 }

app/src/main/AndroidManifest.xml

@@ -94,6 +94,34 @@
 				<data android:host="kotatsu.app" />
 			</intent-filter>
 		</activity>
+		<activity
+			android:name="org.koitharu.kotatsu.details.ui.DetailsActivity2"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="${applicationId}.action.VIEW_MANGA" />
+			</intent-filter>
+			<intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="http" />
+				<data android:scheme="https" />
+				<data android:host="kotatsu.app" />
+				<data android:path="/manga" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+				<data android:host="manga" />
+				<data android:host="kotatsu.app" />
+			</intent-filter>
+		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
 			android:exported="true">

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

@@ -12,6 +12,7 @@ import org.koitharu.kotatsu.core.util.ext.almostEquals
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
 
@@ -24,7 +25,7 @@ class AlternativesUseCase @Inject constructor(
 ) {
 
 	suspend operator fun invoke(manga: Manga): Flow<Manga> {
-		val sources = sourcesRepository.getEnabledSources()
+		val sources = getSources(manga.source)
 		if (sources.isEmpty()) {
 			return emptyFlow()
 		}
@@ -42,7 +43,7 @@ class AlternativesUseCase @Inject constructor(
 						}
 					}.getOrDefault(emptyList())
 					for (item in list) {
-						if (item != manga && item.matches(manga)) {
+						if (item.matches(manga)) {
 							send(item)
 						}
 					}
@@ -55,6 +56,14 @@ class AlternativesUseCase @Inject constructor(
 		}
 	}
 
+	private suspend fun getSources(ref: MangaSource): List<MangaSource> {
+		val result = ArrayList<MangaSource>(MangaSource.entries.size - 2)
+		result.addAll(sourcesRepository.getEnabledSources())
+		result.sortByDescending { it.priority(ref) }
+		result.addAll(sourcesRepository.getDisabledSources().sortedByDescending { it.priority(ref) })
+		return result
+	}
+
 	private fun Manga.matches(ref: Manga): Boolean {
 		return matchesTitles(title, ref.title) ||
 			matchesTitles(title, ref.altTitle) ||
@@ -66,4 +75,11 @@ class AlternativesUseCase @Inject constructor(
 	private fun matchesTitles(a: String?, b: String?): Boolean {
 		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, MATCH_THRESHOLD)
 	}
+
+	private fun MangaSource.priority(ref: MangaSource): Int {
+		var res = 0
+		if (locale == ref.locale) res += 2
+		if (contentType == ref.contentType) res++
+		return res
+	}
 }

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

@@ -5,9 +5,7 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.details.domain.DetailsLoadUseCase
 import org.koitharu.kotatsu.details.domain.ProgressUpdateUseCase
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.history.data.HistoryEntity
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.history.data.toMangaHistory
@@ -21,7 +19,6 @@ class MigrateUseCase @Inject constructor(
 	private val mangaDataRepository: MangaDataRepository,
 	private val database: MangaDatabase,
 	private val progressUpdateUseCase: ProgressUpdateUseCase,
-	private val useCase: DetailsLoadUseCase
 ) {
 
 	suspend operator fun invoke(oldManga: Manga, newManga: Manga) {
@@ -41,16 +38,12 @@ class MigrateUseCase @Inject constructor(
 		database.withTransaction {
 			// replace favorites
 			val favoritesDao = database.getFavouritesDao()
-			val oldFavourite = favoritesDao.find(oldDetails.id)
-			if (oldFavourite != null) {
+			val oldFavourites = favoritesDao.findAllRaw(oldDetails.id)
+			if (oldFavourites.isNotEmpty()) {
 				favoritesDao.delete(oldManga.id)
-				for (f in oldFavourite.categories) {
-					val e = FavouriteEntity(
+				for (f in oldFavourites) {
+					val e = f.copy(
 						mangaId = newManga.id,
-						categoryId = f.categoryId.toLong(),
-						sortKey = f.sortKey,
-						createdAt = f.createdAt,
-						deletedAt = 0,
 					)
 					favoritesDao.upsert(e)
 				}
@@ -75,11 +68,16 @@ class MigrateUseCase @Inject constructor(
 		if (oldManga.chapters.isNullOrEmpty()) { // probably broken manga/source
 			val branch = newManga.getPreferredBranch(null)
 			val chapters = checkNotNull(newManga.getChapters(branch))
+			val currentChapter = if (history.percent in 0f..1f) {
+				chapters[(chapters.lastIndex * history.percent).toInt()]
+			} else {
+				chapters.first()
+			}
 			return HistoryEntity(
 				mangaId = newManga.id,
 				createdAt = history.createdAt,
 				updatedAt = System.currentTimeMillis(),
-				chapterId = chapters[(chapters.lastIndex * history.percent).toInt()].id,
+				chapterId = currentChapter.id,
 				page = history.page,
 				scroll = history.scroll,
 				percent = history.percent,
@@ -91,7 +89,11 @@ class MigrateUseCase @Inject constructor(
 		val oldChapters = checkNotNull(oldManga.getChapters(branch))
 		var index = oldChapters.indexOfFirst { it.id == history.chapterId }
 		if (index < 0) {
-			index = (oldChapters.size * history.percent).toInt()
+			index = if (history.percent in 0f..1f) {
+				(oldChapters.lastIndex * history.percent).toInt()
+			} else {
+				0
+			}
 		}
 		val newChapters = checkNotNull(newManga.chapters).groupBy { it.branch }
 		val newBranch = if (newChapters.containsKey(branch)) {

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

@@ -43,7 +43,11 @@ fun alternativeAD(
 	bind { payloads ->
 		binding.textViewTitle.text = item.manga.title
 		binding.textViewSubtitle.text = buildSpannedString {
-			append(context.resources.getQuantityString(R.plurals.chapters, item.chaptersCount, item.chaptersCount))
+			if (item.chaptersCount > 0) {
+				append(context.resources.getQuantityString(R.plurals.chapters, item.chaptersCount, item.chaptersCount))
+			} else {
+				append(context.getString(R.string.no_chapters))
+			}
 			when (item.chaptersDiff.sign) {
 				-1 -> inSpans(ForegroundColorSpan(colorRed)) {
 					append("  ▼ ")

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

@@ -25,6 +25,7 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingFooter
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
 
 @HiltViewModel
@@ -44,9 +45,11 @@ class AlternativesViewModel @Inject constructor(
 
 	init {
 		launchJob(Dispatchers.Default) {
-			val ref = mangaRepositoryFactory.create(manga.source).getDetails(manga)
+			val ref = runCatchingCancellable {
+				mangaRepositoryFactory.create(manga.source).getDetails(manga)
+			}.getOrDefault(manga)
 			val refCount = ref.chaptersCount()
-			alternativesUseCase(manga)
+			alternativesUseCase(ref)
 				.map {
 					MangaAlternativeModel(
 						manga = it,
@@ -69,6 +72,7 @@ class AlternativesViewModel @Inject constructor(
 				}.collect {
 					content.value = it
 				}
+			content.value = content.value.filterNot { it is LoadingFooter }
 		}
 	}
 

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

@@ -25,6 +25,7 @@ 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.ReversibleActionObserver
+import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
@@ -71,7 +72,7 @@ class BookmarksFragment :
 	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		selectionController = ListSelectionController(
-			activity = requireActivity(),
+			appCompatDelegate = checkNotNull(findAppCompatDelegate()),
 			decoration = BookmarksSelectionDecoration(binding.root.context),
 			registryOwner = this,
 			callback = this,
@@ -100,7 +101,7 @@ class BookmarksFragment :
 		}
 		viewModel.onError.observeEvent(
 			viewLifecycleOwner,
-			SnackbarErrorObserver(binding.recyclerView, this)
+			SnackbarErrorObserver(binding.recyclerView, this),
 		)
 		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
 	}
@@ -206,10 +207,11 @@ class BookmarksFragment :
 	companion object {
 
 		@Deprecated(
-			"", ReplaceWith(
+			"",
+			ReplaceWith(
 				"BookmarksFragment()",
-				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment"
-			)
+				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment",
+			),
 		)
 		fun newInstance() = BookmarksFragment()
 	}

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

@@ -37,6 +37,7 @@ import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
+@Deprecated("")
 @AndroidEntryPoint
 class BookmarksSheet :
 	BaseAdaptiveSheet<SheetPagesBinding>(),

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

@@ -21,6 +21,7 @@ import org.koitharu.kotatsu.list.ui.model.LoadingFooter
 import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import javax.inject.Inject
 
+@Deprecated("")
 @HiltViewModel
 class BookmarksSheetViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.browser
 
-import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
@@ -12,18 +11,28 @@ import android.webkit.CookieManager
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.network.UserAgents
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import javax.inject.Inject
 import com.google.android.material.R as materialR
 
-@SuppressLint("SetJavaScriptEnabled")
+@AndroidEntryPoint
 class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
 	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
 
+	@Inject
+	lateinit var mangaRepositoryFactory: MangaRepository.Factory
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
@@ -33,10 +42,11 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		with(viewBinding.webView.settings) {
-			javaScriptEnabled = true
-			userAgentString = UserAgents.CHROME_MOBILE
+		val userAgent = intent?.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE)?.let { source ->
+			val repository = mangaRepositoryFactory.create(source) as? RemoteMangaRepository
+			repository?.headers?.get(CommonHeaders.USER_AGENT)
 		}
+		viewBinding.webView.configureForParser(userAgent)
 		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
 		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
@@ -57,16 +67,6 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 	}
 
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
-	}
-
-	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
-	}
-
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		super.onCreateOptionsMenu(menu)
 		menuInflater.inflate(R.menu.opt_browser, menu)
@@ -139,11 +139,13 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	companion object {
 
 		private const val EXTRA_TITLE = "title"
+		private const val EXTRA_SOURCE = "source"
 
-		fun newIntent(context: Context, url: String, title: String?): Intent {
+		fun newIntent(context: Context, url: String, source: MangaSource?, title: String?): Intent {
 			return Intent(context, BrowserActivity::class.java)
 				.setData(Uri.parse(url))
 				.putExtra(EXTRA_TITLE, title)
+				.putExtra(EXTRA_SOURCE, source)
 		}
 	}
 }

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

@@ -20,7 +20,7 @@ class CaptchaNotifier(
 ) : EventListener {
 
 	fun notify(exception: CloudFlareProtectedException) {
-		if (!context.checkNotificationPermission()) {
+		if (!context.checkNotificationPermission(CHANNEL_ID)) {
 			return
 		}
 		val manager = NotificationManagerCompat.from(context)

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

@@ -27,8 +27,8 @@ import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
+import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.network.UserAgents
 import javax.inject.Inject
 import com.google.android.material.R as materialR
 
@@ -40,6 +40,7 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 	@Inject
 	lateinit var cookieJar: MutableCookieJar
 
+	private lateinit var cfClient: CloudFlareClient
 	private var onBackPressedCallback: WebViewBackPressedCallback? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -52,13 +53,9 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
 		val url = intent?.dataString.orEmpty()
-		with(viewBinding.webView.settings) {
-			javaScriptEnabled = true
-			domStorageEnabled = true
-			databaseEnabled = true
-			userAgentString = intent?.getStringExtra(ARG_UA) ?: UserAgents.CHROME_MOBILE
-		}
-		viewBinding.webView.webViewClient = CloudFlareClient(cookieJar, this, url)
+		cfClient = CloudFlareClient(cookieJar, this, url)
+		viewBinding.webView.configureForParser(intent?.getStringExtra(ARG_UA))
+		viewBinding.webView.webViewClient = cfClient
 		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView).also {
 			onBackPressedDispatcher.addCallback(it)
 		}
@@ -84,16 +81,6 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		super.onDestroy()
 	}
 
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
-	}
-
-	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
-	}
-
 	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
 		menuInflater.inflate(R.menu.opt_captcha, menu)
 		return super.onCreateOptionsMenu(menu)
@@ -118,15 +105,7 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		}
 
 		R.id.action_retry -> {
-			lifecycleScope.launch {
-				viewBinding.webView.stopLoading()
-				yield()
-				val targetUrl = intent?.dataString?.toHttpUrlOrNull()
-				if (targetUrl != null) {
-					clearCfCookies(targetUrl)
-					viewBinding.webView.loadUrl(targetUrl.toString())
-				}
-			}
+			restartCheck()
 			true
 		}
 
@@ -152,6 +131,10 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		viewBinding.progressBar.isInvisible = true
 	}
 
+	override fun onLoopDetected() {
+		restartCheck()
+	}
+
 	override fun onCheckPassed() {
 		pendingResult = RESULT_OK
 		finishAfterTransition()
@@ -171,10 +154,23 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
 	}
 
+	private fun restartCheck() {
+		lifecycleScope.launch {
+			viewBinding.webView.stopLoading()
+			yield()
+			cfClient.reset()
+			val targetUrl = intent?.dataString?.toHttpUrlOrNull()
+			if (targetUrl != null) {
+				clearCfCookies(targetUrl)
+				viewBinding.webView.loadUrl(targetUrl.toString())
+			}
+		}
+	}
+
 	private suspend fun clearCfCookies(url: HttpUrl) = runInterruptible(Dispatchers.Default) {
 		cookieJar.removeCookies(url) { cookie ->
 			val name = cookie.name
-			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf")
+			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf") || name == "csrftoken"
 		}
 	}
 

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

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

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

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

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

@@ -6,12 +6,14 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runInterruptible
 import okio.Closeable
 import org.json.JSONArray
+import org.koitharu.kotatsu.core.exceptions.BadBackupFormatException
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import java.io.File
 import java.util.EnumSet
+import java.util.zip.ZipException
 import java.util.zip.ZipFile
 
-class BackupZipInput(val file: File) : Closeable {
+class BackupZipInput private constructor(val file: File) : Closeable {
 
 	private val zipFile = ZipFile(file)
 
@@ -41,4 +43,17 @@ class BackupZipInput(val file: File) : Closeable {
 			}
 		}
 	}
+
+	companion object {
+
+		fun from(file: File): BackupZipInput = try {
+			val res = BackupZipInput(file)
+			if (res.zipFile.getEntry("index") == null) {
+				throw BadBackupFormatException(null)
+			}
+			res
+		} catch (e: ZipException) {
+			throw BadBackupFormatException(e)
+		}
+	}
 }

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

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

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

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

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

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

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

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

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

@@ -31,6 +31,7 @@ import org.koitharu.kotatsu.core.db.migrations.Migration15To16
 import org.koitharu.kotatsu.core.db.migrations.Migration16To17
 import org.koitharu.kotatsu.core.db.migrations.Migration17To18
 import org.koitharu.kotatsu.core.db.migrations.Migration18To19
+import org.koitharu.kotatsu.core.db.migrations.Migration19To20
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
@@ -57,7 +58,7 @@ import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 19
+const val DATABASE_VERSION = 20
 
 @Database(
 	entities = [
@@ -116,6 +117,7 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration16To17(context),
 	Migration17To18(),
 	Migration18To19(),
+	Migration19To20(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

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

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

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

@@ -1,6 +1,10 @@
 package org.koitharu.kotatsu.core.db.dao
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogWithManga
@@ -24,6 +28,9 @@ interface TrackLogsDao {
 	@Query("DELETE FROM track_logs WHERE manga_id NOT IN (SELECT manga_id FROM tracks)")
 	suspend fun gc()
 
+	@Query("DELETE FROM track_logs WHERE id IN (SELECT id FROM track_logs ORDER BY created_at DESC LIMIT 0 OFFSET :size)")
+	suspend fun trim(size: Int)
+
 	@Query("SELECT COUNT(*) FROM track_logs")
 	suspend fun count(): Int
 }

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

@@ -0,0 +1,16 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration19To20 : Migration(19, 20) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE tracks_bk (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id))")
+		db.execSQL("INSERT INTO tracks_bk SELECT manga_id, chapters_total, last_chapter_id, chapters_new, last_check, last_notified_id FROM tracks")
+		db.execSQL("DROP TABLE tracks")
+		db.execSQL("CREATE TABLE tracks (`manga_id` INTEGER NOT NULL, `last_chapter_id` INTEGER NOT NULL, `chapters_new` INTEGER NOT NULL, `last_check_time` INTEGER NOT NULL, `last_chapter_date` INTEGER NOT NULL, `last_result` INTEGER NOT NULL, PRIMARY KEY(`manga_id`), FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+		db.execSQL("INSERT INTO tracks SELECT manga_id, last_chapter_id, chapters_new, last_check AS last_check_time, 0 AS last_chapter_date, 0 AS last_result FROM tracks_bk")
+		db.execSQL("DROP TABLE tracks_bk")
+	}
+}

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

@@ -0,0 +1,5 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import java.io.IOException
+
+class BadBackupFormatException(cause: Throwable?) : IOException(cause)

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

@@ -0,0 +1,7 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import okio.IOException
+
+class NoDataReceivedException(
+	private val url: String,
+) : IOException("No data has been received from $url")

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -171,7 +171,11 @@ class RemoteMangaRepository(
 		return getConfig().isSlowdownEnabled
 	}
 
-	private fun getConfig() = parser.config as SourceSettings
+	fun invalidateCache() {
+		cache.clear(source)
+	}
+
+	fun getConfig() = parser.config as SourceSettings
 
 	private suspend fun <T> asyncSafe(block: suspend CoroutineScope.() -> T): SafeDeferred<T> {
 		var dispatcher = currentCoroutineContext()[CoroutineDispatcher.Key]

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

@@ -78,6 +78,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
 
+	var gridSizePages: Int
+		get() = prefs.getInt(KEY_GRID_SIZE_PAGES, 100)
+		set(value) = prefs.edit { putInt(KEY_GRID_SIZE_PAGES, value) }
+
 	var historyListMode: ListMode
 		get() = prefs.getEnumValue(KEY_LIST_MODE_HISTORY, listMode)
 		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_HISTORY, value) }
@@ -178,11 +182,11 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_INCOGNITO_MODE, false)
 		set(value) = prefs.edit { putBoolean(KEY_INCOGNITO_MODE, value) }
 
-	var chaptersReverse: Boolean
+	var isChaptersReverse: Boolean
 		get() = prefs.getBoolean(KEY_REVERSE_CHAPTERS, false)
 		set(value) = prefs.edit { putBoolean(KEY_REVERSE_CHAPTERS, value) }
 
-	var chaptersGridView: Boolean
+	var isChaptersGridView: Boolean
 		get() = prefs.getBoolean(KEY_GRID_VIEW_CHAPTERS, false)
 		set(value) = prefs.edit { putBoolean(KEY_GRID_VIEW_CHAPTERS, value) }
 
@@ -221,8 +225,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isUnstableUpdatesAllowed: Boolean
 		get() = prefs.getBoolean(KEY_UPDATES_UNSTABLE, false)
 
+	val isPagesTabEnabled: Boolean
+		get() = prefs.getBoolean(KEY_PAGES_TAB, true)
+
 	val defaultDetailsTab: Int
-		get() = prefs.getString(KEY_DETAILS_TAB, null)?.toIntOrNull()?.coerceIn(0, 1) ?: 0
+		get() = if (isPagesTabEnabled) {
+			prefs.getString(KEY_DETAILS_TAB, null)?.toIntOrNull()?.coerceIn(0, 1) ?: 0
+		} else {
+			0
+		}
 
 	val isContentPrefetchEnabled: Boolean
 		get() {
@@ -520,6 +531,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SEARCH_HISTORY_CLEAR = "search_history_clear"
 		const val KEY_UPDATES_FEED_CLEAR = "updates_feed_clear"
 		const val KEY_GRID_SIZE = "grid_size"
+		const val KEY_GRID_SIZE_PAGES = "grid_size_pages"
 		const val KEY_REMOTE_SOURCES = "remote_sources"
 		const val KEY_LOCAL_STORAGE = "local_storage"
 		const val KEY_READER_DOUBLE_PAGES = "reader_double_pages"
@@ -622,6 +634,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_CF_INVERTED = "cf_inverted"
 		const val KEY_CF_GRAYSCALE = "cf_grayscale"
 		const val KEY_IGNORE_DOZE = "ignore_dose"
+		const val KEY_PAGES_TAB = "pages_tab"
 		const val KEY_DETAILS_TAB = "details_tab"
 		const val KEY_READING_TIME = "reading_time"
 		const val KEY_PAGES_SAVE_DIR = "pages_dir"

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

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

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

@@ -127,11 +127,13 @@ abstract class BaseActivity<B : ViewBinding> :
 		val actionModeColor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			ColorUtils.compositeColors(
 				ContextCompat.getColor(this, com.google.android.material.R.color.m3_appbar_overlay_color),
-				getThemeColor(R.attr.m3ColorBackground),
+				getThemeColor(com.google.android.material.R.attr.colorSurface),
 			)
 		} else {
-			ContextCompat.getColor(this, R.color.kotatsu_m3_background)
+			ContextCompat.getColor(this, R.color.kotatsu_background)
 		}
+		defaultStatusBarColor = window.statusBarColor
+		window.statusBarColor = actionModeColor
 		val insets = ViewCompat.getRootWindowInsets(viewBinding.root)
 			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
 		findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar).apply {
@@ -140,8 +142,6 @@ abstract class BaseActivity<B : ViewBinding> :
 				topMargin = insets.top
 			}
 		}
-		defaultStatusBarColor = window.statusBarColor
-		window.statusBarColor = actionModeColor
 	}
 
 	@CallSuper

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

@@ -1,10 +1,9 @@
 package org.koitharu.kotatsu.core.ui.list
 
-import android.app.Activity
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.view.ActionMode
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
@@ -20,7 +19,7 @@ private const val KEY_SELECTION = "selection"
 private const val PROVIDER_NAME = "selection_decoration"
 
 class ListSelectionController(
-	private val activity: Activity,
+	private val appCompatDelegate: AppCompatDelegate,
 	private val decoration: AbstractSelectionItemDecoration,
 	private val registryOwner: SavedStateRegistryOwner,
 	private val callback: Callback2,
@@ -108,7 +107,7 @@ class ListSelectionController(
 
 	private fun startActionMode() {
 		if (actionMode == null) {
-			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
+			actionMode = appCompatDelegate.startSupportActionMode(this)
 		}
 	}
 

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

@@ -1,25 +1,39 @@
 package org.koitharu.kotatsu.core.ui.sheet
 
 import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
 import androidx.activity.OnBackPressedDispatcher
+import androidx.annotation.CallSuper
+import androidx.appcompat.app.AppCompatDialog
 import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.appcompat.view.ActionMode
+import androidx.appcompat.widget.ActionBarContextView
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.sidesheet.SideSheetDialog
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import com.google.android.material.R as materialR
 
 abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
 
 	private var waitingForDismissAllowingStateLoss = false
 	private var isFitToContentsDisabled = false
+	private var defaultStatusBarColor = Color.TRANSPARENT
 
 	var viewBinding: B? = null
 		private set
@@ -31,12 +45,19 @@ abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
 	protected val behavior: AdaptiveSheetBehavior?
 		get() = AdaptiveSheetBehavior.from(dialog)
 
+	@JvmField
+	val actionModeDelegate = ActionModeDelegate()
+
 	val isExpanded: Boolean
 		get() = behavior?.state == AdaptiveSheetBehavior.STATE_EXPANDED
 
 	val onBackPressedDispatcher: OnBackPressedDispatcher
 		get() = requireComponentDialog().onBackPressedDispatcher
 
+	var isLocked = false
+		private set
+	private var lockCounter = 0
+
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -60,11 +81,45 @@ abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
 
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 		val context = requireContext()
-		return if (context.resources.getBoolean(R.bool.is_tablet)) {
-			SideSheetDialog(context, theme)
+		val dialog = if (context.resources.getBoolean(R.bool.is_tablet)) {
+			SideSheetDialogImpl(context, theme)
 		} else {
-			BottomSheetDialog(context, theme)
+			BottomSheetDialogImpl(context, theme)
 		}
+		dialog.onBackPressedDispatcher.addCallback(actionModeDelegate)
+		return dialog
+	}
+
+	@CallSuper
+	protected open fun dispatchSupportActionModeStarted(mode: ActionMode) {
+		actionModeDelegate.onSupportActionModeStarted(mode)
+		val ctx = requireContext()
+		val actionModeColor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			ColorUtils.compositeColors(
+				ContextCompat.getColor(ctx, com.google.android.material.R.color.m3_appbar_overlay_color),
+				ctx.getThemeColor(com.google.android.material.R.attr.colorSurface),
+			)
+		} else {
+			ContextCompat.getColor(ctx, R.color.kotatsu_surface)
+		}
+		dialog?.window?.let {
+			defaultStatusBarColor = it.statusBarColor
+			it.statusBarColor = actionModeColor
+		}
+		val insets = ViewCompat.getRootWindowInsets(requireView())
+			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
+		dialog?.window?.decorView?.findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar)?.apply {
+			setBackgroundColor(actionModeColor)
+			updateLayoutParams<ViewGroup.MarginLayoutParams> {
+				topMargin = insets.top
+			}
+		}
+	}
+
+	@CallSuper
+	protected open fun dispatchSupportActionModeFinished(mode: ActionMode) {
+		actionModeDelegate.onSupportActionModeFinished(mode)
+		dialog?.window?.statusBarColor = defaultStatusBarColor
 	}
 
 	fun addSheetCallback(callback: AdaptiveSheetCallback) {
@@ -81,7 +136,16 @@ abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
 
 	protected open fun onViewBindingCreated(binding: B, savedInstanceState: Bundle?) = Unit
 
+	fun startSupportActionMode(callback: ActionMode.Callback): ActionMode? {
+		val appCompatDialog = dialog as? AppCompatDialog ?: return null
+		return appCompatDialog.delegate.startSupportActionMode(callback)
+	}
+
 	protected fun setExpanded(isExpanded: Boolean, isLocked: Boolean) {
+		this.isLocked = isLocked
+		if (!isLocked) {
+			lockCounter = 0
+		}
 		val b = behavior ?: return
 		if (isExpanded) {
 			b.state = BottomSheetBehavior.STATE_EXPANDED
@@ -109,6 +173,20 @@ abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
 		}
 	}
 
+	@CallSuper
+	open fun expandAndLock() {
+		lockCounter++
+		setExpanded(isExpanded = true, isLocked = true)
+	}
+
+	@CallSuper
+	open fun unlock() {
+		lockCounter--
+		if (lockCounter <= 0) {
+			setExpanded(isExpanded, false)
+		}
+	}
+
 	fun requireViewBinding(): B = checkNotNull(viewBinding) {
 		"Fragment $this did not return a ViewBinding from onCreateView() or this was called before onCreateView()."
 	}
@@ -171,4 +249,38 @@ abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
 
 		override fun onSlide(sheet: View, slideOffset: Float) {}
 	}
+
+	private inner class SideSheetDialogImpl(context: Context, theme: Int) : SideSheetDialog(context, theme) {
+
+		override fun onSupportActionModeStarted(mode: ActionMode?) {
+			super.onSupportActionModeStarted(mode)
+			if (mode != null) {
+				dispatchSupportActionModeStarted(mode)
+			}
+		}
+
+		override fun onSupportActionModeFinished(mode: ActionMode?) {
+			super.onSupportActionModeFinished(mode)
+			if (mode != null) {
+				dispatchSupportActionModeFinished(mode)
+			}
+		}
+	}
+
+	private inner class BottomSheetDialogImpl(context: Context, theme: Int) : BottomSheetDialog(context, theme) {
+
+		override fun onSupportActionModeStarted(mode: ActionMode?) {
+			super.onSupportActionModeStarted(mode)
+			if (mode != null) {
+				dispatchSupportActionModeStarted(mode)
+			}
+		}
+
+		override fun onSupportActionModeFinished(mode: ActionMode?) {
+			super.onSupportActionModeFinished(mode)
+			if (mode != null) {
+				dispatchSupportActionModeFinished(mode)
+			}
+		}
+	}
 }

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

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

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

@@ -10,8 +10,8 @@ import com.google.android.material.imageview.ShapeableImageView
 import org.koitharu.kotatsu.R
 import kotlin.math.roundToInt
 
-private const val ASPECT_RATIO_HEIGHT = 18f
-private const val ASPECT_RATIO_WIDTH = 13f
+private const val ASPECT_RATIO_HEIGHT = 3f
+private const val ASPECT_RATIO_WIDTH = 2f
 
 class CoverImageView @JvmOverloads constructor(
 	context: Context,

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

@@ -0,0 +1,155 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Outline
+import android.graphics.Paint
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import android.view.ViewOutlineProvider
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.LinearLayoutCompat
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.children
+import androidx.core.widget.TextViewCompat
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.resolveDp
+import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
+import org.koitharu.kotatsu.core.util.ext.textAndVisible
+import com.google.android.material.R as materialR
+
+class ProgressButton @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0,
+) : LinearLayoutCompat(context, attrs, defStyleAttr), ValueAnimator.AnimatorUpdateListener {
+
+	private val textViewTitle = TextView(context)
+	private val textViewSubtitle = TextView(context)
+	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+
+	private var progress = 0f
+	private var colorBase = context.getThemeColor(materialR.attr.colorPrimaryContainer)
+	private var colorProgress = context.getThemeColor(materialR.attr.colorPrimary)
+	private var colorText = context.getThemeColor(materialR.attr.colorOnPrimaryContainer)
+	private var progressAnimator: ValueAnimator? = null
+
+	var title: CharSequence?
+		get() = textViewTitle.textAndVisible
+		set(value) {
+			textViewTitle.textAndVisible = value
+		}
+
+	var subtitle: CharSequence?
+		get() = textViewSubtitle.textAndVisible
+		set(value) {
+			textViewSubtitle.textAndVisible = value
+		}
+
+	init {
+		orientation = VERTICAL
+		outlineProvider = OutlineProvider()
+		clipToOutline = true
+
+		context.withStyledAttributes(attrs, R.styleable.ProgressButton, defStyleAttr) {
+			val textAppearanceFallback = androidx.appcompat.R.style.TextAppearance_AppCompat
+			TextViewCompat.setTextAppearance(
+				textViewTitle,
+				getResourceId(R.styleable.ProgressButton_titleTextAppearance, textAppearanceFallback),
+			)
+			TextViewCompat.setTextAppearance(
+				textViewSubtitle,
+				getResourceId(R.styleable.ProgressButton_subtitleTextAppearance, textAppearanceFallback),
+			)
+			textViewTitle.text = getText(R.styleable.ProgressButton_title)
+			textViewSubtitle.text = getText(R.styleable.ProgressButton_subtitle)
+			colorBase = getColor(R.styleable.ProgressButton_baseColor, colorBase)
+			colorProgress = getColor(R.styleable.ProgressButton_progressColor, colorProgress)
+			colorText = getColor(R.styleable.ProgressButton_textColor, colorText)
+			textViewTitle.setTextColor(colorText)
+			textViewSubtitle.setTextColor(colorText)
+			progress = getInt(R.styleable.ProgressButton_android_progress, 0).toFloat() /
+				getInt(R.styleable.ProgressButton_android_max, 100).toFloat()
+		}
+
+		addView(textViewTitle, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
+		addView(
+			textViewSubtitle,
+			LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).also { lp ->
+				lp.topMargin = context.resources.resolveDp(2)
+			},
+		)
+
+		paint.style = Paint.Style.FILL
+		paint.color = colorProgress
+		paint.alpha = 84 // 255 * 0.33F
+		applyGravity()
+		setWillNotDraw(false)
+	}
+
+	override fun onDraw(canvas: Canvas) {
+		super.onDraw(canvas)
+		canvas.drawColor(colorBase)
+		canvas.drawRect(0f, 0f, width * progress, height.toFloat(), paint)
+	}
+
+	override fun setGravity(gravity: Int) {
+		super.setGravity(gravity)
+		if (childCount != 0) {
+			applyGravity()
+		}
+	}
+
+	override fun setEnabled(enabled: Boolean) {
+		super.setEnabled(enabled)
+		children.forEach { it.isEnabled = enabled }
+	}
+
+	override fun onAnimationUpdate(animation: ValueAnimator) {
+		progress = animation.animatedValue as Float
+		invalidate()
+	}
+
+	fun setTitle(@StringRes titleResId: Int) {
+		textViewTitle.setTextAndVisible(titleResId)
+	}
+
+	fun setSubtitle(@StringRes titleResId: Int) {
+		textViewSubtitle.setTextAndVisible(titleResId)
+	}
+
+	fun setProgress(value: Float, animate: Boolean) {
+		progressAnimator?.cancel()
+		if (animate) {
+			progressAnimator = ValueAnimator.ofFloat(progress, value).apply {
+				duration = context.getAnimationDuration(android.R.integer.config_shortAnimTime)
+				interpolator = AccelerateDecelerateInterpolator()
+				addUpdateListener(this@ProgressButton)
+				start()
+			}
+		} else {
+			progressAnimator = null
+			progress = value
+			invalidate()
+		}
+	}
+
+	private fun applyGravity() {
+		val value = (gravity and Gravity.HORIZONTAL_GRAVITY_MASK) or Gravity.CENTER_VERTICAL
+		textViewTitle.gravity = value
+		textViewSubtitle.gravity = value
+	}
+
+	private class OutlineProvider : ViewOutlineProvider() {
+
+		override fun getOutline(view: View, outline: Outline) {
+			outline.setRoundRect(0, 0, view.width, view.height, view.height / 2f)
+		}
+	}
+}

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

@@ -75,7 +75,7 @@ class TipView @JvmOverloads constructor(
 			val shapeAppearanceModel = ShapeAppearanceModel.builder(context, attrs, defStyleAttr, 0).build()
 			background = MaterialShapeDrawable(shapeAppearanceModel).also {
 				it.fillColor = getColorStateList(R.styleable.TipView_cardBackgroundColor)
-					?: context.getThemeColorStateList(R.attr.m3ColorExploreButton)
+					?: context.getThemeColorStateList(com.google.android.material.R.attr.colorSurfaceContainerHigh)
 				it.strokeWidth = getDimension(R.styleable.TipView_strokeWidth, 0f)
 				it.strokeColor = getColorStateList(R.styleable.TipView_strokeColor)
 				it.elevation = getDimension(R.styleable.TipView_elevation, 0f)

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

@@ -33,7 +33,7 @@ object KotatsuColors {
 			val hue = (manga.id.absoluteValue % 360).toFloat()
 			ColorUtils.HSLToColor(floatArrayOf(hue, 0.5f, 0.5f))
 		} else {
-			context.getThemeColor(R.attr.colorSurface)
+			context.getThemeColor(R.attr.colorOutline)
 		}
 		val backgroundColor = context.getThemeColor(R.attr.colorSurfaceContainerHigh)
 		return MaterialColors.harmonize(color, backgroundColor)

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

@@ -14,7 +14,7 @@ import android.content.ContextWrapper
 import android.content.OperationApplicationException
 import android.content.SharedPreferences
 import android.content.SyncResult
-import android.content.pm.PackageManager
+import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.content.pm.ResolveInfo
 import android.database.SQLException
 import android.graphics.Bitmap
@@ -27,13 +27,19 @@ import android.provider.Settings
 import android.view.View
 import android.view.ViewPropertyAnimator
 import android.view.Window
+import android.webkit.WebView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IntegerRes
 import androidx.annotation.WorkerThread
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDialog
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.os.LocaleListCompat
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
 import androidx.work.CoroutineWorker
@@ -135,7 +141,7 @@ fun Window.setNavigationBarTransparentCompat(context: Context, elevation: Float,
 	} else {
 		// Set navbar scrim 70% of navigationBarColor
 		ElevationOverlayProvider(context).compositeOverlayIfNeeded(
-			context.getThemeColor(R.attr.m3ColorBottomMenuBackground, alphaFactor),
+			context.getThemeColor(com.google.android.material.R.attr.colorSurfaceContainer, alphaFactor),
 			elevation,
 		)
 	}
@@ -215,10 +221,26 @@ fun Context.findActivity(): Activity? = when (this) {
 	else -> null
 }
 
-fun Context.checkNotificationPermission(): Boolean = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-	ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
-} else {
-	NotificationManagerCompat.from(this).areNotificationsEnabled()
+fun Fragment.findAppCompatDelegate(): AppCompatDelegate? {
+	((this as? DialogFragment)?.dialog as? AppCompatDialog)?.run {
+		return delegate
+	}
+	return parentFragment?.findAppCompatDelegate() ?: (activity as? AppCompatActivity)?.delegate
+}
+
+fun Context.checkNotificationPermission(channelId: String?): Boolean {
+	val hasPermission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+		ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PERMISSION_GRANTED
+	} else {
+		NotificationManagerCompat.from(this).areNotificationsEnabled()
+	}
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && hasPermission && channelId != null) {
+		val channel = NotificationManagerCompat.from(this).getNotificationChannel(channelId)
+		if (channel != null && channel.importance == NotificationManagerCompat.IMPORTANCE_NONE) {
+			return false
+		}
+	}
+	return hasPermission
 }
 
 @WorkerThread
@@ -235,3 +257,13 @@ fun Context.ensureRamAtLeast(requiredSize: Long) {
 		throw IllegalStateException("Not enough free memory")
 	}
 }
+
+fun WebView.configureForParser(userAgentOverride: String?) = with(settings) {
+	javaScriptEnabled = true
+	domStorageEnabled = true
+	mediaPlaybackRequiresUserGesture = false
+	databaseEnabled = true
+	if (userAgentOverride != null) {
+		userAgentString = userAgentOverride
+	}
+}

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

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

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

@@ -18,6 +18,7 @@ fun calculateTimeAgo(instant: Instant, showMonths: Boolean = false): DateTimeAgo
 			if (instant.until(Instant.now(), ChronoUnit.MINUTES) < 3) DateTimeAgo.JustNow
 			else DateTimeAgo.Today
 		}
+
 		diffDays == 1L -> DateTimeAgo.Yesterday
 		diffDays < 6 -> DateTimeAgo.DaysAgo(diffDays.toInt())
 		else -> {
@@ -30,3 +31,5 @@ fun calculateTimeAgo(instant: Instant, showMonths: Boolean = false): DateTimeAgo
 		}
 	}
 }
+
+fun Long.toInstantOrNull() = if (this == 0L) null else Instant.ofEpochMilli(this)

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

@@ -60,3 +60,25 @@ fun DialogFragment.showDistinct(fm: FragmentManager, tag: String) {
 	}
 	show(fm, tag)
 }
+
+tailrec fun Fragment.dismissParentDialog(): Boolean {
+	return when (val parent = parentFragment) {
+		null -> return false
+		is DialogFragment -> {
+			parent.dismiss()
+			true
+		}
+
+		else -> parent.dismissParentDialog()
+	}
+}
+
+@Suppress("UNCHECKED_CAST")
+tailrec fun <T> Fragment.findParentCallback(cls: Class<T>): T? {
+	val parent = parentFragment
+	return when {
+		parent == null -> cls.castOrNull(activity)
+		cls.isInstance(parent) -> parent as T
+		else -> parent.findParentCallback(cls)
+	}
+}

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

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

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

@@ -2,6 +2,8 @@ package org.koitharu.kotatsu.core.util.ext
 
 inline fun Int.ifZero(defaultValue: () -> Int): Int = if (this == 0) defaultValue() else this
 
+inline fun Long.ifZero(defaultValue: () -> Long): Long = if (this == 0L) defaultValue() else this
+
 fun longOf(a: Int, b: Int): Long {
 	return a.toLong() shl 32 or (b.toLong() and 0xffffffffL)
 }

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

@@ -8,15 +8,17 @@ import coil.network.HttpException
 import okio.FileNotFoundException
 import okio.IOException
 import org.acra.ktx.sendWithAcra
-import org.json.JSONException
 import org.jsoup.HttpStatusException
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.BadBackupFormatException
 import org.koitharu.kotatsu.core.exceptions.CaughtException
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
+import org.koitharu.kotatsu.core.exceptions.NoDataReceivedException
 import org.koitharu.kotatsu.core.exceptions.SyncApiException
 import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
+import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
 import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
 import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_BOTH_LOCALE_GENRES_NOT_SUPPORTED
 import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_BOTH_STATES_GENRES_NOT_SUPPORTED
@@ -42,6 +44,7 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 
 	is TooManyRequestExceptions -> resources.getString(R.string.too_many_requests_message)
 	is UnsupportedFileException -> resources.getString(R.string.text_file_not_supported)
+	is BadBackupFormatException -> resources.getString(R.string.unsupported_backup_message)
 	is FileNotFoundException -> resources.getString(R.string.file_not_found)
 	is AccessDeniedException -> resources.getString(R.string.no_access_to_file)
 	is EmptyHistoryException -> resources.getString(R.string.history_is_empty)
@@ -54,8 +57,11 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is SocketTimeoutException,
 	-> resources.getString(R.string.network_error)
 
+	is NoDataReceivedException -> resources.getString(R.string.error_no_data_received)
+
 	is WrongPasswordException -> resources.getString(R.string.wrong_password)
 	is NotFoundException -> resources.getString(R.string.not_found_404)
+	is UnsupportedSourceException -> resources.getString(R.string.unsupported_source)
 
 	is HttpException -> getHttpDisplayMessage(response.code, resources)
 	is HttpStatusException -> getHttpDisplayMessage(statusCode, resources)
@@ -98,19 +104,22 @@ fun Throwable.isReportable(): Boolean {
 	return this is Error || this.javaClass in reportableExceptions
 }
 
+fun Throwable.isNetworkError(): Boolean {
+	return this is UnknownHostException || this is SocketTimeoutException
+}
+
 fun Throwable.report() {
 	val exception = CaughtException(this, "${javaClass.simpleName}($message)")
 	exception.sendWithAcra()
 }
 
 private val reportableExceptions = arraySetOf<Class<*>>(
-	ParseException::class.java,
-	JSONException::class.java,
 	RuntimeException::class.java,
 	IllegalStateException::class.java,
 	IllegalArgumentException::class.java,
 	ConcurrentModificationException::class.java,
 	UnsupportedOperationException::class.java,
+	NoDataReceivedException::class.java,
 )
 
 fun Throwable.isWebViewUnavailable(): Boolean {

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

@@ -19,4 +19,11 @@ data class ReadingTime(
 			resources.getQuantityString(R.plurals.minutes, minutes, minutes),
 		)
 	}
+
+	fun formatShort(resources: Resources): String? = when {
+		hours == 0 && minutes == 0 -> null
+		hours == 0 -> resources.getString(R.string.minutes_short, minutes)
+		minutes == 0 -> resources.getString(R.string.hours_short, hours)
+		else -> resources.getString(R.string.hours_minutes_short, hours, minutes)
+	}
 }

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

@@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.details.data.MangaDetails
@@ -35,6 +36,10 @@ class DetailsInteractor @Inject constructor(
 			.map { it.isNotEmpty() }
 	}
 
+	fun observeFavourite(mangaId: Long): Flow<Set<FavouriteCategory>> {
+		return favouritesRepository.observeCategories(mangaId)
+	}
+
 	fun observeNewChapters(mangaId: Long): Flow<Int> {
 		return settings.observeAsFlow(AppSettings.KEY_TRACKER_ENABLED) { isTrackerEnabled }
 			.flatMapLatest { isEnabled ->

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

@@ -54,7 +54,8 @@ class DetailsLoadUseCase @Inject constructor(
 		} catch (e: IOException) {
 			local?.await()?.manga?.also { localManga ->
 				send(MangaDetails(localManga, null, localManga.description?.parseAsHtml(withImages = false), true))
-			} ?: throw e
+			}
+			throw e
 		}
 	}
 

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

@@ -0,0 +1,126 @@
+package org.koitharu.kotatsu.details.ui
+
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.MenuProvider
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.slider.LabelFormatter
+import com.google.android.material.slider.Slider
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
+import org.koitharu.kotatsu.core.util.ext.setValueRounded
+import org.koitharu.kotatsu.core.util.progress.IntPercentLabelFormatter
+import org.koitharu.kotatsu.details.ui.pager.ChaptersPagesSheet.Companion.TAB_CHAPTERS
+import org.koitharu.kotatsu.details.ui.pager.ChaptersPagesSheet.Companion.TAB_PAGES
+import java.lang.ref.WeakReference
+
+class ChapterPagesMenuProvider(
+	private val viewModel: DetailsViewModel,
+	private val sheet: BaseAdaptiveSheet<*>,
+	private val pager: ViewPager2,
+	private val settings: AppSettings,
+) : OnBackPressedCallback(false), MenuProvider, SearchView.OnQueryTextListener, MenuItem.OnActionExpandListener,
+	Slider.OnChangeListener {
+
+	private var expandedItemRef: WeakReference<MenuItem>? = null
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		val tab = getCurrentTab()
+		when (tab) {
+			TAB_CHAPTERS -> {
+				menuInflater.inflate(R.menu.opt_chapters, menu)
+				menu.findItem(R.id.action_search)?.run {
+					setOnActionExpandListener(this@ChapterPagesMenuProvider)
+					(actionView as? SearchView)?.setupChaptersSearchView()
+				}
+				menu.findItem(R.id.action_search)?.isVisible = viewModel.isChaptersEmpty.value == false
+				menu.findItem(R.id.action_reversed)?.isChecked = viewModel.isChaptersReversed.value == true
+				menu.findItem(R.id.action_grid_view)?.isChecked = viewModel.isChaptersInGridView.value == true
+			}
+
+			TAB_PAGES -> {
+				menuInflater.inflate(R.menu.opt_pages, menu)
+				menu.findItem(R.id.action_grid_size)?.run {
+					setOnActionExpandListener(this@ChapterPagesMenuProvider)
+					(actionView as? Slider)?.setupPagesSizeSlider()
+				}
+			}
+		}
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+		R.id.action_reversed -> {
+			viewModel.setChaptersReversed(!menuItem.isChecked)
+			true
+		}
+
+		R.id.action_grid_view -> {
+			viewModel.setChaptersInGridView(!menuItem.isChecked)
+			true
+		}
+
+		else -> false
+	}
+
+	override fun handleOnBackPressed() {
+		expandedItemRef?.get()?.collapseActionView()
+	}
+
+	override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+		expandedItemRef = WeakReference(item)
+		sheet.expandAndLock()
+		isEnabled = true
+		return true
+	}
+
+	override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+		expandedItemRef = null
+		isEnabled = false
+		(item.actionView as? SearchView)?.setQuery("", false)
+		viewModel.performChapterSearch(null)
+		sheet.unlock()
+		return true
+	}
+
+	override fun onQueryTextSubmit(query: String?): Boolean = false
+
+	override fun onQueryTextChange(newText: String?): Boolean {
+		viewModel.performChapterSearch(newText)
+		return true
+	}
+
+	override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
+		if (fromUser) {
+			settings.gridSizePages = value.toInt()
+		}
+	}
+
+	private fun SearchView.setupChaptersSearchView() {
+		setOnQueryTextListener(this@ChapterPagesMenuProvider)
+		setIconifiedByDefault(false)
+		queryHint = context.getString(R.string.search_chapters)
+	}
+
+	private fun Slider.setupPagesSizeSlider() {
+		valueFrom = 50f
+		valueTo = 150f
+		stepSize = 5f
+		isTickVisible = false
+		labelBehavior = LabelFormatter.LABEL_FLOATING
+		setLabelFormatter(IntPercentLabelFormatter(context))
+		setValueRounded(settings.gridSizePages.toFloat())
+		addOnChangeListener(this@ChapterPagesMenuProvider)
+	}
+
+	private fun getCurrentTab(): Int {
+		var page = pager.currentItem
+		if (page > 0 && pager.adapter?.itemCount == 2) { // no Pages page
+			page++ // shift
+		}
+		return page
+	}
+}

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

@@ -16,6 +16,7 @@ fun MangaDetails.mapChapters(
 	newCount: Int,
 	branch: String?,
 	bookmarks: List<Bookmark>,
+	isGrid: Boolean,
 ): List<ChapterListItem> {
 	val remoteChapters = chapters[branch].orEmpty()
 	val localChapters = local?.manga?.getChapters(branch).orEmpty()
@@ -47,6 +48,7 @@ fun MangaDetails.mapChapters(
 			isNew = isUnread && result.size >= newFrom,
 			isDownloaded = local != null,
 			isBookmarked = chapter.id in bookmarked,
+			isGrid = isGrid,
 		)
 	}
 	if (!localMap.isNullOrEmpty()) {
@@ -60,6 +62,7 @@ fun MangaDetails.mapChapters(
 				isNew = false,
 				isDownloaded = !isLocal,
 				isBookmarked = chapter.id in bookmarked,
+				isGrid = isGrid,
 			)
 		}
 	}

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

@@ -29,6 +29,7 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
+import androidx.preference.PreferenceManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayoutMediator
@@ -36,7 +37,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.parser.MangaIntent
@@ -125,19 +125,7 @@ class DetailsActivity :
 		viewModel.manga.filterNotNull().observe(this, ::onMangaUpdated)
 		viewModel.onMangaRemoved.observeEvent(this, ::onMangaRemoved)
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
-		viewModel.onError.observeEvent(
-			this,
-			SnackbarErrorObserver(
-				host = viewBinding.containerDetails,
-				fragment = null,
-				resolver = exceptionResolver,
-				onResolved = { isResolved ->
-					if (isResolved) {
-						viewModel.reload()
-					}
-				},
-			),
-		)
+		viewModel.onError.observeEvent(this, DetailsErrorObserver(this, viewModel, exceptionResolver))
 		viewModel.onActionDone.observeEvent(
 			this,
 			ReversibleActionObserver(viewBinding.containerDetails, viewBinding.layoutBottom),
@@ -389,12 +377,13 @@ class DetailsActivity :
 	}
 
 	private fun initPager() {
-		val adapter = DetailsPagerAdapter(this)
+		val adapter = DetailsPagerAdapter(this, settings)
 		viewBinding.pager.recyclerView?.isNestedScrollingEnabled = false
 		viewBinding.pager.offscreenPageLimit = 1
 		viewBinding.pager.adapter = adapter
 		TabLayoutMediator(viewBinding.tabs, viewBinding.pager, adapter).attach()
 		viewBinding.pager.setCurrentItem(settings.defaultDetailsTab, false)
+		viewBinding.tabs.isVisible = adapter.itemCount > 1
 	}
 
 	private fun showBottomSheet(isVisible: Boolean) {
@@ -434,15 +423,25 @@ class DetailsActivity :
 	companion object {
 
 		const val TIP_BUTTON = "btn_read"
+		private const val KEY_NEW_ACTIVITY = "new_details_screen"
 
 		fun newIntent(context: Context, manga: Manga): Intent {
-			return Intent(context, DetailsActivity::class.java)
+			return getActivityIntent(context)
 				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
 		}
 
 		fun newIntent(context: Context, mangaId: Long): Intent {
-			return Intent(context, DetailsActivity::class.java)
+			return getActivityIntent(context)
 				.putExtra(MangaIntent.KEY_ID, mangaId)
 		}
+
+		private fun getActivityIntent(context: Context): Intent {
+			val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+			val useNewActivity = prefs.getBoolean(KEY_NEW_ACTIVITY, false)
+			return Intent(
+				context,
+				if (useNewActivity) DetailsActivity2::class.java else DetailsActivity::class.java,
+			)
+		}
 	}
 }

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

@@ -0,0 +1,703 @@
+package org.koitharu.kotatsu.details.ui
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.text.style.DynamicDrawableSpan
+import android.text.style.ForegroundColorSpan
+import android.text.style.ImageSpan
+import android.text.style.RelativeSizeSpan
+import android.transition.TransitionManager
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewTreeObserver
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.appcompat.widget.PopupMenu
+import androidx.core.graphics.Insets
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
+import androidx.core.text.method.LinkMovementMethodCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.request.SuccessResult
+import coil.transform.CircleCropTransformation
+import coil.util.CoilUtils
+import com.google.android.material.chip.Chip
+import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.filterNotNull
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.model.iconResId
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.model.titleResId
+import org.koitharu.kotatsu.core.os.AppShortcutManager
+import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.parser.favicon.faviconUri
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
+import org.koitharu.kotatsu.core.ui.image.ChipIconTarget
+import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
+import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
+import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.util.FileSize
+import org.koitharu.kotatsu.core.util.ViewBadge
+import org.koitharu.kotatsu.core.util.ext.crossfade
+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
+import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.parentView
+import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
+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.ActivityDetailsNewBinding
+import org.koitharu.kotatsu.details.data.MangaDetails
+import org.koitharu.kotatsu.details.data.ReadingTime
+import org.koitharu.kotatsu.details.service.MangaPrefetchService
+import org.koitharu.kotatsu.details.ui.model.ChapterListItem
+import org.koitharu.kotatsu.details.ui.model.HistoryInfo
+import org.koitharu.kotatsu.details.ui.pager.ChaptersPagesSheet
+import org.koitharu.kotatsu.details.ui.related.RelatedMangaActivity
+import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingItemDecoration
+import org.koitharu.kotatsu.details.ui.scrobbling.ScrollingInfoAdapter
+import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteSheet
+import org.koitharu.kotatsu.image.ui.ImageActivity
+import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.MangaItemModel
+import org.koitharu.kotatsu.list.ui.size.StaticItemSizeResolver
+import org.koitharu.kotatsu.local.ui.info.LocalInfoDialog
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.ellipsize
+import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
+import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
+import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
+import org.koitharu.kotatsu.search.ui.MangaListActivity
+import org.koitharu.kotatsu.search.ui.SearchActivity
+import org.koitharu.kotatsu.stats.ui.sheet.MangaStatsSheet
+import javax.inject.Inject
+import com.google.android.material.R as materialR
+
+@AndroidEntryPoint
+class DetailsActivity2 :
+	BaseActivity<ActivityDetailsNewBinding>(),
+	View.OnClickListener,
+	View.OnLongClickListener, PopupMenu.OnMenuItemClickListener, View.OnLayoutChangeListener,
+	ViewTreeObserver.OnDrawListener, ChipsView.OnChipClickListener, OnListItemClickListener<Bookmark> {
+
+	@Inject
+	lateinit var shortcutManager: AppShortcutManager
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	@Inject
+	lateinit var tagHighlighter: ListExtraProvider
+
+	private val viewModel: DetailsViewModel by viewModels()
+
+	var bottomSheetMediator: ChaptersBottomSheetMediator? = null
+		private set
+
+	private lateinit var chaptersBadge: ViewBadge
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityDetailsNewBinding.inflate(layoutInflater))
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setDisplayShowTitleEnabled(false)
+		}
+		viewBinding.buttonRead.setOnClickListener(this)
+		viewBinding.buttonRead.setOnLongClickListener(this)
+		viewBinding.buttonRead.setOnContextClickListenerCompat(this)
+		viewBinding.buttonChapters.setOnClickListener(this)
+		viewBinding.infoLayout.chipBranch.setOnClickListener(this)
+		viewBinding.infoLayout.chipSize.setOnClickListener(this)
+		viewBinding.infoLayout.chipSource.setOnClickListener(this)
+		viewBinding.infoLayout.chipFavorite.setOnClickListener(this)
+		viewBinding.infoLayout.chipAuthor.setOnClickListener(this)
+		viewBinding.infoLayout.chipTime.setOnClickListener(this)
+		viewBinding.imageViewCover.setOnClickListener(this)
+		viewBinding.buttonDescriptionMore.setOnClickListener(this)
+		viewBinding.buttonScrobblingMore.setOnClickListener(this)
+		viewBinding.buttonRelatedMore.setOnClickListener(this)
+		viewBinding.infoLayout.chipSource.setOnClickListener(this)
+		viewBinding.infoLayout.chipSize.setOnClickListener(this)
+		viewBinding.textViewDescription.addOnLayoutChangeListener(this)
+		viewBinding.textViewDescription.viewTreeObserver.addOnDrawListener(this)
+		viewBinding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
+		viewBinding.chipsTags.onChipClickListener = this
+		viewBinding.recyclerViewRelated.addItemDecoration(
+			SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)),
+		)
+		TitleScrollCoordinator(viewBinding.textViewTitle).attach(viewBinding.scrollView)
+
+		chaptersBadge = ViewBadge(viewBinding.buttonChapters, this)
+
+		viewModel.details.filterNotNull().observe(this, ::onMangaUpdated)
+		viewModel.onMangaRemoved.observeEvent(this, ::onMangaRemoved)
+		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
+		viewModel.onError.observeEvent(
+			this,
+			SnackbarErrorObserver(viewBinding.scrollView, null, exceptionResolver) {
+				if (it) viewModel.reload()
+			},
+		)
+		viewModel.onActionDone.observeEvent(this, ReversibleActionObserver(viewBinding.scrollView, null))
+		viewModel.historyInfo.observe(this, ::onHistoryChanged)
+		viewModel.isLoading.observe(this, ::onLoadingStateChanged)
+		viewModel.scrobblingInfo.observe(this, ::onScrobblingInfoChanged)
+		viewModel.localSize.observe(this, ::onLocalSizeChanged)
+		viewModel.relatedManga.observe(this, ::onRelatedMangaChanged)
+		// viewModel.chapters.observe(this, ::onChaptersChanged)
+		viewModel.readingTime.observe(this, ::onReadingTimeChanged)
+		viewModel.selectedBranch.observe(this) {
+			viewBinding.infoLayout.chipBranch.text = it.ifNullOrEmpty { getString(R.string.system_default) }
+		}
+		viewModel.favouriteCategories.observe(this, ::onFavoritesChanged)
+		val menuInvalidator = MenuInvalidator(this)
+		viewModel.isStatsAvailable.observe(this, menuInvalidator)
+		viewModel.remoteManga.observe(this, menuInvalidator)
+		viewModel.branches.observe(this) {
+			viewBinding.infoLayout.chipBranch.isVisible = it.size > 1
+		}
+		viewModel.chapters.observe(this, PrefetchObserver(this))
+		viewModel.onDownloadStarted.observeEvent(
+			this,
+			DownloadStartedObserver(viewBinding.scrollView),
+		)
+
+		addMenuProvider(
+			DetailsMenuProvider(
+				activity = this,
+				viewModel = viewModel,
+				snackbarHost = viewBinding.scrollView,
+				appShortcutManager = shortcutManager,
+			),
+		)
+	}
+
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_read -> openReader(isIncognitoMode = false)
+			R.id.chip_branch -> showBranchPopupMenu(v)
+			R.id.button_chapters -> {
+				ChaptersPagesSheet.show(supportFragmentManager)
+			}
+
+			R.id.chip_author -> {
+				val manga = viewModel.manga.value ?: return
+				startActivity(
+					SearchActivity.newIntent(
+						context = v.context,
+						source = manga.source,
+						query = manga.author ?: return,
+					),
+				)
+			}
+
+			R.id.chip_source -> {
+				val manga = viewModel.manga.value ?: return
+				startActivity(
+					MangaListActivity.newIntent(
+						context = v.context,
+						source = manga.source,
+					),
+				)
+			}
+
+			R.id.chip_size -> {
+				val manga = viewModel.manga.value ?: return
+				LocalInfoDialog.show(supportFragmentManager, manga)
+			}
+
+			R.id.chip_favorite -> {
+				val manga = viewModel.manga.value ?: return
+				FavoriteSheet.show(supportFragmentManager, manga)
+			}
+
+			R.id.chip_time -> {
+				if (viewModel.isStatsAvailable.value) {
+					val manga = viewModel.manga.value ?: return
+					MangaStatsSheet.show(supportFragmentManager, manga)
+				} else {
+					// TODO
+				}
+			}
+
+			R.id.imageView_cover -> {
+				val manga = viewModel.manga.value ?: return
+				startActivity(
+					ImageActivity.newIntent(
+						v.context,
+						manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl },
+						manga.source,
+					),
+					scaleUpActivityOptionsOf(v),
+				)
+			}
+
+			R.id.button_description_more -> {
+				val tv = viewBinding.textViewDescription
+				TransitionManager.beginDelayedTransition(tv.parentView)
+				if (tv.maxLines in 1 until Integer.MAX_VALUE) {
+					tv.maxLines = Integer.MAX_VALUE
+				} else {
+					tv.maxLines = resources.getInteger(R.integer.details_description_lines)
+				}
+			}
+
+			R.id.button_scrobbling_more -> {
+				val manga = viewModel.manga.value ?: return
+				ScrobblingSelectorSheet.show(supportFragmentManager, manga, null)
+			}
+
+			R.id.button_related_more -> {
+				val manga = viewModel.manga.value ?: return
+				startActivity(RelatedMangaActivity.newIntent(v.context, manga))
+			}
+		}
+	}
+
+	override fun onChipClick(chip: Chip, data: Any?) {
+		val tag = data as? MangaTag ?: return
+		startActivity(MangaListActivity.newIntent(this, setOf(tag)))
+	}
+
+	override fun onLongClick(v: View): Boolean = when (v.id) {
+		R.id.button_read -> {
+			val menu = PopupMenu(v.context, v)
+			menu.inflate(R.menu.popup_read)
+			menu.menu.findItem(R.id.action_forget)?.isVisible = viewModel.historyInfo.value.run {
+				!isIncognitoMode && history != null
+			}
+			menu.setOnMenuItemClickListener(this)
+			menu.setForceShowIcon(true)
+			menu.show()
+			true
+		}
+
+		else -> false
+	}
+
+	override fun onMenuItemClick(item: MenuItem): Boolean {
+		return when (item.itemId) {
+			R.id.action_incognito -> {
+				openReader(isIncognitoMode = true)
+				true
+			}
+
+			R.id.action_forget -> {
+				viewModel.removeFromHistory()
+				true
+			}
+
+			else -> false
+		}
+	}
+
+	override fun onItemClick(item: Bookmark, view: View) {
+		startActivity(
+			IntentBuilder(view.context).bookmark(item).incognito(true).build(),
+		)
+		Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
+	}
+
+	override fun onDraw() {
+		viewBinding.run {
+			buttonDescriptionMore.isVisible = textViewDescription.maxLines == Int.MAX_VALUE ||
+				textViewDescription.isTextTruncated
+		}
+	}
+
+	override fun onLayoutChange(
+		v: View?,
+		left: Int,
+		top: Int,
+		right: Int,
+		bottom: Int,
+		oldLeft: Int,
+		oldTop: Int,
+		oldRight: Int,
+		oldBottom: Int
+	) {
+		with(viewBinding) {
+			buttonDescriptionMore.isVisible = textViewDescription.isTextTruncated
+		}
+	}
+
+	private fun onChaptersChanged(chapters: List<ChapterListItem>?) {
+		// TODO
+	}
+
+	private fun onFavoritesChanged(categories: Set<FavouriteCategory>) {
+		val chip = viewBinding.infoLayout.chipFavorite
+		chip.setChipIconResource(if (categories.isEmpty()) R.drawable.ic_heart_outline else R.drawable.ic_heart)
+		chip.text = if (categories.isEmpty()) {
+			getString(R.string.add_to_favourites)
+		} else {
+			if (categories.size == 1) {
+				categories.first().title.ellipsize(FAV_LABEL_LIMIT)
+			}
+			buildString(FAV_LABEL_LIMIT + 6) {
+				for ((i, cat) in categories.withIndex()) {
+					if (i == 0) {
+						append(cat.title.ellipsize(FAV_LABEL_LIMIT - 4))
+					} else if (length + cat.title.length > FAV_LABEL_LIMIT) {
+						append(", ")
+						append(getString(R.string.list_ellipsize_pattern, categories.size - i))
+						break
+					} else {
+						append(", ")
+						append(cat.title)
+					}
+				}
+			}
+		}
+	}
+
+	private fun onReadingTimeChanged(time: ReadingTime?) {
+		val chip = viewBinding.infoLayout.chipTime
+		chip.textAndVisible = time?.formatShort(chip.resources)
+	}
+
+	private fun onDescriptionChanged(description: CharSequence?) {
+		val tv = viewBinding.textViewDescription
+		if (description.isNullOrBlank()) {
+			tv.setText(R.string.no_description)
+		} else {
+			tv.text = description
+		}
+	}
+
+	private fun onLocalSizeChanged(size: Long) {
+		val chip = viewBinding.infoLayout.chipSize
+		if (size == 0L) {
+			chip.isVisible = false
+		} else {
+			chip.text = FileSize.BYTES.format(chip.context, size)
+			chip.isVisible = true
+		}
+	}
+
+	private fun onRelatedMangaChanged(related: List<MangaItemModel>) {
+		if (related.isEmpty()) {
+			viewBinding.groupRelated.isVisible = false
+			return
+		}
+		val rv = viewBinding.recyclerViewRelated
+
+		@Suppress("UNCHECKED_CAST")
+		val adapter = (rv.adapter as? BaseListAdapter<ListModel>) ?: BaseListAdapter<ListModel>()
+			.addDelegate(
+				ListItemType.MANGA_GRID,
+				mangaGridItemAD(
+					coil, this,
+					StaticItemSizeResolver(resources.getDimensionPixelSize(R.dimen.smaller_grid_width)),
+				) { item, view ->
+					startActivity(DetailsActivity.newIntent(view.context, item))
+				},
+			).also { rv.adapter = it }
+		adapter.items = related
+		viewBinding.groupRelated.isVisible = true
+	}
+
+	private fun onLoadingStateChanged(isLoading: Boolean) {
+		val button = viewBinding.buttonChapters
+		if (isLoading) {
+			button.setImageDrawable(
+				CircularProgressDrawable(this).also {
+					it.setStyle(CircularProgressDrawable.LARGE)
+					it.setColorSchemeColors(getThemeColor(materialR.attr.colorControlNormal))
+					it.start()
+				},
+			)
+		} else {
+			button.setImageResource(R.drawable.ic_list_sheet)
+		}
+	}
+
+	private fun onScrobblingInfoChanged(scrobblings: List<ScrobblingInfo>) {
+		var adapter = viewBinding.recyclerViewScrobbling.adapter as? ScrollingInfoAdapter
+		viewBinding.groupScrobbling.isGone = scrobblings.isEmpty()
+		if (adapter != null) {
+			adapter.items = scrobblings
+		} else {
+			adapter = ScrollingInfoAdapter(this, coil, supportFragmentManager)
+			adapter.items = scrobblings
+			viewBinding.recyclerViewScrobbling.adapter = adapter
+			viewBinding.recyclerViewScrobbling.addItemDecoration(ScrobblingItemDecoration())
+		}
+	}
+
+	private fun onMangaUpdated(details: MangaDetails) {
+		with(viewBinding) {
+			val manga = details.toManga()
+			val hasChapters = !manga.chapters.isNullOrEmpty()
+			// Main
+			loadCover(manga)
+			textViewTitle.text = manga.title
+			textViewSubtitle.textAndVisible = manga.altTitle
+			infoLayout.chipAuthor.textAndVisible = manga.author
+			if (manga.hasRating) {
+				ratingBar.rating = manga.rating * ratingBar.numStars
+				ratingBar.isVisible = true
+			} else {
+				ratingBar.isVisible = false
+			}
+
+			manga.state?.let { state ->
+				textViewState.textAndVisible = resources.getString(state.titleResId)
+				imageViewState.setImageResource(state.iconResId)
+			} ?: run {
+				textViewState.isVisible = false
+				imageViewState.isVisible = false
+			}
+
+			if (manga.source == MangaSource.LOCAL || manga.source == MangaSource.DUMMY) {
+				infoLayout.chipSource.isVisible = false
+			} else {
+				infoLayout.chipSource.text = manga.source.title
+				infoLayout.chipSource.isVisible = true
+			}
+
+			textViewNsfw.isVisible = manga.isNsfw
+
+			// Chips
+			bindTags(manga)
+
+			textViewDescription.text = details.description.ifNullOrEmpty { getString(R.string.no_description) }
+
+			viewBinding.infoLayout.chipSource.also { chip ->
+				ImageRequest.Builder(this@DetailsActivity2)
+					.data(manga.source.faviconUri())
+					.lifecycle(this@DetailsActivity2)
+					.crossfade(false)
+					.size(resources.getDimensionPixelSize(materialR.dimen.m3_chip_icon_size))
+					.target(ChipIconTarget(chip))
+					.placeholder(R.drawable.ic_web)
+					.fallback(R.drawable.ic_web)
+					.error(R.drawable.ic_web)
+					.source(manga.source)
+					.transformations(CircleCropTransformation())
+					.allowRgb565(true)
+					.enqueueWith(coil)
+			}
+
+			buttonChapters.isEnabled = hasChapters
+			title = manga.title
+			buttonRead.isEnabled = hasChapters
+			invalidateOptionsMenu()
+		}
+	}
+
+	private fun onMangaRemoved(manga: Manga) {
+		Toast.makeText(
+			this,
+			getString(R.string._s_deleted_from_local_storage, manga.title),
+			Toast.LENGTH_SHORT,
+		).show()
+		finishAfterTransition()
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom
+		)
+	}
+
+	private fun onHistoryChanged(info: HistoryInfo) {
+		with(viewBinding.buttonRead) {
+			if (info.history != null) {
+				setTitle(R.string._continue)
+			} else {
+				setTitle(R.string.read)
+			}
+		}
+		viewBinding.buttonRead.subtitle = when {
+			!info.isValid -> getString(R.string.loading_)
+			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,
+			)
+		}
+		viewBinding.buttonRead.setProgress(info.history?.percent?.coerceIn(0f, 1f) ?: 0f, true)
+	}
+
+	private fun onNewChaptersChanged(count: Int) {
+		chaptersBadge.counter = count
+	}
+
+	private fun showBranchPopupMenu(v: View) {
+		val menu = PopupMenu(v.context, v)
+		val branches = viewModel.branches.value
+		for ((i, branch) in branches.withIndex()) {
+			val title = buildSpannedString {
+				if (branch.isCurrent) {
+					inSpans(
+						ImageSpan(
+							this@DetailsActivity2,
+							R.drawable.ic_current_chapter,
+							DynamicDrawableSpan.ALIGN_BASELINE,
+						),
+					) {
+						append(' ')
+					}
+					append(' ')
+				}
+				append(branch.name ?: getString(R.string.system_default))
+				append(' ')
+				append(' ')
+				inSpans(
+					ForegroundColorSpan(
+						v.context.getThemeColor(
+							android.R.attr.textColorSecondary,
+							Color.LTGRAY,
+						),
+					),
+					RelativeSizeSpan(0.74f),
+				) {
+					append(branch.count.toString())
+				}
+			}
+			val item = menu.menu.add(R.id.group_branches, Menu.NONE, i, title)
+			item.isCheckable = true
+			item.isChecked = branch.isSelected
+		}
+		menu.menu.setGroupCheckable(R.id.group_branches, true, true)
+		menu.setOnMenuItemClickListener {
+			viewModel.setSelectedBranch(branches.getOrNull(it.order)?.name)
+			true
+		}
+		menu.show()
+	}
+
+	private fun openReader(isIncognitoMode: Boolean) {
+		val manga = viewModel.manga.value ?: return
+		val chapterId = viewModel.historyInfo.value.history?.chapterId
+		if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
+			Snackbar.make(viewBinding.scrollView, R.string.chapter_is_missing, Snackbar.LENGTH_SHORT)
+				.show()
+		} else {
+			startActivity(
+				IntentBuilder(this)
+					.manga(manga)
+					.branch(viewModel.selectedBranchValue)
+					.incognito(isIncognitoMode)
+					.build(),
+			)
+			if (isIncognitoMode) {
+				Toast.makeText(this, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
+			}
+		}
+	}
+
+	private fun bindTags(manga: Manga) {
+		viewBinding.chipsTags.isVisible = manga.tags.isNotEmpty()
+		viewBinding.chipsTags.setChips(
+			manga.tags.map { tag ->
+				ChipsView.ChipModel(
+					title = tag.title,
+					tint = tagHighlighter.getTagTint(tag),
+					icon = 0,
+					data = tag,
+					isCheckable = false,
+					isChecked = false,
+				)
+			},
+		)
+	}
+
+	private fun loadCover(manga: Manga) {
+		val imageUrl = manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }
+		val lastResult = CoilUtils.result(viewBinding.imageViewCover)
+		if (lastResult is SuccessResult && lastResult.request.data == imageUrl) {
+			return
+		}
+		val request = ImageRequest.Builder(this)
+			.target(viewBinding.imageViewCover)
+			.size(CoverSizeResolver(viewBinding.imageViewCover))
+			.data(imageUrl)
+			.tag(manga.source)
+			.crossfade(this)
+			.lifecycle(this)
+			.placeholderMemoryCacheKey(manga.coverUrl)
+		val previousDrawable = lastResult?.drawable
+		if (previousDrawable != null) {
+			request.fallback(previousDrawable)
+				.placeholder(previousDrawable)
+				.error(previousDrawable)
+		} else {
+			request.fallback(R.drawable.ic_placeholder)
+				.placeholder(R.drawable.ic_placeholder)
+				.error(R.drawable.ic_error_placeholder)
+		}
+		request.enqueueWith(coil)
+	}
+
+	private class PrefetchObserver(
+		private val context: Context,
+	) : FlowCollector<List<ChapterListItem>?> {
+
+		private var isCalled = false
+
+		override suspend fun emit(value: List<ChapterListItem>?) {
+			if (value.isNullOrEmpty()) {
+				return
+			}
+			if (!isCalled) {
+				isCalled = true
+				val item = value.find { it.isCurrent } ?: value.first()
+				MangaPrefetchService.prefetchPages(context, item.chapter)
+			}
+		}
+	}
+
+	companion object {
+
+		private const val FAV_LABEL_LIMIT = 10
+
+		fun newIntent(context: Context, manga: Manga): Intent {
+			return Intent(context, DetailsActivity2::class.java)
+				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
+		}
+
+		fun newIntent(context: Context, mangaId: Long): Intent {
+			return Intent(context, DetailsActivity2::class.java)
+				.putExtra(MangaIntent.KEY_ID, mangaId)
+		}
+	}
+}

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

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

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

@@ -189,7 +189,7 @@ class DetailsFragment :
 					isVisible = false
 				}
 			}
-			if (manga.source == MangaSource.LOCAL) {
+			if (manga.source == MangaSource.LOCAL || manga.source == MangaSource.DUMMY) {
 				infoLayout.textViewSource.isVisible = false
 			} else {
 				infoLayout.textViewSource.text = manga.source.title
@@ -223,7 +223,7 @@ class DetailsFragment :
 		}
 		binding.approximateReadTime.text = time.format(resources)
 		binding.approximateReadTimeTitle.setText(
-			if (time.isContinue) R.string.approximate_remaining_time else R.string.approximate_reading_time
+			if (time.isContinue) R.string.approximate_remaining_time else R.string.approximate_reading_time,
 		)
 		binding.approximateReadTimeLayout.isVisible = true
 	}

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

@@ -35,6 +35,7 @@ class DetailsMenuProvider(
 
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
 		menuInflater.inflate(R.menu.opt_details, menu)
+		menu.findItem(R.id.action_favourite).isVisible = activity is DetailsActivity
 	}
 
 	override fun onPrepareMenu(menu: Menu) {
@@ -48,7 +49,7 @@ class DetailsMenuProvider(
 		menu.findItem(R.id.action_online).isVisible = viewModel.remoteManga.value != null
 		menu.findItem(R.id.action_stats).isVisible = viewModel.isStatsAvailable.value
 		menu.findItem(R.id.action_favourite).setIcon(
-			if (viewModel.favouriteCategories.value) R.drawable.ic_heart else R.drawable.ic_heart_outline,
+			if (viewModel.favouriteCategories.value.isNotEmpty()) R.drawable.ic_heart else R.drawable.ic_heart_outline,
 		)
 	}
 
@@ -89,7 +90,7 @@ class DetailsMenuProvider(
 
 			R.id.action_browser -> {
 				viewModel.manga.value?.let {
-					activity.startActivity(BrowserActivity.newIntent(activity, it.publicUrl, it.title))
+					activity.startActivity(BrowserActivity.newIntent(activity, it.publicUrl, it.source, it.title))
 				}
 			}
 

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

@@ -36,6 +36,7 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
+import org.koitharu.kotatsu.core.util.ext.combine
 import org.koitharu.kotatsu.core.util.ext.computeSize
 import org.koitharu.kotatsu.core.util.ext.onEachWhile
 import org.koitharu.kotatsu.core.util.ext.requireValue
@@ -100,8 +101,8 @@ class DetailsViewModel @Inject constructor(
 	val history = historyRepository.observeOne(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
-	val favouriteCategories = interactor.observeIsFavourite(mangaId)
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+	val favouriteCategories = interactor.observeFavourite(mangaId)
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptySet())
 
 	val isStatsAvailable = statsRepository.observeHasStats(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
@@ -122,13 +123,13 @@ class DetailsViewModel @Inject constructor(
 	val isChaptersReversed = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.Default,
 		key = AppSettings.KEY_REVERSE_CHAPTERS,
-		valueProducer = { chaptersReverse },
+		valueProducer = { isChaptersReverse },
 	)
 
 	val isChaptersInGridView = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.Default,
 		key = AppSettings.KEY_GRID_VIEW_CHAPTERS,
-		valueProducer = { chaptersGridView },
+		valueProducer = { isChaptersGridView },
 	)
 
 	val historyInfo: StateFlow<HistoryInfo> = combine(
@@ -213,12 +214,14 @@ class DetailsViewModel @Inject constructor(
 			selectedBranch,
 			newChaptersCount,
 			bookmarks,
-		) { manga, history, branch, news, bookmarks ->
+			isChaptersInGridView,
+		) { manga, history, branch, news, bookmarks, grid ->
 			manga?.mapChapters(
 				history,
 				news,
 				branch,
 				bookmarks,
+				grid,
 			).orEmpty()
 		},
 		isChaptersReversed,
@@ -288,11 +291,11 @@ class DetailsViewModel @Inject constructor(
 	}
 
 	fun setChaptersReversed(newValue: Boolean) {
-		settings.chaptersReverse = newValue
+		settings.isChaptersReverse = newValue
 	}
 
 	fun setChaptersInGridView(newValue: Boolean) {
-		settings.chaptersGridView = newValue
+		settings.isChaptersGridView = newValue
 	}
 
 	fun setSelectedBranch(branch: String?) {

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

@@ -1,23 +1,21 @@
 package org.koitharu.kotatsu.details.ui.adapter
 
 import android.graphics.Typeface
-import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.formatNumber
 import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.drawableStart
 import org.koitharu.kotatsu.core.util.ext.getThemeColorStateList
 import org.koitharu.kotatsu.databinding.ItemChapterGridBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import kotlin.math.roundToInt
 
 fun chapterGridItemAD(
 	clickListener: OnListItemClickListener<ChapterListItem>,
 ) = adapterDelegateViewBinding<ChapterListItem, ListModel, ItemChapterGridBinding>(
-	{ inflater, parent -> ItemChapterGridBinding.inflate(inflater, parent, false) },
+	viewBinding = { inflater, parent -> ItemChapterGridBinding.inflate(inflater, parent, false) },
+	on = { item, _, _ -> item is ChapterListItem && item.isGrid },
 ) {
 
 	val eventListener = AdapterDelegateClickListenerAdapter(this, clickListener)
@@ -26,33 +24,29 @@ fun chapterGridItemAD(
 
 	bind { payloads ->
 		if (payloads.isEmpty()) {
-			binding.textViewTitle.text = item.chapter.number.roundToInt().toString()
+			binding.textViewTitle.text = item.chapter.formatNumber() ?: "?"
 		}
+		binding.imageViewNew.isVisible = item.isNew
+		binding.imageViewCurrent.isVisible = item.isCurrent
+		binding.imageViewBookmarked.isVisible = item.isBookmarked
+		binding.imageViewDownloaded.isVisible = item.isDownloaded
+
 		when {
 			item.isCurrent -> {
-				binding.textViewTitle.drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_current_chapter)
 				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorPrimary))
 				binding.textViewTitle.typeface = Typeface.DEFAULT_BOLD
 			}
 
 			item.isUnread -> {
-				binding.textViewTitle.drawableStart = if (item.isNew) {
-					ContextCompat.getDrawable(context, R.drawable.ic_new)
-				} else {
-					null
-				}
 				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorPrimary))
 				binding.textViewTitle.typeface = Typeface.DEFAULT
 			}
 
 			else -> {
-				binding.textViewTitle.drawableStart = null
 				binding.textViewTitle.setTextColor(context.getThemeColorStateList(android.R.attr.textColorHint))
 				binding.textViewTitle.typeface = Typeface.DEFAULT
 			}
 		}
-		binding.imageViewBookmarked.isVisible = item.isBookmarked
-		binding.imageViewDownloaded.isVisible = item.isDownloaded
 	}
 }
 

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

@@ -18,7 +18,8 @@ import com.google.android.material.R as MR
 fun chapterListItemAD(
 	clickListener: OnListItemClickListener<ChapterListItem>,
 ) = adapterDelegateViewBinding<ChapterListItem, ListModel, ItemChapterBinding>(
-	{ inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) },
+	viewBinding = { inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) },
+	on = { item, _, _ -> item is ChapterListItem && !item.isGrid }
 ) {
 
 	val eventListener = AdapterDelegateClickListenerAdapter(this, clickListener)

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

@@ -11,21 +11,12 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class ChaptersAdapter(
 	private val onItemClickListener: OnListItemClickListener<ChapterListItem>,
-	chaptersInGridView: Boolean,
 ) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	init {
-		setChapterAdapterDelegate(chaptersInGridView)
 		addDelegate(ListItemType.HEADER, listHeaderAD(null))
-	}
-
-	fun setChapterAdapterDelegate(chaptersInGridView: Boolean) {
-		delegatesManager.removeDelegate(ListItemType.CHAPTER.ordinal)
-		if (chaptersInGridView) {
-			addDelegate(ListItemType.CHAPTER, chapterGridItemAD(onItemClickListener))
-		} else {
-			addDelegate(ListItemType.CHAPTER, chapterListItemAD(onItemClickListener))
-		}
+		addDelegate(ListItemType.CHAPTER_LIST, chapterListItemAD(onItemClickListener))
+		addDelegate(ListItemType.CHAPTER_GRID, chapterGridItemAD(onItemClickListener))
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {

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

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

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

@@ -48,6 +48,9 @@ data class ChapterListItem(
 	val isNew: Boolean
 		get() = hasFlag(FLAG_NEW)
 
+	val isGrid: Boolean
+		get() = hasFlag(FLAG_GRID)
+
 	private fun buildDescription(): String {
 		val joiner = StringJoiner(" • ")
 		chapter.formatNumber()?.let {
@@ -90,5 +93,6 @@ data class ChapterListItem(
 		const val FLAG_NEW = 8
 		const val FLAG_BOOKMARKED = 16
 		const val FLAG_DOWNLOADED = 32
+		const val FLAG_GRID = 64
 	}
 }

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

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

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

@@ -0,0 +1,116 @@
+package org.koitharu.kotatsu.details.ui.pager
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.view.ActionMode
+import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.activityViewModels
+import com.google.android.material.tabs.TabLayoutMediator
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
+import org.koitharu.kotatsu.core.ui.util.ActionModeListener
+import org.koitharu.kotatsu.core.util.ext.doOnPageChanged
+import org.koitharu.kotatsu.core.util.ext.menuView
+import org.koitharu.kotatsu.core.util.ext.recyclerView
+import org.koitharu.kotatsu.core.util.ext.setTabsEnabled
+import org.koitharu.kotatsu.core.util.ext.showDistinct
+import org.koitharu.kotatsu.core.util.ext.withArgs
+import org.koitharu.kotatsu.databinding.SheetChaptersPagesBinding
+import org.koitharu.kotatsu.details.ui.ChapterPagesMenuProvider
+import org.koitharu.kotatsu.details.ui.DetailsViewModel
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ChaptersPagesSheet : BaseAdaptiveSheet<SheetChaptersPagesBinding>(), ActionModeListener {
+
+	@Inject
+	lateinit var settings: AppSettings
+
+	private val viewModel by activityViewModels<DetailsViewModel>()
+
+	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetChaptersPagesBinding {
+		return SheetChaptersPagesBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewBindingCreated(binding: SheetChaptersPagesBinding, savedInstanceState: Bundle?) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		disableFitToContents()
+
+		val args = arguments ?: Bundle.EMPTY
+		val adapter = DetailsPagerAdapter2(this, args.getBoolean(ARG_SHOW_PAGES, settings.isPagesTabEnabled))
+		binding.pager.recyclerView?.isNestedScrollingEnabled = false
+		binding.pager.offscreenPageLimit = adapter.itemCount
+		binding.pager.adapter = adapter
+		binding.pager.doOnPageChanged(::onPageChanged)
+		TabLayoutMediator(binding.tabs, binding.pager, adapter).attach()
+		binding.pager.setCurrentItem(args.getInt(ARG_TAB, settings.defaultDetailsTab), false)
+		binding.tabs.isVisible = adapter.itemCount > 1
+
+		val menuProvider = ChapterPagesMenuProvider(viewModel, this, binding.pager, settings)
+		onBackPressedDispatcher.addCallback(viewLifecycleOwner, menuProvider)
+		binding.toolbar.addMenuProvider(menuProvider)
+
+		actionModeDelegate.addListener(this, viewLifecycleOwner)
+	}
+
+	override fun onActionModeStarted(mode: ActionMode) {
+		expandAndLock()
+		viewBinding?.toolbar?.menuView?.isEnabled = false
+	}
+
+	override fun onActionModeFinished(mode: ActionMode) {
+		unlock()
+		viewBinding?.toolbar?.menuView?.isEnabled = true
+	}
+
+	override fun expandAndLock() {
+		super.expandAndLock()
+		adjustLockState()
+	}
+
+	override fun unlock() {
+		super.unlock()
+		adjustLockState()
+	}
+
+	private fun adjustLockState() {
+		viewBinding?.run {
+			pager.isUserInputEnabled = !isLocked
+			tabs.setTabsEnabled(!isLocked)
+		}
+	}
+
+	private fun onPageChanged(position: Int) {
+		viewBinding?.toolbar?.invalidateMenu()
+	}
+
+	companion object {
+
+		const val TAB_CHAPTERS = 0
+		const val TAB_PAGES = 1
+		const val TAB_BOOKMARKS = 2
+		private const val ARG_TAB = "tag"
+		private const val ARG_SHOW_PAGES = "pages"
+		private const val TAG = "ChaptersPagesSheet"
+
+		fun show(fm: FragmentManager) {
+			ChaptersPagesSheet().showDistinct(fm, TAG)
+		}
+
+		fun show(fm: FragmentManager, showPagesTab: Boolean) {
+			ChaptersPagesSheet().withArgs(1) {
+				putBoolean(ARG_SHOW_PAGES, showPagesTab)
+			}.showDistinct(fm, TAG)
+		}
+
+		fun show(fm: FragmentManager, showPagesTab: Boolean, defaultTab: Int) {
+			ChaptersPagesSheet().withArgs(2) {
+				putBoolean(ARG_SHOW_PAGES, showPagesTab)
+				putInt(ARG_TAB, defaultTab)
+			}.showDistinct(fm, TAG)
+		}
+	}
+}

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

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

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

@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.details.ui.pager
+
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.details.ui.pager.bookmarks.MangaBookmarksFragment
+import org.koitharu.kotatsu.details.ui.pager.chapters.ChaptersFragment
+import org.koitharu.kotatsu.details.ui.pager.pages.PagesFragment
+
+class DetailsPagerAdapter2(
+	fragment: Fragment,
+	val isPagesTabEnabled: Boolean,
+) : FragmentStateAdapter(fragment),
+	TabLayoutMediator.TabConfigurationStrategy {
+
+	override fun getItemCount(): Int = if (isPagesTabEnabled) 3 else 2
+
+	override fun createFragment(position: Int): Fragment = when (position) {
+		0 -> ChaptersFragment()
+		1 -> if (isPagesTabEnabled) PagesFragment() else MangaBookmarksFragment()
+		2 -> MangaBookmarksFragment()
+		else -> throw IllegalArgumentException("Invalid position $position")
+	}
+
+	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
+		tab.setText(
+			when (position) {
+				0 -> R.string.chapters
+				1 -> if (isPagesTabEnabled) R.string.pages else R.string.bookmarks
+				2 -> R.string.bookmarks
+				else -> 0
+			},
+		)
+	}
+}

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

@@ -0,0 +1,137 @@
+package org.koitharu.kotatsu.details.ui.pager.bookmarks
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.Insets
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.GridLayoutManager
+import coil.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.sheet.BookmarksAdapter
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.ui.BaseFragment
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.dismissParentDialog
+import org.koitharu.kotatsu.core.util.ext.findParentCallback
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.databinding.FragmentMangaBookmarksBinding
+import org.koitharu.kotatsu.details.ui.DetailsViewModel
+import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
+import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
+import org.koitharu.kotatsu.reader.ui.ReaderNavigationCallback
+import org.koitharu.kotatsu.reader.ui.ReaderState
+import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
+import org.koitharu.kotatsu.reader.ui.thumbnails.OnPageSelectListener
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class MangaBookmarksFragment : BaseFragment<FragmentMangaBookmarksBinding>(),
+	OnListItemClickListener<Bookmark> {
+
+	private val activityViewModel by activityViewModels<DetailsViewModel>()
+	private val viewModel by viewModels<MangaBookmarksViewModel>()
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	@Inject
+	lateinit var settings: AppSettings
+
+	private var bookmarksAdapter: BookmarksAdapter? = null
+	private var spanResolver: MangaListSpanResolver? = null
+
+	private val spanSizeLookup = SpanSizeLookup()
+	private val listCommitCallback = Runnable {
+		spanSizeLookup.invalidateCache()
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		activityViewModel.manga.observe(this, viewModel)
+	}
+
+	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentMangaBookmarksBinding {
+		return FragmentMangaBookmarksBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewBindingCreated(binding: FragmentMangaBookmarksBinding, savedInstanceState: Bundle?) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		spanResolver = MangaListSpanResolver(binding.root.resources)
+		bookmarksAdapter = BookmarksAdapter(
+			coil = coil,
+			lifecycleOwner = viewLifecycleOwner,
+			clickListener = this@MangaBookmarksFragment,
+			headerClickListener = null,
+		)
+		with(binding.recyclerView) {
+			addItemDecoration(TypedListSpacingDecoration(context, false))
+			adapter = bookmarksAdapter
+			addOnLayoutChangeListener(spanResolver)
+			spanResolver?.setGridSize(settings.gridSize / 100f, this)
+			(layoutManager as GridLayoutManager).spanSizeLookup = spanSizeLookup
+		}
+		viewModel.content.observe(viewLifecycleOwner, checkNotNull(bookmarksAdapter))
+	}
+
+	override fun onDestroyView() {
+		spanResolver = null
+		bookmarksAdapter = null
+		spanSizeLookup.invalidateCache()
+		super.onDestroyView()
+	}
+
+	override fun onPause() {
+		// required for BottomSheetBehavior
+		requireViewBinding().recyclerView.isNestedScrollingEnabled = false
+		super.onPause()
+	}
+
+	override fun onResume() {
+		requireViewBinding().recyclerView.isNestedScrollingEnabled = true
+		super.onResume()
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) = Unit
+
+	override fun onItemClick(item: Bookmark, view: View) {
+		val listener = findParentCallback(ReaderNavigationCallback::class.java)
+		if (listener != null && listener.onBookmarkSelected(item)) {
+			dismissParentDialog()
+		} else {
+			val intent = IntentBuilder(view.context)
+				.manga(activityViewModel.manga.value ?: return)
+				.bookmark(item)
+				.incognito(true)
+				.build()
+			startActivity(intent)
+		}
+	}
+
+	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup() {
+
+		init {
+			isSpanIndexCacheEnabled = true
+			isSpanGroupIndexCacheEnabled = true
+		}
+
+		override fun getSpanSize(position: Int): Int {
+			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
+			return when (bookmarksAdapter?.getItemViewType(position)) {
+				ListItemType.PAGE_THUMB.ordinal -> 1
+				else -> total
+			}
+		}
+
+		fun invalidateCache() {
+			invalidateSpanGroupIndexCache()
+			invalidateSpanIndexCache()
+		}
+	}
+}
+

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

@@ -0,0 +1,68 @@
+package org.koitharu.kotatsu.details.ui.pager.bookmarks
+
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+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.ui.BaseViewModel
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.parsers.model.Manga
+import javax.inject.Inject
+
+@HiltViewModel
+class MangaBookmarksViewModel @Inject constructor(
+	bookmarksRepository: BookmarksRepository,
+) : BaseViewModel(), FlowCollector<Manga?> {
+
+	private val manga = MutableStateFlow<Manga?>(null)
+
+	val content: StateFlow<List<ListModel>> = manga.filterNotNull().flatMapLatest { m ->
+		bookmarksRepository.observeBookmarks(m)
+			.map { mapList(m, it) }
+	}.withErrorHandling()
+		.filterNotNull()
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, listOf(LoadingState))
+
+	override suspend fun emit(value: Manga?) {
+		manga.value = value
+	}
+
+	private suspend fun mapList(manga: Manga, bookmarks: List<Bookmark>): List<ListModel>? {
+		val chapters = manga.chapters ?: return null
+		val bookmarksMap = bookmarks.groupBy { it.chapterId }
+		val result = ArrayList<ListModel>(bookmarks.size + bookmarksMap.size)
+		for (chapter in chapters) {
+			val b = bookmarksMap[chapter.id]
+			if (b.isNullOrEmpty()) {
+				continue
+			}
+			result += ListHeader(chapter.name)
+			result.addAll(b)
+		}
+		if (result.isEmpty()) {
+			result.add(
+				EmptyState(
+					icon = 0,
+					textPrimary = R.string.no_bookmarks_yet,
+					textSecondary = R.string.no_bookmarks_summary,
+					actionStringRes = 0,
+				),
+			)
+		}
+		return result
+	}
+}

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

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

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.details.ui.pager.chapters
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
@@ -23,6 +22,9 @@ 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.util.RecyclerViewScrollCallback
+import org.koitharu.kotatsu.core.util.ext.dismissParentDialog
+import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
+import org.koitharu.kotatsu.core.util.ext.findParentCallback
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
@@ -38,6 +40,7 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
+import org.koitharu.kotatsu.reader.ui.ReaderNavigationCallback
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import kotlin.math.roundToInt
 
@@ -58,27 +61,29 @@ class ChaptersFragment :
 
 	override fun onViewBindingCreated(binding: FragmentChaptersBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		chaptersAdapter = ChaptersAdapter(this, viewModel.isChaptersInGridView.value)
+		chaptersAdapter = ChaptersAdapter(this)
 		selectionController = ListSelectionController(
-			activity = requireActivity(),
+			appCompatDelegate = checkNotNull(findAppCompatDelegate()),
 			decoration = ChaptersSelectionDecoration(binding.root.context),
 			registryOwner = this,
 			callback = this,
 		)
+		viewModel.isChaptersInGridView.observe(viewLifecycleOwner) { chaptersInGridView ->
+			binding.recyclerViewChapters.layoutManager = if (chaptersInGridView) {
+				GridLayoutManager(context, ChapterGridSpanHelper.getSpanCount(binding.recyclerViewChapters)).apply {
+					spanSizeLookup = ChapterGridSpanHelper.SpanSizeLookup(binding.recyclerViewChapters)
+				}
+			} else {
+				LinearLayoutManager(context)
+			}
+		}
 		with(binding.recyclerViewChapters) {
 			addItemDecoration(TypedListSpacingDecoration(context, true))
 			checkNotNull(selectionController).attachToRecyclerView(this)
 			setHasFixedSize(true)
 			isNestedScrollingEnabled = false
-		}
-		viewModel.isChaptersInGridView.observe(viewLifecycleOwner) { chaptersInGridView ->
-			chaptersAdapter?.setChapterAdapterDelegate(chaptersInGridView)
-			binding.recyclerViewChapters.adapter = chaptersAdapter
-			binding.recyclerViewChapters.layoutManager = if (chaptersInGridView) {
-				GridLayoutManager(context, 4)
-			} else {
-				LinearLayoutManager(context)
-			}
+			adapter = chaptersAdapter
+			ChapterGridSpanHelper.attach(this)
 		}
 		viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
 		viewModel.chapters
@@ -120,12 +125,17 @@ class ChaptersFragment :
 		if (selectionController?.onItemClick(item.chapter.id) == true) {
 			return
 		}
-		startActivity(
-			IntentBuilder(view.context)
-				.manga(viewModel.manga.value ?: return)
-				.state(ReaderState(item.chapter.id, 0, 0))
-				.build(),
-		)
+		val listener = findParentCallback(ReaderNavigationCallback::class.java)
+		if (listener != null && listener.onChapterSelected(item.chapter)) {
+			dismissParentDialog()
+		} else {
+			startActivity(
+				IntentBuilder(view.context)
+					.manga(viewModel.manga.value ?: return)
+					.state(ReaderState(item.chapter.id, 0, 0))
+					.build(),
+			)
+		}
 	}
 
 	override fun onItemLongClick(item: ChapterListItem, view: View): Boolean {

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

@@ -23,16 +23,18 @@ import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.BoundsScrollListener
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.RecyclerViewScrollCallback
+import org.koitharu.kotatsu.core.util.ext.dismissParentDialog
+import org.koitharu.kotatsu.core.util.ext.findParentCallback
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.showOrHide
 import org.koitharu.kotatsu.databinding.FragmentPagesBinding
 import org.koitharu.kotatsu.details.ui.DetailsViewModel
-import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
+import org.koitharu.kotatsu.reader.ui.ReaderNavigationCallback
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
 import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.PageThumbnailAdapter
@@ -54,7 +56,7 @@ class PagesFragment :
 	lateinit var settings: AppSettings
 
 	private var thumbnailsAdapter: PageThumbnailAdapter? = null
-	private var spanResolver: MangaListSpanResolver? = null
+	private var spanResolver: PagesGridSpanResolver? = null
 	private var scrollListener: ScrollListener? = null
 
 	private val spanSizeLookup = SpanSizeLookup()
@@ -81,19 +83,19 @@ class PagesFragment :
 
 	override fun onViewBindingCreated(binding: FragmentPagesBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		spanResolver = MangaListSpanResolver(binding.root.resources)
+		spanResolver = PagesGridSpanResolver(binding.root.resources)
 		thumbnailsAdapter = PageThumbnailAdapter(
 			coil = coil,
 			lifecycleOwner = viewLifecycleOwner,
 			clickListener = this@PagesFragment,
 		)
+		viewModel.gridScale.observe(viewLifecycleOwner, ::onGridScaleChanged) // before rv initialization
 		with(binding.recyclerView) {
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 			adapter = thumbnailsAdapter
 			setHasFixedSize(true)
 			isNestedScrollingEnabled = false
 			addOnLayoutChangeListener(spanResolver)
-			spanResolver?.setGridSize(settings.gridSize / 100f, this)
 			addOnScrollListener(ScrollListener().also { scrollListener = it })
 			(layoutManager as GridLayoutManager).let {
 				it.spanSizeLookup = spanSizeLookup
@@ -130,10 +132,17 @@ class PagesFragment :
 	override fun onWindowInsetsChanged(insets: Insets) = Unit
 
 	override fun onItemClick(item: PageThumbnail, view: View) {
-		val manga = detailsViewModel.manga.value ?: return
-		val state = ReaderState(item.page.chapterId, item.page.index, 0)
-		val intent = IntentBuilder(view.context).manga(manga).state(state).build()
-		startActivity(intent)
+		val listener = findParentCallback(ReaderNavigationCallback::class.java)
+		if (listener != null && listener.onPageSelected(item.page)) {
+			dismissParentDialog()
+		} else {
+			startActivity(
+				IntentBuilder(view.context)
+					.manga(detailsViewModel.manga.value ?: return)
+					.state(ReaderState(item.page.chapterId, item.page.index, 0))
+					.build(),
+			)
+		}
 	}
 
 	private suspend fun onThumbnailsChanged(list: List<ListModel>) {
@@ -163,6 +172,11 @@ class PagesFragment :
 		}
 	}
 
+	private fun onGridScaleChanged(scale: Float) {
+		spanSizeLookup.invalidateCache()
+		spanResolver?.setGridSize(scale, requireViewBinding().recyclerView)
+	}
+
 	private fun onNoChaptersChanged(isNoChapters: Boolean) {
 		with(viewBinding ?: return) {
 			textViewHolder.isVisible = isNoChapters

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

@@ -0,0 +1,59 @@
+package org.koitharu.kotatsu.details.ui.pager.pages
+
+import android.content.res.Resources
+import android.view.View
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.R
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+class PagesGridSpanResolver(
+	resources: Resources,
+) : View.OnLayoutChangeListener {
+
+	var spanCount = 3
+		private set
+
+	private val gridWidth = resources.getDimension(R.dimen.preferred_grid_width)
+	private val spacing = resources.getDimension(R.dimen.grid_spacing)
+	private var cellWidth = -1f
+
+	override fun onLayoutChange(
+		v: View?,
+		left: Int,
+		top: Int,
+		right: Int,
+		bottom: Int,
+		oldLeft: Int,
+		oldTop: Int,
+		oldRight: Int,
+		oldBottom: Int,
+	) {
+		if (cellWidth <= 0f) {
+			return
+		}
+		val rv = v as? RecyclerView ?: return
+		val width = abs(right - left)
+		if (width == 0) {
+			return
+		}
+		resolveGridSpanCount(width)
+		(rv.layoutManager as? GridLayoutManager)?.spanCount = spanCount
+	}
+
+	fun setGridSize(scaleFactor: Float, rv: RecyclerView) {
+		cellWidth = (gridWidth * scaleFactor) + spacing
+		val lm = rv.layoutManager as? GridLayoutManager ?: return
+		val innerWidth = lm.width - lm.paddingEnd - lm.paddingStart
+		if (innerWidth > 0) {
+			resolveGridSpanCount(innerWidth)
+			lm.spanCount = spanCount
+		}
+	}
+
+	private fun resolveGridSpanCount(width: Int) {
+		val estimatedCount = (width / cellWidth).roundToInt()
+		spanCount = estimatedCount.coerceAtLeast(2)
+	}
+}

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

@@ -1,11 +1,15 @@
 package org.koitharu.kotatsu.details.ui.pager.pages
 
+import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.firstNotNull
 import org.koitharu.kotatsu.details.data.MangaDetails
@@ -18,6 +22,7 @@ import javax.inject.Inject
 @HiltViewModel
 class PagesViewModel @Inject constructor(
 	private val chaptersLoader: ChaptersLoader,
+	private val settings: AppSettings,
 ) : BaseViewModel() {
 
 	private var loadingJob: Job? = null
@@ -29,6 +34,12 @@ class PagesViewModel @Inject constructor(
 	val isLoadingUp = MutableStateFlow(false)
 	val isLoadingDown = MutableStateFlow(false)
 
+	val gridScale = settings.observeAsStateFlow(
+		scope = viewModelScope + Dispatchers.Default,
+		key = AppSettings.KEY_GRID_SIZE_PAGES,
+		valueProducer = { gridSizePages / 100f },
+	)
+
 	init {
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
 			val firstState = state.firstNotNull()

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

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

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

@@ -44,7 +44,7 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 		val downloadsAdapter = DownloadsAdapter(this, coil, this)
 		val decoration = TypedListSpacingDecoration(this, false)
 		selectionController = ListSelectionController(
-			activity = this,
+			appCompatDelegate = delegate,
 			decoration = DownloadsSelectionDecoration(this),
 			registryOwner = this,
 			callback = this,

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

@@ -52,6 +52,10 @@ class MangaSourcesRepository @Inject constructor(
 		return dao.findAllDisabled().toSources(settings.isNsfwContentDisabled, null)
 	}
 
+	fun observeIsEnabled(source: MangaSource): Flow<Boolean> {
+		return dao.observeIsEnabled(source.name)
+	}
+
 	fun observeEnabledSourcesCount(): Flow<Int> {
 		return combine(
 			observeIsNsfwDisabled(),

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

@@ -50,6 +50,9 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites WHERE deleted_at = 0 ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
 	abstract suspend fun findAllRaw(offset: Int, limit: Int): List<FavouriteManga>
 
+	@Query("SELECT DISTINCT manga_id FROM favourites WHERE deleted_at = 0 AND category_id IN (SELECT category_id FROM favourite_categories WHERE track = 1)")
+	abstract suspend fun findIdsWithTrack(): LongArray
+
 	@Transaction
 	@Query(
 		"SELECT * FROM favourites WHERE category_id = :categoryId AND deleted_at = 0 " +
@@ -118,6 +121,9 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites WHERE manga_id = :id AND deleted_at = 0 GROUP BY manga_id")
 	abstract suspend fun find(id: Long): FavouriteManga?
 
+	@Query("SELECT * FROM favourites WHERE manga_id = :mangaId AND deleted_at = 0")
+	abstract suspend fun findAllRaw(mangaId: Long): List<FavouriteEntity>
+
 	@Transaction
 	@Deprecated("Ignores order")
 	@Query("SELECT * FROM favourites WHERE manga_id = :id AND deleted_at = 0 GROUP BY manga_id")
@@ -126,9 +132,15 @@ abstract class FavouritesDao {
 	@Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id = :id AND deleted_at = 0")
 	abstract fun observeIds(id: Long): Flow<List<Long>>
 
-	@Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id IN (:mangaIds) AND deleted_at = 0")
+	@Query("SELECT favourite_categories.* FROM favourites LEFT JOIN favourite_categories ON favourite_categories.category_id = favourites.category_id WHERE favourites.manga_id = :mangaId AND favourites.deleted_at = 0")
+	abstract fun observeCategories(mangaId: Long): Flow<List<FavouriteCategoryEntity>>
+
+	@Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id IN (:mangaIds) AND deleted_at = 0 ORDER BY favourites.created_at ASC")
 	abstract suspend fun findCategoriesIds(mangaIds: Collection<Long>): List<Long>
 
+	@Query("SELECT DISTINCT favourite_categories.category_id FROM favourites LEFT JOIN favourite_categories ON favourites.category_id = favourite_categories.category_id WHERE manga_id = :mangaId AND favourites.deleted_at = 0 AND favourite_categories.deleted_at = 0 AND favourite_categories.track = 1")
+	abstract suspend fun findCategoriesIdsWithTrack(mangaId: Long): List<Long>
+
 	/** INSERT **/
 
 	@Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -190,11 +202,14 @@ abstract class FavouritesDao {
 	private fun getOrderBy(sortOrder: ListSortOrder) = when (sortOrder) {
 		ListSortOrder.RATING -> "manga.rating DESC"
 		ListSortOrder.NEWEST -> "favourites.created_at DESC"
+		ListSortOrder.OLDEST -> "favourites.created_at ASC"
 		ListSortOrder.ALPHABETIC -> "manga.title ASC"
 		ListSortOrder.ALPHABETIC_REVERSE -> "manga.title DESC"
 		ListSortOrder.NEW_CHAPTERS -> "IFNULL((SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
 		ListSortOrder.PROGRESS -> "IFNULL((SELECT percent FROM history WHERE history.manga_id = manga.manga_id), 0) DESC"
+		ListSortOrder.UNREAD -> "IFNULL((SELECT percent FROM history WHERE history.manga_id = manga.manga_id), 0) ASC"
 		ListSortOrder.LAST_READ -> "IFNULL((SELECT updated_at FROM history WHERE history.manga_id = manga.manga_id), 0) DESC"
+		ListSortOrder.LONG_AGO_READ -> "IFNULL((SELECT updated_at FROM history WHERE history.manga_id = manga.manga_id), 0) ASC"
 
 		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
 	}

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

@@ -107,6 +107,12 @@ class FavouritesRepository @Inject constructor(
 		return db.getFavouritesDao().observeIds(mangaId).map { it.toSet() }
 	}
 
+	fun observeCategories(mangaId: Long): Flow<Set<FavouriteCategory>> {
+		return db.getFavouritesDao().observeCategories(mangaId).map {
+			it.mapTo(LinkedHashSet(it.size)) { x -> x.toFavouriteCategory() }
+		}
+	}
+
 	suspend fun getCategory(id: Long): FavouriteCategory {
 		return db.getFavouriteCategoriesDao().find(id.toInt()).toFavouriteCategory()
 	}

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

@@ -51,7 +51,7 @@ class FavouriteCategoriesActivity :
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		adapter = CategoriesAdapter(coil, this, this, this)
 		selectionController = ListSelectionController(
-			activity = this,
+			appCompatDelegate = delegate,
 			decoration = CategoriesSelectionDecoration(this),
 			registryOwner = this,
 			callback = CategoriesSelectionCallback(viewBinding.recyclerView, viewModel),

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.favourites.ui.categories.select.adapter
 
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
@@ -23,6 +24,6 @@ fun mangaCategoryAD(
 		binding.checkableImageView.setChecked(item.isChecked, ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED in payloads)
 		binding.textViewTitle.text = item.category.title
 		binding.imageViewTracker.isVisible = item.category.isTrackingEnabled && item.isTrackerEnabled
-		binding.imageViewVisible.isVisible = item.category.isVisibleInLibrary
+		binding.imageViewHidden.isGone = item.category.isVisibleInLibrary
 	}
 }

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

@@ -36,8 +36,11 @@ abstract class HistoryDao {
 	fun observeAll(order: ListSortOrder): Flow<List<HistoryWithManga>> {
 		val orderBy = when (order) {
 			ListSortOrder.LAST_READ -> "history.updated_at DESC"
+			ListSortOrder.LONG_AGO_READ -> "history.updated_at ASC"
 			ListSortOrder.NEWEST -> "history.created_at DESC"
+			ListSortOrder.OLDEST -> "history.created_at ASC"
 			ListSortOrder.PROGRESS -> "history.percent DESC"
+			ListSortOrder.UNREAD -> "history.percent ASC"
 			ListSortOrder.ALPHABETIC -> "manga.title"
 			ListSortOrder.ALPHABETIC_REVERSE -> "manga.title DESC"
 			ListSortOrder.NEW_CHAPTERS -> "IFNULL((SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
@@ -55,6 +58,9 @@ abstract class HistoryDao {
 	@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM history WHERE deleted_at = 0)")
 	abstract suspend fun findAllManga(): List<MangaEntity>
 
+	@Query("SELECT manga_id FROM history WHERE deleted_at = 0")
+	abstract suspend fun findAllIds(): LongArray
+
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
@@ -75,6 +81,9 @@ abstract class HistoryDao {
 	@Query("SELECT COUNT(*) FROM history WHERE deleted_at = 0")
 	abstract fun observeCount(): Flow<Int>
 
+	@Query("SELECT COUNT(*) FROM history WHERE deleted_at = 0")
+	abstract suspend fun getCount(): Int
+
 	@Query("SELECT percent FROM history WHERE manga_id = :id AND deleted_at = 0")
 	abstract suspend fun findProgress(id: Long): Float?
 

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

@@ -45,6 +45,10 @@ class HistoryRepository @Inject constructor(
 		return entities.map { it.manga.toManga(it.tags.toMangaTags()) }
 	}
 
+	suspend fun getCount(): Int {
+		return db.getHistoryDao().getCount()
+	}
+
 	suspend fun getLastOrNull(): Manga? {
 		val entity = db.getHistoryDao().findAll(0, 1).firstOrNull() ?: return null
 		return entity.manga.toManga(entity.tags.toMangaTags())

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

@@ -178,8 +178,13 @@ class HistoryListViewModel @Inject constructor(
 	}
 
 	private fun MangaHistory.header(order: ListSortOrder): ListHeader? = when (order) {
-		ListSortOrder.LAST_READ -> ListHeader(calculateTimeAgo(updatedAt))
+		ListSortOrder.LAST_READ,
+		ListSortOrder.LONG_AGO_READ -> ListHeader(calculateTimeAgo(updatedAt))
+
+		ListSortOrder.OLDEST,
 		ListSortOrder.NEWEST -> ListHeader(calculateTimeAgo(createdAt))
+
+		ListSortOrder.UNREAD,
 		ListSortOrder.PROGRESS -> ListHeader(
 			when (percent) {
 				1f -> R.string.status_completed

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

@@ -10,8 +10,8 @@ import android.view.ViewGroup
 import androidx.core.graphics.Insets
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.view.isVisible
+import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
 import coil.ImageLoader
 import coil.request.CachePolicy
 import coil.request.ErrorResult
@@ -21,6 +21,7 @@ import coil.target.ViewTarget
 import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.getDisplayIcon
@@ -42,27 +43,25 @@ class ImageActivity : BaseActivity<ActivityImageBinding>(), ImageRequest.Listene
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityImageBinding.inflate(layoutInflater))
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(true)
-			setDisplayShowTitleEnabled(false)
-		}
+		viewBinding.buttonBack.setOnClickListener(this)
 		loadImage(intent.data)
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		with(viewBinding.toolbar) {
-			updatePadding(
-				left = insets.left,
-				right = insets.right,
-			)
+		with(viewBinding.buttonBack) {
 			updateLayoutParams<ViewGroup.MarginLayoutParams> {
-				topMargin = insets.top
+				topMargin = insets.top + marginBottom
+				leftMargin = insets.left + marginBottom
+				rightMargin = insets.right + marginBottom
 			}
 		}
 	}
 
-	override fun onClick(v: View?) {
-		loadImage(intent.data)
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_back -> dispatchNavigateUp()
+			else -> loadImage(intent.data)
+		}
 	}
 
 	override fun onError(request: ImageRequest, result: ErrorResult) {

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

@@ -10,21 +10,45 @@ enum class ListSortOrder(
 ) {
 
 	NEWEST(R.string.order_added),
+	OLDEST(R.string.order_oldest),
 	PROGRESS(R.string.progress),
+	UNREAD(R.string.unread),
 	ALPHABETIC(R.string.by_name),
 	ALPHABETIC_REVERSE(R.string.by_name_reverse),
 	RATING(R.string.by_rating),
 	RELEVANCE(R.string.by_relevance),
 	NEW_CHAPTERS(R.string.new_chapters),
 	LAST_READ(R.string.last_read),
+	LONG_AGO_READ(R.string.long_ago_read),
 	;
 
 	fun isGroupingSupported() = this == LAST_READ || this == NEWEST || this == PROGRESS
 
 	companion object {
 
-		val HISTORY: Set<ListSortOrder> = EnumSet.of(LAST_READ, NEWEST, PROGRESS, ALPHABETIC, ALPHABETIC_REVERSE, NEW_CHAPTERS)
-		val FAVORITES: Set<ListSortOrder> = EnumSet.of(ALPHABETIC, ALPHABETIC_REVERSE, NEWEST, RATING, NEW_CHAPTERS, PROGRESS, LAST_READ)
+		val HISTORY: Set<ListSortOrder> = EnumSet.of(
+			LAST_READ,
+			LONG_AGO_READ,
+			NEWEST,
+			OLDEST,
+			PROGRESS,
+			UNREAD,
+			ALPHABETIC,
+			ALPHABETIC_REVERSE,
+			NEW_CHAPTERS,
+		)
+		val FAVORITES: Set<ListSortOrder> = EnumSet.of(
+			ALPHABETIC,
+			ALPHABETIC_REVERSE,
+			NEWEST,
+			OLDEST,
+			RATING,
+			NEW_CHAPTERS,
+			PROGRESS,
+			UNREAD,
+			LAST_READ,
+			LONG_AGO_READ,
+		)
 		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/MangaListFragment.kt

@@ -31,8 +31,10 @@ import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.PaginationScrollListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
+import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
+import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
 import org.koitharu.kotatsu.core.util.ext.measureHeight
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
@@ -98,7 +100,7 @@ abstract class MangaListFragment :
 		listAdapter = onCreateAdapter()
 		spanResolver = MangaListSpanResolver(binding.root.resources)
 		selectionController = ListSelectionController(
-			activity = requireActivity(),
+			appCompatDelegate = checkNotNull(findAppCompatDelegate()),
 			decoration = MangaSelectionDecoration(binding.root.context),
 			registryOwner = this,
 			callback = this,
@@ -230,6 +232,10 @@ abstract class MangaListFragment :
 
 	override fun onListHeaderClick(item: ListHeader, view: View) = Unit
 
+	override fun onPrimaryButtonClick(tipView: TipView) = Unit
+
+	override fun onSecondaryButtonClick(tipView: TipView) = Unit
+
 	override fun onRetryClick(error: Throwable) {
 		resolveException(error)
 	}

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

@@ -20,6 +20,5 @@ fun errorFooterAD(
 
 	bind {
 		binding.textViewTitle.text = item.exception.getDisplayMessage(context.resources)
-		binding.imageViewIcon.setImageResource(item.icon)
 	}
 }

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

@@ -29,5 +29,6 @@ enum class ListItemType {
 	CATEGORY_LARGE,
 	MANGA_SCROBBLING,
 	NAV_ITEM,
-	CHAPTER,
+	CHAPTER_LIST,
+	CHAPTER_GRID,
 }

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

@@ -24,5 +24,6 @@ open class MangaListAdapter(
 		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
 		addDelegate(ListItemType.HINT_EMPTY, emptyHintAD(coil, lifecycleOwner, listener))
 		addDelegate(ListItemType.HEADER, listHeaderAD(listener))
+		addDelegate(ListItemType.TIP, tipAD(listener))
 	}
 }

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

@@ -1,16 +1,13 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
 import android.view.View
-import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.google.android.material.badge.BadgeDrawable
-import com.google.android.material.chip.Chip
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
 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
@@ -20,7 +17,6 @@ import org.koitharu.kotatsu.databinding.ItemMangaListDetailsBinding
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
-import org.koitharu.kotatsu.parsers.model.MangaTag
 
 fun mangaListDetailedItemAD(
 	coil: ImageLoader,
@@ -31,28 +27,18 @@ fun mangaListDetailedItemAD(
 ) {
 	var badge: BadgeDrawable? = null
 
-	val listenerAdapter = object : View.OnClickListener, View.OnLongClickListener, ChipsView.OnChipClickListener {
-		override fun onClick(v: View) = when (v.id) {
-			R.id.button_read -> clickListener.onReadClick(item.manga, v)
-			else -> clickListener.onItemClick(item.manga, v)
-		}
+	val listenerAdapter = 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)
-
-		override fun onChipClick(chip: Chip, data: Any?) {
-			val tag = data as? MangaTag ?: return
-			clickListener.onTagClick(item.manga, tag, chip)
-		}
 	}
 	itemView.setOnClickListener(listenerAdapter)
 	itemView.setOnLongClickListener(listenerAdapter)
 	itemView.setOnContextClickListenerCompat(listenerAdapter)
-	binding.buttonRead.setOnClickListener(listenerAdapter)
-	binding.chipsTags.onChipClickListener = listenerAdapter
 
 	bind { payloads ->
 		binding.textViewTitle.text = item.title
-		binding.textViewSubtitle.textAndVisible = item.subtitle
+		binding.textViewAuthor.textAndVisible = item.manga.author
 		binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.imageViewCover.newImageRequest(lifecycleOwner, item.coverUrl)?.run {
 			size(CoverSizeResolver(binding.imageViewCover))
@@ -65,12 +51,7 @@ fun mangaListDetailedItemAD(
 			source(item.source)
 			enqueueWith(coil)
 		}
-		if (payloads.isEmpty()) {
-			binding.scrollViewTags.scrollTo(0, 0)
-		}
-		binding.chipsTags.setChips(item.tags)
-		binding.ratingBar.isVisible = item.manga.hasRating
-		binding.ratingBar.rating = binding.ratingBar.numStars * item.manga.rating
+		binding.textViewTags.text = item.tags.joinToString(separator = ", ") { it.title }
 		badge = itemView.bindBadge(badge, item.counter)
 	}
 }

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

@@ -1,9 +1,11 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
 import android.view.View
+import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.parsers.model.MangaTag
 
-interface MangaListListener : MangaDetailsClickListener, ListStateHolderListener, ListHeaderClickListener {
+interface MangaListListener : MangaDetailsClickListener, ListStateHolderListener, ListHeaderClickListener,
+	TipView.OnButtonClickListener {
 
 	fun onUpdateFilter(tags: Set<MangaTag>)
 

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

@@ -62,10 +62,12 @@ class TypedListSpacingDecoration(
 			ListItemType.MANGA_NESTED_GROUP,
 			ListItemType.CATEGORY_LARGE,
 			ListItemType.NAV_ITEM,
-			ListItemType.CHAPTER,
+			ListItemType.CHAPTER_LIST,
 			null,
 			-> outRect.set(0)
 
+			ListItemType.CHAPTER_GRID -> outRect.set(spacingSmall)
+
 			ListItemType.TIP -> outRect.set(0) // TODO
 		}
 		if (addHorizontalPadding && !itemType.isEdgeToEdge()) {
@@ -83,5 +85,6 @@ class TypedListSpacingDecoration(
 	private fun ListItemType?.isEdgeToEdge() = this == ListItemType.MANGA_NESTED_GROUP
 		|| this == ListItemType.FILTER_SORT
 		|| this == ListItemType.FILTER_TAG
-		|| this == ListItemType.CHAPTER
+		|| this == ListItemType.CHAPTER_LIST
+		|| this == ListItemType.CHAPTER_GRID
 }

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

@@ -4,7 +4,6 @@ import androidx.annotation.DrawableRes
 
 data class ErrorFooter(
 	val exception: Throwable,
-	@DrawableRes val icon: Int
 ) : ListModel {
 
 	override fun areItemsTheSame(other: ListModel): Boolean {

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

@@ -83,5 +83,4 @@ fun Throwable.toErrorState(canRetry: Boolean = true) = ErrorState(
 
 fun Throwable.toErrorFooter() = ErrorFooter(
 	exception = this,
-	icon = R.drawable.ic_alert_outline,
 )

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

@@ -1,11 +1,16 @@
 package org.koitharu.kotatsu.local.data
 
+import android.Manifest
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build
+import android.os.Environment
 import android.os.StatFs
 import androidx.annotation.WorkerThread
+import androidx.core.content.ContextCompat
 import androidx.core.net.toFile
 import dagger.Reusable
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -101,6 +106,23 @@ class LocalStorageManager @Inject constructor(
 		contentResolver.takePersistableUriPermission(uri, flags)
 	}
 
+	fun isOnExternalStorage(file: File): Boolean {
+		return !file.absolutePath.contains(context.packageName)
+	}
+
+	fun hasExternalStoragePermission(isReadOnly: Boolean): Boolean {
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			Environment.isExternalStorageManager()
+		} else {
+			val permission = if (isReadOnly) {
+				Manifest.permission.READ_EXTERNAL_STORAGE
+			} else {
+				Manifest.permission.WRITE_EXTERNAL_STORAGE
+			}
+			ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+		}
+	}
+
 	suspend fun getDirectoryDisplayName(dir: File, isFullPath: Boolean): String = runInterruptible(Dispatchers.IO) {
 		val packageName = context.packageName
 		if (dir.absolutePath.contains(packageName)) {

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

@@ -12,6 +12,7 @@ import okio.Source
 import okio.buffer
 import okio.sink
 import okio.use
+import org.koitharu.kotatsu.core.exceptions.NoDataReceivedException
 import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.ext.compressToPNG
 import org.koitharu.kotatsu.core.util.ext.longHashCode
@@ -62,7 +63,9 @@ class PagesCache @Inject constructor(@ApplicationContext context: Context) {
 			val bytes = file.sink(append = false).buffer().use {
 				it.writeAllCancellable(source)
 			}
-			check(bytes != 0L) { "No data has been written" }
+			if (bytes == 0L) {
+				throw NoDataReceivedException(url)
+			}
 			lruCache.get().put(url, file)
 		} finally {
 			file.delete()