Update about settings

.editorconfig

@@ -13,7 +13,6 @@ 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
-ij_xml_attribute_wrap = on_every_item
 
 [{*.kt,*.kts}]
 ij_kotlin_allow_trailing_comma_on_call_site = true

.github/FUNDING.yml

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

.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: If you have a problem with a specific **manga source** or want to propose a new one, please open an issue 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

@@ -60,7 +60,5 @@ body:
       attributes:
           label: Acknowledgements
           options:
-              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
-                required: true
-              - label: This is not an issue with a specific manga source. Otherwise, you have to open an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
-                required: true
+              - 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/request_feature.yml

@@ -20,5 +20,5 @@ body:
           label: Acknowledgements
           description: Read this carefully, we will close and ignore your issue if you skimmed through this.
           options:
-              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
-                required: true
+              - 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/workflows/trigger-site-deploy.yml

@@ -1,16 +0,0 @@
-name: Trigger Site Update
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  trigger-site:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send repository_dispatch to site-repo
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.SITE_REPO_TOKEN }}
-          repository: KotatsuApp/website
-          event-type: app-release

.gitignore

@@ -10,13 +10,11 @@
 /.idea/compiler.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
-/.idea/ktlint-plugin.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
 /.idea/kotlinc.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/androidTestResultsUserPreferences.xml
-/.idea/deploymentTargetSelector.xml
 /.idea/render.experimental.xml
 /.idea/inspectionProfiles/
 .DS_Store
@@ -24,6 +22,3 @@
 /captures
 .externalNativeBuild
 .cxx
-/.idea/deviceManager.xml
-/.kotlin/
-/.idea/AndroidProjectSystem.xml

.idea/.gitignore

@@ -1,7 +1,3 @@
 # Default ignored files
 /shelf/
 /workspace.xml
-/migrations.xml
-/runConfigurations.xml
-/appInsightsSettings.xml
-/kotlinCodeInsightSettings.xml

.idea/AndroidProjectSystem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>

.idea/appInsightsSettings.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AppInsightsSettings">
-    <option name="tabSettings">
-      <map>
-        <entry key="Firebase Crashlytics">
-          <value>
-            <InsightsFilterSettings>
-              <option name="connection">
-                <ConnectionSetting>
-                  <option name="appId" value="PLACEHOLDER" />
-                  <option name="mobileSdkAppId" value="" />
-                  <option name="projectId" value="" />
-                  <option name="projectNumber" value="" />
-                </ConnectionSetting>
-              </option>
-              <option name="signal" value="SIGNAL_UNSPECIFIED" />
-              <option name="timeIntervalDays" value="THIRTY_DAYS" />
-              <option name="visibilityType" value="ALL" />
-            </InsightsFilterSettings>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

.idea/gradle.xml

@@ -4,9 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-21" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/vcs.xml

@@ -10,6 +10,6 @@
     </option>
   </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

.weblate

@@ -1,3 +0,0 @@
-[weblate]
-url = https://hosted.weblate.org/api/
-translation = kotatsu/strings

CONTRIBUTING.md

@@ -1,12 +0,0 @@
-## Kotatsu contribution guidelines
-
-+ If you want to **fix bugs** or **implement new features** that **already have an [issue card](https://github.com/KotatsuApp/Kotatsu/issues):** please assign this issue to you and/or comment about it.
-+ If you want to **implement a new feature:** open an issue or discussion regarding it to ensure it will be accepted.
-+ **Translations** have to be managed using the [Weblate](https://hosted.weblate.org/engage/kotatsu/) platform.
-+ In case you want to **add a new manga source,** refer to the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers).
-
-**Refactoring** or some **dev-faces improvements** might also be accepted. However, please stick to the following principles:
-
-+ **Performance matters.** In the case of choosing between source code beauty and performance, performance should be a priority. 
-+ Please, **do not modify readme and other information files** (except for typos).
-+ **Avoid adding new dependencies** unless required. APK size is important.

LICENSE

@@ -619,3 +619,56 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,117 +1,58 @@
-<div align="center">
+# Kotatsu
 
-<a href="https://kotatsu.app">
-    <img src="./.github/assets/vtuber.png" alt="Kotatsu Logo" title="Kotatsu" width="600"/>
-</a>
+Kotatsu is a free and open source manga reader for Android.
 
-# [Kotatsu](https://kotatsu.app)
-
-**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is a free and open-source manga reader for Android with built-in online content sources.**
-
-![Downloads count](https://img.shields.io/github/downloads/KotatsuApp/Kotatsu/total?color=1976d2) ![Latest Stable version](https://img.shields.io/github/v/release/KotatsuApp/Kotatsu?color=2596be&label=latest) ![Android 6.0](https://img.shields.io/badge/android-6.0+-brightgreen) [![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF?)](https://t.me/kotatsuapp) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
 
 ### Download
 
-<div align="left">
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+alt="Get it on F-Droid"
+height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)
 
-* **Recommended:** Download and install APK from [GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest). Application has a built-in self-updating feature.
-* Get it on [F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu). The F-Droid build may be a bit outdated and some fixes might be missing.
-* Also [nightly builds](https://github.com/KotatsuApp/Kotatsu-nightly/releases) are available (Unstable, use at your own risk). Application has a built-in self-updating feature.
+Download APK directly from GitHub:
 
-</div>
+- **[Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)**
 
 ### Main Features
 
-<div align="left">
+* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers)
+* Search manga by name and genres
+* 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 You UI
+* Standard and Webtoon-optimized reader
+* Notifications about new chapters with updates feed
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
+* Password/fingerprint protect access to the app
+* History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 
-* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers) (with 1200+ manga sources)
-* Search manga by name, genres and more filters
-* Favorites organized by user-defined categories
-* Reading history, bookmarks and incognito mode support
-* Download manga and read it offline. Third-party CBZ archives are also supported
-* Clean and convenient Material You UI, optimized for phones, tablets and desktop
-* Standard and Webtoon-optimized customizable reader, gesture support on reading interface
-* Notifications about new chapters with updates feed, manga recommendations (with filters)
-* Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
-* Password / fingerprint-protected access to the app
-* Automatically sync app data with other devices on the same account
-* Support for older devices running Android 5.0+
+### Screenshots
 
-</div>
+| ![Screenshot_20200226-210337](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png)                           | ![Screenshot_20200226-210232](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
+|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
+| ![Screenshot_20200226-210405](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png) | ![Screenshot_20200226-210151](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
 
-### In-App Screenshots
-
-<div align="center">
-    <img src="./metadata/en-US/images/phoneScreenshots/1.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/2.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/3.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/4.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/5.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/6.png" alt="Mobile view" width="250"/>
-</div>
-
-<br>
-
-<div align="center">
-    <img src="./metadata/en-US/images/tenInchScreenshots/1.png" alt="Tablet view" width="400"/>
-    <img src="./metadata/en-US/images/tenInchScreenshots/2.png" alt="Tablet view" width="400"/>
-</div>
+| ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/2.png) |
+|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
 
 ### Localization
 
-<a href="https://hosted.weblate.org/engage/kotatsu/">
-<img src="https://hosted.weblate.org/widget/kotatsu/horizontal-auto.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](https://github.com/KotatsuApp/Kotatsu) is localized in a number of different languages.**<br>
-**📌 If you would like to help improve these or add new languages,
-please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)**
-
-### Contributing
-
-<br>
-
-<a href="https://github.com/KotatsuApp/Kotatsu">
-  <picture>
-    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
-    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu GitHub Repository">
-  </picture>
-</a>
-<a href="https://github.com/KotatsuApp/Kotatsu-parsers">
-  <picture>
-    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
-    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu-parsers GitHub Repository">
-  </picture>
-</a><br></br>
-
-</br>
-
-**📌 Pull requests are welcome, if you want: See [CONTRIBUTING.md](https://github.com/KotatsuApp/Kotatsu/blob/devel/CONTRIBUTING.md) for the guidelines**
-
-### Certificate fingerprints
-
-```plaintext
-2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE
-```
-
-```plaintext
-67:E1:51:00:BB:80:93:01:78:3E:DC:B6:34:8F:A3:BB:F8:30:34:D9:1E:62:86:8A:91:05:3D:BD:70:DB:3F:18
-```
+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 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)
 
-<div align="left">
-
-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.
-
-</div>
+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.
 
 ### DMCA disclaimer
 
-<div align="left">
-
-The developers of this application do not have any affiliation with the content available in the app. It collects content from sources that are freely available through any web browser.
-
-</div>
+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

@@ -1,102 +1,66 @@
-import java.time.LocalDateTime
-
 plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
-	id 'com.google.devtools.ksp'
+	id 'kotlin-kapt'
 	id 'kotlin-parcelize'
 	id 'dagger.hilt.android.plugin'
-	id 'androidx.room'
-	id 'org.jetbrains.kotlin.plugin.serialization'
-	// enable if needed
-	// id 'dev.reformator.stacktracedecoroutinator'
 }
 
 android {
-	compileSdk = 36
-	buildToolsVersion = '35.0.0'
+	compileSdk = 33
+	buildToolsVersion = '33.0.2'
 	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
-		minSdk = 23
-		targetSdk = 36
-		versionCode = 1030
-		versionName = '9.2'
+		minSdkVersion 21
+		targetSdkVersion 33
+		versionCode 525
+		versionName '4.4.9'
 		generatedDensities = []
-		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
-		ksp {
-			arg('room.generateKotlin', 'true')
+		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+		kapt {
+			arguments {
+				arg 'room.schemaLocation', "$projectDir/schemas".toString()
+			}
 		}
-		androidResources {
-			// https://issuetracker.google.com/issues/408030127
-			generateLocaleConfig false
-		}
-		def localProperties = new Properties()
-		def localPropertiesFile = rootProject.file('local.properties')
-		if (localPropertiesFile.exists()) {
-			localProperties.load(new FileInputStream(localPropertiesFile))
-		}
-		resValue 'string', 'tg_backup_bot_token', localProperties.getProperty('tg_backup_bot_token', '')
 	}
 	buildTypes {
 		debug {
 			applicationIdSuffix = '.debug'
 		}
 		release {
+			multiDexEnabled false
 			minifyEnabled true
 			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 		}
-		nightly {
-			initWith release
-			applicationIdSuffix = '.nightly'
-		}
 	}
 	buildFeatures {
 		viewBinding true
-		buildConfig true
-	}
-	packagingOptions {
-		resources {
-			excludes += [
-				'META-INF/README.md',
-				'META-INF/NOTICE.md'
-			]
-		}
 	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
-		main.java.srcDirs += 'src/main/kotlin/'
 	}
 	compileOptions {
-		coreLibraryDesugaringEnabled true
-		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_11
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_11.toString()
+		jvmTarget = JavaVersion.VERSION_1_8.toString()
 		freeCompilerArgs += [
 			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-			'-opt-in=kotlinx.coroutines.ExperimentalForInheritanceCoroutinesApi',
-			'-opt-in=kotlinx.coroutines.InternalForInheritanceCoroutinesApi',
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
-			'-opt-in=coil3.annotation.ExperimentalCoilApi',
-			'-opt-in=coil3.annotation.InternalCoilApi',
-			'-opt-in=kotlinx.serialization.ExperimentalSerializationApi',
-			'-Xjspecify-annotations=strict',
-			'-Xannotation-default-target=first-only',
-			'-Xtype-enhancement-improvements-strict-mode'
+			'-opt-in=coil.annotation.ExperimentalCoilApi',
+			'-opt-in=com.google.android.material.badge.ExperimentalBadgeUtils',
 		]
 	}
-	room {
-		schemaDirectory "$projectDir/schemas"
-	}
 	lint {
 		abortOnError true
-		disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat'
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
 		unitTests.includeAndroidResources true
@@ -105,107 +69,83 @@ android {
 			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
 		}
 	}
-	applicationVariants.configureEach { variant ->
-		if (variant.name == 'nightly') {
-			variant.outputs.each { output ->
-				def now = LocalDateTime.now()
-				output.versionCodeOverride = now.format("yyMMdd").toInteger()
-				output.versionNameOverride = 'N' + now.format("yyyyMMdd")
-			}
+}
+afterEvaluate {
+	compileDebugKotlin {
+		kotlinOptions {
+			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
 		}
 	}
 }
 dependencies {
-	def parsersVersion = libs.versions.parsers.get()
-	if (System.properties.containsKey('parsersVersionOverride')) {
-		// usage:
-		// -DparsersVersionOverride=$(curl -s https://api.github.com/repos/kotatsuapp/kotatsu-parsers/commits/master -H "Accept: application/vnd.github.sha" | cut -c -10)
-		parsersVersion = System.getProperty('parsersVersionOverride')
-	}
-	//noinspection UseTomlInstead
-	implementation("com.github.KotatsuApp:kotatsu-parsers:$parsersVersion") {
+	//noinspection GradleDependency
+	implementation('com.github.KotatsuApp:kotatsu-parsers:1b6d1456f3') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	coreLibraryDesugaring libs.desugar.jdk.libs
-	implementation libs.kotlin.stdlib
-	implementation libs.kotlinx.coroutines.android
-	implementation libs.kotlinx.coroutines.guava
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
-	implementation libs.androidx.appcompat
-	implementation libs.androidx.core
-	implementation libs.androidx.activity
-	implementation libs.androidx.fragment
-	implementation libs.androidx.transition
-	implementation libs.androidx.collection
-	implementation libs.lifecycle.viewmodel
-	implementation libs.lifecycle.service
-	implementation libs.lifecycle.process
-	implementation libs.androidx.constraintlayout
-	implementation libs.androidx.documentfile
-	implementation libs.androidx.swiperefreshlayout
-	implementation libs.androidx.recyclerview
-	implementation libs.androidx.viewpager2
-	implementation libs.androidx.preference
-	implementation libs.androidx.biometric
-	implementation libs.material
-	implementation libs.androidx.lifecycle.common.java8
-	implementation libs.androidx.webkit
+	implementation 'androidx.appcompat:appcompat:1.6.1'
+	implementation 'androidx.core:core-ktx:1.9.0'
+	implementation 'androidx.activity:activity-ktx:1.6.1'
+	implementation 'androidx.fragment:fragment-ktx:1.5.5'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
+	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+	implementation 'androidx.recyclerview:recyclerview:1.2.1'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+	implementation 'androidx.preference:preference-ktx:1.2.0'
+	implementation 'androidx.work:work-runtime-ktx:2.8.0'
+	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
+	implementation 'com.google.android.material:material:1.8.0'
+	//noinspection LifecycleAnnotationProcessorWithJava8
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
 
-	implementation libs.androidx.work.runtime
-	implementation libs.guava
+	implementation 'androidx.room:room-runtime:2.5.0'
+	implementation 'androidx.room:room-ktx:2.5.0'
+	kapt 'androidx.room:room-compiler:2.5.0'
 
-	implementation libs.androidx.room.runtime
-	implementation libs.androidx.room.ktx
-	ksp libs.androidx.room.compiler
+	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
+	implementation 'com.squareup.okio:okio:3.3.0'
 
-	implementation libs.okhttp
-	implementation libs.okhttp.tls
-	implementation libs.okhttp.dnsoverhttps
-	implementation libs.okio
-	implementation libs.kotlinx.serialization.json
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation libs.adapterdelegates
-	implementation libs.adapterdelegates.viewbinding
+	implementation 'com.google.dagger:hilt-android:2.45'
+	kapt 'com.google.dagger:hilt-compiler:2.45'
+	implementation 'androidx.hilt:hilt-work:1.0.0'
+	kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
-	implementation libs.hilt.android
-	ksp libs.hilt.compiler
-	implementation libs.androidx.hilt.work
-	ksp libs.androidx.hilt.compiler
+	implementation 'io.coil-kt:coil-base:2.2.2'
+	implementation 'io.coil-kt:coil-svg:2.2.2'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:1b19231b2f'
+	implementation 'com.github.solkin:disk-lru-cache:1.4'
+	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation libs.coil.core
-	implementation libs.coil.network
-	implementation libs.coil.gif
-	implementation libs.coil.svg
-	implementation libs.avif.decoder
-	implementation libs.ssiv
-	implementation libs.disk.lru.cache
-	implementation libs.markwon
-	implementation libs.kizzyrpc
+	implementation 'ch.acra:acra-http:5.9.7'
+	implementation 'ch.acra:acra-dialog:5.9.7'
 
-	implementation libs.acra.http
-	implementation libs.acra.dialog
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
-	implementation libs.conscrypt.android
+	testImplementation 'junit:junit:4.13.2'
+	testImplementation 'org.json:json:20230227'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
-	debugImplementation libs.leakcanary.android
-	nightlyImplementation libs.leakcanary.android
-	debugImplementation libs.workinspector
+	androidTestImplementation 'androidx.test:runner:1.5.2'
+	androidTestImplementation 'androidx.test:rules:1.5.0'
+	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	testImplementation libs.junit
-	testImplementation libs.json
-	testImplementation libs.kotlinx.coroutines.test
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
-	androidTestImplementation libs.androidx.runner
-	androidTestImplementation libs.androidx.rules
-	androidTestImplementation libs.androidx.test.core
-	androidTestImplementation libs.androidx.junit
+	androidTestImplementation 'androidx.room:room-testing:2.5.0'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
 
-	androidTestImplementation libs.kotlinx.coroutines.test
-
-	androidTestImplementation libs.androidx.room.testing
-	androidTestImplementation libs.moshi.kotlin
-
-	androidTestImplementation libs.hilt.android.testing
-	kspAndroidTest libs.hilt.android.compiler
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.45'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.45'
 }

app/proguard-rules.pro

@@ -8,24 +8,10 @@
 	public static void checkParameterIsNotNull(...);
 	public static void checkNotNullParameter(...);
 }
-
--dontwarn okhttp3.internal.platform.**
--dontwarn org.conscrypt.**
--dontwarn org.bouncycastle.**
--dontwarn org.openjsse.**
--dontwarn com.google.j2objc.annotations.**
--dontwarn coil3.PlatformContext
-
--keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
--keep class org.koitharu.kotatsu.settings.about.changelog.ChangelogFragment
+-keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
+-keep class org.koitharu.kotatsu.core.db.entity.* { *; }
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
 
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
+-keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
 -keep class org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy { *; }
--keep class org.koitharu.kotatsu.backups.ui.periodical.PeriodicalBackupSettingsFragment { *; }
--keep class org.jsoup.parser.Tag
--keep class org.jsoup.internal.StringUtil
-
--keep class org.acra.security.NoKeyStoreFactory { *; }
--keep class org.acra.config.DefaultRetryPolicy { *; }
--keep class org.acra.attachment.DefaultAttachmentProvider { *; }
--keep class org.acra.sender.JobSenderService

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/manga/bad_ids.json

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,15 +29,13 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [
 		{
 			"id": 1552943969433540704,
-			"title": "1 - 1",
+			"name": "1 - 1",
 			"number": 1,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/1",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -46,9 +43,8 @@
 		},
 		{
 			"id": 1552943969433540705,
-			"title": "1 - 2",
+			"name": "1 - 2",
 			"number": 2,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/2",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -56,9 +52,8 @@
 		},
 		{
 			"id": 1552943969433540706,
-			"title": "1 - 3",
+			"name": "1 - 3",
 			"number": 3,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/3",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -66,9 +61,8 @@
 		},
 		{
 			"id": 1552943969433540707,
-			"title": "1 - 4",
+			"name": "1 - 4",
 			"number": 4,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/4",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -76,9 +70,8 @@
 		},
 		{
 			"id": 1552943969433540708,
-			"title": "1 - 5",
+			"name": "1 - 5",
 			"number": 5,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/5",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -86,9 +79,8 @@
 		},
 		{
 			"id": 1552943969433541665,
-			"title": "2 - 1",
+			"name": "2 - 1",
 			"number": 6,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1415570400000,
@@ -96,9 +88,8 @@
 		},
 		{
 			"id": 1552943969433541666,
-			"title": "2 - 2",
+			"name": "2 - 2",
 			"number": 7,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1419976800000,
@@ -106,9 +97,8 @@
 		},
 		{
 			"id": 1552943969433541667,
-			"title": "2 - 3",
+			"name": "2 - 3",
 			"number": 8,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/3",
 			"scanlator": "Sup!",
 			"uploadDate": 1427922000000,
@@ -116,9 +106,8 @@
 		},
 		{
 			"id": 1552943969433541668,
-			"title": "2 - 4",
+			"name": "2 - 4",
 			"number": 9,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/4",
 			"scanlator": "Sup!",
 			"uploadDate": 1436907600000,
@@ -126,9 +115,8 @@
 		},
 		{
 			"id": 1552943969433541669,
-			"title": "2 - 5",
+			"name": "2 - 5",
 			"number": 10,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/5",
 			"scanlator": "Sup!",
 			"uploadDate": 1446674400000,
@@ -136,9 +124,8 @@
 		},
 		{
 			"id": 1552943969433541670,
-			"title": "2 - 6",
+			"name": "2 - 6",
 			"number": 11,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/6",
 			"scanlator": "Sup!",
 			"uploadDate": 1451512800000,
@@ -146,9 +133,8 @@
 		},
 		{
 			"id": 1552943969433542626,
-			"title": "3 - 1",
+			"name": "3 - 1",
 			"number": 12,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -156,9 +142,8 @@
 		},
 		{
 			"id": 1552943969433542627,
-			"title": "3 - 2",
+			"name": "3 - 2",
 			"number": 13,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -166,9 +151,8 @@
 		},
 		{
 			"id": 1552943969433542628,
-			"title": "3 - 3",
+			"name": "3 - 3",
 			"number": 14,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/3",
 			"scanlator": "",
 			"uploadDate": 1465851600000,
@@ -176,4 +160,4 @@
 		}
 	],
 	"source": "READMANGA_RU"
-}
+}

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

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,9 +29,8 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [],
 	"source": "READMANGA_RU"
-}
+}

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

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,15 +29,13 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [
 		{
 			"id": 3552943969433540704,
-			"title": "1 - 1",
+			"name": "1 - 1",
 			"number": 1,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/1",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -46,9 +43,8 @@
 		},
 		{
 			"id": 3552943969433540705,
-			"title": "1 - 2",
+			"name": "1 - 2",
 			"number": 2,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/2",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -56,9 +52,8 @@
 		},
 		{
 			"id": 3552943969433540706,
-			"title": "1 - 3",
+			"name": "1 - 3",
 			"number": 3,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/3",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -66,9 +61,8 @@
 		},
 		{
 			"id": 3552943969433540707,
-			"title": "1 - 4",
+			"name": "1 - 4",
 			"number": 4,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/4",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -76,9 +70,8 @@
 		},
 		{
 			"id": 3552943969433540708,
-			"title": "1 - 5",
+			"name": "1 - 5",
 			"number": 5,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/5",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -86,9 +79,8 @@
 		},
 		{
 			"id": 3552943969433541665,
-			"title": "2 - 1",
+			"name": "2 - 1",
 			"number": 6,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1415570400000,
@@ -96,9 +88,8 @@
 		},
 		{
 			"id": 3552943969433541666,
-			"title": "2 - 2",
+			"name": "2 - 2",
 			"number": 7,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1419976800000,
@@ -106,9 +97,8 @@
 		},
 		{
 			"id": 3552943969433541667,
-			"title": "2 - 3",
+			"name": "2 - 3",
 			"number": 8,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/3",
 			"scanlator": "Sup!",
 			"uploadDate": 1427922000000,
@@ -116,9 +106,8 @@
 		},
 		{
 			"id": 3552943969433541668,
-			"title": "2 - 4",
+			"name": "2 - 4",
 			"number": 9,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/4",
 			"scanlator": "Sup!",
 			"uploadDate": 1436907600000,
@@ -126,9 +115,8 @@
 		},
 		{
 			"id": 3552943969433541669,
-			"title": "2 - 5",
+			"name": "2 - 5",
 			"number": 10,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/5",
 			"scanlator": "Sup!",
 			"uploadDate": 1446674400000,
@@ -136,9 +124,8 @@
 		},
 		{
 			"id": 3552943969433541670,
-			"title": "2 - 6",
+			"name": "2 - 6",
 			"number": 11,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/6",
 			"scanlator": "Sup!",
 			"uploadDate": 1451512800000,
@@ -146,4 +133,4 @@
 		}
 	],
 	"source": "READMANGA_RU"
-}
+}

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

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,15 +29,13 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [
 		{
 			"id": 3552943969433540704,
-			"title": "1 - 1",
+			"name": "1 - 1",
 			"number": 1,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/1",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -46,9 +43,8 @@
 		},
 		{
 			"id": 3552943969433540705,
-			"title": "1 - 2",
+			"name": "1 - 2",
 			"number": 2,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/2",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -56,9 +52,8 @@
 		},
 		{
 			"id": 3552943969433540706,
-			"title": "1 - 3",
+			"name": "1 - 3",
 			"number": 3,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/3",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -66,9 +61,8 @@
 		},
 		{
 			"id": 3552943969433540707,
-			"title": "1 - 4",
+			"name": "1 - 4",
 			"number": 4,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/4",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -76,9 +70,8 @@
 		},
 		{
 			"id": 3552943969433540708,
-			"title": "1 - 5",
+			"name": "1 - 5",
 			"number": 5,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/5",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -86,9 +79,8 @@
 		},
 		{
 			"id": 3552943969433541665,
-			"title": "2 - 1",
+			"name": "2 - 1",
 			"number": 6,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1415570400000,
@@ -96,9 +88,8 @@
 		},
 		{
 			"id": 3552943969433541666,
-			"title": "2 - 2",
+			"name": "2 - 2",
 			"number": 7,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1419976800000,
@@ -106,9 +97,8 @@
 		},
 		{
 			"id": 3552943969433541667,
-			"title": "2 - 3",
+			"name": "2 - 3",
 			"number": 8,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/3",
 			"scanlator": "Sup!",
 			"uploadDate": 1427922000000,
@@ -116,9 +106,8 @@
 		},
 		{
 			"id": 3552943969433541668,
-			"title": "2 - 4",
+			"name": "2 - 4",
 			"number": 9,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/4",
 			"scanlator": "Sup!",
 			"uploadDate": 1436907600000,
@@ -126,9 +115,8 @@
 		},
 		{
 			"id": 3552943969433541669,
-			"title": "2 - 5",
+			"name": "2 - 5",
 			"number": 10,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/5",
 			"scanlator": "Sup!",
 			"uploadDate": 1446674400000,
@@ -136,9 +124,8 @@
 		},
 		{
 			"id": 3552943969433541670,
-			"title": "2 - 6",
+			"name": "2 - 6",
 			"number": 11,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/6",
 			"scanlator": "Sup!",
 			"uploadDate": 1451512800000,
@@ -146,9 +133,8 @@
 		},
 		{
 			"id": 3552943969433542626,
-			"title": "3 - 1",
+			"name": "3 - 1",
 			"number": 12,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -156,9 +142,8 @@
 		},
 		{
 			"id": 3552943969433542627,
-			"title": "3 - 2",
+			"name": "3 - 2",
 			"number": 13,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -166,9 +151,8 @@
 		},
 		{
 			"id": 3552943969433542628,
-			"title": "3 - 3",
+			"name": "3 - 3",
 			"number": 14,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/3",
 			"scanlator": "",
 			"uploadDate": 1465851600000,
@@ -176,4 +160,4 @@
 		}
 	],
 	"source": "READMANGA_RU"
-}
+}

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

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,8 +29,7 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": null,
 	"source": "READMANGA_RU"
-}
+}

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

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,15 +29,13 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [
 		{
 			"id": 3552943969433540704,
-			"title": "1 - 1",
+			"name": "1 - 1",
 			"number": 1,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/1",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -46,9 +43,8 @@
 		},
 		{
 			"id": 3552943969433540705,
-			"title": "1 - 2",
+			"name": "1 - 2",
 			"number": 2,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/2",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -56,9 +52,8 @@
 		},
 		{
 			"id": 3552943969433540706,
-			"title": "1 - 3",
+			"name": "1 - 3",
 			"number": 3,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/3",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -66,9 +61,8 @@
 		},
 		{
 			"id": 3552943969433540707,
-			"title": "1 - 4",
+			"name": "1 - 4",
 			"number": 4,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/4",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -76,9 +70,8 @@
 		},
 		{
 			"id": 3552943969433540708,
-			"title": "1 - 5",
+			"name": "1 - 5",
 			"number": 5,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/5",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -86,9 +79,8 @@
 		},
 		{
 			"id": 3552943969433541666,
-			"title": "2 - 2",
+			"name": "2 - 2",
 			"number": 7,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1419976800000,
@@ -96,9 +88,8 @@
 		},
 		{
 			"id": 3552943969433541667,
-			"title": "2 - 3",
+			"name": "2 - 3",
 			"number": 8,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/3",
 			"scanlator": "Sup!",
 			"uploadDate": 1427922000000,
@@ -106,9 +97,8 @@
 		},
 		{
 			"id": 3552943969433541668,
-			"title": "2 - 4",
+			"name": "2 - 4",
 			"number": 9,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/4",
 			"scanlator": "Sup!",
 			"uploadDate": 1436907600000,
@@ -116,9 +106,8 @@
 		},
 		{
 			"id": 3552943969433541669,
-			"title": "2 - 5",
+			"name": "2 - 5",
 			"number": 10,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/5",
 			"scanlator": "Sup!",
 			"uploadDate": 1446674400000,
@@ -126,9 +115,8 @@
 		},
 		{
 			"id": 3552943969433541670,
-			"title": "2 - 6",
+			"name": "2 - 6",
 			"number": 11,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/6",
 			"scanlator": "Sup!",
 			"uploadDate": 1451512800000,
@@ -136,9 +124,8 @@
 		},
 		{
 			"id": 3552943969433542626,
-			"title": "3 - 1",
+			"name": "3 - 1",
 			"number": 12,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -146,9 +133,8 @@
 		},
 		{
 			"id": 3552943969433542627,
-			"title": "3 - 2",
+			"name": "3 - 2",
 			"number": 13,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -156,9 +142,8 @@
 		},
 		{
 			"id": 3552943969433542628,
-			"title": "3 - 3",
+			"name": "3 - 3",
 			"number": 14,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/3",
 			"scanlator": "",
 			"uploadDate": 1465851600000,
@@ -166,4 +151,4 @@
 		}
 	],
 	"source": "READMANGA_RU"
-}
+}

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

@@ -1,29 +1,19 @@
 package org.koitharu.kotatsu
 
 import androidx.test.platform.app.InstrumentationRegistry
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.JsonReader
-import com.squareup.moshi.JsonWriter
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.ToJson
+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.core.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import java.time.Instant
-import java.util.Date
+import java.util.*
 import kotlin.reflect.KClass
 
 object SampleData {
 
 	private val moshi = Moshi.Builder()
 		.add(DateAdapter())
-		.add(InstantAdapter())
-		.add(MangaSourceAdapter())
 		.add(KotlinJsonAdapterFactory())
 		.build()
 
@@ -61,36 +51,4 @@ object SampleData {
 			writer.value(value?.time ?: 0L)
 		}
 	}
-
-	private class MangaSourceAdapter : JsonAdapter<MangaSource>() {
-
-		@FromJson
-		override fun fromJson(reader: JsonReader): MangaSource? {
-			val name = reader.nextString() ?: return null
-			return MangaSource(name)
-		}
-
-		@ToJson
-		override fun toJson(writer: JsonWriter, value: MangaSource?) {
-			writer.value(value?.name)
-		}
-	}
-
-	private class InstantAdapter : JsonAdapter<Instant>() {
-
-		@FromJson
-		override fun fromJson(reader: JsonReader): Instant? {
-			val ms = reader.nextLong()
-			return if (ms == 0L) {
-				null
-			} else {
-				Instant.ofEpochMilli(ms)
-			}
-		}
-
-		@ToJson
-		override fun toJson(writer: JsonWriter, value: Instant?) {
-			writer.value(value?.toEpochMilli() ?: 0L)
-		}
-	}
-}
+}

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

@@ -17,7 +17,7 @@ class MangaDatabaseTest {
 		MangaDatabase::class.java,
 	)
 
-	private val migrations = getDatabaseMigrations(InstrumentationRegistry.getInstrumentation().targetContext)
+	private val migrations = databaseMigrations
 
 	@Test
 	fun versions() {

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

@@ -8,6 +8,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
@@ -18,12 +19,11 @@ import org.junit.runner.RunWith
 import org.koitharu.kotatsu.SampleData
 import org.koitharu.kotatsu.awaitForIdle
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.history.data.HistoryRepository
-import javax.inject.Inject
+import org.koitharu.kotatsu.history.domain.HistoryRepository
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class AppShortcutManagerTest {
+class ShortcutsUpdaterTest {
 
 	@get:Rule
 	var hiltRule = HiltAndroidRule(this)
@@ -32,7 +32,7 @@ class AppShortcutManagerTest {
 	lateinit var historyRepository: HistoryRepository
 
 	@Inject
-	lateinit var appShortcutManager: AppShortcutManager
+	lateinit var shortcutsUpdater: ShortcutsUpdater
 
 	@Inject
 	lateinit var database: MangaDatabase
@@ -48,7 +48,6 @@ class AppShortcutManagerTest {
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
 			return@runTest
 		}
-		database.invalidationTracker.addObserver(appShortcutManager)
 		awaitUpdate()
 		assertTrue(getShortcuts().isEmpty())
 		historyRepository.addOrUpdate(
@@ -57,7 +56,6 @@ class AppShortcutManagerTest {
 			page = 4,
 			scroll = 2,
 			percent = 0.3f,
-			force = false,
 		)
 		awaitUpdate()
 
@@ -74,6 +72,6 @@ class AppShortcutManagerTest {
 	private suspend fun awaitUpdate() {
 		val instrumentation = InstrumentationRegistry.getInstrumentation()
 		instrumentation.awaitForIdle()
-		appShortcutManager.await()
+		shortcutsUpdater.await()
 	}
 }

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

@@ -5,24 +5,21 @@ 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.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
+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.backups.data.BackupRepository
-import org.koitharu.kotatsu.backups.domain.AppBackupAgent
+import org.koitharu.kotatsu.core.backup.BackupRepository
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.history.data.HistoryRepository
-import java.io.File
-import javax.inject.Inject
+import org.koitharu.kotatsu.history.domain.HistoryRepository
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
@@ -55,7 +52,6 @@ class AppBackupAgentTest {
 			title = SampleData.favouriteCategory.title,
 			sortOrder = SampleData.favouriteCategory.order,
 			isTrackerEnabled = SampleData.favouriteCategory.isTrackingEnabled,
-			isVisibleOnShelf = SampleData.favouriteCategory.isVisibleInLibrary,
 		)
 		favouritesRepository.addToCategory(categoryId = category.id, mangas = listOf(SampleData.manga))
 		historyRepository.addOrUpdate(
@@ -64,7 +60,6 @@ class AppBackupAgentTest {
 			page = 3,
 			scroll = 40,
 			percent = 0.2f,
-			force = false,
 		)
 		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
 
@@ -86,7 +81,7 @@ class AppBackupAgentTest {
 		assertEquals(history, historyRepository.getOne(SampleData.manga))
 		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
 
-		val allTags = database.getTagsDao().findTags(SampleData.tag.source.name).toMangaTags()
+		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
 		assertTrue(SampleData.tag in allTags)
 	}
 

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

@@ -0,0 +1,198 @@
+package org.koitharu.kotatsu.tracker.domain
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
+import junit.framework.TestCase.*
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.koitharu.kotatsu.SampleData
+import org.koitharu.kotatsu.base.domain.MangaDataRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+
+@HiltAndroidTest
+@RunWith(AndroidJUnit4::class)
+class TrackerTest {
+
+	@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 {
+		val manga = loadManga("full.json")
+		tracker.deleteTrack(manga.id)
+
+		tracker.checkUpdates(manga, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(manga.id))
+		tracker.checkUpdates(manga, commit = true).apply {
+			assertTrue(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(manga.id))
+	}
+
+	@Test
+	fun hasUpdates() = runTest {
+		val mangaFirst = loadManga("first_chapters.json")
+		val mangaFull = loadManga("full.json")
+		tracker.deleteTrack(mangaFirst.id)
+
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assertEquals(3, newChapters.size)
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	@Test
+	fun badIds() = runTest {
+		val mangaFirst = loadManga("first_chapters.json")
+		val mangaBad = loadManga("bad_ids.json")
+		tracker.deleteTrack(mangaFirst.id)
+
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaBad, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	@Test
+	fun badIds2() = runTest {
+		val mangaFirst = loadManga("first_chapters.json")
+		val mangaBad = loadManga("bad_ids.json")
+		val mangaFull = loadManga("full.json")
+		tracker.deleteTrack(mangaFirst.id)
+
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assertEquals(3, newChapters.size)
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaBad, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	@Test
+	fun fullReset() = runTest {
+		val mangaFull = loadManga("full.json")
+		val mangaFirst = loadManga("first_chapters.json")
+		val mangaEmpty = loadManga("empty.json")
+		tracker.deleteTrack(mangaFull.id)
+
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaEmpty, commit = true).apply {
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assertEquals(3, newChapters.size)
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaEmpty, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+	}
+
+	@Test
+	fun syncWithHistory() = runTest {
+		val mangaFull = loadManga("full.json")
+		val mangaFirst = loadManga("first_chapters.json")
+		tracker.deleteTrack(mangaFull.id)
+
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assertEquals(3, newChapters.size)
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
+
+		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(0, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	private suspend fun loadManga(name: String): Manga {
+		val manga = SampleData.loadAsset("manga/$name", Manga::class)
+		dataRepository.storeManga(manga)
+		return manga
+	}
+}

app/src/androidTest/kotlin/org/koitharu/kotatsu/HiltTestRunner.kt

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.app.Application
-import android.content.Context
-import androidx.test.runner.AndroidJUnitRunner
-import dagger.hilt.android.testing.HiltTestApplication
-
-class HiltTestRunner : AndroidJUnitRunner() {
-
-    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
-        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
-    }
-}

app/src/debug/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.core.network
 
 import android.util.Log
 import okhttp3.Interceptor
-import okhttp3.Request
 import okhttp3.Response
 import okio.Buffer
 import org.koitharu.kotatsu.core.network.CommonHeaders.ACCEPT_ENCODING
@@ -11,13 +10,8 @@ class CurlLoggingInterceptor(
 	private val curlOptions: String? = null
 ) : Interceptor {
 
-	private val escapeRegex = Regex("([\\[\\]\"])")
-
-	override fun intercept(chain: Interceptor.Chain): Response = chain.proceed(chain.request()).also {
-		logRequest(it.networkResponse?.request ?: it.request)
-	}
-
-	private fun logRequest(request: Request) {
+	override fun intercept(chain: Interceptor.Chain): Response {
+		val request = chain.request()
 		var isCompressed = false
 
 		val curlCmd = StringBuilder()
@@ -46,15 +40,15 @@ class CurlLoggingInterceptor(
 		if (isCompressed) {
 			curlCmd.append(" --compressed")
 		}
-		curlCmd.append(" \"").append(request.url.toString().escape()).append('"')
+		curlCmd.append(" \"").append(request.url).append('"')
 
 		log("---cURL (" + request.url + ")")
 		log(curlCmd.toString())
+
+		return chain.proceed(request)
 	}
 
-	private fun String.escape() = replace(escapeRegex) { match ->
-		"\\" + match.value
-	}
+	private fun String.escape() = replace("\"", "\\\"")
 
 	private fun log(msg: String) {
 		Log.d("CURL", msg)

app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.core.parser
+
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import java.util.EnumSet
+
+/**
+ * This parser is just for parser development, it should not be used in releases
+ */
+class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
+
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("", null)
+
+	override val sortOrders: Set<SortOrder>
+		get() = EnumSet.allOf(SortOrder::class.java)
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getList(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder,
+	): List<Manga> {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		TODO("Not yet implemented")
+	}
+}

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

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

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

@@ -1,91 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Build
-import android.os.StrictMode
-import androidx.core.content.edit
-import androidx.fragment.app.strictmode.FragmentStrictMode
-import leakcanary.LeakCanary
-import org.koitharu.kotatsu.core.BaseApp
-
-class KotatsuApp : BaseApp() {
-
-	var isLeakCanaryEnabled: Boolean
-		get() = getDebugPreferences(this).getBoolean(KEY_LEAK_CANARY, true)
-		set(value) {
-			getDebugPreferences(this).edit { putBoolean(KEY_LEAK_CANARY, value) }
-			configureLeakCanary()
-		}
-
-	override fun attachBaseContext(base: Context) {
-		super.attachBaseContext(base)
-		enableStrictMode()
-		configureLeakCanary()
-	}
-
-	private fun configureLeakCanary() {
-		LeakCanary.config = LeakCanary.config.copy(
-			dumpHeap = isLeakCanaryEnabled,
-		)
-	}
-
-	private fun enableStrictMode() {
-		val notifier = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-			StrictModeNotifier(this)
-		} else {
-			null
-		}
-		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder().apply {
-				detectNetwork()
-				detectDiskWrites()
-				detectCustomSlowCalls()
-				detectResourceMismatches()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) detectUnbufferedIo()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) detectExplicitGc()
-				penaltyLog()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
-					penaltyListener(notifier.executor, notifier)
-				}
-			}.build(),
-		)
-		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder().apply {
-				detectActivityLeaks()
-				detectLeakedSqlLiteObjects()
-				detectLeakedClosableObjects()
-				detectLeakedRegistrationObjects()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					detectContentUriWithoutPermission()
-				}
-				detectFileUriExposure()
-				penaltyLog()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
-					penaltyListener(notifier.executor, notifier)
-				}
-			}.build(),
-		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder().apply {
-			detectWrongFragmentContainer()
-			detectFragmentTagUsage()
-			detectRetainInstanceUsage()
-			detectSetUserVisibleHint()
-			detectWrongNestedHierarchy()
-			detectFragmentReuse()
-			penaltyLog()
-			if (notifier != null) {
-				penaltyListener(notifier)
-			}
-		}.build()
-	}
-
-	private companion object {
-
-		const val PREFS_DEBUG = "_debug"
-		const val KEY_LEAK_CANARY = "leak_canary"
-
-		fun getDebugPreferences(context: Context): SharedPreferences =
-			context.getSharedPreferences(PREFS_DEBUG, MODE_PRIVATE)
-	}
-}

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

@@ -1,73 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.app.Notification
-import android.app.Notification.BigTextStyle
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import android.os.Build
-import android.os.StrictMode
-import android.os.strictmode.Violation
-import androidx.annotation.RequiresApi
-import androidx.core.app.PendingIntentCompat
-import androidx.core.content.getSystemService
-import androidx.fragment.app.strictmode.FragmentStrictMode
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.asExecutor
-import org.koitharu.kotatsu.core.util.ShareHelper
-import kotlin.math.absoluteValue
-import androidx.fragment.app.strictmode.Violation as FragmentViolation
-
-@RequiresApi(Build.VERSION_CODES.P)
-class StrictModeNotifier(
-	private val context: Context,
-) : StrictMode.OnVmViolationListener, StrictMode.OnThreadViolationListener, FragmentStrictMode.OnViolationListener {
-
-	val executor = Dispatchers.Default.asExecutor()
-
-	private val notificationManager by lazy {
-		val nm = checkNotNull(context.getSystemService<NotificationManager>())
-		val channel = NotificationChannel(
-			CHANNEL_ID,
-			context.getString(R.string.strict_mode),
-			NotificationManager.IMPORTANCE_LOW,
-		)
-		nm.createNotificationChannel(channel)
-		nm
-	}
-
-	override fun onVmViolation(v: Violation) = showNotification(v)
-
-	override fun onThreadViolation(v: Violation) = showNotification(v)
-
-	override fun onViolation(violation: FragmentViolation) = showNotification(violation)
-
-	private fun showNotification(violation: Throwable) = Notification.Builder(context, CHANNEL_ID)
-		.setSmallIcon(R.drawable.ic_bug)
-		.setContentTitle(context.getString(R.string.strict_mode))
-		.setContentText(violation.message)
-		.setStyle(
-			BigTextStyle()
-				.setBigContentTitle(context.getString(R.string.strict_mode))
-				.setSummaryText(violation.message)
-				.bigText(violation.stackTraceToString()),
-		).setShowWhen(true)
-		.setContentIntent(
-			PendingIntentCompat.getActivity(
-				context,
-				violation.hashCode(),
-				ShareHelper(context).getShareTextIntent(violation.stackTraceToString()),
-				0,
-				false,
-			),
-		)
-		.setAutoCancel(true)
-		.setGroup(CHANNEL_ID)
-		.build()
-		.let { notificationManager.notify(CHANNEL_ID, violation.hashCode().absoluteValue, it) }
-
-	private companion object {
-
-		const val CHANNEL_ID = "strict_mode"
-	}
-}

app/src/debug/kotlin/org/koitharu/kotatsu/core/parser/TestMangaRepository.kt

@@ -1,57 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.model.TestMangaSource
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
-import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import java.util.EnumSet
-
-/*
- This class is for parser development and testing purposes
- You can open it in the app via Settings -> Debug
- */
-class TestMangaRepository(
-	@Suppress("unused") private val loaderContext: MangaLoaderContext,
-	cache: MemoryContentCache
-) : CachingMangaRepository(cache) {
-
-	override val source = TestMangaSource
-
-	override val sortOrders: Set<SortOrder> = EnumSet.allOf(SortOrder::class.java)
-
-	override var defaultSortOrder: SortOrder
-		get() = sortOrders.first()
-		set(value) = Unit
-
-	override val filterCapabilities = MangaListFilterCapabilities()
-
-	override suspend fun getFilterOptions() = MangaListFilterOptions()
-
-	override suspend fun getList(
-		offset: Int,
-		order: SortOrder?,
-		filter: MangaListFilter?
-	): List<Manga> = TODO("Get manga list by filter")
-
-	override suspend fun getDetailsImpl(
-		manga: Manga
-	): Manga = TODO("Fetch manga details")
-
-	override suspend fun getPagesImpl(
-		chapter: MangaChapter
-	): List<MangaPage> = TODO("Get pages for specific chapter")
-
-	override suspend fun getPageUrl(
-		page: MangaPage
-	): String = TODO("Return direct url of page image or page.url if it is already a direct url")
-
-	override suspend fun getRelatedMangaImpl(
-		seed: Manga
-	): List<Manga> = TODO("Get list of related manga. This method is optional and parser library has a default implementation")
-}

app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt

@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.content.Context
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.LifecycleService
-import leakcanary.AppWatcher
-
-abstract class BaseService : LifecycleService() {
-
-	override fun attachBaseContext(newBase: Context) {
-		super.attachBaseContext(ContextCompat.getContextForLanguage(newBase))
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		AppWatcher.objectWatcher.watch(
-			watchedObject = this,
-			description = "${javaClass.simpleName} service received Service#onDestroy() callback",
-		)
-	}
-}

app/src/debug/kotlin/org/koitharu/kotatsu/core/util/ext/Debug.kt

@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.core.util.ext
-
-import android.os.Looper
-
-fun Throwable.printStackTraceDebug() = printStackTrace()
-
-fun assertNotInMainThread() = check(Looper.myLooper() != Looper.getMainLooper()) {
-	"Calling this from the main thread is prohibited"
-}

app/src/debug/kotlin/org/koitharu/kotatsu/settings/DebugSettingsFragment.kt

@@ -1,72 +0,0 @@
-package org.koitharu.kotatsu.settings
-
-import android.os.Bundle
-import androidx.preference.Preference
-import leakcanary.LeakCanary
-import org.koitharu.kotatsu.KotatsuApp
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.TestMangaSource
-import org.koitharu.kotatsu.core.nav.router
-import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
-import org.koitharu.kotatsu.settings.utils.SplitSwitchPreference
-import org.koitharu.workinspector.WorkInspector
-
-class DebugSettingsFragment : BasePreferenceFragment(R.string.debug), Preference.OnPreferenceChangeListener,
-	Preference.OnPreferenceClickListener {
-
-	private val application
-		get() = requireContext().applicationContext as KotatsuApp
-
-	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-		addPreferencesFromResource(R.xml.pref_debug)
-		findPreference<SplitSwitchPreference>(KEY_LEAK_CANARY)?.let { pref ->
-			pref.isChecked = application.isLeakCanaryEnabled
-			pref.onPreferenceChangeListener = this
-			pref.onContainerClickListener = this
-		}
-	}
-
-	override fun onResume() {
-		super.onResume()
-		findPreference<SplitSwitchPreference>(KEY_LEAK_CANARY)?.isChecked = application.isLeakCanaryEnabled
-	}
-
-	override fun onPreferenceTreeClick(preference: Preference): Boolean = when (preference.key) {
-		KEY_WORK_INSPECTOR -> {
-			startActivity(WorkInspector.getIntent(preference.context))
-			true
-		}
-
-		KEY_TEST_PARSER -> {
-			router.openList(TestMangaSource, null, null)
-			true
-		}
-
-		else -> super.onPreferenceTreeClick(preference)
-	}
-
-	override fun onPreferenceClick(preference: Preference): Boolean = when (preference.key) {
-		KEY_LEAK_CANARY -> {
-			startActivity(LeakCanary.newLeakDisplayActivityIntent())
-			true
-		}
-
-		else -> super.onPreferenceTreeClick(preference)
-	}
-
-	override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean = when (preference.key) {
-		KEY_LEAK_CANARY -> {
-			application.isLeakCanaryEnabled = newValue as Boolean
-			true
-		}
-
-		else -> false
-	}
-
-	private companion object {
-
-		const val KEY_LEAK_CANARY = "leak_canary"
-		const val KEY_WORK_INSPECTOR = "work_inspector"
-		const val KEY_TEST_PARSER = "test_parser"
-	}
-}

app/src/debug/res/drawable-anydpi-v24/ic_bug.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.98150784"
-      android:scaleY="0.98150784"
-      android:translateX="0.22190611"
-      android:translateY="-0.2688478">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
-  </group>
-</vector>

app/src/debug/res/drawable/ic_debug.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?attr/colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M20,8H17.19C16.74,7.2 16.12,6.5 15.37,6L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.05,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6C7.87,6.5 7.26,7.21 6.81,8H4V10H6.09C6.03,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.03,15.67 6.09,16H4V18H6.81C8.47,20.87 12.14,21.84 15,20.18C15.91,19.66 16.67,18.9 17.19,18H20V16H17.91C17.97,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.97,10.33 17.91,10H20V8M16,15A4,4 0 0,1 12,19A4,4 0 0,1 8,15V11A4,4 0 0,1 12,7A4,4 0 0,1 16,11V15M14,10V12H10V10H14M10,14H14V16H10V14Z" />
-</vector>

app/src/debug/res/menu/opt_settings.xml

@@ -4,8 +4,8 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<item
-		android:id="@+id/action_retry"
-		android:title="@string/try_again"
+		android:id="@id/action_leaks"
+		android:title="@string/leak_canary_display_activity_label"
 		app:showAsAction="never" />
 
-</menu>
+</menu>

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

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

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

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

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

@@ -1,4 +1,3 @@
 <resources>
 	<string name="app_name" translatable="false">Kotatsu Dev</string>
-	<string name="strict_mode">Strict mode</string>
-</resources>
+</resources>

app/src/debug/res/xml/pref_debug.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<org.koitharu.kotatsu.settings.utils.SplitSwitchPreference
-		android:key="leak_canary"
-		android:persistent="false"
-		android:title="LeakCanary" />
-
-	<Preference
-		android:key="work_inspector"
-		android:persistent="false"
-		android:title="@string/wi_lib_name" />
-
-	<Preference
-		android:key="test_parser"
-		android:persistent="false"
-		android:title="@string/test_parser"
-		app:allowDividerAbove="true" />
-
-
-</androidx.preference.PreferenceScreen>

app/src/debug/res/xml/pref_root_debug.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<PreferenceScreen
-		android:fragment="org.koitharu.kotatsu.settings.DebugSettingsFragment"
-		android:icon="@drawable/ic_debug"
-		android:key="debug"
-		android:title="@string/debug" />
-
-</androidx.preference.PreferenceScreen>

app/src/main/assets/isrgrootx1.pem

@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
-WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
-ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
-h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
-0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
-A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
-T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
-B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
-B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
-KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
-OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
-jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
-qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
-rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
-hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
-ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
-3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
-NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
-ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
-TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
-jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
-oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
-4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
-mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
-emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
------END CERTIFICATE-----

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

@@ -0,0 +1,140 @@
+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 kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.acra.ReportField
+import org.acra.config.dialog
+import org.acra.config.httpSender
+import org.acra.data.StringFormat
+import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+import javax.inject.Inject
+
+@HiltAndroidApp
+class KotatsuApp : Application(), Configuration.Provider {
+
+	@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()
+		}
+		AppCompatDelegate.setDefaultNightMode(settings.theme)
+		AppCompatDelegate.setApplicationLocales(settings.appLocales)
+		setupActivityLifecycleCallbacks()
+		processLifecycleScope.launch(Dispatchers.Default) {
+			setupDatabaseObservers()
+		}
+	}
+
+	override fun attachBaseContext(base: Context?) {
+		super.attachBaseContext(base)
+		initAcra {
+			buildConfigClass = BuildConfig::class.java
+			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.INSTALLATION_ID,
+				ReportField.APP_VERSION_CODE,
+				ReportField.APP_VERSION_NAME,
+				ReportField.ANDROID_VERSION,
+				ReportField.PHONE_MODEL,
+				ReportField.STACK_TRACE,
+				ReportField.CRASH_CONFIGURATION,
+				ReportField.SHARED_PREFERENCES,
+			)
+			dialog {
+				text = getString(R.string.crash_text)
+				title = getString(R.string.error_occurred)
+				positiveButtonText = getString(R.string.send)
+				resIcon = R.drawable.ic_alert_outline
+				resTheme = android.R.style.Theme_Material_Light_Dialog_Alert
+			}
+		}
+	}
+
+	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)
+		}
+	}
+
+	private fun enableStrictMode() {
+		StrictMode.setThreadPolicy(
+			StrictMode.ThreadPolicy.Builder()
+				.detectAll()
+				.penaltyLog()
+				.build(),
+		)
+		StrictMode.setVmPolicy(
+			StrictMode.VmPolicy.Builder()
+				.detectAll()
+				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
+				.setClassInstanceLimit(PagesCache::class.java, 1)
+				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+				.penaltyLog()
+				.build(),
+		)
+		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
+			.penaltyDeath()
+			.detectFragmentReuse()
+			.detectWrongFragmentContainer()
+			.detectRetainInstanceUsage()
+			.detectSetUserVisibleHint()
+			.detectFragmentTagUsage()
+			.build()
+	}
+}

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

@@ -0,0 +1,168 @@
+package org.koitharu.kotatsu.base.domain
+
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.util.Size
+import androidx.room.withTransaction
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runInterruptible
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
+import org.koitharu.kotatsu.core.db.entity.toEntities
+import org.koitharu.kotatsu.core.db.entity.toEntity
+import org.koitharu.kotatsu.core.db.entity.toManga
+import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.prefs.ReaderMode
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
+import java.io.File
+import java.io.InputStream
+import java.util.zip.ZipFile
+import javax.inject.Inject
+import kotlin.math.roundToInt
+
+private const val MIN_WEBTOON_RATIO = 2
+
+class MangaDataRepository @Inject constructor(
+	private val okHttpClient: OkHttpClient,
+	private val db: MangaDatabase,
+) {
+
+	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
+		db.withTransaction {
+			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(
+				entity.copy(
+					cfBrightness = colorFilter?.brightness ?: 0f,
+					cfContrast = colorFilter?.contrast ?: 0f,
+				),
+			)
+		}
+	}
+
+	suspend fun getReaderMode(mangaId: Long): ReaderMode? {
+		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()
+	}
+
+	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
+		intent.manga != null -> intent.manga
+		intent.mangaId != 0L -> findMangaById(intent.mangaId)
+		else -> null // TODO resolve uri
+	}
+
+	suspend fun storeManga(manga: Manga) {
+		val tags = manga.tags.toEntities()
+		db.withTransaction {
+			db.tagsDao.upsert(tags)
+			db.mangaDao.upsert(manga.toEntity(), tags)
+		}
+	}
+
+	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()
+				.tag(MangaSource::class.java, page.source)
+				.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

@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.base.domain
+
+import android.content.Intent
+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?,
+	val mangaId: Long,
+	val uri: Uri?,
+) {
+
+	constructor(intent: Intent?) : this(
+		manga = intent?.getParcelableExtraCompat<ParcelableManga>(KEY_MANGA)?.manga,
+		mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
+		uri = intent?.data,
+	)
+
+	constructor(args: Bundle?) : this(
+		manga = args?.getParcelableCompat<ParcelableManga>(KEY_MANGA)?.manga,
+		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
+		uri = null,
+	)
+
+	companion object {
+
+		const val ID_NONE = 0L
+
+		const val KEY_MANGA = "manga"
+		const val KEY_ID = "id"
+	}
+}

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

@@ -1,20 +1,19 @@
-package org.koitharu.kotatsu.core.ui.util
+package org.koitharu.kotatsu.base.domain
 
-import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 fun interface ReversibleHandle {
 
 	suspend fun reverse()
 }
 
-fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default, CoroutineStart.ATOMIC) {
+fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default) {
 	runCatchingCancellable {
 		withContext(NonCancellable) {
 			reverse()
@@ -23,3 +22,8 @@ fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.D
 		it.printStackTraceDebug()
 	}
 }
+
+operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {
+	this.reverse()
+	other.reverse()
+}

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

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

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

@@ -0,0 +1,147 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.CallSuper
+import androidx.appcompat.app.AppCompatActivity
+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 dagger.hilt.android.EntryPointAccessors
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.base.ui.util.BaseActivityEntryPoint
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
+import org.koitharu.kotatsu.base.ui.util.inject
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import javax.inject.Inject
+
+abstract class BaseActivity<B : ViewBinding> :
+	AppCompatActivity(),
+	WindowInsetsDelegate.WindowInsetsListener {
+
+	@Inject
+	lateinit var settings: AppSettings
+
+	protected lateinit var binding: B
+		private set
+
+	@Suppress("LeakingThis")
+	protected val exceptionResolver = ExceptionResolver(this)
+
+	@Suppress("LeakingThis")
+	protected val insetsDelegate = WindowInsetsDelegate(this)
+
+	val actionModeDelegate = ActionModeDelegate()
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).inject(this)
+		setTheme(settings.colorScheme.styleResId)
+		if (settings.isAmoledTheme) {
+			setTheme(R.style.ThemeOverlay_Kotatsu_Amoled)
+		}
+		super.onCreate(savedInstanceState)
+		WindowCompat.setDecorFitsSystemWindows(window, false)
+		insetsDelegate.handleImeInsets = true
+	}
+
+	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
+	override fun setContentView(layoutResID: Int) {
+		super.setContentView(layoutResID)
+		setupToolbar()
+	}
+
+	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
+	override fun setContentView(view: View?) {
+		super.setContentView(view)
+		setupToolbar()
+	}
+
+	protected fun setContentView(binding: B) {
+		this.binding = binding
+		super.setContentView(binding.root)
+		val toolbar = (binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)
+		toolbar?.let(this::setSupportActionBar)
+		insetsDelegate.onViewCreated(binding.root)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
+		@Suppress("DEPRECATION")
+		onBackPressed()
+		true
+	} else super.onOptionsItemSelected(item)
+
+	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+			ActivityCompat.recreate(this)
+			return true
+		}
+		return super.onKeyDown(keyCode, event)
+	}
+
+	private fun setupToolbar() {
+		(findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
+	}
+
+	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 && 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
+		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)
+	}
+
+	@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
+	@Deprecated("Should not be used")
+	override fun onBackPressed() {
+		if ( // https://issuetracker.google.com/issues/139738913
+			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&
+			isTaskRoot &&
+			supportFragmentManager.backStackEntryCount == 0
+		) {
+			finishAfterTransition()
+		} else {
+			super.onBackPressed()
+		}
+	}
+}

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

@@ -0,0 +1,93 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.app.Dialog
+import android.os.Bundle
+import android.util.DisplayMetrics
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams
+import androidx.activity.OnBackPressedDispatcher
+import androidx.core.view.updateLayoutParams
+import androidx.viewbinding.ViewBinding
+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() {
+
+	private var viewBinding: B? = null
+
+	protected val binding: B
+		get() = checkNotNull(viewBinding)
+
+	protected val behavior: BottomSheetBehavior<*>?
+		get() = (dialog as? BottomSheetDialog)?.behavior
+
+	val isExpanded: Boolean
+		get() = behavior?.state == BottomSheetBehavior.STATE_EXPANDED
+
+	val onBackPressedDispatcher: OnBackPressedDispatcher
+		get() = (requireDialog() as AppBottomSheetDialog).onBackPressedDispatcher
+
+	final override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?,
+	): View {
+		val binding = onInflateView(inflater, container)
+		viewBinding = binding
+
+		// Enforce max width for tablets
+		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
+		if (width > 0) {
+			behavior?.maxWidth = width
+		}
+
+		// Set peek height to 50% display height
+		requireContext().displayCompat?.let {
+			val metrics = DisplayMetrics()
+			it.getRealMetrics(metrics)
+			behavior?.peekHeight = (metrics.heightPixels * 0.4).toInt()
+		}
+
+		return binding.root
+	}
+
+	override fun onDestroyView() {
+		viewBinding = null
+		super.onDestroyView()
+	}
+
+	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+		return AppBottomSheetDialog(requireContext(), theme)
+	}
+
+	fun addBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback) {
+		val b = behavior ?: return
+		b.addBottomSheetCallback(callback)
+		val rootView = dialog?.findViewById<View>(materialR.id.design_bottom_sheet)
+		if (rootView != null) {
+			callback.onStateChanged(rootView, b.state)
+		}
+	}
+
+	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
+
+	protected fun setExpanded(isExpanded: Boolean, isLocked: Boolean) {
+		val b = behavior ?: return
+		if (isExpanded) {
+			b.state = BottomSheetBehavior.STATE_EXPANDED
+		}
+		b.isFitToContents = !isExpanded
+		val rootView = dialog?.findViewById<View>(materialR.id.design_bottom_sheet)
+		rootView?.updateLayoutParams {
+			height = if (isExpanded) LayoutParams.MATCH_PARENT else LayoutParams.WRAP_CONTENT
+		}
+		b.isDraggable = !isLocked
+	}
+}

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

@@ -0,0 +1,55 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+
+abstract class BaseFragment<B : ViewBinding> :
+	Fragment(),
+	WindowInsetsDelegate.WindowInsetsListener {
+
+	private var viewBinding: B? = null
+
+	protected val binding: B
+		get() = checkNotNull(viewBinding)
+
+	@Suppress("LeakingThis")
+	protected val exceptionResolver = ExceptionResolver(this)
+
+	@Suppress("LeakingThis")
+	protected val insetsDelegate = WindowInsetsDelegate(this)
+
+	protected val actionModeDelegate: ActionModeDelegate
+		get() = (requireActivity() as BaseActivity<*>).actionModeDelegate
+
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?
+	): View? {
+		val binding = onInflateView(inflater, container)
+		viewBinding = binding
+		return binding.root
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		insetsDelegate.onViewCreated(view)
+	}
+
+	override fun onDestroyView() {
+		viewBinding = null
+		insetsDelegate.onDestroyView()
+		super.onDestroyView()
+	}
+
+	protected fun bindingOrNull() = viewBinding
+
+	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
+}

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

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

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

@@ -0,0 +1,63 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.CallSuper
+import androidx.annotation.StringRes
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import androidx.preference.PreferenceFragmentCompat
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.settings.SettingsHeadersFragment
+
+@AndroidEntryPoint
+abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
+	PreferenceFragmentCompat(),
+	WindowInsetsDelegate.WindowInsetsListener,
+	RecyclerViewOwner {
+
+	@Inject
+	lateinit var settings: AppSettings
+
+	@Suppress("LeakingThis")
+	protected val insetsDelegate = WindowInsetsDelegate(this)
+
+	override val recyclerView: RecyclerView
+		get() = listView
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		listView.clipToPadding = false
+		insetsDelegate.onViewCreated(view)
+	}
+
+	override fun onDestroyView() {
+		insetsDelegate.onDestroyView()
+		super.onDestroyView()
+	}
+
+	override fun onResume() {
+		super.onResume()
+		if (titleId != 0) {
+			setTitle(getString(titleId))
+		}
+	}
+
+	@CallSuper
+	override fun onWindowInsetsChanged(insets: Insets) {
+		listView.updatePadding(
+			bottom = insets.bottom,
+		)
+	}
+
+	@Suppress("UsePropertyAccessSyntax")
+	protected fun setTitle(title: CharSequence) {
+		(parentFragment as? SettingsHeadersFragment)?.setTitle(title)
+			?: activity?.setTitle(title)
+	}
+}

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

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

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

@@ -0,0 +1,49 @@
+package org.koitharu.kotatsu.base.ui
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+import kotlinx.coroutines.*
+import org.koitharu.kotatsu.base.ui.util.CountedBooleanLiveData
+import org.koitharu.kotatsu.utils.SingleLiveEvent
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+
+abstract class BaseViewModel : ViewModel() {
+
+	protected val loadingCounter = CountedBooleanLiveData()
+	protected val errorEvent = SingleLiveEvent<Throwable>()
+
+	val onError: LiveData<Throwable>
+		get() = errorEvent
+
+	val isLoading: LiveData<Boolean>
+		get() = loadingCounter
+
+	protected fun launchJob(
+		context: CoroutineContext = EmptyCoroutineContext,
+		start: CoroutineStart = CoroutineStart.DEFAULT,
+		block: suspend CoroutineScope.() -> Unit
+	): Job = viewModelScope.launch(context + createErrorHandler(), start, block)
+
+	protected fun launchLoadingJob(
+		context: CoroutineContext = EmptyCoroutineContext,
+		start: CoroutineStart = CoroutineStart.DEFAULT,
+		block: suspend CoroutineScope.() -> Unit
+	): Job = viewModelScope.launch(context + createErrorHandler(), start) {
+		loadingCounter.increment()
+		try {
+			block()
+		} finally {
+			loadingCounter.decrement()
+		}
+	}
+
+	private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
+		throwable.printStackTraceDebug()
+		if (throwable !is CancellationException) {
+			errorEvent.postCall(throwable)
+		}
+	}
+}

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

@@ -0,0 +1,51 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.app.Service
+import android.content.Intent
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+
+abstract class CoroutineIntentService : BaseService() {
+
+	private val mutex = Mutex()
+	protected open val dispatcher: CoroutineDispatcher = Dispatchers.Default
+
+	final override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
+		launchCoroutine(intent, startId)
+		return Service.START_REDELIVER_INTENT
+	}
+
+	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch(errorHandler(startId)) {
+		mutex.withLock {
+			try {
+				if (intent != null) {
+					withContext(dispatcher) {
+						processIntent(startId, intent)
+					}
+				}
+			} catch (e: Throwable) {
+				e.printStackTraceDebug()
+				onError(startId, e)
+			} finally {
+				stopSelf(startId)
+			}
+		}
+	}
+
+	protected abstract suspend fun processIntent(startId: Int, intent: Intent)
+
+	protected abstract fun onError(startId: Int, error: Throwable)
+
+	private fun errorHandler(startId: Int) = CoroutineExceptionHandler { _, throwable ->
+		throwable.printStackTraceDebug()
+		onError(startId, throwable)
+	}
+}

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

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

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

@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.base.ui.dialog
+
+import android.content.Context
+import android.graphics.Color
+import android.view.View
+import com.google.android.material.bottomsheet.BottomSheetDialog
+
+class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(context, theme) {
+
+	/**
+	 * https://github.com/material-components/material-components-android/issues/2582
+	 */
+	@Suppress("DEPRECATION")
+	override fun onAttachedToWindow() {
+		val window = window
+		val initialSystemUiVisibility = window?.decorView?.systemUiVisibility ?: 0
+		super.onAttachedToWindow()
+		if (window != null) {
+			// If the navigation bar is translucent at all, the BottomSheet should be edge to edge
+			val drawEdgeToEdge = edgeToEdgeEnabled && Color.alpha(window.navigationBarColor) < 0xFF
+			if (drawEdgeToEdge) {
+				// Copied from super.onAttachedToWindow:
+				val edgeToEdgeFlags = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+				// Fix super-class's window flag bug by respecting the initial system UI visibility:
+				window.decorView.systemUiVisibility = edgeToEdgeFlags or initialSystemUiVisibility
+			}
+		}
+	}
+}

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

@@ -0,0 +1,80 @@
+package org.koitharu.kotatsu.base.ui.dialog
+
+import android.content.Context
+import android.content.DialogInterface
+import android.view.LayoutInflater
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.koitharu.kotatsu.databinding.DialogCheckboxBinding
+
+class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog) :
+	DialogInterface by delegate {
+
+	fun show() = delegate.show()
+
+	class Builder(context: Context) {
+
+		private val binding = DialogCheckboxBinding.inflate(LayoutInflater.from(context))
+
+		private val delegate = MaterialAlertDialogBuilder(context)
+			.setView(binding.root)
+
+		fun setTitle(@StringRes titleResId: Int): Builder {
+			delegate.setTitle(titleResId)
+			return this
+		}
+
+		fun setTitle(title: CharSequence): Builder {
+			delegate.setTitle(title)
+			return this
+		}
+
+		fun setMessage(@StringRes messageId: Int): Builder {
+			delegate.setMessage(messageId)
+			return this
+		}
+
+		fun setMessage(message: CharSequence): Builder {
+			delegate.setMessage(message)
+			return this
+		}
+
+		fun setCheckBoxText(@StringRes textId: Int): Builder {
+			binding.checkbox.setText(textId)
+			return this
+		}
+
+		fun setCheckBoxChecked(isChecked: Boolean): Builder {
+			binding.checkbox.isChecked = isChecked
+			return this
+		}
+
+		fun setIcon(@DrawableRes iconId: Int): Builder {
+			delegate.setIcon(iconId)
+			return this
+		}
+
+		fun setPositiveButton(
+			@StringRes textId: Int,
+			listener: (DialogInterface, Boolean) -> Unit
+		): Builder {
+			delegate.setPositiveButton(textId) { dialog, _ ->
+				listener(dialog, binding.checkbox.isChecked)
+			}
+			return this
+		}
+
+		fun setNegativeButton(
+			@StringRes textId: Int,
+			listener: DialogInterface.OnClickListener? = null
+		): Builder {
+			delegate.setNegativeButton(textId, listener)
+			return this
+		}
+
+		fun create() = CheckBoxAlertDialog(delegate.create())
+
+	}
+}

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

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

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

@@ -0,0 +1,101 @@
+package org.koitharu.kotatsu.base.ui.dialog
+
+import android.content.Context
+import android.content.DialogInterface
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.runBlocking
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ItemStorageBinding
+import org.koitharu.kotatsu.local.data.LocalStorageManager
+import java.io.File
+
+class StorageSelectDialog private constructor(private val delegate: AlertDialog) :
+	DialogInterface by delegate {
+
+	fun show() = delegate.show()
+
+	class Builder(context: Context, storageManager: LocalStorageManager, listener: OnStorageSelectListener) {
+
+		private val adapter = VolumesAdapter(storageManager)
+		private val delegate = MaterialAlertDialogBuilder(context)
+
+		init {
+			if (adapter.isEmpty) {
+				delegate.setMessage(R.string.cannot_find_available_storage)
+			} else {
+				val defaultValue = runBlocking {
+					storageManager.getDefaultWriteableDir()
+				}
+				adapter.selectedItemPosition = adapter.volumes.indexOfFirst {
+					it.first.canonicalPath == defaultValue?.canonicalPath
+				}
+				delegate.setAdapter(adapter) { d, i ->
+					listener.onStorageSelected(adapter.getItem(i).first)
+					d.dismiss()
+				}
+			}
+		}
+
+		fun setTitle(@StringRes titleResId: Int): Builder {
+			delegate.setTitle(titleResId)
+			return this
+		}
+
+		fun setTitle(title: CharSequence): Builder {
+			delegate.setTitle(title)
+			return this
+		}
+
+		fun setNegativeButton(@StringRes textId: Int): Builder {
+			delegate.setNegativeButton(textId, null)
+			return this
+		}
+
+		fun create() = StorageSelectDialog(delegate.create())
+	}
+
+	private class VolumesAdapter(storageManager: LocalStorageManager) : BaseAdapter() {
+
+		var selectedItemPosition: Int = -1
+		val volumes = getAvailableVolumes(storageManager)
+
+		override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+			val view = convertView ?: LayoutInflater.from(parent.context).inflate(R.layout.item_storage, parent, false)
+			val binding = (view.tag as? ItemStorageBinding) ?: ItemStorageBinding.bind(view).also {
+				view.tag = it
+			}
+			val item = volumes[position]
+			binding.imageViewIndicator.isChecked = selectedItemPosition == position
+			binding.textViewTitle.text = item.second
+			binding.textViewSubtitle.text = item.first.path
+			return view
+		}
+
+		override fun getItem(position: Int): Pair<File, String> = volumes[position]
+
+		override fun getItemId(position: Int) = position.toLong()
+
+		override fun getCount() = volumes.size
+
+		override fun hasStableIds() = true
+
+		private fun getAvailableVolumes(storageManager: LocalStorageManager): List<Pair<File, String>> {
+			return runBlocking {
+				storageManager.getWriteableDirs().map {
+					it to storageManager.getStorageDisplayName(it)
+				}
+			}
+		}
+	}
+
+	fun interface OnStorageSelectListener {
+
+		fun onStorageSelected(file: File)
+	}
+}

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

@@ -0,0 +1,20 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.view.View
+import android.view.View.OnClickListener
+import android.view.View.OnLongClickListener
+import com.hannesdorfmann.adapterdelegates4.dsl.AdapterDelegateViewBindingViewHolder
+
+class AdapterDelegateClickListenerAdapter<I>(
+	private val adapterDelegate: AdapterDelegateViewBindingViewHolder<out I, *>,
+	private val clickListener: OnListItemClickListener<I>,
+) : OnClickListener, OnLongClickListener {
+
+	override fun onClick(v: View) {
+		clickListener.onItemClick(adapterDelegate.item, v)
+	}
+
+	override fun onLongClick(v: View): Boolean {
+		return clickListener.onItemLongClick(adapterDelegate.item, v)
+	}
+}

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

@@ -1,49 +1,31 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
-abstract class BoundsScrollListener(
-	@JvmField protected val offsetTop: Int,
-	@JvmField protected val offsetBottom: Int
-) : RecyclerView.OnScrollListener() {
+abstract class BoundsScrollListener(private val offsetTop: Int, private val offsetBottom: Int) :
+	RecyclerView.OnScrollListener() {
+
+	constructor(offset: Int = 0) : this(offset, offset)
 
 	override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
 		super.onScrolled(recyclerView, dx, dy)
-		if (recyclerView.hasPendingAdapterUpdates()) {
-			return
-		}
 		val layoutManager = (recyclerView.layoutManager as? LinearLayoutManager) ?: return
 		val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
 		if (firstVisibleItemPosition == RecyclerView.NO_POSITION) {
 			return
 		}
+		if (firstVisibleItemPosition <= offsetTop) {
+			onScrolledToStart(recyclerView)
+		}
 		val visibleItemCount = layoutManager.childCount
 		val totalItemCount = layoutManager.itemCount
 		if (visibleItemCount + firstVisibleItemPosition >= totalItemCount - offsetBottom) {
 			onScrolledToEnd(recyclerView)
 		}
-		if (firstVisibleItemPosition <= offsetTop) {
-			onScrolledToStart(recyclerView)
-		}
-		onPostScrolled(recyclerView, firstVisibleItemPosition, visibleItemCount)
 	}
 
 	abstract fun onScrolledToStart(recyclerView: RecyclerView)
 
 	abstract fun onScrolledToEnd(recyclerView: RecyclerView)
-
-	protected open fun onPostScrolled(
-		recyclerView: RecyclerView,
-		firstVisibleItemPosition: Int,
-		visibleItemCount: Int
-	) = Unit
-
-	fun invalidate(recyclerView: RecyclerView) {
-		onScrolled(recyclerView, 0, 0)
-	}
-
-	fun postInvalidate(recyclerView: RecyclerView) = recyclerView.post {
-		invalidate(recyclerView)
-	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.content.Context
 import android.util.AttributeSet
@@ -29,9 +29,9 @@ class FitHeightGridLayoutManager : GridLayoutManager {
 		if (orientation == RecyclerView.VERTICAL && child.layoutParams.height == LayoutParams.MATCH_PARENT) {
 			val parentBottom = height - paddingBottom
 			val offset = parentBottom - bottom
-			super.layoutDecoratedWithMargins(child, left, top, right, bottom + offset)
+			super.layoutDecoratedWithMargins(child, left, top + offset, right, bottom + offset)
 		} else {
 			super.layoutDecoratedWithMargins(child, left, top, right, bottom)
 		}
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
 import android.content.Context
 import android.util.AttributeSet
@@ -29,9 +29,9 @@ class FitHeightLinearLayoutManager : LinearLayoutManager {
 		if (orientation == RecyclerView.VERTICAL && child.layoutParams.height == LayoutParams.MATCH_PARENT) {
 			val parentBottom = height - paddingBottom
 			val offset = parentBottom - bottom
-			super.layoutDecoratedWithMargins(child, left, top, right, bottom + offset)
+			super.layoutDecoratedWithMargins(child, left, top + offset, right, bottom + offset)
 		} else {
 			super.layoutDecoratedWithMargins(child, left, top, right, bottom)
 		}
 	}
-}
+}

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

@@ -1,53 +1,46 @@
-package org.koitharu.kotatsu.core.ui.list
+package org.koitharu.kotatsu.base.ui.list
 
+import android.app.Activity
 import android.os.Bundle
 import android.view.Menu
-import android.view.MenuInflater
 import android.view.MenuItem
-import android.view.View
-import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
-import androidx.appcompat.widget.PopupMenu
-import androidx.collection.LongSet
-import androidx.collection.longSetOf
 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 kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
-import org.koitharu.kotatsu.core.util.ext.toLongArray
-import org.koitharu.kotatsu.core.util.ext.toSet
 import kotlin.coroutines.EmptyCoroutineContext
+import kotlinx.coroutines.Dispatchers
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
 
 private const val KEY_SELECTION = "selection"
 private const val PROVIDER_NAME = "selection_decoration"
 
 class ListSelectionController(
-	private val appCompatDelegate: AppCompatDelegate,
+	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 var focusedItemId: LongSet? = null
-
-	var useActionMode: Boolean = true
 
 	val count: Int
-		get() = if (focusedItemId != null) 1 else decoration.checkedItemsCount
+		get() = decoration.checkedItemsCount
 
 	init {
 		registryOwner.lifecycle.addObserver(StateEventObserver())
 	}
 
-	fun snapshot(): Set<Long> = (focusedItemId ?: peekCheckedIds()).toSet()
+	fun snapshot(): Set<Long> {
+		return peekCheckedIds().toSet()
+	}
 
-	fun peekCheckedIds(): LongSet {
-		return focusedItemId ?: decoration.checkedItemsIds
+	fun peekCheckedIds(): Set<Long> {
+		return decoration.checkedItemsIds
 	}
 
 	fun clear() {
@@ -59,7 +52,6 @@ class ListSelectionController(
 		if (ids.isEmpty()) {
 			return
 		}
-		startActionMode()
 		decoration.checkAll(ids)
 		notifySelectionChanged()
 	}
@@ -88,42 +80,16 @@ class ListSelectionController(
 		return false
 	}
 
-	fun onItemLongClick(view: View, id: Long): Boolean {
-		return if (useActionMode) {
-			startSelection(id)
-		} else {
-			onItemContextClick(view, id)
-		}
+	fun onItemLongClick(id: Long): Boolean {
+		startActionMode()
+		return actionMode?.also {
+			decoration.setItemIsChecked(id, true)
+			notifySelectionChanged()
+		} != null
 	}
 
-	fun onItemContextClick(view: View, id: Long): Boolean {
-		focusedItemId = longSetOf(id)
-		val menu = PopupMenu(view.context, view)
-		callback.onCreateActionMode(this, menu.menuInflater, menu.menu)
-		callback.onPrepareActionMode(this, null, menu.menu)
-		menu.setForceShowIcon(true)
-		if (menu.menu.hasVisibleItems()) {
-			menu.setOnMenuItemClickListener { menuItem ->
-				callback.onActionItemClicked(this, null, menuItem)
-			}
-			menu.setOnDismissListener {
-				focusedItemId = null
-			}
-			menu.show()
-			return true
-		} else {
-			focusedItemId = null
-			return false
-		}
-	}
-
-	fun startSelection(id: Long): Boolean = startActionMode()?.also {
-		decoration.setItemIsChecked(id, true)
-		notifySelectionChanged()
-	} != null
-
 	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onCreateActionMode(this, mode.menuInflater, menu)
+		return callback.onCreateActionMode(this, mode, menu)
 	}
 
 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
@@ -140,10 +106,9 @@ class ListSelectionController(
 		actionMode = null
 	}
 
-	private fun startActionMode(): ActionMode? {
-		focusedItemId = null
-		return actionMode ?: appCompatDelegate.startSupportActionMode(this).also {
-			actionMode = it
+	private fun startActionMode() {
+		if (actionMode == null) {
+			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
 		}
 	}
 
@@ -166,18 +131,54 @@ class ListSelectionController(
 		notifySelectionChanged()
 	}
 
-	interface Callback {
+	@Deprecated("")
+	interface Callback : Callback2 {
+
+		fun onSelectionChanged(count: Int)
+
+		fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
+
+		fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
+
+		fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
+
+		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, menuInflater: MenuInflater, menu: Menu): Boolean
+		fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean
 
-		fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode?, menu: Menu): Boolean {
-			mode?.title = controller.count.toString()
+		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 onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean
 
 		fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) = Unit
 	}
@@ -186,7 +187,6 @@ class ListSelectionController(
 
 		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
 			if (event == Lifecycle.Event.ON_CREATE) {
-				source.lifecycle.removeObserver(this)
 				val registry = registryOwner.savedStateRegistry
 				registry.registerSavedStateProvider(PROVIDER_NAME, this@ListSelectionController)
 				val state = registry.consumeRestoredStateForKey(PROVIDER_NAME)

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

@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.view.View
+
+interface OnListItemClickListener<I> {
+
+	fun onItemClick(item: I, view: View)
+
+	fun onItemLongClick(item: I, view: View) = false
+}

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

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

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

@@ -0,0 +1,237 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ActionMode
+import androidx.collection.ArrayMap
+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 kotlinx.coroutines.Dispatchers
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+import kotlin.coroutines.EmptyCoroutineContext
+
+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()
+		}
+		var shouldAddDecoration = true
+		for (i in (0 until recyclerView.itemDecorationCount).reversed()) {
+			val decor = recyclerView.getItemDecorationAt(i)
+			if (decor === decoration) {
+				shouldAddDecoration = false
+				break
+			} else if (decor.javaClass == decoration.javaClass) {
+				recyclerView.removeItemDecorationAt(i)
+			}
+		}
+		if (shouldAddDecoration) {
+			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/AbstractDividerItemDecoration.kt

@@ -0,0 +1,87 @@
+package org.koitharu.kotatsu.base.ui.list.decor
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import android.view.View
+import androidx.core.content.res.getColorOrThrow
+import androidx.core.view.children
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.R as materialR
+
+@SuppressLint("PrivateResource")
+abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
+
+	private val bounds = Rect()
+	private val thickness: Int
+	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+
+	init {
+		paint.style = Paint.Style.FILL
+		val ta = context.obtainStyledAttributes(
+			null,
+			materialR.styleable.MaterialDivider,
+			materialR.attr.materialDividerStyle,
+			materialR.style.Widget_Material3_MaterialDivider,
+		)
+		paint.color = ta.getColorOrThrow(materialR.styleable.MaterialDivider_dividerColor)
+		thickness = ta.getDimensionPixelSize(
+			materialR.styleable.MaterialDivider_dividerThickness,
+			context.resources.getDimensionPixelSize(materialR.dimen.material_divider_thickness),
+		)
+		ta.recycle()
+	}
+
+
+	override fun getItemOffsets(
+		outRect: Rect,
+		view: View,
+		parent: RecyclerView,
+		state: RecyclerView.State,
+	) {
+		outRect.set(0, thickness, 0, 0)
+	}
+
+	// TODO implement for horizontal lists on demand
+	override fun onDraw(canvas: Canvas, parent: RecyclerView, s: RecyclerView.State) {
+		if (parent.layoutManager == null || thickness == 0) {
+			return
+		}
+		canvas.save()
+		val left: Float
+		val right: Float
+		if (parent.clipToPadding) {
+			left = parent.paddingLeft.toFloat()
+			right = (parent.width - parent.paddingRight).toFloat()
+			canvas.clipRect(
+				left,
+				parent.paddingTop.toFloat(),
+				right,
+				(parent.height - parent.paddingBottom).toFloat()
+			)
+		} else {
+			left = 0f
+			right = parent.width.toFloat()
+		}
+
+		var previous: RecyclerView.ViewHolder? = null
+		for (child in parent.children) {
+			val holder = parent.getChildViewHolder(child)
+			if (previous != null && shouldDrawDivider(previous, holder)) {
+				parent.getDecoratedBoundsWithMargins(child, bounds)
+				val top: Float = bounds.top + child.translationY
+				val bottom: Float = top + thickness
+				canvas.drawRect(left, top, right, bottom, paint)
+			}
+			previous = holder
+		}
+		canvas.restore()
+	}
+
+	protected abstract fun shouldDrawDivider(
+		above: RecyclerView.ViewHolder,
+		below: RecyclerView.ViewHolder,
+	): Boolean
+}

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

@@ -1,11 +1,9 @@
-package org.koitharu.kotatsu.core.ui.list.decor
+package org.koitharu.kotatsu.base.ui.list.decor
 
 import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.RectF
 import android.view.View
-import androidx.collection.LongSet
-import androidx.collection.MutableLongSet
 import androidx.core.view.children
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.NO_ID
@@ -14,7 +12,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 
 	private val bounds = Rect()
 	private val boundsF = RectF()
-	protected val selection = MutableLongSet()
+	protected val selection = HashSet<Long>()
 
 	protected var hasBackground: Boolean = true
 	protected var hasForeground: Boolean = false
@@ -23,7 +21,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 	val checkedItemsCount: Int
 		get() = selection.size
 
-	val checkedItemsIds: LongSet
+	val checkedItemsIds: Set<Long>
 		get() = selection
 
 	fun toggleItemChecked(id: Long) {
@@ -41,9 +39,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 	}
 
 	fun checkAll(ids: Collection<Long>) {
-		for (id in ids) {
-			selection.add(id)
-		}
+		selection.addAll(ids)
 	}
 
 	fun clearSelection() {
@@ -71,7 +67,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 		if (parent.clipToPadding) {
 			canvas.clipRect(
 				parent.paddingLeft, parent.paddingTop, parent.width - parent.paddingRight,
-				parent.height - parent.paddingBottom,
+				parent.height - parent.paddingBottom
 			)
 		}
 
@@ -95,7 +91,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 		canvas.restoreToCount(checkpoint)
 	}
 
-	abstract fun getItemId(parent: RecyclerView, child: View): Long
+	protected open fun getItemId(parent: RecyclerView, child: View) = parent.getChildItemId(child)
 
 	protected open fun onDrawBackground(
 		canvas: Canvas,
@@ -112,4 +108,4 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
 		bounds: RectF,
 		state: RecyclerView.State,
 	) = Unit
-}
+}

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

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

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

@@ -0,0 +1,35 @@
+package org.koitharu.kotatsu.base.ui.list.decor
+
+import android.graphics.Rect
+import android.util.SparseIntArray
+import android.view.View
+import androidx.core.util.getOrDefault
+import androidx.core.util.set
+import androidx.recyclerview.widget.RecyclerView
+
+class TypedSpacingItemDecoration(
+	vararg spacingMapping: Pair<Int, Int>,
+	private val fallbackSpacing: Int = 0,
+) : RecyclerView.ItemDecoration() {
+
+	private val mapping = SparseIntArray(spacingMapping.size)
+	
+	init {
+		spacingMapping.forEach { (k, v) -> mapping[k] = v }
+	}
+
+	override fun getItemOffsets(
+		outRect: Rect,
+		view: View,
+		parent: RecyclerView,
+		state: RecyclerView.State
+	) {
+		val itemType = parent.getChildViewHolder(view)?.itemViewType
+		val spacing = if (itemType == null) {
+			fallbackSpacing
+		} else {
+			mapping.getOrDefault(itemType, fallbackSpacing)
+		}
+		outRect.set(spacing, spacing, spacing, spacing)
+	}
+}

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

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

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

@@ -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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.core.ui.list.fastscroll
+package org.koitharu.kotatsu.base.ui.list.fastscroll
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -9,34 +9,23 @@ import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.MotionEvent
-import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.LinearLayout
-import android.widget.RelativeLayout
-import androidx.annotation.AttrRes
-import androidx.annotation.ColorInt
-import androidx.annotation.DimenRes
-import androidx.annotation.DrawableRes
-import androidx.annotation.Px
-import androidx.annotation.StyleableRes
+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.ancestors
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
-import org.koitharu.kotatsu.core.util.ext.isLayoutReversed
 import org.koitharu.kotatsu.databinding.FastScrollerBinding
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.isLayoutReversed
 import kotlin.math.roundToInt
-import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 private const val SCROLLBAR_HIDE_DELAY = 1000L
@@ -67,11 +56,10 @@ class FastScroller @JvmOverloads constructor(
 	private var bubbleHeight = 0
 	private var handleHeight = 0
 	private var viewHeight = 0
-	private var offset = 0
 	private var hideScrollbar = true
 	private var showBubble = true
 	private var showBubbleAlways = false
-	private var bubbleSize = BubbleSize.SMALL
+	private var bubbleSize = BubbleSize.NORMAL
 	private var bubbleImage: Drawable? = null
 	private var handleImage: Drawable? = null
 	private var trackImage: Drawable? = null
@@ -95,7 +83,7 @@ class FastScroller @JvmOverloads constructor(
 
 				if (showBubbleAlways) {
 					val targetPos = getRecyclerViewTargetPosition(y)
-					sectionIndexer?.let { bindBubble(it.getSectionText(recyclerView.context, targetPos)) }
+					sectionIndexer?.let { binding.bubble.text = it.getSectionText(recyclerView.context, targetPos) }
 				}
 			}
 		}
@@ -110,7 +98,6 @@ class FastScroller @JvmOverloads constructor(
 						showScrollbar()
 						if (showBubbleAlways && sectionIndexer != null) showBubble()
 					}
-
 					RecyclerView.SCROLL_STATE_IDLE -> if (hideScrollbar && !binding.thumb.isSelected) {
 						handler.postDelayed(scrollbarHider, SCROLLBAR_HIDE_DELAY)
 					}
@@ -126,33 +113,29 @@ class FastScroller @JvmOverloads constructor(
 			return viewHeight * proportion
 		}
 
-	val isScrollbarVisible: Boolean
-		get() = binding.scrollbar.isVisible
-
 	init {
 		clipChildren = false
 		orientation = HORIZONTAL
 
-		@ColorInt var bubbleColor = context.getThemeColor(appcompatR.attr.colorControlNormal, Color.DKGRAY)
+		@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.FastScrollRecyclerView, defStyleAttr) {
-			bubbleColor = getColor(R.styleable.FastScrollRecyclerView_bubbleColor, bubbleColor)
-			handleColor = getColor(R.styleable.FastScrollRecyclerView_thumbColor, handleColor)
-			trackColor = getColor(R.styleable.FastScrollRecyclerView_trackColor, trackColor)
-			textColor = getColor(R.styleable.FastScrollRecyclerView_bubbleTextColor, textColor)
-			hideScrollbar = getBoolean(R.styleable.FastScrollRecyclerView_hideScrollbar, hideScrollbar)
-			showBubble = getBoolean(R.styleable.FastScrollRecyclerView_showBubble, showBubble)
-			showBubbleAlways = getBoolean(R.styleable.FastScrollRecyclerView_showBubbleAlways, showBubbleAlways)
-			showTrack = getBoolean(R.styleable.FastScrollRecyclerView_showTrack, showTrack)
-			bubbleSize = getBubbleSize(R.styleable.FastScrollRecyclerView_bubbleSize, bubbleSize)
-			val textSize = getDimension(R.styleable.FastScrollRecyclerView_bubbleTextSize, bubbleSize.textSize)
+		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)
-			offset = getDimensionPixelOffset(R.styleable.FastScrollRecyclerView_scrollerOffset, offset)
 		}
 
 		setTrackColor(trackColor)
@@ -166,7 +149,7 @@ class FastScroller @JvmOverloads constructor(
 
 	override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) {
 		super.onSizeChanged(w, h, oldW, oldH)
-		viewHeight = h - paddingTop - paddingBottom
+		viewHeight = h
 	}
 
 	@SuppressLint("ClickableViewAccessibility")
@@ -179,9 +162,7 @@ class FastScroller @JvmOverloads constructor(
 
 		when (event.actionMasked) {
 			MotionEvent.ACTION_DOWN -> {
-				if (!isScrollbarVisible || event.x.toInt() !in binding.scrollbar.left..binding.scrollbar.right) {
-					return false
-				}
+				if (event.x.toInt() !in binding.scrollbar.left..binding.scrollbar.right) return false
 
 				requestDisallowInterceptTouchEvent(true)
 				setHandleSelected(true)
@@ -195,12 +176,10 @@ class FastScroller @JvmOverloads constructor(
 				setYPositions()
 				return true
 			}
-
 			MotionEvent.ACTION_MOVE -> {
 				setYPositions()
 				return true
 			}
-
 			MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
 				requestDisallowInterceptTouchEvent(false)
 				setHandleSelected(false)
@@ -233,7 +212,6 @@ class FastScroller @JvmOverloads constructor(
 	 *
 	 * @param params The [ViewGroup.LayoutParams] for this view, cannot be null
 	 */
-	@Suppress("RemoveRedundantQualifierName")
 	override fun setLayoutParams(params: ViewGroup.LayoutParams) {
 		params.width = LayoutParams.WRAP_CONTENT
 		super.setLayoutParams(params)
@@ -247,8 +225,8 @@ class FastScroller @JvmOverloads constructor(
 	 */
 	fun setLayoutParams(viewGroup: ViewGroup) {
 		val recyclerViewId = recyclerView?.id ?: NO_ID
-		val offsetTop = resources.getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_top)
-		val offsetBottom = resources.getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_bottom)
+		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" }
 
@@ -265,45 +243,29 @@ class FastScroller @JvmOverloads constructor(
 					applyTo(viewGroup)
 				}
 
-				updateLayoutParams<ConstraintLayout.LayoutParams> {
+				layoutParams = (layoutParams as ConstraintLayout.LayoutParams).apply {
 					height = 0
-					marginStart = offset
-					marginEnd = offset
-					topMargin = offsetTop
-					bottomMargin = offsetBottom
+					setMargins(0, marginTop, 0, marginBottom)
 				}
 			}
-
-			is CoordinatorLayout -> updateLayoutParams<CoordinatorLayout.LayoutParams> {
+			is CoordinatorLayout -> layoutParams = (layoutParams as CoordinatorLayout.LayoutParams).apply {
 				height = LayoutParams.MATCH_PARENT
 				anchorGravity = GravityCompat.END
 				anchorId = recyclerViewId
-				marginStart = offset
-				marginEnd = offset
-				topMargin = offsetTop
-				bottomMargin = offsetBottom
+				setMargins(0, marginTop, 0, marginBottom)
 			}
-
-			is FrameLayout -> updateLayoutParams<FrameLayout.LayoutParams> {
+			is FrameLayout -> layoutParams = (layoutParams as FrameLayout.LayoutParams).apply {
 				height = LayoutParams.MATCH_PARENT
 				gravity = GravityCompat.END
-				marginStart = offset
-				marginEnd = offset
-				topMargin = offsetTop
-				bottomMargin = offsetBottom
+				setMargins(0, marginTop, 0, marginBottom)
 			}
-
-			is RelativeLayout -> updateLayoutParams<RelativeLayout.LayoutParams> {
+			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)
-				marginStart = offset
-				marginEnd = offset
-				topMargin = offsetTop
-				bottomMargin = offsetBottom
+				setMargins(0, marginTop, 0, marginBottom)
 			}
-
 			else -> throw IllegalArgumentException("Parent ViewGroup must be a ConstraintLayout, CoordinatorLayout, FrameLayout, or RelativeLayout")
 		}
 
@@ -325,12 +287,10 @@ class FastScroller @JvmOverloads constructor(
 
 		if (parent is ViewGroup) {
 			setLayoutParams(parent as ViewGroup)
-		} else {
-			val viewGroup = findValidParent(recyclerView)
-			if (viewGroup != null) {
-				viewGroup.addView(this)
-				setLayoutParams(viewGroup)
-			}
+		} else if (recyclerView.parent is ViewGroup) {
+			val viewGroup = recyclerView.parent as ViewGroup
+			viewGroup.addView(this)
+			setLayoutParams(viewGroup)
 		}
 
 		recyclerView.addOnScrollListener(scrollListener)
@@ -490,7 +450,7 @@ class FastScroller @JvmOverloads constructor(
 		val layoutManager = recyclerView?.layoutManager ?: return
 		val targetPos = getRecyclerViewTargetPosition(y)
 		layoutManager.scrollToPosition(targetPos)
-		if (showBubble) sectionIndexer?.let { bindBubble(it.getSectionText(context, targetPos)) }
+		if (showBubble) sectionIndexer?.let { binding.bubble.text = it.getSectionText(context, targetPos) }
 	}
 
 	private fun setViewPositions(y: Float) {
@@ -541,20 +501,7 @@ class FastScroller @JvmOverloads constructor(
 
 	private fun TypedArray.getBubbleSize(@StyleableRes index: Int, defaultValue: BubbleSize): BubbleSize {
 		val ordinal = getInt(index, -1)
-		return BubbleSize.entries.getOrNull(ordinal) ?: defaultValue
-	}
-
-	private fun findValidParent(view: View): ViewGroup? = view.ancestors.firstNotNullOfOrNull { p ->
-		if (p is FrameLayout || p is ConstraintLayout || p is CoordinatorLayout || p is RelativeLayout) {
-			p
-		} else {
-			null
-		}
-	}
-
-	private fun bindBubble(text: CharSequence?) {
-		binding.bubble.text = text
-		binding.bubble.alpha = if (text.isNullOrEmpty()) 0f else 1f
+		return BubbleSize.values().getOrNull(ordinal) ?: defaultValue
 	}
 
 	private val BubbleSize.textSize