Fix NPE in ListConfigViewModel

Currently translated at 100.0% (7 of 7 strings)

Co-authored-by: Oliullah <shahin1465686@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/bn/
Translation: Kotatsu/plurals

app/build.gradle

@@ -16,11 +16,12 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 589
-		versionName = '6.2.2'
+		versionCode = 600
+		versionName = '6.4'
 		generatedDensities = []
 		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
 		ksp {
+//			arg("room.generateKotlin", "true") TODO: enable later
 			arg("room.schemaLocation", "$projectDir/schemas")
 		}
 		androidResources {
@@ -32,7 +33,6 @@ android {
 			applicationIdSuffix = '.debug'
 		}
 		release {
-			multiDexEnabled false
 			minifyEnabled true
 			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -47,11 +47,12 @@ android {
 		main.java.srcDirs += 'src/main/kotlin/'
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_17
-		targetCompatibility JavaVersion.VERSION_17
+		coreLibraryDesugaringEnabled true
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_17.toString()
+		jvmTarget = JavaVersion.VERSION_1_8.toString()
 		freeCompilerArgs += [
 			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
@@ -81,24 +82,25 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:0054d06e6e') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:46e863ef79') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.10'
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
 	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.0'
-	implementation 'androidx.fragment:fragment-ktx:1.6.1'
+	implementation 'androidx.activity:activity-ktx:1.8.1'
+	implementation 'androidx.fragment:fragment-ktx:1.6.2'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
 	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
 	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.3.1'
+	implementation 'androidx.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'
@@ -114,12 +116,12 @@ dependencies {
 		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
 	}
 
-	implementation 'androidx.room:room-runtime:2.5.2'
-	implementation 'androidx.room:room-ktx:2.5.2'
-	ksp 'androidx.room:room-compiler:2.5.2'
+	implementation 'androidx.room:room-runtime:2.6.0'
+	implementation 'androidx.room:room-ktx:2.6.0'
+	ksp 'androidx.room:room-compiler:2.6.0'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
+	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.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
@@ -127,22 +129,22 @@ dependencies {
 
 	implementation 'com.google.dagger:hilt-android:2.48.1'
 	kapt 'com.google.dagger:hilt-compiler:2.48.1'
-	implementation 'androidx.hilt:hilt-work:1.0.0'
-	kapt 'androidx.hilt:hilt-compiler:1.0.0'
+	implementation 'androidx.hilt:hilt-work:1.1.0'
+	kapt 'androidx.hilt:hilt-compiler:1.1.0'
 
-	implementation 'io.coil-kt:coil-base:2.4.0'
-	implementation 'io.coil-kt:coil-svg:2.4.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:cf089a264d'
+	implementation 'io.coil-kt:coil-base:2.5.0'
+	implementation 'io.coil-kt:coil-svg:2.5.0'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:c7dab3aefe'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.2'
-	implementation 'ch.acra:acra-dialog:5.11.2'
+	implementation 'ch.acra:acra-http:5.11.3'
+	implementation 'ch.acra:acra-dialog:5.11.3'
 
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20230618'
+	testImplementation 'org.json:json:20231013'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
 	androidTestImplementation 'androidx.test:runner:1.5.2'
@@ -152,7 +154,7 @@ dependencies {
 
 	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
-	androidTestImplementation 'androidx.room:room-testing:2.5.2'
+	androidTestImplementation 'androidx.room:room-testing:2.6.0'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
 	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.48.1'

app/proguard-rules.pro

@@ -18,3 +18,6 @@
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
 -keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
 -keep class org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy { *; }
+-keep class org.koitharu.kotatsu.settings.backup.PeriodicalBackupSettingsFragment { *; }
+-keep class org.jsoup.parser.Tag
+-keep class org.jsoup.internal.StringUtil

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

@@ -82,7 +82,7 @@ class AppBackupAgentTest {
 		assertEquals(history, historyRepository.getOne(SampleData.manga))
 		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
 
-		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
+		val allTags = database.getTagsDao().findTags(SampleData.tag.source.name).toMangaTags()
 		assertTrue(SampleData.tag in allTags)
 	}
 

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

@@ -5,6 +5,7 @@ import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
@@ -19,19 +20,14 @@ class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSourc
 	override val configKeyDomain: ConfigKey.Domain
 		get() = ConfigKey.Domain("")
 
-	override val sortOrders: Set<SortOrder>
+	override val availableSortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)
 
 	override suspend fun getDetails(manga: Manga): Manga {
 		TODO("Not yet implemented")
 	}
 
-	override suspend fun getList(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
+	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> {
 		TODO("Not yet implemented")
 	}
 
@@ -39,7 +35,7 @@ class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSourc
 		TODO("Not yet implemented")
 	}
 
-	override suspend fun getTags(): Set<MangaTag> {
+	override suspend fun getAvailableTags(): Set<MangaTag> {
 		TODO("Not yet implemented")
 	}
 }

app/src/main/AndroidManifest.xml

@@ -83,6 +83,16 @@
 				<data android:host="kotatsu.app" />
 				<data android:path="/manga" />
 			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+				<data android:host="manga" />
+				<data android:host="kotatsu.app" />
+			</intent-filter>
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
@@ -211,6 +221,9 @@
 			</intent-filter>
 
 		</activity>
+		<activity
+			android:name="org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity"
+			android:label="@string/sources_catalog" />
 
 		<service
 			android:name="androidx.work.impl.foreground.SystemForegroundService"
@@ -327,6 +340,13 @@
 				<action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
 			</intent-filter>
 		</receiver>
+		<receiver
+			android:name="org.koitharu.kotatsu.core.ErrorReporterReceiver"
+			android:exported="false">
+			<intent-filter>
+				<action android:name="${applicationId}.action.REPORT_ERROR" />
+			</intent-filter>
+		</receiver>
 
 		<meta-data
 			android:name="android.webkit.WebView.EnableSafeBrowsing"

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

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.bookmarks.domain
 
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.local.data.ImageFileFilter
+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
@@ -38,7 +38,6 @@ data class Bookmark(
 	)
 
 	private fun isImageUrlDirect(): Boolean {
-		val extension = imageUrl.substringAfterLast('.')
-		return extension.isNotEmpty() && ImageFileFilter().isExtensionValid(extension)
+		return hasImageExtension(imageUrl)
 	}
 }

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

@@ -25,15 +25,15 @@ class BookmarksRepository @Inject constructor(
 ) {
 
 	fun observeBookmark(manga: Manga, chapterId: Long, page: Int): Flow<Bookmark?> {
-		return db.bookmarksDao.observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
+		return db.getBookmarksDao().observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
 	}
 
 	fun observeBookmarks(manga: Manga): Flow<List<Bookmark>> {
-		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
+		return db.getBookmarksDao().observe(manga.id).mapItems { it.toBookmark(manga) }
 	}
 
 	fun observeBookmarks(): Flow<Map<Manga, List<Bookmark>>> {
-		return db.bookmarksDao.observe().map { map ->
+		return db.getBookmarksDao().observe().map { map ->
 			val res = LinkedHashMap<Manga, List<Bookmark>>(map.size)
 			for ((k, v) in map) {
 				val manga = k.toManga()
@@ -46,9 +46,9 @@ class BookmarksRepository @Inject constructor(
 	suspend fun addBookmark(bookmark: Bookmark) {
 		db.withTransaction {
 			val tags = bookmark.manga.tags.toEntities()
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(bookmark.manga.toEntity(), tags)
-			db.bookmarksDao.insert(bookmark.toEntity())
+			db.getTagsDao().upsert(tags)
+			db.getMangaDao().upsert(bookmark.manga.toEntity(), tags)
+			db.getBookmarksDao().insert(bookmark.toEntity())
 		}
 	}
 
@@ -56,11 +56,11 @@ class BookmarksRepository @Inject constructor(
 		val entity = bookmark.toEntity().copy(
 			imageUrl = imageUrl,
 		)
-		db.bookmarksDao.upsert(listOf(entity))
+		db.getBookmarksDao().upsert(listOf(entity))
 	}
 
 	suspend fun removeBookmark(mangaId: Long, chapterId: Long, page: Int) {
-		check(db.bookmarksDao.delete(mangaId, chapterId, page) != 0) {
+		check(db.getBookmarksDao().delete(mangaId, chapterId, page) != 0) {
 			"Bookmark not found"
 		}
 	}
@@ -72,7 +72,7 @@ class BookmarksRepository @Inject constructor(
 	suspend fun removeBookmarks(ids: Set<Long>): ReversibleHandle {
 		val entities = ArrayList<BookmarkEntity>(ids.size)
 		db.withTransaction {
-			val dao = db.bookmarksDao
+			val dao = db.getBookmarksDao()
 			for (pageId in ids) {
 				val e = dao.find(pageId)
 				if (e != null) {
@@ -92,7 +92,7 @@ class BookmarksRepository @Inject constructor(
 			db.withTransaction {
 				for (e in entities) {
 					try {
-						db.bookmarksDao.insert(e)
+						db.getBookmarksDao().insert(e)
 					} catch (e: SQLException) {
 						e.printStackTraceDebug()
 					}

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

@@ -34,8 +34,8 @@ class BookmarksActivity :
 		val fm = supportFragmentManager
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
-				val fragment = BookmarksFragment.newInstance()
-				replace(R.id.container, fragment)
+				setReorderingAllowed(true)
+				replace(R.id.container, BookmarksFragment::class.java, null)
 			}
 		}
 	}

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

@@ -48,8 +48,8 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		if (!catchingWebViewUnavailability {
 				setContentView(
 					ActivityBrowserBinding.inflate(
-						layoutInflater
-					)
+						layoutInflater,
+					),
 				)
 			}) {
 			return
@@ -82,9 +82,11 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 	}
 
 	override fun onDestroy() {
-		viewBinding.webView.run {
-			stopLoading()
-			destroy()
+		runCatching {
+			viewBinding.webView
+		}.onSuccess {
+			it.stopLoading()
+			it.destroy()
 		}
 		super.onDestroy()
 	}

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

@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.core
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.core.app.PendingIntentCompat
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
+import org.koitharu.kotatsu.core.util.ext.report
+
+class ErrorReporterReceiver : BroadcastReceiver() {
+
+	override fun onReceive(context: Context?, intent: Intent?) {
+		val e = intent?.getSerializableExtraCompat<Throwable>(EXTRA_ERROR) ?: return
+		e.report()
+	}
+
+	companion object {
+
+		private const val EXTRA_ERROR = "err"
+		private const val ACTION_REPORT = "${BuildConfig.APPLICATION_ID}.action.REPORT_ERROR"
+
+		fun getPendingIntent(context: Context, e: Throwable): PendingIntent {
+			val intent = Intent(context, ErrorReporterReceiver::class.java)
+			intent.setAction(ACTION_REPORT)
+			intent.setData(Uri.parse("err://${e.hashCode()}"))
+			intent.putExtra(EXTRA_ERROR, e)
+			return checkNotNull(PendingIntentCompat.getBroadcast(context, 0, intent, 0, false))
+		}
+	}
+}

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

@@ -22,7 +22,7 @@ class BackupRepository @Inject constructor(
 		var offset = 0
 		val entry = BackupEntry(BackupEntry.HISTORY, JSONArray())
 		while (true) {
-			val history = db.historyDao.findAll(offset, PAGE_SIZE)
+			val history = db.getHistoryDao().findAll(offset, PAGE_SIZE)
 			if (history.isEmpty()) {
 				break
 			}
@@ -42,7 +42,7 @@ class BackupRepository @Inject constructor(
 
 	suspend fun dumpCategories(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
-		val categories = db.favouriteCategoriesDao.findAll()
+		val categories = db.getFavouriteCategoriesDao().findAll()
 		for (item in categories) {
 			entry.data.put(JsonSerializer(item).toJson())
 		}
@@ -53,7 +53,7 @@ class BackupRepository @Inject constructor(
 		var offset = 0
 		val entry = BackupEntry(BackupEntry.FAVOURITES, JSONArray())
 		while (true) {
-			val favourites = db.favouritesDao.findAll(offset, PAGE_SIZE)
+			val favourites = db.getFavouritesDao().findAll(offset, PAGE_SIZE)
 			if (favourites.isEmpty()) {
 				break
 			}
@@ -73,7 +73,7 @@ class BackupRepository @Inject constructor(
 
 	suspend fun dumpBookmarks(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.BOOKMARKS, JSONArray())
-		val all = db.bookmarksDao.findAll()
+		val all = db.getBookmarksDao().findAll()
 		for ((m, b) in all) {
 			val json = JSONObject()
 			val manga = JsonSerializer(m.manga).toJson()
@@ -122,9 +122,9 @@ class BackupRepository @Inject constructor(
 			val history = JsonDeserializer(item).toHistoryEntity()
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.historyDao.upsert(history)
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getHistoryDao().upsert(history)
 				}
 			}
 		}
@@ -136,7 +136,7 @@ class BackupRepository @Inject constructor(
 		for (item in entry.data.JSONIterator()) {
 			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
 			result += runCatchingCancellable {
-				db.favouriteCategoriesDao.upsert(category)
+				db.getFavouriteCategoriesDao().upsert(category)
 			}
 		}
 		return result
@@ -153,9 +153,9 @@ class BackupRepository @Inject constructor(
 			val favourite = JsonDeserializer(item).toFavouriteEntity()
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.favouritesDao.upsert(favourite)
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getFavouritesDao().upsert(favourite)
 				}
 			}
 		}
@@ -175,9 +175,9 @@ class BackupRepository @Inject constructor(
 			}
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.bookmarksDao.upsert(bookmarks)
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getBookmarksDao().upsert(bookmarks)
 				}
 			}
 		}

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

@@ -29,7 +29,7 @@ class BackupZipOutput(val file: File) : Closeable {
 	}
 }
 
-private const val DIR_BACKUPS = "backups"
+const val DIR_BACKUPS = "backups"
 
 suspend fun BackupZipOutput(context: Context): BackupZipOutput = runInterruptible(Dispatchers.IO) {
 	val dir = context.run {

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

@@ -66,29 +66,29 @@ const val DATABASE_VERSION = 17
 )
 abstract class MangaDatabase : RoomDatabase() {
 
-	abstract val historyDao: HistoryDao
+	abstract fun getHistoryDao(): HistoryDao
 
-	abstract val tagsDao: TagsDao
+	abstract fun getTagsDao(): TagsDao
 
-	abstract val mangaDao: MangaDao
+	abstract fun getMangaDao(): MangaDao
 
-	abstract val favouritesDao: FavouritesDao
+	abstract fun getFavouritesDao(): FavouritesDao
 
-	abstract val preferencesDao: PreferencesDao
+	abstract fun getPreferencesDao(): PreferencesDao
 
-	abstract val favouriteCategoriesDao: FavouriteCategoriesDao
+	abstract fun getFavouriteCategoriesDao(): FavouriteCategoriesDao
 
-	abstract val tracksDao: TracksDao
+	abstract fun getTracksDao(): TracksDao
 
-	abstract val trackLogsDao: TrackLogsDao
+	abstract fun getTrackLogsDao(): TrackLogsDao
 
-	abstract val suggestionDao: SuggestionDao
+	abstract fun getSuggestionDao(): SuggestionDao
 
-	abstract val bookmarksDao: BookmarksDao
+	abstract fun getBookmarksDao(): BookmarksDao
 
-	abstract val scrobblingDao: ScrobblingDao
+	abstract fun getScrobblingDao(): ScrobblingDao
 
-	abstract val sourcesDao: MangaSourcesDao
+	abstract fun getSourcesDao(): MangaSourcesDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(

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

@@ -4,10 +4,15 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.RawQuery
 import androidx.room.Transaction
 import androidx.room.Upsert
+import androidx.sqlite.db.SimpleSQLiteQuery
+import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
+import org.intellij.lang.annotations.Language
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
+import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 
 @Dao
 abstract class MangaSourcesDao {
@@ -15,11 +20,11 @@ abstract class MangaSourcesDao {
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract suspend fun findAll(): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract suspend fun findAllEnabled(): List<MangaSourceEntity>
+	@Query("SELECT * FROM sources WHERE enabled = 0 ORDER BY sort_key")
+	abstract suspend fun findAllDisabled(): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract fun observeEnabled(): Flow<List<MangaSourceEntity>>
+	@Query("SELECT * FROM sources WHERE enabled = 0")
+	abstract fun observeDisabled(): Flow<List<MangaSourceEntity>>
 
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
@@ -40,6 +45,22 @@ abstract class MangaSourcesDao {
 	@Upsert
 	abstract suspend fun upsert(entry: MangaSourceEntity)
 
+	fun observeEnabled(order: SourcesSortOrder): Flow<List<MangaSourceEntity>> {
+		val orderBy = getOrderBy(order)
+
+		@Language("RoomSql")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
+		return observeImpl(query)
+	}
+
+	suspend fun findAllEnabled(order: SourcesSortOrder): List<MangaSourceEntity> {
+		val orderBy = getOrderBy(order)
+
+		@Language("RoomSql")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
+		return findAllImpl(query)
+	}
+
 	@Transaction
 	open suspend fun setEnabled(source: String, isEnabled: Boolean) {
 		if (updateIsEnabled(source, isEnabled) == 0) {
@@ -54,4 +75,16 @@ abstract class MangaSourcesDao {
 
 	@Query("UPDATE sources SET enabled = :isEnabled WHERE source = :source")
 	protected abstract suspend fun updateIsEnabled(source: String, isEnabled: Boolean): Int
+
+	@RawQuery(observedEntities = [MangaSourceEntity::class])
+	protected abstract fun observeImpl(query: SupportSQLiteQuery): Flow<List<MangaSourceEntity>>
+
+	@RawQuery
+	protected abstract suspend fun findAllImpl(query: SupportSQLiteQuery): List<MangaSourceEntity>
+
+	private fun getOrderBy(order: SourcesSortOrder) = when (order) {
+		SourcesSortOrder.ALPHABETIC -> "source ASC"
+		SourcesSortOrder.POPULARITY -> "(SELECT COUNT(*) FROM manga WHERE source = sources.source) DESC"
+		SourcesSortOrder.MANUAL -> "sort_key ASC"
+	}
 }

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration10To11 : Migration(10, 11) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL(
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL(
 			"""
 			CREATE TABLE IF NOT EXISTS `bookmarks` (
 				`manga_id` INTEGER NOT NULL,
@@ -20,7 +20,7 @@ class Migration10To11 : Migration(10, 11) {
 				FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )
 			""".trimIndent()
 		)
-		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_manga_id` ON `bookmarks` (`manga_id`)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_page_id` ON `bookmarks` (`page_id`)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_manga_id` ON `bookmarks` (`manga_id`)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_page_id` ON `bookmarks` (`page_id`)")
 	}
-}
+}

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration11To12 : Migration(11, 12) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL(
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL(
 			"""
 			CREATE TABLE IF NOT EXISTS `scrobblings` (
 				`scrobbler` INTEGER NOT NULL,
@@ -21,7 +21,7 @@ class Migration11To12 : Migration(11, 12) {
 			)
 			""".trimIndent()
 		)
-		database.execSQL("ALTER TABLE history ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
-		database.execSQL("ALTER TABLE bookmarks ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
+		db.execSQL("ALTER TABLE history ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
+		db.execSQL("ALTER TABLE bookmarks ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
 	}
 }

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration12To13 : Migration(12, 13) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `show_in_lib` INTEGER NOT NULL DEFAULT 1")
-		database.execSQL("ALTER TABLE favourites ADD COLUMN `sort_key` INTEGER NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `show_in_lib` INTEGER NOT NULL DEFAULT 1")
+		db.execSQL("ALTER TABLE favourites ADD COLUMN `sort_key` INTEGER NOT NULL DEFAULT 0")
 	}
-}
+}

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

@@ -5,11 +5,11 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration13To14 : Migration(13, 14) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE favourites ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE history ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE favourites ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE history ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
 	}
 }

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

@@ -5,5 +5,5 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration14To15 : Migration(14, 15) {
 
-	override fun migrate(database: SupportSQLiteDatabase) = Unit
+	override fun migrate(db: SupportSQLiteDatabase) = Unit
 }

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration15To16 : Migration(15, 16) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_invert` INTEGER NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_invert` INTEGER NOT NULL DEFAULT 0")
 	}
 }

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

@@ -10,9 +10,9 @@ class Migration16To17(context: Context) : Migration(16, 17) {
 
 	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE `sources` (`source` TEXT NOT NULL, `enabled` INTEGER NOT NULL, `sort_key` INTEGER NOT NULL, PRIMARY KEY(`source`))")
-		database.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE `sources` (`source` TEXT NOT NULL, `enabled` INTEGER NOT NULL, `sort_key` INTEGER NOT NULL, PRIMARY KEY(`source`))")
+		db.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
 		val hiddenSources = prefs.getStringSet("sources_hidden", null).orEmpty()
 		val order = prefs.getString("sources_order_2", null)?.split('|').orEmpty()
 		val sources = MangaSource.entries
@@ -30,7 +30,7 @@ class Migration16To17(context: Context) : Migration(16, 17) {
 					continue
 				}
 			}
-			database.execSQL(
+			db.execSQL(
 				"INSERT INTO `sources` (`source`, `enabled`, `sort_key`) VALUES (?, ?, ?)",
 				arrayOf(name, (!isHidden).toInt(), sortKey),
 			)

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

@@ -7,48 +7,48 @@ class Migration1To2 : Migration(1, 2) {
 	/**
 	 * Adding foreign keys
 	 */
-	override fun migrate(database: SupportSQLiteDatabase) {
+	override fun migrate(db: SupportSQLiteDatabase) {
 		/* manga_tags */
-		database.execSQL(
+		db.execSQL(
 			"CREATE TABLE IF NOT EXISTS manga_tags_tmp (manga_id INTEGER NOT NULL, tag_id INTEGER NOT NULL, " +
 					"PRIMARY KEY(manga_id, tag_id), " +
 					"FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE, " +
 					"FOREIGN KEY(tag_id) REFERENCES tags(tag_id) ON UPDATE NO ACTION ON DELETE CASCADE )"
 		)
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_manga_tags_manga_id ON manga_tags_tmp (manga_id)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_manga_tags_tag_id ON manga_tags_tmp (tag_id)")
-		database.execSQL("INSERT INTO manga_tags_tmp (manga_id, tag_id) SELECT manga_id, tag_id FROM manga_tags")
-		database.execSQL("DROP TABLE manga_tags")
-		database.execSQL("ALTER TABLE manga_tags_tmp RENAME TO manga_tags")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_manga_tags_manga_id ON manga_tags_tmp (manga_id)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_manga_tags_tag_id ON manga_tags_tmp (tag_id)")
+		db.execSQL("INSERT INTO manga_tags_tmp (manga_id, tag_id) SELECT manga_id, tag_id FROM manga_tags")
+		db.execSQL("DROP TABLE manga_tags")
+		db.execSQL("ALTER TABLE manga_tags_tmp RENAME TO manga_tags")
 		/* favourites */
-		database.execSQL(
+		db.execSQL(
 			"CREATE TABLE IF NOT EXISTS favourites_tmp (manga_id INTEGER NOT NULL, category_id INTEGER NOT NULL, created_at INTEGER NOT NULL, " +
 					"PRIMARY KEY(manga_id, category_id), " +
 					"FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE , " +
 					"FOREIGN KEY(category_id) REFERENCES favourite_categories(category_id) ON UPDATE NO ACTION ON DELETE CASCADE )"
 		)
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_manga_id ON favourites_tmp (manga_id)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_category_id ON favourites_tmp (category_id)")
-		database.execSQL("INSERT INTO favourites_tmp (manga_id, category_id, created_at) SELECT manga_id, category_id, created_at FROM favourites")
-		database.execSQL("DROP TABLE favourites")
-		database.execSQL("ALTER TABLE favourites_tmp RENAME TO favourites")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_manga_id ON favourites_tmp (manga_id)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_category_id ON favourites_tmp (category_id)")
+		db.execSQL("INSERT INTO favourites_tmp (manga_id, category_id, created_at) SELECT manga_id, category_id, created_at FROM favourites")
+		db.execSQL("DROP TABLE favourites")
+		db.execSQL("ALTER TABLE favourites_tmp RENAME TO favourites")
 		/* history */
-		database.execSQL(
+		db.execSQL(
 			"CREATE TABLE IF NOT EXISTS history_tmp (manga_id INTEGER NOT NULL, created_at INTEGER NOT NULL, updated_at INTEGER NOT NULL, chapter_id INTEGER NOT NULL, page INTEGER NOT NULL, " +
 					"PRIMARY KEY(manga_id), " +
 					"FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )"
 		)
-		database.execSQL("INSERT INTO history_tmp (manga_id, created_at, updated_at, chapter_id, page) SELECT manga_id, created_at, updated_at, chapter_id, page FROM history")
-		database.execSQL("DROP TABLE history")
-		database.execSQL("ALTER TABLE history_tmp RENAME TO history")
+		db.execSQL("INSERT INTO history_tmp (manga_id, created_at, updated_at, chapter_id, page) SELECT manga_id, created_at, updated_at, chapter_id, page FROM history")
+		db.execSQL("DROP TABLE history")
+		db.execSQL("ALTER TABLE history_tmp RENAME TO history")
 		/* preferences */
-		database.execSQL(
+		db.execSQL(
 			"CREATE TABLE IF NOT EXISTS preferences_tmp (manga_id INTEGER NOT NULL, mode INTEGER NOT NULL," +
 					" PRIMARY KEY(manga_id), " +
 					"FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )"
 		)
-		database.execSQL("INSERT INTO preferences_tmp (manga_id, mode) SELECT manga_id, mode FROM preferences")
-		database.execSQL("DROP TABLE preferences")
-		database.execSQL("ALTER TABLE preferences_tmp RENAME TO preferences")
+		db.execSQL("INSERT INTO preferences_tmp (manga_id, mode) SELECT manga_id, mode FROM preferences")
+		db.execSQL("DROP TABLE preferences")
+		db.execSQL("ALTER TABLE preferences_tmp RENAME TO preferences")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration2To3 : Migration(2, 3) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE history ADD COLUMN scroll REAL NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE history ADD COLUMN scroll REAL NOT NULL DEFAULT 0")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration3To4 : Migration(3, 4) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE IF NOT EXISTS tracks (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE IF NOT EXISTS tracks (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration4To5 : Migration(4, 5) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN sort_key INTEGER NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN sort_key INTEGER NOT NULL DEFAULT 0")
 	}
-}
+}

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration5To6 : Migration(5, 6) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE IF NOT EXISTS track_logs (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, manga_id INTEGER NOT NULL, chapters TEXT NOT NULL, created_at INTEGER NOT NULL, FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_track_logs_manga_id ON track_logs (manga_id)")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE IF NOT EXISTS track_logs (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, manga_id INTEGER NOT NULL, chapters TEXT NOT NULL, created_at INTEGER NOT NULL, FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_track_logs_manga_id ON track_logs (manga_id)")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration6To7 : Migration(6, 7) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE manga ADD COLUMN public_url TEXT NOT NULL DEFAULT ''")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE manga ADD COLUMN public_url TEXT NOT NULL DEFAULT ''")
 	}
-}
+}

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

@@ -5,9 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration7To8 : Migration(7, 8) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE manga ADD COLUMN nsfw INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("CREATE TABLE IF NOT EXISTS suggestions (manga_id INTEGER NOT NULL, relevance REAL NOT NULL, created_at INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_suggestions_manga_id ON suggestions (manga_id)")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE manga ADD COLUMN nsfw INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("CREATE TABLE IF NOT EXISTS suggestions (manga_id INTEGER NOT NULL, relevance REAL NOT NULL, created_at INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_suggestions_manga_id ON suggestions (manga_id)")
 	}
-}
+}

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

@@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class Migration8To9 : Migration(8, 9) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `order` TEXT NOT NULL DEFAULT ${SortOrder.NEWEST.name}")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `order` TEXT NOT NULL DEFAULT ${SortOrder.NEWEST.name}")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration9To10 : Migration(9, 10) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
 	}
-}
+}

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

@@ -1,12 +1,15 @@
 package org.koitharu.kotatsu.core.model
 
 import android.net.Uri
+import androidx.annotation.StringRes
 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.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
 
 @JvmName("mangaIds")
@@ -31,6 +34,15 @@ fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
 	return acc.values.max()
 }
 
+@get:StringRes
+val MangaState.titleResId: Int
+	get() = when (this) {
+		MangaState.ONGOING -> R.string.state_ongoing
+		MangaState.FINISHED -> R.string.state_finished
+		MangaState.ABANDONED -> R.string.state_abandoned
+		MangaState.PAUSED -> R.string.state_paused
+	}
+
 fun Manga.findChapter(id: Long): MangaChapter? {
 	return chapters?.findById(id)
 }

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

@@ -1,5 +1,8 @@
 package org.koitharu.kotatsu.core.model
 
+import android.content.Context
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.toTitleCase
@@ -18,3 +21,18 @@ fun MangaSource(name: String): MangaSource {
 }
 
 fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
+
+@get:StringRes
+val ContentType.titleResId
+	get() = when (this) {
+		ContentType.MANGA -> R.string.content_type_manga
+		ContentType.HENTAI -> R.string.content_type_hentai
+		ContentType.COMICS -> R.string.content_type_comics
+		ContentType.OTHER -> R.string.content_type_other
+	}
+
+fun MangaSource.getSummary(context: Context): String {
+	val type = context.getString(contentType.titleResId)
+	val locale = getLocaleTitle() ?: context.getString(R.string.various_languages)
+	return context.getString(R.string.source_summary_pattern, type, locale)
+}

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

@@ -14,8 +14,8 @@ class CloudFlareInterceptor : Interceptor {
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val response = chain.proceed(chain.request())
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
-			val content = response.body?.source()?.peek()?.use {
-				Jsoup.parse(it.inputStream(), Charsets.UTF_8.name(), response.request.url.toString())
+			val content = response.body?.let { response.peekBody(Long.MAX_VALUE) }?.byteStream()?.use {
+				Jsoup.parse(it, Charsets.UTF_8.name(), response.request.url.toString())
 			} ?: return response
 			if (content.getElementById("challenge-error-title") != null) {
 				val request = response.request

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

@@ -63,6 +63,9 @@ class MirrorSwitchInterceptor @Inject constructor(
 		}
 		synchronized(obtainLock(repository.source)) {
 			val currentMirror = repository.domain
+			if (currentMirror !in mirrors) {
+				return@synchronized false
+			}
 			addToBlacklist(repository.source, currentMirror)
 			val newMirror = mirrors.firstOrNull { x ->
 				x != currentMirror && !isBlacklisted(repository.source, x)

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

@@ -11,6 +11,7 @@ import org.koitharu.kotatsu.core.db.entity.toEntities
 import org.koitharu.kotatsu.core.db.entity.toEntity
 import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -28,16 +29,16 @@ class MangaDataRepository @Inject constructor(
 	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
 		db.withTransaction {
 			storeManga(manga)
-			val entity = db.preferencesDao.find(manga.id) ?: newEntity(manga.id)
-			db.preferencesDao.upsert(entity.copy(mode = mode.id))
+			val entity = db.getPreferencesDao().find(manga.id) ?: newEntity(manga.id)
+			db.getPreferencesDao().upsert(entity.copy(mode = mode.id))
 		}
 	}
 
 	suspend fun saveColorFilter(manga: Manga, colorFilter: ReaderColorFilter?) {
 		db.withTransaction {
 			storeManga(manga)
-			val entity = db.preferencesDao.find(manga.id) ?: newEntity(manga.id)
-			db.preferencesDao.upsert(
+			val entity = db.getPreferencesDao().find(manga.id) ?: newEntity(manga.id)
+			db.getPreferencesDao().upsert(
 				entity.copy(
 					cfBrightness = colorFilter?.brightness ?: 0f,
 					cfContrast = colorFilter?.contrast ?: 0f,
@@ -48,25 +49,25 @@ class MangaDataRepository @Inject constructor(
 	}
 
 	suspend fun getReaderMode(mangaId: Long): ReaderMode? {
-		return db.preferencesDao.find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
+		return db.getPreferencesDao().find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
 	}
 
 	suspend fun getColorFilter(mangaId: Long): ReaderColorFilter? {
-		return db.preferencesDao.find(mangaId)?.getColorFilterOrNull()
+		return db.getPreferencesDao().find(mangaId)?.getColorFilterOrNull()
 	}
 
 	fun observeColorFilter(mangaId: Long): Flow<ReaderColorFilter?> {
-		return db.preferencesDao.observe(mangaId)
+		return db.getPreferencesDao().observe(mangaId)
 			.map { it?.getColorFilterOrNull() }
 			.distinctUntilChanged()
 	}
 
 	suspend fun findMangaById(mangaId: Long): Manga? {
-		return db.mangaDao.find(mangaId)?.toManga()
+		return db.getMangaDao().find(mangaId)?.toManga()
 	}
 
 	suspend fun findMangaByPublicUrl(publicUrl: String): Manga? {
-		return db.mangaDao.findByPublicUrl(publicUrl)?.toManga()
+		return db.getMangaDao().findByPublicUrl(publicUrl)?.toManga()
 	}
 
 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
@@ -77,15 +78,23 @@ class MangaDataRepository @Inject constructor(
 	}
 
 	suspend fun storeManga(manga: Manga) {
-		val tags = manga.tags.toEntities()
 		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
+			// avoid storing local manga if remote one is already stored
+			val existing = if (manga.isLocal) {
+				db.getMangaDao().find(manga.id)?.manga
+			} else {
+				null
+			}
+			if (existing == null || existing.source == manga.source.name) {
+				val tags = manga.tags.toEntities()
+				db.getTagsDao().upsert(tags)
+				db.getMangaDao().upsert(manga.toEntity(), tags)
+			}
 		}
 	}
 
 	suspend fun findTags(source: MangaSource): Set<MangaTag> {
-		return db.tagsDao.findTags(source.name).toMangaTags()
+		return db.getTagsDao().findTags(source.name).toMangaTags()
 	}
 
 	private fun MangaPrefsEntity.getColorFilterOrNull(): ReaderColorFilter? {

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

@@ -8,6 +8,7 @@ import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.almostEquals
 import org.koitharu.kotatsu.parsers.util.levenshteinDistance
@@ -23,14 +24,14 @@ class MangaLinkResolver @Inject constructor(
 ) {
 
 	suspend fun resolve(uri: Uri): Manga {
-		return if (uri.host == "kotatsu.app") {
+		return if (uri.scheme == "kotatsu" || uri.host == "kotatsu.app") {
 			resolveAppLink(uri)
 		} else {
 			resolveExternalLink(uri)
-		} ?: throw NotFoundException("Manga not found", uri.toString())
+		} ?: throw NotFoundException("Cannot resolve link", uri.toString())
 	}
 
-	suspend fun resolveAppLink(uri: Uri): Manga? {
+	private suspend fun resolveAppLink(uri: Uri): Manga? {
 		require(uri.pathSegments.singleOrNull() == "manga") { "Invalid url" }
 		val sourceName = requireNotNull(uri.getQueryParameter("source")) { "Source is not specified" }
 		val source = MangaSource(sourceName)
@@ -42,7 +43,7 @@ class MangaLinkResolver @Inject constructor(
 		)
 	}
 
-	suspend fun resolveExternalLink(uri: Uri): Manga? {
+	private suspend fun resolveExternalLink(uri: Uri): Manga? {
 		dataRepository.findMangaByPublicUrl(uri.toString())?.let {
 			return it
 		}
@@ -58,7 +59,7 @@ class MangaLinkResolver @Inject constructor(
 
 	private suspend fun MangaRepository.findExact(url: String?, title: String?): Manga? {
 		if (!title.isNullOrEmpty()) {
-			val list = getList(0, title)
+			val list = getList(0, MangaListFilter.Search(title))
 			if (url != null) {
 				list.find { it.url == url }?.let {
 					return it
@@ -77,7 +78,7 @@ class MangaLinkResolver @Inject constructor(
 			}.ifNullOrEmpty {
 				seed.author
 			} ?: return@runCatchingCancellable null
-			val seedList = getList(0, seedTitle)
+			val seedList = getList(0, MangaListFilter.Search(seedTitle))
 			seedList.first { x -> x.url == url }
 		}.getOrThrow()
 	}

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

@@ -7,8 +7,10 @@ import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaPage
 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.parsers.model.SortOrder
 import java.lang.ref.WeakReference
@@ -23,11 +25,13 @@ interface MangaRepository {
 
 	val sortOrders: Set<SortOrder>
 
+	val states: Set<MangaState>
+
 	var defaultSortOrder: SortOrder
 
-	suspend fun getList(offset: Int, query: String): List<Manga>
+	val isMultipleTagsSupported: Boolean
 
-	suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga>
+	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

@@ -23,8 +23,10 @@ import org.koitharu.kotatsu.parsers.exception.ParseException
 import org.koitharu.kotatsu.parsers.model.Favicons
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaPage
 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.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.domain
@@ -40,7 +42,10 @@ class RemoteMangaRepository(
 		get() = parser.source
 
 	override val sortOrders: Set<SortOrder>
-		get() = parser.sortOrders
+		get() = parser.availableSortOrders
+
+	override val states: Set<MangaState>
+		get() = parser.availableStates
 
 	override var defaultSortOrder: SortOrder
 		get() = getConfig().defaultSortOrder ?: sortOrders.first()
@@ -48,6 +53,9 @@ class RemoteMangaRepository(
 			getConfig().defaultSortOrder = value
 		}
 
+	override val isMultipleTagsSupported: Boolean
+		get() = parser.isMultipleTagsSupported
+
 	var domain: String
 		get() = parser.domain
 		set(value) {
@@ -68,15 +76,9 @@ class RemoteMangaRepository(
 		}
 	}
 
-	override suspend fun getList(offset: Int, query: String): List<Manga> {
+	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> {
 		return mirrorSwitchInterceptor.withMirrorSwitching {
-			parser.getList(offset, query)
-		}
-	}
-
-	override suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
-		return mirrorSwitchInterceptor.withMirrorSwitching {
-			parser.getList(offset, tags, sortOrder)
+			parser.getList(offset, filter)
 		}
 	}
 
@@ -98,7 +100,7 @@ class RemoteMangaRepository(
 	}
 
 	override suspend fun getTags(): Set<MangaTag> = mirrorSwitchInterceptor.withMirrorSwitching {
-		parser.getTags()
+		parser.getAvailableTags()
 	}
 
 	suspend fun getFavicons(): Favicons = mirrorSwitchInterceptor.withMirrorSwitching {
@@ -133,7 +135,7 @@ class RemoteMangaRepository(
 	}
 
 	suspend fun find(manga: Manga): Manga? {
-		val list = getList(0, manga.title)
+		val list = getList(0, MangaListFilter.Search(manga.title))
 		return list.find { x -> x.id == manga.id }
 	}
 

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

@@ -22,6 +22,7 @@ import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.putEnumValue
 import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
+import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.find
@@ -108,6 +109,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isReaderTapsAdaptive: Boolean
 		get() = !prefs.getBoolean(KEY_READER_TAPS_LTR, false)
 
+	val isReaderOptimizationEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_OPTIMIZE, false)
+
 	var isTrafficWarningEnabled: Boolean
 		get() = prefs.getBoolean(KEY_TRAFFIC_WARNING, true)
 		set(value) = prefs.edit { putBoolean(KEY_TRAFFIC_WARNING, value) }
@@ -209,6 +213,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			return policy.isNetworkAllowed(connectivityManager)
 		}
 
+	var sourcesSortOrder: SourcesSortOrder
+		get() = prefs.getEnumValue(KEY_SOURCES_ORDER, SourcesSortOrder.MANUAL)
+		set(value) = prefs.edit { putEnumValue(KEY_SOURCES_ORDER, value) }
+
 	var isSourcesGridMode: Boolean
 		get() = prefs.getBoolean(KEY_SOURCES_GRID, false)
 		set(value) = prefs.edit { putBoolean(KEY_SOURCES_GRID, value) }
@@ -354,6 +362,16 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val is32BitColorsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_32BIT_COLOR, false)
 
+	val isPeriodicalBackupEnabled: Boolean
+		get() = prefs.getBoolean(KEY_BACKUP_PERIODICAL_ENABLED, false)
+
+	val periodicalBackupFrequency: Long
+		get() = prefs.getString(KEY_BACKUP_PERIODICAL_FREQUENCY, null)?.toLongOrNull() ?: 7L
+
+	var periodicalBackupOutput: Uri?
+		get() = prefs.getString(KEY_BACKUP_PERIODICAL_OUTPUT, null)?.toUriOrNull()
+		set(value) = prefs.edit { putString(KEY_BACKUP_PERIODICAL_OUTPUT, value?.toString()) }
+
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -458,6 +476,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_ZOOM_MODE = "zoom_mode"
 		const val KEY_BACKUP = "backup"
 		const val KEY_RESTORE = "restore"
+		const val KEY_BACKUP_PERIODICAL_ENABLED = "backup_periodic"
+		const val KEY_BACKUP_PERIODICAL_FREQUENCY = "backup_periodic_freq"
+		const val KEY_BACKUP_PERIODICAL_OUTPUT = "backup_periodic_output"
+		const val KEY_BACKUP_PERIODICAL_LAST = "backup_periodic_last"
 		const val KEY_HISTORY_GROUPING = "history_grouping"
 		const val KEY_READING_INDICATORS = "reading_indicators"
 		const val KEY_REVERSE_CHAPTERS = "reverse_chapters"
@@ -487,6 +509,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_SCREEN_ON = "reader_screen_on"
 		const val KEY_SHORTCUTS = "dynamic_shortcuts"
 		const val KEY_READER_TAPS_LTR = "reader_taps_ltr"
+		const val KEY_READER_OPTIMIZE = "reader_optimize"
 		const val KEY_LOCAL_LIST_ORDER = "local_order"
 		const val KEY_HISTORY_ORDER = "history_order"
 		const val KEY_WEBTOON_ZOOM = "webtoon_zoom"
@@ -514,6 +537,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_RELATED_MANGA = "related_manga"
 		const val KEY_NAV_MAIN = "nav_main"
 		const val KEY_32BIT_COLOR = "enhanced_colors"
+		const val KEY_SOURCES_ORDER = "sources_sort_order"
+		const val KEY_SOURCES_CATALOG = "sources_catalog"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

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

@@ -6,7 +6,6 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
@@ -96,10 +95,10 @@ abstract class BaseActivity<B : ViewBinding> :
 		insetsDelegate.onViewCreated(binding.root)
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
-		onBackPressed()
-		true
-	} else super.onOptionsItemSelected(item)
+	override fun onSupportNavigateUp(): Boolean {
+		dispatchNavigateUp()
+		return true
+	}
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
@@ -150,6 +149,17 @@ abstract class BaseActivity<B : ViewBinding> :
 		window.statusBarColor = defaultStatusBarColor
 	}
 
+	protected open fun dispatchNavigateUp() {
+		val upIntent = parentActivityIntent
+		if (upIntent != null) {
+			if (!navigateUpTo(upIntent)) {
+				startActivity(upIntent)
+			}
+		} else {
+			finishAfterTransition()
+		}
+	}
+
 	private fun putDataToExtras(intent: Intent?) {
 		intent?.putExtra(EXTRA_DATA, intent.data)
 	}

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

@@ -4,11 +4,11 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
 import androidx.core.text.htmlEncode
+import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -37,7 +37,7 @@ class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
 	override fun onViewBindingCreated(binding: DialogErrorDetailsBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		with(binding.textViewMessage) {
-			movementMethod = LinkMovementMethod.getInstance()
+			movementMethod = LinkMovementMethodCompat.getInstance()
 			text = context.getString(
 				R.string.manga_error_description_pattern,
 				exception.message?.htmlEncode().orEmpty(),

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

@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.core.ui.list
+
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
+
+class RecyclerScrollKeeper(
+	private val rv: RecyclerView,
+) : AdapterDataObserver() {
+
+	private val scrollUpRunnable = Runnable {
+		(rv.layoutManager as? LinearLayoutManager)?.scrollToPositionWithOffset(0, 0)
+	}
+
+	fun attach() {
+		rv.adapter?.registerAdapterDataObserver(this)
+	}
+
+	override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+		super.onItemRangeInserted(positionStart, itemCount)
+		if (positionStart == 0 && isScrolledToTop()) {
+			postScrollUp()
+		}
+	}
+
+	override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
+		super.onItemRangeMoved(fromPosition, toPosition, itemCount)
+		if (toPosition == 0 && isScrolledToTop()) {
+			postScrollUp()
+		}
+	}
+
+	private fun postScrollUp() {
+		rv.postDelayed(scrollUpRunnable, 500L)
+	}
+
+	private fun isScrolledToTop(): Boolean {
+		return (rv.layoutManager as? LinearLayoutManager)?.findFirstVisibleItemPosition() == 0
+	}
+}

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

@@ -0,0 +1,88 @@
+package org.koitharu.kotatsu.core.ui.list.lifecycle
+
+import android.view.View
+import androidx.annotation.CallSuper
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.recyclerview.widget.RecyclerView
+
+abstract class LifecycleAwareViewHolder(
+	itemView: View,
+	private val parentLifecycleOwner: LifecycleOwner,
+) : RecyclerView.ViewHolder(itemView), LifecycleOwner {
+
+	@Suppress("LeakingThis")
+	final override val lifecycle = LifecycleRegistry(this)
+	private var isCurrent = false
+
+	init {
+		parentLifecycleOwner.lifecycle.addObserver(ParentLifecycleObserver())
+		if (parentLifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.CREATED)) {
+			lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+		}
+	}
+
+	fun setIsCurrent(value: Boolean) {
+		isCurrent = value
+		dispatchResumed()
+	}
+
+	@CallSuper
+	open fun onStart() = lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
+
+	@CallSuper
+	open fun onResume() = lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
+
+	@CallSuper
+	open fun onPause() = lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+
+	@CallSuper
+	open fun onStop() = lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+
+	private fun dispatchResumed() {
+		val isParentResumed = parentLifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)
+		if (isCurrent && isParentResumed) {
+			if (!isResumed()) {
+				onResume()
+			}
+		} else {
+			if (isResumed()) {
+				onPause()
+			}
+		}
+	}
+
+	protected fun isResumed(): Boolean {
+		return lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)
+	}
+
+	private inner class ParentLifecycleObserver : DefaultLifecycleObserver {
+
+		override fun onCreate(owner: LifecycleOwner) {
+			lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+		}
+
+		override fun onStart(owner: LifecycleOwner) {
+			onStart()
+		}
+
+		override fun onResume(owner: LifecycleOwner) {
+			dispatchResumed()
+		}
+
+		override fun onPause(owner: LifecycleOwner) {
+			dispatchResumed()
+		}
+
+		override fun onStop(owner: LifecycleOwner) {
+			onStop()
+		}
+
+		override fun onDestroy(owner: LifecycleOwner) {
+			lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+			owner.lifecycle.removeObserver(this)
+		}
+	}
+}

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

@@ -0,0 +1,23 @@
+package org.koitharu.kotatsu.core.ui.list.lifecycle
+
+import androidx.core.view.children
+import androidx.viewpager2.widget.ViewPager2
+import org.koitharu.kotatsu.core.util.ext.recyclerView
+
+class PagerLifecycleDispatcher(
+	private val pager: ViewPager2,
+) : ViewPager2.OnPageChangeCallback() {
+
+	override fun onPageSelected(position: Int) {
+		super.onPageSelected(position)
+		val rv = pager.recyclerView ?: return
+		for (child in rv.children) {
+			val wh = rv.getChildViewHolder(child) ?: continue
+			(wh as? LifecycleAwareViewHolder)?.setIsCurrent(wh.absoluteAdapterPosition == position)
+		}
+	}
+
+	fun invalidate() {
+		onPageSelected(pager.currentItem)
+	}
+}

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

@@ -0,0 +1,35 @@
+package org.koitharu.kotatsu.core.ui.list.lifecycle
+
+import androidx.core.view.children
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.NO_POSITION
+
+class RecyclerViewLifecycleDispatcher : RecyclerView.OnScrollListener() {
+
+	private var prevFirst = NO_POSITION
+	private var prevLast = NO_POSITION
+
+	override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+		super.onScrolled(recyclerView, dx, dy)
+		invalidate(recyclerView)
+	}
+
+	fun invalidate(recyclerView: RecyclerView) {
+		val lm = recyclerView.layoutManager as? LinearLayoutManager ?: return
+		val first = lm.findFirstVisibleItemPosition()
+		val last = lm.findLastVisibleItemPosition()
+		if (first == prevFirst && last == prevLast) {
+			return
+		}
+		prevFirst = first
+		prevLast = last
+		if (first == NO_POSITION || last == NO_POSITION) {
+			return
+		}
+		for (child in recyclerView.children) {
+			val wh = recyclerView.getChildViewHolder(child) ?: continue
+			(wh as? LifecycleAwareViewHolder)?.setIsCurrent(wh.absoluteAdapterPosition in first..last)
+		}
+	}
+}

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

@@ -0,0 +1,74 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.content.Context
+import android.util.ArrayMap
+import android.util.AttributeSet
+import com.google.android.material.slider.Slider
+import kotlin.math.cbrt
+import kotlin.math.pow
+
+class CubicSlider @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+) : Slider(context, attrs) {
+
+	private val changeListeners = ArrayMap<OnChangeListener, OnChangeListenerMapper>(1)
+
+	override fun setValue(value: Float) {
+		super.setValue(value.unmap())
+	}
+
+	override fun getValue(): Float {
+		return super.getValue().map()
+	}
+
+	override fun getValueFrom(): Float {
+		return super.getValueFrom().map()
+	}
+
+	override fun setValueFrom(valueFrom: Float) {
+		super.setValueFrom(valueFrom.unmap())
+	}
+
+	override fun getValueTo(): Float {
+		return super.getValueTo().map()
+	}
+
+	override fun setValueTo(valueTo: Float) {
+		super.setValueTo(valueTo.unmap())
+	}
+
+	override fun addOnChangeListener(listener: OnChangeListener) {
+		val mapper = OnChangeListenerMapper(listener)
+		super.addOnChangeListener(mapper)
+		changeListeners[listener] = mapper
+	}
+
+	override fun removeOnChangeListener(listener: OnChangeListener) {
+		changeListeners.remove(listener)?.let {
+			super.removeOnChangeListener(it)
+		}
+	}
+
+	override fun clearOnChangeListeners() {
+		super.clearOnChangeListeners()
+		changeListeners.clear()
+	}
+
+	private fun Float.map(): Float {
+		return this.pow(3)
+	}
+
+	private fun Float.unmap(): Float {
+		return cbrt(this)
+	}
+
+	private inner class OnChangeListenerMapper(
+		private val delegate: OnChangeListener,
+	) : OnChangeListener {
+
+		override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
+			delegate.onValueChange(slider, value.map(), fromUser)
+		}
+	}
+}

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

@@ -26,7 +26,7 @@ class CompositeMutex<T : Any> : Set<T> {
 	}
 
 	override fun isEmpty(): Boolean {
-		return state.isEmpty
+		return state.isEmpty()
 	}
 
 	override fun iterator(): Iterator<T> {

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

@@ -19,7 +19,7 @@ class CompositeMutex2<T : Any> : Set<T> {
 	}
 
 	override fun isEmpty(): Boolean {
-		return delegates.isEmpty
+		return delegates.isEmpty()
 	}
 
 	override fun iterator(): Iterator<T> {

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

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.util
+
+import androidx.core.os.LocaleListCompat
+import org.koitharu.kotatsu.core.util.ext.map
+import java.util.Locale
+
+class LocaleComparator : Comparator<Locale?> {
+
+	private val deviceLocales = LocaleListCompat.getAdjustedDefault()//LocaleManagerCompat.getSystemLocales(context)
+		.map { it.language }
+		.distinct()
+
+	override fun compare(a: Locale?, b: Locale?): Int {
+		return if (a === b) {
+			0
+		} else {
+			val indexA = if (a == null) -1 else deviceLocales.indexOf(a.language)
+			val indexB = if (b == null) -1 else deviceLocales.indexOf(b.language)
+			if (indexA < 0 && indexB < 0) {
+				compareValues(a?.language, b?.language)
+			} else {
+				-2 - (indexA - indexB)
+			}
+		}
+	}
+}

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

@@ -6,13 +6,16 @@ import android.content.res.Configuration
 import android.database.ContentObserver
 import android.os.Handler
 import android.provider.Settings
+import dagger.hilt.android.scopes.ActivityScoped
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.onStart
+import javax.inject.Inject
 
-class ScreenOrientationHelper(private val activity: Activity) {
+@ActivityScoped
+class ScreenOrientationHelper @Inject constructor(private val activity: Activity) {
 
 	val isAutoRotationEnabled: Boolean
 		get() = Settings.System.getInt(
@@ -31,9 +34,15 @@ class ScreenOrientationHelper(private val activity: Activity) {
 			}
 		}
 
-	fun toggleOrientation() {
-		isLandscape = !isLandscape
-	}
+	var isLocked: Boolean
+		get() = activity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED
+		set(value) {
+			activity.requestedOrientation = if (value) {
+				ActivityInfo.SCREEN_ORIENTATION_LOCKED
+			} else {
+				ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+			}
+		}
 
 	fun observeAutoOrientation() = callbackFlow {
 		val observer = object : ContentObserver(Handler(activity.mainLooper)) {

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

@@ -83,7 +83,7 @@ fun <I> ActivityResultLauncher<I>.tryLaunch(
 	e.printStackTraceDebug()
 }.isSuccess
 
-fun SharedPreferences.observe() = callbackFlow<String?> {
+fun SharedPreferences.observe(): Flow<String?> = callbackFlow {
 	val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
 		trySendBlocking(key)
 	}

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

@@ -23,7 +23,7 @@ fun ImageView.newImageRequest(lifecycleOwner: LifecycleOwner, data: Any?): Image
 			return null
 		}
 	}
-	disposeImageRequest()
+	// disposeImageRequest()
 	return ImageRequest.Builder(context)
 		.data(data)
 		.lifecycle(lifecycleOwner)

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.util.ext
 
 import androidx.collection.ArrayMap
 import androidx.collection.ArraySet
+import org.koitharu.kotatsu.BuildConfig
 import java.util.Collections
 import java.util.EnumSet
 
@@ -57,3 +58,13 @@ inline fun <reified E : Enum<E>> Collection<E>.toEnumSet(): EnumSet<E> = if (isE
 }
 
 fun <E : Enum<E>> Collection<E>.sortedByOrdinal() = sortedBy { it.ordinal }
+
+fun <T> Iterable<T>.sortedWithSafe(comparator: Comparator<in T>): List<T> = try {
+	sortedWith(comparator)
+} catch (e: IllegalArgumentException) {
+	if (BuildConfig.DEBUG) {
+		throw e
+	} else {
+		toList()
+	}
+}

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

@@ -7,7 +7,6 @@ import android.os.Build
 import android.os.Environment
 import android.os.storage.StorageManager
 import android.provider.OpenableColumns
-import androidx.annotation.WorkerThread
 import androidx.core.database.getStringOrNull
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
@@ -19,7 +18,9 @@ import java.io.FileFilter
 import java.nio.file.attribute.BasicFileAttributes
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
+import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.readAttributes
+import kotlin.io.path.walk
 
 fun File.subdir(name: String) = File(this, name).also {
 	if (!it.exists()) it.mkdirs()
@@ -49,7 +50,7 @@ fun File.getStorageName(context: Context): String = runCatching {
 	}
 }.getOrNull() ?: context.getString(R.string.other_storage)
 
-fun Uri.toFileOrNull() = if (scheme == "file") path?.let(::File) else null
+fun Uri.toFileOrNull() = if (scheme == URI_SCHEME_FILE) path?.let(::File) else null
 
 suspend fun File.deleteAwait() = withContext(Dispatchers.IO) {
 	delete() || deleteRecursively()
@@ -71,31 +72,7 @@ fun ContentResolver.resolveName(uri: Uri): String? {
 }
 
 suspend fun File.computeSize(): Long = runInterruptible(Dispatchers.IO) {
-	computeSizeInternal(this)
-}
-
-@WorkerThread
-private fun computeSizeInternal(file: File): Long {
-	return if (file.isDirectory) {
-		file.children().sumOf { computeSizeInternal(it) }
-	} else {
-		file.length()
-	}
-}
-
-fun File.listFilesRecursive(filter: FileFilter? = null): Sequence<File> = sequence {
-	listFilesRecursiveImpl(this@listFilesRecursive, filter)
-}
-
-private suspend fun SequenceScope<File>.listFilesRecursiveImpl(root: File, filter: FileFilter?) {
-	val ss = root.children()
-	for (f in ss) {
-		if (f.isDirectory) {
-			listFilesRecursiveImpl(f, filter)
-		} else if (filter == null || filter.accept(f)) {
-			yield(f)
-		}
-	}
+	walkCompat().sumOf { it.length() }
 }
 
 fun File.children() = FileSequence(this)
@@ -108,3 +85,12 @@ val File.creationTime
 	} else {
 		lastModified()
 	}
+
+@OptIn(ExperimentalPathApi::class)
+fun File.walkCompat() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+	// Use lazy loading on Android 8.0 and later
+	toPath().walk().map { it.toFile() }
+} else {
+	// Directories are excluded by default in Path.walk(), so do it here as well
+	walk().filter { it.isFile }
+}

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

@@ -8,6 +8,7 @@ import okhttp3.Response
 import okhttp3.internal.closeQuietly
 import okio.IOException
 import org.json.JSONObject
+import org.jsoup.HttpStatusException
 import java.net.HttpURLConnection
 
 private val TYPE_JSON = "application/json".toMediaType()
@@ -34,9 +35,8 @@ val HttpUrl.isHttpOrHttps: Boolean
 
 fun Response.ensureSuccess() = apply {
 	if (!isSuccessful || code == HttpURLConnection.HTTP_NO_CONTENT) {
-		val message = "Invalid response: $code $message at ${request.url}"
 		closeQuietly()
-		throw IllegalStateException(message)
+		throw HttpStatusException(message, code, request.url.toString())
 	}
 }
 

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

@@ -1,6 +1,9 @@
 package org.koitharu.kotatsu.core.util.ext
 
+import android.content.Context
 import androidx.core.os.LocaleListCompat
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.parsers.util.toTitleCase
 import java.util.Locale
 
 operator fun LocaleListCompat.iterator(): ListIterator<Locale> = LocaleListCompatIterator(this)
@@ -17,6 +20,14 @@ 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 {
+	if (this == null) {
+		return context.getString(R.string.various_languages)
+	}
+	val lc = Locale(this)
+	return lc.getDisplayLanguage(lc).toTitleCase(lc)
+}
+
 private class LocaleListCompatIterator(private val list: LocaleListCompat) : ListIterator<Locale> {
 
 	private var index = 0

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

@@ -27,7 +27,10 @@ import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 
 private const val MSG_NO_SPACE_LEFT = "No space left on device"
-private const val IMAGE_FORMAT_NO_SUPPORTED = "Image format not supported"
+private const val IMAGE_FORMAT_NOT_SUPPORTED = "Image format not supported"
+private const val MULTIPLE_GENRES_NOT_SUPPORTED = "Multiple genres are not supported by this source"
+private const val MULTIPLE_STATES_NOT_SUPPORTED = "Multiple states are not supported by this source"
+private const val SEARCH_NOT_SUPPORTED = "Search is not supported by this source"
 
 fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is AuthRequiredException -> resources.getString(R.string.auth_required)
@@ -56,8 +59,7 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is HttpException -> getHttpDisplayMessage(response.code, resources)
 	is HttpStatusException -> getHttpDisplayMessage(statusCode, resources)
 
-	is IOException -> getDisplayMessage(message, resources) ?: localizedMessage
-	else -> localizedMessage
+	else -> getDisplayMessage(message, resources) ?: localizedMessage
 }.ifNullOrEmpty {
 	resources.getString(R.string.error_occurred)
 }
@@ -82,7 +84,10 @@ private fun getHttpDisplayMessage(statusCode: Int, resources: Resources): String
 private fun getDisplayMessage(msg: String?, resources: Resources): String? = when {
 	msg.isNullOrEmpty() -> null
 	msg.contains(MSG_NO_SPACE_LEFT) -> resources.getString(R.string.error_no_space_left)
-	msg.contains(IMAGE_FORMAT_NO_SUPPORTED) -> resources.getString(R.string.error_corrupted_file)
+	msg.contains(IMAGE_FORMAT_NOT_SUPPORTED) -> resources.getString(R.string.error_corrupted_file)
+	msg == MULTIPLE_GENRES_NOT_SUPPORTED -> resources.getString(R.string.error_multiple_genres_not_supported)
+	msg == MULTIPLE_STATES_NOT_SUPPORTED -> resources.getString(R.string.error_multiple_states_not_supported)
+	msg == SEARCH_NOT_SUPPORTED -> resources.getString(R.string.error_search_not_supported)
 	else -> null
 }
 

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

@@ -0,0 +1,50 @@
+package org.koitharu.kotatsu.core.util.ext
+
+import android.net.Uri
+import androidx.core.net.toFile
+import okio.Source
+import okio.source
+import okio.use
+import org.koitharu.kotatsu.local.data.util.withExtraCloseable
+import java.io.File
+import java.util.zip.ZipFile
+
+const val URI_SCHEME_FILE = "file"
+const val URI_SCHEME_ZIP = "file+zip"
+
+fun Uri.exists(): Boolean = when (scheme) {
+	URI_SCHEME_FILE -> toFile().exists()
+	URI_SCHEME_ZIP -> {
+		val file = File(requireNotNull(schemeSpecificPart))
+		file.exists() && ZipFile(file).use { it.getEntry(fragment) != null }
+	}
+
+	else -> unsupportedUri(this)
+}
+
+fun Uri.isTargetNotEmpty(): Boolean = when (scheme) {
+	URI_SCHEME_FILE -> toFile().isNotEmpty()
+	URI_SCHEME_ZIP -> {
+		val file = File(requireNotNull(schemeSpecificPart))
+		file.exists() && ZipFile(file).use { (it.getEntry(fragment)?.size ?: 0L) != 0L }
+	}
+
+	else -> unsupportedUri(this)
+}
+
+fun Uri.source(): Source = when (scheme) {
+	URI_SCHEME_FILE -> toFile().source()
+	URI_SCHEME_ZIP -> {
+		val zip = ZipFile(schemeSpecificPart)
+		val entry = zip.getEntry(fragment)
+		zip.getInputStream(entry).source().withExtraCloseable(zip)
+	}
+
+	else -> unsupportedUri(this)
+}
+
+fun File.toZipUri(entryName: String): Uri = Uri.parse("$URI_SCHEME_ZIP://$absolutePath#$entryName")
+
+private fun unsupportedUri(uri: Uri): Nothing {
+	throw IllegalArgumentException("Bad uri $uri: only schemes $URI_SCHEME_FILE and $URI_SCHEME_ZIP are supported")
+}

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

@@ -12,6 +12,7 @@ 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.viewpager2.widget.ViewPager2
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import com.google.android.material.slider.Slider
@@ -68,6 +69,10 @@ inline fun ViewPager2.doOnPageChanged(crossinline callback: (Int) -> Unit) {
 val ViewPager2.recyclerView: RecyclerView?
 	get() = children.firstNotNullOfOrNull { it as? RecyclerView }
 
+fun ViewPager2.findCurrentViewHolder(): ViewHolder? {
+	return recyclerView?.findViewHolderForAdapterPosition(currentItem)
+}
+
 fun View.resetTransformations() {
 	alpha = 1f
 	translationX = 0f

app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipPool.kt

@@ -1,32 +0,0 @@
-package org.koitharu.kotatsu.core.zip
-
-import android.net.Uri
-import androidx.annotation.WorkerThread
-import androidx.collection.LruCache
-import okhttp3.internal.closeQuietly
-import okio.Source
-import okio.source
-import java.io.File
-import java.util.zip.ZipFile
-
-class ZipPool(maxSize: Int) : LruCache<String, ZipFile>(maxSize) {
-
-	override fun entryRemoved(evicted: Boolean, key: String, oldValue: ZipFile, newValue: ZipFile?) {
-		super.entryRemoved(evicted, key, oldValue, newValue)
-		oldValue.closeQuietly()
-	}
-
-	override fun create(key: String): ZipFile {
-		return ZipFile(File(key), ZipFile.OPEN_READ)
-	}
-
-	@Synchronized
-	@WorkerThread
-	operator fun get(uri: Uri): Source {
-		val zip = requireNotNull(get(uri.schemeSpecificPart)) {
-			"Cannot obtain zip by \"$uri\""
-		}
-		val entry = zip.getEntry(uri.fragment)
-		return zip.getInputStream(entry).source()
-	}
-}

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

@@ -87,5 +87,5 @@ class DetailsInteractor @Inject constructor(
 		}
 	}
 
-	suspend fun findLocal(seed: Manga) = localMangaRepository.getRemoteManga(seed)
+	suspend fun findRemote(seed: Manga) = localMangaRepository.getRemoteManga(seed)
 }

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

@@ -11,6 +11,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.runInterruptible
+import okio.IOException
 import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaIntent
@@ -46,9 +47,15 @@ class DetailsLoadUseCase @Inject constructor(
 			null
 		}
 		send(MangaDetails(manga, null, null, false))
-		val details = getDetails(manga)
-		send(MangaDetails(details, local?.peek(), details.description?.parseAsHtml(withImages = false), false))
-		send(MangaDetails(details, local?.await(), details.description?.parseAsHtml(withImages = true), true))
+		try {
+			val details = getDetails(manga)
+			send(MangaDetails(details, local?.peek(), details.description?.parseAsHtml(withImages = false), false))
+			send(MangaDetails(details, local?.await(), details.description?.parseAsHtml(withImages = true), true))
+		} catch (e: IOException) {
+			local?.await()?.manga?.also { localManga ->
+				send(MangaDetails(localManga, null, localManga.description?.parseAsHtml(withImages = false), true))
+			} ?: throw e
+		}
 	}
 
 	private suspend fun getDetails(seed: Manga) = runCatchingCancellable {

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.details.domain
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.model.findChapter
 import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
@@ -13,15 +14,19 @@ class ProgressUpdateUseCase @Inject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val database: MangaDatabase,
 	private val localMangaRepository: LocalMangaRepository,
+	private val networkState: NetworkState,
 ) {
 
 	suspend operator fun invoke(manga: Manga): Float {
-		val history = database.historyDao.find(manga.id) ?: return PROGRESS_NONE
+		val history = database.getHistoryDao().find(manga.id) ?: return PROGRESS_NONE
 		val seed = if (manga.isLocal) {
 			localMangaRepository.getRemoteManga(manga) ?: manga
 		} else {
 			manga
 		}
+		if (!seed.isLocal && !networkState.value) {
+			return PROGRESS_NONE
+		}
 		val repo = mangaRepositoryFactory.create(seed.source)
 		val details = if (manga.source != seed.source || seed.chapters.isNullOrEmpty()) {
 			repo.getDetails(seed)
@@ -43,7 +48,7 @@ class ProgressUpdateUseCase @Inject constructor(
 		val ppc = 1f / chaptersCount
 		val result = ppc * chapterIndex + ppc * pagePercent
 		if (result != history.percent) {
-			database.historyDao.update(
+			database.getHistoryDao().update(
 				history.copy(
 					chapterId = chapter.id,
 					percent = result,

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.details.ui
 
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.transition.TransitionManager
 import android.view.LayoutInflater
 import android.view.View
@@ -13,6 +12,7 @@ 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
 import androidx.core.view.updatePadding
@@ -107,7 +107,7 @@ class DetailsFragment :
 		binding.infoLayout.textViewSource.setOnClickListener(this)
 		binding.textViewDescription.addOnLayoutChangeListener(this)
 		binding.textViewDescription.viewTreeObserver.addOnDrawListener(this)
-		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
+		binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
 		binding.chipsTags.onChipClickListener = this
 		binding.recyclerViewRelated.addItemDecoration(
 			SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)),
@@ -197,6 +197,11 @@ class DetailsFragment :
 					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) {

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

@@ -19,7 +19,7 @@ import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.download.ui.dialog.DownloadOption
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteSheet
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
@@ -63,7 +63,7 @@ class DetailsMenuProvider(
 
 			R.id.action_favourite -> {
 				viewModel.manga.value?.let {
-					FavouriteSheet.show(activity.supportFragmentManager, it)
+					FavoriteSheet.show(activity.supportFragmentManager, it)
 				}
 			}
 

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

@@ -149,15 +149,13 @@ class DetailsViewModel @Inject constructor(
 	val scrobblingInfo: StateFlow<List<ScrobblingInfo>> = interactor.observeScrobblingInfo(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
-	val relatedManga: StateFlow<List<MangaItemModel>> = manga
-		.mapLatest {
-			if (it != null && settings.isRelatedMangaEnabled) {
-				relatedMangaUseCase.invoke(it)?.toUi(ListMode.GRID, extraProvider).orEmpty()
-			} else {
-				emptyList()
-			}
+	val relatedManga: StateFlow<List<MangaItemModel>> = manga.mapLatest {
+		if (it != null && settings.isRelatedMangaEnabled) {
+			relatedMangaUseCase.invoke(it)?.toUi(ListMode.GRID, extraProvider).orEmpty()
+		} else {
+			emptyList()
 		}
-		.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
+	}.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
 	val branches: StateFlow<List<MangaBranch>> = combine(
 		details,
@@ -217,7 +215,7 @@ class DetailsViewModel @Inject constructor(
 		}
 		launchJob(Dispatchers.Default) {
 			val manga = details.firstOrNull { it != null && it.isLocal } ?: return@launchJob
-			remoteManga.value = interactor.findLocal(manga.toManga())
+			remoteManga.value = interactor.findRemote(manga.toManga())
 		}
 	}
 

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

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.details.ui.scrobbling
 
 import android.content.Intent
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -12,6 +11,7 @@ import android.widget.RatingBar
 import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.net.toUri
+import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
 import coil.ImageLoader
@@ -71,7 +71,7 @@ class ScrobblingInfoSheet :
 		binding.ratingBar.onRatingBarChangeListener = this
 		binding.buttonMenu.setOnClickListener(this)
 		binding.imageViewCover.setOnClickListener(this)
-		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
+		binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
 
 		menu = PopupMenu(binding.root.context, binding.buttonMenu).apply {
 			inflate(R.menu.opt_scrobbling)

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

@@ -18,8 +18,7 @@ data class DownloadState(
 	val currentPage: Int = 0,
 	val eta: Long = -1L,
 	val localManga: LocalManga? = null,
-	val downloadedChapters: LongArray = LongArray(0),
-	val scheduledChapters: LongArray = LongArray(0),
+	val downloadedChapters: Int = 0,
 	val timestamp: Long = System.currentTimeMillis(),
 ) {
 
@@ -42,68 +41,17 @@ data class DownloadState(
 		.putLong(DATA_ETA, eta)
 		.putLong(DATA_TIMESTAMP, timestamp)
 		.putString(DATA_ERROR, error)
-		.putLongArray(DATA_CHAPTERS, downloadedChapters)
-		.putLongArray(DATA_CHAPTERS_SRC, scheduledChapters)
+		.putInt(DATA_CHAPTERS, downloadedChapters)
 		.putBoolean(DATA_INDETERMINATE, isIndeterminate)
 		.putBoolean(DATA_PAUSED, isPaused)
 		.build()
 
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as DownloadState
-
-		if (manga != other.manga) return false
-		if (isIndeterminate != other.isIndeterminate) return false
-		if (isPaused != other.isPaused) return false
-		if (isStopped != other.isStopped) return false
-		if (error != other.error) return false
-		if (totalChapters != other.totalChapters) return false
-		if (currentChapter != other.currentChapter) return false
-		if (totalPages != other.totalPages) return false
-		if (currentPage != other.currentPage) return false
-		if (eta != other.eta) return false
-		if (localManga != other.localManga) return false
-		if (!downloadedChapters.contentEquals(other.downloadedChapters)) return false
-		if (!scheduledChapters.contentEquals(other.scheduledChapters)) return false
-		if (timestamp != other.timestamp) return false
-		if (max != other.max) return false
-		if (progress != other.progress) return false
-		if (percent != other.percent) return false
-
-		return true
-	}
-
-	override fun hashCode(): Int {
-		var result = manga.hashCode()
-		result = 31 * result + isIndeterminate.hashCode()
-		result = 31 * result + isPaused.hashCode()
-		result = 31 * result + isStopped.hashCode()
-		result = 31 * result + (error?.hashCode() ?: 0)
-		result = 31 * result + totalChapters
-		result = 31 * result + currentChapter
-		result = 31 * result + totalPages
-		result = 31 * result + currentPage
-		result = 31 * result + eta.hashCode()
-		result = 31 * result + (localManga?.hashCode() ?: 0)
-		result = 31 * result + downloadedChapters.contentHashCode()
-		result = 31 * result + scheduledChapters.contentHashCode()
-		result = 31 * result + timestamp.hashCode()
-		result = 31 * result + max
-		result = 31 * result + progress
-		result = 31 * result + percent.hashCode()
-		return result
-	}
-
-
 	companion object {
 
 		private const val DATA_MANGA_ID = "manga_id"
 		private const val DATA_MAX = "max"
 		private const val DATA_PROGRESS = "progress"
-		private const val DATA_CHAPTERS = "chapter"
-		private const val DATA_CHAPTERS_SRC = "chapters_src"
+		private const val DATA_CHAPTERS = "chapter_cnt"
 		private const val DATA_ETA = "eta"
 		private const val DATA_TIMESTAMP = "timestamp"
 		private const val DATA_ERROR = "error"
@@ -126,8 +74,6 @@ data class DownloadState(
 
 		fun getTimestamp(data: Data): Date = Date(data.getLong(DATA_TIMESTAMP, 0L))
 
-		fun getDownloadedChapters(data: Data): LongArray = data.getLongArray(DATA_CHAPTERS) ?: LongArray(0)
-
-		fun getScheduledChapters(data: Data): LongArray = data.getLongArray(DATA_CHAPTERS_SRC) ?: LongArray(0)
+		fun getDownloadedChapters(data: Data): Int = data.getInt(DATA_CHAPTERS, 0)
 	}
 }

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

@@ -2,28 +2,22 @@ package org.koitharu.kotatsu.download.ui.list
 
 import android.transition.TransitionManager
 import android.view.View
-import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.RecyclerView
 import androidx.work.WorkInfo
 import coil.ImageLoader
+import coil.request.SuccessResult
+import coil.util.CoilUtils
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.image.TrimTransformation
-import org.koitharu.kotatsu.core.util.ext.drawableEnd
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemDownloadBinding
-import org.koitharu.kotatsu.download.ui.list.chapters.DownloadChapter
-import org.koitharu.kotatsu.download.ui.list.chapters.downloadChapterAD
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.util.format
 
@@ -36,9 +30,7 @@ fun downloadItemAD(
 ) {
 
 	val percentPattern = context.resources.getString(R.string.percent_string_pattern)
-	val expandIcon = ContextCompat.getDrawable(context, R.drawable.ic_expand_collapse)
-	val chaptersAdapter = BaseListAdapter<DownloadChapter>()
-		.addDelegate(ListItemType.CHAPTER, downloadChapterAD())
+	// val expandIcon = ContextCompat.getDrawable(context, R.drawable.ic_expand_collapse)
 
 	val clickListener = object : View.OnClickListener, View.OnLongClickListener {
 		override fun onClick(v: View) {
@@ -59,27 +51,26 @@ fun downloadItemAD(
 	binding.buttonResume.setOnClickListener(clickListener)
 	itemView.setOnClickListener(clickListener)
 	itemView.setOnLongClickListener(clickListener)
-	binding.recyclerViewChapters.addItemDecoration(DividerItemDecoration(context, RecyclerView.VERTICAL))
-	binding.recyclerViewChapters.adapter = chaptersAdapter
 
 	bind { payloads ->
 		if (ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED in payloads && context.isAnimationsEnabled) {
 			TransitionManager.beginDelayedTransition(binding.constraintLayout)
 		}
 		binding.textViewTitle.text = item.manga.title
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.apply {
-			placeholder(R.drawable.ic_placeholder)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
-			allowRgb565(true)
-			transformations(TrimTransformation())
-			source(item.manga.source)
-			enqueueWith(coil)
+		if ((CoilUtils.result(binding.imageViewCover) as? SuccessResult)?.memoryCacheKey != item.coverCacheKey) {
+			binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.apply {
+				placeholder(R.drawable.ic_placeholder)
+				fallback(R.drawable.ic_placeholder)
+				error(R.drawable.ic_error_placeholder)
+				allowRgb565(true)
+				transformations(TrimTransformation())
+				memoryCacheKey(item.coverCacheKey)
+				source(item.manga.source)
+				enqueueWith(coil)
+			}
 		}
-		binding.textViewTitle.isChecked = item.isExpanded
-		binding.textViewTitle.drawableEnd = if (item.isExpandable) expandIcon else null
-		binding.cardDetails.isVisible = item.isExpanded
-		chaptersAdapter.items = item.chapters
+		// binding.textViewTitle.isChecked = item.isExpanded
+		// binding.textViewTitle.drawableEnd = if (item.isExpandable) expandIcon else null
 		when (item.workState) {
 			WorkInfo.State.ENQUEUED,
 			WorkInfo.State.BLOCKED -> {
@@ -117,11 +108,11 @@ fun downloadItemAD(
 				binding.progressBar.isVisible = false
 				binding.progressBar.isEnabled = true
 				binding.textViewPercent.isVisible = false
-				if (item.totalChapters > 0) {
+				if (item.chaptersDownloaded > 0) {
 					binding.textViewDetails.text = context.resources.getQuantityString(
 						R.plurals.chapters,
-						item.totalChapters,
-						item.totalChapters,
+						item.chaptersDownloaded,
+						item.chaptersDownloaded,
 					)
 					binding.textViewDetails.isVisible = true
 				} else {

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

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.download.ui.list
 
 import android.text.format.DateUtils
 import androidx.work.WorkInfo
-import org.koitharu.kotatsu.download.ui.list.chapters.DownloadChapter
+import coil.memory.MemoryCache
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -17,14 +17,15 @@ data class DownloadItemModel(
 	val manga: Manga,
 	val error: String?,
 	val max: Int,
-	val totalChapters: Int,
 	val progress: Int,
 	val eta: Long,
 	val timestamp: Date,
-	val chapters: List<DownloadChapter>,
+	val chaptersDownloaded: Int,
 	val isExpanded: Boolean,
 ) : ListModel, Comparable<DownloadItemModel> {
 
+	val coverCacheKey = MemoryCache.Key(manga.coverUrl, mapOf("dl" to "1"))
+
 	val percent: Float
 		get() = if (max > 0) progress / max.toFloat() else 0f
 
@@ -38,7 +39,7 @@ data class DownloadItemModel(
 		get() = workState == WorkInfo.State.RUNNING && isPaused
 
 	val isExpandable: Boolean
-		get() = chapters.isNotEmpty()
+		get() = false // TODO
 
 	fun getEtaString(): CharSequence? = if (hasEta) {
 		DateUtils.getRelativeTimeSpanString(

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

@@ -15,6 +15,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
+import org.koitharu.kotatsu.core.ui.list.RecyclerScrollKeeper
 import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -53,6 +54,7 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 			addItemDecoration(decoration)
 			adapter = downloadsAdapter
 			selectionController.attachToRecyclerView(this)
+			RecyclerScrollKeeper(this).attach()
 		}
 		addMenuProvider(DownloadsMenuProvider(this, viewModel))
 		viewModel.items.observe(this) {

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

@@ -28,7 +28,6 @@ import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.download.ui.list.chapters.DownloadChapter
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListHeader
@@ -239,8 +238,6 @@ class DownloadsViewModel @Inject constructor(
 		val mangaId = DownloadState.getMangaId(workData)
 		if (mangaId == 0L) return null
 		val manga = getManga(mangaId) ?: return null
-		val downloadedChapters = DownloadState.getDownloadedChapters(workData)
-		val scheduledChapters = DownloadState.getScheduledChapters(workData).toSet()
 		return DownloadItemModel(
 			id = id,
 			workState = state,
@@ -252,19 +249,8 @@ class DownloadsViewModel @Inject constructor(
 			progress = DownloadState.getProgress(workData),
 			eta = DownloadState.getEta(workData),
 			timestamp = DownloadState.getTimestamp(workData),
-			totalChapters = downloadedChapters.size,
+			chaptersDownloaded = DownloadState.getDownloadedChapters(workData),
 			isExpanded = isExpanded,
-			chapters = manga.chapters?.mapNotNull {
-				if (it.id in scheduledChapters) {
-					DownloadChapter(
-						number = it.number,
-						name = it.name,
-						isDownloaded = it.id in downloadedChapters,
-					)
-				} else {
-					null
-				}
-			}.orEmpty(),
 		)
 	}
 

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

@@ -38,6 +38,7 @@ import okio.buffer
 import okio.sink
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
+import org.koitharu.kotatsu.core.model.ids
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
@@ -46,7 +47,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.Throttler
 import org.koitharu.kotatsu.core.util.ext.awaitFinishedWorkInfosByTag
 import org.koitharu.kotatsu.core.util.ext.awaitUpdateWork
-import org.koitharu.kotatsu.core.util.ext.awaitWorkInfoById
 import org.koitharu.kotatsu.core.util.ext.awaitWorkInfosByTag
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
 import org.koitharu.kotatsu.core.util.ext.deleteWork
@@ -105,11 +105,12 @@ class DownloadWorker @AssistedInject constructor(
 		setForeground(getForegroundInfo())
 		val mangaId = inputData.getLong(MANGA_ID, 0L)
 		val manga = mangaDataRepository.findMangaById(mangaId) ?: return Result.failure()
-		val chaptersIds = inputData.getLongArray(CHAPTERS_IDS)?.takeUnless { it.isEmpty() }
-		val downloadedIds = getDoneChapters()
 		lastPublishedState = DownloadState(manga, isIndeterminate = true)
+		publishState(DownloadState(manga, isIndeterminate = true))
+		val chaptersIds = inputData.getLongArray(CHAPTERS_IDS)?.takeUnless { it.isEmpty() }
+		val downloadedIds = getDoneChapters(manga)
 		return try {
-			downloadMangaImpl(chaptersIds, downloadedIds)
+			downloadMangaImpl(manga, chaptersIds, downloadedIds)
 			Result.success(currentState.toWorkData())
 		} catch (e: CancellationException) {
 			withContext(NonCancellable) {
@@ -147,10 +148,11 @@ class DownloadWorker @AssistedInject constructor(
 	}
 
 	private suspend fun downloadMangaImpl(
+		subject: Manga,
 		includedIds: LongArray?,
-		excludedIds: LongArray,
+		excludedIds: Set<Long>,
 	) {
-		var manga = currentState.manga
+		var manga = subject
 		val chaptersToSkip = excludedIds.toMutableSet()
 		withMangaLock(manga) {
 			ContextCompat.registerReceiver(
@@ -178,16 +180,9 @@ class DownloadWorker @AssistedInject constructor(
 					}
 				}
 				val chapters = getChapters(mangaDetails, includedIds)
-				publishState(
-					currentState.copy(scheduledChapters = LongArray(chapters.size) { i -> chapters[i].id }),
-				)
 				for ((chapterIndex, chapter) in chapters.withIndex()) {
 					if (chaptersToSkip.remove(chapter.id)) {
-						publishState(
-							currentState.copy(
-								downloadedChapters = currentState.downloadedChapters + chapter.id,
-							),
-						)
+						publishState(currentState.copy(downloadedChapters = currentState.downloadedChapters + 1))
 						continue
 					}
 					val pages = runFailsafe(pausingHandle) {
@@ -225,11 +220,7 @@ class DownloadWorker @AssistedInject constructor(
 							localStorageChanges.emit(LocalMangaInput.of(output.rootFile).getManga())
 						}.onFailure(Throwable::printStackTraceDebug)
 					}
-					publishState(
-						currentState.copy(
-							downloadedChapters = currentState.downloadedChapters + chapter.id,
-						),
-					)
+					publishState(currentState.copy(downloadedChapters = currentState.downloadedChapters + 1))
 				}
 				publishState(currentState.copy(isIndeterminate = true, eta = -1L))
 				output.mergeWithExisting()
@@ -336,11 +327,9 @@ class DownloadWorker @AssistedInject constructor(
 		setProgress(state.toWorkData())
 	}
 
-	private suspend fun getDoneChapters(): LongArray {
-		val work = WorkManager.getInstance(applicationContext).awaitWorkInfoById(id)
-			?: return LongArray(0)
-		return DownloadState.getDownloadedChapters(work.progress)
-	}
+	private suspend fun getDoneChapters(manga: Manga) = runCatchingCancellable {
+		localMangaRepository.getDetails(manga).chapters?.ids()
+	}.getOrNull().orEmpty()
 
 	private fun getChapters(
 		manga: Manga,

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

@@ -19,6 +19,7 @@ import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.Collections
 import java.util.EnumSet
 import javax.inject.Inject
@@ -30,7 +31,7 @@ class MangaSourcesRepository @Inject constructor(
 ) {
 
 	private val dao: MangaSourcesDao
-		get() = db.sourcesDao
+		get() = db.getSourcesDao()
 
 	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
 		remove(MangaSource.LOCAL)
@@ -43,15 +44,44 @@ class MangaSourcesRepository @Inject constructor(
 		get() = Collections.unmodifiableSet(remoteSources)
 
 	suspend fun getEnabledSources(): List<MangaSource> {
-		return dao.findAllEnabled().toSources(settings.isNsfwContentDisabled)
+		val order = settings.sourcesSortOrder
+		return dao.findAllEnabled(order).toSources(settings.isNsfwContentDisabled, order)
 	}
 
-	fun observeEnabledSources(): Flow<List<MangaSource>> = observeIsNsfwDisabled().flatMapLatest { skipNsfw ->
-		dao.observeEnabled().map {
-			it.toSources(skipNsfw)
-		}
+	suspend fun getDisabledSources(): List<MangaSource> {
+		return dao.findAllDisabled().toSources(settings.isNsfwContentDisabled, null)
 	}
 
+	fun observeEnabledSourcesCount(): Flow<Int> {
+		return combine(
+			observeIsNsfwDisabled(),
+			dao.observeEnabled(SourcesSortOrder.MANUAL),
+		) { skipNsfw, sources ->
+			sources.count { skipNsfw || !MangaSource(it.source).isNsfw() }
+		}.distinctUntilChanged()
+	}
+
+	fun observeAvailableSourcesCount(): Flow<Int> {
+		return combine(
+			observeIsNsfwDisabled(),
+			dao.observeEnabled(SourcesSortOrder.MANUAL),
+		) { skipNsfw, enabledSources ->
+			val enabled = enabledSources.mapToSet { it.source }
+			allMangaSources.count { x ->
+				x.name !in enabled && (!skipNsfw || !x.isNsfw())
+			}
+		}.distinctUntilChanged()
+	}
+
+	fun observeEnabledSources(): Flow<List<MangaSource>> = combine(
+		observeIsNsfwDisabled(),
+		observeSortOrder(),
+	) { skipNsfw, order ->
+		dao.observeEnabled(order).map {
+			it.toSources(skipNsfw, order)
+		}
+	}.flatMapLatest { it }
+
 	fun observeAll(): Flow<List<Pair<MangaSource, Boolean>>> = dao.observeAll().map { entities ->
 		val result = ArrayList<Pair<MangaSource, Boolean>>(entities.size)
 		for (entity in entities) {
@@ -146,7 +176,10 @@ class MangaSourcesRepository @Inject constructor(
 		return result
 	}
 
-	private fun List<MangaSourceEntity>.toSources(skipNsfwSources: Boolean): List<MangaSource> {
+	private fun List<MangaSourceEntity>.toSources(
+		skipNsfwSources: Boolean,
+		sortOrder: SourcesSortOrder?,
+	): List<MangaSource> {
 		val result = ArrayList<MangaSource>(size)
 		for (entity in this) {
 			val source = MangaSource(entity.source)
@@ -157,6 +190,9 @@ class MangaSourcesRepository @Inject constructor(
 				result.add(source)
 			}
 		}
+		if (sortOrder == SourcesSortOrder.ALPHABETIC) {
+			result.sortBy { it.title }
+		}
 		return result
 	}
 
@@ -167,4 +203,8 @@ class MangaSourcesRepository @Inject constructor(
 	private fun observeIsNewSourcesEnabled() = settings.observeAsFlow(AppSettings.KEY_SOURCES_NEW) {
 		isNewSourcesTipEnabled
 	}
+
+	private fun observeSortOrder() = settings.observeAsFlow(AppSettings.KEY_SOURCES_ORDER) {
+		sourcesSortOrder
+	}
 }

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.explore.data
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+
+enum class SourcesSortOrder(
+	@StringRes val titleResId: Int,
+) {
+	ALPHABETIC(R.string.by_name),
+	POPULARITY(R.string.popular),
+	MANUAL(R.string.manual),
+}

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

@@ -9,6 +9,7 @@ import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.suggestions.domain.TagsBlacklist
@@ -73,7 +74,15 @@ class ExploreRepository @Inject constructor(
 		val tag = tags.firstNotNullOfOrNull { title ->
 			availableTags.find { x -> x.title.almostEquals(title, 0.4f) }
 		}
-		val list = repository.getList(0, setOfNotNull(tag), order).asArrayList()
+		val list = repository.getList(
+			offset = 0,
+			filter = MangaListFilter.Advanced(
+				sortOrder = order,
+				tags = setOfNotNull(tag),
+				locale = null,
+				states = emptySet(),
+			),
+		).asArrayList()
 		if (settings.isSuggestionsExcludeNsfw) {
 			list.removeAll { it.isNsfw }
 		}

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

@@ -5,6 +5,7 @@ import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
 
@@ -18,7 +19,7 @@ class RecoverMangaUseCase @Inject constructor(
 			return@runCatchingCancellable null
 		}
 		val repository = repositoryFactory.create(manga.source)
-		val list = repository.getList(offset = 0, query = manga.title)
+		val list = repository.getList(offset = 0, filter = MangaListFilter.Search(manga.title))
 		val newManga = list.find { x -> x.title == manga.title }?.let {
 			repository.getDetails(it)
 		} ?: return@runCatchingCancellable null

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.explore.ui
 
 import android.content.DialogInterface
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -46,6 +47,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
+import org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
 import javax.inject.Inject
 
@@ -83,7 +85,7 @@ class ExploreFragment :
 			SpanSizeResolver(this, resources.getDimensionPixelSize(R.dimen.explore_grid_width)).attach()
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 		}
-		addMenuProvider(ExploreMenuProvider(binding.root.context, viewModel))
+		addMenuProvider(ExploreMenuProvider(binding.root.context))
 		viewModel.content.observe(viewLifecycleOwner) {
 			exploreAdapter?.items = it
 		}
@@ -109,7 +111,7 @@ class ExploreFragment :
 	}
 
 	override fun onListHeaderClick(item: ListHeader, view: View) {
-		startActivity(SettingsActivity.newManageSourcesIntent(view.context))
+		startActivity(Intent(view.context, SourcesCatalogActivity::class.java))
 	}
 
 	override fun onPrimaryButtonClick(tipView: TipView) {
@@ -174,7 +176,6 @@ class ExploreFragment :
 		} else {
 			LinearLayoutManager(requireContext())
 		}
-		activity?.invalidateOptionsMenu()
 	}
 
 	private fun showSuggestionsTip() {

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

@@ -6,10 +6,10 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.settings.SettingsActivity
 
 class ExploreMenuProvider(
 	private val context: Context,
-	private val viewModel: ExploreViewModel,
 ) : MenuProvider {
 
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
@@ -18,17 +18,12 @@ class ExploreMenuProvider(
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
 		return when (menuItem.itemId) {
-			R.id.action_grid -> {
-				viewModel.setGridMode(!menuItem.isChecked)
+			R.id.action_manage -> {
+				context.startActivity(SettingsActivity.newSourcesSettingsIntent(context))
 				true
 			}
 
 			else -> false
 		}
 	}
-
-	override fun onPrepareMenu(menu: Menu) {
-		super.onPrepareMenu(menu)
-		menu.findItem(R.id.action_grid)?.isChecked = viewModel.isGrid.value == true
-	}
 }

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

@@ -21,6 +21,7 @@ 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
@@ -50,11 +51,13 @@ class ExploreViewModel @Inject constructor(
 		valueProducer = { isSourcesGridMode },
 	)
 
-	val isSuggestionsEnabled = settings.observeAsFlow(
+	private val isSuggestionsEnabled = settings.observeAsFlow(
 		key = AppSettings.KEY_SUGGESTIONS,
 		valueProducer = { isSuggestionsEnabled },
 	)
 
+	val sortOrder = MutableStateFlow(SourcesSortOrder.MANUAL) // TODO
+
 	val onOpenManga = MutableEventFlow<Manga>()
 	val onActionDone = MutableEventFlow<ReversibleAction>()
 	val onShowSuggestionsTip = MutableEventFlow<Unit>()
@@ -104,10 +107,6 @@ class ExploreViewModel @Inject constructor(
 		}
 	}
 
-	fun setGridMode(value: Boolean) {
-		settings.isSourcesGridMode = value
-	}
-
 	fun respondSuggestionTip(isAccepted: Boolean) {
 		settings.isSuggestionsEnabled = isAccepted
 		settings.closeTip(TIP_SUGGESTIONS)
@@ -137,7 +136,7 @@ class ExploreViewModel @Inject constructor(
 			result += RecommendationsItem(recommendation)
 		}
 		if (sources.isNotEmpty()) {
-			result += ListHeader(R.string.remote_sources, R.string.manage)
+			result += ListHeader(R.string.remote_sources, R.string.catalog)
 			if (newSources.isNotEmpty()) {
 				result += TipModel(
 					key = TIP_NEW_SOURCES,

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

@@ -7,6 +7,7 @@ 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.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.ui.image.TrimTransformation
@@ -48,8 +49,8 @@ fun exploreButtonsAD(
 			icon.setColorSchemeColors(
 				context.getThemeColor(
 					materialR.attr.colorPrimary,
-					Color.DKGRAY
-				)
+					Color.DKGRAY,
+				),
 			)
 			binding.buttonRandom.icon = icon
 			icon.start()
@@ -98,7 +99,7 @@ fun exploreSourceListItemAD(
 		ItemExploreSourceListBinding.inflate(
 			layoutInflater,
 			parent,
-			false
+			false,
 		)
 	},
 	on = { item, _, _ -> item is MangaSourceItem && !item.isGrid },
@@ -112,6 +113,7 @@ fun exploreSourceListItemAD(
 
 	bind {
 		binding.textViewTitle.text = item.source.title
+		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 {
 			fallback(fallbackIcon)
@@ -132,7 +134,7 @@ fun exploreSourceGridItemAD(
 		ItemExploreSourceGridBinding.inflate(
 			layoutInflater,
 			parent,
-			false
+			false,
 		)
 	},
 	on = { item, _, _ -> item is MangaSourceItem && item.isGrid },

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

@@ -106,6 +106,9 @@ abstract class FavouritesDao {
 	@Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id = :id AND deleted_at = 0")
 	abstract fun observeIds(id: Long): Flow<List<Long>>
 
+	@Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id IN (:mangaIds) AND deleted_at = 0")
+	abstract suspend fun findCategoriesIds(mangaIds: Collection<Long>): List<Long>
+
 	/** INSERT **/
 
 	@Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -169,7 +172,9 @@ abstract class FavouritesDao {
 		ListSortOrder.NEWEST -> "favourites.created_at DESC"
 		ListSortOrder.ALPHABETIC -> "manga.title ASC"
 		ListSortOrder.NEW_CHAPTERS -> "(SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id) DESC"
+		ListSortOrder.UPDATED, // for legacy support
 		ListSortOrder.PROGRESS -> "(SELECT percent FROM history WHERE history.manga_id = manga.manga_id) DESC"
+
 		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
 	}
 }

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

@@ -31,27 +31,27 @@ class FavouritesRepository @Inject constructor(
 ) {
 
 	suspend fun getAllManga(): List<Manga> {
-		val entities = db.favouritesDao.findAll()
+		val entities = db.getFavouritesDao().findAll()
 		return entities.toMangaList()
 	}
 
 	suspend fun getLastManga(limit: Int): List<Manga> {
-		val entities = db.favouritesDao.findLast(limit)
+		val entities = db.getFavouritesDao().findLast(limit)
 		return entities.toMangaList()
 	}
 
 	fun observeAll(order: ListSortOrder): Flow<List<Manga>> {
-		return db.favouritesDao.observeAll(order)
+		return db.getFavouritesDao().observeAll(order)
 			.mapItems { it.toManga() }
 	}
 
 	suspend fun getManga(categoryId: Long): List<Manga> {
-		val entities = db.favouritesDao.findAll(categoryId)
+		val entities = db.getFavouritesDao().findAll(categoryId)
 		return entities.toMangaList()
 	}
 
 	fun observeAll(categoryId: Long, order: ListSortOrder): Flow<List<Manga>> {
-		return db.favouritesDao.observeAll(categoryId, order)
+		return db.getFavouritesDao().observeAll(categoryId, order)
 			.mapItems { it.toManga() }
 	}
 
@@ -61,25 +61,25 @@ class FavouritesRepository @Inject constructor(
 	}
 
 	fun observeCategories(): Flow<List<FavouriteCategory>> {
-		return db.favouriteCategoriesDao.observeAll().mapItems {
+		return db.getFavouriteCategoriesDao().observeAll().mapItems {
 			it.toFavouriteCategory()
 		}.distinctUntilChanged()
 	}
 
 	fun observeCategoriesForLibrary(): Flow<List<FavouriteCategory>> {
-		return db.favouriteCategoriesDao.observeAllForLibrary().mapItems {
+		return db.getFavouriteCategoriesDao().observeAllForLibrary().mapItems {
 			it.toFavouriteCategory()
 		}.distinctUntilChanged()
 	}
 
 	fun observeCategoriesWithCovers(): Flow<Map<FavouriteCategory, List<Cover>>> {
-		return db.favouriteCategoriesDao.observeAll()
+		return db.getFavouriteCategoriesDao().observeAll()
 			.map {
 				db.withTransaction {
 					val res = LinkedHashMap<FavouriteCategory, List<Cover>>()
 					for (entity in it) {
 						val cat = entity.toFavouriteCategory()
-						res[cat] = db.favouritesDao.findCovers(
+						res[cat] = db.getFavouritesDao().findCovers(
 							categoryId = cat.id,
 							order = cat.order,
 						)
@@ -90,16 +90,20 @@ class FavouritesRepository @Inject constructor(
 	}
 
 	fun observeCategory(id: Long): Flow<FavouriteCategory?> {
-		return db.favouriteCategoriesDao.observe(id)
+		return db.getFavouriteCategoriesDao().observe(id)
 			.map { it?.toFavouriteCategory() }
 	}
 
 	fun observeCategoriesIds(mangaId: Long): Flow<Set<Long>> {
-		return db.favouritesDao.observeIds(mangaId).map { it.toSet() }
+		return db.getFavouritesDao().observeIds(mangaId).map { it.toSet() }
 	}
 
 	suspend fun getCategory(id: Long): FavouriteCategory {
-		return db.favouriteCategoriesDao.find(id.toInt()).toFavouriteCategory()
+		return db.getFavouriteCategoriesDao().find(id.toInt()).toFavouriteCategory()
+	}
+
+	suspend fun getCategoriesIds(mangaIds: Collection<Long>): Set<Long> {
+		return db.getFavouritesDao().findCategoriesIds(mangaIds).toSet()
 	}
 
 	suspend fun createCategory(
@@ -111,14 +115,14 @@ class FavouritesRepository @Inject constructor(
 		val entity = FavouriteCategoryEntity(
 			title = title,
 			createdAt = System.currentTimeMillis(),
-			sortKey = db.favouriteCategoriesDao.getNextSortKey(),
+			sortKey = db.getFavouriteCategoriesDao().getNextSortKey(),
 			categoryId = 0,
 			order = sortOrder.name,
 			track = isTrackerEnabled,
 			deletedAt = 0L,
 			isVisibleInLibrary = isVisibleOnShelf,
 		)
-		val id = db.favouriteCategoriesDao.insert(entity)
+		val id = db.getFavouriteCategoriesDao().insert(entity)
 		val category = entity.toFavouriteCategory(id)
 		channels.createChannel(category)
 		return category
@@ -131,22 +135,22 @@ class FavouritesRepository @Inject constructor(
 		isTrackerEnabled: Boolean,
 		isVisibleOnShelf: Boolean,
 	) {
-		db.favouriteCategoriesDao.update(id, title, sortOrder.name, isTrackerEnabled, isVisibleOnShelf)
+		db.getFavouriteCategoriesDao().update(id, title, sortOrder.name, isTrackerEnabled, isVisibleOnShelf)
 	}
 
 	suspend fun updateCategory(id: Long, isVisibleInLibrary: Boolean) {
-		db.favouriteCategoriesDao.updateLibVisibility(id, isVisibleInLibrary)
+		db.getFavouriteCategoriesDao().updateLibVisibility(id, isVisibleInLibrary)
 	}
 
 	suspend fun updateCategoryTracking(id: Long, isTrackingEnabled: Boolean) {
-		db.favouriteCategoriesDao.updateTracking(id, isTrackingEnabled)
+		db.getFavouriteCategoriesDao().updateTracking(id, isTrackingEnabled)
 	}
 
 	suspend fun removeCategories(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.deleteAll(id)
-				db.favouriteCategoriesDao.delete(id)
+				db.getFavouritesDao().deleteAll(id)
+				db.getFavouriteCategoriesDao().delete(id)
 			}
 		}
 		// run after transaction success
@@ -156,11 +160,11 @@ class FavouritesRepository @Inject constructor(
 	}
 
 	suspend fun setCategoryOrder(id: Long, order: ListSortOrder) {
-		db.favouriteCategoriesDao.updateOrder(id, order.name)
+		db.getFavouriteCategoriesDao().updateOrder(id, order.name)
 	}
 
 	suspend fun reorderCategories(orderedIds: List<Long>) {
-		val dao = db.favouriteCategoriesDao
+		val dao = db.getFavouriteCategoriesDao()
 		db.withTransaction {
 			for ((i, id) in orderedIds.withIndex()) {
 				dao.updateSortKey(id, i)
@@ -172,8 +176,8 @@ class FavouritesRepository @Inject constructor(
 		db.withTransaction {
 			for (manga in mangas) {
 				val tags = manga.tags.toEntities()
-				db.tagsDao.upsert(tags)
-				db.mangaDao.upsert(manga.toEntity(), tags)
+				db.getTagsDao().upsert(tags)
+				db.getMangaDao().upsert(manga.toEntity(), tags)
 				val entity = FavouriteEntity(
 					mangaId = manga.id,
 					categoryId = categoryId,
@@ -181,7 +185,7 @@ class FavouritesRepository @Inject constructor(
 					sortKey = 0,
 					deletedAt = 0L,
 				)
-				db.favouritesDao.insert(entity)
+				db.getFavouritesDao().insert(entity)
 			}
 		}
 	}
@@ -189,7 +193,7 @@ class FavouritesRepository @Inject constructor(
 	suspend fun removeFromFavourites(ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.delete(mangaId = id)
+				db.getFavouritesDao().delete(mangaId = id)
 			}
 		}
 		return ReversibleHandle { recoverToFavourites(ids) }
@@ -198,14 +202,14 @@ class FavouritesRepository @Inject constructor(
 	suspend fun removeFromCategory(categoryId: Long, ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.delete(categoryId = categoryId, mangaId = id)
+				db.getFavouritesDao().delete(categoryId = categoryId, mangaId = id)
 			}
 		}
 		return ReversibleHandle { recoverToCategory(categoryId, ids) }
 	}
 
 	private fun observeOrder(categoryId: Long): Flow<ListSortOrder> {
-		return db.favouriteCategoriesDao.observe(categoryId)
+		return db.getFavouriteCategoriesDao().observe(categoryId)
 			.filterNotNull()
 			.map { x -> ListSortOrder(x.order, ListSortOrder.NEWEST) }
 			.distinctUntilChanged()
@@ -214,7 +218,7 @@ class FavouritesRepository @Inject constructor(
 	private suspend fun recoverToFavourites(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.recover(mangaId = id)
+				db.getFavouritesDao().recover(mangaId = id)
 			}
 		}
 	}
@@ -222,7 +226,7 @@ class FavouritesRepository @Inject constructor(
 	private suspend fun recoverToCategory(categoryId: Long, ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.recover(mangaId = id, categoryId = categoryId)
+				db.getFavouritesDao().recover(mangaId = id, categoryId = categoryId)
 			}
 		}
 	}

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

@@ -19,17 +19,12 @@ import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.SheetFavoriteCategoriesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
-import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
 @AndroidEntryPoint
-class FavouriteSheet :
-	BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(),
-	OnListItemClickListener<MangaCategoryItem> {
+class FavoriteSheet : BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(), OnListItemClickListener<MangaCategoryItem> {
 
-	private val viewModel: MangaCategoriesViewModel by viewModels()
-
-	private var adapter: MangaCategoriesAdapter? = null
+	private val viewModel by viewModels<FavoriteSheetViewModel>()
 
 	override fun onCreateViewBinding(
 		inflater: LayoutInflater,
@@ -41,44 +36,32 @@ class FavouriteSheet :
 		savedInstanceState: Bundle?,
 	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		adapter = MangaCategoriesAdapter(this)
+		val adapter = MangaCategoriesAdapter(this)
 		binding.recyclerViewCategories.adapter = adapter
-		viewModel.content.observe(viewLifecycleOwner, this::onContentChanged)
+		viewModel.content.observe(viewLifecycleOwner, adapter)
 		viewModel.onError.observeEvent(viewLifecycleOwner, ::onError)
 	}
 
-	override fun onDestroyView() {
-		adapter = null
-		super.onDestroyView()
-	}
-
 	override fun onItemClick(item: MangaCategoryItem, view: View) {
 		viewModel.setChecked(item.category.id, !item.isChecked)
 	}
 
-	private fun onContentChanged(categories: List<ListModel>) {
-		adapter?.items = categories
-	}
-
 	private fun onError(e: Throwable) {
 		Toast.makeText(context ?: return, e.getDisplayMessage(resources), Toast.LENGTH_SHORT).show()
 	}
 
 	companion object {
 
-		private const val TAG = "FavouriteCategoriesDialog"
+		private const val TAG = "FavoriteSheet"
 		const val KEY_MANGA_LIST = "manga_list"
 
-		fun show(fm: FragmentManager, manga: Manga) = Companion.show(fm, listOf(manga))
+		fun show(fm: FragmentManager, manga: Manga) = show(fm, setOf(manga))
 
-		fun show(fm: FragmentManager, manga: Collection<Manga>) =
-			FavouriteSheet().withArgs(1) {
-				putParcelableArrayList(
-					KEY_MANGA_LIST,
-					manga.mapTo(ArrayList(manga.size)) {
-						ParcelableManga(it)
-					},
-				)
-			}.showDistinct(fm, TAG)
+		fun show(fm: FragmentManager, manga: Collection<Manga>) = FavoriteSheet().withArgs(1) {
+			putParcelableArrayList(
+				KEY_MANGA_LIST,
+				manga.mapTo(ArrayList(manga.size), ::ParcelableManga),
+			)
+		}.showDistinct(fm, TAG)
 	}
 }

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

@@ -4,77 +4,70 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 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.filterNotNull
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.model.ids
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 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.firstNotNull
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet.Companion.KEY_MANGA_LIST
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.CategoriesHeaderItem
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
-import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.util.mapToSet
 import javax.inject.Inject
 
 @HiltViewModel
-class MangaCategoriesViewModel @Inject constructor(
+class FavoriteSheetViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	private val favouritesRepository: FavouritesRepository,
 	settings: AppSettings,
 ) : BaseViewModel() {
 
-	private val manga = savedStateHandle.require<List<ParcelableManga>>(KEY_MANGA_LIST).map { it.manga }
+	private val manga = savedStateHandle.require<List<ParcelableManga>>(FavoriteSheet.KEY_MANGA_LIST).mapToSet {
+		it.manga
+	}
 	private val header = CategoriesHeaderItem()
-
-	val content: StateFlow<List<ListModel>> = combine(
+	private val checkedCategories = MutableStateFlow<Set<Long>?>(null)
+	val content = combine(
 		favouritesRepository.observeCategories(),
-		observeCategoriesIds(),
-	) { all, checked ->
-		buildList(all.size + 1) {
+		checkedCategories.filterNotNull(),
+		settings.observeAsFlow(AppSettings.KEY_TRACKER_ENABLED) { isTrackerEnabled },
+	) { categories, checked, tracker ->
+		buildList(categories.size + 1) {
 			add(header)
-			all.mapTo(this) {
+			categories.mapTo(this) { cat ->
 				MangaCategoryItem(
-					category = it,
-					isChecked = it.id in checked,
-					isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
+					category = cat,
+					isChecked = cat.id in checked,
+					isTrackerEnabled = tracker,
 				)
 			}
 		}
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(header))
+
+	init {
+		launchJob(Dispatchers.Default) {
+			checkedCategories.value = favouritesRepository.getCategoriesIds(manga.ids())
+		}
+	}
 
 	fun setChecked(categoryId: Long, isChecked: Boolean) {
 		launchJob(Dispatchers.Default) {
+			val checkedIds = checkedCategories.firstNotNull()
 			if (isChecked) {
+				checkedCategories.value = checkedIds + categoryId
 				favouritesRepository.addToCategory(categoryId, manga)
 			} else {
+				checkedCategories.value = checkedIds - categoryId
 				favouritesRepository.removeFromCategory(categoryId, manga.ids())
 			}
 		}
 	}
-
-	private fun observeCategoriesIds() = if (manga.size == 1) {
-		// Fast path
-		favouritesRepository.observeCategoriesIds(manga[0].id)
-	} else {
-		combine(
-			manga.map { favouritesRepository.observeCategoriesIds(it.id) },
-		) { array ->
-			val result = HashSet<Long>()
-			var isFirst = true
-			for (ids in array) {
-				if (isFirst) {
-					result.addAll(ids)
-					isFirst = false
-				} else {
-					result.retainAll(ids.toSet())
-				}
-			}
-			result
-		}
-	}
 }

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

@@ -19,6 +19,8 @@ class FilterAdapter(
 	init {
 		addDelegate(ListItemType.FILTER_SORT, filterSortDelegate(listener))
 		addDelegate(ListItemType.FILTER_TAG, filterTagDelegate(listener))
+		addDelegate(ListItemType.FILTER_TAG_MULTI, filterTagMultipleDelegate(listener))
+		addDelegate(ListItemType.FILTER_STATE, filterStateDelegate(listener))
 		addDelegate(ListItemType.HEADER, listHeaderAD(listener))
 		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
 		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())

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

@@ -4,6 +4,7 @@ import android.widget.TextView
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.titleResId
 import org.koitharu.kotatsu.core.ui.model.titleRes
 import org.koitharu.kotatsu.core.util.ext.setChecked
 import org.koitharu.kotatsu.databinding.ItemCheckableMultipleBinding
@@ -27,10 +28,44 @@ fun filterSortDelegate(
 	}
 }
 
+fun filterStateDelegate(
+	listener: OnFilterChangedListener,
+) = adapterDelegateViewBinding<FilterItem.State, ListModel, ItemCheckableMultipleBinding>(
+	{ layoutInflater, parent -> ItemCheckableMultipleBinding.inflate(layoutInflater, parent, false) },
+) {
+
+	itemView.setOnClickListener {
+		listener.onStateItemClick(item)
+	}
+
+	bind { payloads ->
+		binding.root.setText(item.state.titleResId)
+		binding.root.setChecked(item.isChecked, payloads.isNotEmpty())
+	}
+}
+
 fun filterTagDelegate(
 	listener: OnFilterChangedListener,
+) = adapterDelegateViewBinding<FilterItem.Tag, ListModel, ItemCheckableSingleBinding>(
+	{ layoutInflater, parent -> ItemCheckableSingleBinding.inflate(layoutInflater, parent, false) },
+	on = { item, _, _ -> item is FilterItem.Tag && !item.isMultiple },
+) {
+
+	itemView.setOnClickListener {
+		listener.onTagItemClick(item)
+	}
+
+	bind { payloads ->
+		binding.root.text = item.tag.title
+		binding.root.setChecked(item.isChecked, payloads.isNotEmpty())
+	}
+}
+
+fun filterTagMultipleDelegate(
+	listener: OnFilterChangedListener,
 ) = adapterDelegateViewBinding<FilterItem.Tag, ListModel, ItemCheckableMultipleBinding>(
 	{ layoutInflater, parent -> ItemCheckableMultipleBinding.inflate(layoutInflater, parent, false) },
+	on = { item, _, _ -> item is FilterItem.Tag && item.isMultiple },
 ) {
 
 	itemView.setOnClickListener {

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

@@ -28,11 +28,11 @@ import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
 import org.koitharu.kotatsu.filter.ui.model.FilterItem
-import org.koitharu.kotatsu.filter.ui.model.FilterState
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingFooter
 import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -55,7 +55,8 @@ class FilterCoordinator @Inject constructor(
 
 	private val coroutineScope = lifecycle.lifecycleScope
 	private val repository = mangaRepositoryFactory.create(savedStateHandle.require(RemoteListFragment.ARG_SOURCE))
-	private val currentState = MutableStateFlow(FilterState(repository.defaultSortOrder, emptySet()))
+	private val currentState =
+		MutableStateFlow(MangaListFilter.Advanced(repository.defaultSortOrder, emptySet(), null, emptySet()))
 	private var searchQuery = MutableStateFlow("")
 	private val localTags = SuspendLazy {
 		dataRepository.findTags(repository.source)
@@ -68,7 +69,12 @@ class FilterCoordinator @Inject constructor(
 	override val header: StateFlow<FilterHeaderModel> = getHeaderFlow().stateIn(
 		scope = coroutineScope + Dispatchers.Default,
 		started = SharingStarted.Lazily,
-		initialValue = FilterHeaderModel(emptyList(), repository.defaultSortOrder, false),
+		initialValue = FilterHeaderModel(
+			chips = emptyList(),
+			sortOrder = repository.defaultSortOrder,
+			hasSelectedTags = false,
+			allowMultipleTags = repository.isMultipleTagsSupported,
+		),
 	)
 
 	init {
@@ -81,24 +87,44 @@ class FilterCoordinator @Inject constructor(
 
 	override fun onSortItemClick(item: FilterItem.Sort) {
 		currentState.update { oldValue ->
-			FilterState(item.order, oldValue.tags)
+			oldValue.copy(sortOrder = item.order)
 		}
 		repository.defaultSortOrder = item.order
 	}
 
 	override fun onTagItemClick(item: FilterItem.Tag) {
 		currentState.update { oldValue ->
-			val newTags = if (item.isChecked) {
+			val newTags = if (!item.isMultiple) {
+				setOf(item.tag)
+			} else if (item.isChecked) {
 				oldValue.tags - item.tag
 			} else {
 				oldValue.tags + item.tag
 			}
-			FilterState(oldValue.sortOrder, newTags)
+			oldValue.copy(tags = newTags)
+		}
+	}
+
+	override fun onStateItemClick(item: FilterItem.State) {
+		currentState.update { oldValue ->
+			val newStates = if (item.isChecked) {
+				oldValue.states - item.state
+			} else {
+				oldValue.states + item.state
+			}
+			oldValue.copy(states = newStates)
 		}
 	}
 
 	override fun onListHeaderClick(item: ListHeader, view: View) {
-		reset()
+		currentState.update { oldValue ->
+			oldValue.copy(
+				sortOrder = oldValue.sortOrder,
+				tags = if (item.payload == R.string.genres) emptySet() else oldValue.tags,
+				locale = null,
+				states = if (item.payload == R.string.state) emptySet() else oldValue.states,
+			)
+		}
 	}
 
 	fun observeAvailableTags(): Flow<Set<MangaTag>?> = flow {
@@ -112,13 +138,13 @@ class FilterCoordinator @Inject constructor(
 
 	fun setTags(tags: Set<MangaTag>) {
 		currentState.update { oldValue ->
-			FilterState(oldValue.sortOrder, tags)
+			oldValue.copy(tags = tags)
 		}
 	}
 
 	fun reset() {
 		currentState.update { oldValue ->
-			FilterState(oldValue.sortOrder, emptySet())
+			oldValue.copy(oldValue.sortOrder, emptySet(), null, emptySet())
 		}
 	}
 
@@ -133,7 +159,12 @@ class FilterCoordinator @Inject constructor(
 		observeAvailableTags(),
 	) { state, available ->
 		val chips = createChipsList(state, available.orEmpty(), 8)
-		FilterHeaderModel(chips, state.sortOrder, state.tags.isNotEmpty())
+		FilterHeaderModel(
+			chips = chips,
+			sortOrder = state.sortOrder,
+			hasSelectedTags = state.tags.isNotEmpty(),
+			allowMultipleTags = repository.isMultipleTagsSupported,
+		)
 	}
 
 	private fun getItemsFlow() = combine(
@@ -156,7 +187,7 @@ class FilterCoordinator @Inject constructor(
 	}
 
 	private suspend fun createChipsList(
-		filterState: FilterState,
+		filterState: MangaListFilter.Advanced,
 		availableTags: Set<MangaTag>,
 		limit: Int,
 	): List<ChipsView.ChipModel> {
@@ -205,12 +236,14 @@ class FilterCoordinator @Inject constructor(
 	@WorkerThread
 	private fun buildFilterList(
 		allTags: TagsWrapper,
-		state: FilterState,
+		state: MangaListFilter.Advanced,
 		query: String,
 	): List<ListModel> {
 		val sortOrders = repository.sortOrders.sortedByOrdinal()
+		val states = repository.states
 		val tags = mergeTags(state.tags, allTags.tags).toList()
-		val list = ArrayList<ListModel>(tags.size + sortOrders.size + 3)
+		val list = ArrayList<ListModel>(tags.size + states.size + sortOrders.size + 4)
+		val isMultiTag = repository.isMultipleTagsSupported
 		if (query.isEmpty()) {
 			if (sortOrders.isNotEmpty()) {
 				list.add(ListHeader(R.string.sort_order))
@@ -218,10 +251,28 @@ class FilterCoordinator @Inject constructor(
 					FilterItem.Sort(it, isSelected = it == state.sortOrder)
 				}
 			}
+			if (states.isNotEmpty()) {
+				list.add(
+					ListHeader(
+						textRes = R.string.state,
+						buttonTextRes = if (state.states.isEmpty()) 0 else R.string.reset,
+						payload = R.string.state,
+					),
+				)
+				states.mapTo(list) {
+					FilterItem.State(it, isChecked = it in state.states)
+				}
+			}
 			if (allTags.isLoading || allTags.isError || tags.isNotEmpty()) {
-				list.add(ListHeader(R.string.genres, if (state.tags.isEmpty()) 0 else R.string.reset))
+				list.add(
+					ListHeader(
+						textRes = R.string.genres,
+						buttonTextRes = if (state.tags.isEmpty()) 0 else R.string.reset,
+						payload = R.string.genres,
+					),
+				)
 				tags.mapTo(list) {
-					FilterItem.Tag(it, isChecked = it in state.tags)
+					FilterItem.Tag(it, isMultiple = isMultiTag, isChecked = it in state.tags)
 				}
 			}
 			if (allTags.isError) {
@@ -232,7 +283,7 @@ class FilterCoordinator @Inject constructor(
 		} else {
 			tags.mapNotNullTo(list) {
 				if (it.title.contains(query, ignoreCase = true)) {
-					FilterItem.Tag(it, isChecked = it in state.tags)
+					FilterItem.Tag(it, isMultiple = isMultiTag, isChecked = it in state.tags)
 				} else {
 					null
 				}

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

@@ -39,7 +39,7 @@ class FilterHeaderFragment : BaseFragment<FragmentFilterHeaderBinding>(), ChipsV
 		if (tag == null) {
 			FilterSheetFragment.show(parentFragmentManager)
 		} else {
-			filter.onTagItemClick(FilterItem.Tag(tag, !chip.isChecked))
+			filter.onTagItemClick(FilterItem.Tag(tag, filter.header.value.allowMultipleTags, !chip.isChecked))
 		}
 	}
 

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

@@ -8,4 +8,6 @@ interface OnFilterChangedListener : ListHeaderClickListener {
 	fun onSortItemClick(item: FilterItem.Sort)
 
 	fun onTagItemClick(item: FilterItem.Tag)
+
+	fun onStateItemClick(item: FilterItem.State)
 }

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

@@ -7,6 +7,7 @@ class FilterHeaderModel(
 	val chips: Collection<ChipsView.ChipModel>,
 	val sortOrder: SortOrder?,
 	val hasSelectedTags: Boolean,
+	val allowMultipleTags: Boolean,
 ) {
 
 	val textSummary: String
@@ -19,6 +20,7 @@ class FilterHeaderModel(
 		other as FilterHeaderModel
 
 		if (chips != other.chips) return false
+		if (allowMultipleTags != other.allowMultipleTags) return false
 		return sortOrder == other.sortOrder
 		// Not need to check hasSelectedTags
 
@@ -26,6 +28,7 @@ class FilterHeaderModel(
 
 	override fun hashCode(): Int {
 		var result = chips.hashCode()
+		result = 31 * result + allowMultipleTags.hashCode()
 		result = 31 * result + (sortOrder?.hashCode() ?: 0)
 		return result
 	}

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.filter.ui.model
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 
@@ -28,11 +29,12 @@ sealed interface FilterItem : ListModel {
 
 	data class Tag(
 		val tag: MangaTag,
+		val isMultiple: Boolean,
 		val isChecked: Boolean,
 	) : FilterItem {
 
 		override fun areItemsTheSame(other: ListModel): Boolean {
-			return other is Tag && other.tag == tag
+			return other is Tag && other.isMultiple == isMultiple && other.tag == tag
 		}
 
 		override fun getChangePayload(previousState: ListModel): Any? {
@@ -44,6 +46,24 @@ sealed interface FilterItem : ListModel {
 		}
 	}
 
+	data class State(
+		val state: MangaState,
+		val isChecked: Boolean
+	) : FilterItem {
+
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is State && other.state == state
+		}
+
+		override fun getChangePayload(previousState: ListModel): Any? {
+			return if (previousState is State && previousState.isChecked != isChecked) {
+				ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+			} else {
+				super.getChangePayload(previousState)
+			}
+		}
+	}
+
 	data class Error(
 		@StringRes val textResId: Int,
 	) : FilterItem {

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

@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.filter.ui.model
-
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-
-data class FilterState(
-	val sortOrder: SortOrder?,
-	val tags: Set<MangaTag>,
-)

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

@@ -23,7 +23,7 @@ abstract class HistoryDao {
 
 	@Transaction
 	@Query("SELECT * FROM history WHERE deleted_at = 0 AND manga_id IN (:ids)")
-	abstract suspend fun findAll(ids: Collection<Long>): List<HistoryEntity?>
+	abstract suspend fun findAll(ids: Collection<Long>): List<HistoryEntity>
 
 	@Transaction
 	@Query("SELECT * FROM history WHERE deleted_at = 0 ORDER BY updated_at DESC")

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

@@ -15,6 +15,8 @@ import org.koitharu.kotatsu.core.db.entity.toMangaTag
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.core.model.findById
+import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.core.util.ext.mapItems
@@ -35,39 +37,40 @@ class HistoryRepository @Inject constructor(
 	private val trackingRepository: TrackingRepository,
 	private val settings: AppSettings,
 	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
+	private val mangaRepository: MangaDataRepository,
 ) {
 
 	suspend fun getList(offset: Int, limit: Int): List<Manga> {
-		val entities = db.historyDao.findAll(offset, limit)
+		val entities = db.getHistoryDao().findAll(offset, limit)
 		return entities.map { it.manga.toManga(it.tags.toMangaTags()) }
 	}
 
 	suspend fun getLastOrNull(): Manga? {
-		val entity = db.historyDao.findAll(0, 1).firstOrNull() ?: return null
+		val entity = db.getHistoryDao().findAll(0, 1).firstOrNull() ?: return null
 		return entity.manga.toManga(entity.tags.toMangaTags())
 	}
 
 	fun observeLast(): Flow<Manga?> {
-		return db.historyDao.observeAll(1).map {
+		return db.getHistoryDao().observeAll(1).map {
 			val first = it.firstOrNull()
 			first?.manga?.toManga(first.tags.toMangaTags())
 		}
 	}
 
 	fun observeAll(): Flow<List<Manga>> {
-		return db.historyDao.observeAll().mapItems {
+		return db.getHistoryDao().observeAll().mapItems {
 			it.manga.toManga(it.tags.toMangaTags())
 		}
 	}
 
 	fun observeAll(limit: Int): Flow<List<Manga>> {
-		return db.historyDao.observeAll(limit).mapItems {
+		return db.getHistoryDao().observeAll(limit).mapItems {
 			it.manga.toManga(it.tags.toMangaTags())
 		}
 	}
 
 	fun observeAllWithHistory(order: ListSortOrder): Flow<List<MangaWithHistory>> {
-		return db.historyDao.observeAll(order).mapItems {
+		return db.getHistoryDao().observeAll(order).mapItems {
 			MangaWithHistory(
 				it.manga.toManga(it.tags.toMangaTags()),
 				it.history.toMangaHistory(),
@@ -76,13 +79,13 @@ class HistoryRepository @Inject constructor(
 	}
 
 	fun observeOne(id: Long): Flow<MangaHistory?> {
-		return db.historyDao.observe(id).map {
+		return db.getHistoryDao().observe(id).map {
 			it?.toMangaHistory()
 		}
 	}
 
 	fun observeHasItems(): Flow<Boolean> {
-		return db.historyDao.observeCount()
+		return db.getHistoryDao().observeCount()
 			.map { it > 0 }
 			.distinctUntilChanged()
 	}
@@ -91,14 +94,9 @@ class HistoryRepository @Inject constructor(
 		if (shouldSkip(manga)) {
 			return
 		}
-		val tags = manga.tags.toEntities()
 		db.withTransaction {
-			val existing = db.mangaDao.find(manga.id)?.manga
-			if (existing == null || existing.source == manga.source.name) {
-				db.tagsDao.upsert(tags)
-				db.mangaDao.upsert(manga.toEntity(), tags)
-			}
-			db.historyDao.upsert(
+			mangaRepository.storeManga(manga)
+			db.getHistoryDao().upsert(
 				HistoryEntity(
 					mangaId = manga.id,
 					createdAt = System.currentTimeMillis(),
@@ -119,29 +117,29 @@ class HistoryRepository @Inject constructor(
 	}
 
 	suspend fun getOne(manga: Manga): MangaHistory? {
-		return db.historyDao.find(manga.id)?.recoverIfNeeded(manga)?.toMangaHistory()
+		return db.getHistoryDao().find(manga.id)?.recoverIfNeeded(manga)?.toMangaHistory()
 	}
 
 	suspend fun getProgress(mangaId: Long): Float {
-		return db.historyDao.findProgress(mangaId) ?: PROGRESS_NONE
+		return db.getHistoryDao().findProgress(mangaId) ?: PROGRESS_NONE
 	}
 
 	suspend fun clear() {
-		db.historyDao.clear()
+		db.getHistoryDao().clear()
 	}
 
 	suspend fun delete(manga: Manga) {
-		db.historyDao.delete(manga.id)
+		db.getHistoryDao().delete(manga.id)
 	}
 
 	suspend fun deleteAfter(minDate: Long) {
-		db.historyDao.deleteAfter(minDate)
+		db.getHistoryDao().deleteAfter(minDate)
 	}
 
 	suspend fun delete(ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.historyDao.delete(id)
+				db.getHistoryDao().delete(id)
 			}
 		}
 		return ReversibleHandle {
@@ -154,13 +152,13 @@ class HistoryRepository @Inject constructor(
 	 * Useful for replacing saved manga on deleting it with remote source
 	 */
 	suspend fun deleteOrSwap(manga: Manga, alternative: Manga?) {
-		if (alternative == null || db.mangaDao.update(alternative.toEntity()) <= 0) {
-			db.historyDao.delete(manga.id)
+		if (alternative == null || db.getMangaDao().update(alternative.toEntity()) <= 0) {
+			db.getHistoryDao().delete(manga.id)
 		}
 	}
 
 	suspend fun getPopularTags(limit: Int): List<MangaTag> {
-		return db.historyDao.findPopularTags(limit).map { x -> x.toMangaTag() }
+		return db.getHistoryDao().findPopularTags(limit).map { x -> x.toMangaTag() }
 	}
 
 	fun shouldSkip(manga: Manga): Boolean {
@@ -178,21 +176,21 @@ class HistoryRepository @Inject constructor(
 	private suspend fun recover(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.historyDao.recover(id)
+				db.getHistoryDao().recover(id)
 			}
 		}
 	}
 
 	private suspend fun HistoryEntity.recoverIfNeeded(manga: Manga): HistoryEntity {
 		val chapters = manga.chapters
-		if (chapters.isNullOrEmpty() || chapters.findById(chapterId) != null) {
+		if (manga.isLocal || chapters.isNullOrEmpty() || chapters.findById(chapterId) != null) {
 			return this
 		}
 		val newChapterId = chapters.getOrNull(
 			(chapters.size * percent).toInt(),
 		)?.id ?: return this
 		val newEntity = copy(chapterId = newChapterId)
-		db.historyDao.update(newEntity)
+		db.getHistoryDao().update(newEntity)
 		return newEntity
 	}
 }

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

@@ -9,6 +9,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkManageIntent
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
+import org.koitharu.kotatsu.core.ui.list.RecyclerScrollKeeper
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.list.ui.MangaListFragment
@@ -23,6 +24,7 @@ class HistoryListFragment : MangaListFragment() {
 
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
+		RecyclerScrollKeeper(binding.recyclerView).attach()
 		addMenuProvider(HistoryListMenuProvider(binding.root.context, viewModel))
 	}
 

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

@@ -41,7 +41,7 @@ import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteSheet
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
@@ -284,7 +284,7 @@ abstract class MangaListFragment :
 			}
 
 			R.id.action_favourite -> {
-				FavouriteSheet.show(childFragmentManager, selectedItems)
+				FavoriteSheet.show(childFragmentManager, selectedItems)
 				mode.finish()
 				true
 			}

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

@@ -4,6 +4,8 @@ enum class ListItemType {
 
 	FILTER_SORT,
 	FILTER_TAG,
+	FILTER_TAG_MULTI,
+	FILTER_STATE,
 	HEADER,
 	MANGA_LIST,
 	MANGA_LIST_DETAILED,

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

@@ -29,6 +29,8 @@ class TypedListSpacingDecoration(
 		when (itemType) {
 			ListItemType.FILTER_SORT,
 			ListItemType.FILTER_TAG,
+			ListItemType.FILTER_TAG_MULTI,
+			ListItemType.FILTER_STATE,
 			-> outRect.set(0)
 
 			ListItemType.HEADER,

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

@@ -10,6 +10,7 @@ import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.list.domain.ListSortOrder
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
 
 @HiltViewModel
@@ -54,7 +55,7 @@ class ListConfigViewModel @Inject constructor(
 	}?.sortedByOrdinal()
 
 	fun getSelectedSortOrder(): ListSortOrder? = when (section) {
-		is ListConfigSection.Favorites -> runBlocking { favouritesRepository.getCategory(section.categoryId).order }
+		is ListConfigSection.Favorites -> getCategorySortOrder(section.categoryId)
 		ListConfigSection.General -> null
 		ListConfigSection.History -> settings.historySortOrder
 		ListConfigSection.Suggestions -> ListSortOrder.RELEVANCE // TODO
@@ -73,4 +74,10 @@ class ListConfigViewModel @Inject constructor(
 			ListConfigSection.Suggestions -> Unit
 		}
 	}
+
+	private fun getCategorySortOrder(id: Long): ListSortOrder = runBlocking {
+		runCatchingCancellable {
+			favouritesRepository.getCategory(id).order
+		}.getOrDefault(ListSortOrder.NEWEST)
+	}
 }