Update about settings

README.md

@@ -2,12 +2,17 @@
 
 Kotatsu is a free and open source manga reader for Android.
 
-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
 
 ### Download
 
-- **Recommended:** Download and install APK from **[GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest)**. Application has a built-in self-updating feature.
-- Get it on **[F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu)**. The F-Droid build may be a bit outdated and some fixes might be missing.
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+alt="Get it on F-Droid"
+height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)
+
+Download APK directly from GitHub:
+
+- **[Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)**
 
 ### Main Features
 

app/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 538
-		versionName '5.0'
+		versionCode 525
+		versionName '4.4.9'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -44,17 +44,18 @@ android {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_17
-		targetCompatibility JavaVersion.VERSION_17
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_17.toString()
+		jvmTarget = JavaVersion.VERSION_1_8.toString()
 		freeCompilerArgs += [
 			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
 			'-opt-in=coil.annotation.ExperimentalCoilApi',
+			'-opt-in=com.google.android.material.badge.ExperimentalBadgeUtils',
 		]
 	}
 	lint {
@@ -78,35 +79,35 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:306d46ea93') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:1b6d1456f3') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.21'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation 'androidx.core:core-ktx:1.10.0'
-	implementation 'androidx.activity:activity-ktx:1.7.1'
-	implementation 'androidx.fragment:fragment-ktx:1.5.7'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
+	implementation 'androidx.core:core-ktx:1.9.0'
+	implementation 'androidx.activity:activity-ktx:1.6.1'
+	implementation 'androidx.fragment:fragment-ktx:1.5.5'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.3.0'
+	implementation 'androidx.recyclerview:recyclerview:1.2.1'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 	implementation 'androidx.preference:preference-ktx:1.2.0'
-	implementation 'androidx.work:work-runtime-ktx:2.8.1'
+	implementation 'androidx.work:work-runtime-ktx:2.8.0'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
 	implementation 'com.google.android.material:material:1.8.0'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.6.1'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
 
-	implementation 'androidx.room:room-runtime:2.5.1'
-	implementation 'androidx.room:room-ktx:2.5.1'
-	kapt 'androidx.room:room-compiler:2.5.1'
+	implementation 'androidx.room:room-runtime:2.5.0'
+	implementation 'androidx.room:room-ktx:2.5.0'
+	kapt 'androidx.room:room-compiler:2.5.0'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
@@ -120,8 +121,8 @@ dependencies {
 	implementation 'androidx.hilt:hilt-work:1.0.0'
 	kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
-	implementation 'io.coil-kt:coil-base:2.3.0'
-	implementation 'io.coil-kt:coil-svg:2.3.0'
+	implementation 'io.coil-kt:coil-base:2.2.2'
+	implementation 'io.coil-kt:coil-svg:2.2.2'
 	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:1b19231b2f'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
@@ -142,7 +143,7 @@ dependencies {
 
 	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
-	androidTestImplementation 'androidx.room:room-testing:2.5.1'
+	androidTestImplementation 'androidx.room:room-testing:2.5.0'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
 
 	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.45'

app/proguard-rules.pro

@@ -1,4 +1,5 @@
 -optimizationpasses 8
+-dontobfuscate
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
 	public static void checkExpressionValueIsNotNull(...);
 	public static void checkNotNullExpressionValue(...);
@@ -9,10 +10,7 @@
 }
 -keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
--dontwarn okhttp3.internal.platform.**
--dontwarn org.conscrypt.**
--dontwarn org.bouncycastle.**
--dontwarn org.openjsse.**
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
 
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
 -keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment

app/src/debug/res/values/bools.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 	<bool name="leak_canary_add_launcher_icon" tools:node="replace">false</bool>
+	<bool name="is_sync_enabled">true</bool>
 </resources>

app/src/debug/res/values/constants.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="account_type_sync" translatable="false">org.kotatsu.debug.sync</string>
-	<string name="sync_authority_history" translatable="false">org.koitharu.kotatsu.debug.history</string>
-	<string name="sync_authority_favourites" translatable="false">org.koitharu.kotatsu.debug.favourites</string>
-</resources>

app/src/main/AndroidManifest.xml

@@ -86,17 +86,7 @@
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:exported="true"
-			android:label="@string/settings">
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-
-				<data android:scheme="kotatsu" />
-				<data android:host="about" />
-			</intent-filter>
-		</activity>
+			android:label="@string/settings" />
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
@@ -155,9 +145,6 @@
 				<category android:name="android.intent.category.BROWSABLE" />
 
 				<data android:scheme="kotatsu" />
-				<data android:host="shikimori-auth" />
-				<data android:host="anilist-auth" />
-				<data android:host="mal-auth" />
 			</intent-filter>
 
 		</activity>
@@ -167,6 +154,7 @@
 			android:foregroundServiceType="dataSync"
 			android:stopWithTask="false" />
 		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
+		<service android:name="org.koitharu.kotatsu.local.ui.ImportService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
@@ -227,13 +215,13 @@
 		</provider>
 		<provider
 			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncProvider"
-			android:authorities="@string/sync_authority_favourites"
+			android:authorities="org.koitharu.kotatsu.favourites"
 			android:exported="false"
 			android:label="@string/favourites"
 			android:syncable="true" />
 		<provider
 			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncProvider"
-			android:authorities="@string/sync_authority_history"
+			android:authorities="org.koitharu.kotatsu.history"
 			android:exported="false"
 			android:label="@string/history"
 			android:syncable="true" />

app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt

@@ -23,7 +23,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import javax.inject.Inject
 
@@ -126,7 +125,6 @@ class KotatsuApp : Application(), Configuration.Provider {
 				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
 				.setClassInstanceLimit(PagesCache::class.java, 1)
 				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
-				.setClassInstanceLimit(PageLoader::class.java, 1)
 				.penaltyLog()
 				.build(),
 		)

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt

@@ -4,7 +4,6 @@ import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Size
 import androidx.room.withTransaction
-import dagger.Reusable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -35,7 +34,6 @@ import kotlin.math.roundToInt
 
 private const val MIN_WEBTOON_RATIO = 2
 
-@Reusable
 class MangaDataRepository @Inject constructor(
 	private val okHttpClient: OkHttpClient,
 	private val db: MangaDatabase,
@@ -128,7 +126,7 @@ class MangaDataRepository @Inject constructor(
 				.url(url)
 				.get()
 				.tag(MangaSource::class.java, page.source)
-				.cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE)
+				.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
 				.build()
 			okHttpClient.newCall(request).await().use {
 				runInterruptible(Dispatchers.IO) {

app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt

@@ -3,17 +3,15 @@ package org.koitharu.kotatsu.base.domain
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.lifecycle.SavedStateHandle
-import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.getParcelableCompat
 import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
 
 class MangaIntent private constructor(
-	@JvmField val manga: Manga?,
-	@JvmField val mangaId: Long,
-	@JvmField val uri: Uri?,
+	val manga: Manga?,
+	val mangaId: Long,
+	val uri: Uri?,
 ) {
 
 	constructor(intent: Intent?) : this(
@@ -22,12 +20,6 @@ class MangaIntent private constructor(
 		uri = intent?.data,
 	)
 
-	constructor(savedStateHandle: SavedStateHandle) : this(
-		manga = savedStateHandle.get<ParcelableManga>(KEY_MANGA)?.manga,
-		mangaId = savedStateHandle[KEY_ID] ?: ID_NONE,
-		uri = savedStateHandle[BaseActivity.EXTRA_DATA],
-	)
-
 	constructor(args: Bundle?) : this(
 		manga = args?.getParcelableCompat<ParcelableManga>(KEY_MANGA)?.manga,
 		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.base.ui
 
-import android.content.Intent
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.MenuItem
@@ -26,49 +26,39 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.base.ui.util.BaseActivityEntryPoint
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
+import org.koitharu.kotatsu.base.ui.util.inject
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.utils.ext.getThemeColor
+import javax.inject.Inject
 
-@Suppress("LeakingThis")
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
 	WindowInsetsDelegate.WindowInsetsListener {
 
-	private var isAmoledTheme = false
+	@Inject
+	lateinit var settings: AppSettings
 
 	protected lateinit var binding: B
 		private set
 
-	@JvmField
+	@Suppress("LeakingThis")
 	protected val exceptionResolver = ExceptionResolver(this)
 
-	@JvmField
+	@Suppress("LeakingThis")
 	protected val insetsDelegate = WindowInsetsDelegate(this)
 
-	@JvmField
 	val actionModeDelegate = ActionModeDelegate()
 
 	override fun onCreate(savedInstanceState: Bundle?) {
-		val settings = EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).settings
-		isAmoledTheme = settings.isAmoledTheme
+		EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).inject(this)
 		setTheme(settings.colorScheme.styleResId)
-		if (isAmoledTheme) {
+		if (settings.isAmoledTheme) {
 			setTheme(R.style.ThemeOverlay_Kotatsu_Amoled)
 		}
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)
 		insetsDelegate.handleImeInsets = true
-		putDataToExtras(intent)
-	}
-
-	override fun onPostCreate(savedInstanceState: Bundle?) {
-		super.onPostCreate(savedInstanceState)
-		onBackPressedDispatcher.addCallback(actionModeDelegate)
-	}
-
-	override fun onNewIntent(intent: Intent?) {
-		putDataToExtras(intent)
-		super.onNewIntent(intent)
 	}
 
 	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
@@ -112,7 +102,7 @@ abstract class BaseActivity<B : ViewBinding> :
 	protected fun isDarkAmoledTheme(): Boolean {
 		val uiMode = resources.configuration.uiMode
 		val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-		return isNight && isAmoledTheme
+		return isNight && settings.isAmoledTheme
 	}
 
 	@CallSuper
@@ -141,12 +131,17 @@ abstract class BaseActivity<B : ViewBinding> :
 		window.statusBarColor = getThemeColor(android.R.attr.statusBarColor)
 	}
 
-	private fun putDataToExtras(intent: Intent?) {
-		intent?.putExtra(EXTRA_DATA, intent.data)
-	}
-
-	companion object {
-
-		const val EXTRA_DATA = "data"
+	@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
+	@Deprecated("Should not be used")
+	override fun onBackPressed() {
+		if ( // https://issuetracker.google.com/issues/139738913
+			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&
+			isTaskRoot &&
+			supportFragmentManager.backStackEntryCount == 0
+		) {
+			finishAfterTransition()
+		} else {
+			super.onBackPressed()
+		}
 	}
 }

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.base.ui
 
 import android.app.Dialog
 import android.os.Bundle
+import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,8 +15,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
-import org.koitharu.kotatsu.utils.ext.findActivity
-import org.koitharu.kotatsu.utils.ext.getDisplaySize
+import org.koitharu.kotatsu.utils.ext.displayCompat
 import com.google.android.material.R as materialR
 
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
@@ -41,20 +41,21 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	): View {
 		val binding = onInflateView(inflater, container)
 		viewBinding = binding
-		return binding.root
-	}
 
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
 		// Enforce max width for tablets
 		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
 		if (width > 0) {
 			behavior?.maxWidth = width
 		}
-		// Set peek height to 40% display height
-		binding.root.context.findActivity()?.getDisplaySize()?.let {
-			behavior?.peekHeight = (it.height() * 0.4).toInt()
+
+		// Set peek height to 50% display height
+		requireContext().displayCompat?.let {
+			val metrics = DisplayMetrics()
+			it.getRealMetrics(metrics)
+			behavior?.peekHeight = (metrics.heightPixels * 0.4).toInt()
 		}
+
+		return binding.root
 	}
 
 	override fun onDestroyView() {

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt

@@ -10,7 +10,6 @@ import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 
-@Suppress("LeakingThis")
 abstract class BaseFragment<B : ViewBinding> :
 	Fragment(),
 	WindowInsetsDelegate.WindowInsetsListener {
@@ -20,10 +19,10 @@ abstract class BaseFragment<B : ViewBinding> :
 	protected val binding: B
 		get() = checkNotNull(viewBinding)
 
-	@JvmField
+	@Suppress("LeakingThis")
 	protected val exceptionResolver = ExceptionResolver(this)
 
-	@JvmField
+	@Suppress("LeakingThis")
 	protected val insetsDelegate = WindowInsetsDelegate(this)
 
 	protected val actionModeDelegate: ActionModeDelegate

app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt

@@ -9,13 +9,12 @@ import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.settings.SettingsHeadersFragment
-import javax.inject.Inject
 
-@Suppress("LeakingThis")
 @AndroidEntryPoint
 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	PreferenceFragmentCompat(),
@@ -25,7 +24,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	@Inject
 	lateinit var settings: AppSettings
 
-	@JvmField
+	@Suppress("LeakingThis")
 	protected val insetsDelegate = WindowInsetsDelegate(this)
 
 	override val recyclerView: RecyclerView
@@ -56,6 +55,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 		)
 	}
 
+	@Suppress("UsePropertyAccessSyntax")
 	protected fun setTitle(title: CharSequence) {
 		(parentFragment as? SettingsHeadersFragment)?.setTitle(title)
 			?: activity?.setTitle(title)

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt

@@ -3,24 +3,16 @@ package org.koitharu.kotatsu.base.ui
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+import kotlinx.coroutines.*
 import org.koitharu.kotatsu.base.ui.util.CountedBooleanLiveData
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 
 abstract class BaseViewModel : ViewModel() {
 
-	@JvmField
 	protected val loadingCounter = CountedBooleanLiveData()
-
-	@JvmField
 	protected val errorEvent = SingleLiveEvent<Throwable>()
 
 	val onError: LiveData<Throwable>
@@ -54,4 +46,4 @@ abstract class BaseViewModel : ViewModel() {
 			errorEvent.postCall(throwable)
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.base.ui
 
+import android.app.Service
 import android.content.Intent
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.CoroutineDispatcher
@@ -19,7 +20,7 @@ abstract class CoroutineIntentService : BaseService() {
 	final override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
 		launchCoroutine(intent, startId)
-		return START_REDELIVER_INTENT
+		return Service.START_REDELIVER_INTENT
 	}
 
 	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch(errorHandler(startId)) {

app/src/main/java/org/koitharu/kotatsu/base/ui/list/BoundsScrollListener.kt

@@ -6,6 +6,8 @@ import androidx.recyclerview.widget.RecyclerView
 abstract class BoundsScrollListener(private val offsetTop: Int, private val offsetBottom: Int) :
 	RecyclerView.OnScrollListener() {
 
+	constructor(offset: Int = 0) : this(offset, offset)
+
 	override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
 		super.onScrolled(recyclerView, dx, dy)
 		val layoutManager = (recyclerView.layoutManager as? LinearLayoutManager) ?: return
@@ -26,4 +28,4 @@ abstract class BoundsScrollListener(private val offsetTop: Int, private val offs
 	abstract fun onScrolledToStart(recyclerView: RecyclerView)
 
 	abstract fun onScrolledToEnd(recyclerView: RecyclerView)
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/list/NestedScrollStateHandle.kt

@@ -1,64 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import android.os.Bundle
-import android.os.Parcelable
-import android.util.SparseArray
-import androidx.core.os.BundleCompat
-import androidx.core.view.doOnNextLayout
-import androidx.recyclerview.widget.RecyclerView
-import java.util.Collections
-import java.util.WeakHashMap
-
-class NestedScrollStateHandle(
-	savedInstanceState: Bundle?,
-	private val key: String,
-) {
-
-	private val storage: SparseArray<Parcelable?> = savedInstanceState?.let {
-		BundleCompat.getSparseParcelableArray(it, key, Parcelable::class.java)
-	} ?: SparseArray<Parcelable?>()
-	private val controllers = Collections.newSetFromMap<Controller>(WeakHashMap())
-
-	fun attach(recycler: RecyclerView) = Controller(recycler).also(controllers::add)
-
-	fun onSaveInstanceState(outState: Bundle) {
-		controllers.forEach {
-			it.saveState()
-		}
-		outState.putSparseParcelableArray(key, storage)
-	}
-
-	inner class Controller(
-		private val recycler: RecyclerView
-	) {
-
-		private var lastPosition: Int = -1
-
-		fun onBind(position: Int) {
-			if (position != lastPosition) {
-				saveState()
-				lastPosition = position
-				storage[position]?.let {
-					restoreState(it)
-				}
-			}
-		}
-
-		fun onRecycled() {
-			saveState()
-			lastPosition = -1
-		}
-
-		fun saveState() {
-			if (lastPosition != -1) {
-				storage[lastPosition] = recycler.layoutManager?.onSaveInstanceState()
-			}
-		}
-
-		private fun restoreState(state: Parcelable) {
-			recycler.doOnNextLayout {
-				recycler.layoutManager?.onRestoreInstanceState(state)
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/base/ui/list/OnTipCloseListener.kt

@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-interface OnTipCloseListener<T> {
-
-	fun onCloseTip(tip: T)
-}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeDelegate.kt

@@ -1,11 +1,10 @@
 package org.koitharu.kotatsu.base.ui.util
 
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.view.ActionMode
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 
-class ActionModeDelegate : OnBackPressedCallback(false) {
+class ActionModeDelegate {
 
 	private var activeActionMode: ActionMode? = null
 	private var listeners: MutableList<ActionModeListener>? = null
@@ -13,19 +12,13 @@ class ActionModeDelegate : OnBackPressedCallback(false) {
 	val isActionModeStarted: Boolean
 		get() = activeActionMode != null
 
-	override fun handleOnBackPressed() {
-		activeActionMode?.finish()
-	}
-
 	fun onSupportActionModeStarted(mode: ActionMode) {
 		activeActionMode = mode
-		isEnabled = true
 		listeners?.forEach { it.onActionModeStarted(mode) }
 	}
 
 	fun onSupportActionModeFinished(mode: ActionMode) {
 		activeActionMode = null
-		isEnabled = false
 		listeners?.forEach { it.onActionModeFinished(mode) }
 	}
 
@@ -54,4 +47,4 @@ class ActionModeDelegate : OnBackPressedCallback(false) {
 			removeListener(listener)
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActivityRecreationHandle.kt

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.base.ui.util
 
 import android.app.Activity
 import android.os.Bundle
-import androidx.core.app.ActivityCompat
 import org.koitharu.kotatsu.base.ui.DefaultActivityLifecycleCallbacks
 import java.util.WeakHashMap
 import javax.inject.Inject
@@ -23,6 +22,6 @@ class ActivityRecreationHandle @Inject constructor() : DefaultActivityLifecycleC
 
 	fun recreateAll() {
 		val snapshot = activities.keys.toList()
-		snapshot.forEach { ActivityCompat.recreate(it) }
+		snapshot.forEach { it.recreate() }
 	}
 }

app/src/main/java/org/koitharu/kotatsu/base/ui/util/BaseActivityEntryPoint.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.base.ui.util
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.prefs.AppSettings
 
 @EntryPoint
@@ -10,3 +11,8 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 interface BaseActivityEntryPoint {
 	val settings: AppSettings
 }
+
+// Hilt cannot inject into parametrized classes
+fun BaseActivityEntryPoint.inject(activity: BaseActivity<*>) {
+	activity.settings = settings
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/DefaultTextWatcher.kt

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import android.text.Editable
-import android.text.TextWatcher
-
-interface DefaultTextWatcher : TextWatcher {
-
-	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?) = Unit
-}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleActionObserver.kt

@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import android.view.View
-import androidx.lifecycle.Observer
-import com.google.android.material.snackbar.Snackbar
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.reverseAsync
-import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
-import org.koitharu.kotatsu.utils.ext.findActivity
-
-class ReversibleActionObserver(
-	private val snackbarHost: View,
-) : Observer<ReversibleAction?> {
-
-	override fun onChanged(value: ReversibleAction?) {
-		if (value == null) {
-			return
-		}
-		val handle = value.handle
-		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
-		val snackbar = Snackbar.make(snackbarHost, value.stringResId, length)
-		if (handle != null) {
-			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
-		}
-		(snackbarHost.context.findActivity() as? BottomNavOwner)?.let {
-			snackbar.anchorView = it.bottomNav
-		}
-		snackbar.show()
-	}
-}

app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt

@@ -10,10 +10,8 @@ class WindowInsetsDelegate(
 	private val listener: WindowInsetsListener,
 ) : OnApplyWindowInsetsListener, View.OnLayoutChangeListener {
 
-	@JvmField
 	var handleImeInsets: Boolean = false
 
-	@JvmField
 	var interceptingWindowInsetsListener: OnApplyWindowInsetsListener? = null
 
 	private var lastInsets: Insets? = null
@@ -65,4 +63,4 @@ class WindowInsetsDelegate(
 
 		fun onWindowInsetsChanged(insets: Insets)
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt

@@ -1,20 +1,17 @@
 package org.koitharu.kotatsu.base.ui.widgets
 
-import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.View.OnClickListener
-import androidx.annotation.ColorRes
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.getColorStateListOrThrow
+import androidx.annotation.DrawableRes
 import androidx.core.view.children
+import com.google.android.material.R as materialR
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.utils.ext.castOrNull
-import com.google.android.material.R as materialR
+import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
 
 class ChipsView @JvmOverloads constructor(
 	context: Context,
@@ -30,9 +27,6 @@ class ChipsView @JvmOverloads constructor(
 	private val chipOnCloseListener = OnClickListener {
 		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
 	}
-	private val defaultChipStrokeColor: ColorStateList
-	private val defaultChipTextColor: ColorStateList
-	private val defaultChipIconTint: ColorStateList
 	var onChipClickListener: OnChipClickListener? = null
 		set(value) {
 			field = value
@@ -46,15 +40,6 @@ class ChipsView @JvmOverloads constructor(
 			children.forEach { (it as? Chip)?.isCloseIconVisible = isCloseIconVisible }
 		}
 
-	init {
-		@SuppressLint("CustomViewStyleable")
-		val a = context.obtainStyledAttributes(null, materialR.styleable.Chip, 0, R.style.Widget_Kotatsu_Chip)
-		defaultChipStrokeColor = a.getColorStateListOrThrow(materialR.styleable.Chip_chipStrokeColor)
-		defaultChipTextColor = a.getColorStateListOrThrow(materialR.styleable.Chip_android_textColor)
-		defaultChipIconTint = a.getColorStateListOrThrow(materialR.styleable.Chip_chipIconTint)
-		a.recycle()
-	}
-
 	override fun requestLayout() {
 		if (isLayoutSuppressedCompat) {
 			isLayoutCalledOnSuppressed = true
@@ -90,15 +75,12 @@ class ChipsView @JvmOverloads constructor(
 
 	private fun bindChip(chip: Chip, model: ChipModel) {
 		chip.text = model.title
-		val tint = if (model.tint == 0) {
-			null
+		if (model.icon == 0) {
+			chip.isChipIconVisible = false
 		} else {
-			ContextCompat.getColorStateList(context, model.tint)
+			chip.isChipIconVisible = true
+			chip.setChipIconResource(model.icon)
 		}
-		chip.chipIconTint = tint ?: defaultChipIconTint
-		chip.checkedIconTint = tint ?: defaultChipIconTint
-		chip.chipStrokeColor = tint ?: defaultChipStrokeColor
-		chip.setTextColor(tint ?: defaultChipTextColor)
 		chip.isClickable = onChipClickListener != null || model.isCheckable
 		chip.isCheckable = model.isCheckable
 		chip.isChecked = model.isChecked
@@ -110,9 +92,8 @@ class ChipsView @JvmOverloads constructor(
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
 		chip.setChipDrawable(drawable)
 		chip.isCheckedIconVisible = true
-		chip.isChipIconVisible = false
 		chip.setCheckedIconResource(R.drawable.ic_check)
-		chip.checkedIconTint = defaultChipIconTint
+		chip.checkedIconTint = context.getThemeColorStateList(materialR.attr.colorControlNormal)
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
@@ -132,7 +113,7 @@ class ChipsView @JvmOverloads constructor(
 	}
 
 	class ChipModel(
-		@ColorRes val tint: Int,
+		@DrawableRes val icon: Int,
 		val title: CharSequence,
 		val isCheckable: Boolean,
 		val isChecked: Boolean,
@@ -145,7 +126,7 @@ class ChipsView @JvmOverloads constructor(
 
 			other as ChipModel
 
-			if (tint != other.tint) return false
+			if (icon != other.icon) return false
 			if (title != other.title) return false
 			if (isCheckable != other.isCheckable) return false
 			if (isChecked != other.isChecked) return false
@@ -155,7 +136,7 @@ class ChipsView @JvmOverloads constructor(
 		}
 
 		override fun hashCode(): Int {
-			var result = tint.hashCode()
+			var result = icon
 			result = 31 * result + title.hashCode()
 			result = 31 * result + isCheckable.hashCode()
 			result = 31 * result + isChecked.hashCode()

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SegmentedBarView.kt

@@ -1,7 +1,5 @@
 package org.koitharu.kotatsu.base.ui.widgets
 
-import android.animation.Animator
-import android.animation.ValueAnimator
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Outline
@@ -9,34 +7,48 @@ import android.graphics.Paint
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewOutlineProvider
-import android.view.animation.DecelerateInterpolator
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
-import org.koitharu.kotatsu.parsers.util.replaceWith
-import org.koitharu.kotatsu.utils.ext.getAnimationDuration
-import org.koitharu.kotatsu.utils.ext.getThemeColor
-import org.koitharu.kotatsu.utils.ext.isAnimationsEnabled
-import org.koitharu.kotatsu.utils.ext.resolveDp
+import androidx.core.graphics.ColorUtils
 import com.google.android.material.R as materialR
+import kotlin.random.Random
+import org.koitharu.kotatsu.parsers.util.replaceWith
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.resolveDp
 
 class SegmentedBarView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
 	defStyleAttr: Int = 0,
-) : View(context, attrs, defStyleAttr), ValueAnimator.AnimatorUpdateListener, Animator.AnimatorListener {
+) : View(context, attrs, defStyleAttr) {
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val segmentsData = ArrayList<Segment>()
 	private val segmentsSizes = ArrayList<Float>()
 	private val outlineColor = context.getThemeColor(materialR.attr.colorOutline)
 	private var cornerSize = 0f
-	private var scaleFactor = 1f
-	private var scaleAnimator: ValueAnimator? = null
+
+	var segments: List<Segment>
+		get() = segmentsData
+		set(value) {
+			segmentsData.replaceWith(value)
+			updateSizes()
+			invalidate()
+		}
 
 	init {
 		paint.strokeWidth = context.resources.resolveDp(1f)
 		outlineProvider = OutlineProvider()
 		clipToOutline = true
+
+		if (isInEditMode) {
+			segments = List(Random.nextInt(3, 5)) {
+				Segment(
+					percent = Random.nextFloat(),
+					color = ColorUtils.HSLToColor(floatArrayOf(Random.nextInt(0, 360).toFloat(), 0.5f, 0.5f)),
+				)
+			}
+		}
 	}
 
 	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
@@ -67,56 +79,12 @@ class SegmentedBarView @JvmOverloads constructor(
 		canvas.drawRoundRect(0f, 0f, w, height.toFloat(), cornerSize, cornerSize, paint)
 	}
 
-	override fun onAnimationStart(animation: Animator) = Unit
-
-	override fun onAnimationEnd(animation: Animator) {
-		if (scaleAnimator === animation) {
-			scaleAnimator = null
-		}
-	}
-
-	override fun onAnimationUpdate(animation: ValueAnimator) {
-		scaleFactor = animation.animatedValue as Float
-		updateSizes()
-		invalidate()
-	}
-
-	override fun onAnimationCancel(animation: Animator) = Unit
-
-	override fun onAnimationRepeat(animation: Animator) = Unit
-
-	fun animateSegments(value: List<Segment>) {
-		scaleAnimator?.cancel()
-		segmentsData.replaceWith(value)
-		if (!context.isAnimationsEnabled) {
-			scaleAnimator = null
-			scaleFactor = 1f
-			updateSizes()
-			invalidate()
-			return
-		}
-		scaleFactor = 0f
-		updateSizes()
-		invalidate()
-		val animator = ValueAnimator.ofFloat(0f, 1f)
-		animator.duration = context.getAnimationDuration(android.R.integer.config_longAnimTime)
-		animator.interpolator = DecelerateInterpolator()
-		animator.addUpdateListener(this@SegmentedBarView)
-		animator.addListener(this@SegmentedBarView)
-		scaleAnimator = animator
-		animator.start()
-	}
-
 	private fun updateSizes() {
 		segmentsSizes.clear()
 		segmentsSizes.ensureCapacity(segmentsData.size + 1)
 		var w = width.toFloat()
-		val maxScale = (scaleFactor * (segmentsData.size - 1)).coerceAtLeast(1f)
-		for ((index, segment) in segmentsData.withIndex()) {
-			val scale = (scaleFactor * (index + 1) / maxScale).coerceAtMost(1f)
-			val segmentWidth = (w * segment.percent).coerceAtLeast(
-				if (index == 0) height.toFloat() else cornerSize,
-			) * scale
+		for (segment in segmentsData) {
+			val segmentWidth = (w * segment.percent).coerceAtLeast(cornerSize)
 			segmentsSizes.add(segmentWidth)
 			w -= segmentWidth
 		}

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/TwoLinesItemView.kt

@@ -1,104 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.res.ColorStateList
-import android.content.res.TypedArray
-import android.graphics.Color
-import android.graphics.drawable.InsetDrawable
-import android.graphics.drawable.RippleDrawable
-import android.graphics.drawable.ShapeDrawable
-import android.graphics.drawable.shapes.RoundRectShape
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.LinearLayout
-import androidx.annotation.AttrRes
-import androidx.annotation.DrawableRes
-import androidx.core.content.ContextCompat
-import androidx.core.content.withStyledAttributes
-import androidx.core.view.updateLayoutParams
-import androidx.core.widget.ImageViewCompat
-import androidx.core.widget.TextViewCompat
-import com.google.android.material.ripple.RippleUtils
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.shape.ShapeAppearanceModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.ViewTwoLinesItemBinding
-import org.koitharu.kotatsu.utils.ext.resolveDp
-
-@SuppressLint("RestrictedApi")
-class TwoLinesItemView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = 0,
-) : LinearLayout(context, attrs, defStyleAttr) {
-
-	private val binding = ViewTwoLinesItemBinding.inflate(LayoutInflater.from(context), this)
-
-	init {
-		var textColors: ColorStateList? = null
-		context.withStyledAttributes(
-			set = attrs,
-			attrs = R.styleable.TwoLinesItemView,
-			defStyleAttr = defStyleAttr,
-			defStyleRes = R.style.Widget_Kotatsu_TwoLinesItemView,
-		) {
-			val itemRippleColor = getRippleColor(context)
-			val shape = createShapeDrawable(this)
-			val roundCorners = FloatArray(8) { resources.resolveDp(16f) }
-			background = RippleDrawable(
-				RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
-				shape,
-				ShapeDrawable(RoundRectShape(roundCorners, null, null)),
-			)
-			val drawablePadding = getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_drawablePadding, 0)
-			binding.layoutText.updateLayoutParams<MarginLayoutParams> { marginStart = drawablePadding }
-			setIconResource(getResourceId(R.styleable.TwoLinesItemView_icon, 0))
-			binding.title.text = getText(R.styleable.TwoLinesItemView_title)
-			binding.subtitle.text = getText(R.styleable.TwoLinesItemView_subtitle)
-			textColors = getColorStateList(R.styleable.TwoLinesItemView_android_textColor)
-			val textAppearanceFallback = androidx.appcompat.R.style.TextAppearance_AppCompat
-			TextViewCompat.setTextAppearance(
-				binding.title,
-				getResourceId(R.styleable.TwoLinesItemView_titleTextAppearance, textAppearanceFallback),
-			)
-			TextViewCompat.setTextAppearance(
-				binding.subtitle,
-				getResourceId(R.styleable.TwoLinesItemView_subtitleTextAppearance, textAppearanceFallback),
-			)
-		}
-		if (textColors == null) {
-			textColors = binding.title.textColors
-		}
-		binding.title.setTextColor(textColors)
-		binding.subtitle.setTextColor(textColors)
-		ImageViewCompat.setImageTintList(binding.icon, textColors)
-	}
-
-	fun setIconResource(@DrawableRes resId: Int) {
-		val icon = if (resId != 0) ContextCompat.getDrawable(context, resId) else null
-		binding.icon.setImageDrawable(icon)
-	}
-
-	private fun createShapeDrawable(ta: TypedArray): InsetDrawable {
-		val shapeAppearance = ShapeAppearanceModel.builder(
-			context,
-			ta.getResourceId(R.styleable.TwoLinesItemView_shapeAppearance, 0),
-			ta.getResourceId(R.styleable.TwoLinesItemView_shapeAppearanceOverlay, 0),
-		).build()
-		val shapeDrawable = MaterialShapeDrawable(shapeAppearance)
-		shapeDrawable.fillColor = ta.getColorStateList(R.styleable.TwoLinesItemView_backgroundFillColor)
-		return InsetDrawable(
-			shapeDrawable,
-			ta.getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_insetLeft, 0),
-			ta.getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_insetTop, 0),
-			ta.getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_insetRight, 0),
-			ta.getDimensionPixelOffset(R.styleable.TwoLinesItemView_android_insetBottom, 0),
-		)
-	}
-
-	private fun getRippleColor(context: Context): ColorStateList {
-		return ContextCompat.getColorStateList(context, R.color.selector_overlay)
-			?: ColorStateList.valueOf(Color.TRANSPARENT)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.bookmarks.domain
 
 import android.database.SQLException
 import androidx.room.withTransaction
-import dagger.Reusable
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.base.domain.ReversibleHandle
@@ -17,9 +17,7 @@ import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.mapItems
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import javax.inject.Inject
 
-@Reusable
 class BookmarksRepository @Inject constructor(
 	private val db: MangaDatabase,
 ) {

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

@@ -1,12 +1,7 @@
 package org.koitharu.kotatsu.bookmarks.ui
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
+import android.view.*
 import androidx.appcompat.view.ActionMode
 import androidx.core.graphics.Insets
 import androidx.core.view.updateLayoutParams
@@ -15,6 +10,7 @@ import androidx.fragment.app.viewModels
 import coil.ImageLoader
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.reverseAsync
 import org.koitharu.kotatsu.base.ui.BaseFragment
@@ -28,7 +24,6 @@ import org.koitharu.kotatsu.bookmarks.data.ids
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksGroupAdapter
 import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
@@ -37,9 +32,9 @@ import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.invalidateNestedItemDecorations
 import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class BookmarksFragment :
@@ -81,7 +76,7 @@ class BookmarksFragment :
 		binding.recyclerView.addItemDecoration(spacingDecoration)
 
 		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
-		viewModel.onError.observe(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
+		viewModel.onError.observe(viewLifecycleOwner, ::onError)
 		viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone)
 	}
 
@@ -95,7 +90,6 @@ class BookmarksFragment :
 		if (selectionController?.onItemClick(item.manga, item.pageId) != true) {
 			val intent = ReaderActivity.newIntent(view.context, item)
 			startActivity(intent, scaleUpActivityOptionsOf(view).toBundle())
-			Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 		}
 	}
 
@@ -138,7 +132,6 @@ class BookmarksFragment :
 				mode.finish()
 				true
 			}
-
 			else -> false
 		}
 	}
@@ -161,6 +154,14 @@ class BookmarksFragment :
 		adapter?.items = list
 	}
 
+	private fun onError(e: Throwable) {
+		Snackbar.make(
+			binding.recyclerView,
+			e.getDisplayMessage(resources),
+			Snackbar.LENGTH_SHORT,
+		).show()
+	}
+
 	private fun onActionDone(action: ReversibleAction) {
 		val handle = action.handle
 		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.bookmarks.ui
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
@@ -17,8 +18,7 @@ import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.SingleLiveEvent
-import org.koitharu.kotatsu.utils.asFlowLiveData
-import javax.inject.Inject
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
 @HiltViewModel
 class BookmarksViewModel @Inject constructor(
@@ -43,7 +43,7 @@ class BookmarksViewModel @Inject constructor(
 			}
 		}
 		.catch { e -> emit(listOf(e.toErrorState(canRetry = false))) }
-		.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
+		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
 
 	fun removeBookmarks(ids: Map<Manga, Set<Long>>) {
 		launchJob(Dispatchers.Default) {

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

@@ -8,12 +8,9 @@ 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.decodeRegion
 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.source
-import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
 fun bookmarkListAD(
 	coil: ImageLoader,
@@ -28,14 +25,12 @@ fun bookmarkListAD(
 	binding.root.setOnLongClickListener(listener)
 
 	bind {
-		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageUrl)?.run {
-			size(CoverSizeResolver(binding.imageViewThumb))
+		binding.imageViewThumb.newImageRequest(item.imageUrl, item.manga.source)?.run {
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
-			decodeRegion(item.scroll)
-			source(item.manga.source)
+			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
 	}

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

@@ -18,8 +18,6 @@ import org.koitharu.kotatsu.utils.ext.clearItemDecorations
 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.source
-import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
 fun bookmarksGroupAD(
 	coil: ImageLoader,
@@ -50,13 +48,12 @@ fun bookmarksGroupAD(
 			binding.recyclerView.addItemDecoration(spacingDecoration)
 			selectionController.attachToRecyclerView(item.manga, binding.recyclerView)
 		}
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
+		binding.imageViewCover.newImageRequest(item.manga.coverUrl, item.manga.source)?.run {
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
-			size(CoverSizeResolver(binding.imageViewCover))
-			source(item.manga.source)
+			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
 		binding.textViewTitle.text = item.manga.title

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

@@ -5,18 +5,14 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlin.jvm.internal.Intrinsics
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
-import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
-import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
-import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
-import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
+import org.koitharu.kotatsu.list.ui.adapter.*
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import kotlin.jvm.internal.Intrinsics
 
 class BookmarksGroupAdapter(
 	coil: ImageLoader,
@@ -42,7 +38,7 @@ class BookmarksGroupAdapter(
 			)
 			.addDelegate(loadingStateAD())
 			.addDelegate(loadingFooterAD())
-			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listener))
+			.addDelegate(emptyStateListAD(coil, listener))
 			.addDelegate(errorStateListAD(listener))
 	}
 
@@ -53,7 +49,6 @@ class BookmarksGroupAdapter(
 				oldItem is BookmarksGroup && newItem is BookmarksGroup -> {
 					oldItem.manga.id == newItem.manga.id
 				}
-
 				else -> oldItem.javaClass == newItem.javaClass
 			}
 		}

app/src/main/java/org/koitharu/kotatsu/browser/ProgressChromeClient.kt

@@ -2,13 +2,14 @@ package org.koitharu.kotatsu.browser
 
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import android.widget.ProgressBar
 import androidx.core.view.isVisible
-import com.google.android.material.progressindicator.BaseProgressIndicator
+import org.koitharu.kotatsu.utils.ext.setProgressCompat
 
 private const val PROGRESS_MAX = 100
 
 class ProgressChromeClient(
-	private val progressIndicator: BaseProgressIndicator<*>,
+	private val progressIndicator: ProgressBar,
 ) : WebChromeClient() {
 
 	init {
@@ -27,4 +28,4 @@ class ProgressChromeClient(
 			progressIndicator.isIndeterminate = true
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt

@@ -20,13 +20,14 @@ import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
+import org.koitharu.kotatsu.utils.ext.stringArgument
 import org.koitharu.kotatsu.utils.ext.withArgs
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
 
-	private lateinit var url: String
+	private val url by stringArgument(ARG_URL)
 	private val pendingResult = Bundle(1)
 
 	@Inject
@@ -34,11 +35,6 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	private var onBackPressedCallback: WebViewBackPressedCallback? = null
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		url = requireArguments().getString(ARG_URL).orEmpty()
-	}
-
 	override fun onInflateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -54,12 +50,12 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 			databaseEnabled = true
 			userAgentString = arguments?.getString(ARG_UA) ?: CommonHeadersInterceptor.userAgentChrome
 		}
-		binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url)
+		binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url.orEmpty())
 		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
-		if (url.isEmpty()) {
+		if (url.isNullOrEmpty()) {
 			dismissAllowingStateLoss()
 		} else {
-			binding.webView.loadUrl(url)
+			binding.webView.loadUrl(url.orEmpty())
 		}
 	}
 

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

@@ -86,7 +86,6 @@ interface AppModule {
 		fun provideOkHttpClient(
 			localStorageManager: LocalStorageManager,
 			commonHeadersInterceptor: CommonHeadersInterceptor,
-			mirrorSwitchInterceptor: MirrorSwitchInterceptor,
 			cookieJar: CookieJar,
 			settings: AppSettings,
 		): OkHttpClient {
@@ -104,7 +103,6 @@ interface AppModule {
 				addInterceptor(GZipInterceptor())
 				addInterceptor(commonHeadersInterceptor)
 				addInterceptor(CloudFlareInterceptor())
-				addInterceptor(mirrorSwitchInterceptor)
 				if (BuildConfig.DEBUG) {
 					addInterceptor(CurlLoggingInterceptor())
 				}
@@ -169,6 +167,7 @@ interface AppModule {
 		}
 
 		@Provides
+		@Singleton
 		@ElementsIntoSet
 		fun provideDatabaseObservers(
 			widgetUpdater: WidgetUpdater,
@@ -183,6 +182,7 @@ interface AppModule {
 		)
 
 		@Provides
+		@Singleton
 		@ElementsIntoSet
 		fun provideActivityLifecycleCallbacks(
 			appProtectHelper: AppProtectHelper,

app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/DialogErrorObserver.kt

@@ -1,66 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions.resolve
-
-import android.content.DialogInterface
-import android.view.View
-import androidx.core.util.Consumer
-import androidx.fragment.app.Fragment
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.ErrorDetailsDialog
-import org.koitharu.kotatsu.parsers.exception.ParseException
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-
-class DialogErrorObserver(
-	host: View,
-	fragment: Fragment?,
-	resolver: ExceptionResolver?,
-	private val onResolved: Consumer<Boolean>?,
-) : ErrorObserver(host, fragment, resolver, onResolved) {
-
-	constructor(
-		host: View,
-		fragment: Fragment?,
-	) : this(host, fragment, null, null)
-
-	override fun onChanged(value: Throwable?) {
-		if (value == null) {
-			return
-		}
-		val listener = DialogListener(value)
-		val dialogBuilder = MaterialAlertDialogBuilder(activity ?: host.context)
-			.setMessage(value.getDisplayMessage(host.context.resources))
-			.setNegativeButton(R.string.close, listener)
-			.setOnCancelListener(listener)
-		if (canResolve(value)) {
-			dialogBuilder.setPositiveButton(ExceptionResolver.getResolveStringId(value), listener)
-		} else if (value is ParseException) {
-			val fm = fragmentManager
-			if (fm != null) {
-				dialogBuilder.setPositiveButton(R.string.details) { _, _ ->
-					ErrorDetailsDialog.show(fm, value, value.url)
-				}
-			}
-		}
-		val dialog = dialogBuilder.create()
-		if (activity != null) {
-			dialog.setOwnerActivity(activity)
-		}
-		dialog.show()
-	}
-
-	private inner class DialogListener(
-		private val error: Throwable,
-	) : DialogInterface.OnClickListener, DialogInterface.OnCancelListener {
-
-		override fun onClick(dialog: DialogInterface?, which: Int) {
-			when (which) {
-				DialogInterface.BUTTON_NEGATIVE -> onResolved?.accept(false)
-				DialogInterface.BUTTON_POSITIVE -> resolve(error)
-			}
-		}
-
-		override fun onCancel(dialog: DialogInterface?) {
-			onResolved?.accept(false)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ErrorObserver.kt

@@ -1,44 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions.resolve
-
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.util.Consumer
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.LifecycleCoroutineScope
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.Observer
-import androidx.lifecycle.coroutineScope
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.utils.ext.findActivity
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
-
-abstract class ErrorObserver(
-	protected val host: View,
-	protected val fragment: Fragment?,
-	private val resolver: ExceptionResolver?,
-	private val onResolved: Consumer<Boolean>?,
-) : Observer<Throwable?> {
-
-	protected val activity = host.context.findActivity()
-
-	private val lifecycleScope: LifecycleCoroutineScope
-		get() = checkNotNull(fragment?.viewLifecycleScope ?: (activity as? LifecycleOwner)?.lifecycle?.coroutineScope)
-
-	protected val fragmentManager: FragmentManager?
-		get() = fragment?.childFragmentManager ?: (activity as? AppCompatActivity)?.supportFragmentManager
-
-	protected fun canResolve(error: Throwable): Boolean {
-		return resolver != null && ExceptionResolver.canResolve(error)
-	}
-
-	protected fun resolve(error: Throwable) {
-		lifecycleScope.launch {
-			val isResolved = resolver?.resolve(error) ?: false
-			if (isActive) {
-				onResolved?.accept(isResolved)
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt

@@ -1,23 +1,27 @@
 package org.koitharu.kotatsu.core.exceptions.resolve
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.StringRes
 import androidx.collection.ArrayMap
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.Headers
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.ui.ErrorDetailsDialog
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import org.koitharu.kotatsu.utils.TaggedActivityResult
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.isSuccess
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -39,14 +43,11 @@ class ExceptionResolver private constructor(
 		sourceAuthContract = fragment.registerForActivityResult(SourceAuthActivity.Contract(), this)
 	}
 
-	override fun onActivityResult(result: TaggedActivityResult) {
+	override fun onActivityResult(result: TaggedActivityResult?) {
+		result ?: return
 		continuations.remove(result.tag)?.resume(result.isSuccess)
 	}
 
-	fun showDetails(e: Throwable, url: String?) {
-		ErrorDetailsDialog.show(getFragmentManager(), e, url)
-	}
-
 	suspend fun resolve(e: Throwable): Boolean = when (e) {
 		is CloudFlareProtectedException -> resolveCF(e.url, e.headers)
 		is AuthRequiredException -> resolveAuthException(e.source)
@@ -99,5 +100,21 @@ class ExceptionResolver private constructor(
 		}
 
 		fun canResolve(e: Throwable) = getResolveStringId(e) != 0
+
+		fun showDetails(context: Context, e: Throwable) {
+			val stackTrace = e.stackTraceToString()
+			val dialog = MaterialAlertDialogBuilder(context)
+				.setTitle(e.getDisplayMessage(context.resources))
+				.setMessage(stackTrace)
+				.setPositiveButton(androidx.preference.R.string.copy) { _, _ ->
+					val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+					clipboardManager.setPrimaryClip(
+						ClipData.newPlainText(context.getString(R.string.error), stackTrace),
+					)
+				}
+				.setNegativeButton(R.string.close, null)
+				.create()
+			dialog.show()
+		}
 	}
 }

app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/SnackbarErrorObserver.kt

@@ -1,47 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions.resolve
-
-import android.view.View
-import androidx.core.util.Consumer
-import androidx.fragment.app.Fragment
-import com.google.android.material.snackbar.Snackbar
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.ErrorDetailsDialog
-import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
-import org.koitharu.kotatsu.parsers.exception.ParseException
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-
-class SnackbarErrorObserver(
-	host: View,
-	fragment: Fragment?,
-	resolver: ExceptionResolver?,
-	onResolved: Consumer<Boolean>?,
-) : ErrorObserver(host, fragment, resolver, onResolved) {
-
-	constructor(
-		host: View,
-		fragment: Fragment?,
-	) : this(host, fragment, null, null)
-
-	override fun onChanged(value: Throwable?) {
-		if (value == null) {
-			return
-		}
-		val snackbar = Snackbar.make(host, value.getDisplayMessage(host.context.resources), Snackbar.LENGTH_SHORT)
-		if (activity is BottomNavOwner) {
-			snackbar.anchorView = activity.bottomNav
-		}
-		if (canResolve(value)) {
-			snackbar.setAction(ExceptionResolver.getResolveStringId(value)) {
-				resolve(value)
-			}
-		} else if (value is ParseException) {
-			val fm = fragmentManager
-			if (fm != null) {
-				snackbar.setAction(R.string.details) {
-					ErrorDetailsDialog.show(fm, value, value.url)
-				}
-			}
-		}
-		snackbar.show()
-	}
-}

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.model
 
 import androidx.core.os.LocaleListCompat
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
@@ -9,18 +8,6 @@ import org.koitharu.kotatsu.utils.ext.iterator
 
 fun Collection<Manga>.ids() = mapToSet { it.id }
 
-fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
-	if (size <= 1) {
-		return size
-	}
-	val acc = HashMap<String?, Int>()
-	for (item in this) {
-		val branch = item.chapter.branch
-		acc[branch] = (acc[branch] ?: 0) + 1
-	}
-	return acc.values.max()
-}
-
 fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 	val ch = chapters
 	if (ch.isNullOrEmpty()) {
@@ -44,4 +31,4 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 		}
 	}
 	return groups.maxByOrNull { it.value.size }?.key
-}
+}

app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt

@@ -14,6 +14,6 @@ object CommonHeaders {
 	const val ACCEPT_ENCODING = "Accept-Encoding"
 	const val AUTHORIZATION = "Authorization"
 
-	val CACHE_CONTROL_NO_STORE: CacheControl
+	val CACHE_CONTROL_DISABLED: CacheControl
 		get() = CacheControl.Builder().noStore().build()
 }

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

@@ -1,102 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import dagger.Lazy
-import okhttp3.Interceptor
-import okhttp3.Request
-import okhttp3.Response
-import okhttp3.ResponseBody
-import okhttp3.ResponseBody.Companion.toResponseBody
-import okhttp3.internal.canParseAsIpAddress
-import okhttp3.internal.closeQuietly
-import okhttp3.internal.publicsuffix.PublicSuffixDatabase
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MirrorSwitchInterceptor @Inject constructor(
-	private val mangaRepositoryFactoryLazy: Lazy<MangaRepository.Factory>,
-) : Interceptor {
-
-	override fun intercept(chain: Interceptor.Chain): Response {
-		val request = chain.request()
-		return try {
-			val response = chain.proceed(request)
-			if (response.isFailed) {
-				val responseCopy = response.copy()
-				response.closeQuietly()
-				trySwitchMirror(request, chain)?.also {
-					responseCopy.closeQuietly()
-				} ?: responseCopy
-			} else {
-				response
-			}
-		} catch (e: Exception) {
-			trySwitchMirror(request, chain) ?: throw e
-		}
-	}
-
-	private fun trySwitchMirror(request: Request, chain: Interceptor.Chain): Response? {
-		val source = request.tag(MangaSource::class.java) ?: return null
-		val repository = mangaRepositoryFactoryLazy.get().create(source) as? RemoteMangaRepository ?: return null
-		val mirrors = repository.getAvailableMirrors()
-		if (mirrors.isEmpty()) {
-			return null
-		}
-		return tryMirrors(repository, mirrors, chain, request)
-	}
-
-	private fun tryMirrors(
-		repository: RemoteMangaRepository,
-		mirrors: List<String>,
-		chain: Interceptor.Chain,
-		request: Request,
-	): Response? {
-		val url = request.url
-		val currentDomain = url.topPrivateDomain()
-		if (currentDomain !in mirrors) {
-			return null
-		}
-		val urlBuilder = url.newBuilder()
-		for (mirror in mirrors) {
-			if (mirror == currentDomain) {
-				continue
-			}
-			val newHost = hostOf(url.host, mirror) ?: continue
-			val newRequest = request.newBuilder()
-				.url(urlBuilder.host(newHost).build())
-				.build()
-			val response = chain.proceed(newRequest)
-			if (response.isFailed) {
-				response.closeQuietly()
-			} else {
-				repository.domain = mirror
-				return response
-			}
-		}
-		return null
-	}
-
-	private val Response.isFailed: Boolean
-		get() = code in 400..599
-
-	private fun hostOf(host: String, newDomain: String): String? {
-		if (newDomain.canParseAsIpAddress()) {
-			return newDomain
-		}
-		val domain = PublicSuffixDatabase.get().getEffectiveTldPlusOne(host) ?: return null
-		return host.removeSuffix(domain) + newDomain
-	}
-
-	private fun Response.copy(): Response {
-		return newBuilder()
-			.body(body?.copy())
-			.build()
-	}
-
-	private fun ResponseBody.copy(): ResponseBody {
-		return source().readByteArray().toResponseBody(contentType())
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/os/NetworkState.kt

@@ -3,28 +3,23 @@ package org.koitharu.kotatsu.core.os
 import android.net.ConnectivityManager
 import android.net.ConnectivityManager.NetworkCallback
 import android.net.Network
-import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import kotlinx.coroutines.flow.first
 import org.koitharu.kotatsu.utils.MediatorStateFlow
-import org.koitharu.kotatsu.utils.ext.isOnline
+import org.koitharu.kotatsu.utils.ext.isNetworkAvailable
 
 class NetworkState(
 	private val connectivityManager: ConnectivityManager,
-) : MediatorStateFlow<Boolean>(connectivityManager.isOnline()) {
+) : MediatorStateFlow<Boolean>(connectivityManager.isNetworkAvailable) {
 
 	private val callback = NetworkCallbackImpl()
 
-	@Synchronized
 	override fun onActive() {
 		invalidate()
-		val request = NetworkRequest.Builder()
-			.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-			.build()
+		val request = NetworkRequest.Builder().build()
 		connectivityManager.registerNetworkCallback(request, callback)
 	}
 
-	@Synchronized
 	override fun onInactive() {
 		connectivityManager.unregisterNetworkCallback(callback)
 	}
@@ -37,7 +32,7 @@ class NetworkState(
 	}
 
 	private fun invalidate() {
-		publishValue(connectivityManager.isOnline())
+		publishValue(connectivityManager.isNetworkAvailable)
 	}
 
 	private inner class NetworkCallbackImpl : NetworkCallback() {

app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt

@@ -15,7 +15,6 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.toList
-import java.lang.ref.WeakReference
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -29,14 +28,10 @@ class MangaLoaderContextImpl @Inject constructor(
 	@ApplicationContext private val androidContext: Context,
 ) : MangaLoaderContext() {
 
-	private var webViewCached: WeakReference<WebView>? = null
-
 	@SuppressLint("SetJavaScriptEnabled")
 	override suspend fun evaluateJs(script: String): String? = withContext(Dispatchers.Main) {
-		val webView = webViewCached?.get() ?: WebView(androidContext).also {
-			it.settings.javaScriptEnabled = true
-			webViewCached = WeakReference(it)
-		}
+		val webView = WebView(androidContext)
+		webView.settings.javaScriptEnabled = true
 		suspendCoroutine { cont ->
 			webView.evaluateJavascript(script) { result ->
 				cont.resume(result?.takeUnless { it == "null" })

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.core.parser
 
-import androidx.annotation.AnyThread
 import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
@@ -43,7 +42,6 @@ interface MangaRepository {
 
 		private val cache = EnumMap<MangaSource, WeakReference<RemoteMangaRepository>>(MangaSource::class.java)
 
-		@AnyThread
 		fun create(source: MangaSource): MangaRepository {
 			if (source == MangaSource.LOCAL) {
 				return localMangaRepository

app/src/main/java/org/koitharu/kotatsu/core/parser/MangaTagHighlighter.kt

@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import android.content.Context
-import androidx.annotation.ColorRes
-import dagger.Reusable
-import dagger.hilt.android.qualifiers.ApplicationContext
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import javax.inject.Inject
-
-@Reusable
-class MangaTagHighlighter @Inject constructor(
-	@ApplicationContext context: Context,
-) {
-
-	private val dict by lazy {
-		context.resources.openRawResource(R.raw.tags_redlist).use {
-			val set = HashSet<String>()
-			it.bufferedReader().forEachLine { x ->
-				val line = x.trim()
-				if (line.isNotEmpty()) {
-					set.add(line)
-				}
-			}
-			set
-		}
-	}
-
-	@ColorRes
-	fun getTint(tag: MangaTag): Int {
-		return if (tag.title.lowercase() in dict) {
-			R.color.warning
-		} else {
-			0
-		}
-	}
-}

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

@@ -45,11 +45,8 @@ class RemoteMangaRepository(
 			getConfig().defaultSortOrder = value
 		}
 
-	var domain: String
+	val domain: String
 		get() = parser.domain
-		set(value) {
-			getConfig()[parser.configKeyDomain] = value
-		}
 
 	val headers: Headers?
 		get() = parser.headers
@@ -100,10 +97,6 @@ class RemoteMangaRepository(
 		parser.onCreateConfig(it)
 	}
 
-	fun getAvailableMirrors(): List<String> {
-		return parser.configKeyDomain.presetValues?.toList().orEmpty()
-	}
-
 	private fun getConfig() = parser.config as SourceSettings
 
 	private suspend fun <T> asyncSafe(block: suspend CoroutineScope.() -> T): SafeDeferred<T> {

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

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.net.Uri
 import android.provider.Settings
-import androidx.annotation.FloatRange
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.arraySetOf
 import androidx.core.content.edit
@@ -266,11 +265,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isWebtoonZoomEnable: Boolean
 		get() = prefs.getBoolean(KEY_WEBTOON_ZOOM, true)
 
-	@get:FloatRange(from = 0.0, to = 1.0)
-	var readerAutoscrollSpeed: Float
-		get() = prefs.getFloat(KEY_READER_AUTOSCROLL_SPEED, 0f)
-		set(@FloatRange(from = 0.0, to = 1.0) value) = prefs.edit { putFloat(KEY_READER_AUTOSCROLL_SPEED, value) }
-
 	fun isPagesPreloadEnabled(): Boolean {
 		val policy = NetworkPolicy.from(prefs.getString(KEY_PAGES_PRELOAD, null), NetworkPolicy.NON_METERED)
 		return policy.isNetworkAllowed(connectivityManager)
@@ -302,18 +296,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		return list
 	}
 
-	fun isTipEnabled(tip: String): Boolean {
-		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
-	}
-
-	fun closeTip(tip: String) {
-		val closedTips = prefs.getStringSet(KEY_TIPS_CLOSED, emptySet()).orEmpty()
-		if (tip in closedTips) {
-			return
-		}
-		prefs.edit { putStringSet(KEY_TIPS_CLOSED, closedTips + tip) }
-	}
-
 	fun subscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
 		prefs.registerOnSharedPreferenceChangeListener(listener)
 	}
@@ -401,9 +383,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_LOGS_SHARE = "logs_share"
 		const val KEY_SOURCES_GRID = "sources_grid"
 		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
-		const val KEY_TIPS_CLOSED = "tips_closed"
 		const val KEY_SSL_BYPASS = "ssl_bypass"
-		const val KEY_READER_AUTOSCROLL_SPEED = "as_speed"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

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

@@ -28,12 +28,4 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 			is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue)
 		} as T
 	}
-
-	operator fun <T> set(key: ConfigKey<T>, value: T) = prefs.edit {
-		when (key) {
-			is ConfigKey.Domain -> putString(key.key, value as String?)
-			is ConfigKey.ShowSuspiciousContent -> putBoolean(key.key, value as Boolean)
-			is ConfigKey.UserAgent -> putString(key.key, value as String?)
-		}
-	}
 }

app/src/main/java/org/koitharu/kotatsu/core/ui/MangaErrorDialog.kt

@@ -1,8 +1,5 @@
 package org.koitharu.kotatsu.core.ui
 
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
@@ -15,24 +12,28 @@ import androidx.fragment.app.FragmentManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.databinding.DialogErrorDetailsBinding
-import org.koitharu.kotatsu.utils.ext.isReportable
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.databinding.DialogMangaErrorBinding
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.report
+import org.koitharu.kotatsu.utils.ext.requireParcelable
 import org.koitharu.kotatsu.utils.ext.requireSerializable
 import org.koitharu.kotatsu.utils.ext.withArgs
 
-class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
+class MangaErrorDialog : AlertDialogFragment<DialogMangaErrorBinding>() {
 
-	private lateinit var exception: Throwable
+	private lateinit var error: Throwable
+	private lateinit var manga: Manga
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		val args = requireArguments()
-		exception = args.requireSerializable(ARG_ERROR)
+		manga = args.requireParcelable<ParcelableManga>(ARG_MANGA).manga
+		error = args.requireSerializable(ARG_ERROR)
 	}
 
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): DialogErrorDetailsBinding {
-		return DialogErrorDetailsBinding.inflate(inflater, container, false)
+	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): DialogMangaErrorBinding {
+		return DialogMangaErrorBinding.inflate(inflater, container, false)
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -41,47 +42,31 @@ class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
 			movementMethod = LinkMovementMethod.getInstance()
 			text = context.getString(
 				R.string.manga_error_description_pattern,
-				exception.message?.htmlEncode().orEmpty(),
-				arguments?.getString(ARG_URL),
+				this@MangaErrorDialog.error.message?.htmlEncode().orEmpty(),
+				manga.publicUrl,
 			).parseAsHtml(HtmlCompat.FROM_HTML_MODE_LEGACY)
 		}
 	}
 
-	@Suppress("NAME_SHADOWING")
 	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		val builder = super.onBuildDialog(builder)
+		return super.onBuildDialog(builder)
 			.setCancelable(true)
 			.setNegativeButton(android.R.string.cancel, null)
-			.setTitle(R.string.error_occurred)
-			.setNeutralButton(androidx.preference.R.string.copy) { _, _ ->
-				copyToClipboard()
-			}
-		if (exception.isReportable()) {
-			builder.setPositiveButton(R.string.report) { _, _ ->
+			.setPositiveButton(R.string.report) { _, _ ->
 				dismiss()
-				exception.report()
-			}
-		}
-		return builder
-	}
-
-	private fun copyToClipboard() {
-		val clipboardManager = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-			?: return
-		clipboardManager.setPrimaryClip(
-			ClipData.newPlainText(getString(R.string.error), exception.stackTraceToString()),
-		)
+				error.report()
+			}.setTitle(R.string.error_occurred)
 	}
 
 	companion object {
 
-		private const val TAG = "ErrorDetailsDialog"
+		private const val TAG = "MangaErrorDialog"
 		private const val ARG_ERROR = "error"
-		private const val ARG_URL = "url"
+		private const val ARG_MANGA = "manga"
 
-		fun show(fm: FragmentManager, error: Throwable, url: String?) = ErrorDetailsDialog().withArgs(2) {
+		fun show(fm: FragmentManager, manga: Manga, error: Throwable) = MangaErrorDialog().withArgs(2) {
+			putParcelable(ARG_MANGA, ParcelableManga(manga, false))
 			putSerializable(ARG_ERROR, error)
-			putString(ARG_URL, url)
 		}.show(fm, TAG)
 	}
 }

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

@@ -13,7 +13,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.Toast
-import androidx.activity.viewModels
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
 import androidx.core.view.isGone
@@ -30,9 +29,10 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.base.ui.widgets.BottomSheetHeaderBar
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.os.ShortcutsUpdater
+import org.koitharu.kotatsu.core.ui.MangaErrorDialog
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 import org.koitharu.kotatsu.details.service.MangaPrefetchService
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -43,7 +43,9 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.utils.ViewBadge
+import org.koitharu.kotatsu.utils.ext.assistedViewModels
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.isReportable
 import org.koitharu.kotatsu.utils.ext.setNavigationBarTransparentCompat
 import org.koitharu.kotatsu.utils.ext.textAndVisible
 import javax.inject.Inject
@@ -58,12 +60,17 @@ class DetailsActivity :
 	override val bsHeader: BottomSheetHeaderBar?
 		get() = binding.headerChapters
 
+	@Inject
+	lateinit var viewModelFactory: DetailsViewModel.Factory
+
 	@Inject
 	lateinit var shortcutsUpdater: ShortcutsUpdater
 
 	private lateinit var viewBadge: ViewBadge
 
-	private val viewModel: DetailsViewModel by viewModels()
+	private val viewModel: DetailsViewModel by assistedViewModels {
+		viewModelFactory.create(MangaIntent(intent))
+	}
 	private lateinit var chaptersMenuProvider: ChaptersMenuProvider
 
 	private val downloadReceiver = object : BroadcastReceiver() {
@@ -98,19 +105,7 @@ class DetailsActivity :
 		viewModel.manga.observe(this, ::onMangaUpdated)
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
-		viewModel.onError.observe(
-			this,
-			SnackbarErrorObserver(
-				host = binding.containerDetails,
-				fragment = null,
-				resolver = exceptionResolver,
-				onResolved = { isResolved ->
-					if (isResolved) {
-						viewModel.reload()
-					}
-				},
-			),
-		)
+		viewModel.onError.observe(this, ::onError)
 		viewModel.onShowToast.observe(this) {
 			makeSnackbar(getString(it), Snackbar.LENGTH_SHORT).show()
 		}
@@ -196,6 +191,37 @@ class DetailsActivity :
 		finishAfterTransition()
 	}
 
+	private fun onError(e: Throwable) {
+		val manga = viewModel.manga.value
+		when {
+			ExceptionResolver.canResolve(e) -> {
+				resolveError(e)
+			}
+
+			manga == null -> {
+				Toast.makeText(this, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
+				finishAfterTransition()
+			}
+
+			else -> {
+				val snackbar = makeSnackbar(
+					e.getDisplayMessage(resources),
+					if (viewModel.manga.value?.chapters == null) {
+						Snackbar.LENGTH_INDEFINITE
+					} else {
+						Snackbar.LENGTH_LONG
+					},
+				)
+				if (e.isReportable()) {
+					snackbar.setAction(R.string.details) {
+						MangaErrorDialog.show(supportFragmentManager, manga, e)
+					}
+				}
+				snackbar.show()
+			}
+		}
+	}
+
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.root.updatePadding(
 			left = insets.left,
@@ -305,17 +331,17 @@ class DetailsActivity :
 
 	private class PrefetchObserver(
 		private val context: Context,
-	) : Observer<List<ChapterListItem>?> {
+	) : Observer<List<ChapterListItem>> {
 
 		private var isCalled = false
 
-		override fun onChanged(value: List<ChapterListItem>?) {
-			if (value.isNullOrEmpty()) {
+		override fun onChanged(t: List<ChapterListItem>?) {
+			if (t.isNullOrEmpty()) {
 				return
 			}
 			if (!isCalled) {
 				isCalled = true
-				val item = value.find { it.hasFlag(ChapterListItem.FLAG_CURRENT) } ?: value.first()
+				val item = t.find { it.hasFlag(ChapterListItem.FLAG_CURRENT) } ?: t.first()
 				MangaPrefetchService.prefetchPages(context, item.chapter)
 			}
 		}

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

@@ -5,7 +5,6 @@ import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
@@ -27,8 +26,6 @@ import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
-import org.koitharu.kotatsu.core.model.countChaptersByBranch
-import org.koitharu.kotatsu.core.parser.MangaTagHighlighter
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
@@ -42,6 +39,7 @@ 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.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.search.ui.SearchActivity
@@ -64,15 +62,13 @@ import javax.inject.Inject
 class DetailsFragment :
 	BaseFragment<FragmentDetailsBinding>(),
 	View.OnClickListener,
+	View.OnLongClickListener,
 	ChipsView.OnChipClickListener,
 	OnListItemClickListener<Bookmark> {
 
 	@Inject
 	lateinit var coil: ImageLoader
 
-	@Inject
-	lateinit var tagHighlighter: MangaTagHighlighter
-
 	private val viewModel by activityViewModels<DetailsViewModel>()
 
 	override fun onInflateView(
@@ -101,7 +97,6 @@ class DetailsFragment :
 			ReaderActivity.newIntent(view.context, item),
 			scaleUpActivityOptionsOf(view).toBundle(),
 		)
-		Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 	}
 
 	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
@@ -178,9 +173,12 @@ class DetailsFragment :
 		if (chapters.isNullOrEmpty()) {
 			infoLayout.textViewChapters.isVisible = false
 		} else {
-			val count = chapters.countChaptersByBranch()
 			infoLayout.textViewChapters.isVisible = true
-			infoLayout.textViewChapters.text = resources.getQuantityString(R.plurals.chapters, count, count)
+			infoLayout.textViewChapters.text = resources.getQuantityString(
+				R.plurals.chapters,
+				chapters.size,
+				chapters.size,
+			)
 		}
 	}
 
@@ -266,6 +264,43 @@ class DetailsFragment :
 		}
 	}
 
+	override fun onLongClick(v: View): Boolean {
+		when (v.id) {
+			R.id.button_read -> {
+				if (viewModel.historyInfo.value?.history == null) {
+					return false
+				}
+				val menu = PopupMenu(v.context, v)
+				menu.inflate(R.menu.popup_read)
+				menu.setOnMenuItemClickListener { menuItem ->
+					when (menuItem.itemId) {
+						R.id.action_read -> {
+							val branch = viewModel.selectedBranchValue
+							startActivity(
+								ReaderActivity.newIntent(
+									context = context ?: return@setOnMenuItemClickListener false,
+									manga = viewModel.manga.value ?: return@setOnMenuItemClickListener false,
+									state = viewModel.chapters.value?.firstOrNull { c ->
+										c.chapter.branch == branch
+									}?.let { c ->
+										ReaderState(c.chapter.id, 0, 0)
+									},
+								),
+							)
+							true
+						}
+
+						else -> false
+					}
+				}
+				menu.show()
+				return true
+			}
+
+			else -> return false
+		}
+	}
+
 	override fun onChipClick(chip: Chip, data: Any?) {
 		val tag = data as? MangaTag ?: return
 		startActivity(MangaListActivity.newIntent(requireContext(), setOf(tag)))
@@ -286,7 +321,7 @@ class DetailsFragment :
 			manga.tags.map { tag ->
 				ChipsView.ChipModel(
 					title = tag.title,
-					tint = tagHighlighter.getTint(tag),
+					icon = 0,
 					data = tag,
 					isCheckable = false,
 					isChecked = false,
@@ -306,7 +341,7 @@ class DetailsFragment :
 			.size(CoverSizeResolver(binding.imageViewCover))
 			.data(imageUrl)
 			.tag(manga.source)
-			.crossfade(requireContext())
+			.crossfade(context)
 			.lifecycle(viewLifecycleOwner)
 			.placeholderMemoryCacheKey(manga.coverUrl)
 		val previousDrawable = lastResult?.drawable

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

@@ -10,7 +10,9 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -26,9 +28,12 @@ import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.domain.MangaDataRepository
+import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.details.domain.BranchComparator
@@ -46,24 +51,33 @@ import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.asFlowLiveData
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import java.io.IOException
-import javax.inject.Inject
 
-@HiltViewModel
-class DetailsViewModel @Inject constructor(
+class DetailsViewModel @AssistedInject constructor(
+	@Assisted intent: MangaIntent,
 	private val historyRepository: HistoryRepository,
 	favouritesRepository: FavouritesRepository,
 	private val localMangaRepository: LocalMangaRepository,
 	trackingRepository: TrackingRepository,
+	mangaDataRepository: MangaDataRepository,
 	private val bookmarksRepository: BookmarksRepository,
 	private val settings: AppSettings,
 	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
 	private val imageGetter: Html.ImageGetter,
-	private val delegate: MangaDetailsDelegate,
+	mangaRepositoryFactory: MangaRepository.Factory,
 ) : BaseViewModel() {
 
+	private val delegate = MangaDetailsDelegate(
+		intent = intent,
+		mangaDataRepository = mangaDataRepository,
+		historyRepository = historyRepository,
+		localMangaRepository = localMangaRepository,
+		mangaRepositoryFactory = mangaRepositoryFactory,
+	)
+
 	private var loadingJob: Job
 
 	val onShowToast = SingleLiveEvent<Int>()
@@ -95,19 +109,18 @@ class DetailsViewModel @Inject constructor(
 
 	val historyInfo: LiveData<HistoryInfo> = combine(
 		delegate.manga,
-		delegate.selectedBranch,
 		history,
 		historyRepository.observeShouldSkip(delegate.manga),
-	) { m, b, h, im ->
-		HistoryInfo(m, b, h, im)
+	) { m, h, im ->
+		HistoryInfo(m, h, im)
 	}.asFlowLiveData(
 		context = viewModelScope.coroutineContext + Dispatchers.Default,
-		defaultValue = HistoryInfo(null, null, null, false),
+		defaultValue = HistoryInfo(null, null, false),
 	)
 
 	val bookmarks = delegate.manga.flatMapLatest {
 		if (it != null) bookmarksRepository.observeBookmarks(it) else flowOf(emptyList())
-	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
 
 	val description = delegate.manga
 		.distinctUntilChangedBy { it?.description.orEmpty() }
@@ -119,7 +132,7 @@ class DetailsViewModel @Inject constructor(
 				emit(description.parseAsHtml().filterSpans())
 				emit(description.parseAsHtml(imageGetter = imageGetter).filterSpans())
 			}
-		}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, null)
+		}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
 
 	val onMangaRemoved = SingleLiveEvent<Manga>()
 	val isScrobblingAvailable: Boolean
@@ -141,7 +154,7 @@ class DetailsViewModel @Inject constructor(
 		delegate.selectedBranch,
 	) { branches, selected ->
 		branches.indexOf(selected)
-	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, -1)
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, -1)
 
 	val selectedBranchName = delegate.selectedBranch
 		.asFlowLiveData(viewModelScope.coroutineContext, null)
@@ -151,7 +164,7 @@ class DetailsViewModel @Inject constructor(
 		isLoading.asFlow(),
 	) { m, loading ->
 		m != null && m.chapters.isNullOrEmpty() && !loading
-	}.asFlowLiveData(viewModelScope.coroutineContext, false)
+	}.asLiveDataDistinct(viewModelScope.coroutineContext, false)
 
 	val chapters = combine(
 		combine(
@@ -188,7 +201,7 @@ class DetailsViewModel @Inject constructor(
 			return
 		}
 		launchLoadingJob(Dispatchers.Default) {
-			val manga = if (m.source == MangaSource.LOCAL) m else localMangaRepository.findSavedManga(m)?.manga
+			val manga = if (m.source == MangaSource.LOCAL) m else localMangaRepository.findSavedManga(m)
 			checkNotNull(manga) { "Cannot find saved manga for ${m.title}" }
 			val original = localMangaRepository.getRemoteManga(manga)
 			localMangaRepository.delete(manga) || throw IOException("Unable to delete file")
@@ -266,7 +279,7 @@ class DetailsViewModel @Inject constructor(
 	fun markChapterAsCurrent(chapterId: Long) {
 		launchJob(Dispatchers.Default) {
 			val manga = checkNotNull(delegate.manga.value)
-			val chapters = checkNotNull(manga.getChapters(selectedBranchValue))
+			val chapters = checkNotNull(manga.chapters)
 			val chapterIndex = chapters.indexOfFirst { it.id == chapterId }
 			check(chapterIndex in chapters.indices) { "Chapter not found" }
 			val percent = chapterIndex / chapters.size.toFloat()
@@ -308,4 +321,10 @@ class DetailsViewModel @Inject constructor(
 		}
 		return scrobbler
 	}
+
+	@AssistedFactory
+	interface Factory {
+
+		fun create(intent: MangaIntent): DetailsViewModel
+	}
 }

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

@@ -1,7 +1,5 @@
 package org.koitharu.kotatsu.details.ui
 
-import androidx.lifecycle.SavedStateHandle
-import dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
@@ -19,17 +17,15 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import javax.inject.Inject
 
-@ViewModelScoped
-class MangaDetailsDelegate @Inject constructor(
-	savedStateHandle: SavedStateHandle,
+class MangaDetailsDelegate(
+	private val intent: MangaIntent,
 	private val mangaDataRepository: MangaDataRepository,
 	private val historyRepository: HistoryRepository,
 	private val localMangaRepository: LocalMangaRepository,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) {
-	private val intent = MangaIntent(savedStateHandle)
+
 	private val mangaData = MutableStateFlow(intent.manga)
 
 	val selectedBranch = MutableStateFlow<String?>(null)
@@ -53,7 +49,7 @@ class MangaDetailsDelegate @Inject constructor(
 				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatchingCancellable null
 				mangaRepositoryFactory.create(m.source).getDetails(m)
 			} else {
-				localMangaRepository.findSavedManga(manga)?.manga
+				localMangaRepository.findSavedManga(manga)
 			}
 		}.onFailure { error ->
 			error.printStackTraceDebug()

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

@@ -36,13 +36,8 @@ class HistoryInfo(
 	}
 }
 
-fun HistoryInfo(
-	manga: Manga?,
-	branch: String?,
-	history: MangaHistory?,
-	isIncognitoMode: Boolean
-): HistoryInfo {
-	val chapters = manga?.getChapters(branch)
+fun HistoryInfo(manga: Manga?, history: MangaHistory?, isIncognitoMode: Boolean): HistoryInfo {
+	val chapters = manga?.chapters
 	return HistoryInfo(
 		totalChapters = chapters?.size ?: -1,
 		currentChapter = if (history != null && !chapters.isNullOrEmpty()) {

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

@@ -23,10 +23,11 @@ fun scrobblingInfoAD(
 	}
 
 	bind {
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.coverUrl)?.run {
+		binding.imageViewCover.newImageRequest(item.coverUrl /* TODO */, null)?.run {
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
+			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
 		binding.textViewTitle.text = item.title

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

@@ -123,7 +123,8 @@ class ScrobblingInfoBottomSheet :
 		binding.spinnerStatus.setSelection(scrobbling.status?.ordinal ?: -1)
 		binding.imageViewLogo.contentDescription = getString(scrobbling.scrobbler.titleResId)
 		binding.imageViewLogo.setImageResource(scrobbling.scrobbler.iconResId)
-		binding.imageViewCover.newImageRequest(viewLifecycleOwner, scrobbling.coverUrl)?.apply {
+		binding.imageViewCover.newImageRequest(scrobbling.coverUrl)?.apply {
+			lifecycle(viewLifecycleOwner)
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)

app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt

@@ -1,17 +1,17 @@
 package org.koitharu.kotatsu.download.domain
 
-import android.app.Service
 import android.content.Context
 import android.webkit.MimeTypeMap
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
 import coil.ImageLoader
 import coil.request.ImageRequest
 import coil.size.Scale
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.scopes.ServiceScoped
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
@@ -30,8 +30,7 @@ import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.download.ui.service.PausingHandle
 import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.local.data.input.LocalMangaInput
-import org.koitharu.kotatsu.local.data.output.LocalMangaOutput
+import org.koitharu.kotatsu.local.domain.CbzMangaOutput
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -42,15 +41,13 @@ import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.progress.PausingProgressJob
 import java.io.File
-import javax.inject.Inject
 
 private const val MAX_FAILSAFE_ATTEMPTS = 2
 private const val DOWNLOAD_ERROR_DELAY = 500L
-private const val SLOWDOWN_DELAY = 150L
+private const val SLOWDOWN_DELAY = 200L
 
-@ServiceScoped
-class DownloadManager @Inject constructor(
-	service: Service,
+class DownloadManager @AssistedInject constructor(
+	@Assisted private val coroutineScope: CoroutineScope,
 	@ApplicationContext private val context: Context,
 	private val imageLoader: ImageLoader,
 	private val okHttp: OkHttpClient,
@@ -67,7 +64,6 @@ class DownloadManager @Inject constructor(
 		androidx.core.R.dimen.compat_notification_large_icon_max_height,
 	)
 	private val semaphore = Semaphore(settings.downloadsParallelism)
-	private val coroutineScope = (service as LifecycleService).lifecycleScope
 
 	fun downloadManga(
 		manga: Manga,
@@ -107,10 +103,10 @@ class DownloadManager @Inject constructor(
 		withMangaLock(manga) {
 			semaphore.withPermit {
 				outState.value = DownloadState.Preparing(startId, manga, null)
-				val destination = localMangaRepository.getOutputDir(manga)
+				val destination = localMangaRepository.getOutputDir()
 				checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
 				val tempFileName = "${manga.id}_$startId.tmp"
-				var output: LocalMangaOutput? = null
+				var output: CbzMangaOutput? = null
 				try {
 					if (manga.source == MangaSource.LOCAL) {
 						manga = localMangaRepository.getRemoteManga(manga)
@@ -119,7 +115,7 @@ class DownloadManager @Inject constructor(
 					val repo = mangaRepositoryFactory.create(manga.source)
 					outState.value = DownloadState.Preparing(startId, manga, cover)
 					val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
-					output = LocalMangaOutput.getOrCreate(destination, data)
+					output = CbzMangaOutput.get(destination, data)
 					val coverUrl = data.largeCoverUrl ?: data.coverUrl
 					downloadFile(coverUrl, destination, tempFileName, repo.source).let { file ->
 						output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
@@ -165,12 +161,11 @@ class DownloadManager @Inject constructor(
 								delay(SLOWDOWN_DELAY)
 							}
 						}
-						output.flushChapter(chapter)
 					}
 					outState.value = DownloadState.PostProcessing(startId, data, cover)
 					output.mergeWithExisting()
 					output.finish()
-					val localManga = LocalMangaInput.of(output.rootFile).getManga().manga
+					val localManga = localMangaRepository.getFromFile(output.file)
 					outState.value = DownloadState.Done(startId, data, cover, localManga)
 				} catch (e: CancellationException) {
 					outState.value = DownloadState.Cancelled(startId, manga, cover)
@@ -223,7 +218,7 @@ class DownloadManager @Inject constructor(
 		val request = Request.Builder()
 			.url(url)
 			.tag(MangaSource::class.java, source)
-			.cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE)
+			.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
 			.get()
 			.build()
 		val call = okHttp.newCall(request)
@@ -252,7 +247,6 @@ class DownloadManager @Inject constructor(
 		imageLoader.execute(
 			ImageRequest.Builder(context)
 				.data(manga.coverUrl)
-				.allowHardware(false)
 				.tag(manga.source)
 				.size(coverWidth, coverHeight)
 				.scale(Scale.FILL)
@@ -266,4 +260,10 @@ class DownloadManager @Inject constructor(
 	} finally {
 		localMangaRepository.unlockManga(manga.id)
 	}
+
+	@AssistedFactory
+	interface Factory {
+
+		fun create(coroutineScope: CoroutineScope): DownloadManager
+	}
 }

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

@@ -2,10 +2,9 @@ package org.koitharu.kotatsu.download.ui
 
 import android.view.View
 import androidx.core.view.isVisible
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -18,10 +17,9 @@ import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.onFirst
-import org.koitharu.kotatsu.utils.ext.source
 
 fun downloadItemAD(
-	lifecycleOwner: LifecycleOwner,
+	scope: CoroutineScope,
 	coil: ImageLoader,
 ) = adapterDelegateViewBinding<DownloadItem, DownloadItem, ItemDownloadBinding>(
 	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) },
@@ -45,11 +43,10 @@ fun downloadItemAD(
 	bind {
 		job?.cancel()
 		job = item.progressAsFlow().onFirst { state ->
-			binding.imageViewCover.newImageRequest(lifecycleOwner, state.manga.coverUrl)?.run {
+			binding.imageViewCover.newImageRequest(state.manga.coverUrl, state.manga.source)?.run {
 				placeholder(state.cover)
 				fallback(R.drawable.ic_placeholder)
 				error(R.drawable.ic_error_placeholder)
-				source(state.manga.source)
 				allowRgb565(true)
 				enqueueWith(coil)
 			}
@@ -130,7 +127,7 @@ fun downloadItemAD(
 					binding.buttonResume.isVisible = false
 				}
 			}
-		}.launchIn(lifecycleOwner.lifecycleScope)
+		}.launchIn(scope)
 	}
 
 	onViewRecycled {

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

@@ -6,6 +6,7 @@ import android.os.Bundle
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
 import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
@@ -26,7 +27,7 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityDownloadsBinding.inflate(layoutInflater))
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		val adapter = DownloadsAdapter(this, coil)
+		val adapter = DownloadsAdapter(lifecycleScope, coil)
 		val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 		binding.recyclerView.addItemDecoration(SpacingItemDecoration(spacing))
 		binding.recyclerView.setHasFixedSize(true)

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

@@ -1,21 +1,21 @@
 package org.koitharu.kotatsu.download.ui
 
-import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlinx.coroutines.CoroutineScope
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.utils.progress.PausingProgressJob
 
 typealias DownloadItem = PausingProgressJob<DownloadState>
 
 class DownloadsAdapter(
-	lifecycleOwner: LifecycleOwner,
+	scope: CoroutineScope,
 	coil: ImageLoader,
 ) : AsyncListDifferDelegationAdapter<DownloadItem>(DiffCallback()) {
 
 	init {
-		delegatesManager.addDelegate(downloadItemAD(lifecycleOwner, coil))
+		delegatesManager.addDelegate(downloadItemAD(scope, coil))
 		setHasStableIds(true)
 	}
 

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

@@ -10,7 +10,6 @@ import android.text.format.DateUtils
 import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.text.HtmlCompat
@@ -29,6 +28,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.ellipsize
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.search.ui.MangaListActivity
+import org.koitharu.kotatsu.utils.PendingIntentCompat
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
 class DownloadNotification(private val context: Context) {
@@ -37,20 +37,18 @@ class DownloadNotification(private val context: Context) {
 	private val states = SparseArray<DownloadState>()
 	private val groupBuilder = NotificationCompat.Builder(context, CHANNEL_ID)
 
-	private val queueIntent = PendingIntentCompat.getActivity(
+	private val queueIntent = PendingIntent.getActivity(
 		context,
 		REQUEST_QUEUE,
 		DownloadsActivity.newIntent(context),
-		0,
-		false,
+		PendingIntentCompat.FLAG_IMMUTABLE,
 	)
 
-	private val localListIntent = PendingIntentCompat.getActivity(
+	private val localListIntent = PendingIntent.getActivity(
 		context,
 		REQUEST_LIST_LOCAL,
 		MangaListActivity.newIntent(context, MangaSource.LOCAL),
-		0,
-		false,
+		PendingIntentCompat.FLAG_IMMUTABLE,
 	)
 
 	init {
@@ -80,37 +78,31 @@ class DownloadNotification(private val context: Context) {
 					progress++
 					context.getString(R.string.cancelling_)
 				}
-
 				is DownloadState.Done -> {
 					progress++
 					context.getString(R.string.download_complete)
 				}
-
 				is DownloadState.Error -> {
 					isAllDone = false
 					context.getString(R.string.error)
 				}
-
 				is DownloadState.PostProcessing -> {
 					progress++
 					isInProgress = true
 					isAllDone = false
 					context.getString(R.string.processing_)
 				}
-
 				is DownloadState.Preparing -> {
 					isAllDone = false
 					isInProgress = true
 					context.getString(R.string.preparing_)
 				}
-
 				is DownloadState.Progress -> {
 					isAllDone = false
 					isInProgress = true
 					progress += state.percent
 					context.getString(R.string.percent_string_pattern, (state.percent * 100).format())
 				}
-
 				is DownloadState.Queued -> {
 					isAllDone = false
 					isInProgress = true
@@ -166,23 +158,21 @@ class DownloadNotification(private val context: Context) {
 		private val cancelAction = NotificationCompat.Action(
 			materialR.drawable.material_ic_clear_black_24dp,
 			context.getString(android.R.string.cancel),
-			PendingIntentCompat.getBroadcast(
+			PendingIntent.getBroadcast(
 				context,
 				startId * 2,
 				DownloadService.getCancelIntent(startId),
-				PendingIntent.FLAG_CANCEL_CURRENT,
-				false,
+				PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
 			),
 		)
 		private val retryAction = NotificationCompat.Action(
 			R.drawable.ic_restart_black,
 			context.getString(R.string.try_again),
-			PendingIntentCompat.getBroadcast(
+			PendingIntent.getBroadcast(
 				context,
 				startId * 2 + 1,
 				DownloadService.getResumeIntent(startId),
-				PendingIntent.FLAG_CANCEL_CURRENT,
-				false,
+				PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
 			),
 		)
 
@@ -223,7 +213,6 @@ class DownloadNotification(private val context: Context) {
 					builder.setOngoing(true)
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
-
 				is DownloadState.Done -> {
 					builder.setProgress(0, 0, false)
 					builder.setContentText(context.getString(R.string.download_complete))
@@ -237,7 +226,6 @@ class DownloadNotification(private val context: Context) {
 					builder.setWhen(System.currentTimeMillis())
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
-
 				is DownloadState.Error -> {
 					val message = state.error.getDisplayMessage(context.resources)
 					builder.setProgress(0, 0, false)
@@ -256,7 +244,6 @@ class DownloadNotification(private val context: Context) {
 					}
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
-
 				is DownloadState.PostProcessing -> {
 					builder.setProgress(1, 0, true)
 					builder.setContentText(context.getString(R.string.processing_))
@@ -264,7 +251,6 @@ class DownloadNotification(private val context: Context) {
 					builder.setOngoing(true)
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
-
 				is DownloadState.Queued -> {
 					builder.setProgress(0, 0, false)
 					builder.setContentText(context.getString(R.string.queued))
@@ -273,7 +259,6 @@ class DownloadNotification(private val context: Context) {
 					builder.addAction(cancelAction)
 					builder.priority = NotificationCompat.PRIORITY_LOW
 				}
-
 				is DownloadState.Preparing -> {
 					builder.setProgress(1, 0, true)
 					builder.setContentText(context.getString(R.string.preparing_))
@@ -282,7 +267,6 @@ class DownloadNotification(private val context: Context) {
 					builder.addAction(cancelAction)
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
-
 				is DownloadState.Progress -> {
 					builder.setProgress(state.max, state.progress, false)
 					val percent = context.getString(R.string.percent_string_pattern, (state.percent * 100).format())
@@ -318,12 +302,11 @@ class DownloadNotification(private val context: Context) {
 		manager.notify(ID_GROUP, notification)
 	}
 
-	private fun createMangaIntent(context: Context, manga: Manga) = PendingIntentCompat.getActivity(
+	private fun createMangaIntent(context: Context, manga: Manga) = PendingIntent.getActivity(
 		context,
 		manga.hashCode(),
 		DetailsActivity.newIntent(context, manga),
-		PendingIntent.FLAG_CANCEL_CURRENT,
-		false,
+		PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
 	)
 
 	companion object {

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

@@ -44,11 +44,12 @@ import kotlin.collections.set
 @AndroidEntryPoint
 class DownloadService : BaseService() {
 
+	private lateinit var downloadManager: DownloadManager
 	private lateinit var downloadNotification: DownloadNotification
 	private lateinit var wakeLock: PowerManager.WakeLock
 
 	@Inject
-	lateinit var downloadManager: DownloadManager
+	lateinit var downloadManagerFactory: DownloadManager.Factory
 
 	private val jobs = LinkedHashMap<Int, PausingProgressJob<DownloadState>>()
 	private val jobCount = MutableStateFlow(0)
@@ -60,6 +61,7 @@ class DownloadService : BaseService() {
 		downloadNotification = DownloadNotification(this)
 		wakeLock = (applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager)
 			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
+		downloadManager = downloadManagerFactory.create(lifecycleScope)
 		wakeLock.acquire(TimeUnit.HOURS.toMillis(8))
 		DownloadNotification.createChannel(this)
 		startForeground(DownloadNotification.ID_GROUP, downloadNotification.buildGroupNotification())

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

@@ -13,15 +13,16 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
+import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.domain.reverseAsync
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
-import org.koitharu.kotatsu.base.ui.util.ReversibleActionObserver
+import org.koitharu.kotatsu.base.ui.util.ReversibleAction
 import org.koitharu.kotatsu.base.ui.util.SpanSizeResolver
 import org.koitharu.kotatsu.bookmarks.ui.BookmarksActivity
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.databinding.FragmentExploreBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.explore.ui.adapter.ExploreAdapter
@@ -29,12 +30,14 @@ import org.koitharu.kotatsu.explore.ui.adapter.ExploreListEventListener
 import org.koitharu.kotatsu.explore.ui.model.ExploreItem
 import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
 import org.koitharu.kotatsu.history.ui.HistoryActivity
+import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
 import org.koitharu.kotatsu.utils.ext.addMenuProvider
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -72,9 +75,9 @@ class ExploreFragment :
 		viewModel.content.observe(viewLifecycleOwner) {
 			exploreAdapter?.items = it
 		}
-		viewModel.onError.observe(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
+		viewModel.onError.observe(viewLifecycleOwner, ::onError)
 		viewModel.onOpenManga.observe(viewLifecycleOwner, ::onOpenManga)
-		viewModel.onActionDone.observe(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
+		viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone)
 		viewModel.isGrid.observe(viewLifecycleOwner, ::onGridModeChanged)
 	}
 
@@ -127,11 +130,32 @@ class ExploreFragment :
 
 	override fun onEmptyActionClick() = onManageClick(requireView())
 
+	private fun onError(e: Throwable) {
+		val snackbar = Snackbar.make(
+			binding.recyclerView,
+			e.getDisplayMessage(resources),
+			Snackbar.LENGTH_SHORT,
+		)
+		snackbar.anchorView = (activity as? BottomNavOwner)?.bottomNav
+		snackbar.show()
+	}
+
 	private fun onOpenManga(manga: Manga) {
 		val intent = DetailsActivity.newIntent(context ?: return, manga)
 		startActivity(intent)
 	}
 
+	private fun onActionDone(action: ReversibleAction) {
+		val handle = action.handle
+		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
+		val snackbar = Snackbar.make(binding.recyclerView, action.stringResId, length)
+		if (handle != null) {
+			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
+		}
+		snackbar.anchorView = (activity as? BottomNavOwner)?.bottomNav
+		snackbar.show()
+	}
+
 	private fun onGridModeChanged(isGrid: Boolean) {
 		binding.recyclerView.layoutManager = if (isGrid) {
 			GridLayoutManager(requireContext(), 4).also { lm ->

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

@@ -25,6 +25,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.asFlowLiveData
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import javax.inject.Inject
 
 @HiltViewModel
@@ -49,7 +50,7 @@ class ExploreViewModel @Inject constructor(
 		} else {
 			createContentFlow()
 		}
-	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, listOf(ExploreItem.Loading))
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(ExploreItem.Loading))
 
 	fun openRandom() {
 		launchLoadingJob(Dispatchers.Default) {

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

@@ -21,7 +21,6 @@ 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.setTextAndVisible
-import org.koitharu.kotatsu.utils.ext.source
 import org.koitharu.kotatsu.utils.image.FaviconFallbackDrawable
 
 fun exploreButtonsAD(
@@ -77,11 +76,11 @@ fun exploreSourceListItemAD(
 	bind {
 		binding.textViewTitle.text = item.source.title
 		val fallbackIcon = FaviconFallbackDrawable(context, item.source.name)
-		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
+		binding.imageViewIcon.newImageRequest(item.source.faviconUri(), item.source)?.run {
 			fallback(fallbackIcon)
 			placeholder(fallbackIcon)
 			error(fallbackIcon)
-			source(item.source)
+			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
 	}
@@ -108,11 +107,11 @@ fun exploreSourceGridItemAD(
 	bind {
 		binding.textViewTitle.text = item.source.title
 		val fallbackIcon = FaviconFallbackDrawable(context, item.source.name)
-		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
+		binding.imageViewIcon.newImageRequest(item.source.faviconUri())?.run {
 			fallback(fallbackIcon)
 			placeholder(fallbackIcon)
 			error(fallbackIcon)
-			source(item.source)
+			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt

@@ -23,8 +23,8 @@ abstract class FavouriteCategoriesDao {
 
 	suspend fun delete(id: Long) = setDeletedAt(id, System.currentTimeMillis())
 
-	@Query("UPDATE favourite_categories SET title = :title, `order` = :order, `track` = :tracker, `show_in_lib` = :onShelf WHERE category_id = :id")
-	abstract suspend fun update(id: Long, title: String, order: String, tracker: Boolean, onShelf: Boolean)
+	@Query("UPDATE favourite_categories SET title = :title, `order` = :order, `track` = :tracker  WHERE category_id = :id")
+	abstract suspend fun update(id: Long, title: String, order: String, tracker: Boolean)
 
 	@Query("UPDATE favourite_categories SET `order` = :order WHERE category_id = :id")
 	abstract suspend fun updateOrder(id: Long, order: String)

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

@@ -1,19 +1,12 @@
 package org.koitharu.kotatsu.favourites.domain
 
 import androidx.room.withTransaction
-import dagger.Reusable
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlinx.coroutines.flow.*
 import org.koitharu.kotatsu.base.domain.ReversibleHandle
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.SortOrder
-import org.koitharu.kotatsu.core.db.entity.toEntities
-import org.koitharu.kotatsu.core.db.entity.toEntity
-import org.koitharu.kotatsu.core.db.entity.toManga
-import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.core.db.entity.*
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
@@ -22,9 +15,8 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.tracker.work.TrackerNotificationChannels
 import org.koitharu.kotatsu.utils.ext.mapItems
-import javax.inject.Inject
 
-@Reusable
+@Singleton
 class FavouritesRepository @Inject constructor(
 	private val db: MangaDatabase,
 	private val channels: TrackerNotificationChannels,
@@ -91,12 +83,7 @@ class FavouritesRepository @Inject constructor(
 		return db.favouriteCategoriesDao.find(id.toInt()).toFavouriteCategory()
 	}
 
-	suspend fun createCategory(
-		title: String,
-		sortOrder: SortOrder,
-		isTrackerEnabled: Boolean,
-		isVisibleOnShelf: Boolean,
-	): FavouriteCategory {
+	suspend fun createCategory(title: String, sortOrder: SortOrder, isTrackerEnabled: Boolean): FavouriteCategory {
 		val entity = FavouriteCategoryEntity(
 			title = title,
 			createdAt = System.currentTimeMillis(),
@@ -105,7 +92,7 @@ class FavouritesRepository @Inject constructor(
 			order = sortOrder.name,
 			track = isTrackerEnabled,
 			deletedAt = 0L,
-			isVisibleInLibrary = isVisibleOnShelf,
+			isVisibleInLibrary = true,
 		)
 		val id = db.favouriteCategoriesDao.insert(entity)
 		val category = entity.toFavouriteCategory(id)
@@ -113,14 +100,8 @@ class FavouritesRepository @Inject constructor(
 		return category
 	}
 
-	suspend fun updateCategory(
-		id: Long,
-		title: String,
-		sortOrder: SortOrder,
-		isTrackerEnabled: Boolean,
-		isVisibleOnShelf: Boolean,
-	) {
-		db.favouriteCategoriesDao.update(id, title, sortOrder.name, isTrackerEnabled, isVisibleOnShelf)
+	suspend fun updateCategory(id: Long, title: String, sortOrder: SortOrder, isTrackerEnabled: Boolean) {
+		db.favouriteCategoriesDao.update(id, title, sortOrder.name, isTrackerEnabled)
 	}
 
 	suspend fun updateCategory(id: Long, isVisibleInLibrary: Boolean) {
@@ -142,8 +123,8 @@ class FavouritesRepository @Inject constructor(
 	suspend fun removeCategories(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.deleteAll(id)
 				db.favouriteCategoriesDao.delete(id)
+				db.favouritesDao.deleteAll(id)
 			}
 		}
 		// run after transaction success

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

@@ -18,11 +18,11 @@ import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
+import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.base.ui.list.ListSelectionController
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
 import org.koitharu.kotatsu.favourites.ui.FavouritesActivity
@@ -31,6 +31,7 @@ import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEdit
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
 import javax.inject.Inject
 
@@ -71,7 +72,7 @@ class FavouriteCategoriesActivity :
 		onBackPressedDispatcher.addCallback(exitReorderModeCallback)
 
 		viewModel.detalizedCategories.observe(this, ::onCategoriesChanged)
-		viewModel.onError.observe(this, SnackbarErrorObserver(binding.recyclerView, null))
+		viewModel.onError.observe(this, ::onError)
 		viewModel.isInReorderMode.observe(this, ::onReorderModeChanged)
 	}
 
@@ -145,6 +146,11 @@ class FavouriteCategoriesActivity :
 		invalidateOptionsMenu()
 	}
 
+	private fun onError(e: Throwable) {
+		Snackbar.make(binding.recyclerView, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG)
+			.show()
+	}
+
 	private fun onReorderModeChanged(isReorderMode: Boolean) {
 		val transition = Fade().apply {
 			duration = resources.getInteger(android.R.integer.config_shortAnimTime).toLong()

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

@@ -3,6 +3,8 @@ package org.koitharu.kotatsu.favourites.ui.categories
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import java.util.*
+import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -14,11 +16,9 @@ import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.LoadingState
-import org.koitharu.kotatsu.utils.asFlowLiveData
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.mapItems
 import org.koitharu.kotatsu.utils.ext.requireValue
-import java.util.Collections
-import javax.inject.Inject
 
 @HiltViewModel
 class FavouritesCategoriesViewModel @Inject constructor(
@@ -39,7 +39,7 @@ class FavouritesCategoriesViewModel @Inject constructor(
 				category = it,
 				isReorderMode = false,
 			)
-		}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
+		}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
 
 	val detalizedCategories = combine(
 		repository.observeCategoriesWithCovers(),
@@ -62,7 +62,7 @@ class FavouritesCategoriesViewModel @Inject constructor(
 				),
 			)
 		}
-	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
 
 	fun deleteCategory(id: Long) {
 		launchJob {

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoriesAdapter.kt

@@ -4,12 +4,12 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlin.jvm.internal.Intrinsics
 import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesListListener
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import kotlin.jvm.internal.Intrinsics
 
 class CategoriesAdapter(
 	coil: ImageLoader,
@@ -20,7 +20,7 @@ class CategoriesAdapter(
 
 	init {
 		delegatesManager.addDelegate(categoryAD(coil, lifecycleOwner, onItemClickListener))
-			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listListener))
+			.addDelegate(emptyStateListAD(coil, listListener))
 			.addDelegate(loadingStateAD())
 	}
 
@@ -31,7 +31,6 @@ class CategoriesAdapter(
 				oldItem is CategoryListModel && newItem is CategoryListModel -> {
 					oldItem.category.id == newItem.category.id
 				}
-
 				else -> oldItem.javaClass == newItem.javaClass
 			}
 		}
@@ -53,7 +52,6 @@ class CategoriesAdapter(
 						super.getChangePayload(oldItem, newItem)
 					}
 				}
-
 				else -> super.getChangePayload(oldItem, newItem)
 			}
 		}

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt

@@ -77,12 +77,13 @@ fun categoryAD(
 			)
 		}
 		repeat(coverViews.size) { i ->
-			coverViews[i].newImageRequest(lifecycleOwner, item.covers.getOrNull(i))?.run {
+			coverViews[i].newImageRequest(item.covers.getOrNull(i))?.run {
 				placeholder(R.drawable.ic_placeholder)
 				fallback(fallback)
 				crossfade(crossFadeDuration * (i + 1))
 				error(R.drawable.ic_error_placeholder)
 				allowRgb565(true)
+				lifecycle(lifecycleOwner)
 				enqueueWith(coil)
 			}
 		}

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

@@ -4,37 +4,43 @@ 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
 import android.widget.ArrayAdapter
 import android.widget.Filter
-import androidx.activity.viewModels
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
+import com.google.android.material.R as materialR
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.base.ui.util.DefaultTextWatcher
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.ui.titleRes
 import org.koitharu.kotatsu.databinding.ActivityCategoryEditBinding
 import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.utils.ext.assistedViewModels
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.getSerializableCompat
-import com.google.android.material.R as materialR
 
 @AndroidEntryPoint
 class FavouritesCategoryEditActivity :
 	BaseActivity<ActivityCategoryEditBinding>(),
 	AdapterView.OnItemClickListener,
 	View.OnClickListener,
-	DefaultTextWatcher {
+	TextWatcher {
 
-	private val viewModel by viewModels<FavouritesCategoryEditViewModel>()
+	@Inject
+	lateinit var viewModelFactory: FavouritesCategoryEditViewModel.Factory
+
+	private val viewModel by assistedViewModels<FavouritesCategoryEditViewModel> {
+		viewModelFactory.create(intent.getLongExtra(EXTRA_ID, NO_ID))
+	}
 	private var selectedSortOrder: SortOrder? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -77,11 +83,14 @@ class FavouritesCategoryEditActivity :
 				title = binding.editName.text?.toString()?.trim().orEmpty(),
 				sortOrder = getSelectedSortOrder(),
 				isTrackerEnabled = binding.switchTracker.isChecked,
-				isVisibleOnShelf = binding.switchShelf.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()
 	}
@@ -113,9 +122,6 @@ class FavouritesCategoryEditActivity :
 		val sortText = getString((category?.order ?: SortOrder.NEWEST).titleRes)
 		binding.editSort.setText(sortText, false)
 		binding.switchTracker.isChecked = category?.isTrackingEnabled ?: true
-		binding.switchTracker.jumpDrawablesToCurrentState()
-		binding.switchShelf.isChecked = category?.isVisibleInLibrary ?: true
-		binding.switchShelf.jumpDrawablesToCurrentState()
 	}
 
 	private fun onError(e: Throwable) {
@@ -127,7 +133,6 @@ class FavouritesCategoryEditActivity :
 		binding.editSort.isEnabled = !isLoading
 		binding.editName.isEnabled = !isLoading
 		binding.switchTracker.isEnabled = !isLoading
-		binding.switchShelf.isEnabled = !isLoading
 		if (isLoading) {
 			binding.textViewError.isVisible = false
 		}
@@ -162,9 +167,9 @@ class FavouritesCategoryEditActivity :
 
 	companion object {
 
-		const val EXTRA_ID = "id"
-		const val NO_ID = -1L
+		private const val EXTRA_ID = "id"
 		private const val KEY_SORT_ORDER = "sort"
+		private const val NO_ID = -1L
 
 		fun newIntent(context: Context, id: Long = NO_ID): Intent {
 			return Intent(context, FavouritesCategoryEditActivity::class.java)

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

@@ -1,30 +1,27 @@
 package org.koitharu.kotatsu.favourites.ui.categories.edit
 
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.liveData
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity.Companion.EXTRA_ID
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity.Companion.NO_ID
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.SingleLiveEvent
-import javax.inject.Inject
 
-@HiltViewModel
-class FavouritesCategoryEditViewModel @Inject constructor(
-	savedStateHandle: SavedStateHandle,
+private const val NO_ID = -1L
+
+class FavouritesCategoryEditViewModel @AssistedInject constructor(
+	@Assisted private val categoryId: Long,
 	private val repository: FavouritesRepository,
 	private val settings: AppSettings,
 ) : BaseViewModel() {
 
-	private val categoryId = savedStateHandle[EXTRA_ID] ?: NO_ID
-
 	val onSaved = SingleLiveEvent<Unit>()
 	val category = MutableLiveData<FavouriteCategory?>()
 
@@ -33,14 +30,12 @@ class FavouritesCategoryEditViewModel @Inject constructor(
 	}
 
 	init {
-		launchLoadingJob(Dispatchers.Default) {
-			category.postValue(
-				if (categoryId != NO_ID) {
-					repository.getCategory(categoryId)
-				} else {
-					null
-				},
-			)
+		launchLoadingJob {
+			category.value = if (categoryId != NO_ID) {
+				repository.getCategory(categoryId)
+			} else {
+				null
+			}
 		}
 	}
 
@@ -48,16 +43,21 @@ class FavouritesCategoryEditViewModel @Inject constructor(
 		title: String,
 		sortOrder: SortOrder,
 		isTrackerEnabled: Boolean,
-		isVisibleOnShelf: Boolean,
 	) {
-		launchLoadingJob(Dispatchers.Default) {
+		launchLoadingJob {
 			check(title.isNotEmpty())
 			if (categoryId == NO_ID) {
-				repository.createCategory(title, sortOrder, isTrackerEnabled, isVisibleOnShelf)
+				repository.createCategory(title, sortOrder, isTrackerEnabled)
 			} else {
-				repository.updateCategory(categoryId, title, sortOrder, isTrackerEnabled, isVisibleOnShelf)
+				repository.updateCategory(categoryId, title, sortOrder, isTrackerEnabled)
 			}
-			onSaved.postCall(Unit)
+			onSaved.call(Unit)
 		}
 	}
+
+	@AssistedFactory
+	interface Factory {
+
+		fun create(categoryId: Long): FavouritesCategoryEditViewModel
+	}
 }

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt

@@ -8,8 +8,8 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
@@ -19,6 +19,7 @@ import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEdit
 import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.assistedViewModels
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.withArgs
 
@@ -29,7 +30,14 @@ class FavouriteCategoriesBottomSheet :
 	View.OnClickListener,
 	Toolbar.OnMenuItemClickListener {
 
-	private val viewModel: MangaCategoriesViewModel by viewModels()
+	@Inject
+	lateinit var viewModelFactory: MangaCategoriesViewModel.Factory
+
+	private val viewModel: MangaCategoriesViewModel by assistedViewModels {
+		viewModelFactory.create(
+			requireNotNull(arguments?.getParcelableArrayList<ParcelableManga>(KEY_MANGA_LIST)).map { it.manga },
+		)
+	}
 
 	private var adapter: MangaCategoriesAdapter? = null
 
@@ -83,7 +91,7 @@ class FavouriteCategoriesBottomSheet :
 	companion object {
 
 		private const val TAG = "FavouriteCategoriesDialog"
-		const val KEY_MANGA_LIST = "manga_list"
+		private const val KEY_MANGA_LIST = "manga_list"
 
 		fun show(fm: FragmentManager, manga: Manga) = Companion.show(fm, listOf(manga))
 

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

@@ -1,27 +1,23 @@
 package org.koitharu.kotatsu.favourites.ui.categories.select
 
-import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.model.ids
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesBottomSheet.Companion.KEY_MANGA_LIST
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
-import org.koitharu.kotatsu.utils.asFlowLiveData
-import javax.inject.Inject
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
-@HiltViewModel
-class MangaCategoriesViewModel @Inject constructor(
-	savedStateHandle: SavedStateHandle,
+class MangaCategoriesViewModel @AssistedInject constructor(
+	@Assisted private val manga: List<Manga>,
 	private val favouritesRepository: FavouritesRepository,
 ) : BaseViewModel() {
 
-	private val manga = requireNotNull(savedStateHandle.get<List<ParcelableManga>>(KEY_MANGA_LIST)).map { it.manga }
-
 	val content = combine(
 		favouritesRepository.observeCategories(),
 		observeCategoriesIds(),
@@ -33,7 +29,7 @@ class MangaCategoriesViewModel @Inject constructor(
 				isChecked = it.id in checked,
 			)
 		}
-	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
 
 	fun setChecked(categoryId: Long, isChecked: Boolean) {
 		launchJob(Dispatchers.Default) {
@@ -65,4 +61,10 @@ class MangaCategoriesViewModel @Inject constructor(
 			result
 		}
 	}
+
+	@AssistedFactory
+	interface Factory {
+
+		fun create(manga: List<Manga>): MangaCategoriesViewModel
+	}
 }

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

@@ -6,7 +6,6 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.PopupMenu
-import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.ListSelectionController
@@ -15,12 +14,20 @@ import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.addMenuProvider
+import org.koitharu.kotatsu.utils.ext.assistedViewModels
 import org.koitharu.kotatsu.utils.ext.withArgs
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickListener {
 
-	override val viewModel by viewModels<FavouritesListViewModel>()
+	@Inject
+	lateinit var viewModelFactory: FavouritesListViewModel.Factory
+
+	override val viewModel by assistedViewModels { viewModelFactory.create(categoryId) }
+
+	private val categoryId: Long
+		get() = arguments?.getLong(ARG_CATEGORY_ID) ?: NO_ID
 
 	override val isSwipeRefreshEnabled = false
 
@@ -76,7 +83,7 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 	companion object {
 
 		const val NO_ID = 0L
-		const val ARG_CATEGORY_ID = "category_id"
+		private const val ARG_CATEGORY_ID = "category_id"
 
 		fun newInstance(categoryId: Long) = FavouritesListFragment().withArgs(1) {
 			putLong(ARG_CATEGORY_ID, categoryId)

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

@@ -2,9 +2,10 @@ package org.koitharu.kotatsu.favourites.ui.list
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
@@ -12,10 +13,8 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.parser.MangaTagHighlighter
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.ARG_CATEGORY_ID
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
@@ -28,21 +27,17 @@ import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.asFlowLiveData
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import javax.inject.Inject
 
-@HiltViewModel
-class FavouritesListViewModel @Inject constructor(
-	savedStateHandle: SavedStateHandle,
+class FavouritesListViewModel @AssistedInject constructor(
+	@Assisted val categoryId: Long,
 	private val repository: FavouritesRepository,
 	private val trackingRepository: TrackingRepository,
 	private val historyRepository: HistoryRepository,
 	private val settings: AppSettings,
-	private val tagHighlighter: MangaTagHighlighter,
 ) : MangaListViewModel(settings), ListExtraProvider {
 
-	val categoryId: Long = savedStateHandle[ARG_CATEGORY_ID] ?: NO_ID
-
 	var categoryName: String? = null
 		private set
 
@@ -51,7 +46,7 @@ class FavouritesListViewModel @Inject constructor(
 	} else {
 		repository.observeCategory(categoryId)
 			.map { it?.order }
-			.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, null)
+			.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
 	}
 
 	override val content = combine(
@@ -76,7 +71,7 @@ class FavouritesListViewModel @Inject constructor(
 				),
 			)
 
-			else -> list.toUi(mode, this, tagHighlighter)
+			else -> list.toUi(mode, this)
 		}
 	}.catch {
 		emit(listOf(it.toErrorState(canRetry = false)))
@@ -136,4 +131,10 @@ class FavouritesListViewModel @Inject constructor(
 			PROGRESS_NONE
 		}
 	}
+
+	@AssistedFactory
+	interface Factory {
+
+		fun create(categoryId: Long): FavouritesListViewModel
+	}
 }

app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.history.domain
 
 import androidx.room.withTransaction
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.distinctUntilChangedBy
@@ -31,7 +30,6 @@ import javax.inject.Inject
 
 const val PROGRESS_NONE = -1f
 
-@Reusable
 class HistoryRepository @Inject constructor(
 	private val db: MangaDatabase,
 	private val trackingRepository: TrackingRepository,
@@ -39,7 +37,7 @@ class HistoryRepository @Inject constructor(
 	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
 ) {
 
-	suspend fun getList(offset: Int, limit: Int): List<Manga> {
+	suspend fun getList(offset: Int, limit: Int = 20): List<Manga> {
 		val entities = db.historyDao.findAll(offset, limit)
 		return entities.map { it.manga.toManga(it.tags.toMangaTags()) }
 	}
@@ -137,7 +135,7 @@ class HistoryRepository @Inject constructor(
 
 	/**
 	 * Try to replace one manga with another one
-	 * Useful for replacing saved manga on deleting it with remote source
+	 * Useful for replacing saved manga on deleting it with remove source
 	 */
 	suspend fun deleteOrSwap(manga: Manga, alternative: Manga?) {
 		if (alternative == null || db.mangaDao.update(alternative.toEntity()) <= 0) {

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

@@ -10,7 +10,6 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.parser.MangaTagHighlighter
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
@@ -39,7 +38,6 @@ class HistoryListViewModel @Inject constructor(
 	private val repository: HistoryRepository,
 	private val settings: AppSettings,
 	private val trackingRepository: TrackingRepository,
-	private val tagHighlighter: MangaTagHighlighter,
 ) : MangaListViewModel(settings) {
 
 	val isGroupingEnabled = MutableLiveData<Boolean>()
@@ -120,7 +118,7 @@ class HistoryListViewModel @Inject constructor(
 			val percent = if (showPercent) history.percent else PROGRESS_NONE
 			result += when (mode) {
 				ListMode.LIST -> manga.toListModel(counter, percent)
-				ListMode.DETAILED_LIST -> manga.toListDetailedModel(counter, percent, tagHighlighter)
+				ListMode.DETAILED_LIST -> manga.toListDetailedModel(counter, percent)
 				ListMode.GRID -> manga.toGridModel(counter, percent)
 			}
 		}

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

@@ -21,7 +21,6 @@ import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivityImageBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.enqueueWith
-import org.koitharu.kotatsu.utils.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.utils.ext.indicator
 import javax.inject.Inject
 
@@ -58,7 +57,7 @@ class ImageActivity : BaseActivity<ActivityImageBinding>() {
 			.data(url)
 			.memoryCachePolicy(CachePolicy.DISABLED)
 			.lifecycle(this)
-			.tag(intent.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE))
+			.tag(intent.getSerializableExtra(EXTRA_SOURCE) as? MangaSource)
 			.target(SsivTarget(binding.ssiv))
 			.indicator(binding.progressBar)
 			.enqueueWith(coil)

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

@@ -31,8 +31,9 @@ import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.base.ui.list.decor.TypedSpacingItemDecoration
 import org.koitharu.kotatsu.base.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.base.ui.util.ReversibleAction
+import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
@@ -54,6 +55,7 @@ import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.addMenuProvider
 import org.koitharu.kotatsu.utils.ext.clearItemDecorations
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.getThemeColor
 import org.koitharu.kotatsu.utils.ext.measureHeight
 import org.koitharu.kotatsu.utils.ext.resolveDp
@@ -126,7 +128,7 @@ abstract class MangaListFragment :
 		viewModel.gridScale.observe(viewLifecycleOwner, ::onGridScaleChanged)
 		viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
 		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
-		viewModel.onError.observe(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
+		viewModel.onError.observe(viewLifecycleOwner, ::onError)
 		viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone)
 	}
 
@@ -173,6 +175,18 @@ abstract class MangaListFragment :
 		listAdapter?.setItems(list, listCommitCallback)
 	}
 
+	private fun onError(e: Throwable) {
+		if (e is CloudFlareProtectedException) {
+			CloudFlareDialog.newInstance(e.url, e.headers).show(childFragmentManager, CloudFlareDialog.TAG)
+		} else {
+			Snackbar.make(
+				binding.recyclerView,
+				e.getDisplayMessage(resources),
+				Snackbar.LENGTH_SHORT,
+			).show()
+		}
+	}
+
 	private fun onActionDone(action: ReversibleAction) {
 		val handle = action.handle
 		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
-import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.databinding.ItemEmptyStateBinding
@@ -13,7 +12,6 @@ import org.koitharu.kotatsu.utils.ext.setTextAndVisible
 
 fun emptyStateListAD(
 	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
 	listener: ListStateHolderListener?,
 ) = adapterDelegateViewBinding<EmptyState, ListModel, ItemEmptyStateBinding>(
 	{ inflater, parent -> ItemEmptyStateBinding.inflate(inflater, parent, false) },
@@ -24,7 +22,7 @@ fun emptyStateListAD(
 	}
 
 	bind {
-		binding.icon.newImageRequest(lifecycleOwner, item.icon)?.enqueueWith(coil)
+		binding.icon.newImageRequest(item.icon)?.enqueueWith(coil)
 		binding.textPrimary.setText(item.textPrimary)
 		binding.textSecondary.setTextAndVisible(item.textSecondary)
 		if (listener != null) {

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

@@ -6,13 +6,12 @@ import org.koitharu.kotatsu.databinding.ItemHeader2Binding
 import org.koitharu.kotatsu.list.ui.model.ListHeader2
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.utils.ext.setTextAndVisible
 
 fun listHeader2AD(
 	listener: MangaListListener,
 ) = adapterDelegateViewBinding<ListHeader2, ListModel, ItemHeader2Binding>(
-	{ layoutInflater, parent -> ItemHeader2Binding.inflate(layoutInflater, parent, false) },
+	{ layoutInflater, parent -> ItemHeader2Binding.inflate(layoutInflater, parent, false) }
 ) {
 
 	var ignoreChecking = false
@@ -27,15 +26,11 @@ fun listHeader2AD(
 
 	bind { payloads ->
 		if (payloads.isNotEmpty()) {
-			if (context.isAnimationsEnabled) {
-				binding.scrollView.smoothScrollTo(0, 0)
-			} else {
-				binding.scrollView.scrollTo(0, 0)
-			}
+			binding.scrollView.smoothScrollTo(0, 0)
 		}
 		ignoreChecking = true
 		binding.chipsTags.setChips(item.chips) // TODO use recyclerview
 		ignoreChecking = false
 		binding.textViewFilter.setTextAndVisible(item.sortOrder?.titleRes ?: 0)
 	}
-}
+}

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

@@ -15,7 +15,6 @@ import org.koitharu.kotatsu.parsers.model.Manga
 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.source
 import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
 fun mangaGridItemAD(
@@ -39,13 +38,13 @@ fun mangaGridItemAD(
 	bind { payloads ->
 		binding.textViewTitle.text = item.title
 		binding.progressView.setPercent(item.progress, MangaListAdapter.PAYLOAD_PROGRESS in payloads)
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.coverUrl)?.run {
+		binding.imageViewCover.newImageRequest(item.coverUrl, item.source)?.run {
 			size(CoverSizeResolver(binding.imageViewCover))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
-			source(item.source)
+			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
 		badge = itemView.bindBadge(badge, item.counter)

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

@@ -4,15 +4,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.core.ui.DateTimeAgo
-import org.koitharu.kotatsu.list.ui.model.ListHeader
-import org.koitharu.kotatsu.list.ui.model.ListHeader2
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.MangaGridModel
-import org.koitharu.kotatsu.list.ui.model.MangaItemModel
-import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
-import org.koitharu.kotatsu.list.ui.model.MangaListModel
 import kotlin.jvm.internal.Intrinsics
+import org.koitharu.kotatsu.core.ui.DateTimeAgo
+import org.koitharu.kotatsu.list.ui.model.*
 
 open class MangaListAdapter(
 	coil: ImageLoader,
@@ -30,7 +24,7 @@ open class MangaListAdapter(
 			.addDelegate(ITEM_TYPE_DATE, relatedDateItemAD())
 			.addDelegate(ITEM_TYPE_ERROR_STATE, errorStateListAD(listener))
 			.addDelegate(ITEM_TYPE_ERROR_FOOTER, errorFooterAD(listener))
-			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
+			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(coil, listener))
 			.addDelegate(ITEM_TYPE_HEADER, listHeaderAD(listener))
 			.addDelegate(ITEM_TYPE_HEADER_2, listHeader2AD(listener))
 	}
@@ -41,25 +35,20 @@ open class MangaListAdapter(
 			oldItem is MangaListModel && newItem is MangaListModel -> {
 				oldItem.id == newItem.id
 			}
-
 			oldItem is MangaListDetailedModel && newItem is MangaListDetailedModel -> {
 				oldItem.id == newItem.id
 			}
-
 			oldItem is MangaGridModel && newItem is MangaGridModel -> {
 				oldItem.id == newItem.id
 			}
-
 			oldItem is DateTimeAgo && newItem is DateTimeAgo -> {
 				oldItem == newItem
 			}
-
 			oldItem is ListHeader && newItem is ListHeader -> {
 				oldItem.textRes == newItem.textRes &&
 					oldItem.text == newItem.text &&
 					oldItem.dateTimeAgo == newItem.dateTimeAgo
 			}
-
 			else -> oldItem.javaClass == newItem.javaClass
 		}
 
@@ -76,7 +65,6 @@ open class MangaListAdapter(
 					} else {
 					}
 				}
-
 				is ListHeader2 -> Unit
 				else -> super.getChangePayload(oldItem, newItem)
 			}

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

@@ -17,7 +17,6 @@ import org.koitharu.kotatsu.parsers.model.MangaTag
 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.source
 import org.koitharu.kotatsu.utils.ext.textAndVisible
 import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
@@ -52,13 +51,13 @@ fun mangaListDetailedItemAD(
 		binding.textViewTitle.text = item.title
 		binding.textViewSubtitle.textAndVisible = item.subtitle
 		binding.progressView.setPercent(item.progress, MangaListAdapter.PAYLOAD_PROGRESS in payloads)
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.coverUrl)?.run {
+		binding.imageViewCover.newImageRequest(item.coverUrl, item.source)?.run {
 			size(CoverSizeResolver(binding.imageViewCover))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
-			source(item.source)
+			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
 		if (payloads.isEmpty()) {

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

@@ -13,7 +13,6 @@ import org.koitharu.kotatsu.parsers.model.Manga
 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.source
 import org.koitharu.kotatsu.utils.ext.textAndVisible
 
 fun mangaListItemAD(
@@ -35,12 +34,12 @@ fun mangaListItemAD(
 	bind {
 		binding.textViewTitle.text = item.title
 		binding.textViewSubtitle.textAndVisible = item.subtitle
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.coverUrl)?.run {
+		binding.imageViewCover.newImageRequest(item.coverUrl, item.source)?.run {
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
-			source(item.source)
+			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
 		badge = itemView.bindBadge(badge, item.counter)

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

@@ -16,7 +16,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.utils.asFlowLiveData
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import java.text.Collator
@@ -37,7 +37,7 @@ class FilterCoordinator(
 	private var availableTagsDeferred = loadTagsAsync()
 
 	val items: LiveData<List<FilterItem>> = getItemsFlow()
-		.asFlowLiveData(coroutineScope.coroutineContext + Dispatchers.Default, listOf(FilterItem.Loading))
+		.asLiveDataDistinct(coroutineScope.coroutineContext + Dispatchers.Default, listOf(FilterItem.Loading))
 
 	init {
 		observeState()

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

@@ -4,7 +4,6 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.parser.MangaTagHighlighter
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
@@ -14,10 +13,7 @@ import org.koitharu.kotatsu.utils.ext.ifZero
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 
-fun Manga.toListModel(
-	counter: Int,
-	progress: Float,
-) = MangaListModel(
+fun Manga.toListModel(counter: Int, progress: Float) = MangaListModel(
 	id = id,
 	title = title,
 	subtitle = tags.joinToString(", ") { it.title },
@@ -27,11 +23,7 @@ fun Manga.toListModel(
 	progress = progress,
 )
 
-fun Manga.toListDetailedModel(
-	counter: Int,
-	progress: Float,
-	tagHighlighter: MangaTagHighlighter?,
-) = MangaListDetailedModel(
+fun Manga.toListDetailedModel(counter: Int, progress: Float) = MangaListDetailedModel(
 	id = id,
 	title = title,
 	subtitle = altTitle,
@@ -39,15 +31,7 @@ fun Manga.toListDetailedModel(
 	manga = this,
 	counter = counter,
 	progress = progress,
-	tags = tags.map {
-		ChipsView.ChipModel(
-			tint = tagHighlighter?.getTint(it) ?: 0,
-			title = it.title,
-			isCheckable = false,
-			isChecked = false,
-			data = it,
-		)
-	},
+	tags = tags.map { ChipsView.ChipModel(0, it.title, false, false, it) },
 )
 
 fun Manga.toGridModel(counter: Int, progress: Float) = MangaGridModel(
@@ -62,21 +46,18 @@ fun Manga.toGridModel(counter: Int, progress: Float) = MangaGridModel(
 suspend fun List<Manga>.toUi(
 	mode: ListMode,
 	extraProvider: ListExtraProvider,
-	tagHighlighter: MangaTagHighlighter?,
-): List<MangaItemModel> = toUi(ArrayList(size), mode, extraProvider, tagHighlighter)
+): List<MangaItemModel> = toUi(ArrayList(size), mode, extraProvider)
 
 fun List<Manga>.toUi(
 	mode: ListMode,
-	tagHighlighter: MangaTagHighlighter?,
-): List<MangaItemModel> = toUi(ArrayList(size), mode, tagHighlighter)
+): List<MangaItemModel> = toUi(ArrayList(size), mode)
 
 fun <C : MutableCollection<in MangaItemModel>> List<Manga>.toUi(
 	destination: C,
 	mode: ListMode,
-	tagHighlighter: MangaTagHighlighter?,
 ): C = when (mode) {
 	ListMode.LIST -> mapTo(destination) { it.toListModel(0, PROGRESS_NONE) }
-	ListMode.DETAILED_LIST -> mapTo(destination) { it.toListDetailedModel(0, PROGRESS_NONE, tagHighlighter) }
+	ListMode.DETAILED_LIST -> mapTo(destination) { it.toListDetailedModel(0, PROGRESS_NONE) }
 	ListMode.GRID -> mapTo(destination) { it.toGridModel(0, PROGRESS_NONE) }
 }
 
@@ -84,14 +65,13 @@ suspend fun <C : MutableCollection<in MangaItemModel>> List<Manga>.toUi(
 	destination: C,
 	mode: ListMode,
 	extraProvider: ListExtraProvider,
-	tagHighlighter: MangaTagHighlighter?,
 ): C = when (mode) {
 	ListMode.LIST -> mapTo(destination) {
 		it.toListModel(extraProvider.getCounter(it.id), extraProvider.getProgress(it.id))
 	}
 
 	ListMode.DETAILED_LIST -> mapTo(destination) {
-		it.toListDetailedModel(extraProvider.getCounter(it.id), extraProvider.getProgress(it.id), tagHighlighter)
+		it.toListDetailedModel(extraProvider.getCounter(it.id), extraProvider.getProgress(it.id))
 	}
 
 	ListMode.GRID -> mapTo(destination) {

app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt

@@ -12,7 +12,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okio.buffer
 import okio.source
-import org.koitharu.kotatsu.local.data.util.withExtraCloseable
 import java.util.zip.ZipFile
 
 class CbzFetcher(

app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt

@@ -1,20 +1,15 @@
 package org.koitharu.kotatsu.local.data
 
 import java.io.File
-import java.io.FileFilter
 import java.io.FilenameFilter
-import java.util.Locale
+import java.util.*
 
-class CbzFilter : FileFilter, FilenameFilter {
+class CbzFilter : FilenameFilter {
 
 	override fun accept(dir: File, name: String): Boolean {
 		return isFileSupported(name)
 	}
 
-	override fun accept(pathname: File?): Boolean {
-		return isFileSupported(pathname?.name ?: return false)
-	}
-
 	companion object {
 
 		fun isFileSupported(name: String): Boolean {

app/src/main/java/org/koitharu/kotatsu/local/data/ExtraCloseableSource.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.local.data.util
+package org.koitharu.kotatsu.local.data
 
 import okhttp3.internal.closeQuietly
 import okio.Closeable

app/src/main/java/org/koitharu/kotatsu/local/data/FlowFileObserver.kt

@@ -0,0 +1,27 @@
+package org.koitharu.kotatsu.local.data
+
+import android.os.FileObserver
+import java.io.File
+import kotlinx.coroutines.channels.ProducerScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.callbackFlow
+
+@Suppress("DEPRECATION")
+class FlowFileObserver(
+	private val producerScope: ProducerScope<File>,
+	private val file: File,
+) : FileObserver(file.absolutePath, CREATE or DELETE or CLOSE_WRITE) {
+
+	override fun onEvent(event: Int, path: String?) {
+		producerScope.trySendBlocking(
+			if (path == null) file else file.resolve(path),
+		)
+	}
+}
+
+fun File.observe() = callbackFlow {
+	val observer = FlowFileObserver(this, this@observe)
+	observer.startWatching()
+	awaitClose { observer.stopWatching() }
+}

app/src/main/java/org/koitharu/kotatsu/local/data/ImageFileFilter.kt

@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.local.data
-
-import java.io.File
-import java.io.FileFilter
-import java.io.FilenameFilter
-import java.util.Locale
-import java.util.zip.ZipEntry
-
-class ImageFileFilter : FilenameFilter, FileFilter {
-
-	override fun accept(dir: File, name: String): Boolean {
-		val ext = name.substringAfterLast('.', "").lowercase(Locale.ROOT)
-		return isExtensionValid(ext)
-	}
-
-	override fun accept(pathname: File?): Boolean {
-		val ext = pathname?.extension?.lowercase(Locale.ROOT) ?: return false
-		return isExtensionValid(ext)
-	}
-
-	fun accept(entry: ZipEntry): Boolean {
-		val ext = entry.name.substringAfterLast('.', "").lowercase(Locale.ROOT)
-		return isExtensionValid(ext)
-	}
-
-	private fun isExtensionValid(ext: String): Boolean {
-		return ext == "png" || ext == "jpg" || ext == "jpeg" || ext == "webp"
-	}
-}

app/src/main/java/org/koitharu/kotatsu/local/data/LocalStorageManager.kt

@@ -4,8 +4,10 @@ import android.content.ContentResolver
 import android.content.Context
 import android.os.StatFs
 import androidx.annotation.WorkerThread
-import dagger.Reusable
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
@@ -15,19 +17,16 @@ import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.withContext
 import okhttp3.Cache
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.local.data.util.observe
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.utils.ext.computeSize
 import org.koitharu.kotatsu.utils.ext.getStorageName
-import java.io.File
-import javax.inject.Inject
 
 private const val DIR_NAME = "manga"
 private const val CACHE_DISK_PERCENTAGE = 0.02
 private const val CACHE_SIZE_MIN: Long = 10 * 1024 * 1024 // 10MB
 private const val CACHE_SIZE_MAX: Long = 250 * 1024 * 1024 // 250MB
 
-@Reusable
+@Singleton
 class LocalStorageManager @Inject constructor(
 	@ApplicationContext private val context: Context,
 	private val settings: AppSettings,

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

@@ -1,21 +1,15 @@
 package org.koitharu.kotatsu.local.data
 
-import androidx.annotation.WorkerThread
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
-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.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
 import org.koitharu.kotatsu.parsers.util.json.mapJSONToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.utils.AlphanumComparator
-import java.io.File
 
 class MangaIndex(source: String?) {
 
@@ -132,20 +126,6 @@ class MangaIndex(source: String?) {
 		json.put("chapters", newJo)
 	}
 
-	fun clear() {
-		val keys = json.keys()
-		while (keys.hasNext()) {
-			json.remove(keys.next())
-		}
-	}
-
-	fun setFrom(other: MangaIndex) {
-		clear()
-		other.json.keys().forEach { key ->
-			json.putOpt(key, other.json.opt(key))
-		}
-	}
-
 	private fun getChapters(json: JSONObject, source: MangaSource): List<MangaChapter> {
 		val chapters = ArrayList<MangaChapter>(json.length())
 		for (k in json.keys()) {
@@ -171,18 +151,4 @@ class MangaIndex(source: String?) {
 	} else {
 		json.toString()
 	}
-
-	companion object {
-
-		@WorkerThread
-		fun read(file: File): MangaIndex? {
-			if (file.exists() && file.canRead()) {
-				val text = file.readText()
-				if (text.length > 2) {
-					return MangaIndex(text)
-				}
-			}
-			return null
-		}
-	}
 }

app/src/main/java/org/koitharu/kotatsu/local/data/importer/SingleMangaImporter.kt

@@ -1,103 +0,0 @@
-package org.koitharu.kotatsu.local.data.importer
-
-import android.content.Context
-import android.net.Uri
-import androidx.documentfile.provider.DocumentFile
-import dagger.Reusable
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
-import org.koitharu.kotatsu.local.data.CbzFilter
-import org.koitharu.kotatsu.local.data.LocalManga
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.local.data.input.LocalMangaInput
-import org.koitharu.kotatsu.utils.ext.copyToSuspending
-import org.koitharu.kotatsu.utils.ext.resolveName
-import java.io.File
-import java.io.IOException
-import javax.inject.Inject
-
-@Reusable
-class SingleMangaImporter @Inject constructor(
-	@ApplicationContext private val context: Context,
-	private val storageManager: LocalStorageManager,
-) {
-
-	private val contentResolver = context.contentResolver
-
-	suspend fun import(uri: Uri, progressState: MutableStateFlow<Float>?): LocalManga {
-		return if (isDirectory(uri)) {
-			importDirectory(uri, progressState)
-		} else {
-			importFile(uri, progressState)
-		}
-	}
-
-	private suspend fun importFile(uri: Uri, progressState: MutableStateFlow<Float>?): LocalManga {
-		val contentResolver = storageManager.contentResolver
-		val name = contentResolver.resolveName(uri) ?: throw IOException("Cannot fetch name from uri: $uri")
-		if (!CbzFilter.isFileSupported(name)) {
-			throw UnsupportedFileException("Unsupported file on $uri")
-		}
-		val dest = File(getOutputDir(), name)
-		runInterruptible {
-			contentResolver.openInputStream(uri)
-		}?.use { source ->
-			dest.outputStream().use { output ->
-				source.copyToSuspending(output, progressState = progressState)
-			}
-		} ?: throw IOException("Cannot open input stream: $uri")
-		return LocalMangaInput.of(dest).getManga()
-	}
-
-	private suspend fun importDirectory(uri: Uri, progressState: MutableStateFlow<Float>?): LocalManga {
-		val root = requireNotNull(DocumentFile.fromTreeUri(context, uri)) {
-			"Provided uri $uri is not a tree"
-		}
-		val dest = File(getOutputDir(), root.requireName())
-		dest.mkdir()
-		for (docFile in root.listFiles()) {
-			docFile.copyTo(dest)
-		}
-		return LocalMangaInput.of(dest).getManga()
-	}
-
-	/**
-	 * TODO: progress
-	 */
-	private suspend fun DocumentFile.copyTo(destDir: File) {
-		if (isDirectory) {
-			val subDir = File(destDir, requireName())
-			subDir.mkdir()
-			for (docFile in listFiles()) {
-				docFile.copyTo(subDir)
-			}
-		} else {
-			inputStream().use { input ->
-				File(destDir, requireName()).outputStream().use { output ->
-					input.copyToSuspending(output)
-				}
-			}
-		}
-	}
-
-	private suspend fun getOutputDir(): File {
-		return storageManager.getDefaultWriteableDir() ?: throw IOException("External files dir unavailable")
-	}
-
-	private suspend fun DocumentFile.inputStream() = runInterruptible(Dispatchers.IO) {
-		contentResolver.openInputStream(uri) ?: throw IOException("Cannot open input stream: $uri")
-	}
-
-	private fun DocumentFile.requireName(): String {
-		return name ?: throw IOException("Cannot fetch name from uri: $uri")
-	}
-
-	private fun isDirectory(uri: Uri): Boolean {
-		return runCatching {
-			DocumentFile.fromTreeUri(context, uri)
-		}.isSuccess
-	}
-}

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

@@ -1,144 +0,0 @@
-package org.koitharu.kotatsu.local.data.input
-
-import androidx.core.net.toFile
-import androidx.core.net.toUri
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.local.data.CbzFilter
-import org.koitharu.kotatsu.local.data.ImageFileFilter
-import org.koitharu.kotatsu.local.data.LocalManga
-import org.koitharu.kotatsu.local.data.MangaIndex
-import org.koitharu.kotatsu.local.data.output.LocalMangaOutput
-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 org.koitharu.kotatsu.utils.AlphanumComparator
-import org.koitharu.kotatsu.utils.ext.listFilesRecursive
-import org.koitharu.kotatsu.utils.ext.longHashCode
-import org.koitharu.kotatsu.utils.ext.toListSorted
-import java.io.File
-import java.util.zip.ZipFile
-
-/**
- * Manga {Folder}
- * |--- index.json (optional)
- * |--- Chapter 1.cbz
- *   |--- Page 1.png
- *   :
- *   L--- Page x.png
- * |--- Chapter 2.cbz
- * :
- * L--- Chapter x.cbz
- */
-class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
-
-	override suspend fun getManga(): LocalManga = runInterruptible(Dispatchers.IO) {
-		val index = MangaIndex.read(File(root, LocalMangaOutput.ENTRY_NAME_INDEX))
-		val mangaUri = root.toUri().toString()
-		val chapterFiles = getChaptersFiles()
-		val info = index?.getMangaInfo()
-		val manga = info?.copy2(
-			source = MangaSource.LOCAL,
-			url = mangaUri,
-			coverUrl = fileUri(
-				root,
-				index.getCoverEntry() ?: findFirstImageEntry().orEmpty(),
-			),
-			chapters = info.chapters?.mapIndexed { i, c ->
-				c.copy(url = chapterFiles[i].toUri().toString(), source = MangaSource.LOCAL)
-			},
-		) ?: Manga(
-			id = root.absolutePath.longHashCode(),
-			title = root.name.toHumanReadable(),
-			url = mangaUri,
-			publicUrl = mangaUri,
-			source = MangaSource.LOCAL,
-			coverUrl = findFirstImageEntry().orEmpty(),
-			chapters = chapterFiles.mapIndexed { i, f ->
-				MangaChapter(
-					id = "$i${f.name}".longHashCode(),
-					name = f.nameWithoutExtension.toHumanReadable(),
-					number = i + 1,
-					source = MangaSource.LOCAL,
-					uploadDate = f.lastModified(),
-					url = f.toUri().toString(),
-					scanlator = null,
-					branch = null,
-				)
-			},
-			altTitle = null,
-			rating = -1f,
-			isNsfw = false,
-			tags = setOf(),
-			state = null,
-			author = null,
-			largeCoverUrl = null,
-			description = null,
-		)
-		LocalManga(root, manga)
-	}
-
-	override suspend fun getMangaInfo(): Manga? = runInterruptible(Dispatchers.IO) {
-		val index = MangaIndex.read(File(root, LocalMangaOutput.ENTRY_NAME_INDEX))
-		index?.getMangaInfo()
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = runInterruptible(Dispatchers.IO) {
-		val file = chapter.url.toUri().toFile()
-		if (file.isDirectory) {
-			file.listFilesRecursive(ImageFileFilter())
-				.toListSorted(compareBy(AlphanumComparator()) { x -> x.name })
-				.map {
-					val pageUri = it.toUri().toString()
-					MangaPage(
-						id = pageUri.longHashCode(),
-						url = pageUri,
-						preview = null,
-						source = MangaSource.LOCAL,
-					)
-				}
-		} else {
-			ZipFile(file).use { zip ->
-				zip.entries()
-					.asSequence()
-					.filter { x -> !x.isDirectory }
-					.map { it.name }
-					.toListSorted(AlphanumComparator())
-					.map {
-						val pageUri = zipUri(file, it)
-						MangaPage(
-							id = pageUri.longHashCode(),
-							url = pageUri,
-							preview = null,
-							source = MangaSource.LOCAL,
-						)
-					}
-			}
-		}
-	}
-
-	private fun String.toHumanReadable() = replace("_", " ").toCamelCase()
-
-	private fun getChaptersFiles(): List<File> = root.listFilesRecursive(CbzFilter())
-		.toListSorted(compareBy(AlphanumComparator()) { x -> x.name })
-
-	private fun findFirstImageEntry(): String? {
-		val filter = ImageFileFilter()
-		root.listFilesRecursive(filter).firstOrNull()?.let {
-			return it.toUri().toString()
-		}
-		val cbz = root.listFilesRecursive(CbzFilter()).firstOrNull() ?: return null
-		return ZipFile(cbz).use { zip ->
-			val filter = ImageFileFilter()
-			zip.entries().asSequence()
-				.firstOrNull { x -> !x.isDirectory && filter.accept(x) }
-				?.let { entry -> zipUri(cbz, entry.name) }
-		}
-	}
-
-	private fun fileUri(base: File, name: String): String {
-		return File(base, name).toUri().toString()
-	}
-}