Update parsers

Improved readability & fixed spelling.

.gitignore

@@ -10,6 +10,7 @@
 /.idea/compiler.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
+/.idea/ktlint-plugin.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
 /.idea/kotlinc.xml

CONTRIBUTING.md

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

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 606
-		versionName = '6.5'
+		versionCode = 614
+		versionName = '6.6.4'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,29 +82,29 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:42ecf8a958') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:8e7d7e0bde') {
 		exclude group: 'org.json', module: 'json'
 	}
 
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.21'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.12.0'
-	implementation 'androidx.activity:activity-ktx:1.8.1'
+	implementation 'androidx.activity:activity-ktx:1.8.2'
 	implementation 'androidx.fragment:fragment-ktx:1.6.2'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-service:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.10.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
+	implementation 'com.google.android.material:material:1.11.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
 
 	implementation 'androidx.work:work-runtime:2.9.0'
 	//noinspection GradleDependency
@@ -120,13 +120,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.6.0'
+	implementation 'com.squareup.okio:okio:3.7.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'com.google.dagger:hilt-android:2.49'
-	kapt 'com.google.dagger:hilt-compiler:2.49'
+	implementation 'com.google.dagger:hilt-android:2.50'
+	kapt 'com.google.dagger:hilt-compiler:2.50'
 	implementation 'androidx.hilt:hilt-work:1.1.0'
 	kapt 'androidx.hilt:hilt-compiler:1.1.0'
 
@@ -138,8 +138,10 @@ dependencies {
 
 	implementation 'ch.acra:acra-http:5.11.3'
 	implementation 'ch.acra:acra-dialog:5.11.3'
+	compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
+	ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.1.0'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.json:json:20231013'
@@ -155,6 +157,6 @@ dependencies {
 	androidTestImplementation 'androidx.room:room-testing:2.6.1'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.49'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.49'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.50'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.50'
 }

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

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

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

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

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

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

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

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

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

@@ -55,7 +55,7 @@ class BackupRepository @Inject constructor(
 		var offset = 0
 		val entry = BackupEntry(BackupEntry.Name.FAVOURITES, JSONArray())
 		while (true) {
-			val favourites = db.getFavouritesDao().findAll(offset, PAGE_SIZE)
+			val favourites = db.getFavouritesDao().findAllRaw(offset, PAGE_SIZE)
 			if (favourites.isEmpty()) {
 				break
 			}

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

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

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

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

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

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

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

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

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

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

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

@@ -7,11 +7,13 @@ import androidx.core.os.LocaleListCompat
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.iterator
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.util.mapToSet
+import com.google.android.material.R as materialR
 
 @JvmName("mangaIds")
 fun Collection<Manga>.ids() = mapToSet { it.id }
@@ -42,15 +44,25 @@ val MangaState.titleResId: Int
 		MangaState.FINISHED -> R.string.state_finished
 		MangaState.ABANDONED -> R.string.state_abandoned
 		MangaState.PAUSED -> R.string.state_paused
+		MangaState.UPCOMING -> R.string.state_upcoming
 	}
 
 @get:DrawableRes
 val MangaState.iconResId: Int
 	get() = when (this) {
-		MangaState.ONGOING -> R.drawable.ic_state_ongoing
+		MangaState.ONGOING -> R.drawable.ic_play
 		MangaState.FINISHED -> R.drawable.ic_state_finished
 		MangaState.ABANDONED -> R.drawable.ic_state_abandoned
 		MangaState.PAUSED -> R.drawable.ic_action_pause
+		MangaState.UPCOMING -> materialR.drawable.ic_clock_black_24dp
+	}
+
+@get:StringRes
+val ContentRating.titleResId: Int
+	get() = when (this) {
+		ContentRating.SAFE -> R.string.rating_safe
+		ContentRating.SUGGESTIVE -> R.string.rating_suggestive
+		ContentRating.ADULT -> R.string.rating_adult
 	}
 
 fun Manga.findChapter(id: Long): MangaChapter? {

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

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

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

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

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

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

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

@@ -5,6 +5,7 @@ import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.core.network.MirrorSwitchInterceptor
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
@@ -28,10 +29,16 @@ interface MangaRepository {
 
 	val states: Set<MangaState>
 
+	val contentRatings: Set<ContentRating>
+
 	var defaultSortOrder: SortOrder
 
 	val isMultipleTagsSupported: Boolean
 
+	val isTagsExclusionSupported: Boolean
+
+	val isSearchSupported: Boolean
+
 	suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga>
 
 	suspend fun getDetails(manga: Manga): Manga

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

@@ -21,6 +21,7 @@ import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.exception.ParseException
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Favicons
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
@@ -49,6 +50,9 @@ class RemoteMangaRepository(
 	override val states: Set<MangaState>
 		get() = parser.availableStates
 
+	override val contentRatings: Set<ContentRating>
+		get() = parser.availableContentRating
+
 	override var defaultSortOrder: SortOrder
 		get() = getConfig().defaultSortOrder ?: sortOrders.first()
 		set(value) {
@@ -58,6 +62,12 @@ class RemoteMangaRepository(
 	override val isMultipleTagsSupported: Boolean
 		get() = parser.isMultipleTagsSupported
 
+	override val isSearchSupported: Boolean
+		get() = parser.isSearchSupported
+
+	override val isTagsExclusionSupported: Boolean
+		get() = parser.isTagsExclusionSupported
+
 	var domain: String
 		get() = parser.domain
 		set(value) {

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

@@ -204,6 +204,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isUnstableUpdatesAllowed: Boolean
 		get() = prefs.getBoolean(KEY_UPDATES_UNSTABLE, false)
 
+	val defaultDetailsTab: Int
+		get() = prefs.getString(KEY_DETAILS_TAB, null)?.toIntOrNull()?.coerceIn(0, 1) ?: 0
+
 	val isContentPrefetchEnabled: Boolean
 		get() {
 			if (isBackgroundNetworkRestricted()) {
@@ -295,13 +298,13 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_READER_SCREEN_ON, true)
 
 	var readerColorFilter: ReaderColorFilter?
-		get() {
+		get() = runCatching {
 			val brightness = prefs.getFloat(KEY_CF_BRIGHTNESS, ReaderColorFilter.EMPTY.brightness)
 			val contrast = prefs.getFloat(KEY_CF_CONTRAST, ReaderColorFilter.EMPTY.contrast)
 			val inverted = prefs.getBoolean(KEY_CF_INVERTED, ReaderColorFilter.EMPTY.isInverted)
 			val grayscale = prefs.getBoolean(KEY_CF_GRAYSCALE, ReaderColorFilter.EMPTY.isGrayscale)
-			return ReaderColorFilter(brightness, contrast, inverted, grayscale).takeUnless { it.isEmpty }
-		}
+			ReaderColorFilter(brightness, contrast, inverted, grayscale).takeUnless { it.isEmpty }
+		}.getOrNull()
 		set(value) {
 			prefs.edit {
 				val cf = value ?: ReaderColorFilter.EMPTY
@@ -347,6 +350,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.UPDATED)
 		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
 
+	var allFavoritesSortOrder: ListSortOrder
+		get() = prefs.getEnumValue(KEY_FAVORITES_ORDER, ListSortOrder.NEWEST)
+		set(value) = prefs.edit { putEnumValue(KEY_FAVORITES_ORDER, value) }
+
 	val isRelatedMangaEnabled: Boolean
 		get() = prefs.getBoolean(KEY_RELATED_MANGA, true)
 
@@ -527,6 +534,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_OPTIMIZE = "reader_optimize"
 		const val KEY_LOCAL_LIST_ORDER = "local_order"
 		const val KEY_HISTORY_ORDER = "history_order"
+		const val KEY_FAVORITES_ORDER = "fav_order"
 		const val KEY_WEBTOON_ZOOM = "webtoon_zoom"
 		const val KEY_PREFETCH_CONTENT = "prefetch_content"
 		const val KEY_APP_LOCALE = "app_locale"
@@ -559,6 +567,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_DETAILS_TAB = "details_tab"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -108,7 +108,6 @@ class ChipsView @JvmOverloads constructor(
 		chip.setChipDrawable(drawable)
 		chip.isCheckedIconVisible = true
 		chip.isChipIconVisible = false
-		chip.setCheckedIconResource(R.drawable.ic_check)
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)

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

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

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

@@ -17,6 +17,7 @@ import android.content.SyncResult
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.database.SQLException
+import android.graphics.Bitmap
 import android.graphics.Color
 import android.net.Uri
 import android.os.Build
@@ -29,6 +30,7 @@ import android.view.Window
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IntegerRes
+import androidx.annotation.WorkerThread
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
@@ -37,6 +39,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
 import androidx.work.CoroutineWorker
 import com.google.android.material.elevation.ElevationOverlayProvider
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.delay
@@ -45,7 +48,9 @@ import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
 import okio.IOException
+import okio.use
 import org.json.JSONException
 import org.jsoup.internal.StringUtil.StringJoiner
 import org.koitharu.kotatsu.BuildConfig
@@ -53,6 +58,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.xmlpull.v1.XmlPullParser
 import org.xmlpull.v1.XmlPullParserException
+import java.io.File
 import kotlin.math.roundToLong
 
 val Context.activityManager: ActivityManager?
@@ -130,7 +136,7 @@ fun Window.setNavigationBarTransparentCompat(context: Context, elevation: Float,
 	} else {
 		// Set navbar scrim 70% of navigationBarColor
 		ElevationOverlayProvider(context).compositeOverlayIfNeeded(
-			context.getThemeColor(android.R.attr.navigationBarColor, alphaFactor),
+			context.getThemeColor(R.attr.m3ColorBottomMenuBackground, alphaFactor),
 			elevation,
 		)
 	}
@@ -230,3 +236,18 @@ fun Context.checkNotificationPermission(): Boolean = if (Build.VERSION.SDK_INT >
 } else {
 	NotificationManagerCompat.from(this).areNotificationsEnabled()
 }
+
+@WorkerThread
+suspend fun Bitmap.compressToPNG(output: File) = runInterruptible(Dispatchers.IO) {
+	output.outputStream().use { os ->
+		if (!compress(Bitmap.CompressFormat.PNG, 100, os)) {
+			throw IOException("Failed to encode bitmap into PNG format")
+		}
+	}
+}
+
+fun Context.ensureRamAtLeast(requiredSize: Long) {
+	if (ramAvailable < requiredSize) {
+		throw IllegalStateException("Not enough free memory")
+	}
+}

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

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

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

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

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

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

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

@@ -8,12 +8,16 @@ import android.view.View.MeasureSpec
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.Checkable
+import androidx.appcompat.widget.ActionMenuView
+import androidx.appcompat.widget.Toolbar
 import androidx.core.view.children
 import androidx.core.view.descendants
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import com.google.android.material.slider.Slider
 import com.google.android.material.tabs.TabLayout
@@ -153,3 +157,18 @@ fun View.setOnContextClickListenerCompat(listener: View.OnLongClickListener) {
 		setOnContextClickListener(listener::onLongClick)
 	}
 }
+
+val Toolbar.menuView: ActionMenuView?
+	get() {
+		menu // to call ensureMenu()
+		return children.firstNotNullOfOrNull { it as? ActionMenuView }
+	}
+
+fun MaterialButton.setProgressIcon() {
+	val progressDrawable = CircularProgressDrawable(context)
+	progressDrawable.strokeWidth = resources.resolveDp(2f)
+	progressDrawable.setColorSchemeColors(currentTextColor)
+	progressDrawable.setTintList(textColors)
+	icon = progressDrawable
+	progressDrawable.start()
+}

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

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

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

@@ -22,13 +22,14 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
+import androidx.core.view.MenuHost
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.filterNotNull
@@ -37,15 +38,19 @@ 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
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
+import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.ext.doOnExpansionsChanged
 import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.measureHeight
+import org.koitharu.kotatsu.core.util.ext.menuView
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.recyclerView
 import org.koitharu.kotatsu.core.util.ext.setNavigationBarTransparentCompat
 import org.koitharu.kotatsu.core.util.ext.setNavigationIconSafe
 import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
@@ -54,6 +59,7 @@ import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 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.DetailsPagerAdapter
 import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
 import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -74,10 +80,18 @@ class DetailsActivity :
 	@Inject
 	lateinit var appShortcutManager: AppShortcutManager
 
+	@Inject
+	lateinit var settings: AppSettings
+
 	private var buttonTip: WeakReference<ButtonTip>? = null
 
 	private val viewModel: DetailsViewModel by viewModels()
-	private lateinit var chaptersMenuProvider: ChaptersMenuProvider
+
+	val secondaryMenuHost: MenuHost
+		get() = viewBinding.toolbarChapters ?: this
+
+	var bottomSheetMediator: ChaptersBottomSheetMediator? = null
+		private set
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -93,24 +107,22 @@ class DetailsActivity :
 
 		if (viewBinding.layoutBottom != null) {
 			val behavior = BottomSheetBehavior.from(checkNotNull(viewBinding.layoutBottom))
-			val bsMediator = ChaptersBottomSheetMediator(behavior)
+			val bsMediator = ChaptersBottomSheetMediator(behavior, viewBinding.pager, viewBinding.tabs)
 			actionModeDelegate.addListener(bsMediator)
 			checkNotNull(viewBinding.layoutBsHeader).addOnLayoutChangeListener(bsMediator)
 			onBackPressedDispatcher.addCallback(bsMediator)
-			chaptersMenuProvider = ChaptersMenuProvider(viewModel, bsMediator)
+			bottomSheetMediator = bsMediator
 			behavior.doOnExpansionsChanged(::onChaptersSheetStateChanged)
 			viewBinding.toolbarChapters?.setNavigationOnClickListener {
 				behavior.state = BottomSheetBehavior.STATE_COLLAPSED
 			}
 			viewBinding.toolbarChapters?.setOnGenericMotionListener(bsMediator)
-		} else {
-			chaptersMenuProvider = ChaptersMenuProvider(viewModel, null)
-			addMenuProvider(chaptersMenuProvider)
 		}
-		onBackPressedDispatcher.addCallback(chaptersMenuProvider)
+		initPager()
 
 		viewModel.manga.filterNotNull().observe(this, ::onMangaUpdated)
 		viewModel.onMangaRemoved.observeEvent(this, ::onMangaRemoved)
+		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onError.observeEvent(
 			this,
 			SnackbarErrorObserver(
@@ -124,19 +136,16 @@ class DetailsActivity :
 				},
 			),
 		)
-		viewModel.onShowToast.observeEvent(this) {
-			makeSnackbar(getString(it), Snackbar.LENGTH_SHORT).show()
-		}
+		viewModel.onActionDone.observeEvent(this, ReversibleActionObserver(viewBinding.containerDetails))
 		viewModel.onShowTip.observeEvent(this) { showTip() }
 		viewModel.historyInfo.observe(this, ::onHistoryChanged)
 		viewModel.selectedBranch.observe(this) {
 			viewBinding.toolbarChapters?.subtitle = it
 			viewBinding.textViewSubtitle?.textAndVisible = it
 		}
-		viewModel.isChaptersReversed.observe(
-			this,
-			MenuInvalidator(viewBinding.toolbarChapters ?: this),
-		)
+		val chaptersMenuInvalidator = MenuInvalidator(viewBinding.toolbarChapters ?: this)
+		viewModel.isChaptersReversed.observe(this, chaptersMenuInvalidator)
+		viewModel.isChaptersEmpty.observe(this, chaptersMenuInvalidator)
 		val menuInvalidator = MenuInvalidator(this)
 		viewModel.favouriteCategories.observe(this, menuInvalidator)
 		viewModel.remoteManga.observe(this, menuInvalidator)
@@ -153,7 +162,7 @@ class DetailsActivity :
 			DetailsMenuProvider(
 				activity = this,
 				viewModel = viewModel,
-				snackbarHost = viewBinding.containerChapters,
+				snackbarHost = viewBinding.pager,
 				appShortcutManager = appShortcutManager,
 			),
 		)
@@ -217,12 +226,11 @@ class DetailsActivity :
 			TransitionManager.beginDelayedTransition(toolbar, transition)
 		}
 		if (isExpanded) {
-			toolbar.addMenuProvider(chaptersMenuProvider)
 			toolbar.setNavigationIconSafe(materialR.drawable.abc_ic_clear_material)
 		} else {
-			toolbar.removeMenuProvider(chaptersMenuProvider)
 			toolbar.navigationIcon = null
 		}
+		toolbar.menuView?.isVisible = isExpanded
 		viewBinding.buttonRead.isGone = isExpanded
 	}
 
@@ -293,6 +301,18 @@ class DetailsActivity :
 		viewBinding.textViewTitle?.text = text
 	}
 
+	private fun onNewChaptersChanged(count: Int) {
+		val tab = viewBinding.tabs.getTabAt(0) ?: return
+		if (count == 0) {
+			tab.removeBadge()
+		} else {
+			val badge = tab.orCreateBadge
+			badge.horizontalOffsetWithText = -resources.getDimensionPixelOffset(R.dimen.margin_small)
+			badge.number = count
+			badge.isVisible = true
+		}
+	}
+
 	private fun showBranchPopupMenu(v: View) {
 		val menu = PopupMenu(v.context, v)
 		val branches = viewModel.branches.value
@@ -326,9 +346,8 @@ class DetailsActivity :
 		val manga = viewModel.manga.value ?: return
 		val chapterId = viewModel.historyInfo.value.history?.chapterId
 		if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
-			val snackbar =
-				makeSnackbar(getString(R.string.chapter_is_missing), Snackbar.LENGTH_SHORT)
-			snackbar.show()
+			Snackbar.make(viewBinding.containerDetails, R.string.chapter_is_missing, Snackbar.LENGTH_SHORT)
+				.show()
 		} else {
 			startActivity(
 				IntentBuilder(this)
@@ -343,6 +362,15 @@ class DetailsActivity :
 		}
 	}
 
+	private fun initPager() {
+		viewBinding.pager.recyclerView?.isNestedScrollingEnabled = false
+		val adapter = DetailsPagerAdapter(this)
+		viewBinding.pager.offscreenPageLimit = 1
+		viewBinding.pager.adapter = adapter
+		TabLayoutMediator(viewBinding.tabs, viewBinding.pager, adapter).attach()
+		viewBinding.pager.setCurrentItem(settings.defaultDetailsTab, false)
+	}
+
 	private fun showBottomSheet(isVisible: Boolean) {
 		val view = viewBinding.layoutBottom ?: return
 		if (view.isVisible == isVisible) return
@@ -353,17 +381,6 @@ class DetailsActivity :
 		view.isVisible = isVisible
 	}
 
-	private fun makeSnackbar(
-		text: CharSequence,
-		@BaseTransientBottomBar.Duration duration: Int,
-	): Snackbar {
-		val sb = Snackbar.make(viewBinding.containerDetails, text, duration)
-		if (viewBinding.layoutBottom?.isVisible == true) {
-			sb.anchorView = viewBinding.toolbarChapters
-		}
-		return sb
-	}
-
 	private class PrefetchObserver(
 		private val context: Context,
 	) : FlowCollector<List<ChapterListItem>?> {

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

@@ -10,8 +10,6 @@ import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
-import androidx.core.text.buildSpannedString
-import androidx.core.text.color
 import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -23,13 +21,14 @@ import coil.request.SuccessResult
 import coil.util.CoilUtils
 import com.google.android.material.chip.Chip
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
 import org.koitharu.kotatsu.bookmarks.ui.sheet.BookmarksSheet
 import org.koitharu.kotatsu.core.model.countChaptersByBranch
+import org.koitharu.kotatsu.core.model.iconResId
+import org.koitharu.kotatsu.core.model.titleResId
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
@@ -40,7 +39,6 @@ import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.ext.crossfade
 import org.koitharu.kotatsu.core.util.ext.drawableTop
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.core.util.ext.isTextTruncated
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -66,7 +64,6 @@ import org.koitharu.kotatsu.list.ui.size.StaticItemSizeResolver
 import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
@@ -74,7 +71,6 @@ import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorShee
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.search.ui.SearchActivity
 import javax.inject.Inject
-import com.google.android.material.R as materialR
 
 @AndroidEntryPoint
 class DetailsFragment :
@@ -121,7 +117,7 @@ class DetailsFragment :
 		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
 		viewModel.localSize.observe(viewLifecycleOwner, ::onLocalSizeChanged)
 		viewModel.relatedManga.observe(viewLifecycleOwner, ::onRelatedMangaChanged)
-		combine(viewModel.chapters, viewModel.newChaptersCount, ::Pair).observe(viewLifecycleOwner, ::onChaptersChanged)
+		viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
@@ -181,28 +177,13 @@ class DetailsFragment :
 				ratingBar.isVisible = false
 			}
 
-			when (manga.state) {
-				MangaState.FINISHED -> infoLayout.textViewState.apply {
-					textAndVisible = resources.getString(R.string.state_finished)
-					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_finished)
+			infoLayout.textViewState.apply {
+				manga.state?.let { state ->
+					textAndVisible = resources.getString(state.titleResId)
+					drawableTop = ContextCompat.getDrawable(context, state.iconResId)
+				} ?: run {
+					isVisible = false
 				}
-
-				MangaState.ONGOING -> infoLayout.textViewState.apply {
-					textAndVisible = resources.getString(R.string.state_ongoing)
-					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_ongoing)
-				}
-
-				MangaState.ABANDONED -> infoLayout.textViewState.apply {
-					textAndVisible = resources.getString(R.string.state_abandoned)
-					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_abandoned)
-				}
-
-				MangaState.PAUSED -> infoLayout.textViewState.apply {
-					textAndVisible = resources.getString(R.string.state_paused)
-					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_action_pause)
-				}
-
-				null -> infoLayout.textViewState.isVisible = false
 			}
 			if (manga.source == MangaSource.LOCAL) {
 				infoLayout.textViewSource.isVisible = false
@@ -218,8 +199,7 @@ class DetailsFragment :
 		}
 	}
 
-	private fun onChaptersChanged(data: Pair<List<ChapterListItem>?, Int>) {
-		val (chapters, newChapters) = data
+	private fun onChaptersChanged(chapters: List<ChapterListItem>?) {
 		val infoLayout = requireViewBinding().infoLayout
 		if (chapters.isNullOrEmpty()) {
 			infoLayout.textViewChapters.isVisible = false
@@ -227,19 +207,7 @@ class DetailsFragment :
 			val count = chapters.countChaptersByBranch()
 			infoLayout.textViewChapters.isVisible = true
 			val chaptersText = resources.getQuantityString(R.plurals.chapters, count, count)
-			infoLayout.textViewChapters.text = if (newChapters == 0) {
-				chaptersText
-			} else {
-				buildSpannedString {
-					append(chaptersText)
-					append(' ')
-					color(infoLayout.textViewChapters.context.getThemeColor(materialR.attr.colorError)) {
-						append("(+")
-						append(newChapters.toString())
-						append(')')
-					}
-				}
-			}
+			infoLayout.textViewChapters.text = chaptersText
 		}
 	}
 

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

@@ -21,6 +21,7 @@ import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.plus
+import okio.FileNotFoundException
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
@@ -30,6 +31,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 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.computeSize
@@ -53,6 +55,7 @@ import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.DeleteLocalMangaUseCase
 import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
@@ -79,7 +82,7 @@ class DetailsViewModel @Inject constructor(
 	private val mangaId = intent.mangaId
 	private var loadingJob: Job
 
-	val onShowToast = MutableEventFlow<Int>()
+	val onActionDone = MutableEventFlow<ReversibleAction>()
 	val onShowTip = MutableEventFlow<Unit>()
 	val onSelectChapter = MutableEventFlow<Long>()
 	val onDownloadStarted = MutableEventFlow<Unit>()
@@ -134,8 +137,14 @@ class DetailsViewModel @Inject constructor(
 		.map { it?.local }
 		.distinctUntilChanged()
 		.map { local ->
-			local?.file?.computeSize() ?: 0L
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.WhileSubscribed(), 0)
+			if (local != null) {
+				runCatchingCancellable {
+					local.file.computeSize()
+				}.getOrDefault(0L)
+			} else {
+				0L
+			}
+		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.WhileSubscribed(5000), 0L)
 
 	@Deprecated("")
 	val description = details
@@ -227,7 +236,7 @@ class DetailsViewModel @Inject constructor(
 	fun deleteLocal() {
 		val m = details.value?.local?.manga
 		if (m == null) {
-			onShowToast.call(R.string.file_not_found)
+			errorEvent.call(FileNotFoundException())
 			return
 		}
 		launchLoadingJob(Dispatchers.Default) {
@@ -239,7 +248,7 @@ class DetailsViewModel @Inject constructor(
 	fun removeBookmark(bookmark: Bookmark) {
 		launchJob(Dispatchers.Default) {
 			bookmarksRepository.removeBookmark(bookmark)
-			onShowToast.call(R.string.bookmark_removed)
+			onActionDone.call(ReversibleAction(R.string.bookmark_removed, null))
 		}
 	}
 

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

@@ -0,0 +1,32 @@
+package org.koitharu.kotatsu.details.ui.pager
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+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.details.ui.pager.chapters.ChaptersFragment
+import org.koitharu.kotatsu.details.ui.pager.pages.PagesFragment
+
+class DetailsPagerAdapter(activity: FragmentActivity) : FragmentStateAdapter(activity),
+	TabLayoutMediator.TabConfigurationStrategy {
+
+	override fun getItemCount(): Int = 2
+
+	override fun createFragment(position: Int): Fragment = when (position) {
+		0 -> ChaptersFragment()
+		1 -> PagesFragment()
+		else -> throw IllegalArgumentException("Invalid position $position")
+	}
+
+	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
+		tab.setText(
+			when (position) {
+				0 -> R.string.chapters
+				1 -> R.string.pages
+				else -> 0
+			},
+		)
+	}
+}

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

@@ -1,6 +1,5 @@
-package org.koitharu.kotatsu.details.ui
+package org.koitharu.kotatsu.details.ui.pager.chapters
 
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -11,6 +10,7 @@ import androidx.appcompat.view.ActionMode
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
 import com.google.android.material.snackbar.Snackbar
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseFragment
@@ -20,6 +20,9 @@ import org.koitharu.kotatsu.core.util.RecyclerViewScrollCallback
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
+import org.koitharu.kotatsu.details.ui.ChaptersMenuProvider
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.details.ui.DetailsViewModel
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -57,9 +60,6 @@ class ChaptersFragment :
 			checkNotNull(selectionController).attachToRecyclerView(this)
 			setHasFixedSize(true)
 			adapter = chaptersAdapter
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-				scrollIndicators = if (resources.getBoolean(R.bool.is_tablet)) 0 else View.SCROLL_INDICATOR_TOP
-			}
 		}
 		viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
 		viewModel.chapters.observe(viewLifecycleOwner, this::onChaptersChanged)
@@ -69,6 +69,12 @@ class ChaptersFragment :
 		viewModel.onSelectChapter.observeEvent(viewLifecycleOwner) {
 			selectionController?.onItemLongClick(it)
 		}
+		val detailsActivity = activity as? DetailsActivity
+		if (detailsActivity != null) {
+			val menuProvider = ChaptersMenuProvider(viewModel, detailsActivity.bottomSheetMediator)
+			activity?.onBackPressedDispatcher?.addCallback(menuProvider)
+			detailsActivity.secondaryMenuHost.addMenuProvider(menuProvider, viewLifecycleOwner, Lifecycle.State.RESUMED)
+		}
 	}
 
 	override fun onDestroyView() {

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

@@ -0,0 +1,189 @@
+package org.koitharu.kotatsu.details.ui.pager.pages
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.Insets
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.combine
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.prefs.AppSettings
+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.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.ReaderState
+import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
+import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.PageThumbnailAdapter
+import javax.inject.Inject
+import kotlin.math.roundToInt
+
+@AndroidEntryPoint
+class PagesFragment :
+	BaseFragment<FragmentPagesBinding>(),
+	OnListItemClickListener<PageThumbnail> {
+
+	private val detailsViewModel by activityViewModels<DetailsViewModel>()
+	private val viewModel by viewModels<PagesViewModel>()
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	@Inject
+	lateinit var settings: AppSettings
+
+	private var thumbnailsAdapter: PageThumbnailAdapter? = null
+	private var spanResolver: MangaListSpanResolver? = null
+	private var scrollListener: ScrollListener? = null
+
+	private val spanSizeLookup = SpanSizeLookup()
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		combine(
+			detailsViewModel.details,
+			detailsViewModel.history,
+			detailsViewModel.selectedBranch,
+		) { details, history, branch ->
+			if (details != null && (details.isLoaded || details.chapters.isNotEmpty())) {
+				PagesViewModel.State(details, history, branch)
+			} else {
+				null
+			}
+		}.observe(this, viewModel::updateState)
+	}
+
+	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentPagesBinding {
+		return FragmentPagesBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewBindingCreated(binding: FragmentPagesBinding, savedInstanceState: Bundle?) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		spanResolver = MangaListSpanResolver(binding.root.resources)
+		thumbnailsAdapter = PageThumbnailAdapter(
+			coil = coil,
+			lifecycleOwner = viewLifecycleOwner,
+			clickListener = this@PagesFragment,
+		)
+		with(binding.recyclerView) {
+			addItemDecoration(TypedListSpacingDecoration(context, false))
+			adapter = thumbnailsAdapter
+			setHasFixedSize(true)
+			addOnLayoutChangeListener(spanResolver)
+			spanResolver?.setGridSize(settings.gridSize / 100f, this)
+			addOnScrollListener(ScrollListener().also { scrollListener = it })
+			(layoutManager as GridLayoutManager).let {
+				it.spanSizeLookup = spanSizeLookup
+				it.spanCount = checkNotNull(spanResolver).spanCount
+			}
+		}
+		detailsViewModel.isChaptersEmpty.observe(viewLifecycleOwner, ::onNoChaptersChanged)
+		viewModel.thumbnails.observe(viewLifecycleOwner, ::onThumbnailsChanged)
+		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
+		viewModel.isLoading.observe(viewLifecycleOwner) { binding.progressBar.showOrHide(it) }
+		viewModel.isLoadingUp.observe(viewLifecycleOwner) { binding.progressBarTop.showOrHide(it) }
+		viewModel.isLoadingDown.observe(viewLifecycleOwner) { binding.progressBarBottom.showOrHide(it) }
+	}
+
+	override fun onDestroyView() {
+		spanResolver = null
+		scrollListener = null
+		thumbnailsAdapter = null
+		spanSizeLookup.invalidateCache()
+		super.onDestroyView()
+	}
+
+	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)
+	}
+
+	private suspend fun onThumbnailsChanged(list: List<ListModel>) {
+		val adapter = thumbnailsAdapter ?: return
+		if (adapter.itemCount == 0) {
+			var position = list.indexOfFirst { it is PageThumbnail && it.isCurrent }
+			if (position > 0) {
+				val spanCount = spanResolver?.spanCount ?: 0
+				val offset = if (position > spanCount + 1) {
+					(resources.getDimensionPixelSize(R.dimen.manga_list_details_item_height) * 0.6).roundToInt()
+				} else {
+					position = 0
+					0
+				}
+				val scrollCallback = RecyclerViewScrollCallback(requireViewBinding().recyclerView, position, offset)
+				adapter.emit(list)
+				scrollCallback.run()
+			} else {
+				adapter.emit(list)
+			}
+		} else {
+			adapter.emit(list)
+		}
+		spanSizeLookup.invalidateCache()
+		viewBinding?.recyclerView?.let {
+			scrollListener?.postInvalidate(it)
+		}
+	}
+
+	private fun onNoChaptersChanged(isNoChapters: Boolean) {
+		with(viewBinding ?: return) {
+			textViewHolder.isVisible = isNoChapters
+			recyclerView.isInvisible = isNoChapters
+		}
+	}
+
+	private inner class ScrollListener : BoundsScrollListener(3, 3) {
+
+		override fun onScrolledToStart(recyclerView: RecyclerView) {
+			viewModel.loadPrevChapter()
+		}
+
+		override fun onScrolledToEnd(recyclerView: RecyclerView) {
+			viewModel.loadNextChapter()
+		}
+	}
+
+	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 (thumbnailsAdapter?.getItemViewType(position)) {
+				ListItemType.PAGE_THUMB.ordinal -> 1
+				else -> total
+			}
+		}
+
+		fun invalidateCache() {
+			invalidateSpanGroupIndexCache()
+			invalidateSpanIndexCache()
+		}
+	}
+}

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

@@ -0,0 +1,115 @@
+package org.koitharu.kotatsu.details.ui.pager.pages
+
+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 org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.core.util.ext.firstNotNull
+import org.koitharu.kotatsu.details.data.MangaDetails
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.reader.domain.ChaptersLoader
+import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
+import javax.inject.Inject
+
+@HiltViewModel
+class PagesViewModel @Inject constructor(
+	private val chaptersLoader: ChaptersLoader,
+) : BaseViewModel() {
+
+	private var loadingJob: Job? = null
+	private var loadingPrevJob: Job? = null
+	private var loadingNextJob: Job? = null
+
+	private val state = MutableStateFlow<State?>(null)
+	val thumbnails = MutableStateFlow<List<ListModel>>(emptyList())
+	val isLoadingUp = MutableStateFlow(false)
+	val isLoadingDown = MutableStateFlow(false)
+
+	init {
+		loadingJob = launchLoadingJob(Dispatchers.Default) {
+			val firstState = state.firstNotNull()
+			doInit(firstState)
+			launchJob(Dispatchers.Default) {
+				state.collectLatest {
+					if (it != null) {
+						doInit(it)
+					}
+				}
+			}
+		}
+	}
+
+	fun updateState(newState: State?) {
+		if (newState != null) {
+			state.value = newState
+		}
+	}
+
+	fun loadPrevChapter() {
+		if (loadingJob?.isActive == true || loadingPrevJob?.isActive == true) {
+			return
+		}
+		loadingPrevJob = loadPrevNextChapter(isNext = false)
+	}
+
+	fun loadNextChapter() {
+		if (loadingJob?.isActive == true || loadingNextJob?.isActive == true) {
+			return
+		}
+		loadingNextJob = loadPrevNextChapter(isNext = true)
+	}
+
+	private suspend fun doInit(state: State) {
+		chaptersLoader.init(state.details)
+		val initialChapterId = state.history?.chapterId ?: state.details.allChapters.firstOrNull()?.id ?: return
+		if (!chaptersLoader.hasPages(initialChapterId)) {
+			chaptersLoader.loadSingleChapter(initialChapterId)
+		}
+		updateList(state.history)
+	}
+
+	private fun loadPrevNextChapter(isNext: Boolean): Job = launchJob(Dispatchers.Default) {
+		val indicator = if (isNext) isLoadingDown else isLoadingUp
+		indicator.value = true
+		try {
+			val currentState = state.firstNotNull()
+			val currentId = (if (isNext) chaptersLoader.last() else chaptersLoader.first()).chapterId
+			chaptersLoader.loadPrevNextChapter(currentState.details, currentId, isNext)
+			updateList(currentState.history)
+		} finally {
+			indicator.value = false
+		}
+	}
+
+	private fun updateList(history: MangaHistory?) {
+		val snapshot = chaptersLoader.snapshot()
+		val pages = buildList(snapshot.size + chaptersLoader.size + 2) {
+			var previousChapterId = 0L
+			for (page in snapshot) {
+				if (page.chapterId != previousChapterId) {
+					chaptersLoader.peekChapter(page.chapterId)?.let {
+						add(ListHeader(it.name))
+					}
+					previousChapterId = page.chapterId
+				}
+				this += PageThumbnail(
+					isCurrent = history?.let {
+						page.chapterId == it.chapterId && page.index == it.page
+					} ?: false,
+					page = page,
+				)
+			}
+		}
+		thumbnails.value = pages
+	}
+
+	data class State(
+		val details: MangaDetails,
+		val history: MangaHistory?,
+		val branch: String?
+	)
+}

app/src/main/kotlin/org/koitharu/kotatsu/download/domain/DownloadState.kt

@@ -4,7 +4,7 @@ import androidx.work.Data
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.Date
+import java.time.Instant
 
 data class DownloadState(
 	val manga: Manga,
@@ -72,7 +72,7 @@ data class DownloadState(
 
 		fun getEta(data: Data): Long = data.getLong(DATA_ETA, -1L)
 
-		fun getTimestamp(data: Data): Date = Date(data.getLong(DATA_TIMESTAMP, 0L))
+		fun getTimestamp(data: Data): Instant = Instant.ofEpochMilli(data.getLong(DATA_TIMESTAMP, 0L))
 
 		fun getDownloadedChapters(data: Data): Int = data.getInt(DATA_CHAPTERS, 0)
 	}

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

@@ -8,7 +8,7 @@ import org.koitharu.kotatsu.download.ui.list.chapters.DownloadChapter
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.Date
+import java.time.Instant
 import java.util.UUID
 
 data class DownloadItemModel(
@@ -21,7 +21,7 @@ data class DownloadItemModel(
 	val max: Int,
 	val progress: Int,
 	val eta: Long,
-	val timestamp: Date,
+	val timestamp: Instant,
 	val chaptersDownloaded: Int,
 	val isExpanded: Boolean,
 	val chapters: StateFlow<List<DownloadChapter>?>,

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

@@ -28,8 +28,8 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
+import org.koitharu.kotatsu.core.util.ext.calculateTimeAgo
 import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.core.util.ext.isEmpty
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.download.ui.list.chapters.DownloadChapter
@@ -44,10 +44,8 @@ import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import java.util.Date
 import java.util.LinkedList
 import java.util.UUID
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @HiltViewModel
@@ -225,7 +223,7 @@ class DownloadsViewModel @Inject constructor(
 				WorkInfo.State.ENQUEUED -> queued += item
 
 				else -> {
-					val date = timeAgo(item.timestamp)
+					val date = calculateTimeAgo(item.timestamp)
 					if (prevDate != date) {
 						destination += ListHeader(date)
 					}
@@ -275,19 +273,6 @@ class DownloadsViewModel @Inject constructor(
 		)
 	}
 
-	private fun timeAgo(date: Date): DateTimeAgo {
-		val diff = (System.currentTimeMillis() - date.time).coerceAtLeast(0L)
-		val diffMinutes = TimeUnit.MILLISECONDS.toMinutes(diff).toInt()
-		val diffDays = -date.daysDiff(System.currentTimeMillis())
-		return when {
-			diffMinutes < 3 -> DateTimeAgo.JustNow
-			diffDays < 1 -> DateTimeAgo.Today
-			diffDays == 1 -> DateTimeAgo.Yesterday
-			diffDays < 6 -> DateTimeAgo.DaysAgo(diffDays)
-			else -> DateTimeAgo.Absolute(date)
-		}
-	}
-
 	private fun emptyStateList() = listOf(
 		EmptyState(
 			icon = R.drawable.ic_empty_common,

app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt

@@ -76,12 +76,9 @@ class ExploreRepository @Inject constructor(
 		}
 		val list = repository.getList(
 			offset = 0,
-			filter = MangaListFilter.Advanced(
-				sortOrder = order,
-				tags = setOfNotNull(tag),
-				locale = null,
-				states = emptySet(),
-			),
+			filter = MangaListFilter.Advanced.Builder(order)
+				.tags(setOfNotNull(tag))
+				.build(),
 		).asArrayList()
 		if (settings.isSuggestionsExcludeNsfw) {
 			list.removeAll { it.isNsfw }

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

@@ -160,7 +160,7 @@ class ExploreFragment :
 	override fun onRetryClick(error: Throwable) = Unit
 
 	override fun onEmptyActionClick() {
-		startActivity(SettingsActivity.newManageSourcesIntent(context ?: return))
+		startActivity(Intent(context ?: return, SourcesCatalogActivity::class.java))
 	}
 
 	private fun onOpenManga(manga: Manga) {

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

@@ -21,7 +21,6 @@ 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.explore.data.MangaSourcesRepository
-import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 import org.koitharu.kotatsu.explore.domain.ExploreRepository
 import org.koitharu.kotatsu.explore.ui.model.ExploreButtons
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
@@ -30,7 +29,6 @@ import org.koitharu.kotatsu.list.ui.model.EmptyHint
 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.list.ui.model.TipModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -56,8 +54,6 @@ class ExploreViewModel @Inject constructor(
 		valueProducer = { isSuggestionsEnabled },
 	)
 
-	val sortOrder = MutableStateFlow(SourcesSortOrder.MANUAL) // TODO
-
 	val onOpenManga = MutableEventFlow<Manga>()
 	val onActionDone = MutableEventFlow<ReversibleAction>()
 	val onShowSuggestionsTip = MutableEventFlow<Unit>()
@@ -129,31 +125,25 @@ class ExploreViewModel @Inject constructor(
 		randomLoading: Boolean,
 		newSources: Set<MangaSource>,
 	): List<ListModel> {
-		val result = ArrayList<ListModel>(sources.size + 4)
+		val result = ArrayList<ListModel>(sources.size + 3)
 		result += ExploreButtons(randomLoading)
 		if (recommendation != null) {
 			result += ListHeader(R.string.suggestions)
 			result += RecommendationsItem(recommendation)
 		}
 		if (sources.isNotEmpty()) {
-			result += ListHeader(R.string.remote_sources, R.string.catalog)
-			if (newSources.isNotEmpty()) {
-				result += TipModel(
-					key = TIP_NEW_SOURCES,
-					title = R.string.new_sources_text,
-					text = R.string.new_sources_text,
-					icon = R.drawable.ic_explore_normal,
-					primaryButtonText = R.string.manage,
-					secondaryButtonText = R.string.discard,
-				)
-			}
+			result += ListHeader(
+				textRes = R.string.remote_sources,
+				buttonTextRes = R.string.catalog,
+				badge = if (newSources.isNotEmpty()) "" else null,
+			)
 			sources.mapTo(result) { MangaSourceItem(it, isGrid) }
 		} else {
 			result += EmptyHint(
 				icon = R.drawable.ic_empty_common,
 				textPrimary = R.string.no_manga_sources,
 				textSecondary = R.string.no_manga_sources_text,
-				actionStringRes = R.string.manage,
+				actionStringRes = R.string.catalog,
 			)
 		}
 		return result

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

@@ -1,23 +1,21 @@
 package org.koitharu.kotatsu.explore.ui.adapter
 
-import android.graphics.Color
 import android.view.View
 import androidx.lifecycle.LifecycleOwner
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.getSummary
+import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
+import org.koitharu.kotatsu.core.util.ext.setProgressIcon
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemExploreButtonsBinding
@@ -29,7 +27,6 @@ import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.explore.ui.model.RecommendationsItem
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import com.google.android.material.R as materialR
 
 fun exploreButtonsAD(
 	clickListener: View.OnClickListener,
@@ -44,16 +41,7 @@ fun exploreButtonsAD(
 
 	bind {
 		if (item.isRandomLoading) {
-			val icon = CircularProgressDrawable(context)
-			icon.strokeWidth = context.resources.resolveDp(2f)
-			icon.setColorSchemeColors(
-				context.getThemeColor(
-					materialR.attr.colorPrimary,
-					Color.DKGRAY,
-				),
-			)
-			binding.buttonRandom.icon = icon
-			icon.start()
+			binding.buttonRandom.setProgressIcon()
 		} else {
 			binding.buttonRandom.setIconResource(R.drawable.ic_dice)
 		}
@@ -112,7 +100,7 @@ fun exploreSourceListItemAD(
 	binding.root.setOnContextClickListenerCompat(eventListener)
 
 	bind {
-		binding.textViewTitle.text = item.source.title
+		binding.textViewTitle.text = item.source.getTitle(context)
 		binding.textViewSubtitle.text = item.source.getSummary(context)
 		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
@@ -147,7 +135,7 @@ fun exploreSourceGridItemAD(
 	binding.root.setOnContextClickListenerCompat(eventListener)
 
 	bind {
-		binding.textViewTitle.text = item.source.title
+		binding.textViewTitle.text = item.source.getTitle(context)
 		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Large, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
 			fallback(fallbackIcon)

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

@@ -4,14 +4,14 @@ import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.list.domain.ListSortOrder
-import java.util.Date
+import java.time.Instant
 
 fun FavouriteCategoryEntity.toFavouriteCategory(id: Long = categoryId.toLong()) = FavouriteCategory(
 	id = id,
 	title = title,
 	sortKey = sortKey,
 	order = ListSortOrder(order, ListSortOrder.NEWEST),
-	createdAt = Date(createdAt),
+	createdAt = Instant.ofEpochMilli(createdAt),
 	isTrackingEnabled = track,
 	isVisibleInLibrary = isVisibleInLibrary,
 )

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

@@ -46,6 +46,10 @@ abstract class FavouritesDao {
 	)
 	abstract suspend fun findAll(offset: Int, limit: Int): List<FavouriteManga>
 
+	@Transaction
+	@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>
+
 	@Transaction
 	@Query(
 		"SELECT * FROM favourites WHERE category_id = :categoryId AND deleted_at = 0 " +
@@ -171,9 +175,10 @@ abstract class FavouritesDao {
 		ListSortOrder.RATING -> "manga.rating DESC"
 		ListSortOrder.NEWEST -> "favourites.created_at DESC"
 		ListSortOrder.ALPHABETIC -> "manga.title ASC"
-		ListSortOrder.NEW_CHAPTERS -> "(SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id) DESC"
+		ListSortOrder.ALPHABETIC_REVERSE -> "manga.title DESC"
+		ListSortOrder.NEW_CHAPTERS -> "IFNULL((SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
 		ListSortOrder.UPDATED, // for legacy support
-		ListSortOrder.PROGRESS -> "(SELECT percent FROM history WHERE history.manga_id = manga.manga_id) DESC"
+		ListSortOrder.PROGRESS -> "IFNULL((SELECT percent FROM history WHERE history.manga_id = manga.manga_id), 0) DESC"
 
 		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
 	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,19 +1,17 @@
 package org.koitharu.kotatsu.favourites.ui.list
 
-import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.viewModels
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
-import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.core.util.ext.withArgs
-import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -28,13 +26,6 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 	val categoryId
 		get() = viewModel.categoryId
 
-	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		if (viewModel.categoryId != NO_ID) {
-			addMenuProvider(FavouritesListMenuProvider(binding.root.context, viewModel))
-		}
-	}
-
 	override fun onScrolledToEnd() = Unit
 
 	override fun onFilterClick(view: View?) {
@@ -73,6 +64,18 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 				true
 			}
 
+			R.id.action_mark_current -> {
+				MaterialAlertDialogBuilder(context ?: return false)
+					.setTitle(item.title)
+					.setMessage(R.string.mark_as_completed_prompt)
+					.setNegativeButton(android.R.string.cancel, null)
+					.setPositiveButton(android.R.string.ok) { _, _ ->
+						viewModel.markAsRead(selectedItems)
+						mode.finish()
+					}.show()
+				true
+			}
+
 			else -> super.onActionItemClicked(controller, mode, item)
 		}
 	}

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

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

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

@@ -9,6 +9,8 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
@@ -21,6 +23,7 @@ import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.ARG_CATEGORY_ID
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
+import org.koitharu.kotatsu.history.domain.MarkAsReadUseCase
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
@@ -28,6 +31,7 @@ import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.list.ui.model.toUi
+import org.koitharu.kotatsu.parsers.model.Manga
 import javax.inject.Inject
 
 @HiltViewModel
@@ -35,31 +39,37 @@ class FavouritesListViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	private val repository: FavouritesRepository,
 	private val listExtraProvider: ListExtraProvider,
+	private val markAsReadUseCase: MarkAsReadUseCase,
 	settings: AppSettings,
 	downloadScheduler: DownloadWorker.Scheduler,
 ) : MangaListViewModel(settings, downloadScheduler) {
 
 	val categoryId: Long = savedStateHandle[ARG_CATEGORY_ID] ?: NO_ID
+	private val refreshTrigger = MutableStateFlow(Any())
 
 	override val listMode = settings.observeAsFlow(AppSettings.KEY_LIST_MODE_FAVORITES) { favoritesListMode }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.favoritesListMode)
 
 	val sortOrder: StateFlow<ListSortOrder?> = if (categoryId == NO_ID) {
-		MutableStateFlow(null)
+		settings.observeAsFlow(AppSettings.KEY_FAVORITES_ORDER) {
+			allFavoritesSortOrder
+		}
 	} else {
 		repository.observeCategory(categoryId)
 			.map { it?.order }
-			.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
-	}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	override val content = combine(
 		if (categoryId == NO_ID) {
-			repository.observeAll(ListSortOrder.NEWEST)
+			sortOrder.filterNotNull().flatMapLatest {
+				repository.observeAll(it)
+			}
 		} else {
 			repository.observeAll(categoryId)
 		},
 		listMode,
-	) { list, mode ->
+		refreshTrigger,
+	) { list, mode, _ ->
 		when {
 			list.isEmpty() -> listOf(
 				EmptyState(
@@ -80,10 +90,19 @@ class FavouritesListViewModel @Inject constructor(
 		emit(listOf(it.toErrorState(canRetry = false)))
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
 
-	override fun onRefresh() = Unit
+	override fun onRefresh() {
+		refreshTrigger.value = Any()
+	}
 
 	override fun onRetry() = Unit
 
+	fun markAsRead(items: Set<Manga>) {
+		launchLoadingJob(Dispatchers.Default) {
+			markAsReadUseCase(items)
+			onRefresh()
+		}
+	}
+
 	fun removeFromFavourites(ids: Set<Long>) {
 		if (ids.isEmpty()) {
 			return

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

@@ -41,6 +41,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.list.ui.model.toErrorFooter
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
@@ -67,11 +68,28 @@ class FilterCoordinator @Inject constructor(
 	private val coroutineScope = lifecycle.lifecycleScope
 	private val repository = mangaRepositoryFactory.create(savedStateHandle.require(RemoteListFragment.ARG_SOURCE))
 	private val currentState = MutableStateFlow(
-		MangaListFilter.Advanced(repository.defaultSortOrder, emptySet(), null, emptySet()),
+		MangaListFilter.Advanced(
+			sortOrder = repository.defaultSortOrder,
+			tags = emptySet(),
+			tagsExclude = emptySet(),
+			locale = null,
+			states = emptySet(),
+			contentRating = emptySet(),
+		),
 	)
 	private val localTags = SuspendLazy {
 		dataRepository.findTags(repository.source)
 	}
+	private val tagsFlow = flow {
+		val localTags = localTags.get()
+		emit(PendingData(localTags, isLoading = true, error = null))
+		tryLoadTags()
+			.onSuccess { remoteTags ->
+				emit(PendingData(mergeTags(remoteTags, localTags), isLoading = false, error = null))
+			}.onFailure {
+				emit(PendingData(localTags, isLoading = false, error = it))
+			}
+	}.stateIn(coroutineScope, SharingStarted.WhileSubscribed(5000), PendingData(emptySet(), true, null))
 	private var availableTagsDeferred = loadTagsAsync()
 	private var availableLocalesDeferred = loadLocalesAsync()
 	private var allTagsLoadJob: Job? = null
@@ -96,6 +114,22 @@ class FilterCoordinator @Inject constructor(
 		)
 	}.stateIn(coroutineScope + Dispatchers.Default, SharingStarted.Lazily, loadingProperty())
 
+	override val filterTagsExcluded: StateFlow<FilterProperty<MangaTag>> = if (repository.isTagsExclusionSupported) {
+		combine(
+			currentState.distinctUntilChangedBy { it.tagsExclude },
+			getBottomTagsAsFlow(4),
+		) { state, tags ->
+			FilterProperty(
+				availableItems = tags.items.asArrayList(),
+				selectedItems = state.tagsExclude,
+				isLoading = tags.isLoading,
+				error = tags.error,
+			)
+		}.stateIn(coroutineScope + Dispatchers.Default, SharingStarted.Lazily, loadingProperty())
+	} else {
+		MutableStateFlow(emptyProperty())
+	}
+
 	override val filterSortOrder: StateFlow<FilterProperty<SortOrder>> = combine(
 		currentState.distinctUntilChangedBy { it.sortOrder },
 		flowOf(repository.sortOrders),
@@ -120,6 +154,18 @@ class FilterCoordinator @Inject constructor(
 		)
 	}.stateIn(coroutineScope + Dispatchers.Default, SharingStarted.Lazily, loadingProperty())
 
+	override val filterContentRating: StateFlow<FilterProperty<ContentRating>> = combine(
+		currentState.distinctUntilChangedBy { it.contentRating },
+		flowOf(repository.contentRatings),
+	) { rating, ratings ->
+		FilterProperty(
+			availableItems = ratings.sortedBy { it.ordinal },
+			selectedItems = rating.contentRating,
+			isLoading = false,
+			error = null,
+		)
+	}.stateIn(coroutineScope + Dispatchers.Default, SharingStarted.Lazily, loadingProperty())
+
 	override val filterLocale: StateFlow<FilterProperty<Locale?>> = combine(
 		currentState.distinctUntilChangedBy { it.locale },
 		getLocalesAsFlow(),
@@ -187,7 +233,32 @@ class FilterCoordinator @Inject constructor(
 					emptySet()
 				}
 			}
-			oldValue.copy(tags = newTags)
+			oldValue.copy(
+				tags = newTags,
+				tagsExclude = oldValue.tagsExclude - newTags,
+			)
+		}
+	}
+
+	override fun setTagExcluded(value: MangaTag, addOrRemove: Boolean) {
+		currentState.update { oldValue ->
+			val newTags = if (repository.isMultipleTagsSupported) {
+				if (addOrRemove) {
+					oldValue.tagsExclude + value
+				} else {
+					oldValue.tagsExclude - value
+				}
+			} else {
+				if (addOrRemove) {
+					setOf(value)
+				} else {
+					emptySet()
+				}
+			}
+			oldValue.copy(
+				tagsExclude = newTags,
+				tags = oldValue.tags - newTags
+			)
 		}
 	}
 
@@ -202,6 +273,17 @@ class FilterCoordinator @Inject constructor(
 		}
 	}
 
+	override fun setContentRating(value: ContentRating, addOrRemove: Boolean) {
+		currentState.update { oldValue ->
+			val newRating = if (addOrRemove) {
+				oldValue.contentRating + value
+			} else {
+				oldValue.contentRating - value
+			}
+			oldValue.copy(contentRating = newRating)
+		}
+	}
+
 	override fun onListHeaderClick(item: ListHeader, view: View) {
 		currentState.update { oldValue ->
 			oldValue.copy(
@@ -224,13 +306,16 @@ class FilterCoordinator @Inject constructor(
 
 	fun setTags(tags: Set<MangaTag>) {
 		currentState.update { oldValue ->
-			oldValue.copy(tags = tags)
+			oldValue.copy(
+				tags = tags,
+				tagsExclude = oldValue.tagsExclude - tags
+			)
 		}
 	}
 
 	fun reset() {
 		currentState.update { oldValue ->
-			oldValue.copy(oldValue.sortOrder, emptySet(), null, emptySet())
+			MangaListFilter.Advanced.Builder(oldValue.sortOrder).build()
 		}
 	}
 
@@ -248,17 +333,6 @@ class FilterCoordinator @Inject constructor(
 		)
 	}
 
-	private fun getTagsAsFlow() = flow {
-		val localTags = localTags.get()
-		emit(PendingData(localTags, isLoading = true, error = null))
-		tryLoadTags()
-			.onSuccess { remoteTags ->
-				emit(PendingData(mergeTags(remoteTags, localTags), isLoading = false, error = null))
-			}.onFailure {
-				emit(PendingData(localTags, isLoading = false, error = it))
-			}
-	}
-
 	private fun getLocalesAsFlow(): Flow<PendingData<Locale>> = flow {
 		emit(PendingData(emptySet(), isLoading = true, error = null))
 		tryLoadLocales()
@@ -277,7 +351,18 @@ class FilterCoordinator @Inject constructor(
 				searchRepository.getTagsSuggestion(it).take(limit)
 			}
 		},
-		getTagsAsFlow(),
+		tagsFlow,
+	) { suggested, all ->
+		val res = suggested.toMutableList()
+		if (res.size < limit) {
+			res.addAll(all.items.shuffled().take(limit - res.size))
+		}
+		PendingData(res, all.isLoading, all.error.takeIf { res.size < limit })
+	}
+
+	private fun getBottomTagsAsFlow(limit: Int): Flow<PendingData<MangaTag>> = combine(
+		flow { emit(searchRepository.getRareTags(repository.source, limit)) },
+		tagsFlow,
 	) { suggested, all ->
 		val res = suggested.toMutableList()
 		if (res.size < limit) {
@@ -411,6 +496,8 @@ class FilterCoordinator @Inject constructor(
 
 	private fun <T> loadingProperty() = FilterProperty<T>(emptyList(), emptySet(), true, null)
 
+	private fun <T> emptyProperty() = FilterProperty<T>(emptyList(), emptySet(), false, null)
+
 	private class TagTitleComparator(lc: String?) : Comparator<MangaTag> {
 
 		private val collator = lc?.let { Collator.getInstance(Locale(it)) }

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

@@ -37,7 +37,7 @@ class FilterHeaderFragment : BaseFragment<FragmentFilterHeaderBinding>(), ChipsV
 	override fun onChipClick(chip: Chip, data: Any?) {
 		val tag = data as? MangaTag
 		if (tag == null) {
-			TagsCatalogSheet.show(parentFragmentManager)
+			TagsCatalogSheet.show(parentFragmentManager, isExcludeTag = false)
 		} else {
 			filter.setTag(tag, chip.isChecked)
 		}

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

@@ -4,6 +4,7 @@ import kotlinx.coroutines.flow.StateFlow
 import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
@@ -15,10 +16,14 @@ interface MangaFilter : OnFilterChangedListener {
 
 	val filterTags: StateFlow<FilterProperty<MangaTag>>
 
+	val filterTagsExcluded: StateFlow<FilterProperty<MangaTag>>
+
 	val filterSortOrder: StateFlow<FilterProperty<SortOrder>>
 
 	val filterState: StateFlow<FilterProperty<MangaState>>
 
+	val filterContentRating: StateFlow<FilterProperty<ContentRating>>
+
 	val filterLocale: StateFlow<FilterProperty<Locale?>>
 
 	val header: StateFlow<FilterHeaderModel>

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.filter.ui
 
 import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
@@ -14,5 +15,9 @@ interface OnFilterChangedListener : ListHeaderClickListener {
 
 	fun setTag(value: MangaTag, addOrRemove: Boolean)
 
+	fun setTagExcluded(value: MangaTag, addOrRemove: Boolean)
+
 	fun setState(value: MangaState, addOrRemove: Boolean)
+
+	fun setContentRating(value: ContentRating, addOrRemove: Boolean)
 }

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

@@ -18,12 +18,14 @@ import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.parentView
 import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.SheetFilterBinding
 import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.filter.ui.tags.TagsCatalogSheet
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
@@ -31,8 +33,9 @@ import org.koitharu.kotatsu.parsers.util.toTitleCase
 import java.util.Locale
 import com.google.android.material.R as materialR
 
-class FilterSheetFragment :
-	BaseAdaptiveSheet<SheetFilterBinding>(), AdapterView.OnItemSelectedListener, ChipsView.OnChipClickListener {
+class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
+	AdapterView.OnItemSelectedListener,
+	ChipsView.OnChipClickListener {
 
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetFilterBinding {
 		return SheetFilterBinding.inflate(inflater, container, false)
@@ -50,12 +53,16 @@ class FilterSheetFragment :
 		filter.filterSortOrder.observe(viewLifecycleOwner, this::onSortOrderChanged)
 		filter.filterLocale.observe(viewLifecycleOwner, this::onLocaleChanged)
 		filter.filterTags.observe(viewLifecycleOwner, this::onTagsChanged)
+		filter.filterTagsExcluded.observe(viewLifecycleOwner, this::onTagsExcludedChanged)
 		filter.filterState.observe(viewLifecycleOwner, this::onStateChanged)
+		filter.filterContentRating.observe(viewLifecycleOwner, this::onContentRatingChanged)
 
 		binding.spinnerLocale.onItemSelectedListener = this
 		binding.spinnerOrder.onItemSelectedListener = this
 		binding.chipsState.onChipClickListener = this
+		binding.chipsContentRating.onChipClickListener = this
 		binding.chipsGenres.onChipClickListener = this
+		binding.chipsGenresExclude.onChipClickListener = this
 	}
 
 	override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
@@ -72,8 +79,14 @@ class FilterSheetFragment :
 		val filter = requireFilter()
 		when (data) {
 			is MangaState -> filter.setState(data, chip.isChecked)
-			is MangaTag -> filter.setTag(data, chip.isChecked)
-			null -> TagsCatalogSheet.show(childFragmentManager)
+			is MangaTag -> if (chip.parentView?.id == R.id.chips_genresExclude) {
+				filter.setTagExcluded(data, chip.isChecked)
+			} else {
+				filter.setTag(data, chip.isChecked)
+			}
+
+			is ContentRating -> filter.setContentRating(data, chip.isChecked)
+			null -> TagsCatalogSheet.show(childFragmentManager, chip.parentView?.id == R.id.chips_genresExclude)
 		}
 	}
 
@@ -166,6 +179,51 @@ class FilterSheetFragment :
 		b.chipsGenres.setChips(chips)
 	}
 
+	private fun onTagsExcludedChanged(value: FilterProperty<MangaTag>) {
+		val b = viewBinding ?: return
+		b.textViewGenresExcludeTitle.isGone = value.isEmpty()
+		b.chipsGenresExclude.isGone = value.isEmpty()
+		if (value.isEmpty()) {
+			return
+		}
+		val chips = ArrayList<ChipsView.ChipModel>(value.selectedItems.size + value.availableItems.size + 1)
+		value.selectedItems.mapTo(chips) { tag ->
+			ChipsView.ChipModel(
+				tint = 0,
+				title = tag.title,
+				icon = 0,
+				isCheckable = true,
+				isChecked = true,
+				data = tag,
+			)
+		}
+		value.availableItems.mapNotNullTo(chips) { tag ->
+			if (tag !in value.selectedItems) {
+				ChipsView.ChipModel(
+					tint = 0,
+					title = tag.title,
+					icon = 0,
+					isCheckable = true,
+					isChecked = false,
+					data = tag,
+				)
+			} else {
+				null
+			}
+		}
+		chips.add(
+			ChipsView.ChipModel(
+				tint = 0,
+				title = getString(R.string.more),
+				icon = materialR.drawable.abc_ic_menu_overflow_material,
+				isCheckable = false,
+				isChecked = false,
+				data = null,
+			),
+		)
+		b.chipsGenresExclude.setChips(chips)
+	}
+
 	private fun onStateChanged(value: FilterProperty<MangaState>) {
 		val b = viewBinding ?: return
 		b.textViewStateTitle.isGone = value.isEmpty()
@@ -186,6 +244,26 @@ class FilterSheetFragment :
 		b.chipsState.setChips(chips)
 	}
 
+	private fun onContentRatingChanged(value: FilterProperty<ContentRating>) {
+		val b = viewBinding ?: return
+		b.textViewContentRatingTitle.isGone = value.isEmpty()
+		b.chipsContentRating.isGone = value.isEmpty()
+		if (value.isEmpty()) {
+			return
+		}
+		val chips = value.availableItems.map { contentRating ->
+			ChipsView.ChipModel(
+				tint = 0,
+				title = getString(contentRating.titleResId),
+				icon = 0,
+				isCheckable = true,
+				isChecked = contentRating in value.selectedItems,
+				data = contentRating,
+			)
+		}
+		b.chipsContentRating.setChips(chips)
+	}
+
 	private fun requireFilter() = (requireActivity() as FilterOwner).filter
 
 	companion object {

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

@@ -19,6 +19,7 @@ import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetCallback
 import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.showDistinct
+import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.SheetTagsBinding
 import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.filter.ui.model.TagCatalogItem
@@ -30,7 +31,10 @@ class TagsCatalogSheet : BaseAdaptiveSheet<SheetTagsBinding>(), OnListItemClickL
 	private val viewModel by viewModels<TagsCatalogViewModel>(
 		extrasProducer = {
 			defaultViewModelCreationExtras.withCreationCallback<TagsCatalogViewModel.Factory> { factory ->
-				factory.create((requireActivity() as FilterOwner).filter)
+				factory.create(
+					filter = (requireActivity() as FilterOwner).filter,
+					isExcludeTag = requireArguments().getBoolean(ARG_EXCLUDE),
+				)
 			}
 		},
 	)
@@ -54,8 +58,7 @@ class TagsCatalogSheet : BaseAdaptiveSheet<SheetTagsBinding>(), OnListItemClickL
 	}
 
 	override fun onItemClick(item: TagCatalogItem, view: View) {
-		val filter = (requireActivity() as FilterOwner).filter
-		filter.setTag(item.tag, !item.isChecked)
+		viewModel.handleTagClick(item.tag, item.isChecked)
 	}
 
 	override fun onFocusChange(v: View?, hasFocus: Boolean) {
@@ -90,7 +93,10 @@ class TagsCatalogSheet : BaseAdaptiveSheet<SheetTagsBinding>(), OnListItemClickL
 	companion object {
 
 		private const val TAG = "TagsCatalogSheet"
+		private const val ARG_EXCLUDE = "exclude"
 
-		fun show(fm: FragmentManager) = TagsCatalogSheet().showDistinct(fm, TAG)
+		fun show(fm: FragmentManager, isExcludeTag: Boolean) = TagsCatalogSheet().withArgs(1) {
+			putBoolean(ARG_EXCLUDE, isExcludeTag)
+		}.showDistinct(fm, TAG)
 	}
 }

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

@@ -8,29 +8,32 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.core.parser.MangaDataRepository
-import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.filter.ui.MangaFilter
+import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.filter.ui.model.TagCatalogItem
 import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.parsers.model.MangaTag
 
 @HiltViewModel(assistedFactory = TagsCatalogViewModel.Factory::class)
 class TagsCatalogViewModel @AssistedInject constructor(
-	@Assisted filter: MangaFilter,
-	mangaRepositoryFactory: MangaRepository.Factory,
-	dataRepository: MangaDataRepository,
+	@Assisted private val filter: MangaFilter,
+	@Assisted private val isExcluded: Boolean,
 ) : BaseViewModel() {
 
 	val searchQuery = MutableStateFlow("")
 
+	private val filterProperty: StateFlow<FilterProperty<MangaTag>>
+		get() = if (isExcluded) filter.filterTagsExcluded else filter.filterTags
+
 	private val tags = combine(
 		filter.allTags,
-		filter.filterTags.map { it.selectedItems },
+		filterProperty.map { it.selectedItems },
 	) { all, selected ->
 		all.map { x ->
 			if (x is TagCatalogItem) {
@@ -52,9 +55,17 @@ class TagsCatalogViewModel @AssistedInject constructor(
 		}
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, listOf(LoadingState))
 
+	fun handleTagClick(tag: MangaTag, isChecked: Boolean) {
+		if (isExcluded) {
+			filter.setTagExcluded(tag, !isChecked)
+		} else {
+			filter.setTag(tag, !isChecked)
+		}
+	}
+
 	@AssistedFactory
 	interface Factory {
-		fun create(filter: MangaFilter): TagsCatalogViewModel
+		fun create(filter: MangaFilter, isExcludeTag: Boolean): TagsCatalogViewModel
 	}
 
 }

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

@@ -1,13 +1,13 @@
 package org.koitharu.kotatsu.history.data
 
 import org.koitharu.kotatsu.core.model.MangaHistory
-import java.util.*
+import java.time.Instant
 
 fun HistoryEntity.toMangaHistory() = MangaHistory(
-	createdAt = Date(createdAt),
-	updatedAt = Date(updatedAt),
+	createdAt = Instant.ofEpochMilli(createdAt),
+	updatedAt = Instant.ofEpochMilli(updatedAt),
 	chapterId = chapterId,
 	page = page,
 	scroll = scroll.toInt(),
 	percent = percent,
-)
+)

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

@@ -39,7 +39,8 @@ abstract class HistoryDao {
 			ListSortOrder.NEWEST -> "history.created_at DESC"
 			ListSortOrder.PROGRESS -> "history.percent DESC"
 			ListSortOrder.ALPHABETIC -> "manga.title"
-			ListSortOrder.NEW_CHAPTERS -> "(SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id) DESC"
+			ListSortOrder.ALPHABETIC_REVERSE -> "manga.title DESC"
+			ListSortOrder.NEW_CHAPTERS -> "IFNULL((SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
 			else -> throw IllegalArgumentException("Sort order $order is not supported")
 		}
 

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

@@ -0,0 +1,49 @@
+package org.koitharu.kotatsu.history.domain
+
+import dagger.Reusable
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.supervisorScope
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import javax.inject.Inject
+
+@Reusable
+class MarkAsReadUseCase @Inject constructor(
+	private val historyRepository: HistoryRepository,
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+) {
+
+	suspend operator fun invoke(manga: Manga) {
+		val repo = mangaRepositoryFactory.create(manga.source)
+		val details = if (manga.chapters.isNullOrEmpty()) {
+			repo.getDetails(manga)
+		} else {
+			manga
+		}
+		val lastChapter = checkNotNull(details.chapters).last()
+		val pages = repo.getPages(lastChapter)
+		historyRepository.addOrUpdate(
+			manga = details,
+			chapterId = lastChapter.id,
+			page = pages.lastIndex,
+			scroll = 0,
+			percent = 1f,
+		)
+	}
+
+	suspend operator fun invoke(manga: Collection<Manga>) {
+		when (manga.size) {
+			0 -> Unit
+			1 -> invoke(manga.first())
+			else -> supervisorScope {
+				manga.map {
+					launch {
+						invoke(it)
+					}
+				}.joinAll()
+			}
+		}
+	}
+}

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

@@ -5,6 +5,7 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.view.ActionMode
 import androidx.fragment.app.viewModels
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkManageIntent
@@ -54,6 +55,18 @@ class HistoryListFragment : MangaListFragment() {
 				true
 			}
 
+			R.id.action_mark_current -> {
+				MaterialAlertDialogBuilder(context ?: return false)
+					.setTitle(item.title)
+					.setMessage(R.string.mark_as_completed_prompt)
+					.setNegativeButton(android.R.string.cancel, null)
+					.setPositiveButton(android.R.string.ok) { _, _ ->
+						viewModel.markAsRead(selectedItems)
+						mode.finish()
+					}.show()
+				true
+			}
+
 			else -> super.onActionItemClicked(controller, mode, item)
 		}
 	}

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

@@ -8,9 +8,10 @@ import androidx.core.view.MenuProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.dialog.RememberSelectionDialogListener
-import org.koitharu.kotatsu.core.util.ext.startOfDay
-import java.util.Date
-import java.util.concurrent.TimeUnit
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.temporal.ChronoUnit
 import com.google.android.material.R as materialR
 
 class HistoryListMenuProvider(
@@ -50,9 +51,9 @@ class HistoryListMenuProvider(
 			.setNegativeButton(android.R.string.cancel, null)
 			.setPositiveButton(R.string.clear) { _, _ ->
 				val minDate = when (selectionListener.selection) {
-					0 -> System.currentTimeMillis() - TimeUnit.HOURS.toMillis(2)
-					1 -> Date().startOfDay()
-					2 -> 0L
+					0 -> Instant.now().minus(2, ChronoUnit.HOURS)
+					1 -> LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()
+					2 -> Instant.EPOCH
 					else -> return@setPositiveButton
 				}
 				viewModel.clearHistory(minDate)

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

@@ -19,13 +19,13 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
-import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
+import org.koitharu.kotatsu.core.util.ext.calculateTimeAgo
 import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.core.util.ext.onFirst
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.history.domain.MarkAsReadUseCase
 import org.koitharu.kotatsu.history.domain.model.MangaWithHistory
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.domain.ListSortOrder
@@ -40,8 +40,8 @@ import org.koitharu.kotatsu.list.ui.model.toGridModel
 import org.koitharu.kotatsu.list.ui.model.toListDetailedModel
 import org.koitharu.kotatsu.list.ui.model.toListModel
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
-import java.util.Date
-import java.util.concurrent.TimeUnit
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.time.Instant
 import javax.inject.Inject
 
 @HiltViewModel
@@ -50,6 +50,7 @@ class HistoryListViewModel @Inject constructor(
 	settings: AppSettings,
 	private val extraProvider: ListExtraProvider,
 	private val localMangaRepository: LocalMangaRepository,
+	private val markAsReadUseCase: MarkAsReadUseCase,
 	networkState: NetworkState,
 	downloadScheduler: DownloadWorker.Scheduler,
 ) : MangaListViewModel(settings, downloadScheduler) {
@@ -100,13 +101,13 @@ class HistoryListViewModel @Inject constructor(
 
 	override fun onRetry() = Unit
 
-	fun clearHistory(minDate: Long) {
+	fun clearHistory(minDate: Instant) {
 		launchJob(Dispatchers.Default) {
-			val stringRes = if (minDate <= 0) {
+			val stringRes = if (minDate <= Instant.EPOCH) {
 				repository.clear()
 				R.string.history_cleared
 			} else {
-				repository.deleteAfter(minDate)
+				repository.deleteAfter(minDate.toEpochMilli())
 				R.string.removed_from_history
 			}
 			onActionDone.call(ReversibleAction(stringRes, null))
@@ -123,6 +124,12 @@ class HistoryListViewModel @Inject constructor(
 		}
 	}
 
+	fun markAsRead(items: Set<Manga>) {
+		launchLoadingJob(Dispatchers.Default) {
+			markAsReadUseCase(items)
+		}
+	}
+
 	private suspend fun mapList(
 		list: List<MangaWithHistory>,
 		grouped: Boolean,
@@ -165,8 +172,8 @@ class HistoryListViewModel @Inject constructor(
 	}
 
 	private fun MangaHistory.header(order: ListSortOrder): ListHeader? = when (order) {
-		ListSortOrder.UPDATED -> ListHeader(timeAgo(updatedAt))
-		ListSortOrder.NEWEST -> ListHeader(timeAgo(createdAt))
+		ListSortOrder.UPDATED -> ListHeader(calculateTimeAgo(updatedAt))
+		ListSortOrder.NEWEST -> ListHeader(calculateTimeAgo(createdAt))
 		ListSortOrder.PROGRESS -> ListHeader(
 			when (percent) {
 				1f -> R.string.status_completed
@@ -177,22 +184,9 @@ class HistoryListViewModel @Inject constructor(
 		)
 
 		ListSortOrder.ALPHABETIC,
+		ListSortOrder.ALPHABETIC_REVERSE,
 		ListSortOrder.RELEVANCE,
 		ListSortOrder.NEW_CHAPTERS,
 		ListSortOrder.RATING -> null
 	}
-
-	private fun timeAgo(date: Date): DateTimeAgo {
-		val diff = (System.currentTimeMillis() - date.time).coerceAtLeast(0L)
-		val diffMinutes = TimeUnit.MILLISECONDS.toMinutes(diff).toInt()
-		val diffDays = -date.daysDiff(System.currentTimeMillis())
-		return when {
-			diffMinutes < 3 -> DateTimeAgo.JustNow
-			diffDays < 1 -> DateTimeAgo.Today
-			diffDays == 1 -> DateTimeAgo.Yesterday
-			diffDays < 6 -> DateTimeAgo.DaysAgo(diffDays)
-			diffDays < 200 -> DateTimeAgo.MonthsAgo(diffDays / 30)
-			else -> DateTimeAgo.LongAgo
-		}
-	}
 }

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

@@ -13,6 +13,7 @@ enum class ListSortOrder(
 	NEWEST(R.string.order_added),
 	PROGRESS(R.string.progress),
 	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),
@@ -22,8 +23,8 @@ enum class ListSortOrder(
 
 	companion object {
 
-		val HISTORY: Set<ListSortOrder> = EnumSet.of(UPDATED, NEWEST, PROGRESS, ALPHABETIC, NEW_CHAPTERS)
-		val FAVORITES: Set<ListSortOrder> = EnumSet.of(ALPHABETIC, NEWEST, RATING, NEW_CHAPTERS, PROGRESS)
+		val HISTORY: Set<ListSortOrder> = EnumSet.of(UPDATED, NEWEST, PROGRESS, ALPHABETIC, ALPHABETIC_REVERSE, NEW_CHAPTERS)
+		val FAVORITES: Set<ListSortOrder> = EnumSet.of(ALPHABETIC, ALPHABETIC_REVERSE, NEWEST, RATING, NEW_CHAPTERS, PROGRESS)
 		val SUGGESTIONS: Set<ListSortOrder> = EnumSet.of(RELEVANCE)
 
 		operator fun invoke(value: String, fallback: ListSortOrder) = entries.find(value) ?: fallback

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

@@ -171,6 +171,9 @@ abstract class MangaListFragment :
 	private suspend fun onListChanged(list: List<ListModel>) {
 		listAdapter?.emit(list)
 		spanSizeLookup.invalidateCache()
+		viewBinding?.recyclerView?.let {
+			paginationListener?.postInvalidate(it)
+		}
 	}
 
 	private fun resolveException(e: Throwable) {

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

@@ -14,22 +14,37 @@ import com.google.android.material.R as materialR
 
 @CheckResult
 fun View.bindBadge(badge: BadgeDrawable?, counter: Int): BadgeDrawable? {
-	return if (counter > 0) {
-		val badgeDrawable = badge ?: initBadge(this)
-		badgeDrawable.number = counter
-		badgeDrawable.isVisible = true
-		badgeDrawable.align(this)
-		badgeDrawable
-	} else {
-		badge?.isVisible = false
-		badge
-	}
+	return bindBadgeImpl(badge, null, counter)
+}
+
+@CheckResult
+fun View.bindBadge(badge: BadgeDrawable?, text: String?): BadgeDrawable? {
+	return bindBadgeImpl(badge, text, 0)
 }
 
 fun View.clearBadge(badge: BadgeDrawable?) {
 	BadgeUtils.detachBadgeDrawable(badge, this)
 }
 
+private fun View.bindBadgeImpl(
+	badge: BadgeDrawable?,
+	text: String?,
+	counter: Int,
+): BadgeDrawable? = if (text != null || counter > 0) {
+	val badgeDrawable = badge ?: initBadge(this)
+	if (counter > 0) {
+		badgeDrawable.number = counter
+	} else {
+		badgeDrawable.text = text?.takeUnless { it.isEmpty() }
+	}
+	badgeDrawable.isVisible = true
+	badgeDrawable.align(this)
+	badgeDrawable
+} else {
+	badge?.isVisible = false
+	badge
+}
+
 private fun initBadge(anchor: View): BadgeDrawable {
 	val badge = BadgeDrawable.create(anchor.context)
 	val resources = anchor.resources

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.list.ui.adapter
 
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
+import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.databinding.ItemHeaderButtonBinding
 import org.koitharu.kotatsu.list.ui.model.ListHeader
@@ -12,6 +13,8 @@ fun listHeaderAD(
 ) = adapterDelegateViewBinding<ListHeader, ListModel, ItemHeaderButtonBinding>(
 	{ inflater, parent -> ItemHeaderButtonBinding.inflate(inflater, parent, false) },
 ) {
+	var badge: BadgeDrawable? = null
+
 	if (listener != null) {
 		binding.buttonMore.setOnClickListener {
 			listener.onListHeaderClick(item, it)
@@ -23,9 +26,11 @@ fun listHeaderAD(
 		if (item.buttonTextRes == 0) {
 			binding.buttonMore.isInvisible = true
 			binding.buttonMore.text = null
+			binding.buttonMore.clearBadge(badge)
 		} else {
 			binding.buttonMore.setText(item.buttonTextRes)
 			binding.buttonMore.isVisible = true
+			badge = itemView.bindBadge(badge, item.badge)
 		}
 	}
 }

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

@@ -9,6 +9,7 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
@@ -65,7 +66,11 @@ class ListConfigViewModel @Inject constructor(
 		val value = getSortOrders()?.getOrNull(position) ?: return
 		when (section) {
 			is ListConfigSection.Favorites -> launchJob {
-				favouritesRepository.setCategoryOrder(section.categoryId, value)
+				if (section.categoryId == NO_ID) {
+					settings.allFavoritesSortOrder = value
+				} else {
+					favouritesRepository.setCategoryOrder(section.categoryId, value)
+				}
 			}
 
 			ListConfigSection.General -> Unit
@@ -75,9 +80,13 @@ class ListConfigViewModel @Inject constructor(
 		}
 	}
 
-	private fun getCategorySortOrder(id: Long): ListSortOrder = runBlocking {
+	private fun getCategorySortOrder(id: Long): ListSortOrder = if (id == NO_ID) {
+		settings.allFavoritesSortOrder
+	} else runBlocking {
 		runCatchingCancellable {
 			favouritesRepository.getCategory(id).order
-		}.getOrDefault(ListSortOrder.NEWEST)
+		}.getOrElse {
+			settings.allFavoritesSortOrder
+		}
 	}
 }

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

@@ -6,38 +6,41 @@ import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 
 @Suppress("DataClassPrivateConstructor")
 data class ListHeader private constructor(
-	private val text: CharSequence?,
-	@StringRes private val textRes: Int,
-	private val dateTimeAgo: DateTimeAgo?,
+	private val textRaw: Any,
 	@StringRes val buttonTextRes: Int,
 	val payload: Any?,
+	val badge: String?,
 ) : ListModel {
 
 	constructor(
 		text: CharSequence,
 		@StringRes buttonTextRes: Int = 0,
 		payload: Any? = null,
-	) : this(text, 0, null, buttonTextRes, payload)
+		badge: String? = null,
+	) : this(textRaw = text, buttonTextRes, payload, badge)
 
 	constructor(
 		@StringRes textRes: Int,
 		@StringRes buttonTextRes: Int = 0,
 		payload: Any? = null,
-	) : this(null, textRes, null, buttonTextRes, payload)
+		badge: String? = null,
+	) : this(textRaw = textRes, buttonTextRes, payload, badge)
 
 	constructor(
 		dateTimeAgo: DateTimeAgo,
 		@StringRes buttonTextRes: Int = 0,
 		payload: Any? = null,
-	) : this(null, 0, dateTimeAgo, buttonTextRes, payload)
+		badge: String? = null,
+	) : this(textRaw = dateTimeAgo, buttonTextRes, payload, badge)
 
-	fun getText(context: Context): CharSequence? = when {
-		text != null -> text
-		textRes != 0 -> context.getString(textRes)
-		else -> dateTimeAgo?.format(context.resources)
+	fun getText(context: Context): CharSequence? = when (textRaw) {
+		is CharSequence -> textRaw
+		is Int -> if (textRaw != 0) context.getString(textRaw) else null
+		is DateTimeAgo -> textRaw.format(context.resources)
+		else -> null
 	}
 
 	override fun areItemsTheSame(other: ListModel): Boolean {
-		return other is ListHeader && text == other.text && dateTimeAgo == other.dateTimeAgo && textRes == other.textRes
+		return other is ListHeader && textRaw == other.textRaw
 	}
 }

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

@@ -24,6 +24,7 @@ import org.koitharu.kotatsu.local.data.input.LocalMangaInput
 import org.koitharu.kotatsu.local.data.output.LocalMangaOutput
 import org.koitharu.kotatsu.local.data.output.LocalMangaUtil
 import org.koitharu.kotatsu.local.domain.model.LocalManga
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
@@ -52,8 +53,11 @@ class LocalMangaRepository @Inject constructor(
 	private val locks = CompositeMutex2<Long>()
 
 	override val isMultipleTagsSupported: Boolean = true
+	override val isTagsExclusionSupported: Boolean = true
+	override val isSearchSupported: Boolean = true
 	override val sortOrders: Set<SortOrder> = EnumSet.of(SortOrder.ALPHABETICAL, SortOrder.RATING, SortOrder.NEWEST)
 	override val states = emptySet<MangaState>()
+	override val contentRatings = emptySet<ContentRating>()
 
 	override var defaultSortOrder: SortOrder
 		get() = settings.localListOrder
@@ -75,6 +79,9 @@ class LocalMangaRepository @Inject constructor(
 				if (filter.tags.isNotEmpty()) {
 					list.retainAll { x -> x.containsTags(filter.tags) }
 				}
+				if (filter.tagsExclude.isNotEmpty()) {
+					list.removeAll { x -> x.containsAnyTag(filter.tags) }
+				}
 				when (filter.sortOrder) {
 					SortOrder.ALPHABETICAL -> list.sortWith(compareBy(AlphanumComparator()) { x -> x.manga.title })
 					SortOrder.RATING -> list.sortByDescending { it.manga.rating }

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.local.data
 
 import android.content.Context
+import android.graphics.Bitmap
 import android.os.StatFs
 import com.tomclaw.cache.DiskLruCache
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -10,15 +11,17 @@ import kotlinx.coroutines.withContext
 import okio.Source
 import okio.buffer
 import okio.sink
+import okio.use
 import org.koitharu.kotatsu.core.util.FileSize
+import org.koitharu.kotatsu.core.util.ext.compressToPNG
 import org.koitharu.kotatsu.core.util.ext.longHashCode
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.subdir
 import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.util.ext.takeIfWriteable
 import org.koitharu.kotatsu.core.util.ext.writeAllCancellable
 import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -66,6 +69,16 @@ class PagesCache @Inject constructor(@ApplicationContext context: Context) {
 		}
 	}
 
+	suspend fun put(url: String, bitmap: Bitmap): File = withContext(Dispatchers.IO) {
+		val file = File(cacheDir.get().parentFile, url.longHashCode().toString())
+		try {
+			bitmap.compressToPNG(file)
+			lruCache.get().put(url, file)
+		} finally {
+			file.delete()
+		}
+	}
+
 	private suspend fun getAvailableSize(): Long = runCatchingCancellable {
 		val statFs = StatFs(cacheDir.get().absolutePath)
 		statFs.availableBytes

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

@@ -47,7 +47,7 @@ class SingleMangaImporter @Inject constructor(
 		val contentResolver = storageManager.contentResolver
 		val name = contentResolver.resolveName(uri) ?: throw IOException("Cannot fetch name from uri: $uri")
 		if (!hasCbzExtension(name)) {
-			throw UnsupportedFileException("Unsupported file on $uri")
+			throw UnsupportedFileException("Unsupported file $name on $uri")
 		}
 		val dest = File(getOutputDir(), name)
 		runInterruptible {

app/src/main/kotlin/org/koitharu/kotatsu/local/domain/model/LocalManga.kt

@@ -30,6 +30,12 @@ data class LocalManga(
 		return manga.tags.containsAll(tags)
 	}
 
+	fun containsAnyTag(tags: Set<MangaTag>): Boolean {
+		return tags.any { tag ->
+			manga.tags.contains(tag)
+		}
+	}
+
 	override fun toString(): String {
 		return "LocalManga(${file.path}: ${manga.title})"
 	}

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

@@ -13,9 +13,14 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.AlertDialogFragment
 import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.databinding.DialogImportBinding
+import org.koitharu.kotatsu.local.data.LocalStorageManager
+import javax.inject.Inject
 
 class ImportDialogFragment : AlertDialogFragment<DialogImportBinding>(), View.OnClickListener {
 
+	@Inject
+	lateinit var storageManager: LocalStorageManager
+
 	private val importFileCall = registerForActivityResult(ActivityResultContracts.OpenMultipleDocuments()) {
 		startImport(it)
 	}
@@ -55,6 +60,9 @@ class ImportDialogFragment : AlertDialogFragment<DialogImportBinding>(), View.On
 		if (uris.isEmpty()) {
 			return
 		}
+		uris.forEach {
+			storageManager.takePermissions(it)
+		}
 		val ctx = requireContext()
 		ImportWorker.start(ctx, uris)
 		Toast.makeText(ctx, R.string.import_will_start_soon, Toast.LENGTH_LONG).show()

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

@@ -26,6 +26,15 @@ import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 
 class LocalListFragment : MangaListFragment(), FilterOwner {
 
+	init {
+		withArgs(1) {
+			putSerializable(
+				RemoteListFragment.ARG_SOURCE,
+				MangaSource.LOCAL,
+			) // required by FilterCoordinator
+		}
+	}
+
 	override val viewModel by viewModels<LocalListViewModel>()
 
 	override val filter: MangaFilter
@@ -97,14 +106,4 @@ class LocalListFragment : MangaListFragment(), FilterOwner {
 			Snackbar.LENGTH_SHORT,
 		).show()
 	}
-
-	companion object {
-
-		fun newInstance() = LocalListFragment().withArgs(1) {
-			putSerializable(
-				RemoteListFragment.ARG_SOURCE,
-				MangaSource.LOCAL,
-			) // required by FilterCoordinator
-		}
-	}
 }

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

@@ -13,8 +13,6 @@ import androidx.appcompat.view.ActionMode
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
@@ -47,7 +45,6 @@ import org.koitharu.kotatsu.core.util.ext.hideKeyboard
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
-import org.koitharu.kotatsu.core.util.ext.setNavigationBarTransparentCompat
 import org.koitharu.kotatsu.databinding.ActivityMainBinding
 import org.koitharu.kotatsu.details.service.MangaPrefetchService
 import org.koitharu.kotatsu.details.ui.DetailsActivity
@@ -98,17 +95,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityMainBinding.inflate(layoutInflater))
 
-		if (bottomNav != null) {
-			ViewCompat.setOnApplyWindowInsetsListener(viewBinding.root) { _, insets ->
-				if (insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom > 0) {
-					val elevation = bottomNav?.elevation ?: 0f
-					window.setNavigationBarTransparentCompat(this@MainActivity, elevation)
-				}
-				insets
-			}
-			ViewCompat.requestApplyInsets(viewBinding.root)
-		}
-
 		with(viewBinding.searchView) {
 			onFocusChangeListener = this@MainActivity
 			searchSuggestionListener = this@MainActivity
@@ -139,7 +125,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.container, null))
 		viewModel.isLoading.observe(this, this::onLoadingStateChanged)
 		viewModel.isResumeEnabled.observe(this, this::onResumeEnabledChanged)
-		viewModel.counters.observe(this, ::onCountersChanged)
+		viewModel.feedCounter.observe(this, ::onFeedCounterChanged)
 		viewModel.appUpdate.observe(this, MenuInvalidator(this))
 		viewModel.onFirstStart.observeEvent(this) {
 			WelcomeSheet.show(supportFragmentManager)
@@ -292,10 +278,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		startActivity(IntentBuilder(this).manga(manga).build(), options)
 	}
 
-	private fun onCountersChanged(counters: Map<NavItem, Int>) {
-		counters.forEach { (navItem, counter) ->
-			navigationDelegate.setCounter(navItem, counter)
-		}
+	private fun onFeedCounterChanged(counter: Int) {
+		navigationDelegate.setCounter(NavItem.FEED, counter)
 	}
 
 	private fun onIncognitoModeChanged(isIncognito: Boolean) {

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

@@ -134,13 +134,13 @@ class MainNavigationDelegate(
 	private fun onNavigationItemSelected(@IdRes itemId: Int): Boolean {
 		return setPrimaryFragment(
 			when (itemId) {
-				R.id.nav_history -> HistoryListFragment()
-				R.id.nav_favorites -> FavouritesContainerFragment()
-				R.id.nav_explore -> ExploreFragment()
-				R.id.nav_feed -> FeedFragment()
-				R.id.nav_local -> LocalListFragment.newInstance()
-				R.id.nav_suggestions -> SuggestionsFragment()
-				R.id.nav_bookmarks -> BookmarksFragment()
+				R.id.nav_history -> HistoryListFragment::class.java
+				R.id.nav_favorites -> FavouritesContainerFragment::class.java
+				R.id.nav_explore -> ExploreFragment::class.java
+				R.id.nav_feed -> FeedFragment::class.java
+				R.id.nav_local -> LocalListFragment::class.java
+				R.id.nav_suggestions -> SuggestionsFragment::class.java
+				R.id.nav_bookmarks -> BookmarksFragment::class.java
 				else -> return false
 			},
 		)
@@ -157,16 +157,17 @@ class MainNavigationDelegate(
 		else -> 0
 	}
 
-	private fun setPrimaryFragment(fragment: Fragment): Boolean {
-		if (fragmentManager.isStateSaved) {
+	private fun setPrimaryFragment(fragmentClass: Class<out Fragment>): Boolean {
+		if (fragmentManager.isStateSaved || fragmentClass.isInstance(primaryFragment)) {
 			return false
 		}
+		val fragment = instantiateFragment(fragmentClass)
 		fragment.enterTransition = MaterialFadeThrough()
 		fragmentManager.beginTransaction()
 			.setReorderingAllowed(true)
-			.replace(R.id.container, fragment, TAG_PRIMARY)
+			.replace(R.id.container, fragmentClass, null, TAG_PRIMARY)
+			.runOnCommit { onFragmentChanged(fragment, fromUser = true) }
 			.commit()
-		onFragmentChanged(fragment, fromUser = true)
 		return true
 	}
 
@@ -182,6 +183,11 @@ class MainNavigationDelegate(
 		}
 	}
 
+	private fun instantiateFragment(fragmentClass: Class<out Fragment>): Fragment {
+		val classLoader = navBar.context.classLoader
+		return fragmentManager.fragmentFactory.instantiate(classLoader, fragmentClass.name)
+	}
+
 	private fun observeSettings(lifecycleOwner: LifecycleOwner) {
 		settings.observe()
 			.filter { x -> x == AppSettings.KEY_TRACKER_ENABLED || x == AppSettings.KEY_SUGGESTIONS }

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

@@ -4,15 +4,11 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.github.AppUpdateRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.NavItem
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
@@ -22,7 +18,6 @@ import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.main.domain.ReadingResumeEnabledUseCase
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
-import java.util.EnumMap
 import javax.inject.Inject
 
 @HiltViewModel
@@ -52,19 +47,8 @@ class MainViewModel @Inject constructor(
 
 	val appUpdate = appUpdateRepository.observeAvailableUpdate()
 
-	val counters = combine(
-		trackingRepository.observeUpdatedMangaCount(),
-		observeNewSourcesCount(),
-	) { tracks, newSources ->
-		val em = EnumMap<NavItem, Int>(NavItem::class.java)
-		em[NavItem.EXPLORE] = newSources
-		em[NavItem.FEED] = tracks
-		em
-	}.stateIn(
-		scope = viewModelScope + Dispatchers.Default,
-		started = SharingStarted.WhileSubscribed(5000),
-		initialValue = emptyMap<NavItem, Int>(),
-	)
+	val feedCounter = trackingRepository.observeUpdatedMangaCount()
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, 0)
 
 	init {
 		launchJob {
@@ -87,8 +71,4 @@ class MainViewModel @Inject constructor(
 	fun setIncognitoMode(isEnabled: Boolean) {
 		settings.isIncognitoModeEnabled = isEnabled
 	}
-
-	private fun observeNewSourcesCount() = sourcesRepository.observeNewSources()
-		.map { if (sourcesRepository.isSetupRequired()) 0 else it.size }
-		.distinctUntilChanged()
 }

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.reader.domain
 
 import androidx.collection.LongSparseArray
+import androidx.collection.contains
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 
 class ChapterPages private constructor(private val pages: ArrayDeque<ReaderPage>) : List<ReaderPage> by pages {
@@ -57,6 +58,8 @@ class ChapterPages private constructor(private val pages: ArrayDeque<ReaderPage>
 		return pages.subList(range.first, range.last + 1)
 	}
 
+	operator fun contains(chapterId: Long)  = indices.contains(chapterId)
+
 	private fun shiftIndices(delta: Int) {
 		for (i in 0 until indices.size()) {
 			val range = indices.valueAt(i)

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

@@ -67,6 +67,10 @@ class ChaptersLoader @Inject constructor(
 
 	fun peekChapter(chapterId: Long): MangaChapter? = chapters[chapterId]
 
+	fun hasPages(chapterId: Long): Boolean {
+		return chapterId in chapterPages
+	}
+
 	fun getPages(chapterId: Long): List<ReaderPage> {
 		return chapterPages.subList(chapterId)
 	}

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

@@ -1,15 +1,14 @@
 package org.koitharu.kotatsu.reader.domain
 
 import android.content.Context
-import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
 import androidx.annotation.AnyThread
 import androidx.collection.LongSparseArray
 import androidx.collection.set
+import androidx.core.net.toFile
 import androidx.core.net.toUri
 import dagger.hilt.android.ActivityRetainedLifecycle
-import dagger.hilt.android.lifecycle.RetainedLifecycle
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ActivityRetainedScoped
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -26,6 +25,7 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.sync.withPermit
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import okio.use
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
@@ -35,6 +35,8 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
 import org.koitharu.kotatsu.core.util.ext.URI_SCHEME_ZIP
+import org.koitharu.kotatsu.core.util.ext.compressToPNG
+import org.koitharu.kotatsu.core.util.ext.ensureRamAtLeast
 import org.koitharu.kotatsu.core.util.ext.ensureSuccess
 import org.koitharu.kotatsu.core.util.ext.exists
 import org.koitharu.kotatsu.core.util.ext.getCompletionResultOrNull
@@ -49,10 +51,11 @@ import org.koitharu.kotatsu.local.data.isZipUri
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
-import java.io.File
 import java.util.LinkedList
 import java.util.concurrent.atomic.AtomicInteger
+import java.util.zip.ZipFile
 import javax.inject.Inject
+import kotlin.concurrent.Volatile
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
 
@@ -65,11 +68,7 @@ class PageLoader @Inject constructor(
 	private val settings: AppSettings,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val imageProxyInterceptor: ImageProxyInterceptor,
-) : RetainedLifecycle.OnClearedListener {
-
-	init {
-		lifecycle.addOnClearedListener(this)
-	}
+) {
 
 	val loaderScope = RetainedLifecycleCoroutineScope(lifecycle) + InternalErrorHandler() + Dispatchers.Default
 
@@ -77,17 +76,13 @@ class PageLoader @Inject constructor(
 	private val semaphore = Semaphore(3)
 	private val convertLock = Mutex()
 	private val prefetchLock = Mutex()
+
+	@Volatile
 	private var repository: MangaRepository? = null
 	private val prefetchQueue = LinkedList<MangaPage>()
 	private val counter = AtomicInteger(0)
 	private var prefetchQueueLimit = PREFETCH_LIMIT_DEFAULT // TODO adaptive
 
-	override fun onCleared() {
-		synchronized(tasks) {
-			tasks.clear()
-		}
-	}
-
 	fun isPrefetchApplicable(): Boolean {
 		return repository is RemoteMangaRepository
 			&& settings.isPagesPreloadEnabled
@@ -131,21 +126,30 @@ class PageLoader @Inject constructor(
 		return loadPageAsync(page, force).await()
 	}
 
-	suspend fun convertInPlace(file: File) {
-		convertLock.withLock {
-			if (context.ramAvailable < file.length() * 2) {
-				return@withLock
-			}
-			runInterruptible(Dispatchers.Default) {
-				val image = BitmapFactory.decodeFile(file.absolutePath)
-				try {
-					file.outputStream().use { out ->
-						image.compress(Bitmap.CompressFormat.PNG, 100, out)
+	suspend fun convertBimap(uri: Uri): Uri = convertLock.withLock {
+		if (uri.isZipUri()) {
+			val bitmap = runInterruptible(Dispatchers.IO) {
+				ZipFile(uri.schemeSpecificPart).use { zip ->
+					val entry = zip.getEntry(uri.fragment)
+					context.ensureRamAtLeast(entry.size * 2)
+					zip.getInputStream(zip.getEntry(uri.fragment)).use {
+						BitmapFactory.decodeStream(it)
 					}
-				} finally {
-					image.recycle()
 				}
 			}
+			cache.put(uri.toString(), bitmap).toUri()
+		} else {
+			val file = uri.toFile()
+			context.ensureRamAtLeast(file.length() * 2)
+			val image = runInterruptible(Dispatchers.IO) {
+				BitmapFactory.decodeFile(file.absolutePath)
+			}
+			try {
+				image.compressToPNG(file)
+			} finally {
+				image.recycle()
+			}
+			uri
 		}
 	}
 
@@ -197,7 +201,7 @@ class PageLoader @Inject constructor(
 
 	private suspend fun loadPageImpl(page: MangaPage, progress: MutableStateFlow<Float>): Uri = semaphore.withPermit {
 		val pageUrl = getPageUrl(page)
-		check(pageUrl.isNotBlank()) { "Cannot obtain full image url" }
+		check(pageUrl.isNotBlank()) { "Cannot obtain full image url for $page" }
 		val uri = Uri.parse(pageUrl)
 		return if (uri.isZipUri()) {
 			if (uri.scheme == URI_SCHEME_ZIP) {
@@ -237,7 +241,7 @@ class PageLoader @Inject constructor(
 	companion object {
 
 		private const val PROGRESS_UNDEFINED = -1f
-		private const val PREFETCH_LIMIT_DEFAULT = 10
+		private const val PREFETCH_LIMIT_DEFAULT = 6
 		private const val PREFETCH_MIN_RAM_MB = 80L
 
 		fun createPageRequest(page: MangaPage, pageUrl: String) = Request.Builder()

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

@@ -24,8 +24,9 @@ import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
-import java.text.SimpleDateFormat
-import java.util.Date
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
 import com.google.android.material.R as materialR
 
 class ReaderInfoBarView @JvmOverloads constructor(
@@ -36,7 +37,7 @@ class ReaderInfoBarView @JvmOverloads constructor(
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val textBounds = Rect()
-	private val timeFormat = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT)
+	private val timeFormat = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
 	private val timeReceiver = TimeReceiver()
 	private var insetLeft: Int = 0
 	private var insetRight: Int = 0
@@ -52,7 +53,7 @@ class ReaderInfoBarView @JvmOverloads constructor(
 		200,
 	)
 
-	private var timeText = timeFormat.format(Date())
+	private var timeText = timeFormat.format(LocalTime.now())
 	private var text: String = ""
 
 	private val innerHeight
@@ -181,7 +182,7 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	private inner class TimeReceiver : BroadcastReceiver() {
 
 		override fun onReceive(context: Context?, intent: Intent?) {
-			timeText = timeFormat.format(Date())
+			timeText = timeFormat.format(LocalTime.now())
 			invalidate()
 		}
 	}

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

@@ -56,7 +56,7 @@ import org.koitharu.kotatsu.reader.domain.DetectReaderModeUseCase
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
-import java.util.Date
+import java.time.Instant
 import javax.inject.Inject
 
 private const val BOUNDS_PAGE_OFFSET = 2
@@ -302,7 +302,7 @@ class ReaderViewModel @Inject constructor(
 				page = state.page,
 				scroll = state.scroll,
 				imageUrl = page.preview.ifNullOrEmpty { page.url },
-				createdAt = Date(),
+				createdAt = Instant.now(),
 				percent = computePercent(state.chapterId, state.page),
 			)
 			bookmarksRepository.addBookmark(bookmark)

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

@@ -119,9 +119,9 @@ class ColorFilterConfigActivity :
 			.setMessage(R.string.color_correction_apply_text)
 			.setNegativeButton(android.R.string.cancel, null)
 			.setPositiveButton(R.string.this_manga) { _, _ ->
-				viewModel.saveGlobally()
-			}.setNeutralButton(R.string.globally) { _, _ ->
 				viewModel.save()
+			}.setNeutralButton(R.string.globally) { _, _ ->
+				viewModel.saveGlobally()
 			}.show()
 	}
 

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

@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.reader.ui.pager
 
 import android.net.Uri
-import androidx.core.net.toFile
-import androidx.core.net.toUri
 import androidx.lifecycle.Observer
 import com.davemorrissey.labs.subscaleview.DefaultOnImageEventListener
 import kotlinx.coroutines.CancellationException
@@ -139,10 +137,9 @@ class PageHolderDelegate(
 			prevJob?.join()
 			state = State.CONVERTING
 			try {
-				val file = uri.toFile()
-				loader.convertInPlace(file)
+				val newUri = loader.convertBimap(uri)
 				state = State.CONVERTED
-				callback.onImageReady(file.toUri())
+				callback.onImageReady(newUri)
 			} catch (ce: CancellationException) {
 				throw ce
 			} catch (e2: Throwable) {

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

@@ -1,12 +1,10 @@
 package org.koitharu.kotatsu.reader.ui.thumbnails
 
-import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 
 data class PageThumbnail(
 	val isCurrent: Boolean,
-	val repository: MangaRepository,
 	val page: ReaderPage,
 ) : ListModel {
 

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

@@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.stateIn
 import org.koitharu.kotatsu.core.model.findById
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.parser.MangaIntent
-import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.firstNotNull
 import org.koitharu.kotatsu.core.util.ext.require
@@ -26,7 +25,6 @@ import javax.inject.Inject
 @HiltViewModel
 class PagesThumbnailsViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
-	mangaRepositoryFactory: MangaRepository.Factory,
 	private val chaptersLoader: ChaptersLoader,
 	detailsLoadUseCase: DetailsLoadUseCase,
 ) : BaseViewModel() {
@@ -36,14 +34,13 @@ class PagesThumbnailsViewModel @Inject constructor(
 	private val initialChapterId: Long = savedStateHandle[PagesThumbnailsSheet.ARG_CHAPTER_ID] ?: 0L
 	val manga = savedStateHandle.require<ParcelableManga>(PagesThumbnailsSheet.ARG_MANGA).manga
 
-	private val repository = mangaRepositoryFactory.create(manga.source)
 	private val mangaDetails = detailsLoadUseCase(MangaIntent.of(manga)).map {
 		val b = manga.chapters?.findById(initialChapterId)?.branch
 		branch.value = b
 		it.filterChapters(b)
 	}.withErrorHandling()
 		.stateIn(viewModelScope, SharingStarted.Lazily, null)
-	private var loadingJob: Job? = null
+	private var loadingJob: Job
 	private var loadingPrevJob: Job? = null
 	private var loadingNextJob: Job? = null
 
@@ -59,14 +56,14 @@ class PagesThumbnailsViewModel @Inject constructor(
 	}
 
 	fun loadPrevChapter() {
-		if (loadingJob?.isActive == true || loadingPrevJob?.isActive == true) {
+		if (loadingJob.isActive || loadingPrevJob?.isActive == true) {
 			return
 		}
 		loadingPrevJob = loadPrevNextChapter(isNext = false)
 	}
 
 	fun loadNextChapter() {
-		if (loadingJob?.isActive == true || loadingNextJob?.isActive == true) {
+		if (loadingJob.isActive || loadingNextJob?.isActive == true) {
 			return
 		}
 		loadingNextJob = loadPrevNextChapter(isNext = true)
@@ -91,7 +88,6 @@ class PagesThumbnailsViewModel @Inject constructor(
 				}
 				this += PageThumbnail(
 					isCurrent = page.chapterId == initialChapterId && page.index == currentPageIndex,
-					repository = repository,
 					page = page,
 				)
 			}

app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt

@@ -11,6 +11,8 @@ import androidx.core.view.MenuProvider
 import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.drop
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
@@ -44,6 +46,11 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 		viewModel.onOpenManga.observeEvent(viewLifecycleOwner) {
 			startActivity(DetailsActivity.newIntent(binding.root.context, it))
 		}
+		viewModel.header.distinctUntilChangedBy { it.isFilterApplied }
+			.drop(1)
+			.observe(viewLifecycleOwner) {
+				activity?.invalidateMenu()
+			}
 	}
 
 	override fun onScrolledToEnd() {
@@ -94,12 +101,19 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 				true
 			}
 
+			R.id.action_filter_reset -> {
+				viewModel.resetFilter()
+				true
+			}
+
 			else -> false
 		}
 
 		override fun onPrepareMenu(menu: Menu) {
 			super.onPrepareMenu(menu)
+			menu.findItem(R.id.action_search)?.isVisible = viewModel.isSearchAvailable
 			menu.findItem(R.id.action_random)?.isEnabled = !viewModel.isRandomLoading.value
+			menu.findItem(R.id.action_filter_reset)?.isVisible = viewModel.header.value.isFilterApplied
 		}
 
 		override fun onQueryTextSubmit(query: String?): Boolean {

app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt

@@ -68,6 +68,9 @@ open class RemoteListViewModel @Inject constructor(
 	private var loadingJob: Job? = null
 	private var randomJob: Job? = null
 
+	val isSearchAvailable: Boolean
+		get() = repository.isSearchSupported
+
 	override val content = combine(
 		mangaList.map { it?.distinctById()?.skipNsfwIfNeeded() },
 		listMode,