Dynamic sources support

Currently translated at 100.0% (648 of 648 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (9 of 9 strings)

Co-authored-by: Milo Ivir <mail@milotype.de>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/hr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/hr/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 645
-		versionName = '7.1.2'
+		versionCode = 650
+		versionName = '7.2.1'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,7 +82,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:26be293f24') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:f923acc5a7') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -90,15 +90,15 @@ dependencies {
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.24'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
 
-	implementation 'androidx.appcompat:appcompat:1.6.1'
+	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.7.1'
+	implementation 'androidx.fragment:fragment-ktx:1.8.0'
 	implementation 'androidx.transition:transition-ktx:1.5.0'
 	implementation 'androidx.collection:collection-ktx:1.4.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0'
-	implementation 'androidx.lifecycle:lifecycle-service:2.8.0'
-	implementation 'androidx.lifecycle:lifecycle-process:2.8.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.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.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.2'
 	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:02e6d6cfe9'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:8cafac256e'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 

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

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

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

@@ -12,135 +12,184 @@ import org.koitharu.kotatsu.history.data.toMangaHistory
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
+import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
 import org.koitharu.kotatsu.tracker.data.TrackEntity
 import javax.inject.Inject
 
-class MigrateUseCase @Inject constructor(
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-	private val mangaDataRepository: MangaDataRepository,
-	private val database: MangaDatabase,
-	private val progressUpdateUseCase: ProgressUpdateUseCase,
-) {
-
-	suspend operator fun invoke(oldManga: Manga, newManga: Manga) {
-		val oldDetails = if (oldManga.chapters.isNullOrEmpty()) {
-			runCatchingCancellable {
-				mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
-			}.getOrDefault(oldManga)
-		} else {
-			oldManga
-		}
-		val newDetails = if (newManga.chapters.isNullOrEmpty()) {
-			mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
-		} else {
-			newManga
-		}
-		mangaDataRepository.storeManga(newDetails)
-		database.withTransaction {
-			// replace favorites
-			val favoritesDao = database.getFavouritesDao()
-			val oldFavourites = favoritesDao.findAllRaw(oldDetails.id)
-			if (oldFavourites.isNotEmpty()) {
-				favoritesDao.delete(oldManga.id)
-				for (f in oldFavourites) {
-					val e = f.copy(
-						mangaId = newManga.id,
+class MigrateUseCase
+	@Inject
+	constructor(
+		private val mangaRepositoryFactory: MangaRepository.Factory,
+		private val mangaDataRepository: MangaDataRepository,
+		private val database: MangaDatabase,
+		private val progressUpdateUseCase: ProgressUpdateUseCase,
+		private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
+	) {
+		suspend operator fun invoke(
+			oldManga: Manga,
+			newManga: Manga,
+		) {
+			val oldDetails =
+				if (oldManga.chapters.isNullOrEmpty()) {
+					runCatchingCancellable {
+						mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
+					}.getOrDefault(oldManga)
+				} else {
+					oldManga
+				}
+			val newDetails =
+				if (newManga.chapters.isNullOrEmpty()) {
+					mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
+				} else {
+					newManga
+				}
+			mangaDataRepository.storeManga(newDetails)
+			database.withTransaction {
+				// replace favorites
+				val favoritesDao = database.getFavouritesDao()
+				val oldFavourites = favoritesDao.findAllRaw(oldDetails.id)
+				if (oldFavourites.isNotEmpty()) {
+					favoritesDao.delete(oldManga.id)
+					for (f in oldFavourites) {
+						val e =
+							f.copy(
+								mangaId = newManga.id,
+							)
+						favoritesDao.upsert(e)
+					}
+				}
+				// replace history
+				val historyDao = database.getHistoryDao()
+				val oldHistory = historyDao.find(oldDetails.id)
+				val newHistory =
+					if (oldHistory != null) {
+						val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
+						historyDao.delete(oldDetails.id)
+						historyDao.upsert(newHistory)
+						newHistory
+					} else {
+						null
+					}
+				// track
+				val tracksDao = database.getTracksDao()
+				val oldTrack = tracksDao.find(oldDetails.id)
+				if (oldTrack != null) {
+					val lastChapter = newDetails.chapters?.lastOrNull()
+					val newTrack =
+						TrackEntity(
+							mangaId = newDetails.id,
+							lastChapterId = lastChapter?.id ?: 0L,
+							newChapters = 0,
+							lastCheckTime = System.currentTimeMillis(),
+							lastChapterDate = lastChapter?.uploadDate ?: 0L,
+							lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION,
+							lastError = null,
+						)
+					tracksDao.delete(oldDetails.id)
+					tracksDao.upsert(newTrack)
+				}
+				// scrobbling
+				for (scrobbler in scrobblers) {
+					if (!scrobbler.isEnabled) {
+						continue
+					}
+					val prevInfo = scrobbler.getScrobblingInfoOrNull(oldDetails.id) ?: continue
+					scrobbler.unregisterScrobbling(oldDetails.id)
+					scrobbler.linkManga(newDetails.id, prevInfo.targetId)
+					scrobbler.updateScrobblingInfo(
+						mangaId = newDetails.id,
+						rating = prevInfo.rating,
+						status =
+							prevInfo.status ?: when {
+								newHistory == null -> ScrobblingStatus.PLANNED
+								newHistory.percent == 1f -> ScrobblingStatus.COMPLETED
+								else -> ScrobblingStatus.READING
+							},
+						comment = prevInfo.comment,
 					)
-					favoritesDao.upsert(e)
+					if (newHistory != null) {
+						scrobbler.scrobble(
+							manga = newDetails,
+							chapterId = newHistory.chapterId,
+						)
+					}
 				}
 			}
-			// replace history
-			val historyDao = database.getHistoryDao()
-			val oldHistory = historyDao.find(oldDetails.id)
-			if (oldHistory != null) {
-				val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
-				historyDao.delete(oldDetails.id)
-				historyDao.upsert(newHistory)
-			}
-			// track
-			val tracksDao = database.getTracksDao()
-			val oldTrack = tracksDao.find(oldDetails.id)
-			if (oldTrack != null) {
-				val lastChapter = newDetails.chapters?.lastOrNull()
-				val newTrack = TrackEntity(
-					mangaId = newDetails.id,
-					lastChapterId = lastChapter?.id ?: 0L,
-					newChapters = 0,
-					lastCheckTime = System.currentTimeMillis(),
-					lastChapterDate = lastChapter?.uploadDate ?: 0L,
-					lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION,
-				)
-				tracksDao.delete(oldDetails.id)
-				tracksDao.upsert(newTrack)
-			}
+			progressUpdateUseCase(newManga)
 		}
-		progressUpdateUseCase(newManga)
-	}
 
-	private fun makeNewHistory(
-		oldManga: Manga,
-		newManga: Manga,
-		history: HistoryEntity,
-	): HistoryEntity {
-		if (oldManga.chapters.isNullOrEmpty()) { // probably broken manga/source
-			val branch = newManga.getPreferredBranch(null)
-			val chapters = checkNotNull(newManga.getChapters(branch))
-			val currentChapter = if (history.percent in 0f..1f) {
-				chapters[(chapters.lastIndex * history.percent).toInt()]
-			} else {
-				chapters.first()
+		private fun makeNewHistory(
+			oldManga: Manga,
+			newManga: Manga,
+			history: HistoryEntity,
+		): HistoryEntity {
+			if (oldManga.chapters.isNullOrEmpty()) { // probably broken manga/source
+				val branch = newManga.getPreferredBranch(null)
+				val chapters = checkNotNull(newManga.getChapters(branch))
+				val currentChapter =
+					if (history.percent in 0f..1f) {
+						chapters[(chapters.lastIndex * history.percent).toInt()]
+					} else {
+						chapters.first()
+					}
+				return HistoryEntity(
+					mangaId = newManga.id,
+					createdAt = history.createdAt,
+					updatedAt = System.currentTimeMillis(),
+					chapterId = currentChapter.id,
+					page = history.page,
+					scroll = history.scroll,
+					percent = history.percent,
+					deletedAt = 0,
+					chaptersCount = chapters.size,
+				)
 			}
+			val branch = oldManga.getPreferredBranch(history.toMangaHistory())
+			val oldChapters = checkNotNull(oldManga.getChapters(branch))
+			var index = oldChapters.indexOfFirst { it.id == history.chapterId }
+			if (index < 0) {
+				index =
+					if (history.percent in 0f..1f) {
+						(oldChapters.lastIndex * history.percent).toInt()
+					} else {
+						0
+					}
+			}
+			val newChapters = checkNotNull(newManga.chapters).groupBy { it.branch }
+			val newBranch =
+				if (newChapters.containsKey(branch)) {
+					branch
+				} else {
+					newManga.getPreferredBranch(null)
+				}
+			val newChapterId =
+				checkNotNull(newChapters[newBranch])
+					.let {
+						val oldChapter = oldChapters[index]
+						it.findByNumber(oldChapter.volume, oldChapter.number) ?: it.getOrNull(index) ?: it.last()
+					}.id
+
 			return HistoryEntity(
 				mangaId = newManga.id,
 				createdAt = history.createdAt,
 				updatedAt = System.currentTimeMillis(),
-				chapterId = currentChapter.id,
+				chapterId = newChapterId,
 				page = history.page,
 				scroll = history.scroll,
-				percent = history.percent,
+				percent = PROGRESS_NONE,
 				deletedAt = 0,
-				chaptersCount = chapters.size,
+				chaptersCount = checkNotNull(newChapters[newBranch]).size,
 			)
 		}
-		val branch = oldManga.getPreferredBranch(history.toMangaHistory())
-		val oldChapters = checkNotNull(oldManga.getChapters(branch))
-		var index = oldChapters.indexOfFirst { it.id == history.chapterId }
-		if (index < 0) {
-			index = if (history.percent in 0f..1f) {
-				(oldChapters.lastIndex * history.percent).toInt()
+
+		private fun List<MangaChapter>.findByNumber(
+			volume: Int,
+			number: Float,
+		): MangaChapter? =
+			if (number <= 0f) {
+				null
 			} else {
-				0
+				firstOrNull { it.volume == volume && it.number == number }
 			}
-		}
-		val newChapters = checkNotNull(newManga.chapters).groupBy { it.branch }
-		val newBranch = if (newChapters.containsKey(branch)) {
-			branch
-		} else {
-			newManga.getPreferredBranch(null)
-		}
-		val newChapterId = checkNotNull(newChapters[newBranch]).let {
-			val oldChapter = oldChapters[index]
-			it.findByNumber(oldChapter.volume, oldChapter.number) ?: it.getOrNull(index) ?: it.last()
-		}.id
-
-		return HistoryEntity(
-			mangaId = newManga.id,
-			createdAt = history.createdAt,
-			updatedAt = System.currentTimeMillis(),
-			chapterId = newChapterId,
-			page = history.page,
-			scroll = history.scroll,
-			percent = PROGRESS_NONE,
-			deletedAt = 0,
-			chaptersCount = checkNotNull(newChapters[newBranch]).size,
-		)
 	}
-
-	private fun List<MangaChapter>.findByNumber(volume: Int, number: Float): MangaChapter? {
-		return if (number <= 0f) {
-			null
-		} else {
-			firstOrNull { it.volume == volume && it.number == number }
-		}
-	}
-}

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

@@ -10,6 +10,7 @@ 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
@@ -63,7 +64,7 @@ fun alternativeAD(
 		}
 		binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.chipSource.also { chip ->
-			chip.text = item.manga.source.title
+			chip.text = item.manga.source.getTitle(chip.context)
 			ImageRequest.Builder(context)
 				.data(item.manga.source.faviconUri())
 				.lifecycle(lifecycleOwner)

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

@@ -13,6 +13,7 @@ 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
@@ -95,9 +96,9 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 				getString(
 					R.string.migrate_confirmation,
 					viewModel.manga.title,
-					viewModel.manga.source.title,
+					viewModel.manga.source.getTitle(this),
 					target.title,
-					target.source.title,
+					target.source.getTitle(this),
 				),
 			)
 			.setNegativeButton(android.R.string.cancel, null)

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

@@ -12,13 +12,14 @@ 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
@@ -42,10 +43,9 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		val userAgent = intent?.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE)?.let { source ->
-			val repository = mangaRepositoryFactory.create(source) as? RemoteMangaRepository
-			repository?.headers?.get(CommonHeaders.USER_AGENT)
-		}
+		val mangaSource = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
+		val repository = mangaRepositoryFactory.create(mangaSource) 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)
+				.putExtra(EXTRA_SOURCE, source?.name)
 		}
 	}
 }

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

@@ -14,8 +14,9 @@ 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(
@@ -46,7 +47,7 @@ class CaptchaNotifier(
 			.setGroup(GROUP_CAPTCHA)
 			.setAutoCancel(true)
 			.setVisibility(
-				if (exception.source?.contentType == ContentType.HENTAI) {
+				if (exception.source?.isNsfw() == true) {
 					NotificationCompat.VISIBILITY_SECRET
 				} else {
 					NotificationCompat.VISIBILITY_PUBLIC
@@ -55,7 +56,7 @@ class CaptchaNotifier(
 			.setContentText(
 				context.getString(
 					R.string.captcha_required_summary,
-					exception.source?.title ?: context.getString(R.string.app_name),
+					exception.source?.getTitle(context) ?: context.getString(R.string.app_name),
 				),
 			)
 			.setContentIntent(PendingIntentCompat.getActivity(context, 0, intent, 0, false))

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

@@ -48,6 +48,7 @@ import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.main.domain.CoverRestoreInterceptor
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.settings.backup.BackupObserver
@@ -152,10 +153,12 @@ interface AppModule {
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
 			acraScreenLogger: AcraScreenLogger,
+			screenshotPolicyHelper: ScreenshotPolicyHelper,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
 			acraScreenLogger,
+			screenshotPolicyHelper,
 		)
 
 		@Provides

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

@@ -84,6 +84,7 @@ class JsonDeserializer(private val json: JSONObject) {
 		source = json.getString("source"),
 		isEnabled = json.getBoolean("enabled"),
 		sortKey = json.getInt("sort_key"),
+		addedIn = json.getIntOrDefault("added_in", 0),
 	)
 
 	fun toMap(): Map<String, Any?> {

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

@@ -33,6 +33,7 @@ import org.koitharu.kotatsu.core.db.migrations.Migration17To18
 import org.koitharu.kotatsu.core.db.migrations.Migration18To19
 import org.koitharu.kotatsu.core.db.migrations.Migration19To20
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
+import org.koitharu.kotatsu.core.db.migrations.Migration20To21
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
 import org.koitharu.kotatsu.core.db.migrations.Migration4To5
@@ -58,7 +59,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 = 20
+const val DATABASE_VERSION = 21
 
 @Database(
 	entities = [
@@ -118,6 +119,7 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration17To18(),
 	Migration18To19(),
 	Migration19To20(),
+	Migration20To21(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

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

@@ -11,6 +11,7 @@ import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
 import org.intellij.lang.annotations.Language
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 
@@ -23,6 +24,9 @@ abstract class MangaSourcesDao {
 	@Query("SELECT source FROM sources WHERE enabled = 1")
 	abstract suspend fun findAllEnabledNames(): List<String>
 
+	@Query("SELECT * FROM sources WHERE added_in >= :version")
+	abstract suspend fun findAllFromVersion(version: Int): List<MangaSourceEntity>
+
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
 
@@ -68,6 +72,7 @@ abstract class MangaSourcesDao {
 				source = source,
 				isEnabled = isEnabled,
 				sortKey = getMaxSortKey() + 1,
+				addedIn = BuildConfig.VERSION_CODE,
 			)
 			upsert(entity)
 		}

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

@@ -14,4 +14,5 @@ data class MangaSourceEntity(
 	val source: String,
 	@ColumnInfo(name = "enabled") val isEnabled: Boolean,
 	@ColumnInfo(name = "sort_key", index = true) val sortKey: Int,
+	@ColumnInfo(name = "added_in") val addedIn: Int,
 )

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.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 
 class Migration16To17(context: Context) : Migration(16, 17) {
 
@@ -15,11 +15,8 @@ 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 = MangaSource.entries
+		val sources = MangaParserSource.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/Migration20To21.kt

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

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

@@ -11,7 +11,6 @@ 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
@@ -109,7 +108,7 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 }
 
 val Manga.isLocal: Boolean
-	get() = source == MangaSource.LOCAL
+	get() = source == LocalMangaSource
 
 val Manga.appUrl: Uri
 	get() = Uri.parse("https://kotatsu.app/manga").buildUpon()

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

@@ -7,26 +7,41 @@ 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 org.koitharu.kotatsu.parsers.util.toTitleCase
-import java.util.Locale
 import com.google.android.material.R as materialR
 
-fun MangaSource(name: String): MangaSource {
-	MangaSource.entries.forEach {
-		if (it.name == name) return it
-	}
-	return MangaSource.DUMMY
+data object LocalMangaSource : MangaSource {
+	override val name = "LOCAL"
 }
 
-fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
+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 {
+		if (it.name == name) return it
+	}
+	return UnknownMangaSource
+}
+
+fun MangaSource.isNsfw() = when (this) {
+	is MangaParserSource -> contentType == ContentType.HENTAI
+	else -> false
+}
 
 @get:StringRes
 val ContentType.titleResId
@@ -37,23 +52,23 @@ val ContentType.titleResId
 		ContentType.OTHER -> R.string.content_type_other
 	}
 
-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)
+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)
 	}
-} else {
-	title
+
+	else -> null
 }
 
-private fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
+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(
 	ForegroundColorSpan(context.getThemeColor(materialR.attr.colorError, Color.RED)),
 	RelativeSizeSpan(0.74f),
 	SuperscriptSpan(),

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

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

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

@@ -5,6 +5,7 @@ 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
@@ -30,7 +31,7 @@ data class ParcelableManga(
 			parcel.writeParcelable(ParcelableMangaTags(tags), flags)
 			parcel.writeSerializable(state)
 			parcel.writeString(author)
-			parcel.writeSerializable(source)
+			parcel.writeString(source.name)
 		}
 
 		override fun create(parcel: Parcel) = ParcelableManga(
@@ -49,8 +50,8 @@ data class ParcelableManga(
 				state = parcel.readSerializableCompat(),
 				author = parcel.readString(),
 				chapters = null,
-				source = requireNotNull(parcel.readSerializableCompat()),
-			)
+				source = MangaSource(parcel.readString()),
+			),
 		)
 	}
 }

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.util.ext.readSerializableCompat
+import org.koitharu.kotatsu.core.model.MangaSource
 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 = requireNotNull(parcel.readSerializableCompat()),
+		source = MangaSource(parcel.readString()),
 	)
 
 	override fun MangaPage.write(parcel: Parcel, flags: Int) {
 		parcel.writeLong(id)
 		parcel.writeString(url)
 		parcel.writeString(preview)
-		parcel.writeSerializable(source)
+		parcel.writeString(source.name)
 	}
 }
 

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.util.ext.readSerializableCompat
+import org.koitharu.kotatsu.core.model.MangaSource
 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 = requireNotNull(parcel.readSerializableCompat()),
+		source = MangaSource(parcel.readString()),
 	)
 
 	override fun MangaTag.write(parcel: Parcel, flags: Int) {
 		parcel.writeString(title)
 		parcel.writeString(key)
-		parcel.writeSerializable(source)
+		parcel.writeString(source.name)
 	}
 }
 

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

@@ -85,7 +85,7 @@ class DoHManager(
 			).build()
 
 		DoHProvider.ZERO_MS -> DnsOverHttps.Builder().client(bootstrapClient)
-			.url("https://0ms.dev/dns-query".toHttpUrl())
+			.url("https://2ca4h4crra.cloudflare-gateway.com/dns-query".toHttpUrl())
 			.resolvePublicAddresses(true)
 			.build()
 	}

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

@@ -15,6 +15,7 @@ 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
@@ -26,8 +27,8 @@ class MirrorSwitchInterceptor @Inject constructor(
 	private val settings: AppSettings,
 ) : Interceptor {
 
-	private val locks = EnumMap<MangaSource, Any>(MangaSource::class.java)
-	private val blacklist = EnumMap<MangaSource, MutableSet<String>>(MangaSource::class.java)
+	private val locks = EnumMap<MangaParserSource, Any>(MangaParserSource::class.java)
+	private val blacklist = EnumMap<MangaParserSource, MutableSet<String>>(MangaParserSource::class.java)
 
 	val isEnabled: Boolean
 		get() = settings.isMirrorSwitchingAvailable
@@ -145,15 +146,15 @@ class MirrorSwitchInterceptor @Inject constructor(
 		return source().readByteArray().toResponseBody(contentType())
 	}
 
-	private fun obtainLock(source: MangaSource): Any = locks.getOrPut(source) {
+	private fun obtainLock(source: MangaParserSource): Any = locks.getOrPut(source) {
 		Any()
 	}
 
-	private fun isBlacklisted(source: MangaSource, domain: String): Boolean {
+	private fun isBlacklisted(source: MangaParserSource, domain: String): Boolean {
 		return blacklist[source]?.contains(domain) == true
 	}
 
-	private fun addToBlacklist(source: MangaSource, domain: String) {
+	private fun addToBlacklist(source: MangaParserSource, domain: String) {
 		blacklist.getOrPut(source) {
 			ArraySet(2)
 		}.add(domain)

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

@@ -21,6 +21,7 @@ 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
@@ -173,9 +174,10 @@ 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(source.title)
-			.setLongLabel(source.title)
+			.setShortLabel(title)
+			.setLongLabel(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.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 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, MangaSource.DUMMY) {
+class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaParserSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
 		get() = ConfigKey.Domain("localhost")

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

@@ -0,0 +1,54 @@
+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.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 {
+
+	override val sortOrders: 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 getPages(chapter: MangaChapter): List<MangaPage> = stub(null)
+
+	override suspend fun getPageUrl(page: MangaPage): String = 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)
+
+	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,6 +12,7 @@ import org.koitharu.kotatsu.core.db.entity.toEntities
 import org.koitharu.kotatsu.core.db.entity.toEntity
 import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.ext.toFileOrNull
@@ -101,7 +102,7 @@ class MangaDataRepository @Inject constructor(
 
 	suspend fun cleanupLocalManga() {
 		val dao = db.getMangaDao()
-		val broken = dao.findAllBySource(MangaSource.LOCAL.name)
+		val broken = dao.findAllBySource(LocalMangaSource.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,10 +4,11 @@ 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
@@ -36,7 +37,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 != MangaSource.DUMMY) { "Manga source $sourceName is not supported" }
+		require(source != UnknownMangaSource) { "Manga source $sourceName is not supported" }
 		val repo = repositoryFactory.create(source)
 		return repo.findExact(
 			url = uri.getQueryParameter("url"),
@@ -108,7 +109,7 @@ class MangaLinkResolver @Inject constructor(
 		url = url,
 		publicUrl = "",
 		rating = 0.0f,
-		isNsfw = source.contentType == ContentType.HENTAI,
+		isNsfw = source.isNsfw(),
 		coverUrl = "",
 		tags = emptySet(),
 		state = null,

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

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

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

@@ -1,7 +1,10 @@
 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
@@ -10,12 +13,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
@@ -61,24 +64,35 @@ interface MangaRepository {
 		private val mirrorSwitchInterceptor: MirrorSwitchInterceptor,
 	) {
 
-		private val cache = EnumMap<MangaSource, WeakReference<RemoteMangaRepository>>(MangaSource::class.java)
+		private val cache = ArrayMap<MangaSource, WeakReference<MangaRepository>>()
 
 		@AnyThread
 		fun create(source: MangaSource): MangaRepository {
-			if (source == MangaSource.LOCAL) {
-				return localMangaRepository
+			when (source) {
+				LocalMangaSource -> return localMangaRepository
+				UnknownMangaSource -> return EmptyMangaRepository(source)
 			}
 			cache[source]?.get()?.let { return it }
 			return synchronized(cache) {
 				cache[source]?.get()?.let { return it }
-				val repository = RemoteMangaRepository(
-					parser = MangaParser(source, loaderContext),
-					cache = contentCache,
-					mirrorSwitchInterceptor = mirrorSwitchInterceptor,
-				)
-				cache[source] = WeakReference(repository)
-				repository
+				val repository = createRepository(source)
+				if (repository != null) {
+					cache[source] = WeakReference(repository)
+					repository
+				} else {
+					EmptyMangaRepository(source)
+				}
 			}
 		}
+
+		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.MangaSource
+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
@@ -46,7 +46,7 @@ class RemoteMangaRepository(
 	private val relatedMangaMutex = MultiMutex<Long>()
 	private val pagesMutex = MultiMutex<Long>()
 
-	override val source: MangaSource
+	override val source: MangaParserSource
 		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}[${mangaSource.ordinal}]x${options.size.toCacheKey()}"
+		get() = options.diskCacheKey ?: "${mangaSource.name}x${options.size.toCacheKey()}"
 
 	private val fileSystem
 		get() = checkNotNull(diskCache.value).fileSystem

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

@@ -290,17 +290,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_SOURCES_GRID, true)
 		set(value) = prefs.edit { putBoolean(KEY_SOURCES_GRID, value) }
 
-	val isNewSourcesTipEnabled: Boolean
-		get() = prefs.getBoolean(KEY_SOURCES_NEW, true)
+	var sourcesVersion: Int
+		get() = prefs.getInt(KEY_SOURCES_VERSION, 0)
+		set(value) = prefs.edit { putInt(KEY_SOURCES_VERSION, value) }
 
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
 
 	val screenshotsPolicy: ScreenshotsPolicy
-		get() = runCatching {
-			val key = prefs.getString(KEY_SCREENSHOTS_POLICY, null)?.uppercase(Locale.ROOT)
-			if (key == null) ScreenshotsPolicy.ALLOW else ScreenshotsPolicy.valueOf(key)
-		}.getOrDefault(ScreenshotsPolicy.ALLOW)
+		get() = prefs.getEnumValue(KEY_SCREENSHOTS_POLICY, ScreenshotsPolicy.ALLOW)
 
 	var userSpecifiedMangaDirectories: Set<File>
 		get() {
@@ -653,7 +651,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_APP_LOCALE = "app_locale"
 		const val KEY_LOGGING_ENABLED = "logging"
 		const val KEY_SOURCES_GRID = "sources_grid"
-		const val KEY_SOURCES_NEW = "sources_new"
 		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
 		const val KEY_TIPS_CLOSED = "tips_closed"
 		const val KEY_SSL_BYPASS = "ssl_bypass"
@@ -689,6 +686,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_STATS_ENABLED = "stats_on"
 		const val KEY_FEED_HEADER = "feed_header"
 		const val KEY_SEARCH_SUGGESTION_TYPES = "search_suggest_types"
+		const val KEY_SOURCES_VERSION = "sources_version"
 
 		// keys for non-persistent preferences
 		const val KEY_APP_VERSION = "app_version"

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

@@ -3,5 +3,5 @@ package org.koitharu.kotatsu.core.prefs
 enum class ScreenshotsPolicy {
 
 	// Do not rename this
-	ALLOW, BLOCK_NSFW, BLOCK_ALL;
-}
+	ALLOW, BLOCK_NSFW, BLOCK_INCOGNITO, BLOCK_ALL;
+}

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

@@ -19,6 +19,8 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
@@ -26,10 +28,12 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.isWebViewUnavailable
+import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 
 @Suppress("LeakingThis")
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
+	ScreenshotPolicyHelper.ContentContainer,
 	WindowInsetsDelegate.WindowInsetsListener {
 
 	private var isAmoledTheme = false
@@ -151,6 +155,8 @@ abstract class BaseActivity<B : ViewBinding> :
 		}
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = flowOf(false)
+
 	private fun putDataToExtras(intent: Intent?) {
 		intent?.putExtra(EXTRA_DATA, intent.data)
 	}

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

@@ -68,7 +68,7 @@ abstract class BaseViewModel : ViewModel() {
 		errorEvent.call(error)
 	}
 
-	protected inline suspend fun <T> withLoading(block: () -> T): T = try {
+	protected inline fun <T> withLoading(block: () -> T): T = try {
 		loadingCounter.increment()
 		block()
 	} finally {

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

@@ -52,6 +52,16 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 		fastScroller.visibility = if (isFastScrollerEnabled) visibility else GONE
 	}
 
+	override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) {
+		super.setPadding(left, top, right, bottom)
+		fastScroller.setPadding(left, top, right, bottom)
+	}
+
+	override fun setPaddingRelative(start: Int, top: Int, end: Int, bottom: Int) {
+		super.setPaddingRelative(start, top, end, bottom)
+		fastScroller.setPaddingRelative(start, top, end, bottom)
+	}
+
 	override fun onAttachedToWindow() {
 		super.onAttachedToWindow()
 		fastScroller.attachRecyclerView(this)

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

@@ -12,6 +12,8 @@ import com.google.android.material.chip.ChipGroup
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.castOrNull
 
+import com.google.android.material.R as materialR
+
 class ChipsView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
@@ -24,7 +26,9 @@ class ChipsView @JvmOverloads constructor(
 		onChipClickListener?.onChipClick(it as Chip, it.tag)
 	}
 	private val chipOnCloseListener = OnClickListener {
-		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
+		val chip = it as Chip
+		val data = it.tag
+		onChipCloseClickListener?.onChipCloseClick(chip, data) ?: onChipClickListener?.onChipClick(chip, data)
 	}
 	private val chipStyle: Int
 	var onChipClickListener: OnChipClickListener? = null
@@ -48,7 +52,7 @@ class ChipsView @JvmOverloads constructor(
 		if (isInEditMode) {
 			setChips(
 				List(5) {
-					ChipModel(0, "Chip $it", 0, isCheckable = false, isChecked = false)
+					ChipModel(title = "Chip $it")
 				},
 			)
 		}
@@ -99,6 +103,15 @@ class ChipsView @JvmOverloads constructor(
 			chip.isChipIconVisible = true
 		}
 		chip.isChecked = model.isChecked
+		chip.isCheckedIconVisible = chip.isCheckable && model.icon == 0
+		chip.isCloseIconVisible = if (onChipCloseClickListener != null || model.isDropdown) {
+			chip.setCloseIconResource(
+				if (model.isDropdown) R.drawable.ic_expand_more else materialR.drawable.ic_m3_chip_close,
+			)
+			true
+		} else {
+			false
+		}
 		chip.tag = model.data
 	}
 
@@ -106,12 +119,11 @@ class ChipsView @JvmOverloads constructor(
 		val chip = Chip(context)
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, chipStyle)
 		chip.setChipDrawable(drawable)
-		chip.isCheckedIconVisible = true
 		chip.isChipIconVisible = false
-		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
+		chip.isElegantTextHeight = false
 		addView(chip)
 		return chip
 	}
@@ -127,11 +139,12 @@ class ChipsView @JvmOverloads constructor(
 	}
 
 	data class ChipModel(
-		@ColorRes val tint: Int,
 		val title: CharSequence,
-		@DrawableRes val icon: Int,
-		val isCheckable: Boolean,
-		val isChecked: Boolean,
+		@DrawableRes val icon: Int = 0,
+		val isCheckable: Boolean = false,
+		@ColorRes val tint: Int = 0,
+		val isChecked: Boolean = false,
+		val isDropdown: Boolean = false,
 		val data: Any? = null,
 	)
 

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

@@ -1,14 +1,27 @@
 package org.koitharu.kotatsu.core.util
 
 import androidx.core.os.LocaleListCompat
-import org.koitharu.kotatsu.core.util.ext.map
+import org.koitharu.kotatsu.core.util.ext.iterator
 import java.util.Locale
 
 class LocaleComparator : Comparator<Locale> {
 
-	private val deviceLocales = LocaleListCompat.getAdjustedDefault()//LocaleManagerCompat.getSystemLocales(context)
-		.map { it.language }
-		.distinct()
+	private val deviceLocales: List<String>
+
+	init {
+		val localeList = LocaleListCompat.getAdjustedDefault()
+		deviceLocales = buildList(localeList.size() + 1) {
+			add("")
+			val set = HashSet<String>(localeList.size() + 1)
+			set.add("")
+			for (locale in localeList) {
+				val lang = locale.language
+				if (set.add(lang)) {
+					add(lang)
+				}
+			}
+		}
+	}
 
 	override fun compare(a: Locale, b: Locale): Int {
 		val indexA = deviceLocales.indexOf(a.language)

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

@@ -22,11 +22,10 @@ fun LocaleListCompat.getOrThrow(index: Int) = get(index) ?: throw NoSuchElementE
 
 fun String.toLocale() = Locale(this)
 
-fun Locale?.getDisplayName(context: Context): String {
-	if (this == null) {
-		return context.getString(R.string.various_languages)
-	}
-	return getDisplayLanguage(this).toTitleCase(this)
+fun Locale?.getDisplayName(context: Context): String = when (this) {
+	null -> context.getString(R.string.all_languages)
+	Locale.ROOT -> context.getString(R.string.various_languages)
+	else -> getDisplayLanguage(this).toTitleCase(this)
 }
 
 private class LocaleListCompatIterator(private val list: LocaleListCompat) : ListIterator<Locale> {

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

@@ -5,7 +5,9 @@ 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
@@ -62,7 +64,7 @@ class MangaPrefetchService : CoroutineIntentService() {
 
 	private suspend fun prefetchLast() {
 		val last = historyRepository.getLastOrNull() ?: return
-		if (last.source == MangaSource.LOCAL) return
+		if (last.isLocal) return
 		val repo = mangaRepositoryFactory.create(last.source)
 		val details = runCatchingCancellable { repo.getDetails(last) }.getOrNull() ?: return
 		val chapters = details.chapters
@@ -110,7 +112,7 @@ class MangaPrefetchService : CoroutineIntentService() {
 		}
 
 		private fun isPrefetchAvailable(context: Context, source: MangaSource?): Boolean {
-			if (source == MangaSource.LOCAL || context.isPowerSaveMode()) {
+			if (source == LocalMangaSource || context.isPowerSaveMode()) {
 				return false
 			}
 			val entryPoint = EntryPointAccessors.fromApplication(

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

@@ -34,13 +34,18 @@ import coil.util.CoilUtils
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.filterNotNull
+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
@@ -92,7 +97,6 @@ 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
@@ -197,6 +201,8 @@ class DetailsActivity :
 		addMenuProvider(menuProvider)
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = viewModel.manga.map { it?.isNsfw == true }
+
 	override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_read -> openReader(isIncognitoMode = false)
@@ -459,10 +465,10 @@ class DetailsActivity :
 				imageViewState.isVisible = false
 			}
 
-			if (manga.source == MangaSource.LOCAL || manga.source == MangaSource.DUMMY) {
+			if (manga.source == LocalMangaSource || manga.source == UnknownMangaSource) {
 				infoLayout.chipSource.isVisible = false
 			} else {
-				infoLayout.chipSource.text = manga.source.title
+				infoLayout.chipSource.text = manga.source.getTitle(this@DetailsActivity)
 				infoLayout.chipSource.isVisible = true
 			}
 
@@ -534,7 +540,7 @@ class DetailsActivity :
 		}
 		val isFirstCall = buttonRead.tag == null
 		buttonRead.tag = Unit
-		buttonRead.setProgress(info.history?.percent?.coerceIn(0f, 1f) ?: 0f, !isFirstCall)
+		buttonRead.setProgress(info.percent.coerceIn(0f, 1f), !isFirstCall)
 		buttonDownload?.isEnabled = info.isValid && info.canDownload
 		buttonRead.isEnabled = info.isValid
 	}
@@ -612,10 +618,7 @@ class DetailsActivity :
 				ChipsView.ChipModel(
 					title = tag.title,
 					tint = tagHighlighter.getTagTint(tag),
-					icon = 0,
 					data = tag,
-					isCheckable = false,
-					isChecked = false,
 				)
 			},
 		)

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

@@ -16,11 +16,12 @@ 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
@@ -38,10 +39,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 != 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_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_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
@@ -53,7 +54,7 @@ class DetailsMenuProvider(
 			R.id.action_share -> {
 				viewModel.manga.value?.let {
 					val shareHelper = ShareHelper(activity)
-					if (it.source == MangaSource.LOCAL) {
+					if (it.isLocal) {
 						shareHelper.shareCbz(listOf(it.url.toUri().toFile()))
 					} else {
 						shareHelper.shareMangaLink(it)

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

@@ -93,15 +93,19 @@ class DetailsViewModel @Inject constructor(
 
 	val details = MutableStateFlow(intent.manga?.let { MangaDetails(it, null, null, false) })
 	val manga = details.map { x -> x?.toManga() }
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	val history = historyRepository.observeOne(mangaId)
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	val favouriteCategories = interactor.observeFavourite(mangaId)
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptySet())
 
 	val isStatsAvailable = statsRepository.observeHasStats(mangaId)
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
 
 	val remoteManga = MutableStateFlow<Manga?>(null)
@@ -162,7 +166,7 @@ class DetailsViewModel @Inject constructor(
 
 	val onMangaRemoved = MutableEventFlow<Manga>()
 	val isScrobblingAvailable: Boolean
-		get() = scrobblers.any { it.isAvailable }
+		get() = scrobblers.any { it.isEnabled }
 
 	val scrobblingInfo: StateFlow<List<ScrobblingInfo>> = interactor.observeScrobblingInfo(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
@@ -393,7 +397,7 @@ class DetailsViewModel @Inject constructor(
 	private fun getScrobbler(index: Int): Scrobbler? {
 		val info = scrobblingInfo.value.getOrNull(index)
 		val scrobbler = if (info != null) {
-			scrobblers.find { it.scrobblerService == info.scrobbler && it.isAvailable }
+			scrobblers.find { it.scrobblerService == info.scrobbler && it.isEnabled }
 		} else {
 			null
 		}

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

@@ -16,6 +16,13 @@ data class HistoryInfo(
 
 	val canContinue
 		get() = currentChapter >= 0
+
+	val percent: Float
+		get() = if (history != null && (canContinue || isChapterMissing)) {
+			history.percent
+		} else {
+			0f
+		}
 }
 
 fun HistoryInfo(

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

@@ -21,6 +21,7 @@ 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
@@ -40,7 +41,6 @@ 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 == MangaSource.LOCAL
+			val isLocal = x.isDownloaded || x.chapter.source == LocalMangaSource
 			if (isLocal) canSave = false else canDelete = false
 		}
 		menu.findItem(R.id.action_save).isVisible = canSave

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, MangaSource.LOCAL)
+			MangaListActivity.newIntent(context, LocalMangaSource)
 		},
 		PendingIntent.FLAG_CANCEL_CURRENT,
 		false,

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

@@ -43,6 +43,7 @@ import okio.sink
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
 import org.koitharu.kotatsu.core.model.ids
+import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
@@ -177,7 +178,7 @@ class DownloadWorker @AssistedInject constructor(
 			checkNotNull(destination) { applicationContext.getString(R.string.cannot_find_available_storage) }
 			var output: LocalMangaOutput? = null
 			try {
-				if (manga.source == MangaSource.LOCAL) {
+				if (manga.isLocal) {
 					manga = localMangaRepository.getRemoteManga(manga)
 						?: error("Cannot obtain remote manga instance")
 				}

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

@@ -6,21 +6,23 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.isNsfw
 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
 import java.util.EnumSet
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
 @Reusable
@@ -29,39 +31,76 @@ class MangaSourcesRepository @Inject constructor(
 	private val settings: AppSettings,
 ) {
 
+	private val isNewSourcesAssimilated = AtomicBoolean(false)
 	private val dao: MangaSourcesDao
 		get() = db.getSourcesDao()
 
-	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
-		remove(MangaSource.LOCAL)
+	private val remoteSources = EnumSet.allOf(MangaParserSource::class.java).apply {
 		if (!BuildConfig.DEBUG) {
-			remove(MangaSource.DUMMY)
+			remove(MangaParserSource.DUMMY)
 		}
 	}
 
-	val allMangaSources: Set<MangaSource>
+	val allMangaSources: Set<MangaParserSource>
 		get() = Collections.unmodifiableSet(remoteSources)
 
 	suspend fun getEnabledSources(): List<MangaSource> {
+		assimilateNewSources()
 		val order = settings.sourcesSortOrder
 		return dao.findAllEnabled(order).toSources(settings.isNsfwContentDisabled, order)
 	}
 
 	suspend fun getDisabledSources(): Set<MangaSource> {
+		assimilateNewSources()
 		val result = EnumSet.copyOf(remoteSources)
 		val enabled = dao.findAllEnabledNames()
 		for (name in enabled) {
-			val source = MangaSource(name)
+			val source = name.toMangaSourceOrNull() ?: continue
 			result.remove(source)
 		}
-		if (settings.isNsfwContentDisabled) {
-			result.removeAll { it.isNsfw() }
-		}
 		return result
 	}
 
+	suspend fun getAvailableSources(
+		isDisabledOnly: Boolean,
+		isNewOnly: Boolean,
+		excludeBroken: Boolean,
+		types: Set<ContentType>,
+		query: String?,
+		locale: String?,
+		sortOrder: SourcesSortOrder?,
+	): List<MangaParserSource> {
+		assimilateNewSources()
+		val entities = dao.findAll().toMutableList()
+		if (isDisabledOnly) {
+			entities.removeAll { it.isEnabled }
+		}
+		if (isNewOnly) {
+			entities.retainAll { it.addedIn == BuildConfig.VERSION_CODE }
+		}
+		val sources = entities.toSources(
+			skipNsfwSources = settings.isNsfwContentDisabled,
+			sortOrder = sortOrder,
+		)
+		if (locale != null) {
+			sources.retainAll { it.locale == locale }
+		}
+		if (excludeBroken) {
+			sources.removeAll { it.isBroken }
+		}
+		if (types.isNotEmpty()) {
+			sources.retainAll { it.contentType in types }
+		}
+		if (!query.isNullOrEmpty()) {
+			sources.retainAll {
+				it.title.contains(query, ignoreCase = true) || it.name.contains(query, ignoreCase = true)
+			}
+		}
+		return sources
+	}
+
 	fun observeIsEnabled(source: MangaSource): Flow<Boolean> {
-		return dao.observeIsEnabled(source.name)
+		return dao.observeIsEnabled(source.name).onStart { assimilateNewSources() }
 	}
 
 	fun observeEnabledSourcesCount(): Flow<Int> {
@@ -69,8 +108,10 @@ class MangaSourcesRepository @Inject constructor(
 			observeIsNsfwDisabled(),
 			dao.observeEnabled(SourcesSortOrder.MANUAL),
 		) { skipNsfw, sources ->
-			sources.count { !skipNsfw || !MangaSource(it.source).isNsfw() }
-		}.distinctUntilChanged()
+			sources.count {
+				it.source.toMangaSourceOrNull()?.let { s -> !skipNsfw || !s.isNsfw() } == true
+			}
+		}.distinctUntilChanged().onStart { assimilateNewSources() }
 	}
 
 	fun observeAvailableSourcesCount(): Flow<Int> {
@@ -82,7 +123,7 @@ class MangaSourcesRepository @Inject constructor(
 			allMangaSources.count { x ->
 				x.name !in enabled && (!skipNsfw || !x.isNsfw())
 			}
-		}.distinctUntilChanged()
+		}.distinctUntilChanged().onStart { assimilateNewSources() }
 	}
 
 	fun observeEnabledSources(): Flow<List<MangaSource>> = combine(
@@ -92,18 +133,18 @@ class MangaSourcesRepository @Inject constructor(
 		dao.observeEnabled(order).map {
 			it.toSources(skipNsfw, order)
 		}
-	}.flatMapLatest { it }
+	}.flatMapLatest { it }.onStart { assimilateNewSources() }
 
 	fun observeAll(): Flow<List<Pair<MangaSource, Boolean>>> = dao.observeAll().map { entities ->
 		val result = ArrayList<Pair<MangaSource, Boolean>>(entities.size)
 		for (entity in entities) {
-			val source = MangaSource(entity.source)
+			val source = entity.source.toMangaSourceOrNull() ?: continue
 			if (source in remoteSources) {
 				result.add(source to entity.isEnabled)
 			}
 		}
 		result
-	}
+	}.onStart { assimilateNewSources() }
 
 	suspend fun setSourcesEnabled(sources: Collection<MangaSource>, isEnabled: Boolean): ReversibleHandle {
 		setSourcesEnabledImpl(sources, isEnabled)
@@ -114,6 +155,7 @@ class MangaSourcesRepository @Inject constructor(
 
 	suspend fun setSourcesEnabledExclusive(sources: Set<MangaSource>) {
 		db.withTransaction {
+			assimilateNewSources()
 			for (s in remoteSources) {
 				dao.setEnabled(s.name, s in sources)
 			}
@@ -135,31 +177,34 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	fun observeNewSources(): Flow<Set<MangaSource>> = observeIsNewSourcesEnabled().flatMapLatest {
-		if (it) {
-			combine(
-				dao.observeAll(),
-				observeIsNsfwDisabled(),
-			) { entities, skipNsfw ->
-				val result = EnumSet.copyOf(remoteSources)
-				for (e in entities) {
-					result.remove(MangaSource(e.source))
-				}
-				if (skipNsfw) {
-					result.removeAll { x -> x.isNsfw() }
-				}
-				result
-			}.distinctUntilChanged()
+	fun observeHasNewSources(): Flow<Boolean> = observeIsNsfwDisabled().map { skipNsfw ->
+		val sources = dao.findAllFromVersion(BuildConfig.VERSION_CODE).toSources(skipNsfw, null)
+		sources.isNotEmpty() && sources.size != remoteSources.size
+	}.onStart { assimilateNewSources() }
+
+	fun observeHasNewSourcesForBadge(): Flow<Boolean> = combine(
+		settings.observeAsFlow(AppSettings.KEY_SOURCES_VERSION) { sourcesVersion },
+		observeIsNsfwDisabled(),
+	) { version, skipNsfw ->
+		if (version < BuildConfig.VERSION_CODE) {
+			val sources = dao.findAllFromVersion(version).toSources(skipNsfw, null)
+			sources.isNotEmpty()
 		} else {
-			assimilateNewSources()
-			flowOf(emptySet())
+			false
 		}
+	}.onStart { assimilateNewSources() }
+
+	fun clearNewSourcesBadge() {
+		settings.sourcesVersion = BuildConfig.VERSION_CODE
 	}
 
-	suspend fun assimilateNewSources(): Set<MangaSource> {
+	private suspend fun assimilateNewSources(): Boolean {
+		if (isNewSourcesAssimilated.getAndSet(true)) {
+			return false
+		}
 		val new = getNewSources()
 		if (new.isEmpty()) {
-			return emptySet()
+			return false
 		}
 		var maxSortKey = dao.getMaxSortKey()
 		val entities = new.map { x ->
@@ -167,17 +212,15 @@ class MangaSourcesRepository @Inject constructor(
 				source = x.name,
 				isEnabled = false,
 				sortKey = ++maxSortKey,
+				addedIn = BuildConfig.VERSION_CODE,
 			)
 		}
 		dao.insertIfAbsent(entities)
-		if (settings.isNsfwContentDisabled) {
-			new.removeAll { x -> x.isNsfw() }
-		}
-		return new
+		return true
 	}
 
 	suspend fun isSetupRequired(): Boolean {
-		return dao.findAll().isEmpty()
+		return settings.sourcesVersion == 0 && dao.findAllEnabledNames().isEmpty()
 	}
 
 	private suspend fun setSourcesEnabledImpl(sources: Collection<MangaSource>, isEnabled: Boolean) {
@@ -192,11 +235,11 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	private suspend fun getNewSources(): MutableSet<MangaSource> {
+	private suspend fun getNewSources(): MutableSet<out MangaSource> {
 		val entities = dao.findAll()
 		val result = EnumSet.copyOf(remoteSources)
 		for (e in entities) {
-			result.remove(MangaSource(e.source))
+			result.remove(e.source.toMangaSourceOrNull() ?: continue)
 		}
 		return result
 	}
@@ -204,10 +247,10 @@ class MangaSourcesRepository @Inject constructor(
 	private fun List<MangaSourceEntity>.toSources(
 		skipNsfwSources: Boolean,
 		sortOrder: SourcesSortOrder?,
-	): List<MangaSource> {
-		val result = ArrayList<MangaSource>(size)
+	): MutableList<MangaParserSource> {
+		val result = ArrayList<MangaParserSource>(size)
 		for (entity in this) {
-			val source = MangaSource(entity.source)
+			val source = entity.source.toMangaSourceOrNull() ?: continue
 			if (skipNsfwSources && source.isNsfw()) {
 				continue
 			}
@@ -225,11 +268,9 @@ class MangaSourcesRepository @Inject constructor(
 		isNsfwContentDisabled
 	}
 
-	private fun observeIsNewSourcesEnabled() = settings.observeAsFlow(AppSettings.KEY_SOURCES_NEW) {
-		isNewSourcesTipEnabled
-	}
-
 	private fun observeSortOrder() = settings.observeAsFlow(AppSettings.KEY_SOURCES_ORDER) {
 		sourcesSortOrder
 	}
+
+	private fun String.toMangaSourceOrNull(): MangaParserSource? = MangaParserSource.entries.find { it.name == this }
 }

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

@@ -1,5 +1,6 @@
 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
@@ -7,7 +8,6 @@ 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.contentType != ContentType.HENTAI
+		val skipNsfw = settings.isSuggestionsExcludeNsfw && !source.isNsfw()
 		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,6 +20,7 @@ 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
@@ -27,7 +28,6 @@ import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.ui.util.SpanSizeResolver
-import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -40,13 +40,11 @@ import org.koitharu.kotatsu.explore.ui.adapter.ExploreListEventListener
 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.list.ui.model.TipModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
-import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
 import org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
 import javax.inject.Inject
@@ -56,7 +54,7 @@ class ExploreFragment :
 	BaseFragment<FragmentExploreBinding>(),
 	RecyclerViewOwner,
 	ExploreListEventListener,
-	OnListItemClickListener<MangaSourceItem>, TipView.OnButtonClickListener, ListSelectionController.Callback2 {
+	OnListItemClickListener<MangaSourceItem>, ListSelectionController.Callback2 {
 
 	@Inject
 	lateinit var coil: ImageLoader
@@ -74,7 +72,7 @@ class ExploreFragment :
 
 	override fun onViewBindingCreated(binding: FragmentExploreBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this, this) { manga, view ->
+		exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this) { manga, view ->
 			startActivity(DetailsActivity.newIntent(view.context, manga))
 		}
 		sourceSelectionController = ListSelectionController(
@@ -124,21 +122,9 @@ class ExploreFragment :
 		}
 	}
 
-	override fun onPrimaryButtonClick(tipView: TipView) {
-		when ((tipView.tag as? TipModel)?.key) {
-			ExploreViewModel.TIP_NEW_SOURCES -> NewSourcesDialogFragment.show(childFragmentManager)
-		}
-	}
-
-	override fun onSecondaryButtonClick(tipView: TipView) {
-		when ((tipView.tag as? TipModel)?.key) {
-			ExploreViewModel.TIP_NEW_SOURCES -> viewModel.discardNewSources()
-		}
-	}
-
 	override fun onClick(v: View) {
 		val intent = when (v.id) {
-			R.id.button_local -> MangaListActivity.newIntent(v.context, MangaSource.LOCAL)
+			R.id.button_local -> MangaListActivity.newIntent(v.context, LocalMangaSource)
 			R.id.button_bookmarks -> AllBookmarksActivity.newIntent(v.context)
 			R.id.button_more -> SuggestionsActivity.newIntent(v.context)
 			R.id.button_downloads -> DownloadsActivity.newIntent(v.context)
@@ -188,7 +174,7 @@ class ExploreFragment :
 
 	override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
 		val selectedSources = controller.peekCheckedIds().mapNotNullToSet { id ->
-			MangaSource.entries.getOrNull(id.toInt())
+			MangaParserSource.entries.getOrNull(id.toInt()) // TODO
 		}
 		if (selectedSources.isEmpty()) {
 			return false

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

@@ -102,12 +102,6 @@ class ExploreViewModel @Inject constructor(
 		}
 	}
 
-	fun discardNewSources() {
-		launchJob(Dispatchers.Default) {
-			sourcesRepository.assimilateNewSources()
-		}
-	}
-
 	fun requestPinShortcut(source: MangaSource) {
 		launchLoadingJob(Dispatchers.Default) {
 			shortcutManager.requestPinShortcut(source)
@@ -124,7 +118,7 @@ class ExploreViewModel @Inject constructor(
 		getSuggestionFlow(),
 		isGrid,
 		isRandomLoading,
-		sourcesRepository.observeNewSources(),
+		sourcesRepository.observeHasNewSourcesForBadge(),
 	) { content, suggestions, grid, randomLoading, newSources ->
 		buildList(content, suggestions, grid, randomLoading, newSources)
 	}.withErrorHandling()
@@ -134,7 +128,7 @@ class ExploreViewModel @Inject constructor(
 		recommendation: List<Manga>,
 		isGrid: Boolean,
 		randomLoading: Boolean,
-		newSources: Set<MangaSource>,
+		hasNewSources: Boolean,
 	): List<ListModel> {
 		val result = ArrayList<ListModel>(sources.size + 3)
 		result += ExploreButtons(randomLoading)
@@ -146,7 +140,7 @@ class ExploreViewModel @Inject constructor(
 			result += ListHeader(
 				textRes = R.string.remote_sources,
 				buttonTextRes = R.string.catalog,
-				badge = if (newSources.isNotEmpty()) "" else null,
+				badge = if (hasNewSources) "" else null,
 			)
 			sources.mapTo(result) { MangaSourceItem(it, isGrid) }
 		} else {
@@ -191,6 +185,5 @@ class ExploreViewModel @Inject constructor(
 
 		private const val TIP_SUGGESTIONS = "suggestions"
 		private const val SUGGESTIONS_COUNT = 8
-		const val TIP_NEW_SOURCES = "new_sources"
 	}
 }

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

@@ -4,13 +4,11 @@ import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.emptyHintAD
 import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.adapter.tipAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
@@ -18,7 +16,6 @@ class ExploreAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: ExploreListEventListener,
-	tipClickListener: TipView.OnButtonClickListener,
 	clickListener: OnListItemClickListener<MangaSourceItem>,
 	mangaClickListener: OnListItemClickListener<Manga>,
 ) : BaseListAdapter<ListModel>() {
@@ -34,6 +31,5 @@ class ExploreAdapter(
 		addDelegate(ListItemType.EXPLORE_SOURCE_GRID, exploreSourceGridItemAD(coil, clickListener, lifecycleOwner))
 		addDelegate(ListItemType.HINT_EMPTY, emptyHintAD(coil, lifecycleOwner, listener))
 		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
-		addDelegate(ListItemType.TIP, tipAD(tipClickListener))
 	}
 }

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

@@ -1,5 +1,6 @@
 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
 
@@ -8,8 +9,7 @@ data class MangaSourceItem(
 	val isGrid: Boolean,
 ) : ListModel {
 
-	val id: Long
-		get() = source.ordinal.toLong()
+	val id: Long = source.name.longHashCode()
 
 	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,12 +1,10 @@
 package org.koitharu.kotatsu.favourites.domain.model
 
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.find
+import org.koitharu.kotatsu.core.model.MangaSource
 
 data class Cover(
 	val url: String,
 	val source: String,
 ) {
-	val mangaSource: MangaSource?
-		get() = if (source.isEmpty()) null else MangaSource.entries.find(source)
+	val mangaSource by lazy { MangaSource(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,9 +57,7 @@ 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.source == MangaSource.LOCAL
-		}
+		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none { it.isLocal }
 		return super.onPrepareActionMode(controller, mode, menu)
 	}
 

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

@@ -43,6 +43,7 @@ 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
@@ -257,7 +258,7 @@ class FilterCoordinator @Inject constructor(
 			}
 			oldValue.copy(
 				tagsExclude = newTags,
-				tags = oldValue.tags - newTags
+				tags = oldValue.tags - newTags,
 			)
 		}
 	}
@@ -308,7 +309,7 @@ class FilterCoordinator @Inject constructor(
 		currentState.update { oldValue ->
 			oldValue.copy(
 				tags = tags,
-				tagsExclude = oldValue.tagsExclude - tags
+				tagsExclude = oldValue.tagsExclude - tags,
 			)
 		}
 	}
@@ -391,9 +392,7 @@ class FilterCoordinator @Inject constructor(
 		val result = LinkedList<ChipsView.ChipModel>()
 		for (tag in tags) {
 			val model = ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = selectedTags.remove(tag),
 				data = tag,
@@ -406,9 +405,7 @@ class FilterCoordinator @Inject constructor(
 		}
 		for (tag in selectedTags) {
 			val model = ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = true,
 				data = tag,
@@ -455,7 +452,7 @@ class FilterCoordinator @Inject constructor(
 	}
 
 	private fun mergeTags(primary: Set<MangaTag>, secondary: Set<MangaTag>): Set<MangaTag> {
-		val result = TreeSet(TagTitleComparator(repository.source.locale))
+		val result = TreeSet(TagTitleComparator((repository.source as? MangaParserSource)?.locale))
 		result.addAll(secondary)
 		result.addAll(primary)
 		return result

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

@@ -61,10 +61,7 @@ class FilterHeaderFragment : BaseFragment<FragmentFilterHeaderBinding>(), ChipsV
 	}
 
 	private fun moreTagsChip() = ChipsView.ChipModel(
-		tint = 0,
 		title = getString(R.string.more),
 		icon = materialR.drawable.abc_ic_menu_overflow_material,
-		isCheckable = false,
-		isChecked = false,
 	)
 }

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

@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.core.ui.model.titleRes
 import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.parentView
 import org.koitharu.kotatsu.core.util.ext.showDistinct
@@ -29,7 +30,6 @@ import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.toTitleCase
 import java.util.Locale
 import com.google.android.material.R as materialR
 
@@ -122,10 +122,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 			b.spinnerLocale.context,
 			android.R.layout.simple_spinner_dropdown_item,
 			android.R.id.text1,
-			value.availableItems.map {
-				it?.getDisplayLanguage(it)?.toTitleCase(it)
-					?: b.spinnerLocale.context.getString(R.string.various_languages)
-			},
+			value.availableItems.map { it.getDisplayName(b.spinnerLocale.context) },
 		)
 		val selectedIndex = value.availableItems.indexOf(selected)
 		if (selectedIndex >= 0) {
@@ -144,9 +141,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		val chips = ArrayList<ChipsView.ChipModel>(value.selectedItems.size + value.availableItems.size + 1)
 		value.selectedItems.mapTo(chips) { tag ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = true,
 				data = tag,
@@ -155,9 +150,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		value.availableItems.mapNotNullTo(chips) { tag ->
 			if (tag !in value.selectedItems) {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = tag.title,
-					icon = 0,
 					isCheckable = true,
 					isChecked = false,
 					data = tag,
@@ -168,12 +161,8 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		chips.add(
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(R.string.more),
 				icon = materialR.drawable.abc_ic_menu_overflow_material,
-				isCheckable = false,
-				isChecked = false,
-				data = null,
 			),
 		)
 		b.chipsGenres.setChips(chips)
@@ -200,9 +189,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		value.availableItems.mapNotNullTo(chips) { tag ->
 			if (tag !in value.selectedItems) {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = tag.title,
-					icon = 0,
 					isCheckable = true,
 					isChecked = false,
 					data = tag,
@@ -213,12 +200,8 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		chips.add(
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(R.string.more),
 				icon = materialR.drawable.abc_ic_menu_overflow_material,
-				isCheckable = false,
-				isChecked = false,
-				data = null,
 			),
 		)
 		b.chipsGenresExclude.setChips(chips)
@@ -233,9 +216,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		val chips = value.availableItems.map { state ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(state.titleResId),
-				icon = 0,
 				isCheckable = true,
 				isChecked = state in value.selectedItems,
 				data = state,
@@ -253,9 +234,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		val chips = value.availableItems.map { contentRating ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(contentRating.titleResId),
-				icon = 0,
 				isCheckable = true,
 				isChecked = contentRating in value.selectedItems,
 				data = contentRating,

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

@@ -8,6 +8,7 @@ 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
@@ -17,7 +18,6 @@ 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,9 +44,7 @@ class HistoryListFragment : MangaListFragment() {
 	}
 
 	override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none {
-			it.source == MangaSource.LOCAL
-		}
+		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none { it.isLocal }
 		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(intent.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE))
+			.source(MangaSource(intent.getStringExtra(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)
+				.putExtra(EXTRA_SOURCE, source?.name)
 		}
 	}
 }

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

@@ -37,9 +37,6 @@ suspend fun Manga.toListDetailedModel(
 		ChipsView.ChipModel(
 			tint = extraProvider?.getTagTint(it) ?: 0,
 			title = it.title,
-			icon = 0,
-			isCheckable = false,
-			isChecked = false,
 			data = it,
 		)
 	},

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

@@ -85,10 +85,7 @@ class PreviewViewModel @Inject constructor(
 			ChipsView.ChipModel(
 				title = tag.title,
 				tint = extraProvider.getTagTint(tag),
-				icon = 0,
 				data = tag,
-				isCheckable = false,
-				isChecked = false,
 			)
 		}
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())

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

@@ -11,6 +11,7 @@ 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
@@ -29,7 +30,6 @@ 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 = MangaSource.LOCAL
+	override val source = LocalMangaSource
 	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.source != MangaSource.LOCAL -> requireNotNull(findSavedManga(manga)?.manga) {
+		!manga.isLocal -> requireNotNull(findSavedManga(manga)?.manga) {
 			"Manga is not local or saved"
 		}
 
@@ -227,9 +227,11 @@ class LocalMangaRepository @Inject constructor(
 		}.filterNotNullTo(ArrayList(files.size))
 	}
 
-	private suspend fun getAllFiles() = storageManager.getReadableDirs().asSequence().flatMap { dir ->
-		dir.children()
-	}
+	private suspend fun getAllFiles() = storageManager.getReadableDirs()
+		.asSequence()
+		.flatMap { dir ->
+			dir.children().filterNot { it.isHidden }
+		}
 
 	private fun Collection<LocalManga>.unwrap(): List<Manga> = map { it.manga }
 }

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

@@ -4,6 +4,7 @@ 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
@@ -58,7 +59,7 @@ class MangaIndex(source: String?) {
 	}
 
 	fun getMangaInfo(): Manga? = if (json.length() == 0) null else runCatching {
-		val source = MangaSource.valueOf(json.getString("source"))
+		val source = MangaSource(json.getString("source"))
 		Manga(
 			id = json.getLong("id"),
 			title = json.getString("title"),

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

@@ -4,6 +4,7 @@ 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
@@ -18,7 +19,6 @@ 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 = MangaSource.LOCAL,
+			source = LocalMangaSource,
 			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 = MangaSource.LOCAL)
+				c.copy(url = file.toUri().toString(), source = LocalMangaSource)
 			},
 		) ?: Manga(
 			id = root.absolutePath.longHashCode(),
 			title = root.name.toHumanReadable(),
 			url = mangaUri,
 			publicUrl = mangaUri,
-			source = MangaSource.LOCAL,
+			source = LocalMangaSource,
 			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 = MangaSource.LOCAL,
+					source = LocalMangaSource,
 					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, MangaSource.LOCAL)
+					MangaPage(pageUri.longHashCode(), pageUri, null, LocalMangaSource)
 				}
 		} else {
 			ZipFile(file).use { zip ->
@@ -121,7 +121,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 							id = pageUri.longHashCode(),
 							url = pageUri,
 							preview = null,
-							source = MangaSource.LOCAL,
+							source = LocalMangaSource,
 						)
 					}
 			}

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

@@ -7,6 +7,7 @@ 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
@@ -17,7 +18,6 @@ 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 = MangaSource.LOCAL,
+						source = LocalMangaSource,
 						url = fileUri,
 						coverUrl = cover,
 						largeCoverUrl = cover,
 						chapters = info.chapters?.map { c ->
-							c.copy(url = fileUri, source = MangaSource.LOCAL)
+							c.copy(url = fileUri, source = LocalMangaSource)
 						},
 					)
 				}
@@ -70,7 +70,7 @@ class LocalMangaZipInput(root: File) : LocalMangaInput(root) {
 					title = title,
 					url = fileUri,
 					publicUrl = fileUri,
-					source = MangaSource.LOCAL,
+					source = LocalMangaSource,
 					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 = MangaSource.LOCAL,
+								source = LocalMangaSource,
 								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 = MangaSource.LOCAL,
+						source = LocalMangaSource,
 					)
 				}
 		}

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

@@ -4,17 +4,15 @@ 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.source == MangaSource.LOCAL) {
-			"Expected LOCAL source but ${manga.source} found"
-		}
+		require(manga.isLocal) { "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,6 +14,7 @@ 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
@@ -26,7 +27,6 @@ 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) {
-			putSerializable(
+			putString(
 				RemoteListFragment.ARG_SOURCE,
-				MangaSource.LOCAL,
+				LocalMangaSource.name,
 			) // required by FilterCoordinator
 		}
 	}

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.source == MangaSource.LOCAL)
+				last != null && (isOnline || last.isLocal)
 			}
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/protect/ScreenshotPolicyHelper.kt

@@ -0,0 +1,61 @@
+package org.koitharu.kotatsu.main.ui.protect
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.WindowManager
+import androidx.annotation.MainThread
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.core.ui.DefaultActivityLifecycleCallbacks
+import javax.inject.Inject
+
+class ScreenshotPolicyHelper @Inject constructor(
+	private val settings: AppSettings,
+) : DefaultActivityLifecycleCallbacks {
+
+	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+		(activity as? ContentContainer)?.setupScreenshotPolicy(activity)
+	}
+
+	private fun ContentContainer.setupScreenshotPolicy(activity: Activity) =
+		lifecycleScope.launch(Dispatchers.Default) {
+			settings.observeAsFlow(AppSettings.KEY_SCREENSHOTS_POLICY) { screenshotsPolicy }
+				.flatMapLatest { policy ->
+					when (policy) {
+						ScreenshotsPolicy.ALLOW -> flowOf(false)
+						ScreenshotsPolicy.BLOCK_NSFW -> withContext(Dispatchers.Main) {
+							isNsfwContent()
+						}.distinctUntilChanged()
+
+						ScreenshotsPolicy.BLOCK_ALL -> flowOf(true)
+						ScreenshotsPolicy.BLOCK_INCOGNITO -> settings.observeAsFlow(AppSettings.KEY_INCOGNITO_MODE) {
+							isIncognitoModeEnabled
+						}
+					}
+				}.collect { isSecure ->
+					withContext(Dispatchers.Main) {
+						if (isSecure) {
+							activity.window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+						} else {
+							activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+						}
+					}
+				}
+		}
+
+	interface ContentContainer : LifecycleOwner {
+
+		@MainThread
+		fun isNsfwContent(): Flow<Boolean>
+	}
+}

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

@@ -18,13 +18,13 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.titleResId
 import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.databinding.SheetWelcomeBinding
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.backup.RestoreDialogFragment
 import java.util.Locale
 
@@ -58,7 +58,7 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 	override fun onChipClick(chip: Chip, data: Any?) {
 		when (data) {
 			is ContentType -> viewModel.setTypeChecked(data, chip.isChecked)
-			is Locale? -> viewModel.setLocaleChecked(data, chip.isChecked)
+			is Locale -> viewModel.setLocaleChecked(data, chip.isChecked)
 		}
 	}
 
@@ -86,14 +86,12 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 		}
 	}
 
-	private fun onLocalesChanged(value: FilterProperty<Locale?>) {
+	private fun onLocalesChanged(value: FilterProperty<Locale>) {
 		val chips = viewBinding?.chipsLocales ?: return
 		chips.setChips(
 			value.availableItems.map {
 				ChipsView.ChipModel(
-					tint = 0,
-					title = it?.getDisplayLanguage(it)?.toTitleCase(it) ?: getString(R.string.various_languages),
-					icon = 0,
+					title = it.getDisplayName(chips.context),
 					isCheckable = true,
 					isChecked = it in value.selectedItems,
 					data = it,
@@ -107,9 +105,7 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 		chips.setChips(
 			value.availableItems.map {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = getString(it.titleResId),
-					icon = 0,
 					isCheckable = true,
 					isChecked = it in value.selectedItems,
 					data = it,

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

@@ -11,10 +11,11 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.LocaleComparator
 import org.koitharu.kotatsu.core.util.ext.sortedWithSafe
 import org.koitharu.kotatsu.core.util.ext.toList
+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.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.EnumSet
 import java.util.Locale
@@ -27,14 +28,14 @@ class WelcomeViewModel @Inject constructor(
 ) : BaseViewModel() {
 
 	private val allSources = repository.allMangaSources
-	private val localesGroups by lazy { allSources.groupBy { it.locale?.let { x -> Locale(x) } } }
+	private val localesGroups by lazy { allSources.groupBy { it.locale.toLocale() } }
 
 	private var updateJob: Job
 
 	val locales = MutableStateFlow(
-		FilterProperty<Locale?>(
-			availableItems = listOf(null),
-			selectedItems = setOf(null),
+		FilterProperty<Locale>(
+			availableItems = listOf(Locale.ROOT),
+			selectedItems = setOf(Locale.ROOT),
 			isLoading = true,
 			error = null,
 		),
@@ -51,22 +52,23 @@ class WelcomeViewModel @Inject constructor(
 
 	init {
 		updateJob = launchJob(Dispatchers.Default) {
-			val languages = localesGroups.keys.associateBy { x -> x?.language }
-			val selectedLocales = HashSet<Locale?>(2)
-			selectedLocales += ConfigurationCompat.getLocales(context.resources.configuration).toList()
+			val languages = localesGroups.keys.associateBy { x -> x.language }
+			val selectedLocales = HashSet<Locale>(2)
+			ConfigurationCompat.getLocales(context.resources.configuration).toList()
 				.firstNotNullOfOrNull { lc -> languages[lc.language] }
-			selectedLocales += null
+				?.let { selectedLocales += it }
+			selectedLocales += Locale.ROOT
 			locales.value = locales.value.copy(
-				availableItems = localesGroups.keys.sortedWithSafe(nullsFirst(LocaleComparator())),
+				availableItems = localesGroups.keys.sortedWithSafe(LocaleComparator()),
 				selectedItems = selectedLocales,
 				isLoading = false,
 			)
-			repository.assimilateNewSources()
+			repository.clearNewSourcesBadge()
 			commit()
 		}
 	}
 
-	fun setLocaleChecked(locale: Locale?, isChecked: Boolean) {
+	fun setLocaleChecked(locale: Locale, isChecked: Boolean) {
 		val snapshot = locales.value
 		locales.value = snapshot.copy(
 			selectedItems = if (isChecked) {
@@ -99,9 +101,9 @@ class WelcomeViewModel @Inject constructor(
 	}
 
 	private suspend fun commit() {
-		val languages = locales.value.selectedItems.mapToSet { it?.language }
+		val languages = locales.value.selectedItems.mapToSet { it.language }
 		val types = types.value.selectedItems
-		val enabledSources = allSources.filterTo(EnumSet.noneOf(MangaSource::class.java)) { x ->
+		val enabledSources = allSources.filterTo(EnumSet.noneOf(MangaParserSource::class.java)) { x ->
 			x.contentType in types && x.locale in languages
 		}
 		repository.setSourcesEnabledExclusive(enabledSources)

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

@@ -28,6 +28,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.BuildConfig
@@ -142,7 +143,6 @@ class ReaderActivity :
 		viewModel.content.observe(this) {
 			onLoadingStateChanged(viewModel.isLoading.value)
 		}
-		viewModel.isScreenshotsBlockEnabled.observe(this, this::setWindowSecure)
 		viewModel.isKeepScreenOnEnabled.observe(this, this::setKeepScreenOn)
 		viewModel.isInfoBarEnabled.observe(this, ::onReaderBarChanged)
 		viewModel.isBookmarkAdded.observe(this, MenuInvalidator(this))
@@ -179,6 +179,8 @@ class ReaderActivity :
 		viewModel.onPause()
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = viewModel.isMangaNsfw
+
 	override fun onIdle() {
 		viewModel.saveCurrentState(readerManager.currentReader?.getCurrentState())
 	}
@@ -297,14 +299,6 @@ class ReaderActivity :
 			.show()
 	}
 
-	private fun setWindowSecure(isSecure: Boolean) {
-		if (isSecure) {
-			window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-		} else {
-			window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-		}
-	}
-
 	private fun setKeepScreenOn(isKeep: Boolean) {
 		if (isKeep) {
 			window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)

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

@@ -11,7 +11,9 @@ import android.graphics.Paint
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.os.BatteryManager
+import android.os.Build
 import android.util.AttributeSet
+import android.view.RoundedCorner
 import android.view.View
 import android.view.WindowInsets
 import androidx.annotation.AttrRes
@@ -46,8 +48,10 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	private var insetLeft: Int = 0
 	private var insetRight: Int = 0
 	private var insetTop: Int = 0
-	private var cutoutInsetLeft = 0
-	private var cutoutInsetRight = 0
+	private val insetLeftFallback: Int
+	private val insetRightFallback: Int
+	private val insetTopFallback: Int
+	private val insetCornerFallback = getSystemUiDimensionOffset("rounded_corner_content_padding")
 	private val colorText = ColorUtils.setAlphaComponent(
 		context.getThemeColor(materialR.attr.colorOnSurface, Color.BLACK),
 		200,
@@ -80,14 +84,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 			paint.strokeWidth = getDimension(R.styleable.ReaderInfoBarView_android_strokeWidth, 2f)
 			paint.textSize = getDimension(R.styleable.ReaderInfoBarView_android_textSize, 16f)
 		}
-		val insetCorner = getSystemUiDimensionOffset("rounded_corner_content_padding")
-		val fallbackInset = resources.getDimensionPixelOffset(R.dimen.reader_bar_inset_fallback)
-		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start", fallbackInset) + insetCorner
-		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end", fallbackInset) + insetCorner
+		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start")
+		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end")
 		val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
-		insetLeft = if (isRtl) insetEnd else insetStart
-		insetRight = if (isRtl) insetStart else insetEnd
-		insetTop = minOf(insetLeft, insetRight)
+		insetLeftFallback = if (isRtl) insetEnd else insetStart
+		insetRightFallback = if (isRtl) insetStart else insetEnd
+		insetTopFallback = minOf(insetLeftFallback, insetRightFallback)
 	}
 
 	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -110,12 +112,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 		paint.textAlign = Paint.Align.LEFT
 		canvas.drawTextOutline(
 			text,
-			(paddingLeft + insetLeft + cutoutInsetLeft).toFloat(),
+			(paddingLeft + insetLeft).toFloat(),
 			paddingTop + insetTop + ty,
 		)
 		if (isTimeVisible) {
 			paint.textAlign = Paint.Align.RIGHT
-			var endX = (width - paddingRight - insetRight - cutoutInsetRight).toFloat()
+			var endX = (width - paddingRight - insetRight).toFloat()
 			canvas.drawTextOutline(timeText, endX, paddingTop + insetTop + ty)
 			if (batteryText.isNotEmpty()) {
 				paint.getTextBounds(timeText, 0, timeText.length, textBounds)
@@ -221,15 +223,29 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	}
 
 	private fun updateCutoutInsets(insetsCompat: WindowInsetsCompat?) {
-		val cutouts = (insetsCompat ?: return).displayCutout?.boundingRects.orEmpty()
-		cutoutInsetLeft = 0
-		cutoutInsetRight = 0
-		for (rect in cutouts) {
-			if (rect.left <= paddingLeft) {
-				cutoutInsetLeft += rect.width()
+		insetLeft = insetLeftFallback
+		insetRight = insetRightFallback
+		insetTop = insetTopFallback
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && insetsCompat != null) {
+			val nativeInsets = insetsCompat.toWindowInsets()
+			nativeInsets?.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT)?.let { corner ->
+				insetLeft += corner.radius
 			}
-			if (rect.right >= width - paddingRight) {
-				cutoutInsetRight += rect.width()
+			nativeInsets?.getRoundedCorner(RoundedCorner.POSITION_TOP_RIGHT)?.let { corner ->
+				insetRight += corner.radius
+			}
+		} else {
+			insetLeft += insetCornerFallback
+			insetRight += insetCornerFallback
+		}
+		insetsCompat?.displayCutout?.let { cutout ->
+			for (rect in cutout.boundingRects) {
+				if (rect.left <= paddingLeft) {
+					insetLeft += rect.width()
+				}
+				if (rect.right >= width - paddingRight) {
+					insetRight += rect.width()
+				}
 			}
 		}
 	}

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

@@ -32,13 +32,13 @@ import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.core.model.findChapter
 import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
-import org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
@@ -70,7 +70,9 @@ private const val BOUNDS_PAGE_OFFSET = 2
 private const val PREFETCH_LIMIT = 10
 
 @HiltViewModel
-class ReaderViewModel @Inject constructor(
+class ReaderViewModel
+@Inject
+constructor(
 	savedStateHandle: SavedStateHandle,
 	private val dataRepository: MangaDataRepository,
 	private val historyRepository: HistoryRepository,
@@ -85,7 +87,6 @@ class ReaderViewModel @Inject constructor(
 	private val detectReaderModeUseCase: DetectReaderModeUseCase,
 	private val statsCollector: StatsCollector,
 ) : BaseViewModel() {
-
 	private val intent = MangaIntent(savedStateHandle)
 	private val preselectedBranch = savedStateHandle.get<String>(ReaderActivity.EXTRA_BRANCH)
 
@@ -105,9 +106,11 @@ class ReaderViewModel @Inject constructor(
 
 	val incognitoMode = if (savedStateHandle.get<Boolean>(ReaderActivity.EXTRA_INCOGNITO) == true) {
 		MutableStateFlow(true)
-	} else mangaFlow.map {
-		it != null && historyRepository.shouldSkip(it)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+	} else {
+		mangaFlow.map {
+			it != null && historyRepository.shouldSkip(it)
+		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+	}
 
 	val isPagesSheetEnabled = observeIsPagesSheetEnabled()
 
@@ -166,13 +169,7 @@ class ReaderViewModel @Inject constructor(
 		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null),
 	)
 
-	val isScreenshotsBlockEnabled = combine(
-		mangaFlow,
-		settings.observeAsFlow(AppSettings.KEY_SCREENSHOTS_POLICY) { screenshotsPolicy },
-	) { manga, policy ->
-		policy == ScreenshotsPolicy.BLOCK_ALL ||
-			(policy == ScreenshotsPolicy.BLOCK_NSFW && manga != null && manga.isNsfw)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, false)
+	val isMangaNsfw = mangaFlow.map { it?.isNsfw == true }
 
 	val isBookmarkAdded = currentState.flatMapLatest { state ->
 		val manga = mangaData.value?.toManga()
@@ -385,9 +382,7 @@ class ReaderViewModel @Inject constructor(
 			val manga = details.toManga()
 			// obtain state
 			if (currentState.value == null) {
-				currentState.value = historyRepository.getOne(manga)?.let {
-					ReaderState(it)
-				} ?: ReaderState(manga, preselectedBranch ?: manga.getPreferredBranch(null))
+				currentState.value = getStateFromIntent(manga)
 			}
 			val mode = detectReaderModeUseCase.invoke(manga, currentState.value)
 			val branch = chaptersLoader.peekChapter(currentState.value?.chapterId ?: 0L)?.branch
@@ -484,4 +479,18 @@ class ReaderViewModel @Inject constructor(
 		.filter { it == AppSettings.KEY_PAGES_TAB || it == AppSettings.KEY_DETAILS_TAB || it == AppSettings.KEY_DETAILS_LAST_TAB }
 		.map { settings.defaultDetailsTab == TAB_PAGES }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.defaultDetailsTab == TAB_PAGES)
+
+	private suspend fun getStateFromIntent(manga: Manga): ReaderState {
+		val history = historyRepository.getOne(manga)
+		val result = if (history != null) {
+			if (preselectedBranch != null && preselectedBranch != manga.findChapter(history.chapterId)?.branch) {
+				null
+			} else {
+				ReaderState(history)
+			}
+		} else {
+			null
+		}
+		return result ?: ReaderState(manga, preselectedBranch ?: manga.getPreferredBranch(null))
+	}
 }

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

@@ -71,7 +71,7 @@ abstract class BasePageHolder<B : ViewBinding>(
 	}
 
 	protected fun SubsamplingScaleImageView.applyDownsampling(isForeground: Boolean) {
-		downsampling = when {
+		downSampling = when {
 			isForeground || !settings.isReaderOptimizationEnabled -> 1
 			context.isLowRamDevice() -> 8
 			else -> 4

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

@@ -2,10 +2,13 @@ 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/webtoon/WebtoonImageView.kt

@@ -97,8 +97,8 @@ class WebtoonImageView @JvmOverloads constructor(
 		setMeasuredDimension(desiredWidth, desiredHeight)
 	}
 
-	override fun onDownsamplingChanged() {
-		super.onDownsamplingChanged()
+	override fun onDownSamplingChanged() {
+		super.onDownSamplingChanged()
 		post {
 			adjustScale()
 		}

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

@@ -221,7 +221,14 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 		syncMatrixValues()
 	}
 
-	private fun scaleChild(newScale: Float, focusX: Float, focusY: Float) {
+	private fun scaleChild(
+		newScale: Float,
+		focusX: Float,
+		focusY: Float,
+	): Boolean {
+		if (scale.isNaN() || scale == 0f) {
+			return false
+		}
 		val factor = newScale / scale
 		if (newScale > 1) {
 			translateBounds.set(
@@ -240,13 +247,12 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 		}
 		transformMatrix.postScale(factor, factor, focusX, focusY)
 		invalidateTarget()
+		return true
 	}
 
-
 	override fun onScale(detector: ScaleGestureDetector): Boolean {
 		val newScale = (scale * detector.scaleFactor).coerceIn(MIN_SCALE, MAX_SCALE)
-		scaleChild(newScale, detector.focusX, detector.focusY)
-		return true
+		return scaleChild(newScale, detector.focusX, detector.focusY)
 	}
 
 	override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {

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

@@ -16,6 +16,7 @@ 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
@@ -75,7 +76,12 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 	override fun onSecondaryErrorActionClick(error: Throwable) {
 		viewModel.browserUrl?.also { url ->
 			startActivity(
-				BrowserActivity.newIntent(requireContext(), url, viewModel.source, viewModel.source.title),
+				BrowserActivity.newIntent(
+					requireContext(),
+					url,
+					viewModel.source,
+					viewModel.source.getTitle(requireContext()),
+				),
 			)
 		} ?: Snackbar.make(requireViewBinding().recyclerView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT)
 			.show()
@@ -165,8 +171,8 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 
 		const val ARG_SOURCE = "provider"
 
-		fun newInstance(provider: MangaSource) = RemoteListFragment().withArgs(1) {
-			putSerializable(ARG_SOURCE, provider)
+		fun newInstance(source: MangaSource) = RemoteListFragment().withArgs(1) {
+			putString(ARG_SOURCE, source.name)
 		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/Scrobbler.kt

@@ -51,7 +51,7 @@ abstract class Scrobbler(
 		}
 	}
 
-	val isAvailable: Boolean
+	val isEnabled: Boolean
 		get() = repository.isAuthorized
 
 	suspend fun authorize(authCode: String): ScrobblerUser {

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt

@@ -42,7 +42,7 @@ class ScrobblingSelectorViewModel @Inject constructor(
 
 	val manga = savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga
 
-	val availableScrobblers = scrobblers.filter { it.isAvailable }
+	val availableScrobblers = scrobblers.filter { it.isEnabled }
 
 	val selectedScrobblerIndex = MutableStateFlow(0)
 

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

@@ -15,11 +15,16 @@ import androidx.fragment.app.commit
 import com.google.android.material.appbar.AppBarLayout
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
 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
 import org.koitharu.kotatsu.core.parser.MangaIntent
@@ -58,6 +63,8 @@ class MangaListActivity :
 			"Cannot find FilterOwner fragment in ${supportFragmentManager.fragments}"
 		}.filter
 
+	private var source: MangaSource? = null
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityMangaListBinding.inflate(layoutInflater))
@@ -66,16 +73,19 @@ class MangaListActivity :
 		if (viewBinding.containerFilterHeader != null) {
 			viewBinding.appbar.addOnOffsetChangedListener(this)
 		}
-		val source = intent.getStringExtra(EXTRA_SOURCE)?.let(::MangaSource) ?: tags?.firstOrNull()?.source
-		if (source == null) {
+		source = intent.getStringExtra(EXTRA_SOURCE)?.let(::MangaSource) ?: tags?.firstOrNull()?.source
+		val src = source
+		if (src == null) {
 			finishAfterTransition()
-			return
+		} else {
+			viewBinding.buttonOrder?.setOnClickListener(this)
+			title = src.getTitle(this)
+			initList(src, tags)
 		}
-		viewBinding.buttonOrder?.setOnClickListener(this)
-		title = if (source == MangaSource.LOCAL) getString(R.string.local_storage) else source.title
-		initList(source, tags)
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = flowOf(source?.isNsfw() == true)
+
 	override fun onWindowInsetsChanged(insets: Insets) {
 		viewBinding.root.updatePadding(
 			left = insets.left,
@@ -117,7 +127,7 @@ class MangaListActivity :
 		} else {
 			fm.commit {
 				setReorderingAllowed(true)
-				val fragment = if (source == MangaSource.LOCAL) {
+				val fragment = if (source == LocalMangaSource) {
 					LocalListFragment()
 				} else {
 					RemoteListFragment.newInstance(source)

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

@@ -11,8 +11,9 @@ 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
@@ -28,15 +29,12 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivitySearchBinding.inflate(layoutInflater))
-		source = intent.getSerializableExtraCompat(EXTRA_SOURCE) ?: run {
-			finishAfterTransition()
-			return
-		}
+		source = MangaSource(intent.getStringExtra(EXTRA_SOURCE))
 		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.title)
+			queryHint = getString(R.string.search_on_s, source.getTitle(context))
 			setOnQueryTextListener(this@SearchActivity)
 
 			if (query.isNullOrBlank()) {
@@ -52,7 +50,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,
@@ -93,7 +91,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 
 		fun newIntent(context: Context, source: MangaSource, query: String?) =
 			Intent(context, SearchActivity::class.java)
-				.putExtra(EXTRA_SOURCE, source)
+				.putExtra(EXTRA_SOURCE, source.name)
 				.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) {
-			putSerializable(ARG_SOURCE, source)
+			putString(ARG_SOURCE, source.name)
 			putString(ARG_QUERY, query)
 		}
 	}

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

@@ -13,6 +13,7 @@ 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
@@ -42,7 +43,7 @@ class SearchViewModel @Inject constructor(
 ) : MangaListViewModel(settings, downloadScheduler) {
 
 	private val query = savedStateHandle.require<String>(SearchFragment.ARG_QUERY)
-	private val repository = repositoryFactory.create(savedStateHandle.require(SearchFragment.ARG_SOURCE))
+	private val repository = repositoryFactory.create(MangaSource(savedStateHandle.get(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,6 +8,7 @@ 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
@@ -45,7 +46,7 @@ fun searchResultsAD(
 	binding.buttonMore.setOnClickListener(eventListener)
 
 	bind {
-		binding.textViewTitle.text = item.source.title
+		binding.textViewTitle.text = item.source.getTitle(context)
 		binding.buttonMore.isVisible = item.hasMore
 		adapter.items = item.list
 		adapter.notifyDataSetChanged()

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

@@ -22,7 +22,6 @@ 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
@@ -103,7 +102,7 @@ class SearchSuggestionViewModel @Inject constructor(
 		suggestionJob?.cancel()
 		suggestionJob = combine(
 			query.debounce(DEBOUNCE_TIMEOUT),
-			sourcesRepository.observeEnabledSources().map { it.toEnumSet() },
+			sourcesRepository.observeEnabledSources().map { it.toSet() },
 			settings.observeAsFlow(AppSettings.KEY_SEARCH_SUGGESTION_TYPES) { searchSuggestionTypes },
 			::Triple,
 		).mapLatest { (searchQuery, enabledSources, types) ->
@@ -172,12 +171,8 @@ class SearchSuggestionViewModel @Inject constructor(
 
 	private fun mapTags(tags: List<MangaTag>): List<ChipsView.ChipModel> = tags.map { tag ->
 		ChipsView.ChipModel(
-			tint = 0,
 			title = tag.title,
-			icon = 0,
 			data = tag,
-			isCheckable = false,
-			isChecked = false,
 		)
 	}
 }

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

@@ -1,9 +1,9 @@
 package org.koitharu.kotatsu.search.ui.suggestion.model
 
+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 +51,7 @@ sealed interface SearchSuggestionItem : ListModel {
 	) : SearchSuggestionItem {
 
 		val isNsfw: Boolean
-			get() = source.contentType == ContentType.HENTAI
+			get() = source.isNsfw()
 
 		override fun areItemsTheSame(other: ListModel): Boolean {
 			return other is Source && other.source == source

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(
-				intent.getSerializableExtraCompat(EXTRA_SOURCE) ?: MangaSource.LOCAL,
+				MangaSource(intent.getStringExtra(EXTRA_SOURCE)),
 			)
 
 			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)
+				.putExtra(EXTRA_SOURCE, source.name)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt

@@ -1,76 +0,0 @@
-package org.koitharu.kotatsu.settings.newsources
-
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.viewModels
-import coil.ImageLoader
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.databinding.DialogOnboardBinding
-import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class NewSourcesDialogFragment :
-	AlertDialogFragment<DialogOnboardBinding>(),
-	SourceConfigListener,
-	DialogInterface.OnClickListener {
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	private val viewModel by viewModels<NewSourcesViewModel>()
-
-	override fun onCreateViewBinding(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	): DialogOnboardBinding {
-		return DialogOnboardBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewBindingCreated(binding: DialogOnboardBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		val adapter = SourcesSelectAdapter(this, coil, viewLifecycleOwner)
-		binding.recyclerView.adapter = adapter
-		binding.textViewTitle.setText(R.string.new_sources_text)
-
-		viewModel.content.observe(viewLifecycleOwner) { adapter.items = it }
-	}
-
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder)
-			.setPositiveButton(R.string.done, this)
-			.setCancelable(true)
-			.setTitle(R.string.remote_sources)
-	}
-
-	override fun onClick(dialog: DialogInterface, which: Int) {
-		dialog.dismiss()
-	}
-
-	override fun onItemSettingsClick(item: SourceConfigItem.SourceItem) = Unit
-
-	override fun onItemLiftClick(item: SourceConfigItem.SourceItem) = Unit
-
-	override fun onItemShortcutClick(item: SourceConfigItem.SourceItem) = Unit
-
-	override fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
-		viewModel.onItemEnabledChanged(item, isEnabled)
-	}
-
-	override fun onCloseTip(tip: SourceConfigItem.Tip) = Unit
-
-	companion object {
-
-		private const val TAG = "NewSources"
-
-		fun show(fm: FragmentManager) = NewSourcesDialogFragment().show(fm, TAG)
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt

@@ -1,52 +0,0 @@
-package org.koitharu.kotatsu.settings.newsources
-
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
-import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.util.SuspendLazy
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
-import javax.inject.Inject
-
-@HiltViewModel
-class NewSourcesViewModel @Inject constructor(
-	private val repository: MangaSourcesRepository,
-	private val settings: AppSettings,
-) : BaseViewModel() {
-
-	private val newSources = SuspendLazy {
-		repository.assimilateNewSources()
-	}
-	val content: StateFlow<List<SourceConfigItem>> = repository.observeAll()
-		.map { sources ->
-			val new = newSources.get()
-			val skipNsfw = settings.isNsfwContentDisabled
-			sources.mapNotNull { (source, enabled) ->
-				if (source in new) {
-					SourceConfigItem.SourceItem(
-						source = source,
-						isEnabled = enabled,
-						isDraggable = false,
-						isAvailable = !skipNsfw || source.contentType != ContentType.HENTAI,
-					)
-				} else {
-					null
-				}
-			}
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, emptyList())
-
-	fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
-		launchJob(Dispatchers.Default) {
-			repository.setSourcesEnabled(setOf(item.source), isEnabled)
-		}
-	}
-}
-

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/SourcesSelectAdapter.kt

@@ -1,19 +0,0 @@
-package org.koitharu.kotatsu.settings.newsources
-
-import androidx.lifecycle.LifecycleOwner
-import coil.ImageLoader
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
-import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener
-import org.koitharu.kotatsu.settings.sources.adapter.sourceConfigItemCheckableDelegate
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
-
-class SourcesSelectAdapter(
-	listener: SourceConfigListener,
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-) : BaseListAdapter<SourceConfigItem>() {
-
-	init {
-		delegatesManager.addDelegate(sourceConfigItemCheckableDelegate(listener, coil, lifecycleOwner))
-	}
-}

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

@@ -9,6 +9,7 @@ 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
@@ -26,7 +27,9 @@ class SourceSettingsFragment : BasePreferenceFragment(0), Preference.OnPreferenc
 
 	override fun onResume() {
 		super.onResume()
-		setTitle(viewModel.source.title)
+		context?.let { ctx ->
+			setTitle(viewModel.source.getTitle(ctx))
+		}
 		viewModel.onResume()
 	}
 
@@ -36,7 +39,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0), Preference.OnPreferenc
 		addPreferencesFromRepository(viewModel.repository)
 
 		findPreference<SwitchPreferenceCompat>(KEY_ENABLE)?.run {
-			setOnPreferenceChangeListener(this@SourceSettingsFragment)
+			onPreferenceChangeListener = this@SourceSettingsFragment
 		}
 		findPreference<Preference>(KEY_AUTH)?.run {
 			val authProvider = viewModel.repository.getAuthProvider()
@@ -101,7 +104,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0), Preference.OnPreferenc
 		const val EXTRA_SOURCE = "source"
 
 		fun newInstance(source: MangaSource) = SourceSettingsFragment().withArgs(1) {
-			putSerializable(EXTRA_SOURCE, source)
+			putString(EXTRA_SOURCE, source.name)
 		}
 	}
 }

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

@@ -8,6 +8,7 @@ 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
@@ -16,10 +17,8 @@ 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
@@ -30,7 +29,7 @@ class SourceSettingsViewModel @Inject constructor(
 	private val mangaSourcesRepository: MangaSourcesRepository,
 ) : BaseViewModel(), SharedPreferences.OnSharedPreferenceChangeListener {
 
-	val source = savedStateHandle.require<MangaSource>(SourceSettingsFragment.EXTRA_SOURCE)
+	val source = MangaSource(savedStateHandle.get<String>(SourceSettingsFragment.EXTRA_SOURCE))
 	val repository = mangaRepositoryFactory.create(source) as RemoteMangaRepository
 
 	val onActionDone = MutableEventFlow<ReversibleAction>()

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

@@ -18,15 +18,16 @@ 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
@@ -46,8 +47,8 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
 		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
 			return
 		}
-		val source = intent?.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE)
-		if (source == null) {
+		val source = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
+		if (source !is MangaParserSource) {
 			finishAfterTransition()
 			return
 		}
@@ -148,7 +149,7 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
 
 		fun newIntent(context: Context, source: MangaSource): Intent {
 			return Intent(context, SourceAuthActivity::class.java)
-				.putExtra(EXTRA_SOURCE, source)
+				.putExtra(EXTRA_SOURCE, source.name)
 		}
 	}
 }

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

@@ -3,13 +3,12 @@ package org.koitharu.kotatsu.settings.sources.catalog
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 
 sealed interface SourceCatalogItem : ListModel {
 
 	data class Source(
-		val source: MangaSource,
-		val showSummary: Boolean,
+		val source: MangaParserSource,
 	) : SourceCatalogItem {
 
 		override fun areItemsTheSame(other: ListModel): Boolean {

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.settings.sources.catalog
 
+import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -15,6 +16,7 @@ import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 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.setTextAndVisible
@@ -22,28 +24,32 @@ import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ItemCatalogPageBinding
 import org.koitharu.kotatsu.databinding.ItemEmptyHintBinding
 import org.koitharu.kotatsu.databinding.ItemSourceCatalogBinding
+import org.koitharu.kotatsu.list.ui.model.ListModel
 
 fun sourceCatalogItemSourceAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: OnListItemClickListener<SourceCatalogItem.Source>
-) = adapterDelegateViewBinding<SourceCatalogItem.Source, SourceCatalogItem, ItemSourceCatalogBinding>(
+) = adapterDelegateViewBinding<SourceCatalogItem.Source, ListModel, ItemSourceCatalogBinding>(
 	{ layoutInflater, parent ->
 		ItemSourceCatalogBinding.inflate(layoutInflater, parent, false)
 	},
 ) {
 
 	binding.imageViewAdd.setOnClickListener { v ->
+		listener.onItemLongClick(item, v)
+	}
+	binding.root.setOnClickListener { v ->
 		listener.onItemClick(item, v)
 	}
 
 	bind {
 		binding.textViewTitle.text = item.source.getTitle(context)
-		if (item.showSummary) {
-			binding.textViewDescription.text = item.source.getSummary(context)
-			binding.textViewDescription.isVisible = true
+		binding.textViewDescription.text = item.source.getSummary(context)
+		binding.textViewDescription.drawableStart = if (item.source.isBroken) {
+			ContextCompat.getDrawable(context, R.drawable.ic_off_small)
 		} else {
-			binding.textViewDescription.isVisible = false
+			null
 		}
 		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
@@ -61,7 +67,7 @@ fun sourceCatalogItemSourceAD(
 fun sourceCatalogItemHintAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
-) = adapterDelegateViewBinding<SourceCatalogItem.Hint, SourceCatalogItem, ItemEmptyHintBinding>(
+) = adapterDelegateViewBinding<SourceCatalogItem.Hint, ListModel, ItemEmptyHintBinding>(
 	{ inflater, parent -> ItemEmptyHintBinding.inflate(inflater, parent, false) },
 ) {
 

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

@@ -1,41 +1,46 @@
 package org.koitharu.kotatsu.settings.sources.catalog
 
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.activity.viewModels
+import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.Insets
-import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import coil.ImageLoader
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.tabs.TabLayoutMediator
+import com.google.android.material.chip.Chip
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.titleResId
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
+import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.ui.widgets.ChipsView.ChipModel
+import org.koitharu.kotatsu.core.util.LocaleComparator
 import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.databinding.ActivitySourcesCatalogBinding
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
+import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.search.ui.MangaListActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class SourcesCatalogActivity : BaseActivity<ActivitySourcesCatalogBinding>(),
 	OnListItemClickListener<SourceCatalogItem.Source>,
-	AppBarOwner, MenuItem.OnActionExpandListener {
+	AppBarOwner, MenuItem.OnActionExpandListener, ChipsView.OnChipClickListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
 
-	private var newSourcesSnackbar: Snackbar? = null
-
 	override val appBar: AppBarLayout
 		get() = viewBinding.appbar
 
@@ -45,18 +50,20 @@ class SourcesCatalogActivity : BaseActivity<ActivitySourcesCatalogBinding>(),
 		super.onCreate(savedInstanceState)
 		setContentView(ActivitySourcesCatalogBinding.inflate(layoutInflater))
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		val pagerAdapter = SourcesCatalogPagerAdapter(this, coil, this)
-		viewBinding.pager.adapter = pagerAdapter
-		val tabMediator = TabLayoutMediator(viewBinding.tabs, viewBinding.pager, pagerAdapter)
-		tabMediator.attach()
-		viewModel.content.observe(this, pagerAdapter)
-		viewModel.hasNewSources.observe(this, ::onHasNewSourcesChanged)
+		val sourcesAdapter = SourcesCatalogAdapter(this, coil, this)
+		with(viewBinding.recyclerView) {
+			setHasFixedSize(true)
+			addItemDecoration(TypedListSpacingDecoration(context, false))
+			adapter = sourcesAdapter
+		}
+		viewBinding.chipsFilter.onChipClickListener = this
+		viewModel.content.observe(this, sourcesAdapter)
 		viewModel.onActionDone.observeEvent(
 			this,
-			ReversibleActionObserver(viewBinding.pager),
+			ReversibleActionObserver(viewBinding.recyclerView),
 		)
-		viewModel.locale.observe(this) {
-			supportActionBar?.subtitle = it?.toLocale().getDisplayName(this)
+		combine(viewModel.appliedFilter, viewModel.hasNewSources, ::Pair).observe(this) {
+			updateFilers(it.first, it.second)
 		}
 		addMenuProvider(SourcesCatalogMenuProvider(this, viewModel, this))
 	}
@@ -66,51 +73,85 @@ class SourcesCatalogActivity : BaseActivity<ActivitySourcesCatalogBinding>(),
 			left = insets.left,
 			right = insets.right,
 		)
+		viewBinding.recyclerView.updatePadding(
+			bottom = insets.bottom,
+		)
+	}
+
+	override fun onChipClick(chip: Chip, data: Any?) {
+		when (data) {
+			is ContentType -> viewModel.setContentType(data, chip.isChecked)
+			is Boolean -> viewModel.setNewOnly(chip.isChecked)
+			else -> showLocalesMenu(chip)
+		}
 	}
 
 	override fun onItemClick(item: SourceCatalogItem.Source, view: View) {
+		startActivity(MangaListActivity.newIntent(this, item.source))
+	}
+
+	override fun onItemLongClick(item: SourceCatalogItem.Source, view: View): Boolean {
 		viewModel.addSource(item.source)
+		return false
 	}
 
 	override fun onMenuItemActionExpand(item: MenuItem): Boolean {
-		viewBinding.tabs.isVisible = false
-		viewBinding.pager.isUserInputEnabled = false
 		val sq = (item.actionView as? SearchView)?.query?.trim()?.toString().orEmpty()
 		viewModel.performSearch(sq)
 		return true
 	}
 
 	override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
-		viewBinding.tabs.isVisible = true
-		viewBinding.pager.isUserInputEnabled = true
 		viewModel.performSearch(null)
 		return true
 	}
 
-	private fun onHasNewSourcesChanged(hasNewSources: Boolean) {
+	private fun updateFilers(
+		appliedFilter: SourcesCatalogFilter,
+		hasNewSources: Boolean,
+	) {
+		val chips = ArrayList<ChipModel>(ContentType.entries.size + 2)
+		chips += ChipModel(
+			title = appliedFilter.locale?.toLocale().getDisplayName(this),
+			icon = R.drawable.ic_language,
+			isDropdown = true,
+		)
 		if (hasNewSources) {
-			if (newSourcesSnackbar?.isShownOrQueued == true) {
-				return
-			}
-			val snackbar = Snackbar.make(viewBinding.pager, R.string.new_sources_text, Snackbar.LENGTH_INDEFINITE)
-			snackbar.setAction(R.string.explore) {
-				NewSourcesDialogFragment.show(supportFragmentManager)
-			}
-			snackbar.addCallback(
-				object : Snackbar.Callback() {
-					override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
-						super.onDismissed(transientBottomBar, event)
-						if (event == DISMISS_EVENT_SWIPE) {
-							viewModel.skipNewSources()
-						}
-					}
-				},
+			chips += ChipModel(
+				title = getString(R.string._new),
+				icon = R.drawable.ic_updated_selector,
+				isCheckable = true,
+				isChecked = appliedFilter.isNewOnly,
+				data = true,
 			)
-			snackbar.show()
-			newSourcesSnackbar = snackbar
-		} else {
-			newSourcesSnackbar?.dismiss()
-			newSourcesSnackbar = null
 		}
+		for (type in ContentType.entries) {
+			if (type == ContentType.HENTAI && viewModel.isNsfwDisabled) {
+				continue
+			}
+			chips += ChipModel(
+				title = getString(type.titleResId),
+				isCheckable = true,
+				isChecked = type in appliedFilter.types,
+				data = type,
+			)
+		}
+		viewBinding.chipsFilter.setChips(chips)
+	}
+
+	private fun showLocalesMenu(anchor: View) {
+		val locales = viewModel.locales.mapTo(ArrayList(viewModel.locales.size)) {
+			it to it?.toLocale()
+		}
+		locales.sortWith(compareBy(nullsFirst(LocaleComparator())) { it.second })
+		val menu = PopupMenu(this, anchor)
+		for ((i, lc) in locales.withIndex()) {
+			menu.menu.add(Menu.NONE, Menu.NONE, i, lc.second.getDisplayName(this))
+		}
+		menu.setOnMenuItemClickListener {
+			viewModel.setLocale(locales.getOrNull(it.order)?.first)
+			true
+		}
+		menu.show()
 	}
 }