Merge branch 'master' of github.com:KotatsuApp/Kotatsu

Currently translated at 100.0% (398 of 398 strings)

Co-authored-by: Eric <hamburger1024@mailbox.org>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/zh_Hans/
Translation: Kotatsu/Strings

.github/FUNDING.yml

@@ -1 +1,2 @@
 custom: ["https://yoomoney.ru/to/410012543938752"]
+ko_fi: koitharu

.gitignore

@@ -7,6 +7,7 @@
 /.idea/modules.xml
 /.idea/misc.xml
 /.idea/discord.xml
+/.idea/compiler.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

.idea/kotlinc.xml

@@ -3,4 +3,7 @@
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="1.8" />
   </component>
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.7.20" />
+  </component>
 </project>

app/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 497
-		versionName '4.0-beta1'
+		versionCode 500
+		versionName '4.0'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -60,6 +60,7 @@ android {
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
 			'-opt-in=coil.annotation.ExperimentalCoilApi',
+			'-opt-in=com.google.android.material.badge.ExperimentalBadgeUtils',
 		]
 	}
 	lint {
@@ -82,15 +83,15 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation('com.github.KotatsuApp:kotatsu-parsers:b3a9c5fcda') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:a1441e7ed7') {
 		exclude group: 'org.json', module: 'json'
 	}
 
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
 	implementation 'androidx.core:core-ktx:1.9.0'
-	implementation 'androidx.activity:activity-ktx:1.5.1'
-	implementation 'androidx.fragment:fragment-ktx:1.5.2'
+	implementation 'androidx.activity:activity-ktx:1.6.0'
+	implementation 'androidx.fragment:fragment-ktx:1.5.3'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
 	implementation 'androidx.lifecycle:lifecycle-service:2.5.1'
@@ -101,8 +102,8 @@ dependencies {
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
-	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
-	implementation 'com.google.android.material:material:1.7.0-rc01'
+	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
+	implementation 'com.google.android.material:material:1.7.0'
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
 
@@ -117,14 +118,14 @@ dependencies {
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation "com.google.dagger:hilt-android:2.43.2"
-	kapt "com.google.dagger:hilt-compiler:2.43.2"
+	implementation "com.google.dagger:hilt-android:2.44"
+	kapt "com.google.dagger:hilt-compiler:2.44"
 	implementation 'androidx.hilt:hilt-work:1.0.0'
 	kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
-	implementation 'io.coil-kt:coil-base:2.2.1'
-	implementation 'io.coil-kt:coil-svg:2.2.1'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:a9ab74c8b4'
+	implementation 'io.coil-kt:coil-base:2.2.2'
+	implementation 'io.coil-kt:coil-svg:2.2.2'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:0ff0278f0f'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
 	implementation 'ch.acra:acra-http:5.9.6'
@@ -133,7 +134,7 @@ dependencies {
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20220320'
+	testImplementation 'org.json:json:20220924'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
 	androidTestImplementation 'androidx.test:runner:1.4.0'
@@ -146,6 +147,6 @@ dependencies {
 	androidTestImplementation 'androidx.room:room-testing:2.4.3'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.43.2'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.43.2'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.44'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.44'
 }

app/src/main/AndroidManifest.xml

@@ -68,6 +68,9 @@
 		<activity
 			android:name="org.koitharu.kotatsu.history.ui.HistoryActivity"
 			android:label="@string/history" />
+		<activity
+			android:name="org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity"
+			android:label="@string/updates" />
 		<activity
 			android:name="org.koitharu.kotatsu.favourites.ui.FavouritesActivity"
 			android:label="@string/favourites" />

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

@@ -10,7 +10,6 @@ import androidx.hilt.work.HiltWorkerFactory
 import androidx.room.InvalidationTracker
 import androidx.work.Configuration
 import dagger.hilt.android.HiltAndroidApp
-import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.acra.ReportField
@@ -25,6 +24,7 @@ import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+import javax.inject.Inject
 
 @HiltAndroidApp
 class KotatsuApp : Application(), Configuration.Provider {
@@ -72,6 +72,7 @@ class KotatsuApp : Application(), Configuration.Provider {
 			}
 			reportContent = listOf(
 				ReportField.PACKAGE_NAME,
+				ReportField.INSTALLATION_ID,
 				ReportField.APP_VERSION_CODE,
 				ReportField.APP_VERSION_NAME,
 				ReportField.ANDROID_VERSION,

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

@@ -1,9 +1,12 @@
 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.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 fun interface ReversibleHandle {
 
@@ -11,8 +14,10 @@ fun interface ReversibleHandle {
 }
 
 fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default) {
-	runCatching {
-		reverse()
+	runCatchingCancellable {
+		withContext(NonCancellable) {
+			reverse()
+		}
 	}.onFailure {
 		it.printStackTraceDebug()
 	}
@@ -21,4 +26,4 @@ fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.D
 operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {
 	this.reverse()
 	other.reverse()
-}
+}

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

@@ -20,7 +20,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
 import dagger.hilt.android.EntryPointAccessors
-import javax.inject.Inject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
@@ -30,6 +29,7 @@ import org.koitharu.kotatsu.base.ui.util.inject
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.utils.ext.getThemeColor
+import javax.inject.Inject
 
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
@@ -134,6 +134,7 @@ abstract class BaseActivity<B : ViewBinding> :
 		window.statusBarColor = getThemeColor(android.R.attr.statusBarColor)
 	}
 
+	@Suppress("OVERRIDE_DEPRECATION", "DEPRECATION")
 	override fun onBackPressed() {
 		if ( // https://issuetracker.google.com/issues/139738913
 			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&

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

@@ -4,11 +4,13 @@ import android.app.Service
 import android.content.Intent
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 
 abstract class CoroutineIntentService : BaseService() {
 
@@ -21,11 +23,13 @@ abstract class CoroutineIntentService : BaseService() {
 		return Service.START_REDELIVER_INTENT
 	}
 
-	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch {
+	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch(errorHandler(startId)) {
 		mutex.withLock {
 			try {
-				withContext(dispatcher) {
-					processIntent(intent)
+				if (intent != null) {
+					withContext(dispatcher) {
+						processIntent(startId, intent)
+					}
 				}
 			} finally {
 				stopSelf(startId)
@@ -33,5 +37,12 @@ abstract class CoroutineIntentService : BaseService() {
 		}
 	}
 
-	protected abstract suspend fun processIntent(intent: Intent?)
+	protected abstract suspend fun processIntent(startId: Int, intent: Intent)
+
+	protected abstract fun onError(startId: Int, error: Throwable)
+
+	private fun errorHandler(startId: Int) = CoroutineExceptionHandler { _, throwable ->
+		throwable.printStackTraceDebug()
+		onError(startId, throwable)
+	}
 }

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

@@ -0,0 +1,22 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.app.Activity
+import android.app.Application.ActivityLifecycleCallbacks
+import android.os.Bundle
+
+interface DefaultActivityLifecycleCallbacks : ActivityLifecycleCallbacks {
+
+	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit
+
+	override fun onActivityStarted(activity: Activity) = Unit
+
+	override fun onActivityResumed(activity: Activity) = Unit
+
+	override fun onActivityPaused(activity: Activity) = Unit
+
+	override fun onActivityStopped(activity: Activity) = Unit
+
+	override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+
+	override fun onActivityDestroyed(activity: Activity) = Unit
+}

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

@@ -1,14 +1,14 @@
 package org.koitharu.kotatsu.base.ui.util
 
 import android.app.Activity
-import android.app.Application.ActivityLifecycleCallbacks
 import android.os.Bundle
-import java.util.*
+import org.koitharu.kotatsu.base.ui.DefaultActivityLifecycleCallbacks
+import java.util.WeakHashMap
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ActivityRecreationHandle @Inject constructor() : ActivityLifecycleCallbacks {
+class ActivityRecreationHandle @Inject constructor() : DefaultActivityLifecycleCallbacks {
 
 	private val activities = WeakHashMap<Activity, Unit>()
 
@@ -16,16 +16,6 @@ class ActivityRecreationHandle @Inject constructor() : ActivityLifecycleCallback
 		activities[activity] = Unit
 	}
 
-	override fun onActivityStarted(activity: Activity) = Unit
-
-	override fun onActivityResumed(activity: Activity) = Unit
-
-	override fun onActivityPaused(activity: Activity) = Unit
-
-	override fun onActivityStopped(activity: Activity) = Unit
-
-	override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
-
 	override fun onActivityDestroyed(activity: Activity) {
 		activities.remove(activity)
 	}

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

@@ -18,8 +18,6 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import dagger.multibindings.ElementsIntoSet
-import java.util.concurrent.TimeUnit
-import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import okhttp3.CookieJar
 import okhttp3.OkHttpClient
@@ -40,9 +38,12 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
 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.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)
@@ -152,9 +153,11 @@ interface AppModule {
 		fun provideActivityLifecycleCallbacks(
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
+			incognitoModeIndicator: IncognitoModeIndicator,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
+			incognitoModeIndicator,
 		)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt

@@ -1,13 +1,14 @@
 package org.koitharu.kotatsu.core.backup
 
 import androidx.room.withTransaction
-import javax.inject.Inject
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.parsers.util.json.JSONIterator
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import javax.inject.Inject
 
 private const val PAGE_SIZE = 10
 
@@ -85,7 +86,7 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 				JsonDeserializer(it).toTagEntity()
 			}
 			val history = JsonDeserializer(item).toHistoryEntity()
-			result += runCatching {
+			result += runCatchingCancellable {
 				db.withTransaction {
 					db.tagsDao.upsert(tags)
 					db.mangaDao.upsert(manga, tags)
@@ -100,7 +101,7 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 		val result = CompositeResult()
 		for (item in entry.data.JSONIterator()) {
 			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
-			result += runCatching {
+			result += runCatchingCancellable {
 				db.favouriteCategoriesDao.upsert(category)
 			}
 		}
@@ -116,7 +117,7 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 				JsonDeserializer(it).toTagEntity()
 			}
 			val favourite = JsonDeserializer(item).toFavouriteEntity()
-			result += runCatching {
+			result += runCatchingCancellable {
 				db.withTransaction {
 					db.tagsDao.upsert(tags)
 					db.mangaDao.upsert(manga, tags)

app/src/main/java/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt

@@ -4,13 +4,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import dagger.hilt.android.qualifiers.ApplicationContext
-import java.io.ByteArrayInputStream
-import java.io.InputStream
-import java.security.MessageDigest
-import java.security.cert.CertificateFactory
-import java.security.cert.X509Certificate
-import javax.inject.Inject
-import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -24,6 +17,14 @@ import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
 import org.koitharu.kotatsu.parsers.util.parseJsonArray
 import org.koitharu.kotatsu.utils.ext.asArrayList
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+import java.security.MessageDigest
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import javax.inject.Inject
+import javax.inject.Singleton
 
 private const val CERT_SHA1 = "2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE"
 
@@ -59,7 +60,7 @@ class AppUpdateRepository @Inject constructor(
 		if (!isUpdateSupported()) {
 			return@withContext null
 		}
-		runCatching {
+		runCatchingCancellable {
 			val currentVersion = VersionId(BuildConfig.VERSION_NAME)
 			val available = getAvailableVersions().asArrayList()
 			available.sortBy { it.versionId }

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

@@ -2,7 +2,12 @@ package org.koitharu.kotatsu.core.model.parcelable
 
 import android.os.Parcel
 import androidx.core.os.ParcelCompat
-import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.utils.ext.readParcelableCompat
+import org.koitharu.kotatsu.utils.ext.readSerializableCompat
 
 fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
 	out.writeLong(id)
@@ -37,11 +42,11 @@ fun Parcel.readManga() = Manga(
 	coverUrl = requireNotNull(readString()),
 	largeCoverUrl = readString(),
 	description = readString(),
-	tags = requireNotNull(readParcelable<ParcelableMangaTags>(ParcelableMangaTags::class.java.classLoader)).tags,
-	state = readSerializable() as MangaState?,
+	tags = requireNotNull(readParcelableCompat<ParcelableMangaTags>()).tags,
+	state = readSerializableCompat(),
 	author = readString(),
-	chapters = readParcelable<ParcelableMangaChapters>(ParcelableMangaChapters::class.java.classLoader)?.chapters,
-	source = readSerializable() as MangaSource,
+	chapters = readParcelableCompat<ParcelableMangaChapters>()?.chapters,
+	source = checkNotNull(readSerializableCompat()),
 )
 
 fun MangaPage.writeToParcel(out: Parcel) {
@@ -57,7 +62,7 @@ fun Parcel.readMangaPage() = MangaPage(
 	url = requireNotNull(readString()),
 	referer = requireNotNull(readString()),
 	preview = readString(),
-	source = readSerializable() as MangaSource,
+	source = checkNotNull(readSerializableCompat()),
 )
 
 fun MangaChapter.writeToParcel(out: Parcel) {
@@ -79,7 +84,7 @@ fun Parcel.readMangaChapter() = MangaChapter(
 	scanlator = readString(),
 	uploadDate = readLong(),
 	branch = readString(),
-	source = readSerializable() as MangaSource,
+	source = checkNotNull(readSerializableCompat()),
 )
 
 fun MangaTag.writeToParcel(out: Parcel) {
@@ -91,5 +96,5 @@ fun MangaTag.writeToParcel(out: Parcel) {
 fun Parcel.readMangaTag() = MangaTag(
 	title = requireNotNull(readString()),
 	key = requireNotNull(readString()),
-	source = readSerializable() as MangaSource,
-)
+	source = checkNotNull(readSerializableCompat()),
+)

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

@@ -50,4 +50,4 @@ class ParcelableManga(
 			return arrayOfNulls(size)
 		}
 	}
-}
+}

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

@@ -0,0 +1,64 @@
+package org.koitharu.kotatsu.core.os
+
+import android.content.Context
+import android.net.ConnectivityManager.NetworkCallback
+import android.net.Network
+import android.net.NetworkRequest
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.ProducerScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.callbackFlow
+import org.koitharu.kotatsu.utils.ext.connectivityManager
+import org.koitharu.kotatsu.utils.ext.isNetworkAvailable
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NetworkStateObserver @Inject constructor(
+	@ApplicationContext context: Context,
+) : StateFlow<Boolean> {
+
+	private val connectivityManager = context.connectivityManager
+
+	override val replayCache: List<Boolean>
+		get() = listOf(value)
+
+	override var value: Boolean = connectivityManager.isNetworkAvailable
+
+	override suspend fun collect(collector: FlowCollector<Boolean>): Nothing {
+		collector.emit(value)
+		while (true) {
+			observeImpl().collect(collector)
+		}
+	}
+
+	private fun observeImpl() = callbackFlow<Boolean> {
+		val request = NetworkRequest.Builder().build()
+		val callback = FlowNetworkCallback(this)
+		connectivityManager.registerNetworkCallback(request, callback)
+		awaitClose {
+			connectivityManager.unregisterNetworkCallback(callback)
+		}
+	}
+
+	inner class FlowNetworkCallback(
+		private val producerScope: ProducerScope<Boolean>,
+	) : NetworkCallback() {
+		override fun onAvailable(network: Network) = update()
+
+		override fun onLost(network: Network) = update()
+
+		override fun onUnavailable() = update()
+
+		private fun update() {
+			val newValue = connectivityManager.isNetworkAvailable
+			if (value != newValue) {
+				value = newValue
+				producerScope.trySendBlocking(newValue)
+			}
+		}
+	}
+}

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

@@ -17,8 +17,6 @@ import coil.request.ImageRequest
 import coil.size.Precision
 import coil.size.Scale
 import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -32,6 +30,9 @@ import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import org.koitharu.kotatsu.utils.ext.requireBitmap
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @Singleton
 class ShortcutsUpdater @Inject constructor(
@@ -92,7 +93,7 @@ class ShortcutsUpdater @Inject constructor(
 	}
 
 	@RequiresApi(Build.VERSION_CODES.N_MR1)
-	private suspend fun updateShortcutsImpl() = runCatching {
+	private suspend fun updateShortcutsImpl() = runCatchingCancellable {
 		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
 		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
 			.filter { x -> x.title.isNotEmpty() }
@@ -112,7 +113,7 @@ class ShortcutsUpdater @Inject constructor(
 	}
 
 	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat.Builder {
-		val icon = runCatching {
+		val icon = runCatchingCancellable {
 			coil.execute(
 				ImageRequest.Builder(context)
 					.data(manga.coverUrl)

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

@@ -11,12 +11,6 @@ import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.google.android.material.color.DynamicColors
 import dagger.hilt.android.qualifiers.ApplicationContext
-import java.io.File
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Singleton
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.network.DoHProvider
@@ -26,6 +20,14 @@ import org.koitharu.kotatsu.utils.ext.getEnumValue
 import org.koitharu.kotatsu.utils.ext.observe
 import org.koitharu.kotatsu.utils.ext.putEnumValue
 import org.koitharu.kotatsu.utils.ext.toUriOrNull
+import java.io.File
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.Collections
+import java.util.EnumSet
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @Singleton
 class AppSettings @Inject constructor(@ApplicationContext context: Context) {
@@ -206,6 +208,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isReaderBarEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_BAR, true)
 
+	val isReaderSliderEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_SLIDER, true)
+
 	val dnsOverHttps: DoHProvider
 		get() = prefs.getEnumValue(KEY_DOH, DoHProvider.NONE)
 
@@ -213,6 +218,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_LOCAL_LIST_ORDER, SortOrder.NEWEST)
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
 
+	val isWebtoonZoomEnable: Boolean
+		get() = prefs.getBoolean(KEY_WEBTOON_ZOOM, true)
+
 	fun isPagesPreloadAllowed(cm: ConnectivityManager): Boolean {
 		return when (prefs.getString(KEY_PAGES_PRELOAD, null)?.toIntOrNull()) {
 			NETWORK_ALWAYS -> true
@@ -328,9 +336,11 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_INCOGNITO_MODE = "incognito"
 		const val KEY_SYNC = "sync"
 		const val KEY_READER_BAR = "reader_bar"
+		const val KEY_READER_SLIDER = "reader_slider"
 		const val KEY_SHORTCUTS = "dynamic_shortcuts"
 		const val KEY_READER_TAPS_LTR = "reader_taps_ltr"
 		const val KEY_LOCAL_LIST_ORDER = "local_order"
+		const val KEY_WEBTOON_ZOOM = "webtoon_zoom"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

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

@@ -54,7 +54,7 @@ class MangaErrorDialog : AlertDialogFragment<DialogMangaErrorBinding>() {
 			.setNegativeButton(android.R.string.cancel, null)
 			.setPositiveButton(R.string.report) { _, _ ->
 				dismiss()
-				error.report(TAG)
+				error.report()
 			}.setTitle(R.string.error_occurred)
 	}
 

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

@@ -19,12 +19,10 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
-import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
@@ -37,12 +35,17 @@ import org.koitharu.kotatsu.core.ui.MangaErrorDialog
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
 import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.list.ui.adapter.bindBadge
 import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.ViewBadge
+import org.koitharu.kotatsu.utils.ext.assistedViewModels
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.isReportable
+import org.koitharu.kotatsu.utils.ext.setNavigationBarTransparentCompat
+import org.koitharu.kotatsu.utils.ext.textAndVisible
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class DetailsActivity :
@@ -60,7 +63,7 @@ class DetailsActivity :
 	@Inject
 	lateinit var shortcutsUpdater: ShortcutsUpdater
 
-	private var badge: BadgeDrawable? = null
+	private lateinit var viewBadge: ViewBadge
 
 	private val viewModel: DetailsViewModel by assistedViewModels {
 		viewModelFactory.create(MangaIntent(intent))
@@ -83,6 +86,7 @@ class DetailsActivity :
 		}
 		binding.buttonRead.setOnClickListener(this)
 		binding.buttonDropdown.setOnClickListener(this)
+		viewBadge = ViewBadge(binding.buttonRead, this)
 
 		chaptersMenuProvider = if (binding.layoutBottom != null) {
 			val bsMediator = ChaptersBottomSheetMediator(checkNotNull(binding.layoutBottom))
@@ -151,6 +155,7 @@ class DetailsActivity :
 					)
 				}
 			}
+
 			R.id.button_dropdown -> showBranchPopupMenu()
 		}
 	}
@@ -188,10 +193,12 @@ class DetailsActivity :
 			ExceptionResolver.canResolve(e) -> {
 				resolveError(e)
 			}
+
 			manga == null -> {
 				Toast.makeText(this, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
 				finishAfterTransition()
 			}
+
 			else -> {
 				val snackbar = makeSnackbar(
 					e.getDisplayMessage(resources),
@@ -242,7 +249,7 @@ class DetailsActivity :
 	}
 
 	private fun onNewChaptersChanged(newChapters: Int) {
-		badge = binding.buttonRead.bindBadge(badge, newChapters)
+		viewBadge.counter = newChapters
 	}
 
 	fun showChapterMissingDialog(chapterId: Long) {

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

@@ -45,6 +45,7 @@ import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.asFlowLiveData
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class DetailsViewModel @AssistedInject constructor(
 	@Assisted intent: MangaIntent,
@@ -189,7 +190,7 @@ class DetailsViewModel @AssistedInject constructor(
 			checkNotNull(manga) { "Cannot find saved manga for ${m.title}" }
 			val original = localMangaRepository.getRemoteManga(manga)
 			localMangaRepository.delete(manga) || throw IOException("Unable to delete file")
-			runCatching {
+			runCatchingCancellable {
 				historyRepository.deleteOrSwap(manga, original)
 			}
 			onMangaRemoved.postCall(manga)
@@ -228,7 +229,7 @@ class DetailsViewModel @AssistedInject constructor(
 			reload()
 		} else {
 			viewModelScope.launch(Dispatchers.Default) {
-				runCatching {
+				runCatchingCancellable {
 					localMangaRepository.getDetails(downloadedManga)
 				}.onSuccess {
 					delegate.relatedManga.value = it

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

@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class MangaDetailsDelegate(
 	private val intent: MangaIntent,
@@ -45,9 +46,9 @@ class MangaDetailsDelegate(
 		val hist = historyRepository.getOne(manga)
 		selectedBranch.value = manga.getPreferredBranch(hist)
 		mangaData.value = manga
-		relatedManga.value = runCatching {
+		relatedManga.value = runCatchingCancellable {
 			if (manga.source == MangaSource.LOCAL) {
-				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
+				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatchingCancellable null
 				mangaRepositoryFactory.create(m.source).getDetails(m)
 			} else {
 				localMangaRepository.findSavedManga(manga)

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

@@ -34,7 +34,7 @@ fun chapterListItemAD(
 		when (item.status) {
 			FLAG_UNREAD -> {
 				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_default)
-				binding.textViewNumber.setTextColor(context.getThemeColor(android.R.attr.textColorSecondaryInverse))
+				binding.textViewNumber.setTextColor(context.getThemeColor(com.google.android.material.R.attr.colorOnTertiary))
 			}
 			FLAG_CURRENT -> {
 				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_accent)
@@ -53,4 +53,4 @@ fun chapterListItemAD(
 		binding.imageViewDownloaded.isVisible = item.hasFlag(FLAG_DOWNLOADED)
 		binding.imageViewNew.isVisible = item.hasFlag(FLAG_NEW)
 	}
-}
+}

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

@@ -9,11 +9,18 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
-import java.io.File
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
+import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.internal.closeQuietly
@@ -32,7 +39,9 @@ import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.referer
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.progress.PausingProgressJob
+import java.io.File
 
 private const val MAX_FAILSAFE_ATTEMPTS = 2
 private const val DOWNLOAD_ERROR_DELAY = 500L
@@ -231,7 +240,7 @@ class DownloadManager @AssistedInject constructor(
 			)
 		}
 
-	private suspend fun loadCover(manga: Manga) = runCatching {
+	private suspend fun loadCover(manga: Manga) = runCatchingCancellable {
 		imageLoader.execute(
 			ImageRequest.Builder(context)
 				.data(manga.coverUrl)

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

@@ -34,7 +34,7 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
 		setContentView(ActivityDownloadsBinding.inflate(layoutInflater))
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		val adapter = DownloadsAdapter(lifecycleScope, coil)
-		val spacing = resources.getDimensionPixelOffset(R.dimen.grid_spacing)
+		val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 		binding.recyclerView.addItemDecoration(SpacingItemDecoration(spacing))
 		binding.recyclerView.setHasFixedSize(true)
 		binding.recyclerView.adapter = adapter

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

@@ -16,10 +16,12 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import kotlin.collections.set
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.transformWhile
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
@@ -28,10 +30,14 @@ import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.download.domain.DownloadManager
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
 import org.koitharu.kotatsu.utils.ext.throttle
 import org.koitharu.kotatsu.utils.progress.PausingProgressJob
 import org.koitharu.kotatsu.utils.progress.ProgressJob
 import org.koitharu.kotatsu.utils.progress.TimeLeftEstimator
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlin.collections.set
 
 @AndroidEntryPoint
 class DownloadService : BaseService() {
@@ -65,7 +71,7 @@ class DownloadService : BaseService() {
 
 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
-		val manga = intent?.getParcelableExtra<ParcelableManga>(EXTRA_MANGA)?.manga
+		val manga = intent?.getParcelableExtraCompat<ParcelableManga>(EXTRA_MANGA)?.manga
 		val chapters = intent?.getLongArrayExtra(EXTRA_CHAPTERS_IDS)
 		return if (manga != null) {
 			jobs[startId] = downloadManga(startId, manga, chapters)
@@ -84,7 +90,9 @@ class DownloadService : BaseService() {
 
 	override fun onDestroy() {
 		unregisterReceiver(controlReceiver)
-		wakeLock.release()
+		if (wakeLock.isHeld) {
+			wakeLock.release()
+		}
 		isRunning = false
 		super.onDestroy()
 	}
@@ -168,6 +176,7 @@ class DownloadService : BaseService() {
 					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
 					jobs[cancelId]?.cancel()
 				}
+
 				ACTION_DOWNLOAD_RESUME -> {
 					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
 					jobs[cancelId]?.resume()
@@ -254,7 +263,7 @@ class DownloadService : BaseService() {
 
 		fun getDownloadedManga(intent: Intent?): Manga? {
 			if (intent?.action == ACTION_DOWNLOAD_COMPLETE) {
-				return intent.getParcelableExtra<ParcelableManga>(EXTRA_MANGA)?.manga
+				return intent.getParcelableExtraCompat<ParcelableManga>(EXTRA_MANGA)?.manga
 			}
 			return null
 		}

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

@@ -61,7 +61,7 @@ class ExploreViewModel @Inject constructor(
 			sources.mapTo(result) { ExploreItem.Source(it) }
 		} else {
 			result += ExploreItem.EmptyHint(
-				icon = R.drawable.ic_empty_search,
+				icon = R.drawable.ic_empty_common,
 				textPrimary = R.string.no_manga_sources,
 				textSecondary = R.string.no_manga_sources_text,
 				actionStringRes = R.string.manage,

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.explore.ui.model
 
-import android.net.Uri
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.list.ui.model.EmptyState
@@ -73,6 +72,7 @@ sealed interface ExploreItem : ListModel {
 		}
 	}
 
+	@Deprecated("")
 	class EmptyHint(
 		@DrawableRes icon: Int,
 		@StringRes textPrimary: Int,
@@ -81,4 +81,4 @@ sealed interface ExploreItem : ListModel {
 	) : EmptyState(icon, textPrimary, textSecondary, actionStringRes), ExploreItem
 
 	object Loading : ExploreItem
-}
+}

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

@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.databinding.ActivityContainerBinding
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
+import kotlin.text.Typography.dagger
 
 @AndroidEntryPoint
 class FavouritesActivity : BaseActivity<ActivityContainerBinding>() {
@@ -28,6 +29,7 @@ class FavouritesActivity : BaseActivity<ActivityContainerBinding>() {
 		val fm = supportFragmentManager
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
+				setReorderingAllowed(true)
 				val fragment = FavouritesListFragment.newInstance(intent.getLongExtra(EXTRA_CATEGORY_ID, NO_ID))
 				replace(R.id.container, fragment)
 			}

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

@@ -28,6 +28,7 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.asFlowLiveData
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class FavouritesListViewModel @AssistedInject constructor(
 	@Assisted private val categoryId: Long,
@@ -69,6 +70,7 @@ class FavouritesListViewModel @AssistedInject constructor(
 					actionStringRes = 0,
 				),
 			)
+
 			else -> list.toUi(mode, this)
 		}
 	}.catch {
@@ -79,7 +81,7 @@ class FavouritesListViewModel @AssistedInject constructor(
 		if (categoryId != NO_ID) {
 			launchJob {
 				categoryName = withContext(Dispatchers.Default) {
-					runCatching {
+					runCatchingCancellable {
 						repository.getCategory(categoryId).title
 					}.getOrNull()
 				}

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

@@ -12,6 +12,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivityContainerBinding
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import kotlin.text.Typography.dagger
 
 @AndroidEntryPoint
 class HistoryActivity :
@@ -28,6 +29,7 @@ class HistoryActivity :
 		val fm = supportFragmentManager
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
+				setReorderingAllowed(true)
 				val fragment = HistoryListFragment.newInstance()
 				replace(R.id.container, fragment)
 			}

app/src/main/java/org/koitharu/kotatsu/library/domain/LibraryRepository.kt

@@ -1,38 +0,0 @@
-package org.koitharu.kotatsu.library.domain
-
-import javax.inject.Inject
-import kotlinx.coroutines.flow.*
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.toManga
-import org.koitharu.kotatsu.core.db.entity.toMangaTags
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.favourites.data.toFavouriteCategory
-import org.koitharu.kotatsu.parsers.model.Manga
-
-class LibraryRepository @Inject constructor(
-	private val db: MangaDatabase,
-) {
-
-	fun observeFavourites(): Flow<Map<FavouriteCategory, List<Manga>>> {
-		return db.favouriteCategoriesDao.observeAll()
-			.flatMapLatest { categories ->
-				val cats = categories.filter { it.isVisibleInLibrary }
-				if (cats.isEmpty()) {
-					flowOf(emptyMap())
-				} else {
-					observeCategoriesContent(cats)
-				}
-			}
-	}
-
-	private fun observeCategoriesContent(
-		categories: List<FavouriteCategoryEntity>,
-	) = combine<Pair<FavouriteCategory, List<Manga>>, Map<FavouriteCategory, List<Manga>>>(
-		categories.map { cat ->
-			val category = cat.toFavouriteCategory()
-			db.favouritesDao.observeAll(category.id, category.order)
-				.map { category to it.map { x -> x.manga.toManga(x.tags.toMangaTags()) } }
-		},
-	) { array -> array.toMap() }
-}

app/src/main/java/org/koitharu/kotatsu/library/ui/adapter/LibraryListEventListener.kt

@@ -1,15 +0,0 @@
-package org.koitharu.kotatsu.library.ui.adapter
-
-import android.view.View
-import org.koitharu.kotatsu.library.ui.model.LibrarySectionModel
-import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
-import org.koitharu.kotatsu.parsers.model.Manga
-
-interface LibraryListEventListener : ListStateHolderListener {
-
-	fun onItemClick(item: Manga, section: LibrarySectionModel, view: View)
-
-	fun onItemLongClick(item: Manga, section: LibrarySectionModel, view: View): Boolean
-
-	fun onSectionClick(section: LibrarySectionModel, view: View)
-}

app/src/main/java/org/koitharu/kotatsu/library/ui/model/LibrarySectionModel.kt

@@ -1,94 +0,0 @@
-package org.koitharu.kotatsu.library.ui.model
-
-import android.content.res.Resources
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.ui.DateTimeAgo
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.MangaItemModel
-
-sealed class LibrarySectionModel(
-	val items: List<MangaItemModel>,
-	@StringRes val showAllButtonText: Int,
-) : ListModel {
-
-	abstract val key: Any
-	abstract fun getTitle(resources: Resources): CharSequence
-
-	class History(
-		items: List<MangaItemModel>,
-		val timeAgo: DateTimeAgo?,
-		showAllButtonText: Int,
-	) : LibrarySectionModel(items, showAllButtonText) {
-
-		override val key: Any
-			get() = timeAgo?.javaClass ?: this::class.java
-
-		override fun getTitle(resources: Resources): CharSequence {
-			return timeAgo?.format(resources) ?: resources.getString(R.string.history)
-		}
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as History
-
-			if (timeAgo != other.timeAgo) return false
-			if (showAllButtonText != other.showAllButtonText) return false
-			if (items != other.items) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = items.hashCode()
-			result = 31 * result + (timeAgo?.hashCode() ?: 0)
-			result = 31 * result + showAllButtonText.hashCode()
-			return result
-		}
-
-		override fun toString(): String {
-			return "hist_$timeAgo"
-		}
-	}
-
-	class Favourites(
-		items: List<MangaItemModel>,
-		val category: FavouriteCategory,
-		showAllButtonText: Int,
-	) : LibrarySectionModel(items, showAllButtonText) {
-
-		override val key: Any
-			get() = category.id
-
-		override fun getTitle(resources: Resources): CharSequence {
-			return category.title
-		}
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Favourites
-
-			if (category != other.category) return false
-			if (showAllButtonText != other.showAllButtonText) return false
-			if (items != other.items) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = items.hashCode()
-			result = 31 * result + category.hashCode()
-			result = 31 * result + showAllButtonText.hashCode()
-			return result
-		}
-
-		override fun toString(): String {
-			return "fav_${category.id}"
-		}
-	}
-}

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

@@ -6,24 +6,23 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.button.MaterialButtonToggleGroup
 import com.google.android.material.slider.Slider
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.base.ui.widgets.CheckableButtonGroup
+import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.databinding.DialogListModeBinding
 import org.koitharu.kotatsu.utils.ext.setValueRounded
 import org.koitharu.kotatsu.utils.progress.IntPercentLabelFormatter
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class ListModeSelectDialog :
-	AlertDialogFragment<DialogListModeBinding>(),
-	CheckableButtonGroup.OnCheckedChangeListener,
-	Slider.OnChangeListener {
+class ListModeBottomSheet :
+	BaseBottomSheet<DialogListModeBinding>(),
+	Slider.OnChangeListener,
+	MaterialButtonToggleGroup.OnButtonCheckedListener {
 
 	@Inject
 	lateinit var settings: AppSettings
@@ -33,13 +32,6 @@ class ListModeSelectDialog :
 		container: ViewGroup?,
 	) = DialogListModeBinding.inflate(inflater, container, false)
 
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder)
-			.setTitle(R.string.list_mode)
-			.setPositiveButton(R.string.done, null)
-			.setCancelable(true)
-	}
-
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		val mode = settings.listMode
@@ -53,10 +45,10 @@ class ListModeSelectDialog :
 		binding.sliderGrid.setValueRounded(settings.gridSize.toFloat())
 		binding.sliderGrid.addOnChangeListener(this)
 
-		binding.checkableGroup.onCheckedChangeListener = this
+		binding.checkableGroup.addOnButtonCheckedListener(this)
 	}
 
-	override fun onCheckedChanged(group: CheckableButtonGroup, checkedId: Int) {
+	override fun onButtonChecked(group: MaterialButtonToggleGroup?, checkedId: Int, isChecked: Boolean) {
 		val mode = when (checkedId) {
 			R.id.button_list -> ListMode.LIST
 			R.id.button_list_detailed -> ListMode.DETAILED_LIST
@@ -78,6 +70,6 @@ class ListModeSelectDialog :
 
 		private const val TAG = "ListModeSelectDialog"
 
-		fun show(fm: FragmentManager) = ListModeSelectDialog().show(fm, TAG)
+		fun show(fm: FragmentManager) = ListModeBottomSheet().show(fm, TAG)
 	}
 }

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

@@ -17,9 +17,10 @@ class MangaListMenuProvider(
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
 		R.id.action_list_mode -> {
-			ListModeSelectDialog.show(fragment.childFragmentManager)
+			ListModeBottomSheet.show(fragment.childFragmentManager)
 			true
 		}
+
 		else -> false
 	}
-}
+}

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

@@ -1,8 +1,5 @@
-@file:SuppressLint("UnsafeOptInUsageError")
-
 package org.koitharu.kotatsu.list.ui.adapter
 
-import android.annotation.SuppressLint
 import android.view.View
 import androidx.annotation.CheckResult
 import androidx.core.view.doOnNextLayout
@@ -42,4 +39,4 @@ private fun initBadge(anchor: View): BadgeDrawable {
 private fun BadgeDrawable.align() {
 	horizontalOffset = intrinsicWidth
 	verticalOffset = intrinsicHeight
-}
+}

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

@@ -0,0 +1,23 @@
+package org.koitharu.kotatsu.list.ui.adapter
+
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.databinding.ItemEmptyCardBinding
+import org.koitharu.kotatsu.list.ui.model.EmptyHint
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.utils.ext.setTextAndVisible
+
+fun emptyHintAD(
+	listener: ListStateHolderListener,
+) = adapterDelegateViewBinding<EmptyHint, ListModel, ItemEmptyCardBinding>(
+	{ inflater, parent -> ItemEmptyCardBinding.inflate(inflater, parent, false) },
+) {
+
+	binding.buttonRetry.setOnClickListener { listener.onEmptyActionClick() }
+
+	bind {
+		binding.icon.setImageResource(item.icon)
+		binding.textPrimary.setText(item.textPrimary)
+		binding.textSecondary.setTextAndVisible(item.textSecondary)
+		binding.buttonRetry.setTextAndVisible(item.actionStringRes)
+	}
+}

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

@@ -6,15 +6,22 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.update
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import java.text.Collator
-import java.util.*
+import java.util.Locale
+import java.util.TreeSet
 
 class FilterCoordinator(
 	private val repository: RemoteMangaRepository,
@@ -153,7 +160,7 @@ class FilterCoordinator(
 	}
 
 	private fun loadTagsAsync() = coroutineScope.async(Dispatchers.Default, CoroutineStart.LAZY) {
-		runCatching {
+		runCatchingCancellable {
 			repository.getTags()
 		}.onFailure { error ->
 			error.printStackTraceDebug()
@@ -204,4 +211,4 @@ class FilterCoordinator(
 			return collator?.compare(t1, t2) ?: compareValues(t1, t2)
 		}
 	}
-}
+}

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

@@ -0,0 +1,14 @@
+package org.koitharu.kotatsu.list.ui.model
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+
+class EmptyHint(
+	@DrawableRes icon: Int,
+	@StringRes textPrimary: Int,
+	@StringRes textSecondary: Int,
+	@StringRes actionStringRes: Int,
+) : EmptyState(icon, textPrimary, textSecondary, actionStringRes) {
+
+	fun toState() = EmptyState(icon, textPrimary, textSecondary, actionStringRes)
+}

app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt

@@ -7,28 +7,40 @@ import androidx.annotation.WorkerThread
 import androidx.collection.ArraySet
 import androidx.core.net.toFile
 import androidx.core.net.toUri
-import java.io.File
-import java.util.*
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlin.coroutines.CoroutineContext
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.runInterruptible
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.local.data.MangaIndex
 import org.koitharu.kotatsu.local.data.TempFileFilter
-import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.toCamelCase
 import org.koitharu.kotatsu.utils.AlphanumComparator
 import org.koitharu.kotatsu.utils.CompositeMutex
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.longHashCode
 import org.koitharu.kotatsu.utils.ext.readText
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import java.io.File
+import java.util.Enumeration
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.CoroutineContext
 
 private const val MAX_PARALLELISM = 4
 
@@ -58,13 +70,14 @@ class LocalMangaRepository @Inject constructor(private val storageManager: Local
 		if (!tags.isNullOrEmpty()) {
 			list.retainAll { x -> x.containsTags(tags) }
 		}
-		@Suppress("NON_EXHAUSTIVE_WHEN_STATEMENT")
 		when (sortOrder) {
 			SortOrder.ALPHABETICAL -> list.sortWith(compareBy(AlphanumComparator()) { x -> x.manga.title })
 			SortOrder.RATING -> list.sortByDescending { it.manga.rating }
 			SortOrder.NEWEST,
 			SortOrder.UPDATED,
 			-> list.sortByDescending { it.createdAt }
+
+			else -> Unit
 		}
 		return list.unwrap()
 	}
@@ -73,6 +86,7 @@ class LocalMangaRepository @Inject constructor(private val storageManager: Local
 		manga.source != MangaSource.LOCAL -> requireNotNull(findSavedManga(manga)) {
 			"Manga is not local or saved"
 		}
+
 		else -> getFromFile(Uri.parse(manga.url).toFile())
 	}
 
@@ -236,7 +250,7 @@ class LocalMangaRepository @Inject constructor(private val storageManager: Local
 		context: CoroutineContext,
 	): Deferred<LocalManga?> = async(context) {
 		runInterruptible {
-			runCatching { LocalManga(getFromFile(file), file) }.getOrNull()
+			runCatchingCancellable { LocalManga(getFromFile(file), file) }.getOrNull()
 		}
 	}
 

app/src/main/java/org/koitharu/kotatsu/local/ui/ImportService.kt

@@ -23,7 +23,12 @@ import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.local.domain.importer.MangaImporter
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.PendingIntentCompat
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.ext.asArrayList
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.referer
+import org.koitharu.kotatsu.utils.ext.report
+import org.koitharu.kotatsu.utils.ext.toBitmapOrNull
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -48,8 +53,8 @@ class ImportService : CoroutineIntentService() {
 		super.onDestroy()
 	}
 
-	override suspend fun processIntent(intent: Intent?) {
-		val uris = intent?.getParcelableArrayListExtra<Uri>(EXTRA_URIS)
+	override suspend fun processIntent(startId: Int, intent: Intent) {
+		val uris = intent.getParcelableArrayListExtra<Uri>(EXTRA_URIS)
 		if (uris.isNullOrEmpty()) {
 			return
 		}
@@ -69,6 +74,10 @@ class ImportService : CoroutineIntentService() {
 		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
 	}
 
+	override fun onError(startId: Int, error: Throwable) {
+		error.report()
+	}
+
 	private suspend fun importImpl(uri: Uri): Manga {
 		val importer = importerFactory.create(uri)
 		return importer.import(uri)

app/src/main/java/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt

@@ -9,13 +9,15 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.CoroutineIntentService
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class LocalChaptersRemoveService : CoroutineIntentService() {
@@ -33,8 +35,8 @@ class LocalChaptersRemoveService : CoroutineIntentService() {
 		super.onDestroy()
 	}
 
-	override suspend fun processIntent(intent: Intent?) {
-		val manga = intent?.getParcelableExtra<ParcelableManga>(EXTRA_MANGA)?.manga ?: return
+	override suspend fun processIntent(startId: Int, intent: Intent) {
+		val manga = intent.getParcelableExtraCompat<ParcelableManga>(EXTRA_MANGA)?.manga ?: return
 		val chaptersIds = intent.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toSet() ?: return
 		startForeground()
 		val mangaWithChapters = localMangaRepository.getDetails(manga)
@@ -46,6 +48,21 @@ class LocalChaptersRemoveService : CoroutineIntentService() {
 		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
 	}
 
+	override fun onError(startId: Int, error: Throwable) {
+		val notification = NotificationCompat.Builder(this, CHANNEL_ID)
+			.setContentTitle(getString(R.string.error_occurred))
+			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
+			.setDefaults(0)
+			.setColor(ContextCompat.getColor(this, R.color.blue_primary_dark))
+			.setSilent(true)
+			.setContentText(error.getDisplayMessage(resources))
+			.setSmallIcon(android.R.drawable.stat_notify_error)
+			.setAutoCancel(true)
+			.build()
+		val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+		nm.notify(NOTIFICATION_ID + startId, notification)
+	}
+
 	private fun startForeground() {
 		val title = getString(R.string.local_manga_processing)
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt

@@ -29,6 +29,7 @@ import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 @HiltViewModel
 class LocalListViewModel @Inject constructor(
@@ -63,6 +64,7 @@ class LocalListViewModel @Inject constructor(
 					actionStringRes = R.string._import,
 				),
 			)
+
 			else -> buildList(list.size + 1) {
 				add(createHeader(list, tags, order))
 				list.toUi(this, mode, this@LocalListViewModel)
@@ -104,7 +106,7 @@ class LocalListViewModel @Inject constructor(
 				for (manga in itemsToRemove) {
 					val original = repository.getRemoteManga(manga)
 					repository.delete(manga) || throw IOException("Unable to delete file")
-					runCatching {
+					runCatchingCancellable {
 						historyRepository.deleteOrSwap(manga, original)
 					}
 					mangaList.update { list ->
@@ -120,6 +122,8 @@ class LocalListViewModel @Inject constructor(
 		try {
 			listError.value = null
 			mangaList.value = repository.getList(0, selectedTags.value, sortOrder.value)
+		} catch (e: CancellationException) {
+			throw e
 		} catch (e: Throwable) {
 			listError.value = e
 		}
@@ -128,7 +132,7 @@ class LocalListViewModel @Inject constructor(
 	private fun cleanup() {
 		if (!DownloadService.isRunning && !ImportService.isRunning && !LocalChaptersRemoveService.isRunning) {
 			viewModelScope.launch {
-				runCatching {
+				runCatchingCancellable {
 					repository.cleanup()
 				}.onFailure { error ->
 					error.printStackTraceDebug()

app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -15,15 +15,21 @@ import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.util.size
-import androidx.core.view.*
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
 import androidx.transition.TransitionManager
-import com.google.android.material.R as materialR
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.*
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
@@ -34,7 +40,6 @@ import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.base.ui.widgets.SlidingBottomNavigationView
 import org.koitharu.kotatsu.databinding.ActivityMainBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.library.ui.LibraryFragment
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -48,10 +53,18 @@ import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
 import org.koitharu.kotatsu.settings.onboard.OnboardDialogFragment
+import org.koitharu.kotatsu.shelf.ui.ShelfFragment
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsWorker
 import org.koitharu.kotatsu.tracker.work.TrackWorker
 import org.koitharu.kotatsu.utils.VoiceInputContract
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.ext.drawableEnd
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.hideKeyboard
+import org.koitharu.kotatsu.utils.ext.resolve
+import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
+import org.koitharu.kotatsu.utils.ext.setNavigationBarTransparentCompat
+import org.koitharu.kotatsu.utils.ext.tryLaunch
+import com.google.android.material.R as materialR
 
 private const val TAG_SEARCH = "search"
 
@@ -115,6 +128,7 @@ class MainActivity :
 		viewModel.isLoading.observe(this, this::onLoadingStateChanged)
 		viewModel.isResumeEnabled.observe(this, this::onResumeEnabledChanged)
 		viewModel.counters.observe(this, ::onCountersChanged)
+		viewModel.isFeedAvailable.observe(this, ::onFeedAvailabilityChanged)
 	}
 
 	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
@@ -127,20 +141,18 @@ class MainActivity :
 		binding.searchView.clearFocus()
 		when {
 			fragment != null -> supportFragmentManager.commit {
+				setReorderingAllowed(true)
 				remove(fragment)
 				setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
 				runOnCommit { onSearchClosed() }
 			}
+
 			else -> super.onBackPressed()
 		}
 	}
 
 	override fun onFragmentChanged(fragment: Fragment, fromUser: Boolean) {
-		if (fragment is LibraryFragment) {
-			binding.fab?.show()
-		} else {
-			binding.fab?.hide()
-		}
+		adjustFabVisibility(topFragment = fragment)
 		if (fromUser) {
 			binding.appbar.setExpanded(true)
 		}
@@ -173,6 +185,7 @@ class MainActivity :
 		if (v?.id == R.id.searchView && hasFocus) {
 			if (fragment == null) {
 				supportFragmentManager.commit {
+					setReorderingAllowed(true)
 					add(R.id.container, SearchSuggestionFragment.newInstance(), TAG_SEARCH)
 					setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
 					runOnCommit { onSearchOpened() }
@@ -257,6 +270,10 @@ class MainActivity :
 		}
 	}
 
+	private fun onFeedAvailabilityChanged(isFeedAvailable: Boolean) {
+		navigationDelegate.setItemVisibility(R.id.nav_feed, isFeedAvailable)
+	}
+
 	private fun onLoadingStateChanged(isLoading: Boolean) {
 		binding.fab?.isEnabled = !isLoading
 	}
@@ -308,18 +325,18 @@ class MainActivity :
 		topFragment: Fragment? = navigationDelegate.primaryFragment,
 		isSearchOpened: Boolean = isSearchOpened(),
 	) {
-		val fab = binding.fab
+		val fab = binding.fab ?: return
 		if (
 			isResumeEnabled &&
 			!actionModeDelegate.isActionModeStarted &&
 			!isSearchOpened &&
-			topFragment is LibraryFragment
+			topFragment is ShelfFragment
 		) {
-			if (fab?.isVisible == false) {
+			if (!fab.isVisible) {
 				fab.show()
 			}
 		} else {
-			if (fab?.isVisible == true) {
+			if (fab.isVisible) {
 				fab.hide()
 			}
 		}

app/src/main/java/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.main.ui
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.annotation.IdRes
+import androidx.core.view.iterator
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
@@ -10,10 +11,10 @@ import com.google.android.material.navigation.NavigationBarView
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.explore.ui.ExploreFragment
-import org.koitharu.kotatsu.library.ui.LibraryFragment
 import org.koitharu.kotatsu.settings.tools.ToolsFragment
-import org.koitharu.kotatsu.tracker.ui.FeedFragment
-import java.util.*
+import org.koitharu.kotatsu.shelf.ui.ShelfFragment
+import org.koitharu.kotatsu.tracker.ui.feed.FeedFragment
+import java.util.LinkedList
 
 private const val TAG_PRIMARY = "primary"
 
@@ -62,6 +63,14 @@ class MainNavigationDelegate(
 		}
 	}
 
+	fun setItemVisibility(@IdRes itemId: Int, isVisible: Boolean) {
+		val item = navBar.menu.findItem(itemId) ?: return
+		item.isVisible = isVisible
+		if (item.isChecked && !isVisible) {
+			navBar.selectedItemId = firstItem()?.itemId ?: return
+		}
+	}
+
 	fun addOnFragmentChangedListener(listener: OnFragmentChangedListener) {
 		listeners.add(listener)
 	}
@@ -73,7 +82,7 @@ class MainNavigationDelegate(
 	private fun onNavigationItemSelected(@IdRes itemId: Int): Boolean {
 		setPrimaryFragment(
 			when (itemId) {
-				R.id.nav_library -> LibraryFragment.newInstance()
+				R.id.nav_shelf -> ShelfFragment.newInstance()
 				R.id.nav_explore -> ExploreFragment.newInstance()
 				R.id.nav_feed -> FeedFragment.newInstance()
 				R.id.nav_tools -> ToolsFragment.newInstance()
@@ -85,6 +94,7 @@ class MainNavigationDelegate(
 
 	private fun setPrimaryFragment(fragment: Fragment) {
 		fragmentManager.beginTransaction()
+			.setReorderingAllowed(true)
 			.replace(R.id.container, fragment, TAG_PRIMARY)
 			.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
 			.commit()
@@ -95,6 +105,14 @@ class MainNavigationDelegate(
 		listeners.forEach { it.onFragmentChanged(fragment, fromUser) }
 	}
 
+	private fun firstItem(): MenuItem? {
+		val menu = navBar.menu
+		for (item in menu) {
+			if (item.isVisible) return item
+		}
+		return null
+	}
+
 	interface OnFragmentChangedListener {
 
 		fun onFragmentChanged(fragment: Fragment, fromUser: Boolean)

app/src/main/java/org/koitharu/kotatsu/main/ui/MainViewModel.kt

@@ -4,7 +4,6 @@ import android.util.SparseIntArray
 import androidx.core.util.set
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.R
@@ -12,6 +11,8 @@ import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.github.AppUpdateRepository
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsLiveData
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.sync.domain.SyncController
@@ -19,6 +20,7 @@ import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.asFlowLiveData
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+import javax.inject.Inject
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
@@ -27,6 +29,7 @@ class MainViewModel @Inject constructor(
 	private val trackingRepository: TrackingRepository,
 	syncController: SyncController,
 	database: MangaDatabase,
+	private val settings: AppSettings,
 ) : BaseViewModel() {
 
 	val onOpenReader = SingleLiveEvent<Manga>()
@@ -35,6 +38,12 @@ class MainViewModel @Inject constructor(
 		.observeHasItems()
 		.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, false)
 
+	val isFeedAvailable = settings.observeAsLiveData(
+		context = viewModelScope.coroutineContext + Dispatchers.Default,
+		key = AppSettings.KEY_TRACKER_ENABLED,
+		valueProducer = { isTrackerEnabled },
+	)
+
 	val counters = combine(
 		appUpdateRepository.observeAvailableUpdate(),
 		trackingRepository.observeUpdatedMangaCount(),

app/src/main/java/org/koitharu/kotatsu/main/ui/protect/AppProtectHelper.kt

@@ -1,16 +1,16 @@
 package org.koitharu.kotatsu.main.ui.protect
 
 import android.app.Activity
-import android.app.Application
 import android.content.Intent
 import android.os.Bundle
+import org.acra.dialog.CrashReportDialog
+import org.koitharu.kotatsu.base.ui.DefaultActivityLifecycleCallbacks
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.acra.dialog.CrashReportDialog
-import org.koitharu.kotatsu.core.prefs.AppSettings
 
 @Singleton
-class AppProtectHelper @Inject constructor(private val settings: AppSettings) : Application.ActivityLifecycleCallbacks {
+class AppProtectHelper @Inject constructor(private val settings: AppSettings) : DefaultActivityLifecycleCallbacks {
 
 	private var isUnlocked = settings.appPassword.isNullOrEmpty()
 
@@ -27,16 +27,6 @@ class AppProtectHelper @Inject constructor(private val settings: AppSettings) :
 		}
 	}
 
-	override fun onActivityStarted(activity: Activity) = Unit
-
-	override fun onActivityResumed(activity: Activity) = Unit
-
-	override fun onActivityPaused(activity: Activity) = Unit
-
-	override fun onActivityStopped(activity: Activity) = Unit
-
-	override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
-
 	override fun onActivityDestroyed(activity: Activity) {
 		if (activity !is ProtectActivity && activity.isFinishing && activity.isTaskRoot) {
 			restoreLock()

app/src/main/java/org/koitharu/kotatsu/main/ui/protect/ProtectActivity.kt

@@ -49,7 +49,10 @@ class ProtectActivity :
 			startActivity(intent)
 			finishAfterTransition()
 		}
+	}
 
+	override fun onStart() {
+		super.onStart()
 		if (!useFingerprint()) {
 			binding.editPassword.requestFocus()
 		}

app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt

@@ -7,14 +7,16 @@ import android.net.Uri
 import androidx.collection.LongSparseArray
 import androidx.collection.set
 import dagger.hilt.android.qualifiers.ApplicationContext
-import java.io.File
-import java.util.*
-import java.util.concurrent.atomic.AtomicInteger
-import java.util.zip.ZipFile
-import javax.inject.Inject
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.OkHttpClient
@@ -30,7 +32,15 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.utils.ext.connectivityManager
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.progress.ProgressDeferred
+import java.io.File
+import java.util.LinkedList
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.zip.ZipFile
+import javax.inject.Inject
+import kotlin.coroutines.AbstractCoroutineContextElement
+import kotlin.coroutines.CoroutineContext
 
 private const val PROGRESS_UNDEFINED = -1f
 private const val PREFETCH_LIMIT_DEFAULT = 10
@@ -43,7 +53,7 @@ class PageLoader @Inject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) : Closeable {
 
-	val loaderScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+	val loaderScope = CoroutineScope(SupervisorJob() + InternalErrorHandler() + Dispatchers.Default)
 
 	private val connectivityManager = context.connectivityManager
 	private val tasks = LongSparseArray<ProgressDeferred<File, Float>>()
@@ -197,4 +207,13 @@ class PageLoader @Inject constructor(
 		val deferred = CompletableDeferred(file)
 		return ProgressDeferred(deferred, emptyProgressFlow)
 	}
+
+	private class InternalErrorHandler : AbstractCoroutineContextElement(CoroutineExceptionHandler),
+		CoroutineExceptionHandler {
+
+		override fun handleException(context: CoroutineContext, exception: Throwable) {
+			exception.printStackTraceDebug()
+		}
+
+	}
 }

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

@@ -9,15 +9,23 @@ import android.transition.Fade
 import android.transition.Slide
 import android.transition.TransitionManager
 import android.transition.TransitionSet
-import android.view.*
+import android.view.Gravity
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuItem
+import android.view.MotionEvent
+import android.view.View
+import android.view.WindowManager
 import androidx.core.graphics.Insets
-import androidx.core.view.*
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -42,7 +50,16 @@ import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.utils.GridTouchHelper
 import org.koitharu.kotatsu.utils.IdlingDetector
 import org.koitharu.kotatsu.utils.ShareHelper
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.ext.assistedViewModels
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
+import org.koitharu.kotatsu.utils.ext.hasGlobalPoint
+import org.koitharu.kotatsu.utils.ext.isReportable
+import org.koitharu.kotatsu.utils.ext.observeWithPrevious
+import org.koitharu.kotatsu.utils.ext.postDelayed
+import org.koitharu.kotatsu.utils.ext.report
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class ReaderActivity :
@@ -145,6 +162,7 @@ class ReaderActivity :
 			R.id.action_settings -> {
 				startActivity(SettingsActivity.newReaderSettingsIntent(this))
 			}
+
 			R.id.action_chapters -> {
 				ChaptersBottomSheet.show(
 					supportFragmentManager,
@@ -152,6 +170,7 @@ class ReaderActivity :
 					viewModel.getCurrentState()?.chapterId ?: 0L,
 				)
 			}
+
 			R.id.action_pages_thumbs -> {
 				val pages = viewModel.getCurrentChapterPages()
 				if (!pages.isNullOrEmpty()) {
@@ -165,6 +184,7 @@ class ReaderActivity :
 					return false
 				}
 			}
+
 			R.id.action_bookmark -> {
 				if (viewModel.isBookmarkAdded.value == true) {
 					viewModel.removeBookmark()
@@ -172,11 +192,13 @@ class ReaderActivity :
 					viewModel.addBookmark()
 				}
 			}
+
 			R.id.action_options -> {
 				viewModel.saveCurrentState(readerManager.currentReader?.getCurrentState())
 				val currentMode = readerManager.currentMode ?: return false
 				ReaderConfigBottomSheet.show(supportFragmentManager, currentMode)
 			}
+
 			else -> return super.onOptionsItemSelected(item)
 		}
 		return true
@@ -364,7 +386,7 @@ class ReaderActivity :
 				binding.toastView.showTemporary(uiState.chapterName, TOAST_DURATION)
 			}
 		}
-		if (uiState.totalPages > 1 && uiState.currentPage < uiState.totalPages) {
+		if (uiState.isSliderAvailable()) {
 			binding.slider.valueTo = uiState.totalPages.toFloat() - 1
 			binding.slider.value = uiState.currentPage.toFloat()
 			binding.slider.isVisible = true
@@ -383,7 +405,7 @@ class ReaderActivity :
 				if (ExceptionResolver.canResolve(exception)) {
 					tryResolve(exception)
 				} else {
-					exception.report("ReaderActivity::onError")
+					exception.report()
 				}
 			} else {
 				onCancel(dialog)

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderConfigDialog.kt

@@ -1,83 +0,0 @@
-package org.koitharu.kotatsu.reader.ui
-
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.base.ui.widgets.CheckableButtonGroup
-import org.koitharu.kotatsu.core.prefs.ReaderMode
-import org.koitharu.kotatsu.databinding.DialogReaderConfigBinding
-import org.koitharu.kotatsu.utils.ext.withArgs
-
-@Deprecated("Not in use")
-class ReaderConfigDialog :
-	AlertDialogFragment<DialogReaderConfigBinding>(),
-	CheckableButtonGroup.OnCheckedChangeListener {
-
-	private lateinit var mode: ReaderMode
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = DialogReaderConfigBinding.inflate(inflater, container, false)
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		mode = arguments?.getInt(ARG_MODE)
-			?.let { ReaderMode.valueOf(it) }
-			?: ReaderMode.STANDARD
-	}
-
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder)
-			.setTitle(R.string.read_mode)
-			.setPositiveButton(R.string.done, null)
-			.setCancelable(true)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		binding.buttonStandard.isChecked = mode == ReaderMode.STANDARD
-		binding.buttonReversed.isChecked = mode == ReaderMode.REVERSED
-		binding.buttonWebtoon.isChecked = mode == ReaderMode.WEBTOON
-
-		binding.checkableGroup.onCheckedChangeListener = this
-	}
-
-	override fun onDismiss(dialog: DialogInterface) {
-		(
-			(parentFragment as? Callback)
-				?: (activity as? Callback)
-			)?.onReaderModeChanged(mode)
-		super.onDismiss(dialog)
-	}
-
-	override fun onCheckedChanged(group: CheckableButtonGroup, checkedId: Int) {
-		mode = when (checkedId) {
-			R.id.button_standard -> ReaderMode.STANDARD
-			R.id.button_webtoon -> ReaderMode.WEBTOON
-			R.id.button_reversed -> ReaderMode.REVERSED
-			else -> return
-		}
-	}
-
-	interface Callback {
-
-		fun onReaderModeChanged(mode: ReaderMode)
-	}
-
-	companion object {
-
-		private const val TAG = "ReaderConfigDialog"
-		private const val ARG_MODE = "mode"
-
-		fun show(fm: FragmentManager, mode: ReaderMode) = ReaderConfigDialog().withArgs(1) {
-			putInt(ARG_MODE, mode.id)
-		}.show(fm, TAG)
-	}
-}

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

@@ -62,8 +62,9 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	init {
 		paint.strokeWidth = context.resources.resolveDp(2f)
 		val insetCorner = getSystemUiDimensionOffset("rounded_corner_content_padding")
-		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start") + insetCorner
-		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end") + insetCorner
+		val fallbackInset = resources.getDimensionPixelOffset(R.dimen.reader_bar_inset_fallback)
+		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start", fallbackInset) + insetCorner
+		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end", fallbackInset) + insetCorner
 		val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
 		insetLeft = if (isRtl) insetEnd else insetStart
 		insetRight = if (isRtl) insetStart else insetEnd
@@ -179,12 +180,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 		}
 	}
 
-	private fun getSystemUiDimensionOffset(name: String): Int = runCatching {
+	private fun getSystemUiDimensionOffset(name: String, fallback: Int = 0): Int = runCatching {
 		val manager = context.packageManager
 		val resources = manager.getResourcesForApplication("com.android.systemui")
 		val resId = resources.getIdentifier(name, "dimen", "com.android.systemui")
 		resources.getDimensionPixelOffset(resId)
 	}.onFailure {
 		it.printStackTraceDebug()
-	}.getOrDefault(0)
+	}.getOrDefault(fallback)
 }

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderManager.kt

@@ -8,7 +8,7 @@ import org.koitharu.kotatsu.reader.ui.pager.BaseReader
 import org.koitharu.kotatsu.reader.ui.pager.reversed.ReversedReaderFragment
 import org.koitharu.kotatsu.reader.ui.pager.standard.PagerReaderFragment
 import org.koitharu.kotatsu.reader.ui.pager.webtoon.WebtoonReaderFragment
-import java.util.*
+import java.util.EnumMap
 
 class ReaderManager(
 	private val fragmentManager: FragmentManager,
@@ -35,11 +35,15 @@ class ReaderManager(
 	fun replace(newMode: ReaderMode) {
 		val readerClass = requireNotNull(modeMap[newMode])
 		fragmentManager.commit {
+			setReorderingAllowed(true)
 			replace(containerResId, readerClass, null, null)
 		}
 	}
 
 	fun replace(reader: BaseReader<*>) {
-		fragmentManager.commit { replace(containerResId, reader) }
+		fragmentManager.commit {
+			setReorderingAllowed(true)
+			replace(containerResId, reader)
+		}
 	}
-}
+}

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

@@ -10,10 +10,22 @@ import androidx.lifecycle.viewModelScope
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import java.util.*
-import javax.inject.Provider
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.domain.MangaIntent
@@ -21,7 +33,11 @@ import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.*
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ReaderMode
+import org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.core.prefs.observeAsLiveData
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
@@ -38,6 +54,9 @@ import org.koitharu.kotatsu.utils.asFlowLiveData
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import org.koitharu.kotatsu.utils.ext.requireValue
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import java.util.Date
+import javax.inject.Provider
 
 private const val BOUNDS_PAGE_OFFSET = 2
 private const val PREFETCH_LIMIT = 10
@@ -87,6 +106,12 @@ class ReaderViewModel @AssistedInject constructor(
 		valueProducer = { isReaderBarEnabled },
 	)
 
+	val isWebtoonZoomEnabled = settings.observeAsLiveData(
+		context = viewModelScope.coroutineContext + Dispatchers.Default,
+		key = AppSettings.KEY_WEBTOON_ZOOM,
+		valueProducer = { isWebtoonZoomEnable },
+	)
+
 	val readerSettings = ReaderSettings(
 		parentScope = viewModelScope,
 		settings = settings,
@@ -115,6 +140,10 @@ class ReaderViewModel @AssistedInject constructor(
 
 	init {
 		loadImpl()
+		settings.observe()
+			.onEach { key ->
+				if (key == AppSettings.KEY_READER_SLIDER) notifyStateChanged()
+			}.launchIn(viewModelScope)
 	}
 
 	override fun onCleared() {
@@ -326,7 +355,7 @@ class ReaderViewModel @AssistedInject constructor(
 			?: manga.chapters?.randomOrNull()
 			?: error("There are no chapters in this manga")
 		val pages = repo.getPages(chapter)
-		return runCatching {
+		return runCatchingCancellable {
 			val isWebtoon = dataRepository.determineMangaIsWebtoon(repo, pages)
 			if (isWebtoon) ReaderMode.WEBTOON else defaultMode
 		}.onSuccess {
@@ -347,6 +376,7 @@ class ReaderViewModel @AssistedInject constructor(
 			chaptersTotal = chapters.size(),
 			totalPages = if (chapter != null) chaptersLoader.getPagesCount(chapter.id) else 0,
 			currentPage = state?.page ?: 0,
+			isSliderEnabled = settings.isReaderSliderEnabled,
 		)
 		uiState.postValue(newState)
 	}
@@ -381,7 +411,7 @@ class ReaderViewModel @AssistedInject constructor(
  */
 private fun HistoryRepository.saveStateAsync(manga: Manga, state: ReaderState, percent: Float): Job {
 	return processLifecycleScope.launch(Dispatchers.Default) {
-		runCatching {
+		runCatchingCancellable {
 			addOrUpdate(
 				manga = manga,
 				chapterId = state.chapterId,

app/src/main/java/org/koitharu/kotatsu/reader/ui/config/ReaderSettings.kt

@@ -2,9 +2,13 @@ package org.koitharu.kotatsu.reader.ui.config
 
 import android.content.SharedPreferences
 import androidx.lifecycle.MediatorLiveData
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
@@ -60,7 +64,7 @@ class ReaderSettings(
 		}
 
 		override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-			if (key == AppSettings.KEY_ZOOM_MODE || key == AppSettings.KEY_PAGES_NUMBERS) {
+			if (key == AppSettings.KEY_ZOOM_MODE || key == AppSettings.KEY_PAGES_NUMBERS || key == AppSettings.KEY_WEBTOON_ZOOM) {
 				notifyChanged()
 			}
 		}

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt

@@ -4,17 +4,23 @@ import android.net.Uri
 import androidx.core.net.toUri
 import androidx.lifecycle.Observer
 import com.davemorrissey.labs.subscaleview.DefaultOnImageEventListener
-import java.io.File
-import java.io.IOException
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
+import java.io.File
+import java.io.IOException
 
 class PageHolderDelegate(
 	private val loader: PageLoader,
@@ -102,6 +108,8 @@ class PageHolderDelegate(
 				loader.convertInPlace(file)
 				state = State.CONVERTED
 				callback.onImageReady(file.toUri())
+			} catch (ce: CancellationException) {
+				throw ce
 			} catch (e2: Throwable) {
 				e.addSuppressed(e2)
 				state = State.ERROR
@@ -124,7 +132,7 @@ class PageHolderDelegate(
 			callback.onImageReady(file.toUri())
 		} catch (e: CancellationException) {
 			throw e
-		} catch (e: Exception) {
+		} catch (e: Throwable) {
 			state = State.ERROR
 			error = e
 			callback.onError(e)

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderUiState.kt

@@ -7,8 +7,13 @@ data class ReaderUiState(
 	val chaptersTotal: Int,
 	val currentPage: Int,
 	val totalPages: Int,
+	private val isSliderEnabled: Boolean,
 ) {
 
+	fun isSliderAvailable(): Boolean {
+		return isSliderEnabled && totalPages > 1 && currentPage < totalPages
+	}
+
 	fun computePercent(): Float {
 		val ppc = 1f / chaptersTotal
 		val chapterIndex = chapterNumber - 1

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt

@@ -35,6 +35,10 @@ class WebtoonReaderFragment : BaseReader<FragmentReaderWebtoonBinding>() {
 			adapter = webtoonAdapter
 			addOnPageScrollListener(PageScrollListener())
 		}
+
+		viewModel.isWebtoonZoomEnabled.observe(viewLifecycleOwner) {
+			binding.frame.isZoomEnable = it
+		}
 	}
 
 	override fun onDestroyView() {

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

@@ -0,0 +1,213 @@
+package org.koitharu.kotatsu.reader.ui.pager.webtoon
+
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.graphics.Matrix
+import android.graphics.Rect
+import android.graphics.RectF
+import android.util.AttributeSet
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.ScaleGestureDetector
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.widget.FrameLayout
+import android.widget.OverScroller
+import androidx.core.view.GestureDetectorCompat
+
+private const val MAX_SCALE = 2.5f
+private const val MIN_SCALE = 1f // under-scaling disabled due to buggy nested scroll
+
+class WebtoonScalingFrame @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyles: Int = 0,
+) : FrameLayout(context, attrs, defStyles), ScaleGestureDetector.OnScaleGestureListener {
+
+	private val targetChild by lazy(LazyThreadSafetyMode.NONE) { getChildAt(0) }
+
+	private val scaleDetector = ScaleGestureDetector(context, this)
+	private val gestureDetector = GestureDetectorCompat(context, GestureListener())
+	private val overScroller = OverScroller(context, AccelerateDecelerateInterpolator())
+	private val transformMatrix = Matrix()
+	private val matrixValues = FloatArray(9)
+	private val scale
+		get() = matrixValues[Matrix.MSCALE_X]
+	private val transX
+		get() = halfWidth * (scale - 1f) + matrixValues[Matrix.MTRANS_X]
+	private val transY
+		get() = halfHeight * (scale - 1f) + matrixValues[Matrix.MTRANS_Y]
+	private var halfWidth = 0f
+	private var halfHeight = 0f
+	private val translateBounds = RectF()
+	private val targetHitRect = Rect()
+	private var pendingScroll = 0
+
+	var isZoomEnable = true
+		set(value) {
+			field = value
+			if (scale != 1f) {
+				scaleChild(1f, halfWidth, halfHeight)
+			}
+		}
+
+	init {
+		syncMatrixValues()
+	}
+
+	override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+		if (!isZoomEnable || ev == null) {
+			return super.dispatchTouchEvent(ev)
+		}
+
+		if (ev.action == MotionEvent.ACTION_DOWN && overScroller.computeScrollOffset()) {
+			overScroller.forceFinished(true)
+		}
+
+		gestureDetector.onTouchEvent(ev)
+		scaleDetector.onTouchEvent(ev)
+
+		// Offset event to inside the child view
+		if (scale < 1 && !targetHitRect.contains(ev.x.toInt(), ev.y.toInt())) {
+			ev.offsetLocation(halfWidth - ev.x + targetHitRect.width() / 3, 0f)
+		}
+
+		// Send action cancel to avoid recycler jump when scale end
+		if (scaleDetector.isInProgress) {
+			ev.action = MotionEvent.ACTION_CANCEL
+		}
+		return super.dispatchTouchEvent(ev)
+	}
+
+	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+		halfWidth = measuredWidth / 2f
+		halfHeight = measuredHeight / 2f
+	}
+
+	private fun invalidateTarget() {
+		adjustBounds()
+		targetChild.run {
+			scaleX = scale
+			scaleY = scale
+			translationX = transX
+			translationY = transY
+		}
+
+		val newHeight = if (scale < 1f) (height / scale).toInt() else height
+		if (newHeight != targetChild.height) {
+			targetChild.layoutParams.height = newHeight
+			targetChild.requestLayout()
+		}
+
+		if (scale < 1) {
+			targetChild.getHitRect(targetHitRect)
+			targetChild.scrollBy(0, pendingScroll)
+			pendingScroll = 0
+		}
+	}
+
+	private fun syncMatrixValues() {
+		transformMatrix.getValues(matrixValues)
+	}
+
+	private fun adjustBounds() {
+		syncMatrixValues()
+		val dx = when {
+			transX < translateBounds.left -> translateBounds.left - transX
+			transX > translateBounds.right -> translateBounds.right - transX
+			else -> 0f
+		}
+
+		val dy = when {
+			transY < translateBounds.top -> translateBounds.top - transY
+			transY > translateBounds.bottom -> translateBounds.bottom - transY
+			else -> 0f
+		}
+
+		pendingScroll = dy.toInt()
+		transformMatrix.postTranslate(dx, dy)
+		syncMatrixValues()
+	}
+
+	private fun scaleChild(newScale: Float, focusX: Float, focusY: Float) {
+		val factor = newScale / scale
+		if (newScale > 1) {
+			translateBounds.set(
+				halfWidth * (1 - newScale),
+				halfHeight * (1 - newScale),
+				halfWidth * (newScale - 1),
+				halfHeight * (newScale - 1),
+			)
+		} else {
+			translateBounds.set(
+				0f,
+				halfHeight - halfHeight / newScale,
+				0f,
+				halfHeight - halfHeight / newScale,
+			)
+		}
+		transformMatrix.postScale(factor, factor, focusX, focusY)
+		invalidateTarget()
+	}
+
+
+	override fun onScale(detector: ScaleGestureDetector): Boolean {
+		val newScale = (scale * detector.scaleFactor).coerceIn(MIN_SCALE, MAX_SCALE)
+		scaleChild(newScale, detector.focusX, detector.focusY)
+		return true
+	}
+
+	override fun onScaleBegin(detector: ScaleGestureDetector): Boolean = true
+
+	override fun onScaleEnd(p0: ScaleGestureDetector) {
+		pendingScroll = 0
+	}
+
+
+	private inner class GestureListener : GestureDetector.SimpleOnGestureListener(), Runnable {
+		override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+			if (scale <= 1f) return false
+			transformMatrix.postTranslate(-distanceX, -distanceY)
+			invalidateTarget()
+			return true
+		}
+
+		override fun onDoubleTap(e: MotionEvent): Boolean {
+			val newScale = if (scale != 1f) 1f else MAX_SCALE * 0.8f
+			ObjectAnimator.ofFloat(scale, newScale).run {
+				interpolator = AccelerateDecelerateInterpolator()
+				duration = 300
+				addUpdateListener {
+					scaleChild(it.animatedValue as Float, e.x, e.y)
+				}
+				start()
+			}
+			return true
+		}
+
+		override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+			if (scale <= 1) return false
+
+			overScroller.fling(
+				transX.toInt(),
+				transY.toInt(),
+				velocityX.toInt(),
+				velocityY.toInt(),
+				translateBounds.left.toInt(),
+				translateBounds.right.toInt(),
+				translateBounds.top.toInt(),
+				translateBounds.bottom.toInt(),
+			)
+			postOnAnimation(this)
+			return true
+		}
+
+		override fun run() {
+			if (overScroller.computeScrollOffset()) {
+				transformMatrix.postTranslate(overScroller.currX - transX, overScroller.currY - transY)
+				invalidateTarget()
+				postOnAnimation(this)
+			}
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt

@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
 import org.koitharu.kotatsu.utils.ext.decodeRegion
 import org.koitharu.kotatsu.utils.ext.isLowRamDevice
 import org.koitharu.kotatsu.utils.ext.referer
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.ext.setTextColorAttr
 
 fun pageThumbnailAD(
@@ -72,7 +73,7 @@ fun pageThumbnailAD(
 			text = (item.number).toString()
 		}
 		job = scope.launch {
-			val drawable = runCatching {
+			val drawable = runCatchingCancellable {
 				loadPageThumbnail(item)
 			}.getOrNull()
 			binding.imageViewThumb.setImageDrawable(drawable)

app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt

@@ -5,11 +5,16 @@ import androidx.lifecycle.viewModelScope
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import java.util.*
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
@@ -21,13 +26,20 @@ import org.koitharu.kotatsu.list.ui.filter.FilterCoordinator
 import org.koitharu.kotatsu.list.ui.filter.FilterItem
 import org.koitharu.kotatsu.list.ui.filter.FilterState
 import org.koitharu.kotatsu.list.ui.filter.OnFilterChangedListener
-import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListHeader2
+import org.koitharu.kotatsu.list.ui.model.LoadingFooter
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.toErrorFooter
+import org.koitharu.kotatsu.list.ui.model.toErrorState
+import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.search.domain.MangaSearchRepository
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import java.util.LinkedList
 
 private const val FILTER_MIN_INTERVAL = 250L
 
@@ -138,6 +150,8 @@ class RemoteListViewModel @AssistedInject constructor(
 					mangaList.value = mangaList.value?.plus(list) ?: list
 				}
 				hasNextPage.value = list.isNotEmpty()
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Throwable) {
 				e.printStackTraceDebug()
 				listError.value = e
@@ -149,7 +163,7 @@ class RemoteListViewModel @AssistedInject constructor(
 	}
 
 	private fun createEmptyState(canResetFilter: Boolean) = EmptyState(
-		icon = R.drawable.ic_empty_search,
+		icon = R.drawable.ic_empty_common,
 		textPrimary = R.string.nothing_found,
 		textSecondary = 0,
 		actionStringRes = if (canResetFilter) R.string.reset_filter else 0,

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

@@ -3,15 +3,20 @@ package org.koitharu.kotatsu.scrobbling.domain
 import androidx.collection.LongSparseArray
 import androidx.collection.getOrElse
 import androidx.core.text.parseAsHtml
-import java.util.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.scrobbling.data.ScrobblingEntity
-import org.koitharu.kotatsu.scrobbling.domain.model.*
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblerManga
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblerMangaInfo
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblerService
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
 import org.koitharu.kotatsu.utils.ext.findKeyByValue
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import java.util.EnumMap
 
 abstract class Scrobbler(
 	protected val db: MangaDatabase,
@@ -47,7 +52,7 @@ abstract class Scrobbler(
 
 	private suspend fun ScrobblingEntity.toScrobblingInfo(mangaId: Long): ScrobblingInfo? {
 		val mangaInfo = infoCache.getOrElse(targetId) {
-			runCatching {
+			runCatchingCancellable {
 				getMangaInfo(targetId)
 			}.onFailure {
 				it.printStackTraceDebug()
@@ -72,9 +77,9 @@ abstract class Scrobbler(
 }
 
 suspend fun Scrobbler.tryScrobble(mangaId: Long, chapter: MangaChapter): Boolean {
-	return runCatching {
+	return runCatchingCancellable {
 		scrobble(mangaId, chapter)
 	}.onFailure {
 		it.printStackTraceDebug()
 	}.isSuccess
-}
+}

app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt

@@ -21,6 +21,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.util.levenshteinDistance
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class MangaSearchRepository @Inject constructor(
 	private val settings: AppSettings,
@@ -33,7 +34,7 @@ class MangaSearchRepository @Inject constructor(
 	fun globalSearch(query: String, concurrency: Int = DEFAULT_CONCURRENCY): Flow<Manga> =
 		settings.getMangaSources(includeHidden = false).asFlow()
 			.flatMapMerge(concurrency) { source ->
-				runCatching {
+				runCatchingCancellable {
 					mangaRepositoryFactory.create(source).getList(
 						offset = 0,
 						query = query,

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

@@ -18,6 +18,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
+import kotlin.text.Typography.dagger
 
 @AndroidEntryPoint
 class MangaListActivity :
@@ -41,6 +42,7 @@ class MangaListActivity :
 		val fm = supportFragmentManager
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
+				setReorderingAllowed(true)
 				val fragment = if (source == MangaSource.LOCAL) {
 					LocalListFragment.newInstance()
 				} else {

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

@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.databinding.ActivitySearchBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 import org.koitharu.kotatsu.utils.ext.showKeyboard
+import kotlin.text.Typography.dagger
 
 @AndroidEntryPoint
 class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQueryTextListener {
@@ -61,6 +62,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 		}
 		title = query
 		supportFragmentManager.commit {
+			setReorderingAllowed(true)
 			replace(R.id.container, SearchFragment.newInstance(source, q))
 		}
 		binding.searchView.clearFocus()

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

@@ -4,6 +4,7 @@ import androidx.lifecycle.viewModelScope
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -12,7 +13,13 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
-import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingFooter
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.toErrorFooter
+import org.koitharu.kotatsu.list.ui.model.toErrorState
+import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
@@ -41,12 +48,13 @@ class SearchViewModel @AssistedInject constructor(
 			list == null -> listOf(LoadingState)
 			list.isEmpty() -> listOf(
 				EmptyState(
-					icon = R.drawable.ic_empty_search,
+					icon = R.drawable.ic_empty_common,
 					textPrimary = R.string.nothing_found,
 					textSecondary = R.string.text_search_holder_secondary,
 					actionStringRes = 0,
 				),
 			)
+
 			else -> {
 				val result = ArrayList<ListModel>(list.size + 1)
 				list.toUi(result, mode)
@@ -94,6 +102,8 @@ class SearchViewModel @AssistedInject constructor(
 					mangaList.value = mangaList.value?.plus(list) ?: list
 				}
 				hasNextPage.value = list.isNotEmpty()
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Throwable) {
 				listError.value = e
 			}

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

@@ -20,6 +20,7 @@ import org.koitharu.kotatsu.list.ui.model.*
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 private const val MAX_PARALLELISM = 4
 private const val MIN_HAS_MORE_ITEMS = 8
@@ -47,13 +48,14 @@ class MultiSearchViewModel @AssistedInject constructor(
 					loading -> LoadingState
 					error != null -> error.toErrorState(canRetry = true)
 					else -> EmptyState(
-						icon = R.drawable.ic_empty_search,
+						icon = R.drawable.ic_empty_common,
 						textPrimary = R.string.nothing_found,
 						textSecondary = R.string.text_search_holder_secondary,
 						actionStringRes = 0,
 					)
 				},
 			)
+
 			loading -> list + LoadingFooter
 			else -> list
 		}
@@ -85,6 +87,8 @@ class MultiSearchViewModel @AssistedInject constructor(
 				loadingData.value = true
 				query.postValue(q)
 				searchImpl(q)
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Throwable) {
 				listError.value = e
 			} finally {
@@ -98,7 +102,7 @@ class MultiSearchViewModel @AssistedInject constructor(
 		val dispatcher = Dispatchers.Default.limitedParallelism(MAX_PARALLELISM)
 		val deferredList = sources.map { source ->
 			async(dispatcher) {
-				runCatching {
+				runCatchingCancellable {
 					val list = mangaRepositoryFactory.create(source).getList(offset = 0, query = q)
 						.toUi(ListMode.GRID)
 					if (list.isNotEmpty()) {

app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt

@@ -8,7 +8,7 @@ import androidx.preference.Preference
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
@@ -23,6 +23,7 @@ import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.FileSize
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cache) {
@@ -82,18 +83,22 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 				clearCache(preference, CacheDir.PAGES)
 				true
 			}
+
 			AppSettings.KEY_THUMBS_CACHE_CLEAR -> {
 				clearCache(preference, CacheDir.THUMBS)
 				true
 			}
+
 			AppSettings.KEY_COOKIES_CLEAR -> {
 				clearCookies()
 				true
 			}
+
 			AppSettings.KEY_SEARCH_HISTORY_CLEAR -> {
 				clearSearchHistory(preference)
 				true
 			}
+
 			AppSettings.KEY_UPDATES_FEED_CLEAR -> {
 				viewLifecycleScope.launch {
 					trackerRepo.clearLogs()
@@ -107,6 +112,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 				}
 				true
 			}
+
 			AppSettings.KEY_SHIKIMORI -> {
 				if (!shikimoriRepository.isAuthorized) {
 					launchShikimoriAuth()
@@ -115,6 +121,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 					super.onPreferenceTreeClick(preference)
 				}
 			}
+
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
@@ -127,6 +134,8 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 				storageManager.clearCache(cache)
 				val size = storageManager.computeCacheSize(cache)
 				preference.summary = FileSize.BYTES.format(ctx, size)
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Exception) {
 				preference.summary = e.getDisplayMessage(ctx.resources)
 			} finally {

app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt

@@ -7,7 +7,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.launch
@@ -20,7 +19,14 @@ import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.ext.awaitViewLifecycle
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import org.koitharu.kotatsu.utils.ext.serializableArgument
+import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
+import org.koitharu.kotatsu.utils.ext.withArgs
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class SourceSettingsFragment : BasePreferenceFragment(0) {
@@ -66,12 +72,13 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
 				startActivity(SourceAuthActivity.newIntent(preference.context, source))
 				true
 			}
+
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
 
 	private fun loadUsername(owner: LifecycleOwner, preference: Preference) = owner.lifecycleScope.launch {
-		runCatching {
+		runCatchingCancellable {
 			preference.summary = null
 			withContext(Dispatchers.Default) {
 				requireNotNull(repository?.getAuthProvider()?.getUsername())
@@ -91,6 +98,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
 					).setAction(ExceptionResolver.getResolveStringId(error)) { resolveError(error) }
 						.show()
 				}
+
 				else -> preference.summary = error.getDisplayMessage(preference.context.resources)
 			}
 			error.printStackTraceDebug()

app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupDialogFragment.kt

@@ -11,13 +11,13 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import java.io.File
-import java.io.FileOutputStream
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
 import org.koitharu.kotatsu.databinding.DialogProgressBinding
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.progress.Progress
+import java.io.File
+import java.io.FileOutputStream
 
 @AndroidEntryPoint
 class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
@@ -91,6 +91,8 @@ class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 			}
 			Toast.makeText(requireContext(), R.string.backup_saved, Toast.LENGTH_LONG).show()
 			dismiss()
+		} catch (e: InterruptedException) {
+			throw e
 		} catch (e: Exception) {
 			onError(e)
 		}

app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt

@@ -11,8 +11,8 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.databinding.DialogOnboardBinding
+import org.koitharu.kotatsu.settings.onboard.adapter.SourceLocaleListener
 import org.koitharu.kotatsu.settings.onboard.adapter.SourceLocalesAdapter
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import org.koitharu.kotatsu.utils.ext.showAllowStateLoss
@@ -21,8 +21,7 @@ import org.koitharu.kotatsu.utils.ext.withArgs
 @AndroidEntryPoint
 class OnboardDialogFragment :
 	AlertDialogFragment<DialogOnboardBinding>(),
-	OnListItemClickListener<SourceLocale>,
-	DialogInterface.OnClickListener {
+	DialogInterface.OnClickListener, SourceLocaleListener {
 
 	private val viewModel by viewModels<OnboardViewModel>()
 	private var isWelcome: Boolean = false
@@ -63,8 +62,8 @@ class OnboardDialogFragment :
 		}
 	}
 
-	override fun onItemClick(item: SourceLocale, view: View) {
-		viewModel.setItemChecked(item.key, !item.isChecked)
+	override fun onItemCheckedChanged(item: SourceLocale, isChecked: Boolean) {
+		viewModel.setItemChecked(item.key, isChecked)
 	}
 
 	override fun onClick(dialog: DialogInterface?, which: Int) {

app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt

@@ -1,11 +1,8 @@
 package org.koitharu.kotatsu.settings.onboard
 
-import androidx.collection.ArraySet
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.MutableLiveData
 import dagger.hilt.android.lifecycle.HiltViewModel
-import java.util.*
-import javax.inject.Inject
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -15,6 +12,8 @@ import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import org.koitharu.kotatsu.utils.ext.map
 import org.koitharu.kotatsu.utils.ext.mapToSet
+import java.util.Locale
+import javax.inject.Inject
 
 @HiltViewModel
 class OnboardViewModel @Inject constructor(
@@ -23,9 +22,9 @@ class OnboardViewModel @Inject constructor(
 
 	private val allSources = settings.remoteMangaSources
 
-	private val locales = allSources.mapTo(ArraySet()) { it.locale }
+	private val locales = allSources.groupBy { it.locale }
 
-	private val selectedLocales = locales.toMutableSet()
+	private val selectedLocales = locales.keys.toMutableSet()
 
 	val list = MutableLiveData<List<SourceLocale>?>()
 
@@ -64,13 +63,14 @@ class OnboardViewModel @Inject constructor(
 	}
 
 	private fun rebuildList() {
-		list.value = locales.map { key ->
+		list.value = locales.map { (key, srcs) ->
 			val locale = if (key != null) {
 				Locale(key)
 			} else null
 			SourceLocale(
 				key = key,
 				title = locale?.getDisplayLanguage(locale)?.toTitleCase(locale),
+				summary = srcs.joinToString { it.title },
 				isChecked = key in selectedLocales,
 			)
 		}.sortedWith(SourceLocaleComparator())
@@ -87,11 +87,12 @@ class OnboardViewModel @Inject constructor(
 				a?.key == null -> 1
 				b?.key == null -> -1
 				else -> {
-					val index = deviceLocales.indexOf(a.key)
-					if (index == -1) {
+					val indexA = deviceLocales.indexOf(a.key)
+					val indexB = deviceLocales.indexOf(b.key)
+					if (indexA == -1 && indexB == -1) {
 						compareValues(a.title, b.title)
 					} else {
-						-2 - index
+						-2 - (indexA - indexB)
 					}
 				}
 			}

app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocaleAD.kt

@@ -2,22 +2,23 @@ package org.koitharu.kotatsu.settings.onboard.adapter
 
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.databinding.ItemSourceLocaleBinding
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
+import org.koitharu.kotatsu.utils.ext.textAndVisible
 
 fun sourceLocaleAD(
-	clickListener: OnListItemClickListener<SourceLocale>
+	listener: SourceLocaleListener,
 ) = adapterDelegateViewBinding<SourceLocale, SourceLocale, ItemSourceLocaleBinding>(
-	{ inflater, parent -> ItemSourceLocaleBinding.inflate(inflater, parent, false) }
+	{ inflater, parent -> ItemSourceLocaleBinding.inflate(inflater, parent, false) },
 ) {
 
-	binding.root.setOnClickListener {
-		clickListener.onItemClick(item, it)
+	binding.switchToggle.setOnCheckedChangeListener { _, isChecked ->
+		listener.onItemCheckedChanged(item, isChecked)
 	}
 
 	bind {
-		binding.root.text = item.title ?: getString(R.string.other)
-		binding.root.isChecked = item.isChecked
+		binding.textViewTitle.text = item.title ?: getString(R.string.different_languages)
+		binding.textViewDescription.textAndVisible = item.summary
+		binding.switchToggle.isChecked = item.isChecked
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocaleListener.kt

@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.settings.onboard.adapter
+
+import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
+
+interface SourceLocaleListener {
+
+	fun onItemCheckedChanged(item: SourceLocale, isChecked: Boolean)
+}

app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocalesAdapter.kt

@@ -2,15 +2,14 @@ package org.koitharu.kotatsu.settings.onboard.adapter
 
 import androidx.recyclerview.widget.DiffUtil
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 
 class SourceLocalesAdapter(
-	clickListener: OnListItemClickListener<SourceLocale>,
+	listener: SourceLocaleListener,
 ) : AsyncListDifferDelegationAdapter<SourceLocale>(DiffCallback()) {
 
 	init {
-		delegatesManager.addDelegate(sourceLocaleAD(clickListener))
+		delegatesManager.addDelegate(sourceLocaleAD(listener))
 	}
 
 	private class DiffCallback : DiffUtil.ItemCallback<SourceLocale>() {
@@ -25,4 +24,4 @@ class SourceLocalesAdapter(
 			newItem: SourceLocale,
 		): Boolean = oldItem == newItem
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/settings/onboard/model/SourceLocale.kt

@@ -1,10 +1,11 @@
 package org.koitharu.kotatsu.settings.onboard.model
 
-import java.util.*
+import java.util.Locale
 
 data class SourceLocale(
 	val key: String?,
 	val title: String?,
+	val summary: String?,
 	val isChecked: Boolean,
 ) : Comparable<SourceLocale> {
 

app/src/main/java/org/koitharu/kotatsu/settings/tools/ToolsFragment.kt

@@ -91,8 +91,8 @@ class ToolsFragment :
 			binding.cardUpdate.root.isVisible = false
 			return
 		}
-		binding.cardUpdate.textPrimary.text = getString(R.string.app_update_available_s, version.name)
-		binding.cardUpdate.textSecondary.text = version.description
+		binding.cardUpdate.textSecondary.text = getString(R.string.new_version_s, version.name)
+		binding.cardUpdate.textChangelog.text = version.description
 		binding.cardUpdate.root.isVisible = true
 	}
 

app/src/main/java/org/koitharu/kotatsu/settings/utils/RingtonePickContract.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.provider.Settings
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.annotation.StringRes
+import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
 
 class RingtonePickContract(@StringRes private val titleResId: Int) : ActivityResultContract<Uri?, Uri?>() {
 
@@ -30,6 +31,6 @@ class RingtonePickContract(@StringRes private val titleResId: Int) : ActivityRes
 	}
 
 	override fun parseResult(resultCode: Int, intent: Intent?): Uri? {
-		return intent?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+		return intent?.getParcelableExtraCompat(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/shelf/domain/ShelfRepository.kt

@@ -0,0 +1,80 @@
+package org.koitharu.kotatsu.shelf.domain
+
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.toManga
+import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.toFavouriteCategory
+import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import javax.inject.Inject
+
+class ShelfRepository @Inject constructor(
+	private val localMangaRepository: LocalMangaRepository,
+	private val historyRepository: HistoryRepository,
+	private val db: MangaDatabase,
+) {
+
+	fun observeLocalManga(sortOrder: SortOrder): Flow<List<Manga>> {
+		return flow {
+			emit(null)
+			emitAll(localMangaRepository.watchReadableDirs())
+		}.mapLatest {
+			localMangaRepository.getList(0, null, sortOrder)
+		}
+	}
+
+	fun observeFavourites(): Flow<Map<FavouriteCategory, List<Manga>>> {
+		return db.favouriteCategoriesDao.observeAll()
+			.flatMapLatest { categories ->
+				val cats = categories.filter { it.isVisibleInLibrary }
+				if (cats.isEmpty()) {
+					flowOf(emptyMap())
+				} else {
+					observeCategoriesContent(cats)
+				}
+			}
+	}
+
+	suspend fun deleteLocalManga(ids: Set<Long>) {
+		val list = localMangaRepository.getList(0, null, null)
+			.filter { x -> x.id in ids }
+		coroutineScope {
+			list.map { manga ->
+				async {
+					val original = localMangaRepository.getRemoteManga(manga)
+					if (localMangaRepository.delete(manga)) {
+						runCatchingCancellable {
+							historyRepository.deleteOrSwap(manga, original)
+						}
+					}
+				}
+			}.awaitAll()
+		}
+	}
+
+	private fun observeCategoriesContent(
+		categories: List<FavouriteCategoryEntity>,
+	) = combine<Pair<FavouriteCategory, List<Manga>>, Map<FavouriteCategory, List<Manga>>>(
+		categories.map { cat ->
+			val category = cat.toFavouriteCategory()
+			db.favouritesDao.observeAll(category.id, category.order)
+				.map { category to it.map { x -> x.manga.toManga(x.tags.toMangaTags()) } }
+		},
+	) { array -> array.toMap() }
+}

app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfFragment.kt

@@ -1,6 +1,9 @@
-package org.koitharu.kotatsu.library.ui
+package org.koitharu.kotatsu.shelf.ui
 
+import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,7 +14,6 @@ import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.reverseAsync
 import org.koitharu.kotatsu.base.ui.BaseFragment
@@ -19,25 +21,29 @@ import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
 import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.base.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.databinding.FragmentLibraryBinding
+import org.koitharu.kotatsu.databinding.FragmentShelfBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.favourites.ui.FavouritesActivity
 import org.koitharu.kotatsu.history.ui.HistoryActivity
-import org.koitharu.kotatsu.library.ui.adapter.LibraryAdapter
-import org.koitharu.kotatsu.library.ui.adapter.LibraryListEventListener
-import org.koitharu.kotatsu.library.ui.model.LibrarySectionModel
 import org.koitharu.kotatsu.list.ui.ItemSizeResolver
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.search.ui.MangaListActivity
+import org.koitharu.kotatsu.shelf.ui.adapter.ShelfAdapter
+import org.koitharu.kotatsu.shelf.ui.adapter.ShelfListEventListener
+import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
+import org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity
 import org.koitharu.kotatsu.utils.ext.addMenuProvider
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class LibraryFragment :
-	BaseFragment<FragmentLibraryBinding>(),
+class ShelfFragment :
+	BaseFragment<FragmentShelfBinding>(),
 	RecyclerViewOwner,
-	LibraryListEventListener {
+	ShelfListEventListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
@@ -45,15 +51,15 @@ class LibraryFragment :
 	@Inject
 	lateinit var settings: AppSettings
 
-	private val viewModel by viewModels<LibraryViewModel>()
-	private var adapter: LibraryAdapter? = null
-	private var selectionController: SectionedSelectionController<LibrarySectionModel>? = null
+	private val viewModel by viewModels<ShelfViewModel>()
+	private var adapter: ShelfAdapter? = null
+	private var selectionController: SectionedSelectionController<ShelfSectionModel>? = null
 
 	override val recyclerView: RecyclerView
 		get() = binding.recyclerView
 
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): FragmentLibraryBinding {
-		return FragmentLibraryBinding.inflate(inflater, container, false)
+	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): FragmentShelfBinding {
+		return FragmentShelfBinding.inflate(inflater, container, false)
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -62,9 +68,9 @@ class LibraryFragment :
 		selectionController = SectionedSelectionController(
 			activity = requireActivity(),
 			owner = this,
-			callback = LibrarySelectionCallback(binding.recyclerView, childFragmentManager, viewModel),
+			callback = ShelfSelectionCallback(binding.recyclerView, childFragmentManager, viewModel),
 		)
-		adapter = LibraryAdapter(
+		adapter = ShelfAdapter(
 			lifecycleOwner = viewLifecycleOwner,
 			coil = coil,
 			listener = this,
@@ -73,7 +79,7 @@ class LibraryFragment :
 		)
 		binding.recyclerView.adapter = adapter
 		binding.recyclerView.setHasFixedSize(true)
-		addMenuProvider(LibraryMenuProvider(view.context, childFragmentManager, viewModel))
+		addMenuProvider(ShelfMenuProvider(view.context, childFragmentManager, viewModel))
 
 		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
 		viewModel.onError.observe(viewLifecycleOwner, ::onError)
@@ -86,29 +92,38 @@ class LibraryFragment :
 		selectionController = null
 	}
 
-	override fun onItemClick(item: Manga, section: LibrarySectionModel, view: View) {
+	override fun onItemClick(item: Manga, section: ShelfSectionModel, view: View) {
 		if (selectionController?.onItemClick(section, item.id) != true) {
 			val intent = DetailsActivity.newIntent(view.context, item)
 			startActivity(intent)
 		}
 	}
 
-	override fun onItemLongClick(item: Manga, section: LibrarySectionModel, view: View): Boolean {
+	override fun onItemLongClick(item: Manga, section: ShelfSectionModel, view: View): Boolean {
 		return selectionController?.onItemLongClick(section, item.id) ?: false
 	}
 
-	override fun onSectionClick(section: LibrarySectionModel, view: View) {
+	override fun onSectionClick(section: ShelfSectionModel, view: View) {
 		selectionController?.clear()
 		val intent = when (section) {
-			is LibrarySectionModel.History -> HistoryActivity.newIntent(view.context)
-			is LibrarySectionModel.Favourites -> FavouritesActivity.newIntent(view.context, section.category)
+			is ShelfSectionModel.History -> HistoryActivity.newIntent(view.context)
+			is ShelfSectionModel.Favourites -> FavouritesActivity.newIntent(view.context, section.category)
+			is ShelfSectionModel.Updated -> UpdatesActivity.newIntent(view.context)
+			is ShelfSectionModel.Local -> MangaListActivity.newIntent(view.context, MangaSource.LOCAL)
 		}
 		startActivity(intent)
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
 
-	override fun onEmptyActionClick() = Unit
+	override fun onEmptyActionClick() {
+		val action = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+			Settings.Panel.ACTION_INTERNET_CONNECTIVITY
+		} else {
+			Settings.ACTION_WIRELESS_SETTINGS
+		}
+		startActivity(Intent(action))
+	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.recyclerView.updatePadding(
@@ -143,6 +158,6 @@ class LibraryFragment :
 
 	companion object {
 
-		fun newInstance() = LibraryFragment()
+		fun newInstance() = ShelfFragment()
 	}
 }

app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui
+package org.koitharu.kotatsu.shelf.ui
 
 import android.content.Context
 import android.view.Menu
@@ -12,19 +12,19 @@ import java.util.*
 import java.util.concurrent.TimeUnit
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.dialog.RememberSelectionDialogListener
-import org.koitharu.kotatsu.library.ui.config.categories.LibraryCategoriesConfigSheet
-import org.koitharu.kotatsu.library.ui.config.size.LibrarySizeBottomSheet
+import org.koitharu.kotatsu.shelf.ui.config.categories.ShelfCategoriesConfigSheet
+import org.koitharu.kotatsu.shelf.ui.config.size.ShelfSizeBottomSheet
 import org.koitharu.kotatsu.local.ui.ImportDialogFragment
 import org.koitharu.kotatsu.utils.ext.startOfDay
 
-class LibraryMenuProvider(
+class ShelfMenuProvider(
 	private val context: Context,
 	private val fragmentManager: FragmentManager,
-	private val viewModel: LibraryViewModel,
+	private val viewModel: ShelfViewModel,
 ) : MenuProvider {
 
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-		menuInflater.inflate(R.menu.opt_library, menu)
+		menuInflater.inflate(R.menu.opt_shelf, menu)
 	}
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
@@ -34,7 +34,7 @@ class LibraryMenuProvider(
 				true
 			}
 			R.id.action_grid_size -> {
-				LibrarySizeBottomSheet.show(fragmentManager)
+				ShelfSizeBottomSheet.show(fragmentManager)
 				true
 			}
 			R.id.action_import -> {
@@ -42,7 +42,7 @@ class LibraryMenuProvider(
 				true
 			}
 			R.id.action_categories -> {
-				LibraryCategoriesConfigSheet.show(fragmentManager)
+				ShelfCategoriesConfigSheet.show(fragmentManager)
 				true
 			}
 			else -> false

app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfSelectionCallback.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui
+package org.koitharu.kotatsu.shelf.ui
 
 import android.content.Context
 import android.view.Menu
@@ -6,48 +6,51 @@ import android.view.MenuItem
 import androidx.appcompat.view.ActionMode
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
 import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesBottomSheet
-import org.koitharu.kotatsu.library.ui.model.LibrarySectionModel
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.flattenTo
+import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
 import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.invalidateNestedItemDecorations
 
-class LibrarySelectionCallback(
+class ShelfSelectionCallback(
 	private val recyclerView: RecyclerView,
 	private val fragmentManager: FragmentManager,
-	private val viewModel: LibraryViewModel,
-) : SectionedSelectionController.Callback<LibrarySectionModel> {
+	private val viewModel: ShelfViewModel,
+) : SectionedSelectionController.Callback<ShelfSectionModel> {
 
 	private val context: Context
 		get() = recyclerView.context
 
 	override fun onCreateActionMode(
-		controller: SectionedSelectionController<LibrarySectionModel>,
+		controller: SectionedSelectionController<ShelfSectionModel>,
 		mode: ActionMode,
 		menu: Menu,
 	): Boolean {
-		mode.menuInflater.inflate(R.menu.mode_library, menu)
+		mode.menuInflater.inflate(R.menu.mode_shelf, menu)
 		return true
 	}
 
 	override fun onPrepareActionMode(
-		controller: SectionedSelectionController<LibrarySectionModel>,
+		controller: SectionedSelectionController<ShelfSectionModel>,
 		mode: ActionMode,
 		menu: Menu,
 	): Boolean {
-		menu.findItem(R.id.action_remove).isVisible =
-			controller.peekCheckedIds().count { (_, v) -> v.isNotEmpty() } == 1
+		val checkedIds = controller.peekCheckedIds().entries
+		val singleKey = checkedIds.singleOrNull { (_, ids) -> ids.isNotEmpty() }?.key
+		menu.findItem(R.id.action_remove)?.isVisible = singleKey != null && singleKey !is ShelfSectionModel.Updated
+		menu.findItem(R.id.action_save)?.isVisible = singleKey !is ShelfSectionModel.Local
 		return super.onPrepareActionMode(controller, mode, menu)
 	}
 
 	override fun onActionItemClicked(
-		controller: SectionedSelectionController<LibrarySectionModel>,
+		controller: SectionedSelectionController<ShelfSectionModel>,
 		mode: ActionMode,
 		item: MenuItem,
 	): Boolean {
@@ -57,41 +60,50 @@ class LibrarySelectionCallback(
 				mode.finish()
 				true
 			}
+
 			R.id.action_favourite -> {
 				FavouriteCategoriesBottomSheet.show(fragmentManager, collectSelectedItems(controller))
 				mode.finish()
 				true
 			}
+
 			R.id.action_save -> {
 				DownloadService.confirmAndStart(context, collectSelectedItems(controller))
 				mode.finish()
 				true
 			}
+
 			R.id.action_remove -> {
 				val (group, ids) = controller.snapshot().entries.singleOrNull { it.value.isNotEmpty() } ?: return false
 				when (group) {
-					is LibrarySectionModel.Favourites -> viewModel.removeFromFavourites(group.category, ids)
-					is LibrarySectionModel.History -> viewModel.removeFromHistory(ids)
+					is ShelfSectionModel.Favourites -> viewModel.removeFromFavourites(group.category, ids)
+					is ShelfSectionModel.History -> viewModel.removeFromHistory(ids)
+					is ShelfSectionModel.Updated -> return false
+					is ShelfSectionModel.Local -> {
+						showDeletionConfirm(ids, mode)
+						return true
+					}
 				}
 				mode.finish()
 				true
 			}
+
 			else -> false
 		}
 	}
 
-	override fun onSelectionChanged(controller: SectionedSelectionController<LibrarySectionModel>, count: Int) {
+	override fun onSelectionChanged(controller: SectionedSelectionController<ShelfSectionModel>, count: Int) {
 		recyclerView.invalidateNestedItemDecorations()
 	}
 
 	override fun onCreateItemDecoration(
-		controller: SectionedSelectionController<LibrarySectionModel>,
-		section: LibrarySectionModel,
+		controller: SectionedSelectionController<ShelfSectionModel>,
+		section: ShelfSectionModel,
 	): AbstractSelectionItemDecoration = MangaSelectionDecoration(context)
 
 	private fun collectSelectedItemsMap(
-		controller: SectionedSelectionController<LibrarySectionModel>,
-	): Map<LibrarySectionModel, Set<Manga>> {
+		controller: SectionedSelectionController<ShelfSectionModel>,
+	): Map<ShelfSectionModel, Set<Manga>> {
 		val snapshot = controller.peekCheckedIds()
 		if (snapshot.isEmpty()) {
 			return emptyMap()
@@ -100,7 +112,7 @@ class LibrarySelectionCallback(
 	}
 
 	private fun collectSelectedItems(
-		controller: SectionedSelectionController<LibrarySectionModel>,
+		controller: SectionedSelectionController<ShelfSectionModel>,
 	): Set<Manga> {
 		val snapshot = controller.peekCheckedIds()
 		if (snapshot.isEmpty()) {
@@ -108,4 +120,19 @@ class LibrarySelectionCallback(
 		}
 		return viewModel.getManga(snapshot.values.flattenTo(HashSet()))
 	}
+
+	private fun showDeletionConfirm(ids: Set<Long>, mode: ActionMode) {
+		if (ids.isEmpty()) {
+			return
+		}
+		MaterialAlertDialogBuilder(context ?: return)
+			.setTitle(R.string.delete_manga)
+			.setMessage(context.getString(R.string.text_delete_local_manga_batch))
+			.setPositiveButton(R.string.delete) { _, _ ->
+				viewModel.deleteLocal(ids)
+				mode.finish()
+			}
+			.setNegativeButton(android.R.string.cancel, null)
+			.show()
+	}
 }

app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt

@@ -1,56 +1,66 @@
-package org.koitharu.kotatsu.library.ui
+package org.koitharu.kotatsu.shelf.ui
 
 import androidx.collection.ArraySet
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import java.util.*
-import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.base.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.os.NetworkStateObserver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
-import org.koitharu.kotatsu.core.ui.DateTimeAgo
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.history.domain.MangaWithHistory
 import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
-import org.koitharu.kotatsu.library.domain.LibraryRepository
-import org.koitharu.kotatsu.library.ui.model.LibrarySectionModel
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
-import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.list.ui.model.EmptyHint
+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.list.ui.model.toGridModel
+import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.shelf.domain.ShelfRepository
+import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.asFlowLiveData
-import org.koitharu.kotatsu.utils.ext.daysDiff
-
-private const val HISTORY_MAX_SEGMENTS = 2
+import javax.inject.Inject
 
 @HiltViewModel
-class LibraryViewModel @Inject constructor(
-	repository: LibraryRepository,
+class ShelfViewModel @Inject constructor(
+	private val repository: ShelfRepository,
 	private val historyRepository: HistoryRepository,
 	private val favouritesRepository: FavouritesRepository,
 	private val trackingRepository: TrackingRepository,
 	private val settings: AppSettings,
+	private val networkStateObserver: NetworkStateObserver,
 ) : BaseViewModel(), ListExtraProvider {
 
 	val onActionDone = SingleLiveEvent<ReversibleAction>()
 
 	val content: LiveData<List<ListModel>> = combine(
+		networkStateObserver,
 		historyRepository.observeAllWithHistory(),
+		repository.observeLocalManga(SortOrder.UPDATED),
 		repository.observeFavourites(),
-	) { history, favourites ->
-		mapList(history, favourites)
-	}.catch { e ->
-		emit(listOf(e.toErrorState(canRetry = false)))
-	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
+		trackingRepository.observeUpdatedManga(),
+	) { isConnected, history, local, favourites, updated ->
+		mapList(history, favourites, updated, local, isConnected)
+	}.debounce(500)
+		.catch { e ->
+			emit(listOf(e.toErrorState(canRetry = false)))
+		}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
 
 	override suspend fun getCounter(mangaId: Long): Int {
 		return trackingRepository.getNewChaptersCount(mangaId)
@@ -84,6 +94,13 @@ class LibraryViewModel @Inject constructor(
 		}
 	}
 
+	fun deleteLocal(ids: Set<Long>) {
+		launchLoadingJob(Dispatchers.Default) {
+			repository.deleteLocalManga(ids)
+			onActionDone.postCall(ReversibleAction(R.string.removal_completed, null))
+		}
+	}
+
 	fun clearHistory(minDate: Long) {
 		launchJob(Dispatchers.Default) {
 			val stringRes = if (minDate <= 0) {
@@ -101,7 +118,7 @@ class LibraryViewModel @Inject constructor(
 		val snapshot = content.value ?: return emptySet()
 		val result = ArraySet<Manga>(ids.size)
 		for (section in snapshot) {
-			if (section !is LibrarySectionModel) {
+			if (section !is ShelfSectionModel) {
 				continue
 			}
 			for (item in section.items) {
@@ -119,13 +136,38 @@ class LibraryViewModel @Inject constructor(
 	private suspend fun mapList(
 		history: List<MangaWithHistory>,
 		favourites: Map<FavouriteCategory, List<Manga>>,
+		updated: Map<Manga, Int>,
+		local: List<Manga>,
+		isNetworkAvailable: Boolean,
 	): List<ListModel> {
-		val result = ArrayList<ListModel>(favourites.keys.size + 1)
-		if (history.isNotEmpty()) {
-			mapHistory(result, history)
-		}
-		if (favourites.isNotEmpty()) {
-			mapFavourites(result, favourites)
+		val result = ArrayList<ListModel>(favourites.keys.size + 3)
+		if (isNetworkAvailable) {
+			if (history.isNotEmpty()) {
+				mapHistory(result, history)
+			}
+			if (local.isNotEmpty()) {
+				mapLocal(result, local)
+			}
+			if (updated.isNotEmpty()) {
+				mapUpdated(result, updated)
+			}
+			if (favourites.isNotEmpty()) {
+				mapFavourites(result, favourites)
+			}
+		} else {
+			result += EmptyHint(
+				icon = R.drawable.ic_empty_common,
+				textPrimary = R.string.network_unavailable,
+				textSecondary = R.string.network_unavailable_hint,
+				actionStringRes = R.string.manage,
+			)
+			val offlineHistory = history.filter { it.manga.source == MangaSource.LOCAL }
+			if (offlineHistory.isNotEmpty()) {
+				mapHistory(result, offlineHistory)
+			}
+			if (local.isNotEmpty()) {
+				mapLocal(result, local)
+			}
 		}
 		if (result.isEmpty()) {
 			result += EmptyState(
@@ -134,42 +176,61 @@ class LibraryViewModel @Inject constructor(
 				textSecondary = R.string.text_shelf_holder_secondary,
 				actionStringRes = 0,
 			)
+		} else {
+			val one = result.singleOrNull()
+			if (one is EmptyHint) {
+				result[0] = one.toState()
+			}
 		}
-		result.trimToSize()
 		return result
 	}
 
 	private suspend fun mapHistory(
-		destination: MutableList<in LibrarySectionModel.History>,
+		destination: MutableList<in ShelfSectionModel.History>,
 		list: List<MangaWithHistory>,
 	) {
 		val showPercent = settings.isReadingIndicatorsEnabled
-		val groups = list.groupByTo(LinkedHashMap()) { timeAgo(it.history.updatedAt) }
-		while (groups.size > HISTORY_MAX_SEGMENTS) {
-			val lastKey = groups.keys.last()
-			val subList = groups.remove(lastKey) ?: continue
-			groups[groups.keys.last()]?.addAll(subList)
-		}
-		for ((timeAgo, subList) in groups) {
-			destination += LibrarySectionModel.History(
-				items = subList.map { (manga, history) ->
-					val counter = trackingRepository.getNewChaptersCount(manga.id)
-					val percent = if (showPercent) history.percent else PROGRESS_NONE
-					manga.toGridModel(counter, percent)
-				},
-				timeAgo = timeAgo,
-				showAllButtonText = R.string.show_all,
-			)
-		}
+		destination += ShelfSectionModel.History(
+			items = list.map { (manga, history) ->
+				val counter = trackingRepository.getNewChaptersCount(manga.id)
+				val percent = if (showPercent) history.percent else PROGRESS_NONE
+				manga.toGridModel(counter, percent)
+			},
+			showAllButtonText = R.string.show_all,
+		)
+	}
+
+	private suspend fun mapUpdated(
+		destination: MutableList<in ShelfSectionModel.Updated>,
+		updated: Map<Manga, Int>,
+	) {
+		val showPercent = settings.isReadingIndicatorsEnabled
+		destination += ShelfSectionModel.Updated(
+			items = updated.map { (manga, counter) ->
+				val percent = if (showPercent) getProgress(manga.id) else PROGRESS_NONE
+				manga.toGridModel(counter, percent)
+			},
+			showAllButtonText = R.string.show_all,
+		)
+	}
+
+	private suspend fun mapLocal(
+		destination: MutableList<in ShelfSectionModel.Local>,
+		local: List<Manga>,
+	) {
+		destination += ShelfSectionModel.Local(
+			items = local.toUi(ListMode.GRID, this),
+			showAllButtonText = R.string.show_all,
+		)
 	}
 
 	private suspend fun mapFavourites(
-		destination: MutableList<in LibrarySectionModel.Favourites>,
+		destination: MutableList<in ShelfSectionModel.Favourites>,
 		favourites: Map<FavouriteCategory, List<Manga>>,
 	) {
 		for ((category, list) in favourites) {
 			if (list.isNotEmpty()) {
-				destination += LibrarySectionModel.Favourites(
+				destination += ShelfSectionModel.Favourites(
 					items = list.toUi(ListMode.GRID, this),
 					category = category,
 					showAllButtonText = R.string.show_all,
@@ -177,14 +238,4 @@ class LibraryViewModel @Inject constructor(
 			}
 		}
 	}
-
-	private fun timeAgo(date: Date): DateTimeAgo {
-		val diffDays = -date.daysDiff(System.currentTimeMillis())
-		return when {
-			diffDays < 1 -> DateTimeAgo.Today
-			diffDays == 1 -> DateTimeAgo.Yesterday
-			diffDays <= 3 -> DateTimeAgo.DaysAgo(diffDays)
-			else -> DateTimeAgo.LongAgo
-		}
-	}
 }

app/src/main/java/org/koitharu/kotatsu/shelf/ui/adapter/MangaItemDiffCallback.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui.adapter
+package org.koitharu.kotatsu.shelf.ui.adapter
 
 import androidx.recyclerview.widget.DiffUtil
 import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
@@ -27,4 +27,4 @@ class MangaItemDiffCallback : DiffUtil.ItemCallback<ListModel>() {
 			else -> super.getChangePayload(oldItem, newItem)
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/shelf/ui/adapter/ScrollKeepObserver.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui.adapter
+package org.koitharu.kotatsu.shelf.ui.adapter
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView

app/src/main/java/org/koitharu/kotatsu/shelf/ui/adapter/ShelfAdapter.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui.adapter
+package org.koitharu.kotatsu.shelf.ui.adapter
 
 import android.content.Context
 import androidx.lifecycle.LifecycleOwner
@@ -6,30 +6,31 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import kotlin.jvm.internal.Intrinsics
 import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
 import org.koitharu.kotatsu.base.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.library.ui.model.LibrarySectionModel
 import org.koitharu.kotatsu.list.ui.ItemSizeResolver
+import org.koitharu.kotatsu.list.ui.adapter.emptyHintAD
 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.shelf.ui.model.ShelfSectionModel
+import kotlin.jvm.internal.Intrinsics
 
-class LibraryAdapter(
+class ShelfAdapter(
 	lifecycleOwner: LifecycleOwner,
 	coil: ImageLoader,
-	listener: LibraryListEventListener,
+	listener: ShelfListEventListener,
 	sizeResolver: ItemSizeResolver,
-	selectionController: SectionedSelectionController<LibrarySectionModel>,
+	selectionController: SectionedSelectionController<ShelfSectionModel>,
 ) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()), FastScroller.SectionIndexer {
 
 	init {
 		val pool = RecyclerView.RecycledViewPool()
 		delegatesManager
 			.addDelegate(
-				libraryGroupAD(
+				shelfGroupAD(
 					sharedPool = pool,
 					lifecycleOwner = lifecycleOwner,
 					coil = coil,
@@ -40,12 +41,13 @@ class LibraryAdapter(
 			)
 			.addDelegate(loadingStateAD())
 			.addDelegate(loadingFooterAD())
+			.addDelegate(emptyHintAD(listener))
 			.addDelegate(emptyStateListAD(coil, listener))
 			.addDelegate(errorStateListAD(listener))
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence {
-		val item = items.getOrNull(position) as? LibrarySectionModel
+		val item = items.getOrNull(position) as? ShelfSectionModel
 		return item?.getTitle(context.resources) ?: ""
 	}
 
@@ -53,9 +55,10 @@ class LibraryAdapter(
 
 		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
 			return when {
-				oldItem is LibrarySectionModel && newItem is LibrarySectionModel -> {
+				oldItem is ShelfSectionModel && newItem is ShelfSectionModel -> {
 					oldItem.key == newItem.key
 				}
+
 				else -> oldItem.javaClass == newItem.javaClass
 			}
 		}
@@ -66,7 +69,7 @@ class LibraryAdapter(
 
 		override fun getChangePayload(oldItem: ListModel, newItem: ListModel): Any? {
 			return when {
-				oldItem is LibrarySectionModel && newItem is LibrarySectionModel -> Unit
+				oldItem is ShelfSectionModel && newItem is ShelfSectionModel -> Unit
 				else -> super.getChangePayload(oldItem, newItem)
 			}
 		}

app/src/main/java/org/koitharu/kotatsu/shelf/ui/adapter/ShelfGroupAD.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui.adapter
+package org.koitharu.kotatsu.shelf.ui.adapter
 
 import android.view.View
 import androidx.lifecycle.LifecycleOwner
@@ -12,7 +12,7 @@ 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.databinding.ItemListGroupBinding
-import org.koitharu.kotatsu.library.ui.model.LibrarySectionModel
+import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
 import org.koitharu.kotatsu.list.ui.ItemSizeResolver
 import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -20,14 +20,14 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.removeItemDecoration
 import org.koitharu.kotatsu.utils.ext.setTextAndVisible
 
-fun libraryGroupAD(
+fun shelfGroupAD(
 	sharedPool: RecyclerView.RecycledViewPool,
 	lifecycleOwner: LifecycleOwner,
 	coil: ImageLoader,
 	sizeResolver: ItemSizeResolver,
-	selectionController: SectionedSelectionController<LibrarySectionModel>,
-	listener: LibraryListEventListener,
-) = adapterDelegateViewBinding<LibrarySectionModel, ListModel, ItemListGroupBinding>(
+	selectionController: SectionedSelectionController<ShelfSectionModel>,
+	listener: ShelfListEventListener,
+) = adapterDelegateViewBinding<ShelfSectionModel, ListModel, ItemListGroupBinding>(
 	{ layoutInflater, parent -> ItemListGroupBinding.inflate(layoutInflater, parent, false) },
 ) {
 	val listenerAdapter = object : OnListItemClickListener<Manga>, View.OnClickListener {

app/src/main/java/org/koitharu/kotatsu/shelf/ui/adapter/ShelfListEventListener.kt

@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.shelf.ui.adapter
+
+import android.view.View
+import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.parsers.model.Manga
+
+interface ShelfListEventListener : ListStateHolderListener {
+
+	fun onItemClick(item: Manga, section: ShelfSectionModel, view: View)
+
+	fun onItemLongClick(item: Manga, section: ShelfSectionModel, view: View): Boolean
+
+	fun onSectionClick(section: ShelfSectionModel, view: View)
+}

app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfCategoriesConfigAdapter.kt

@@ -1,16 +1,16 @@
-package org.koitharu.kotatsu.library.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config.categories
 
 import androidx.recyclerview.widget.DiffUtil
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 
-class LibraryCategoriesConfigAdapter(
+class ShelfCategoriesConfigAdapter(
 	listener: OnListItemClickListener<FavouriteCategory>,
 ) : AsyncListDifferDelegationAdapter<FavouriteCategory>(DiffCallback()) {
 
 	init {
-		delegatesManager.addDelegate(libraryCategoryAD(listener))
+		delegatesManager.addDelegate(shelfCategoryAD(listener))
 	}
 
 	class DiffCallback : DiffUtil.ItemCallback<FavouriteCategory>() {

app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfCategoriesConfigSheet.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config.categories
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -15,12 +15,12 @@ import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.databinding.SheetBaseBinding
 
 @AndroidEntryPoint
-class LibraryCategoriesConfigSheet :
+class ShelfCategoriesConfigSheet :
 	BaseBottomSheet<SheetBaseBinding>(),
 	OnListItemClickListener<FavouriteCategory>,
 	View.OnClickListener {
 
-	private val viewModel by viewModels<LibraryCategoriesConfigViewModel>()
+	private val viewModel by viewModels<ShelfCategoriesConfigViewModel>()
 
 	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetBaseBinding {
 		return SheetBaseBinding.inflate(inflater, container, false)
@@ -31,7 +31,7 @@ class LibraryCategoriesConfigSheet :
 		binding.headerBar.toolbar.setTitle(R.string.favourites_categories)
 		binding.buttonDone.isVisible = true
 		binding.buttonDone.setOnClickListener(this)
-		val adapter = LibraryCategoriesConfigAdapter(this)
+		val adapter = ShelfCategoriesConfigAdapter(this)
 		binding.recyclerView.adapter = adapter
 
 		viewModel.content.observe(viewLifecycleOwner) { adapter.items = it }
@@ -47,8 +47,8 @@ class LibraryCategoriesConfigSheet :
 
 	companion object {
 
-		private const val TAG = "LibraryCategoriesConfigSheet"
+		private const val TAG = "ShelfCategoriesConfigSheet"
 
-		fun show(fm: FragmentManager) = LibraryCategoriesConfigSheet().show(fm, TAG)
+		fun show(fm: FragmentManager) = ShelfCategoriesConfigSheet().show(fm, TAG)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfCategoriesConfigViewModel.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config.categories
 
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -11,7 +11,7 @@ import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
 @HiltViewModel
-class LibraryCategoriesConfigViewModel @Inject constructor(
+class ShelfCategoriesConfigViewModel @Inject constructor(
 	private val favouritesRepository: FavouritesRepository,
 ) : BaseViewModel() {
 

app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfCategoryAD.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config.categories
 
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.base.ui.list.AdapterDelegateClickListenerAdapter
@@ -6,7 +6,7 @@ import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.databinding.ItemCategoryCheckableMultipleBinding
 
-fun libraryCategoryAD(
+fun shelfCategoryAD(
 	listener: OnListItemClickListener<FavouriteCategory>,
 ) = adapterDelegateViewBinding<FavouriteCategory, FavouriteCategory, ItemCategoryCheckableMultipleBinding>(
 	{ layoutInflater, parent -> ItemCategoryCheckableMultipleBinding.inflate(layoutInflater, parent, false) },

app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/size/ShelfSizeBottomSheet.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.library.ui.config.size
+package org.koitharu.kotatsu.shelf.ui.config.size
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,13 +12,13 @@ import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.databinding.SheetLibrarySizeBinding
+import org.koitharu.kotatsu.databinding.SheetShelfSizeBinding
 import org.koitharu.kotatsu.utils.ext.setValueRounded
 import org.koitharu.kotatsu.utils.progress.IntPercentLabelFormatter
 
 @AndroidEntryPoint
-class LibrarySizeBottomSheet :
-	BaseBottomSheet<SheetLibrarySizeBinding>(),
+class ShelfSizeBottomSheet :
+	BaseBottomSheet<SheetShelfSizeBinding>(),
 	Slider.OnChangeListener,
 	View.OnClickListener {
 
@@ -26,8 +26,8 @@ class LibrarySizeBottomSheet :
 	lateinit var settings: AppSettings
 	private var labelFormatter: LabelFormatter? = null
 
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetLibrarySizeBinding {
-		return SheetLibrarySizeBinding.inflate(inflater, container, false)
+	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetShelfSizeBinding {
+		return SheetShelfSizeBinding.inflate(inflater, container, false)
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -59,8 +59,8 @@ class LibrarySizeBottomSheet :
 
 	companion object {
 
-		private const val TAG = "LibrarySizeBottomSheet"
+		private const val TAG = "ShelfSizeBottomSheet"
 
-		fun show(fm: FragmentManager) = LibrarySizeBottomSheet().show(fm, TAG)
+		fun show(fm: FragmentManager) = ShelfSizeBottomSheet().show(fm, TAG)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/shelf/ui/model/ShelfSectionModel.kt

@@ -0,0 +1,144 @@
+package org.koitharu.kotatsu.shelf.ui.model
+
+import android.content.res.Resources
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.MangaItemModel
+
+sealed interface ShelfSectionModel : ListModel {
+
+	val items: List<MangaItemModel>
+
+	@get:StringRes
+	val showAllButtonText: Int
+
+	val key: String
+	fun getTitle(resources: Resources): CharSequence
+
+	override fun toString(): String
+
+	class History(
+		override val items: List<MangaItemModel>,
+		override val showAllButtonText: Int,
+	) : ShelfSectionModel {
+
+		override val key = "history"
+
+		override fun getTitle(resources: Resources) = resources.getString(R.string.history)
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as History
+
+			if (showAllButtonText != other.showAllButtonText) return false
+			if (items != other.items) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			var result = items.hashCode()
+			result = 31 * result + showAllButtonText.hashCode()
+			return result
+		}
+
+		override fun toString(): String = key
+	}
+
+	class Favourites(
+		override val items: List<MangaItemModel>,
+		val category: FavouriteCategory,
+		override val showAllButtonText: Int,
+	) : ShelfSectionModel {
+
+		override val key = "fav_${category.id}"
+
+		override fun getTitle(resources: Resources) = category.title
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Favourites
+
+			if (category != other.category) return false
+			if (showAllButtonText != other.showAllButtonText) return false
+			if (items != other.items) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			var result = items.hashCode()
+			result = 31 * result + category.hashCode()
+			result = 31 * result + showAllButtonText.hashCode()
+			return result
+		}
+
+		override fun toString(): String = key
+	}
+
+	class Updated(
+		override val items: List<MangaItemModel>,
+		override val showAllButtonText: Int,
+	) : ShelfSectionModel {
+
+		override val key = "upd"
+
+		override fun getTitle(resources: Resources) = resources.getString(R.string.updated)
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Updated
+
+			if (items != other.items) return false
+			if (showAllButtonText != other.showAllButtonText) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			var result = items.hashCode()
+			result = 31 * result + showAllButtonText
+			return result
+		}
+
+		override fun toString(): String = key
+	}
+
+	class Local(
+		override val items: List<MangaItemModel>,
+		override val showAllButtonText: Int,
+	) : ShelfSectionModel {
+
+		override val key = "local"
+
+		override fun getTitle(resources: Resources) = resources.getString(R.string.local_storage)
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Local
+
+			if (items != other.items) return false
+			if (showAllButtonText != other.showAllButtonText) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			var result = items.hashCode()
+			result = 31 * result + showAllButtonText
+			return result
+		}
+
+		override fun toString(): String = key
+	}
+}

app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsActivity.kt

@@ -12,6 +12,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivityContainerBinding
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import kotlin.text.Typography.dagger
 
 @AndroidEntryPoint
 class SuggestionsActivity :
@@ -28,6 +29,7 @@ class SuggestionsActivity :
 		val fm = supportFragmentManager
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
+				setReorderingAllowed(true)
 				val fragment = SuggestionsFragment.newInstance()
 				replace(R.id.container, fragment)
 			}

app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt

@@ -31,7 +31,7 @@ class SuggestionsViewModel @Inject constructor(
 		when {
 			list.isEmpty() -> listOf(
 				EmptyState(
-					icon = R.drawable.ic_empty_suggestions,
+					icon = R.drawable.ic_empty_common,
 					textPrimary = R.string.nothing_found,
 					textSecondary = R.string.text_suggestion_holder,
 					actionStringRes = 0,

app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt

@@ -26,6 +26,7 @@ import org.koitharu.kotatsu.suggestions.domain.MangaSuggestion
 import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
 import org.koitharu.kotatsu.utils.ext.asArrayList
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.ext.trySetForeground
 import java.util.concurrent.TimeUnit
 import kotlin.math.pow
@@ -137,7 +138,7 @@ class SuggestionsWorker @AssistedInject constructor(
 		return (weight / maxWeight).pow(2.0).toFloat()
 	}
 
-	private suspend fun MangaRepository.getListSafe(tag: MangaTag) = runCatching {
+	private suspend fun MangaRepository.getListSafe(tag: MangaTag) = runCatchingCancellable {
 		getList(offset = 0, sortOrder = SortOrder.UPDATED, tags = setOf(tag))
 	}.onFailure { error ->
 		error.printStackTraceDebug()