Fix amoled theme

Currently translated at 100.0% (476 of 476 strings)

Co-authored-by: Dpper <ruslan20020401@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/uk/
Translation: Kotatsu/Strings

app/build.gradle

@@ -8,17 +8,16 @@ plugins {
 }
 
 android {
-	compileSdk = 33
-//	compileSdkExtension = 4
+	compileSdk = 34
 	buildToolsVersion = '34.0.0'
 	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
-		minSdkVersion 21
-		targetSdkVersion 33
-		versionCode 570
-		versionName '6.0-a1'
+		minSdk = 21
+		targetSdk = 34
+		versionCode = 573
+		versionName = '6.0'
 		generatedDensities = []
 		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
 		ksp {
@@ -82,11 +81,11 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:407ef5b655') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:3a76504380') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.0'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.10'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
@@ -121,7 +120,7 @@ dependencies {
 
 	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
-	implementation 'com.squareup.okio:okio:3.4.0'
+	implementation 'com.squareup.okio:okio:3.5.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
@@ -137,8 +136,8 @@ dependencies {
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.0'
-	implementation 'ch.acra:acra-dialog:5.11.0'
+	implementation 'ch.acra:acra-http:5.11.1'
+	implementation 'ch.acra:acra-dialog:5.11.1'
 
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 

app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu
+
+import android.content.Context
+import android.os.StrictMode
+import androidx.fragment.app.strictmode.FragmentStrictMode
+import org.koitharu.kotatsu.core.BaseApp
+import org.koitharu.kotatsu.local.data.LocalMangaRepository
+import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.reader.domain.PageLoader
+
+class KotatsuApp : BaseApp() {
+
+	override fun attachBaseContext(base: Context?) {
+		super.attachBaseContext(base)
+		enableStrictMode()
+	}
+
+	private fun enableStrictMode() {
+		StrictMode.setThreadPolicy(
+			StrictMode.ThreadPolicy.Builder()
+				.detectAll()
+				.penaltyLog()
+				.build(),
+		)
+		StrictMode.setVmPolicy(
+			StrictMode.VmPolicy.Builder()
+				.detectAll()
+				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
+				.setClassInstanceLimit(PagesCache::class.java, 1)
+				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+				.setClassInstanceLimit(PageLoader::class.java, 1)
+				.penaltyLog()
+				.build(),
+		)
+		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
+			.penaltyDeath()
+			.detectFragmentReuse()
+			// .detectWrongFragmentContainer() FIXME: migrate to ViewPager2
+			.detectRetainInstanceUsage()
+			.detectSetUserVisibleHint()
+			.detectFragmentTagUsage()
+			.build()
+	}
+}

app/src/main/AndroidManifest.xml

@@ -18,6 +18,7 @@
 	<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
 	<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 	<uses-permission
 		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
 		android:maxSdkVersion="29" />
@@ -70,6 +71,17 @@
 			<intent-filter>
 				<action android:name="${applicationId}.action.VIEW_MANGA" />
 			</intent-filter>
+			<intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="http" />
+				<data android:scheme="https" />
+				<data android:host="kotatsu.app" />
+				<data android:path="/manga" />
+			</intent-filter>
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
@@ -185,7 +197,13 @@
 
 		</activity>
 
-		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
+		<service
+			android:name="androidx.work.impl.foreground.SystemForegroundService"
+			android:foregroundServiceType="dataSync"
+			tools:node="merge" />
+		<service
+			android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService"
+			android:foregroundServiceType="dataSync" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
@@ -298,6 +316,660 @@
 			android:name="com.samsung.android.icon_container.has_icon_container"
 			android:value="@bool/com_samsung_android_icon_container_has_icon_container" />
 
+		<activity-alias
+			android:name="org.koitharu.kotatsu.details.ui.DetailsBYLinkActivity"
+			android:exported="true"
+			android:targetActivity="org.koitharu.kotatsu.details.ui.DetailsActivity">
+
+			<intent-filter android:autoVerify="false">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="http" />
+				<data android:scheme="https" />
+				<data android:host="1stkissmanga.me" />
+				<data android:host="3asq.org" />
+				<data android:host="18porncomic.com" />
+				<data android:host="212.32.226.234" />
+				<data android:host="247manga.com" />
+				<data android:host="365manga.com" />
+				<data android:host="2023.allhen.online" />
+				<data android:host="adultwebtoon.com" />
+				<data android:host="afroditscans.com" />
+				<data android:host="ainzscans.site" />
+				<data android:host="aiyumanga.com" />
+				<data android:host="alceascan.my.id" />
+				<data android:host="allporncomic.com" />
+				<data android:host="anibel.net" />
+				<data android:host="anigliscans.com" />
+				<data android:host="anikiga.com" />
+				<data android:host="animaregia.net" />
+				<data android:host="anisamanga.com" />
+				<data android:host="anshscans.org" />
+				<data android:host="apenasmaisumyaoi.com" />
+				<data android:host="apollcomics.com" />
+				<data android:host="aquamanga.com" />
+				<data android:host="arabtoons.net" />
+				<data android:host="araznovel.com" />
+				<data android:host="arcanescans.com" />
+				<data android:host="arenascans.net" />
+				<data android:host="arthurscan.xyz" />
+				<data android:host="astral-manga.fr" />
+				<data android:host="astrallibrary.net" />
+				<data android:host="astrumscans.xyz" />
+				<data android:host="asura.nacm.xyz" />
+				<data android:host="asurascanstr.com" />
+				<data android:host="athenafansub.com" />
+				<data android:host="ayatoon.com" />
+				<data android:host="azoranov.com" />
+				<data android:host="azuremanga.com" />
+				<data android:host="babeltoon.com" />
+				<data android:host="bakai.org" />
+				<data android:host="bakaman.net" />
+				<data android:host="bakamh.com" />
+				<data android:host="banana-scan.com" />
+				<data android:host="bato.to" />
+				<data android:host="batocomic.com" />
+				<data android:host="batocomic.net" />
+				<data android:host="batocomic.org" />
+				<data android:host="batotoo.com" />
+				<data android:host="batotwo.com" />
+				<data android:host="battwo.com" />
+				<data android:host="beast-scans.com" />
+				<data android:host="beehentai.com" />
+				<data android:host="bentomanga.com" />
+				<data android:host="bestmanga.club" />
+				<data android:host="bestmanhua.com" />
+				<data android:host="bibimanga.com" />
+				<data android:host="birdmanga.com" />
+				<data android:host="birdtoon.net" />
+				<data android:host="blogmanga.net" />
+				<data android:host="blogtruyenmoi.com" />
+				<data android:host="bokugents.com" />
+				<data android:host="boosei.net" />
+				<data android:host="boyslove.me" />
+				<data android:host="br.atlantisscan.com" />
+				<data android:host="br.ninemanga.com" />
+				<data android:host="cabaredowatame.site" />
+				<data android:host="cafecomyaoi.com.br" />
+				<data android:host="carteldemanhwas.com" />
+				<data android:host="cat300.com" />
+				<data android:host="cerisescans.com" />
+				<data android:host="chap.mangairo.com" />
+				<data android:host="chapmanganato.com" />
+				<data android:host="chapmanganato.com" />
+				<data android:host="cizgiromanarsivi.com" />
+				<data android:host="cmreader.info" />
+				<data android:host="cocorip.net" />
+				<data android:host="coffeemanga.io" />
+				<data android:host="coloredmanga.com" />
+				<data android:host="comick.app" />
+				<data android:host="comiko.net" />
+				<data android:host="comiko.org" />
+				<data android:host="copypastescan.xyz" />
+				<data android:host="cosmicscans.com" />
+				<data android:host="daprob.com" />
+				<data android:host="darkscans.com" />
+				<data android:host="de.ninemanga.com" />
+				<data android:host="desu.me" />
+				<data android:host="diamondfansub.com" />
+				<data android:host="dojing.net" />
+				<data android:host="dokkomanga.com" />
+				<data android:host="dokkomanga.com" />
+				<data android:host="doujin69.com" />
+				<data android:host="doujindesu.rip" />
+				<data android:host="doujinhentai.net" />
+				<data android:host="dragontea.ink" />
+				<data android:host="dragontranslation.net" />
+				<data android:host="drakescans.com" />
+				<data android:host="dto.to" />
+				<data android:host="duckmanga.com" />
+				<data android:host="duniakomik.id" />
+				<data android:host="dynasty-scans.com" />
+				<data android:host="e-hentai.org" />
+				<data android:host="elarcpage.com" />
+				<data android:host="en.leviatanscans.com" />
+				<data android:host="epsilonscan.fr" />
+				<data android:host="es.ninemanga.com" />
+				<data android:host="esomanga.com" />
+				<data android:host="exhentai.org" />
+				<data android:host="falconmanga.com" />
+				<data android:host="fbsquads.com" />
+				<data android:host="finalscans.com" />
+				<data android:host="flamescans.org" />
+				<data android:host="foxwhite.com.br" />
+				<data android:host="fr-scan.cc" />
+				<data android:host="fr.ninemanga.com" />
+				<data android:host="franxxmangas.net" />
+				<data android:host="freakscans.com" />
+				<data android:host="freemanga.me" />
+				<data android:host="freemangatop.com" />
+				<data android:host="freewebtooncoins.com" />
+				<data android:host="frscans.com" />
+				<data android:host="furyosociety.com" />
+				<data android:host="galaxymanga.org" />
+				<data android:host="gatemanga.com" />
+				<data android:host="gdscans.com" />
+				<data android:host="gekkou.com.br" />
+				<data android:host="glorymanga.com" />
+				<data android:host="goldenmanga.top" />
+				<data android:host="golgebahcesi.com" />
+				<data android:host="gooffansub.com" />
+				<data android:host="gourmetscans.net" />
+				<data android:host="grabber.zone" />
+				<data android:host="gremorymangas.com" />
+				<data android:host="guimah.com" />
+				<data android:host="guncelmanga.net" />
+				<data android:host="h.mangabat.com" />
+				<data android:host="hachiraw.com" />
+				<data android:host="harimanga.com" />
+				<data android:host="hayalistic.com" />
+				<data android:host="hensekai.com" />
+				<data android:host="hentai3z.cc" />
+				<data android:host="hentai3z.xyz" />
+				<data android:host="hentai4free.net" />
+				<data android:host="hentai20.io" />
+				<data android:host="hentai.gekkouscans.com.br" />
+				<data android:host="hentai.scantrad-vf.cc" />
+				<data android:host="hentaichan.live" />
+				<data android:host="hentaichan.pro" />
+				<data android:host="hentaicube.net" />
+				<data android:host="hentailib.me" />
+				<data android:host="hentaimanga.me" />
+				<data android:host="hentaiteca.net" />
+				<data android:host="hentaivn.autos" />
+				<data android:host="hentaivn.tv" />
+				<data android:host="hentaiwebtoon.com" />
+				<data android:host="hentaixcomic.com" />
+				<data android:host="hentaixdickgirl.com" />
+				<data android:host="hentaixyuri.com" />
+				<data android:host="hentaizone.xyz" />
+				<data android:host="herenscan.com" />
+				<data android:host="hhentai.fr" />
+				<data android:host="hikariscan.com.br" />
+				<data android:host="hipercool.xyz" />
+				<data android:host="hmanhwa.com" />
+				<data android:host="hni-scantrad.com" />
+				<data android:host="honey-manga.com.ua" />
+				<data android:host="hscans.com" />
+				<data android:host="hto.to" />
+				<data android:host="id.gourmetscans.net" />
+				<data android:host="illusionscan.com" />
+				<data android:host="immortalupdates.com" />
+				<data android:host="immortalupdates.id" />
+				<data android:host="imperiodabritannia.com" />
+				<data android:host="imperioscans.com.br" />
+				<data android:host="indo18h.com" />
+				<data android:host="infrafandub.xyz" />
+				<data android:host="isekaiscan.top" />
+				<data android:host="it.ninemanga.com" />
+				<data android:host="itsyourightmanhua.com" />
+				<data android:host="jaiminisbox.net" />
+				<data android:host="japscan.ws" />
+				<data android:host="jiangzaitoon.co" />
+				<data android:host="jimanga.com" />
+				<data android:host="jpmangas.xyz" />
+				<data android:host="kanzenin.xyz" />
+				<data android:host="karatcam-scans.fr" />
+				<data android:host="katakomik.online" />
+				<data android:host="kiryuu.id" />
+				<data android:host="kissmanga.in" />
+				<data android:host="klikmanga.id" />
+				<data android:host="klz9.com" />
+				<data android:host="koinoboriscan.com" />
+				<data android:host="kolmanga.com" />
+				<data android:host="komikav.com" />
+				<data android:host="komikcast.io" />
+				<data android:host="komikdewasa.cfd" />
+				<data android:host="komikgo.org" />
+				<data android:host="komikhentai.co" />
+				<data android:host="komikid.com" />
+				<data android:host="komikindo.co" />
+				<data android:host="komikindo.info" />
+				<data android:host="komiklab.com" />
+				<data android:host="komiklokal.cfd" />
+				<data android:host="komikmama.co" />
+				<data android:host="komikmanhwa.me" />
+				<data android:host="komikmirror.art" />
+				<data android:host="komiksan.link" />
+				<data android:host="komiksay.site" />
+				<data android:host="komikstation.co" />
+				<data android:host="komiktap.in" />
+				<data android:host="komiku.com" />
+				<data android:host="komikzoid.xyz" />
+				<data android:host="ksgroupscans.com" />
+				<data android:host="kumascans.com" />
+				<data android:host="kunmanga.com" />
+				<data android:host="ladymanga.com" />
+				<data android:host="lectortmo.com" />
+				<data android:host="lectorunitoon.com" />
+				<data android:host="legacy-scans.com" />
+				<data android:host="legionscans.com" />
+				<data android:host="leitor.kamisama.com.br" />
+				<data android:host="leitorizakaya.net" />
+				<data android:host="lelscanvf.cc" />
+				<data android:host="leryaoi.com" />
+				<data android:host="lilymanga.net" />
+				<data android:host="limascans.xyz/v2" />
+				<data android:host="lkscanlation.com" />
+				<data android:host="lolicon.mobi" />
+				<data android:host="lugnica-scans.com" />
+				<data android:host="lunarscan.org" />
+				<data android:host="luxmanga.net" />
+				<data android:host="lxmanga.net" />
+				<data android:host="lynxscans.com" />
+				<data android:host="m.isekaiscan.to" />
+				<data android:host="mafia-manga.com" />
+				<data android:host="maidscan.com.br" />
+				<data android:host="manga1st.online" />
+				<data android:host="manga3s.com" />
+				<data android:host="manga18.club" />
+				<data android:host="manga68.com" />
+				<data android:host="manga689.com" />
+				<data android:host="manga-chan.me" />
+				<data android:host="manga-crab.com" />
+				<data android:host="manga-diyari.com" />
+				<data android:host="manga-fast.com" />
+				<data android:host="manga-fr.me" />
+				<data android:host="manga-mate.org" />
+				<data android:host="manga-moons.net" />
+				<data android:host="manga-scan.co" />
+				<data android:host="manga-scantrad.io" />
+				<data android:host="manga-tx.com" />
+				<data android:host="manga-uptocats.com" />
+				<data android:host="manga.clone-army.org" />
+				<data android:host="manga.in.ua" />
+				<data android:host="manga.mundodrama.site" />
+				<data android:host="mangaaction.com" />
+				<data android:host="mangaatrend.net" />
+				<data android:host="mangabaz.net" />
+				<data android:host="mangabob.com" />
+				<data android:host="mangabuddy.com" />
+				<data android:host="mangacim.com" />
+				<data android:host="mangaclash.com" />
+				<data android:host="mangacultivator.com" />
+				<data android:host="mangacute.com" />
+				<data android:host="mangacv.com" />
+				<data android:host="mangadass.com" />
+				<data android:host="mangadeemak.com" />
+				<data android:host="mangadex.org" />
+				<data android:host="mangadistrict.com" />
+				<data android:host="mangadna.com" />
+				<data android:host="mangadoor.com" />
+				<data android:host="mangaeffect.com" />
+				<data android:host="mangaforest.me" />
+				<data android:host="mangaforfree.com" />
+				<data android:host="mangafoxfull.com" />
+				<data android:host="mangafreak.online" />
+				<data android:host="mangagalaxy.me" />
+				<data android:host="mangagg.com" />
+				<data android:host="mangagoyaoi.com" />
+				<data android:host="mangagreat.com" />
+				<data android:host="mangahentai.me" />
+				<data android:host="mangahub.fr" />
+				<data android:host="mangaid.click" />
+				<data android:host="mangaindo.me" />
+				<data android:host="mangak2.com" />
+				<data android:host="mangakakalot.com" />
+				<data android:host="mangakeyfi.net" />
+				<data android:host="mangaking.net" />
+				<data android:host="mangakio.me" />
+				<data android:host="mangakiss.org" />
+				<data android:host="mangakita.net" />
+				<data android:host="mangakomi.io" />
+				<data android:host="mangakyo.org" />
+				<data android:host="mangalek.com" />
+				<data android:host="mangaleks.com" />
+				<data android:host="mangaleveling.com" />
+				<data android:host="mangalib.me" />
+				<data android:host="mangalike.me" />
+				<data android:host="mangalink.online" />
+				<data android:host="mangalionz.com" />
+				<data android:host="mangamammy.ru" />
+				<data android:host="mangamanhua.online" />
+				<data android:host="mangamaniacs.org" />
+				<data android:host="manganato.com" />
+				<data android:host="mangaokutr.com" />
+				<data android:host="mangaonelove.site" />
+				<data android:host="mangaonlineteam.com" />
+				<data android:host="mangaowl.to" />
+				<data android:host="mangaprotm.com" />
+				<data android:host="mangapt.com" />
+				<data android:host="mangapuma.com" />
+				<data android:host="mangaread.co" />
+				<data android:host="mangareaderpro.com" />
+				<data android:host="mangareading.org" />
+				<data android:host="mangarockteam.com" />
+				<data android:host="mangarocky.com" />
+				<data android:host="mangarolls.net" />
+				<data android:host="mangarosie.in" />
+				<data android:host="mangas-origines.fr" />
+				<data android:host="mangas-origines.xyz" />
+				<data android:host="mangaschan.com" />
+				<data android:host="mangasehri.com" />
+				<data android:host="mangaspark.com" />
+				<data android:host="mangastarz.com" />
+				<data android:host="mangastic.cc" />
+				<data android:host="mangastic.cc" />
+				<data android:host="mangasushi.org" />
+				<data android:host="mangasusuku.xyz" />
+				<data android:host="mangatale.co" />
+				<data android:host="mangatone.com" />
+				<data android:host="mangatoto.com" />
+				<data android:host="mangatoto.net" />
+				<data android:host="mangatoto.org" />
+				<data android:host="mangatx.com" />
+				<data android:host="mangaus.xyz" />
+				<data android:host="mangavisa.com" />
+				<data android:host="mangaweebs.in" />
+				<data android:host="mangawt.com" />
+				<data android:host="mangax1.com" />
+				<data android:host="mangaxyz.com" />
+				<data android:host="mangayaro.net" />
+				<data android:host="mangazavr.ru" />
+				<data android:host="mangazodiac.com" />
+				<data android:host="manhatic.com" />
+				<data android:host="manhuaes.com" />
+				<data android:host="manhuafast.com" />
+				<data android:host="manhuafast.net" />
+				<data android:host="manhuaga.com" />
+				<data android:host="manhuahot.com" />
+				<data android:host="manhuamix.com" />
+				<data android:host="manhuaplus.com" />
+				<data android:host="manhuascan.us" />
+				<data android:host="manhuaus.com" />
+				<data android:host="manhuazone.net" />
+				<data android:host="manhwa18.app" />
+				<data android:host="manhwa18.com" />
+				<data android:host="manhwa18.net" />
+				<data android:host="manhwa18.org" />
+				<data android:host="manhwa68.com" />
+				<data android:host="manhwa-latino.com" />
+				<data android:host="manhwaclan.com" />
+				<data android:host="manhwadesu.top" />
+				<data android:host="manhwafull.com" />
+				<data android:host="manhwahentai.me" />
+				<data android:host="manhwaindo.icu" />
+				<data android:host="manhwaindo.id" />
+				<data android:host="manhwakool.com" />
+				<data android:host="manhwalist.xyz" />
+				<data android:host="manhwalover.com" />
+				<data android:host="manhwaplus.pro" />
+				<data android:host="manhwasco.net" />
+				<data android:host="manhwatop.com" />
+				<data android:host="manhwaworld.com" />
+				<data android:host="manhwax.org" />
+				<data android:host="manhwaz.com" />
+				<data android:host="mantrazscan.com" />
+				<data android:host="manwe.pro" />
+				<data android:host="manycomic.com" />
+				<data android:host="manytoon.com" />
+				<data android:host="manytoon.me" />
+				<data android:host="masterkomik.com" />
+				<data android:host="melokomik.xyz" />
+				<data android:host="mgkomik.com" />
+				<data android:host="miauscans.com" />
+				<data android:host="milftoon.xxx" />
+				<data android:host="mintmanga.com" />
+				<data android:host="mintmanga.live" />
+				<data android:host="mirrordesu.ink" />
+				<data android:host="mm-scans.org" />
+				<data android:host="momonohanascan.com" />
+				<data android:host="monarcamanga.com" />
+				<data android:host="moonloversscan.com.br" />
+				<data android:host="moonwitchinlovescan.com" />
+				<data android:host="mortalsgroove.com" />
+				<data android:host="mto.to" />
+				<data android:host="mundomangakun.com.br" />
+				<data android:host="mundomanhwa.com" />
+				<data android:host="murimscan.run" />
+				<data android:host="neatmangas.com" />
+				<data android:host="neoxscans.net" />
+				<data android:host="nettruyenin.com" />
+				<data android:host="nettruyento.com" />
+				<data android:host="neumanga.net" />
+				<data android:host="neumanga.xyz" />
+				<data android:host="nhattruyenmin.com" />
+				<data android:host="nhentai.net" />
+				<data android:host="nicovideo.jp" />
+				<data android:host="nightscans.org" />
+				<data android:host="niji-translations.com" />
+				<data android:host="ninjascan.site" />
+				<data android:host="niverafansub.com" />
+				<data android:host="nocsummer.com.br" />
+				<data android:host="noindexscan.com" />
+				<data android:host="nonbiri.space" />
+				<data android:host="novelcrow.com" />
+				<data android:host="novelmic.com" />
+				<data android:host="novelstown.cyou" />
+				<data android:host="nude-moon.net" />
+				<data android:host="nude-moon.org" />
+				<data android:host="nyxmanga.com" />
+				<data android:host="origami-orpheans.com.br" />
+				<data android:host="otsugami.id" />
+				<data android:host="oxapk.com" />
+				<data android:host="ozulmanga.com" />
+				<data android:host="painfulnightz.com" />
+				<data android:host="pantheon-scan.com" />
+				<data android:host="papscan.com" />
+				<data android:host="paragonscans.com" />
+				<data android:host="peacescans.com" />
+				<data android:host="phantomscans.com" />
+				<data android:host="phenixscans.fr" />
+				<data android:host="pianmanga.me" />
+				<data android:host="pirulitorosa.site" />
+				<data android:host="piscans.in" />
+				<data android:host="platinumscans.com" />
+				<data android:host="pojokmanga.net" />
+				<data android:host="popsmanga.com" />
+				<data android:host="portalyaoi.com" />
+				<data android:host="prismahentai.com" />
+				<data android:host="prismascans.net" />
+				<data android:host="projetoscanlator.com" />
+				<data android:host="psunicorn.com" />
+				<data android:host="queenscans.com" />
+				<data android:host="ragnarokscan.com" />
+				<data android:host="ragnarokscanlation.com" />
+				<data android:host="raijinscans.fr" />
+				<data android:host="raikiscan.com" />
+				<data android:host="rainbowfairyscan.com" />
+				<data android:host="randomscans.com" />
+				<data android:host="ravenscans.com" />
+				<data android:host="rawdex.net" />
+				<data android:host="rawkuma.com" />
+				<data android:host="read-nifteam.info" />
+				<data android:host="read.babelwuxia.com" />
+				<data android:host="readcomicsonline.ru" />
+				<data android:host="reader.deathtollscans.net" />
+				<data android:host="reader.decadencescans.com" />
+				<data android:host="reader.evilflowers.com" />
+				<data android:host="reader.mangatellers.gr" />
+				<data android:host="reader.onepiecenakama.pl" />
+				<data android:host="reader.powermanga.org" />
+				<data android:host="reader.silentsky-scans.net" />
+				<data android:host="readfreecomics.com" />
+				<data android:host="readkomik.com" />
+				<data android:host="readmanga.io" />
+				<data android:host="readmanga.live" />
+				<data android:host="readmanga.me" />
+				<data android:host="readmangabat.com" />
+				<data android:host="readmanhua.net" />
+				<data android:host="readtoto.com" />
+				<data android:host="readtoto.net" />
+				<data android:host="readtoto.org" />
+				<data android:host="realmscans.xyz" />
+				<data android:host="reaperscans.fr" />
+				<data android:host="remanga.org" />
+				<data android:host="rightdark-scan.com" />
+				<data android:host="rio2manga.com" />
+				<data android:host="rio2manga.net" />
+				<data android:host="rogmangas.com" />
+				<data android:host="romantikmanga.com" />
+				<data android:host="ru.ninemanga.com" />
+				<data android:host="s2manga.com" />
+				<data android:host="samuraiscan.com" />
+				<data android:host="sawamics.com" />
+				<data android:host="saytruyenhay.com" />
+				<data android:host="scambertraslator.com" />
+				<data android:host="scan.hentai.menu" />
+				<data android:host="scanmanga-vf.ws" />
+				<data android:host="scansmangas.me" />
+				<data android:host="scansraw.com" />
+				<data android:host="scantrad-union.com" />
+				<data android:host="scantrad-vf.co" />
+				<data android:host="sekaikomik.pro" />
+				<data android:host="sektedoujin.cc" />
+				<data android:host="sektekomik.xyz" />
+				<data android:host="selfmanga.live" />
+				<data android:host="senpaiediciones.com" />
+				<data android:host="shadowmangas.com" />
+				<data android:host="shadowtrad.net" />
+				<data android:host="sheakomik.com" />
+				<data android:host="shibamanga.com" />
+				<data android:host="shinigami.id" />
+				<data android:host="shirodoujin.com" />
+				<data android:host="shootingstarscans.com" />
+				<data android:host="silencescan.com.br" />
+				<data android:host="sinensisscans.com" />
+				<data android:host="skanlacje-feniksy.pl" />
+				<data android:host="skymanga.work" />
+				<data android:host="skymangas.com" />
+				<data android:host="sleepytranslations.com" />
+				<data android:host="soulscans.my.id" />
+				<data android:host="spartanmanga.com.tr" />
+				<data android:host="sssscanlator.com" />
+				<data android:host="summanga.com" />
+				<data android:host="suryascans.com" />
+				<data android:host="sushiscan.fr" />
+				<data android:host="sushiscan.net" />
+				<data android:host="swatop.club" />
+				<data android:host="tankouhentai.com" />
+				<data android:host="tatakaescan.com" />
+				<data android:host="tecnoscann.com" />
+				<data android:host="teenmanhua.com" />
+				<data android:host="tempestfansub.com" />
+				<data android:host="templescan.net" />
+				<data android:host="templescanesp.com" />
+				<data android:host="tenkaiscan.net" />
+				<data android:host="theguildscans.com" />
+				<data android:host="thesugarscan.com" />
+				<data android:host="timenaight.com" />
+				<data android:host="todaymic.com" />
+				<data android:host="tonizutoon.com" />
+				<data android:host="toonchill.com" />
+				<data android:host="toonfr.com" />
+				<data android:host="toonhunter.com" />
+				<data android:host="toonily.com" />
+				<data android:host="toonily.me" />
+				<data android:host="toonily.net" />
+				<data android:host="toonitube.com" />
+				<data android:host="tortuga-ceviri.com" />
+				<data android:host="traduccionesmoonlight.com" />
+				<data android:host="treemanga.com" />
+				<data android:host="tritinia.org" />
+				<data android:host="truemanga.com" />
+				<data android:host="truyentranhlh.net" />
+				<data android:host="tsundoku.com.br" />
+				<data android:host="tukangkomik.id" />
+				<data android:host="tumanhwas.club" />
+				<data android:host="turktoon.com" />
+				<data android:host="v2.comiz.net" />
+				<data android:host="valkyriescan.com" />
+				<data android:host="vercomicsporno.com" />
+				<data android:host="vermangasporno.com" />
+				<data android:host="vermanhwa.es" />
+				<data android:host="viyafansub.com" />
+				<data android:host="void-scans.com" />
+				<data android:host="w.mangairo.com" />
+				<data android:host="wakamics.net" />
+				<data android:host="webcomic.me" />
+				<data android:host="webtoon-tr.com" />
+				<data android:host="webtoon.uk" />
+				<data android:host="webtoonempire.org" />
+				<data android:host="webtoonhatti.com" />
+				<data android:host="webtoons.top" />
+				<data android:host="webtoonscan.com" />
+				<data android:host="weloma.art" />
+				<data android:host="welovemanga.one" />
+				<data android:host="westmanga.info" />
+				<data android:host="wickedwitchscan.com" />
+				<data android:host="winterscan.com" />
+				<data android:host="wonderlandscan.com" />
+				<data android:host="woopread.com" />
+				<data android:host="worldmanhwas.bar" />
+				<data android:host="wto.to" />
+				<data android:host="www1.bluesolo.org" />
+				<data android:host="www.areascans.net" />
+				<data android:host="www.bentomanga.com" />
+				<data android:host="www.eromiau.com" />
+				<data android:host="www.inu-manga.com" />
+				<data android:host="www.japscan.lol" />
+				<data android:host="www.kuroimanga.com" />
+				<data android:host="www.lami-manga.com" />
+				<data android:host="www.lelmanga.com" />
+				<data android:host="www.lianscans.my.id" />
+				<data android:host="www.maid.my.id" />
+				<data android:host="www.majorscans.com" />
+				<data android:host="www.mangadods.com" />
+				<data android:host="www.mangaread.org" />
+				<data android:host="www.mangascantrad.fr" />
+				<data android:host="www.mangatown.com" />
+				<data android:host="www.manhuabug.com" />
+				<data android:host="www.manhuakey.com" />
+				<data android:host="www.manhuasy.com" />
+				<data android:host="www.menudo-fansub.com" />
+				<data android:host="www.nettruyenmax.com" />
+				<data android:host="www.nettruyento.com" />
+				<data android:host="www.nightcomic.com" />
+				<data android:host="www.ninemanga.com" />
+				<data android:host="www.noblessetranslations.com" />
+				<data android:host="www.pantheon-scan.fr" />
+				<data android:host="www.paritehaber.com" />
+				<data android:host="www.peachscan.com" />
+				<data android:host="www.petrotechsociety.org" />
+				<data android:host="www.petrotechsociety.org" />
+				<data android:host="www.ramareader.it" />
+				<data android:host="www.rh2plusmanga.com" />
+				<data android:host="www.ruyamanga.com" />
+				<data android:host="www.scan-fr.org" />
+				<data android:host="www.scan-vf.net" />
+				<data android:host="www.thaimanga.net" />
+				<data android:host="www.topmanhua.com" />
+				<data android:host="www.vfscan.com" />
+				<data android:host="www.walpurgiscan.it" />
+				<data android:host="www.webtoon.xyz" />
+				<data android:host="www.witcomics.net" />
+				<data android:host="www.xn--l3c0azab5a2gta.com" />
+				<data android:host="www.yaoitoshokan.net" />
+				<data android:host="xbato.com" />
+				<data android:host="xbato.net" />
+				<data android:host="xbato.org" />
+				<data android:host="xoxocomics.net" />
+				<data android:host="xx.hentaichan.live" />
+				<data android:host="xxx.hentaichan.live" />
+				<data android:host="y.hentaichan.live" />
+				<data android:host="yaoi-chan.me" />
+				<data android:host="yaoi.mobi" />
+				<data android:host="yaoilib.me" />
+				<data android:host="yaoiscan.com" />
+				<data android:host="ycscan.com" />
+				<data android:host="yugenmangas.com.br" />
+				<data android:host="yuri.live" />
+				<data android:host="zahard.xyz" />
+				<data android:host="zandynofansub.aishiteru.org" />
+				<data android:host="zbato.com" />
+				<data android:host="zbato.net" />
+				<data android:host="zbato.org" />
+				<data android:host="zeroscan.com.br" />
+				<data android:host="zinmanga.com" />
+				<data android:host="zinmanhwa.com" />
+				<data android:host="zuttomanga.com" />
+				<data android:host="реманга.орг" />
+			</intent-filter>
+		</activity-alias>
+
 	</application>
 
 </manifest>

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

@@ -52,6 +52,13 @@ class BookmarksRepository @Inject constructor(
 		}
 	}
 
+	suspend fun updateBookmark(bookmark: Bookmark, imageUrl: String) {
+		val entity = bookmark.toEntity().copy(
+			imageUrl = imageUrl,
+		)
+		db.bookmarksDao.upsert(listOf(entity))
+	}
+
 	suspend fun removeBookmark(mangaId: Long, chapterId: Long, page: Int) {
 		check(db.bookmarksDao.delete(mangaId, chapterId, page) != 0) {
 			"Bookmark not found"

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

@@ -29,7 +29,6 @@ import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.ui.util.reverseAsync
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
@@ -84,7 +83,7 @@ class BookmarksFragment :
 		with(binding.recyclerView) {
 			setHasFixedSize(true)
 			val spanResolver = MangaListSpanResolver(resources)
-			addItemDecoration(TypedListSpacingDecoration(context))
+			addItemDecoration(TypedListSpacingDecoration(context, false))
 			adapter = bookmarksAdapter
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver.setGridSize(settings.gridSize / 100f, this)
@@ -159,10 +158,11 @@ class BookmarksFragment :
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		requireViewBinding().recyclerView.updatePadding(
-			bottom = insets.bottom,
+		val rv = requireViewBinding().recyclerView
+		rv.updatePadding(
+			bottom = insets.bottom + rv.paddingTop,
 		)
-		requireViewBinding().recyclerView.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+		rv.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
 			bottomMargin = insets.bottom
 		}
 	}

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

@@ -34,6 +34,7 @@ fun bookmarkListAD(
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
+			tag(item)
 			decodeRegion(item.scroll)
 			source(item.manga.source)
 			enqueueWith(coil)

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

@@ -5,11 +5,15 @@ import coil.ImageLoader
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 
 class BookmarksAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Bookmark>,
-) : BaseListAdapter<Bookmark>(
-	bookmarkListAD(coil, lifecycleOwner, clickListener),
-)
+) : BaseListAdapter<Bookmark>() {
+
+	init {
+		addDelegate(ListItemType.PAGE_THUMB, bookmarkListAD(coil, lifecycleOwner, clickListener))
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarkLargeAD.kt

@@ -35,6 +35,7 @@ fun bookmarkLargeAD(
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
+			tag(item)
 			decodeRegion(item.scroll)
 			source(item.manga.source)
 			enqueueWith(coil)

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksAdapter.kt

@@ -9,6 +9,7 @@ import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
@@ -27,6 +28,7 @@ class BookmarksAdapter(
 		addDelegate(ListItemType.HEADER, listHeaderAD(headerClickListener))
 		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
 		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, null))
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksSheet.kt

@@ -75,7 +75,7 @@ class BookmarksSheet :
 		)
 		viewBinding?.headerBar?.setTitle(R.string.bookmarks)
 		with(binding.recyclerView) {
-			addItemDecoration(TypedListSpacingDecoration(context))
+			addItemDecoration(TypedListSpacingDecoration(context, false))
 			adapter = bookmarksAdapter
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver?.setGridSize(settings.gridSize / 100f, this)

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

@@ -13,6 +13,7 @@ import coil.decode.SvgDecoder
 import coil.disk.DiskCache
 import coil.util.DebugLogger
 import dagger.Binds
+import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -46,6 +47,7 @@ import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.model.LocalManga
+import org.koitharu.kotatsu.main.domain.CoverRestorer
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.reader.ui.thumbnails.MangaPageFetcher
@@ -89,6 +91,7 @@ interface AppModule {
 			mangaRepositoryFactory: MangaRepository.Factory,
 			imageProxyInterceptor: ImageProxyInterceptor,
 			pageFetcherFactory: MangaPageFetcher.Factory,
+			coverRestorerProvider: Lazy<CoverRestorer>,
 		): ImageLoader {
 			val diskCacheFactory = {
 				val rootDir = context.externalCacheDir ?: context.cacheDir
@@ -105,6 +108,7 @@ interface AppModule {
 				.diskCache(diskCacheFactory)
 				.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
 				.allowRgb565(context.isLowRamDevice())
+				.eventListenerFactory { coverRestorerProvider.get() }
 				.components(
 					ComponentRegistry.Builder()
 						.add(SvgDecoder.Factory())

app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt

@@ -1,11 +1,9 @@
-package org.koitharu.kotatsu
+package org.koitharu.kotatsu.core
 
 import android.app.Application
 import android.content.Context
-import android.os.StrictMode
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.fragment.app.strictmode.FragmentStrictMode
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.room.InvalidationTracker
 import androidx.work.Configuration
@@ -20,20 +18,19 @@ import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.os.AppValidator
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.local.data.LocalMangaRepository
-import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
 import javax.inject.Inject
 import javax.inject.Provider
 
 @HiltAndroidApp
-class KotatsuApp : Application(), Configuration.Provider {
+open class BaseApp : Application(), Configuration.Provider {
 
 	@Inject
 	lateinit var databaseObservers: Set<@JvmSuppressWildcards InvalidationTracker.Observer>
@@ -62,9 +59,6 @@ class KotatsuApp : Application(), Configuration.Provider {
 	override fun onCreate() {
 		super.onCreate()
 		ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.toString())
-		if (BuildConfig.DEBUG) {
-			enableStrictMode()
-		}
 		AppCompatDelegate.setDefaultNightMode(settings.theme)
 		AppCompatDelegate.setApplicationLocales(settings.appLocales)
 		setupActivityLifecycleCallbacks()
@@ -72,6 +66,7 @@ class KotatsuApp : Application(), Configuration.Provider {
 			setupDatabaseObservers()
 		}
 		workScheduleManager.init()
+		WorkServiceStopHelper(workManagerProvider).setup()
 	}
 
 	override fun attachBaseContext(base: Context?) {
@@ -134,31 +129,4 @@ class KotatsuApp : Application(), Configuration.Provider {
 			registerActivityLifecycleCallbacks(it)
 		}
 	}
-
-	private fun enableStrictMode() {
-		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder()
-				.detectAll()
-				.penaltyLog()
-				.build(),
-		)
-		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder()
-				.detectAll()
-				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
-				.setClassInstanceLimit(PagesCache::class.java, 1)
-				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
-				.setClassInstanceLimit(PageLoader::class.java, 1)
-				.penaltyLog()
-				.build(),
-		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
-			.penaltyDeath()
-			.detectFragmentReuse()
-			// .detectWrongFragmentContainer() FIXME: migrate to ViewPager2
-			.detectRetainInstanceUsage()
-			.detectSetUserVisibleHint()
-			.detectFragmentTagUsage()
-			.build()
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaDao.kt

@@ -19,6 +19,10 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE manga_id = :id")
 	abstract suspend fun find(id: Long): MangaWithTags?
 
+	@Transaction
+	@Query("SELECT * FROM manga WHERE public_url = :publicUrl")
+	abstract suspend fun findByPublicUrl(publicUrl: String): MangaWithTags?
+
 	@Transaction
 	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND manga_id IN (SELECT manga_id FROM favourites UNION SELECT manga_id FROM history) LIMIT :limit")
 	abstract suspend fun searchByTitle(query: String, limit: Int): List<MangaWithTags>

app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration16To17.kt

@@ -21,13 +21,18 @@ class Migration16To17(context: Context) : Migration(16, 17) {
 				continue
 			}
 			val name = source.name
+			val isHidden = name in hiddenSources
 			var sortKey = order.indexOf(name)
 			if (sortKey == -1) {
-				sortKey = order.size + source.ordinal
+				if (isHidden) {
+					sortKey = order.size + source.ordinal
+				} else {
+					continue
+				}
 			}
 			database.execSQL(
 				"INSERT INTO `sources` (`source`, `enabled`, `sort_key`) VALUES (?, ?, ?)",
-				arrayOf(name, (name !in hiddenSources).toInt(), sortKey),
+				arrayOf(name, (!isHidden).toInt(), sortKey),
 			)
 		}
 	}

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.model
 
+import android.net.Uri
 import androidx.core.os.LocaleListCompat
 import org.koitharu.kotatsu.core.util.ext.iterator
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -66,3 +67,10 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 
 val Manga.isLocal: Boolean
 	get() = source == MangaSource.LOCAL
+
+val Manga.appUrl: Uri
+	get() = Uri.parse("https://kotatsu.app/manga").buildUpon()
+		.appendQueryParameter("source", source.name)
+		.appendQueryParameter("name", title)
+		.appendQueryParameter("url", url)
+		.build()

app/src/main/kotlin/org/koitharu/kotatsu/core/os/NetworkManageIntent.kt

@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.core.os
+
+import android.content.Intent
+import android.os.Build
+import android.provider.Settings
+
+@Suppress("FunctionName")
+fun NetworkManageIntent(): Intent {
+	val action = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		Settings.Panel.ACTION_INTERNET_CONNECTIVITY
+	} else {
+		Settings.ACTION_WIRELESS_SETTINGS
+	}
+	return Intent(action)
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt

@@ -17,10 +17,12 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 import javax.inject.Inject
+import javax.inject.Provider
 
 @Reusable
 class MangaDataRepository @Inject constructor(
 	private val db: MangaDatabase,
+	private val resolverProvider: Provider<MangaLinkResolver>,
 ) {
 
 	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
@@ -63,10 +65,15 @@ class MangaDataRepository @Inject constructor(
 		return db.mangaDao.find(mangaId)?.toManga()
 	}
 
+	suspend fun findMangaByPublicUrl(publicUrl: String): Manga? {
+		return db.mangaDao.findByPublicUrl(publicUrl)?.toManga()
+	}
+
 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
 		intent.manga != null -> intent.manga
 		intent.mangaId != 0L -> findMangaById(intent.mangaId)
-		else -> null // TODO resolve uri
+		intent.uri != null -> resolverProvider.get().resolve(intent.uri)
+		else -> null
 	}
 
 	suspend fun storeManga(manga: Manga) {

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLinkResolver.kt

@@ -0,0 +1,119 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.net.Uri
+import dagger.Reusable
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import org.koitharu.kotatsu.parsers.exception.NotFoundException
+import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.almostEquals
+import org.koitharu.kotatsu.parsers.util.levenshteinDistance
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.parsers.util.toRelativeUrl
+import javax.inject.Inject
+
+@Reusable
+class MangaLinkResolver @Inject constructor(
+	private val repositoryFactory: MangaRepository.Factory,
+	private val sourcesRepository: MangaSourcesRepository,
+	private val dataRepository: MangaDataRepository,
+) {
+
+	suspend fun resolve(uri: Uri): Manga {
+		return if (uri.host == "kotatsu.app") {
+			resolveAppLink(uri)
+		} else {
+			resolveExternalLink(uri)
+		} ?: throw NotFoundException("Manga not found", uri.toString())
+	}
+
+	suspend fun resolveAppLink(uri: Uri): Manga? {
+		require(uri.pathSegments.singleOrNull() == "manga") { "Invalid url" }
+		val sourceName = requireNotNull(uri.getQueryParameter("source")) { "Source is not specified" }
+		val source = MangaSource(sourceName)
+		require(source != MangaSource.DUMMY) { "Manga source $sourceName is not supported" }
+		val repo = repositoryFactory.create(source)
+		return repo.findExact(
+			url = uri.getQueryParameter("url"),
+			title = uri.getQueryParameter("name"),
+		)
+	}
+
+	suspend fun resolveExternalLink(uri: Uri): Manga? {
+		dataRepository.findMangaByPublicUrl(uri.toString())?.let {
+			return it
+		}
+		val host = uri.host ?: return null
+		val repo = sourcesRepository.allMangaSources.asSequence()
+			.map { source ->
+				repositoryFactory.create(source) as RemoteMangaRepository
+			}.find { repo ->
+				host in repo.domains
+			} ?: return null
+		return repo.findExact(uri.toString().toRelativeUrl(host), null)
+	}
+
+	private suspend fun MangaRepository.findExact(url: String?, title: String?): Manga? {
+		if (!title.isNullOrEmpty()) {
+			val list = getList(0, title)
+			if (url != null) {
+				list.find { it.url == url }?.let {
+					return it
+				}
+			}
+			list.minByOrNull { it.title.levenshteinDistance(title) }
+				?.takeIf { it.title.almostEquals(title, 0.2f) }
+				?.let { return it }
+		}
+		val seed = getDetailsNoCache(
+			getSeedManga(source, url ?: return null, title),
+		)
+		return runCatchingCancellable {
+			val seedTitle = seed.title.ifEmpty {
+				seed.altTitle
+			}.ifNullOrEmpty {
+				seed.author
+			} ?: return@runCatchingCancellable null
+			val seedList = getList(0, seedTitle)
+			seedList.first { x -> x.url == url }
+		}.getOrThrow()
+	}
+
+	private suspend fun MangaRepository.getDetailsNoCache(manga: Manga): Manga {
+		return if (this is RemoteMangaRepository) {
+			getDetails(manga, withCache = false)
+		} else {
+			getDetails(manga)
+		}
+	}
+
+	private fun getSeedManga(source: MangaSource, url: String, title: String?) = Manga(
+		id = run {
+			var h = 1125899906842597L
+			source.name.forEach { c ->
+				h = 31 * h + c.code
+			}
+			url.forEach { c ->
+				h = 31 * h + c.code
+			}
+			h
+		},
+		title = title.orEmpty(),
+		altTitle = null,
+		url = url,
+		publicUrl = "",
+		rating = 0.0f,
+		isNsfw = source.contentType == ContentType.HENTAI,
+		coverUrl = "",
+		tags = emptySet(),
+		state = null,
+		author = null,
+		largeCoverUrl = null,
+		description = null,
+		chapters = null,
+		source = source,
+	)
+}

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

@@ -51,6 +51,9 @@ class RemoteMangaRepository(
 			getConfig()[parser.configKeyDomain] = value
 		}
 
+	val domains: Array<out String>
+		get() = parser.configKeyDomain.presetValues
+
 	val headers: Headers
 		get() = parser.headers
 
@@ -70,14 +73,7 @@ class RemoteMangaRepository(
 		return parser.getList(offset, tags, sortOrder)
 	}
 
-	override suspend fun getDetails(manga: Manga): Manga {
-		cache.getDetails(source, manga.url)?.let { return it }
-		val details = asyncSafe {
-			parser.getDetails(manga)
-		}
-		cache.putDetails(source, manga.url, details)
-		return details.await()
-	}
+	override suspend fun getDetails(manga: Manga): Manga = getDetails(manga, withCache = true)
 
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
 		cache.getPages(source, chapter.url)?.let { return it }
@@ -103,6 +99,23 @@ class RemoteMangaRepository(
 		return related.await()
 	}
 
+	suspend fun getDetails(manga: Manga, withCache: Boolean): Manga {
+		if (!withCache) {
+			return parser.getDetails(manga)
+		}
+		cache.getDetails(source, manga.url)?.let { return it }
+		val details = asyncSafe {
+			parser.getDetails(manga)
+		}
+		cache.putDetails(source, manga.url, details)
+		return details.await()
+	}
+
+	suspend fun find(manga: Manga): Manga? {
+		val list = getList(0, manga.title)
+		return list.find { x -> x.id == manga.id }
+	}
+
 	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
 
 	fun getConfigKeys(): List<ConfigKey<*>> = ArrayList<ConfigKey<*>>().also {

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt

@@ -20,7 +20,6 @@ import okhttp3.Response
 import okhttp3.ResponseBody
 import okhttp3.internal.closeQuietly
 import okio.Closeable
-import okio.IOException
 import okio.buffer
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.MangaSource
@@ -62,7 +61,7 @@ class FaviconFetcher(
 				loadIcon(icon.url, mangaSource)
 			} catch (e: CloudFlareProtectedException) {
 				throw e
-			} catch (e: IOException) {
+			} catch (e: HttpException) {
 				favicons -= icon
 				continue
 			}

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

@@ -51,6 +51,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isAmoledTheme: Boolean
 		get() = prefs.getBoolean(KEY_THEME_AMOLED, false)
 
+	val isFavoritesNavItemFirst: Boolean
+		get() = (prefs.getString(KEY_FIRST_NAV_ITEM, null)?.toIntOrNull() ?: 0) == 1
+
 	var gridSize: Int
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
@@ -280,6 +283,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, HistoryOrder.UPDATED)
 		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
 
+	val isRelatedMangaEnabled: Boolean
+		get() = prefs.getBoolean(KEY_RELATED_MANGA, true)
+
 	val isWebtoonZoomEnable: Boolean
 		get() = prefs.getBoolean(KEY_WEBTOON_ZOOM, true)
 
@@ -448,6 +454,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_IMAGES_PROXY = "images_proxy"
 		const val KEY_LOCAL_MANGA_DIRS = "local_manga_dirs"
 		const val KEY_DISABLE_NSFW = "no_nsfw"
+		const val KEY_RELATED_MANGA = "related_manga"
+		const val KEY_FIRST_NAV_ITEM = "nav_first"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseListAdapter.kt

@@ -13,13 +13,10 @@ import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import kotlin.coroutines.suspendCoroutine
 
-open class BaseListAdapter<T : ListModel>(
-	vararg delegates: AdapterDelegate<List<T>>,
-) : AsyncListDifferDelegationAdapter<T>(
+open class BaseListAdapter<T : ListModel> : AsyncListDifferDelegationAdapter<T>(
 	AsyncDifferConfig.Builder(ListModelDiffCallback<T>())
 		.setBackgroundThreadExecutor(Dispatchers.Default.limitedParallelism(2).asExecutor())
 		.build(),
-	*delegates,
 ), FlowCollector<List<T>?> {
 
 	override suspend fun emit(value: List<T>?) = suspendCoroutine { cont ->

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/ActivityRecreationHandle.kt

@@ -25,4 +25,9 @@ class ActivityRecreationHandle @Inject constructor() : DefaultActivityLifecycleC
 		val snapshot = activities.keys.toList()
 		snapshot.forEach { ActivityCompat.recreate(it) }
 	}
+
+	fun recreate(cls: Class<out Activity>) {
+		val activity = activities.keys.find { x -> x.javaClass == cls } ?: return
+		ActivityCompat.recreate(activity)
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt

@@ -76,7 +76,7 @@ class TipView @JvmOverloads constructor(
 			val shapeAppearanceModel = ShapeAppearanceModel.builder(context, attrs, defStyleAttr, 0).build()
 			background = MaterialShapeDrawable(shapeAppearanceModel).also {
 				it.fillColor = getColorStateList(R.styleable.TipView_cardBackgroundColor)
-					?: context.getThemeColorStateList(materialR.attr.colorBackgroundFloating)
+					?: context.getThemeColorStateList(R.attr.m3ColorExploreButton)
 				it.strokeWidth = getDimension(R.styleable.TipView_strokeWidth, 0f)
 				it.strokeColor = getColorStateList(R.styleable.TipView_strokeColor)
 				it.elevation = getDimension(R.styleable.TipView_elevation, 0f)

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ShareHelper.kt

@@ -8,6 +8,7 @@ import androidx.core.content.FileProvider
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.logs.FileLogger
+import org.koitharu.kotatsu.core.model.appUrl
 import org.koitharu.kotatsu.parsers.model.Manga
 import java.io.File
 
@@ -22,6 +23,8 @@ class ShareHelper(private val context: Context) {
 			append(manga.title)
 			append("\n \n")
 			append(manga.publicUrl)
+			append("\n \n")
+			append(manga.appUrl)
 		}
 		ShareCompat.IntentBuilder(context)
 			.setText(text)

app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt

@@ -0,0 +1,48 @@
+package org.koitharu.kotatsu.core.util
+
+import android.annotation.SuppressLint
+import androidx.lifecycle.asFlow
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import androidx.work.WorkQuery
+import androidx.work.impl.foreground.SystemForegroundService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
+import javax.inject.Provider
+
+/**
+ * Workaround for issue
+ * https://issuetracker.google.com/issues/270245927
+ * https://issuetracker.google.com/issues/280504155
+ */
+class WorkServiceStopHelper(
+	private val workManagerProvider: Provider<WorkManager>,
+) {
+
+	fun setup() {
+		processLifecycleScope.launch(Dispatchers.Default) {
+			workManagerProvider.get()
+				.getWorkInfosLiveData(WorkQuery.fromStates(WorkInfo.State.RUNNING))
+				.asFlow()
+				.map { it.isEmpty() }
+				.distinctUntilChanged()
+				.collectLatest {
+					if (it) {
+						delay(1_000)
+						stopWorkerService()
+					}
+				}
+		}
+	}
+
+	@SuppressLint("RestrictedApi")
+	private fun stopWorkerService() {
+		SystemForegroundService.getInstance()?.stop()
+	}
+}
+

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt

@@ -83,7 +83,7 @@ fun <I> ActivityResultLauncher<I>.tryLaunch(
 	e.printStackTraceDebug()
 }.isSuccess
 
-fun SharedPreferences.observe() = callbackFlow<String> {
+fun SharedPreferences.observe() = callbackFlow<String?> {
 	val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
 		trySendBlocking(key)
 	}
@@ -102,7 +102,7 @@ fun <T> SharedPreferences.observe(key: String, valueProducer: suspend () -> T):
 	}
 }.distinctUntilChanged()
 
-fun Lifecycle.postDelayed(runnable: Runnable, delay: Long) {
+fun Lifecycle.postDelayed(delay: Long, runnable: Runnable) {
 	coroutineScope.launch {
 		delay(delay)
 		runnable.run()

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt

@@ -29,7 +29,7 @@ fun ImageView.newImageRequest(lifecycleOwner: LifecycleOwner, data: Any?): Image
 		.data(data)
 		.lifecycle(lifecycleOwner)
 		.crossfade(context)
-		.listener(CaptchaNotifier(context.applicationContext))
+		.addListener(CaptchaNotifier(context.applicationContext))
 		.target(this)
 }
 
@@ -65,11 +65,11 @@ fun ImageResult.toBitmapOrNull() = when (this) {
 }
 
 fun ImageRequest.Builder.indicator(indicator: BaseProgressIndicator<*>): ImageRequest.Builder {
-	return listener(ImageRequestIndicatorListener(listOf(indicator)))
+	return addListener(ImageRequestIndicatorListener(listOf(indicator)))
 }
 
 fun ImageRequest.Builder.indicator(indicators: List<BaseProgressIndicator<*>>): ImageRequest.Builder {
-	return listener(ImageRequestIndicatorListener(indicators))
+	return addListener(ImageRequestIndicatorListener(indicators))
 }
 
 fun ImageRequest.Builder.decodeRegion(
@@ -86,3 +86,30 @@ fun ImageRequest.Builder.crossfade(context: Context): ImageRequest.Builder {
 fun ImageRequest.Builder.source(source: MangaSource?): ImageRequest.Builder {
 	return tag(MangaSource::class.java, source)
 }
+
+fun ImageRequest.Builder.addListener(listener: ImageRequest.Listener): ImageRequest.Builder {
+	val existing = build().listener
+	return listener(
+		when (existing) {
+			null -> listener
+			is CompositeImageRequestListener -> existing + listener
+			else -> CompositeImageRequestListener(arrayOf(existing, listener))
+		},
+	)
+}
+
+private class CompositeImageRequestListener(
+	private val delegates: Array<ImageRequest.Listener>,
+) : ImageRequest.Listener {
+
+	override fun onCancel(request: ImageRequest) = delegates.forEach { it.onCancel(request) }
+
+	override fun onError(request: ImageRequest, result: ErrorResult) = delegates.forEach { it.onError(request, result) }
+
+	override fun onStart(request: ImageRequest) = delegates.forEach { it.onStart(request) }
+
+	override fun onSuccess(request: ImageRequest, result: SuccessResult) =
+		delegates.forEach { it.onSuccess(request, result) }
+
+	operator fun plus(other: ImageRequest.Listener) = CompositeImageRequestListener(delegates + other)
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coroutines.kt

@@ -10,6 +10,7 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.lifecycle.RetainedLifecycle
 import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
@@ -70,3 +71,11 @@ private fun Lifecycle.removeObserverFromAnyThread(observer: LifecycleObserver) {
 		removeObserver(observer)
 	}
 }
+
+fun <T> Deferred<T>.getCompletionResultOrNull(): Result<T>? = if (isCompleted) {
+	getCompletionExceptionOrNull()?.let { error ->
+		Result.failure(error)
+	} ?: Result.success(getCompleted())
+} else {
+	null
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/String.kt

@@ -4,7 +4,7 @@ import androidx.annotation.FloatRange
 import org.koitharu.kotatsu.parsers.util.levenshteinDistance
 import java.util.UUID
 
-inline fun <C : CharSequence> C?.ifNullOrEmpty(defaultValue: () -> C): C {
+inline fun <C : CharSequence?> C?.ifNullOrEmpty(defaultValue: () -> C): C {
 	return if (this.isNullOrEmpty()) defaultValue() else this
 }
 

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt

@@ -3,7 +3,9 @@ package org.koitharu.kotatsu.core.util.ext
 import android.content.ActivityNotFoundException
 import android.content.res.Resources
 import android.util.AndroidRuntimeException
+import androidx.annotation.DrawableRes
 import androidx.collection.arraySetOf
+import coil.network.HttpException
 import okio.FileNotFoundException
 import okio.IOException
 import org.acra.ktx.sendWithAcra
@@ -50,10 +52,8 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is WrongPasswordException -> resources.getString(R.string.wrong_password)
 	is NotFoundException -> resources.getString(R.string.not_found_404)
 
-	is HttpStatusException -> when (statusCode) {
-		in 500..599 -> resources.getString(R.string.server_error, statusCode)
-		else -> localizedMessage
-	}
+	is HttpException -> getHttpDisplayMessage(response.code, resources)
+	is HttpStatusException -> getHttpDisplayMessage(statusCode, resources)
 
 	is IOException -> getDisplayMessage(message, resources) ?: localizedMessage
 	else -> localizedMessage
@@ -61,6 +61,23 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	resources.getString(R.string.error_occurred)
 }
 
+@DrawableRes
+fun Throwable.getDisplayIcon() = when (this) {
+	is AuthRequiredException -> R.drawable.ic_auth_key_large
+	is CloudFlareProtectedException -> R.drawable.ic_bot_large
+	is UnknownHostException,
+	is SocketTimeoutException,
+	-> R.drawable.ic_plug_large
+
+	else -> R.drawable.ic_error_large
+}
+
+private fun getHttpDisplayMessage(statusCode: Int, resources: Resources): String? = when (statusCode) {
+	404 -> resources.getString(R.string.not_found_404)
+	in 500..599 -> resources.getString(R.string.server_error, statusCode)
+	else -> null
+}
+
 private fun getDisplayMessage(msg: String?, resources: Resources): String? = when {
 	msg.isNullOrEmpty() -> null
 	msg.contains(MSG_NO_SPACE_LEFT) -> resources.getString(R.string.error_no_space_left)

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.view.ViewParent
 import android.view.inputmethod.InputMethodManager
 import android.widget.Checkable
+import android.widget.CompoundButton
 import androidx.core.view.children
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2

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

@@ -53,6 +53,7 @@ import org.koitharu.kotatsu.details.ui.scrobbling.ScrollingInfoAdapter
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.image.ui.ImageActivity
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaItemModel
@@ -227,14 +228,16 @@ class DetailsFragment :
 		val rv = viewBinding?.recyclerViewRelated ?: return
 
 		@Suppress("UNCHECKED_CAST")
-		val adapter = (rv.adapter as? BaseListAdapter<ListModel>) ?: BaseListAdapter(
-			mangaGridItemAD(
-				coil, viewLifecycleOwner,
-				StaticItemSizeResolver(resources.getDimensionPixelSize(R.dimen.smaller_grid_width)),
-			) { item, view ->
-				startActivity(DetailsActivity.newIntent(view.context, item))
-			},
-		).also { rv.adapter = it }
+		val adapter = (rv.adapter as? BaseListAdapter<ListModel>) ?: BaseListAdapter<ListModel>()
+			.addDelegate(
+				ListItemType.MANGA_GRID,
+				mangaGridItemAD(
+					coil, viewLifecycleOwner,
+					StaticItemSizeResolver(resources.getDimensionPixelSize(R.dimen.smaller_grid_width)),
+				) { item, view ->
+					startActivity(DetailsActivity.newIntent(view.context, item))
+				},
+			).also { rv.adapter = it }
 		adapter.items = related
 		requireViewBinding().groupRelated.isVisible = true
 	}

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

@@ -167,7 +167,7 @@ class DetailsViewModel @Inject constructor(
 		it?.remote
 	}.distinctUntilChangedBy { it?.id }
 		.mapLatest {
-			if (it != null) {
+			if (it != null && settings.isRelatedMangaEnabled) {
 				relatedMangaUseCase.invoke(it)?.toUi(ListMode.GRID, extraProvider).orEmpty()
 			} else {
 				emptyList()

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

@@ -7,7 +7,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.activity.viewModels
-import androidx.annotation.Px
 import androidx.appcompat.view.ActionMode
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
@@ -37,16 +36,12 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 	private val viewModel by viewModels<DownloadsViewModel>()
 	private lateinit var selectionController: ListSelectionController
 
-	@Px
-	private var listSpacing = 0
-
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityDownloadsBinding.inflate(layoutInflater))
-		listSpacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		val downloadsAdapter = DownloadsAdapter(this, coil, this)
-		val decoration = TypedListSpacingDecoration(this)
+		val decoration = TypedListSpacingDecoration(this, false)
 		selectionController = ListSelectionController(
 			activity = this,
 			decoration = DownloadsSelectionDecoration(this),
@@ -71,9 +66,10 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.recyclerView.updatePadding(
-			left = insets.left + listSpacing,
-			right = insets.right + listSpacing,
+		val rv = viewBinding.recyclerView
+		rv.updatePadding(
+			left = insets.left + rv.paddingTop,
+			right = insets.right + rv.paddingTop,
 			bottom = insets.bottom,
 		)
 		viewBinding.toolbar.updatePadding(
@@ -98,11 +94,11 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 	}
 
 	override fun onPauseClick(item: DownloadItemModel) {
-		sendBroadcast(PausingReceiver.getPauseIntent(item.id))
+		sendBroadcast(PausingReceiver.getPauseIntent(this, item.id))
 	}
 
 	override fun onResumeClick(item: DownloadItemModel) {
-		sendBroadcast(PausingReceiver.getResumeIntent(item.id))
+		sendBroadcast(PausingReceiver.getResumeIntent(this, item.id))
 	}
 
 	override fun onSelectionChanged(controller: ListSelectionController, count: Int) {

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt

@@ -2,6 +2,8 @@ package org.koitharu.kotatsu.download.ui.worker
 
 import android.app.NotificationManager
 import android.content.Context
+import android.content.pm.ServiceInfo
+import android.os.Build
 import android.webkit.MimeTypeMap
 import androidx.core.content.ContextCompat
 import androidx.hilt.work.HiltWorker
@@ -130,10 +132,18 @@ class DownloadWorker @AssistedInject constructor(
 		}
 	}
 
-	override suspend fun getForegroundInfo() = ForegroundInfo(
-		id.hashCode(),
-		notificationFactory.create(lastPublishedState),
-	)
+	override suspend fun getForegroundInfo() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		ForegroundInfo(
+			id.hashCode(),
+			notificationFactory.create(lastPublishedState),
+			ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
+		)
+	} else {
+		ForegroundInfo(
+			id.hashCode(),
+			notificationFactory.create(lastPublishedState),
+		)
+	}
 
 	private suspend fun downloadMangaImpl(
 		includedIds: LongArray?,
@@ -389,12 +399,12 @@ class DownloadWorker @AssistedInject constructor(
 		}
 
 		fun pause(id: UUID) {
-			val intent = PausingReceiver.getPauseIntent(id)
+			val intent = PausingReceiver.getPauseIntent(context, id)
 			context.sendBroadcast(intent)
 		}
 
 		fun resume(id: UUID) {
-			val intent = PausingReceiver.getResumeIntent(id)
+			val intent = PausingReceiver.getResumeIntent(context, id)
 			context.sendBroadcast(intent)
 		}
 

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/PausingReceiver.kt

@@ -40,18 +40,20 @@ class PausingReceiver(
 			addDataPath(id.toString(), PatternMatcher.PATTERN_SIMPLE_GLOB)
 		}
 
-		fun getPauseIntent(id: UUID) = Intent(ACTION_PAUSE)
+		fun getPauseIntent(context: Context, id: UUID) = Intent(ACTION_PAUSE)
 			.setData(Uri.parse("$SCHEME://$id"))
+			.setPackage(context.packageName)
 			.putExtra(EXTRA_UUID, id.toString())
 
-		fun getResumeIntent(id: UUID) = Intent(ACTION_RESUME)
+		fun getResumeIntent(context: Context, id: UUID) = Intent(ACTION_RESUME)
 			.setData(Uri.parse("$SCHEME://$id"))
+			.setPackage(context.packageName)
 			.putExtra(EXTRA_UUID, id.toString())
 
 		fun createPausePendingIntent(context: Context, id: UUID) = PendingIntentCompat.getBroadcast(
 			context,
 			0,
-			getPauseIntent(id),
+			getPauseIntent(context, id),
 			0,
 			false,
 		)
@@ -59,7 +61,7 @@ class PausingReceiver(
 		fun createResumePendingIntent(context: Context, id: UUID) = PendingIntentCompat.getBroadcast(
 			context,
 			0,
-			getResumeIntent(id),
+			getResumeIntent(context, id),
 			0,
 			false,
 		)

app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt

@@ -68,6 +68,14 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
+	suspend fun setSourcesEnabledExclusive(sources: Set<MangaSource>) {
+		db.withTransaction {
+			for (s in remoteSources) {
+				dao.setEnabled(s.name, s in sources)
+			}
+		}
+	}
+
 	suspend fun setSourcesEnabled(sources: Iterable<MangaSource>, isEnabled: Boolean) {
 		db.withTransaction {
 			for (s in sources) {
@@ -83,6 +91,14 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
+	suspend fun setPositions(sources: List<MangaSource>) {
+		db.withTransaction {
+			for ((index, item) in sources.withIndex()) {
+				dao.setSortKey(item.name, index)
+			}
+		}
+	}
+
 	suspend fun setPosition(source: MangaSource, index: Int) {
 		db.withTransaction {
 			val all = dao.findAll().toMutableList()

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

@@ -28,13 +28,13 @@ import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.databinding.FragmentExploreBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.list.DownloadsActivity
 import org.koitharu.kotatsu.explore.ui.adapter.ExploreAdapter
 import org.koitharu.kotatsu.explore.ui.adapter.ExploreListEventListener
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.TipModel
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -57,7 +57,6 @@ class ExploreFragment :
 
 	private val viewModel by viewModels<ExploreViewModel>()
 	private var exploreAdapter: ExploreAdapter? = null
-	private var paddingHorizontal = 0
 
 	override val recyclerView: RecyclerView
 		get() = requireViewBinding().recyclerView
@@ -75,8 +74,7 @@ class ExploreFragment :
 			adapter = exploreAdapter
 			setHasFixedSize(true)
 			SpanSizeResolver(this, resources.getDimensionPixelSize(R.dimen.explore_grid_width)).attach()
-			val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
-			paddingHorizontal = spacing
+			addItemDecoration(TypedListSpacingDecoration(context, false))
 		}
 		addMenuProvider(ExploreMenuProvider(binding.root.context, viewModel))
 		viewModel.content.observe(viewLifecycleOwner) {
@@ -97,8 +95,9 @@ class ExploreFragment :
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		requireViewBinding().recyclerView.updatePadding(
-			bottom = insets.bottom,
+		val rv = requireViewBinding().recyclerView
+		rv.updatePadding(
+			bottom = insets.bottom + rv.paddingTop,
 		)
 	}
 

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

@@ -24,6 +24,7 @@ import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoriesAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import javax.inject.Inject
@@ -58,6 +59,7 @@ class FavouriteCategoriesActivity :
 		selectionController.attachToRecyclerView(viewBinding.recyclerView)
 		viewBinding.recyclerView.setHasFixedSize(true)
 		viewBinding.recyclerView.adapter = adapter
+		viewBinding.recyclerView.addItemDecoration(TypedListSpacingDecoration(this, false))
 		viewBinding.fabAdd.setOnClickListener(this)
 
 		reorderHelper = ItemTouchHelper(ReorderHelperCallback()).apply {
@@ -106,7 +108,7 @@ class FavouriteCategoriesActivity :
 			right = insets.right,
 		)
 		viewBinding.recyclerView.updatePadding(
-			bottom = insets.bottom,
+			bottom = insets.bottom + viewBinding.recyclerView.paddingTop,
 		)
 	}
 

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

@@ -35,6 +35,7 @@ class FavouritesCategoriesViewModel @Inject constructor(
 					mangaCount = covers.size,
 					covers = covers.take(3),
 					category = category,
+					isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
 				)
 			}.ifEmpty {
 				listOf(

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

@@ -4,6 +4,7 @@ import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesListListener
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
@@ -17,8 +18,8 @@ class CategoriesAdapter(
 ) : BaseListAdapter<ListModel>() {
 
 	init {
-		delegatesManager.addDelegate(categoryAD(coil, lifecycleOwner, onItemClickListener))
-			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listListener))
-			.addDelegate(loadingStateAD())
+		addDelegate(ListItemType.CATEGORY_LARGE ,categoryAD(coil, lifecycleOwner, onItemClickListener))
+		addDelegate(ListItemType.STATE_EMPTY ,emptyStateListAD(coil, lifecycleOwner, listListener))
+		addDelegate(ListItemType.STATE_LOADING ,loadingStateAD())
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt

@@ -8,6 +8,7 @@ class CategoryListModel(
 	val mangaCount: Int,
 	val covers: List<Cover>,
 	val category: FavouriteCategory,
+	val isTrackerEnabled: Boolean,
 ) : ListModel {
 
 	override fun areItemsTheSame(other: ListModel): Boolean {
@@ -21,6 +22,7 @@ class CategoryListModel(
 		other as CategoryListModel
 
 		if (mangaCount != other.mangaCount) return false
+		if (isTrackerEnabled != other.isTrackerEnabled) return false
 		if (covers != other.covers) return false
 		if (category.id != other.category.id) return false
 		if (category.title != other.category.title) return false
@@ -33,6 +35,7 @@ class CategoryListModel(
 
 	override fun hashCode(): Int {
 		var result = mangaCount
+		result = 31 * result + isTrackerEnabled.hashCode()
 		result = 31 * result + covers.hashCode()
 		result = 31 * result + category.id.hashCode()
 		result = 31 * result + category.title.hashCode()

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

@@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.model.ids
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
@@ -24,6 +25,7 @@ import javax.inject.Inject
 class MangaCategoriesViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	private val favouritesRepository: FavouritesRepository,
+	settings: AppSettings,
 ) : BaseViewModel() {
 
 	private val manga = savedStateHandle.require<List<ParcelableManga>>(KEY_MANGA_LIST).map { it.manga }
@@ -39,6 +41,7 @@ class MangaCategoriesViewModel @Inject constructor(
 				MangaCategoryItem(
 					category = it,
 					isChecked = it.id in checked,
+					isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
 				)
 			}
 		}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoryAD.kt

@@ -22,7 +22,7 @@ fun mangaCategoryAD(
 	bind { payloads ->
 		binding.checkableImageView.setChecked(item.isChecked, ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED !in payloads)
 		binding.textViewTitle.text = item.category.title
-		binding.imageViewTracker.isVisible = item.category.isTrackingEnabled
+		binding.imageViewTracker.isVisible = item.category.isTrackingEnabled && item.isTrackerEnabled
 		binding.imageViewVisible.isVisible = item.category.isVisibleInLibrary
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/MangaCategoryItem.kt

@@ -7,6 +7,7 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 data class MangaCategoryItem(
 	val category: FavouriteCategory,
 	val isChecked: Boolean,
+	val isTrackerEnabled: Boolean,
 ) : ListModel {
 
 	override fun areItemsTheSame(other: ListModel): Boolean {

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt

@@ -33,7 +33,7 @@ class FilterSheetFragment :
 		val adapter = FilterAdapter(filter, this)
 		binding.recyclerView.adapter = adapter
 		filter.filterItems.observe(viewLifecycleOwner, adapter)
-		binding.recyclerView.addItemDecoration(TypedListSpacingDecoration(binding.root.context))
+		binding.recyclerView.addItemDecoration(TypedListSpacingDecoration(binding.root.context, true))
 
 		if (dialog == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			binding.recyclerView.scrollIndicators = 0

app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt

@@ -7,6 +7,7 @@ import androidx.appcompat.view.ActionMode
 import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.os.NetworkManageIntent
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
@@ -32,6 +33,10 @@ class HistoryListFragment : MangaListFragment() {
 
 	override fun onScrolledToEnd() = Unit
 
+	override fun onEmptyActionClick() {
+		startActivity(NetworkManageIntent())
+	}
+
 	override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
 		mode.menuInflater.inflate(R.menu.mode_history, menu)
 		return super.onCreateActionMode(controller, mode, menu)

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

@@ -13,6 +13,8 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
@@ -28,6 +30,7 @@ import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import org.koitharu.kotatsu.history.domain.model.MangaWithHistory
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
+import org.koitharu.kotatsu.list.ui.model.EmptyHint
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -36,6 +39,7 @@ import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.list.ui.model.toGridModel
 import org.koitharu.kotatsu.list.ui.model.toListDetailedModel
 import org.koitharu.kotatsu.list.ui.model.toListModel
+import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import java.util.Date
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -45,6 +49,8 @@ class HistoryListViewModel @Inject constructor(
 	private val repository: HistoryRepository,
 	private val settings: AppSettings,
 	private val extraProvider: ListExtraProvider,
+	private val localMangaRepository: LocalMangaRepository,
+	networkState: NetworkState,
 	downloadScheduler: DownloadWorker.Scheduler,
 ) : MangaListViewModel(settings, downloadScheduler) {
 
@@ -69,7 +75,8 @@ class HistoryListViewModel @Inject constructor(
 		sortOrder.flatMapLatest { repository.observeAllWithHistory(it) },
 		isGroupingEnabled,
 		listMode,
-	) { list, grouped, mode ->
+		networkState,
+	) { list, grouped, mode, online ->
 		when {
 			list.isEmpty() -> listOf(
 				EmptyState(
@@ -80,7 +87,7 @@ class HistoryListViewModel @Inject constructor(
 				),
 			)
 
-			else -> mapList(list, grouped, mode)
+			else -> mapList(list, grouped, mode, online)
 		}
 	}.onStart {
 		loadingCounter.increment()
@@ -129,11 +136,25 @@ class HistoryListViewModel @Inject constructor(
 		list: List<MangaWithHistory>,
 		grouped: Boolean,
 		mode: ListMode,
+		isOnline: Boolean,
 	): List<ListModel> {
 		val result = ArrayList<ListModel>(if (grouped) (list.size * 1.4).toInt() else list.size + 1)
 		val order = sortOrder.value
 		var prevHeader: ListHeader? = null
-		for ((manga, history) in list) {
+		if (!isOnline) {
+			result += EmptyHint(
+				icon = R.drawable.ic_empty_common,
+				textPrimary = R.string.network_unavailable,
+				textSecondary = R.string.network_unavailable_hint,
+				actionStringRes = R.string.manage,
+			)
+		}
+		for ((m, history) in list) {
+			val manga = if (!isOnline && !m.isLocal) {
+				localMangaRepository.findSavedManga(m)?.manga ?: continue
+			} else {
+				m
+			}
 			if (grouped) {
 				val header = history.header(order)
 				if (header != prevHeader) {

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

@@ -5,32 +5,40 @@ import android.content.Intent
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.Insets
 import androidx.core.graphics.drawable.toBitmap
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import coil.ImageLoader
 import coil.request.CachePolicy
+import coil.request.ErrorResult
 import coil.request.ImageRequest
+import coil.request.SuccessResult
 import coil.target.ViewTarget
 import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.getDisplayIcon
+import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
-import org.koitharu.kotatsu.core.util.ext.indicator
 import org.koitharu.kotatsu.databinding.ActivityImageBinding
+import org.koitharu.kotatsu.databinding.ItemErrorStateBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ImageActivity : BaseActivity<ActivityImageBinding>() {
+class ImageActivity : BaseActivity<ActivityImageBinding>(), ImageRequest.Listener, View.OnClickListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
 
+	private var errorBinding: ItemErrorStateBinding? = null
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityImageBinding.inflate(layoutInflater))
@@ -53,14 +61,40 @@ class ImageActivity : BaseActivity<ActivityImageBinding>() {
 		}
 	}
 
+	override fun onClick(v: View?) {
+		loadImage(intent.data)
+	}
+
+	override fun onError(request: ImageRequest, result: ErrorResult) {
+		viewBinding.progressBar.hide()
+		with(errorBinding ?: ItemErrorStateBinding.bind(viewBinding.stubError.inflate())) {
+			errorBinding = this
+			root.isVisible = true
+			textViewError.text = result.throwable.getDisplayMessage(resources)
+			textViewError.setCompoundDrawablesWithIntrinsicBounds(0, result.throwable.getDisplayIcon(), 0, 0)
+			buttonRetry.isVisible = true
+			buttonRetry.setOnClickListener(this@ImageActivity)
+		}
+	}
+
+	override fun onStart(request: ImageRequest) {
+		viewBinding.progressBar.show()
+		(errorBinding?.root ?: viewBinding.stubError).isVisible = false
+	}
+
+	override fun onSuccess(request: ImageRequest, result: SuccessResult) {
+		viewBinding.progressBar.hide()
+		(errorBinding?.root ?: viewBinding.stubError).isVisible = false
+	}
+
 	private fun loadImage(url: Uri?) {
 		ImageRequest.Builder(this)
 			.data(url)
 			.memoryCachePolicy(CachePolicy.DISABLED)
 			.lifecycle(this)
+			.listener(this)
 			.tag(intent.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE))
 			.target(SsivTarget(viewBinding.ssiv))
-			.indicator(viewBinding.progressBar)
 			.enqueueWith(coil)
 	}
 

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

@@ -37,7 +37,6 @@ import org.koitharu.kotatsu.core.util.ext.measureHeight
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.resolveDp
-import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
@@ -109,7 +108,7 @@ abstract class MangaListFragment :
 			setHasFixedSize(true)
 			adapter = listAdapter
 			checkNotNull(selectionController).attachToRecyclerView(binding.recyclerView)
-			addItemDecoration(TypedListSpacingDecoration(context))
+			addItemDecoration(TypedListSpacingDecoration(context, false))
 			addOnScrollListener(paginationListener!!)
 			fastScroller.setFastScrollListener(this@MangaListFragment)
 		}
@@ -200,15 +199,16 @@ abstract class MangaListFragment :
 			coil = coil,
 			lifecycleOwner = viewLifecycleOwner,
 			listener = this,
-			sizeResolver = DynamicItemSizeResolver(resources, settings, adjustWidth = false)
+			sizeResolver = DynamicItemSizeResolver(resources, settings, adjustWidth = false),
 		)
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		requireViewBinding().recyclerView.updatePadding(
-			bottom = insets.bottom,
+		val rv = requireViewBinding().recyclerView
+		rv.updatePadding(
+			bottom = insets.bottom + rv.paddingTop,
 		)
-		requireViewBinding().recyclerView.fastScroller.updateLayoutParams<MarginLayoutParams> {
+		rv.fastScroller.updateLayoutParams<MarginLayoutParams> {
 			bottomMargin = insets.bottom
 		}
 		if (activity is MainActivity) {
@@ -247,21 +247,16 @@ abstract class MangaListFragment :
 			when (mode) {
 				ListMode.LIST -> {
 					layoutManager = FitHeightLinearLayoutManager(context)
-					updatePadding(left = 0, right = 0)
 				}
 
 				ListMode.DETAILED_LIST -> {
 					layoutManager = FitHeightLinearLayoutManager(context)
-					val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
-					updatePadding(left = spacing, right = spacing)
 				}
 
 				ListMode.GRID -> {
 					layoutManager = FitHeightGridLayoutManager(context, checkNotNull(spanResolver).spanCount).also {
 						it.spanSizeLookup = spanSizeLookup
 					}
-					val spacing = resources.getDimensionPixelOffset(R.dimen.grid_spacing)
-					updatePadding(left = spacing, right = spacing)
 					addOnLayoutChangeListener(spanResolver)
 				}
 			}

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListItemType.kt

@@ -23,4 +23,6 @@ enum class ListItemType {
 	PAGE_THUMB,
 	FEED,
 	DOWNLOAD,
+	CATEGORY_LARGE,
+	MANGA_SCROBBLING,
 }

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

@@ -48,6 +48,7 @@ fun mangaGridItemAD(
 			error(R.drawable.ic_error_placeholder)
 			transformations(TrimTransformation())
 			allowRgb565(true)
+			tag(item.manga)
 			source(item.source)
 			enqueueWith(coil)
 		}

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

@@ -22,6 +22,7 @@ open class MangaListAdapter(
 		addDelegate(ListItemType.STATE_ERROR, errorStateListAD(listener))
 		addDelegate(ListItemType.FOOTER_ERROR, errorFooterAD(listener))
 		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
+		addDelegate(ListItemType.HINT_EMPTY, emptyHintAD(coil, lifecycleOwner, listener))
 		addDelegate(ListItemType.HEADER, listHeaderAD(listener))
 	}
 }

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

@@ -61,6 +61,7 @@ fun mangaListDetailedItemAD(
 			error(R.drawable.ic_error_placeholder)
 			transformations(TrimTransformation())
 			allowRgb565(true)
+			tag(item.manga)
 			source(item.source)
 			enqueueWith(coil)
 		}

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

@@ -42,6 +42,7 @@ fun mangaListItemAD(
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
 			transformations(TrimTransformation())
+			tag(item.manga)
 			source(item.source)
 			enqueueWith(coil)
 		}

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt

@@ -9,10 +9,12 @@ import org.koitharu.kotatsu.R
 
 class TypedListSpacingDecoration(
 	context: Context,
+	private val addHorizontalPadding: Boolean,
 ) : ItemDecoration() {
 
-	private val spacingList = context.resources.getDimensionPixelOffset(R.dimen.list_spacing)
-	private val spacingGrid = context.resources.getDimensionPixelOffset(R.dimen.grid_spacing)
+	private val spacingSmall = context.resources.getDimensionPixelOffset(R.dimen.list_spacing_small)
+	private val spacingNormal = context.resources.getDimensionPixelOffset(R.dimen.list_spacing_normal)
+	private val spacingLarge = context.resources.getDimensionPixelOffset(R.dimen.list_spacing_large)
 
 	override fun getItemOffsets(
 		outRect: Rect,
@@ -27,31 +29,47 @@ class TypedListSpacingDecoration(
 			ListItemType.FILTER_SORT,
 			ListItemType.FILTER_TAG -> outRect.set(0)
 
-			ListItemType.HEADER -> outRect.set(spacingList, 0, spacingList, 0)
+			ListItemType.HEADER,
+			ListItemType.FEED,
+			ListItemType.EXPLORE_SOURCE_LIST,
+			ListItemType.MANGA_SCROBBLING,
 			ListItemType.MANGA_LIST -> outRect.set(0)
+
 			ListItemType.DOWNLOAD,
-			ListItemType.MANGA_LIST_DETAILED -> outRect.set(spacingList)
+			ListItemType.HINT_EMPTY,
+			ListItemType.MANGA_LIST_DETAILED -> outRect.set(spacingNormal)
 
 			ListItemType.PAGE_THUMB,
-			ListItemType.MANGA_GRID -> outRect.set(spacingGrid)
+			ListItemType.MANGA_GRID -> outRect.set(spacingNormal)
+
+			ListItemType.EXPLORE_BUTTONS -> outRect.set(spacingNormal)
 
 			ListItemType.FOOTER_LOADING,
 			ListItemType.FOOTER_ERROR,
 			ListItemType.STATE_LOADING,
 			ListItemType.STATE_ERROR,
 			ListItemType.STATE_EMPTY,
-			ListItemType.EXPLORE_BUTTONS,
 			ListItemType.EXPLORE_SOURCE_GRID,
-			ListItemType.EXPLORE_SOURCE_LIST,
 			ListItemType.EXPLORE_SUGGESTION,
 			ListItemType.MANGA_NESTED_GROUP,
+			ListItemType.CATEGORY_LARGE,
 			null -> outRect.set(0)
 
 			ListItemType.TIP -> outRect.set(0) // TODO
-			ListItemType.HINT_EMPTY -> outRect.set(0) // TODO
-			ListItemType.FEED -> outRect.set(spacingList, 0, spacingList, 0)
+		}
+		if (addHorizontalPadding && !itemType.isEdgeToEdge()) {
+			outRect.set(
+				outRect.left + spacingNormal,
+				outRect.top,
+				outRect.right + spacingNormal,
+				outRect.bottom,
+			)
 		}
 	}
 
 	private fun Rect.set(spacing: Int) = set(spacing, spacing, spacing, spacing)
+
+	private fun ListItemType?.isEdgeToEdge() = this == ListItemType.MANGA_NESTED_GROUP
+		|| this == ListItemType.FILTER_SORT
+		|| this == ListItemType.FILTER_TAG
 }

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

@@ -1,17 +1,14 @@
 package org.koitharu.kotatsu.list.ui.model
 
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.util.ext.getDisplayIcon
 import org.koitharu.kotatsu.core.util.ext.ifZero
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
-import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
 
 suspend fun Manga.toListModel(
 	extraProvider: ListExtraProvider?
@@ -79,7 +76,7 @@ suspend fun <C : MutableCollection<in MangaItemModel>> List<Manga>.toUi(
 
 fun Throwable.toErrorState(canRetry: Boolean = true) = ErrorState(
 	exception = this,
-	icon = getErrorIcon(this),
+	icon = getDisplayIcon(),
 	canRetry = canRetry,
 	buttonText = ExceptionResolver.getResolveStringId(this).ifZero { R.string.try_again },
 )
@@ -88,13 +85,3 @@ fun Throwable.toErrorFooter() = ErrorFooter(
 	exception = this,
 	icon = R.drawable.ic_alert_outline,
 )
-
-private fun getErrorIcon(error: Throwable) = when (error) {
-	is AuthRequiredException -> R.drawable.ic_auth_key_large
-	is CloudFlareProtectedException -> R.drawable.ic_bot_large
-	is UnknownHostException,
-	is SocketTimeoutException,
-	-> R.drawable.ic_plug_large
-
-	else -> R.drawable.ic_error_large
-}

app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt

@@ -129,6 +129,7 @@ class LocalMangaRepository @Inject constructor(
 	}
 
 	suspend fun findSavedManga(remoteManga: Manga): LocalManga? {
+		// TODO fast path by name
 		val files = getAllFiles()
 		return channelFlow {
 			for (file in files) {

app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportWorker.kt

@@ -3,7 +3,9 @@ package org.koitharu.kotatsu.local.ui
 import android.app.Notification
 import android.app.PendingIntent
 import android.content.Context
+import android.content.pm.ServiceInfo
 import android.net.Uri
+import android.os.Build
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -22,6 +24,7 @@ import coil.request.ImageRequest
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
@@ -46,7 +49,7 @@ class ImportWorker @AssistedInject constructor(
 		val result = runCatchingCancellable {
 			importer.import(uri).manga
 		}
-		if (notificationManager.areNotificationsEnabled()) {
+		if (applicationContext.checkNotificationPermission()) {
 			val notification = buildNotification(result)
 			notificationManager.notify(uri.hashCode(), notification)
 		}
@@ -76,7 +79,11 @@ class ImportWorker @AssistedInject constructor(
 			.setCategory(NotificationCompat.CATEGORY_PROGRESS)
 			.build()
 
-		return ForegroundInfo(FOREGROUND_NOTIFICATION_ID, notification)
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+			ForegroundInfo(FOREGROUND_NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+		} else {
+			ForegroundInfo(FOREGROUND_NOTIFICATION_ID, notification)
+		}
 	}
 
 	private suspend fun buildNotification(result: kotlin.Result<Manga>): Notification {

app/src/main/kotlin/org/koitharu/kotatsu/main/domain/CoverRestorer.kt

@@ -0,0 +1,111 @@
+package org.koitharu.kotatsu.main.domain
+
+import androidx.collection.ArraySet
+import androidx.lifecycle.coroutineScope
+import coil.EventListener
+import coil.ImageLoader
+import coil.network.HttpException
+import coil.request.ErrorResult
+import coil.request.ImageRequest
+import kotlinx.coroutines.launch
+import org.jsoup.HttpStatusException
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
+import org.koitharu.kotatsu.parsers.exception.ParseException
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import javax.inject.Inject
+import javax.inject.Provider
+
+class CoverRestorer @Inject constructor(
+	private val dataRepository: MangaDataRepository,
+	private val bookmarksRepository: BookmarksRepository,
+	private val repositoryFactory: MangaRepository.Factory,
+	private val coilProvider: Provider<ImageLoader>,
+) : EventListener {
+
+	private val blacklist = ArraySet<String>()
+
+	override fun onError(request: ImageRequest, result: ErrorResult) {
+		super.onError(request, result)
+		if (!result.throwable.shouldRestore()) {
+			return
+		}
+		request.tags.tag<Manga>()?.let {
+			restoreManga(it, request)
+		}
+		request.tags.tag<Bookmark>()?.let {
+			restoreBookmark(it, request)
+		}
+	}
+
+	private fun restoreManga(manga: Manga, request: ImageRequest) {
+		val key = manga.publicUrl
+		if (key in blacklist) {
+			return
+		}
+		request.lifecycle.coroutineScope.launch {
+			val restored = runCatchingCancellable {
+				restoreMangaImpl(manga)
+			}.getOrDefault(false)
+			if (restored) {
+				request.newBuilder().enqueueWith(coilProvider.get())
+			} else {
+				blacklist.add(key)
+			}
+		}
+	}
+
+	private suspend fun restoreMangaImpl(manga: Manga): Boolean {
+		if (dataRepository.findMangaById(manga.id) == null) {
+			return false
+		}
+		val repo = repositoryFactory.create(manga.source) as? RemoteMangaRepository ?: return false
+		val fixed = repo.find(manga) ?: return false
+		return if (fixed != manga) {
+			dataRepository.storeManga(fixed)
+			fixed.coverUrl != manga.coverUrl
+		} else {
+			false
+		}
+	}
+
+	private fun restoreBookmark(bookmark: Bookmark, request: ImageRequest) {
+		val key = bookmark.imageUrl
+		if (key in blacklist) {
+			return
+		}
+		request.lifecycle.coroutineScope.launch {
+			val restored = runCatchingCancellable {
+				restoreBookmarkImpl(bookmark)
+			}.getOrDefault(false)
+			if (restored) {
+				request.newBuilder().enqueueWith(coilProvider.get())
+			} else {
+				blacklist.add(key)
+			}
+		}
+	}
+
+	private suspend fun restoreBookmarkImpl(bookmark: Bookmark): Boolean {
+		val repo = repositoryFactory.create(bookmark.manga.source) as? RemoteMangaRepository ?: return false
+		val chapter = repo.getDetails(bookmark.manga).chapters?.find { it.id == bookmark.chapterId } ?: return false
+		val page = repo.getPages(chapter)[bookmark.page]
+		val imageUrl = page.preview.ifNullOrEmpty { page.url }
+		return if (imageUrl != bookmark.imageUrl) {
+			bookmarksRepository.updateBookmark(bookmark, imageUrl)
+			true
+		} else {
+			false
+		}
+	}
+
+	private fun Throwable.shouldRestore(): Boolean {
+		return this is HttpException || this is HttpStatusException || this is ParseException
+	}
+}

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

@@ -116,9 +116,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		navigationDelegate = MainNavigationDelegate(
 			navBar = checkNotNull(bottomNav ?: viewBinding.navRail),
 			fragmentManager = supportFragmentManager,
+			settings = settings,
 		)
 		navigationDelegate.addOnFragmentChangedListener(this)
-		navigationDelegate.onCreate()
+		navigationDelegate.onCreate(savedInstanceState)
 
 		appUpdateBadge = OptionsMenuBadgeHelper(viewBinding.toolbar, R.id.action_app_update)
 

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

@@ -1,14 +1,17 @@
 package org.koitharu.kotatsu.main.ui
 
+import android.os.Bundle
 import android.view.MenuItem
 import androidx.activity.OnBackPressedCallback
 import androidx.annotation.IdRes
+import androidx.core.view.isEmpty
 import androidx.core.view.iterator
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.navigation.NavigationBarView
 import com.google.android.material.transition.MaterialFadeThrough
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.util.ext.firstVisibleItemPosition
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
@@ -23,7 +26,10 @@ private const val TAG_PRIMARY = "primary"
 class MainNavigationDelegate(
 	private val navBar: NavigationBarView,
 	private val fragmentManager: FragmentManager,
-) : OnBackPressedCallback(false), NavigationBarView.OnItemSelectedListener, NavigationBarView.OnItemReselectedListener {
+	private val settings: AppSettings,
+) : OnBackPressedCallback(false),
+	NavigationBarView.OnItemSelectedListener,
+	NavigationBarView.OnItemReselectedListener {
 
 	private val listeners = LinkedList<OnFragmentChangedListener>()
 
@@ -56,14 +62,26 @@ class MainNavigationDelegate(
 		navBar.selectedItemId = R.id.nav_history
 	}
 
-	fun onCreate() {
-		primaryFragment?.let {
-			onFragmentChanged(it, fromUser = false)
-			val itemId = getItemId(it)
+	fun onCreate(savedInstanceState: Bundle?) {
+		if (navBar.menu.isEmpty()) {
+			val menuRes = if (settings.isFavoritesNavItemFirst) R.menu.nav_bottom_alt else R.menu.nav_bottom
+			navBar.inflateMenu(menuRes)
+		}
+		val fragment = primaryFragment
+		if (fragment != null) {
+			onFragmentChanged(fragment, fromUser = false)
+			val itemId = getItemId(fragment)
 			if (navBar.selectedItemId != itemId) {
 				navBar.selectedItemId = itemId
 			}
-		} ?: onNavigationItemSelected(navBar.selectedItemId)
+		} else {
+			val itemId = if (savedInstanceState == null) {
+				firstItem()?.itemId ?: navBar.selectedItemId
+			} else {
+				navBar.selectedItemId
+			}
+			onNavigationItemSelected(itemId)
+		}
 	}
 
 	fun setCounterAt(position: Int, counter: Int) {

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

@@ -34,6 +34,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
 import org.koitharu.kotatsu.core.util.ext.ensureSuccess
+import org.koitharu.kotatsu.core.util.ext.getCompletionResultOrNull
 import org.koitharu.kotatsu.core.util.ext.isNotEmpty
 import org.koitharu.kotatsu.core.util.ext.isPowerSaveMode
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
@@ -222,12 +223,9 @@ class PageLoader @Inject constructor(
 	}
 
 	private fun Deferred<File>.isValid(): Boolean {
-		return if (isCompleted) {
-			val file = getCompleted()
+		return getCompletionResultOrNull()?.map { file ->
 			file.exists() && file.isNotEmpty()
-		} else {
-			true
-		}
+		}?.getOrDefault(false) ?: true
 	}
 
 	private class InternalErrorHandler : AbstractCoroutineContextElement(CoroutineExceptionHandler),

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

@@ -163,7 +163,7 @@ class ReaderActivity :
 			readerManager.replace(mode)
 		}
 		if (viewBinding.appbarTop.isVisible) {
-			lifecycle.postDelayed(hideUiRunnable, TimeUnit.SECONDS.toMillis(1))
+			lifecycle.postDelayed(TimeUnit.SECONDS.toMillis(1), hideUiRunnable)
 		}
 		viewBinding.slider.isRtl = mode == ReaderMode.REVERSED
 	}

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

@@ -13,16 +13,17 @@ import android.util.AttributeSet
 import android.view.View
 import android.view.WindowInsets
 import androidx.annotation.AttrRes
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.measureDimension
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.text.SimpleDateFormat
 import java.util.Date
 import com.google.android.material.R as materialR
@@ -111,7 +112,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 
 	override fun onAttachedToWindow() {
 		super.onAttachedToWindow()
-		context.registerReceiver(timeReceiver, IntentFilter(Intent.ACTION_TIME_TICK))
+		ContextCompat.registerReceiver(
+			context,
+			timeReceiver,
+			IntentFilter(Intent.ACTION_TIME_TICK),
+			ContextCompat.RECEIVER_EXPORTED,
+		)
 		updateCutoutInsets(ViewCompat.getRootWindowInsets(this))
 	}
 

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

@@ -16,6 +16,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
+import kotlinx.coroutines.yield
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
@@ -137,12 +138,13 @@ class PageHolderDelegate(
 		state = State.LOADING
 		error = null
 		callback.onLoadingStarted()
+		yield()
 		try {
 			val task = loader.loadPageAsync(data, force)
 			file = coroutineScope {
 				val progressObserver = observeProgress(this, task.progressAsFlow())
 				val file = task.await()
-				progressObserver.cancel()
+				progressObserver.cancelAndJoin()
 				file
 			}
 			state = State.LOADED

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt

@@ -116,7 +116,7 @@ open class PageHolder(
 		bindingInfo.progressBar.hide()
 	}
 
-	override fun onClick(v: View) {
+	final override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_retry -> delegate.retry(boundData?.toMangaPage() ?: return)
 			R.id.button_error_details -> delegate.showErrorDetails(boundData?.url)

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

@@ -165,7 +165,8 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 
 
 	private inner class GestureListener : GestureDetector.SimpleOnGestureListener(), Runnable {
-		override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+
+		override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
 			if (scale <= 1f) return false
 			transformMatrix.postTranslate(-distanceX, -distanceY)
 			invalidateTarget()
@@ -185,7 +186,7 @@ class WebtoonScalingFrame @JvmOverloads constructor(
 			return true
 		}
 
-		override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+		override fun onFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
 			if (scale <= 1) return false
 
 			overScroller.fling(

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt

@@ -23,7 +23,6 @@ import org.koitharu.kotatsu.core.util.RecyclerViewScrollCallback
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.plus
-import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.SheetPagesBinding
@@ -75,7 +74,7 @@ class PagesThumbnailsSheet :
 			clickListener = this@PagesThumbnailsSheet,
 		)
 		with(binding.recyclerView) {
-			addItemDecoration(TypedListSpacingDecoration(context))
+			addItemDecoration(TypedListSpacingDecoration(context, false))
 			adapter = thumbnailsAdapter
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver?.setGridSize(settings.gridSize / 100f, this)

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/anilist/data/AniListAuthenticator.kt

@@ -7,6 +7,7 @@ import okhttp3.Response
 import okhttp3.Route
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblerStorage
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerType
@@ -49,8 +50,6 @@ class AniListAuthenticator @Inject constructor(
 		runBlocking { repository.authorize(null) }
 		return storage.accessToken
 	}.onFailure {
-		if (BuildConfig.DEBUG) {
-			it.printStackTrace()
-		}
+		it.printStackTraceDebug()
 	}.getOrNull()
 }

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt

@@ -38,9 +38,6 @@ class ScrobblerConfigActivity : BaseActivity<ActivityScrobblerConfigBinding>(),
 
 	private val viewModel: ScrobblerConfigViewModel by viewModels()
 
-	private var paddingVertical = 0
-	private var paddingHorizontal = 0
-
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityScrobblerConfigBinding.inflate(layoutInflater))
@@ -51,10 +48,7 @@ class ScrobblerConfigActivity : BaseActivity<ActivityScrobblerConfigBinding>(),
 		with(viewBinding.recyclerView) {
 			adapter = listAdapter
 			setHasFixedSize(true)
-			val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
-			paddingHorizontal = spacing
-			paddingVertical = resources.getDimensionPixelOffset(R.dimen.grid_spacing_outer)
-			val decoration = TypedListSpacingDecoration(context)
+			val decoration = TypedListSpacingDecoration(context, false)
 			addItemDecoration(decoration)
 		}
 		viewBinding.imageViewAvatar.setOnClickListener(this)
@@ -79,10 +73,11 @@ class ScrobblerConfigActivity : BaseActivity<ActivityScrobblerConfigBinding>(),
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.recyclerView.updatePadding(
-			left = insets.left + paddingHorizontal,
-			right = insets.right + paddingHorizontal,
-			bottom = insets.bottom + paddingVertical,
+		val rv = viewBinding.recyclerView
+		rv.updatePadding(
+			left = insets.left + rv.paddingTop,
+			right = insets.right + rv.paddingTop,
+			bottom = insets.bottom + rv.paddingTop,
 		)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/adapter/ScrobblingHeaderAD.kt

@@ -1,16 +1,20 @@
 package org.koitharu.kotatsu.scrobbling.common.ui.config.adapter
 
-import android.widget.TextView
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
+import androidx.core.view.isInvisible
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ItemHeaderButtonBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
 
-fun scrobblingHeaderAD() = adapterDelegate<ScrobblingStatus, ListModel>(R.layout.item_header) {
+fun scrobblingHeaderAD() = adapterDelegateViewBinding<ScrobblingStatus, ListModel, ItemHeaderButtonBinding>(
+	{ inflater, parent -> ItemHeaderButtonBinding.inflate(inflater, parent, false) },
+) {
+
+	binding.buttonMore.isInvisible = true
+	val strings = context.resources.getStringArray(R.array.scrobbling_statuses)
 
 	bind {
-		(itemView as TextView).text = context.resources
-			.getStringArray(R.array.scrobbling_statuses)
-			.getOrNull(item.ordinal)
+		binding.textViewTitle.text = strings.getOrNull(item.ordinal)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/adapter/ScrobblingMangaAdapter.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
@@ -15,8 +16,8 @@ class ScrobblingMangaAdapter(
 ) : BaseListAdapter<ListModel>() {
 
 	init {
-		delegatesManager.addDelegate(scrobblingMangaAD(clickListener, coil, lifecycleOwner))
-			.addDelegate(scrobblingHeaderAD())
-			.addDelegate(emptyStateListAD(coil, lifecycleOwner, null))
+		addDelegate(ListItemType.HEADER, scrobblingHeaderAD())
+		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, null))
+		addDelegate(ListItemType.MANGA_SCROBBLING, scrobblingMangaAD(clickListener, coil, lifecycleOwner))
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorSheet.kt

@@ -26,6 +26,7 @@ import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.SheetScrobblingSelectorBinding
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerManga
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService
@@ -63,6 +64,7 @@ class ScrobblingSelectorSheet :
 		with(binding.recyclerView) {
 			adapter = listAdapter
 			addItemDecoration(decoration)
+			addItemDecoration(TypedListSpacingDecoration(context, false))
 			addOnScrollListener(PaginationScrollListener(4, this@ScrobblingSelectorSheet))
 		}
 		binding.buttonDone.setOnClickListener(this)

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/adapter/ScrobblerSelectorAdapter.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
@@ -18,9 +19,9 @@ class ScrobblerSelectorAdapter(
 ) : BaseListAdapter<ListModel>() {
 
 	init {
-		delegatesManager.addDelegate(loadingStateAD())
-			.addDelegate(scrobblingMangaAD(lifecycleOwner, coil, clickListener))
-			.addDelegate(loadingFooterAD())
-			.addDelegate(scrobblerHintAD(stateHolderListener))
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.MANGA_SCROBBLING, scrobblingMangaAD(lifecycleOwner, coil, clickListener))
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.HINT_EMPTY, scrobblerHintAD(stateHolderListener))
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/mal/data/MALAuthenticator.kt

@@ -7,6 +7,7 @@ import okhttp3.Response
 import okhttp3.Route
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblerStorage
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerType
@@ -49,9 +50,7 @@ class MALAuthenticator @Inject constructor(
 		runBlocking { repository.authorize(null) }
 		return storage.accessToken
 	}.onFailure {
-		if (BuildConfig.DEBUG) {
-			it.printStackTrace()
-		}
+		it.printStackTraceDebug()
 	}.getOrNull()
 
 }

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/shikimori/data/ShikimoriAuthenticator.kt

@@ -7,6 +7,7 @@ import okhttp3.Response
 import okhttp3.Route
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblerStorage
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerType
@@ -49,8 +50,6 @@ class ShikimoriAuthenticator @Inject constructor(
 		runBlocking { repository.authorize(null) }
 		return storage.accessToken
 	}.onFailure {
-		if (BuildConfig.DEBUG) {
-			it.printStackTrace()
-		}
+		it.printStackTraceDebug()
 	}.getOrNull()
 }

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

@@ -73,6 +73,20 @@ class MangaSearchRepository @Inject constructor(
 		}.orEmpty()
 	}
 
+	suspend fun getQueryHintSuggestion(
+		query: String,
+		limit: Int,
+	): List<String> {
+		if (query.isEmpty()) {
+			return emptyList()
+		}
+		val titles = db.suggestionDao.getTitles("$query%")
+		if (titles.isEmpty()) {
+			return emptyList()
+		}
+		return titles.shuffled().take(limit)
+	}
+
 	suspend fun getTagsSuggestion(query: String, limit: Int, source: MangaSource?): List<MangaTag> {
 		return when {
 			query.isNotEmpty() && source != null -> db.tagsDao.findTags(source.name, "%$query%", limit)

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

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import androidx.core.graphics.Insets
+import androidx.core.graphics.drawable.toDrawable
 import androidx.core.os.bundleOf
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
@@ -24,6 +25,7 @@ import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.model.titleRes
 import org.koitharu.kotatsu.core.util.ext.getParcelableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
 import org.koitharu.kotatsu.databinding.ActivityMangaListBinding
@@ -38,11 +40,13 @@ 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.remotelist.ui.RemoteListFragment
+import kotlin.math.absoluteValue
+import com.google.android.material.R as materialR
 
 @AndroidEntryPoint
 class MangaListActivity :
 	BaseActivity<ActivityMangaListBinding>(),
-	AppBarOwner, View.OnClickListener, FilterOwner {
+	AppBarOwner, View.OnClickListener, FilterOwner, AppBarLayout.OnOffsetChangedListener {
 
 	override val appBar: AppBarLayout
 		get() = viewBinding.appbar
@@ -57,6 +61,9 @@ class MangaListActivity :
 		setContentView(ActivityMangaListBinding.inflate(layoutInflater))
 		val tags = intent.getParcelableExtraCompat<ParcelableMangaTags>(EXTRA_TAGS)?.tags
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		if (viewBinding.containerFilterHeader != null) {
+			viewBinding.appbar.addOnOffsetChangedListener(this)
+		}
 		val source = intent.getSerializableExtraCompat(EXTRA_SOURCE) ?: tags?.firstOrNull()?.source
 		if (source == null) {
 			finishAfterTransition()
@@ -78,6 +85,15 @@ class MangaListActivity :
 		}
 	}
 
+	override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
+		val container = viewBinding.containerFilterHeader ?: return
+		container.background = if (verticalOffset.absoluteValue < appBarLayout.totalScrollRange) {
+			container.context.getThemeColor(materialR.attr.backgroundColor).toDrawable()
+		} else {
+			viewBinding.collapsingToolbarLayout?.contentScrim
+		}
+	}
+
 	override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_order -> FilterSheetFragment.show(supportFragmentManager)

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt

@@ -23,13 +23,13 @@ import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.core.util.ext.invalidateNestedItemDecorations
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.databinding.ActivitySearchMultiBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.size.DynamicItemSizeResolver
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -83,6 +83,7 @@ class MultiSearchActivity :
 		)
 		viewBinding.recyclerView.adapter = adapter
 		viewBinding.recyclerView.setHasFixedSize(true)
+		viewBinding.recyclerView.addItemDecoration(TypedListSpacingDecoration(this, true))
 
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(true)
@@ -100,7 +101,7 @@ class MultiSearchActivity :
 			right = insets.right,
 		)
 		viewBinding.recyclerView.updatePadding(
-			bottom = insets.bottom,
+			bottom = insets.bottom + viewBinding.recyclerView.paddingTop,
 		)
 	}
 

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

@@ -107,6 +107,9 @@ class MultiSearchViewModel @Inject constructor(
 	@CheckResult
 	private fun searchImpl(q: String): Flow<List<MultiSearchListModel>> = channelFlow {
 		val sources = sourcesRepository.getEnabledSources()
+		if (sources.isEmpty()) {
+			return@channelFlow
+		}
 		val semaphore = Semaphore(MAX_PARALLELISM)
 		for (source in sources) {
 			launch {

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/MultiSearchAdapter.kt

@@ -6,6 +6,7 @@ import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
@@ -26,21 +27,21 @@ class MultiSearchAdapter(
 
 	init {
 		val pool = RecycledViewPool()
-		delegatesManager
-			.addDelegate(
-				searchResultsAD(
-					sharedPool = pool,
-					lifecycleOwner = lifecycleOwner,
-					coil = coil,
-					sizeResolver = sizeResolver,
-					selectionDecoration = selectionDecoration,
-					listener = listener,
-					itemClickListener = itemClickListener,
-				),
-			)
-			.addDelegate(loadingStateAD())
-			.addDelegate(loadingFooterAD())
-			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listener))
-			.addDelegate(errorStateListAD(listener))
+		addDelegate(
+			ListItemType.MANGA_NESTED_GROUP,
+			searchResultsAD(
+				sharedPool = pool,
+				lifecycleOwner = lifecycleOwner,
+				coil = coil,
+				sizeResolver = sizeResolver,
+				selectionDecoration = selectionDecoration,
+				listener = listener,
+				itemClickListener = itemClickListener,
+			),
+		)
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
+		addDelegate(ListItemType.STATE_ERROR, errorStateListAD(listener))
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt

@@ -69,6 +69,11 @@ class SearchSuggestionFragment :
 		viewModel.deleteQuery(query)
 	}
 
+	override fun onResume() {
+		super.onResume()
+		viewModel.onResume()
+	}
+
 	companion object {
 
 		fun newInstance() = SearchSuggestionFragment()

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt

@@ -30,6 +30,7 @@ import javax.inject.Inject
 private const val DEBOUNCE_TIMEOUT = 500L
 private const val MAX_MANGA_ITEMS = 6
 private const val MAX_QUERY_ITEMS = 16
+private const val MAX_HINTS_ITEMS = 3
 private const val MAX_TAGS_ITEMS = 8
 private const val MAX_SOURCES_ITEMS = 6
 
@@ -42,6 +43,7 @@ class SearchSuggestionViewModel @Inject constructor(
 
 	private val query = MutableStateFlow("")
 	private var suggestionJob: Job? = null
+	private var invalidateOnResume = false
 
 	val isIncognitoModeEnabled = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.Default,
@@ -60,11 +62,10 @@ class SearchSuggestionViewModel @Inject constructor(
 	}
 
 	fun saveQuery(query: String) {
-		launchJob(Dispatchers.Default) {
-			if (!settings.isIncognitoModeEnabled) {
-				repository.saveSearchQuery(query)
-			}
+		if (!settings.isIncognitoModeEnabled) {
+			repository.saveSearchQuery(query)
 		}
+		invalidateOnResume = true
 	}
 
 	fun clearSearchHistory() {
@@ -80,6 +81,13 @@ class SearchSuggestionViewModel @Inject constructor(
 		}
 	}
 
+	fun onResume() {
+		if (invalidateOnResume) {
+			invalidateOnResume = false
+			setupSuggestion()
+		}
+	}
+
 	fun deleteQuery(query: String) {
 		launchJob {
 			repository.deleteSearchQuery(query)
@@ -108,6 +116,9 @@ class SearchSuggestionViewModel @Inject constructor(
 		val queriesDeferred = async {
 			repository.getQuerySuggestion(searchQuery, MAX_QUERY_ITEMS)
 		}
+		val hintsDeferred = async {
+			repository.getQueryHintSuggestion(searchQuery, MAX_HINTS_ITEMS)
+		}
 		val tagsDeferred = async {
 			repository.getTagsSuggestion(searchQuery, MAX_TAGS_ITEMS, null)
 		}
@@ -119,16 +130,18 @@ class SearchSuggestionViewModel @Inject constructor(
 		val tags = tagsDeferred.await()
 		val mangaList = mangaDeferred.await()
 		val queries = queriesDeferred.await()
+		val hints = hintsDeferred.await()
 
-		buildList(queries.size + sources.size + 2) {
+		buildList(queries.size + sources.size + hints.size + 2) {
 			if (tags.isNotEmpty()) {
 				add(SearchSuggestionItem.Tags(mapTags(tags)))
 			}
 			if (mangaList.isNotEmpty()) {
 				add(SearchSuggestionItem.MangaList(mangaList))
 			}
-			queries.mapTo(this) { SearchSuggestionItem.RecentQuery(it) }
 			sources.mapTo(this) { SearchSuggestionItem.Source(it, it in enabledSources) }
+			queries.mapTo(this) { SearchSuggestionItem.RecentQuery(it) }
+			hints.mapTo(this) { SearchSuggestionItem.Hint(it) }
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt

@@ -20,5 +20,6 @@ class SearchSuggestionAdapter(
 			.addDelegate(searchSuggestionSourceAD(coil, lifecycleOwner, listener))
 			.addDelegate(searchSuggestionTagsAD(listener))
 			.addDelegate(searchSuggestionMangaListAD(coil, lifecycleOwner, listener))
+			.addDelegate(searchSuggestionQueryHintAD(listener))
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionQueryHintAD.kt

@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.search.ui.suggestion.adapter
+
+import android.view.View
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.databinding.ItemSearchSuggestionQueryHintBinding
+import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
+import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+
+fun searchSuggestionQueryHintAD(
+	listener: SearchSuggestionListener,
+) = adapterDelegateViewBinding<SearchSuggestionItem.Hint, SearchSuggestionItem, ItemSearchSuggestionQueryHintBinding>(
+	{ inflater, parent -> ItemSearchSuggestionQueryHintBinding.inflate(inflater, parent, false) },
+) {
+
+	val viewClickListener = View.OnClickListener { v ->
+		listener.onQueryClick(item.query, true)
+	}
+
+	binding.root.setOnClickListener(viewClickListener)
+
+	bind {
+		binding.root.text = item.query
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt

@@ -27,6 +27,15 @@ sealed interface SearchSuggestionItem : ListModel {
 		}
 	}
 
+	data class Hint(
+		val query: String,
+	) : SearchSuggestionItem {
+
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Hint && query == other.query
+		}
+	}
+
 	data class Source(
 		val source: MangaSource,
 		val isEnabled: Boolean,

app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt

@@ -10,7 +10,6 @@ import android.provider.Settings
 import android.view.View
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.app.LocaleManagerCompat
-import androidx.core.view.postDelayed
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import dagger.hilt.android.AndroidEntryPoint
@@ -21,8 +20,10 @@ import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.core.util.ext.getLocalesConfig
 import org.koitharu.kotatsu.core.util.ext.map
+import org.koitharu.kotatsu.core.util.ext.postDelayed
 import org.koitharu.kotatsu.core.util.ext.setDefaultValueCompat
 import org.koitharu.kotatsu.core.util.ext.toList
+import org.koitharu.kotatsu.main.ui.MainActivity
 import org.koitharu.kotatsu.parsers.util.names
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.utils.ActivityListPreference
@@ -92,11 +93,15 @@ class AppearanceSettingsFragment :
 			AppSettings.KEY_APP_LOCALE -> {
 				AppCompatDelegate.setApplicationLocales(settings.appLocales)
 			}
+
+			AppSettings.KEY_FIRST_NAV_ITEM -> {
+				activityRecreationHandle.recreate(MainActivity::class.java)
+			}
 		}
 	}
 
 	private fun postRestart() {
-		view?.postDelayed(400) {
+		viewLifecycleOwner.lifecycle.postDelayed(400) {
 			activityRecreationHandle.recreateAll()
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/SourcesSelectAdapter.kt

@@ -11,6 +11,9 @@ class SourcesSelectAdapter(
 	listener: SourceConfigListener,
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
-) : BaseListAdapter<SourceConfigItem>(
-	sourceConfigItemCheckableDelegate(listener, coil, lifecycleOwner),
-)
+) : BaseListAdapter<SourceConfigItem>() {
+
+	init {
+		delegatesManager.addDelegate(sourceConfigItemCheckableDelegate(listener, coil, lifecycleOwner))
+	}
+}