Update dependencies

app/build.gradle

@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 415
+		versionCode 416
-		versionName '3.4.3'
+		versionName '3.4.4'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -76,11 +76,11 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation('com.github.nv95:kotatsu-parsers:2d1907569b') {
+	implementation('com.github.nv95:kotatsu-parsers:6af8cec134') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
 	implementation 'androidx.core:core-ktx:1.8.0'
 	implementation 'androidx.activity:activity-ktx:1.5.0'
@@ -116,21 +116,21 @@ dependencies {
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
-	implementation 'ch.acra:acra-mail:5.9.3'
+	implementation 'ch.acra:acra-mail:5.9.5'
-	implementation 'ch.acra:acra-dialog:5.9.3'
+	implementation 'ch.acra:acra-dialog:5.9.5'
 
-	debugImplementation 'org.jsoup:jsoup:1.15.1'
+	debugImplementation 'org.jsoup:jsoup:1.15.2'
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
 	androidTestImplementation 'androidx.test:runner:1.4.0'
 	androidTestImplementation 'androidx.test:rules:1.4.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.4.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 	androidTestImplementation 'io.insert-koin:koin-test:3.2.0'
 	androidTestImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
 

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarkListAD.kt

@@ -2,15 +2,13 @@ package org.koitharu.kotatsu.bookmarks.ui
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import coil.request.Disposable
-import coil.size.Scale
-import coil.util.CoilUtils
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.databinding.ItemBookmarkBinding
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.referer
@@ -23,29 +21,24 @@ fun bookmarkListAD(
 	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) }
 ) {
 
-	var imageRequest: Disposable? = null
 	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
 
 	binding.root.setOnClickListener(listener)
 	binding.root.setOnLongClickListener(listener)
 
 	bind {
-		imageRequest?.dispose()
+		binding.imageViewThumb.newImageRequest(item.imageUrl)?.run {
-		imageRequest = binding.imageViewThumb.newImageRequest(item.imageUrl)
+			referer(item.manga.publicUrl)
-			.referer(item.manga.publicUrl)
+			placeholder(R.drawable.ic_placeholder)
-			.placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
+			allowRgb565(true)
-			.allowRgb565(true)
+			lifecycle(lifecycleOwner)
-			.scale(Scale.FILL)
+			enqueueWith(coil)
-			.lifecycle(lifecycleOwner)
+		}
-			.enqueueWith(coil)
 	}
 
 	onViewRecycled {
-		imageRequest?.dispose()
+		binding.imageViewThumb.disposeImageRequest()
-		imageRequest = null
-		CoilUtils.dispose(binding.imageViewThumb)
-		binding.imageViewThumb.setImageDrawable(null)
 	}
 }

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

@@ -231,14 +231,13 @@ class DetailsFragment :
 				CoilUtils.dispose(imageViewCover)
 				return
 			}
-			imageViewCover.newImageRequest(scrobbling.coverUrl)
+			imageViewCover.newImageRequest(scrobbling.coverUrl)?.run {
-				.crossfade(true)
+				placeholder(R.drawable.ic_placeholder)
-				.placeholder(R.drawable.ic_placeholder)
+				fallback(R.drawable.ic_placeholder)
-				.fallback(R.drawable.ic_placeholder)
+				error(R.drawable.ic_placeholder)
-				.error(R.drawable.ic_placeholder)
+				lifecycle(viewLifecycleOwner)
-				.scale(Scale.FILL)
+				enqueueWith(coil)
-				.lifecycle(viewLifecycleOwner)
+			}
-				.enqueueWith(coil)
 			textViewTitle.text = scrobbling.title
 			textViewTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, scrobbling.scrobbler.iconResId, 0)
 			ratingBar.rating = scrobbling.rating * ratingBar.numStars

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

@@ -27,13 +27,14 @@ fun downloadItemAD(
 	bind {
 		job?.cancel()
 		job = item.progressAsFlow().onFirst { state ->
-			binding.imageViewCover.newImageRequest(state.manga.coverUrl)
+			binding.imageViewCover.newImageRequest(state.manga.coverUrl)?.run {
-				.referer(state.manga.publicUrl)
+				referer(state.manga.publicUrl)
-				.placeholder(state.cover)
+				placeholder(state.cover)
-				.fallback(R.drawable.ic_placeholder)
+				fallback(R.drawable.ic_placeholder)
-				.error(R.drawable.ic_placeholder)
+				error(R.drawable.ic_placeholder)
-				.allowRgb565(true)
+				allowRgb565(true)
-				.enqueueWith(coil)
+				enqueueWith(coil)
+			}
 		}.onEach { state ->
 			binding.textViewTitle.text = state.manga.title
 			when (state) {

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

@@ -3,6 +3,8 @@ package org.koitharu.kotatsu.favourites.ui.categories.edit
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
@@ -24,7 +26,7 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
 class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>(), AdapterView.OnItemClickListener,
-	View.OnClickListener {
+	View.OnClickListener, TextWatcher {
 
 	private val viewModel by viewModel<FavouritesCategoryEditViewModel> {
 		parametersOf(intent.getLongExtra(EXTRA_ID, NO_ID))
@@ -40,6 +42,8 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
 		}
 		initSortSpinner()
 		binding.buttonDone.setOnClickListener(this)
+		binding.editName.addTextChangedListener(this)
+		afterTextChanged(binding.editName.text)
 
 		viewModel.onSaved.observe(this) { finishAfterTransition() }
 		viewModel.category.observe(this, ::onCategoryChanged)
@@ -66,13 +70,21 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
 	override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_done -> viewModel.save(
-				title = binding.editName.text?.toString().orEmpty(),
+				title = binding.editName.text?.toString()?.trim().orEmpty(),
 				sortOrder = getSelectedSortOrder(),
 				isTrackerEnabled = binding.switchTracker.isChecked,
 			)
 		}
 	}
 
+	override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+	override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit
+
+	override fun afterTextChanged(s: Editable?) {
+		binding.buttonDone.isEnabled = !s.isNullOrBlank()
+	}
+
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.scrollView.updatePadding(
 			left = insets.left,

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

@@ -42,6 +42,7 @@ class FavouritesCategoryEditViewModel(
 		isTrackerEnabled: Boolean,
 	) {
 		launchLoadingJob {
+			check(title.isNotEmpty())
 			if (categoryId == NO_ID) {
 				repository.createCategory(title, sortOrder, isTrackerEnabled)
 			} else {

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

@@ -46,7 +46,7 @@ abstract class HistoryDao {
 	abstract fun observeCount(): Flow<Int>
 
 	@Query("SELECT percent FROM history WHERE manga_id = :id")
-	abstract fun findProgress(id: Long): Float?
+	abstract suspend fun findProgress(id: Long): Float?
 
 	@Query("DELETE FROM history")
 	abstract suspend fun clear()

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt

@@ -3,9 +3,6 @@ package org.koitharu.kotatsu.list.ui.adapter
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import coil.request.Disposable
-import coil.size.Scale
-import coil.util.CoilUtils
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
@@ -16,6 +13,7 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaGridModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.search.ui.multi.adapter.ItemSizeResolver
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.referer
@@ -29,7 +27,6 @@ fun mangaGridItemAD(
 	{ inflater, parent -> ItemMangaGridBinding.inflate(inflater, parent, false) }
 ) {
 
-	var imageRequest: Disposable? = null
 	var badge: BadgeDrawable? = null
 
 	itemView.setOnClickListener {
@@ -47,16 +44,15 @@ fun mangaGridItemAD(
 	bind { payloads ->
 		binding.textViewTitle.text = item.title
 		binding.progressView.setPercent(item.progress, MangaListAdapter.PAYLOAD_PROGRESS in payloads)
-		imageRequest?.dispose()
+		binding.imageViewCover.newImageRequest(item.coverUrl)?.run {
-		imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl)
+			referer(item.manga.publicUrl)
-			.referer(item.manga.publicUrl)
+			placeholder(R.drawable.ic_placeholder)
-			.placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
+			allowRgb565(true)
-			.allowRgb565(true)
+			lifecycle(lifecycleOwner)
-			.scale(Scale.FILL)
+			enqueueWith(coil)
-			.lifecycle(lifecycleOwner)
+		}
-			.enqueueWith(coil)
 		badge = itemView.bindBadge(badge, item.counter)
 	}
 
@@ -64,9 +60,6 @@ fun mangaGridItemAD(
 		itemView.clearBadge(badge)
 		binding.progressView.percent = PROGRESS_NONE
 		badge = null
-		imageRequest?.dispose()
+		binding.imageViewCover.disposeImageRequest()
-		imageRequest = null
-		CoilUtils.dispose(binding.imageViewCover)
-		binding.imageViewCover.setImageDrawable(null)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt

@@ -2,9 +2,7 @@ package org.koitharu.kotatsu.list.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import coil.request.Disposable
+import org.koitharu.kotatsu.utils.ext.*
-import coil.size.Scale
-import coil.util.CoilUtils
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
@@ -14,10 +12,6 @@ import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.enqueueWith
-import org.koitharu.kotatsu.utils.ext.newImageRequest
-import org.koitharu.kotatsu.utils.ext.referer
-import org.koitharu.kotatsu.utils.ext.textAndVisible
 
 fun mangaListDetailedItemAD(
 	coil: ImageLoader,
@@ -27,7 +21,6 @@ fun mangaListDetailedItemAD(
 	{ inflater, parent -> ItemMangaListDetailsBinding.inflate(inflater, parent, false) }
 ) {
 
-	var imageRequest: Disposable? = null
 	var badge: BadgeDrawable? = null
 
 	itemView.setOnClickListener {
@@ -38,19 +31,18 @@ fun mangaListDetailedItemAD(
 	}
 
 	bind { payloads ->
-		imageRequest?.dispose()
 		binding.textViewTitle.text = item.title
 		binding.textViewSubtitle.textAndVisible = item.subtitle
 		binding.progressView.setPercent(item.progress, MangaListAdapter.PAYLOAD_PROGRESS in payloads)
-		imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl)
+		binding.imageViewCover.newImageRequest(item.coverUrl)?.run {
-			.referer(item.manga.publicUrl)
+			referer(item.manga.publicUrl)
-			.placeholder(R.drawable.ic_placeholder)
+			placeholder(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
-			.scale(Scale.FILL)
+			allowRgb565(true)
-			.allowRgb565(true)
+			lifecycle(lifecycleOwner)
-			.lifecycle(lifecycleOwner)
+			enqueueWith(coil)
-			.enqueueWith(coil)
+		}
 		binding.textViewRating.textAndVisible = item.rating
 		binding.textViewTags.text = item.tags
 		itemView.bindBadge(badge, item.counter)
@@ -60,9 +52,6 @@ fun mangaListDetailedItemAD(
 		itemView.clearBadge(badge)
 		binding.progressView.percent = PROGRESS_NONE
 		badge = null
-		imageRequest?.dispose()
+		binding.imageViewCover.disposeImageRequest()
-		imageRequest = null
-		CoilUtils.dispose(binding.imageViewCover)
-		binding.imageViewCover.setImageDrawable(null)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt

@@ -2,9 +2,7 @@ package org.koitharu.kotatsu.list.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import coil.request.Disposable
+import org.koitharu.kotatsu.utils.ext.*
-import coil.size.Scale
-import coil.util.CoilUtils
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
@@ -13,10 +11,6 @@ import org.koitharu.kotatsu.databinding.ItemMangaListBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.enqueueWith
-import org.koitharu.kotatsu.utils.ext.newImageRequest
-import org.koitharu.kotatsu.utils.ext.referer
-import org.koitharu.kotatsu.utils.ext.textAndVisible
 
 fun mangaListItemAD(
 	coil: ImageLoader,
@@ -26,7 +20,6 @@ fun mangaListItemAD(
 	{ inflater, parent -> ItemMangaListBinding.inflate(inflater, parent, false) }
 ) {
 
-	var imageRequest: Disposable? = null
 	var badge: BadgeDrawable? = null
 
 	itemView.setOnClickListener {
@@ -37,27 +30,23 @@ fun mangaListItemAD(
 	}
 
 	bind {
-		imageRequest?.dispose()
 		binding.textViewTitle.text = item.title
 		binding.textViewSubtitle.textAndVisible = item.subtitle
-		imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl)
+		binding.imageViewCover.newImageRequest(item.coverUrl)?.run {
-			.referer(item.manga.publicUrl)
+			referer(item.manga.publicUrl)
-			.placeholder(R.drawable.ic_placeholder)
+			placeholder(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
-			.scale(Scale.FILL)
+			allowRgb565(true)
-			.allowRgb565(true)
+			lifecycle(lifecycleOwner)
-			.lifecycle(lifecycleOwner)
+			enqueueWith(coil)
-			.enqueueWith(coil)
+		}
 		itemView.bindBadge(badge, item.counter)
 	}
 
 	onViewRecycled {
 		itemView.clearBadge(badge)
 		badge = null
-		imageRequest?.dispose()
+		binding.imageViewCover.disposeImageRequest()
-		imageRequest = null
-		CoilUtils.dispose(binding.imageViewCover)
-		binding.imageViewCover.setImageDrawable(null)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/scrobbling/ui/selector/adapter/ShikimoriMangaAD.kt

@@ -2,15 +2,13 @@ package org.koitharu.kotatsu.scrobbling.ui.selector.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import coil.request.Disposable
-import coil.size.Scale
-import coil.util.CoilUtils
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.databinding.ItemMangaListBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblerManga
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.textAndVisible
@@ -23,30 +21,24 @@ fun shikimoriMangaAD(
 	{ inflater, parent -> ItemMangaListBinding.inflate(inflater, parent, false) }
 ) {
 
-	var imageRequest: Disposable? = null
-
 	itemView.setOnClickListener {
 		clickListener.onItemClick(item, it)
 	}
 
 	bind {
-		imageRequest?.dispose()
 		binding.textViewTitle.text = item.name
 		binding.textViewSubtitle.textAndVisible = item.altName
-		imageRequest = binding.imageViewCover.newImageRequest(item.cover)
+		binding.imageViewCover.newImageRequest(item.cover)?.run {
-			.placeholder(R.drawable.ic_placeholder)
+			placeholder(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
-			.scale(Scale.FILL)
+			allowRgb565(true)
-			.allowRgb565(true)
+			lifecycle(lifecycleOwner)
-			.lifecycle(lifecycleOwner)
+			enqueueWith(coil)
-			.enqueueWith(coil)
+		}
 	}
 
 	onViewRecycled {
-		imageRequest?.dispose()
+		binding.imageViewCover.disposeImageRequest()
-		imageRequest = null
-		CoilUtils.dispose(binding.imageViewCover)
-		binding.imageViewCover.setImageDrawable(null)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt

@@ -89,26 +89,25 @@ class MultiSearchViewModel(
 		}
 	}
 
-	private suspend fun searchImpl(q: String) {
+	private suspend fun searchImpl(q: String) = coroutineScope {
 		val sources = settings.getMangaSources(includeHidden = false)
 		val dispatcher = Dispatchers.Default.limitedParallelism(MAX_PARALLELISM)
-		val deferredList = coroutineScope {
+		val deferredList = sources.map { source ->
-			sources.map { source ->
+			async(dispatcher) {
-				async(dispatcher) {
+				runCatching {
-					runCatching {
+					val list = MangaRepository(source).getList(offset = 0, query = q)
-						val list = MangaRepository(source).getList(offset = 0, query = q)
+						.toUi(ListMode.GRID)
-							.toUi(ListMode.GRID)
+					if (list.isNotEmpty()) {
-						if (list.isNotEmpty()) {
+						MultiSearchListModel(source, list.size > MIN_HAS_MORE_ITEMS, list)
-							MultiSearchListModel(source, list.size > MIN_HAS_MORE_ITEMS, list)
+					} else {
-						} else {
+						null
-							null
-						}
-					}.onFailure {
-						it.printStackTraceDebug()
 					}
+				}.onFailure {
+					it.printStackTraceDebug()
 				}
 			}
 		}
+
 		val errors = ArrayList<Throwable>()
 		for (deferred in deferredList) {
 			deferred.await()
@@ -120,13 +119,12 @@ class MultiSearchViewModel(
 					errors.add(it)
 				}
 		}
-		if (listData.value.isNotEmpty()) {
+		if (listData.value.isEmpty()) {
-			return
+			when (errors.size) {
-		}
+				0 -> Unit
-		when (errors.size) {
+				1 -> throw errors[0]
-			0 -> Unit
+				else -> throw CompositeException(errors)
-			1 -> throw errors[0]
+			}
-			else -> throw CompositeException(errors)
 		}
 	}
 }

app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionsMangaListAD.kt

@@ -5,7 +5,6 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
-import coil.request.Disposable
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -16,6 +15,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
 import org.koitharu.kotatsu.utils.RecyclerViewScrollCallback
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 
@@ -52,27 +52,24 @@ private fun searchSuggestionMangaGridAD(
 	{ layoutInflater, parent -> ItemSearchSuggestionMangaGridBinding.inflate(layoutInflater, parent, false) }
 ) {
 
-	var imageRequest: Disposable? = null
-
 	itemView.setOnClickListener {
 		listener.onMangaClick(item)
 	}
 
 	bind {
-		imageRequest?.dispose()
+		binding.imageViewCover.newImageRequest(item.coverUrl)?.run {
-		imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl)
+			placeholder(R.drawable.ic_placeholder)
-			.placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
+			allowRgb565(true)
-			.allowRgb565(true)
+			lifecycle(lifecycleOwner)
-			.lifecycle(lifecycleOwner)
+			enqueueWith(coil)
-			.enqueueWith(coil)
+		}
 		binding.textViewTitle.text = item.title
 	}
 
 	onViewRecycled {
-		imageRequest?.dispose()
+		binding.imageViewCover.disposeImageRequest()
-		binding.imageViewCover.setImageDrawable(null)
 	}
 }
 

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

@@ -6,8 +6,6 @@ import android.view.View
 import android.widget.CompoundButton
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import coil.request.Disposable
-import coil.request.ImageRequest
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
@@ -16,7 +14,9 @@ import org.koitharu.kotatsu.databinding.ItemFilterHeaderBinding
 import org.koitharu.kotatsu.databinding.ItemSourceConfigBinding
 import org.koitharu.kotatsu.databinding.ItemSourceConfigDraggableBinding
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
+import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.textAndVisible
 
 fun sourceConfigHeaderDelegate() =
@@ -54,8 +54,6 @@ fun sourceConfigItemDelegate(
 	on = { item, _, _ -> item is SourceConfigItem.SourceItem && !item.isDraggable }
 ) {
 
-	var imageRequest: Disposable? = null
-
 	binding.switchToggle.setOnCheckedChangeListener { _, isChecked ->
 		listener.onItemEnabledChanged(item, isChecked)
 	}
@@ -64,17 +62,15 @@ fun sourceConfigItemDelegate(
 		binding.textViewTitle.text = item.source.title
 		binding.switchToggle.isChecked = item.isEnabled
 		binding.textViewDescription.textAndVisible = item.summary
-		imageRequest = ImageRequest.Builder(context)
+		binding.imageViewIcon.newImageRequest(item.faviconUrl)?.run {
-			.data(item.faviconUrl)
+			error(R.drawable.ic_favicon_fallback)
-			.error(R.drawable.ic_favicon_fallback)
+			lifecycle(lifecycleOwner)
-			.target(binding.imageViewIcon)
+			enqueueWith(coil)
-			.lifecycle(lifecycleOwner)
+		}
-			.enqueueWith(coil)
 	}
 
 	onViewRecycled {
-		imageRequest?.dispose()
+		binding.imageViewIcon.disposeImageRequest()
-		imageRequest = null
 	}
 }
 

app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt

@@ -2,8 +2,6 @@ package org.koitharu.kotatsu.tracker.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import coil.request.Disposable
-import coil.size.Scale
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
@@ -11,6 +9,7 @@ import org.koitharu.kotatsu.databinding.ItemFeedBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.tracker.ui.model.FeedItem
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 
@@ -22,22 +21,19 @@ fun feedItemAD(
 	{ inflater, parent -> ItemFeedBinding.inflate(inflater, parent, false) }
 ) {
 
-	var imageRequest: Disposable? = null
-
 	itemView.setOnClickListener {
 		clickListener.onItemClick(item.manga, it)
 	}
 
 	bind {
-		imageRequest?.dispose()
+		binding.imageViewCover.newImageRequest(item.imageUrl)?.run {
-		imageRequest = binding.imageViewCover.newImageRequest(item.imageUrl)
+			placeholder(R.drawable.ic_placeholder)
-			.placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
+			allowRgb565(true)
-			.allowRgb565(true)
+			lifecycle(lifecycleOwner)
-			.scale(Scale.FILL)
+			enqueueWith(coil)
-			.lifecycle(lifecycleOwner)
+		}
-			.enqueueWith(coil)
 		binding.textViewTitle.text = item.title
 		binding.textViewSummary.text = context.resources.getQuantityString(
 			R.plurals.new_chapters,
@@ -47,7 +43,6 @@ fun feedItemAD(
 	}
 
 	onViewRecycled {
-		imageRequest?.dispose()
+		binding.imageViewCover.disposeImageRequest()
-		binding.imageViewCover.setImageDrawable(null)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/utils/ext/CoilExt.kt

@@ -7,14 +7,26 @@ import coil.request.ErrorResult
 import coil.request.ImageRequest
 import coil.request.ImageResult
 import coil.request.SuccessResult
+import coil.util.CoilUtils
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.utils.progress.ImageRequestIndicatorListener
 
-fun ImageView.newImageRequest(url: String?) = ImageRequest.Builder(context)
+fun ImageView.newImageRequest(url: Any?): ImageRequest.Builder? {
-	.data(url)
+	val current = CoilUtils.result(this)
-	.crossfade(true)
+	if (current != null && current.request.data == url) {
-	.target(this)
+		return null
+	}
+	return ImageRequest.Builder(context)
+		.data(url)
+		.crossfade(true)
+		.target(this)
+}
+
+fun ImageView.disposeImageRequest() {
+	CoilUtils.dispose(this)
+	setImageDrawable(null)
+}
 
 fun ImageRequest.Builder.enqueueWith(loader: ImageLoader) = loader.enqueue(build())