Draft double reader implementation

app/build.gradle

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

app/proguard-rules.pro

@@ -18,6 +18,3 @@
 -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.getTagsDao().findTags(SampleData.tag.source.name).toMangaTags()
+		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
 		assertTrue(SampleData.tag in allTags)
 	}
 

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

@@ -5,7 +5,6 @@ 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
@@ -20,14 +19,19 @@ class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSourc
 	override val configKeyDomain: ConfigKey.Domain
 		get() = ConfigKey.Domain("")
 
-	override val availableSortOrders: Set<SortOrder>
+	override val sortOrders: 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, filter: MangaListFilter?): List<Manga> {
+	override suspend fun getList(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder,
+	): List<Manga> {
 		TODO("Not yet implemented")
 	}
 
@@ -35,7 +39,7 @@ class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSourc
 		TODO("Not yet implemented")
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		TODO("Not yet implemented")
 	}
 }

app/src/main/AndroidManifest.xml

@@ -83,16 +83,6 @@
 				<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"
@@ -221,9 +211,6 @@
 			</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"
@@ -340,13 +327,6 @@
 				<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/BookmarksRepository.kt

@@ -25,15 +25,15 @@ class BookmarksRepository @Inject constructor(
 ) {
 
 	fun observeBookmark(manga: Manga, chapterId: Long, page: Int): Flow<Bookmark?> {
-		return db.getBookmarksDao().observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
+		return db.bookmarksDao.observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
 	}
 
 	fun observeBookmarks(manga: Manga): Flow<List<Bookmark>> {
-		return db.getBookmarksDao().observe(manga.id).mapItems { it.toBookmark(manga) }
+		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
 	}
 
 	fun observeBookmarks(): Flow<Map<Manga, List<Bookmark>>> {
-		return db.getBookmarksDao().observe().map { map ->
+		return db.bookmarksDao.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.getTagsDao().upsert(tags)
+			db.tagsDao.upsert(tags)
-			db.getMangaDao().upsert(bookmark.manga.toEntity(), tags)
+			db.mangaDao.upsert(bookmark.manga.toEntity(), tags)
-			db.getBookmarksDao().insert(bookmark.toEntity())
+			db.bookmarksDao.insert(bookmark.toEntity())
 		}
 	}
 
@@ -56,11 +56,11 @@ class BookmarksRepository @Inject constructor(
 		val entity = bookmark.toEntity().copy(
 			imageUrl = imageUrl,
 		)
-		db.getBookmarksDao().upsert(listOf(entity))
+		db.bookmarksDao.upsert(listOf(entity))
 	}
 
 	suspend fun removeBookmark(mangaId: Long, chapterId: Long, page: Int) {
-		check(db.getBookmarksDao().delete(mangaId, chapterId, page) != 0) {
+		check(db.bookmarksDao.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.getBookmarksDao()
+			val dao = db.bookmarksDao
 			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.getBookmarksDao().insert(e)
+						db.bookmarksDao.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 {
-				setReorderingAllowed(true)
+				val fragment = BookmarksFragment.newInstance()
-				replace(R.id.container, BookmarksFragment::class.java, null)
+				replace(R.id.container, fragment)
 			}
 		}
 	}

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,11 +82,9 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 	}
 
 	override fun onDestroy() {
-		runCatching {
+		viewBinding.webView.run {
-			viewBinding.webView
+			stopLoading()
-		}.onSuccess {
+			destroy()
-			it.stopLoading()
-			it.destroy()
 		}
 		super.onDestroy()
 	}

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

@@ -1,33 +0,0 @@
-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.getHistoryDao().findAll(offset, PAGE_SIZE)
+			val history = db.historyDao.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.getFavouriteCategoriesDao().findAll()
+		val categories = db.favouriteCategoriesDao.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.getFavouritesDao().findAll(offset, PAGE_SIZE)
+			val favourites = db.favouritesDao.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.getBookmarksDao().findAll()
+		val all = db.bookmarksDao.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.getTagsDao().upsert(tags)
+					db.tagsDao.upsert(tags)
-					db.getMangaDao().upsert(manga, tags)
+					db.mangaDao.upsert(manga, tags)
-					db.getHistoryDao().upsert(history)
+					db.historyDao.upsert(history)
 				}
 			}
 		}
@@ -136,7 +136,7 @@ class BackupRepository @Inject constructor(
 		for (item in entry.data.JSONIterator()) {
 			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
 			result += runCatchingCancellable {
-				db.getFavouriteCategoriesDao().upsert(category)
+				db.favouriteCategoriesDao.upsert(category)
 			}
 		}
 		return result
@@ -153,9 +153,9 @@ class BackupRepository @Inject constructor(
 			val favourite = JsonDeserializer(item).toFavouriteEntity()
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.getTagsDao().upsert(tags)
+					db.tagsDao.upsert(tags)
-					db.getMangaDao().upsert(manga, tags)
+					db.mangaDao.upsert(manga, tags)
-					db.getFavouritesDao().upsert(favourite)
+					db.favouritesDao.upsert(favourite)
 				}
 			}
 		}
@@ -175,9 +175,9 @@ class BackupRepository @Inject constructor(
 			}
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.getTagsDao().upsert(tags)
+					db.tagsDao.upsert(tags)
-					db.getMangaDao().upsert(manga, tags)
+					db.mangaDao.upsert(manga, tags)
-					db.getBookmarksDao().upsert(bookmarks)
+					db.bookmarksDao.upsert(bookmarks)
 				}
 			}
 		}

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

@@ -29,7 +29,7 @@ class BackupZipOutput(val file: File) : Closeable {
 	}
 }
 
-const val DIR_BACKUPS = "backups"
+private 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 fun getHistoryDao(): HistoryDao
+	abstract val historyDao: HistoryDao
 
-	abstract fun getTagsDao(): TagsDao
+	abstract val tagsDao: TagsDao
 
-	abstract fun getMangaDao(): MangaDao
+	abstract val mangaDao: MangaDao
 
-	abstract fun getFavouritesDao(): FavouritesDao
+	abstract val favouritesDao: FavouritesDao
 
-	abstract fun getPreferencesDao(): PreferencesDao
+	abstract val preferencesDao: PreferencesDao
 
-	abstract fun getFavouriteCategoriesDao(): FavouriteCategoriesDao
+	abstract val favouriteCategoriesDao: FavouriteCategoriesDao
 
-	abstract fun getTracksDao(): TracksDao
+	abstract val tracksDao: TracksDao
 
-	abstract fun getTrackLogsDao(): TrackLogsDao
+	abstract val trackLogsDao: TrackLogsDao
 
-	abstract fun getSuggestionDao(): SuggestionDao
+	abstract val suggestionDao: SuggestionDao
 
-	abstract fun getBookmarksDao(): BookmarksDao
+	abstract val bookmarksDao: BookmarksDao
 
-	abstract fun getScrobblingDao(): ScrobblingDao
+	abstract val scrobblingDao: ScrobblingDao
 
-	abstract fun getSourcesDao(): MangaSourcesDao
+	abstract val sourcesDao: MangaSourcesDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(

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

@@ -4,15 +4,10 @@ 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 {
@@ -20,11 +15,11 @@ abstract class MangaSourcesDao {
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract suspend fun findAll(): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources WHERE enabled = 0 ORDER BY sort_key")
+	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract suspend fun findAllDisabled(): List<MangaSourceEntity>
+	abstract suspend fun findAllEnabled(): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources WHERE enabled = 0")
+	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract fun observeDisabled(): Flow<List<MangaSourceEntity>>
+	abstract fun observeEnabled(): Flow<List<MangaSourceEntity>>
 
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
@@ -45,22 +40,6 @@ 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) {
@@ -75,16 +54,4 @@ 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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL(
+		database.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()
 		)
-		db.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_manga_id` ON `bookmarks` (`manga_id`)")
+		database.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`)")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL(
+		database.execSQL(
 			"""
 			CREATE TABLE IF NOT EXISTS `scrobblings` (
 				`scrobbler` INTEGER NOT NULL,
@@ -21,7 +21,7 @@ class Migration11To12 : Migration(11, 12) {
 			)
 			""".trimIndent()
 		)
-		db.execSQL("ALTER TABLE history ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
+		database.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")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `show_in_lib` INTEGER NOT NULL DEFAULT 1")
+		database.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")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+		database.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")
+		database.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")
+		database.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")
+		database.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")
+		database.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(db: SupportSQLiteDatabase) = Unit
+	override fun migrate(database: 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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_invert` INTEGER NOT NULL DEFAULT 0")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("CREATE TABLE `sources` (`source` TEXT NOT NULL, `enabled` INTEGER NOT NULL, `sort_key` INTEGER NOT NULL, PRIMARY KEY(`source`))")
+		database.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`)")
+		database.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
 				}
 			}
-			db.execSQL(
+			database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
 		/* manga_tags */
-		db.execSQL(
+		database.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 )"
 		)
-		db.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_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)")
+		database.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")
+		database.execSQL("INSERT INTO manga_tags_tmp (manga_id, tag_id) SELECT manga_id, tag_id FROM manga_tags")
-		db.execSQL("DROP TABLE manga_tags")
+		database.execSQL("DROP TABLE manga_tags")
-		db.execSQL("ALTER TABLE manga_tags_tmp RENAME TO manga_tags")
+		database.execSQL("ALTER TABLE manga_tags_tmp RENAME TO manga_tags")
 		/* favourites */
-		db.execSQL(
+		database.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 )"
 		)
-		db.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_manga_id ON favourites_tmp (manga_id)")
+		database.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)")
+		database.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")
+		database.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")
+		database.execSQL("DROP TABLE favourites")
-		db.execSQL("ALTER TABLE favourites_tmp RENAME TO favourites")
+		database.execSQL("ALTER TABLE favourites_tmp RENAME TO favourites")
 		/* history */
-		db.execSQL(
+		database.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 )"
 		)
-		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")
+		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")
-		db.execSQL("DROP TABLE history")
+		database.execSQL("DROP TABLE history")
-		db.execSQL("ALTER TABLE history_tmp RENAME TO history")
+		database.execSQL("ALTER TABLE history_tmp RENAME TO history")
 		/* preferences */
-		db.execSQL(
+		database.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 )"
 		)
-		db.execSQL("INSERT INTO preferences_tmp (manga_id, mode) SELECT manga_id, mode FROM preferences")
+		database.execSQL("INSERT INTO preferences_tmp (manga_id, mode) SELECT manga_id, mode FROM preferences")
-		db.execSQL("DROP TABLE preferences")
+		database.execSQL("DROP TABLE preferences")
-		db.execSQL("ALTER TABLE preferences_tmp RENAME TO preferences")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE history ADD COLUMN scroll REAL NOT NULL DEFAULT 0")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: 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 )")
+		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 )")
 	}
-}
+}

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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN sort_key INTEGER NOT NULL DEFAULT 0")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: 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)")
+		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)")
-		db.execSQL("CREATE INDEX IF NOT EXISTS index_track_logs_manga_id ON track_logs (manga_id)")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE manga ADD COLUMN public_url TEXT NOT NULL DEFAULT ''")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE manga ADD COLUMN nsfw INTEGER NOT NULL DEFAULT 0")
+		database.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 )")
+		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 )")
-		db.execSQL("CREATE INDEX IF NOT EXISTS index_suggestions_manga_id ON suggestions (manga_id)")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `order` TEXT NOT NULL DEFAULT ${SortOrder.NEWEST.name}")
+		database.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(db: SupportSQLiteDatabase) {
+	override fun migrate(database: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
+		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
 	}
-}
+}

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

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

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

@@ -1,8 +1,5 @@
 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
@@ -21,18 +18,3 @@ 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?.let { response.peekBody(Long.MAX_VALUE) }?.byteStream()?.use {
+			val content = response.body?.source()?.peek()?.use {
-				Jsoup.parse(it, Charsets.UTF_8.name(), response.request.url.toString())
+				Jsoup.parse(it.inputStream(), 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/GZipInterceptor.kt

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.core.network
 
 import okhttp3.Interceptor
 import okhttp3.Response
-import okio.IOException
 import org.koitharu.kotatsu.core.network.CommonHeaders.CONTENT_ENCODING
 
 class GZipInterceptor : Interceptor {
@@ -10,10 +9,6 @@ class GZipInterceptor : Interceptor {
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val newRequest = chain.request().newBuilder()
 		newRequest.addHeader(CONTENT_ENCODING, "gzip")
-		return try {
+		return chain.proceed(newRequest.build())
-			chain.proceed(newRequest.build())
-		} catch (e: NullPointerException) {
-			throw IOException(e)
-		}
 	}
 }

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

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

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

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

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

@@ -23,14 +23,14 @@ class MangaLinkResolver @Inject constructor(
 ) {
 
 	suspend fun resolve(uri: Uri): Manga {
-		return if (uri.scheme == "kotatsu" || uri.host == "kotatsu.app") {
+		return if (uri.host == "kotatsu.app") {
 			resolveAppLink(uri)
 		} else {
 			resolveExternalLink(uri)
-		} ?: throw NotFoundException("Cannot resolve link", uri.toString())
+		} ?: throw NotFoundException("Manga not found", uri.toString())
 	}
 
-	private suspend fun resolveAppLink(uri: Uri): Manga? {
+	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 +42,7 @@ class MangaLinkResolver @Inject constructor(
 		)
 	}
 
-	private suspend fun resolveExternalLink(uri: Uri): Manga? {
+	suspend fun resolveExternalLink(uri: Uri): Manga? {
 		dataRepository.findMangaByPublicUrl(uri.toString())?.let {
 			return it
 		}

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

@@ -128,10 +128,6 @@ class RemoteMangaRepository(
 		return details.await()
 	}
 
-	suspend fun peekDetails(manga: Manga): Manga? {
-		return cache.getDetails(source, manga.url)
-	}
-
 	suspend fun find(manga: Manga): Manga? {
 		val list = getList(0, manga.title)
 		return list.find { x -> x.id == manga.id }

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

@@ -22,8 +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.history.domain.model.HistoryOrder
-import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.find
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
@@ -73,18 +72,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
 
-	var historyListMode: ListMode
-		get() = prefs.getEnumValue(KEY_LIST_MODE_HISTORY, listMode)
-		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_HISTORY, value) }
-
-	var suggestionsListMode: ListMode
-		get() = prefs.getEnumValue(KEY_LIST_MODE_SUGGESTIONS, listMode)
-		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_SUGGESTIONS, value) }
-
-	var favoritesListMode: ListMode
-		get() = prefs.getEnumValue(KEY_LIST_MODE_FAVORITES, listMode)
-		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_FAVORITES, value) }
-
 	var isNsfwContentDisabled: Boolean
 		get() = prefs.getBoolean(KEY_DISABLE_NSFW, false)
 		set(value) = prefs.edit { putBoolean(KEY_DISABLE_NSFW, value) }
@@ -189,7 +176,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		set(value) = prefs.edit { putBoolean(KEY_PROTECT_APP_BIOMETRIC, value) }
 
 	val isMirrorSwitchingAvailable: Boolean
-		get() = prefs.getBoolean(KEY_MIRROR_SWITCHING, false)
+		get() = prefs.getBoolean(KEY_MIRROR_SWITCHING, true)
 
 	val isExitConfirmationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_EXIT_CONFIRM, false)
@@ -210,17 +197,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) }
 
-	val isNewSourcesTipEnabled: Boolean
-		get() = prefs.getBoolean(KEY_SOURCES_NEW, true)
-
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
 
@@ -324,8 +304,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_LOCAL_LIST_ORDER, SortOrder.NEWEST)
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
 
-	var historySortOrder: ListSortOrder
+	var historySortOrder: HistoryOrder
-		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.UPDATED)
+		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, HistoryOrder.UPDATED)
 		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
 
 	val isRelatedMangaEnabled: Boolean
@@ -356,19 +336,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			return policy.isNetworkAllowed(connectivityManager)
 		}
 
-	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
 	}
@@ -434,9 +401,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val TRACK_FAVOURITES = "favourites"
 
 		const val KEY_LIST_MODE = "list_mode_2"
-		const val KEY_LIST_MODE_HISTORY = "list_mode_history"
-		const val KEY_LIST_MODE_FAVORITES = "list_mode_favorites"
-		const val KEY_LIST_MODE_SUGGESTIONS = "list_mode_suggestions"
 		const val KEY_THEME = "theme"
 		const val KEY_COLOR_THEME = "color_theme"
 		const val KEY_THEME_AMOLED = "amoled_theme"
@@ -473,10 +437,6 @@ 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"
@@ -514,7 +474,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_LOGGING_ENABLED = "logging"
 		const val KEY_LOGS_SHARE = "logs_share"
 		const val KEY_SOURCES_GRID = "sources_grid"
-		const val KEY_SOURCES_NEW = "sources_new"
 		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
 		const val KEY_TIPS_CLOSED = "tips_closed"
 		const val KEY_SSL_BYPASS = "ssl_bypass"
@@ -532,9 +491,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_DISABLE_NSFW = "no_nsfw"
 		const val KEY_RELATED_MANGA = "related_manga"
 		const val KEY_NAV_MAIN = "nav_main"
-		const val KEY_32BIT_COLOR = "enhanced_colors"
-		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,6 +6,7 @@ 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
@@ -95,10 +96,10 @@ abstract class BaseActivity<B : ViewBinding> :
 		insetsDelegate.onViewCreated(binding.root)
 	}
 
-	override fun onSupportNavigateUp(): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
-		dispatchNavigateUp()
+		onBackPressed()
-		return true
+		true
-	}
+	} else super.onOptionsItemSelected(item)
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
@@ -125,10 +126,10 @@ abstract class BaseActivity<B : ViewBinding> :
 		val actionModeColor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			ColorUtils.compositeColors(
 				ContextCompat.getColor(this, com.google.android.material.R.color.m3_appbar_overlay_color),
-				getThemeColor(R.attr.m3ColorBackground),
+				getThemeColor(com.google.android.material.R.attr.colorSurface),
 			)
 		} else {
-			ContextCompat.getColor(this, R.color.kotatsu_m3_background)
+			ContextCompat.getColor(this, R.color.kotatsu_secondaryContainer)
 		}
 		val insets = ViewCompat.getRootWindowInsets(viewBinding.root)
 			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
@@ -149,17 +150,6 @@ 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 = LinkMovementMethodCompat.getInstance()
+			movementMethod = LinkMovementMethod.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

@@ -1,40 +0,0 @@
-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/widgets/CubicSlider.kt

@@ -1,74 +0,0 @@
-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

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

@@ -1,26 +0,0 @@
-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,16 +6,13 @@ 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
 
-@ActivityScoped
+class ScreenOrientationHelper(private val activity: Activity) {
-class ScreenOrientationHelper @Inject constructor(private val activity: Activity) {
 
 	val isAutoRotationEnabled: Boolean
 		get() = Settings.System.getInt(
@@ -34,15 +31,9 @@ class ScreenOrientationHelper @Inject constructor(private val activity: Activity
 			}
 		}
 
-	var isLocked: Boolean
+	fun toggleOrientation() {
-		get() = activity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED
+		isLandscape = !isLandscape
-		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/ViewBadge.kt

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

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

@@ -83,7 +83,7 @@ fun <I> ActivityResultLauncher<I>.tryLaunch(
 	e.printStackTraceDebug()
 }.isSuccess
 
-fun SharedPreferences.observe(): Flow<String?> = callbackFlow {
+fun SharedPreferences.observe() = callbackFlow<String?> {
 	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

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

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

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

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

@@ -26,17 +26,6 @@ fun <T> Flow<T>.onFirst(action: suspend (T) -> Unit): Flow<T> {
 	}
 }
 
-fun <T> Flow<T>.onEachWhile(action: suspend (T) -> Boolean): Flow<T> {
-	var isCalled = false
-	return onEach {
-		if (!isCalled) {
-			isCalled = action(it)
-		}
-	}.onCompletion {
-		isCalled = false
-	}
-}
-
 inline fun <T, R> Flow<List<T>>.mapItems(crossinline transform: (T) -> R): Flow<List<R>> {
 	return map { list -> list.map(transform) }
 }

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

@@ -8,7 +8,6 @@ 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()
@@ -35,8 +34,9 @@ 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 HttpStatusException(message, code, request.url.toString())
+		throw IllegalStateException(message)
 	}
 }
 

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

@@ -12,7 +12,6 @@ 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
@@ -69,10 +68,6 @@ 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/details/data/MangaDetails.kt

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

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

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

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

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

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

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

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

@@ -1,60 +0,0 @@
-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
-import org.koitharu.kotatsu.parsers.model.Manga
-import javax.inject.Inject
-
-class ProgressUpdateUseCase @Inject constructor(
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-	private val database: MangaDatabase,
-	private val localMangaRepository: LocalMangaRepository,
-	private val networkState: NetworkState,
-) {
-
-	suspend operator fun invoke(manga: Manga): Float {
-		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)
-		} else {
-			seed
-		}
-		val chapter = details.findChapter(history.chapterId) ?: return PROGRESS_NONE
-		val chapters = details.getChapters(chapter.branch) ?: return PROGRESS_NONE
-		val chaptersCount = chapters.size
-		if (chaptersCount == 0) {
-			return PROGRESS_NONE
-		}
-		val chapterIndex = chapters.indexOfFirst { x -> x.id == history.chapterId }
-		val pagesCount = repo.getPages(chapter).size
-		if (pagesCount == 0) {
-			return PROGRESS_NONE
-		}
-		val pagePercent = (history.page + 1) / pagesCount.toFloat()
-		val ppc = 1f / chaptersCount
-		val result = ppc * chapterIndex + ppc * pagePercent
-		if (result != history.percent) {
-			database.getHistoryDao().update(
-				history.copy(
-					chapterId = chapter.id,
-					percent = result,
-				),
-			)
-		}
-		return result
-	}
-}

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

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

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

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

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

@@ -39,6 +39,7 @@ import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
+import org.koitharu.kotatsu.core.util.ViewBadge
 import org.koitharu.kotatsu.core.util.ext.doOnExpansionsChanged
 import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
@@ -74,6 +75,7 @@ class DetailsActivity :
 	@Inject
 	lateinit var appShortcutManager: AppShortcutManager
 
+	private lateinit var viewBadge: ViewBadge
 	private var buttonTip: WeakReference<ButtonTip>? = null
 
 	private val viewModel: DetailsViewModel by viewModels()
@@ -90,6 +92,7 @@ class DetailsActivity :
 		viewBinding.buttonRead.setOnLongClickListener(this)
 		viewBinding.buttonRead.setOnContextClickListenerCompat(this)
 		viewBinding.buttonDropdown.setOnClickListener(this)
+		viewBadge = ViewBadge(viewBinding.buttonRead, this)
 
 		if (viewBinding.layoutBottom != null) {
 			val behavior = BottomSheetBehavior.from(checkNotNull(viewBinding.layoutBottom))
@@ -110,6 +113,7 @@ class DetailsActivity :
 		onBackPressedDispatcher.addCallback(chaptersMenuProvider)
 
 		viewModel.manga.filterNotNull().observe(this, ::onMangaUpdated)
+		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onMangaRemoved.observeEvent(this, ::onMangaRemoved)
 		viewModel.onError.observeEvent(
 			this,
@@ -135,18 +139,16 @@ class DetailsActivity :
 		}
 		viewModel.isChaptersReversed.observe(
 			this,
-			MenuInvalidator(viewBinding.toolbarChapters ?: this),
+			MenuInvalidator(viewBinding.toolbarChapters ?: this)
 		)
-		val menuInvalidator = MenuInvalidator(this)
+		viewModel.favouriteCategories.observe(this, MenuInvalidator(this))
-		viewModel.favouriteCategories.observe(this, menuInvalidator)
-		viewModel.remoteManga.observe(this, menuInvalidator)
 		viewModel.branches.observe(this) {
 			viewBinding.buttonDropdown.isVisible = it.size > 1
 		}
 		viewModel.chapters.observe(this, PrefetchObserver(this))
 		viewModel.onDownloadStarted.observeEvent(
 			this,
-			DownloadStartedObserver(viewBinding.containerDetails),
+			DownloadStartedObserver(viewBinding.containerDetails)
 		)
 
 		addMenuProvider(
@@ -253,7 +255,7 @@ class DetailsActivity :
 			window.setNavigationBarTransparentCompat(
 				this,
 				viewBinding.layoutBottom?.elevation ?: 0f,
-				0.9f,
+				0.9f
 			)
 		}
 		viewBinding.cardChapters?.updateLayoutParams<MarginLayoutParams> {
@@ -279,20 +281,24 @@ class DetailsActivity :
 			info.currentChapter >= 0 -> getString(
 				R.string.chapter_d_of_d,
 				info.currentChapter + 1,
-				info.totalChapters,
+				info.totalChapters
 			)
 
 			info.totalChapters == 0 -> getString(R.string.no_chapters)
 			else -> resources.getQuantityString(
 				R.plurals.chapters,
 				info.totalChapters,
-				info.totalChapters,
+				info.totalChapters
 			)
 		}
 		viewBinding.toolbarChapters?.title = text
 		viewBinding.textViewTitle?.text = text
 	}
 
+	private fun onNewChaptersChanged(newChapters: Int) {
+		viewBadge.counter = newChapters
+	}
+
 	private fun showBranchPopupMenu(v: View) {
 		val menu = PopupMenu(v.context, v)
 		val branches = viewModel.branches.value
@@ -305,8 +311,8 @@ class DetailsActivity :
 					ForegroundColorSpan(
 						v.context.getThemeColor(
 							android.R.attr.textColorSecondary,
-							Color.LTGRAY,
+							Color.LTGRAY
-						),
+						)
 					),
 					RelativeSizeSpan(0.74f),
 				) {

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

@@ -1,6 +1,7 @@
 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
@@ -10,9 +11,6 @@ import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
-import androidx.core.text.buildSpannedString
-import androidx.core.text.color
-import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -23,7 +21,6 @@ import coil.request.SuccessResult
 import coil.util.CoilUtils
 import com.google.android.material.chip.Chip
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
@@ -40,7 +37,6 @@ import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.ext.crossfade
 import org.koitharu.kotatsu.core.util.ext.drawableTop
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.core.util.ext.isTextTruncated
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -74,14 +70,13 @@ import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorShee
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.search.ui.SearchActivity
 import javax.inject.Inject
-import com.google.android.material.R as materialR
 
 @AndroidEntryPoint
 class DetailsFragment :
 	BaseFragment<FragmentDetailsBinding>(),
 	View.OnClickListener,
 	ChipsView.OnChipClickListener,
-	OnListItemClickListener<Bookmark>, ViewTreeObserver.OnDrawListener, View.OnLayoutChangeListener {
+	OnListItemClickListener<Bookmark>, ViewTreeObserver.OnDrawListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
@@ -105,9 +100,8 @@ class DetailsFragment :
 		binding.buttonScrobblingMore.setOnClickListener(this)
 		binding.buttonRelatedMore.setOnClickListener(this)
 		binding.infoLayout.textViewSource.setOnClickListener(this)
-		binding.textViewDescription.addOnLayoutChangeListener(this)
 		binding.textViewDescription.viewTreeObserver.addOnDrawListener(this)
-		binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
+		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
 		binding.chipsTags.onChipClickListener = this
 		binding.recyclerViewRelated.addItemDecoration(
 			SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)),
@@ -119,9 +113,9 @@ class DetailsFragment :
 		viewModel.bookmarks.observe(viewLifecycleOwner, ::onBookmarksChanged)
 		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
 		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
+		viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
 		viewModel.localSize.observe(viewLifecycleOwner, ::onLocalSizeChanged)
 		viewModel.relatedManga.observe(viewLifecycleOwner, ::onRelatedMangaChanged)
-		combine(viewModel.chapters, viewModel.newChaptersCount, ::Pair).observe(viewLifecycleOwner, ::onChaptersChanged)
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
@@ -151,22 +145,6 @@ class DetailsFragment :
 		}
 	}
 
-	override fun onLayoutChange(
-		v: View?,
-		left: Int,
-		top: Int,
-		right: Int,
-		bottom: Int,
-		oldLeft: Int,
-		oldTop: Int,
-		oldRight: Int,
-		oldBottom: Int
-	) {
-		with(viewBinding ?: return) {
-			buttonDescriptionMore.isVisible = textViewDescription.isTextTruncated
-		}
-	}
-
 	private fun onMangaUpdated(manga: Manga) {
 		with(requireViewBinding()) {
 			// Main
@@ -197,11 +175,6 @@ 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) {
@@ -218,28 +191,14 @@ class DetailsFragment :
 		}
 	}
 
-	private fun onChaptersChanged(data: Pair<List<ChapterListItem>?, Int>) {
+	private fun onChaptersChanged(chapters: List<ChapterListItem>?) {
-		val (chapters, newChapters) = data
 		val infoLayout = requireViewBinding().infoLayout
 		if (chapters.isNullOrEmpty()) {
 			infoLayout.textViewChapters.isVisible = false
 		} else {
 			val count = chapters.countChaptersByBranch()
 			infoLayout.textViewChapters.isVisible = true
-			val chaptersText = resources.getQuantityString(R.plurals.chapters, count, count)
+			infoLayout.textViewChapters.text = resources.getQuantityString(R.plurals.chapters, count, count)
-			infoLayout.textViewChapters.text = if (newChapters == 0) {
-				chaptersText
-			} else {
-				buildSpannedString {
-					append(chaptersText)
-					append(' ')
-					color(infoLayout.textViewChapters.context.getThemeColor(materialR.attr.colorError)) {
-						append("(+")
-						append(newChapters.toString())
-						append(')')
-					}
-				}
-			}
 		}
 	}
 
@@ -250,6 +209,7 @@ class DetailsFragment :
 		} else {
 			tv.text = description
 		}
+		requireViewBinding().buttonDescriptionMore.isVisible = tv.isTextTruncated
 	}
 
 	private fun onLocalSizeChanged(size: Long) {

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.FavoriteSheet
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
@@ -42,7 +42,6 @@ class DetailsMenuProvider(
 		menu.findItem(R.id.action_browser).isVisible = manga?.source != MangaSource.LOCAL
 		menu.findItem(R.id.action_shortcut).isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(activity)
 		menu.findItem(R.id.action_scrobbling).isVisible = viewModel.isScrobblingAvailable
-		menu.findItem(R.id.action_online).isVisible = viewModel.remoteManga.value != null
 		menu.findItem(R.id.action_favourite).setIcon(
 			if (viewModel.favouriteCategories.value) R.drawable.ic_heart else R.drawable.ic_heart_outline,
 		)
@@ -63,7 +62,7 @@ class DetailsMenuProvider(
 
 			R.id.action_favourite -> {
 				viewModel.manga.value?.let {
-					FavoriteSheet.show(activity.supportFragmentManager, it)
+					FavouriteSheet.show(activity.supportFragmentManager, it)
 				}
 			}
 
@@ -89,12 +88,6 @@ class DetailsMenuProvider(
 				}
 			}
 
-			R.id.action_online -> {
-				viewModel.remoteManga.value?.let {
-					activity.startActivity(DetailsActivity.newIntent(activity, it))
-				}
-			}
-
 			R.id.action_related -> {
 				viewModel.manga.value?.let {
 					activity.startActivity(MultiSearchActivity.newIntent(activity, it.title))

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

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

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

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

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

@@ -2,6 +2,7 @@ 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
@@ -11,7 +12,6 @@ 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 = LinkMovementMethodCompat.getInstance()
+		binding.textViewDescription.movementMethod = LinkMovementMethod.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,7 +18,7 @@ data class DownloadState(
 	val currentPage: Int = 0,
 	val eta: Long = -1L,
 	val localManga: LocalManga? = null,
-	val downloadedChapters: Int = 0,
+	val downloadedChapters: LongArray = LongArray(0),
 	val timestamp: Long = System.currentTimeMillis(),
 ) {
 
@@ -41,17 +41,61 @@ data class DownloadState(
 		.putLong(DATA_ETA, eta)
 		.putLong(DATA_TIMESTAMP, timestamp)
 		.putString(DATA_ERROR, error)
-		.putInt(DATA_CHAPTERS, downloadedChapters)
+		.putLongArray(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 (timestamp != other.timestamp) return false
+		if (max != other.max) return false
+		if (progress != other.progress) return false
+		return percent == other.percent
+	}
+
+	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 + 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_cnt"
+		private const val DATA_CHAPTERS = "chapter"
 		private const val DATA_ETA = "eta"
 		private const val DATA_TIMESTAMP = "timestamp"
 		private const val DATA_ERROR = "error"
@@ -74,6 +118,6 @@ data class DownloadState(
 
 		fun getTimestamp(data: Data): Date = Date(data.getLong(DATA_TIMESTAMP, 0L))
 
-		fun getDownloadedChapters(data: Data): Int = data.getInt(DATA_CHAPTERS, 0)
+		fun getDownloadedChapters(data: Data): LongArray = data.getLongArray(DATA_CHAPTERS) ?: LongArray(0)
 	}
 }

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

@@ -1,23 +1,18 @@
 package org.koitharu.kotatsu.download.ui.list
 
-import android.transition.TransitionManager
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
 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.image.TrimTransformation
 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.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.util.format
 
@@ -30,7 +25,6 @@ fun downloadItemAD(
 ) {
 
 	val percentPattern = context.resources.getString(R.string.percent_string_pattern)
-	// val expandIcon = ContextCompat.getDrawable(context, R.drawable.ic_expand_collapse)
 
 	val clickListener = object : View.OnClickListener, View.OnLongClickListener {
 		override fun onClick(v: View) {
@@ -53,24 +47,16 @@ fun downloadItemAD(
 	itemView.setOnLongClickListener(clickListener)
 
 	bind { payloads ->
-		if (ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED in payloads && context.isAnimationsEnabled) {
-			TransitionManager.beginDelayedTransition(binding.constraintLayout)
-		}
 		binding.textViewTitle.text = item.manga.title
-		if ((CoilUtils.result(binding.imageViewCover) as? SuccessResult)?.memoryCacheKey != item.coverCacheKey) {
+		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.apply {
-			binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.apply {
+			placeholder(R.drawable.ic_placeholder)
-				placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
-				fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_error_placeholder)
-				error(R.drawable.ic_error_placeholder)
+			allowRgb565(true)
-				allowRgb565(true)
+			transformations(TrimTransformation())
-				transformations(TrimTransformation())
+			source(item.manga.source)
-				memoryCacheKey(item.coverCacheKey)
+			enqueueWith(coil)
-				source(item.manga.source)
-				enqueueWith(coil)
-			}
 		}
-		// binding.textViewTitle.isChecked = item.isExpanded
-		// binding.textViewTitle.drawableEnd = if (item.isExpandable) expandIcon else null
 		when (item.workState) {
 			WorkInfo.State.ENQUEUED,
 			WorkInfo.State.BLOCKED -> {
@@ -108,11 +94,11 @@ fun downloadItemAD(
 				binding.progressBar.isVisible = false
 				binding.progressBar.isEnabled = true
 				binding.textViewPercent.isVisible = false
-				if (item.chaptersDownloaded > 0) {
+				if (item.totalChapters > 0) {
 					binding.textViewDetails.text = context.resources.getQuantityString(
 						R.plurals.chapters,
-						item.chaptersDownloaded,
+						item.totalChapters,
-						item.chaptersDownloaded,
+						item.totalChapters,
 					)
 					binding.textViewDetails.isVisible = true
 				} else {

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

@@ -2,8 +2,6 @@ package org.koitharu.kotatsu.download.ui.list
 
 import android.text.format.DateUtils
 import androidx.work.WorkInfo
-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
 import java.util.Date
@@ -17,15 +15,12 @@ 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 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,9 +33,6 @@ data class DownloadItemModel(
 	val canResume: Boolean
 		get() = workState == WorkInfo.State.RUNNING && isPaused
 
-	val isExpandable: Boolean
-		get() = false // TODO
-
 	fun getEtaString(): CharSequence? = if (hasEta) {
 		DateUtils.getRelativeTimeSpanString(
 			eta,
@@ -59,10 +51,17 @@ data class DownloadItemModel(
 		return other is DownloadItemModel && other.id == id
 	}
 
-	override fun getChangePayload(previousState: ListModel): Any? = when {
+	override fun getChangePayload(previousState: ListModel): Any? {
-		previousState !is DownloadItemModel -> super.getChangePayload(previousState)
+		return when (previousState) {
-		workState != previousState.workState -> null
+			is DownloadItemModel -> {
-		isExpanded != previousState.isExpanded -> ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+				if (workState == previousState.workState) {
-		else -> ListModelDiffCallback.PAYLOAD_ANYTHING_CHANGED
+					Unit
+				} else {
+					null
+				}
+			}
+
+			else -> super.getChangePayload(previousState)
+		}
 	}
 }

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

@@ -15,7 +15,6 @@ 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
@@ -54,7 +53,6 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 			addItemDecoration(decoration)
 			adapter = downloadsAdapter
 			selectionController.attachToRecyclerView(this)
-			RecyclerScrollKeeper(this).attach()
 		}
 		addMenuProvider(DownloadsMenuProvider(this, viewModel))
 		viewModel.items.observe(this) {
@@ -84,11 +82,7 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 		if (selectionController.onItemClick(item.id.mostSignificantBits)) {
 			return
 		}
-		if (item.isExpandable) {
+		startActivity(DetailsActivity.newIntent(view.context, item.manga))
-			viewModel.expandCollapse(item)
-		} else {
-			startActivity(DetailsActivity.newIntent(view.context, item.manga))
-		}
 	}
 
 	override fun onItemLongClick(item: DownloadItemModel, view: View): Boolean {

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

@@ -8,19 +8,15 @@ import androidx.work.Data
 import androidx.work.WorkInfo
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.plus
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
@@ -35,7 +31,6 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.mapToSet
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.util.Date
 import java.util.LinkedList
 import java.util.UUID
@@ -46,18 +41,13 @@ import javax.inject.Inject
 class DownloadsViewModel @Inject constructor(
 	private val workScheduler: DownloadWorker.Scheduler,
 	private val mangaDataRepository: MangaDataRepository,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) : BaseViewModel() {
 
 	private val mangaCache = LongSparseArray<Manga>()
 	private val cacheMutex = Mutex()
-	private val expanded = MutableStateFlow(emptySet<UUID>())
+	private val works = workScheduler.observeWorks()
-	private val works = combine(
+		.mapLatest { it.toDownloadsList() }
-		workScheduler.observeWorks(),
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
-		expanded,
-	) { list, exp ->
-		list.toDownloadsList(exp)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	val onActionDone = MutableEventFlow<ReversibleAction>()
 
@@ -179,21 +169,11 @@ class DownloadsViewModel @Inject constructor(
 		it.id.mostSignificantBits
 	} ?: emptySet()
 
-	fun expandCollapse(item: DownloadItemModel) {
+	private suspend fun List<WorkInfo>.toDownloadsList(): List<DownloadItemModel> {
-		expanded.update {
-			if (item.id in it) {
-				it - item.id
-			} else {
-				it + item.id
-			}
-		}
-	}
-
-	private suspend fun List<WorkInfo>.toDownloadsList(exp: Set<UUID>): List<DownloadItemModel> {
 		if (isEmpty()) {
 			return emptyList()
 		}
-		val list = mapNotNullTo(ArrayList(size)) { it.toUiModel(it.id in exp) }
+		val list = mapNotNullTo(ArrayList(size)) { it.toUiModel() }
 		list.sortByDescending { it.timestamp }
 		return list
 	}
@@ -233,7 +213,7 @@ class DownloadsViewModel @Inject constructor(
 		return destination
 	}
 
-	private suspend fun WorkInfo.toUiModel(isExpanded: Boolean): DownloadItemModel? {
+	private suspend fun WorkInfo.toUiModel(): DownloadItemModel? {
 		val workData = if (outputData == Data.EMPTY) progress else outputData
 		val mangaId = DownloadState.getMangaId(workData)
 		if (mangaId == 0L) return null
@@ -249,8 +229,7 @@ class DownloadsViewModel @Inject constructor(
 			progress = DownloadState.getProgress(workData),
 			eta = DownloadState.getEta(workData),
 			timestamp = DownloadState.getTimestamp(workData),
-			chaptersDownloaded = DownloadState.getDownloadedChapters(workData),
+			totalChapters = DownloadState.getDownloadedChapters(workData).size,
-			isExpanded = isExpanded,
 		)
 	}
 
@@ -282,16 +261,8 @@ class DownloadsViewModel @Inject constructor(
 		}
 		return cacheMutex.withLock {
 			mangaCache.getOrElse(mangaId) {
-				mangaDataRepository.findMangaById(mangaId)?.let {
+				mangaDataRepository.findMangaById(mangaId)?.also { mangaCache[mangaId] = it } ?: return null
-					tryLoad(it) ?: it
-				}?.also {
-					mangaCache[mangaId] = it
-				} ?: return null
 			}
 		}
 	}
-
-	private suspend fun tryLoad(manga: Manga) = runCatchingCancellable {
-		(mangaRepositoryFactory.create(manga.source) as RemoteMangaRepository).peekDetails(manga)
-	}.getOrNull()
 }

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

@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.download.ui.list.chapters
-
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-data class DownloadChapter(
-	val number: Int,
-	val name: String,
-	val isDownloaded: Boolean,
-) : ListModel {
-
-	override fun areItemsTheSame(other: ListModel): Boolean {
-		return other is DownloadChapter && other.name == name
-	}
-}

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

@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.download.ui.list.chapters
-
-import androidx.core.content.ContextCompat
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.drawableEnd
-import org.koitharu.kotatsu.databinding.ItemChapterDownloadBinding
-
-fun downloadChapterAD() = adapterDelegateViewBinding<DownloadChapter, DownloadChapter, ItemChapterDownloadBinding>(
-	{ layoutInflater, parent -> ItemChapterDownloadBinding.inflate(layoutInflater, parent, false) },
-) {
-
-	val iconDone = ContextCompat.getDrawable(context, R.drawable.ic_check)
-
-	bind {
-		binding.textViewNumber.text = item.number.toString()
-		binding.textViewTitle.text = item.name
-		binding.textViewTitle.drawableEnd = if (item.isDownloaded) iconDone else null
-	}
-}

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

@@ -38,7 +38,6 @@ 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
@@ -47,6 +46,7 @@ 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,12 +105,11 @@ class DownloadWorker @AssistedInject constructor(
 		setForeground(getForegroundInfo())
 		val mangaId = inputData.getLong(MANGA_ID, 0L)
 		val manga = mangaDataRepository.findMangaById(mangaId) ?: return Result.failure()
-		lastPublishedState = DownloadState(manga, isIndeterminate = true)
-		publishState(DownloadState(manga, isIndeterminate = true))
 		val chaptersIds = inputData.getLongArray(CHAPTERS_IDS)?.takeUnless { it.isEmpty() }
-		val downloadedIds = getDoneChapters(manga)
+		val downloadedIds = getDoneChapters()
+		lastPublishedState = DownloadState(manga, isIndeterminate = true)
 		return try {
-			downloadMangaImpl(manga, chaptersIds, downloadedIds)
+			downloadMangaImpl(chaptersIds, downloadedIds)
 			Result.success(currentState.toWorkData())
 		} catch (e: CancellationException) {
 			withContext(NonCancellable) {
@@ -148,11 +147,10 @@ class DownloadWorker @AssistedInject constructor(
 	}
 
 	private suspend fun downloadMangaImpl(
-		subject: Manga,
 		includedIds: LongArray?,
-		excludedIds: Set<Long>,
+		excludedIds: LongArray,
 	) {
-		var manga = subject
+		var manga = currentState.manga
 		val chaptersToSkip = excludedIds.toMutableSet()
 		withMangaLock(manga) {
 			ContextCompat.registerReceiver(
@@ -182,7 +180,11 @@ class DownloadWorker @AssistedInject constructor(
 				val chapters = getChapters(mangaDetails, includedIds)
 				for ((chapterIndex, chapter) in chapters.withIndex()) {
 					if (chaptersToSkip.remove(chapter.id)) {
-						publishState(currentState.copy(downloadedChapters = currentState.downloadedChapters + 1))
+						publishState(
+							currentState.copy(
+								downloadedChapters = currentState.downloadedChapters + chapter.id,
+							),
+						)
 						continue
 					}
 					val pages = runFailsafe(pausingHandle) {
@@ -220,7 +222,11 @@ class DownloadWorker @AssistedInject constructor(
 							localStorageChanges.emit(LocalMangaInput.of(output.rootFile).getManga())
 						}.onFailure(Throwable::printStackTraceDebug)
 					}
-					publishState(currentState.copy(downloadedChapters = currentState.downloadedChapters + 1))
+					publishState(
+						currentState.copy(
+							downloadedChapters = currentState.downloadedChapters + chapter.id,
+						),
+					)
 				}
 				publishState(currentState.copy(isIndeterminate = true, eta = -1L))
 				output.mergeWithExisting()
@@ -327,9 +333,11 @@ class DownloadWorker @AssistedInject constructor(
 		setProgress(state.toWorkData())
 	}
 
-	private suspend fun getDoneChapters(manga: Manga) = runCatchingCancellable {
+	private suspend fun getDoneChapters(): LongArray {
-		localMangaRepository.getDetails(manga).chapters?.ids()
+		val work = WorkManager.getInstance(applicationContext).awaitWorkInfoById(id)
-	}.getOrNull().orEmpty()
+			?: return LongArray(0)
+		return DownloadState.getDownloadedChapters(work.progress)
+	}
 
 	private fun getChapters(
 		manga: Manga,

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

@@ -6,7 +6,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
@@ -19,7 +18,6 @@ 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
@@ -31,7 +29,7 @@ class MangaSourcesRepository @Inject constructor(
 ) {
 
 	private val dao: MangaSourcesDao
-		get() = db.getSourcesDao()
+		get() = db.sourcesDao
 
 	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
 		remove(MangaSource.LOCAL)
@@ -44,43 +42,14 @@ class MangaSourcesRepository @Inject constructor(
 		get() = Collections.unmodifiableSet(remoteSources)
 
 	suspend fun getEnabledSources(): List<MangaSource> {
-		val order = settings.sourcesSortOrder
+		return dao.findAllEnabled().toSources(settings.isNsfwContentDisabled)
-		return dao.findAllEnabled(order).toSources(settings.isNsfwContentDisabled, order)
 	}
 
-	suspend fun getDisabledSources(): List<MangaSource> {
+	fun observeEnabledSources(): Flow<List<MangaSource>> = observeIsNsfwDisabled().flatMapLatest { skipNsfw ->
-		return dao.findAllDisabled().toSources(settings.isNsfwContentDisabled, null)
+		dao.observeEnabled().map {
-	}
+			it.toSources(skipNsfw)
-
-	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)
@@ -123,25 +92,19 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	fun observeNewSources(): Flow<Set<MangaSource>> = observeIsNewSourcesEnabled().flatMapLatest {
+	fun observeNewSources(): Flow<Set<MangaSource>> = combine(
-		if (it) {
+		dao.observeAll(),
-			combine(
+		observeIsNsfwDisabled(),
-				dao.observeAll(),
+	) { entities, skipNsfw ->
-				observeIsNsfwDisabled(),
+		val result = EnumSet.copyOf(remoteSources)
-			) { entities, skipNsfw ->
+		for (e in entities) {
-				val result = EnumSet.copyOf(remoteSources)
+			result.remove(MangaSource(e.source))
-				for (e in entities) {
-					result.remove(MangaSource(e.source))
-				}
-				if (skipNsfw) {
-					result.removeAll { x -> x.isNsfw() }
-				}
-				result
-			}.distinctUntilChanged()
-		} else {
-			flowOf(emptySet())
 		}
-	}
+		if (skipNsfw) {
+			result.removeAll { x -> x.isNsfw() }
+		}
+		result
+	}.distinctUntilChanged()
 
 	suspend fun assimilateNewSources(): Set<MangaSource> {
 		val new = getNewSources()
@@ -176,10 +139,7 @@ class MangaSourcesRepository @Inject constructor(
 		return result
 	}
 
-	private fun List<MangaSourceEntity>.toSources(
+	private fun List<MangaSourceEntity>.toSources(skipNsfwSources: Boolean): List<MangaSource> {
-		skipNsfwSources: Boolean,
-		sortOrder: SourcesSortOrder?,
-	): List<MangaSource> {
 		val result = ArrayList<MangaSource>(size)
 		for (entity in this) {
 			val source = MangaSource(entity.source)
@@ -190,21 +150,10 @@ class MangaSourcesRepository @Inject constructor(
 				result.add(source)
 			}
 		}
-		if (sortOrder == SourcesSortOrder.ALPHABETIC) {
-			result.sortBy { it.title }
-		}
 		return result
 	}
 
 	private fun observeIsNsfwDisabled() = settings.observeAsFlow(AppSettings.KEY_DISABLE_NSFW) {
 		isNsfwContentDisabled
 	}
-
-	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

@@ -1,12 +0,0 @@
-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/ui/ExploreFragment.kt

@@ -1,7 +1,6 @@
 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
@@ -47,7 +46,6 @@ 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
 
@@ -85,7 +83,7 @@ class ExploreFragment :
 			SpanSizeResolver(this, resources.getDimensionPixelSize(R.dimen.explore_grid_width)).attach()
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 		}
-		addMenuProvider(ExploreMenuProvider(binding.root.context))
+		addMenuProvider(ExploreMenuProvider(binding.root.context, viewModel))
 		viewModel.content.observe(viewLifecycleOwner) {
 			exploreAdapter?.items = it
 		}
@@ -111,7 +109,7 @@ class ExploreFragment :
 	}
 
 	override fun onListHeaderClick(item: ListHeader, view: View) {
-		startActivity(Intent(view.context, SourcesCatalogActivity::class.java))
+		startActivity(SettingsActivity.newManageSourcesIntent(view.context))
 	}
 
 	override fun onPrimaryButtonClick(tipView: TipView) {
@@ -176,6 +174,7 @@ 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,12 +18,17 @@ class ExploreMenuProvider(
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
 		return when (menuItem.itemId) {
-			R.id.action_manage -> {
+			R.id.action_grid -> {
-				context.startActivity(SettingsActivity.newSourcesSettingsIntent(context))
+				viewModel.setGridMode(!menuItem.isChecked)
 				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,7 +21,6 @@ import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
-import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 import org.koitharu.kotatsu.explore.domain.ExploreRepository
 import org.koitharu.kotatsu.explore.ui.model.ExploreButtons
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
@@ -51,13 +50,11 @@ class ExploreViewModel @Inject constructor(
 		valueProducer = { isSourcesGridMode },
 	)
 
-	private val isSuggestionsEnabled = settings.observeAsFlow(
+	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>()
@@ -107,6 +104,10 @@ class ExploreViewModel @Inject constructor(
 		}
 	}
 
+	fun setGridMode(value: Boolean) {
+		settings.isSourcesGridMode = value
+	}
+
 	fun respondSuggestionTip(isAccepted: Boolean) {
 		settings.isSuggestionsEnabled = isAccepted
 		settings.closeTip(TIP_SUGGESTIONS)
@@ -136,7 +137,7 @@ class ExploreViewModel @Inject constructor(
 			result += RecommendationsItem(recommendation)
 		}
 		if (sources.isNotEmpty()) {
-			result += ListHeader(R.string.remote_sources, R.string.catalog)
+			result += ListHeader(R.string.remote_sources, R.string.manage)
 			if (newSources.isNotEmpty()) {
 				result += TipModel(
 					key = TIP_NEW_SOURCES,

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

@@ -7,7 +7,6 @@ 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
@@ -49,8 +48,8 @@ fun exploreButtonsAD(
 			icon.setColorSchemeColors(
 				context.getThemeColor(
 					materialR.attr.colorPrimary,
-					Color.DKGRAY,
+					Color.DKGRAY
-				),
+				)
 			)
 			binding.buttonRandom.icon = icon
 			icon.start()
@@ -99,7 +98,7 @@ fun exploreSourceListItemAD(
 		ItemExploreSourceListBinding.inflate(
 			layoutInflater,
 			parent,
-			false,
+			false
 		)
 	},
 	on = { item, _, _ -> item is MangaSourceItem && !item.isGrid },
@@ -113,7 +112,6 @@ 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)
@@ -134,7 +132,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/EntityMapping.kt

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

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

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

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

@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.SortOrder
 import org.koitharu.kotatsu.core.db.entity.toEntities
 import org.koitharu.kotatsu.core.db.entity.toEntity
 import org.koitharu.kotatsu.core.model.FavouriteCategory
@@ -19,8 +20,8 @@ import org.koitharu.kotatsu.favourites.data.toFavouriteCategory
 import org.koitharu.kotatsu.favourites.data.toManga
 import org.koitharu.kotatsu.favourites.data.toMangaList
 import org.koitharu.kotatsu.favourites.domain.model.Cover
-import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.tracker.work.TrackerNotificationChannels
 import javax.inject.Inject
 
@@ -31,27 +32,27 @@ class FavouritesRepository @Inject constructor(
 ) {
 
 	suspend fun getAllManga(): List<Manga> {
-		val entities = db.getFavouritesDao().findAll()
+		val entities = db.favouritesDao.findAll()
 		return entities.toMangaList()
 	}
 
 	suspend fun getLastManga(limit: Int): List<Manga> {
-		val entities = db.getFavouritesDao().findLast(limit)
+		val entities = db.favouritesDao.findLast(limit)
 		return entities.toMangaList()
 	}
 
-	fun observeAll(order: ListSortOrder): Flow<List<Manga>> {
+	fun observeAll(order: SortOrder): Flow<List<Manga>> {
-		return db.getFavouritesDao().observeAll(order)
+		return db.favouritesDao.observeAll(order)
 			.mapItems { it.toManga() }
 	}
 
 	suspend fun getManga(categoryId: Long): List<Manga> {
-		val entities = db.getFavouritesDao().findAll(categoryId)
+		val entities = db.favouritesDao.findAll(categoryId)
 		return entities.toMangaList()
 	}
 
-	fun observeAll(categoryId: Long, order: ListSortOrder): Flow<List<Manga>> {
+	fun observeAll(categoryId: Long, order: SortOrder): Flow<List<Manga>> {
-		return db.getFavouritesDao().observeAll(categoryId, order)
+		return db.favouritesDao.observeAll(categoryId, order)
 			.mapItems { it.toManga() }
 	}
 
@@ -61,25 +62,25 @@ class FavouritesRepository @Inject constructor(
 	}
 
 	fun observeCategories(): Flow<List<FavouriteCategory>> {
-		return db.getFavouriteCategoriesDao().observeAll().mapItems {
+		return db.favouriteCategoriesDao.observeAll().mapItems {
 			it.toFavouriteCategory()
 		}.distinctUntilChanged()
 	}
 
 	fun observeCategoriesForLibrary(): Flow<List<FavouriteCategory>> {
-		return db.getFavouriteCategoriesDao().observeAllForLibrary().mapItems {
+		return db.favouriteCategoriesDao.observeAllForLibrary().mapItems {
 			it.toFavouriteCategory()
 		}.distinctUntilChanged()
 	}
 
 	fun observeCategoriesWithCovers(): Flow<Map<FavouriteCategory, List<Cover>>> {
-		return db.getFavouriteCategoriesDao().observeAll()
+		return db.favouriteCategoriesDao.observeAll()
 			.map {
 				db.withTransaction {
 					val res = LinkedHashMap<FavouriteCategory, List<Cover>>()
 					for (entity in it) {
 						val cat = entity.toFavouriteCategory()
-						res[cat] = db.getFavouritesDao().findCovers(
+						res[cat] = db.favouritesDao.findCovers(
 							categoryId = cat.id,
 							order = cat.order,
 						)
@@ -90,39 +91,35 @@ class FavouritesRepository @Inject constructor(
 	}
 
 	fun observeCategory(id: Long): Flow<FavouriteCategory?> {
-		return db.getFavouriteCategoriesDao().observe(id)
+		return db.favouriteCategoriesDao.observe(id)
 			.map { it?.toFavouriteCategory() }
 	}
 
 	fun observeCategoriesIds(mangaId: Long): Flow<Set<Long>> {
-		return db.getFavouritesDao().observeIds(mangaId).map { it.toSet() }
+		return db.favouritesDao.observeIds(mangaId).map { it.toSet() }
 	}
 
 	suspend fun getCategory(id: Long): FavouriteCategory {
-		return db.getFavouriteCategoriesDao().find(id.toInt()).toFavouriteCategory()
+		return db.favouriteCategoriesDao.find(id.toInt()).toFavouriteCategory()
-	}
-
-	suspend fun getCategoriesIds(mangaIds: Collection<Long>): Set<Long> {
-		return db.getFavouritesDao().findCategoriesIds(mangaIds).toSet()
 	}
 
 	suspend fun createCategory(
 		title: String,
-		sortOrder: ListSortOrder,
+		sortOrder: SortOrder,
 		isTrackerEnabled: Boolean,
 		isVisibleOnShelf: Boolean,
 	): FavouriteCategory {
 		val entity = FavouriteCategoryEntity(
 			title = title,
 			createdAt = System.currentTimeMillis(),
-			sortKey = db.getFavouriteCategoriesDao().getNextSortKey(),
+			sortKey = db.favouriteCategoriesDao.getNextSortKey(),
 			categoryId = 0,
 			order = sortOrder.name,
 			track = isTrackerEnabled,
 			deletedAt = 0L,
 			isVisibleInLibrary = isVisibleOnShelf,
 		)
-		val id = db.getFavouriteCategoriesDao().insert(entity)
+		val id = db.favouriteCategoriesDao.insert(entity)
 		val category = entity.toFavouriteCategory(id)
 		channels.createChannel(category)
 		return category
@@ -131,26 +128,26 @@ class FavouritesRepository @Inject constructor(
 	suspend fun updateCategory(
 		id: Long,
 		title: String,
-		sortOrder: ListSortOrder,
+		sortOrder: SortOrder,
 		isTrackerEnabled: Boolean,
 		isVisibleOnShelf: Boolean,
 	) {
-		db.getFavouriteCategoriesDao().update(id, title, sortOrder.name, isTrackerEnabled, isVisibleOnShelf)
+		db.favouriteCategoriesDao.update(id, title, sortOrder.name, isTrackerEnabled, isVisibleOnShelf)
 	}
 
 	suspend fun updateCategory(id: Long, isVisibleInLibrary: Boolean) {
-		db.getFavouriteCategoriesDao().updateLibVisibility(id, isVisibleInLibrary)
+		db.favouriteCategoriesDao.updateLibVisibility(id, isVisibleInLibrary)
 	}
 
 	suspend fun updateCategoryTracking(id: Long, isTrackingEnabled: Boolean) {
-		db.getFavouriteCategoriesDao().updateTracking(id, isTrackingEnabled)
+		db.favouriteCategoriesDao.updateTracking(id, isTrackingEnabled)
 	}
 
 	suspend fun removeCategories(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.getFavouritesDao().deleteAll(id)
+				db.favouritesDao.deleteAll(id)
-				db.getFavouriteCategoriesDao().delete(id)
+				db.favouriteCategoriesDao.delete(id)
 			}
 		}
 		// run after transaction success
@@ -159,12 +156,12 @@ class FavouritesRepository @Inject constructor(
 		}
 	}
 
-	suspend fun setCategoryOrder(id: Long, order: ListSortOrder) {
+	suspend fun setCategoryOrder(id: Long, order: SortOrder) {
-		db.getFavouriteCategoriesDao().updateOrder(id, order.name)
+		db.favouriteCategoriesDao.updateOrder(id, order.name)
 	}
 
 	suspend fun reorderCategories(orderedIds: List<Long>) {
-		val dao = db.getFavouriteCategoriesDao()
+		val dao = db.favouriteCategoriesDao
 		db.withTransaction {
 			for ((i, id) in orderedIds.withIndex()) {
 				dao.updateSortKey(id, i)
@@ -176,8 +173,8 @@ class FavouritesRepository @Inject constructor(
 		db.withTransaction {
 			for (manga in mangas) {
 				val tags = manga.tags.toEntities()
-				db.getTagsDao().upsert(tags)
+				db.tagsDao.upsert(tags)
-				db.getMangaDao().upsert(manga.toEntity(), tags)
+				db.mangaDao.upsert(manga.toEntity(), tags)
 				val entity = FavouriteEntity(
 					mangaId = manga.id,
 					categoryId = categoryId,
@@ -185,7 +182,7 @@ class FavouritesRepository @Inject constructor(
 					sortKey = 0,
 					deletedAt = 0L,
 				)
-				db.getFavouritesDao().insert(entity)
+				db.favouritesDao.insert(entity)
 			}
 		}
 	}
@@ -193,7 +190,7 @@ class FavouritesRepository @Inject constructor(
 	suspend fun removeFromFavourites(ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.getFavouritesDao().delete(mangaId = id)
+				db.favouritesDao.delete(mangaId = id)
 			}
 		}
 		return ReversibleHandle { recoverToFavourites(ids) }
@@ -202,23 +199,23 @@ class FavouritesRepository @Inject constructor(
 	suspend fun removeFromCategory(categoryId: Long, ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.getFavouritesDao().delete(categoryId = categoryId, mangaId = id)
+				db.favouritesDao.delete(categoryId = categoryId, mangaId = id)
 			}
 		}
 		return ReversibleHandle { recoverToCategory(categoryId, ids) }
 	}
 
-	private fun observeOrder(categoryId: Long): Flow<ListSortOrder> {
+	private fun observeOrder(categoryId: Long): Flow<SortOrder> {
-		return db.getFavouriteCategoriesDao().observe(categoryId)
+		return db.favouriteCategoriesDao.observe(categoryId)
 			.filterNotNull()
-			.map { x -> ListSortOrder(x.order, ListSortOrder.NEWEST) }
+			.map { x -> SortOrder(x.order, SortOrder.NEWEST) }
 			.distinctUntilChanged()
 	}
 
 	private suspend fun recoverToFavourites(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.getFavouritesDao().recover(mangaId = id)
+				db.favouritesDao.recover(mangaId = id)
 			}
 		}
 	}
@@ -226,7 +223,7 @@ class FavouritesRepository @Inject constructor(
 	private suspend fun recoverToCategory(categoryId: Long, ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.getFavouritesDao().recover(mangaId = id, categoryId = categoryId)
+				db.favouritesDao.recover(mangaId = id, categoryId = categoryId)
 			}
 		}
 	}

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

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

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

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

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

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

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

@@ -19,12 +19,17 @@ 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 FavoriteSheet : BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(), OnListItemClickListener<MangaCategoryItem> {
+class FavouriteSheet :
+	BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(),
+	OnListItemClickListener<MangaCategoryItem> {
 
-	private val viewModel by viewModels<FavoriteSheetViewModel>()
+	private val viewModel: MangaCategoriesViewModel by viewModels()
+
+	private var adapter: MangaCategoriesAdapter? = null
 
 	override fun onCreateViewBinding(
 		inflater: LayoutInflater,
@@ -36,32 +41,44 @@ class FavoriteSheet : BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(), OnLis
 		savedInstanceState: Bundle?,
 	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		val adapter = MangaCategoriesAdapter(this)
+		adapter = MangaCategoriesAdapter(this)
 		binding.recyclerViewCategories.adapter = adapter
-		viewModel.content.observe(viewLifecycleOwner, adapter)
+		viewModel.content.observe(viewLifecycleOwner, this::onContentChanged)
 		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 = "FavoriteSheet"
+		private const val TAG = "FavouriteCategoriesDialog"
 		const val KEY_MANGA_LIST = "manga_list"
 
-		fun show(fm: FragmentManager, manga: Manga) = show(fm, setOf(manga))
+		fun show(fm: FragmentManager, manga: Manga) = Companion.show(fm, listOf(manga))
 
-		fun show(fm: FragmentManager, manga: Collection<Manga>) = FavoriteSheet().withArgs(1) {
+		fun show(fm: FragmentManager, manga: Collection<Manga>) =
-			putParcelableArrayList(
+			FavouriteSheet().withArgs(1) {
-				KEY_MANGA_LIST,
+				putParcelableArrayList(
-				manga.mapTo(ArrayList(manga.size), ::ParcelableManga),
+					KEY_MANGA_LIST,
-			)
+					manga.mapTo(ArrayList(manga.size)) {
-		}.showDistinct(fm, TAG)
+						ParcelableManga(it)
+					},
+				)
+			}.showDistinct(fm, TAG)
 	}
 }

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

@@ -4,70 +4,77 @@ 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.parsers.util.mapToSet
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import javax.inject.Inject
 
 @HiltViewModel
-class FavoriteSheetViewModel @Inject constructor(
+class MangaCategoriesViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	private val favouritesRepository: FavouritesRepository,
 	settings: AppSettings,
 ) : BaseViewModel() {
 
-	private val manga = savedStateHandle.require<List<ParcelableManga>>(FavoriteSheet.KEY_MANGA_LIST).mapToSet {
+	private val manga = savedStateHandle.require<List<ParcelableManga>>(KEY_MANGA_LIST).map { it.manga }
-		it.manga
-	}
 	private val header = CategoriesHeaderItem()
-	private val checkedCategories = MutableStateFlow<Set<Long>?>(null)
+
-	val content = combine(
+	val content: StateFlow<List<ListModel>> = combine(
 		favouritesRepository.observeCategories(),
-		checkedCategories.filterNotNull(),
+		observeCategoriesIds(),
-		settings.observeAsFlow(AppSettings.KEY_TRACKER_ENABLED) { isTrackerEnabled },
+	) { all, checked ->
-	) { categories, checked, tracker ->
+		buildList(all.size + 1) {
-		buildList(categories.size + 1) {
 			add(header)
-			categories.mapTo(this) { cat ->
+			all.mapTo(this) {
 				MangaCategoryItem(
-					category = cat,
+					category = it,
-					isChecked = cat.id in checked,
+					isChecked = it.id in checked,
-					isTrackerEnabled = tracker,
+					isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
 				)
 			}
 		}
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(header))
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
-
-	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/favourites/ui/list/FavouritesListFragment.kt

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

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

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

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

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

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

@@ -25,7 +25,6 @@ import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.lifecycleScope
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.require
-import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
 import org.koitharu.kotatsu.filter.ui.model.FilterItem
 import org.koitharu.kotatsu.filter.ui.model.FilterState
@@ -208,7 +207,7 @@ class FilterCoordinator @Inject constructor(
 		state: FilterState,
 		query: String,
 	): List<ListModel> {
-		val sortOrders = repository.sortOrders.sortedByOrdinal()
+		val sortOrders = repository.sortOrders.sortedBy { it.ordinal }
 		val tags = mergeTags(state.tags, allTags.tags).toList()
 		val list = ArrayList<ListModel>(tags.size + sortOrders.size + 3)
 		if (query.isEmpty()) {

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

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

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

@@ -15,13 +15,11 @@ 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
+import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import org.koitharu.kotatsu.history.domain.model.MangaWithHistory
-import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
@@ -37,40 +35,39 @@ 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.getHistoryDao().findAll(offset, limit)
+		val entities = db.historyDao.findAll(offset, limit)
 		return entities.map { it.manga.toManga(it.tags.toMangaTags()) }
 	}
 
 	suspend fun getLastOrNull(): Manga? {
-		val entity = db.getHistoryDao().findAll(0, 1).firstOrNull() ?: return null
+		val entity = db.historyDao.findAll(0, 1).firstOrNull() ?: return null
 		return entity.manga.toManga(entity.tags.toMangaTags())
 	}
 
 	fun observeLast(): Flow<Manga?> {
-		return db.getHistoryDao().observeAll(1).map {
+		return db.historyDao.observeAll(1).map {
 			val first = it.firstOrNull()
 			first?.manga?.toManga(first.tags.toMangaTags())
 		}
 	}
 
 	fun observeAll(): Flow<List<Manga>> {
-		return db.getHistoryDao().observeAll().mapItems {
+		return db.historyDao.observeAll().mapItems {
 			it.manga.toManga(it.tags.toMangaTags())
 		}
 	}
 
 	fun observeAll(limit: Int): Flow<List<Manga>> {
-		return db.getHistoryDao().observeAll(limit).mapItems {
+		return db.historyDao.observeAll(limit).mapItems {
 			it.manga.toManga(it.tags.toMangaTags())
 		}
 	}
 
-	fun observeAllWithHistory(order: ListSortOrder): Flow<List<MangaWithHistory>> {
+	fun observeAllWithHistory(order: HistoryOrder): Flow<List<MangaWithHistory>> {
-		return db.getHistoryDao().observeAll(order).mapItems {
+		return db.historyDao.observeAll(order).mapItems {
 			MangaWithHistory(
 				it.manga.toManga(it.tags.toMangaTags()),
 				it.history.toMangaHistory(),
@@ -79,13 +76,13 @@ class HistoryRepository @Inject constructor(
 	}
 
 	fun observeOne(id: Long): Flow<MangaHistory?> {
-		return db.getHistoryDao().observe(id).map {
+		return db.historyDao.observe(id).map {
 			it?.toMangaHistory()
 		}
 	}
 
 	fun observeHasItems(): Flow<Boolean> {
-		return db.getHistoryDao().observeCount()
+		return db.historyDao.observeCount()
 			.map { it > 0 }
 			.distinctUntilChanged()
 	}
@@ -94,9 +91,11 @@ class HistoryRepository @Inject constructor(
 		if (shouldSkip(manga)) {
 			return
 		}
+		val tags = manga.tags.toEntities()
 		db.withTransaction {
-			mangaRepository.storeManga(manga)
+			db.tagsDao.upsert(tags)
-			db.getHistoryDao().upsert(
+			db.mangaDao.upsert(manga.toEntity(), tags)
+			db.historyDao.upsert(
 				HistoryEntity(
 					mangaId = manga.id,
 					createdAt = System.currentTimeMillis(),
@@ -117,29 +116,29 @@ class HistoryRepository @Inject constructor(
 	}
 
 	suspend fun getOne(manga: Manga): MangaHistory? {
-		return db.getHistoryDao().find(manga.id)?.recoverIfNeeded(manga)?.toMangaHistory()
+		return db.historyDao.find(manga.id)?.recoverIfNeeded(manga)?.toMangaHistory()
 	}
 
 	suspend fun getProgress(mangaId: Long): Float {
-		return db.getHistoryDao().findProgress(mangaId) ?: PROGRESS_NONE
+		return db.historyDao.findProgress(mangaId) ?: PROGRESS_NONE
 	}
 
 	suspend fun clear() {
-		db.getHistoryDao().clear()
+		db.historyDao.clear()
 	}
 
 	suspend fun delete(manga: Manga) {
-		db.getHistoryDao().delete(manga.id)
+		db.historyDao.delete(manga.id)
 	}
 
 	suspend fun deleteAfter(minDate: Long) {
-		db.getHistoryDao().deleteAfter(minDate)
+		db.historyDao.deleteAfter(minDate)
 	}
 
 	suspend fun delete(ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.getHistoryDao().delete(id)
+				db.historyDao.delete(id)
 			}
 		}
 		return ReversibleHandle {
@@ -152,13 +151,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.getMangaDao().update(alternative.toEntity()) <= 0) {
+		if (alternative == null || db.mangaDao.update(alternative.toEntity()) <= 0) {
-			db.getHistoryDao().delete(manga.id)
+			db.historyDao.delete(manga.id)
 		}
 	}
 
 	suspend fun getPopularTags(limit: Int): List<MangaTag> {
-		return db.getHistoryDao().findPopularTags(limit).map { x -> x.toMangaTag() }
+		return db.historyDao.findPopularTags(limit).map { x -> x.toMangaTag() }
 	}
 
 	fun shouldSkip(manga: Manga): Boolean {
@@ -176,21 +175,21 @@ class HistoryRepository @Inject constructor(
 	private suspend fun recover(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.getHistoryDao().recover(id)
+				db.historyDao.recover(id)
 			}
 		}
 	}
 
 	private suspend fun HistoryEntity.recoverIfNeeded(manga: Manga): HistoryEntity {
 		val chapters = manga.chapters
-		if (manga.isLocal || chapters.isNullOrEmpty() || chapters.findById(chapterId) != null) {
+		if (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.getHistoryDao().update(newEntity)
+		db.historyDao.update(newEntity)
 		return newEntity
 	}
 }

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

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

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

@@ -9,8 +9,9 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkManageIntent
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
-import org.koitharu.kotatsu.core.ui.list.RecyclerScrollKeeper
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
+import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.list.ui.size.DynamicItemSizeResolver
@@ -24,8 +25,10 @@ class HistoryListFragment : MangaListFragment() {
 
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		RecyclerScrollKeeper(binding.recyclerView).attach()
 		addMenuProvider(HistoryListMenuProvider(binding.root.context, viewModel))
+		val menuInvalidator = MenuInvalidator(requireActivity())
+		viewModel.isGroupingEnabled.observe(viewLifecycleOwner, menuInvalidator)
+		viewModel.sortOrder.observe(viewLifecycleOwner, menuInvalidator)
 	}
 
 	override fun onScrolledToEnd() = Unit

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

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

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

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

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

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