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 = 648
-		versionName = '7.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:56fd22b43f') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:f923acc5a7') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -93,12 +93,12 @@ dependencies {
 	implementation 'androidx.appcompat:appcompat:1.7.0'
 	implementation 'androidx.core:core-ktx:1.13.1'
 	implementation 'androidx.activity:activity-ktx:1.9.0'
-	implementation 'androidx.fragment:fragment-ktx:1.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.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.8.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.8.1'
+	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.1'
+	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,136 +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,
-					lastError = null,
-				)
-				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/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/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,24 +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 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
@@ -35,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/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/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/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

@@ -43,6 +43,9 @@ 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
@@ -94,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
@@ -463,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
 			}
 
@@ -538,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
 	}

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

@@ -17,6 +17,7 @@ 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
@@ -34,14 +35,13 @@ class MangaSourcesRepository @Inject constructor(
 	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> {
@@ -69,7 +69,7 @@ class MangaSourcesRepository @Inject constructor(
 		query: String?,
 		locale: String?,
 		sortOrder: SourcesSortOrder?,
-	): List<MangaSource> {
+	): List<MangaParserSource> {
 		assimilateNewSources()
 		val entities = dao.findAll().toMutableList()
 		if (isDisabledOnly) {
@@ -235,7 +235,7 @@ 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) {
@@ -247,8 +247,8 @@ class MangaSourcesRepository @Inject constructor(
 	private fun List<MangaSourceEntity>.toSources(
 		skipNsfwSources: Boolean,
 		sortOrder: SourcesSortOrder?,
-	): MutableList<MangaSource> {
-		val result = ArrayList<MangaSource>(size)
+	): MutableList<MangaParserSource> {
+		val result = ArrayList<MangaParserSource>(size)
 		for (entity in this) {
 			val source = entity.source.toMangaSourceOrNull() ?: continue
 			if (skipNsfwSources && source.isNsfw()) {
@@ -272,5 +272,5 @@ class MangaSourcesRepository @Inject constructor(
 		sourcesSortOrder
 	}
 
-	private fun String.toMangaSourceOrNull(): MangaSource? = MangaSource.entries.find { it.name == this }
+	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
@@ -40,7 +41,7 @@ import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.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
@@ -123,7 +124,7 @@ class ExploreFragment :
 
 	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)
@@ -173,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/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
@@ -451,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/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/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"
 		}
 

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/welcome/WelcomeViewModel.kt

@@ -15,7 +15,7 @@ import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.EnumSet
 import java.util.Locale
@@ -103,7 +103,7 @@ class WelcomeViewModel @Inject constructor(
 	private suspend fun commit() {
 		val languages = locales.value.selectedItems.mapToSet { it.language }
 		val types = types.value.selectedItems
-		val enabledSources = allSources.filterTo(EnumSet.noneOf(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/ReaderViewModel.kt

@@ -17,7 +17,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
@@ -33,6 +32,7 @@ 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
@@ -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,9 +169,7 @@ class ReaderViewModel @Inject constructor(
 		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null),
 	)
 
-	val isMangaNsfw = mangaFlow.map {
-		it?.isNsfw == true
-	}
+	val isMangaNsfw = mangaFlow.map { it?.isNsfw == true }
 
 	val isBookmarkAdded = currentState.flatMapLatest { state ->
 		val manga = mangaData.value?.toManga()
@@ -381,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
@@ -480,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

@@ -21,7 +21,9 @@ 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
@@ -77,7 +79,7 @@ class MangaListActivity :
 			finishAfterTransition()
 		} else {
 			viewBinding.buttonOrder?.setOnClickListener(this)
-			title = if (src == MangaSource.LOCAL) getString(R.string.local_storage) else src.title
+			title = src.getTitle(this)
 			initList(src, tags)
 		}
 	}
@@ -125,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) ->

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/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,12 +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 source: MangaParserSource,
 	) : SourceCatalogItem {
 
 		override fun areItemsTheSame(other: ListModel): Boolean {

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.settings.sources.catalog
 import android.content.Context
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
+import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
@@ -23,6 +24,6 @@ class SourcesCatalogAdapter(
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
-		return (items.getOrNull(position) as? SourceCatalogItem.Source)?.source?.title?.take(1)
+		return (items.getOrNull(position) as? SourceCatalogItem.Source)?.source?.getTitle(context)?.take(1)
 	}
 }

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

@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.settings.sources.manage
 
+import android.content.Context
 import androidx.room.InvalidationTracker
 import dagger.hilt.android.ViewModelLifecycle
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancelAndJoin
@@ -14,10 +16,10 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.TABLE_SOURCES
+import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.lifecycleScope
-import org.koitharu.kotatsu.core.util.ext.toEnumSet
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
@@ -26,6 +28,7 @@ import javax.inject.Inject
 @ViewModelScoped
 class SourcesListProducer @Inject constructor(
 	lifecycle: ViewModelLifecycle,
+	@ApplicationContext private val context: Context,
 	private val repository: MangaSourcesRepository,
 	private val settings: AppSettings,
 ) : InvalidationTracker.Observer(TABLE_SOURCES) {
@@ -64,10 +67,10 @@ class SourcesListProducer @Inject constructor(
 		val isNsfwDisabled = settings.isNsfwContentDisabled
 		val isReorderAvailable = settings.sourcesSortOrder == SourcesSortOrder.MANUAL
 		val withTip = isReorderAvailable && settings.isTipEnabled(TIP_REORDER)
-		val enabledSet = enabledSources.toEnumSet()
+		val enabledSet = enabledSources.toSet()
 		if (query.isNotEmpty()) {
 			return enabledSources.mapNotNull {
-				if (!it.title.contains(query, ignoreCase = true)) {
+				if (!it.getTitle(context).contains(query, ignoreCase = true)) {
 					return@mapNotNull null
 				}
 				SourceConfigItem.SourceItem(

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

@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.settings.sources.model
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
+import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
 sealed interface SourceConfigItem : ListModel {
@@ -16,7 +16,7 @@ sealed interface SourceConfigItem : ListModel {
 	) : SourceConfigItem {
 
 		val isNsfw: Boolean
-			get() = source.contentType == ContentType.HENTAI
+			get() = source.isNsfw()
 
 		override fun areItemsTheSame(other: ListModel): Boolean {
 			return other is SourceItem && other.source == source

app/src/main/kotlin/org/koitharu/kotatsu/stats/domain/StatsCollector.kt

@@ -9,6 +9,8 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.stats.data.StatsEntity
 import javax.inject.Inject
@@ -62,7 +64,11 @@ class StatsCollector @Inject constructor(
 
 	private fun commit(entity: StatsEntity) {
 		viewModelScope.launch(Dispatchers.Default) {
-			db.getStatsDao().upsert(entity)
+			runCatchingCancellable {
+				db.getStatsDao().upsert(entity)
+			}.onFailure { e ->
+				e.printStackTraceDebug()
+			}
 		}
 	}
 

app/src/main/res/layout/activity_main.xml

@@ -48,6 +48,7 @@
 				android:layout_marginEnd="6dp"
 				android:focusable="true"
 				android:focusableInTouchMode="true"
+				app:collapseIcon="@null"
 				app:contentInsetStartWithNavigation="0dp"
 				app:navigationContentDescription="@string/search"
 				app:navigationIcon="?attr/actionModeWebSearchDrawable">

app/src/main/res/layout/item_page.xml

@@ -12,6 +12,7 @@
 		android:layout_height="match_parent"
 		android:defaultFocusHighlightEnabled="false"
 		android:focusable="true"
+		app:doubleTapZoomStyle="center"
 		app:restoreStrategy="deferred" />
 
 	<TextView

app/src/main/res/values-ar/plurals.xml

@@ -19,7 +19,7 @@
     <plurals name="minutes_ago">
         <item quantity="zero">%1$d دقيقة مضت</item>
         <item quantity="one">%1$d دقيقة مضت</item>
-        <item quantity="two">%1$d دقائق مضت</item>
+        <item quantity="two">%1$d دقيقتين مضت</item>
         <item quantity="few">%1$d دقائق مضت</item>
         <item quantity="many">%1$d دقائق مضت</item>
         <item quantity="other">%1$d دقائق مضت</item>
@@ -57,7 +57,7 @@
         <item quantity="other">%1$d ساعات مضت</item>
     </plurals>
     <plurals name="minutes">
-        <item quantity="zero"></item>
+        <item quantity="zero"/>
         <item quantity="one">دقيقة</item>
         <item quantity="two">دقيقتان</item>
         <item quantity="few">ثلاث دقائق</item>

app/src/main/res/values-ar/strings.xml

@@ -307,7 +307,7 @@
     <string name="options">خيارات</string>
     <string name="incognito_mode">الوضع الخفي</string>
     <string name="automatic_scroll">تمرير تلقائي</string>
-    <string name="reader_info_pattern">Ch. %1$d/%2$d Pg. %3$d/%4$d</string>
+    <string name="reader_info_pattern">فصل %1$d/%2$d صفحة %3$d/%4$d</string>
     <string name="reader_info_bar">عرض شريط المعلومات في قارئ الصفحات</string>
     <string name="folder_with_images">مجلد مع صور</string>
     <string name="exclude_nsfw_from_history_summary">المانغا +18 لن يتم إضافتها إلى السجل، ولن يتم حفظ تقدمك فيها.\"</string>
@@ -334,4 +334,53 @@
     <string name="import_completed_hint">يمكنك حذف الملف الأصلي من التخزين لتوفير مساحة</string>
     <string name="import_will_start_soon">الإستيراد سيبدأ عن قريب</string>
     <string name="history_shortcuts">إظهار اختصارات المانجا الحديثة</string>
+    <string name="network_unavailable_hint">قم بتشغيل الواي فاي أو شبكة الهاتف المحمول لقراءة المانجا عبر الإنترنت</string>
+    <string name="contrast">تباين</string>
+    <string name="text_unsaved_changes_prompt">هل تريد حفظ أو تجاهل التغييرات الغير المحفوظة؟</string>
+    <string name="error_no_space_left">لا توجد مساحة متبقية على الجهاز</string>
+    <string name="reader_slider">إظهار شريط التمرير لتبديل الصفحات</string>
+    <string name="server_error">خطأ من جانب الخادم (%1$s). الرجاء المحاولة مرة أخرى لاحقًا</string>
+    <string name="chapters_grid_view">عرض الشبكة</string>
+    <string name="manga_error_description_pattern">تفاصيل الخطأ:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. حاول &lt;a href=\"%2$s\"&gt;فتح المانجا في متصفح ويب&lt;/a&gt; للتأكد من أنها متوفرة على مصدرها&lt;br&gt;2. تأكد من أنك تستخدم &lt;a href=kotatsu://about&gt;أحدث إصدار من Kotatsu&lt;/a&gt;&lt;br&gt;3. إذا كانت متوفرة، أرسل تقرير خطأ إلى المطورين.</string>
+    <string name="history_shortcuts_summary">إتاحة المانجا الحديثة بالضغط المطول على أيقونة التطبيق</string>
+    <string name="reader_control_ltr_summary">النقر على الحافة اليمنى أو الضغط على المفتاح الأيمن يؤدي دائمًا إلى الانتقال للصفحة التالية.</string>
+    <string name="reader_control_ltr">تحكم مريح في القراءة</string>
+    <string name="brightness">سطوع</string>
+    <string name="clear_new_chapters_counters">قم أيضًا بمسح المعلومات حول الفصول الجديدة</string>
+    <string name="color_correction">تصحيح الألوان</string>
+    <string name="reset">إعادة تعيين</string>
+    <string name="discard">تجاهل</string>
+    <string name="webtoon_zoom">تكبير الويبتون</string>
+    <string name="network_unavailable">الشبكة غير متاحة</string>
+    <string name="more">المزيد</string>
+    <string name="prefetch_content">اعادة تحميل المحتوى</string>
+    <string name="enable_logging">تفعيل التسجيل</string>
+    <string name="theme_name_asuka">أسوكا</string>
+    <string name="remove_completed_downloads_confirm">سيتم حذف سجل التحميلات خاصتك بشكل دائم</string>
+    <string name="theme_name_dynamic">الديناميكية</string>
+    <string name="mark_as_current">تسجيل على كونها الحالي</string>
+    <string name="theme_name_mamimi">ماميمي</string>
+    <string name="theme_name_kanade">كانادي</string>
+    <string name="got_it">وجدتها</string>
+    <string name="downloads_wifi_only_summary">إيقاف التحميل عند الانتقال إلى شبكة الهاتف المحمول</string>
+    <string name="resume">استئناف</string>
+    <string name="cancel_all">إلغاء الكل</string>
+    <string name="source_disabled">المصدر معطل</string>
+    <string name="theme_name_rikka">ريكا</string>
+    <string name="theme_name_sakura">ساكورا</string>
+    <string name="pause">إيقاف مؤقت</string>
+    <string name="show_on_shelf">العرض في الرف</string>
+    <string name="remove_completed">تمت الإزالة</string>
+    <string name="enable_logging_summary">سجل بعض الأفعال لغايات التصحيح. لا تقم بتشغيله إذا لم تكن متأكدًا مما تفعله</string>
+    <string name="language">اللغة</string>
+    <string name="show_suspicious_content">إظهار المحتوى مشكوك فيه</string>
+    <string name="color_theme">مخطط الألوان</string>
+    <string name="show_in_grid_view">العرض في الشبكة</string>
+    <string name="theme_name_miku">ميكو</string>
+    <string name="theme_name_mion">ميون</string>
+    <string name="nothing_here">لا يوجد شيئ هنا</string>
+    <string name="sync_auth_hint">يمكنك تسجيل الدخول إلى حساب موجود أصلا أو إنشاء حساب جديد</string>
+    <string name="paused">متوقف مؤقتاً</string>
+    <string name="downloads_wifi_only">التحميل عبر شبكة الوايفاي فقط</string>
+    <string name="suggestions_notifications_summary">إظهار الإشعارات أحيانًا بالمانغا المقترحة</string>
 </resources>

app/src/main/res/values-cs/strings.xml

@@ -632,4 +632,16 @@
     <string name="pin_navigation_ui">Upevnit uživatelské rozhraní pro navigaci</string>
     <string name="fix">Upevnit</string>
     <string name="pin_navigation_ui_summary">Neskrývat navigační panel a zobrazení vyhledávání při posouvání</string>
+    <string name="disable_connectivity_check">Vypnout kontrolu připojení</string>
+    <string name="ignore_ssl_errors_summary">Můžeš vypnout SSL certifikáty pokud se potýkáš s problémy při připojení k internetovým zdrojům. Toto může ovlivnit tvoji bezpečnost. Restart aplikace je požadován po změnění tohoto nastavení.</string>
+    <string name="sources_disabled">Vypnout zdroje</string>
+    <string name="disable">Vypnout</string>
+    <string name="_new">Nový l</string>
+    <string name="disable_connectivity_check_summary">Přeskoč kontrolu připojení pokud s tím máš problémy (např. zapnout offline režim i když jsi připojený k internetu)</string>
+    <string name="disable_nsfw_notifications_summary">Nezobrazovat notifikace o nových NSFW manga kapitolách</string>
+    <string name="all_languages">Všechny jazyky</string>
+    <string name="screenshots_block_incognito">Zablokovat když je privátní režim</string>
+    <string name="disable_nsfw_notifications">Vypnout NSFW oznámení</string>
+    <string name="tracker_debug_info">Log kontroly nových kapitol</string>
+    <string name="tracker_debug_info_summary">Debug informace o kontrole nových kapitol na pozadí</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -609,4 +609,7 @@
     <string name="enable_source">Quelle aktivieren</string>
     <string name="unsupported_source">Diese Manga-Quelle wird nicht unterstützt</string>
     <string name="show_pages_thumbs">Seitenvorschau anzeigen</string>
+    <string name="unsupported_backup_message">Bitte wähle eine richtige Kotatsu-Backup-Datei aus</string>
+    <string name="show_pages_thumbs_summary">Registerkarte \"Seiten\" auf dem Detailbildschirm aktivieren</string>
+    <string name="error_no_data_received">Keine Daten vom Server erhalten</string>
 </resources>

app/src/main/res/values-fil/strings.xml

@@ -642,4 +642,6 @@
     <string name="tracker_debug_info_summary">Debug na impormasyon tungkol sa mga pagsusuri sa background para sa mga bagong kabanata</string>
     <string name="disable_nsfw_notifications">Di paganahin ang mga abisong NSFW</string>
     <string name="_new">Mga bago</string>
+    <string name="screenshots_block_incognito">Harangan pag naka-incognito mode</string>
+    <string name="all_languages">Lahat ng wika</string>
 </resources>

app/src/main/res/values-hr/plurals.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="items">
+        <item quantity="one">%1$d stavka</item>
+        <item quantity="few">%1$d stavke</item>
+        <item quantity="other">%1$d stavkih</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d novo poglavlje</item>
+        <item quantity="few">%1$d nova poglavlja</item>
+        <item quantity="other">%1$d novih poglavlja</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d poglavlje</item>
+        <item quantity="few">%1$d poglavlja</item>
+        <item quantity="other">%1$d poglavlja</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">prije %1$d minute</item>
+        <item quantity="few">prije %1$d minuta</item>
+        <item quantity="other">prije %1$d minuta</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">prije %1$d sat</item>
+        <item quantity="few">prije %1$d sata</item>
+        <item quantity="other">prije %1$d sati</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">prije %1$d dan</item>
+        <item quantity="few">prije %1$d dana</item>
+        <item quantity="other">prije %1$d dana</item>
+    </plurals>
+    <plurals name="months_ago">
+        <item quantity="one">prije %1$d mjesec</item>
+        <item quantity="few">prije %1$d mjeseca</item>
+        <item quantity="other">prije %1$d mjeseci</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%1$d sat</item>
+        <item quantity="few">%1$d sata</item>
+        <item quantity="other">%1$d sati</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%1$d minuta</item>
+        <item quantity="few">%1$d minute</item>
+        <item quantity="other">%1$d minuta</item>
+    </plurals>
+</resources>

app/src/main/res/values-hr/strings.xml

@@ -0,0 +1,642 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="missing_storage_permission">Nema dopuštenja za pristup mangi na vanjskoj pohrani</string>
+    <string name="show_pages_thumbs_summary">Omogućite karticu \"Stranice\" na zaslonu s detaljima</string>
+    <string name="error_no_data_received">Nikakvi podaci nisu primljeni s poslužitelja</string>
+    <string name="unsupported_backup_message">Odaberite odgovarajuću datoteku sigurnosne kopije Kotatsu</string>
+    <string name="hours_short">%d h</string>
+    <string name="minutes_short">%d m</string>
+    <string name="hours_minutes_short">%1$d h %2$d m</string>
+    <string name="fix">Popravi</string>
+    <string name="show_updated">Prikaži ažurirano</string>
+    <string name="webtoon_gaps_summary">Prikaži okomite razmake između stranica u načinu webtoon</string>
+    <string name="more_frequently">Češće</string>
+    <string name="pin_navigation_ui_summary">Nemoj skrivati navigacijsku traku i prikaz pretraživanja prilikom pomicanja</string>
+    <string name="suggested_queries">Predloženi upiti</string>
+    <string name="last_used">Zadnje korišteno</string>
+    <string name="webtoon_gaps">Praznine u webtoon modu</string>
+    <string name="blocked_by_server_message">Poslužitelj vas je blokirao. Pokušajte koristiti drugu mrežnu vezu (VPN, proxy itd.)</string>
+    <string name="less_frequently">Rjeđe</string>
+    <string name="frequency_of_check">Učestalost provjere</string>
+    <string name="recent_queries">Nedavni upiti</string>
+    <string name="disable">Onemogući</string>
+    <string name="pin_navigation_ui">Zakači navigacijsko sučelje</string>
+    <string name="search_suggestions">Prijedlozi za pretraživanje</string>
+    <string name="authors">Autori</string>
+    <string name="sources_disabled">Izvori onemogućeni</string>
+    <string name="local_storage">Lokalna pohrana</string>
+    <string name="favourites">Favoriti</string>
+    <string name="history">Povijest</string>
+    <string name="error_occurred">Dogodila se greška</string>
+    <string name="details">Detalji</string>
+    <string name="chapters">Poglavlja</string>
+    <string name="list">Popis</string>
+    <string name="detailed_list">Detaljan popis</string>
+    <string name="grid">Mreža</string>
+    <string name="settings">Postavke</string>
+    <string name="remote_sources">Manga izvori</string>
+    <string name="loading_">Učitavanje…</string>
+    <string name="computing_">Računanje…</string>
+    <string name="chapter_d_of_d">Poglavlje %1$d od %2$d</string>
+    <string name="close">Zatvori</string>
+    <string name="try_again">Pokušajte ponovno</string>
+    <string name="clear_history">Obriši povijest</string>
+    <string name="nothing_found">Ništa nije pronađeno</string>
+    <string name="read">Čitaj</string>
+    <string name="you_have_not_favourites_yet">Još nema favorita</string>
+    <string name="add_to_favourites">Označite ovo kao favorit</string>
+    <string name="add_new_category">Nova kategorija</string>
+    <string name="add">Dodaj</string>
+    <string name="save">Sačuvaj</string>
+    <string name="share">Podijeli</string>
+    <string name="create_shortcut">Napravi prečicu…</string>
+    <string name="share_s">Podijeli %s</string>
+    <string name="search">Pretraži</string>
+    <string name="search_manga">Pretraži mangu</string>
+    <string name="manga_downloading_">Preuzimanje…</string>
+    <string name="network_error">Pogreška mreže</string>
+    <string name="list_mode">Modus popisa</string>
+    <string name="theme">Tema</string>
+    <string name="light">Svijetla</string>
+    <string name="dark">Tamna</string>
+    <string name="clear">Očisti</string>
+    <string name="remove">Ukloni</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" izbrisano iz lokalne pohrane</string>
+    <string name="page_saved">Spremljeno</string>
+    <string name="share_image">Dijeli sliku</string>
+    <string name="_import">Uvoz</string>
+    <string name="delete">Izbriši</string>
+    <string name="operation_not_supported">Ova operacija nije podržana</string>
+    <string name="text_file_not_supported">Odaberite ZIP ili CBZ datoteku.</string>
+    <string name="no_description">Bez opisa</string>
+    <string name="clear_pages_cache">Očisti predmemoriju stranice</string>
+    <string name="read_mode">Način čitanja</string>
+    <string name="grid_size">Veličina mreže</string>
+    <string name="search_on_s">Traži na %s</string>
+    <string name="delete_manga">Izbriši mangu</string>
+    <string name="text_delete_local_manga">Trajno izbrisati \"%s\" s uređaja?</string>
+    <string name="reader_settings">Postavke čitača</string>
+    <string name="switch_pages">Promijenite stranice</string>
+    <string name="_continue">Nastaviti</string>
+    <string name="error">Greška</string>
+    <string name="clear_thumbs_cache">Očisti predmemoriju sličica</string>
+    <string name="search_history_cleared">Očišćeno</string>
+    <string name="internal_storage">Interna pohrana</string>
+    <string name="external_storage">Vanjska pohrana</string>
+    <string name="domain">Domena</string>
+    <string name="app_update_available">Dostupna je nova verzija aplikacije</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Omogućeno je %1$d od %2$d</string>
+    <string name="new_chapters">Nova poglavlja</string>
+    <string name="download">Preuzimi</string>
+    <string name="notifications_settings">Postavke obavijesti</string>
+    <string name="notification_sound">Zvuk obavijesti</string>
+    <string name="light_indicator">LED indikator</string>
+    <string name="vibration">Vibracija</string>
+    <string name="favourites_categories">Omiljene kategorije</string>
+    <string name="text_search_holder_secondary">Pokušajte preformulirati upit.</string>
+    <string name="text_history_holder_primary">Ono što pročitate bit će prikazano ovdje</string>
+    <string name="text_history_holder_secondary">Pronađite što čitati u odjeljku «Istražite»</string>
+    <string name="text_local_holder_primary">Prvo spremite nešto</string>
+    <string name="text_local_holder_secondary">Spremite nešto iz online kataloga ili uvezite iz datoteke.</string>
+    <string name="manga_shelf">Polica</string>
+    <string name="recent_manga">Nedavno</string>
+    <string name="pages_animation">Animacija stranice</string>
+    <string name="manga_save_location">Mapa preuzimanja</string>
+    <string name="not_available">Nije dostupno</string>
+    <string name="cannot_find_available_storage">Nema dostupnog prostora za pohranu</string>
+    <string name="other_storage">Ostala pohrana</string>
+    <string name="all_favourites">Svi favoriti</string>
+    <string name="favourites_category_empty">Prazna kategorija</string>
+    <string name="text_feed_holder">Ovdje su prikazana nova poglavlja onoga što čitate</string>
+    <string name="search_results">Rezultati pretraživanja</string>
+    <string name="new_version_s">Nova verzija: %s</string>
+    <string name="dont_check">Ne provjeravaj</string>
+    <string name="enter_password">Upišite lozinku</string>
+    <string name="wrong_password">Pogrešna lozinka</string>
+    <string name="protect_application">Zaštitite aplikaciju</string>
+    <string name="protect_application_summary">Traži lozinku prilikom pokretanja Kotatsua</string>
+    <string name="repeat_password">Ponovite lozinku</string>
+    <string name="passwords_mismatch">Nepodudarne lozinke</string>
+    <string name="about">O aplikaciji</string>
+    <string name="app_version">Verzija %s</string>
+    <string name="check_for_updates">Provjerite ima li ažuriranja</string>
+    <string name="no_update_available">Nema dostupnih ažuriranja</string>
+    <string name="right_to_left">S desna na lijevo</string>
+    <string name="create_category">Nova kategorija</string>
+    <string name="scale_mode">Način skaliranja</string>
+    <string name="zoom_mode_fit_width">Prilagodi širini</string>
+    <string name="zoom_mode_fit_height">Prilagodi visini</string>
+    <string name="zoom_mode_fit_center">Prilagodi sredini</string>
+    <string name="zoom_mode_keep_start">Zadrži na početku</string>
+    <string name="black_dark_theme">Crno</string>
+    <string name="black_dark_theme_summary">Koristi manje energije na AMOLED zaslonima</string>
+    <string name="backup_restore">Sigurnosno kopiranje i vraćanje</string>
+    <string name="create_backup">Stvorite sigurnosnu kopiju podataka</string>
+    <string name="group">Grupa</string>
+    <string name="today">Danas</string>
+    <string name="tap_to_try_again">Dodirnite za ponovni pokušaj</string>
+    <string name="reader_mode_hint">Odabrana konfiguracija bit će zapamćena za ovu mangu</string>
+    <string name="silent">Tiho</string>
+    <string name="captcha_required">Potrebna CAPTCHA</string>
+    <string name="captcha_solve">Riješi</string>
+    <string name="clear_cookies">Obriši kolačiće</string>
+    <string name="cookies_cleared">Svi kolačići su uklonjeni</string>
+    <string name="clear_feed">Očisti novosti</string>
+    <string name="text_clear_updates_feed_prompt">Trajno izbrisati svu povijest ažuriranja?</string>
+    <string name="check_for_new_chapters">Provjerite ima li novih poglavlja</string>
+    <string name="reverse">Unazad</string>
+    <string name="chapters_grid_view">Mrežni prikaz</string>
+    <string name="sign_in">Prijaviti se</string>
+    <string name="auth_required">Prijavite se da vidite ovaj sadržaj</string>
+    <string name="default_s">Zadano: %s</string>
+    <string name="next">Sljedeće</string>
+    <string name="protect_application_subtitle">Unesite lozinku za pokretanje aplikacije</string>
+    <string name="confirm">Potvrdi</string>
+    <string name="password_length_hint">Lozinka mora imati 4 znaka ili više</string>
+    <string name="tracker_warning">Neki uređaji imaju drugačije ponašanje sustava, što može prekinuti pozadinske zadatke.</string>
+    <string name="read_more">Čitaj više</string>
+    <string name="queued">U redu čekanja</string>
+    <string name="chapter_is_missing">Poglavlje nedostaje</string>
+    <string name="about_app_translation_summary">Prevedi ovu aplikaciju</string>
+    <string name="about_app_translation">Prijevod</string>
+    <string name="auth_complete">Ovlašteni</string>
+    <string name="auth_not_supported_by">Prijava na %s nije podržana</string>
+    <string name="text_clear_cookies_prompt">Bit ćete odjavljeni sa svih izvora</string>
+    <string name="genres">Žanrovi</string>
+    <string name="state_finished">Završeno</string>
+    <string name="state_ongoing">U tijeku</string>
+    <string name="system_default">Zadano</string>
+    <string name="exclude_nsfw_from_history">Isključi NSFW mangu iz povijesti</string>
+    <string name="show_pages_numbers">Numerirane stranice</string>
+    <string name="screenshots_policy">Pravila snimanja zaslona</string>
+    <string name="suggestions_info">Svi se podaci analiziraju samo lokalno na ovom uređaju i nikada se ne šalju nigdje.</string>
+    <string name="text_suggestion_holder">Počnite čitati mangu i dobit ćete personalizirane prijedloge</string>
+    <string name="exclude_nsfw_from_suggestions">Nemojte predlagati NSFW mangu</string>
+    <string name="reset_filter">Resetiraj filter</string>
+    <string name="onboard_text">Odaberite jezike na kojima želite čitati mangu. Kasnije ga možete promijeniti u postavkama.</string>
+    <string name="never">Nikada</string>
+    <string name="only_using_wifi">Samo na Wi-Fi</string>
+    <string name="always">Uvijek</string>
+    <string name="logged_in_as">Prijavljeni kao %s</string>
+    <string name="nsfw">18+</string>
+    <string name="various_languages">Razni jezici</string>
+    <string name="search_chapters">Pronađi poglavlje</string>
+    <string name="chapters_will_removed_background">Poglavlja će biti uklonjena u pozadini</string>
+    <string name="canceled">Otkazano</string>
+    <string name="account_already_exists">Račun već postoji</string>
+    <string name="back">Nazad</string>
+    <string name="sync">Sinkronizacija</string>
+    <string name="sync_title">Sinkronizirajte vaše podatke</string>
+    <string name="email_enter_hint">Unesite vašu e-poštu za nastavak</string>
+    <string name="hide">Sakrij</string>
+    <string name="new_sources_text">Dostupni su novi izvori mange</string>
+    <string name="check_new_chapters_title">Provjeriti ima li novih poglavlja i obavijestiti o tome</string>
+    <string name="show_notification_new_chapters_on">Primit ćete obavijesti o ažuriranjima mange koju čitate</string>
+    <string name="show_notification_new_chapters_off">Nećete primati obavijesti, ali će nova poglavlja biti istaknuta na popisima</string>
+    <string name="notifications_enable">Omogući obavijesti</string>
+    <string name="name">Ime</string>
+    <string name="edit">Uredi</string>
+    <string name="edit_category">Uredi kategoriju</string>
+    <string name="tracking">Pratim</string>
+    <string name="bookmark_add">Dodaj zabilješku</string>
+    <string name="bookmark_remove">Ukloni zabilješku</string>
+    <string name="bookmark_added">Zabilješka dodana</string>
+    <string name="removed_from_history">Uklonjeno iz povijesti</string>
+    <string name="detect_reader_mode">Automatsko otkrivanje načina čitanja</string>
+    <string name="disable_battery_optimization_summary">Pomaže pri provjerama ažuriranja u pozadini</string>
+    <string name="crash_text">Nešto je pošlo po zlu. Pošaljite izvješće o pogrešci razvojnim programerima kako biste nam pomogli da je popravimo.</string>
+    <string name="send">Pošalji</string>
+    <string name="status_planned">Planirani</string>
+    <string name="status_reading">Čitam</string>
+    <string name="status_re_reading">Ponovo čitam</string>
+    <string name="status_completed">Dovršeno</string>
+    <string name="status_on_hold">Na čekanju</string>
+    <string name="report">Prijavi</string>
+    <string name="show_reading_indicators">Prikaži indikatore napretka tokom čitanja</string>
+    <string name="data_deletion">Brisanje podataka</string>
+    <string name="show_reading_indicators_summary">Prikaži postotak pročitanih u povijesti i favoritima</string>
+    <string name="exclude_nsfw_from_history_summary">Manga označena kao NSFW nikada neće biti dodana u povijest i vaš napredak neće biti spremljen</string>
+    <string name="clear_cookies_summary">Može pomoći u slučaju nekih problema. Sva će ovlaštenja biti poništena</string>
+    <string name="show_all">Prikaži sve</string>
+    <string name="invalid_domain_message">Nevažeća domena</string>
+    <string name="select_range">Odaberite raspon</string>
+    <string name="clear_all_history">Izbriši svu povijest</string>
+    <string name="last_2_hours">Zadnja 2 sata</string>
+    <string name="history_cleared">Povijest izbrisana</string>
+    <string name="manage">Upravljaj</string>
+    <string name="no_bookmarks_yet">Još nema zabilješki</string>
+    <string name="bookmarks_removed">Zabilješka izbrisana</string>
+    <string name="no_manga_sources">Nema izvora mange</string>
+    <string name="no_manga_sources_text">Omogućite izvore mange za čitanje mange na mreži</string>
+    <string name="random">Nasumično</string>
+    <string name="categories_delete_confirm">Jeste li sigurni da želite izbrisati odabrane omiljene kategorije?
+\nSve mange u njoj bit će izgubljene i to se ne može poništiti.</string>
+    <string name="reader_info_pattern">Poglavlje %1$d/%2$d Stranica %3$d/%4$d</string>
+    <string name="reader_info_bar">Prikaži informacijsku traku u čitaču</string>
+    <string name="comics_archive">Arhiva stripova</string>
+    <string name="folder_with_images">Mapa sa slikama</string>
+    <string name="importing_manga">Uvoz mange</string>
+    <string name="import_completed">Uvoz dovršen</string>
+    <string name="import_completed_hint">Možete izbrisati izvornu datoteku iz pohrane radi uštede prostora</string>
+    <string name="import_will_start_soon">Uvoz će uskoro početi</string>
+    <string name="feed">Novosti</string>
+    <string name="manga_error_description_pattern">Detalji pogreške:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Pokušajte &lt;a href=%2$s&gt;otvoriti mangu u web-pregledniku&lt;/a&gt; kako biste bili sigurni da je dostupna na izvoru&lt;br&gt;2. Provjerite koristite li &lt;a href=kotatsu://about&gt;najnoviju verziju Kotatsu&lt;/a&gt;&lt;br&gt;3. Ako je dostupno, pošaljite izvješće o pogrešci programerima.</string>
+    <string name="history_shortcuts">Prikaži nedavne manga prečice</string>
+    <string name="history_shortcuts_summary">Učinite nedavnu mangu dostupnom dugim pritiskom na ikonu aplikacije</string>
+    <string name="reader_control_ltr_summary">Dodirom desnog ruba ili pritiskom desne tipke uvijek prelazi na sljedeću stranicu.</string>
+    <string name="reader_control_ltr">Ergonomska kontrola čitača</string>
+    <string name="color_correction">Korekcija boja</string>
+    <string name="brightness">Svjetlina</string>
+    <string name="contrast">Kontrast</string>
+    <string name="reset">Resetiraj</string>
+    <string name="text_unsaved_changes_prompt">Spremi ili odbaci nespremljene promjene?</string>
+    <string name="discard">Odbaci</string>
+    <string name="error_no_space_left">Nema više prostora na uređaju</string>
+    <string name="reader_slider">Prikaži klizač za promjenu stranice</string>
+    <string name="webtoon_zoom">Webtoon zumiranje</string>
+    <string name="network_unavailable">Mreža nije dostupna</string>
+    <string name="network_unavailable_hint">Uključite Wi-Fi ili mobilnu mrežu da biste čitali mangu online</string>
+    <string name="server_error">Pogreška na strani poslužitelja (%1$d). Molimo pokušajte ponovo kasnije</string>
+    <string name="clear_new_chapters_counters">Također očistite informacije o novim poglavljima</string>
+    <string name="compact">Kompaktan</string>
+    <string name="source_disabled">Izvor onemogućen</string>
+    <string name="prefetch_content">Predučitavanje sadržaja</string>
+    <string name="mark_as_current">Označi kao trenutno</string>
+    <string name="language">Jezik</string>
+    <string name="share_logs">Podijelite zapise</string>
+    <string name="enable_logging">Omogući bilježenje</string>
+    <string name="enable_logging_summary">Snimite neke radnje u svrhu otklanjanja pogrešaka. Nemojte ga uključivati ako niste sigurni što radite</string>
+    <string name="show_suspicious_content">Prikaži sumnjiv sadržaj</string>
+    <string name="theme_name_dynamic">Dinamičan</string>
+    <string name="color_theme">Shema boja</string>
+    <string name="show_in_grid_view">Prikaži u mrežnom prikazu</string>
+    <string name="theme_name_miku">Miku</string>
+    <string name="theme_name_asuka">Asuka</string>
+    <string name="theme_name_mion">Mion</string>
+    <string name="theme_name_rikka">Rikka</string>
+    <string name="theme_name_sakura">Sakura</string>
+    <string name="theme_name_mamimi">Mamimi</string>
+    <string name="services">Usluge</string>
+    <string name="allow_unstable_updates">Dopusti nestabilna ažuriranja</string>
+    <string name="allow_unstable_updates_summary">Primajte obavijesti o nestabilnim verzijama</string>
+    <string name="download_started">Preuzimanje je počelo</string>
+    <string name="got_it">Shvaćam</string>
+    <string name="speed">Brzina</string>
+    <string name="server_address">Adresa poslužitelja</string>
+    <string name="sync_host_description">Možete koristiti poslužitelj za sinkronizaciju s vlastitim hostom ili zadanim. Nemojte ovo mijenjati ako niste sigurni što radite.</string>
+    <string name="ignore_ssl_errors">Ignorirajte SSL greške</string>
+    <string name="mirror_switching">Odaberite posluživač automatski</string>
+    <string name="mirror_switching_summary">Automatski mijenjaj domene za izvore mange u slučaju grešaka ako su poslužitelji dostupni</string>
+    <string name="pause">Pauza</string>
+    <string name="resume">Nastavi</string>
+    <string name="paused">Pauzirano</string>
+    <string name="remove_completed">Ukloni dovršene</string>
+    <string name="cancel_all">Otkaži sve</string>
+    <string name="downloads_wifi_only">Preuzimanje samo putem Wi-Fi mreže</string>
+    <string name="downloads_wifi_only_summary">Zaustavite preuzimanje kada se prebacite na mobilnu mrežu</string>
+    <string name="suggestion_manga">Prijedlog: %s</string>
+    <string name="suggestions_notifications_summary">Ponekad prikaži obavijesti s predloženom mangom</string>
+    <string name="more">Više</string>
+    <string name="enable">Omogući</string>
+    <string name="no_thanks">Ne hvala</string>
+    <string name="cancel_all_downloads_confirm">Sva aktivna preuzimanja bit će otkazana, djelomično preuzeti podaci bit će izgubljeni</string>
+    <string name="remove_completed_downloads_confirm">Vaša povijest preuzimanja bit će trajno izbrisana</string>
+    <string name="downloads_resumed">Preuzimanja su nastavljena</string>
+    <string name="downloads_paused">Preuzimanja su pauzirana</string>
+    <string name="downloads_removed">Preuzimanja su uklonjena</string>
+    <string name="suggestions_enable_prompt">Želite li primati personalizirane prijedloge za mange?</string>
+    <string name="web_view_unavailable">WebView nije dostupan: provjerite je li instaliran WebView provider</string>
+    <string name="type">Tip</string>
+    <string name="port">Port</string>
+    <string name="proxy">Proxy</string>
+    <string name="invalid_value_message">Nevažeća vrijednost</string>
+    <string name="email_password_enter_hint">Unesite vašu e-poštu i lozinku za nastavak</string>
+    <string name="invert_colors">Invertiraj boje</string>
+    <string name="username">Korisničko ime</string>
+    <string name="password">Lozinka</string>
+    <string name="authorization_optional">Autorizacija (nije obavezno)</string>
+    <string name="invalid_port_number">Nevažeći broj port-a</string>
+    <string name="network">Mreža</string>
+    <string name="data_and_privacy">Podaci i privatnost</string>
+    <string name="restore_summary">Vratite prethodno stvorenu sigurnosnu kopiju</string>
+    <string name="reader_info_bar_summary">Prikažite trenutno vrijeme i napredak čitanja na vrhu zaslona</string>
+    <string name="show_pages_numbers_summary">Prikaži brojeve stranica u donjem kutu</string>
+    <string name="clear_source_cookies_summary">Brisanje kolačića samo za određenu domenu. U većini slučajeva poništit će autorizaciju</string>
+    <string name="download_option_whole_manga">Cijela manga</string>
+    <string name="download_option_first_n_chapters">Prvi %s</string>
+    <string name="description">Opis</string>
+    <string name="tracker_wifi_only_summary">Ne provjeravajte nova poglavlja pomoću mrežnih veza s ograničenim protokom</string>
+    <string name="search_hint">Unesite naslov mange, žanr ili naziv izvora</string>
+    <string name="progress">Napredak</string>
+    <string name="order_added">Dodano</string>
+    <string name="show">Prikaži</string>
+    <string name="captcha_required_summary">%s zahtijeva da se captcha riješi kako bi ispravno radio</string>
+    <string name="to_top">Na vrh</string>
+    <string name="zoom_out">Umanji</string>
+    <string name="zoom_in">Povećaj</string>
+    <string name="reader_zoom_buttons">Prikaži gumbe za zumiranje</string>
+    <string name="reader_zoom_buttons_summary">Treba li prikazati gumbe za kontrolu zumiranja u donjem desnom kutu</string>
+    <string name="keep_screen_on">Držite zaslon uključenim</string>
+    <string name="keep_screen_on_summary">Ne isključujte ekran dok čitate mangu</string>
+    <string name="state_abandoned">Izbačeno</string>
+    <string name="enhanced_colors_summary">Smanjuje trake, ali može utjecati na performanse</string>
+    <string name="enhanced_colors">32-bitni način rada u boji</string>
+    <string name="suggest_new_sources">Predloži nove izvore nakon ažuriranja aplikacije</string>
+    <string name="suggest_new_sources_summary">Upit za omogućavanje novododanih izvora nakon ažuriranja aplikacije</string>
+    <string name="list_options">Popis opcija</string>
+    <string name="by_relevance">Relevantnost</string>
+    <string name="categories">Kategorije</string>
+    <string name="online_variant">Online varijanta</string>
+    <string name="periodic_backups">Periodične sigurnosne kopije</string>
+    <string name="backup_frequency">Učestalost stvaranja sigurnosne kopije</string>
+    <string name="frequency_every_day">Svaki dan</string>
+    <string name="content_type_manga">Manga</string>
+    <string name="content_type_hentai">Hentai</string>
+    <string name="content_type_comics">Stripovi</string>
+    <string name="content_type_other">Ostalo</string>
+    <string name="sources_catalog">Katalog izvora</string>
+    <string name="source_enabled">Izvor omogućen</string>
+    <string name="no_manga_sources_catalog_text">U ovom odjeljku nema dostupnih izvora ili su svi možda već dodani.
+\nBudite u toku</string>
+    <string name="no_manga_sources_found">Vašim upitom nisu pronađeni dostupni izvori mangi</string>
+    <string name="catalog">Katalog</string>
+    <string name="disable_nsfw_summary">Onemogućite NSFW izvore i sakrijte mangu za odrasle s popisa ako je moguće</string>
+    <string name="state_paused">Pauzirano</string>
+    <string name="reader_optimize">Smanjite potrošnju memorije (beta)</string>
+    <string name="reader_optimize_summary">Smanjite kvalitetu stranica izvan zaslona kako biste koristili manje memorije</string>
+    <string name="state">Stanje</string>
+    <string name="error_multiple_genres_not_supported">Ovaj izvor mange ne podržava filtriranje prema više žanrova</string>
+    <string name="apply">Primjeni</string>
+    <string name="error_filter_locale_genre_not_supported">Ovaj izvor ne podržava filtriranje po žanrovima i lokalitetima</string>
+    <string name="error_filter_states_genre_not_supported">Ovaj izvor ne podržava filtriranje po žanrovima i stanjima</string>
+    <string name="genres_search_hint">Počnite upisivati naziv žanra</string>
+    <string name="backup_date_">Datum sigurnosne kopije: %s</string>
+    <string name="state_upcoming">Nadolazeće</string>
+    <string name="by_name_reverse">Ime obrnuto</string>
+    <string name="content_rating">Ocjena sadržaja</string>
+    <string name="rating_safe">Sigurno</string>
+    <string name="rating_suggestive">Sugestivno</string>
+    <string name="rating_adult">Za odrasle</string>
+    <string name="default_tab">Zadana kartica</string>
+    <string name="mark_as_completed">Označi kao dovršeno</string>
+    <string name="mark_as_completed_prompt">Označiti odabranu mangu kao potpuno pročitanu?
+\n
+\nUpozorenje: trenutni napredak čitanja bit će izgubljen.</string>
+    <string name="category_hidden_done">Ova je kategorija bila skrivena s glavnog zaslona i dostupna je kroz Meni → Upravljanje kategorijama</string>
+    <string name="volume_">Svezak %d</string>
+    <string name="volume_unknown">Nepoznati svezak</string>
+    <string name="incognito_mode_hint">Vaš napredak u čitanju neće biti spremljen</string>
+    <string name="vertical">Okomito</string>
+    <string name="last_read">Zadnje pročitano</string>
+    <string name="show_menu">Prikaži meni</string>
+    <string name="toggle_ui">Prikaži/sakrij korisničko sučelje</string>
+    <string name="prev_chapter">Prethodno poglavlje</string>
+    <string name="next_chapter">Sljedeće poglavlje</string>
+    <string name="next_page">Sljedeća stranica</string>
+    <string name="default_webtoon_zoom_out">Zadani webtoon smanji</string>
+    <string name="fullscreen_mode">Cijeli zaslon</string>
+    <string name="reader_fullscreen_summary">Sakrij status sustava i navigacijske trake</string>
+    <string name="reading_time_estimation">Prikaži procijenjeno vrijeme čitanja</string>
+    <string name="reading_time_estimation_summary">Vrijednost procjene vremena može biti netočna</string>
+    <string name="suggestions_unavailable_text">Značajka prijedloga je onemogućena</string>
+    <string name="check_for_new_chapters_disabled">Provjera novih poglavlja je onemogućena</string>
+    <string name="show_labels_in_navbar">Prikaži oznake u navigacijskoj traci</string>
+    <string name="pages_saving">Spremanje stranica</string>
+    <string name="ask_for_dest_dir_every_time">Svaki put pitajte za odredišni direktorij</string>
+    <string name="default_page_save_dir">Zadani direktorij za spremanje stranice</string>
+    <string name="remove_from_history">Ukloni iz povijesti</string>
+    <string name="location">Lokacija</string>
+    <string name="preferred_download_format">Preferirani format preuzimanja</string>
+    <string name="automatic">Automatski</string>
+    <string name="single_cbz_file">Jedna CBZ datoteka</string>
+    <string name="multiple_cbz_files">Više CBZ datoteka</string>
+    <string name="reading_stats">Statistika čitanja</string>
+    <string name="other_manga">Druge mange</string>
+    <string name="less_than_minute">Manje od minute</string>
+    <string name="statistics">Statistika</string>
+    <string name="stats_cleared">Statistika obrisana</string>
+    <string name="clear_stats">Obriši statistiku</string>
+    <string name="delete_read_chapters_summary">Izbrišite poglavlja koja ste već pročitali iz lokalne pohrane kako biste oslobodili prostor</string>
+    <string name="delete_read_chapters_prompt">Ovo će trajno izbrisati sva poglavlja označena kao pročitana iz vaše lokalne pohrane. Kasnije ga možete ponovo preuzeti, ali uvezena poglavlja mogu biti zauvijek izgubljena</string>
+    <string name="delete_read_chapters_auto">Automatski izbrišite pročitana poglavlja</string>
+    <string name="runs_on_app_start">Pokreće se kada se aplikacija pokrene</string>
+    <string name="split_by_translations">Podjeli po prijevodima</string>
+    <string name="split_by_translations_summary">Pokažite poglavlja s različitim prijevodima odvojeno, umjesto na jednom popisu</string>
+    <string name="order_oldest">Najstariji</string>
+    <string name="long_ago_read">Davno pročitano</string>
+    <string name="unread">Nepročitano</string>
+    <string name="enable_source">Omogući izvor</string>
+    <string name="unsupported_source">Ovaj izvor mange nije podržan</string>
+    <string name="show_pages_thumbs">Prikaži sličice stranica</string>
+    <string name="disable_connectivity_check">Onemogući provjeru povezivanja</string>
+    <string name="ignore_ssl_errors_summary">Možete onemogućiti provjeru SSL certifikata u slučaju da se suočite s problemima povezanim sa SSL-om prilikom pristupa mrežnim resursima. To može utjecati na vašu sigurnost. Nakon promjene ove postavke potrebno je ponovno pokretanje aplikacije.</string>
+    <string name="disable_connectivity_check_summary">Preskočite provjeru povezivanja u slučaju da imate problema s njom (npr. odlazak u izvanmrežni način rada iako je mreža povezana)</string>
+    <string name="disable_nsfw_notifications">Onemogući NSFW obavijesti</string>
+    <string name="disable_nsfw_notifications_summary">Ne prikazuj obavijesti o ažuriranjima NSFW mange</string>
+    <string name="tracker_debug_info">Provjera zapisnika novih poglavlja</string>
+    <string name="tracker_debug_info_summary">Informacije o otklanjanju pogrešaka o pozadinskim provjerama za nova poglavlja</string>
+    <string name="_new">Novo</string>
+    <string name="all_languages">Svi jezici</string>
+    <string name="screenshots_block_incognito">Blokiraj u anonimnom načinu rada</string>
+    <string name="processing_">Obrada…</string>
+    <string name="download_complete">Preuzeto</string>
+    <string name="by_name">Ime</string>
+    <string name="newest">Najnoviji</string>
+    <string name="sort_order">Redoslijed sortiranja</string>
+    <string name="filter">Filter</string>
+    <string name="follow_system">Slijedite sustav</string>
+    <string name="pages">Stranice</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="standard">Standard</string>
+    <string name="webtoon">Webtoon</string>
+    <string name="remove_category">Ukloni</string>
+    <string name="done">Gotovo</string>
+    <string name="read_later">Pročitaj kasnije</string>
+    <string name="size_s">Veličina: %s</string>
+    <string name="feed_will_update_soon">Ažuriranje sažetka sadržaja počet će uskoro</string>
+    <string name="track_sources">Potražite ažuriranja</string>
+    <string name="clear_search_history">Obriši povijest pretraživanja</string>
+    <string name="open_in_browser">Otvorite u web pregledniku</string>
+    <string name="text_empty_holder_primary">Ovdje je nekako prazno…</string>
+    <string name="updates">Ažuriranja</string>
+    <string name="downloads">Preuzimanja</string>
+    <string name="popular">Popularno</string>
+    <string name="updated">Ažurirano</string>
+    <string name="by_rating">Ocjena</string>
+    <string name="save_page">Spremi stranicu</string>
+    <string name="notifications">Obavijesti</string>
+    <string name="update">Ažuriraj</string>
+    <string name="history_is_empty">Još nema povijesti</string>
+    <string name="clear_updates_feed">Očisti sažetak ažuriranja</string>
+    <string name="updates_feed_cleared">Očišćeno</string>
+    <string name="rotate_screen">Zakreni zaslon</string>
+    <string name="preparing_">Priprema…</string>
+    <string name="restore_backup">Vrati iz sigurnosne kopije</string>
+    <string name="file_not_found">Datoteka nije pronađena</string>
+    <string name="data_restored_success">Svi podaci su vraćeni</string>
+    <string name="data_restored_with_errors">Podaci su vraćeni, ali ima grešaka</string>
+    <string name="backup_information">Možete stvoriti sigurnosnu kopiju svoje povijesti i favorita i vratiti je</string>
+    <string name="yesterday">Jučer</string>
+    <string name="long_ago">Davno</string>
+    <string name="data_restored">Vraćeno</string>
+    <string name="just_now">Upravo sada</string>
+    <string name="screenshots_allow">Dopusti</string>
+    <string name="screenshots_block_all">Uvijek blokiraj</string>
+    <string name="suggestions">Prijedlozi</string>
+    <string name="chapters_empty">Nema poglavlja u ovoj mangi</string>
+    <string name="appearance">Izgled</string>
+    <string name="suggestions_updating">Ažuriranje prijedloga</string>
+    <string name="suggestions_excluded_genres_summary">Navedite žanrove koje ne želite vidjeti u prijedlozima</string>
+    <string name="download_slowdown_summary">Pomaže u izbjegavanju blokiranja vaše IP adrese</string>
+    <string name="local_manga_processing">Obrada spremljene mange</string>
+    <string name="bookmarks">Zabilješke</string>
+    <string name="bookmark_removed">Zabilješka uklonjena</string>
+    <string name="dns_over_https">DNS preko HTTPS-a</string>
+    <string name="disable_battery_optimization">Onemogući optimizaciju baterije</string>
+    <string name="status_dropped">Izbačeno</string>
+    <string name="appwidget_shelf_description">Manga iz vaših favorita</string>
+    <string name="no_bookmarks_summary">Možete stvoriti zabilješku dok čitate mangu</string>
+    <string name="empty">Prazno</string>
+    <string name="exit_confirmation_summary">Dvaput pritisnite Natrag za izlaz iz aplikacije</string>
+    <string name="exit_confirmation">Potvrda izlaza</string>
+    <string name="storage_usage">Korištenje pohrane</string>
+    <string name="text_clear_search_history_prompt">Želite li trajno ukloniti sve nedavne upite za pretraživanje?</string>
+    <string name="welcome">Dobrodošli</string>
+    <string name="backup_saved">Sigurnosna kopija spremljena</string>
+    <string name="enabled">Omogućeno</string>
+    <string name="preload_pages">Prethodno učitavanje stranica</string>
+    <string name="empty_favourite_categories">Nema omiljenih kategorija</string>
+    <string name="undo">Poništi</string>
+    <string name="disable_all">Onemogući sve</string>
+    <string name="use_fingerprint">Koristite otisak prsta ako je dostupan</string>
+    <string name="appwidget_recent_description">Vaša nedavno pročitana manga</string>
+    <string name="explore">Istraži</string>
+    <string name="confirm_exit">Ponovno pritisnite Natrag za izlaz</string>
+    <string name="saved_manga">Spremljena manga</string>
+    <string name="pages_cache">Predmemorija stranica</string>
+    <string name="other_cache">Drugi cache</string>
+    <string name="available">Dostupno</string>
+    <string name="disabled">Onemogućeno</string>
+    <string name="default_mode">Zadani način rada</string>
+    <string name="detect_reader_mode_summary">Automatski otkrij je li manga webtoon</string>
+    <string name="removed_from_favourites">Uklonjeno iz favorita</string>
+    <string name="not_found_404">Sadržaj nije pronađen ili uklonjen</string>
+    <string name="no_chapters">Nema poglavlja</string>
+    <string name="options">Opcije</string>
+    <string name="download_slowdown">Usporavanje preuzimanja</string>
+    <string name="logout">Odjavite se</string>
+    <string name="reorder">Rasporedi</string>
+    <string name="incognito_mode">Anonimni način rada</string>
+    <string name="suggestions_excluded_genres">Ispostavite žanrove</string>
+    <string name="text_delete_local_manga_batch">Trajno izbrisati odabrane stavke s uređaja?</string>
+    <string name="removal_completed">Uklanjanje dovršeno</string>
+    <string name="automatic_scroll">Automatsko pomicanje</string>
+    <string name="screenshots_block_nsfw">Blokiraj na NSFW-u</string>
+    <string name="suggestions_enable">Omogući prijedloge</string>
+    <string name="suggestions_summary">Predložiti mangu na temelju vaših preferencija</string>
+    <string name="theme_name_kanade">Kanade</string>
+    <string name="find_similar">Pronađite slično</string>
+    <string name="scrobbling_empty_hint">Za praćenje napretka čitanja odaberite Meni → Prati na zaslonu s detaljima mange.</string>
+    <string name="sources_reorder_tip">Dodirnite i držite stavku da biste im promijenili redoslijed</string>
+    <string name="settings_apply_restart_required">Ponovno pokrenite aplikaciju kako biste primijenili ove promjene</string>
+    <string name="folder_with_images_import_description">Možete odabrati direktorij s arhivama ili slikama. Svaka arhiva (ili poddirektorij) bit će prepoznata kao poglavlje.</string>
+    <string name="sync_settings">Postavke sinkronizacije</string>
+    <string name="nothing_here">Ovdje nema ničega</string>
+    <string name="user_agent">Zaglavlje UserAgent-a</string>
+    <string name="comics_archive_import_description">Možete odabrati jednu ili više .cbz ili .zip datoteka, svaka će datoteka biti prepoznata kao zasebna manga.</string>
+    <string name="show_on_shelf">Prikaži na polici</string>
+    <string name="sync_auth_hint">Možete se prijaviti na postojeći račun ili stvoriti novi</string>
+    <string name="text_downloads_list_holder">Nemate preuzimanja</string>
+    <string name="downloads_cancelled">Preuzimanja su otkazana</string>
+    <string name="clear_network_cache">Očisti mrežnu predmemoriju</string>
+    <string name="address">Adresa</string>
+    <string name="images_proxy_title">Proxy za optimizaciju slika</string>
+    <string name="webtoon_zoom_summary">Dopusti gestu zumiranja u načinu webtoona</string>
+    <string name="download_option_all_chapters">Sva poglavlja s prijevodom %s</string>
+    <string name="this_month">Ovaj mjesec</string>
+    <string name="color_light">Svjetla</string>
+    <string name="color_white">Bijela</string>
+    <string name="background">Pozadina</string>
+    <string name="data_not_restored_text">Provjerite jeste li odabrali ispravnu datoteku sigurnosne kopije</string>
+    <string name="manage_categories">Upravljanje kategorijama</string>
+    <string name="suggestions_wifi_only_summary">Nemojte ažurirati prijedloge pomoću mrežnih veza s ograničenim protokom</string>
+    <string name="languages">Jezici</string>
+    <string name="directories">Direktorij</string>
+    <string name="main_screen_sections">Odjeljci glavnog zaslona</string>
+    <string name="items_limit_exceeded">Nije moguće dodati više stavki</string>
+    <string name="moved_to_top">Premješteno na vrh</string>
+    <string name="frequency_every_2_days">Svaka 2 dana</string>
+    <string name="manual">Ručno</string>
+    <string name="error_search_not_supported">Ovaj izvor mange ne podržava pretraživanje</string>
+    <string name="skip">Preskoči</string>
+    <string name="grayscale">Sivi tonovi</string>
+    <string name="globally">Globalno</string>
+    <string name="this_manga">Ova manga</string>
+    <string name="color_correction_apply_text">Ove postavke mogu se primijeniti globalno ili samo na trenutnu mangu. Ako se primjenjuju globalno, pojedinačne postavke neće biti zamjenjene.</string>
+    <string name="welcome_text">Odaberite koje izvore sadržaja želite omogućiti. To se također može konfigurirati kasnije u postavkama</string>
+    <string name="sync_auth">Prijavite se za sinkronizaciju računa</string>
+    <string name="prev_page">Prethodna stranica</string>
+    <string name="reader_actions">Radnje čitatelja</string>
+    <string name="reader_actions_summary">Konfigurirajte radnje za dodirna područja zaslona</string>
+    <string name="switch_pages_volume_buttons_summary">Koristite tipke za glasnoću za prebacivanje stranica</string>
+    <string name="tap_action">Radnja pri dodiru</string>
+    <string name="long_tap_action">Radnja dugog dodira</string>
+    <string name="use_two_pages_landscape">Koristi izgled dvije stranice u pejzažnoj orijentaciji (beta)</string>
+    <string name="download_option_next_unread_n_chapters">Sljedeći nepročitani %s</string>
+    <string name="download_option_all_unread">Sva nepročitana poglavlja</string>
+    <string name="download_option_all_unread_b">Sva nepročitana poglavlja (%s)</string>
+    <string name="download_option_manual_selection">Odaberite poglavlja ručno</string>
+    <string name="pick_custom_directory">Odaberite prilagođeni direktorij</string>
+    <string name="no_access_to_file">Nemate pristup ovoj datoteci ili direktoriju</string>
+    <string name="local_manga_directories">Lokalni direktoriji mange</string>
+    <string name="voice_search">Glasovno pretraživanje</string>
+    <string name="related_manga">Povezana manga</string>
+    <string name="color_dark">Tamna</string>
+    <string name="color_black">Crna</string>
+    <string name="data_not_restored">Podaci nisu vraćeni</string>
+    <string name="on_device">Na uređaju</string>
+    <string name="frequency_once_per_week">Jednom tjedno</string>
+    <string name="speed_value">x%.1f</string>
+    <string name="manage_sources">Upravljanje izvorima</string>
+    <string name="error_multiple_states_not_supported">Ovaj izvor mange ne podržava filtriranje prema višestrukim stanjima</string>
+    <string name="downloads_settings_info">Možete omogućiti usporavanje preuzimanja za svaki izvor mange zasebno u postavkama izvora ako imate problema s blokiranjem na strani poslužitelja</string>
+    <string name="restore">Vrati</string>
+    <string name="switch_pages_volume_buttons">Omogući tipke za glasnoću</string>
+    <string name="none">Nijedan</string>
+    <string name="config_reset_confirm">Vratiti postavke na zadane vrijednosti? Ova se radnja ne može poništiti.</string>
+    <string name="clear_stats_confirm">Želite li stvarno izbrisati sve statistike čitanja? Ova se radnja ne može poništiti.</string>
+    <string name="month">Mjesec</string>
+    <string name="pages_read_s">Pročitane stranice: %s</string>
+    <string name="no_chapters_deleted">Nijedno poglavlje nije izbrisano</string>
+    <string name="downloaded">Preuzeto</string>
+    <string name="images_procy_description">Koristite uslugu wsrv.nl kako biste smanjili promet i ubrzali učitavanje slika ako je moguće</string>
+    <string name="unknown">Nepoznato</string>
+    <string name="too_many_requests_message">Previše zahtjeva. Pokušajte ponovno kasnije</string>
+    <string name="manga_list">Popis mangi</string>
+    <string name="error_corrupted_file">Vraćeni su nevažeći podaci ili je datoteka oštećena</string>
+    <string name="frequency_twice_per_month">Dva puta mjesečno</string>
+    <string name="frequency_once_per_month">Jednom mjesečno</string>
+    <string name="available_d">Dostupno: %1$d</string>
+    <string name="genres_exclude">Isključi žanrove</string>
+    <string name="week">Tjedan</string>
+    <string name="day">Dan</string>
+    <string name="alternatives">Alternative</string>
+    <string name="periodic_backups_enable">Omogućite povremene sigurnosne kopije</string>
+    <string name="disable_battery_optimization_summary_downloads">Moglo bi vam pomoći pri započinjanju preuzimanja ako imate problema s njim</string>
+    <string name="all_time">Cijelo vrijeme</string>
+    <string name="manga_migration">Migracija mange</string>
+    <string name="migration_completed">Migracija dovršena</string>
+    <string name="in_progress">U toku</string>
+    <string name="disable_nsfw">Onemogući NSFW</string>
+    <string name="related_manga_summary">Prikaži popis povezanih mangi. U nekim slučajevima može biti netočan ili nedostajati</string>
+    <string name="advanced">Napredno</string>
+    <string name="backups_output_directory">Izlazni direktorij sigurnosne kopije</string>
+    <string name="three_months">Tri mjeseca</string>
+    <string name="empty_stats_text">Nema statistike za odabrano razdoblje</string>
+    <string name="last_successful_backup">Zadnja uspješna sigurnosna kopija: %s</string>
+    <string name="migrate">Migrirati</string>
+    <string name="chapters_deleted_pattern">Uklonjeno %1$s, izbrisano %2$s</string>
+    <string name="lock_screen_rotation">Zaključavanje zakretanja zaslona</string>
+    <string name="migrate_confirmation">Manga \"%1$s\" iz \"%2$s\" bit će zamijenjena s \"%3$s\" iz \"%4$s\" u vašoj povijesti i favoritima (ako postoje)</string>
+    <string name="delete_read_chapters">Brisanje pročitanih poglavlja</string>
+</resources>

app/src/main/res/values-in/strings.xml

@@ -581,4 +581,64 @@
     <string name="reader_fullscreen_summary">Sembunyikan status sistem dan bilah navigasi</string>
     <string name="automatic">Otomatis</string>
     <string name="default_webtoon_zoom_out">Zoom webtoon default</string>
+    <string name="last_used">Terakhir digunakan</string>
+    <string name="_new">Terbaru</string>
+    <string name="hours_short">%d j</string>
+    <string name="minutes_short">%d m</string>
+    <string name="hours_minutes_short">%1$d j %2$d m</string>
+    <string name="default_page_save_dir">Direktori penyimpanan halaman default</string>
+    <string name="clear_stats">Bersihkan statistik</string>
+    <string name="delete_read_chapters_prompt">Hal ini akan menghapus secara permanen semua bab yang ditandai sebagai telah dibaca dari penyimpanan lokal Anda. Anda dapat mengunduh ulang nanti, tetapi bab yang diimpor mungkin akan hilang selamanya</string>
+    <string name="reading_stats">Statistik membaca</string>
+    <string name="other_manga">Manga lainnya</string>
+    <string name="show_pages_thumbs">Menampilkan gambar mini halaman</string>
+    <string name="show_updated">Tampilkan yang diperbarui</string>
+    <string name="ignore_ssl_errors_summary">Anda dapat menonaktifkan verifikasi sertifikat SSL jika Anda menghadapi masalah terkait SSL saat mengakses sumber daya jaringan. Hal ini dapat memengaruhi keamanan Anda. Diperlukan pengaktifan ulang aplikasi setelah mengubah pengaturan ini.</string>
+    <string name="multiple_cbz_files">Beberapa file CBZ</string>
+    <string name="pages_read_s">Halaman yang dibaca: %s</string>
+    <string name="migrate_confirmation">Manga \"%1$s\" dari \"%2$s\" akan diganti dengan \"%3$s\" dari \"%4$s\" di riwayat dan favorit Anda (jika ada)</string>
+    <string name="unread">Belum dibaca</string>
+    <string name="show_pages_thumbs_summary">Aktifkan tab \"Halaman\" pada layar detail</string>
+    <string name="unsupported_backup_message">Pilih file cadangan Kotatsu yang tepat</string>
+    <string name="fix">Memperbaiki</string>
+    <string name="missing_storage_permission">Tidak ada izin untuk mengakses manga di penyimpanan eksternal</string>
+    <string name="disable_nsfw_notifications_summary">Jangan tampilkan pemberitahuan tentang pembaruan manga NSFW</string>
+    <string name="search_suggestions">Saran pencarian</string>
+    <string name="recent_queries">Pertanyaan terbaru</string>
+    <string name="authors">Penulis</string>
+    <string name="single_cbz_file">File CBZ tunggal</string>
+    <string name="empty_stats_text">Tidak ada statistik untuk periode yang dipilih</string>
+    <string name="preferred_download_format">Format unduhan yang disukai</string>
+    <string name="migration_completed">Migrasi selesai</string>
+    <string name="delete_read_chapters_summary">Menghapus bab yang telah Anda baca dari penyimpanan lokal untuk mengosongkan ruang</string>
+    <string name="migrate">Migrasi</string>
+    <string name="manga_migration">Manga migration</string>
+    <string name="delete_read_chapters_auto">Menghapus bab yang sudah dibaca secara otomatis</string>
+    <string name="runs_on_app_start">Berjalan saat aplikasi dimulai</string>
+    <string name="delete_read_chapters">Menghapus bab yang sudah dibaca</string>
+    <string name="no_chapters_deleted">Tidak ada bab yang telah dihapus</string>
+    <string name="split_by_translations">Dibagi berdasarkan terjemahan</string>
+    <string name="split_by_translations_summary">Menampilkan bab dengan terjemahan yang berbeda secara terpisah, bukan dalam satu daftar</string>
+    <string name="order_oldest">Terlama</string>
+    <string name="long_ago_read">Dibaca lama sekali</string>
+    <string name="webtoon_gaps">Celah dalam mode webtoon</string>
+    <string name="more_frequently">Lebih sering</string>
+    <string name="webtoon_gaps_summary">Menampilkan celah vertikal di antara halaman dalam mode webtoon</string>
+    <string name="frequency_of_check">Frekuensi pemeriksaan</string>
+    <string name="pin_navigation_ui">Pin UI navigasi</string>
+    <string name="tracker_debug_info">Memeriksa log bab baru</string>
+    <string name="disable_connectivity_check">Menonaktifkan pemeriksaan konektivitas</string>
+    <string name="disable_connectivity_check_summary">Lewati pemeriksaan konektivitas jika Anda mengalami masalah dengan konektivitas (misalnya, masuk ke mode offline meskipun jaringan tersambung)</string>
+    <string name="disable_nsfw_notifications">Menonaktifkan notifikasi NSFW</string>
+    <string name="tracker_debug_info_summary">Informasi debug tentang pemeriksaan latar belakang untuk bab baru</string>
+    <string name="all_languages">Semua bahasa</string>
+    <string name="screenshots_block_incognito">Blokir saat mode penyamaran</string>
+    <string name="error_no_data_received">Tidak ada data yang diterima dari server</string>
+    <string name="disable">Nonaktifkan</string>
+    <string name="sources_disabled">Sumber dinonaktifkan</string>
+    <string name="enable_source">Aktifkan sumber</string>
+    <string name="unsupported_source">Sumber manga ini tidak didukung</string>
+    <string name="blocked_by_server_message">Anda diblokir oleh server. Coba gunakan koneksi jaringan yang berbeda (VPN, Proxy, dll.)</string>
+    <string name="less_frequently">Lebih jarang</string>
+    <string name="pin_navigation_ui_summary">Jangan sembunyikan bilah navigasi dan tampilan pencarian saat menggulir</string>
 </resources>

app/src/main/res/values-sr/strings.xml

@@ -243,7 +243,7 @@
     <string name="invalid_value_message">Погрешна вредност</string>
     <string name="downloads_cancelled">Преузимања су отказана</string>
     <string name="webtoon_zoom">Webtoon увећање</string>
-    <string name="various_languages">Сви језици</string>
+    <string name="various_languages">Разни језици</string>
     <string name="removal_completed">Уклањање је завршено</string>
     <string name="theme_name_miku">Мику</string>
     <string name="edit">Уреди</string>
@@ -642,4 +642,6 @@
     <string name="tracker_debug_info">Провера дневника нових поглавља</string>
     <string name="tracker_debug_info_summary">Информације о отклањању грешака о позадинским проверама за нова поглавља</string>
     <string name="_new">Нови</string>
+    <string name="all_languages">Сви језици</string>
+    <string name="screenshots_block_incognito">Блокирај у режиму без архивирања</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -642,6 +642,6 @@
     <string name="tracker_debug_info">漫画更新日志</string>
     <string name="tracker_debug_info_summary">记录漫画后台更新时的调试日志</string>
     <string name="_new">最新</string>
-    <string name="screenshots_block_incognito">无痕模式时禁止</string>
+    <string name="screenshots_block_incognito">开启无痕模式时禁止</string>
     <string name="all_languages">所有语言</string>
 </resources>

app/src/test/kotlin/org/koitharu/kotatsu/core/backup/JsonSerializerTest.kt

@@ -7,7 +7,7 @@ import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.history.data.HistoryEntity
-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.SortOrder
 import java.util.concurrent.TimeUnit
@@ -42,7 +42,7 @@ class JsonSerializerTest {
 			largeCoverUrl = null,
 			state = MangaState.FINISHED.name,
 			author = "RERE",
-			source = MangaSource.DUMMY.name,
+			source = MangaParserSource.DUMMY.name,
 		)
 		val json = JsonSerializer(entity).toJson()
 		val result = JsonDeserializer(json).toMangaEntity()
@@ -55,7 +55,7 @@ class JsonSerializerTest {
 			id = 934023534,
 			title = "Adventure",
 			key = "adventure",
-			source = MangaSource.DUMMY.name,
+			source = MangaParserSource.DUMMY.name,
 		)
 		val json = JsonSerializer(entity).toJson()
 		val result = JsonDeserializer(json).toTagEntity()

app/src/test/kotlin/org/koitharu/kotatsu/reader/domain/ChapterPagesTest.kt

@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.reader.domain
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import kotlin.random.Random
 
@@ -73,6 +73,6 @@ class ChapterPagesTest {
 		preview = null,
 		chapterId = chapterId,
 		index = Random.nextInt(),
-		source = MangaSource.DUMMY,
+		source = MangaParserSource.DUMMY,
 	)
 }