Update parsers

Currently translated at 100.0% (658 of 658 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (658 of 658 strings)

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

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 650
-		versionName = '7.2.1'
+		versionCode = 651
+		versionName = '7.3'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,7 +82,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:f923acc5a7') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:74b8aaa94e') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -93,12 +93,12 @@ dependencies {
 	implementation 'androidx.appcompat:appcompat:1.7.0'
 	implementation 'androidx.core:core-ktx:1.13.1'
 	implementation 'androidx.activity:activity-ktx:1.9.0'
-	implementation 'androidx.fragment:fragment-ktx:1.8.0'
+	implementation 'androidx.fragment:fragment-ktx:1.8.1'
 	implementation 'androidx.transition:transition-ktx:1.5.0'
 	implementation 'androidx.collection:collection-ktx:1.4.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2'
-	implementation 'androidx.lifecycle:lifecycle-service:2.8.2'
-	implementation 'androidx.lifecycle:lifecycle-process:2.8.2'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3'
+	implementation 'androidx.lifecycle:lifecycle-service:2.8.3'
+	implementation 'androidx.lifecycle:lifecycle-process:2.8.3'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
@@ -106,7 +106,7 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
 	implementation 'com.google.android.material:material:1.12.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.2'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.3'
 	implementation 'androidx.webkit:webkit:1.11.0'
 
 	implementation 'androidx.work:work-runtime:2.9.0'
@@ -136,7 +136,7 @@ dependencies {
 
 	implementation 'io.coil-kt:coil-base:2.6.0'
 	implementation 'io.coil-kt:coil-svg:2.6.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:8cafac256e'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:882bc0620c'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
@@ -154,10 +154,10 @@ dependencies {
 	testImplementation 'org.json:json:20240303'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
 
-	androidTestImplementation 'androidx.test:runner:1.5.2'
-	androidTestImplementation 'androidx.test:rules:1.5.0'
-	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
-	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
+	androidTestImplementation 'androidx.test:runner:1.6.1'
+	androidTestImplementation 'androidx.test:rules:1.6.1'
+	androidTestImplementation 'androidx.test:core-ktx:1.6.1'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
 
 	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
 

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

@@ -12,7 +12,6 @@ import org.koitharu.kotatsu.core.util.ext.almostEquals
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
@@ -58,7 +57,7 @@ class AlternativesUseCase @Inject constructor(
 	}
 
 	private suspend fun getSources(ref: MangaSource): List<MangaSource> {
-		val result = ArrayList<MangaSource>(MangaParserSource.entries.size - 2)
+		val result = ArrayList<MangaSource>(MangaSource.entries.size - 2)
 		result.addAll(sourcesRepository.getEnabledSources())
 		result.sortByDescending { it.priority(ref) }
 		result.addAll(sourcesRepository.getDisabledSources().sortedByDescending { it.priority(ref) })
@@ -79,10 +78,8 @@ class AlternativesUseCase @Inject constructor(
 
 	private fun MangaSource.priority(ref: MangaSource): Int {
 		var res = 0
-		if (this is MangaParserSource && ref is MangaParserSource) {
-			if (locale == ref.locale) res += 2
-			if (contentType == ref.contentType) res++
-		}
+		if (locale == ref.locale) res += 2
+		if (contentType == ref.contentType) res++
 		return res
 	}
 }

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

@@ -10,7 +10,6 @@ import coil.request.ImageRequest
 import coil.transform.CircleCropTransformation
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.ui.image.ChipIconTarget
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
@@ -64,7 +63,7 @@ fun alternativeAD(
 		}
 		binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.chipSource.also { chip ->
-			chip.text = item.manga.source.getTitle(chip.context)
+			chip.text = item.manga.source.title
 			ImageRequest.Builder(context)
 				.data(item.manga.source.faviconUri())
 				.lifecycle(lifecycleOwner)

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

@@ -13,7 +13,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.ui.BaseActivity
@@ -96,9 +95,9 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 				getString(
 					R.string.migrate_confirmation,
 					viewModel.manga.title,
-					viewModel.manga.source.getTitle(this),
+					viewModel.manga.source.title,
 					target.title,
-					target.source.getTitle(this),
+					target.source.title,
 				),
 			)
 			.setNegativeButton(android.R.string.cancel, null)

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

@@ -12,14 +12,13 @@ import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import dagger.hilt.android.AndroidEntryPoint
-import okhttp3.internal.userAgent
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -43,9 +42,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		val mangaSource = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
-		val repository = mangaRepositoryFactory.create(mangaSource) as? RemoteMangaRepository
-		repository?.headers?.get(CommonHeaders.USER_AGENT)
+		val userAgent = intent?.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE)?.let { source ->
+			val repository = mangaRepositoryFactory.create(source) as? RemoteMangaRepository
+			repository?.headers?.get(CommonHeaders.USER_AGENT)
+		}
 		viewBinding.webView.configureForParser(userAgent)
 		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
@@ -147,7 +147,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			return Intent(context, BrowserActivity::class.java)
 				.setData(Uri.parse(url))
 				.putExtra(EXTRA_TITLE, title)
-				.putExtra(EXTRA_SOURCE, source?.name)
+				.putExtra(EXTRA_SOURCE, source)
 		}
 	}
 }

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

@@ -14,9 +14,8 @@ import coil.request.ErrorResult
 import coil.request.ImageRequest
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.model.getTitle
-import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class CaptchaNotifier(
@@ -47,7 +46,7 @@ class CaptchaNotifier(
 			.setGroup(GROUP_CAPTCHA)
 			.setAutoCancel(true)
 			.setVisibility(
-				if (exception.source?.isNsfw() == true) {
+				if (exception.source?.contentType == ContentType.HENTAI) {
 					NotificationCompat.VISIBILITY_SECRET
 				} else {
 					NotificationCompat.VISIBILITY_PUBLIC
@@ -56,7 +55,7 @@ class CaptchaNotifier(
 			.setContentText(
 				context.getString(
 					R.string.captcha_required_summary,
-					exception.source?.getTitle(context) ?: context.getString(R.string.app_name),
+					exception.source?.title ?: context.getString(R.string.app_name),
 				),
 			)
 			.setContentIntent(PendingIntentCompat.getActivity(context, 0, intent, 0, false))

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

@@ -12,6 +12,7 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
 
 class JsonDeserializer(private val json: JSONObject) {
@@ -85,6 +86,8 @@ class JsonDeserializer(private val json: JSONObject) {
 		isEnabled = json.getBoolean("enabled"),
 		sortKey = json.getInt("sort_key"),
 		addedIn = json.getIntOrDefault("added_in", 0),
+		lastUsedAt = json.getLongOrDefault("used_at", 0L),
+		isPinned = json.getBooleanOrDefault("pinned", false),
 	)
 
 	fun toMap(): Map<String, Any?> {

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

@@ -89,6 +89,9 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("source", e.source)
 			put("enabled", e.isEnabled)
 			put("sort_key", e.sortKey)
+			put("added_in", e.addedIn)
+			put("used_at", e.lastUsedAt)
+			put("pinned", e.isPinned)
 		},
 	)
 

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

@@ -34,6 +34,7 @@ import org.koitharu.kotatsu.core.db.migrations.Migration18To19
 import org.koitharu.kotatsu.core.db.migrations.Migration19To20
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration20To21
+import org.koitharu.kotatsu.core.db.migrations.Migration21To22
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
 import org.koitharu.kotatsu.core.db.migrations.Migration4To5
@@ -59,7 +60,7 @@ import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 21
+const val DATABASE_VERSION = 22
 
 @Database(
 	entities = [
@@ -120,6 +121,7 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration18To19(),
 	Migration19To20(),
 	Migration20To21(),
+	Migration21To22(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

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

@@ -18,7 +18,7 @@ import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 @Dao
 abstract class MangaSourcesDao {
 
-	@Query("SELECT * FROM sources ORDER BY sort_key")
+	@Query("SELECT * FROM sources ORDER BY pinned DESC, sort_key")
 	abstract suspend fun findAll(): List<MangaSourceEntity>
 
 	@Query("SELECT source FROM sources WHERE enabled = 1")
@@ -27,7 +27,10 @@ abstract class MangaSourcesDao {
 	@Query("SELECT * FROM sources WHERE added_in >= :version")
 	abstract suspend fun findAllFromVersion(version: Int): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources ORDER BY sort_key")
+	@Query("SELECT * FROM sources ORDER BY used_at DESC LIMIT :limit")
+	abstract suspend fun findLastUsed(limit: Int): List<MangaSourceEntity>
+
+	@Query("SELECT * FROM sources ORDER BY pinned DESC, sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
 
 	@Query("SELECT enabled FROM sources WHERE source = :source")
@@ -42,6 +45,12 @@ abstract class MangaSourcesDao {
 	@Query("UPDATE sources SET sort_key = :sortKey WHERE source = :source")
 	abstract suspend fun setSortKey(source: String, sortKey: Int)
 
+	@Query("UPDATE sources SET used_at = :value WHERE source = :source")
+	abstract suspend fun setLastUsed(source: String, value: Long)
+
+	@Query("UPDATE sources SET pinned = :isPinned WHERE source = :source")
+	abstract suspend fun setPinned(source: String, isPinned: Boolean)
+
 	@Insert(onConflict = OnConflictStrategy.IGNORE)
 	@Transaction
 	abstract suspend fun insertIfAbsent(entries: Collection<MangaSourceEntity>)
@@ -49,11 +58,14 @@ abstract class MangaSourcesDao {
 	@Upsert
 	abstract suspend fun upsert(entry: MangaSourceEntity)
 
+	@Query("SELECT * FROM sources WHERE pinned = 1")
+	abstract suspend fun findAllPinned(): List<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")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
 		return observeImpl(query)
 	}
 
@@ -61,7 +73,7 @@ abstract class MangaSourcesDao {
 		val orderBy = getOrderBy(order)
 
 		@Language("RoomSql")
-		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
 		return findAllImpl(query)
 	}
 
@@ -73,6 +85,8 @@ abstract class MangaSourcesDao {
 				isEnabled = isEnabled,
 				sortKey = getMaxSortKey() + 1,
 				addedIn = BuildConfig.VERSION_CODE,
+				lastUsedAt = 0,
+				isPinned = false,
 			)
 			upsert(entity)
 		}
@@ -91,5 +105,6 @@ abstract class MangaSourcesDao {
 		SourcesSortOrder.ALPHABETIC -> "source ASC"
 		SourcesSortOrder.POPULARITY -> "(SELECT COUNT(*) FROM manga WHERE source = sources.source) DESC"
 		SourcesSortOrder.MANUAL -> "sort_key ASC"
+		SourcesSortOrder.LAST_USED -> "used_at DESC"
 	}
 }

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

@@ -15,4 +15,6 @@ data class MangaSourceEntity(
 	@ColumnInfo(name = "enabled") val isEnabled: Boolean,
 	@ColumnInfo(name = "sort_key", index = true) val sortKey: Int,
 	@ColumnInfo(name = "added_in") val addedIn: Int,
+	@ColumnInfo(name = "used_at") val lastUsedAt: Long,
+	@ColumnInfo(name = "pinned") val isPinned: Boolean,
 )

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

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.preference.PreferenceManager
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class Migration16To17(context: Context) : Migration(16, 17) {
 
@@ -15,8 +15,11 @@ class Migration16To17(context: Context) : Migration(16, 17) {
 		db.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
 		val hiddenSources = prefs.getStringSet("sources_hidden", null).orEmpty()
 		val order = prefs.getString("sources_order_2", null)?.split('|').orEmpty()
-		val sources = MangaParserSource.entries
+		val sources = MangaSource.entries
 		for (source in sources) {
+			if (source == MangaSource.LOCAL) {
+				continue
+			}
 			val name = source.name
 			val isHidden = name in hiddenSources
 			var sortKey = order.indexOf(name)

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration21To22 : Migration(21, 22) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE sources ADD COLUMN `used_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE sources ADD COLUMN `pinned` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -11,6 +11,7 @@ import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.util.formatSimple
 import org.koitharu.kotatsu.parsers.util.mapToSet
@@ -108,7 +109,7 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 }
 
 val Manga.isLocal: Boolean
-	get() = source == LocalMangaSource
+	get() = source == MangaSource.LOCAL
 
 val Manga.appUrl: Uri
 	get() = Uri.parse("https://kotatsu.app/manga").buildUpon()

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

@@ -7,41 +7,24 @@ import android.text.style.ForegroundColorSpan
 import android.text.style.RelativeSizeSpan
 import android.text.style.SuperscriptSpan
 import androidx.annotation.StringRes
+import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import com.google.android.material.R as materialR
 
-data object LocalMangaSource : MangaSource {
-	override val name = "LOCAL"
-}
-
-data object UnknownMangaSource : MangaSource {
-	override val name = "UNKNOWN"
-}
-
-fun MangaSource(name: String?): MangaSource {
-	when (name) {
-		null,
-		UnknownMangaSource.name -> UnknownMangaSource
-
-		LocalMangaSource.name -> LocalMangaSource
-	}
-	MangaParserSource.entries.forEach {
+fun MangaSource(name: String): MangaSource {
+	MangaSource.entries.forEach {
 		if (it.name == name) return it
 	}
-	return UnknownMangaSource
+	return MangaSource.UNKNOWN
 }
 
-fun MangaSource.isNsfw() = when (this) {
-	is MangaParserSource -> contentType == ContentType.HENTAI
-	else -> false
-}
+fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
 
 @get:StringRes
 val ContentType.titleResId
@@ -52,23 +35,23 @@ val ContentType.titleResId
 		ContentType.OTHER -> R.string.content_type_other
 	}
 
-fun MangaSource.getSummary(context: Context): String? = when (this) {
-	is MangaParserSource -> {
-		val type = context.getString(contentType.titleResId)
-		val locale = locale.toLocale().getDisplayName(context)
-		context.getString(R.string.source_summary_pattern, type, locale)
+fun MangaSource.getSummary(context: Context): String {
+	val type = context.getString(contentType.titleResId)
+	val locale = locale.toLocale().getDisplayName(context)
+	return context.getString(R.string.source_summary_pattern, type, locale)
+}
+
+fun MangaSource.getTitle(context: Context): CharSequence = if (isNsfw()) {
+	buildSpannedString {
+		append(title)
+		append(' ')
+		appendNsfwLabel(context)
 	}
-
-	else -> null
+} else {
+	title
 }
 
-fun MangaSource.getTitle(context: Context): String = when (this) {
-	is MangaParserSource -> title
-	LocalMangaSource -> context.getString(R.string.local_storage)
-	else -> context.getString(R.string.unknown)
-}
-
-fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
+private fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
 	ForegroundColorSpan(context.getThemeColor(materialR.attr.colorError, Color.RED)),
 	RelativeSizeSpan(0.74f),
 	SuperscriptSpan(),

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

@@ -1,15 +0,0 @@
-package org.koitharu.kotatsu.core.model.parcelable
-
-import android.os.Parcel
-import kotlinx.parcelize.Parceler
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-class MangaSourceParceler : Parceler<MangaSource> {
-
-	override fun create(parcel: Parcel): MangaSource = MangaSource(parcel.readString())
-
-	override fun MangaSource.write(parcel: Parcel, flags: Int) {
-		parcel.writeString(name)
-	}
-}

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

@@ -4,8 +4,9 @@ import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.parcelize.Parceler
 import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 @Parcelize
 data class ParcelableChapter(
@@ -24,8 +25,8 @@ data class ParcelableChapter(
 				scanlator = parcel.readString(),
 				uploadDate = parcel.readLong(),
 				branch = parcel.readString(),
-				source = MangaSource(parcel.readString()),
-			),
+				source = parcel.readSerializableCompat() ?: MangaSource.UNKNOWN,
+			)
 		)
 
 		override fun ParcelableChapter.write(parcel: Parcel, flags: Int) = with(chapter) {
@@ -37,7 +38,7 @@ data class ParcelableChapter(
 			parcel.writeString(scanlator)
 			parcel.writeLong(uploadDate)
 			parcel.writeString(branch)
-			parcel.writeString(source.name)
+			parcel.writeSerializable(source)
 		}
 	}
 }

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

@@ -5,7 +5,6 @@ import android.os.Parcelable
 import androidx.core.os.ParcelCompat
 import kotlinx.parcelize.Parceler
 import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
 import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -31,7 +30,7 @@ data class ParcelableManga(
 			parcel.writeParcelable(ParcelableMangaTags(tags), flags)
 			parcel.writeSerializable(state)
 			parcel.writeString(author)
-			parcel.writeString(source.name)
+			parcel.writeSerializable(source)
 		}
 
 		override fun create(parcel: Parcel) = ParcelableManga(
@@ -50,8 +49,8 @@ data class ParcelableManga(
 				state = parcel.readSerializableCompat(),
 				author = parcel.readString(),
 				chapters = null,
-				source = MangaSource(parcel.readString()),
-			),
+				source = requireNotNull(parcel.readSerializableCompat()),
+			)
 		)
 	}
 }

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

@@ -5,7 +5,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.MangaPage
 
 object MangaPageParceler : Parceler<MangaPage> {
@@ -13,14 +13,14 @@ object MangaPageParceler : Parceler<MangaPage> {
 		id = parcel.readLong(),
 		url = requireNotNull(parcel.readString()),
 		preview = parcel.readString(),
-		source = MangaSource(parcel.readString()),
+		source = requireNotNull(parcel.readSerializableCompat()),
 	)
 
 	override fun MangaPage.write(parcel: Parcel, flags: Int) {
 		parcel.writeLong(id)
 		parcel.writeString(url)
 		parcel.writeString(preview)
-		parcel.writeString(source.name)
+		parcel.writeSerializable(source)
 	}
 }
 

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

@@ -5,20 +5,20 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.MangaTag
 
 object MangaTagParceler : Parceler<MangaTag> {
 	override fun create(parcel: Parcel) = MangaTag(
 		title = requireNotNull(parcel.readString()),
 		key = requireNotNull(parcel.readString()),
-		source = MangaSource(parcel.readString()),
+		source = requireNotNull(parcel.readSerializableCompat()),
 	)
 
 	override fun MangaTag.write(parcel: Parcel, flags: Int) {
 		parcel.writeString(title)
 		parcel.writeString(key)
-		parcel.writeString(source.name)
+		parcel.writeSerializable(source)
 	}
 }
 

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

@@ -15,7 +15,6 @@ import okhttp3.internal.publicsuffix.PublicSuffixDatabase
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.util.EnumMap
 import javax.inject.Inject
@@ -27,8 +26,8 @@ class MirrorSwitchInterceptor @Inject constructor(
 	private val settings: AppSettings,
 ) : Interceptor {
 
-	private val locks = EnumMap<MangaParserSource, Any>(MangaParserSource::class.java)
-	private val blacklist = EnumMap<MangaParserSource, MutableSet<String>>(MangaParserSource::class.java)
+	private val locks = EnumMap<MangaSource, Any>(MangaSource::class.java)
+	private val blacklist = EnumMap<MangaSource, MutableSet<String>>(MangaSource::class.java)
 
 	val isEnabled: Boolean
 		get() = settings.isMirrorSwitchingAvailable
@@ -146,15 +145,15 @@ class MirrorSwitchInterceptor @Inject constructor(
 		return source().readByteArray().toResponseBody(contentType())
 	}
 
-	private fun obtainLock(source: MangaParserSource): Any = locks.getOrPut(source) {
+	private fun obtainLock(source: MangaSource): Any = locks.getOrPut(source) {
 		Any()
 	}
 
-	private fun isBlacklisted(source: MangaParserSource, domain: String): Boolean {
+	private fun isBlacklisted(source: MangaSource, domain: String): Boolean {
 		return blacklist[source]?.contains(domain) == true
 	}
 
-	private fun addToBlacklist(source: MangaParserSource, domain: String) {
+	private fun addToBlacklist(source: MangaSource, domain: String) {
 		blacklist.getOrPut(source) {
 			ArraySet(2)
 		}.add(domain)

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

@@ -21,7 +21,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.TABLE_HISTORY
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -174,10 +173,9 @@ class AppShortcutManager @Inject constructor(
 			onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
 			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) },
 		)
-		val title = source.getTitle(context)
 		ShortcutInfoCompat.Builder(context, source.name)
-			.setShortLabel(title)
-			.setLongLabel(title)
+			.setShortLabel(source.title)
+			.setLongLabel(source.title)
 			.setIcon(icon)
 			.setLongLived(true)
 			.setIntent(MangaListActivity.newIntent(context, source))

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

@@ -8,7 +8,7 @@ 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.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.EnumSet
@@ -16,7 +16,7 @@ import java.util.EnumSet
 /**
  * This parser is just for parser development, it should not be used in releases
  */
-class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaParserSource.DUMMY) {
+class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
 		get() = ConfigKey.Domain("localhost")

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

@@ -1,52 +1,38 @@
 package org.koitharu.kotatsu.core.parser
 
 import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
-import org.koitharu.kotatsu.parsers.model.ContentRating
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+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.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.EnumSet
-import java.util.Locale
 
 /**
  * This parser is just for parser development, it should not be used in releases
  */
-class EmptyMangaRepository(override val source: MangaSource) : MangaRepository {
+class EmptyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
-	override val sortOrders: Set<SortOrder>
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("localhost")
+
+	override val availableSortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)
-	override val states: Set<MangaState>
-		get() = emptySet()
-	override val contentRatings: Set<ContentRating>
-		get() = emptySet()
-	override var defaultSortOrder: SortOrder
-		get() = SortOrder.NEWEST
-		set(value) = Unit
-	override val isMultipleTagsSupported: Boolean
-		get() = false
-	override val isTagsExclusionSupported: Boolean
-		get() = false
-	override val isSearchSupported: Boolean
-		get() = false
-
-	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = stub(null)
 
 	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
 
+	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = stub(null)
+
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = stub(null)
 
-	override suspend fun getPageUrl(page: MangaPage): String = stub(null)
+	override suspend fun getAvailableTags(): Set<MangaTag> = stub(null)
 
-	override suspend fun getTags(): Set<MangaTag> = stub(null)
-
-	override suspend fun getLocales(): Set<Locale> = stub(null)
-
-	override suspend fun getRelated(seed: Manga): List<Manga> = stub(seed)
+	override suspend fun getRelatedManga(seed: Manga): List<Manga> = stub(seed)
 
 	private fun stub(manga: Manga?): Nothing {
 		throw UnsupportedSourceException("This manga source is not supported", manga)

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

@@ -12,7 +12,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.LocalMangaSource
 import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.ext.toFileOrNull
@@ -102,7 +101,7 @@ class MangaDataRepository @Inject constructor(
 
 	suspend fun cleanupLocalManga() {
 		val dao = db.getMangaDao()
-		val broken = dao.findAllBySource(LocalMangaSource.name)
+		val broken = dao.findAllBySource(MangaSource.LOCAL.name)
 			.filter { x -> x.manga.url.toUri().toFileOrNull()?.exists() == false }
 		if (broken.isNotEmpty()) {
 			dao.delete(broken.map { it.manga })

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

@@ -4,11 +4,10 @@ import android.net.Uri
 import coil.request.CachePolicy
 import dagger.Reusable
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.UnknownMangaSource
-import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -37,7 +36,7 @@ class MangaLinkResolver @Inject constructor(
 		require(uri.pathSegments.singleOrNull() == "manga") { "Invalid url" }
 		val sourceName = requireNotNull(uri.getQueryParameter("source")) { "Source is not specified" }
 		val source = MangaSource(sourceName)
-		require(source != UnknownMangaSource) { "Manga source $sourceName is not supported" }
+		require(source != MangaSource.UNKNOWN) { "Manga source $sourceName is not supported" }
 		val repo = repositoryFactory.create(source)
 		return repo.findExact(
 			url = uri.getQueryParameter("url"),
@@ -109,7 +108,7 @@ class MangaLinkResolver @Inject constructor(
 		url = url,
 		publicUrl = "",
 		rating = 0.0f,
-		isNsfw = source.isNsfw(),
+		isNsfw = source.contentType == ContentType.HENTAI,
 		coverUrl = "",
 		tags = emptySet(),
 		state = null,

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

@@ -2,11 +2,12 @@ package org.koitharu.kotatsu.core.parser
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
-fun MangaParser(source: MangaParserSource, loaderContext: MangaLoaderContext): MangaParser {
+fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
 	return when (source) {
-		MangaParserSource.DUMMY -> DummyParser(loaderContext)
+		MangaSource.UNKNOWN -> EmptyParser(loaderContext)
+		MangaSource.DUMMY -> DummyParser(loaderContext)
 		else -> loaderContext.newParserInstance(source)
 	}
 }

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

@@ -1,10 +1,7 @@
 package org.koitharu.kotatsu.core.parser
 
 import androidx.annotation.AnyThread
-import androidx.collection.ArrayMap
 import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.model.LocalMangaSource
-import org.koitharu.kotatsu.core.model.UnknownMangaSource
 import org.koitharu.kotatsu.core.network.MirrorSwitchInterceptor
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
@@ -13,12 +10,12 @@ 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.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.lang.ref.WeakReference
+import java.util.EnumMap
 import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -64,35 +61,24 @@ interface MangaRepository {
 		private val mirrorSwitchInterceptor: MirrorSwitchInterceptor,
 	) {
 
-		private val cache = ArrayMap<MangaSource, WeakReference<MangaRepository>>()
+		private val cache = EnumMap<MangaSource, WeakReference<RemoteMangaRepository>>(MangaSource::class.java)
 
 		@AnyThread
 		fun create(source: MangaSource): MangaRepository {
-			when (source) {
-				LocalMangaSource -> return localMangaRepository
-				UnknownMangaSource -> return EmptyMangaRepository(source)
+			if (source == MangaSource.LOCAL) {
+				return localMangaRepository
 			}
 			cache[source]?.get()?.let { return it }
 			return synchronized(cache) {
 				cache[source]?.get()?.let { return it }
-				val repository = createRepository(source)
-				if (repository != null) {
-					cache[source] = WeakReference(repository)
-					repository
-				} else {
-					EmptyMangaRepository(source)
-				}
+				val repository = RemoteMangaRepository(
+					parser = MangaParser(source, loaderContext),
+					cache = contentCache,
+					mirrorSwitchInterceptor = mirrorSwitchInterceptor,
+				)
+				cache[source] = WeakReference(repository)
+				repository
 			}
 		}
-
-		private fun createRepository(source: MangaSource): MangaRepository? = when (source) {
-			is MangaParserSource -> RemoteMangaRepository(
-				parser = MangaParser(source, loaderContext),
-				cache = contentCache,
-				mirrorSwitchInterceptor = mirrorSwitchInterceptor,
-			)
-
-			else -> null
-		}
 	}
 }

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

@@ -28,7 +28,7 @@ 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.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
@@ -46,7 +46,7 @@ class RemoteMangaRepository(
 	private val relatedMangaMutex = MultiMutex<Long>()
 	private val pagesMutex = MultiMutex<Long>()
 
-	override val source: MangaParserSource
+	override val source: MangaSource
 		get() = parser.source
 
 	override val sortOrders: Set<SortOrder>

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

@@ -46,7 +46,7 @@ class FaviconFetcher(
 ) : Fetcher {
 
 	private val diskCacheKey
-		get() = options.diskCacheKey ?: "${mangaSource.name}x${options.size.toCacheKey()}"
+		get() = options.diskCacheKey ?: "${mangaSource.name}[${mangaSource.ordinal}]x${options.size.toCacheKey()}"
 
 	private val fileSystem
 		get() = checkNotNull(diskCache.value).fileSystem

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

@@ -33,7 +33,6 @@ import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 import java.io.File
 import java.net.Proxy
 import java.util.EnumSet
-import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -485,6 +484,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isAutoLocalChaptersCleanupEnabled: Boolean
 		get() = prefs.getBoolean(KEY_CHAPTERS_CLEAR_AUTO, false)
 
+	fun isPagesCropEnabled(mode: ReaderMode): Boolean {
+		val rawValue = prefs.getStringSet(KEY_READER_CROP, emptySet())
+		if (rawValue.isNullOrEmpty()) {
+			return false
+		}
+		val needle = if (mode == ReaderMode.WEBTOON) READER_CROP_WEBTOON else READER_CROP_PAGED
+		return needle.toString() in rawValue
+	}
+
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -597,6 +605,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_ANIMATION = "reader_animation2"
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
+		const val KEY_READER_CROP = "reader_crop"
 		const val KEY_APP_PASSWORD = "app_password"
 		const val KEY_APP_PASSWORD_NUMERIC = "app_password_num"
 		const val KEY_PROTECT_APP = "protect_app"
@@ -698,5 +707,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 
 		// old keys are for migration only
 		private const val KEY_IMAGES_PROXY_OLD = "images_proxy"
+
+		// values
+		private const val READER_CROP_PAGED = 1
+		private const val READER_CROP_WEBTOON = 2
 	}
 }

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

@@ -12,5 +12,6 @@ enum class SearchSuggestionType(
 	QUERIES_SUGGEST(R.string.suggested_queries),
 	MANGA(R.string.content_type_manga),
 	SOURCES(R.string.remote_sources),
+	RECENT_SOURCES(R.string.recent_sources),
 	AUTHORS(R.string.authors),
 }

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

@@ -38,6 +38,7 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 
 			is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue)
 			is ConfigKey.SplitByTranslations -> prefs.getBoolean(key.key, key.defaultValue)
+			is ConfigKey.PreferredImageServer -> prefs.getString(key.key, key.defaultValue)?.takeUnless(String::isEmpty)
 		} as T
 	}
 
@@ -47,6 +48,7 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 			is ConfigKey.ShowSuspiciousContent -> putBoolean(key.key, value as Boolean)
 			is ConfigKey.UserAgent -> putString(key.key, (value as String?)?.sanitizeHeaderValue())
 			is ConfigKey.SplitByTranslations -> putBoolean(key.key, value as Boolean)
+			is ConfigKey.PreferredImageServer -> putString(key.key, value as String? ?: "")
 		}
 	}
 

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

@@ -1,15 +1,10 @@
 package org.koitharu.kotatsu.core.ui.image
 
 import android.graphics.Bitmap
-import androidx.annotation.ColorInt
-import androidx.core.graphics.alpha
-import androidx.core.graphics.blue
 import androidx.core.graphics.get
-import androidx.core.graphics.green
-import androidx.core.graphics.red
 import coil.size.Size
 import coil.transform.Transformation
-import kotlin.math.abs
+import org.koitharu.kotatsu.reader.domain.EdgeDetector.Companion.isColorTheSame
 
 class TrimTransformation(
 	private val tolerance: Int = 20,
@@ -28,7 +23,7 @@ class TrimTransformation(
 			var isColBlank = true
 			val prevColor = input[x, 0]
 			for (y in 1 until input.height) {
-				if (!isColorTheSame(input[x, y], prevColor)) {
+				if (!isColorTheSame(input[x, y], prevColor, tolerance)) {
 					isColBlank = false
 					break
 				}
@@ -47,7 +42,7 @@ class TrimTransformation(
 			var isColBlank = true
 			val prevColor = input[x, 0]
 			for (y in 1 until input.height) {
-				if (!isColorTheSame(input[x, y], prevColor)) {
+				if (!isColorTheSame(input[x, y], prevColor, tolerance)) {
 					isColBlank = false
 					break
 				}
@@ -63,7 +58,7 @@ class TrimTransformation(
 			var isRowBlank = true
 			val prevColor = input[0, y]
 			for (x in 1 until input.width) {
-				if (!isColorTheSame(input[x, y], prevColor)) {
+				if (!isColorTheSame(input[x, y], prevColor, tolerance)) {
 					isRowBlank = false
 					break
 				}
@@ -79,7 +74,7 @@ class TrimTransformation(
 			var isRowBlank = true
 			val prevColor = input[0, y]
 			for (x in 1 until input.width) {
-				if (!isColorTheSame(input[x, y], prevColor)) {
+				if (!isColorTheSame(input[x, y], prevColor, tolerance)) {
 					isRowBlank = false
 					break
 				}
@@ -98,13 +93,6 @@ class TrimTransformation(
 		}
 	}
 
-	private fun isColorTheSame(@ColorInt a: Int, @ColorInt b: Int): Boolean {
-		return abs(a.red - b.red) <= tolerance &&
-			abs(a.green - b.green) <= tolerance &&
-			abs(a.blue - b.blue) <= tolerance &&
-			abs(a.alpha - b.alpha) <= tolerance
-	}
-
 	override fun equals(other: Any?): Boolean {
 		return this === other || (other is TrimTransformation && other.tolerance == tolerance)
 	}

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

@@ -23,11 +23,16 @@ class SelectableTextView @JvmOverloads constructor(
 	private fun fixSelectionRange() {
 		if (selectionStart < 0 || selectionEnd < 0) {
 			val spannableText = text as? Spannable ?: return
-			Selection.setSelection(spannableText, text.length)
+			Selection.setSelection(spannableText, spannableText.length)
 		}
 	}
 
 	override fun scrollTo(x: Int, y: Int) {
 		super.scrollTo(0, 0)
 	}
+
+	fun selectAll() {
+		val spannableText = text as? Spannable ?: return
+		Selection.selectAll(spannableText)
+	}
 }

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

@@ -69,4 +69,11 @@ fun <T> Iterable<T>.sortedWithSafe(comparator: Comparator<in T>): List<T> = try
 	}
 }
 
-fun Collection<*>?.sizeOrZero() = if (this == null) 0 else size
+fun Collection<*>?.sizeOrZero() = this?.size ?: 0
+
+@Suppress("UNCHECKED_CAST")
+inline fun <T, reified R> Collection<T>.mapToArray(transform: (T) -> R): Array<R> {
+	val result = arrayOfNulls<R>(size)
+	forEachIndexed { index, t -> result[index] = transform(t) }
+	return result as Array<R>
+}

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

@@ -12,12 +12,16 @@ import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.plus
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.koitharu.kotatsu.core.util.AcraCoroutineErrorHandler
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
+import org.koitharu.kotatsu.parsers.util.cancelAll
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import kotlin.coroutines.EmptyCoroutineContext
+import kotlin.coroutines.cancellation.CancellationException
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
@@ -90,3 +94,10 @@ fun <T> Deferred<T>.peek(): T? = if (isCompleted) {
 } else {
 	null
 }
+
+@Suppress("SuspendFunctionOnCoroutineScope")
+suspend fun CoroutineScope.cancelChildrenAndJoin(cause: CancellationException? = null) {
+	val jobs = coroutineContext[Job]?.children?.toList() ?: return
+	jobs.cancelAll(cause)
+	jobs.joinAll()
+}

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.util.ext
 
+import android.graphics.Bitmap
 import android.graphics.Rect
 import kotlin.math.roundToInt
 
@@ -11,3 +12,9 @@ fun Rect.scale(factor: Double) {
 		(height() - newHeight) / 2,
 	)
 }
+
+inline fun <R> Bitmap.use(block: (Bitmap) -> R) = try {
+	block(this)
+} finally {
+	recycle()
+}

app/src/main/kotlin/org/koitharu/kotatsu/details/service/MangaPrefetchService.kt

@@ -5,9 +5,7 @@ import android.content.Intent
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.EntryPointAccessors
 import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.model.findById
-import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableChapter
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.parser.MangaRepository
@@ -64,7 +62,7 @@ class MangaPrefetchService : CoroutineIntentService() {
 
 	private suspend fun prefetchLast() {
 		val last = historyRepository.getLastOrNull() ?: return
-		if (last.isLocal) return
+		if (last.source == MangaSource.LOCAL) return
 		val repo = mangaRepositoryFactory.create(last.source)
 		val details = runCatchingCancellable { repo.getDetails(last) }.getOrNull() ?: return
 		val chapters = details.chapters
@@ -112,7 +110,7 @@ class MangaPrefetchService : CoroutineIntentService() {
 		}
 
 		private fun isPrefetchAvailable(context: Context, source: MangaSource?): Boolean {
-			if (source == LocalMangaSource || context.isPowerSaveMode()) {
+			if (source == MangaSource.LOCAL || context.isPowerSaveMode()) {
 				return false
 			}
 			val entryPoint = EntryPointAccessors.fromApplication(

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

@@ -43,9 +43,6 @@ import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.LocalMangaSource
-import org.koitharu.kotatsu.core.model.UnknownMangaSource
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.model.iconResId
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.model.titleResId
@@ -97,6 +94,7 @@ import org.koitharu.kotatsu.list.ui.model.MangaItemModel
 import org.koitharu.kotatsu.list.ui.size.StaticItemSizeResolver
 import org.koitharu.kotatsu.local.ui.info.LocalInfoDialog
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.util.ellipsize
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
@@ -125,7 +123,6 @@ class DetailsActivity :
 	lateinit var tagHighlighter: ListExtraProvider
 
 	private val viewModel: DetailsViewModel by viewModels()
-
 	private lateinit var menuProvider: DetailsMenuProvider
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -159,6 +156,7 @@ class DetailsActivity :
 		viewBinding.containerBottomSheet?.let { sheet ->
 			onBackPressedDispatcher.addCallback(BottomSheetCollapseCallback(sheet))
 		}
+		TitleExpandListener(viewBinding.textViewTitle).attach()
 
 		viewModel.details.filterNotNull().observe(this, ::onMangaUpdated)
 		viewModel.onMangaRemoved.observeEvent(this, ::onMangaRemoved)
@@ -465,10 +463,10 @@ class DetailsActivity :
 				imageViewState.isVisible = false
 			}
 
-			if (manga.source == LocalMangaSource || manga.source == UnknownMangaSource) {
+			if (manga.source == MangaSource.LOCAL || manga.source == MangaSource.UNKNOWN) {
 				infoLayout.chipSource.isVisible = false
 			} else {
-				infoLayout.chipSource.text = manga.source.getTitle(this@DetailsActivity)
+				infoLayout.chipSource.text = manga.source.title
 				infoLayout.chipSource.isVisible = true
 			}
 

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

@@ -16,12 +16,11 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
 import org.koitharu.kotatsu.browser.BrowserActivity
-import org.koitharu.kotatsu.core.model.LocalMangaSource
-import org.koitharu.kotatsu.core.model.isLocal
 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.parsers.model.MangaSource
 import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
 import org.koitharu.kotatsu.stats.ui.sheet.MangaStatsSheet
@@ -39,10 +38,10 @@ class DetailsMenuProvider(
 
 	override fun onPrepareMenu(menu: Menu) {
 		val manga = viewModel.manga.value
-		menu.findItem(R.id.action_save).isVisible = manga?.source != null && manga.source != LocalMangaSource
-		menu.findItem(R.id.action_delete).isVisible = manga?.source == LocalMangaSource
-		menu.findItem(R.id.action_browser).isVisible = manga?.source != LocalMangaSource
-		menu.findItem(R.id.action_alternatives).isVisible = manga?.source != LocalMangaSource
+		menu.findItem(R.id.action_save).isVisible = manga?.source != null && manga.source != MangaSource.LOCAL
+		menu.findItem(R.id.action_delete).isVisible = manga?.source == MangaSource.LOCAL
+		menu.findItem(R.id.action_browser).isVisible = manga?.source != MangaSource.LOCAL
+		menu.findItem(R.id.action_alternatives).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
@@ -54,7 +53,7 @@ class DetailsMenuProvider(
 			R.id.action_share -> {
 				viewModel.manga.value?.let {
 					val shareHelper = ShareHelper(activity)
-					if (it.isLocal) {
+					if (it.source == MangaSource.LOCAL) {
 						shareHelper.shareCbz(listOf(it.url.toUri().toFile()))
 					} else {
 						shareHelper.shareMangaLink(it)

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

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.details.ui
+
+import android.annotation.SuppressLint
+import android.transition.TransitionManager
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.View
+import android.view.View.OnTouchListener
+import android.view.ViewGroup
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.widgets.SelectableTextView
+import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
+
+@SuppressLint("ClickableViewAccessibility")
+class TitleExpandListener(
+	private val textView: SelectableTextView,
+) : GestureDetector.SimpleOnGestureListener(), OnTouchListener {
+
+	private val gestureDetector = GestureDetector(textView.context, this)
+	private val linesExpanded = textView.resources.getInteger(R.integer.details_description_lines)
+	private val linesCollapsed = textView.resources.getInteger(R.integer.details_title_lines)
+
+	override fun onTouch(v: View?, event: MotionEvent) = gestureDetector.onTouchEvent(event)
+
+	override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+		if (textView.context.isAnimationsEnabled) {
+			TransitionManager.beginDelayedTransition(textView.parent as ViewGroup)
+		}
+		if (textView.maxLines in 1 until Integer.MAX_VALUE) {
+			textView.maxLines = Integer.MAX_VALUE
+		} else {
+			textView.maxLines = linesCollapsed
+		}
+		return true
+	}
+
+	override fun onLongPress(e: MotionEvent) {
+		textView.maxLines = Integer.MAX_VALUE
+		textView.selectAll()
+	}
+
+	fun attach() {
+		textView.setOnTouchListener(this)
+	}
+}

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

@@ -31,7 +31,11 @@ fun HistoryInfo(
 	history: MangaHistory?,
 	isIncognitoMode: Boolean
 ): HistoryInfo {
-	val chapters = manga?.chapters?.get(branch)
+	val chapters = if (manga?.chapters?.isEmpty() == true) {
+		emptyList()
+	} else {
+		manga?.chapters?.get(branch)
+	}
 	val currentChapter = if (history != null && !chapters.isNullOrEmpty()) {
 		chapters.indexOfFirst { it.id == history.chapterId }
 	} else {

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

@@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
@@ -41,6 +40,7 @@ import org.koitharu.kotatsu.details.ui.withVolumeHeaders
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
 import org.koitharu.kotatsu.reader.ui.ReaderNavigationCallback
 import org.koitharu.kotatsu.reader.ui.ReaderState
@@ -218,7 +218,7 @@ class ChaptersFragment :
 		var canSave = true
 		var canDelete = true
 		items.forEach { (_, x) ->
-			val isLocal = x.isDownloaded || x.chapter.source == LocalMangaSource
+			val isLocal = x.isDownloaded || x.chapter.source == MangaSource.LOCAL
 			if (isLocal) canSave = false else canDelete = false
 		}
 		menu.findItem(R.id.action_save).isVisible = canSave

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

@@ -92,7 +92,7 @@ class MangaPageFetcher(
 			}
 
 			else -> {
-				val request = PageLoader.createPageRequest(page, pageUrl)
+				val request = PageLoader.createPageRequest(pageUrl, page.source)
 				imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use { response ->
 					if (!response.isSuccessful) {
 						throw HttpException(response)

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

@@ -21,13 +21,13 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.util.ext.getDrawableOrThrow
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.download.ui.list.DownloadsActivity
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.search.ui.MangaListActivity
@@ -231,7 +231,7 @@ class DownloadNotificationFactory @AssistedInject constructor(
 		if (manga != null) {
 			DetailsActivity.newIntent(context, manga)
 		} else {
-			MangaListActivity.newIntent(context, LocalMangaSource)
+			MangaListActivity.newIntent(context, MangaSource.LOCAL)
 		},
 		PendingIntent.FLAG_CANCEL_CURRENT,
 		false,

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

@@ -35,17 +35,16 @@ import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import okhttp3.internal.closeQuietly
 import okio.IOException
 import okio.buffer
 import okio.sink
+import okio.use
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
 import org.koitharu.kotatsu.core.model.ids
-import org.koitharu.kotatsu.core.model.isLocal
-import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.MangaHttpClient
+import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -56,6 +55,7 @@ import org.koitharu.kotatsu.core.util.ext.awaitWorkInfosByTag
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
 import org.koitharu.kotatsu.core.util.ext.deleteWork
 import org.koitharu.kotatsu.core.util.ext.deleteWorks
+import org.koitharu.kotatsu.core.util.ext.ensureSuccess
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.getWorkInputData
 import org.koitharu.kotatsu.core.util.ext.getWorkSpec
@@ -74,9 +74,9 @@ import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.reader.domain.PageLoader
 import java.io.File
 import java.util.UUID
 import java.util.concurrent.TimeUnit
@@ -94,6 +94,7 @@ class DownloadWorker @AssistedInject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val settings: AppSettings,
 	@LocalStorageChanges private val localStorageChanges: MutableSharedFlow<LocalManga?>,
+	private val imageProxyInterceptor: ImageProxyInterceptor,
 	notificationFactoryFactory: DownloadNotificationFactory.Factory,
 ) : CoroutineWorker(appContext, params) {
 
@@ -178,7 +179,7 @@ class DownloadWorker @AssistedInject constructor(
 			checkNotNull(destination) { applicationContext.getString(R.string.cannot_find_available_storage) }
 			var output: LocalMangaOutput? = null
 			try {
-				if (manga.isLocal) {
+				if (manga.source == MangaSource.LOCAL) {
 					manga = localMangaRepository.getRemoteManga(manga)
 						?: error("Cannot obtain remote manga instance")
 				}
@@ -328,28 +329,24 @@ class DownloadWorker @AssistedInject constructor(
 		destination: File,
 		source: MangaSource,
 	): File {
-		val request = Request.Builder()
-			.url(url)
-			.tag(MangaSource::class.java, source)
-			.header(CommonHeaders.ACCEPT, "image/webp,image/png;q=0.9,image/jpeg,*/*;q=0.8")
-			.cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE)
-			.get()
-			.build()
+		val request = PageLoader.createPageRequest(url, source)
 		slowdownDispatcher.delay(source)
-		val call = okHttp.newCall(request)
-		val file = File(destination, UUID.randomUUID().toString() + ".tmp")
-		try {
-			val response = call.clone().await()
-			checkNotNull(response.body).use { body ->
-				file.sink(append = false).buffer().use {
-					it.writeAllCancellable(body.source())
+		return imageProxyInterceptor.interceptPageRequest(request, okHttp)
+			.ensureSuccess()
+			.use { response ->
+				val file = File(destination, UUID.randomUUID().toString() + ".tmp")
+				try {
+					checkNotNull(response.body).use { body ->
+						file.sink(append = false).buffer().use {
+							it.writeAllCancellable(body.source())
+						}
+					}
+				} catch (e: CancellationException) {
+					file.delete()
+					throw e
 				}
+				file
 			}
-		} catch (e: CancellationException) {
-			file.delete()
-			throw e
-		}
-		return file
 	}
 
 	private suspend fun publishState(state: DownloadState) {

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

@@ -17,7 +17,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.Collections
@@ -35,13 +34,15 @@ class MangaSourcesRepository @Inject constructor(
 	private val dao: MangaSourcesDao
 		get() = db.getSourcesDao()
 
-	private val remoteSources = EnumSet.allOf(MangaParserSource::class.java).apply {
+	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
+		remove(MangaSource.LOCAL)
+		remove(MangaSource.UNKNOWN)
 		if (!BuildConfig.DEBUG) {
-			remove(MangaParserSource.DUMMY)
+			remove(MangaSource.DUMMY)
 		}
 	}
 
-	val allMangaSources: Set<MangaParserSource>
+	val allMangaSources: Set<MangaSource>
 		get() = Collections.unmodifiableSet(remoteSources)
 
 	suspend fun getEnabledSources(): List<MangaSource> {
@@ -50,6 +51,19 @@ class MangaSourcesRepository @Inject constructor(
 		return dao.findAllEnabled(order).toSources(settings.isNsfwContentDisabled, order)
 	}
 
+	suspend fun getPinnedSources(): Set<MangaSource> {
+		assimilateNewSources()
+		val skipNsfw = settings.isNsfwContentDisabled
+		return dao.findAllPinned().mapNotNullTo(EnumSet.noneOf(MangaSource::class.java)) {
+			it.source.toMangaSourceOrNull()?.takeUnless { x -> skipNsfw && x.isNsfw() }
+		}
+	}
+
+	suspend fun getTopSources(limit: Int): List<MangaSource> {
+		assimilateNewSources()
+		return dao.findLastUsed(limit).toSources(settings.isNsfwContentDisabled, null)
+	}
+
 	suspend fun getDisabledSources(): Set<MangaSource> {
 		assimilateNewSources()
 		val result = EnumSet.copyOf(remoteSources)
@@ -69,7 +83,7 @@ class MangaSourcesRepository @Inject constructor(
 		query: String?,
 		locale: String?,
 		sortOrder: SourcesSortOrder?,
-	): List<MangaParserSource> {
+	): List<MangaSource> {
 		assimilateNewSources()
 		val entities = dao.findAll().toMutableList()
 		if (isDisabledOnly) {
@@ -213,6 +227,8 @@ class MangaSourcesRepository @Inject constructor(
 				isEnabled = false,
 				sortKey = ++maxSortKey,
 				addedIn = BuildConfig.VERSION_CODE,
+				lastUsedAt = 0,
+				isPinned = false,
 			)
 		}
 		dao.insertIfAbsent(entities)
@@ -223,6 +239,19 @@ class MangaSourcesRepository @Inject constructor(
 		return settings.sourcesVersion == 0 && dao.findAllEnabledNames().isEmpty()
 	}
 
+	suspend fun setIsPinned(sources: Collection<MangaSource>, isPinned: Boolean): ReversibleHandle {
+		setSourcesPinnedImpl(sources, isPinned)
+		return ReversibleHandle {
+			setSourcesEnabledImpl(sources, !isPinned)
+		}
+	}
+
+	suspend fun trackUsage(source: MangaSource) {
+		if (!settings.isIncognitoModeEnabled && !(settings.isHistoryExcludeNsfw && source.isNsfw())) {
+			dao.setLastUsed(source.name, System.currentTimeMillis())
+		}
+	}
+
 	private suspend fun setSourcesEnabledImpl(sources: Collection<MangaSource>, isEnabled: Boolean) {
 		if (sources.size == 1) { // fast path
 			dao.setEnabled(sources.first().name, isEnabled)
@@ -235,7 +264,19 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	private suspend fun getNewSources(): MutableSet<out MangaSource> {
+	private suspend fun setSourcesPinnedImpl(sources: Collection<MangaSource>, isPinned: Boolean) {
+		if (sources.size == 1) { // fast path
+			dao.setPinned(sources.first().name, isPinned)
+			return
+		}
+		db.withTransaction {
+			for (source in sources) {
+				dao.setPinned(source.name, isPinned)
+			}
+		}
+	}
+
+	private suspend fun getNewSources(): MutableSet<MangaSource> {
 		val entities = dao.findAll()
 		val result = EnumSet.copyOf(remoteSources)
 		for (e in entities) {
@@ -247,8 +288,9 @@ class MangaSourcesRepository @Inject constructor(
 	private fun List<MangaSourceEntity>.toSources(
 		skipNsfwSources: Boolean,
 		sortOrder: SourcesSortOrder?,
-	): MutableList<MangaParserSource> {
-		val result = ArrayList<MangaParserSource>(size)
+	): MutableList<MangaSource> {
+		val result = ArrayList<MangaSource>(size)
+		val pinned = EnumSet.noneOf(MangaSource::class.java)
 		for (entity in this) {
 			val source = entity.source.toMangaSourceOrNull() ?: continue
 			if (skipNsfwSources && source.isNsfw()) {
@@ -256,10 +298,13 @@ class MangaSourcesRepository @Inject constructor(
 			}
 			if (source in remoteSources) {
 				result.add(source)
+				if (entity.isPinned) {
+					pinned.add(source)
+				}
 			}
 		}
 		if (sortOrder == SourcesSortOrder.ALPHABETIC) {
-			result.sortBy { it.title }
+			result.sortWith(compareBy<MangaSource> { it in pinned }.thenBy { it.title })
 		}
 		return result
 	}
@@ -272,5 +317,5 @@ class MangaSourcesRepository @Inject constructor(
 		sourcesSortOrder
 	}
 
-	private fun String.toMangaSourceOrNull(): MangaParserSource? = MangaParserSource.entries.find { it.name == this }
+	private fun String.toMangaSourceOrNull(): MangaSource? = MangaSource.entries.find { it.name == this }
 }

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

@@ -9,4 +9,5 @@ enum class SourcesSortOrder(
 	ALPHABETIC(R.string.by_name),
 	POPULARITY(R.string.popular),
 	MANUAL(R.string.manual),
+	LAST_USED(R.string.last_used),
 }

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.explore.domain
 
-import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.almostEquals
@@ -8,6 +7,7 @@ import org.koitharu.kotatsu.core.util.ext.asArrayList
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -45,7 +45,7 @@ class ExploreRepository @Inject constructor(
 
 	suspend fun findRandomManga(source: MangaSource, tagsLimit: Int): Manga {
 		val tagsBlacklist = TagsBlacklist(settings.suggestionsTagsBlacklist, 0.4f)
-		val skipNsfw = settings.isSuggestionsExcludeNsfw && !source.isNsfw()
+		val skipNsfw = settings.isSuggestionsExcludeNsfw && source.contentType != ContentType.HENTAI
 		val tags = historyRepository.getPopularTags(tagsLimit).mapNotNull {
 			if (it in tagsBlacklist) null else it.title
 		}

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

@@ -20,7 +20,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.ui.AllBookmarksActivity
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.dialog.TwoButtonsAlertDialog
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
@@ -41,7 +40,7 @@ import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
@@ -124,7 +123,7 @@ class ExploreFragment :
 
 	override fun onClick(v: View) {
 		val intent = when (v.id) {
-			R.id.button_local -> MangaListActivity.newIntent(v.context, LocalMangaSource)
+			R.id.button_local -> MangaListActivity.newIntent(v.context, MangaSource.LOCAL)
 			R.id.button_bookmarks -> AllBookmarksActivity.newIntent(v.context)
 			R.id.button_more -> SuggestionsActivity.newIntent(v.context)
 			R.id.button_downloads -> DownloadsActivity.newIntent(v.context)
@@ -174,7 +173,7 @@ class ExploreFragment :
 
 	override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
 		val selectedSources = controller.peekCheckedIds().mapNotNullToSet { id ->
-			MangaParserSource.entries.getOrNull(id.toInt()) // TODO
+			MangaSource.entries.getOrNull(id.toInt())
 		}
 		if (selectedSources.isEmpty()) {
 			return false
@@ -197,6 +196,16 @@ class ExploreFragment :
 				mode.finish()
 			}
 
+			R.id.action_pin -> {
+				viewModel.setSourcesPinned(selectedSources, isPinned = true)
+				mode.finish()
+			}
+
+			R.id.action_unpin -> {
+				viewModel.setSourcesPinned(selectedSources, isPinned = false)
+				mode.finish()
+			}
+
 			else -> return false
 		}
 		return true

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

@@ -108,6 +108,18 @@ class ExploreViewModel @Inject constructor(
 		}
 	}
 
+	fun setSourcesPinned(sources: Set<MangaSource>, isPinned: Boolean) {
+		launchJob(Dispatchers.Default) {
+			sourcesRepository.setIsPinned(sources, isPinned)
+			val message = if (sources.size == 1) {
+				if (isPinned) R.string.source_pinned else R.string.source_unpinned
+			} else {
+				if (isPinned) R.string.sources_pinned else R.string.sources_unpinned
+			}
+			onActionDone.call(ReversibleAction(message, null))
+		}
+	}
+
 	fun respondSuggestionTip(isAccepted: Boolean) {
 		settings.isSuggestionsEnabled = isAccepted
 		settings.closeTip(TIP_SUGGESTIONS)

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.explore.ui.model
 
-import org.koitharu.kotatsu.core.util.ext.longHashCode
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
@@ -9,7 +8,8 @@ data class MangaSourceItem(
 	val isGrid: Boolean,
 ) : ListModel {
 
-	val id: Long = source.name.longHashCode()
+	val id: Long
+		get() = source.ordinal.toLong()
 
 	override fun areItemsTheSame(other: ListModel): Boolean {
 		return other is MangaSourceItem && other.source == source

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

@@ -1,10 +1,12 @@
 package org.koitharu.kotatsu.favourites.domain.model
 
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.find
 
 data class Cover(
 	val url: String,
 	val source: String,
 ) {
-	val mangaSource by lazy { MangaSource(source) }
+	val mangaSource: MangaSource?
+		get() = if (source.isEmpty()) null else MangaSource.entries.find(source)
 }

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

@@ -10,13 +10,13 @@ import androidx.fragment.app.viewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.util.ext.sortedByOrdinal
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.list.ui.MangaListFragment
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 @AndroidEntryPoint
 class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickListener {
@@ -57,7 +57,9 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 	}
 
 	override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none { it.isLocal }
+		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none {
+			it.source == MangaSource.LOCAL
+		}
 		return super.onPrepareActionMode(controller, mode, menu)
 	}
 

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

@@ -43,7 +43,6 @@ import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorFooter
 import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
@@ -452,7 +451,7 @@ class FilterCoordinator @Inject constructor(
 	}
 
 	private fun mergeTags(primary: Set<MangaTag>, secondary: Set<MangaTag>): Set<MangaTag> {
-		val result = TreeSet(TagTitleComparator((repository.source as? MangaParserSource)?.locale))
+		val result = TreeSet(TagTitleComparator(repository.source.locale))
 		result.addAll(secondary)
 		result.addAll(primary)
 		return result

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

@@ -8,7 +8,6 @@ import androidx.fragment.app.viewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.os.NetworkManageIntent
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.RecyclerScrollKeeper
@@ -18,6 +17,7 @@ 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
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 @AndroidEntryPoint
 class HistoryListFragment : MangaListFragment() {
@@ -44,7 +44,9 @@ class HistoryListFragment : MangaListFragment() {
 	}
 
 	override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none { it.isLocal }
+		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none {
+			it.source == MangaSource.LOCAL
+		}
 		return super.onPrepareActionMode(controller, mode, menu)
 	}
 

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

@@ -25,13 +25,13 @@ import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.util.PopupMenuMediator
 import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.getDisplayIcon
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
@@ -120,7 +120,7 @@ class ImageActivity : BaseActivity<ActivityImageBinding>(), ImageRequest.Listene
 			.memoryCachePolicy(CachePolicy.DISABLED)
 			.lifecycle(this)
 			.listener(this)
-			.source(MangaSource(intent.getStringExtra(EXTRA_SOURCE)))
+			.source(intent.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE))
 			.target(SsivTarget(viewBinding.ssiv))
 			.enqueueWith(coil)
 	}
@@ -180,7 +180,7 @@ class ImageActivity : BaseActivity<ActivityImageBinding>(), ImageRequest.Listene
 		fun newIntent(context: Context, url: String, source: MangaSource?): Intent {
 			return Intent(context, ImageActivity::class.java)
 				.setData(Uri.parse(url))
-				.putExtra(EXTRA_SOURCE, source?.name)
+				.putExtra(EXTRA_SOURCE, source)
 		}
 	}
 }

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

@@ -11,7 +11,6 @@ import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -30,6 +29,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
@@ -49,7 +49,7 @@ class LocalMangaRepository @Inject constructor(
 	private val settings: AppSettings,
 ) : MangaRepository {
 
-	override val source = LocalMangaSource
+	override val source = MangaSource.LOCAL
 	private val locks = MultiMutex<Long>()
 	private val localMappingCache = LocalMangaMappingCache()
 
@@ -100,7 +100,7 @@ class LocalMangaRepository @Inject constructor(
 	}
 
 	override suspend fun getDetails(manga: Manga): Manga = when {
-		!manga.isLocal -> requireNotNull(findSavedManga(manga)?.manga) {
+		manga.source != MangaSource.LOCAL -> requireNotNull(findSavedManga(manga)?.manga) {
 			"Manga is not local or saved"
 		}
 

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

@@ -4,7 +4,6 @@ import androidx.annotation.WorkerThread
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
@@ -59,7 +58,7 @@ class MangaIndex(source: String?) {
 	}
 
 	fun getMangaInfo(): Manga? = if (json.length() == 0) null else runCatching {
-		val source = MangaSource(json.getString("source"))
+		val source = MangaSource.valueOf(json.getString("source"))
 		Manga(
 			id = json.getLong("id"),
 			title = json.getString("title"),

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

@@ -82,6 +82,13 @@ class PagesCache @Inject constructor(@ApplicationContext context: Context) {
 		}
 	}
 
+	suspend fun clear() {
+		val cache = lruCache.get()
+		runInterruptible(Dispatchers.IO) {
+			cache.clearCache()
+		}
+	}
+
 	private suspend fun getAvailableSize(): Long = runCatchingCancellable {
 		val statFs = StatFs(cacheDir.get().absolutePath)
 		statFs.availableBytes

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

@@ -4,7 +4,6 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.util.AlphanumComparator
 import org.koitharu.kotatsu.core.util.ext.children
 import org.koitharu.kotatsu.core.util.ext.creationTime
@@ -19,6 +18,7 @@ import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.toCamelCase
 import java.io.File
 import java.util.TreeMap
@@ -47,7 +47,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 			index?.getCoverEntry() ?: findFirstImageEntry().orEmpty(),
 		)
 		val manga = info?.copy2(
-			source = LocalMangaSource,
+			source = MangaSource.LOCAL,
 			url = mangaUri,
 			coverUrl = cover,
 			largeCoverUrl = cover,
@@ -59,14 +59,14 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 					// old downloads
 					chapterFiles.values.elementAtOrNull(i)
 				} ?: return@mapIndexedNotNull null
-				c.copy(url = file.toUri().toString(), source = LocalMangaSource)
+				c.copy(url = file.toUri().toString(), source = MangaSource.LOCAL)
 			},
 		) ?: Manga(
 			id = root.absolutePath.longHashCode(),
 			title = root.name.toHumanReadable(),
 			url = mangaUri,
 			publicUrl = mangaUri,
-			source = LocalMangaSource,
+			source = MangaSource.LOCAL,
 			coverUrl = findFirstImageEntry().orEmpty(),
 			chapters = chapterFiles.values.mapIndexed { i, f ->
 				MangaChapter(
@@ -74,7 +74,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 					name = f.nameWithoutExtension.toHumanReadable(),
 					number = 0f,
 					volume = 0,
-					source = LocalMangaSource,
+					source = MangaSource.LOCAL,
 					uploadDate = f.creationTime,
 					url = f.toUri().toString(),
 					scanlator = null,
@@ -106,7 +106,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 				.toListSorted(compareBy(AlphanumComparator()) { x -> x.name })
 				.map {
 					val pageUri = it.toUri().toString()
-					MangaPage(pageUri.longHashCode(), pageUri, null, LocalMangaSource)
+					MangaPage(pageUri.longHashCode(), pageUri, null, MangaSource.LOCAL)
 				}
 		} else {
 			ZipFile(file).use { zip ->
@@ -121,7 +121,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 							id = pageUri.longHashCode(),
 							url = pageUri,
 							preview = null,
-							source = LocalMangaSource,
+							source = MangaSource.LOCAL,
 						)
 					}
 			}

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

@@ -7,7 +7,6 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.util.AlphanumComparator
 import org.koitharu.kotatsu.core.util.ext.longHashCode
 import org.koitharu.kotatsu.core.util.ext.readText
@@ -18,6 +17,7 @@ import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.toCamelCase
 import java.io.File
 import java.util.Enumeration
@@ -47,12 +47,12 @@ class LocalMangaZipInput(root: File) : LocalMangaInput(root) {
 						entryName = index.getCoverEntry() ?: findFirstImageEntry(zip.entries())?.name.orEmpty(),
 					)
 					return@use info.copy2(
-						source = LocalMangaSource,
+						source = MangaSource.LOCAL,
 						url = fileUri,
 						coverUrl = cover,
 						largeCoverUrl = cover,
 						chapters = info.chapters?.map { c ->
-							c.copy(url = fileUri, source = LocalMangaSource)
+							c.copy(url = fileUri, source = MangaSource.LOCAL)
 						},
 					)
 				}
@@ -70,7 +70,7 @@ class LocalMangaZipInput(root: File) : LocalMangaInput(root) {
 					title = title,
 					url = fileUri,
 					publicUrl = fileUri,
-					source = LocalMangaSource,
+					source = MangaSource.LOCAL,
 					coverUrl = zipUri(root, findFirstImageEntry(zip.entries())?.name.orEmpty()),
 					chapters = chapters.sortedWith(AlphanumComparator())
 						.mapIndexed { i, s ->
@@ -79,7 +79,7 @@ class LocalMangaZipInput(root: File) : LocalMangaInput(root) {
 								name = s.ifEmpty { title },
 								number = 0f,
 								volume = 0,
-								source = LocalMangaSource,
+								source = MangaSource.LOCAL,
 								uploadDate = 0L,
 								url = uriBuilder.fragment(s).build().toString(),
 								scanlator = null,
@@ -135,7 +135,7 @@ class LocalMangaZipInput(root: File) : LocalMangaInput(root) {
 						id = entryUri.longHashCode(),
 						url = entryUri,
 						preview = null,
-						source = LocalMangaSource,
+						source = MangaSource.LOCAL,
 					)
 				}
 		}

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

@@ -4,15 +4,17 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class LocalMangaUtil(
 	private val manga: Manga,
 ) {
 
 	init {
-		require(manga.isLocal) { "Expected LOCAL source but ${manga.source} found" }
+		require(manga.source == MangaSource.LOCAL) {
+			"Expected LOCAL source but ${manga.source} found"
+		}
 	}
 
 	suspend fun deleteChapters(ids: Set<Long>) {

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

@@ -14,7 +14,6 @@ import androidx.fragment.app.viewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.core.util.ShareHelper
@@ -27,6 +26,7 @@ import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.filter.ui.MangaFilter
 import org.koitharu.kotatsu.filter.ui.sheet.FilterSheetFragment
 import org.koitharu.kotatsu.list.ui.MangaListFragment
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 import org.koitharu.kotatsu.settings.storage.RequestStorageManagerPermissionContract
 import org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity
@@ -47,9 +47,9 @@ class LocalListFragment : MangaListFragment(), FilterOwner {
 
 	init {
 		withArgs(1) {
-			putString(
+			putSerializable(
 				RemoteListFragment.ARG_SOURCE,
-				LocalMangaSource.name,
+				MangaSource.LOCAL,
 			) // required by FilterCoordinator
 		}
 	}

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

@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.toFileOrNull
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.explore.domain.ExploreRepository
 import org.koitharu.kotatsu.filter.ui.FilterCoordinator
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
@@ -39,6 +40,7 @@ class LocalListViewModel @Inject constructor(
 	exploreRepository: ExploreRepository,
 	@LocalStorageChanges private val localStorageChanges: SharedFlow<LocalManga?>,
 	private val localStorageManager: LocalStorageManager,
+	sourcesRepository: MangaSourcesRepository,
 ) : RemoteListViewModel(
 	savedStateHandle,
 	mangaRepositoryFactory,
@@ -47,6 +49,7 @@ class LocalListViewModel @Inject constructor(
 	listExtraProvider,
 	downloadScheduler,
 	exploreRepository,
+	sourcesRepository,
 ), SharedPreferences.OnSharedPreferenceChangeListener {
 
 	val onMangaRemoved = MutableEventFlow<Unit>()

app/src/main/kotlin/org/koitharu/kotatsu/main/domain/ReadingResumeEnabledUseCase.kt

@@ -4,11 +4,11 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
-import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import javax.inject.Inject
 
 class ReadingResumeEnabledUseCase @Inject constructor(
@@ -24,7 +24,7 @@ class ReadingResumeEnabledUseCase @Inject constructor(
 			flowOf(false)
 		} else {
 			combine(networkState, historyRepository.observeLast()) { isOnline, last ->
-				last != null && (isOnline || last.isLocal)
+				last != null && (isOnline || last.source == MangaSource.LOCAL)
 			}
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/welcome/WelcomeViewModel.kt

@@ -15,7 +15,7 @@ import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.EnumSet
 import java.util.Locale
@@ -103,7 +103,7 @@ class WelcomeViewModel @Inject constructor(
 	private suspend fun commit() {
 		val languages = locales.value.selectedItems.mapToSet { it.language }
 		val types = types.value.selectedItems
-		val enabledSources = allSources.filterTo(EnumSet.noneOf(MangaParserSource::class.java)) { x ->
+		val enabledSources = allSources.filterTo(EnumSet.noneOf(MangaSource::class.java)) { x ->
 			x.contentType in types && x.locale in languages
 		}
 		repository.setSourcesEnabledExclusive(enabledSources)

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.reader.domain
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Size
+import androidx.core.net.toFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okhttp3.OkHttpClient
@@ -14,6 +15,8 @@ import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.local.data.isFileUri
+import org.koitharu.kotatsu.local.data.isZipUri
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -61,19 +64,28 @@ class DetectReaderModeUseCase @Inject constructor(
 		val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
 		val url = repository.getPageUrl(page)
 		val uri = Uri.parse(url)
-		val size = if (uri.scheme == "cbz") {
-			runInterruptible(Dispatchers.IO) {
+
+		val size = when {
+			uri.isZipUri() -> runInterruptible(Dispatchers.IO) {
 				val zip = ZipFile(uri.schemeSpecificPart)
 				val entry = zip.getEntry(uri.fragment)
 				zip.getInputStream(entry).use {
 					getBitmapSize(it)
 				}
 			}
-		} else {
-			val request = PageLoader.createPageRequest(page, url)
-			imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use {
-				runInterruptible(Dispatchers.IO) {
-					getBitmapSize(it.body?.byteStream())
+
+			uri.isFileUri() -> runInterruptible(Dispatchers.IO) {
+				uri.toFile().inputStream().use {
+					getBitmapSize(it)
+				}
+			}
+
+			else -> {
+				val request = PageLoader.createPageRequest(url, page.source)
+				imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use {
+					runInterruptible(Dispatchers.IO) {
+						getBitmapSize(it.body?.byteStream())
+					}
 				}
 			}
 		}

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

@@ -0,0 +1,150 @@
+package org.koitharu.kotatsu.reader.domain
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.graphics.Point
+import android.graphics.Rect
+import androidx.annotation.ColorInt
+import androidx.core.graphics.alpha
+import androidx.core.graphics.blue
+import androidx.core.graphics.get
+import androidx.core.graphics.green
+import androidx.core.graphics.red
+import com.davemorrissey.labs.subscaleview.ImageSource
+import com.davemorrissey.labs.subscaleview.decoder.ImageRegionDecoder
+import com.davemorrissey.labs.subscaleview.decoder.SkiaPooledImageRegionDecoder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.core.util.ext.use
+import kotlin.math.abs
+
+class EdgeDetector(private val context: Context) {
+
+	private val mutex = Mutex()
+
+	suspend fun getBounds(imageSource: ImageSource): Rect? = mutex.withLock {
+		withContext(Dispatchers.IO) {
+			val decoder = SkiaPooledImageRegionDecoder(Bitmap.Config.RGB_565)
+			try {
+				val size = runInterruptible {
+					decoder.init(context, imageSource)
+				}
+				val edges = coroutineScope {
+					listOf(
+						async { detectLeftRightEdge(decoder, size, isLeft = true) },
+						async { detectTopBottomEdge(decoder, size, isTop = true) },
+						async { detectLeftRightEdge(decoder, size, isLeft = false) },
+						async { detectTopBottomEdge(decoder, size, isTop = false) },
+					).awaitAll()
+				}
+				var hasEdges = false
+				for (edge in edges) {
+					if (edge > 0) {
+						hasEdges = true
+					} else if (edge < 0) {
+						return@withContext null
+					}
+				}
+				if (hasEdges) {
+					Rect(edges[0], edges[1], size.x - edges[2], size.y - edges[3])
+				} else {
+					null
+				}
+			} finally {
+				decoder.recycle()
+			}
+		}
+	}
+
+	private fun detectLeftRightEdge(decoder: ImageRegionDecoder, size: Point, isLeft: Boolean): Int {
+		var width = size.x
+		val rectCount = size.x / BLOCK_SIZE
+		val maxRect = rectCount / 3
+		for (i in 0 until rectCount) {
+			if (i > maxRect) {
+				return -1
+			}
+			var dd = BLOCK_SIZE
+			for (j in 0 until size.y / BLOCK_SIZE) {
+				val regionX = if (isLeft) i * BLOCK_SIZE else size.x - (i + 1) * BLOCK_SIZE
+				decoder.decodeRegion(region(regionX, j * BLOCK_SIZE), 1).use { bitmap ->
+					for (ii in 0 until minOf(BLOCK_SIZE, dd)) {
+						for (jj in 0 until BLOCK_SIZE) {
+							val bi = if (isLeft) ii else BLOCK_SIZE - ii - 1
+							if (bitmap[bi, jj].isNotWhite()) {
+								width = minOf(width, BLOCK_SIZE * i + ii)
+								dd--
+								break
+							}
+						}
+					}
+				}
+				if (dd == 0) {
+					break
+				}
+			}
+			if (dd < BLOCK_SIZE) {
+				break // We have already found vertical field or it is not exist
+			}
+		}
+		return width
+	}
+
+	private fun detectTopBottomEdge(decoder: ImageRegionDecoder, size: Point, isTop: Boolean): Int {
+		var height = size.y
+		val rectCount = size.y / BLOCK_SIZE
+		val maxRect = rectCount / 3
+		for (j in 0 until rectCount) {
+			if (j > maxRect) {
+				return -1
+			}
+			var dd = BLOCK_SIZE
+			for (i in 0 until size.x / BLOCK_SIZE) {
+				val regionY = if (isTop) j * BLOCK_SIZE else size.y - (j + 1) * BLOCK_SIZE
+				decoder.decodeRegion(region(i * BLOCK_SIZE, regionY), 1).use { bitmap ->
+					for (jj in 0 until minOf(BLOCK_SIZE, dd)) {
+						for (ii in 0 until BLOCK_SIZE) {
+							val bj = if (isTop) jj else BLOCK_SIZE - jj - 1
+							if (bitmap[ii, bj].isNotWhite()) {
+								height = minOf(height, BLOCK_SIZE * j + jj)
+								dd--
+								break
+							}
+						}
+					}
+				}
+				if (dd == 0) {
+					break
+				}
+			}
+			if (dd < BLOCK_SIZE) {
+				break // We have already found vertical field or it is not exist
+			}
+		}
+		return height
+	}
+
+	companion object {
+
+		private const val BLOCK_SIZE = 100
+		private const val COLOR_TOLERANCE = 16
+
+		fun isColorTheSame(@ColorInt a: Int, @ColorInt b: Int, tolerance: Int): Boolean {
+			return abs(a.red - b.red) <= tolerance &&
+				abs(a.green - b.green) <= tolerance &&
+				abs(a.blue - b.blue) <= tolerance &&
+				abs(a.alpha - b.alpha) <= tolerance
+		}
+
+		private fun Int.isNotWhite() = !isColorTheSame(this, Color.WHITE, COLOR_TOLERANCE)
+
+		private fun region(x: Int, y: Int) = Rect(x, y, x + BLOCK_SIZE, y + BLOCK_SIZE)
+	}
+}

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

@@ -2,12 +2,14 @@ package org.koitharu.kotatsu.reader.domain
 
 import android.content.Context
 import android.graphics.BitmapFactory
+import android.graphics.Rect
 import android.net.Uri
 import androidx.annotation.AnyThread
 import androidx.collection.LongSparseArray
 import androidx.collection.set
 import androidx.core.net.toFile
 import androidx.core.net.toUri
+import com.davemorrissey.labs.subscaleview.ImageSource
 import dagger.hilt.android.ActivityRetainedLifecycle
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ActivityRetainedScoped
@@ -35,6 +37,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
 import org.koitharu.kotatsu.core.util.ext.URI_SCHEME_ZIP
+import org.koitharu.kotatsu.core.util.ext.cancelChildrenAndJoin
 import org.koitharu.kotatsu.core.util.ext.compressToPNG
 import org.koitharu.kotatsu.core.util.ext.ensureRamAtLeast
 import org.koitharu.kotatsu.core.util.ext.ensureSuccess
@@ -44,6 +47,7 @@ import org.koitharu.kotatsu.core.util.ext.isPowerSaveMode
 import org.koitharu.kotatsu.core.util.ext.isTargetNotEmpty
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.ramAvailable
+import org.koitharu.kotatsu.core.util.ext.use
 import org.koitharu.kotatsu.core.util.ext.withProgress
 import org.koitharu.kotatsu.core.util.progress.ProgressDeferred
 import org.koitharu.kotatsu.local.data.PagesCache
@@ -51,6 +55,7 @@ import org.koitharu.kotatsu.local.data.isFileUri
 import org.koitharu.kotatsu.local.data.isZipUri
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import java.util.LinkedList
 import java.util.concurrent.atomic.AtomicInteger
@@ -83,6 +88,7 @@ class PageLoader @Inject constructor(
 	private val prefetchQueue = LinkedList<MangaPage>()
 	private val counter = AtomicInteger(0)
 	private var prefetchQueueLimit = PREFETCH_LIMIT_DEFAULT // TODO adaptive
+	private val edgeDetector = EdgeDetector(context)
 
 	fun isPrefetchApplicable(): Boolean {
 		return repository is RemoteMangaRepository
@@ -142,22 +148,33 @@ class PageLoader @Inject constructor(
 		} else {
 			val file = uri.toFile()
 			context.ensureRamAtLeast(file.length() * 2)
-			val image = runInterruptible(Dispatchers.IO) {
+			runInterruptible(Dispatchers.IO) {
 				BitmapFactory.decodeFile(file.absolutePath)
-			}
-			try {
+			}.use { image ->
 				image.compressToPNG(file)
-			} finally {
-				image.recycle()
 			}
 			uri
 		}
 	}
 
+	suspend fun getTrimmedBounds(uri: Uri): Rect? = runCatchingCancellable {
+		edgeDetector.getBounds(ImageSource.Uri(uri))
+	}.onFailure { error ->
+		error.printStackTraceDebug()
+	}.getOrNull()
+
 	suspend fun getPageUrl(page: MangaPage): String {
 		return getRepository(page.source).getPageUrl(page)
 	}
 
+	suspend fun invalidate(clearCache: Boolean) {
+		tasks.clear()
+		loaderScope.cancelChildrenAndJoin()
+		if (clearCache) {
+			cache.clear()
+		}
+	}
+
 	private fun onIdle() = loaderScope.launch {
 		prefetchLock.withLock {
 			while (prefetchQueue.isNotEmpty()) {
@@ -213,7 +230,7 @@ class PageLoader @Inject constructor(
 
 			uri.isFileUri() -> uri
 			else -> {
-				val request = createPageRequest(page, pageUrl)
+				val request = createPageRequest(pageUrl, page.source)
 				imageProxyInterceptor.interceptPageRequest(request, okHttp).ensureSuccess().use { response ->
 					val body = checkNotNull(response.body) { "Null response body" }
 					body.withProgress(progress).use {
@@ -248,12 +265,12 @@ class PageLoader @Inject constructor(
 		private const val PREFETCH_LIMIT_DEFAULT = 6
 		private const val PREFETCH_MIN_RAM_MB = 80L
 
-		fun createPageRequest(page: MangaPage, pageUrl: String) = Request.Builder()
+		fun createPageRequest(pageUrl: String, mangaSource: MangaSource) = Request.Builder()
 			.url(pageUrl)
 			.get()
 			.header(CommonHeaders.ACCEPT, "image/webp,image/png;q=0.9,image/jpeg,*/*;q=0.8")
 			.cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE)
-			.tag(MangaSource::class.java, page.source)
+			.tag(MangaSource::class.java, mangaSource)
 			.build()
 	}
 }

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

@@ -283,7 +283,9 @@ constructor(
 			prevJob?.cancelAndJoin()
 			content.value = ReaderContent(emptyList(), null)
 			chaptersLoader.loadSingleChapter(id)
-			content.value = ReaderContent(chaptersLoader.snapshot(), ReaderState(id, page, 0))
+			val newState = ReaderState(id, page, 0)
+			content.value = ReaderContent(chaptersLoader.snapshot(), newState)
+			saveCurrentState(newState)
 		}
 	}
 
@@ -291,17 +293,27 @@ constructor(
 		val prevJob = loadingJob
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
 			prevJob?.cancelAndJoin()
-			val currentChapterId = currentState.requireValue().chapterId
-			val allChapters = checkNotNull(manga).allChapters
-			var index = allChapters.indexOfFirst { x -> x.id == currentChapterId }
-			if (index < 0) {
-				return@launchLoadingJob
+			val prevState = currentState.requireValue()
+			val newChapterId = if (delta != 0) {
+				val allChapters = checkNotNull(manga).allChapters
+				var index = allChapters.indexOfFirst { x -> x.id == prevState.chapterId }
+				if (index < 0) {
+					return@launchLoadingJob
+				}
+				index += delta
+				(allChapters.getOrNull(index) ?: return@launchLoadingJob).id
+			} else {
+				prevState.chapterId
 			}
-			index += delta
-			val newChapterId = (allChapters.getOrNull(index) ?: return@launchLoadingJob).id
 			content.value = ReaderContent(emptyList(), null)
 			chaptersLoader.loadSingleChapter(newChapterId)
-			content.value = ReaderContent(chaptersLoader.snapshot(), ReaderState(newChapterId, 0, 0))
+			val newState = ReaderState(
+				chapterId = newChapterId,
+				page = if (delta == 0) prevState.page else 0,
+				scroll = if (delta == 0) prevState.scroll else 0,
+			)
+			content.value = ReaderContent(chaptersLoader.snapshot(), newState)
+			saveCurrentState(newState)
 		}
 	}
 

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

@@ -0,0 +1,85 @@
+package org.koitharu.kotatsu.reader.ui.config
+
+import android.content.Context
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.core.util.ext.mapToArray
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.SuspendLazy
+import kotlin.coroutines.resume
+
+class ImageServerDelegate(
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val mangaSource: MangaSource?,
+) {
+
+	private val repositoryLazy = SuspendLazy {
+		mangaRepositoryFactory.create(checkNotNull(mangaSource)) as RemoteMangaRepository
+	}
+
+	suspend fun isAvailable() = withContext(Dispatchers.Default) {
+		repositoryLazy.tryGet().map { repository ->
+			repository.getConfigKeys().any { it is ConfigKey.PreferredImageServer }
+		}.getOrDefault(false)
+	}
+
+	suspend fun getValue(): String? = withContext(Dispatchers.Default) {
+		repositoryLazy.tryGet().map { repository ->
+			val key = repository.getConfigKeys().firstNotNullOfOrNull { it as? ConfigKey.PreferredImageServer }
+			if (key != null) {
+				key.presetValues[repository.getConfig()[key]]
+			} else {
+				null
+			}
+		}.getOrNull()
+	}
+
+	suspend fun showDialog(context: Context): Boolean {
+		val repository = withContext(Dispatchers.Default) {
+			repositoryLazy.tryGet().getOrNull()
+		} ?: return false
+		val key = repository.getConfigKeys().firstNotNullOfOrNull {
+			it as? ConfigKey.PreferredImageServer
+		} ?: return false
+		val entries = key.presetValues.values.mapToArray {
+			it ?: context.getString(R.string.automatic)
+		}
+		val entryValues = key.presetValues.keys.toTypedArray()
+		val config = repository.getConfig()
+		val initialValue = config[key]
+		var currentValue = initialValue
+		val changed = suspendCancellableCoroutine { cont ->
+			val dialog = MaterialAlertDialogBuilder(context)
+				.setTitle(R.string.image_server)
+				.setCancelable(true)
+				.setSingleChoiceItems(entries, entryValues.indexOf(initialValue)) { _, i ->
+					currentValue = entryValues[i]
+				}.setNegativeButton(android.R.string.cancel) { dialog, _ ->
+					dialog.cancel()
+				}.setPositiveButton(android.R.string.ok) { _, _ ->
+					if (currentValue != initialValue) {
+						config[key] = currentValue
+						cont.resume(true)
+					} else {
+						cont.resume(false)
+					}
+				}.setOnCancelListener {
+					cont.resume(false)
+				}.create()
+			dialog.show()
+			cont.invokeOnCancellation {
+				dialog.cancel()
+			}
+		}
+		if (changed) {
+			repository.invalidateCache()
+		}
+		return changed
+	}
+}

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

@@ -16,8 +16,10 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
@@ -29,6 +31,7 @@ import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.SheetReaderConfigBinding
+import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 import org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
@@ -47,7 +50,14 @@ class ReaderConfigSheet :
 	@Inject
 	lateinit var orientationHelper: ScreenOrientationHelper
 
+	@Inject
+	lateinit var mangaRepositoryFactory: MangaRepository.Factory
+
+	@Inject
+	lateinit var pageLoader: PageLoader
+
 	private lateinit var mode: ReaderMode
+	private lateinit var imageServerDelegate: ImageServerDelegate
 
 	@Inject
 	lateinit var settings: AppSettings
@@ -57,6 +67,10 @@ class ReaderConfigSheet :
 		mode = arguments?.getInt(ARG_MODE)
 			?.let { ReaderMode.valueOf(it) }
 			?: ReaderMode.STANDARD
+		imageServerDelegate = ImageServerDelegate(
+			mangaRepositoryFactory = mangaRepositoryFactory,
+			mangaSource = viewModel.manga?.toManga()?.source,
+		)
 	}
 
 	override fun onCreateViewBinding(
@@ -83,11 +97,20 @@ class ReaderConfigSheet :
 		binding.buttonSavePage.setOnClickListener(this)
 		binding.buttonScreenRotate.setOnClickListener(this)
 		binding.buttonSettings.setOnClickListener(this)
+		binding.buttonImageServer.setOnClickListener(this)
 		binding.buttonColorFilter.setOnClickListener(this)
 		binding.sliderTimer.addOnChangeListener(this)
 		binding.switchScrollTimer.setOnCheckedChangeListener(this)
 		binding.switchDoubleReader.setOnCheckedChangeListener(this)
 
+		viewLifecycleScope.launch {
+			val isAvailable = imageServerDelegate.isAvailable()
+			if (isAvailable) {
+				bindImageServerTitle()
+			}
+			binding.buttonImageServer.isVisible = isAvailable
+		}
+
 		settings.observeAsStateFlow(
 			scope = lifecycleScope + Dispatchers.Default,
 			key = AppSettings.KEY_READER_AUTOSCROLL_SPEED,
@@ -124,6 +147,14 @@ class ReaderConfigSheet :
 				val manga = viewModel.manga?.toManga() ?: return
 				startActivity(ColorFilterConfigActivity.newIntent(v.context, manga, page))
 			}
+
+			R.id.button_image_server -> viewLifecycleScope.launch {
+				if (imageServerDelegate.showDialog(v.context)) {
+					bindImageServerTitle()
+					pageLoader.invalidate(clearCache = true)
+					viewModel.switchChapterBy(0)
+				}
+			}
 		}
 	}
 
@@ -194,6 +225,14 @@ class ReaderConfigSheet :
 		switch.setOnCheckedChangeListener(this)
 	}
 
+	private suspend fun bindImageServerTitle() {
+		viewBinding?.buttonImageServer?.text = getString(
+			R.string.inline_preference_pattern,
+			getString(R.string.image_server),
+			imageServerDelegate.getValue() ?: getString(R.string.automatic),
+		)
+	}
+
 	interface Callback {
 
 		var isAutoScrollEnabled: Boolean

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

@@ -18,6 +18,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 
@@ -54,6 +55,10 @@ class ReaderSettings(
 		view.background = bg.resolve(view.context)
 	}
 
+	fun isPagesCropEnabled(isWebtoon: Boolean) = settings.isPagesCropEnabled(
+		if (isWebtoon) ReaderMode.WEBTOON else ReaderMode.STANDARD,
+	)
+
 	@CheckResult
 	fun applyBitmapConfig(ssiv: SubsamplingScaleImageView): Boolean {
 		val config = bitmapConfig

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

@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.databinding.LayoutPageInfoBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.PageHolderDelegate.State
+import org.koitharu.kotatsu.reader.ui.pager.webtoon.WebtoonHolder
 
 abstract class BasePageHolder<B : ViewBinding>(
 	protected val binding: B,
@@ -24,7 +25,14 @@ abstract class BasePageHolder<B : ViewBinding>(
 ) : LifecycleAwareViewHolder(binding.root, lifecycleOwner), PageHolderDelegate.Callback {
 
 	@Suppress("LeakingThis")
-	protected val delegate = PageHolderDelegate(loader, settings, this, networkState, exceptionResolver)
+	protected val delegate = PageHolderDelegate(
+		loader = loader,
+		readerSettings = settings,
+		callback = this,
+		networkState = networkState,
+		exceptionResolver = exceptionResolver,
+		isWebtoon = this is WebtoonHolder,
+	)
 	protected val bindingInfo = LayoutPageInfoBinding.bind(binding.root)
 
 	val context: Context
@@ -70,7 +78,7 @@ abstract class BasePageHolder<B : ViewBinding>(
 		delegate.onRecycle()
 	}
 
-	protected fun SubsamplingScaleImageView.applyDownsampling(isForeground: Boolean) {
+	protected fun SubsamplingScaleImageView.applyDownSampling(isForeground: Boolean) {
 		downSampling = when {
 			isForeground || !settings.isReaderOptimizationEnabled -> 1
 			context.isLowRamDevice() -> 8

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.reader.ui.pager
 
+import android.graphics.Rect
 import android.net.Uri
 import androidx.lifecycle.Observer
 import com.davemorrissey.labs.subscaleview.DefaultOnImageEventListener
@@ -32,6 +33,7 @@ class PageHolderDelegate(
 	private val callback: Callback,
 	private val networkState: NetworkState,
 	private val exceptionResolver: ExceptionResolver,
+	private val isWebtoon: Boolean,
 ) : DefaultOnImageEventListener, Observer<ReaderSettings> {
 
 	private val scope = loader.loaderScope + Dispatchers.Main.immediate
@@ -39,6 +41,7 @@ class PageHolderDelegate(
 		private set
 	private var job: Job? = null
 	private var uri: Uri? = null
+	private var cachedBounds: Rect? = null
 	private var error: Throwable? = null
 
 	init {
@@ -88,6 +91,7 @@ class PageHolderDelegate(
 	fun onRecycle() {
 		state = State.EMPTY
 		uri = null
+		cachedBounds = null
 		error = null
 		job?.cancel()
 	}
@@ -95,7 +99,7 @@ class PageHolderDelegate(
 	fun reload() {
 		if (state == State.SHOWN) {
 			uri?.let {
-				callback.onImageReady(it)
+				callback.onImageReady(it, cachedBounds)
 			}
 		}
 	}
@@ -138,8 +142,13 @@ class PageHolderDelegate(
 			state = State.CONVERTING
 			try {
 				val newUri = loader.convertBimap(uri)
+				cachedBounds = if (readerSettings.isPagesCropEnabled(isWebtoon)) {
+					loader.getTrimmedBounds(newUri)
+				} else {
+					null
+				}
 				state = State.CONVERTED
-				callback.onImageReady(newUri)
+				callback.onImageReady(newUri, cachedBounds)
 			} catch (ce: CancellationException) {
 				throw ce
 			} catch (e2: Throwable) {
@@ -166,7 +175,12 @@ class PageHolderDelegate(
 				file
 			}
 			state = State.LOADED
-			callback.onImageReady(checkNotNull(uri))
+			cachedBounds = if (readerSettings.isPagesCropEnabled(isWebtoon)) {
+				loader.getTrimmedBounds(checkNotNull(uri))
+			} else {
+				null
+			}
+			callback.onImageReady(checkNotNull(uri), cachedBounds)
 		} catch (e: CancellationException) {
 			throw e
 		} catch (e: Throwable) {
@@ -196,7 +210,7 @@ class PageHolderDelegate(
 
 		fun onError(e: Throwable)
 
-		fun onImageReady(uri: Uri)
+		fun onImageReady(uri: Uri, bounds: Rect?)
 
 		fun onImageShowing(settings: ReaderSettings)
 

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

@@ -2,13 +2,10 @@ package org.koitharu.kotatsu.reader.ui.pager
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import kotlinx.parcelize.TypeParceler
-import org.koitharu.kotatsu.core.model.parcelable.MangaSourceParceler
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
 @Parcelize
-@TypeParceler<MangaSource, MangaSourceParceler>
 data class ReaderPage(
 	val id: Long,
 	val url: String,

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.reader.ui.pager.standard
 
 import android.annotation.SuppressLint
 import android.graphics.PointF
+import android.graphics.Rect
 import android.net.Uri
 import android.view.View
 import android.view.animation.DecelerateInterpolator
@@ -46,12 +47,12 @@ open class PageHolder(
 
 	override fun onResume() {
 		super.onResume()
-		binding.ssiv.applyDownsampling(isForeground = true)
+		binding.ssiv.applyDownSampling(isForeground = true)
 	}
 
 	override fun onPause() {
 		super.onPause()
-		binding.ssiv.applyDownsampling(isForeground = false)
+		binding.ssiv.applyDownSampling(isForeground = false)
 	}
 
 	override fun onConfigChanged() {
@@ -59,7 +60,7 @@ open class PageHolder(
 		if (settings.applyBitmapConfig(binding.ssiv)) {
 			delegate.reload()
 		}
-		binding.ssiv.applyDownsampling(isResumed())
+		binding.ssiv.applyDownSampling(isResumed())
 		binding.textViewNumber.isVisible = settings.isPagesNumbersEnabled
 	}
 
@@ -89,8 +90,12 @@ open class PageHolder(
 		}
 	}
 
-	override fun onImageReady(uri: Uri) {
-		binding.ssiv.setImage(ImageSource.Uri(uri))
+	override fun onImageReady(uri: Uri, bounds: Rect?) {
+		val source = ImageSource.Uri(uri)
+		if (bounds != null) {
+			source.region(bounds)
+		}
+		binding.ssiv.setImage(source)
 	}
 
 	override fun onImageShowing(settings: ReaderSettings) {

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.reader.ui.pager.webtoon
 
+import android.graphics.Rect
 import android.net.Uri
 import android.view.View
 import androidx.core.view.isVisible
@@ -39,12 +40,12 @@ class WebtoonHolder(
 
 	override fun onResume() {
 		super.onResume()
-		binding.ssiv.applyDownsampling(isForeground = true)
+		binding.ssiv.applyDownSampling(isForeground = true)
 	}
 
 	override fun onPause() {
 		super.onPause()
-		binding.ssiv.applyDownsampling(isForeground = false)
+		binding.ssiv.applyDownSampling(isForeground = false)
 	}
 
 	override fun onConfigChanged() {
@@ -52,7 +53,7 @@ class WebtoonHolder(
 		if (settings.applyBitmapConfig(binding.ssiv)) {
 			delegate.reload()
 		}
-		binding.ssiv.applyDownsampling(isResumed())
+		binding.ssiv.applyDownSampling(isResumed())
 	}
 
 	override fun onBind(data: ReaderPage) {
@@ -89,8 +90,12 @@ class WebtoonHolder(
 		}
 	}
 
-	override fun onImageReady(uri: Uri) {
-		binding.ssiv.setImage(ImageSource.Uri(uri))
+	override fun onImageReady(uri: Uri, bounds: Rect?) {
+		val source = ImageSource.Uri(uri)
+		if (bounds != null) {
+			source.region(bounds)
+		}
+		binding.ssiv.setImage(source)
 	}
 
 	override fun onImageShowing(settings: ReaderSettings) {

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

@@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.drop
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.BrowserActivity
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
@@ -76,12 +75,7 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 	override fun onSecondaryErrorActionClick(error: Throwable) {
 		viewModel.browserUrl?.also { url ->
 			startActivity(
-				BrowserActivity.newIntent(
-					requireContext(),
-					url,
-					viewModel.source,
-					viewModel.source.getTitle(requireContext()),
-				),
+				BrowserActivity.newIntent(requireContext(), url, viewModel.source, viewModel.source.title),
 			)
 		} ?: Snackbar.make(requireViewBinding().recyclerView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT)
 			.show()
@@ -171,8 +165,8 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 
 		const val ARG_SOURCE = "provider"
 
-		fun newInstance(source: MangaSource) = RemoteListFragment().withArgs(1) {
-			putString(ARG_SOURCE, source.name)
+		fun newInstance(provider: MangaSource) = RemoteListFragment().withArgs(1) {
+			putSerializable(ARG_SOURCE, provider)
 		}
 	}
 }

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

@@ -28,6 +28,7 @@ import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.core.util.ext.sizeOrZero
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.explore.domain.ExploreRepository
 import org.koitharu.kotatsu.filter.ui.FilterCoordinator
 import org.koitharu.kotatsu.filter.ui.MangaFilter
@@ -45,7 +46,6 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.util.concatUrl
 import javax.inject.Inject
 
 private const val FILTER_MIN_INTERVAL = 250L
@@ -59,6 +59,7 @@ open class RemoteListViewModel @Inject constructor(
 	listExtraProvider: ListExtraProvider,
 	downloadScheduler: DownloadWorker.Scheduler,
 	private val exploreRepository: ExploreRepository,
+	sourcesRepository: MangaSourcesRepository,
 ) : MangaListViewModel(settings, downloadScheduler), MangaFilter by filter {
 
 	val source = savedStateHandle.require<MangaSource>(RemoteListFragment.ARG_SOURCE)
@@ -117,6 +118,10 @@ open class RemoteListViewModel @Inject constructor(
 			}.catch { error ->
 				listError.value = error
 			}.launchIn(viewModelScope)
+
+		launchJob(Dispatchers.Default) {
+			sourcesRepository.trackUsage(source)
+		}
 	}
 
 	override fun onRefresh() {

app/src/main/kotlin/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt

@@ -125,6 +125,8 @@ class MangaSearchRepository @Inject constructor(
 		return db.getTagsDao().findRareTags(source.name, limit).toMangaTagsList()
 	}
 
+	suspend fun getSourcesSuggestion(limit: Int): List<MangaSource> = sourcesRepository.getTopSources(limit)
+
 	fun getSourcesSuggestion(query: String, limit: Int): List<MangaSource> {
 		if (query.length < 3) {
 			return emptyList()

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt

@@ -21,9 +21,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaTags
@@ -79,7 +77,7 @@ class MangaListActivity :
 			finishAfterTransition()
 		} else {
 			viewBinding.buttonOrder?.setOnClickListener(this)
-			title = src.getTitle(this)
+			title = if (src == MangaSource.LOCAL) getString(R.string.local_storage) else src.title
 			initList(src, tags)
 		}
 	}
@@ -127,7 +125,7 @@ class MangaListActivity :
 		} else {
 			fm.commit {
 				setReorderingAllowed(true)
-				val fragment = if (source == LocalMangaSource) {
+				val fragment = if (source == MangaSource.LOCAL) {
 					LocalListFragment()
 				} else {
 					RemoteListFragment.newInstance(source)

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/SearchActivity.kt

@@ -11,9 +11,8 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.commit
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.showKeyboard
 import org.koitharu.kotatsu.databinding.ActivitySearchBinding
@@ -29,12 +28,15 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivitySearchBinding.inflate(layoutInflater))
-		source = MangaSource(intent.getStringExtra(EXTRA_SOURCE))
+		source = intent.getSerializableExtraCompat(EXTRA_SOURCE) ?: run {
+			finishAfterTransition()
+			return
+		}
 		val query = intent.getStringExtra(EXTRA_QUERY)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		searchSuggestionViewModel.isIncognitoModeEnabled.observe(this, this::onIncognitoModeChanged)
 		with(viewBinding.searchView) {
-			queryHint = getString(R.string.search_on_s, source.getTitle(context))
+			queryHint = getString(R.string.search_on_s, source.title)
 			setOnQueryTextListener(this@SearchActivity)
 
 			if (query.isNullOrBlank()) {
@@ -50,7 +52,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 		viewBinding.toolbar.updatePadding(
 			left = insets.left,
 			right = insets.right,
-			top = insets.top,
+			top = insets.top
 		)
 		viewBinding.container.updatePadding(
 			bottom = insets.bottom,
@@ -91,7 +93,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 
 		fun newIntent(context: Context, source: MangaSource, query: String?) =
 			Intent(context, SearchActivity::class.java)
-				.putExtra(EXTRA_SOURCE, source.name)
+				.putExtra(EXTRA_SOURCE, source)
 				.putExtra(EXTRA_QUERY, query)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/SearchFragment.kt

@@ -30,7 +30,7 @@ class SearchFragment : MangaListFragment() {
 		const val ARG_SOURCE = "source"
 
 		fun newInstance(source: MangaSource, query: String) = SearchFragment().withArgs(2) {
-			putString(ARG_SOURCE, source.name)
+			putSerializable(ARG_SOURCE, source)
 			putString(ARG_QUERY, query)
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/SearchViewModel.kt

@@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.distinctById
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -43,7 +42,7 @@ class SearchViewModel @Inject constructor(
 ) : MangaListViewModel(settings, downloadScheduler) {
 
 	private val query = savedStateHandle.require<String>(SearchFragment.ARG_QUERY)
-	private val repository = repositoryFactory.create(MangaSource(savedStateHandle.get(SearchFragment.ARG_SOURCE)))
+	private val repository = repositoryFactory.create(savedStateHandle.require(SearchFragment.ARG_SOURCE))
 	private val mangaList = MutableStateFlow<List<Manga>?>(null)
 	private val hasNextPage = MutableStateFlow(false)
 	private val listError = MutableStateFlow<Throwable?>(null)

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/SearchResultsAD.kt

@@ -8,7 +8,6 @@ import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
@@ -46,7 +45,7 @@ fun searchResultsAD(
 	binding.buttonMore.setOnClickListener(eventListener)
 
 	bind {
-		binding.textViewTitle.text = item.source.getTitle(context)
+		binding.textViewTitle.text = item.source.title
 		binding.buttonMore.isVisible = item.hasMore
 		adapter.items = item.list
 		adapter.notifyDataSetChanged()

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt

@@ -22,6 +22,7 @@ import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.sizeOrZero
+import org.koitharu.kotatsu.core.util.ext.toEnumSet
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
@@ -36,6 +37,7 @@ private const val MAX_HINTS_ITEMS = 3
 private const val MAX_AUTHORS_ITEMS = 2
 private const val MAX_TAGS_ITEMS = 8
 private const val MAX_SOURCES_ITEMS = 6
+private const val MAX_SOURCES_TIPS_ITEMS = 2
 
 @HiltViewModel
 class SearchSuggestionViewModel @Inject constructor(
@@ -102,7 +104,7 @@ class SearchSuggestionViewModel @Inject constructor(
 		suggestionJob?.cancel()
 		suggestionJob = combine(
 			query.debounce(DEBOUNCE_TIMEOUT),
-			sourcesRepository.observeEnabledSources().map { it.toSet() },
+			sourcesRepository.observeEnabledSources().map { it.toEnumSet() },
 			settings.observeAsFlow(AppSettings.KEY_SEARCH_SUGGESTION_TYPES) { searchSuggestionTypes },
 			::Triple,
 		).mapLatest { (searchQuery, enabledSources, types) ->
@@ -148,12 +150,18 @@ class SearchSuggestionViewModel @Inject constructor(
 		} else {
 			null
 		}
+		val sourcesTipsDeferred = if (searchQuery.isEmpty() && SearchSuggestionType.RECENT_SOURCES in types) {
+			async { repository.getSourcesSuggestion(MAX_SOURCES_TIPS_ITEMS) }
+		} else {
+			null
+		}
 
 		val tags = tagsDeferred?.await()
 		val mangaList = mangaDeferred?.await()
 		val queries = queriesDeferred?.await()
 		val hints = hintsDeferred?.await()
 		val authors = authorsDeferred?.await()
+		val sourcesTips = sourcesTipsDeferred?.await()
 
 		buildList(queries.sizeOrZero() + sources.sizeOrZero() + authors.sizeOrZero() + hints.sizeOrZero() + 2) {
 			if (!tags.isNullOrEmpty()) {
@@ -166,6 +174,7 @@ class SearchSuggestionViewModel @Inject constructor(
 			queries?.mapTo(this) { SearchSuggestionItem.RecentQuery(it) }
 			authors?.mapTo(this) { SearchSuggestionItem.Author(it) }
 			hints?.mapTo(this) { SearchSuggestionItem.Hint(it) }
+			sourcesTips?.mapTo(this) { SearchSuggestionItem.SourceTip(it) }
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt

@@ -18,6 +18,7 @@ class SearchSuggestionAdapter(
 		delegatesManager
 			.addDelegate(SEARCH_SUGGESTION_ITEM_TYPE_QUERY, searchSuggestionQueryAD(listener))
 			.addDelegate(searchSuggestionSourceAD(coil, lifecycleOwner, listener))
+			.addDelegate(searchSuggestionSourceTipAD(coil, lifecycleOwner, listener))
 			.addDelegate(searchSuggestionTagsAD(listener))
 			.addDelegate(searchSuggestionMangaListAD(coil, lifecycleOwner, listener))
 			.addDelegate(searchSuggestionQueryHintAD(listener))

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionSourceTipAD.kt

@@ -0,0 +1,43 @@
+package org.koitharu.kotatsu.search.ui.suggestion.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.getSummary
+import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.parser.favicon.faviconUri
+import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.source
+import org.koitharu.kotatsu.databinding.ItemSearchSuggestionSourceTipBinding
+import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
+import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+
+fun searchSuggestionSourceTipAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	listener: SearchSuggestionListener,
+) =
+	adapterDelegateViewBinding<SearchSuggestionItem.SourceTip, SearchSuggestionItem, ItemSearchSuggestionSourceTipBinding>(
+		{ inflater, parent -> ItemSearchSuggestionSourceTipBinding.inflate(inflater, parent, false) },
+	) {
+
+		binding.root.setOnClickListener {
+			listener.onSourceClick(item.source)
+		}
+
+		bind {
+			binding.textViewTitle.text = item.source.getTitle(context)
+			binding.textViewSubtitle.text = item.source.getSummary(context)
+			val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
+			binding.imageViewCover.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
+				fallback(fallbackIcon)
+				placeholder(fallbackIcon)
+				error(fallbackIcon)
+				source(item.source)
+				enqueueWith(coil)
+			}
+		}
+	}

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt

@@ -4,6 +4,7 @@ import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
@@ -51,7 +52,7 @@ sealed interface SearchSuggestionItem : ListModel {
 	) : SearchSuggestionItem {
 
 		val isNsfw: Boolean
-			get() = source.isNsfw()
+			get() = source.contentType == ContentType.HENTAI
 
 		override fun areItemsTheSame(other: ListModel): Boolean {
 			return other is Source && other.source == source
@@ -69,6 +70,18 @@ sealed interface SearchSuggestionItem : ListModel {
 		}
 	}
 
+	data class SourceTip(
+		val source: MangaSource,
+	) : SearchSuggestionItem {
+
+		val isNsfw: Boolean
+			get() = source.isNsfw()
+
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Source && other.source == source
+		}
+	}
+
 	data class Tags(
 		val tags: List<ChipsView.ChipModel>,
 	) : SearchSuggestionItem {

app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt

@@ -5,6 +5,7 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.preference.ListPreference
+import androidx.preference.MultiSelectListPreference
 import androidx.preference.Preference
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
@@ -17,6 +18,7 @@ import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.util.ext.setDefaultValueCompat
 import org.koitharu.kotatsu.parsers.util.names
 import org.koitharu.kotatsu.settings.reader.ReaderTapGridConfigActivity
+import org.koitharu.kotatsu.settings.utils.MultiSummaryProvider
 import org.koitharu.kotatsu.settings.utils.PercentSummaryProvider
 import org.koitharu.kotatsu.settings.utils.SliderPreference
 
@@ -48,6 +50,9 @@ class ReaderSettingsFragment :
 			entryValues = ZoomMode.entries.names()
 			setDefaultValueCompat(ZoomMode.FIT_CENTER.name)
 		}
+		findPreference<MultiSelectListPreference>(AppSettings.KEY_READER_CROP)?.run {
+			summaryProvider = MultiSummaryProvider(R.string.disabled)
+		}
 		findPreference<SliderPreference>(AppSettings.KEY_WEBTOON_ZOOM_OUT)?.summaryProvider = PercentSummaryProvider()
 		updateReaderModeDependency()
 	}

app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt

@@ -16,8 +16,8 @@ import com.google.android.material.appbar.AppBarLayout
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ActivitySettingsBinding
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
@@ -110,7 +110,7 @@ class SettingsActivity :
 			ACTION_SOURCES -> SourcesSettingsFragment()
 			ACTION_MANAGE_DOWNLOADS -> DownloadsSettingsFragment()
 			ACTION_SOURCE -> SourceSettingsFragment.newInstance(
-				MangaSource(intent.getStringExtra(EXTRA_SOURCE)),
+				intent.getSerializableExtraCompat(EXTRA_SOURCE) ?: MangaSource.LOCAL,
 			)
 
 			ACTION_MANAGE_SOURCES -> SourcesManageFragment()
@@ -177,6 +177,6 @@ class SettingsActivity :
 		fun newSourceSettingsIntent(context: Context, source: MangaSource) =
 			Intent(context, SettingsActivity::class.java)
 				.setAction(ACTION_SOURCE)
-				.putExtra(EXTRA_SOURCE, source.name)
+				.putExtra(EXTRA_SOURCE, source)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourceSettingsExt.kt

@@ -2,11 +2,13 @@ package org.koitharu.kotatsu.settings.sources
 
 import android.view.inputmethod.EditorInfo
 import androidx.preference.EditTextPreference
+import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.core.util.ext.mapToArray
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.network.UserAgents
 import org.koitharu.kotatsu.settings.utils.AutoCompleteTextViewPreference
@@ -23,9 +25,9 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
 			is ConfigKey.Domain -> {
 				val presetValues = key.presetValues
 				if (presetValues.size <= 1) {
-					EditTextPreference(requireContext())
+					EditTextPreference(screen.context)
 				} else {
-					AutoCompleteTextViewPreference(requireContext()).apply {
+					AutoCompleteTextViewPreference(screen.context).apply {
 						entries = presetValues.toStringArray()
 					}
 				}.apply {
@@ -43,7 +45,7 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
 			}
 
 			is ConfigKey.UserAgent -> {
-				AutoCompleteTextViewPreference(requireContext()).apply {
+				AutoCompleteTextViewPreference(screen.context).apply {
 					entries = arrayOf(
 						UserAgents.FIREFOX_MOBILE,
 						UserAgents.CHROME_MOBILE,
@@ -64,19 +66,32 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
 			}
 
 			is ConfigKey.ShowSuspiciousContent -> {
-				SwitchPreferenceCompat(requireContext()).apply {
+				SwitchPreferenceCompat(screen.context).apply {
 					setDefaultValue(key.defaultValue)
 					setTitle(R.string.show_suspicious_content)
 				}
 			}
 
 			is ConfigKey.SplitByTranslations -> {
-				SwitchPreferenceCompat(requireContext()).apply {
+				SwitchPreferenceCompat(screen.context).apply {
 					setDefaultValue(key.defaultValue)
 					setTitle(R.string.split_by_translations)
 					setSummary(R.string.split_by_translations_summary)
 				}
 			}
+
+			is ConfigKey.PreferredImageServer -> {
+				ListPreference(screen.context).apply {
+					entries = key.presetValues.values.mapToArray {
+						it ?: context.getString(R.string.automatic)
+					}
+					entryValues = key.presetValues.keys.mapToArray { it.orEmpty() }
+					setDefaultValue(key.defaultValue.orEmpty())
+					setTitle(R.string.image_server)
+					setDialogTitle(R.string.image_server)
+					summaryProvider = ListPreference.SimpleSummaryProvider.getInstance()
+				}
+			}
 		}
 		preference.isIconSpaceReserved = false
 		preference.key = key.key

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourceSettingsFragment.kt

@@ -9,7 +9,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
@@ -27,9 +26,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0), Preference.OnPreferenc
 
 	override fun onResume() {
 		super.onResume()
-		context?.let { ctx ->
-			setTitle(viewModel.source.getTitle(ctx))
-		}
+		setTitle(viewModel.source.title)
 		viewModel.onResume()
 	}
 
@@ -104,7 +101,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0), Preference.OnPreferenc
 		const val EXTRA_SOURCE = "source"
 
 		fun newInstance(source: MangaSource) = SourceSettingsFragment().withArgs(1) {
-			putString(EXTRA_SOURCE, source.name)
+			putSerializable(EXTRA_SOURCE, source)
 		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourceSettingsViewModel.kt

@@ -8,7 +8,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import okhttp3.HttpUrl
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
@@ -17,8 +16,10 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
+import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import javax.inject.Inject
 
 @HiltViewModel
@@ -29,7 +30,7 @@ class SourceSettingsViewModel @Inject constructor(
 	private val mangaSourcesRepository: MangaSourcesRepository,
 ) : BaseViewModel(), SharedPreferences.OnSharedPreferenceChangeListener {
 
-	val source = MangaSource(savedStateHandle.get<String>(SourceSettingsFragment.EXTRA_SOURCE))
+	val source = savedStateHandle.require<MangaSource>(SourceSettingsFragment.EXTRA_SOURCE)
 	val repository = mangaRepositoryFactory.create(source) as RemoteMangaRepository
 
 	val onActionDone = MutableEventFlow<ReversibleAction>()

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.settings.sources.adapter
 
 import android.view.View
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.content.ContextCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -16,49 +17,14 @@ import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.ui.list.OnTipCloseListener
 import org.koitharu.kotatsu.core.util.ext.crossfade
+import org.koitharu.kotatsu.core.util.ext.drawableStart
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ItemSourceConfigBinding
-import org.koitharu.kotatsu.databinding.ItemSourceConfigCheckableBinding
 import org.koitharu.kotatsu.databinding.ItemTipBinding
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
 
-fun sourceConfigItemCheckableDelegate(
-	listener: SourceConfigListener,
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-) = adapterDelegateViewBinding<SourceConfigItem.SourceItem, SourceConfigItem, ItemSourceConfigCheckableBinding>(
-	{ layoutInflater, parent ->
-		ItemSourceConfigCheckableBinding.inflate(
-			layoutInflater,
-			parent,
-			false,
-		)
-	},
-) {
-
-	binding.switchToggle.setOnCheckedChangeListener { _, isChecked ->
-		listener.onItemEnabledChanged(item, isChecked)
-	}
-
-	bind {
-		binding.textViewTitle.text = item.source.getTitle(context)
-		binding.switchToggle.isChecked = item.isEnabled
-		binding.switchToggle.isEnabled = item.isAvailable
-		binding.textViewDescription.text = item.source.getSummary(context)
-		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
-		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
-			crossfade(context)
-			error(fallbackIcon)
-			placeholder(fallbackIcon)
-			fallback(fallbackIcon)
-			source(item.source)
-			enqueueWith(coil)
-		}
-	}
-}
-
 fun sourceConfigItemDelegate2(
 	listener: SourceConfigListener,
 	coil: ImageLoader,
@@ -73,6 +39,7 @@ fun sourceConfigItemDelegate2(
 	},
 ) {
 
+	val iconPinned = ContextCompat.getDrawable(context, R.drawable.ic_pin_small)
 	val eventListener = View.OnClickListener { v ->
 		when (v.id) {
 			R.id.imageView_add -> listener.onItemEnabledChanged(item, true)
@@ -89,6 +56,7 @@ fun sourceConfigItemDelegate2(
 		binding.imageViewAdd.isGone = item.isEnabled || !item.isAvailable
 		binding.imageViewRemove.isVisible = item.isEnabled
 		binding.imageViewMenu.isVisible = item.isEnabled
+		binding.textViewTitle.drawableStart = if (item.isPinned) iconPinned else null
 		binding.textViewDescription.text = item.source.getSummary(context)
 		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
@@ -132,12 +100,15 @@ private fun showSourceMenu(
 	menu.inflate(R.menu.popup_source_config)
 	menu.menu.findItem(R.id.action_shortcut)
 		?.isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(anchor.context)
+	menu.menu.findItem(R.id.action_pin)?.isVisible = item.isEnabled
+	menu.menu.findItem(R.id.action_pin)?.isChecked = item.isPinned
 	menu.menu.findItem(R.id.action_lift)?.isVisible = item.isDraggable
 	menu.setOnMenuItemClickListener {
 		when (it.itemId) {
 			R.id.action_settings -> listener.onItemSettingsClick(item)
 			R.id.action_lift -> listener.onItemLiftClick(item)
 			R.id.action_shortcut -> listener.onItemShortcutClick(item)
+			R.id.action_pin -> listener.onItemPinClick(item)
 		}
 		true
 	}

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigListener.kt

@@ -11,5 +11,7 @@ interface SourceConfigListener : OnTipCloseListener<SourceConfigItem.Tip> {
 
 	fun onItemShortcutClick(item: SourceConfigItem.SourceItem)
 
+	fun onItemPinClick(item: SourceConfigItem.SourceItem)
+
 	fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean)
 }

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt

@@ -18,16 +18,15 @@ import org.koitharu.kotatsu.browser.BrowserCallback
 import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.browser.ProgressChromeClient
 import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
 import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import javax.inject.Inject
 import com.google.android.material.R as materialR
@@ -47,8 +46,8 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
 		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
 			return
 		}
-		val source = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
-		if (source !is MangaParserSource) {
+		val source = intent?.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE)
+		if (source == null) {
 			finishAfterTransition()
 			return
 		}
@@ -149,7 +148,7 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
 
 		fun newIntent(context: Context, source: MangaSource): Intent {
 			return Intent(context, SourceAuthActivity::class.java)
-				.putExtra(EXTRA_SOURCE, source.name)
+				.putExtra(EXTRA_SOURCE, source)
 		}
 	}
 }