Fix favourite categories covers loading

README.md

@@ -19,7 +19,7 @@ Kotatsu is a free and open source manga reader for Android.
 * Tablet-optimized Material You UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
-* Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
 * Password/fingerprint protect access to the app
 * History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 

app/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 547
-		versionName '5.1.3'
+		versionCode 548
+		versionName '5.1.4'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -42,7 +42,6 @@ android {
 	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
-		main.java.srcDirs += 'src/main/kotlin/'
 	}
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_17
@@ -60,7 +59,7 @@ android {
 	}
 	lint {
 		abortOnError true
-		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged', 'SetJavaScriptEnabled'
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
 		unitTests.includeAndroidResources true
@@ -106,7 +105,7 @@ dependencies {
 
 	implementation 'androidx.work:work-runtime-ktx:2.8.1'
 	//noinspection GradleDependency
-	implementation('com.google.guava:guava:32.0.0-android') {
+	implementation('com.google.guava:guava:31.1-android') {
 		exclude group: 'com.google.guava', module: 'failureaccess'
 		exclude group: 'org.checkerframework', module: 'checker-qual'
 		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'

app/proguard-rules.pro

@@ -8,7 +8,7 @@
 	public static void checkParameterIsNotNull(...);
 	public static void checkNotNullParameter(...);
 }
--keep public class ** extends org.koitharu.kotatsu.core.ui.BaseFragment
+-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.**

app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt

@@ -8,6 +8,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
@@ -18,8 +19,7 @@ import org.junit.runner.RunWith
 import org.koitharu.kotatsu.SampleData
 import org.koitharu.kotatsu.awaitForIdle
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.history.data.HistoryRepository
-import javax.inject.Inject
+import org.koitharu.kotatsu.history.domain.HistoryRepository
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)

app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt

@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.core.backup.BackupRepository
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.history.domain.HistoryRepository
 import java.io.File
 import javax.inject.Inject
 

app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.tracker.domain
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
 import junit.framework.TestCase.*
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
@@ -10,9 +11,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.parsers.model.Manga
-import javax.inject.Inject
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)

app/src/debug/java/org/koitharu/kotatsu/util/LoggingAdapterDataObserver.kt

@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.util
-
-import android.util.Log
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
-
-class LoggingAdapterDataObserver(
-	private val tag: String,
-) : AdapterDataObserver() {
-
-	override fun onChanged() {
-		Log.d(tag, "onChanged()")
-	}
-
-	override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
-		Log.d(tag, "onItemRangeChanged(positionStart=$positionStart, itemCount=$itemCount)")
-	}
-
-	override fun onItemRangeChanged(positionStart: Int, itemCount: Int, payload: Any?) {
-		Log.d(tag, "onItemRangeChanged(positionStart=$positionStart, itemCount=$itemCount, payload=$payload)")
-	}
-
-	override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-		Log.d(tag, "onItemRangeInserted(positionStart=$positionStart, itemCount=$itemCount)")
-	}
-
-	override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
-		Log.d(tag, "onItemRangeRemoved(positionStart=$positionStart, itemCount=$itemCount)")
-	}
-
-	override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
-		Log.d(tag, "onItemRangeMoved(fromPosition=$fromPosition, toPosition=$toPosition, itemCount=$itemCount)")
-	}
-
-	override fun onStateRestorationPolicyChanged() {
-		Log.d(tag, "onStateRestorationPolicyChanged()")
-	}
-}

app/src/debug/java/org/koitharu/kotatsu/util/ext/DebugExt.kt

@@ -1,3 +0,0 @@
-package org.koitharu.kotatsu.util.ext
-
-fun Throwable.printStackTraceDebug() = printStackTrace()

app/src/debug/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt

@@ -0,0 +1,3 @@
+package org.koitharu.kotatsu.utils.ext
+
+fun Throwable.printStackTraceDebug() = printStackTrace()

app/src/main/AndroidManifest.xml

@@ -159,21 +159,9 @@
 				<data android:host="shikimori-auth" />
 				<data android:host="anilist-auth" />
 				<data android:host="mal-auth" />
-				<data android:host="kitsu-auth" />
 			</intent-filter>
 
 		</activity>
-		<activity
-			android:name=".scrobbling.kitsu.ui.KitsuAuthActivity"
-			android:exported="false"
-			android:label="@string/kitsu"
-			tools:ignore="AppLinkUrlError">
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<data android:scheme="kotatsu+kitsu" />
-			</intent-filter>
-		</activity>
 
 		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
 		<service

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

@@ -20,12 +20,12 @@ import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
-import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.local.data.LocalMangaRepository
 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.WorkServiceStopHelper
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import javax.inject.Inject
 
 @HiltAndroidApp

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

@@ -1,25 +1,43 @@
-package org.koitharu.kotatsu.core.parser
+package org.koitharu.kotatsu.base.domain
 
+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
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runInterruptible
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 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.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
+import java.io.File
+import java.io.InputStream
+import java.util.zip.ZipFile
 import javax.inject.Inject
+import kotlin.math.roundToInt
+
+private const val MIN_WEBTOON_RATIO = 2
 
 @Reusable
 class MangaDataRepository @Inject constructor(
+	private val okHttpClient: OkHttpClient,
 	private val db: MangaDatabase,
 ) {
 
@@ -39,7 +57,6 @@ class MangaDataRepository @Inject constructor(
 				entity.copy(
 					cfBrightness = colorFilter?.brightness ?: 0f,
 					cfContrast = colorFilter?.contrast ?: 0f,
-					cfInvert = colorFilter?.isInverted ?: false,
 				),
 			)
 		}
@@ -82,18 +99,72 @@ class MangaDataRepository @Inject constructor(
 	}
 
 	private fun MangaPrefsEntity.getColorFilterOrNull(): ReaderColorFilter? {
-		return if (cfBrightness != 0f || cfContrast != 0f || cfInvert) {
-			ReaderColorFilter(cfBrightness, cfContrast, cfInvert)
+		return if (cfBrightness != 0f || cfContrast != 0f) {
+			ReaderColorFilter(cfBrightness, cfContrast)
 		} else {
 			null
 		}
 	}
 
+	/**
+	 * Automatic determine type of manga by page size
+	 * @return ReaderMode.WEBTOON if page is wide
+	 */
+	suspend fun determineMangaIsWebtoon(repository: MangaRepository, pages: List<MangaPage>): Boolean {
+		val pageIndex = (pages.size * 0.3).roundToInt()
+		val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
+		val url = repository.getPageUrl(page)
+		val uri = Uri.parse(url)
+		val size = if (uri.scheme == "cbz") {
+			runInterruptible(Dispatchers.IO) {
+				val zip = ZipFile(uri.schemeSpecificPart)
+				val entry = zip.getEntry(uri.fragment)
+				zip.getInputStream(entry).use {
+					getBitmapSize(it)
+				}
+			}
+		} else {
+			val request = Request.Builder()
+				.url(url)
+				.get()
+				.tag(MangaSource::class.java, page.source)
+				.cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE)
+				.build()
+			okHttpClient.newCall(request).await().use {
+				runInterruptible(Dispatchers.IO) {
+					getBitmapSize(it.body?.byteStream())
+				}
+			}
+		}
+		return size.width * MIN_WEBTOON_RATIO < size.height
+	}
+
 	private fun newEntity(mangaId: Long) = MangaPrefsEntity(
 		mangaId = mangaId,
 		mode = -1,
 		cfBrightness = 0f,
 		cfContrast = 0f,
-		cfInvert = false,
 	)
+
+	companion object {
+
+		suspend fun getImageMimeType(file: File): String? = runInterruptible(Dispatchers.IO) {
+			val options = BitmapFactory.Options().apply {
+				inJustDecodeBounds = true
+			}
+			BitmapFactory.decodeFile(file.path, options)?.recycle()
+			options.outMimeType
+		}
+
+		private fun getBitmapSize(input: InputStream?): Size {
+			val options = BitmapFactory.Options().apply {
+				inJustDecodeBounds = true
+			}
+			BitmapFactory.decodeStream(input, null, options)?.recycle()
+			val imageHeight: Int = options.outHeight
+			val imageWidth: Int = options.outWidth
+			check(imageHeight > 0 && imageWidth > 0)
+			return Size(imageWidth, imageHeight)
+		}
+	}
 }

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

@@ -1,42 +1,39 @@
-package org.koitharu.kotatsu.core.parser
+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.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.ext.getParcelableCompat
-import org.koitharu.kotatsu.core.util.ext.getParcelableExtraCompat
 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 id: Long,
+	@JvmField val mangaId: Long,
 	@JvmField val uri: Uri?,
 ) {
 
 	constructor(intent: Intent?) : this(
 		manga = intent?.getParcelableExtraCompat<ParcelableManga>(KEY_MANGA)?.manga,
-		id = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
+		mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
 		uri = intent?.data,
 	)
 
 	constructor(savedStateHandle: SavedStateHandle) : this(
 		manga = savedStateHandle.get<ParcelableManga>(KEY_MANGA)?.manga,
-		id = savedStateHandle[KEY_ID] ?: ID_NONE,
+		mangaId = savedStateHandle[KEY_ID] ?: ID_NONE,
 		uri = savedStateHandle[BaseActivity.EXTRA_DATA],
 	)
 
 	constructor(args: Bundle?) : this(
 		manga = args?.getParcelableCompat<ParcelableManga>(KEY_MANGA)?.manga,
-		id = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
+		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
 		uri = null,
 	)
 
-	val mangaId: Long
-		get() = if (id != ID_NONE) id else manga?.id ?: uri?.lastPathSegment?.toLongOrNull() ?: ID_NONE
-
 	companion object {
 
 		const val ID_NONE = 0L

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

@@ -1,12 +1,12 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.domain
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 fun interface ReversibleHandle {
 

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

@@ -1,9 +1,8 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.base.ui
 
 import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AlertDialog
@@ -13,15 +12,13 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 
-	var viewBinding: B? = null
-		private set
+	private var viewBinding: B? = null
 
-	@Deprecated("", ReplaceWith("requireViewBinding()"))
 	protected val binding: B
-		get() = requireViewBinding()
+		get() = checkNotNull(viewBinding)
 
 	final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		val binding = onCreateViewBinding(layoutInflater, null)
+		val binding = onInflateView(layoutInflater, null)
 		viewBinding = binding
 		return MaterialAlertDialogBuilder(requireContext(), theme)
 			.setView(binding.root)
@@ -35,11 +32,6 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 		savedInstanceState: Bundle?,
 	) = viewBinding?.root
 
-	final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		onViewBindingCreated(requireViewBinding(), savedInstanceState)
-	}
-
 	@CallSuper
 	override fun onDestroyView() {
 		viewBinding = null
@@ -50,14 +42,7 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 
 	open fun onDialogCreated(dialog: AlertDialog) = Unit
 
-	@Deprecated("", ReplaceWith("viewBinding"))
-	protected fun bindingOrNull() = viewBinding
+	protected fun bindingOrNull(): B? = viewBinding
 
-	fun requireViewBinding(): B = checkNotNull(viewBinding) {
-		"Fragment $this did not return a ViewBinding from onCreateView() or this was called before onCreateView()."
-	}
-
-	protected abstract fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): B
-
-	protected open fun onViewBindingCreated(binding: B, savedInstanceState: Bundle?) = Unit
+	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
 }

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.base.ui
 
 import android.content.Intent
 import android.content.res.Configuration
@@ -25,11 +25,11 @@ import androidx.viewbinding.ViewBinding
 import dagger.hilt.android.EntryPointAccessors
 import org.koitharu.kotatsu.BuildConfig
 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.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
-import org.koitharu.kotatsu.core.ui.util.BaseActivityEntryPoint
-import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.getThemeColor
 
 @Suppress("LeakingThis")
 abstract class BaseActivity<B : ViewBinding> :
@@ -38,7 +38,7 @@ abstract class BaseActivity<B : ViewBinding> :
 
 	private var isAmoledTheme = false
 
-	lateinit var viewBinding: B
+	protected lateinit var binding: B
 		private set
 
 	@JvmField
@@ -88,7 +88,7 @@ abstract class BaseActivity<B : ViewBinding> :
 	}
 
 	protected fun setContentView(binding: B) {
-		this.viewBinding = binding
+		this.binding = binding
 		super.setContentView(binding.root)
 		val toolbar = (binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)
 		toolbar?.let(this::setSupportActionBar)
@@ -131,7 +131,7 @@ abstract class BaseActivity<B : ViewBinding> :
 		} else {
 			ContextCompat.getColor(this, R.color.kotatsu_secondaryContainer)
 		}
-		val insets = ViewCompat.getRootWindowInsets(viewBinding.root)
+		val insets = ViewCompat.getRootWindowInsets(binding.root)
 			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
 		findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar).apply {
 			setBackgroundColor(actionModeColor)

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.base.ui
 
 import android.app.Dialog
 import android.os.Bundle
@@ -13,23 +13,17 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.dialog.AppBottomSheetDialog
-import org.koitharu.kotatsu.core.util.ext.findActivity
-import org.koitharu.kotatsu.core.util.ext.getDisplaySize
+import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
+import org.koitharu.kotatsu.utils.ext.findActivity
+import org.koitharu.kotatsu.utils.ext.getDisplaySize
 import com.google.android.material.R as materialR
 
-@Deprecated(
-	"Use BaseAdaptiveSheet",
-	replaceWith = ReplaceWith("BaseAdaptiveSheet<B>", "org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet"),
-)
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 
-	var viewBinding: B? = null
-		private set
+	private var viewBinding: B? = null
 
-	@Deprecated("", ReplaceWith("requireViewBinding()"))
 	protected val binding: B
-		get() = requireViewBinding()
+		get() = checkNotNull(viewBinding)
 
 	protected val behavior: BottomSheetBehavior<*>?
 		get() = (dialog as? BottomSheetDialog)?.behavior
@@ -45,14 +39,13 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		container: ViewGroup?,
 		savedInstanceState: Bundle?,
 	): View {
-		val binding = onCreateViewBinding(inflater, container)
+		val binding = onInflateView(inflater, container)
 		viewBinding = binding
 		return binding.root
 	}
 
-	final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		val binding = requireViewBinding()
 		// Enforce max width for tablets
 		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
 		if (width > 0) {
@@ -62,7 +55,6 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		binding.root.context.findActivity()?.getDisplaySize()?.let {
 			behavior?.peekHeight = (it.height() * 0.4).toInt()
 		}
-		onViewBindingCreated(binding, savedInstanceState)
 	}
 
 	override fun onDestroyView() {
@@ -83,9 +75,7 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		}
 	}
 
-	protected abstract fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): B
-
-	protected open fun onViewBindingCreated(binding: B, savedInstanceState: Bundle?) = Unit
+	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
 
 	protected fun setExpanded(isExpanded: Boolean, isLocked: Boolean) {
 		val b = behavior ?: return
@@ -99,8 +89,4 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		}
 		b.isDraggable = !isLocked
 	}
-
-	fun requireViewBinding(): B = checkNotNull(viewBinding) {
-		"Fragment $this did not return a ViewBinding from onCreateView() or this was called before onCreateView()."
-	}
 }

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.base.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,21 +6,19 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
+import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
-import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 
 @Suppress("LeakingThis")
 abstract class BaseFragment<B : ViewBinding> :
 	Fragment(),
 	WindowInsetsDelegate.WindowInsetsListener {
 
-	var viewBinding: B? = null
-		private set
+	private var viewBinding: B? = null
 
-	@Deprecated("", ReplaceWith("requireViewBinding()"))
 	protected val binding: B
-		get() = requireViewBinding()
+		get() = checkNotNull(viewBinding)
 
 	@JvmField
 	protected val exceptionResolver = ExceptionResolver(this)
@@ -31,20 +29,19 @@ abstract class BaseFragment<B : ViewBinding> :
 	protected val actionModeDelegate: ActionModeDelegate
 		get() = (requireActivity() as BaseActivity<*>).actionModeDelegate
 
-	final override fun onCreateView(
+	override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
 		savedInstanceState: Bundle?
-	): View {
-		val binding = onCreateViewBinding(inflater, container)
+	): View? {
+		val binding = onInflateView(inflater, container)
 		viewBinding = binding
 		return binding.root
 	}
 
-	final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		insetsDelegate.onViewCreated(view)
-		onViewBindingCreated(requireViewBinding(), savedInstanceState)
 	}
 
 	override fun onDestroyView() {
@@ -53,14 +50,7 @@ abstract class BaseFragment<B : ViewBinding> :
 		super.onDestroyView()
 	}
 
-	fun requireViewBinding(): B = checkNotNull(viewBinding) {
-		"Fragment $this did not return a ViewBinding from onCreateView() or this was called before onCreateView()."
-	}
-
-	@Deprecated("", ReplaceWith("viewBinding"))
 	protected fun bindingOrNull() = viewBinding
 
-	protected abstract fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): B
-
-	protected open fun onViewBindingCreated(binding: B, savedInstanceState: Bundle?) = Unit
+	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
 }

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

@@ -0,0 +1,59 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import androidx.viewbinding.ViewBinding
+
+@Suppress("DEPRECATION")
+private const val SYSTEM_UI_FLAGS_SHOWN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+	View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+	View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+
+@Suppress("DEPRECATION")
+private const val SYSTEM_UI_FLAGS_HIDDEN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+	View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+	View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+	View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
+	View.SYSTEM_UI_FLAG_FULLSCREEN or
+	View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+
+abstract class BaseFullscreenActivity<B : ViewBinding> :
+	BaseActivity<B>(),
+	View.OnSystemUiVisibilityChangeListener {
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		with(window) {
+			statusBarColor = Color.TRANSPARENT
+			navigationBarColor = Color.TRANSPARENT
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+				attributes.layoutInDisplayCutoutMode =
+					WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+			}
+			decorView.setOnSystemUiVisibilityChangeListener(this@BaseFullscreenActivity)
+		}
+		showSystemUI()
+	}
+
+	@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
+	@Deprecated("Deprecated in Java")
+	final override fun onSystemUiVisibilityChange(visibility: Int) {
+		onSystemUiVisibilityChanged(visibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0)
+	}
+
+	// TODO WindowInsetsControllerCompat works incorrect
+	@Suppress("DEPRECATION")
+	protected fun hideSystemUI() {
+		window.decorView.systemUiVisibility = SYSTEM_UI_FLAGS_HIDDEN
+	}
+
+	@Suppress("DEPRECATION")
+	protected fun showSystemUI() {
+		window.decorView.systemUiVisibility = SYSTEM_UI_FLAGS_SHOWN
+	}
+
+	protected open fun onSystemUiVisibilityChanged(isVisible: Boolean) = Unit
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.base.ui
 
 import android.os.Bundle
 import android.view.View
@@ -9,9 +9,9 @@ import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
+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.core.ui.util.RecyclerViewOwner
-import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.settings.SettingsHeadersFragment
 import javax.inject.Inject
 
@@ -56,7 +56,6 @@ 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/BaseService.kt

@@ -0,0 +1,5 @@
+package org.koitharu.kotatsu.base.ui
+
+import androidx.lifecycle.LifecycleService
+
+abstract class BaseService : LifecycleService()

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

@@ -1,5 +1,6 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.base.ui
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CancellationException
@@ -7,34 +8,26 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.core.util.ext.EventFlow
-import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
-import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.util.ext.printStackTraceDebug
+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 = MutableStateFlow(0)
+	protected val loadingCounter = CountedBooleanLiveData()
 
 	@JvmField
-	protected val errorEvent = MutableEventFlow<Throwable>()
+	protected val errorEvent = SingleLiveEvent<Throwable>()
 
-	val onError: EventFlow<Throwable>
+	val onError: LiveData<Throwable>
 		get() = errorEvent
 
-	val isLoading: StateFlow<Boolean>
-		get() = loadingCounter.map { it > 0 }
-			.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)
+	val isLoading: LiveData<Boolean>
+		get() = loadingCounter
 
 	protected fun launchJob(
 		context: CoroutineContext = EmptyCoroutineContext,
@@ -58,11 +51,7 @@ abstract class BaseViewModel : ViewModel() {
 	private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
 		throwable.printStackTraceDebug()
 		if (throwable !is CancellationException) {
-			errorEvent.call(throwable)
+			errorEvent.postCall(throwable)
 		}
 	}
-
-	protected fun MutableStateFlow<Int>.increment() = update { it + 1 }
-
-	protected fun MutableStateFlow<Int>.decrement() = update { it - 1 }
 }

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.base.ui
 
 import android.content.Intent
 import androidx.lifecycle.lifecycleScope
@@ -9,7 +9,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 
 abstract class CoroutineIntentService : BaseService() {
 

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.base.ui
 
 import android.app.Activity
 import android.app.Application.ActivityLifecycleCallbacks

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
 import android.content.Context
 import android.graphics.Color
@@ -26,4 +26,4 @@ class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(con
 			}
 		}
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
 import android.content.Context
 import android.content.DialogInterface
@@ -77,4 +77,4 @@ class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog)
 		fun create() = CheckBoxAlertDialog(delegate.create())
 
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
 import android.content.Context
 import android.content.DialogInterface

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
 import android.content.DialogInterface
 
@@ -10,4 +10,4 @@ class RememberSelectionDialogListener(initialValue: Int) : DialogInterface.OnCli
 	override fun onClick(dialog: DialogInterface?, which: Int) {
 		selection = which
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
 import android.content.Context
 import android.content.DialogInterface
@@ -98,4 +98,4 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 
 		fun onStorageSelected(file: File)
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.dialog
+package org.koitharu.kotatsu.base.ui.dialog
 
 import android.content.Context
 import android.content.DialogInterface

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.view.View
 import android.view.View.OnClickListener

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

@@ -1,12 +1,10 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
-abstract class BoundsScrollListener(
-	@JvmField protected val offsetTop: Int,
-	@JvmField protected val offsetBottom: Int
-) : RecyclerView.OnScrollListener() {
+abstract class BoundsScrollListener(private val offsetTop: Int, private val offsetBottom: Int) :
+	RecyclerView.OnScrollListener() {
 
 	override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
 		super.onScrolled(recyclerView, dx, dy)
@@ -26,16 +24,9 @@ abstract class BoundsScrollListener(
 		if (firstVisibleItemPosition <= offsetTop) {
 			onScrolledToStart(recyclerView)
 		}
-		onPostScrolled(recyclerView, firstVisibleItemPosition, visibleItemCount)
 	}
 
 	abstract fun onScrolledToStart(recyclerView: RecyclerView)
 
 	abstract fun onScrolledToEnd(recyclerView: RecyclerView)
-
-	protected open fun onPostScrolled(
-		recyclerView: RecyclerView,
-		firstVisibleItemPosition: Int,
-		visibleItemCount: Int
-	) = Unit
 }

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.content.Context
 import android.util.AttributeSet
@@ -34,4 +34,4 @@ class FitHeightGridLayoutManager : GridLayoutManager {
 			super.layoutDecoratedWithMargins(child, left, top, right, bottom)
 		}
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.content.Context
 import android.util.AttributeSet
@@ -34,4 +34,4 @@ class FitHeightLinearLayoutManager : LinearLayoutManager {
 			super.layoutDecoratedWithMargins(child, left, top, right, bottom)
 		}
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.app.Activity
 import android.os.Bundle
@@ -12,9 +12,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
 import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryOwner
-import kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
 import kotlin.coroutines.EmptyCoroutineContext
+import kotlinx.coroutines.Dispatchers
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
 
 private const val KEY_SELECTION = "selection"
 private const val PROVIDER_NAME = "selection_decoration"

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.os.Bundle
 import android.os.Parcelable

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.view.View
 

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 interface OnTipCloseListener<T> {
 

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import androidx.recyclerview.widget.RecyclerView
 
@@ -15,4 +15,4 @@ class PaginationScrollListener(offset: Int, private val callback: Callback) :
 
 		fun onScrolledToEnd()
 	}
-}
+}

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

@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import androidx.recyclerview.widget.RecyclerView
+
+class ScrollListenerInvalidationObserver(
+	private val recyclerView: RecyclerView,
+	private val scrollListener: RecyclerView.OnScrollListener,
+) : RecyclerView.AdapterDataObserver() {
+
+	override fun onChanged() {
+		super.onChanged()
+		invalidateScroll()
+	}
+
+	override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+		super.onItemRangeInserted(positionStart, itemCount)
+		invalidateScroll()
+	}
+
+	override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
+		super.onItemRangeRemoved(positionStart, itemCount)
+		invalidateScroll()
+	}
+
+	private fun invalidateScroll() {
+		recyclerView.post {
+			scrollListener.onScrolled(recyclerView, 0, 0)
+		}
+	}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.app.Activity
 import android.os.Bundle
@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryOwner
 import kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
 import kotlin.coroutines.EmptyCoroutineContext
 
 private const val PROVIDER_NAME = "selection_decoration_sectioned"

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list.decor
+package org.koitharu.kotatsu.base.ui.list.decor
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -59,7 +59,7 @@ abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.It
 				left,
 				parent.paddingTop.toFloat(),
 				right,
-				(parent.height - parent.paddingBottom).toFloat(),
+				(parent.height - parent.paddingBottom).toFloat()
 			)
 		} else {
 			left = 0f
@@ -84,4 +84,4 @@ abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.It
 		above: RecyclerView.ViewHolder,
 		below: RecyclerView.ViewHolder,
 	): Boolean
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list.decor
+package org.koitharu.kotatsu.base.ui.list.decor
 
 import android.graphics.Canvas
 import android.graphics.Rect
@@ -67,7 +67,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 		if (parent.clipToPadding) {
 			canvas.clipRect(
 				parent.paddingLeft, parent.paddingTop, parent.width - parent.paddingRight,
-				parent.height - parent.paddingBottom,
+				parent.height - parent.paddingBottom
 			)
 		}
 
@@ -108,4 +108,4 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 		bounds: RectF,
 		state: RecyclerView.State,
 	) = Unit
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list.decor
+package org.koitharu.kotatsu.base.ui.list.decor
 
 import android.graphics.Rect
 import android.view.View

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list.decor
+package org.koitharu.kotatsu.base.ui.list.decor
 
 import android.graphics.Rect
 import android.util.SparseIntArray
@@ -13,7 +13,7 @@ class TypedSpacingItemDecoration(
 ) : RecyclerView.ItemDecoration() {
 
 	private val mapping = SparseIntArray(spacingMapping.size)
-
+	
 	init {
 		spacingMapping.forEach { (k, v) -> mapping[k] = v }
 	}
@@ -32,4 +32,4 @@ class TypedSpacingItemDecoration(
 		}
 		outRect.set(spacing, spacing, spacing, spacing)
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list.fastscroll
+package org.koitharu.kotatsu.base.ui.list.fastscroll
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -8,9 +8,9 @@ import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
-import org.koitharu.kotatsu.core.util.ext.animatorDurationScale
-import org.koitharu.kotatsu.core.util.ext.measureWidth
 import kotlin.math.hypot
+import org.koitharu.kotatsu.utils.ext.animatorDurationScale
+import org.koitharu.kotatsu.utils.ext.measureWidth
 
 class BubbleAnimator(
 	private val bubble: View,

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

@@ -1,10 +1,9 @@
-package org.koitharu.kotatsu.core.ui.list.fastscroll
+package org.koitharu.kotatsu.base.ui.list.fastscroll
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.ViewGroup
 import androidx.annotation.AttrRes
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.R
 
@@ -16,12 +15,6 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 
 	val fastScroller = FastScroller(context, attrs)
 
-	var isFastScrollerEnabled: Boolean = true
-		set(value) {
-			field = value
-			fastScroller.isVisible = value && isVisible
-		}
-
 	init {
 		fastScroller.id = R.id.fast_scroller
 		fastScroller.layoutParams = ViewGroup.LayoutParams(
@@ -37,7 +30,7 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 
 	override fun setVisibility(visibility: Int) {
 		super.setVisibility(visibility)
-		fastScroller.visibility = if (isFastScrollerEnabled) visibility else GONE
+		fastScroller.visibility = visibility
 	}
 
 	override fun onAttachedToWindow() {
@@ -49,4 +42,4 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 		fastScroller.detachRecyclerView()
 		super.onDetachedFromWindow()
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list.fastscroll
+package org.koitharu.kotatsu.base.ui.list.fastscroll
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -22,9 +22,9 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
-import org.koitharu.kotatsu.core.util.ext.isLayoutReversed
 import org.koitharu.kotatsu.databinding.FastScrollerBinding
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.isLayoutReversed
 import kotlin.math.roundToInt
 import com.google.android.material.R as materialR
 
@@ -56,7 +56,6 @@ class FastScroller @JvmOverloads constructor(
 	private var bubbleHeight = 0
 	private var handleHeight = 0
 	private var viewHeight = 0
-	private var offset = 0
 	private var hideScrollbar = true
 	private var showBubble = true
 	private var showBubbleAlways = false
@@ -99,7 +98,6 @@ class FastScroller @JvmOverloads constructor(
 						showScrollbar()
 						if (showBubbleAlways && sectionIndexer != null) showBubble()
 					}
-
 					RecyclerView.SCROLL_STATE_IDLE -> if (hideScrollbar && !binding.thumb.isSelected) {
 						handler.postDelayed(scrollbarHider, SCROLLBAR_HIDE_DELAY)
 					}
@@ -138,7 +136,6 @@ class FastScroller @JvmOverloads constructor(
 			bubbleSize = getBubbleSize(R.styleable.FastScroller_bubbleSize, BubbleSize.NORMAL)
 			val textSize = getDimension(R.styleable.FastScroller_bubbleTextSize, bubbleSize.textSize)
 			binding.bubble.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
-			offset = getDimensionPixelOffset(R.styleable.FastScroller_scrollerOffset, offset)
 		}
 
 		setTrackColor(trackColor)
@@ -179,12 +176,10 @@ class FastScroller @JvmOverloads constructor(
 				setYPositions()
 				return true
 			}
-
 			MotionEvent.ACTION_MOVE -> {
 				setYPositions()
 				return true
 			}
-
 			MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
 				requestDisallowInterceptTouchEvent(false)
 				setHandleSelected(false)
@@ -250,31 +245,27 @@ class FastScroller @JvmOverloads constructor(
 
 				layoutParams = (layoutParams as ConstraintLayout.LayoutParams).apply {
 					height = 0
-					setMargins(offset, marginTop, offset, marginBottom)
+					setMargins(0, marginTop, 0, marginBottom)
 				}
 			}
-
 			is CoordinatorLayout -> layoutParams = (layoutParams as CoordinatorLayout.LayoutParams).apply {
 				height = LayoutParams.MATCH_PARENT
 				anchorGravity = GravityCompat.END
 				anchorId = recyclerViewId
-				setMargins(offset, marginTop, offset, marginBottom)
+				setMargins(0, marginTop, 0, marginBottom)
 			}
-
 			is FrameLayout -> layoutParams = (layoutParams as FrameLayout.LayoutParams).apply {
 				height = LayoutParams.MATCH_PARENT
 				gravity = GravityCompat.END
-				setMargins(offset, marginTop, offset, marginBottom)
+				setMargins(0, marginTop, 0, marginBottom)
 			}
-
 			is RelativeLayout -> layoutParams = (layoutParams as RelativeLayout.LayoutParams).apply {
 				height = 0
 				addRule(RelativeLayout.ALIGN_TOP, recyclerViewId)
 				addRule(RelativeLayout.ALIGN_BOTTOM, recyclerViewId)
 				addRule(RelativeLayout.ALIGN_END, recyclerViewId)
-				setMargins(offset, marginTop, offset, marginBottom)
+				setMargins(0, marginTop, 0, marginBottom)
 			}
-
 			else -> throw IllegalArgumentException("Parent ViewGroup must be a ConstraintLayout, CoordinatorLayout, FrameLayout, or RelativeLayout")
 		}
 

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list.fastscroll
+package org.koitharu.kotatsu.base.ui.list.fastscroll
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -7,7 +7,7 @@ import android.view.ViewPropertyAnimator
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.animatorDurationScale
+import org.koitharu.kotatsu.utils.ext.animatorDurationScale
 
 class ScrollbarAnimator(
 	private val scrollbar: View,

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.view.ActionMode

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import androidx.appcompat.view.ActionMode
 
@@ -7,4 +7,4 @@ interface ActionModeListener {
 	fun onActionModeStarted(mode: ActionMode)
 
 	fun onActionModeFinished(mode: ActionMode)
-}
+}

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

@@ -1,9 +1,9 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import android.app.Activity
 import android.os.Bundle
 import androidx.core.app.ActivityCompat
-import org.koitharu.kotatsu.core.ui.DefaultActivityLifecycleCallbacks
+import org.koitharu.kotatsu.base.ui.DefaultActivityLifecycleCallbacks
 import java.util.WeakHashMap
 import javax.inject.Inject
 import javax.inject.Singleton

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import android.view.MenuItem
 import android.view.MenuItem.OnActionExpandListener

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

@@ -0,0 +1,31 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import androidx.annotation.AnyThread
+import androidx.lifecycle.LiveData
+import java.util.concurrent.atomic.AtomicInteger
+
+class CountedBooleanLiveData : LiveData<Boolean>(false) {
+
+	private val counter = AtomicInteger(0)
+
+	@AnyThread
+	fun increment() {
+		if (counter.getAndIncrement() == 0) {
+			postValue(true)
+		}
+	}
+
+	@AnyThread
+	fun decrement() {
+		if (counter.decrementAndGet() == 0) {
+			postValue(false)
+		}
+	}
+
+	@AnyThread
+	fun reset() {
+		if (counter.getAndSet(0) != 0) {
+			postValue(false)
+		}
+	}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import android.text.Editable
 import android.text.TextWatcher

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

@@ -1,8 +1,8 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import androidx.recyclerview.widget.RecyclerView
 
 interface RecyclerViewOwner {
 
 	val recyclerView: RecyclerView
-}
+}

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

@@ -1,8 +1,9 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import androidx.annotation.StringRes
+import org.koitharu.kotatsu.base.domain.ReversibleHandle
 
 class ReversibleAction(
 	@StringRes val stringResId: Int,
 	val handle: ReversibleHandle?,
-)
+)

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

@@ -1,15 +1,19 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import android.view.View
+import androidx.lifecycle.Observer
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.flow.FlowCollector
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.domain.reverseAsync
 
 class ReversibleActionObserver(
 	private val snackbarHost: View,
-) : FlowCollector<ReversibleAction> {
+) : Observer<ReversibleAction?> {
 
-	override suspend fun emit(value: 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)

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import android.content.Context
 import android.util.AttributeSet

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import android.view.View
 import androidx.annotation.Px

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

@@ -1,11 +1,11 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import android.animation.ValueAnimator
 import android.view.animation.AccelerateDecelerateInterpolator
+import com.google.android.material.R as materialR
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.shape.MaterialShapeDrawable
-import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
-import com.google.android.material.R as materialR
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
 
 class StatusBarDimHelper : AppBarLayout.OnOffsetChangedListener {
 

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.ui.util
 
 import android.view.View
 import androidx.core.graphics.Insets

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.animation.LayoutTransition
 import android.content.Context
@@ -21,16 +21,15 @@ import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
-import org.koitharu.kotatsu.core.util.ext.getThemeDrawable
-import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.databinding.LayoutSheetHeaderBinding
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
+import org.koitharu.kotatsu.utils.ext.getThemeDrawable
+import org.koitharu.kotatsu.utils.ext.parents
 import java.util.*
 import com.google.android.material.R as materialR
 
 private const val THROTTLE_DELAY = 200L
 
-@Deprecated("")
 class BottomSheetHeaderBar @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
@@ -71,9 +70,6 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 			binding.toolbar.subtitle = value
 		}
 
-	val isExpanded: Boolean
-		get() = binding.dragHandle.isGone
-
 	init {
 		setBackgroundResource(R.drawable.sheet_toolbar_background)
 		layoutTransition = LayoutTransition().apply {

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
 import android.os.Parcel
@@ -101,4 +101,4 @@ class CheckableImageView @JvmOverloads constructor(
 			}
 		}
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -6,7 +6,6 @@ import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.View.OnClickListener
 import androidx.annotation.ColorRes
-import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.getColorStateListOrThrow
 import androidx.core.view.children
@@ -14,7 +13,7 @@ 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.core.util.ext.castOrNull
+import org.koitharu.kotatsu.utils.ext.castOrNull
 import com.google.android.material.R as materialR
 
 class ChipsView @JvmOverloads constructor(
@@ -102,13 +101,6 @@ class ChipsView @JvmOverloads constructor(
 		chip.setTextColor(tint ?: defaultChipTextColor)
 		chip.isClickable = onChipClickListener != null || model.isCheckable
 		chip.isCheckable = model.isCheckable
-		if (model.icon == 0) {
-			chip.chipIcon = null
-			chip.isChipIconVisible = false
-		} else {
-			chip.setChipIconResource(model.icon)
-			chip.isChipIconVisible = true
-		}
 		chip.isChecked = model.isChecked
 		chip.tag = model.data
 	}
@@ -142,7 +134,6 @@ class ChipsView @JvmOverloads constructor(
 	class ChipModel(
 		@ColorRes val tint: Int,
 		val title: CharSequence,
-		@DrawableRes val icon: Int,
 		val isCheckable: Boolean,
 		val isChecked: Boolean,
 		val data: Any? = null,
@@ -156,16 +147,16 @@ class ChipsView @JvmOverloads constructor(
 
 			if (tint != other.tint) return false
 			if (title != other.title) return false
-			if (icon != other.icon) return false
 			if (isCheckable != other.isCheckable) return false
 			if (isChecked != other.isChecked) return false
-			return data == other.data
+			if (data != other.data) return false
+
+			return true
 		}
 
 		override fun hashCode(): Int {
 			var result = tint.hashCode()
 			result = 31 * result + title.hashCode()
-			result = 31 * result + icon.hashCode()
 			result = 31 * result + isCheckable.hashCode()
 			result = 31 * result + isChecked.hashCode()
 			result = 31 * result + (data?.hashCode() ?: 0)

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet
@@ -40,4 +40,4 @@ class CoverImageView @JvmOverloads constructor(
 		}
 		setMeasuredDimension(desiredWidth, desiredHeight)
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.animation.ValueAnimator
 import android.content.Context
@@ -10,8 +10,8 @@ import androidx.core.view.ViewCompat
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
-import org.koitharu.kotatsu.core.util.ext.measureHeight
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
+import org.koitharu.kotatsu.utils.ext.measureHeight
 
 class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor(
 	context: Context? = null,

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -19,7 +19,7 @@ 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.core.util.ext.resolveDp
+import org.koitharu.kotatsu.utils.ext.resolveDp
 
 @SuppressLint("RestrictedApi")
 class ListItemTextView @JvmOverloads constructor(

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.animation.Animator
 import android.animation.ValueAnimator
@@ -12,11 +12,11 @@ import android.view.ViewOutlineProvider
 import android.view.animation.DecelerateInterpolator
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
-import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
-import org.koitharu.kotatsu.core.util.ext.resolveDp
 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 com.google.android.material.R as materialR
 
 class SegmentedBarView @JvmOverloads constructor(
@@ -135,7 +135,9 @@ class SegmentedBarView @JvmOverloads constructor(
 			other as Segment
 
 			if (percent != other.percent) return false
-			return color == other.color
+			if (color != other.color) return false
+
+			return true
 		}
 
 		override fun hashCode(): Int {

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
 import android.text.Selection
@@ -26,4 +26,4 @@ class SelectableTextView @JvmOverloads constructor(
 			Selection.setSelection(spannableText, text.length)
 		}
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.annotation.SuppressLint
 import android.content.Context

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -14,10 +14,10 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.customview.view.AbsSavedState
 import androidx.interpolator.view.animation.FastOutLinearInInterpolator
 import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import org.koitharu.kotatsu.core.util.ext.applySystemAnimatorScale
-import org.koitharu.kotatsu.core.util.ext.measureHeight
 import com.google.android.material.R as materialR
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import org.koitharu.kotatsu.utils.ext.applySystemAnimatorScale
+import org.koitharu.kotatsu.utils.ext.measureHeight
 
 private const val STATE_DOWN = 1
 private const val STATE_UP = 2

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -23,8 +23,8 @@ 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.core.util.ext.resolveDp
 import org.koitharu.kotatsu.databinding.ViewTwoLinesItemBinding
+import org.koitharu.kotatsu.utils.ext.resolveDp
 
 @SuppressLint("RestrictedApi")
 class TwoLinesItemView @JvmOverloads constructor(

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.widgets
+package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet

app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt

@@ -1,10 +1,6 @@
 package org.koitharu.kotatsu.bookmarks.data
 
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import androidx.room.Transaction
+import androidx.room.*
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaWithTags
 
@@ -22,7 +18,7 @@ abstract class BookmarksDao {
 
 	@Transaction
 	@Query(
-		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY bookmarks.created_at",
+		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY bookmarks.created_at"
 	)
 	abstract fun observe(): Flow<Map<MangaWithTags, List<BookmarkEntity>>>
 
@@ -33,8 +29,5 @@ abstract class BookmarksDao {
 	abstract suspend fun delete(entity: BookmarkEntity)
 
 	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
-	abstract suspend fun delete(mangaId: Long, pageId: Long): Int
-
-	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
-	abstract suspend fun delete(mangaId: Long, chapterId: Long, page: Int): Int
-}
+	abstract suspend fun delete(mangaId: Long, pageId: Long)
+}

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

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.bookmarks.domain
 
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.Date
+import java.util.*
 
 class Bookmark(
 	val manga: Manga,
@@ -27,7 +27,9 @@ class Bookmark(
 		if (scroll != other.scroll) return false
 		if (imageUrl != other.imageUrl) return false
 		if (createdAt != other.createdAt) return false
-		return percent == other.percent
+		if (percent != other.percent) return false
+
+		return true
 	}
 
 	override fun hashCode(): Int {
@@ -41,4 +43,4 @@ class Bookmark(
 		result = 31 * result + percent.hashCode()
 		return result
 	}
-}
+}

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

@@ -5,6 +5,7 @@ import androidx.room.withTransaction
 import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.base.domain.ReversibleHandle
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.toBookmark
 import org.koitharu.kotatsu.bookmarks.data.toBookmarks
@@ -13,10 +14,9 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 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.ui.util.ReversibleHandle
-import org.koitharu.kotatsu.core.util.ext.mapItems
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.mapItems
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import javax.inject.Inject
 
 @Reusable
@@ -52,14 +52,8 @@ class BookmarksRepository @Inject constructor(
 		}
 	}
 
-	suspend fun removeBookmark(mangaId: Long, chapterId: Long, page: Int) {
-		check(db.bookmarksDao.delete(mangaId, chapterId, page) != 0) {
-			"Bookmark not found"
-		}
-	}
-
-	suspend fun removeBookmark(bookmark: Bookmark) {
-		removeBookmark(bookmark.manga.id, bookmark.chapterId, bookmark.page)
+	suspend fun removeBookmark(mangaId: Long, pageId: Long) {
+		db.bookmarksDao.delete(mangaId, pageId)
 	}
 
 	suspend fun removeBookmarks(ids: Map<Manga, Set<Long>>): ReversibleHandle {

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

@@ -3,14 +3,16 @@ package org.koitharu.kotatsu.bookmarks.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.commit
 import com.google.android.material.appbar.AppBarLayout
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivityContainerBinding
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
@@ -22,10 +24,10 @@ class BookmarksActivity :
 	SnackbarOwner {
 
 	override val appBar: AppBarLayout
-		get() = viewBinding.appbar
+		get() = binding.appbar
 
 	override val snackbarHost: CoordinatorLayout
-		get() = viewBinding.root
+		get() = binding.root
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -41,7 +43,7 @@ class BookmarksActivity :
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.root.updatePadding(
+		binding.root.updatePadding(
 			left = insets.left,
 			right = insets.right,
 		)

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

@@ -16,23 +16,19 @@ 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.list.SectionedSelectionController
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.base.ui.list.fastscroll.FastScroller
+import org.koitharu.kotatsu.base.ui.util.ReversibleAction
 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.core.ui.BaseFragment
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
-import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.core.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.ui.util.reverseAsync
-import org.koitharu.kotatsu.core.util.ext.invalidateNestedItemDecorations
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
@@ -41,6 +37,8 @@ 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.invalidateNestedItemDecorations
+import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -58,12 +56,12 @@ class BookmarksFragment :
 	private var adapter: BookmarksGroupAdapter? = null
 	private var selectionController: SectionedSelectionController<Manga>? = null
 
-	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
+	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
 		return FragmentListSimpleBinding.inflate(inflater, container, false)
 	}
 
-	override fun onViewBindingCreated(binding: FragmentListSimpleBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
 		selectionController = SectionedSelectionController(
 			activity = requireActivity(),
 			owner = this,
@@ -79,12 +77,12 @@ class BookmarksFragment :
 		)
 		binding.recyclerView.adapter = adapter
 		binding.recyclerView.setHasFixedSize(true)
-		val spacingDecoration = SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing))
+		val spacingDecoration = SpacingItemDecoration(view.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
 		binding.recyclerView.addItemDecoration(spacingDecoration)
 
 		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
-		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
-		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ::onActionDone)
+		viewModel.onError.observe(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
+		viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone)
 	}
 
 	override fun onDestroyView() {
@@ -116,7 +114,7 @@ class BookmarksFragment :
 	override fun onFastScrollStop(fastScroller: FastScroller) = Unit
 
 	override fun onSelectionChanged(controller: SectionedSelectionController<Manga>, count: Int) {
-		requireViewBinding().recyclerView.invalidateNestedItemDecorations()
+		binding.recyclerView.invalidateNestedItemDecorations()
 	}
 
 	override fun onCreateActionMode(
@@ -151,10 +149,10 @@ class BookmarksFragment :
 	): AbstractSelectionItemDecoration = BookmarksSelectionDecoration(requireContext())
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		requireViewBinding().recyclerView.updatePadding(
+		binding.recyclerView.updatePadding(
 			bottom = insets.bottom,
 		)
-		requireViewBinding().recyclerView.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+		binding.recyclerView.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
 			bottomMargin = insets.bottom
 		}
 	}

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

@@ -4,8 +4,8 @@ import android.content.Context
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.util.ext.getItem
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
+import org.koitharu.kotatsu.utils.ext.getItem
 
 class BookmarksSelectionDecoration(context: Context) : MangaSelectionDecoration(context) {
 
@@ -14,4 +14,5 @@ class BookmarksSelectionDecoration(context: Context) : MangaSelectionDecoration(
 		val item = holder.getItem(Bookmark::class.java) ?: return RecyclerView.NO_ID
 		return item.pageId
 	}
-}
+
+}

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

@@ -1,26 +1,23 @@
 package org.koitharu.kotatsu.bookmarks.ui
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.base.ui.util.ReversibleAction
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
 import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
-import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
 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
 
 @HiltViewModel
@@ -28,9 +25,9 @@ class BookmarksViewModel @Inject constructor(
 	private val repository: BookmarksRepository,
 ) : BaseViewModel() {
 
-	val onActionDone = MutableEventFlow<ReversibleAction>()
+	val onActionDone = SingleLiveEvent<ReversibleAction>()
 
-	val content: StateFlow<List<ListModel>> = repository.observeBookmarks()
+	val content: LiveData<List<ListModel>> = repository.observeBookmarks()
 		.map { list ->
 			if (list.isEmpty()) {
 				listOf(
@@ -46,12 +43,12 @@ class BookmarksViewModel @Inject constructor(
 			}
 		}
 		.catch { e -> emit(listOf(e.toErrorState(canRetry = false))) }
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
+		.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
 
 	fun removeBookmarks(ids: Map<Manga, Set<Long>>) {
 		launchJob(Dispatchers.Default) {
 			val handle = repository.removeBookmarks(ids)
-			onActionDone.call(ReversibleAction(R.string.bookmarks_removed, handle))
+			onActionDone.emitCall(ReversibleAction(R.string.bookmarks_removed, handle))
 		}
 	}
 }

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

@@ -4,16 +4,16 @@ import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.AdapterDelegateClickListenerAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
-import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.decodeRegion
-import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
-import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.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,

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

@@ -4,8 +4,8 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 
 class BookmarksAdapter(
 	coil: ImageLoader,
@@ -13,15 +13,13 @@ class BookmarksAdapter(
 	clickListener: OnListItemClickListener<Bookmark>,
 ) : AsyncListDifferDelegationAdapter<Bookmark>(
 	DiffCallback(),
-	bookmarkListAD(coil, lifecycleOwner, clickListener),
+	bookmarkListAD(coil, lifecycleOwner, clickListener)
 ) {
 
 	private class DiffCallback : DiffUtil.ItemCallback<Bookmark>() {
 
 		override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
-			return oldItem.manga.id == newItem.manga.id &&
-				oldItem.chapterId == newItem.chapterId &&
-				oldItem.page == newItem.page
+			return oldItem.manga.id == newItem.manga.id && oldItem.pageId == newItem.pageId
 		}
 
 		override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
@@ -29,4 +27,4 @@ class BookmarksAdapter(
 		}
 
 	}
-}
+}

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

@@ -6,20 +6,20 @@ import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.util.ext.clearItemDecorations
-import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
-import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ItemBookmarksGroupBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
+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,

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

@@ -5,17 +5,16 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+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.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
 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.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
 import org.koitharu.kotatsu.parsers.model.Manga
 import kotlin.jvm.internal.Intrinsics
 
@@ -55,10 +54,6 @@ class BookmarksGroupAdapter(
 					oldItem.manga.id == newItem.manga.id
 				}
 
-				oldItem is LoadingFooter && newItem is LoadingFooter -> {
-					oldItem.key == newItem.key
-				}
-
 				else -> oldItem.javaClass == newItem.javaClass
 			}
 		}

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

@@ -12,10 +12,10 @@ import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
-import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
+import org.koitharu.kotatsu.utils.ext.catchingWebViewUnavailability
 import com.google.android.material.R as materialR
 
 @SuppressLint("SetJavaScriptEnabled")
@@ -32,13 +32,13 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		with(viewBinding.webView.settings) {
+		with(binding.webView.settings) {
 			javaScriptEnabled = true
 			userAgentString = CommonHeadersInterceptor.userAgentChrome
 		}
-		viewBinding.webView.webViewClient = BrowserClient(this)
-		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
-		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
+		binding.webView.webViewClient = BrowserClient(this)
+		binding.webView.webChromeClient = ProgressChromeClient(binding.progressBar)
+		onBackPressedCallback = WebViewBackPressedCallback(binding.webView)
 		onBackPressedDispatcher.addCallback(onBackPressedCallback)
 		if (savedInstanceState != null) {
 			return
@@ -51,18 +51,18 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 				intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
 				url,
 			)
-			viewBinding.webView.loadUrl(url)
+			binding.webView.loadUrl(url)
 		}
 	}
 
 	override fun onSaveInstanceState(outState: Bundle) {
 		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
+		binding.webView.saveState(outState)
 	}
 
 	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
 		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
+		binding.webView.restoreState(savedInstanceState)
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -73,14 +73,14 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
 		android.R.id.home -> {
-			viewBinding.webView.stopLoading()
+			binding.webView.stopLoading()
 			finishAfterTransition()
 			true
 		}
 
 		R.id.action_browser -> {
 			val intent = Intent(Intent.ACTION_VIEW)
-			intent.data = Uri.parse(viewBinding.webView.url)
+			intent.data = Uri.parse(binding.webView.url)
 			try {
 				startActivity(Intent.createChooser(intent, item.title))
 			} catch (_: ActivityNotFoundException) {
@@ -92,22 +92,22 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	}
 
 	override fun onPause() {
-		viewBinding.webView.onPause()
+		binding.webView.onPause()
 		super.onPause()
 	}
 
 	override fun onResume() {
 		super.onResume()
-		viewBinding.webView.onResume()
+		binding.webView.onResume()
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		viewBinding.webView.destroy()
+		binding.webView.destroy()
 	}
 
 	override fun onLoadingStateChanged(isLoading: Boolean) {
-		viewBinding.progressBar.isVisible = isLoading
+		binding.progressBar.isVisible = isLoading
 	}
 
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
@@ -120,10 +120,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.appbar.updatePadding(
+		binding.appbar.updatePadding(
 			top = insets.top,
 		)
-		viewBinding.root.updatePadding(
+		binding.root.updatePadding(
 			left = insets.left,
 			right = insets.right,
 			bottom = insets.bottom,

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

@@ -1,8 +1,10 @@
 package org.koitharu.kotatsu.browser.cloudflare
 
+import android.annotation.SuppressLint
 import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.webkit.CookieManager
 import android.webkit.WebSettings
@@ -12,13 +14,13 @@ import androidx.fragment.app.setFragmentResult
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import okhttp3.Headers
+import org.koitharu.kotatsu.base.ui.AlertDialogFragment
 import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
 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.core.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
+import org.koitharu.kotatsu.utils.ext.withArgs
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -37,13 +39,14 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 		url = requireArguments().getString(ARG_URL).orEmpty()
 	}
 
-	override fun onCreateViewBinding(
+	override fun onInflateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
 	) = FragmentCloudflareBinding.inflate(inflater, container, false)
 
-	override fun onViewBindingCreated(binding: FragmentCloudflareBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
+	@SuppressLint("SetJavaScriptEnabled")
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
 		with(binding.webView.settings) {
 			javaScriptEnabled = true
 			cacheMode = WebSettings.LOAD_DEFAULT
@@ -61,8 +64,8 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 	}
 
 	override fun onDestroyView() {
-		requireViewBinding().webView.stopLoading()
-		requireViewBinding().webView.destroy()
+		binding.webView.stopLoading()
+		binding.webView.destroy()
 		onBackPressedCallback = null
 		super.onDestroyView()
 	}
@@ -73,18 +76,18 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	override fun onDialogCreated(dialog: AlertDialog) {
 		super.onDialogCreated(dialog)
-		onBackPressedCallback = WebViewBackPressedCallback(requireViewBinding().webView).also {
+		onBackPressedCallback = WebViewBackPressedCallback(binding.webView).also {
 			dialog.onBackPressedDispatcher.addCallback(it)
 		}
 	}
 
 	override fun onResume() {
 		super.onResume()
-		requireViewBinding().webView.onResume()
+		binding.webView.onResume()
 	}
 
 	override fun onPause() {
-		requireViewBinding().webView.onPause()
+		binding.webView.onPause()
 		super.onPause()
 	}
 
@@ -94,7 +97,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 	}
 
 	override fun onPageLoaded() {
-		viewBinding?.progressBar?.isInvisible = true
+		bindingOrNull()?.progressBar?.isInvisible = true
 	}
 
 	override fun onCheckPassed() {

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

@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.Context
 import android.provider.SearchRecentSuggestions
 import android.text.Html
+import android.util.AndroidRuntimeException
 import androidx.collection.arraySetOf
 import androidx.room.InvalidationTracker
 import coil.ComponentRegistry
@@ -22,54 +23,106 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import okhttp3.Cache
+import okhttp3.CookieJar
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.base.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.core.cache.MemoryContentCache
 import org.koitharu.kotatsu.core.cache.StubContentCache
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.network.*
+import org.koitharu.kotatsu.core.network.cookies.AndroidCookieJar
+import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
+import org.koitharu.kotatsu.core.network.cookies.PreferencesCookieJar
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.os.ShortcutsUpdater
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
-import org.koitharu.kotatsu.core.ui.image.CoilImageGetter
-import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
-import org.koitharu.kotatsu.core.util.IncognitoModeIndicator
-import org.koitharu.kotatsu.core.util.ext.activityManager
-import org.koitharu.kotatsu.core.util.ext.connectivityManager
-import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
-import org.koitharu.kotatsu.list.domain.ListExtraProvider
-import org.koitharu.kotatsu.list.domain.ListExtraProviderImpl
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
+import org.koitharu.kotatsu.local.data.LocalManga
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
-import org.koitharu.kotatsu.local.domain.model.LocalManga
+import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.ui.thumbnails.MangaPageFetcher
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.settings.backup.BackupObserver
 import org.koitharu.kotatsu.sync.domain.SyncController
+import org.koitharu.kotatsu.utils.IncognitoModeIndicator
+import org.koitharu.kotatsu.utils.ext.activityManager
+import org.koitharu.kotatsu.utils.ext.connectivityManager
+import org.koitharu.kotatsu.utils.ext.isLowRamDevice
+import org.koitharu.kotatsu.utils.image.CoilImageGetter
 import org.koitharu.kotatsu.widget.WidgetUpdater
+import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface AppModule {
 
+	@Binds
+	fun bindCookieJar(androidCookieJar: MutableCookieJar): CookieJar
+
 	@Binds
 	fun bindMangaLoaderContext(mangaLoaderContextImpl: MangaLoaderContextImpl): MangaLoaderContext
 
 	@Binds
 	fun bindImageGetter(coilImageGetter: CoilImageGetter): Html.ImageGetter
 
-	@Binds
-	fun bindListExtraProvider(impl: ListExtraProviderImpl): ListExtraProvider
-
 	companion object {
 
+		@Provides
+		@Singleton
+		fun provideCookieJar(
+			@ApplicationContext context: Context
+		): MutableCookieJar = try {
+			AndroidCookieJar()
+		} catch (e: AndroidRuntimeException) {
+			// WebView is not available
+			PreferencesCookieJar(context)
+		}
+
+		@Provides
+		@Singleton
+		fun provideHttpCache(
+			localStorageManager: LocalStorageManager,
+		): Cache = localStorageManager.createHttpCache()
+
+		@Provides
+		@Singleton
+		fun provideOkHttpClient(
+			cache: Cache,
+			commonHeadersInterceptor: CommonHeadersInterceptor,
+			mirrorSwitchInterceptor: MirrorSwitchInterceptor,
+			cookieJar: CookieJar,
+			settings: AppSettings,
+		): OkHttpClient {
+			return OkHttpClient.Builder().apply {
+				connectTimeout(20, TimeUnit.SECONDS)
+				readTimeout(60, TimeUnit.SECONDS)
+				writeTimeout(20, TimeUnit.SECONDS)
+				cookieJar(cookieJar)
+				dns(DoHManager(cache, settings))
+				if (settings.isSSLBypassEnabled) {
+					bypassSSLErrors()
+				}
+				cache(cache)
+				addNetworkInterceptor(CacheLimitInterceptor())
+				addInterceptor(GZipInterceptor())
+				addInterceptor(commonHeadersInterceptor)
+				addInterceptor(CloudFlareInterceptor())
+				addInterceptor(mirrorSwitchInterceptor)
+				if (BuildConfig.DEBUG) {
+					addInterceptor(CurlLoggingInterceptor())
+				}
+			}.build()
+		}
+
 		@Provides
 		@Singleton
 		fun provideNetworkState(
@@ -88,11 +141,14 @@ interface AppModule {
 		@Singleton
 		fun provideCoil(
 			@ApplicationContext context: Context,
-			@MangaHttpClient okHttpClient: OkHttpClient,
+			okHttpClient: OkHttpClient,
 			mangaRepositoryFactory: MangaRepository.Factory,
-			imageProxyInterceptor: ImageProxyInterceptor,
-			pageFetcherFactory: MangaPageFetcher.Factory,
 		): ImageLoader {
+			val httpClientFactory = {
+				okHttpClient.newBuilder()
+					.cache(null)
+					.build()
+			}
 			val diskCacheFactory = {
 				val rootDir = context.externalCacheDir ?: context.cacheDir
 				DiskCache.Builder()
@@ -100,21 +156,19 @@ interface AppModule {
 					.build()
 			}
 			return ImageLoader.Builder(context)
-				.okHttpClient(okHttpClient.newBuilder().cache(null).build())
+				.okHttpClient(httpClientFactory)
 				.interceptorDispatcher(Dispatchers.Default)
 				.fetcherDispatcher(Dispatchers.IO)
 				.decoderDispatcher(Dispatchers.Default)
 				.transformationDispatcher(Dispatchers.Default)
 				.diskCache(diskCacheFactory)
 				.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
-				.allowRgb565(context.isLowRamDevice())
+				.allowRgb565(isLowRamDevice(context))
 				.components(
 					ComponentRegistry.Builder()
 						.add(SvgDecoder.Factory())
 						.add(CbzFetcher.Factory())
 						.add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
-						.add(pageFetcherFactory)
-						.add(imageProxyInterceptor)
 						.build(),
 				).build()
 		}