Update version to v3.3

Currently translated at 100.0% (297 of 297 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (8 of 8 strings)

Co-authored-by: Artem <artem@molotov.work>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/uk/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/uk/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals

.editorconfig

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

.github/FUNDING.yml

@@ -1 +1 @@
-custom: ["https://money.yandex.ru/to/410012543938752"]
+custom: ["https://yoomoney.ru/to/410012543938752"]

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+    - name: ⚠️ Source issue
+      url: https://github.com/nv95/kotatsu-parsers/issues/new
+      about: Issues and requests for sources should be opened in the kotatsu-parsers repository instead

.github/ISSUE_TEMPLATE/report_issue.yml

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

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -0,0 +1,39 @@
+name: ⭐ Feature request
+description: Suggest a feature to improve Kotatsu
+labels: [feature request]
+body:
+
+    - type: textarea
+      id: feature-description
+      attributes:
+          label: Describe your suggested feature
+          description: How can Kotatsu be improved?
+          placeholder: |
+              Example:
+                "It should work like this..."
+      validations:
+          required: true
+
+    - type: textarea
+      id: other-details
+      attributes:
+          label: Other details
+          placeholder: |
+              Additional details and attachments.
+
+    - type: checkboxes
+      id: acknowledgements
+      attributes:
+          label: Acknowledgements
+          description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+          options:
+              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+                required: true
+              - label: I have written a short but informative title.
+                required: true
+              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
+                required: true
+              - label: I have updated the app to version **[3.2.3](https://github.com/nv95/Kotatsu/releases/latest)**.
+                required: true
+              - label: I will fill out all of the requested information in this form.
+                required: true

.gitignore

@@ -6,9 +6,12 @@
 /.idea/dictionaries
 /.idea/modules.xml
 /.idea/misc.xml
+/.idea/discord.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/kotlinScripting.xml
+/.idea/deploymentTargetDropDown.xml
 .DS_Store
 /build
 /captures

.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_API_S.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-02-19T19:02:37.198775Z" />
-  </component>
-</project>

.idea/gradle.xml

@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/inspectionProfiles/Project_Default.xml

@@ -1,8 +1,13 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="BooleanLiteralArgument" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="BooleanLiteralArgument" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="Destructure" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="KotlinFunctionArgumentsHelper" enabled="true" level="INFORMATION" enabled_by_default="true">
+      <option name="withoutDefaultValues" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ReplaceCollectionCountWithSize" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="TrailingComma" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="ZeroLengthArrayInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
   </profile>

.idea/jarRepositories.xml

@@ -36,5 +36,10 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://maven.pkg.github.com/nv95/kotatsu-parsers" />
+    </remote-repository>
   </component>
 </project>

.idea/ktlint.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KtlintProjectConfiguration">
+    <androidMode>true</androidMode>
+    <treatAsErrors>false</treatAsErrors>
+  </component>
+</project>

.travis.yml

@@ -1,11 +0,0 @@
-language: android
-dist: trusty
-android:
-  components:
-    - android-30
-    - build-tools-30.0.3
-    - platform-tools-30.0.5
-    - tools
-before_install:
-  - yes | sdkmanager "platforms;android-30"
-script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug

README.md

@@ -2,7 +2,7 @@
 
 Kotatsu is a free and open source manga reader for Android.
 
-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) [![Build Status](https://travis-ci.org/nv95/Kotatsu.svg?branch=master)](https://travis-ci.org/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/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)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/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
 
@@ -25,15 +25,25 @@ Download APK from Github Releases:
 * Tablet-optimized material design UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
+* Available in multiple languages
+* Password protect access to the app
 
 ### Screenshots
 
-| ![Screenshot_20200226-210337](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png) | ![Screenshot_20200226-210232](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
-|---|---|---|
-| ![Screenshot_20200226-210405](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png)  | ![Screenshot_20200226-210151](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
+| ![Screenshot_20200226-210337](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png)                           | ![Screenshot_20200226-210232](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
+|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
+| ![Screenshot_20200226-210405](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png) | ![Screenshot_20200226-210151](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
 
 | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/nv95/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/widgets/kotatsu/-/287x66-white.png" alt="Translation status" />
+</a>
+
+Kotatsu is localized in a number of different languages, if you would like to help improve these or add new languages, please head over to the Weblate <a href="https://hosted.weblate.org/engage/kotatsu/">project page</a> 
 
 ### License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

app/build.gradle

@@ -6,15 +6,16 @@ plugins {
 }
 
 android {
-	compileSdkVersion 31
-	buildToolsVersion '30.0.3'
+	compileSdkVersion 32
+	buildToolsVersion '32.0.0'
+	namespace 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
-		targetSdkVersion 31
-		versionCode 372
-		versionName '2.0'
+		targetSdkVersion 32
+		versionCode 409
+		versionName '3.3'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -24,10 +25,6 @@ android {
 			}
 		}
 	}
-	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
-	}
 	buildTypes {
 		debug {
 			applicationIdSuffix = '.debug'
@@ -45,74 +42,80 @@ android {
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
 	}
-	lintOptions {
-		disable 'MissingTranslation'
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
+	}
+	kotlinOptions {
+		jvmTarget = JavaVersion.VERSION_1_8.toString()
+		freeCompilerArgs += [
+			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+			'-opt-in=kotlinx.coroutines.FlowPreview',
+			'-opt-in=kotlin.contracts.ExperimentalContracts',
+			'-opt-in=coil.annotation.ExperimentalCoilApi',
+		]
+	}
+	lint {
 		abortOnError false
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
 		unitTests.includeAndroidResources = true
 		unitTests.returnDefaultValues = false
 	}
 }
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_1_8.toString()
-		freeCompilerArgs += [
-				'-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-		]
-	}
-}
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
+	implementation('com.github.nv95:kotatsu-parsers:f46c5add46') {
+		exclude group: 'org.json', module: 'json'
+	}
+
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
 
 	implementation 'androidx.core:core-ktx:1.7.0'
 	implementation 'androidx.activity:activity-ktx:1.4.0'
-	implementation 'androidx.fragment:fragment-ktx:1.3.6'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-service:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-process:2.4.0'
-	implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+	implementation 'androidx.fragment:fragment-ktx:1.4.1'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.4.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
+	implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 	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.1.1'
-	implementation 'androidx.work:work-runtime-ktx:2.7.0'
-	implementation 'com.google.android.material:material:1.4.0'
+	implementation 'androidx.preference:preference-ktx:1.2.0'
+	implementation 'androidx.work:work-runtime-ktx:2.7.1'
+	implementation 'com.google.android.material:material:1.7.0-alpha01'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.0'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
 
-	implementation 'androidx.room:room-runtime:2.3.0'
-	implementation 'androidx.room:room-ktx:2.3.0'
-	kapt 'androidx.room:room-compiler:2.3.0'
+	implementation 'androidx.room:room-runtime:2.4.2'
+	implementation 'androidx.room:room-ktx:2.4.2'
+	kapt 'androidx.room:room-compiler:2.4.2'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.9.1'
-	implementation 'com.squareup.okio:okio:2.10.0'
-	implementation 'org.jsoup:jsoup:1.14.3'
+	implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
+	implementation 'com.squareup.okio:okio:3.1.0'
 
-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.1'
-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.1'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'io.insert-koin:koin-android:3.1.3'
-	implementation 'io.coil-kt:coil-base:1.4.0'
+	implementation 'io.insert-koin:koin-android:3.2.0'
+	implementation 'io.coil-kt:coil-base:2.1.0'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
-	implementation 'com.github.solkin:disk-lru-cache:1.3'
+	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'com.google.truth:truth:1.1.3'
-	testImplementation 'org.json:json:20210307'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2'
-	testImplementation 'io.insert-koin:koin-test-junit4:3.1.3'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
+	testImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
 
 	androidTestImplementation 'androidx.test:runner:1.4.0'
 	androidTestImplementation 'androidx.test:rules:1.4.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.4.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
-	androidTestImplementation 'androidx.room:room-testing:2.3.0'
-	androidTestImplementation 'com.google.truth:truth:1.1.3'
+	androidTestImplementation 'androidx.room:room-testing:2.4.2'
 }

app/proguard-rules.pro

@@ -1,3 +1,4 @@
+-optimizationpasses 8
 -dontobfuscate
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
 	public static void checkExpressionValueIsNotNull(...);
@@ -7,5 +8,6 @@
 	public static void checkParameterIsNotNull(...);
 	public static void checkNotNullParameter(...);
 }
+-keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
 -dontwarn okhttp3.internal.platform.ConscryptPlatform

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

@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.core.parser
+
+import java.util.*
+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.*
+
+/**
+ * This parser is just for parser development, it should not be used in releases
+ */
+class DummyParser(override val context: MangaLoaderContext) : MangaParser(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/core/parser/MangaParser.kt

@@ -0,0 +1,14 @@
+package org.koitharu.kotatsu.core.parser
+
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.newParser
+
+fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
+	return if (source == MangaSource.DUMMY) {
+		DummyParser(loaderContext)
+	} else {
+		source.newParser(loaderContext)
+	}
+}

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/res/menu/opt_settings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@id/action_leaks"
+		android:title="@string/leak_canary_display_activity_label"
+		app:showAsAction="never" />
+
+</menu>

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

@@ -0,0 +1,4 @@
+<?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>
+</resources>

app/src/main/AndroidManifest.xml

@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="org.koitharu.kotatsu">
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
 	<application
 		android:name="org.koitharu.kotatsu.KotatsuApp"
 		android:allowBackup="true"
-		android:fullBackupContent="@xml/backup_descriptor"
+		android:backupAgent="org.koitharu.kotatsu.settings.backup.AppBackupAgent"
+		android:dataExtractionRules="@xml/backup_rules"
+		android:fullBackupContent="@xml/backup_content"
+		android:fullBackupOnly="true"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
+		android:networkSecurityConfig="@xml/network_security_config"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
-		android:theme="@style/AppTheme"
-		android:networkSecurityConfig="@xml/network_security_config"
+		android:theme="@style/Theme.Kotatsu"
 		tools:ignore="UnusedAttribute">
+
 		<activity
 			android:name="org.koitharu.kotatsu.main.ui.MainActivity"
 			android:exported="true">
@@ -32,7 +34,7 @@
 			</intent-filter>
 			<meta-data
 				android:name="android.app.default_searchable"
-				android:value=".ui.search.SearchActivity" />
+				android:value="org.koitharu.kotatsu.ui.search.SearchActivity" />
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.details.ui.DetailsActivity"
@@ -51,23 +53,19 @@
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
 			android:label="@string/search" />
+		<activity
+			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
+			android:label="@string/search_manga" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:label="@string/settings" />
-		<activity
-			android:name="org.koitharu.kotatsu.reader.ui.SimpleSettingsActivity"
-			android:exported="true"
-			android:label="@string/settings">
-			<intent-filter>
-				<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
-		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.core.ui.CrashActivity"
@@ -81,7 +79,8 @@
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
 			android:exported="true"
-			android:label="@string/manga_shelf">
+			android:label="@string/manga_shelf"
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
@@ -89,20 +88,30 @@
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity"
 			android:label="@string/search" />
+		<activity
+			android:name="org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity"
+			android:label="@string/search" />
 		<activity
 			android:name="org.koitharu.kotatsu.main.ui.protect.ProtectActivity"
 			android:noHistory="true"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name=".settings.protect.ProtectSetupActivity"
+			android:name="org.koitharu.kotatsu.settings.protect.ProtectSetupActivity"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
-			android:label="@string/downloads" />
+			android:label="@string/downloads"
+			android:launchMode="singleTop"
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity" />
+		<activity
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
 
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
 			android:foregroundServiceType="dataSync" />
+		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />

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

@@ -3,14 +3,15 @@ package org.koitharu.kotatsu
 import android.app.Application
 import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.strictmode.FragmentStrictMode
 import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
+import org.koitharu.kotatsu.base.ui.util.ActivityRecreationHandle
+import org.koitharu.kotatsu.bookmarks.bookmarksModule
 import org.koitharu.kotatsu.core.db.databaseModule
 import org.koitharu.kotatsu.core.github.githubModule
 import org.koitharu.kotatsu.core.network.networkModule
-import org.koitharu.kotatsu.core.parser.parserModule
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.AppCrashHandler
 import org.koitharu.kotatsu.core.ui.uiModule
@@ -22,10 +23,12 @@ import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.local.localModule
 import org.koitharu.kotatsu.main.mainModule
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.reader.readerModule
 import org.koitharu.kotatsu.remotelist.remoteListModule
 import org.koitharu.kotatsu.search.searchModule
 import org.koitharu.kotatsu.settings.settingsModule
+import org.koitharu.kotatsu.suggestions.suggestionsModule
 import org.koitharu.kotatsu.tracker.trackerModule
 import org.koitharu.kotatsu.widget.WidgetUpdater
 import org.koitharu.kotatsu.widget.appWidgetModule
@@ -41,6 +44,7 @@ class KotatsuApp : Application() {
 		Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext))
 		AppCompatDelegate.setDefaultNightMode(get<AppSettings>().theme)
 		registerActivityLifecycleCallbacks(get<AppProtectHelper>())
+		registerActivityLifecycleCallbacks(get<ActivityRecreationHandle>())
 		val widgetUpdater = WidgetUpdater(applicationContext)
 		widgetUpdater.subscribeToFavourites(get())
 		widgetUpdater.subscribeToHistory(get())
@@ -54,7 +58,6 @@ class KotatsuApp : Application() {
 				databaseModule,
 				githubModule,
 				uiModule,
-				parserModule,
 				mainModule,
 				searchModule,
 				localModule,
@@ -65,7 +68,9 @@ class KotatsuApp : Application() {
 				trackerModule,
 				settingsModule,
 				readerModule,
-				appWidgetModule
+				appWidgetModule,
+				suggestionsModule,
+				bookmarksModule,
 			)
 		}
 	}
@@ -86,5 +91,13 @@ class KotatsuApp : Application() {
 				.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

@@ -2,19 +2,19 @@ package org.koitharu.kotatsu.base.domain
 
 import androidx.room.withTransaction
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.db.entity.*
 import org.koitharu.kotatsu.core.prefs.ReaderMode
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
 
 class MangaDataRepository(private val db: MangaDatabase) {
 
 	suspend fun savePreferences(manga: Manga, mode: ReaderMode) {
-		val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
+		val tags = manga.tags.toEntities()
 		db.withTransaction {
 			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(MangaEntity.from(manga), tags)
+			db.mangaDao.upsert(manga.toEntity(), tags)
 			db.preferencesDao.upsert(
 				MangaPrefsEntity(
 					mangaId = manga.id,
@@ -34,15 +34,19 @@ class MangaDataRepository(private val db: MangaDatabase) {
 
 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
 		intent.manga != null -> intent.manga
-		intent.mangaId != MangaIntent.ID_NONE -> db.mangaDao.find(intent.mangaId)?.toManga()
+		intent.mangaId != 0L -> findMangaById(intent.mangaId)
 		else -> null // TODO resolve uri
 	}
 
 	suspend fun storeManga(manga: Manga) {
-		val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
+		val tags = manga.tags.toEntities()
 		db.withTransaction {
 			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(MangaEntity.from(manga), tags)
+			db.mangaDao.upsert(manga.toEntity(), tags)
 		}
 	}
+
+	suspend fun findTags(source: MangaSource): Set<MangaTag> {
+		return db.tagsDao.findTags(source.name).toMangaTags()
+	}
 }

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

@@ -3,31 +3,32 @@ package org.koitharu.kotatsu.base.domain
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.parsers.model.Manga
 
-class MangaIntent(
+class MangaIntent private constructor(
 	val manga: Manga?,
 	val mangaId: Long,
-	val uri: Uri?
+	val uri: Uri?,
 ) {
 
+	constructor(intent: Intent?) : this(
+		manga = intent?.getParcelableExtra<ParcelableManga>(KEY_MANGA)?.manga,
+		mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
+		uri = intent?.data
+	)
+
+	constructor(args: Bundle?) : this(
+		manga = args?.getParcelable<ParcelableManga>(KEY_MANGA)?.manga,
+		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
+		uri = null
+	)
+
 	companion object {
 
-		fun from(intent: Intent?) = MangaIntent(
-			manga = intent?.getParcelableExtra(KEY_MANGA),
-			mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
-			uri = intent?.data
-		)
-
-		fun from(args: Bundle?) = MangaIntent(
-			manga = args?.getParcelable(KEY_MANGA),
-			mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
-			uri = null
-		)
-
 		const val ID_NONE = 0L
 
 		const val KEY_MANGA = "manga"
 		const val KEY_ID = "id"
 	}
-}
+}

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

@@ -1,64 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import okhttp3.*
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.utils.ext.await
-
-open class MangaLoaderContext(
-	private val okHttp: OkHttpClient,
-	val cookieJar: CookieJar
-) : KoinComponent {
-
-	suspend fun httpGet(url: String, headers: Headers? = null): Response {
-		val request = Request.Builder()
-			.get()
-			.url(url)
-		if (headers != null) {
-			request.headers(headers)
-		}
-		return okHttp.newCall(request.build()).await()
-	}
-
-	suspend fun httpPost(
-		url: String,
-		form: Map<String, String>
-	): Response {
-		val body = FormBody.Builder()
-		form.forEach { (k, v) ->
-			body.addEncoded(k, v)
-		}
-		val request = Request.Builder()
-			.post(body.build())
-			.url(url)
-		return okHttp.newCall(request.build()).await()
-	}
-
-	suspend fun httpPost(
-		url: String,
-		payload: String
-	): Response {
-		val body = FormBody.Builder()
-		payload.split('&').forEach {
-			val pos = it.indexOf('=')
-			if (pos != -1) {
-				val k = it.substring(0, pos)
-				val v = it.substring(pos + 1)
-				body.addEncoded(k, v)
-			}
-		}
-		val request = Request.Builder()
-			.post(body.build())
-			.url(url)
-		return okHttp.newCall(request.build()).await()
-	}
-
-	open fun getSettings(source: MangaSource) = SourceSettings(get(), source)
-
-	private companion object {
-
-		private const val SCHEME_HTTP = "http"
-	}
-}

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

@@ -1,24 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.prefs.AppSettings
-
-object MangaProviderFactory {
-
-	fun getSources(settings: AppSettings, includeHidden: Boolean): List<MangaSource> {
-		val list = MangaSource.values().toList() - MangaSource.LOCAL
-		val order = settings.sourcesOrder
-		val hidden = settings.hiddenSources
-		val sorted = list.sortedBy { x ->
-			val e = order.indexOf(x.ordinal)
-			if (e == -1) order.size + x.ordinal else e
-		}
-		return if (includeHidden) {
-			sorted
-		} else {
-			sorted.filterNot { x ->
-				x.name in hidden
-			}
-		}
-	}
-}

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

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

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

@@ -0,0 +1,19 @@
+package org.koitharu.kotatsu.base.domain
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+
+fun interface ReversibleHandle {
+
+	suspend fun reverse()
+}
+
+fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default) {
+	reverse()
+}
+
+operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {
+	this.reverse()
+	other.reverse()
+}

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

@@ -5,9 +5,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.viewbinding.ViewBinding
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 
@@ -17,10 +17,9 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 		get() = checkNotNull(viewBinding)
 
 	final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		val inflater = activity?.layoutInflater ?: LayoutInflater.from(requireContext())
-		val binding = onInflateView(inflater, null)
+		val binding = onInflateView(layoutInflater, null)
 		viewBinding = binding
-		return AlertDialog.Builder(requireContext(), theme)
+		return MaterialAlertDialogBuilder(requireContext(), theme)
 			.setView(binding.root)
 			.also(::onBuildDialog)
 			.create()
@@ -38,7 +37,7 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 		super.onDestroyView()
 	}
 
-	open fun onBuildDialog(builder: AlertDialog.Builder) = Unit
+	open fun onBuildDialog(builder: MaterialAlertDialogBuilder) = Unit
 
 	protected fun bindingOrNull(): B? = viewBinding
 

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

@@ -7,39 +7,53 @@ 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.graphics.Insets
-import androidx.core.view.*
+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 com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.*
 import org.koin.android.ext.android.get
 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.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 
-abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindowInsetsListener {
+abstract class BaseActivity<B : ViewBinding> :
+	AppCompatActivity(),
+	WindowInsetsDelegate.WindowInsetsListener {
 
 	protected lateinit var binding: B
 		private set
 
-	protected val exceptionResolver by lazy(LazyThreadSafetyMode.NONE) {
-		ExceptionResolver(this, supportFragmentManager)
-	}
+	@Suppress("LeakingThis")
+	protected val exceptionResolver = ExceptionResolver(this)
 
-	private var lastInsets: Insets = Insets.NONE
+	@Suppress("LeakingThis")
+	protected val insetsDelegate = WindowInsetsDelegate(this)
+
+	val actionModeDelegate = ActionModeDelegate()
 
 	override fun onCreate(savedInstanceState: Bundle?) {
-		if (get<AppSettings>().isAmoledTheme) {
-			setTheme(R.style.AppTheme_AMOLED)
+		val settings = get<AppSettings>()
+		val isAmoled = settings.isAmoledTheme
+		val isDynamic = settings.isDynamicTheme
+		// TODO support DialogWhenLarge theme
+		when {
+			isAmoled && isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet_Amoled)
+			isAmoled -> setTheme(R.style.Theme_Kotatsu_Amoled)
+			isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet)
 		}
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)
+		insetsDelegate.handleImeInsets = true
 	}
 
 	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
@@ -59,28 +73,7 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		super.setContentView(binding.root)
 		val toolbar = (binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)
 		toolbar?.let(this::setSupportActionBar)
-		ViewCompat.setOnApplyWindowInsetsListener(binding.root, this)
-
-		val toolbarParams = (binding.root.findViewById<View>(R.id.toolbar_card) ?: toolbar)
-			?.layoutParams as? AppBarLayout.LayoutParams
-		if (toolbarParams != null) {
-			if (get<AppSettings>().isToolbarHideWhenScrolling) {
-				toolbarParams.scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS or SCROLL_FLAG_SNAP
-			} else {
-				toolbarParams.scrollFlags = SCROLL_FLAG_NO_SCROLL
-			}
-		}
-	}
-
-	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
-		val baseInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-		val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
-		val newInsets = Insets.max(baseInsets, imeInsets)
-		if (newInsets != lastInsets) {
-			onWindowInsetsChanged(newInsets)
-			lastInsets = newInsets
-		}
-		return insets
+		insetsDelegate.onViewCreated(binding.root)
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
@@ -96,8 +89,6 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		return super.onKeyDown(keyCode, event)
 	}
 
-	protected abstract fun onWindowInsetsChanged(insets: Insets)
-
 	private fun setupToolbar() {
 		(findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
 	}
@@ -108,8 +99,10 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		return isNight && get<AppSettings>().isAmoledTheme
 	}
 
+	@CallSuper
 	override fun onSupportActionModeStarted(mode: ActionMode) {
 		super.onSupportActionModeStarted(mode)
+		actionModeDelegate.onSupportActionModeStarted(mode)
 		val insets = ViewCompat.getRootWindowInsets(binding.root)
 			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
 		val view = findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar)
@@ -118,6 +111,12 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		}
 	}
 
+	@CallSuper
+	override fun onSupportActionModeFinished(mode: ActionMode) {
+		super.onSupportActionModeFinished(mode)
+		actionModeDelegate.onSupportActionModeFinished(mode)
+	}
+
 	override fun onBackPressed() {
 		if ( // https://issuetracker.google.com/issues/139738913
 			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&

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

@@ -2,22 +2,31 @@ 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 androidx.appcompat.app.AppCompatDialog
+import android.view.ViewGroup.LayoutParams
+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() {
+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
+
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -25,6 +34,20 @@ abstract class BaseBottomSheet<B : ViewBinding> :
 	): 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 / 2
+		}
+
 		return binding.root
 	}
 
@@ -34,10 +57,21 @@ abstract class BaseBottomSheet<B : ViewBinding> :
 	}
 
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		return if (resources.getBoolean(R.bool.is_tablet)) {
-			AppCompatDialog(context, theme)
-		} else super.onCreateDialog(savedInstanceState)
+		return AppBottomSheetDialog(requireContext(), theme)
 	}
 
 	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

@@ -1,30 +1,32 @@
 package org.koitharu.kotatsu.base.ui
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.graphics.Insets
-import androidx.core.view.OnApplyWindowInsetsListener
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 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(), OnApplyWindowInsetsListener {
+abstract class BaseFragment<B : ViewBinding> :
+	Fragment(),
+	WindowInsetsDelegate.WindowInsetsListener {
 
 	private var viewBinding: B? = null
 
 	protected val binding: B
 		get() = checkNotNull(viewBinding)
 
-	protected val exceptionResolver by lazy(LazyThreadSafetyMode.NONE) {
-		ExceptionResolver(viewLifecycleOwner, childFragmentManager)
-	}
+	@Suppress("LeakingThis")
+	protected val exceptionResolver = ExceptionResolver(this)
 
-	private var lastInsets: Insets = Insets.NONE
+	@Suppress("LeakingThis")
+	protected val insetsDelegate = WindowInsetsDelegate(this)
+
+	protected val actionModeDelegate: ActionModeDelegate
+		get() = (requireActivity() as BaseActivity<*>).actionModeDelegate
 
 	override fun onCreateView(
 		inflater: LayoutInflater,
@@ -38,36 +40,16 @@ abstract class BaseFragment<B : ViewBinding> : Fragment(), OnApplyWindowInsetsLi
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		lastInsets = Insets.NONE
-		ViewCompat.setOnApplyWindowInsetsListener(view, this)
+		insetsDelegate.onViewCreated(view)
 	}
 
 	override fun onDestroyView() {
 		viewBinding = null
+		insetsDelegate.onDestroyView()
 		super.onDestroyView()
 	}
 
-	open fun getTitle(): CharSequence? = null
-
-	override fun onAttach(context: Context) {
-		super.onAttach(context)
-		getTitle()?.let {
-			activity?.title = it
-		}
-	}
-
-	override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat): WindowInsetsCompat {
-		val newInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-		if (newInsets != lastInsets) {
-			onWindowInsetsChanged(newInsets)
-			lastInsets = newInsets
-		}
-		return insets
-	}
-
 	protected fun bindingOrNull() = viewBinding
 
 	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-
-	protected abstract fun onWindowInsetsChanged(insets: Insets)
-}
+}

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

@@ -7,8 +7,21 @@ 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
 
-abstract class BaseFullscreenActivity<B : ViewBinding> : BaseActivity<B>(),
+@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?) {
@@ -25,33 +38,22 @@ abstract class BaseFullscreenActivity<B : ViewBinding> : BaseActivity<B>(),
 		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
-
-	@Suppress("DEPRECATION")
-	private companion object {
-
-		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
-
-		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
-	}
 }

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

@@ -2,38 +2,61 @@ 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.view.OnApplyWindowInsetsListener
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
+import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceFragmentCompat
+import androidx.recyclerview.widget.RecyclerView
 import org.koin.android.ext.android.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.SettingsActivity
+import org.koitharu.kotatsu.settings.SettingsHeadersFragment
 
 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
-	PreferenceFragmentCompat(), OnApplyWindowInsetsListener {
+	PreferenceFragmentCompat(),
+	WindowInsetsDelegate.WindowInsetsListener,
+	RecyclerViewOwner {
 
 	protected val settings by inject<AppSettings>(mode = LazyThreadSafetyMode.NONE)
 
+	@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
-		ViewCompat.setOnApplyWindowInsetsListener(view, this)
+		insetsDelegate.onViewCreated(view)
+	}
+
+	override fun onDestroyView() {
+		insetsDelegate.onDestroyView()
+		super.onDestroyView()
 	}
 
 	override fun onResume() {
 		super.onResume()
-		activity?.setTitle(titleId)
+		if (titleId != 0) {
+			setTitle(getString(titleId))
+		}
 	}
 
-	override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat): WindowInsetsCompat {
-		val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+	@CallSuper
+	override fun onWindowInsetsChanged(insets: Insets) {
 		listView.updatePadding(
-			left = systemBars.left,
-			right = systemBars.right,
-			bottom = systemBars.bottom
+			bottom = insets.bottom
 		)
-		return insets
+	}
+
+	@Suppress("UsePropertyAccessSyntax")
+	protected fun setTitle(title: CharSequence) {
+		(parentFragment as? SettingsHeadersFragment)?.setTitle(title)
+			?: activity?.setTitle(title)
 	}
 }

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

@@ -1,18 +1,25 @@
 package org.koitharu.kotatsu.base.ui
 
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.*
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.utils.SingleLiveEvent
 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() {
 
-	val onError = SingleLiveEvent<Throwable>()
-	val isLoading = MutableLiveData(false)
+	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,
@@ -25,20 +32,18 @@ abstract class BaseViewModel : ViewModel() {
 		start: CoroutineStart = CoroutineStart.DEFAULT,
 		block: suspend CoroutineScope.() -> Unit
 	): Job = viewModelScope.launch(context + createErrorHandler(), start) {
-		isLoading.postValue(true)
+		loadingCounter.increment()
 		try {
 			block()
 		} finally {
-			isLoading.postValue(false)
+			loadingCounter.decrement()
 		}
 	}
 
 	private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
-		if (BuildConfig.DEBUG) {
-			throwable.printStackTrace()
-		}
+		throwable.printStackTraceDebug()
 		if (throwable !is CancellationException) {
-			onError.postCall(throwable)
+			errorEvent.postCall(throwable)
 		}
 	}
 }

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

@@ -0,0 +1,37 @@
+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.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+
+abstract class CoroutineIntentService : BaseService() {
+
+	private val mutex = Mutex()
+	protected open val dispatcher: CoroutineDispatcher = Dispatchers.Default
+
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
+		launchCoroutine(intent, startId)
+		return Service.START_REDELIVER_INTENT
+	}
+
+	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch {
+		mutex.withLock {
+			try {
+				withContext(dispatcher) {
+					processIntent(intent)
+				}
+			} finally {
+				stopSelf(startId)
+			}
+		}
+	}
+
+	protected abstract suspend fun processIntent(intent: Intent?)
+}

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

@@ -6,6 +6,7 @@ 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) :
@@ -17,7 +18,7 @@ class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog)
 
 		private val binding = DialogCheckboxBinding.inflate(LayoutInflater.from(context))
 
-		private val delegate = AlertDialog.Builder(context)
+		private val delegate = MaterialAlertDialogBuilder(context)
 			.setView(binding.root)
 
 		fun setTitle(@StringRes titleResId: Int): Builder {

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

@@ -2,18 +2,17 @@ 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.domain.LocalMangaRepository
-import org.koitharu.kotatsu.utils.ext.getStorageName
-import org.koitharu.kotatsu.utils.ext.inflate
-import org.koitharu.kotatsu.utils.ext.longHashCode
+import org.koitharu.kotatsu.local.data.LocalStorageManager
 import java.io.File
 
 class StorageSelectDialog private constructor(private val delegate: AlertDialog) :
@@ -21,19 +20,22 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 
 	fun show() = delegate.show()
 
-	class Builder(context: Context, defaultValue: File?, listener: OnStorageSelectListener) {
+	class Builder(context: Context, storageManager: LocalStorageManager, listener: OnStorageSelectListener) {
 
-		private val adapter = VolumesAdapter(context)
-		private val delegate = AlertDialog.Builder(context)
+		private val adapter = VolumesAdapter(storageManager)
+		private val delegate = MaterialAlertDialogBuilder(context)
 
 		init {
 			if (adapter.isEmpty) {
 				delegate.setMessage(R.string.cannot_find_available_storage)
 			} else {
-				val checked = adapter.volumes.indexOfFirst {
+				val defaultValue = runBlocking {
+					storageManager.getDefaultWriteableDir()
+				}
+				adapter.selectedItemPosition = adapter.volumes.indexOfFirst {
 					it.first.canonicalPath == defaultValue?.canonicalPath
 				}
-				delegate.setSingleChoiceItems(adapter, checked) { d, i ->
+				delegate.setAdapter(adapter) { d, i ->
 					listener.onStorageSelected(adapter.getItem(i).first)
 					d.dismiss()
 				}
@@ -58,14 +60,18 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 		fun create() = StorageSelectDialog(delegate.create())
 	}
 
-	private class VolumesAdapter(context: Context) : BaseAdapter() {
+	private class VolumesAdapter(storageManager: LocalStorageManager) : BaseAdapter() {
 
-		val volumes = getAvailableVolumes(context)
+		var selectedItemPosition: Int = -1
+		val volumes = getAvailableVolumes(storageManager)
 
 		override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-			val view = convertView ?: parent.inflate(R.layout.item_storage)
+			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]
-			val binding = ItemStorageBinding.bind(view)
+			binding.imageViewIndicator.isChecked = selectedItemPosition == position
 			binding.textViewTitle.text = item.second
 			binding.textViewSubtitle.text = item.first.path
 			return view
@@ -73,23 +79,23 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 
 		override fun getItem(position: Int): Pair<File, String> = volumes[position]
 
-		override fun getItemId(position: Int) = volumes[position].first.absolutePath.longHashCode()
+		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)
 	}
-
-	private companion object {
-
-		fun getAvailableVolumes(context: Context): List<Pair<File, String>> {
-			return LocalMangaRepository.getAvailableStorageDirs(context).map {
-				it to it.getStorageName(context)
-			}
-		}
-	}
 }

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

@@ -10,7 +10,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.databinding.DialogInputBinding
 
 class TextInputDialog private constructor(
-	private val delegate: AlertDialog
+	private val delegate: AlertDialog,
 ) : DialogInterface by delegate {
 
 	fun show() = delegate.show()
@@ -19,7 +19,7 @@ class TextInputDialog private constructor(
 
 		private val binding = DialogInputBinding.inflate(LayoutInflater.from(context))
 
-		private val delegate = AlertDialog.Builder(context)
+		private val delegate = MaterialAlertDialogBuilder(context)
 			.setView(binding.root)
 
 		fun setTitle(@StringRes titleResId: Int): Builder {
@@ -33,7 +33,7 @@ class TextInputDialog private constructor(
 		}
 
 		fun setHint(@StringRes hintResId: Int): Builder {
-			binding.inputLayout.hint = binding.root.context.getString(hintResId)
+			binding.inputEdit.hint = binding.root.context.getString(hintResId)
 			return this
 		}
 
@@ -64,7 +64,7 @@ class TextInputDialog private constructor(
 			listener: (DialogInterface, String) -> Unit
 		): Builder {
 			delegate.setPositiveButton(textId) { dialog, _ ->
-				listener(dialog, binding.inputEdit.text.toString().orEmpty())
+				listener(dialog, binding.inputEdit.text?.toString().orEmpty())
 			}
 			return this
 		}

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<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/BaseViewHolder.kt

@@ -1,28 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
-import org.koin.core.component.KoinComponent
-
-@Deprecated("")
-abstract class BaseViewHolder<T, E, B : ViewBinding> protected constructor(val binding: B) :
-	RecyclerView.ViewHolder(binding.root), KoinComponent {
-
-	var boundData: T? = null
-		private set
-
-	val context get() = itemView.context!!
-
-	fun bind(data: T, extra: E) {
-		boundData = data
-		onBind(data, extra)
-	}
-
-	fun requireData(): T {
-		return boundData ?: throw IllegalStateException("Calling requireData() before bind()")
-	}
-
-	open fun onRecycled() = Unit
-
-	abstract fun onBind(data: T, extra: E)
-}

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

@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+
+class FitHeightGridLayoutManager : GridLayoutManager {
+
+	constructor(context: Context?, spanCount: Int) : super(context, spanCount)
+
+	constructor(
+		context: Context?,
+		attrs: AttributeSet?,
+		defStyleAttr: Int,
+		defStyleRes: Int,
+	) : super(context, attrs, defStyleAttr, defStyleRes)
+
+	constructor(
+		context: Context?,
+		spanCount: Int,
+		orientation: Int,
+		reverseLayout: Boolean,
+	) : super(context, spanCount, orientation, reverseLayout)
+
+
+	override fun layoutDecoratedWithMargins(child: View, left: Int, top: Int, right: Int, bottom: Int) {
+		if (orientation == RecyclerView.VERTICAL && child.layoutParams.height == LayoutParams.MATCH_PARENT) {
+			val parentBottom = height - paddingBottom
+			val offset = parentBottom - bottom
+			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

@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.annotation.AttrRes
+import androidx.annotation.StyleRes
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.LayoutParams
+
+class FitHeightLinearLayoutManager : LinearLayoutManager {
+
+	constructor(context: Context) : super(context)
+	constructor(
+		context: Context,
+		@RecyclerView.Orientation orientation: Int,
+		reverseLayout: Boolean,
+	) : super(context, orientation, reverseLayout)
+
+	constructor(
+		context: Context,
+		attrs: AttributeSet?,
+		@AttrRes defStyleAttr: Int,
+		@StyleRes defStyleRes: Int,
+	) : super(context, attrs, defStyleAttr, defStyleRes)
+
+	override fun layoutDecoratedWithMargins(child: View, left: Int, top: Int, right: Int, bottom: Int) {
+		if (orientation == RecyclerView.VERTICAL && child.layoutParams.height == LayoutParams.MATCH_PARENT) {
+			val parentBottom = height - paddingBottom
+			val offset = parentBottom - bottom
+			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/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

@@ -0,0 +1,111 @@
+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.core.view.children
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.NO_ID
+
+abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
+
+	private val bounds = Rect()
+	private val boundsF = RectF()
+	private val selection = HashSet<Long>()
+
+	protected var hasBackground: Boolean = true
+	protected var hasForeground: Boolean = false
+	protected var isIncludeDecorAndMargins: Boolean = true
+
+	val checkedItemsCount: Int
+		get() = selection.size
+
+	val checkedItemsIds: Set<Long>
+		get() = selection
+
+	fun toggleItemChecked(id: Long) {
+		if (!selection.remove(id)) {
+			selection.add(id)
+		}
+	}
+
+	fun setItemIsChecked(id: Long, isChecked: Boolean) {
+		if (isChecked) {
+			selection.add(id)
+		} else {
+			selection.remove(id)
+		}
+	}
+
+	fun checkAll(ids: Collection<Long>) {
+		selection.addAll(ids)
+	}
+
+	fun clearSelection() {
+		selection.clear()
+	}
+
+	override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+		if (hasBackground) {
+			doDraw(canvas, parent, state, false)
+		} else {
+			super.onDraw(canvas, parent, state)
+		}
+	}
+
+	override fun onDrawOver(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+		if (hasForeground) {
+			doDraw(canvas, parent, state, true)
+		} else {
+			super.onDrawOver(canvas, parent, state)
+		}
+	}
+
+	private fun doDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State, isOver: Boolean) {
+		val checkpoint = canvas.save()
+		if (parent.clipToPadding) {
+			canvas.clipRect(
+				parent.paddingLeft, parent.paddingTop, parent.width - parent.paddingRight,
+				parent.height - parent.paddingBottom
+			)
+		}
+
+		for (child in parent.children) {
+			val itemId = getItemId(parent, child)
+			if (itemId != NO_ID && itemId in selection) {
+				if (isIncludeDecorAndMargins) {
+					parent.getDecoratedBoundsWithMargins(child, bounds)
+				} else {
+					bounds.set(child.left, child.top, child.right, child.bottom)
+				}
+				boundsF.set(bounds)
+				boundsF.offset(child.translationX, child.translationY)
+				if (isOver) {
+					onDrawForeground(canvas, parent, child, boundsF, state)
+				} else {
+					onDrawBackground(canvas, parent, child, boundsF, state)
+				}
+			}
+		}
+		canvas.restoreToCount(checkpoint)
+	}
+
+	protected open fun getItemId(parent: RecyclerView, child: View) = parent.getChildItemId(child)
+
+	protected open fun onDrawBackground(
+		canvas: Canvas,
+		parent: RecyclerView,
+		child: View,
+		bounds: RectF,
+		state: RecyclerView.State,
+	) = Unit
+
+	protected open fun onDrawForeground(
+		canvas: Canvas,
+		parent: RecyclerView,
+		child: View,
+		bounds: RectF,
+		state: RecyclerView.State,
+	) = Unit
+}

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

@@ -1,58 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.decor
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.view.View
-import androidx.core.view.children
-import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.utils.ext.getThemeDrawable
-import kotlin.math.roundToInt
-
-class ItemTypeDividerDecoration(context: Context) : RecyclerView.ItemDecoration() {
-
-	private val divider = context.getThemeDrawable(android.R.attr.listDivider)
-	private val bounds = Rect()
-
-	override fun getItemOffsets(
-		outRect: Rect, view: View,
-		parent: RecyclerView, state: RecyclerView.State
-	) {
-		outRect.set(0, divider?.intrinsicHeight ?: 0, 0, 0)
-	}
-
-	override fun onDraw(canvas: Canvas, parent: RecyclerView, s: RecyclerView.State) {
-		if (parent.layoutManager == null || divider == null) {
-			return
-		}
-		val adapter = parent.adapter ?: return
-		canvas.save()
-		val left: Int
-		val right: Int
-		if (parent.clipToPadding) {
-			left = parent.paddingLeft
-			right = parent.width - parent.paddingRight
-			canvas.clipRect(
-				left, parent.paddingTop, right,
-				parent.height - parent.paddingBottom
-			)
-		} else {
-			left = 0
-			right = parent.width
-		}
-
-		var lastItemType = -1
-		for (child in parent.children) {
-			val itemType = adapter.getItemViewType(parent.getChildAdapterPosition(child))
-			if (lastItemType != -1 && itemType != lastItemType) {
-				parent.getDecoratedBoundsWithMargins(child, bounds)
-				val top: Int = bounds.top + child.translationY.roundToInt()
-				val bottom: Int = top + divider.intrinsicHeight
-				divider.setBounds(left, top, right, bottom)
-				divider.draw(canvas)
-			}
-			lastItemType = itemType
-		}
-		canvas.restore()
-	}
-}

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

@@ -1,96 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.decor
-
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.core.view.children
-import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.inflate
-import kotlin.math.max
-
-/**
- * https://github.com/paetztm/recycler_view_headers
- */
-class SectionItemDecoration(
-	private val isSticky: Boolean,
-	private val callback: Callback
-) : RecyclerView.ItemDecoration() {
-
-	private var headerView: TextView? = null
-	private var headerOffset: Int = 0
-
-	override fun getItemOffsets(
-		outRect: Rect,
-		view: View,
-		parent: RecyclerView,
-		state: RecyclerView.State
-	) {
-		if (headerOffset == 0) {
-			headerOffset = parent.resources.getDimensionPixelSize(R.dimen.header_height)
-		}
-		val pos = parent.getChildAdapterPosition(view)
-		outRect.set(0, if (callback.isSection(pos)) headerOffset else 0, 0, 0)
-	}
-
-	override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-		super.onDrawOver(c, parent, state)
-		val textView = headerView ?: parent.inflate<TextView>(R.layout.item_filter_header).also {
-			headerView = it
-		}
-		fixLayoutSize(textView, parent)
-
-		for (child in parent.children) {
-			val pos = parent.getChildAdapterPosition(child)
-			if (callback.isSection(pos)) {
-				textView.text = callback.getSectionTitle(pos) ?: continue
-				c.save()
-				if (isSticky) {
-					c.translate(
-						0f,
-						max(0f, (child.top - textView.height).toFloat())
-					)
-				} else {
-					c.translate(
-						0f,
-						(child.top - textView.height).toFloat()
-					)
-				}
-				textView.draw(c)
-				c.restore()
-			}
-		}
-	}
-
-	/**
-	 * Measures the header view to make sure its size is greater than 0 and will be drawn
-	 * https://yoda.entelect.co.za/view/9627/how-to-android-recyclerview-item-decorations
-	 */
-	private fun fixLayoutSize(view: View, parent: ViewGroup) {
-		val widthSpec = View.MeasureSpec.makeMeasureSpec(parent.width, View.MeasureSpec.EXACTLY)
-		val heightSpec =
-			View.MeasureSpec.makeMeasureSpec(parent.height, View.MeasureSpec.UNSPECIFIED)
-
-		val childWidth = ViewGroup.getChildMeasureSpec(
-			widthSpec,
-			parent.paddingLeft + parent.paddingRight,
-			view.layoutParams.width
-		)
-		val childHeight = ViewGroup.getChildMeasureSpec(
-			heightSpec,
-			parent.paddingTop + parent.paddingBottom,
-			view.layoutParams.height
-		)
-		view.measure(childWidth, childHeight)
-		view.layout(0, 0, view.measuredWidth, view.measuredHeight)
-	}
-
-	interface Callback {
-
-		fun isSection(position: Int): Boolean
-
-		fun getSectionTitle(position: Int): CharSequence?
-	}
-}

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/util/ActionModeDelegate.kt

@@ -0,0 +1,50 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import androidx.appcompat.view.ActionMode
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+
+class ActionModeDelegate {
+
+	private var activeActionMode: ActionMode? = null
+	private var listeners: MutableList<ActionModeListener>? = null
+
+	val isActionModeStarted: Boolean
+		get() = activeActionMode != null
+
+	fun onSupportActionModeStarted(mode: ActionMode) {
+		activeActionMode = mode
+		listeners?.forEach { it.onActionModeStarted(mode) }
+	}
+
+	fun onSupportActionModeFinished(mode: ActionMode) {
+		activeActionMode = null
+		listeners?.forEach { it.onActionModeFinished(mode) }
+	}
+
+	fun addListener(listener: ActionModeListener) {
+		if (listeners == null) {
+			listeners = ArrayList()
+		}
+		checkNotNull(listeners).add(listener)
+	}
+
+	fun removeListener(listener: ActionModeListener) {
+		listeners?.remove(listener)
+	}
+
+	fun addListener(listener: ActionModeListener, owner: LifecycleOwner) {
+		addListener(listener)
+		owner.lifecycle.addObserver(ListenerLifecycleObserver(listener))
+	}
+
+	private inner class ListenerLifecycleObserver(
+		private val listener: ActionModeListener,
+	) : DefaultLifecycleObserver {
+
+		override fun onDestroy(owner: LifecycleOwner) {
+			super.onDestroy(owner)
+			removeListener(listener)
+		}
+	}
+}

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

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

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

@@ -0,0 +1,34 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.app.Activity
+import android.app.Application.ActivityLifecycleCallbacks
+import android.os.Bundle
+import java.util.*
+
+class ActivityRecreationHandle : ActivityLifecycleCallbacks {
+
+	private val activities = WeakHashMap<Activity, Unit>()
+
+	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+		activities[activity] = Unit
+	}
+
+	override fun onActivityStarted(activity: Activity) = Unit
+
+	override fun onActivityResumed(activity: Activity) = Unit
+
+	override fun onActivityPaused(activity: Activity) = Unit
+
+	override fun onActivityStopped(activity: Activity) = Unit
+
+	override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+
+	override fun onActivityDestroyed(activity: Activity) {
+		activities.remove(activity)
+	}
+
+	fun recreateAll() {
+		val snapshot = activities.keys.toList()
+		snapshot.forEach { it.recreate() }
+	}
+}

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

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

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

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

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

@@ -0,0 +1,48 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior
+import androidx.core.view.ViewCompat
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+
+class ShrinkOnScrollBehavior : Behavior<ExtendedFloatingActionButton> {
+
+	@Suppress("unused") constructor() : super()
+	@Suppress("unused") constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
+
+	override fun onStartNestedScroll(
+		coordinatorLayout: CoordinatorLayout,
+		child: ExtendedFloatingActionButton,
+		directTargetChild: View,
+		target: View,
+		axes: Int,
+		type: Int
+	): Boolean {
+		return axes == ViewCompat.SCROLL_AXIS_VERTICAL
+	}
+
+	override fun onNestedScroll(
+		coordinatorLayout: CoordinatorLayout,
+		child: ExtendedFloatingActionButton,
+		target: View,
+		dxConsumed: Int,
+		dyConsumed: Int,
+		dxUnconsumed: Int,
+		dyUnconsumed: Int,
+		type: Int,
+		consumed: IntArray
+	) {
+		if (dyConsumed > 0) {
+			if (child.isExtended) {
+				child.shrink()
+			}
+		} else if (dyConsumed < 0) {
+			if (!child.isExtended) {
+				child.extend()
+			}
+		}
+	}
+}

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

@@ -0,0 +1,69 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.view.View
+import androidx.core.graphics.Insets
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+class WindowInsetsDelegate(
+	private val listener: WindowInsetsListener,
+) : OnApplyWindowInsetsListener, View.OnLayoutChangeListener {
+
+	var handleImeInsets: Boolean = false
+
+	var interceptingWindowInsetsListener: OnApplyWindowInsetsListener? = null
+
+	private var lastInsets: Insets? = null
+
+	override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat?): WindowInsetsCompat? {
+		if (insets == null) {
+			return null
+		}
+		val handledInsets = interceptingWindowInsetsListener?.onApplyWindowInsets(v, insets) ?: insets
+		val newInsets = if (handleImeInsets) {
+			Insets.max(
+				handledInsets.getInsets(WindowInsetsCompat.Type.systemBars()),
+				handledInsets.getInsets(WindowInsetsCompat.Type.ime()),
+			)
+		} else {
+			handledInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+		}
+		if (newInsets != lastInsets) {
+			listener.onWindowInsetsChanged(newInsets)
+			lastInsets = newInsets
+		}
+		return handledInsets
+	}
+
+	override fun onLayoutChange(
+		view: View,
+		left: Int,
+		top: Int,
+		right: Int,
+		bottom: Int,
+		oldLeft: Int,
+		oldTop: Int,
+		oldRight: Int,
+		oldBottom: Int,
+	) {
+		view.removeOnLayoutChangeListener(this)
+		if (lastInsets == null) { // Listener may not be called
+			onApplyWindowInsets(view, ViewCompat.getRootWindowInsets(view))
+		}
+	}
+
+	fun onViewCreated(view: View) {
+		ViewCompat.setOnApplyWindowInsetsListener(view, this)
+		view.addOnLayoutChangeListener(this)
+	}
+
+	fun onDestroyView() {
+		lastInsets = null
+	}
+
+	interface WindowInsetsListener {
+
+		fun onWindowInsetsChanged(insets: Insets)
+	}
+}

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

@@ -1,41 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import android.util.AttributeSet
-import android.view.View
-import androidx.appcompat.widget.Toolbar
-import androidx.core.view.isGone
-import com.google.android.material.R
-import com.google.android.material.appbar.MaterialToolbar
-import java.lang.reflect.Field
-
-class AnimatedToolbar @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	defStyleAttr: Int = R.attr.toolbarStyle,
-) : MaterialToolbar(context, attrs, defStyleAttr) {
-
-	private var navButtonView: View? = null
-		get() {
-			if (field == null) {
-				runCatching {
-					field = navButtonViewField?.get(this) as? View
-				}
-			}
-			return field
-		}
-
-	override fun setNavigationIcon(icon: Drawable?) {
-		super.setNavigationIcon(icon)
-		navButtonView?.isGone = (icon == null)
-	}
-
-	private companion object {
-
-		val navButtonViewField: Field? = runCatching {
-			Toolbar::class.java.getDeclaredField("mNavButtonView")
-				.also { it.isAccessible = true }
-		}.getOrNull()
-	}
-}

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

@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import androidx.annotation.AttrRes
+import androidx.annotation.IdRes
+import androidx.core.view.children
+import com.google.android.material.button.MaterialButton
+
+class CheckableButtonGroup @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = 0,
+) : LinearLayout(context, attrs, defStyleAttr), View.OnClickListener {
+
+	var onCheckedChangeListener: OnCheckedChangeListener? = null
+
+	override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
+		if (child is MaterialButton) {
+			child.setOnClickListener(this)
+		}
+		super.addView(child, index, params)
+	}
+
+	override fun onClick(v: View) {
+		setCheckedId(v.id)
+	}
+
+	fun setCheckedId(@IdRes viewRes: Int) {
+		children.forEach {
+			(it as? MaterialButton)?.isChecked = it.id == viewRes
+		}
+		onCheckedChangeListener?.onCheckedChanged(this, viewRes)
+	}
+
+	fun interface OnCheckedChangeListener {
+		fun onCheckedChanged(group: CheckableButtonGroup, checkedId: Int)
+	}
+}

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

@@ -1,12 +1,20 @@
 package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable
+import android.os.Parcelable.Creator
 import android.util.AttributeSet
+import android.view.View
 import android.widget.Checkable
+import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.os.ParcelCompat
 
 class CheckableImageView @JvmOverloads constructor(
-	context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = 0,
 ) : AppCompatImageView(context, attrs, defStyleAttr), Checkable {
 
 	private var isCheckedInternal = false
@@ -14,20 +22,6 @@ class CheckableImageView @JvmOverloads constructor(
 
 	var onCheckedChangeListener: OnCheckedChangeListener? = null
 
-	init {
-		setOnClickListener {
-			toggle()
-		}
-	}
-
-	fun setOnCheckedChangeListener(listener: (Boolean) -> Unit) {
-		onCheckedChangeListener = object : OnCheckedChangeListener {
-			override fun onCheckedChanged(view: CheckableImageView, isChecked: Boolean) {
-				listener(isChecked)
-			}
-		}
-	}
-
 	override fun isChecked() = isCheckedInternal
 
 	override fun toggle() {
@@ -49,18 +43,60 @@ class CheckableImageView @JvmOverloads constructor(
 	override fun onCreateDrawableState(extraSpace: Int): IntArray {
 		val state = super.onCreateDrawableState(extraSpace + 1)
 		if (isCheckedInternal) {
-			mergeDrawableStates(state, CHECKED_STATE_SET)
+			mergeDrawableStates(state, intArrayOf(android.R.attr.state_checked))
 		}
 		return state
 	}
 
+	override fun onSaveInstanceState(): Parcelable? {
+		val superState = super.onSaveInstanceState() ?: return null
+		return SavedState(superState, isChecked)
+	}
+
+	override fun onRestoreInstanceState(state: Parcelable?) {
+		if (state is SavedState) {
+			super.onRestoreInstanceState(state.superState)
+			isChecked = state.isChecked
+		} else {
+			super.onRestoreInstanceState(state)
+		}
+	}
+
+	class ToggleOnClickListener : OnClickListener {
+		override fun onClick(view: View) {
+			(view as? Checkable)?.toggle()
+		}
+	}
+
 	fun interface OnCheckedChangeListener {
 
 		fun onCheckedChanged(view: CheckableImageView, isChecked: Boolean)
 	}
 
-	private companion object {
+	private class SavedState : BaseSavedState {
 
-		private val CHECKED_STATE_SET = intArrayOf(android.R.attr.state_checked)
+		val isChecked: Boolean
+
+		constructor(superState: Parcelable, checked: Boolean) : super(superState) {
+			isChecked = checked
+		}
+
+		constructor(source: Parcel) : super(source) {
+			isChecked = ParcelCompat.readBoolean(source)
+		}
+
+		override fun writeToParcel(out: Parcel, flags: Int) {
+			super.writeToParcel(out, flags)
+			ParcelCompat.writeBoolean(out, isChecked)
+		}
+
+		companion object {
+			@JvmField
+			val CREATOR: Creator<SavedState> = object : Creator<SavedState> {
+				override fun createFromParcel(`in`: Parcel) = SavedState(`in`)
+
+				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
+			}
+		}
 	}
 }

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

@@ -4,7 +4,6 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View.OnClickListener
 import androidx.annotation.DrawableRes
-import androidx.core.content.ContextCompat
 import androidx.core.view.children
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
@@ -77,11 +76,11 @@ class ChipsView @JvmOverloads constructor(
 		val chip = Chip(context)
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
 		chip.setChipDrawable(drawable)
-		chip.setTextColor(ContextCompat.getColor(context, R.color.color_primary))
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
+		chip.isCheckable = false
 		addView(chip)
 		return chip
 	}

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

@@ -2,16 +2,22 @@ package org.koitharu.kotatsu.base.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.LinearLayout
-import androidx.appcompat.widget.AppCompatImageView
+import android.widget.LinearLayout.HORIZONTAL
+import android.widget.LinearLayout.VERTICAL
+import androidx.annotation.AttrRes
 import androidx.core.content.withStyledAttributes
+import com.google.android.material.imageview.ShapeableImageView
 import org.koitharu.kotatsu.R
 import kotlin.math.roundToInt
 
+private const val ASPECT_RATIO_HEIGHT = 18f
+private const val ASPECT_RATIO_WIDTH = 13f
 
 class CoverImageView @JvmOverloads constructor(
-	context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0,
-) : AppCompatImageView(context, attrs, defStyleAttr) {
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = 0,
+) : ShapeableImageView(context, attrs, defStyleAttr) {
 
 	private var orientation: Int = HORIZONTAL
 
@@ -34,13 +40,4 @@ class CoverImageView @JvmOverloads constructor(
 		}
 		setMeasuredDimension(desiredWidth, desiredHeight)
 	}
-
-	companion object {
-
-		const val VERTICAL = LinearLayout.VERTICAL
-		const val HORIZONTAL = LinearLayout.HORIZONTAL
-
-		private const val ASPECT_RATIO_HEIGHT = 18f
-		private const val ASPECT_RATIO_WIDTH = 13f
-	}
 }

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

@@ -26,6 +26,10 @@ import androidx.annotation.StringRes
 import androidx.core.view.postDelayed
 import org.koitharu.kotatsu.R
 
+private const val ENTER_DURATION = 300L
+private const val EXIT_DURATION = 200L
+private const val SHORT_DURATION = 1_500L
+private const val LONG_DURATION = 2_750L
 /**
  * A custom snackbar implementation allowing more control over placement and entry/exit animations.
  *
@@ -87,11 +91,4 @@ class FadingSnackbar @JvmOverloads constructor(
 			dismissListener()
 		}
 	}
-
-	companion object {
-		private const val ENTER_DURATION = 300L
-		private const val EXIT_DURATION = 200L
-		private const val SHORT_DURATION = 1_500L
-		private const val LONG_DURATION = 2_750L
-	}
 }

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

@@ -0,0 +1,124 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.InsetDrawable
+import android.graphics.drawable.RippleDrawable
+import android.graphics.drawable.ShapeDrawable
+import android.graphics.drawable.shapes.RectShape
+import android.util.AttributeSet
+import androidx.annotation.AttrRes
+import androidx.appcompat.widget.AppCompatCheckedTextView
+import androidx.core.content.withStyledAttributes
+import com.google.android.material.ripple.RippleUtils
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.google.android.material.shape.ShapeAppearanceModel
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
+
+@SuppressLint("RestrictedApi")
+class ListItemTextView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = R.attr.listItemTextViewStyle,
+) : AppCompatCheckedTextView(context, attrs, defStyleAttr) {
+
+	private var checkedDrawableStart: Drawable? = null
+	private var checkedDrawableEnd: Drawable? = null
+	private var isInitialized = false
+	private var isCheckDrawablesVisible: Boolean = false
+	private var defaultPaddingStart: Int = 0
+	private var defaultPaddingEnd: Int = 0
+
+	init {
+		context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) {
+			val itemRippleColor = getRippleColor(context)
+			val shape = createShapeDrawable(this)
+			background = RippleDrawable(
+				RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
+				shape,
+				ShapeDrawable(RectShape()),
+			)
+			checkedDrawableStart = getDrawable(R.styleable.ListItemTextView_checkedDrawableStart)
+			checkedDrawableEnd = getDrawable(R.styleable.ListItemTextView_checkedDrawableEnd)
+		}
+		checkedDrawableStart?.setTintList(textColors)
+		checkedDrawableEnd?.setTintList(textColors)
+		defaultPaddingStart = paddingStart
+		defaultPaddingEnd = paddingEnd
+		isInitialized = true
+		adjustCheckDrawables()
+	}
+
+	override fun refreshDrawableState() {
+		super.refreshDrawableState()
+		adjustCheckDrawables()
+	}
+
+	override fun setTextColor(colors: ColorStateList?) {
+		checkedDrawableStart?.setTintList(colors)
+		checkedDrawableEnd?.setTintList(colors)
+		super.setTextColor(colors)
+	}
+
+	override fun setPaddingRelative(start: Int, top: Int, end: Int, bottom: Int) {
+		defaultPaddingStart = start
+		defaultPaddingEnd = end
+		super.setPaddingRelative(start, top, end, bottom)
+	}
+
+	override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) {
+		val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
+		defaultPaddingStart = if (isRtl) right else left
+		defaultPaddingEnd = if (isRtl) left else right
+		super.setPadding(left, top, right, bottom)
+	}
+
+	private fun adjustCheckDrawables() {
+		if (isInitialized && isCheckDrawablesVisible != isChecked) {
+			setCompoundDrawablesRelativeWithIntrinsicBounds(
+				if (isChecked) checkedDrawableStart else null,
+				null,
+				if (isChecked) checkedDrawableEnd else null,
+				null,
+			)
+			super.setPaddingRelative(
+				if (isChecked && checkedDrawableStart != null) {
+					defaultPaddingStart + compoundDrawablePadding
+				} else defaultPaddingStart,
+				paddingTop,
+				if (isChecked && checkedDrawableEnd != null) {
+					defaultPaddingEnd + compoundDrawablePadding
+				} else defaultPaddingEnd,
+				paddingBottom,
+			)
+			isCheckDrawablesVisible = isChecked
+		}
+	}
+
+	private fun createShapeDrawable(ta: TypedArray): InsetDrawable {
+		val shapeAppearance = ShapeAppearanceModel.builder(
+			context,
+			ta.getResourceId(R.styleable.ListItemTextView_shapeAppearance, 0),
+			ta.getResourceId(R.styleable.ListItemTextView_shapeAppearanceOverlay, 0),
+		).build()
+		val shapeDrawable = MaterialShapeDrawable(shapeAppearance)
+		shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundFillColor)
+		return InsetDrawable(
+			shapeDrawable,
+			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetLeft, 0),
+			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetTop, 0),
+			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetRight, 0),
+			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetBottom, 0),
+		)
+	}
+
+	private fun getRippleColor(context: Context): ColorStateList {
+		return context.getThemeColorStateList(android.R.attr.colorControlHighlight)
+			?: ColorStateList.valueOf(Color.TRANSPARENT)
+	}
+}

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

@@ -0,0 +1,72 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import android.view.WindowInsets
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import androidx.annotation.AttrRes
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.WindowInsetsCompat
+
+class WindowInsetHolder @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = 0,
+) : View(context, attrs, defStyleAttr) {
+
+	private var desiredHeight = 0
+	private var desiredWidth = 0
+
+	@SuppressLint("RtlHardcoded")
+	override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
+		val barsInsets = WindowInsetsCompat.toWindowInsetsCompat(insets, this)
+			.getInsets(WindowInsetsCompat.Type.systemBars())
+		val gravity = getLayoutGravity()
+		val newWidth = when (gravity and Gravity.HORIZONTAL_GRAVITY_MASK) {
+			Gravity.LEFT -> barsInsets.left
+			Gravity.RIGHT -> barsInsets.right
+			else -> 0
+		}
+		val newHeight = when (gravity and Gravity.VERTICAL_GRAVITY_MASK) {
+			Gravity.TOP -> barsInsets.top
+			Gravity.BOTTOM -> barsInsets.bottom
+			else -> 0
+		}
+		if (newWidth != desiredWidth || newHeight != desiredHeight) {
+			desiredWidth = newWidth
+			desiredHeight = newHeight
+			requestLayout()
+		}
+		return super.dispatchApplyWindowInsets(insets)
+	}
+
+	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+		val widthMode = MeasureSpec.getMode(widthMeasureSpec)
+		val heightMode = MeasureSpec.getMode(heightMeasureSpec)
+		super.onMeasure(
+			if (desiredWidth == 0 || widthMode == MeasureSpec.EXACTLY) {
+				widthMeasureSpec
+			} else {
+				MeasureSpec.makeMeasureSpec(desiredWidth, widthMode)
+			},
+			if (desiredHeight == 0 || heightMode == MeasureSpec.EXACTLY) {
+				heightMeasureSpec
+			} else {
+				MeasureSpec.makeMeasureSpec(desiredHeight, heightMode)
+			},
+		)
+	}
+
+	private fun getLayoutGravity(): Int {
+		return when (val lp = layoutParams) {
+			is FrameLayout.LayoutParams -> lp.gravity
+			is LinearLayout.LayoutParams -> lp.gravity
+			is CoordinatorLayout.LayoutParams -> lp.gravity
+			else -> Gravity.NO_GRAVITY
+		}
+	}
+}

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

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

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

@@ -0,0 +1,28 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+
+@Entity(
+	tableName = "bookmarks",
+	primaryKeys = ["manga_id", "page_id"],
+	foreignKeys = [
+		ForeignKey(
+			entity = MangaEntity::class,
+			parentColumns = ["manga_id"],
+			childColumns = ["manga_id"],
+			onDelete = ForeignKey.CASCADE
+		),
+	]
+)
+class BookmarkEntity(
+	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
+	@ColumnInfo(name = "page_id", index = true) val pageId: Long,
+	@ColumnInfo(name = "chapter_id") val chapterId: Long,
+	@ColumnInfo(name = "page") val page: Int,
+	@ColumnInfo(name = "scroll") val scroll: Int,
+	@ColumnInfo(name = "image") val imageUrl: String,
+	@ColumnInfo(name = "created_at") val createdAt: Long,
+)

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

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

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

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+abstract class BookmarksDao {
+
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
+	abstract fun observe(mangaId: Long, chapterId: Long, page: Int): Flow<BookmarkEntity?>
+
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
+	abstract fun observe(mangaId: Long): Flow<List<BookmarkEntity>>
+
+	@Insert
+	abstract suspend fun insert(entity: BookmarkEntity)
+
+	@Delete
+	abstract suspend fun delete(entity: BookmarkEntity)
+
+	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
+	abstract suspend fun delete(mangaId: Long, pageId: Long)
+}

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

@@ -0,0 +1,31 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.db.entity.toManga
+import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.util.*
+
+fun BookmarkWithManga.toBookmark() = bookmark.toBookmark(
+	manga.toManga(tags.toMangaTags())
+)
+
+fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
+	manga = manga,
+	pageId = pageId,
+	chapterId = chapterId,
+	page = page,
+	scroll = scroll,
+	imageUrl = imageUrl,
+	createdAt = Date(createdAt),
+)
+
+fun Bookmark.toEntity() = BookmarkEntity(
+	mangaId = manga.id,
+	pageId = pageId,
+	chapterId = chapterId,
+	page = page,
+	scroll = scroll,
+	imageUrl = imageUrl,
+	createdAt = createdAt.time,
+)

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

@@ -0,0 +1,43 @@
+package org.koitharu.kotatsu.bookmarks.domain
+
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.util.*
+
+class Bookmark(
+	val manga: Manga,
+	val pageId: Long,
+	val chapterId: Long,
+	val page: Int,
+	val scroll: Int,
+	val imageUrl: String,
+	val createdAt: Date,
+) {
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as Bookmark
+
+		if (manga != other.manga) return false
+		if (pageId != other.pageId) return false
+		if (chapterId != other.chapterId) return false
+		if (page != other.page) return false
+		if (scroll != other.scroll) return false
+		if (imageUrl != other.imageUrl) return false
+		if (createdAt != other.createdAt) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		var result = manga.hashCode()
+		result = 31 * result + pageId.hashCode()
+		result = 31 * result + chapterId.hashCode()
+		result = 31 * result + page
+		result = 31 * result + scroll
+		result = 31 * result + imageUrl.hashCode()
+		result = 31 * result + createdAt.hashCode()
+		return result
+	}
+}

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

@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.bookmarks.domain
+
+import androidx.room.withTransaction
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.bookmarks.data.toBookmark
+import org.koitharu.kotatsu.bookmarks.data.toEntity
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.toEntities
+import org.koitharu.kotatsu.core.db.entity.toEntity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.mapItems
+
+class BookmarksRepository(
+	private val db: MangaDatabase,
+) {
+
+	fun observeBookmark(manga: Manga, chapterId: Long, page: Int): Flow<Bookmark?> {
+		return db.bookmarksDao.observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
+	}
+
+	fun observeBookmarks(manga: Manga): Flow<List<Bookmark>> {
+		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
+	}
+
+	suspend fun addBookmark(bookmark: Bookmark) {
+		db.withTransaction {
+			val tags = bookmark.manga.tags.toEntities()
+			db.tagsDao.upsert(tags)
+			db.mangaDao.upsert(bookmark.manga.toEntity(), tags)
+			db.bookmarksDao.insert(bookmark.toEntity())
+		}
+	}
+
+	suspend fun removeBookmark(mangaId: Long, pageId: Long) {
+		db.bookmarksDao.delete(mangaId, pageId)
+	}
+}

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

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

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

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

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

@@ -11,8 +11,10 @@ import android.view.MenuItem
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.core.network.UserAgentInterceptor
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 
 @SuppressLint("SetJavaScriptEnabled")
@@ -23,12 +25,17 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		setContentView(ActivityBrowserBinding.inflate(layoutInflater))
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(true)
-			setHomeAsUpIndicator(R.drawable.ic_cross)
+			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
 		with(binding.webView.settings) {
 			javaScriptEnabled = true
+			userAgentString = UserAgentInterceptor.userAgent
 		}
 		binding.webView.webViewClient = BrowserClient(this)
+		binding.webView.webChromeClient = ProgressChromeClient(binding.progressBar)
+		if (savedInstanceState != null) {
+			return
+		}
 		val url = intent?.dataString
 		if (url.isNullOrEmpty()) {
 			finishAfterTransition()
@@ -41,6 +48,16 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 	}
 
+	override fun onSaveInstanceState(outState: Bundle) {
+		super.onSaveInstanceState(outState)
+		binding.webView.saveState(outState)
+	}
+
+	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+		super.onRestoreInstanceState(savedInstanceState)
+		binding.webView.restoreState(savedInstanceState)
+	}
+
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.opt_browser, menu)
 		return super.onCreateOptionsMenu(menu)
@@ -82,6 +99,11 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		binding.webView.onResume()
 	}
 
+	override fun onDestroy() {
+		super.onDestroy()
+		binding.webView.destroy()
+	}
+
 	override fun onLoadingStateChanged(isLoading: Boolean) {
 		binding.progressBar.isVisible = isLoading
 	}

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

@@ -2,15 +2,11 @@ package org.koitharu.kotatsu.browser
 
 import android.graphics.Bitmap
 import android.webkit.WebView
-import okhttp3.OkHttpClient
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.network.WebViewClientCompat
 
 class BrowserClient(private val callback: BrowserCallback) : WebViewClientCompat(), KoinComponent {
 
-	private val okHttp by inject<OkHttpClient>(mode = LazyThreadSafetyMode.SYNCHRONIZED)
-
 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)
 		callback.onLoadingStateChanged(isLoading = false)

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

@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.browser
+
+import android.webkit.WebChromeClient
+import android.webkit.WebView
+import androidx.core.view.isVisible
+import com.google.android.material.progressindicator.BaseProgressIndicator
+
+private const val PROGRESS_MAX = 100
+
+class ProgressChromeClient(
+	private val progressIndicator: BaseProgressIndicator<*>,
+) : WebChromeClient() {
+
+	init {
+		progressIndicator.max = PROGRESS_MAX
+	}
+
+	override fun onProgressChanged(view: WebView?, newProgress: Int) {
+		super.onProgressChanged(view, newProgress)
+		if (!progressIndicator.isVisible) {
+			return
+		}
+		if (newProgress in 1 until PROGRESS_MAX) {
+			progressIndicator.isIndeterminate = false
+			progressIndicator.setProgressCompat(newProgress.coerceAtMost(PROGRESS_MAX), true)
+		} else {
+			progressIndicator.setIndeterminate(true)
+		}
+	}
+}

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

@@ -6,6 +6,8 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.koitharu.kotatsu.core.network.AndroidCookieJar
 import org.koitharu.kotatsu.core.network.WebViewClientCompat
 
+private const val CF_CLEARANCE = "cf_clearance"
+
 class CloudFlareClient(
 	private val cookieJar: AndroidCookieJar,
 	private val callback: CloudFlareCallback,
@@ -40,9 +42,4 @@ class CloudFlareClient(
 		return cookieJar.loadForRequest(targetUrl.toHttpUrl())
 			.find { it.name == name }?.value
 	}
-
-	private companion object {
-
-		const val CF_CLEARANCE = "cf_clearance"
-	}
 }

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

@@ -8,9 +8,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.webkit.CookieManager
 import android.webkit.WebSettings
-import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isInvisible
 import androidx.fragment.app.setFragmentResult
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
 import org.koitharu.kotatsu.core.network.UserAgentInterceptor
@@ -52,7 +52,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 		super.onDestroyView()
 	}
 
-	override fun onBuildDialog(builder: AlertDialog.Builder) {
+	override fun onBuildDialog(builder: MaterialAlertDialogBuilder) {
 		builder.setNegativeButton(android.R.string.cancel, null)
 	}
 

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

@@ -1,51 +0,0 @@
-package org.koitharu.kotatsu.core.backup
-
-import android.content.Context
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.json.JSONArray
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.MutableZipFile
-import org.koitharu.kotatsu.utils.ext.format
-import java.io.File
-import java.util.*
-
-class BackupArchive(file: File) : MutableZipFile(file) {
-
-	init {
-		if (!dir.exists()) {
-			dir.mkdirs()
-		}
-	}
-
-	suspend fun put(entry: BackupEntry) {
-		put(entry.name, entry.data.toString(2))
-	}
-
-	suspend fun getEntry(name: String): BackupEntry {
-		val json = withContext(Dispatchers.Default) {
-			JSONArray(getContent(name))
-		}
-		return BackupEntry(name, json)
-	}
-
-	companion object {
-
-		private const val DIR_BACKUPS = "backups"
-
-		@Suppress("BlockingMethodInNonBlockingContext")
-		suspend fun createNew(context: Context): BackupArchive = withContext(Dispatchers.IO) {
-			val dir = context.run {
-				getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
-			}
-			dir.mkdirs()
-			val filename = buildString {
-				append(context.getString(R.string.app_name).toLowerCase(Locale.ROOT))
-				append('_')
-				append(Date().format("ddMMyyyy"))
-				append(".bak")
-			}
-			BackupArchive(File(dir, filename))
-		}
-	}
-}

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

@@ -10,6 +10,8 @@ import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.history.data.HistoryEntity
 
+private const val PAGE_SIZE = 10
+
 class BackupRepository(private val db: MangaDatabase) {
 
 	suspend fun dumpHistory(): BackupEntry {
@@ -65,7 +67,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		return entry
 	}
 
-	suspend fun createIndex(): BackupEntry {
+	fun createIndex(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.INDEX, JSONArray())
 		val json = JSONObject()
 		json.put("app_id", BuildConfig.APPLICATION_ID)
@@ -119,6 +121,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		jo.put("sort_key", sortKey)
 		jo.put("title", title)
 		jo.put("order", order)
+		jo.put("track", track)
 		return jo
 	}
 
@@ -129,9 +132,4 @@ class BackupRepository(private val db: MangaDatabase) {
 		jo.put("created_at", createdAt)
 		return jo
 	}
-
-	private companion object {
-
-		const val PAGE_SIZE = 10
-	}
 }

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

@@ -0,0 +1,25 @@
+package org.koitharu.kotatsu.core.backup
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import okio.Closeable
+import org.json.JSONArray
+import java.io.File
+import java.util.zip.ZipFile
+
+class BackupZipInput(val file: File) : Closeable {
+
+	private val zipFile = ZipFile(file)
+
+	suspend fun getEntry(name: String): BackupEntry = runInterruptible(Dispatchers.IO) {
+		val entry = zipFile.getEntry(name)
+		val json = zipFile.getInputStream(entry).use {
+			JSONArray(it.bufferedReader().readText())
+		}
+		BackupEntry(name, json)
+	}
+
+	override fun close() {
+		zipFile.close()
+	}
+}

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

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.core.backup
+
+import android.content.Context
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import okio.Closeable
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.zip.ZipOutput
+import org.koitharu.kotatsu.utils.ext.format
+import java.io.File
+import java.util.*
+import java.util.zip.Deflater
+
+class BackupZipOutput(val file: File) : Closeable {
+
+	private val output = ZipOutput(file, Deflater.BEST_COMPRESSION)
+
+	suspend fun put(entry: BackupEntry) {
+		output.put(entry.name, entry.data.toString(2))
+	}
+
+	suspend fun finish() {
+		output.finish()
+	}
+
+	override fun close() {
+		output.close()
+	}
+}
+
+private const val DIR_BACKUPS = "backups"
+
+suspend fun BackupZipOutput(context: Context): BackupZipOutput = runInterruptible(Dispatchers.IO) {
+	val dir = context.run {
+		getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
+	}
+	dir.mkdirs()
+	val filename = buildString {
+		append(context.getString(R.string.app_name).replace(' ', '_').lowercase(Locale.ROOT))
+		append('_')
+		append(Date().format("ddMMyyyy"))
+		append(".bk.zip")
+	}
+	BackupZipOutput(File(dir, filename))
+}

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

@@ -5,23 +5,23 @@ import org.json.JSONObject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.utils.ext.getBooleanOrDefault
-import org.koitharu.kotatsu.utils.ext.getStringOrNull
-import org.koitharu.kotatsu.utils.ext.iterator
-import org.koitharu.kotatsu.utils.ext.map
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
 
 class RestoreRepository(private val db: MangaDatabase) {
 
 	suspend fun upsertHistory(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data) {
+		for (item in entry.data.JSONIterator()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = parseManga(mangaJson)
-			val tags = mangaJson.getJSONArray("tags").map {
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
 				parseTag(it)
 			}
 			val history = parseHistory(item)
@@ -38,7 +38,7 @@ class RestoreRepository(private val db: MangaDatabase) {
 
 	suspend fun upsertCategories(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data) {
+		for (item in entry.data.JSONIterator()) {
 			val category = parseCategory(item)
 			result += runCatching {
 				db.favouriteCategoriesDao.upsert(category)
@@ -49,10 +49,10 @@ class RestoreRepository(private val db: MangaDatabase) {
 
 	suspend fun upsertFavourites(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data) {
+		for (item in entry.data.JSONIterator()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = parseManga(mangaJson)
-			val tags = mangaJson.getJSONArray("tags").map {
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
 				parseTag(it)
 			}
 			val favourite = parseFavourite(item)
@@ -104,6 +104,7 @@ class RestoreRepository(private val db: MangaDatabase) {
 		sortKey = json.getInt("sort_key"),
 		title = json.getString("title"),
 		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
+		track = json.getBooleanOrDefault("track", true),
 	)
 
 	private fun parseFavourite(json: JSONObject) = FavouriteEntity(

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

@@ -1,28 +1,9 @@
 package org.koitharu.kotatsu.core.db
 
-import androidx.room.Room
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
-import org.koitharu.kotatsu.core.db.migrations.*
 
 val databaseModule
 	get() = module {
-		single {
-			Room.databaseBuilder(
-				androidContext(),
-				MangaDatabase::class.java,
-				"kotatsu-db"
-			).addMigrations(
-				Migration1To2(),
-				Migration2To3(),
-				Migration3To4(),
-				Migration4To5(),
-				Migration5To6(),
-				Migration6To7(),
-				Migration7To8(),
-				Migration8To9(),
-			).addCallback(
-				DatabasePrePopulateCallback(androidContext().resources)
-			).build()
-		}
+		single { MangaDatabase(androidContext()) }
 	}

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

@@ -4,14 +4,14 @@ import android.content.res.Resources
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class DatabasePrePopulateCallback(private val resources: Resources) : RoomDatabase.Callback() {
 
 	override fun onCreate(db: SupportSQLiteDatabase) {
 		db.execSQL(
-			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`) VALUES (?,?,?,?)",
-			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name)
+			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track) VALUES (?,?,?,?,?)",
+			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name, 1)
 		)
 	}
 }

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

@@ -1,22 +1,30 @@
 package org.koitharu.kotatsu.core.db
 
+import android.content.Context
 import androidx.room.Database
+import androidx.room.Room
 import androidx.room.RoomDatabase
+import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
+import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
 import org.koitharu.kotatsu.core.db.dao.*
 import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.core.db.migrations.*
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoriesDao
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.favourites.data.FavouritesDao
 import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.suggestions.data.SuggestionDao
+import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
-		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class
-	], version = 9
+		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
+	],
+	version = 11,
 )
 abstract class MangaDatabase : RoomDatabase() {
 
@@ -35,4 +43,27 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val tracksDao: TracksDao
 
 	abstract val trackLogsDao: TrackLogsDao
-}
+
+	abstract val suggestionDao: SuggestionDao
+
+	abstract val bookmarksDao: BookmarksDao
+}
+
+fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
+	context,
+	MangaDatabase::class.java,
+	"kotatsu-db"
+).addMigrations(
+	Migration1To2(),
+	Migration2To3(),
+	Migration3To4(),
+	Migration4To5(),
+	Migration5To6(),
+	Migration6To7(),
+	Migration7To8(),
+	Migration8To9(),
+	Migration9To10(),
+	Migration10To11(),
+).addCallback(
+	DatabasePrePopulateCallback(context.resources)
+).build()

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

@@ -6,8 +6,47 @@ import org.koitharu.kotatsu.core.db.entity.TagEntity
 @Dao
 abstract class TagsDao {
 
-	@Query("SELECT * FROM tags")
-	abstract suspend fun getAllTags(): List<TagEntity>
+	@Query("SELECT * FROM tags WHERE source = :source")
+	abstract suspend fun findTags(source: String): List<TagEntity>
+
+	@Query(
+		"""SELECT tags.* FROM tags
+		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
+		GROUP BY tags.title 
+		ORDER BY COUNT(manga_id) DESC 
+		LIMIT :limit"""
+	)
+	abstract suspend fun findPopularTags(limit: Int): List<TagEntity>
+
+	@Query(
+		"""SELECT tags.* FROM tags
+		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE tags.source = :source 
+		GROUP BY tags.title
+		ORDER BY COUNT(manga_id) DESC 
+		LIMIT :limit"""
+	)
+	abstract suspend fun findPopularTags(source: String, limit: Int): List<TagEntity>
+
+	@Query(
+		"""SELECT tags.* FROM tags
+		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE tags.source = :source AND title LIKE :query
+		GROUP BY tags.title
+		ORDER BY COUNT(manga_id) DESC 
+		LIMIT :limit"""
+	)
+	abstract suspend fun findTags(source: String, query: String, limit: Int): List<TagEntity>
+
+	@Query(
+		"""SELECT tags.* FROM tags
+		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE title LIKE :query
+		GROUP BY tags.title
+		ORDER BY COUNT(manga_id) DESC 
+		LIMIT :limit"""
+	)
+	abstract suspend fun findTags(query: String, limit: Int): List<TagEntity>
 
 	@Insert(onConflict = OnConflictStrategy.IGNORE)
 	abstract suspend fun insert(tag: TagEntity): Long

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

@@ -10,9 +10,15 @@ abstract class TracksDao {
 	@Query("SELECT * FROM tracks")
 	abstract suspend fun findAll(): List<TrackEntity>
 
+	@Query("SELECT * FROM tracks WHERE manga_id IN (:ids)")
+	abstract suspend fun findAll(ids: Collection<Long>): List<TrackEntity>
+
 	@Query("SELECT * FROM tracks WHERE manga_id = :mangaId")
 	abstract suspend fun find(mangaId: Long): TrackEntity?
 
+	@Query("SELECT chapters_new FROM tracks WHERE manga_id = :mangaId")
+	abstract suspend fun findNewChapters(mangaId: Long): Int?
+
 	@Query("DELETE FROM tracks")
 	abstract suspend fun clear()
 

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

@@ -0,0 +1,76 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import java.util.*
+import org.koitharu.kotatsu.core.model.TrackingLogItem
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.mapToSet
+import org.koitharu.kotatsu.parsers.util.toTitleCase
+import org.koitharu.kotatsu.utils.ext.longHashCode
+
+// Entity to model
+
+fun TagEntity.toMangaTag() = MangaTag(
+	key = this.key,
+	title = this.title.toTitleCase(),
+	source = MangaSource.valueOf(this.source),
+)
+
+fun Collection<TagEntity>.toMangaTags() = mapToSet(TagEntity::toMangaTag)
+
+fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
+	id = this.id,
+	title = this.title,
+	altTitle = this.altTitle,
+	state = this.state?.let { MangaState.valueOf(it) },
+	rating = this.rating,
+	isNsfw = this.isNsfw,
+	url = this.url,
+	publicUrl = this.publicUrl,
+	coverUrl = this.coverUrl,
+	largeCoverUrl = this.largeCoverUrl,
+	author = this.author,
+	source = MangaSource.valueOf(this.source),
+	tags = tags
+)
+
+fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())
+
+fun TrackLogWithManga.toTrackingLogItem() = TrackingLogItem(
+	id = trackLog.id,
+	chapters = trackLog.chapters.split('\n').filterNot { x -> x.isEmpty() },
+	manga = manga.toManga(tags.toMangaTags()),
+	createdAt = Date(trackLog.createdAt)
+)
+
+// Model to entity
+
+fun Manga.toEntity() = MangaEntity(
+	id = id,
+	url = url,
+	publicUrl = publicUrl,
+	source = source.name,
+	largeCoverUrl = largeCoverUrl,
+	coverUrl = coverUrl,
+	altTitle = altTitle,
+	rating = rating,
+	isNsfw = isNsfw,
+	state = state?.name,
+	title = title,
+	author = author,
+)
+
+fun MangaTag.toEntity() = TagEntity(
+	title = title,
+	key = key,
+	source = source.name,
+	id = "${key}_${source.name}".longHashCode()
+)
+
+fun Collection<MangaTag>.toEntities() = map(MangaTag::toEntity)
+
+// Other
+
+@Suppress("FunctionName")
+fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {
+	SortOrder.valueOf(name)
+}.getOrDefault(fallback)

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

@@ -3,10 +3,6 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaState
-import org.koitharu.kotatsu.core.model.MangaTag
 
 @Entity(tableName = "manga")
 class MangaEntity(
@@ -16,46 +12,11 @@ class MangaEntity(
 	@ColumnInfo(name = "alt_title") val altTitle: String?,
 	@ColumnInfo(name = "url") val url: String,
 	@ColumnInfo(name = "public_url") val publicUrl: String,
-	@ColumnInfo(name = "rating") val rating: Float, //normalized value [0..1] or -1
+	@ColumnInfo(name = "rating") val rating: Float, // normalized value [0..1] or -1
 	@ColumnInfo(name = "nsfw") val isNsfw: Boolean,
 	@ColumnInfo(name = "cover_url") val coverUrl: String,
 	@ColumnInfo(name = "large_cover_url") val largeCoverUrl: String?,
 	@ColumnInfo(name = "state") val state: String?,
 	@ColumnInfo(name = "author") val author: String?,
 	@ColumnInfo(name = "source") val source: String
-) {
-
-	fun toManga(tags: Set<MangaTag> = emptySet()) = Manga(
-		id = this.id,
-		title = this.title,
-		altTitle = this.altTitle,
-		state = this.state?.let { MangaState.valueOf(it) },
-		rating = this.rating,
-		isNsfw = this.isNsfw,
-		url = this.url,
-		publicUrl = this.publicUrl,
-		coverUrl = this.coverUrl,
-		largeCoverUrl = this.largeCoverUrl,
-		author = this.author,
-		source = MangaSource.valueOf(this.source),
-		tags = tags
-	)
-
-	companion object {
-
-		fun from(manga: Manga) = MangaEntity(
-			id = manga.id,
-			url = manga.url,
-			publicUrl = manga.publicUrl,
-			source = manga.source.name,
-			largeCoverUrl = manga.largeCoverUrl,
-			coverUrl = manga.coverUrl,
-			altTitle = manga.altTitle,
-			rating = manga.rating,
-			isNsfw = manga.isNsfw,
-			state = manga.state?.name,
-			title = manga.title,
-			author = manga.author
-		)
-	}
-}
+)

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

@@ -6,13 +6,15 @@ import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 
 @Entity(
-	tableName = "preferences", foreignKeys = [
+	tableName = "preferences",
+	foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
 			childColumns = ["manga_id"],
 			onDelete = ForeignKey.CASCADE
-		)]
+		)
+	]
 )
 class MangaPrefsEntity(
 	@PrimaryKey(autoGenerate = false)

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

@@ -5,7 +5,8 @@ import androidx.room.Entity
 import androidx.room.ForeignKey
 
 @Entity(
-	tableName = "manga_tags", primaryKeys = ["manga_id", "tag_id"], foreignKeys = [
+	tableName = "manga_tags", primaryKeys = ["manga_id", "tag_id"],
+	foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],

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

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.Embedded
 import androidx.room.Junction
 import androidx.room.Relation
-import org.koitharu.kotatsu.utils.ext.mapToSet
 
 class MangaWithTags(
 	@Embedded val manga: MangaEntity,
@@ -12,10 +11,5 @@ class MangaWithTags(
 		entityColumn = "tag_id",
 		associateBy = Junction(MangaTagsEntity::class)
 	)
-	val tags: List<TagEntity>
-) {
-
-	fun toManga() = manga.toManga(tags.mapToSet {
-		it.toMangaTag()
-	})
-}
+	val tags: List<TagEntity>,
+)

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

@@ -3,9 +3,6 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.longHashCode
 
 @Entity(tableName = "tags")
 class TagEntity(
@@ -14,21 +11,4 @@ class TagEntity(
 	@ColumnInfo(name = "title") val title: String,
 	@ColumnInfo(name = "key") val key: String,
 	@ColumnInfo(name = "source") val source: String
-) {
-
-	fun toMangaTag() = MangaTag(
-		key = this.key,
-		title = this.title,
-		source = MangaSource.valueOf(this.source)
-	)
-
-	companion object {
-
-		fun fromMangaTag(tag: MangaTag) = TagEntity(
-			title = tag.title,
-			key = tag.key,
-			source = tag.source.name,
-			id = "${tag.key}_${tag.source.name}".longHashCode()
-		)
-	}
-}
+)

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

@@ -6,7 +6,8 @@ import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 
 @Entity(
-	tableName = "tracks", foreignKeys = [
+	tableName = "tracks",
+	foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],

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

@@ -6,7 +6,8 @@ import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 
 @Entity(
-	tableName = "track_logs", foreignKeys = [
+	tableName = "track_logs",
+	foreignKeys = [
 		ForeignKey(
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
@@ -20,5 +21,5 @@ class TrackLogEntity(
 	@ColumnInfo(name = "id") val id: Long = 0L,
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
 	@ColumnInfo(name = "chapters") val chapters: String,
-	@ColumnInfo(name = "created_at") val createdAt: Long = System.currentTimeMillis()
+	@ColumnInfo(name = "created_at") val createdAt: Long = System.currentTimeMillis(),
 )

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

@@ -3,9 +3,6 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.Embedded
 import androidx.room.Junction
 import androidx.room.Relation
-import org.koitharu.kotatsu.core.model.TrackingLogItem
-import org.koitharu.kotatsu.utils.ext.mapToSet
-import java.util.*
 
 class TrackLogWithManga(
 	@Embedded val trackLog: TrackLogEntity,
@@ -19,13 +16,5 @@ class TrackLogWithManga(
 		entityColumn = "tag_id",
 		associateBy = Junction(MangaTagsEntity::class)
 	)
-	val tags: List<TagEntity>
-) {
-
-	fun toTrackingLogItem() = TrackingLogItem(
-		id = trackLog.id,
-		chapters = trackLog.chapters.split('\n').filterNot { x -> x.isEmpty() },
-		manga = manga.toManga(tags.mapToSet { x -> x.toMangaTag() }),
-		createdAt = Date(trackLog.createdAt)
-	)
-}
+	val tags: List<TagEntity>,
+)

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

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration10To11 : Migration(10, 11) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL(
+			"""
+			CREATE TABLE IF NOT EXISTS `bookmarks` (
+				`manga_id` INTEGER NOT NULL,
+				`page_id` INTEGER NOT NULL,
+				`chapter_id` INTEGER NOT NULL, 
+				`page` INTEGER NOT NULL,
+				`scroll` INTEGER NOT NULL,
+				`image` TEXT NOT NULL,
+				`created_at` INTEGER NOT NULL,
+				PRIMARY KEY(`manga_id`, `page_id`),
+				FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )
+			""".trimIndent()
+		)
+		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_manga_id` ON `bookmarks` (`manga_id`)")
+		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_page_id` ON `bookmarks` (`page_id`)")
+	}
+}

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

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.db.migrations
 
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class Migration8To9 : Migration(8, 9) {
 

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

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration9To10 : Migration(9, 10) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
+	}
+}