Respect display cutout in reader bar

Currently translated at 100.0% (376 of 376 strings)

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

.editorconfig

@@ -5,15 +5,16 @@ charset = utf-8
 end_of_line = lf
 indent_size = 4
 indent_style = tab
-insert_final_newline = false
+insert_final_newline = true
 max_line_length = 120
 tab_width = 4
 # noinspection EditorConfigKeyCorrectness
-disabled_rules=no-wildcard-imports,no-unused-imports
+disabled_rules = no-wildcard-imports, no-unused-imports
 
 [{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
 ij_continuation_indent_size = 4
 
 [{*.kt,*.kts}]
+ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL

.github/ISSUE_TEMPLATE/config.yml

@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
     - name: ⚠️ Source issue
       url: https://github.com/KotatsuApp/kotatsu-parsers/issues/new
-      about: Issues and requests for sources should be opened in the kotatsu-parsers repository instead
+      about: If you have troubles with a manga parser or want to propose new manga source, please open an issue in the kotatsu-parsers repository instead

.github/ISSUE_TEMPLATE/report_bug.yml

@@ -0,0 +1,64 @@
+name: 🐞 Bug report
+description: Report a bug in Kotatsu
+labels: [bug]
+body:
+
+    - type: textarea
+      id: summary
+      attributes:
+          label: Brief summary
+          description: Please describe, what went wrong
+      validations:
+          required: true
+
+    - type: textarea
+      id: reproduce-steps
+      attributes:
+          label: Steps to reproduce
+          description: Please provide a way to reproduce this issue. Screenshots or videos can be very helpful
+          placeholder: |
+              Example:
+                1. First step
+                2. Second step
+                3. Issue here
+      validations:
+          required: false
+
+
+    - type: input
+      id: kotatsu-version
+      attributes:
+          label: Kotatsu version
+          description: You can find your Kotatsu version in **Settings → About**.
+          placeholder: |
+              Example: "3.3"
+      validations:
+          required: true
+
+    - type: input
+      id: android-version
+      attributes:
+          label: Android version
+          description: You can find this somewhere in your Android settings.
+          placeholder: |
+              Example: "12.0"
+      validations:
+          required: true
+
+    - type: input
+      id: device
+      attributes:
+          label: Device
+          description: List your device and model.
+          placeholder: |
+              Example: "LG Nexus 5X"
+      validations:
+          required: false
+
+    - type: checkboxes
+      id: acknowledgements
+      attributes:
+          label: Acknowledgements
+          options:
+              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+                required: true

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -1,91 +0,0 @@
-name: 🐞 Issue report
-description: Report an issue in Kotatsu
-labels: [bug]
-body:
-
-    - type: textarea
-      id: reproduce-steps
-      attributes:
-          label: Steps to reproduce
-          description: Provide an example of the issue.
-          placeholder: |
-              Example:
-                1. First step
-                2. Second step
-                3. Issue here
-      validations:
-          required: true
-
-    - type: textarea
-      id: expected-behavior
-      attributes:
-          label: Expected behavior
-          description: Explain what you should expect to happen.
-          placeholder: |
-              Example:
-                "This should happen..."
-      validations:
-          required: true
-
-    - type: textarea
-      id: actual-behavior
-      attributes:
-          label: Actual behavior
-          description: Explain what actually happens.
-          placeholder: |
-              Example:
-                "This happened instead..."
-      validations:
-          required: true
-
-    - type: input
-      id: kotatsu-version
-      attributes:
-          label: Kotatsu version
-          description: You can find your Kotatsu version in **Settings → About**.
-          placeholder: |
-              Example: "3.3"
-      validations:
-          required: true
-
-    - type: input
-      id: android-version
-      attributes:
-          label: Android version
-          description: You can find this somewhere in your Android settings.
-          placeholder: |
-              Example: "Android 12"
-      validations:
-          required: true
-
-    - type: input
-      id: device
-      attributes:
-          label: Device
-          description: List your device and model.
-          placeholder: |
-              Example: "LG Nexus 5X"
-      validations:
-          required: true
-
-    - type: textarea
-      id: other-details
-      attributes:
-          label: Other details
-          placeholder: |
-              Additional details and attachments.
-
-    - type: checkboxes
-      id: acknowledgements
-      attributes:
-          label: Acknowledgements
-          description: Read this carefully, we will close and ignore your issue if you skimmed through this.
-          options:
-              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                required: true
-              - label: I have written a short but informative title.
-                required: true
-              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new).
-                required: true
-              - label: I will fill out all of the requested information in this form.
-                required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -1,5 +1,5 @@
 name: ⭐ Feature request
-description: Suggest a feature to improve Kotatsu
+description: Suggest a new idea how to improve Kotatsu
 labels: [feature request]
 body:
 
@@ -14,23 +14,6 @@ body:
       validations:
           required: true
 
-    - type: textarea
-      id: other-details
-      attributes:
-          label: Other details
-          placeholder: |
-              Additional details and attachments.
-
-    - type: input
-      id: kotatsu-version
-      attributes:
-          label: Kotatsu version
-          description: You can find your Kotatsu version in **Settings → About**.
-          placeholder: |
-              Example: "3.3"
-      validations:
-          required: true
-
     - type: checkboxes
       id: acknowledgements
       attributes:
@@ -38,10 +21,4 @@ body:
           description: Read this carefully, we will close and ignore your issue if you skimmed through this.
           options:
               - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                required: true
-              - label: I have written a short but informative title.
-                required: true
-              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new).
-                required: true
-              - label: I will fill out all of the requested information in this form.
                 required: true

.idea/inspectionProfiles/Project_Default.xml

@@ -3,6 +3,9 @@
     <option name="myName" value="Project Default" />
     <inspection_tool class="BooleanLiteralArgument" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="Destructure" enabled="true" level="INFO" enabled_by_default="true" />
+    <inspection_tool class="FillClass" enabled="true" level="INFORMATION" enabled_by_default="true">
+      <option name="withoutDefaultValues" value="true" />
+    </inspection_tool>
     <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="KotlinFunctionArgumentsHelper" enabled="true" level="INFORMATION" enabled_by_default="true">
       <option name="withoutDefaultValues" value="true" />

README.md

@@ -10,9 +10,9 @@ Kotatsu is a free and open source manga reader for Android.
 alt="Get it on F-Droid"
 height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)
 
-Download APK from GitHub Releases:
+Download APK directly from GitHub:
 
-- [Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)
+- **[Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)**
 
 ### Main Features
 
@@ -21,11 +21,12 @@ Download APK from GitHub Releases:
 * Reading history and bookmarks
 * Favourites organized by user-defined categories
 * Downloading manga and reading it offline. Third-party CBZ archives also supported
-* Tablet-optimized material design UI
+* Tablet-optimized Material You UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
-* Available in multiple languages
-* Password protect access to the app
+* Shikimori integration (manga tracking)
+* Password/fingerprint protect access to the app
+* History and favourites synchronization across devices (coming soon)
 
 ### Screenshots
 
@@ -38,23 +39,20 @@ Download APK from GitHub Releases:
 
 ### Localization
 
-<a href="https://hosted.weblate.org/engage/kotatsu/">
-<img src="https://hosted.weblate.org/widgets/kotatsu/-/287x66-white.png" alt="Translation status" />
-</a>
+[<img src="https://hosted.weblate.org/widgets/kotatsu/-/287x66-white.png" alt="Translation status">](https://hosted.weblate.org/engage/kotatsu/)
 
 Kotatsu is localized in a number of different languages, if you would like to help improve these or add new languages,
-please head over to the Weblate <a href="https://hosted.weblate.org/engage/kotatsu/">project page</a>
+please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)
 
 ### License
 
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)
 
-Kotatsu is Free Software: You can use, study share and improve it at your
-will. Specifically you can redistribute and/or modify it under the terms of the
-[GNU General Public License](https://www.gnu.org/licenses/gpl.html) as
-published by the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications
+to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build &
+install instructions.
 
-### Disclaimer
+### DMCA disclaimer
 
-The developers of this application does not have any affiliation with the content providers available.
+The developers of this application does not have any affiliation with the content available in the app.
+It is collecting from the sources freely available through any web browser.

app/build.gradle

@@ -3,19 +3,20 @@ plugins {
 	id 'kotlin-android'
 	id 'kotlin-kapt'
 	id 'kotlin-parcelize'
+	id 'dagger.hilt.android.plugin'
 }
 
 android {
-	compileSdkVersion 32
-	buildToolsVersion '32.0.0'
+	compileSdkVersion 33
+	buildToolsVersion '33.0.0'
 	namespace 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
-		targetSdkVersion 32
-		versionCode 412
-		versionName '3.4'
+		targetSdkVersion 33
+		versionCode 494
+		versionName '4.0-a5'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -28,6 +29,8 @@ android {
 		// define this values in your local.properties file
 		buildConfigField 'String', 'SHIKIMORI_CLIENT_ID', "\"${localProperty('shikimori.clientId')}\""
 		buildConfigField 'String', 'SHIKIMORI_CLIENT_SECRET', "\"${localProperty('shikimori.clientSecret')}\""
+		resValue "string", "acra_login", "${localProperty('acra.login')}"
+		resValue "string", "acra_password", "${localProperty('acra.password')}"
 	}
 	buildTypes {
 		debug {
@@ -64,8 +67,11 @@ android {
 		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
-		unitTests.includeAndroidResources = true
-		unitTests.returnDefaultValues = false
+		unitTests.includeAndroidResources true
+		unitTests.returnDefaultValues false
+		kotlinOptions {
+			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
+		}
 	}
 }
 afterEvaluate {
@@ -76,20 +82,19 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:da3b0ae0cf') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:f112a06ab6') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
 	implementation 'androidx.core:core-ktx:1.8.0'
-	implementation 'androidx.activity:activity-ktx:1.5.0'
-	implementation 'androidx.fragment:fragment-ktx:1.5.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
-	implementation 'androidx.lifecycle:lifecycle-service:2.5.0'
-	implementation 'androidx.lifecycle:lifecycle-process:2.5.0'
+	implementation 'androidx.activity:activity-ktx:1.5.1'
+	implementation 'androidx.fragment:fragment-ktx:1.5.2'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -97,13 +102,13 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
-	implementation 'com.google.android.material:material:1.7.0-alpha02'
+	implementation 'com.google.android.material:material:1.7.0-beta01'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.0'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
 
-	implementation 'androidx.room:room-runtime:2.4.2'
-	implementation 'androidx.room:room-ktx:2.4.2'
-	kapt 'androidx.room:room-compiler:2.4.2'
+	implementation 'androidx.room:room-runtime:2.4.3'
+	implementation 'androidx.room:room-ktx:2.4.3'
+	kapt 'androidx.room:room-compiler:2.4.3'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
@@ -112,29 +117,36 @@ dependencies {
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'io.insert-koin:koin-android:3.2.0'
-	implementation 'io.coil-kt:coil-base:2.1.0'
-	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
+	implementation "com.google.dagger:hilt-android:2.43.2"
+	kapt "com.google.dagger:hilt-compiler:2.43.2"
+	implementation 'androidx.hilt:hilt-work:1.0.0'
+	kapt 'androidx.hilt:hilt-compiler:1.0.0'
+
+	implementation 'io.coil-kt:coil-base:2.2.0'
+	implementation 'io.coil-kt:coil-svg:2.2.0'
+//	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:2942b797a2'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
-	implementation 'ch.acra:acra-mail:5.9.3'
-	implementation 'ch.acra:acra-dialog:5.9.3'
+	implementation 'ch.acra:acra-http:5.9.6'
+	implementation 'ch.acra:acra-dialog:5.9.6'
 
-	debugImplementation 'org.jsoup:jsoup:1.15.1'
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
+	testImplementation 'org.json:json:20220320'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
 	androidTestImplementation 'androidx.test:runner:1.4.0'
 	androidTestImplementation 'androidx.test:rules:1.4.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.4.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
-	androidTestImplementation 'io.insert-koin:koin-test:3.2.0'
-	androidTestImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
-	androidTestImplementation 'androidx.room:room-testing:2.4.2'
+	androidTestImplementation 'androidx.room:room-testing:2.4.3'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
-}
+
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.43.2'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.43.2'
+}

app/proguard-rules.pro

@@ -10,4 +10,7 @@
 }
 -keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
--dontwarn okhttp3.internal.platform.ConscryptPlatform
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
+
+-keep class org.koitharu.kotatsu.core.exceptions.* { *; }
+-keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment

app/sampledata/genres

@@ -0,0 +1,10 @@
+Slice of Life, Mystery
+Slice of Life, Mystery
+Psychological, Romance, Comedy, Slice of Life, Supernatural
+Sci-Fi, Comedy
+Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
+Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
+Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
+Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
+Adventure, Slice of Life, Mystery
+Adventure, Slice of Life, Mystery

app/sampledata/titles

@@ -0,0 +1,10 @@
+Forget-me-not Vol. 1
+Forget-me-not Vol. 2
+La Pomme Prisoinniere
+Momo Kanchou no Himitsu Kichi
+Omoide Emanon
+Sasurai Emanon Vol. 1
+Sasurai Emanon Vol. 2
+Sasurai Emanon Vol. 3
+Wandering Island Vol. 1
+Wandering Island Vol. 2

app/src/androidTest/assets/categories/simple.json

@@ -0,0 +1,9 @@
+{
+	"id": 4,
+	"title": "Read later",
+	"sortKey": 1,
+	"order": "NEWEST",
+	"createdAt": 1335906000000,
+	"isTrackingEnabled": true,
+	"isVisibleInLibrary": true
+}

app/src/androidTest/assets/manga/header.json

@@ -0,0 +1,35 @@
+{
+	"id": -2096681732556647985,
+	"title": "Странствия Эманон",
+	"url": "/stranstviia_emanon",
+	"publicUrl": "https://readmanga.io/stranstviia_emanon",
+	"rating": 0.9400894,
+	"isNsfw": true,
+	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
+	"tags": [
+		{
+			"title": "Сверхъестественное",
+			"key": "supernatural",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Сэйнэн",
+			"key": "seinen",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Повседневность",
+			"key": "slice_of_life",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Приключения",
+			"key": "adventure",
+			"source": "READMANGA_RU"
+		}
+	],
+	"state": "FINISHED",
+	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
+	"description": null,
+	"source": "READMANGA_RU"
+}

app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt

@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu
+
+import android.app.Instrumentation
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+suspend fun Instrumentation.awaitForIdle() = suspendCoroutine<Unit> { cont ->
+	waitForIdle { cont.resume(Unit) }
+}

app/src/androidTest/java/org/koitharu/kotatsu/SampleData.kt

@@ -0,0 +1,54 @@
+package org.koitharu.kotatsu
+
+import androidx.test.platform.app.InstrumentationRegistry
+import com.squareup.moshi.*
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import okio.buffer
+import okio.source
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.util.*
+import kotlin.reflect.KClass
+
+object SampleData {
+
+	private val moshi = Moshi.Builder()
+		.add(DateAdapter())
+		.add(KotlinJsonAdapterFactory())
+		.build()
+
+	val manga: Manga = loadAsset("manga/header.json", Manga::class)
+
+	val mangaDetails: Manga = loadAsset("manga/full.json", Manga::class)
+
+	val tag = mangaDetails.tags.elementAt(2)
+
+	val chapter = checkNotNull(mangaDetails.chapters)[2]
+
+	val favouriteCategory: FavouriteCategory = loadAsset("categories/simple.json", FavouriteCategory::class)
+
+	fun <T : Any> loadAsset(name: String, cls: KClass<T>): T {
+		val assets = InstrumentationRegistry.getInstrumentation().context.assets
+		return assets.open(name).use {
+			moshi.adapter(cls.java).fromJson(it.source().buffer())
+		} ?: throw RuntimeException("Cannot read asset from json \"$name\"")
+	}
+
+	private class DateAdapter : JsonAdapter<Date>() {
+
+		@FromJson
+		override fun fromJson(reader: JsonReader): Date? {
+			val ms = reader.nextLong()
+			return if (ms == 0L) {
+				null
+			} else {
+				Date(ms)
+			}
+		}
+
+		@ToJson
+		override fun toJson(writer: JsonWriter, value: Date?) {
+			writer.value(value?.time ?: 0L)
+		}
+	}
+}

app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt

@@ -3,11 +3,10 @@ package org.koitharu.kotatsu.core.db
 import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import java.io.IOException
+import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.koitharu.kotatsu.core.db.migrations.*
 
 @RunWith(AndroidJUnit4::class)
 class MangaDatabaseTest {
@@ -18,38 +17,41 @@ class MangaDatabaseTest {
 		MangaDatabase::class.java,
 	)
 
+	private val migrations = databaseMigrations
+
 	@Test
-	@Throws(IOException::class)
-	fun migrateAll() {
-		helper.createDatabase(TEST_DB, 1).apply {
-			// TODO execSQL("")
-			close()
+	fun versions() {
+		assertEquals(1, migrations.first().startVersion)
+		repeat(migrations.size) { i ->
+			assertEquals(i + 1, migrations[i].startVersion)
+			assertEquals(i + 2, migrations[i].endVersion)
 		}
+		assertEquals(DATABASE_VERSION, migrations.last().endVersion)
+	}
+
+	@Test
+	fun migrateAll() {
+		helper.createDatabase(TEST_DB, 1).close()
 		for (migration in migrations) {
 			helper.runMigrationsAndValidate(
 				TEST_DB,
 				migration.endVersion,
 				true,
-				migration
-			)
+				migration,
+			).close()
+		}
+	}
+
+	@Test
+	fun prePopulate() {
+		val resources = InstrumentationRegistry.getInstrumentation().targetContext.resources
+		helper.createDatabase(TEST_DB, DATABASE_VERSION).use {
+			DatabasePrePopulateCallback(resources).onCreate(it)
 		}
 	}
 
 	private companion object {
 
 		const val TEST_DB = "test-db"
-
-		val migrations = arrayOf(
-			Migration1To2(),
-			Migration2To3(),
-			Migration3To4(),
-			Migration4To5(),
-			Migration5To6(),
-			Migration6To7(),
-			Migration7To8(),
-			Migration8To9(),
-			Migration9To10(),
-			Migration10To11(),
-		)
 	}
-}
+}

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

@@ -0,0 +1,77 @@
+package org.koitharu.kotatsu.core.os
+
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
+import android.os.Build
+import androidx.core.content.getSystemService
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.koitharu.kotatsu.SampleData
+import org.koitharu.kotatsu.awaitForIdle
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.history.domain.HistoryRepository
+
+@HiltAndroidTest
+@RunWith(AndroidJUnit4::class)
+class ShortcutsUpdaterTest {
+
+	@get:Rule
+	var hiltRule = HiltAndroidRule(this)
+
+	@Inject
+	lateinit var historyRepository: HistoryRepository
+
+	@Inject
+	lateinit var shortcutsUpdater: ShortcutsUpdater
+
+	@Inject
+	lateinit var database: MangaDatabase
+
+	@Before
+	fun setUp() {
+		hiltRule.inject()
+		database.clearAllTables()
+	}
+
+	@Test
+	fun testUpdateShortcuts() = runTest {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
+			return@runTest
+		}
+		awaitUpdate()
+		assertTrue(getShortcuts().isEmpty())
+		historyRepository.addOrUpdate(
+			manga = SampleData.manga,
+			chapterId = SampleData.chapter.id,
+			page = 4,
+			scroll = 2,
+			percent = 0.3f,
+		)
+		awaitUpdate()
+
+		val shortcuts = getShortcuts()
+		assertEquals(1, shortcuts.size)
+	}
+
+	private fun getShortcuts(): List<ShortcutInfo> {
+		val context = InstrumentationRegistry.getInstrumentation().targetContext
+		val manager = checkNotNull(context.getSystemService<ShortcutManager>())
+		return manager.dynamicShortcuts.filterNot { it.id == "com.squareup.leakcanary.dynamic_shortcut" }
+	}
+
+	private suspend fun awaitUpdate() {
+		val instrumentation = InstrumentationRegistry.getInstrumentation()
+		instrumentation.awaitForIdle()
+		shortcutsUpdater.await()
+	}
+}

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

@@ -0,0 +1,108 @@
+package org.koitharu.kotatsu.settings.backup
+
+import android.content.res.AssetManager
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import java.io.File
+import javax.inject.Inject
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.koitharu.kotatsu.SampleData
+import org.koitharu.kotatsu.core.backup.BackupRepository
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.history.domain.HistoryRepository
+
+@HiltAndroidTest
+@RunWith(AndroidJUnit4::class)
+class AppBackupAgentTest {
+
+	@get:Rule
+	var hiltRule = HiltAndroidRule(this)
+
+	@Inject
+	lateinit var historyRepository: HistoryRepository
+
+	@Inject
+	lateinit var favouritesRepository: FavouritesRepository
+
+	@Inject
+	lateinit var backupRepository: BackupRepository
+
+	@Inject
+	lateinit var database: MangaDatabase
+
+	@Before
+	fun setUp() {
+		hiltRule.inject()
+		database.clearAllTables()
+	}
+
+	@Test
+	fun backupAndRestore() = runTest {
+		val category = favouritesRepository.createCategory(
+			title = SampleData.favouriteCategory.title,
+			sortOrder = SampleData.favouriteCategory.order,
+			isTrackerEnabled = SampleData.favouriteCategory.isTrackingEnabled,
+		)
+		favouritesRepository.addToCategory(categoryId = category.id, mangas = listOf(SampleData.manga))
+		historyRepository.addOrUpdate(
+			manga = SampleData.mangaDetails,
+			chapterId = SampleData.mangaDetails.chapters!![2].id,
+			page = 3,
+			scroll = 40,
+			percent = 0.2f,
+		)
+		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
+
+		val agent = AppBackupAgent()
+		val backup = agent.createBackupFile(
+			context = InstrumentationRegistry.getInstrumentation().targetContext,
+			repository = backupRepository,
+		)
+
+		database.clearAllTables()
+		assertTrue(favouritesRepository.getAllManga().isEmpty())
+		assertNull(historyRepository.getLastOrNull())
+
+		backup.inputStream().use {
+			agent.restoreBackupFile(it.fd, backup.length(), backupRepository)
+		}
+
+		assertEquals(category, favouritesRepository.getCategory(category.id))
+		assertEquals(history, historyRepository.getOne(SampleData.manga))
+		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
+
+		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
+		assertTrue(SampleData.tag in allTags)
+	}
+
+	@Test
+	fun restoreOldBackup() {
+		val agent = AppBackupAgent()
+		val backup = File.createTempFile("backup_", ".tmp")
+		InstrumentationRegistry.getInstrumentation().context.assets
+			.open("kotatsu_test.bak", AssetManager.ACCESS_STREAMING)
+			.use { input ->
+				backup.outputStream().use { output ->
+					input.copyTo(output)
+				}
+			}
+		backup.inputStream().use {
+			agent.restoreBackupFile(it.fd, backup.length(), backupRepository)
+		}
+		runTest {
+			assertEquals(6, historyRepository.observeAll().first().size)
+			assertEquals(2, favouritesRepository.observeCategories().first().size)
+			assertEquals(15, favouritesRepository.getAllManga().size)
+		}
+	}
+}

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

@@ -1,32 +1,39 @@
 package org.koitharu.kotatsu.tracker.domain
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
+import junit.framework.TestCase.*
 import kotlinx.coroutines.test.runTest
-import okio.buffer
-import okio.source
+import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
+import org.koitharu.kotatsu.SampleData
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 
+@HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class TrackerTest : KoinTest {
+class TrackerTest {
 
-	private val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
-	private val mangaAdapter = moshi.adapter(Manga::class.java)
-	private val historyRegistry by inject<HistoryRepository>()
-	private val repository by inject<TrackingRepository>()
-	private val dataRepository by inject<MangaDataRepository>()
-	private val tracker by inject<Tracker>()
+	@get:Rule
+	var hiltRule = HiltAndroidRule(this)
+
+	@Inject
+	lateinit var repository: TrackingRepository
+
+	@Inject
+	lateinit var dataRepository: MangaDataRepository
+
+	@Inject
+	lateinit var tracker: Tracker
+
+	@Before
+	fun setUp() {
+		hiltRule.inject()
+	}
 
 	@Test
 	fun noUpdates() = runTest {
@@ -166,23 +173,26 @@ class TrackerTest : KoinTest {
 		}
 		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
 
-		val chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex - 1) }
+		var chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex - 1) }
 		repository.syncWithHistory(mangaFull, chapter.id)
 
 		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
+
+		chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex) }
+		repository.syncWithHistory(mangaFull, chapter.id)
+
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+
 		tracker.checkUpdates(mangaFull, commit = true).apply {
 			assertTrue(isValid)
 			assert(newChapters.isEmpty())
 		}
-		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
 	}
 
 	private suspend fun loadManga(name: String): Manga {
-		val assets = InstrumentationRegistry.getInstrumentation().context.assets
-		val manga = assets.open("manga/$name").use {
-			mangaAdapter.fromJson(it.source().buffer())
-		} ?: throw RuntimeException("Cannot read manga from json \"$name\"")
+		val manga = SampleData.loadAsset("manga/$name", Manga::class)
 		dataRepository.storeManga(manga)
 		return manga
 	}
-}
+}

app/src/main/AndroidManifest.xml

@@ -10,6 +10,14 @@
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
+	<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
+	<uses-permission android:name="android.permission.READ_SYNC_STATS" />
+	<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" />
 
 	<application
 		android:name="org.koitharu.kotatsu.KotatsuApp"
@@ -57,14 +65,28 @@
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
 			android:label="@string/search_manga" />
+		<activity
+			android:name="org.koitharu.kotatsu.history.ui.HistoryActivity"
+			android:label="@string/history" />
+		<activity
+			android:name="org.koitharu.kotatsu.favourites.ui.FavouritesActivity"
+			android:label="@string/favourites" />
+		<activity
+			android:name="org.koitharu.kotatsu.bookmarks.ui.BookmarksActivity"
+			android:label="@string/bookmarks" />
+		<activity
+			android:name="org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity"
+			android:label="@string/suggestions" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:exported="true"
 			android:label="@string/settings">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
+
 				<category android:name="android.intent.category.DEFAULT" />
 				<category android:name="android.intent.category.BROWSABLE" />
+
 				<data android:scheme="kotatsu" />
 			</intent-filter>
 		</activity>
@@ -77,8 +99,8 @@
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name="org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity"
-			android:label="@string/favourites_categories"
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity"
+			android:label="@string/favourites"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
@@ -108,17 +130,60 @@
 		<activity
 			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
 			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+		<activity
+			android:name="org.koitharu.kotatsu.sync.ui.SyncAuthActivity"
+			android:label="@string/sync" />
+		<activity
+			android:name="org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity"
+			android:label="@string/color_correction" />
 
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
-			android:foregroundServiceType="dataSync" />
+			android:foregroundServiceType="dataSync"
+			android:stopWithTask="false" />
 		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
+		<service android:name="org.koitharu.kotatsu.local.ui.ImportService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.SyncAuthenticatorService"
+			android:exported="true"
+			tools:ignore="ExportedService">
+			<intent-filter>
+				<action android:name="android.accounts.AccountAuthenticator" />
+			</intent-filter>
+			<meta-data
+				android:name="android.accounts.AccountAuthenticator"
+				android:resource="@xml/authenticator_sync" />
+		</service>
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncService"
+			android:exported="false"
+			android:label="@string/favourites"
+			android:process=":sync">
+			<intent-filter>
+				<action android:name="android.content.SyncAdapter" />
+			</intent-filter>
+			<meta-data
+				android:name="android.content.SyncAdapter"
+				android:resource="@xml/sync_favourites" />
+		</service>
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncService"
+			android:exported="false"
+			android:label="@string/history"
+			android:process=":sync">
+			<intent-filter>
+				<action android:name="android.content.SyncAdapter" />
+			</intent-filter>
+			<meta-data
+				android:name="android.content.SyncAdapter"
+				android:resource="@xml/sync_history" />
+		</service>
 
 		<provider
 			android:name="org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider"
@@ -133,6 +198,22 @@
 				android:name="android.support.FILE_PROVIDER_PATHS"
 				android:resource="@xml/filepaths" />
 		</provider>
+		<provider
+			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncProvider"
+			android:authorities="org.koitharu.kotatsu.favourites"
+			android:exported="false"
+			android:label="@string/favourites"
+			android:syncable="true" />
+		<provider
+			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncProvider"
+			android:authorities="org.koitharu.kotatsu.history"
+			android:exported="false"
+			android:label="@string/history"
+			android:syncable="true" />
+		<provider
+			android:name="androidx.startup.InitializationProvider"
+			android:authorities="${applicationId}.androidx-startup"
+			tools:node="remove" />
 
 		<receiver
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider"
@@ -166,4 +247,4 @@
 
 	</application>
 
-</manifest>
+</manifest>

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

@@ -3,81 +3,56 @@ package org.koitharu.kotatsu
 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
+import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.acra.ReportField
 import org.acra.config.dialog
-import org.acra.config.mailSender
+import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
-import org.koin.android.ext.android.get
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
-import org.koitharu.kotatsu.base.ui.util.ActivityRecreationHandle
-import org.koitharu.kotatsu.bookmarks.bookmarksModule
-import org.koitharu.kotatsu.core.db.databaseModule
-import org.koitharu.kotatsu.core.github.githubModule
-import org.koitharu.kotatsu.core.network.networkModule
+import org.acra.sender.HttpSender
+import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.uiModule
-import org.koitharu.kotatsu.details.detailsModule
-import org.koitharu.kotatsu.favourites.favouritesModule
-import org.koitharu.kotatsu.history.historyModule
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.local.localModule
-import org.koitharu.kotatsu.main.mainModule
-import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.readerModule
-import org.koitharu.kotatsu.remotelist.remoteListModule
-import org.koitharu.kotatsu.scrobbling.shikimori.shikimoriModule
-import org.koitharu.kotatsu.search.searchModule
-import org.koitharu.kotatsu.settings.settingsModule
-import org.koitharu.kotatsu.suggestions.suggestionsModule
-import org.koitharu.kotatsu.tracker.trackerModule
-import org.koitharu.kotatsu.widget.WidgetUpdater
-import org.koitharu.kotatsu.widget.appWidgetModule
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 
-class KotatsuApp : Application() {
+@HiltAndroidApp
+class KotatsuApp : Application(), Configuration.Provider {
+
+	@Inject
+	lateinit var databaseObservers: Set<@JvmSuppressWildcards InvalidationTracker.Observer>
+
+	@Inject
+	lateinit var activityLifecycleCallbacks: Set<@JvmSuppressWildcards ActivityLifecycleCallbacks>
+
+	@Inject
+	lateinit var database: MangaDatabase
+
+	@Inject
+	lateinit var settings: AppSettings
+
+	@Inject
+	lateinit var workerFactory: HiltWorkerFactory
 
 	override fun onCreate() {
 		super.onCreate()
 		if (BuildConfig.DEBUG) {
 			enableStrictMode()
 		}
-		initKoin()
-		AppCompatDelegate.setDefaultNightMode(get<AppSettings>().theme)
-		registerActivityLifecycleCallbacks(get<AppProtectHelper>())
-		registerActivityLifecycleCallbacks(get<ActivityRecreationHandle>())
-		val widgetUpdater = WidgetUpdater(applicationContext)
-		widgetUpdater.subscribeToFavourites(get())
-		widgetUpdater.subscribeToHistory(get())
-	}
-
-	private fun initKoin() {
-		startKoin {
-			androidContext(this@KotatsuApp)
-			modules(
-				networkModule,
-				databaseModule,
-				githubModule,
-				uiModule,
-				mainModule,
-				searchModule,
-				localModule,
-				favouritesModule,
-				historyModule,
-				remoteListModule,
-				detailsModule,
-				trackerModule,
-				settingsModule,
-				readerModule,
-				appWidgetModule,
-				suggestionsModule,
-				shikimoriModule,
-				bookmarksModule,
-			)
+		AppCompatDelegate.setDefaultNightMode(settings.theme)
+		setupActivityLifecycleCallbacks()
+		processLifecycleScope.launch(Dispatchers.Default) {
+			setupDatabaseObservers()
 		}
 	}
 
@@ -85,16 +60,24 @@ class KotatsuApp : Application() {
 		super.attachBaseContext(base)
 		initAcra {
 			buildConfigClass = BuildConfig::class.java
-			reportFormat = StringFormat.KEY_VALUE_LIST
+			reportFormat = StringFormat.JSON
+			excludeMatchingSharedPreferencesKeys = listOf(
+				"sources_\\w+",
+			)
+			httpSender {
+				uri = getString(R.string.url_error_report)
+				basicAuthLogin = getString(R.string.acra_login)
+				basicAuthPassword = getString(R.string.acra_password)
+				httpMethod = HttpSender.Method.POST
+			}
 			reportContent = listOf(
 				ReportField.PACKAGE_NAME,
 				ReportField.APP_VERSION_CODE,
 				ReportField.APP_VERSION_NAME,
 				ReportField.ANDROID_VERSION,
 				ReportField.PHONE_MODEL,
-				ReportField.CRASH_CONFIGURATION,
 				ReportField.STACK_TRACE,
-				ReportField.CUSTOM_DATA,
+				ReportField.CRASH_CONFIGURATION,
 				ReportField.SHARED_PREFERENCES,
 			)
 			dialog {
@@ -104,11 +87,26 @@ class KotatsuApp : Application() {
 				resIcon = R.drawable.ic_alert_outline
 				resTheme = android.R.style.Theme_Material_Light_Dialog_Alert
 			}
-			mailSender {
-				mailTo = getString(R.string.email_error_report)
-				reportAsFile = true
-				reportFileName = "stacktrace.txt"
-			}
+		}
+	}
+
+	override fun getWorkManagerConfiguration(): Configuration {
+		return Configuration.Builder()
+			.setWorkerFactory(workerFactory)
+			.build()
+	}
+
+	@WorkerThread
+	private fun setupDatabaseObservers() {
+		val tracker = database.invalidationTracker
+		databaseObservers.forEach {
+			tracker.addObserver(it)
+		}
+	}
+
+	private fun setupActivityLifecycleCallbacks() {
+		activityLifecycleCallbacks.forEach {
+			registerActivityLifecycleCallbacks(it)
 		}
 	}
 
@@ -117,7 +115,7 @@ class KotatsuApp : Application() {
 			StrictMode.ThreadPolicy.Builder()
 				.detectAll()
 				.penaltyLog()
-				.build()
+				.build(),
 		)
 		StrictMode.setVmPolicy(
 			StrictMode.VmPolicy.Builder()
@@ -126,7 +124,7 @@ class KotatsuApp : Application() {
 				.setClassInstanceLimit(PagesCache::class.java, 1)
 				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
 				.penaltyLog()
-				.build()
+				.build(),
 		)
 		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
 			.penaltyDeath()
@@ -137,4 +135,4 @@ class KotatsuApp : Application() {
 			.detectFragmentTagUsage()
 			.build()
 	}
-}
+}

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

@@ -1,25 +1,57 @@
 package org.koitharu.kotatsu.base.domain
 
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.util.Size
 import androidx.room.withTransaction
+import java.io.File
+import java.io.InputStream
+import java.util.zip.ZipFile
+import javax.inject.Inject
+import kotlin.math.roundToInt
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runInterruptible
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 
-class MangaDataRepository(private val db: MangaDatabase) {
+private const val MIN_WEBTOON_RATIO = 2
 
-	suspend fun savePreferences(manga: Manga, mode: ReaderMode) {
-		val tags = manga.tags.toEntities()
+class MangaDataRepository @Inject constructor(
+	private val okHttpClient: OkHttpClient,
+	private val db: MangaDatabase,
+) {
+
+	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
 		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
+			storeManga(manga)
+			val entity = db.preferencesDao.find(manga.id) ?: newEntity(manga.id)
+			db.preferencesDao.upsert(entity.copy(mode = mode.id))
+		}
+	}
+
+	suspend fun saveColorFilter(manga: Manga, colorFilter: ReaderColorFilter?) {
+		db.withTransaction {
+			storeManga(manga)
+			val entity = db.preferencesDao.find(manga.id) ?: newEntity(manga.id)
 			db.preferencesDao.upsert(
-				MangaPrefsEntity(
-					mangaId = manga.id,
-					mode = mode.id
-				)
+				entity.copy(
+					cfBrightness = colorFilter?.brightness ?: 0f,
+					cfContrast = colorFilter?.contrast ?: 0f,
+				),
 			)
 		}
 	}
@@ -28,6 +60,16 @@ class MangaDataRepository(private val db: MangaDatabase) {
 		return db.preferencesDao.find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
 	}
 
+	suspend fun getColorFilter(mangaId: Long): ReaderColorFilter? {
+		return db.preferencesDao.find(mangaId)?.getColorFilterOrNull()
+	}
+
+	fun observeColorFilter(mangaId: Long): Flow<ReaderColorFilter?> {
+		return db.preferencesDao.observe(mangaId)
+			.map { it?.getColorFilterOrNull() }
+			.distinctUntilChanged()
+	}
+
 	suspend fun findMangaById(mangaId: Long): Manga? {
 		return db.mangaDao.find(mangaId)?.toManga()
 	}
@@ -49,4 +91,74 @@ class MangaDataRepository(private val db: MangaDatabase) {
 	suspend fun findTags(source: MangaSource): Set<MangaTag> {
 		return db.tagsDao.findTags(source.name).toMangaTags()
 	}
-}
+
+	private fun MangaPrefsEntity.getColorFilterOrNull(): ReaderColorFilter? {
+		return if (cfBrightness != 0f || cfContrast != 0f) {
+			ReaderColorFilter(cfBrightness, cfContrast)
+		} else {
+			null
+		}
+	}
+
+	/**
+	 * Automatic determine type of manga by page size
+	 * @return ReaderMode.WEBTOON if page is wide
+	 */
+	suspend fun determineMangaIsWebtoon(repository: MangaRepository, pages: List<MangaPage>): Boolean {
+		val pageIndex = (pages.size * 0.3).roundToInt()
+		val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
+		val url = repository.getPageUrl(page)
+		val uri = Uri.parse(url)
+		val size = if (uri.scheme == "cbz") {
+			runInterruptible(Dispatchers.IO) {
+				val zip = ZipFile(uri.schemeSpecificPart)
+				val entry = zip.getEntry(uri.fragment)
+				zip.getInputStream(entry).use {
+					getBitmapSize(it)
+				}
+			}
+		} else {
+			val request = Request.Builder()
+				.url(url)
+				.get()
+				.header(CommonHeaders.REFERER, page.referer)
+				.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
+				.build()
+			okHttpClient.newCall(request).await().use {
+				runInterruptible(Dispatchers.IO) {
+					getBitmapSize(it.body?.byteStream())
+				}
+			}
+		}
+		return size.width * MIN_WEBTOON_RATIO < size.height
+	}
+
+	private fun newEntity(mangaId: Long) = MangaPrefsEntity(
+		mangaId = mangaId,
+		mode = -1,
+		cfBrightness = 0f,
+		cfContrast = 0f,
+	)
+
+	companion object {
+
+		suspend fun getImageMimeType(file: File): String? = runInterruptible(Dispatchers.IO) {
+			val options = BitmapFactory.Options().apply {
+				inJustDecodeBounds = true
+			}
+			BitmapFactory.decodeFile(file.path, options)?.recycle()
+			options.outMimeType
+		}
+
+		private fun getBitmapSize(input: InputStream?): Size {
+			val options = BitmapFactory.Options().apply {
+				inJustDecodeBounds = true
+			}
+			BitmapFactory.decodeStream(input, null, options)?.recycle()
+			val imageHeight: Int = options.outHeight
+			val imageWidth: Int = options.outWidth
+			check(imageHeight > 0 && imageWidth > 0)
+			return Size(imageWidth, imageHeight)
+		}
+	}
+}

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

@@ -5,6 +5,8 @@ import android.net.Uri
 import android.os.Bundle
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.getParcelableCompat
+import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
 
 class MangaIntent private constructor(
 	val manga: Manga?,
@@ -13,15 +15,15 @@ class MangaIntent private constructor(
 ) {
 
 	constructor(intent: Intent?) : this(
-		manga = intent?.getParcelableExtra<ParcelableManga>(KEY_MANGA)?.manga,
+		manga = intent?.getParcelableExtraCompat<ParcelableManga>(KEY_MANGA)?.manga,
 		mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
-		uri = intent?.data
+		uri = intent?.data,
 	)
 
 	constructor(args: Bundle?) : this(
-		manga = args?.getParcelable<ParcelableManga>(KEY_MANGA)?.manga,
+		manga = args?.getParcelableCompat<ParcelableManga>(KEY_MANGA)?.manga,
 		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
-		uri = null
+		uri = null,
 	)
 
 	companion object {

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

@@ -1,76 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import android.graphics.BitmapFactory
-import android.net.Uri
-import android.util.Size
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.util.await
-import java.io.File
-import java.io.InputStream
-import java.util.zip.ZipFile
-import kotlin.math.roundToInt
-
-object MangaUtils : KoinComponent {
-
-	private const val MIN_WEBTOON_RATIO = 2
-
-	/**
-	 * Automatic determine type of manga by page size
-	 * @return ReaderMode.WEBTOON if page is wide
-	 */
-	suspend fun determineMangaIsWebtoon(pages: List<MangaPage>): Boolean {
-		val pageIndex = (pages.size * 0.3).roundToInt()
-		val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
-		val url = MangaRepository(page.source).getPageUrl(page)
-		val uri = Uri.parse(url)
-		val size = if (uri.scheme == "cbz") {
-			runInterruptible(Dispatchers.IO) {
-				val zip = ZipFile(uri.schemeSpecificPart)
-				val entry = zip.getEntry(uri.fragment)
-				zip.getInputStream(entry).use {
-					getBitmapSize(it)
-				}
-			}
-		} else {
-			val request = Request.Builder()
-				.url(url)
-				.get()
-				.header(CommonHeaders.REFERER, page.referer)
-				.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
-				.build()
-			get<OkHttpClient>().newCall(request).await().use {
-				runInterruptible(Dispatchers.IO) {
-					getBitmapSize(it.body?.byteStream())
-				}
-			}
-		}
-		return size.width * MIN_WEBTOON_RATIO < size.height
-	}
-
-	suspend fun getImageMimeType(file: File): String? = runInterruptible(Dispatchers.IO) {
-		val options = BitmapFactory.Options().apply {
-			inJustDecodeBounds = true
-		}
-		BitmapFactory.decodeFile(file.path, options)?.recycle()
-		options.outMimeType
-	}
-
-	private fun getBitmapSize(input: InputStream?): Size {
-		val options = BitmapFactory.Options().apply {
-			inJustDecodeBounds = true
-		}
-		BitmapFactory.decodeStream(input, null, options)?.recycle()
-		val imageHeight: Int = options.outHeight
-		val imageWidth: Int = options.outWidth
-		check(imageHeight > 0 && imageWidth > 0)
-		return Size(imageWidth, imageHeight)
-	}
-}

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.base.domain
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 
 fun interface ReversibleHandle {
@@ -10,7 +11,11 @@ fun interface ReversibleHandle {
 }
 
 fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default) {
-	reverse()
+	runCatching {
+		reverse()
+	}.onFailure {
+		it.printStackTraceDebug()
+	}
 }
 
 operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {

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

@@ -21,14 +21,14 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 		viewBinding = binding
 		return MaterialAlertDialogBuilder(requireContext(), theme)
 			.setView(binding.root)
-			.also(::onBuildDialog)
+			.run(::onBuildDialog)
 			.create()
 	}
 
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
-		savedInstanceState: Bundle?
+		savedInstanceState: Bundle?,
 	) = viewBinding?.root
 
 	@CallSuper
@@ -37,9 +37,9 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 		super.onDestroyView()
 	}
 
-	open fun onBuildDialog(builder: MaterialAlertDialogBuilder) = Unit
+	open fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder = builder
 
 	protected fun bindingOrNull(): B? = viewBinding
 
 	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-}
+}

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

@@ -13,23 +13,32 @@ import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.ActionBarContextView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
-import org.koin.android.ext.android.get
+import dagger.hilt.android.EntryPointAccessors
+import javax.inject.Inject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.base.ui.util.BaseActivityEntryPoint
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
+import org.koitharu.kotatsu.base.ui.util.inject
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.utils.ext.getThemeColor
 
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
 	WindowInsetsDelegate.WindowInsetsListener {
 
+	@Inject
+	lateinit var settings: AppSettings
+
 	protected lateinit var binding: B
 		private set
 
@@ -42,7 +51,7 @@ abstract class BaseActivity<B : ViewBinding> :
 	val actionModeDelegate = ActionModeDelegate()
 
 	override fun onCreate(savedInstanceState: Bundle?) {
-		val settings = get<AppSettings>()
+		EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).inject(this)
 		val isAmoled = settings.isAmoledTheme
 		val isDynamic = settings.isDynamicTheme
 		// TODO support DialogWhenLarge theme
@@ -96,25 +105,33 @@ abstract class BaseActivity<B : ViewBinding> :
 	protected fun isDarkAmoledTheme(): Boolean {
 		val uiMode = resources.configuration.uiMode
 		val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-		return isNight && get<AppSettings>().isAmoledTheme
+		return isNight && settings.isAmoledTheme
 	}
 
 	@CallSuper
 	override fun onSupportActionModeStarted(mode: ActionMode) {
 		super.onSupportActionModeStarted(mode)
 		actionModeDelegate.onSupportActionModeStarted(mode)
+		val actionModeColor = ColorUtils.compositeColors(
+			ContextCompat.getColor(this, com.google.android.material.R.color.m3_appbar_overlay_color),
+			getThemeColor(com.google.android.material.R.attr.colorSurface),
+		)
 		val insets = ViewCompat.getRootWindowInsets(binding.root)
 			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
-		val view = findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar)
-		view?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			topMargin = insets.top
+		findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar).apply {
+			setBackgroundColor(actionModeColor)
+			updateLayoutParams<ViewGroup.MarginLayoutParams> {
+				topMargin = insets.top
+			}
 		}
+		window.statusBarColor = actionModeColor
 	}
 
 	@CallSuper
 	override fun onSupportActionModeFinished(mode: ActionMode) {
 		super.onSupportActionModeFinished(mode)
 		actionModeDelegate.onSupportActionModeFinished(mode)
+		window.statusBarColor = getThemeColor(android.R.attr.statusBarColor)
 	}
 
 	override fun onBackPressed() {
@@ -128,4 +145,4 @@ abstract class BaseActivity<B : ViewBinding> :
 			super.onBackPressed()
 		}
 	}
-}
+}

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

@@ -9,13 +9,13 @@ import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
+import com.google.android.material.R as materialR
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
 import org.koitharu.kotatsu.utils.ext.displayCompat
-import com.google.android.material.R as materialR
 
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 
@@ -30,7 +30,7 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
-		savedInstanceState: Bundle?
+		savedInstanceState: Bundle?,
 	): View {
 		val binding = onInflateView(inflater, container)
 		viewBinding = binding
@@ -83,4 +83,4 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		}
 		b.isDraggable = !isLocked
 	}
-}
+}

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

@@ -52,4 +52,4 @@ abstract class BaseFragment<B : ViewBinding> :
 	protected fun bindingOrNull() = viewBinding
 
 	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-}
+}

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

@@ -8,18 +8,21 @@ import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
-import org.koin.android.ext.android.inject
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.settings.SettingsHeadersFragment
 
+@AndroidEntryPoint
 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	PreferenceFragmentCompat(),
 	WindowInsetsDelegate.WindowInsetsListener,
 	RecyclerViewOwner {
 
-	protected val settings by inject<AppSettings>(mode = LazyThreadSafetyMode.NONE)
+	@Inject
+	lateinit var settings: AppSettings
 
 	@Suppress("LeakingThis")
 	protected val insetsDelegate = WindowInsetsDelegate(this)
@@ -48,7 +51,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	@CallSuper
 	override fun onWindowInsetsChanged(insets: Insets) {
 		listView.updatePadding(
-			bottom = insets.bottom
+			bottom = insets.bottom,
 		)
 	}
 
@@ -57,4 +60,4 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 		(parentFragment as? SettingsHeadersFragment)?.setTitle(title)
 			?: activity?.setTitle(title)
 	}
-}
+}

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

@@ -15,7 +15,7 @@ abstract class CoroutineIntentService : BaseService() {
 	private val mutex = Mutex()
 	protected open val dispatcher: CoroutineDispatcher = Dispatchers.Default
 
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+	final override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
 		launchCoroutine(intent, startId)
 		return Service.START_REDELIVER_INTENT
@@ -34,4 +34,4 @@ abstract class CoroutineIntentService : BaseService() {
 	}
 
 	protected abstract suspend fun processIntent(intent: Intent?)
-}
+}

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

@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.base.ui.dialog
+
+import android.content.DialogInterface
+
+class RememberSelectionDialogListener(initialValue: Int) : DialogInterface.OnClickListener {
+
+	var selection: Int = initialValue
+		private set
+
+	override fun onClick(dialog: DialogInterface?, which: Int) {
+		selection = which
+	}
+}

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

@@ -12,9 +12,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
 import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryOwner
+import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.Dispatchers
 import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
-import kotlin.coroutines.EmptyCoroutineContext
 
 private const val KEY_SELECTION = "selection"
 private const val PROVIDER_NAME = "selection_decoration"
@@ -23,15 +23,18 @@ class ListSelectionController(
 	private val activity: Activity,
 	private val decoration: AbstractSelectionItemDecoration,
 	private val registryOwner: SavedStateRegistryOwner,
-	private val callback: Callback,
+	private val callback: Callback2,
 ) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
 
 	private var actionMode: ActionMode? = null
-	private val stateEventObserver = StateEventObserver()
 
 	val count: Int
 		get() = decoration.checkedItemsCount
 
+	init {
+		registryOwner.lifecycle.addObserver(StateEventObserver())
+	}
+
 	fun snapshot(): Set<Long> {
 		return peekCheckedIds().toSet()
 	}
@@ -55,7 +58,6 @@ class ListSelectionController(
 
 	fun attachToRecyclerView(recyclerView: RecyclerView) {
 		recyclerView.addItemDecoration(decoration)
-		registryOwner.lifecycle.addObserver(stateEventObserver)
 	}
 
 	override fun saveState(): Bundle {
@@ -87,19 +89,19 @@ class ListSelectionController(
 	}
 
 	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onCreateActionMode(mode, menu)
+		return callback.onCreateActionMode(this, mode, menu)
 	}
 
 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onPrepareActionMode(mode, menu)
+		return callback.onPrepareActionMode(this, mode, menu)
 	}
 
 	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-		return callback.onActionItemClicked(mode, item)
+		return callback.onActionItemClicked(this, mode, item)
 	}
 
 	override fun onDestroyActionMode(mode: ActionMode) {
-		callback.onDestroyActionMode(mode)
+		callback.onDestroyActionMode(this, mode)
 		clear()
 		actionMode = null
 	}
@@ -112,7 +114,7 @@ class ListSelectionController(
 
 	private fun notifySelectionChanged() {
 		val count = decoration.checkedItemsCount
-		callback.onSelectionChanged(count)
+		callback.onSelectionChanged(this, count)
 		if (count == 0) {
 			actionMode?.finish()
 		} else {
@@ -129,17 +131,56 @@ class ListSelectionController(
 		notifySelectionChanged()
 	}
 
-	interface Callback : ActionMode.Callback {
+	@Deprecated("")
+	interface Callback : Callback2 {
 
 		fun onSelectionChanged(count: Int)
 
-		override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
+		fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
 
-		override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
+		fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
 
-		override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
+		fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
 
-		override fun onDestroyActionMode(mode: ActionMode) = Unit
+		fun onDestroyActionMode(mode: ActionMode) = Unit
+
+		override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
+			onSelectionChanged(count)
+		}
+
+		override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+			return onCreateActionMode(mode, menu)
+		}
+
+		override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+			return onPrepareActionMode(mode, menu)
+		}
+
+		override fun onActionItemClicked(
+			controller: ListSelectionController,
+			mode: ActionMode,
+			item: MenuItem,
+		): Boolean = onActionItemClicked(mode, item)
+
+		override fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) {
+			onDestroyActionMode(mode)
+		}
+	}
+
+	interface Callback2 {
+
+		fun onSelectionChanged(controller: ListSelectionController, count: Int)
+
+		fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean
+
+		fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+			mode.title = controller.count.toString()
+			return true
+		}
+
+		fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean
+
+		fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) = Unit
 	}
 
 	private inner class StateEventObserver : LifecycleEventObserver {
@@ -159,4 +200,4 @@ class ListSelectionController(
 			}
 		}
 	}
-}
+}

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

@@ -0,0 +1,225 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.app.Activity
+import android.os.Bundle
+import android.util.ArrayMap
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ActionMode
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import androidx.savedstate.SavedStateRegistry
+import androidx.savedstate.SavedStateRegistryOwner
+import kotlin.coroutines.EmptyCoroutineContext
+import kotlinx.coroutines.Dispatchers
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+
+private const val PROVIDER_NAME = "selection_decoration_sectioned"
+
+class SectionedSelectionController<T : Any>(
+	private val activity: Activity,
+	private val owner: SavedStateRegistryOwner,
+	private val callback: Callback<T>,
+) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
+
+	private var actionMode: ActionMode? = null
+
+	private var pendingData: MutableMap<String, Collection<Long>>? = null
+	private val decorations = ArrayMap<T, AbstractSelectionItemDecoration>()
+
+	val count: Int
+		get() = decorations.values.sumOf { it.checkedItemsCount }
+
+	init {
+		owner.lifecycle.addObserver(StateEventObserver())
+	}
+
+	fun snapshot(): Map<T, Set<Long>> {
+		return decorations.mapValues { it.value.checkedItemsIds.toSet() }
+	}
+
+	fun peekCheckedIds(): Map<T, Set<Long>> {
+		return decorations.mapValues { it.value.checkedItemsIds }
+	}
+
+	fun clear() {
+		decorations.values.forEach {
+			it.clearSelection()
+		}
+		notifySelectionChanged()
+	}
+
+	fun attachToRecyclerView(section: T, recyclerView: RecyclerView) {
+		val decoration = getDecoration(section)
+		val pendingIds = pendingData?.remove(section.toString())
+		if (!pendingIds.isNullOrEmpty()) {
+			decoration.checkAll(pendingIds)
+			startActionMode()
+			notifySelectionChanged()
+		}
+		recyclerView.addItemDecoration(decoration)
+		if (pendingData?.isEmpty() == true) {
+			pendingData = null
+		}
+	}
+
+	override fun saveState(): Bundle {
+		val bundle = Bundle(decorations.size)
+		for ((k, v) in decorations) {
+			bundle.putLongArray(k.toString(), v.checkedItemsIds.toLongArray())
+		}
+		return bundle
+	}
+
+	fun onItemClick(section: T, id: Long): Boolean {
+		val decoration = getDecoration(section)
+		if (isInSelectionMode()) {
+			decoration.toggleItemChecked(id)
+			if (isInSelectionMode()) {
+				actionMode?.invalidate()
+			} else {
+				actionMode?.finish()
+			}
+			notifySelectionChanged()
+			return true
+		}
+		return false
+	}
+
+	fun onItemLongClick(section: T, id: Long): Boolean {
+		val decoration = getDecoration(section)
+		startActionMode()
+		return actionMode?.also {
+			decoration.setItemIsChecked(id, true)
+			notifySelectionChanged()
+		} != null
+	}
+
+	fun getSectionCount(section: T): Int {
+		return decorations[section]?.checkedItemsCount ?: 0
+	}
+
+	fun addToSelection(section: T, ids: Collection<Long>): Boolean {
+		val decoration = getDecoration(section)
+		startActionMode()
+		return actionMode?.also {
+			decoration.checkAll(ids)
+			notifySelectionChanged()
+		} != null
+	}
+
+	fun clearSelection(section: T) {
+		decorations[section]?.clearSelection() ?: return
+		notifySelectionChanged()
+	}
+
+	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+		return callback.onCreateActionMode(this, mode, menu)
+	}
+
+	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+		return callback.onPrepareActionMode(this, mode, menu)
+	}
+
+	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
+		return callback.onActionItemClicked(this, mode, item)
+	}
+
+	override fun onDestroyActionMode(mode: ActionMode) {
+		callback.onDestroyActionMode(this, mode)
+		clear()
+		actionMode = null
+	}
+
+	private fun startActionMode() {
+		if (actionMode == null) {
+			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
+		}
+	}
+
+	private fun isInSelectionMode(): Boolean {
+		return decorations.values.any { x -> x.checkedItemsCount > 0 }
+	}
+
+	private fun notifySelectionChanged() {
+		val count = this.count
+		callback.onSelectionChanged(this, count)
+		if (count == 0) {
+			actionMode?.finish()
+		} else {
+			actionMode?.invalidate()
+		}
+	}
+
+	private fun restoreState(ids: MutableMap<String, Collection<Long>>) {
+		if (ids.isEmpty() || isInSelectionMode()) {
+			return
+		}
+		for ((k, v) in decorations) {
+			val items = ids.remove(k.toString())
+			if (!items.isNullOrEmpty()) {
+				v.checkAll(items)
+			}
+		}
+		pendingData = ids
+		if (isInSelectionMode()) {
+			startActionMode()
+			notifySelectionChanged()
+		}
+	}
+
+	private fun getDecoration(section: T): AbstractSelectionItemDecoration {
+		return decorations.getOrPut(section) {
+			callback.onCreateItemDecoration(this, section)
+		}
+	}
+
+	interface Callback<T : Any> {
+
+		fun onSelectionChanged(controller: SectionedSelectionController<T>, count: Int)
+
+		fun onCreateActionMode(controller: SectionedSelectionController<T>, mode: ActionMode, menu: Menu): Boolean
+
+		fun onPrepareActionMode(controller: SectionedSelectionController<T>, mode: ActionMode, menu: Menu): Boolean {
+			mode.title = controller.count.toString()
+			return true
+		}
+
+		fun onDestroyActionMode(controller: SectionedSelectionController<T>, mode: ActionMode) = Unit
+
+		fun onActionItemClicked(
+			controller: SectionedSelectionController<T>,
+			mode: ActionMode,
+			item: MenuItem,
+		): Boolean
+
+		fun onCreateItemDecoration(
+			controller: SectionedSelectionController<T>,
+			section: T,
+		): AbstractSelectionItemDecoration
+	}
+
+	private inner class StateEventObserver : LifecycleEventObserver {
+
+		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+			if (event == Lifecycle.Event.ON_CREATE) {
+				val registry = owner.savedStateRegistry
+				registry.registerSavedStateProvider(PROVIDER_NAME, this@SectionedSelectionController)
+				val state = registry.consumeRestoredStateForKey(PROVIDER_NAME)
+				if (state != null) {
+					Dispatchers.Main.dispatch(EmptyCoroutineContext) { // == Handler.post
+						if (source.lifecycle.currentState.isAtLeast(Lifecycle.State.CREATED)) {
+							restoreState(
+								state.keySet()
+									.associateWithTo(HashMap()) { state.getLongArray(it)?.toList().orEmpty() },
+							)
+						}
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -11,8 +11,8 @@ class SpacingItemDecoration(@Px private val spacing: Int) : RecyclerView.ItemDec
 		outRect: Rect,
 		view: View,
 		parent: RecyclerView,
-		state: RecyclerView.State
+		state: RecyclerView.State,
 	) {
 		outRect.set(spacing, spacing, spacing, spacing)
 	}
-}
+}

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

@@ -0,0 +1,84 @@
+package org.koitharu.kotatsu.base.ui.list.fastscroll
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.view.View
+import android.view.ViewAnimationUtils
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import kotlin.math.hypot
+import org.koitharu.kotatsu.utils.ext.animatorDurationScale
+import org.koitharu.kotatsu.utils.ext.measureWidth
+
+class BubbleAnimator(
+	private val bubble: View,
+) {
+
+	private val animationDuration = (
+		bubble.resources.getInteger(android.R.integer.config_shortAnimTime) *
+			bubble.context.animatorDurationScale
+		).toLong()
+	private var animator: Animator? = null
+	private var isHiding = false
+
+	fun show() {
+		if (bubble.isVisible && !isHiding) {
+			return
+		}
+		isHiding = false
+		animator?.cancel()
+		animator = ViewAnimationUtils.createCircularReveal(
+			bubble,
+			bubble.measureWidth(),
+			bubble.measuredHeight,
+			0f,
+			hypot(bubble.width.toDouble(), bubble.height.toDouble()).toFloat(),
+		).apply {
+			bubble.isVisible = true
+			duration = animationDuration
+			interpolator = DecelerateInterpolator()
+			start()
+		}
+	}
+
+	fun hide() {
+		if (!bubble.isVisible || isHiding) {
+			return
+		}
+		animator?.cancel()
+		isHiding = true
+		animator = ViewAnimationUtils.createCircularReveal(
+			bubble,
+			bubble.width,
+			bubble.height,
+			hypot(bubble.width.toDouble(), bubble.height.toDouble()).toFloat(),
+			0f,
+		).apply {
+			duration = animationDuration
+			interpolator = AccelerateInterpolator()
+			addListener(HideListener())
+			start()
+		}
+	}
+
+	private inner class HideListener : AnimatorListenerAdapter() {
+
+		private var isCancelled = false
+
+		override fun onAnimationCancel(animation: Animator) {
+			super.onAnimationCancel(animation)
+			isCancelled = true
+		}
+
+		override fun onAnimationEnd(animation: Animator) {
+			super.onAnimationEnd(animation)
+			if (!isCancelled && animation === this@BubbleAnimator.animator) {
+				bubble.isInvisible = true
+				isHiding = false
+				this@BubbleAnimator.animator = null
+			}
+		}
+	}
+}

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

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.base.ui.list.fastscroll
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.ViewGroup
+import androidx.annotation.AttrRes
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.R
+
+class FastScrollRecyclerView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = androidx.recyclerview.R.attr.recyclerViewStyle,
+) : RecyclerView(context, attrs, defStyleAttr) {
+
+	val fastScroller = FastScroller(context, attrs)
+
+	init {
+		fastScroller.id = R.id.fast_scroller
+		fastScroller.layoutParams = ViewGroup.LayoutParams(
+			ViewGroup.LayoutParams.WRAP_CONTENT,
+			ViewGroup.LayoutParams.MATCH_PARENT,
+		)
+	}
+
+	override fun setAdapter(adapter: Adapter<*>?) {
+		super.setAdapter(adapter)
+		fastScroller.setSectionIndexer(adapter as? FastScroller.SectionIndexer)
+	}
+
+	override fun setVisibility(visibility: Int) {
+		super.setVisibility(visibility)
+		fastScroller.visibility = visibility
+	}
+
+	override fun onAttachedToWindow() {
+		super.onAttachedToWindow()
+		fastScroller.attachRecyclerView(this)
+	}
+
+	override fun onDetachedFromWindow() {
+		fastScroller.detachRecyclerView()
+		super.onDetachedFromWindow()
+	}
+}

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

@@ -0,0 +1,521 @@
+package org.koitharu.kotatsu.base.ui.list.fastscroll
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.ViewGroup
+import android.widget.*
+import androidx.annotation.*
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.content.ContextCompat
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.GravityCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.FastScrollerBinding
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.isLayoutReversed
+import kotlin.math.roundToInt
+import com.google.android.material.R as materialR
+
+private const val SCROLLBAR_HIDE_DELAY = 1000L
+private const val TRACK_SNAP_RANGE = 5
+
+@Suppress("MemberVisibilityCanBePrivate", "unused")
+class FastScroller @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = R.attr.fastScrollerStyle,
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+	enum class BubbleSize(@DrawableRes val drawableId: Int, @DimenRes val textSizeId: Int) {
+		NORMAL(R.drawable.fastscroll_bubble, R.dimen.fastscroll_bubble_text_size),
+		SMALL(R.drawable.fastscroll_bubble_small, R.dimen.fastscroll_bubble_text_size_small)
+	}
+
+	private val binding = FastScrollerBinding.inflate(LayoutInflater.from(context), this)
+
+	private val scrollbarPaddingEnd = context.resources.getDimension(R.dimen.fastscroll_scrollbar_padding_end)
+
+	@ColorInt
+	private var bubbleColor = 0
+
+	@ColorInt
+	private var handleColor = 0
+
+	private var bubbleHeight = 0
+	private var handleHeight = 0
+	private var viewHeight = 0
+	private var hideScrollbar = true
+	private var showBubble = true
+	private var showBubbleAlways = false
+	private var bubbleSize = BubbleSize.NORMAL
+	private var bubbleImage: Drawable? = null
+	private var handleImage: Drawable? = null
+	private var trackImage: Drawable? = null
+	private var recyclerView: RecyclerView? = null
+	private val scrollbarAnimator = ScrollbarAnimator(binding.scrollbar, scrollbarPaddingEnd)
+	private val bubbleAnimator = BubbleAnimator(binding.bubble)
+
+	private var fastScrollListener: FastScrollListener? = null
+	private var sectionIndexer: SectionIndexer? = null
+
+	private val scrollbarHider = Runnable {
+		hideBubble()
+		hideScrollbar()
+	}
+
+	private val scrollListener: RecyclerView.OnScrollListener = object : RecyclerView.OnScrollListener() {
+		override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+			if (!binding.thumb.isSelected && isEnabled) {
+				val y = recyclerView.scrollProportion
+				setViewPositions(y)
+
+				if (showBubbleAlways) {
+					val targetPos = getRecyclerViewTargetPosition(y)
+					sectionIndexer?.let { binding.bubble.text = it.getSectionText(recyclerView.context, targetPos) }
+				}
+			}
+		}
+
+		override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+			super.onScrollStateChanged(recyclerView, newState)
+
+			if (isEnabled) {
+				when (newState) {
+					RecyclerView.SCROLL_STATE_DRAGGING -> {
+						handler.removeCallbacks(scrollbarHider)
+						showScrollbar()
+						if (showBubbleAlways && sectionIndexer != null) showBubble()
+					}
+					RecyclerView.SCROLL_STATE_IDLE -> if (hideScrollbar && !binding.thumb.isSelected) {
+						handler.postDelayed(scrollbarHider, SCROLLBAR_HIDE_DELAY)
+					}
+				}
+			}
+		}
+	}
+
+	private val RecyclerView.scrollProportion: Float
+		get() {
+			val rangeDiff = computeVerticalScrollRange() - computeVerticalScrollExtent()
+			val proportion = computeVerticalScrollOffset() / if (rangeDiff > 0) rangeDiff.toFloat() else 1f
+			return viewHeight * proportion
+		}
+
+	init {
+		clipChildren = false
+		orientation = HORIZONTAL
+
+		@ColorInt var bubbleColor = context.getThemeColor(materialR.attr.colorControlNormal, Color.DKGRAY)
+		@ColorInt var handleColor = bubbleColor
+		@ColorInt var trackColor = context.getThemeColor(materialR.attr.colorOutline, Color.LTGRAY)
+		@ColorInt var textColor = context.getThemeColor(android.R.attr.textColorPrimaryInverse, Color.WHITE)
+
+		var showTrack = false
+
+		context.withStyledAttributes(attrs, R.styleable.FastScroller, defStyleAttr) {
+			bubbleColor = getColor(R.styleable.FastScroller_bubbleColor, bubbleColor)
+			handleColor = getColor(R.styleable.FastScroller_thumbColor, handleColor)
+			trackColor = getColor(R.styleable.FastScroller_trackColor, trackColor)
+			textColor = getColor(R.styleable.FastScroller_bubbleTextColor, textColor)
+			hideScrollbar = getBoolean(R.styleable.FastScroller_hideScrollbar, hideScrollbar)
+			showBubble = getBoolean(R.styleable.FastScroller_showBubble, showBubble)
+			showBubbleAlways = getBoolean(R.styleable.FastScroller_showBubbleAlways, showBubbleAlways)
+			showTrack = getBoolean(R.styleable.FastScroller_showTrack, showTrack)
+			bubbleSize = getBubbleSize(R.styleable.FastScroller_bubbleSize, BubbleSize.NORMAL)
+			val textSize = getDimension(R.styleable.FastScroller_bubbleTextSize, bubbleSize.textSize)
+			binding.bubble.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
+		}
+
+		setTrackColor(trackColor)
+		setHandleColor(handleColor)
+		setBubbleColor(bubbleColor)
+		setBubbleTextColor(textColor)
+		setHideScrollbar(hideScrollbar)
+		setBubbleVisible(showBubble, showBubbleAlways)
+		setTrackVisible(showTrack)
+	}
+
+	override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) {
+		super.onSizeChanged(w, h, oldW, oldH)
+		viewHeight = h
+	}
+
+	@SuppressLint("ClickableViewAccessibility")
+	override fun onTouchEvent(event: MotionEvent): Boolean {
+		val setYPositions: () -> Unit = {
+			val y = event.y
+			setViewPositions(y)
+			setRecyclerViewPosition(y)
+		}
+
+		when (event.actionMasked) {
+			MotionEvent.ACTION_DOWN -> {
+				if (event.x.toInt() !in binding.scrollbar.left..binding.scrollbar.right) return false
+
+				requestDisallowInterceptTouchEvent(true)
+				setHandleSelected(true)
+
+				handler.removeCallbacks(scrollbarHider)
+				showScrollbar()
+				if (showBubble && sectionIndexer != null) showBubble()
+
+				fastScrollListener?.onFastScrollStart(this)
+
+				setYPositions()
+				return true
+			}
+			MotionEvent.ACTION_MOVE -> {
+				setYPositions()
+				return true
+			}
+			MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+				requestDisallowInterceptTouchEvent(false)
+				setHandleSelected(false)
+
+				if (hideScrollbar) handler.postDelayed(scrollbarHider, SCROLLBAR_HIDE_DELAY)
+				if (!showBubbleAlways) hideBubble()
+
+				fastScrollListener?.onFastScrollStop(this)
+
+				return true
+			}
+		}
+
+		return super.onTouchEvent(event)
+	}
+
+	/**
+	 * Set the enabled state of this view.
+	 *
+	 * @param enabled True if this view is enabled, false otherwise
+	 */
+	override fun setEnabled(enabled: Boolean) {
+		super.setEnabled(enabled)
+		isVisible = enabled
+	}
+
+	/**
+	 * Set the [ViewGroup.LayoutParams] associated with this view. These supply
+	 * parameters to the *parent* of this view specifying how it should be arranged.
+	 *
+	 * @param params The [ViewGroup.LayoutParams] for this view, cannot be null
+	 */
+	override fun setLayoutParams(params: ViewGroup.LayoutParams) {
+		params.width = LayoutParams.WRAP_CONTENT
+		super.setLayoutParams(params)
+	}
+
+	/**
+	 * Set the [ViewGroup.LayoutParams] associated with this view. These supply
+	 * parameters to the *parent* of this view specifying how it should be arranged.
+	 *
+	 * @param viewGroup The parent [ViewGroup] for this view, cannot be null
+	 */
+	fun setLayoutParams(viewGroup: ViewGroup) {
+		val recyclerViewId = recyclerView?.id ?: NO_ID
+		val marginTop = resources.getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_top)
+		val marginBottom = resources.getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_bottom)
+
+		require(recyclerViewId != NO_ID) { "RecyclerView must have a view ID" }
+
+		when (viewGroup) {
+			is ConstraintLayout -> {
+				val endId = if (recyclerView?.parent === parent) recyclerViewId else ConstraintSet.PARENT_ID
+				val startId = id
+
+				ConstraintSet().apply {
+					clone(viewGroup)
+					connect(startId, ConstraintSet.TOP, endId, ConstraintSet.TOP)
+					connect(startId, ConstraintSet.BOTTOM, endId, ConstraintSet.BOTTOM)
+					connect(startId, ConstraintSet.END, endId, ConstraintSet.END)
+					applyTo(viewGroup)
+				}
+
+				layoutParams = (layoutParams as ConstraintLayout.LayoutParams).apply {
+					height = 0
+					setMargins(0, marginTop, 0, marginBottom)
+				}
+			}
+			is CoordinatorLayout -> layoutParams = (layoutParams as CoordinatorLayout.LayoutParams).apply {
+				height = LayoutParams.MATCH_PARENT
+				anchorGravity = GravityCompat.END
+				anchorId = recyclerViewId
+				setMargins(0, marginTop, 0, marginBottom)
+			}
+			is FrameLayout -> layoutParams = (layoutParams as FrameLayout.LayoutParams).apply {
+				height = LayoutParams.MATCH_PARENT
+				gravity = GravityCompat.END
+				setMargins(0, marginTop, 0, marginBottom)
+			}
+			is RelativeLayout -> layoutParams = (layoutParams as RelativeLayout.LayoutParams).apply {
+				height = 0
+				addRule(RelativeLayout.ALIGN_TOP, recyclerViewId)
+				addRule(RelativeLayout.ALIGN_BOTTOM, recyclerViewId)
+				addRule(RelativeLayout.ALIGN_END, recyclerViewId)
+				setMargins(0, marginTop, 0, marginBottom)
+			}
+			else -> throw IllegalArgumentException("Parent ViewGroup must be a ConstraintLayout, CoordinatorLayout, FrameLayout, or RelativeLayout")
+		}
+
+		updateViewHeights()
+	}
+
+	/**
+	 * Set the [RecyclerView] associated with this [FastScroller]. This allows the
+	 * FastScroller to set its layout parameters and listen for scroll changes.
+	 *
+	 * @param recyclerView The [RecyclerView] to attach, cannot be null
+	 * @see detachRecyclerView
+	 */
+	fun attachRecyclerView(recyclerView: RecyclerView) {
+		if (this.recyclerView != null) {
+			detachRecyclerView()
+		}
+		this.recyclerView = recyclerView
+
+		if (parent is ViewGroup) {
+			setLayoutParams(parent as ViewGroup)
+		} else if (recyclerView.parent is ViewGroup) {
+			val viewGroup = recyclerView.parent as ViewGroup
+			viewGroup.addView(this)
+			setLayoutParams(viewGroup)
+		}
+
+		recyclerView.addOnScrollListener(scrollListener)
+
+		// set initial positions for bubble and thumb
+		post { setViewPositions(this.recyclerView?.scrollProportion ?: 0f) }
+	}
+
+	/**
+	 * Clears references to the attached [RecyclerView] and stops listening for scroll changes.
+	 *
+	 * @see attachRecyclerView
+	 */
+	fun detachRecyclerView() {
+		recyclerView?.removeOnScrollListener(scrollListener)
+		recyclerView = null
+	}
+
+	/**
+	 * Set a new [FastScrollListener] that will listen to fast scroll events.
+	 *
+	 * @param fastScrollListener The new [FastScrollListener] to set, or null to set none
+	 */
+	fun setFastScrollListener(fastScrollListener: FastScrollListener?) {
+		this.fastScrollListener = fastScrollListener
+	}
+
+	/**
+	 * Set a new [SectionIndexer] that provides section text for this [FastScroller].
+	 *
+	 * @param sectionIndexer The new [SectionIndexer] to set, or null to set none
+	 */
+	fun setSectionIndexer(sectionIndexer: SectionIndexer?) {
+		this.sectionIndexer = sectionIndexer
+	}
+
+	/**
+	 * Hide the scrollbar when not scrolling.
+	 *
+	 * @param hideScrollbar True to hide the scrollbar, false to show
+	 */
+	fun setHideScrollbar(hideScrollbar: Boolean) {
+		if (this.hideScrollbar != hideScrollbar) {
+			this.hideScrollbar = hideScrollbar
+			binding.scrollbar.isGone = hideScrollbar
+		}
+	}
+
+	/**
+	 * Show the scroll track while scrolling.
+	 *
+	 * @param visible True to show scroll track, false to hide
+	 */
+	fun setTrackVisible(visible: Boolean) {
+		binding.track.isVisible = visible
+	}
+
+	/**
+	 * Set the color of the scroll track.
+	 *
+	 * @param color The color for the scroll track
+	 */
+	fun setTrackColor(@ColorInt color: Int) {
+		if (trackImage == null) {
+			trackImage = ContextCompat.getDrawable(context, R.drawable.fastscroll_track)
+		}
+
+		trackImage?.let {
+			it.setTint(color)
+			binding.track.setImageDrawable(it)
+		}
+	}
+
+	/**
+	 * Set the color of the scroll thumb.
+	 *
+	 * @param color The color for the scroll thumb
+	 */
+	fun setHandleColor(@ColorInt color: Int) {
+		handleColor = color
+
+		if (handleImage == null) {
+			handleImage = ContextCompat.getDrawable(context, R.drawable.fastscroll_handle)
+		}
+
+		handleImage?.let {
+			it.setTint(handleColor)
+			binding.thumb.setImageDrawable(it)
+		}
+	}
+
+	/**
+	 * Show the section bubble while scrolling.
+	 *
+	 * @param visible True to show the bubble, false to hide
+	 * @param always  True to always show the bubble, false to only show on thumb touch
+	 */
+	@JvmOverloads
+	fun setBubbleVisible(visible: Boolean, always: Boolean = false) {
+		showBubble = visible
+		showBubbleAlways = visible && always
+	}
+
+	/**
+	 * Set the background color of the section bubble.
+	 *
+	 * @param color The background color for the section bubble
+	 */
+	fun setBubbleColor(@ColorInt color: Int) {
+		bubbleColor = color
+
+		if (bubbleImage == null) {
+			bubbleImage = ContextCompat.getDrawable(context, bubbleSize.drawableId)
+		}
+
+		bubbleImage?.let {
+			it.setTint(bubbleColor)
+			binding.bubble.background = it
+		}
+	}
+
+	/**
+	 * Set the text color of the section bubble.
+	 *
+	 * @param color The text color for the section bubble
+	 */
+	fun setBubbleTextColor(@ColorInt color: Int) = binding.bubble.setTextColor(color)
+
+	/**
+	 * Set the scaled pixel text size of the section bubble.
+	 *
+	 * @param size The scaled pixel text size for the section bubble
+	 */
+	fun setBubbleTextSize(size: Int) {
+		binding.bubble.textSize = size.toFloat()
+	}
+
+	private fun getRecyclerViewTargetPosition(y: Float) = recyclerView?.let { recyclerView ->
+		val itemCount = recyclerView.adapter?.itemCount ?: 0
+
+		val proportion = when {
+			binding.thumb.y == 0f -> 0f
+			binding.thumb.y + handleHeight >= viewHeight - TRACK_SNAP_RANGE -> 1f
+			else -> y / viewHeight.toFloat()
+		}
+
+		var scrolledItemCount = (proportion * itemCount).roundToInt()
+
+		if (recyclerView.layoutManager.isLayoutReversed) {
+			scrolledItemCount = itemCount - scrolledItemCount
+		}
+
+		if (itemCount > 0) scrolledItemCount.coerceIn(0, itemCount - 1) else 0
+	} ?: 0
+
+	private fun setRecyclerViewPosition(y: Float) {
+		val layoutManager = recyclerView?.layoutManager ?: return
+		val targetPos = getRecyclerViewTargetPosition(y)
+		layoutManager.scrollToPosition(targetPos)
+		if (showBubble) sectionIndexer?.let { binding.bubble.text = it.getSectionText(context, targetPos) }
+	}
+
+	private fun setViewPositions(y: Float) {
+		bubbleHeight = binding.bubble.measuredHeight
+		handleHeight = binding.thumb.measuredHeight
+
+		val bubbleHandleHeight = bubbleHeight + handleHeight / 2f
+
+		if (showBubble && viewHeight >= bubbleHandleHeight) {
+			binding.bubble.y = (y - bubbleHeight).coerceIn(0f, viewHeight - bubbleHandleHeight)
+		}
+
+		if (viewHeight >= handleHeight) {
+			binding.thumb.y = (y - handleHeight / 2).coerceIn(0f, viewHeight - handleHeight.toFloat())
+		}
+	}
+
+	private fun updateViewHeights() {
+		val measureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED)
+		binding.bubble.measure(measureSpec, measureSpec)
+		bubbleHeight = binding.bubble.measuredHeight
+		binding.thumb.measure(measureSpec, measureSpec)
+		handleHeight = binding.thumb.measuredHeight
+	}
+
+	private fun showBubble() {
+		bubbleAnimator.show()
+	}
+
+	private fun hideBubble() {
+		bubbleAnimator.hide()
+	}
+
+	private fun showScrollbar() {
+		if (recyclerView?.run { canScrollVertically(1) || canScrollVertically(-1) } == true) {
+			scrollbarAnimator.show()
+		}
+	}
+
+	private fun hideScrollbar() {
+		scrollbarAnimator.hide()
+	}
+
+	private fun setHandleSelected(selected: Boolean) {
+		binding.thumb.isSelected = selected
+		handleImage?.setTint(if (selected) bubbleColor else handleColor)
+	}
+
+	private fun TypedArray.getBubbleSize(@StyleableRes index: Int, defaultValue: BubbleSize): BubbleSize {
+		val ordinal = getInt(index, -1)
+		return BubbleSize.values().getOrNull(ordinal) ?: defaultValue
+	}
+
+	private val BubbleSize.textSize
+		@Px get() = resources.getDimension(textSizeId)
+
+	interface FastScrollListener {
+
+		fun onFastScrollStart(fastScroller: FastScroller)
+
+		fun onFastScrollStop(fastScroller: FastScroller)
+	}
+
+	interface SectionIndexer {
+
+		fun getSectionText(context: Context, position: Int): CharSequence
+	}
+}

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

@@ -0,0 +1,73 @@
+package org.koitharu.kotatsu.base.ui.list.fastscroll
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.view.View
+import android.view.ViewPropertyAnimator
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.ext.animatorDurationScale
+
+class ScrollbarAnimator(
+	private val scrollbar: View,
+	private val scrollbarPaddingEnd: Float,
+) {
+
+	private val animationDuration = (
+		scrollbar.resources.getInteger(R.integer.config_defaultAnimTime) *
+			scrollbar.context.animatorDurationScale
+		).toLong()
+	private var animator: ViewPropertyAnimator? = null
+	private var isHiding = false
+
+	fun show() {
+		if (scrollbar.isVisible && !isHiding) {
+			return
+		}
+		isHiding = false
+		animator?.cancel()
+		scrollbar.translationX = scrollbarPaddingEnd
+		scrollbar.isVisible = true
+		animator = scrollbar
+			.animate()
+			.translationX(0f)
+			.alpha(1f)
+			.setDuration(animationDuration)
+	}
+
+	fun hide() {
+		if (!scrollbar.isVisible || isHiding) {
+			return
+		}
+		animator?.cancel()
+		isHiding = true
+		animator = scrollbar.animate().apply {
+			translationX(scrollbarPaddingEnd)
+			alpha(0f)
+			duration = animationDuration
+			setListener(HideListener(this))
+		}
+	}
+
+	private inner class HideListener(
+		private val viewPropertyAnimator: ViewPropertyAnimator,
+	) : AnimatorListenerAdapter() {
+
+		private var isCancelled = false
+
+		override fun onAnimationCancel(animation: Animator) {
+			super.onAnimationCancel(animation)
+			isCancelled = true
+		}
+
+		override fun onAnimationEnd(animation: Animator) {
+			super.onAnimationEnd(animation)
+			if (!isCancelled && this@ScrollbarAnimator.animator === viewPropertyAnimator) {
+				scrollbar.isInvisible = true
+				isHiding = false
+				this@ScrollbarAnimator.animator = null
+			}
+		}
+	}
+}

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

@@ -4,8 +4,11 @@ import android.app.Activity
 import android.app.Application.ActivityLifecycleCallbacks
 import android.os.Bundle
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 
-class ActivityRecreationHandle : ActivityLifecycleCallbacks {
+@Singleton
+class ActivityRecreationHandle @Inject constructor() : ActivityLifecycleCallbacks {
 
 	private val activities = WeakHashMap<Activity, Unit>()
 
@@ -31,4 +34,4 @@ class ActivityRecreationHandle : ActivityLifecycleCallbacks {
 		val snapshot = activities.keys.toList()
 		snapshot.forEach { it.recreate() }
 	}
-}
+}

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

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

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

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

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

@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.animation.ValueAnimator
+import android.view.animation.AccelerateDecelerateInterpolator
+import com.google.android.material.R as materialR
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.shape.MaterialShapeDrawable
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
+
+class StatusBarDimHelper : AppBarLayout.OnOffsetChangedListener {
+
+	private var animator: ValueAnimator? = null
+	private val interpolator = AccelerateDecelerateInterpolator()
+
+	override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
+		val foreground = appBarLayout.statusBarForeground ?: return
+		val start = foreground.alpha
+		val collapsed = verticalOffset != 0
+		val end = if (collapsed) 255 else 0
+		animator?.cancel()
+		if (start == end) {
+			animator = null
+			return
+		}
+		animator = ValueAnimator.ofInt(start, end).apply {
+			duration = appBarLayout.context.getAnimationDuration(materialR.integer.app_bar_elevation_anim_duration)
+			interpolator = this@StatusBarDimHelper.interpolator
+			addUpdateListener {
+				foreground.alpha = it.animatedValue as Int
+			}
+			start()
+		}
+	}
+
+	fun attachToAppBar(appBarLayout: AppBarLayout) {
+		appBarLayout.addOnOffsetChangedListener(this)
+		appBarLayout.statusBarForeground =
+			MaterialShapeDrawable.createWithElevationOverlay(appBarLayout.context).apply {
+				alpha = 0
+			}
+	}
+}

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

@@ -0,0 +1,302 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.animation.LayoutTransition
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowInsets
+import androidx.annotation.AttrRes
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.*
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import com.google.android.material.R as materialR
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import java.util.*
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.LayoutSheetHeaderBinding
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
+import org.koitharu.kotatsu.utils.ext.getThemeDrawable
+import org.koitharu.kotatsu.utils.ext.parents
+
+private const val THROTTLE_DELAY = 200L
+
+class BottomSheetHeaderBar @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = materialR.attr.appBarLayoutStyle,
+) : AppBarLayout(context, attrs, defStyleAttr), MenuHost {
+
+	private val binding = LayoutSheetHeaderBinding.inflate(LayoutInflater.from(context), this)
+	private val closeDrawable = context.getThemeDrawable(materialR.attr.actionModeCloseDrawable)
+	private val bottomSheetCallback = Callback()
+	private val adjustStateRunnable = Runnable { adjustState() }
+	private var bottomSheetBehavior: BottomSheetBehavior<*>? = null
+	private val locationBuffer = IntArray(2)
+	private val expansionListeners = LinkedList<OnExpansionChangeListener>()
+	private var fitStatusBar = false
+	private val minHandleHeight = context.resources.getDimensionPixelSize(R.dimen.bottom_sheet_handle_size_min)
+	private val maxHandleHeight = context.resources.getDimensionPixelSize(R.dimen.bottom_sheet_handle_size_max)
+	private var isLayoutSuppressedCompat = false
+	private var isLayoutCalledWhileSuppressed = false
+	private var isBsExpanded = false
+	private var stateAdjustedAt = 0L
+
+	@Deprecated("")
+	val toolbar: MaterialToolbar
+		get() = binding.toolbar
+
+	var title: CharSequence?
+		get() = binding.toolbar.title
+		set(value) {
+			binding.toolbar.title = value
+		}
+
+	var subtitle: CharSequence?
+		get() = binding.toolbar.subtitle
+		set(value) {
+			binding.toolbar.subtitle = value
+		}
+
+	init {
+		setBackgroundResource(R.drawable.sheet_toolbar_background)
+		layoutTransition = LayoutTransition().apply {
+			setDuration(context.getAnimationDuration(R.integer.config_tinyAnimTime))
+		}
+		context.withStyledAttributes(attrs, R.styleable.BottomSheetHeaderBar, defStyleAttr) {
+			binding.toolbar.title = getString(R.styleable.BottomSheetHeaderBar_title)
+			fitStatusBar = getBoolean(R.styleable.BottomSheetHeaderBar_fitStatusBar, fitStatusBar)
+			val menuResId = getResourceId(R.styleable.BottomSheetHeaderBar_menu, 0)
+			if (menuResId != 0) {
+				binding.toolbar.inflateMenu(menuResId)
+			}
+		}
+		binding.toolbar.setNavigationOnClickListener(bottomSheetCallback)
+	}
+
+	override fun onAttachedToWindow() {
+		super.onAttachedToWindow()
+		setBottomSheetBehavior(findParentBottomSheetBehavior())
+	}
+
+	override fun onDetachedFromWindow() {
+		setBottomSheetBehavior(null)
+		super.onDetachedFromWindow()
+	}
+
+	override fun addView(child: View?, index: Int) {
+		if (shouldAddView(child)) {
+			super.addView(child, index)
+		} else {
+			binding.toolbar.addView(child, index)
+		}
+	}
+
+	override fun addView(child: View?, width: Int, height: Int) {
+		if (shouldAddView(child)) {
+			super.addView(child, width, height)
+		} else {
+			binding.toolbar.addView(child, width, height)
+		}
+	}
+
+	override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
+		if (shouldAddView(child)) {
+			super.addView(child, index, params)
+		} else {
+			binding.toolbar.addView(child, index, convertLayoutParams(params))
+		}
+	}
+
+	override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets {
+		dispatchInsets(if (insets != null) WindowInsetsCompat.toWindowInsetsCompat(insets) else null)
+		return super.onApplyWindowInsets(insets)
+	}
+
+	override fun addMenuProvider(provider: MenuProvider) {
+		binding.toolbar.addMenuProvider(provider)
+	}
+
+	override fun addMenuProvider(provider: MenuProvider, owner: LifecycleOwner) {
+		binding.toolbar.addMenuProvider(provider, owner)
+	}
+
+	override fun addMenuProvider(provider: MenuProvider, owner: LifecycleOwner, state: Lifecycle.State) {
+		binding.toolbar.addMenuProvider(provider, owner, state)
+	}
+
+	override fun removeMenuProvider(provider: MenuProvider) {
+		binding.toolbar.removeMenuProvider(provider)
+	}
+
+	override fun invalidateMenu() {
+		binding.toolbar.invalidateMenu()
+	}
+
+	fun setNavigationOnClickListener(onClickListener: OnClickListener) {
+		binding.toolbar.setNavigationOnClickListener(onClickListener)
+	}
+
+	fun addOnExpansionChangeListener(listener: OnExpansionChangeListener) {
+		expansionListeners.add(listener)
+	}
+
+	fun removeOnExpansionChangeListener(listener: OnExpansionChangeListener) {
+		expansionListeners.remove(listener)
+	}
+
+	fun setTitle(@StringRes resId: Int) {
+		binding.toolbar.setTitle(resId)
+	}
+
+	fun setSubtitle(@StringRes resId: Int) {
+		binding.toolbar.setSubtitle(resId)
+	}
+
+	override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+		if (isLayoutSuppressedCompat) {
+			isLayoutCalledWhileSuppressed = true
+		} else {
+			super.onLayout(changed, l, t, r, b)
+		}
+	}
+
+	private fun setBottomSheetBehavior(behavior: BottomSheetBehavior<*>?) {
+		bottomSheetBehavior?.removeBottomSheetCallback(bottomSheetCallback)
+		bottomSheetBehavior = behavior
+		if (behavior != null) {
+			onBottomSheetStateChanged(behavior.state)
+			behavior.addBottomSheetCallback(bottomSheetCallback)
+		}
+	}
+
+	private fun onBottomSheetStateChanged(newState: Int) {
+		val expanded = newState == BottomSheetBehavior.STATE_EXPANDED && isOnTopOfScreen()
+		if (isBsExpanded != expanded) {
+			isBsExpanded = expanded
+			postAdjustState()
+		}
+	}
+
+	private fun suppressLayoutCompat(suppress: Boolean) {
+		if (suppress == isLayoutSuppressedCompat) return
+		isLayoutSuppressedCompat = suppress
+		if (!suppress && isLayoutCalledWhileSuppressed) {
+			requestLayout()
+		}
+		isLayoutCalledWhileSuppressed = false
+	}
+
+	private fun dispatchInsets(insets: WindowInsetsCompat?) {
+		if (!fitStatusBar) {
+			return
+		}
+		val isExpanded = binding.dragHandle.isGone
+		val topInset = insets?.getInsets(WindowInsetsCompat.Type.systemBars())?.top ?: 0
+		if (isExpanded) {
+			updatePadding(top = topInset)
+		} else {
+			updatePadding(top = 0)
+			binding.dragHandle.updateLayoutParams {
+				height = topInset.coerceIn(minHandleHeight, maxHandleHeight)
+			}
+		}
+	}
+
+	private fun findParentBottomSheetBehavior(): BottomSheetBehavior<*>? {
+		for (p in parents) {
+			val layoutParams = (p as? View)?.layoutParams
+			if (layoutParams is CoordinatorLayout.LayoutParams) {
+				val behavior = layoutParams.behavior
+				if (behavior is BottomSheetBehavior<*>) {
+					return behavior
+				}
+			}
+		}
+		return null
+	}
+
+	private fun isOnTopOfScreen(): Boolean {
+		getLocationInWindow(locationBuffer)
+		val topInset = ViewCompat.getRootWindowInsets(this)
+			?.getInsets(WindowInsetsCompat.Type.systemBars())?.top ?: 0
+		val zeroTop = (layoutParams as? MarginLayoutParams)?.topMargin ?: 0
+		return (locationBuffer[1] - topInset) <= zeroTop
+	}
+
+	private fun dismissBottomSheet() {
+		val behavior = bottomSheetBehavior ?: return
+		if (behavior.isHideable) {
+			behavior.state = BottomSheetBehavior.STATE_HIDDEN
+		} else {
+			behavior.state = BottomSheetBehavior.STATE_COLLAPSED
+		}
+	}
+
+	private fun shouldAddView(child: View?): Boolean {
+		if (child == null) {
+			return true
+		}
+		val viewId = child.id
+		return viewId == R.id.dragHandle || viewId == R.id.toolbar
+	}
+
+	private fun convertLayoutParams(params: ViewGroup.LayoutParams?): Toolbar.LayoutParams? {
+		return when (params) {
+			null -> null
+			is MarginLayoutParams -> {
+				val lp = Toolbar.LayoutParams(params)
+				if (params is LayoutParams) {
+					lp.gravity = params.gravity
+				}
+				lp
+			}
+			else -> Toolbar.LayoutParams(params)
+		}
+	}
+
+	private fun postAdjustState() {
+		removeCallbacks(adjustStateRunnable)
+		val now = System.currentTimeMillis()
+		if (stateAdjustedAt + THROTTLE_DELAY < now) {
+			adjustState()
+		} else {
+			postDelayed(adjustStateRunnable, THROTTLE_DELAY)
+		}
+	}
+
+	private fun adjustState() {
+		suppressLayoutCompat(true)
+		binding.toolbar.navigationIcon = (if (isBsExpanded) closeDrawable else null)
+		binding.dragHandle.isGone = isBsExpanded
+		expansionListeners.forEach { it.onExpansionStateChanged(this, isBsExpanded) }
+		dispatchInsets(ViewCompat.getRootWindowInsets(this))
+		stateAdjustedAt = System.currentTimeMillis()
+		suppressLayoutCompat(false)
+	}
+
+	private inner class Callback : BottomSheetBehavior.BottomSheetCallback(), View.OnClickListener {
+
+		override fun onStateChanged(bottomSheet: View, newState: Int) {
+			onBottomSheetStateChanged(newState)
+		}
+
+		override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
+
+		override fun onClick(v: View?) {
+			dismissBottomSheet()
+		}
+	}
+
+	fun interface OnExpansionChangeListener {
+
+		fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean)
+	}
+}

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

@@ -8,23 +8,33 @@ import android.widget.LinearLayout
 import androidx.annotation.AttrRes
 import androidx.annotation.IdRes
 import androidx.core.view.children
+import com.google.android.material.R as materialR
 import com.google.android.material.button.MaterialButton
+import com.google.android.material.shape.ShapeAppearanceModel
 
 class CheckableButtonGroup @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = 0,
-) : LinearLayout(context, attrs, defStyleAttr), View.OnClickListener {
+	@AttrRes defStyleAttr: Int = materialR.attr.materialButtonToggleGroupStyle,
+) : LinearLayout(context, attrs, defStyleAttr, materialR.style.Widget_MaterialComponents_MaterialButtonToggleGroup),
+	View.OnClickListener {
+
+	private val originalCornerData = ArrayList<CornerData>()
 
 	var onCheckedChangeListener: OnCheckedChangeListener? = null
 
 	override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
 		if (child is MaterialButton) {
-			child.setOnClickListener(this)
+			setupButton(child)
 		}
 		super.addView(child, index, params)
 	}
 
+	override fun onFinishInflate() {
+		super.onFinishInflate()
+		updateChildShapes()
+	}
+
 	override fun onClick(v: View) {
 		setCheckedId(v.id)
 	}
@@ -36,7 +46,74 @@ class CheckableButtonGroup @JvmOverloads constructor(
 		onCheckedChangeListener?.onCheckedChanged(this, viewRes)
 	}
 
+	private fun updateChildShapes() {
+		val childCount = childCount
+		val firstVisibleChildIndex = 0
+		val lastVisibleChildIndex = childCount - 1
+		for (i in 0 until childCount) {
+			val button: MaterialButton = getChildAt(i) as? MaterialButton ?: continue
+			if (button.visibility == GONE) {
+				continue
+			}
+			val builder = button.shapeAppearanceModel.toBuilder()
+			val newCornerData: CornerData? =
+				getNewCornerData(i, firstVisibleChildIndex, lastVisibleChildIndex)
+			updateBuilderWithCornerData(builder, newCornerData)
+			button.shapeAppearanceModel = builder.build()
+		}
+	}
+
+	private fun setupButton(button: MaterialButton) {
+		button.setOnClickListener(this)
+		button.isElegantTextHeight = false
+		// Saves original corner data
+		val shapeAppearanceModel: ShapeAppearanceModel = button.shapeAppearanceModel
+		originalCornerData.add(
+			CornerData(
+				shapeAppearanceModel.topLeftCornerSize,
+				shapeAppearanceModel.bottomLeftCornerSize,
+				shapeAppearanceModel.topRightCornerSize,
+				shapeAppearanceModel.bottomRightCornerSize,
+			),
+		)
+	}
+
+	private fun getNewCornerData(
+		index: Int,
+		firstVisibleChildIndex: Int,
+		lastVisibleChildIndex: Int,
+	): CornerData? {
+		val cornerData: CornerData = originalCornerData.get(index)
+
+		// If only one (visible) child exists, use its original corners
+		if (firstVisibleChildIndex == lastVisibleChildIndex) {
+			return cornerData
+		}
+		val isHorizontal = orientation == HORIZONTAL
+		if (index == firstVisibleChildIndex) {
+			return if (isHorizontal) cornerData.start(this) else cornerData.top()
+		}
+		return if (index == lastVisibleChildIndex) {
+			if (isHorizontal) cornerData.end(this) else cornerData.bottom()
+		} else null
+	}
+
+	private fun updateBuilderWithCornerData(
+		shapeAppearanceModelBuilder: ShapeAppearanceModel.Builder,
+		cornerData: CornerData?,
+	) {
+		if (cornerData == null) {
+			shapeAppearanceModelBuilder.setAllCornerSizes(0f)
+			return
+		}
+		shapeAppearanceModelBuilder
+			.setTopLeftCornerSize(cornerData.topLeft)
+			.setBottomLeftCornerSize(cornerData.bottomLeft)
+			.setTopRightCornerSize(cornerData.topRight)
+			.setBottomRightCornerSize(cornerData.bottomRight)
+	}
+
 	fun interface OnCheckedChangeListener {
 		fun onCheckedChanged(group: CheckableButtonGroup, checkedId: Int)
 	}
-}
+}

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

@@ -10,6 +10,7 @@ import android.widget.Checkable
 import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.os.ParcelCompat
+import androidx.customview.view.AbsSavedState
 
 class CheckableImageView @JvmOverloads constructor(
 	context: Context,
@@ -73,7 +74,7 @@ class CheckableImageView @JvmOverloads constructor(
 		fun onCheckedChanged(view: CheckableImageView, isChecked: Boolean)
 	}
 
-	private class SavedState : BaseSavedState {
+	private class SavedState : AbsSavedState {
 
 		val isChecked: Boolean
 
@@ -81,7 +82,7 @@ class CheckableImageView @JvmOverloads constructor(
 			isChecked = checked
 		}
 
-		constructor(source: Parcel) : super(source) {
+		constructor(source: Parcel, classLoader: ClassLoader?) : super(source, classLoader) {
 			isChecked = ParcelCompat.readBoolean(source)
 		}
 
@@ -91,9 +92,10 @@ class CheckableImageView @JvmOverloads constructor(
 		}
 
 		companion object {
+			@Suppress("unused")
 			@JvmField
 			val CREATOR: Creator<SavedState> = object : Creator<SavedState> {
-				override fun createFromParcel(`in`: Parcel) = SavedState(`in`)
+				override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader)
 
 				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
 			}

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

@@ -5,23 +5,26 @@ import android.util.AttributeSet
 import android.view.View.OnClickListener
 import androidx.annotation.DrawableRes
 import androidx.core.view.children
+import com.google.android.material.R as materialR
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.ext.castOrNull
+import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
 
 class ChipsView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle
+	defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle,
 ) : ChipGroup(context, attrs, defStyleAttr) {
 
 	private var isLayoutSuppressedCompat = false
 	private var isLayoutCalledOnSuppressed = false
-	private var chipOnClickListener = OnClickListener {
+	private val chipOnClickListener = OnClickListener {
 		onChipClickListener?.onChipClick(it as Chip, it.tag)
 	}
-	private var chipOnCloseListener = OnClickListener {
+	private val chipOnCloseListener = OnClickListener {
 		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
 	}
 	var onChipClickListener: OnChipClickListener? = null
@@ -60,15 +63,27 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}
 
+	fun <T> getCheckedData(cls: Class<T>): Set<T> {
+		val result = LinkedHashSet<T>(childCount)
+		for (child in children) {
+			if (child is Chip && child.isChecked) {
+				result += cls.castOrNull(child.tag) ?: continue
+			}
+		}
+		return result
+	}
+
 	private fun bindChip(chip: Chip, model: ChipModel) {
 		chip.text = model.title
 		if (model.icon == 0) {
 			chip.isChipIconVisible = false
 		} else {
-			chip.isCheckedIconVisible = true
+			chip.isChipIconVisible = true
 			chip.setChipIconResource(model.icon)
 		}
-		chip.isClickable = onChipClickListener != null
+		chip.isClickable = onChipClickListener != null || model.isCheckable
+		chip.isCheckable = model.isCheckable
+		chip.isChecked = model.isChecked
 		chip.tag = model.data
 	}
 
@@ -76,11 +91,13 @@ class ChipsView @JvmOverloads constructor(
 		val chip = Chip(context)
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
 		chip.setChipDrawable(drawable)
+		chip.isCheckedIconVisible = true
+		chip.setCheckedIconResource(R.drawable.ic_check)
+		chip.checkedIconTint = context.getThemeColorStateList(materialR.attr.colorControlNormal)
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
-		chip.isCheckable = false
 		addView(chip)
 		return chip
 	}
@@ -98,7 +115,9 @@ class ChipsView @JvmOverloads constructor(
 	class ChipModel(
 		@DrawableRes val icon: Int,
 		val title: CharSequence,
-		val data: Any? = null
+		val isCheckable: Boolean,
+		val isChecked: Boolean,
+		val data: Any? = null,
 	) {
 
 		override fun equals(other: Any?): Boolean {
@@ -109,6 +128,8 @@ class ChipsView @JvmOverloads constructor(
 
 			if (icon != other.icon) return false
 			if (title != other.title) return false
+			if (isCheckable != other.isCheckable) return false
+			if (isChecked != other.isChecked) return false
 			if (data != other.data) return false
 
 			return true
@@ -117,7 +138,9 @@ class ChipsView @JvmOverloads constructor(
 		override fun hashCode(): Int {
 			var result = icon
 			result = 31 * result + title.hashCode()
-			result = 31 * result + data.hashCode()
+			result = 31 * result + isCheckable.hashCode()
+			result = 31 * result + isChecked.hashCode()
+			result = 31 * result + (data?.hashCode() ?: 0)
 			return result
 		}
 	}
@@ -131,4 +154,4 @@ class ChipsView @JvmOverloads constructor(
 
 		fun onChipCloseClick(chip: Chip, data: Any?)
 	}
-}
+}

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

@@ -0,0 +1,47 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.view.View
+import androidx.core.view.ViewCompat
+import com.google.android.material.shape.AbsoluteCornerSize
+import com.google.android.material.shape.CornerSize
+
+class CornerData(
+	var topLeft: CornerSize,
+	var bottomLeft: CornerSize,
+	var topRight: CornerSize,
+	var bottomRight: CornerSize,
+) {
+
+	fun start(view: View): CornerData {
+		return if (isLayoutRtl(view)) right() else left()
+	}
+
+	fun end(view: View): CornerData {
+		return if (isLayoutRtl(view)) left() else right()
+	}
+
+	fun left(): CornerData {
+		return CornerData(topLeft, bottomLeft, noCorner, noCorner)
+	}
+
+	fun right(): CornerData {
+		return CornerData(noCorner, noCorner, topRight, bottomRight)
+	}
+
+	fun top(): CornerData {
+		return CornerData(topLeft, noCorner, topRight, noCorner)
+	}
+
+	fun bottom(): CornerData {
+		return CornerData(noCorner, bottomLeft, noCorner, bottomRight)
+	}
+
+	private companion object {
+
+		val noCorner: CornerSize = AbsoluteCornerSize(0f)
+
+		fun isLayoutRtl(view: View): Boolean {
+			return ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_RTL
+		}
+	}
+}

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

@@ -1,133 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.drawable.Drawable
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import androidx.annotation.ColorInt
-import androidx.annotation.StringRes
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.view.postDelayed
-import com.google.android.material.color.MaterialColors
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.shape.ShapeAppearanceModel
-import com.google.android.material.snackbar.Snackbar
-import org.koitharu.kotatsu.databinding.FadingSnackbarLayoutBinding
-import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
-import com.google.android.material.R as materialR
-
-private const val ENTER_DURATION = 300L
-private const val EXIT_DURATION = 200L
-private const val SHORT_DURATION_MS = 1_500L
-private const val LONG_DURATION_MS = 2_750L
-
-/**
- * A custom snackbar implementation allowing more control over placement and entry/exit animations.
- *
- * Xtimms: Well, my sufferings over the Snackbar in [DetailsActivity] will go away forever... Thanks, Google.
- *
- * https://github.com/google/iosched/blob/main/mobile/src/main/java/com/google/samples/apps/iosched/widget/FadingSnackbar.kt
- */
-class FadingSnackbar @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	defStyleAttr: Int = 0,
-) : FrameLayout(context, attrs, defStyleAttr) {
-
-	private val binding = FadingSnackbarLayoutBinding.inflate(LayoutInflater.from(context), this)
-
-	init {
-		binding.snackbarLayout.background = createThemedBackground()
-	}
-
-	fun dismiss() {
-		if (visibility == VISIBLE && alpha == 1f) {
-			animate()
-				.alpha(0f)
-				.withEndAction { visibility = GONE }
-				.duration = EXIT_DURATION
-		}
-	}
-
-	fun show(
-		messageText: CharSequence?,
-		@StringRes actionId: Int = 0,
-		duration: Int = Snackbar.LENGTH_SHORT,
-		onActionClick: (FadingSnackbar.() -> Unit)? = null,
-		onDismiss: (() -> Unit)? = null,
-	) {
-		binding.snackbarText.text = messageText
-		if (actionId != 0) {
-			with(binding.snackbarAction) {
-				visibility = VISIBLE
-				text = context.getString(actionId)
-				setOnClickListener {
-					onActionClick?.invoke(this@FadingSnackbar) ?: dismiss()
-				}
-			}
-		} else {
-			binding.snackbarAction.visibility = GONE
-		}
-		alpha = 0f
-		visibility = VISIBLE
-		animate()
-			.alpha(1f)
-			.duration = ENTER_DURATION
-		if (duration == Snackbar.LENGTH_INDEFINITE) {
-			return
-		}
-		val durationMs = ENTER_DURATION + if (duration == Snackbar.LENGTH_LONG) LONG_DURATION_MS else SHORT_DURATION_MS
-		postDelayed(durationMs) {
-			dismiss()
-			onDismiss?.invoke()
-		}
-	}
-
-	private fun createThemedBackground(): Drawable {
-		val backgroundColor = MaterialColors.layer(this, materialR.attr.colorSurface, materialR.attr.colorOnSurface, 1f)
-		val shapeAppearanceModel = ShapeAppearanceModel.builder(
-			context,
-			materialR.style.ShapeAppearance_Material3_Corner_ExtraSmall,
-			0
-		).build()
-		val background = createMaterialShapeDrawableBackground(
-			backgroundColor,
-			shapeAppearanceModel,
-		)
-		val backgroundTint = context.getThemeColorStateList(materialR.attr.colorSurfaceInverse)
-		return if (backgroundTint != null) {
-			val wrappedDrawable = DrawableCompat.wrap(background)
-			DrawableCompat.setTintList(wrappedDrawable, backgroundTint)
-			wrappedDrawable
-		} else {
-			DrawableCompat.wrap(background)
-		}
-	}
-
-	private fun createMaterialShapeDrawableBackground(
-		@ColorInt backgroundColor: Int,
-		shapeAppearanceModel: ShapeAppearanceModel,
-	): MaterialShapeDrawable {
-		val background = MaterialShapeDrawable(shapeAppearanceModel)
-		background.fillColor = ColorStateList.valueOf(backgroundColor)
-		return background
-	}
-}

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

@@ -0,0 +1,101 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.animation.DecelerateInterpolator
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
+import org.koitharu.kotatsu.utils.ext.measureHeight
+
+class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor(
+	context: Context? = null,
+	attrs: AttributeSet? = null,
+) : CoordinatorLayout.Behavior<BottomNavigationView>(context, attrs) {
+
+	@ViewCompat.NestedScrollType
+	private var lastStartedType: Int = 0
+
+	private var offsetAnimator: ValueAnimator? = null
+
+	private var dyRatio = 1F
+
+	override fun layoutDependsOn(parent: CoordinatorLayout, child: BottomNavigationView, dependency: View): Boolean {
+		return dependency is AppBarLayout
+	}
+
+	override fun onDependentViewChanged(
+		parent: CoordinatorLayout,
+		child: BottomNavigationView,
+		dependency: View,
+	): Boolean {
+		val appBarSize = dependency.measureHeight()
+		dyRatio = if (appBarSize > 0) {
+			child.measureHeight().toFloat() / appBarSize
+		} else {
+			1F
+		}
+		return false
+	}
+
+	override fun onStartNestedScroll(
+		coordinatorLayout: CoordinatorLayout,
+		child: BottomNavigationView,
+		directTargetChild: View,
+		target: View,
+		axes: Int,
+		type: Int,
+	): Boolean {
+		if (axes != ViewCompat.SCROLL_AXIS_VERTICAL) {
+			return false
+		}
+		lastStartedType = type
+		offsetAnimator?.cancel()
+		return true
+	}
+
+	override fun onNestedPreScroll(
+		coordinatorLayout: CoordinatorLayout,
+		child: BottomNavigationView,
+		target: View,
+		dx: Int,
+		dy: Int,
+		consumed: IntArray,
+		type: Int,
+	) {
+		super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type)
+		child.translationY = (child.translationY + (dy * dyRatio)).coerceIn(0F, child.height.toFloat())
+	}
+
+	override fun onStopNestedScroll(
+		coordinatorLayout: CoordinatorLayout,
+		child: BottomNavigationView,
+		target: View,
+		type: Int,
+	) {
+		if (lastStartedType == ViewCompat.TYPE_TOUCH || type == ViewCompat.TYPE_NON_TOUCH) {
+			animateBottomNavigationVisibility(child, child.translationY < child.height / 2)
+		}
+	}
+
+	private fun animateBottomNavigationVisibility(child: BottomNavigationView, isVisible: Boolean) {
+		offsetAnimator?.cancel()
+		offsetAnimator = ValueAnimator().apply {
+			interpolator = DecelerateInterpolator()
+			duration = child.context.getAnimationDuration(R.integer.config_shorterAnimTime)
+			addUpdateListener {
+				child.translationY = it.animatedValue as Float
+			}
+		}
+		offsetAnimator?.setFloatValues(
+			child.translationY,
+			if (isVisible) 0F else child.height.toFloat(),
+		)
+		offsetAnimator?.start()
+	}
+}

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

@@ -9,16 +9,17 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.InsetDrawable
 import android.graphics.drawable.RippleDrawable
 import android.graphics.drawable.ShapeDrawable
-import android.graphics.drawable.shapes.RectShape
+import android.graphics.drawable.shapes.RoundRectShape
 import android.util.AttributeSet
 import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatCheckedTextView
+import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
 import com.google.android.material.ripple.RippleUtils
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
+import org.koitharu.kotatsu.utils.ext.resolveDp
 
 @SuppressLint("RestrictedApi")
 class ListItemTextView @JvmOverloads constructor(
@@ -38,10 +39,11 @@ class ListItemTextView @JvmOverloads constructor(
 		context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) {
 			val itemRippleColor = getRippleColor(context)
 			val shape = createShapeDrawable(this)
+			val roundCorners = FloatArray(8) { resources.resolveDp(32f) }
 			background = RippleDrawable(
 				RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
 				shape,
-				ShapeDrawable(RectShape()),
+				ShapeDrawable(RoundRectShape(roundCorners, null, null)),
 			)
 			checkedDrawableStart = getDrawable(R.styleable.ListItemTextView_checkedDrawableStart)
 			checkedDrawableEnd = getDrawable(R.styleable.ListItemTextView_checkedDrawableEnd)
@@ -118,7 +120,7 @@ class ListItemTextView @JvmOverloads constructor(
 	}
 
 	private fun getRippleColor(context: Context): ColorStateList {
-		return context.getThemeColorStateList(android.R.attr.colorControlHighlight)
+		return ContextCompat.getColorStateList(context, R.color.selector_overlay)
 			?: ColorStateList.valueOf(Color.TRANSPARENT)
 	}
-}
+}

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

@@ -0,0 +1,123 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Outline
+import android.graphics.Paint
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewOutlineProvider
+import androidx.annotation.ColorInt
+import androidx.annotation.FloatRange
+import androidx.core.graphics.ColorUtils
+import com.google.android.material.R as materialR
+import kotlin.random.Random
+import org.koitharu.kotatsu.parsers.util.replaceWith
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.resolveDp
+
+class SegmentedBarView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0,
+) : View(context, attrs, defStyleAttr) {
+
+	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+	private val segmentsData = ArrayList<Segment>()
+	private val segmentsSizes = ArrayList<Float>()
+	private val outlineColor = context.getThemeColor(materialR.attr.colorOutline)
+	private var cornerSize = 0f
+
+	var segments: List<Segment>
+		get() = segmentsData
+		set(value) {
+			segmentsData.replaceWith(value)
+			updateSizes()
+			invalidate()
+		}
+
+	init {
+		paint.strokeWidth = context.resources.resolveDp(1f)
+		outlineProvider = OutlineProvider()
+		clipToOutline = true
+
+		if (isInEditMode) {
+			segments = List(Random.nextInt(3, 5)) {
+				Segment(
+					percent = Random.nextFloat(),
+					color = ColorUtils.HSLToColor(floatArrayOf(Random.nextInt(0, 360).toFloat(), 0.5f, 0.5f)),
+				)
+			}
+		}
+	}
+
+	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+		super.onSizeChanged(w, h, oldw, oldh)
+		cornerSize = h / 2f
+		updateSizes()
+	}
+
+	override fun onDraw(canvas: Canvas) {
+		if (segmentsSizes.isEmpty()) {
+			return
+		}
+		val w = width.toFloat()
+		var x = w - segmentsSizes.last()
+		for (i in (0 until segmentsData.size).reversed()) {
+			val segment = segmentsData[i]
+			paint.color = segment.color
+			paint.style = Paint.Style.FILL
+			val segmentWidth = segmentsSizes[i]
+			canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
+			paint.color = outlineColor
+			paint.style = Paint.Style.STROKE
+			canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
+			x -= segmentWidth
+		}
+		paint.color = outlineColor
+		paint.style = Paint.Style.STROKE
+		canvas.drawRoundRect(0f, 0f, w, height.toFloat(), cornerSize, cornerSize, paint)
+	}
+
+	private fun updateSizes() {
+		segmentsSizes.clear()
+		segmentsSizes.ensureCapacity(segmentsData.size + 1)
+		var w = width.toFloat()
+		for (segment in segmentsData) {
+			val segmentWidth = (w * segment.percent).coerceAtLeast(cornerSize)
+			segmentsSizes.add(segmentWidth)
+			w -= segmentWidth
+		}
+		segmentsSizes.add(w)
+	}
+
+	class Segment(
+		@FloatRange(from = 0.0, to = 1.0) val percent: Float,
+		@ColorInt val color: Int,
+	) {
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Segment
+
+			if (percent != other.percent) return false
+			if (color != other.color) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			var result = percent.hashCode()
+			result = 31 * result + color
+			return result
+		}
+	}
+
+	private class OutlineProvider : ViewOutlineProvider() {
+		override fun getOutline(view: View, outline: Outline) {
+			outline.setRoundRect(0, 0, view.width, view.height, view.height / 2f)
+		}
+	}
+}

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

@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.content.Context
+import android.text.Selection
+import android.text.Spannable
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.annotation.AttrRes
+import com.google.android.material.textview.MaterialTextView
+
+class SelectableTextView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = android.R.attr.textViewStyle,
+) : MaterialTextView(context, attrs, defStyleAttr) {
+
+	override fun dispatchTouchEvent(event: MotionEvent?): Boolean {
+		fixSelectionRange()
+		return super.dispatchTouchEvent(event)
+	}
+
+	// https://stackoverflow.com/questions/22810147/error-when-selecting-text-from-textview-java-lang-indexoutofboundsexception-se
+	private fun fixSelectionRange() {
+		if (selectionStart < 0 || selectionEnd < 0) {
+			val spannableText = text as? Spannable ?: return
+			Selection.setSelection(spannableText, text.length)
+		}
+	}
+}

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

@@ -0,0 +1,142 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.TimeInterpolator
+import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable
+import android.util.AttributeSet
+import android.view.ViewPropertyAnimator
+import androidx.annotation.AttrRes
+import androidx.annotation.StyleRes
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.customview.view.AbsSavedState
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator
+import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
+import com.google.android.material.R as materialR
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import org.koitharu.kotatsu.utils.ext.applySystemAnimatorScale
+import org.koitharu.kotatsu.utils.ext.measureHeight
+
+private const val STATE_DOWN = 1
+private const val STATE_UP = 2
+
+private const val SLIDE_UP_ANIMATION_DURATION = 225L
+private const val SLIDE_DOWN_ANIMATION_DURATION = 175L
+
+class SlidingBottomNavigationView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = materialR.attr.bottomNavigationStyle,
+	@StyleRes defStyleRes: Int = materialR.style.Widget_Design_BottomNavigationView,
+) : BottomNavigationView(context, attrs, defStyleAttr, defStyleRes),
+	CoordinatorLayout.AttachedBehavior {
+
+	private var currentAnimator: ViewPropertyAnimator? = null
+
+	private var currentState = STATE_UP
+	private var behavior = HideBottomNavigationOnScrollBehavior()
+
+	override fun getBehavior(): CoordinatorLayout.Behavior<*> {
+		return behavior
+	}
+
+	override fun onSaveInstanceState(): Parcelable {
+		val superState = super.onSaveInstanceState()
+		return SavedState(superState, currentState, translationY)
+	}
+
+	override fun onRestoreInstanceState(state: Parcelable?) {
+		if (state is SavedState) {
+			super.onRestoreInstanceState(state.superState)
+			super.setTranslationY(state.translationY)
+			currentState = state.currentState
+		} else {
+			super.onRestoreInstanceState(state)
+		}
+	}
+
+	override fun setTranslationY(translationY: Float) {
+		// Disallow translation change when state down
+		if (currentState != STATE_DOWN) {
+			super.setTranslationY(translationY)
+		}
+	}
+
+	fun show() {
+		currentAnimator?.cancel()
+		clearAnimation()
+
+		currentState = STATE_UP
+		animateTranslation(
+			0F,
+			SLIDE_UP_ANIMATION_DURATION,
+			LinearOutSlowInInterpolator(),
+		)
+	}
+
+	fun hide() {
+		currentAnimator?.cancel()
+		clearAnimation()
+
+		currentState = STATE_DOWN
+		val target = measureHeight()
+		if (target == 0) {
+			return
+		}
+		animateTranslation(
+			target.toFloat(),
+			SLIDE_DOWN_ANIMATION_DURATION,
+			FastOutLinearInInterpolator(),
+		)
+	}
+
+	private fun animateTranslation(targetY: Float, duration: Long, interpolator: TimeInterpolator) {
+		currentAnimator = animate()
+			.translationY(targetY)
+			.setInterpolator(interpolator)
+			.setDuration(duration)
+			.applySystemAnimatorScale(context)
+			.setListener(
+				object : AnimatorListenerAdapter() {
+					override fun onAnimationEnd(animation: Animator) {
+						currentAnimator = null
+						postInvalidate()
+					}
+				},
+			)
+	}
+
+	internal class SavedState : AbsSavedState {
+		var currentState = STATE_UP
+		var translationY = 0F
+
+		constructor(superState: Parcelable, currentState: Int, translationY: Float) : super(superState) {
+			this.currentState = currentState
+			this.translationY = translationY
+		}
+
+		constructor(source: Parcel, loader: ClassLoader?) : super(source, loader) {
+			currentState = source.readInt()
+			translationY = source.readFloat()
+		}
+
+		override fun writeToParcel(out: Parcel, flags: Int) {
+			super.writeToParcel(out, flags)
+			out.writeInt(currentState)
+			out.writeFloat(translationY)
+		}
+
+		companion object {
+
+			@Suppress("unused")
+			@JvmField
+			val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> {
+				override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader)
+
+				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
+			}
+		}
+	}
+}

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

@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.FrameLayout
-
-class SquareLayout @JvmOverloads constructor(
-	context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr) {
-
-	public override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-		super.onMeasure(widthMeasureSpec, widthMeasureSpec)
-	}
-}

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.base.ui.widgets
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.Gravity
@@ -21,8 +20,7 @@ class WindowInsetHolder @JvmOverloads constructor(
 	private var desiredHeight = 0
 	private var desiredWidth = 0
 
-	@SuppressLint("RtlHardcoded")
-	override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
+	override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets {
 		val barsInsets = WindowInsetsCompat.toWindowInsetsCompat(insets, this)
 			.getInsets(WindowInsetsCompat.Type.systemBars())
 		val gravity = getLayoutGravity()
@@ -41,24 +39,26 @@ class WindowInsetHolder @JvmOverloads constructor(
 			desiredHeight = newHeight
 			requestLayout()
 		}
-		return super.dispatchApplyWindowInsets(insets)
+		return super.onApplyWindowInsets(insets)
 	}
 
 	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
 		val widthMode = MeasureSpec.getMode(widthMeasureSpec)
+		val widthSize = MeasureSpec.getSize(widthMeasureSpec)
 		val heightMode = MeasureSpec.getMode(heightMeasureSpec)
-		super.onMeasure(
-			if (desiredWidth == 0 || widthMode == MeasureSpec.EXACTLY) {
-				widthMeasureSpec
-			} else {
-				MeasureSpec.makeMeasureSpec(desiredWidth, widthMode)
-			},
-			if (desiredHeight == 0 || heightMode == MeasureSpec.EXACTLY) {
-				heightMeasureSpec
-			} else {
-				MeasureSpec.makeMeasureSpec(desiredHeight, heightMode)
-			},
-		)
+		val heightSize = MeasureSpec.getSize(heightMeasureSpec)
+
+		val width: Int = when (widthMode) {
+			MeasureSpec.EXACTLY -> widthSize
+			MeasureSpec.AT_MOST -> minOf(desiredWidth, widthSize)
+			else -> desiredWidth
+		}
+		val height = when (heightMode) {
+			MeasureSpec.EXACTLY -> heightSize
+			MeasureSpec.AT_MOST -> minOf(desiredHeight, heightSize)
+			else -> desiredHeight
+		}
+		setMeasuredDimension(width, height)
 	}
 
 	private fun getLayoutGravity(): Int {
@@ -69,4 +69,4 @@ class WindowInsetHolder @JvmOverloads constructor(
 			else -> Gravity.NO_GRAVITY
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.bookmarks
-
-import org.koin.dsl.module
-import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-
-val bookmarksModule
-	get() = module {
-
-		factory { BookmarksRepository(get()) }
-	}

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

@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 		),
 	]
 )
-class BookmarkEntity(
+data class BookmarkEntity(
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
 	@ColumnInfo(name = "page_id", index = true) val pageId: Long,
 	@ColumnInfo(name = "chapter_id") val chapterId: Long,

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

@@ -1,23 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.data
-
-import androidx.room.Embedded
-import androidx.room.Junction
-import androidx.room.Relation
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-
-class BookmarkWithManga(
-	@Embedded val bookmark: BookmarkEntity,
-	@Relation(
-		parentColumn = "manga_id",
-		entityColumn = "manga_id"
-	)
-	val manga: MangaEntity,
-	@Relation(
-		parentColumn = "manga_id",
-		entityColumn = "tag_id",
-		associateBy = Junction(MangaTagsEntity::class)
-	)
-	val tags: List<TagEntity>,
-)

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

@@ -1,20 +1,27 @@
 package org.koitharu.kotatsu.bookmarks.data
 
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
+import androidx.room.*
 import kotlinx.coroutines.flow.Flow
+import org.koitharu.kotatsu.core.db.entity.MangaWithTags
 
 @Dao
 abstract class BookmarksDao {
 
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
+	abstract suspend fun find(mangaId: Long, pageId: Long): BookmarkEntity?
+
 	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
 	abstract fun observe(mangaId: Long, chapterId: Long, page: Int): Flow<BookmarkEntity?>
 
 	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
 	abstract fun observe(mangaId: Long): Flow<List<BookmarkEntity>>
 
+	@Transaction
+	@Query(
+		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY bookmarks.created_at"
+	)
+	abstract fun observe(): Flow<Map<MangaWithTags, List<BookmarkEntity>>>
+
 	@Insert
 	abstract suspend fun insert(entity: BookmarkEntity)
 

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

@@ -1,15 +1,9 @@
 package org.koitharu.kotatsu.bookmarks.data
 
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.db.entity.toManga
-import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.parsers.model.Manga
 import java.util.*
 
-fun BookmarkWithManga.toBookmark() = bookmark.toBookmark(
-	manga.toManga(tags.toMangaTags())
-)
-
 fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	manga = manga,
 	pageId = pageId,
@@ -30,4 +24,10 @@ fun Bookmark.toEntity() = BookmarkEntity(
 	imageUrl = imageUrl,
 	createdAt = createdAt.time,
 	percent = percent,
-)
+)
+
+fun Collection<BookmarkEntity>.toBookmarks(manga: Manga) = map {
+	it.toBookmark(manga)
+}
+
+fun Collection<Bookmark>.ids() = map { it.pageId }

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

@@ -1,17 +1,24 @@
 package org.koitharu.kotatsu.bookmarks.domain
 
+import android.database.SQLException
 import androidx.room.withTransaction
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.base.domain.ReversibleHandle
+import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.toBookmark
+import org.koitharu.kotatsu.bookmarks.data.toBookmarks
 import org.koitharu.kotatsu.bookmarks.data.toEntity
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.toEntities
 import org.koitharu.kotatsu.core.db.entity.toEntity
+import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.mapItems
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 
-class BookmarksRepository(
+class BookmarksRepository @Inject constructor(
 	private val db: MangaDatabase,
 ) {
 
@@ -23,6 +30,17 @@ class BookmarksRepository(
 		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
 	}
 
+	fun observeBookmarks(): Flow<Map<Manga, List<Bookmark>>> {
+		return db.bookmarksDao.observe().map { map ->
+			val res = LinkedHashMap<Manga, List<Bookmark>>(map.size)
+			for ((k, v) in map) {
+				val manga = k.toManga()
+				res[manga] = v.toBookmarks(manga)
+			}
+			res
+		}
+	}
+
 	suspend fun addBookmark(bookmark: Bookmark) {
 		db.withTransaction {
 			val tags = bookmark.manga.tags.toEntities()
@@ -35,4 +53,38 @@ class BookmarksRepository(
 	suspend fun removeBookmark(mangaId: Long, pageId: Long) {
 		db.bookmarksDao.delete(mangaId, pageId)
 	}
-}
+
+	suspend fun removeBookmarks(ids: Map<Manga, Set<Long>>): ReversibleHandle {
+		val entities = ArrayList<BookmarkEntity>(ids.size)
+		db.withTransaction {
+			val dao = db.bookmarksDao
+			for ((manga, idSet) in ids) {
+				for (pageId in idSet) {
+					val e = dao.find(manga.id, pageId)
+					if (e != null) {
+						entities.add(e)
+					}
+					dao.delete(manga.id, pageId)
+				}
+			}
+		}
+		return BookmarksRestorer(entities)
+	}
+
+	private inner class BookmarksRestorer(
+		private val entities: Collection<BookmarkEntity>,
+	) : ReversibleHandle {
+
+		override suspend fun reverse() {
+			db.withTransaction {
+				for (e in entities) {
+					try {
+						db.bookmarksDao.insert(e)
+					} catch (e: SQLException) {
+						e.printStackTraceDebug()
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,56 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.ViewGroup
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import androidx.fragment.app.commit
+import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityContainerBinding
+import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
+
+@AndroidEntryPoint
+class BookmarksActivity :
+	BaseActivity<ActivityContainerBinding>(),
+	AppBarOwner,
+	SnackbarOwner {
+
+	override val appBar: AppBarLayout
+		get() = binding.appbar
+
+	override val snackbarHost: CoordinatorLayout
+		get() = binding.root
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityContainerBinding.inflate(layoutInflater))
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		val fm = supportFragmentManager
+		if (fm.findFragmentById(R.id.container) == null) {
+			fm.commit {
+				val fragment = BookmarksFragment.newInstance()
+				replace(R.id.container, fragment)
+			}
+		}
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
+	}
+
+	companion object {
+
+		fun newIntent(context: Context) = Intent(context, BookmarksActivity::class.java)
+	}
+}

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

@@ -0,0 +1,200 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import android.os.Bundle
+import android.view.*
+import androidx.appcompat.view.ActionMode
+import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import androidx.fragment.app.viewModels
+import coil.ImageLoader
+import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.domain.reverseAsync
+import org.koitharu.kotatsu.base.ui.BaseFragment
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.base.ui.list.fastscroll.FastScroller
+import org.koitharu.kotatsu.base.ui.util.ReversibleAction
+import org.koitharu.kotatsu.bookmarks.data.ids
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksGroupAdapter
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.invalidateNestedItemDecorations
+import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
+
+@AndroidEntryPoint
+class BookmarksFragment :
+	BaseFragment<FragmentListSimpleBinding>(),
+	ListStateHolderListener,
+	OnListItemClickListener<Bookmark>,
+	SectionedSelectionController.Callback<Manga>,
+	FastScroller.FastScrollListener {
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	private val viewModel by viewModels<BookmarksViewModel>()
+	private var adapter: BookmarksGroupAdapter? = null
+	private var selectionController: SectionedSelectionController<Manga>? = null
+
+	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
+		return FragmentListSimpleBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		selectionController = SectionedSelectionController(
+			activity = requireActivity(),
+			owner = this,
+			callback = this,
+		)
+		adapter = BookmarksGroupAdapter(
+			lifecycleOwner = viewLifecycleOwner,
+			coil = coil,
+			listener = this,
+			selectionController = checkNotNull(selectionController),
+			bookmarkClickListener = this,
+			groupClickListener = OnGroupClickListener(),
+		)
+		binding.recyclerView.adapter = adapter
+		binding.recyclerView.setHasFixedSize(true)
+		val spacingDecoration = SpacingItemDecoration(view.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
+		binding.recyclerView.addItemDecoration(spacingDecoration)
+
+		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
+		viewModel.onError.observe(viewLifecycleOwner, ::onError)
+		viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone)
+	}
+
+	override fun onDestroyView() {
+		super.onDestroyView()
+		adapter = null
+		selectionController = null
+	}
+
+	override fun onItemClick(item: Bookmark, view: View) {
+		if (selectionController?.onItemClick(item.manga, item.pageId) != true) {
+			val intent = ReaderActivity.newIntent(view.context, item)
+			startActivity(intent, scaleUpActivityOptionsOf(view).toBundle())
+		}
+	}
+
+	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
+		return selectionController?.onItemLongClick(item.manga, item.pageId) ?: false
+	}
+
+	override fun onRetryClick(error: Throwable) = Unit
+
+	override fun onEmptyActionClick() = Unit
+
+	override fun onFastScrollStart(fastScroller: FastScroller) {
+		(activity as? AppBarOwner)?.appBar?.setExpanded(false, true)
+	}
+
+	override fun onFastScrollStop(fastScroller: FastScroller) = Unit
+
+	override fun onSelectionChanged(controller: SectionedSelectionController<Manga>, count: Int) {
+		binding.recyclerView.invalidateNestedItemDecorations()
+	}
+
+	override fun onCreateActionMode(
+		controller: SectionedSelectionController<Manga>,
+		mode: ActionMode,
+		menu: Menu,
+	): Boolean {
+		mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
+		return true
+	}
+
+	override fun onActionItemClicked(
+		controller: SectionedSelectionController<Manga>,
+		mode: ActionMode,
+		item: MenuItem,
+	): Boolean {
+		return when (item.itemId) {
+			R.id.action_remove -> {
+				val ids = selectionController?.snapshot() ?: return false
+				viewModel.removeBookmarks(ids)
+				mode.finish()
+				true
+			}
+			else -> false
+		}
+	}
+
+	override fun onCreateItemDecoration(
+		controller: SectionedSelectionController<Manga>,
+		section: Manga,
+	): AbstractSelectionItemDecoration = BookmarksSelectionDecoration(requireContext())
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.recyclerView.updatePadding(
+			bottom = insets.bottom,
+		)
+		binding.recyclerView.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+			bottomMargin = insets.bottom
+		}
+	}
+
+	private fun onListChanged(list: List<ListModel>) {
+		adapter?.items = list
+	}
+
+	private fun onError(e: Throwable) {
+		Snackbar.make(
+			binding.recyclerView,
+			e.getDisplayMessage(resources),
+			Snackbar.LENGTH_SHORT,
+		).show()
+	}
+
+	private fun onActionDone(action: ReversibleAction) {
+		val handle = action.handle
+		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
+		val snackbar = Snackbar.make((activity as SnackbarOwner).snackbarHost, action.stringResId, length)
+		if (handle != null) {
+			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
+		}
+		snackbar.show()
+	}
+
+	private inner class OnGroupClickListener : OnListItemClickListener<BookmarksGroup> {
+
+		override fun onItemClick(item: BookmarksGroup, view: View) {
+			val controller = selectionController
+			if (controller != null && controller.count > 0) {
+				if (controller.getSectionCount(item.manga) == item.bookmarks.size) {
+					controller.clearSelection(item.manga)
+				} else {
+					controller.addToSelection(item.manga, item.bookmarks.ids())
+				}
+				return
+			}
+			val intent = DetailsActivity.newIntent(view.context, item.manga)
+			startActivity(intent)
+		}
+
+		override fun onItemLongClick(item: BookmarksGroup, view: View): Boolean {
+			return selectionController?.addToSelection(item.manga, item.bookmarks.ids()) ?: false
+		}
+	}
+
+	companion object {
+
+		fun newInstance() = BookmarksFragment()
+	}
+}

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

@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import android.content.Context
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
+import org.koitharu.kotatsu.utils.ext.getItem
+
+class BookmarksSelectionDecoration(context: Context) : MangaSelectionDecoration(context) {
+
+	override fun getItemId(parent: RecyclerView, child: View): Long {
+		val holder = parent.getChildViewHolder(child) ?: return RecyclerView.NO_ID
+		val item = holder.getItem(Bookmark::class.java) ?: return RecyclerView.NO_ID
+		return item.pageId
+	}
+
+}

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

@@ -0,0 +1,54 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.base.ui.util.ReversibleAction
+import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.toErrorState
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.SingleLiveEvent
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+
+@HiltViewModel
+class BookmarksViewModel @Inject constructor(
+	private val repository: BookmarksRepository,
+) : BaseViewModel() {
+
+	val onActionDone = SingleLiveEvent<ReversibleAction>()
+
+	val content: LiveData<List<ListModel>> = repository.observeBookmarks()
+		.map { list ->
+			if (list.isEmpty()) {
+				listOf(
+					EmptyState(
+						icon = R.drawable.ic_empty_favourites,
+						textPrimary = R.string.no_bookmarks_yet,
+						textSecondary = R.string.no_bookmarks_summary,
+						actionStringRes = 0,
+					),
+				)
+			} else list.map { (manga, bookmarks) ->
+				BookmarksGroup(manga, bookmarks)
+			}
+		}
+		.catch { e -> emit(listOf(e.toErrorState(canRetry = false))) }
+		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
+
+	fun removeBookmarks(ids: Map<Manga, Set<Long>>) {
+		launchJob(Dispatchers.Default) {
+			val handle = repository.removeBookmarks(ids)
+			onActionDone.postCall(ReversibleAction(R.string.bookmarks_removed, handle))
+		}
+	}
+}

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

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

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.bookmarks.ui
+package org.koitharu.kotatsu.bookmarks.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
@@ -19,7 +19,7 @@ class BookmarksAdapter(
 	private class DiffCallback : DiffUtil.ItemCallback<Bookmark>() {
 
 		override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
-			return oldItem.manga.id == newItem.manga.id && oldItem.chapterId == newItem.chapterId
+			return oldItem.manga.id == newItem.manga.id && oldItem.pageId == newItem.pageId
 		}
 
 		override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {

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

@@ -0,0 +1,64 @@
+package org.koitharu.kotatsu.bookmarks.ui.adapter
+
+import android.view.View
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.databinding.ItemBookmarksGroupBinding
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.*
+
+fun bookmarksGroupAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	sharedPool: RecyclerView.RecycledViewPool,
+	selectionController: SectionedSelectionController<Manga>,
+	bookmarkClickListener: OnListItemClickListener<Bookmark>,
+	groupClickListener: OnListItemClickListener<BookmarksGroup>,
+) = adapterDelegateViewBinding<BookmarksGroup, ListModel, ItemBookmarksGroupBinding>(
+	{ layoutInflater, parent -> ItemBookmarksGroupBinding.inflate(layoutInflater, parent, false) },
+) {
+	val viewListenerAdapter = object : View.OnClickListener, View.OnLongClickListener {
+		override fun onClick(v: View) = groupClickListener.onItemClick(item, v)
+		override fun onLongClick(v: View) = groupClickListener.onItemLongClick(item, v)
+	}
+
+	val adapter = BookmarksAdapter(coil, lifecycleOwner, bookmarkClickListener)
+	binding.recyclerView.setRecycledViewPool(sharedPool)
+	binding.recyclerView.adapter = adapter
+	val spacingDecoration = SpacingItemDecoration(context.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
+	binding.recyclerView.addItemDecoration(spacingDecoration)
+	binding.root.setOnClickListener(viewListenerAdapter)
+	binding.root.setOnLongClickListener(viewListenerAdapter)
+
+	bind { payloads ->
+		if (payloads.isEmpty()) {
+			binding.recyclerView.clearItemDecorations()
+			binding.recyclerView.addItemDecoration(spacingDecoration)
+			selectionController.attachToRecyclerView(item.manga, binding.recyclerView)
+		}
+		binding.imageViewCover.newImageRequest(item.manga.coverUrl)?.run {
+			referer(item.manga.publicUrl)
+			placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_error_placeholder)
+			allowRgb565(true)
+			lifecycle(lifecycleOwner)
+			enqueueWith(coil)
+		}
+		binding.textViewTitle.text = item.manga.title
+		adapter.items = item.bookmarks
+	}
+
+	onViewRecycled {
+		binding.imageViewCover.disposeImageRequest()
+	}
+}

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

@@ -0,0 +1,67 @@
+package org.koitharu.kotatsu.bookmarks.ui.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.list.ui.adapter.*
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import kotlin.jvm.internal.Intrinsics
+
+class BookmarksGroupAdapter(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	selectionController: SectionedSelectionController<Manga>,
+	listener: ListStateHolderListener,
+	bookmarkClickListener: OnListItemClickListener<Bookmark>,
+	groupClickListener: OnListItemClickListener<BookmarksGroup>,
+) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+
+	init {
+		val pool = RecyclerView.RecycledViewPool()
+		delegatesManager
+			.addDelegate(
+				bookmarksGroupAD(
+					coil = coil,
+					lifecycleOwner = lifecycleOwner,
+					sharedPool = pool,
+					selectionController = selectionController,
+					bookmarkClickListener = bookmarkClickListener,
+					groupClickListener = groupClickListener,
+				)
+			)
+			.addDelegate(loadingStateAD())
+			.addDelegate(loadingFooterAD())
+			.addDelegate(emptyStateListAD(listener))
+			.addDelegate(errorStateListAD(listener))
+	}
+
+	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
+
+		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
+			return when {
+				oldItem is BookmarksGroup && newItem is BookmarksGroup -> {
+					oldItem.manga.id == newItem.manga.id
+				}
+				else -> oldItem.javaClass == newItem.javaClass
+			}
+		}
+
+		override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
+			return Intrinsics.areEqual(oldItem, newItem)
+		}
+
+		override fun getChangePayload(oldItem: ListModel, newItem: ListModel): Any? {
+			return when {
+				oldItem is BookmarksGroup && newItem is BookmarksGroup -> Unit
+				else -> super.getChangePayload(oldItem, newItem)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,31 @@
+package org.koitharu.kotatsu.bookmarks.ui.model
+
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.areItemsEquals
+
+class BookmarksGroup(
+	val manga: Manga,
+	val bookmarks: List<Bookmark>,
+) : ListModel {
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as BookmarksGroup
+
+		if (manga != other.manga) return false
+
+		return bookmarks.areItemsEquals(other.bookmarks) { a, b ->
+			a.imageUrl == b.imageUrl
+		}
+	}
+
+	override fun hashCode(): Int {
+		var result = manga.hashCode()
+		result = 31 * result + bookmarks.sumOf { it.imageUrl.hashCode() }
+		return result
+	}
+}

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

@@ -8,8 +8,10 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.ViewGroup
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
@@ -42,7 +44,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		} else {
 			onTitleChanged(
 				intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
-				url
+				url,
 			)
 			binding.webView.loadUrl(url)
 		}
@@ -59,8 +61,9 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
+		super.onCreateOptionsMenu(menu)
 		menuInflater.inflate(R.menu.opt_browser, menu)
-		return super.onCreateOptionsMenu(menu)
+		return true
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
@@ -116,8 +119,6 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.appbar.updatePadding(
 			top = insets.top,
-			left = insets.left,
-			right = insets.right,
 		)
 		binding.root.updatePadding(
 			left = insets.left,
@@ -136,4 +137,4 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 				.putExtra(EXTRA_TITLE, title)
 		}
 	}
-}
+}

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

@@ -2,10 +2,9 @@ package org.koitharu.kotatsu.browser
 
 import android.graphics.Bitmap
 import android.webkit.WebView
-import org.koin.core.component.KoinComponent
-import org.koitharu.kotatsu.core.network.WebViewClientCompat
+import android.webkit.WebViewClient
 
-class BrowserClient(private val callback: BrowserCallback) : WebViewClientCompat(), KoinComponent {
+class BrowserClient(private val callback: BrowserCallback) : WebViewClient() {
 
 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)

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

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

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

@@ -2,19 +2,19 @@ package org.koitharu.kotatsu.browser.cloudflare
 
 import android.graphics.Bitmap
 import android.webkit.WebView
+import android.webkit.WebViewClient
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.koitharu.kotatsu.core.network.AndroidCookieJar
-import org.koitharu.kotatsu.core.network.WebViewClientCompat
 
 private const val CF_CLEARANCE = "cf_clearance"
 
 class CloudFlareClient(
 	private val cookieJar: AndroidCookieJar,
 	private val callback: CloudFlareCallback,
-	private val targetUrl: String
-) : WebViewClientCompat() {
+	private val targetUrl: String,
+) : WebViewClient() {
 
-	private val oldClearance = getCookieValue(CF_CLEARANCE)
+	private val oldClearance = getClearance()
 
 	override fun onPageStarted(view: WebView, url: String?, favicon: Bitmap?) {
 		super.onPageStarted(view, url, favicon)
@@ -32,14 +32,14 @@ class CloudFlareClient(
 	}
 
 	private fun checkClearance() {
-		val clearance = getCookieValue(CF_CLEARANCE)
+		val clearance = getClearance()
 		if (clearance != null && clearance != oldClearance) {
 			callback.onCheckPassed()
 		}
 	}
 
-	private fun getCookieValue(name: String): String? {
+	private fun getClearance(): String? {
 		return cookieJar.loadForRequest(targetUrl.toHttpUrl())
-			.find { it.name == name }?.value
+			.find { it.name == CF_CLEARANCE }?.value
 	}
 }

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

@@ -11,21 +11,27 @@ import android.webkit.WebSettings
 import androidx.core.view.isInvisible
 import androidx.fragment.app.setFragmentResult
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koin.android.ext.android.get
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
+import org.koitharu.kotatsu.core.network.AndroidCookieJar
 import org.koitharu.kotatsu.core.network.UserAgentInterceptor
 import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
 import org.koitharu.kotatsu.utils.ext.stringArgument
 import org.koitharu.kotatsu.utils.ext.withArgs
 
+@AndroidEntryPoint
 class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
 
 	private val url by stringArgument(ARG_URL)
 	private val pendingResult = Bundle(1)
 
+	@Inject
+	lateinit var cookieJar: AndroidCookieJar
+
 	override fun onInflateView(
 		inflater: LayoutInflater,
-		container: ViewGroup?
+		container: ViewGroup?,
 	) = FragmentCloudflareBinding.inflate(inflater, container, false)
 
 	@SuppressLint("SetJavaScriptEnabled")
@@ -38,7 +44,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 			databaseEnabled = true
 			userAgentString = UserAgentInterceptor.userAgent
 		}
-		binding.webView.webViewClient = CloudFlareClient(get(), this, url.orEmpty())
+		binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url.orEmpty())
 		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
 		if (url.isNullOrEmpty()) {
 			dismissAllowingStateLoss()
@@ -49,11 +55,12 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	override fun onDestroyView() {
 		binding.webView.stopLoading()
+		binding.webView.destroy()
 		super.onDestroyView()
 	}
 
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder) {
-		builder.setNegativeButton(android.R.string.cancel, null)
+	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
+		return super.onBuildDialog(builder).setNegativeButton(android.R.string.cancel, null)
 	}
 
 	override fun onResume() {
@@ -77,7 +84,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	override fun onCheckPassed() {
 		pendingResult.putBoolean(EXTRA_RESULT, true)
-		dismiss()
+		dismissAllowingStateLoss()
 	}
 
 	companion object {
@@ -90,4 +97,4 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 			putString(ARG_URL, url)
 		}
 	}
-}
+}

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

@@ -0,0 +1,160 @@
+package org.koitharu.kotatsu.core
+
+import android.app.Application
+import android.content.Context
+import android.provider.SearchRecentSuggestions
+import android.text.Html
+import androidx.collection.arraySetOf
+import androidx.room.InvalidationTracker
+import coil.ComponentRegistry
+import coil.ImageLoader
+import coil.decode.SvgDecoder
+import coil.disk.DiskCache
+import coil.util.DebugLogger
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import dagger.multibindings.ElementsIntoSet
+import java.util.concurrent.TimeUnit
+import javax.inject.Singleton
+import kotlinx.coroutines.Dispatchers
+import okhttp3.CookieJar
+import okhttp3.OkHttpClient
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.base.ui.util.ActivityRecreationHandle
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.network.*
+import org.koitharu.kotatsu.core.os.ShortcutsUpdater
+import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.local.data.CacheDir
+import org.koitharu.kotatsu.local.data.CbzFetcher
+import org.koitharu.kotatsu.local.data.LocalStorageManager
+import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
+import org.koitharu.kotatsu.settings.backup.BackupObserver
+import org.koitharu.kotatsu.sync.domain.SyncController
+import org.koitharu.kotatsu.utils.ext.isLowRamDevice
+import org.koitharu.kotatsu.utils.image.CoilImageGetter
+import org.koitharu.kotatsu.widget.WidgetUpdater
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface AppModule {
+
+	@Binds
+	fun bindCookieJar(androidCookieJar: AndroidCookieJar): CookieJar
+
+	@Binds
+	fun bindMangaLoaderContext(mangaLoaderContextImpl: MangaLoaderContextImpl): MangaLoaderContext
+
+	@Binds
+	fun bindImageGetter(coilImageGetter: CoilImageGetter): Html.ImageGetter
+
+	companion object {
+
+		@Provides
+		@Singleton
+		fun provideOkHttpClient(
+			localStorageManager: LocalStorageManager,
+			cookieJar: CookieJar,
+			settings: AppSettings,
+		): OkHttpClient {
+			val cache = localStorageManager.createHttpCache()
+			return OkHttpClient.Builder().apply {
+				connectTimeout(20, TimeUnit.SECONDS)
+				readTimeout(60, TimeUnit.SECONDS)
+				writeTimeout(20, TimeUnit.SECONDS)
+				cookieJar(cookieJar)
+				dns(DoHManager(cache, settings))
+				cache(cache)
+				addInterceptor(GZipInterceptor())
+				addInterceptor(UserAgentInterceptor())
+				addInterceptor(CloudFlareInterceptor())
+			}.build()
+		}
+
+		@Provides
+		@Singleton
+		fun provideMangaDatabase(
+			@ApplicationContext context: Context,
+		): MangaDatabase {
+			return MangaDatabase(context)
+		}
+
+		@Provides
+		@Singleton
+		fun provideCoil(
+			@ApplicationContext context: Context,
+			okHttpClient: OkHttpClient,
+			mangaRepositoryFactory: MangaRepository.Factory,
+		): ImageLoader {
+			val httpClientFactory = {
+				okHttpClient.newBuilder()
+					.cache(null)
+					.build()
+			}
+			val diskCacheFactory = {
+				val rootDir = context.externalCacheDir ?: context.cacheDir
+				DiskCache.Builder()
+					.directory(rootDir.resolve(CacheDir.THUMBS.dir))
+					.build()
+			}
+			return ImageLoader.Builder(context)
+				.okHttpClient(httpClientFactory)
+				.interceptorDispatcher(Dispatchers.Default)
+				.fetcherDispatcher(Dispatchers.IO)
+				.decoderDispatcher(Dispatchers.Default)
+				.transformationDispatcher(Dispatchers.Default)
+				.diskCache(diskCacheFactory)
+				.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
+				.allowRgb565(isLowRamDevice(context))
+				.components(
+					ComponentRegistry.Builder()
+						.add(SvgDecoder.Factory())
+						.add(CbzFetcher.Factory())
+						.add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
+						.build(),
+				).build()
+		}
+
+		@Provides
+		fun provideSearchSuggestions(
+			@ApplicationContext context: Context,
+		): SearchRecentSuggestions {
+			return MangaSuggestionsProvider.createSuggestions(context)
+		}
+
+		@Provides
+		@Singleton
+		@ElementsIntoSet
+		fun provideDatabaseObservers(
+			widgetUpdater: WidgetUpdater,
+			shortcutsUpdater: ShortcutsUpdater,
+			backupObserver: BackupObserver,
+			syncController: SyncController,
+		): Set<@JvmSuppressWildcards InvalidationTracker.Observer> = arraySetOf(
+			widgetUpdater,
+			shortcutsUpdater,
+			backupObserver,
+			syncController,
+		)
+
+		@Provides
+		@Singleton
+		@ElementsIntoSet
+		fun provideActivityLifecycleCallbacks(
+			appProtectHelper: AppProtectHelper,
+			activityRecreationHandle: ActivityRecreationHandle,
+		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
+			appProtectHelper,
+			activityRecreationHandle,
+		)
+	}
+}

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

@@ -1,18 +1,17 @@
 package org.koitharu.kotatsu.core.backup
 
+import androidx.room.withTransaction
+import javax.inject.Inject
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
-import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
 
 private const val PAGE_SIZE = 10
 
-class BackupRepository(private val db: MangaDatabase) {
+class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 
 	suspend fun dumpHistory(): BackupEntry {
 		var offset = 0
@@ -24,11 +23,11 @@ class BackupRepository(private val db: MangaDatabase) {
 			}
 			offset += history.size
 			for (item in history) {
-				val manga = item.manga.toJson()
+				val manga = JsonSerializer(item.manga).toJson()
 				val tags = JSONArray()
-				item.tags.forEach { tags.put(it.toJson()) }
+				item.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
 				manga.put("tags", tags)
-				val json = item.history.toJson()
+				val json = JsonSerializer(item.history).toJson()
 				json.put("manga", manga)
 				entry.data.put(json)
 			}
@@ -40,7 +39,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
 		val categories = db.favouriteCategoriesDao.findAll()
 		for (item in categories) {
-			entry.data.put(item.toJson())
+			entry.data.put(JsonSerializer(item).toJson())
 		}
 		return entry
 	}
@@ -55,11 +54,11 @@ class BackupRepository(private val db: MangaDatabase) {
 			}
 			offset += favourites.size
 			for (item in favourites) {
-				val manga = item.manga.toJson()
+				val manga = JsonSerializer(item.manga).toJson()
 				val tags = JSONArray()
-				item.tags.forEach { tags.put(it.toJson()) }
+				item.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
 				manga.put("tags", tags)
-				val json = item.favourite.toJson()
+				val json = JsonSerializer(item.favourite).toJson()
 				json.put("manga", manga)
 				entry.data.put(json)
 			}
@@ -77,60 +76,54 @@ class BackupRepository(private val db: MangaDatabase) {
 		return entry
 	}
 
-	private fun MangaEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("id", id)
-		jo.put("title", title)
-		jo.put("alt_title", altTitle)
-		jo.put("url", url)
-		jo.put("public_url", publicUrl)
-		jo.put("rating", rating)
-		jo.put("nsfw", isNsfw)
-		jo.put("cover_url", coverUrl)
-		jo.put("large_cover_url", largeCoverUrl)
-		jo.put("state", state)
-		jo.put("author", author)
-		jo.put("source", source)
-		return jo
+	suspend fun restoreHistory(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = JsonDeserializer(mangaJson).toMangaEntity()
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
+				JsonDeserializer(it).toTagEntity()
+			}
+			val history = JsonDeserializer(item).toHistoryEntity()
+			result += runCatching {
+				db.withTransaction {
+					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.historyDao.upsert(history)
+				}
+			}
+		}
+		return result
 	}
 
-	private fun TagEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("id", id)
-		jo.put("title", title)
-		jo.put("key", key)
-		jo.put("source", source)
-		return jo
+	suspend fun restoreCategories(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
+			result += runCatching {
+				db.favouriteCategoriesDao.upsert(category)
+			}
+		}
+		return result
 	}
 
-	private fun HistoryEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("manga_id", mangaId)
-		jo.put("created_at", createdAt)
-		jo.put("updated_at", updatedAt)
-		jo.put("chapter_id", chapterId)
-		jo.put("page", page)
-		jo.put("scroll", scroll)
-		jo.put("percent", percent)
-		return jo
+	suspend fun restoreFavourites(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = JsonDeserializer(mangaJson).toMangaEntity()
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
+				JsonDeserializer(it).toTagEntity()
+			}
+			val favourite = JsonDeserializer(item).toFavouriteEntity()
+			result += runCatching {
+				db.withTransaction {
+					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.favouritesDao.upsert(favourite)
+				}
+			}
+		}
+		return result
 	}
-
-	private fun FavouriteCategoryEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("category_id", categoryId)
-		jo.put("created_at", createdAt)
-		jo.put("sort_key", sortKey)
-		jo.put("title", title)
-		jo.put("order", order)
-		jo.put("track", track)
-		return jo
-	}
-
-	private fun FavouriteEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("manga_id", mangaId)
-		jo.put("category_id", categoryId)
-		jo.put("created_at", createdAt)
-		return jo
-	}
-}
+}

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

@@ -0,0 +1,68 @@
+package org.koitharu.kotatsu.core.backup
+
+import org.json.JSONObject
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+
+class JsonDeserializer(private val json: JSONObject) {
+
+	fun toFavouriteEntity() = FavouriteEntity(
+		mangaId = json.getLong("manga_id"),
+		categoryId = json.getLong("category_id"),
+		sortKey = json.getIntOrDefault("sort_key", 0),
+		createdAt = json.getLong("created_at"),
+		deletedAt = 0L,
+	)
+
+	fun toMangaEntity() = MangaEntity(
+		id = json.getLong("id"),
+		title = json.getString("title"),
+		altTitle = json.getStringOrNull("alt_title"),
+		url = json.getString("url"),
+		publicUrl = json.getStringOrNull("public_url").orEmpty(),
+		rating = json.getDouble("rating").toFloat(),
+		isNsfw = json.getBooleanOrDefault("nsfw", false),
+		coverUrl = json.getString("cover_url"),
+		largeCoverUrl = json.getStringOrNull("large_cover_url"),
+		state = json.getStringOrNull("state"),
+		author = json.getStringOrNull("author"),
+		source = json.getString("source")
+	)
+
+	fun toTagEntity() = TagEntity(
+		id = json.getLong("id"),
+		title = json.getString("title"),
+		key = json.getString("key"),
+		source = json.getString("source")
+	)
+
+	fun toHistoryEntity() = HistoryEntity(
+		mangaId = json.getLong("manga_id"),
+		createdAt = json.getLong("created_at"),
+		updatedAt = json.getLong("updated_at"),
+		chapterId = json.getLong("chapter_id"),
+		page = json.getInt("page"),
+		scroll = json.getDouble("scroll").toFloat(),
+		percent = json.getFloatOrDefault("percent", -1f),
+		deletedAt = 0L,
+	)
+
+	fun toFavouriteCategoryEntity() = FavouriteCategoryEntity(
+		categoryId = json.getInt("category_id"),
+		createdAt = json.getLong("created_at"),
+		sortKey = json.getInt("sort_key"),
+		title = json.getString("title"),
+		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
+		track = json.getBooleanOrDefault("track", true),
+		isVisibleInLibrary = json.getBooleanOrDefault("show_in_lib", true),
+		deletedAt = 0L,
+	)
+}

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

@@ -0,0 +1,72 @@
+package org.koitharu.kotatsu.core.backup
+
+import org.json.JSONObject
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.history.data.HistoryEntity
+
+class JsonSerializer private constructor(private val json: JSONObject) {
+
+	constructor(e: FavouriteEntity) : this(
+		JSONObject().apply {
+			put("manga_id", e.mangaId)
+			put("category_id", e.categoryId)
+			put("sort_key", e.sortKey)
+			put("created_at", e.createdAt)
+		}
+	)
+
+	constructor(e: FavouriteCategoryEntity) : this(
+		JSONObject().apply {
+			put("category_id", e.categoryId)
+			put("created_at", e.createdAt)
+			put("sort_key", e.sortKey)
+			put("title", e.title)
+			put("order", e.order)
+			put("track", e.track)
+			put("show_in_lib", e.isVisibleInLibrary)
+		}
+	)
+
+	constructor(e: HistoryEntity) : this(
+		JSONObject().apply {
+			put("manga_id", e.mangaId)
+			put("created_at", e.createdAt)
+			put("updated_at", e.updatedAt)
+			put("chapter_id", e.chapterId)
+			put("page", e.page)
+			put("scroll", e.scroll)
+			put("percent", e.percent)
+		}
+	)
+
+	constructor(e: TagEntity) : this(
+		JSONObject().apply {
+			put("id", e.id)
+			put("title", e.title)
+			put("key", e.key)
+			put("source", e.source)
+		}
+	)
+
+	constructor(e: MangaEntity) : this(
+		JSONObject().apply {
+			put("id", e.id)
+			put("title", e.title)
+			put("alt_title", e.altTitle)
+			put("url", e.url)
+			put("public_url", e.publicUrl)
+			put("rating", e.rating)
+			put("nsfw", e.isNsfw)
+			put("cover_url", e.coverUrl)
+			put("large_cover_url", e.largeCoverUrl)
+			put("state", e.state)
+			put("author", e.author)
+			put("source", e.source)
+		}
+	)
+
+	fun toJson(): JSONObject = json
+}

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

@@ -1,113 +0,0 @@
-package org.koitharu.kotatsu.core.backup
-
-import androidx.room.withTransaction
-import org.json.JSONObject
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
-import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.json.*
-
-class RestoreRepository(private val db: MangaDatabase) {
-
-	suspend fun upsertHistory(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
-			val mangaJson = item.getJSONObject("manga")
-			val manga = parseManga(mangaJson)
-			val tags = mangaJson.getJSONArray("tags").mapJSON {
-				parseTag(it)
-			}
-			val history = parseHistory(item)
-			result += runCatching {
-				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.historyDao.upsert(history)
-				}
-			}
-		}
-		return result
-	}
-
-	suspend fun upsertCategories(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
-			val category = parseCategory(item)
-			result += runCatching {
-				db.favouriteCategoriesDao.upsert(category)
-			}
-		}
-		return result
-	}
-
-	suspend fun upsertFavourites(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
-			val mangaJson = item.getJSONObject("manga")
-			val manga = parseManga(mangaJson)
-			val tags = mangaJson.getJSONArray("tags").mapJSON {
-				parseTag(it)
-			}
-			val favourite = parseFavourite(item)
-			result += runCatching {
-				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.favouritesDao.upsert(favourite)
-				}
-			}
-		}
-		return result
-	}
-
-	private fun parseManga(json: JSONObject) = MangaEntity(
-		id = json.getLong("id"),
-		title = json.getString("title"),
-		altTitle = json.getStringOrNull("alt_title"),
-		url = json.getString("url"),
-		publicUrl = json.getStringOrNull("public_url").orEmpty(),
-		rating = json.getDouble("rating").toFloat(),
-		isNsfw = json.getBooleanOrDefault("nsfw", false),
-		coverUrl = json.getString("cover_url"),
-		largeCoverUrl = json.getStringOrNull("large_cover_url"),
-		state = json.getStringOrNull("state"),
-		author = json.getStringOrNull("author"),
-		source = json.getString("source")
-	)
-
-	private fun parseTag(json: JSONObject) = TagEntity(
-		id = json.getLong("id"),
-		title = json.getString("title"),
-		key = json.getString("key"),
-		source = json.getString("source")
-	)
-
-	private fun parseHistory(json: JSONObject) = HistoryEntity(
-		mangaId = json.getLong("manga_id"),
-		createdAt = json.getLong("created_at"),
-		updatedAt = json.getLong("updated_at"),
-		chapterId = json.getLong("chapter_id"),
-		page = json.getInt("page"),
-		scroll = json.getDouble("scroll").toFloat(),
-		percent = json.getFloatOrDefault("percent", -1f),
-	)
-
-	private fun parseCategory(json: JSONObject) = FavouriteCategoryEntity(
-		categoryId = json.getInt("category_id"),
-		createdAt = json.getLong("created_at"),
-		sortKey = json.getInt("sort_key"),
-		title = json.getString("title"),
-		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
-		track = json.getBooleanOrDefault("track", true),
-	)
-
-	private fun parseFavourite(json: JSONObject) = FavouriteEntity(
-		mangaId = json.getLong("manga_id"),
-		categoryId = json.getLong("category_id"),
-		createdAt = json.getLong("created_at")
-	)
-}

app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt

@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.core.db
-
-import org.koin.android.ext.koin.androidContext
-import org.koin.dsl.module
-
-val databaseModule
-	get() = module {
-		single { MangaDatabase(androidContext()) }
-	}

app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt

@@ -10,8 +10,16 @@ class DatabasePrePopulateCallback(private val resources: Resources) : RoomDataba
 
 	override fun onCreate(db: SupportSQLiteDatabase) {
 		db.execSQL(
-			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track) VALUES (?,?,?,?,?)",
-			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name, 1)
+			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track, show_in_lib, `deleted_at`) VALUES (?,?,?,?,?,?,?)",
+			arrayOf(
+				System.currentTimeMillis(),
+				1,
+				resources.getString(R.string.read_later),
+				SortOrder.NEWEST.name,
+				1,
+				1,
+				0L,
+			)
 		)
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt

@@ -2,8 +2,13 @@ package org.koitharu.kotatsu.core.db
 
 import android.content.Context
 import androidx.room.Database
+import androidx.room.InvalidationTracker
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import androidx.room.migration.Migration
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
 import org.koitharu.kotatsu.core.db.dao.MangaDao
@@ -28,6 +33,9 @@ import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+
+const val DATABASE_VERSION = 15
 
 @Database(
 	entities = [
@@ -36,7 +44,7 @@ import org.koitharu.kotatsu.tracker.data.TracksDao
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
 		ScrobblingEntity::class,
 	],
-	version = 12,
+	version = DATABASE_VERSION,
 )
 abstract class MangaDatabase : RoomDatabase() {
 
@@ -63,22 +71,35 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val scrobblingDao: ScrobblingDao
 }
 
-fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
-	context,
-	MangaDatabase::class.java,
-	"kotatsu-db"
-).addMigrations(
-	Migration1To2(),
-	Migration2To3(),
-	Migration3To4(),
-	Migration4To5(),
-	Migration5To6(),
-	Migration6To7(),
-	Migration7To8(),
-	Migration8To9(),
-	Migration9To10(),
-	Migration10To11(),
-	Migration11To12(),
-).addCallback(
-	DatabasePrePopulateCallback(context.resources)
-).build()
+val databaseMigrations: Array<Migration>
+	get() = arrayOf(
+		Migration1To2(),
+		Migration2To3(),
+		Migration3To4(),
+		Migration4To5(),
+		Migration5To6(),
+		Migration6To7(),
+		Migration7To8(),
+		Migration8To9(),
+		Migration9To10(),
+		Migration10To11(),
+		Migration11To12(),
+		Migration12To13(),
+		Migration13To14(),
+		Migration14To15(),
+	)
+
+fun MangaDatabase(context: Context): MangaDatabase = Room
+	.databaseBuilder(context, MangaDatabase::class.java, "kotatsu-db")
+	.addMigrations(*databaseMigrations)
+	.addCallback(DatabasePrePopulateCallback(context.resources))
+	.build()
+
+fun InvalidationTracker.removeObserverAsync(observer: InvalidationTracker.Observer) {
+	val scope = processLifecycleScope
+	if (scope.isActive) {
+		processLifecycleScope.launch(Dispatchers.Default) {
+			removeObserver(observer)
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/db/Tables.kt

@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.db
+
+const val TABLE_FAVOURITES = "favourites"
+const val TABLE_MANGA = "manga"
+const val TABLE_TAGS = "tags"
+const val TABLE_FAVOURITE_CATEGORIES = "favourite_categories"
+const val TABLE_HISTORY = "history"
+const val TABLE_MANGA_TAGS = "manga_tags"

app/src/main/java/org/koitharu/kotatsu/core/db/dao/PreferencesDao.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
+import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 
 @Dao
@@ -9,6 +10,9 @@ abstract class PreferencesDao {
 	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
 	abstract suspend fun find(mangaId: Long): MangaPrefsEntity?
 
+	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
+	abstract fun observe(mangaId: Long): Flow<MangaPrefsEntity?>
+
 	@Insert(onConflict = OnConflictStrategy.IGNORE)
 	abstract suspend fun insert(pref: MangaPrefsEntity): Long
 
@@ -21,4 +25,4 @@ abstract class PreferencesDao {
 			insert(pref)
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/core/db/dao/TrackLogsDao.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
+import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogWithManga
 
@@ -8,8 +9,8 @@ import org.koitharu.kotatsu.tracker.data.TrackLogWithManga
 interface TrackLogsDao {
 
 	@Transaction
-	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
-	suspend fun findAll(offset: Int, limit: Int): List<TrackLogWithManga>
+	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET 0")
+	fun observeAll(limit: Int): Flow<List<TrackLogWithManga>>
 
 	@Query("DELETE FROM track_logs")
 	suspend fun clear()
@@ -25,4 +26,4 @@ interface TrackLogsDao {
 
 	@Query("SELECT COUNT(*) FROM track_logs")
 	suspend fun count(): Int
-}
+}

app/src/main/java/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.db.entity
 
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
@@ -10,7 +11,7 @@ import org.koitharu.kotatsu.utils.ext.longHashCode
 fun TagEntity.toMangaTag() = MangaTag(
 	key = this.key,
 	title = this.title.toTitleCase(),
-	source = MangaSource.valueOf(this.source),
+	source = MangaSource(this.source) ?: MangaSource.DUMMY,
 )
 
 fun Collection<TagEntity>.toMangaTags() = mapToSet(TagEntity::toMangaTag)
@@ -19,7 +20,7 @@ fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 	id = this.id,
 	title = this.title,
 	altTitle = this.altTitle,
-	state = this.state?.let { MangaState.valueOf(it) },
+	state = this.state?.let { MangaState(it) },
 	rating = this.rating,
 	isNsfw = this.isNsfw,
 	url = this.url,
@@ -27,8 +28,8 @@ fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 	coverUrl = this.coverUrl,
 	largeCoverUrl = this.largeCoverUrl,
 	author = this.author,
-	source = MangaSource.valueOf(this.source),
-	tags = tags
+	source = MangaSource(this.source) ?: MangaSource.DUMMY,
+	tags = tags,
 )
 
 fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())
@@ -54,14 +55,18 @@ fun MangaTag.toEntity() = TagEntity(
 	title = title,
 	key = key,
 	source = source.name,
-	id = "${key}_${source.name}".longHashCode()
+	id = "${key}_${source.name}".longHashCode(),
 )
 
 fun Collection<MangaTag>.toEntities() = map(MangaTag::toEntity)
 
 // Other
 
-@Suppress("FunctionName")
 fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {
 	SortOrder.valueOf(name)
-}.getOrDefault(fallback)
+}.getOrDefault(fallback)
+
+@Suppress("FunctionName")
+fun MangaState(name: String): MangaState? = runCatching {
+	MangaState.valueOf(name)
+}.getOrNull()

app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt

@@ -3,9 +3,10 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.koitharu.kotatsu.core.db.TABLE_MANGA
 
-@Entity(tableName = "manga")
-class MangaEntity(
+@Entity(tableName = TABLE_MANGA)
+data class MangaEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,
@@ -18,5 +19,5 @@ class MangaEntity(
 	@ColumnInfo(name = "large_cover_url") val largeCoverUrl: String?,
 	@ColumnInfo(name = "state") val state: String?,
 	@ColumnInfo(name = "author") val author: String?,
-	@ColumnInfo(name = "source") val source: String
-)
+	@ColumnInfo(name = "source") val source: String,
+)