Fix release build

Currently translated at 100.0% (524 of 524 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (524 of 524 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (524 of 524 strings)

Co-authored-by: Макар Разин <makarrazin14@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/be/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/uk/
Translation: Kotatsu/Strings

.editorconfig

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/report_bug.yml

@@ -61,4 +61,6 @@ body:
           label: Acknowledgements
           options:
               - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                required: true
+                required: true
+              - label: If this is an issue with a parser, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
+                required: true

.gitignore

@@ -7,13 +7,16 @@
 /.idea/modules.xml
 /.idea/misc.xml
 /.idea/discord.xml
+/.idea/compiler.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
+/.idea/kotlinc.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/androidTestResultsUserPreferences.xml
 /.idea/render.experimental.xml
+/.idea/inspectionProfiles/
 .DS_Store
 /build
 /captures

.idea/.gitignore

@@ -0,0 +1,4 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+/migrations.xml

.idea/compiler.xml

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

.idea/gradle.xml

@@ -5,15 +5,15 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <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="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,14 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="BooleanLiteralArgument" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="Destructure" enabled="true" level="INFO" enabled_by_default="true" />
-    <inspection_tool class="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>
-</component>

.idea/kotlinc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Kotlin2JvmCompilerArguments">
-    <option name="jvmTarget" value="1.8" />
-  </component>
-</project>

.idea/ktlint.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KtlintProjectConfiguration">
+    <enableKtlint>false</enableKtlint>
     <androidMode>true</androidMode>
     <treatAsErrors>false</treatAsErrors>
+    <disabledRules>
+      <list>
+        <option value="no-empty-first-line-in-method-block" />
+      </list>
+    </disabledRules>
   </component>
 </project>

.weblate

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

CONTRIBUTING.md

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

README.md

@@ -2,30 +2,26 @@
 
 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/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
 
 ### Download
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-alt="Get it on F-Droid"
-height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)
-
-Download APK directly from GitHub:
-
-- **[Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)**
+- **Recommended:** Download and install APK from **[GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest)**. Application has a built-in self-updating feature.
+- Get it on **[F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu)**. The F-Droid build may be a bit outdated and some fixes might be missing.
 
 ### Main Features
 
-* Online manga catalogues
+* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers)
 * Search manga by name and genres
 * Reading history and bookmarks
 * Favourites organized by user-defined categories
 * Downloading manga and reading it offline. Third-party CBZ archives also supported
-* Tablet-optimized material design UI
+* Tablet-optimized Material You UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
-* Shikimori integration (manga tracking)
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
 * Password/fingerprint protect access to the app
+* History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 
 ### Screenshots
 
@@ -43,6 +39,10 @@ Download APK directly from GitHub:
 Kotatsu is localized in a number of different languages, if you would like to help improve these or add new languages,
 please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)
 
+### Contributing
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for the guidelines.
+
 ### 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

@@ -2,39 +2,37 @@ plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
 	id 'kotlin-kapt'
+	id 'com.google.devtools.ksp'
 	id 'kotlin-parcelize'
+	id 'dagger.hilt.android.plugin'
 }
 
 android {
-	compileSdkVersion 32
-	buildToolsVersion '32.0.0'
-	namespace 'org.koitharu.kotatsu'
+	compileSdk = 34
+	buildToolsVersion = '34.0.0'
+	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
-		minSdkVersion 21
-		targetSdkVersion 32
-		versionCode 415
-		versionName '3.4.3'
+		minSdk = 21
+		targetSdk = 34
+		versionCode = 598
+		versionName = '6.3.1'
 		generatedDensities = []
-		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-		kapt {
-			arguments {
-				arg 'room.schemaLocation', "$projectDir/schemas".toString()
-			}
+		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
+		ksp {
+//			arg("room.generateKotlin", "true") TODO: enable later
+			arg("room.schemaLocation", "$projectDir/schemas")
+		}
+		androidResources {
+			generateLocaleConfig true
 		}
-
-		// define this values in your local.properties file
-		buildConfigField 'String', 'SHIKIMORI_CLIENT_ID', "\"${localProperty('shikimori.clientId')}\""
-		buildConfigField 'String', 'SHIKIMORI_CLIENT_SECRET', "\"${localProperty('shikimori.clientSecret')}\""
 	}
 	buildTypes {
 		debug {
 			applicationIdSuffix = '.debug'
 		}
 		release {
-			multiDexEnabled false
 			minifyEnabled true
 			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -42,17 +40,21 @@ android {
 	}
 	buildFeatures {
 		viewBinding true
+		buildConfig true
 	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+		main.java.srcDirs += 'src/main/kotlin/'
 	}
 	compileOptions {
+		coreLibraryDesugaringEnabled true
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
 	}
 	kotlinOptions {
 		jvmTarget = JavaVersion.VERSION_1_8.toString()
 		freeCompilerArgs += [
+			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
@@ -60,12 +62,15 @@ android {
 		]
 	}
 	lint {
-		abortOnError false
-		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
+		abortOnError true
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged', 'SetJavaScriptEnabled'
 	}
 	testOptions {
-		unitTests.includeAndroidResources = true
-		unitTests.returnDefaultValues = false
+		unitTests.includeAndroidResources true
+		unitTests.returnDefaultValues false
+		kotlinOptions {
+			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
+		}
 	}
 }
 afterEvaluate {
@@ -76,64 +81,82 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation('com.github.nv95:kotatsu-parsers:2d1907569b') {
+	//noinspection GradleDependency
+	implementation('com.github.KotatsuApp:kotatsu-parsers:c3613f3ba4') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3'
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
-	implementation 'androidx.core:core-ktx:1.8.0'
-	implementation 'androidx.activity:activity-ktx:1.5.0'
-	implementation 'androidx.fragment:fragment-ktx:1.5.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
-	implementation 'androidx.lifecycle:lifecycle-service:2.5.0'
-	implementation 'androidx.lifecycle:lifecycle-process:2.5.0'
+	implementation 'androidx.appcompat:appcompat:1.6.1'
+	implementation 'androidx.core:core-ktx:1.12.0'
+	implementation 'androidx.activity:activity-ktx:1.8.1'
+	implementation 'androidx.fragment:fragment-ktx:1.6.2'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
+	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.2.1'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-	implementation 'androidx.preference:preference-ktx:1.2.0'
-	implementation 'androidx.work:work-runtime-ktx:2.7.1'
-	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
-	implementation 'com.google.android.material:material:1.7.0-alpha02'
-	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.0'
+	implementation 'androidx.recyclerview:recyclerview:1.3.2'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
+	implementation 'androidx.preference:preference-ktx:1.2.1'
+	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
+	implementation 'com.google.android.material:material:1.10.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
 
-	implementation 'androidx.room:room-runtime:2.4.2'
-	implementation 'androidx.room:room-ktx:2.4.2'
-	kapt 'androidx.room:room-compiler:2.4.2'
+	// TODO https://issuetracker.google.com/issues/254846063
+	implementation 'androidx.work:work-runtime-ktx:2.8.1'
+	//noinspection GradleDependency
+	implementation('com.google.guava:guava:32.0.1-android') {
+		exclude group: 'com.google.guava', module: 'failureaccess'
+		exclude group: 'org.checkerframework', module: 'checker-qual'
+		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
+	}
 
-	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
-	implementation 'com.squareup.okio:okio:3.2.0'
+	implementation 'androidx.room:room-runtime:2.6.0'
+	implementation 'androidx.room:room-ktx:2.6.0'
+	ksp 'androidx.room:room-compiler:2.6.0'
+
+	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
+	implementation 'com.squareup.okio:okio:3.6.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'io.insert-koin:koin-android:3.2.0'
-	implementation 'io.coil-kt:coil-base:2.1.0'
-	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
+	implementation 'com.google.dagger:hilt-android:2.48.1'
+	kapt 'com.google.dagger:hilt-compiler:2.48.1'
+	implementation 'androidx.hilt:hilt-work:1.1.0'
+	kapt 'androidx.hilt:hilt-compiler:1.1.0'
+
+	implementation 'io.coil-kt:coil-base:2.5.0'
+	implementation 'io.coil-kt:coil-svg:2.5.0'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:cf089a264d'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
+	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-mail:5.9.3'
-	implementation 'ch.acra:acra-dialog:5.9.3'
+	implementation 'ch.acra:acra-http:5.11.3'
+	implementation 'ch.acra:acra-dialog:5.11.3'
 
-	debugImplementation 'org.jsoup:jsoup:1.15.1'
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
+	testImplementation 'org.json:json:20231013'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
-	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.test:runner:1.5.2'
+	androidTestImplementation 'androidx.test:rules:1.5.0'
+	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
-	androidTestImplementation 'io.insert-koin:koin-test:3.2.0'
-	androidTestImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
-	androidTestImplementation 'androidx.room:room-testing:2.4.2'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
-}
+	androidTestImplementation 'androidx.room:room-testing:2.6.0'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
+
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.48.1'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.48.1'
+}

app/proguard-rules.pro

@@ -8,6 +8,16 @@
 	public static void checkParameterIsNotNull(...);
 	public static void checkNotNullParameter(...);
 }
--keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
+-keep public class ** extends org.koitharu.kotatsu.core.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
--dontwarn okhttp3.internal.platform.ConscryptPlatform
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+
+-keep class org.koitharu.kotatsu.core.exceptions.* { *; }
+-keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
+-keep class org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy { *; }
+-keep class org.koitharu.kotatsu.settings.backup.PeriodicalBackupSettingsFragment { *; }
+-keep class org.jsoup.parser.Tag
+-keep class org.jsoup.internal.StringUtil

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

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

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

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

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

@@ -1,55 +0,0 @@
-package org.koitharu.kotatsu.core.db
-
-import androidx.room.testing.MigrationTestHelper
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import java.io.IOException
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.koitharu.kotatsu.core.db.migrations.*
-
-@RunWith(AndroidJUnit4::class)
-class MangaDatabaseTest {
-
-	@get:Rule
-	val helper: MigrationTestHelper = MigrationTestHelper(
-		InstrumentationRegistry.getInstrumentation(),
-		MangaDatabase::class.java,
-	)
-
-	@Test
-	@Throws(IOException::class)
-	fun migrateAll() {
-		helper.createDatabase(TEST_DB, 1).apply {
-			// TODO execSQL("")
-			close()
-		}
-		for (migration in migrations) {
-			helper.runMigrationsAndValidate(
-				TEST_DB,
-				migration.endVersion,
-				true,
-				migration
-			)
-		}
-	}
-
-	private companion object {
-
-		const val TEST_DB = "test-db"
-
-		val migrations = arrayOf(
-			Migration1To2(),
-			Migration2To3(),
-			Migration3To4(),
-			Migration4To5(),
-			Migration5To6(),
-			Migration6To7(),
-			Migration7To8(),
-			Migration8To9(),
-			Migration9To10(),
-			Migration10To11(),
-		)
-	}
-}

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

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

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

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

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

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

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

@@ -0,0 +1,57 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.testing.MigrationTestHelper
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MangaDatabaseTest {
+
+	@get:Rule
+	val helper: MigrationTestHelper = MigrationTestHelper(
+		InstrumentationRegistry.getInstrumentation(),
+		MangaDatabase::class.java,
+	)
+
+	private val migrations = getDatabaseMigrations(InstrumentationRegistry.getInstrumentation().targetContext)
+
+	@Test
+	fun versions() {
+		assertEquals(1, migrations.first().startVersion)
+		repeat(migrations.size) { i ->
+			assertEquals(i + 1, migrations[i].startVersion)
+			assertEquals(i + 2, migrations[i].endVersion)
+		}
+		assertEquals(DATABASE_VERSION, migrations.last().endVersion)
+	}
+
+	@Test
+	fun migrateAll() {
+		helper.createDatabase(TEST_DB, 1).close()
+		for (migration in migrations) {
+			helper.runMigrationsAndValidate(
+				TEST_DB,
+				migration.endVersion,
+				true,
+				migration,
+			).close()
+		}
+	}
+
+	@Test
+	fun prePopulate() {
+		val resources = InstrumentationRegistry.getInstrumentation().targetContext.resources
+		helper.createDatabase(TEST_DB, DATABASE_VERSION).use {
+			DatabasePrePopulateCallback(resources).onCreate(it)
+		}
+	}
+
+	private companion object {
+
+		const val TEST_DB = "test-db"
+	}
+}

app/src/androidTest/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt

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

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

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

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

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

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

@@ -1,40 +0,0 @@
-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/utils/ext/DebugExt.kt

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

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

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

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

@@ -0,0 +1,56 @@
+package org.koitharu.kotatsu.core.network
+
+import android.util.Log
+import okhttp3.Interceptor
+import okhttp3.Response
+import okio.Buffer
+import org.koitharu.kotatsu.core.network.CommonHeaders.ACCEPT_ENCODING
+
+class CurlLoggingInterceptor(
+	private val curlOptions: String? = null
+) : Interceptor {
+
+	override fun intercept(chain: Interceptor.Chain): Response {
+		val request = chain.request()
+		var isCompressed = false
+
+		val curlCmd = StringBuilder()
+		curlCmd.append("curl")
+		if (curlOptions != null) {
+			curlCmd.append(' ').append(curlOptions)
+		}
+		curlCmd.append(" -X ").append(request.method)
+
+		for ((name, value) in request.headers) {
+			if (name.equals(ACCEPT_ENCODING, ignoreCase = true) && value.equals("gzip", ignoreCase = true)) {
+				isCompressed = true
+			}
+			curlCmd.append(" -H \"").append(name).append(": ").append(value.escape()).append('\"')
+		}
+
+		val body = request.body
+		if (body != null) {
+			val buffer = Buffer()
+			body.writeTo(buffer)
+			val charset = body.contentType()?.charset() ?: Charsets.UTF_8
+			curlCmd.append(" --data-raw '")
+				.append(buffer.readString(charset).replace("\n", "\\n"))
+				.append("'")
+		}
+		if (isCompressed) {
+			curlCmd.append(" --compressed")
+		}
+		curlCmd.append(" \"").append(request.url).append('"')
+
+		log("---cURL (" + request.url + ")")
+		log(curlCmd.toString())
+
+		return chain.proceed(request)
+	}
+
+	private fun String.escape() = replace("\"", "\\\"")
+
+	private fun log(msg: String) {
+		Log.d("CURL", msg)
+	}
+}

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

@@ -0,0 +1,41 @@
+package org.koitharu.kotatsu.core.parser
+
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import java.util.EnumSet
+
+/**
+ * This parser is just for parser development, it should not be used in releases
+ */
+class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
+
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("")
+
+	override val availableSortOrders: 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, filter: MangaListFilter?): List<Manga> {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getAvailableTags(): Set<MangaTag> {
+		TODO("Not yet implemented")
+	}
+}

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

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

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -10,17 +10,46 @@
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
+	<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
+	<uses-permission android:name="android.permission.READ_SYNC_STATS" />
+	<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+	<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+	<uses-permission
+		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+		android:maxSdkVersion="29" />
+	<uses-permission
+		android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+		tools:ignore="ScopedStorage" />
+
+	<queries>
+		<intent>
+			<action android:name="android.intent.action.PROCESS_TEXT" />
+			<data android:mimeType="text/plain" />
+		</intent>
+		<intent>
+			<action android:name="android.speech.action.RECOGNIZE_SPEECH" />
+		</intent>
+	</queries>
 
 	<application
 		android:name="org.koitharu.kotatsu.KotatsuApp"
 		android:allowBackup="true"
 		android:backupAgent="org.koitharu.kotatsu.settings.backup.AppBackupAgent"
 		android:dataExtractionRules="@xml/backup_rules"
+		android:enableOnBackInvokedCallback="true"
 		android:fullBackupContent="@xml/backup_content"
 		android:fullBackupOnly="true"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
+		android:largeHeap="true"
 		android:networkSecurityConfig="@xml/network_security_config"
+		android:requestLegacyExternalStorage="true"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
 		android:theme="@style/Theme.Kotatsu"
@@ -43,6 +72,27 @@
 			<intent-filter>
 				<action android:name="${applicationId}.action.VIEW_MANGA" />
 			</intent-filter>
+			<intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="http" />
+				<data android:scheme="https" />
+				<data android:host="kotatsu.app" />
+				<data android:path="/manga" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+				<data android:host="manga" />
+				<data android:host="kotatsu.app" />
+			</intent-filter>
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
@@ -56,35 +106,76 @@
 			android:label="@string/search" />
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
-			android:label="@string/search_manga" />
+			android:exported="true"
+			android:label="@string/manga_list">
+			<intent-filter>
+				<action android:name="${applicationId}.action.EXPLORE_MANGA" />
+			</intent-filter>
+		</activity>
+		<activity
+			android:name="org.koitharu.kotatsu.history.ui.HistoryActivity"
+			android:label="@string/history" />
+		<activity
+			android:name="org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity"
+			android:label="@string/updates" />
+		<activity
+			android:name="org.koitharu.kotatsu.favourites.ui.FavouritesActivity"
+			android:label="@string/favourites" />
+		<activity
+			android:name="org.koitharu.kotatsu.bookmarks.ui.BookmarksActivity"
+			android:label="@string/bookmarks" />
+		<activity
+			android:name="org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity"
+			android:label="@string/suggestions" />
+		<activity
+			android:name="org.koitharu.kotatsu.details.ui.related.RelatedMangaActivity"
+			android:label="@string/related_manga" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:exported="true"
 			android:label="@string/settings">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
+
 				<category android:name="android.intent.category.DEFAULT" />
 				<category android:name="android.intent.category.BROWSABLE" />
+
 				<data android:scheme="kotatsu" />
+				<data android:host="about" />
+				<data android:host="sync-settings" />
 			</intent-filter>
 		</activity>
+		<activity
+			android:name="org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity"
+			android:label="@string/local_manga_directories" />
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
+		<activity
+			android:name="org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity"
+			android:autoRemoveFromRecents="true"
+			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.favourites.ui.categories.CategoriesActivity"
-			android:label="@string/favourites_categories"
-			android:windowSoftInputMode="stateAlwaysHidden" />
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity"
+			android:label="@string/manage_categories" />
 		<activity
-			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
+			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetConfigActivity"
 			android:exported="true"
-			android:label="@string/manga_shelf"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge">
+			android:label="@string/manga_shelf">
+			<intent-filter>
+				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+			</intent-filter>
+		</activity>
+		<activity
+			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetConfigActivity"
+			android:exported="true"
+			android:label="@string/recent_manga">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
@@ -100,25 +191,89 @@
 			android:name="org.koitharu.kotatsu.settings.protect.ProtectSetupActivity"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
+			android:name="org.koitharu.kotatsu.download.ui.list.DownloadsActivity"
 			android:label="@string/downloads"
-			android:launchMode="singleTop"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+			android:launchMode="singleTop" />
 		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity" />
+		<activity android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity" />
 		<activity
-			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+			android:name="org.koitharu.kotatsu.sync.ui.SyncAuthActivity"
+			android:label="@string/sync" />
+		<activity
+			android:name="org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity"
+			android:label="@string/color_correction" />
+		<activity
+			android:name="org.koitharu.kotatsu.scrobbling.common.ui.config.ScrobblerConfigActivity"
+			android:exported="true"
+			android:label="@string/settings"
+			android:launchMode="singleTop">
+
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+				<data android:host="shikimori-auth" />
+				<data android:host="anilist-auth" />
+				<data android:host="mal-auth" />
+			</intent-filter>
+
+		</activity>
+		<activity
+			android:name="org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity"
+			android:label="@string/sources_catalog" />
 
 		<service
-			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
+			android:name="androidx.work.impl.foreground.SystemForegroundService"
+			android:foregroundServiceType="dataSync"
+			tools:node="merge" />
+		<service
+			android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService"
 			android:foregroundServiceType="dataSync" />
-		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.SyncAuthenticatorService"
+			android:exported="true"
+			tools:ignore="ExportedService">
+			<intent-filter>
+				<action android:name="android.accounts.AccountAuthenticator" />
+			</intent-filter>
+			<meta-data
+				android:name="android.accounts.AccountAuthenticator"
+				android:resource="@xml/authenticator_sync" />
+		</service>
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncService"
+			android:exported="false"
+			android:label="@string/favourites">
+			<intent-filter>
+				<action android:name="android.content.SyncAdapter" />
+			</intent-filter>
+			<meta-data
+				android:name="android.content.SyncAdapter"
+				android:resource="@xml/sync_favourites" />
+		</service>
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncService"
+			android:exported="false"
+			android:label="@string/history">
+			<intent-filter>
+				<action android:name="android.content.SyncAdapter" />
+			</intent-filter>
+			<meta-data
+				android:name="android.content.SyncAdapter"
+				android:resource="@xml/sync_history" />
+		</service>
+		<service
+			android:name="org.koitharu.kotatsu.details.service.MangaPrefetchService"
+			android:exported="false" />
 
 		<provider
 			android:name="org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider"
@@ -133,6 +288,28 @@
 				android:name="android.support.FILE_PROVIDER_PATHS"
 				android:resource="@xml/filepaths" />
 		</provider>
+		<provider
+			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncProvider"
+			android:authorities="@string/sync_authority_favourites"
+			android:exported="false"
+			android:label="@string/favourites"
+			android:syncable="true" />
+		<provider
+			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncProvider"
+			android:authorities="@string/sync_authority_history"
+			android:exported="false"
+			android:label="@string/history"
+			android:syncable="true" />
+		<provider
+			android:name="androidx.startup.InitializationProvider"
+			android:authorities="${applicationId}.androidx-startup"
+			android:exported="false"
+			tools:node="remove">
+			<meta-data
+				android:name="androidx.work.WorkManagerInitializer"
+				android:value="androidx.startup"
+				tools:node="remove" />
+		</provider>
 
 		<receiver
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider"
@@ -156,6 +333,20 @@
 				android:name="android.appwidget.provider"
 				android:resource="@xml/widget_recent" />
 		</receiver>
+		<receiver
+			android:name="org.koitharu.kotatsu.settings.about.UpdateDownloadReceiver"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
+			</intent-filter>
+		</receiver>
+		<receiver
+			android:name="org.koitharu.kotatsu.core.ErrorReporterReceiver"
+			android:exported="false">
+			<intent-filter>
+				<action android:name="${applicationId}.action.REPORT_ERROR" />
+			</intent-filter>
+		</receiver>
 
 		<meta-data
 			android:name="android.webkit.WebView.EnableSafeBrowsing"
@@ -163,7 +354,664 @@
 		<meta-data
 			android:name="android.webkit.WebView.MetricsOptOut"
 			android:value="true" />
+		<meta-data
+			android:name="com.samsung.android.icon_container.has_icon_container"
+			android:value="@bool/com_samsung_android_icon_container_has_icon_container" />
+
+		<activity-alias
+			android:name="org.koitharu.kotatsu.details.ui.DetailsBYLinkActivity"
+			android:exported="true"
+			android:targetActivity="org.koitharu.kotatsu.details.ui.DetailsActivity">
+
+			<intent-filter android:autoVerify="false">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="http" />
+				<data android:scheme="https" />
+				<data android:host="1stkissmanga.me" />
+				<data android:host="3asq.org" />
+				<data android:host="18porncomic.com" />
+				<data android:host="212.32.226.234" />
+				<data android:host="247manga.com" />
+				<data android:host="365manga.com" />
+				<data android:host="2023.allhen.online" />
+				<data android:host="adultwebtoon.com" />
+				<data android:host="afroditscans.com" />
+				<data android:host="ainzscans.site" />
+				<data android:host="aiyumanga.com" />
+				<data android:host="alceascan.my.id" />
+				<data android:host="allporncomic.com" />
+				<data android:host="anibel.net" />
+				<data android:host="anigliscans.com" />
+				<data android:host="anikiga.com" />
+				<data android:host="animaregia.net" />
+				<data android:host="anisamanga.com" />
+				<data android:host="anshscans.org" />
+				<data android:host="apenasmaisumyaoi.com" />
+				<data android:host="apollcomics.com" />
+				<data android:host="aquamanga.com" />
+				<data android:host="arabtoons.net" />
+				<data android:host="araznovel.com" />
+				<data android:host="arcanescans.com" />
+				<data android:host="arenascans.net" />
+				<data android:host="arthurscan.xyz" />
+				<data android:host="astral-manga.fr" />
+				<data android:host="astrallibrary.net" />
+				<data android:host="astrumscans.xyz" />
+				<data android:host="asura.nacm.xyz" />
+				<data android:host="asurascanstr.com" />
+				<data android:host="athenafansub.com" />
+				<data android:host="ayatoon.com" />
+				<data android:host="azoranov.com" />
+				<data android:host="azuremanga.com" />
+				<data android:host="babeltoon.com" />
+				<data android:host="bakai.org" />
+				<data android:host="bakaman.net" />
+				<data android:host="bakamh.com" />
+				<data android:host="banana-scan.com" />
+				<data android:host="bato.to" />
+				<data android:host="batocomic.com" />
+				<data android:host="batocomic.net" />
+				<data android:host="batocomic.org" />
+				<data android:host="batotoo.com" />
+				<data android:host="batotwo.com" />
+				<data android:host="battwo.com" />
+				<data android:host="beast-scans.com" />
+				<data android:host="beehentai.com" />
+				<data android:host="bentomanga.com" />
+				<data android:host="bestmanga.club" />
+				<data android:host="bestmanhua.com" />
+				<data android:host="bibimanga.com" />
+				<data android:host="birdmanga.com" />
+				<data android:host="birdtoon.net" />
+				<data android:host="blogmanga.net" />
+				<data android:host="blogtruyenmoi.com" />
+				<data android:host="bokugents.com" />
+				<data android:host="boosei.net" />
+				<data android:host="boyslove.me" />
+				<data android:host="br.atlantisscan.com" />
+				<data android:host="br.ninemanga.com" />
+				<data android:host="cabaredowatame.site" />
+				<data android:host="cafecomyaoi.com.br" />
+				<data android:host="carteldemanhwas.com" />
+				<data android:host="cat300.com" />
+				<data android:host="cerisescans.com" />
+				<data android:host="chap.mangairo.com" />
+				<data android:host="chapmanganato.com" />
+				<data android:host="chapmanganato.com" />
+				<data android:host="cizgiromanarsivi.com" />
+				<data android:host="cmreader.info" />
+				<data android:host="cocorip.net" />
+				<data android:host="coffeemanga.io" />
+				<data android:host="coloredmanga.com" />
+				<data android:host="comick.app" />
+				<data android:host="comiko.net" />
+				<data android:host="comiko.org" />
+				<data android:host="copypastescan.xyz" />
+				<data android:host="cosmicscans.com" />
+				<data android:host="daprob.com" />
+				<data android:host="darkscans.com" />
+				<data android:host="de.ninemanga.com" />
+				<data android:host="desu.me" />
+				<data android:host="diamondfansub.com" />
+				<data android:host="dojing.net" />
+				<data android:host="dokkomanga.com" />
+				<data android:host="dokkomanga.com" />
+				<data android:host="doujin69.com" />
+				<data android:host="doujindesu.rip" />
+				<data android:host="doujinhentai.net" />
+				<data android:host="dragontea.ink" />
+				<data android:host="dragontranslation.net" />
+				<data android:host="drakescans.com" />
+				<data android:host="dto.to" />
+				<data android:host="duckmanga.com" />
+				<data android:host="duniakomik.id" />
+				<data android:host="dynasty-scans.com" />
+				<data android:host="e-hentai.org" />
+				<data android:host="elarcpage.com" />
+				<data android:host="en.leviatanscans.com" />
+				<data android:host="epsilonscan.fr" />
+				<data android:host="es.ninemanga.com" />
+				<data android:host="esomanga.com" />
+				<data android:host="exhentai.org" />
+				<data android:host="falconmanga.com" />
+				<data android:host="fbsquads.com" />
+				<data android:host="finalscans.com" />
+				<data android:host="flamescans.org" />
+				<data android:host="foxwhite.com.br" />
+				<data android:host="fr-scan.cc" />
+				<data android:host="fr.ninemanga.com" />
+				<data android:host="franxxmangas.net" />
+				<data android:host="freakscans.com" />
+				<data android:host="freemanga.me" />
+				<data android:host="freemangatop.com" />
+				<data android:host="freewebtooncoins.com" />
+				<data android:host="frscans.com" />
+				<data android:host="furyosociety.com" />
+				<data android:host="galaxymanga.org" />
+				<data android:host="gatemanga.com" />
+				<data android:host="gdscans.com" />
+				<data android:host="gekkou.com.br" />
+				<data android:host="glorymanga.com" />
+				<data android:host="goldenmanga.top" />
+				<data android:host="golgebahcesi.com" />
+				<data android:host="gooffansub.com" />
+				<data android:host="gourmetscans.net" />
+				<data android:host="grabber.zone" />
+				<data android:host="gremorymangas.com" />
+				<data android:host="guimah.com" />
+				<data android:host="guncelmanga.net" />
+				<data android:host="h.mangabat.com" />
+				<data android:host="hachiraw.com" />
+				<data android:host="harimanga.com" />
+				<data android:host="hayalistic.com" />
+				<data android:host="hensekai.com" />
+				<data android:host="hentai3z.cc" />
+				<data android:host="hentai3z.xyz" />
+				<data android:host="hentai4free.net" />
+				<data android:host="hentai20.io" />
+				<data android:host="hentai.gekkouscans.com.br" />
+				<data android:host="hentai.scantrad-vf.cc" />
+				<data android:host="hentaichan.live" />
+				<data android:host="hentaichan.pro" />
+				<data android:host="hentaicube.net" />
+				<data android:host="hentailib.me" />
+				<data android:host="hentaimanga.me" />
+				<data android:host="hentaiteca.net" />
+				<data android:host="hentaivn.autos" />
+				<data android:host="hentaivn.tv" />
+				<data android:host="hentaiwebtoon.com" />
+				<data android:host="hentaixcomic.com" />
+				<data android:host="hentaixdickgirl.com" />
+				<data android:host="hentaixyuri.com" />
+				<data android:host="hentaizone.xyz" />
+				<data android:host="herenscan.com" />
+				<data android:host="hhentai.fr" />
+				<data android:host="hikariscan.com.br" />
+				<data android:host="hipercool.xyz" />
+				<data android:host="hmanhwa.com" />
+				<data android:host="hni-scantrad.com" />
+				<data android:host="honey-manga.com.ua" />
+				<data android:host="hscans.com" />
+				<data android:host="hto.to" />
+				<data android:host="id.gourmetscans.net" />
+				<data android:host="illusionscan.com" />
+				<data android:host="immortalupdates.com" />
+				<data android:host="immortalupdates.id" />
+				<data android:host="imperiodabritannia.com" />
+				<data android:host="imperioscans.com.br" />
+				<data android:host="indo18h.com" />
+				<data android:host="infrafandub.xyz" />
+				<data android:host="isekaiscan.top" />
+				<data android:host="it.ninemanga.com" />
+				<data android:host="itsyourightmanhua.com" />
+				<data android:host="jaiminisbox.net" />
+				<data android:host="japscan.ws" />
+				<data android:host="jiangzaitoon.co" />
+				<data android:host="jimanga.com" />
+				<data android:host="jpmangas.xyz" />
+				<data android:host="kanzenin.xyz" />
+				<data android:host="karatcam-scans.fr" />
+				<data android:host="katakomik.online" />
+				<data android:host="kiryuu.id" />
+				<data android:host="kissmanga.in" />
+				<data android:host="klikmanga.id" />
+				<data android:host="klz9.com" />
+				<data android:host="koinoboriscan.com" />
+				<data android:host="kolmanga.com" />
+				<data android:host="komikav.com" />
+				<data android:host="komikcast.io" />
+				<data android:host="komikdewasa.cfd" />
+				<data android:host="komikgo.org" />
+				<data android:host="komikhentai.co" />
+				<data android:host="komikid.com" />
+				<data android:host="komikindo.co" />
+				<data android:host="komikindo.info" />
+				<data android:host="komiklab.com" />
+				<data android:host="komiklokal.cfd" />
+				<data android:host="komikmama.co" />
+				<data android:host="komikmanhwa.me" />
+				<data android:host="komikmirror.art" />
+				<data android:host="komiksan.link" />
+				<data android:host="komiksay.site" />
+				<data android:host="komikstation.co" />
+				<data android:host="komiktap.in" />
+				<data android:host="komiku.com" />
+				<data android:host="komikzoid.xyz" />
+				<data android:host="ksgroupscans.com" />
+				<data android:host="kumascans.com" />
+				<data android:host="kunmanga.com" />
+				<data android:host="ladymanga.com" />
+				<data android:host="lectortmo.com" />
+				<data android:host="lectorunitoon.com" />
+				<data android:host="legacy-scans.com" />
+				<data android:host="legionscans.com" />
+				<data android:host="leitor.kamisama.com.br" />
+				<data android:host="leitorizakaya.net" />
+				<data android:host="lelscanvf.cc" />
+				<data android:host="leryaoi.com" />
+				<data android:host="lilymanga.net" />
+				<data android:host="limascans.xyz/v2" />
+				<data android:host="lkscanlation.com" />
+				<data android:host="lolicon.mobi" />
+				<data android:host="lugnica-scans.com" />
+				<data android:host="lunarscan.org" />
+				<data android:host="luxmanga.net" />
+				<data android:host="lxmanga.net" />
+				<data android:host="lynxscans.com" />
+				<data android:host="m.isekaiscan.to" />
+				<data android:host="mafia-manga.com" />
+				<data android:host="maidscan.com.br" />
+				<data android:host="manga1st.online" />
+				<data android:host="manga3s.com" />
+				<data android:host="manga18.club" />
+				<data android:host="manga68.com" />
+				<data android:host="manga689.com" />
+				<data android:host="manga-chan.me" />
+				<data android:host="manga-crab.com" />
+				<data android:host="manga-diyari.com" />
+				<data android:host="manga-fast.com" />
+				<data android:host="manga-fr.me" />
+				<data android:host="manga-mate.org" />
+				<data android:host="manga-moons.net" />
+				<data android:host="manga-scan.co" />
+				<data android:host="manga-scantrad.io" />
+				<data android:host="manga-tx.com" />
+				<data android:host="manga-uptocats.com" />
+				<data android:host="manga.clone-army.org" />
+				<data android:host="manga.in.ua" />
+				<data android:host="manga.mundodrama.site" />
+				<data android:host="mangaaction.com" />
+				<data android:host="mangaatrend.net" />
+				<data android:host="mangabaz.net" />
+				<data android:host="mangabob.com" />
+				<data android:host="mangabuddy.com" />
+				<data android:host="mangacim.com" />
+				<data android:host="mangaclash.com" />
+				<data android:host="mangacultivator.com" />
+				<data android:host="mangacute.com" />
+				<data android:host="mangacv.com" />
+				<data android:host="mangadass.com" />
+				<data android:host="mangadeemak.com" />
+				<data android:host="mangadex.org" />
+				<data android:host="mangadistrict.com" />
+				<data android:host="mangadna.com" />
+				<data android:host="mangadoor.com" />
+				<data android:host="mangaeffect.com" />
+				<data android:host="mangaforest.me" />
+				<data android:host="mangaforfree.com" />
+				<data android:host="mangafoxfull.com" />
+				<data android:host="mangafreak.online" />
+				<data android:host="mangagalaxy.me" />
+				<data android:host="mangagg.com" />
+				<data android:host="mangagoyaoi.com" />
+				<data android:host="mangagreat.com" />
+				<data android:host="mangahentai.me" />
+				<data android:host="mangahub.fr" />
+				<data android:host="mangaid.click" />
+				<data android:host="mangaindo.me" />
+				<data android:host="mangak2.com" />
+				<data android:host="mangakakalot.com" />
+				<data android:host="mangakeyfi.net" />
+				<data android:host="mangaking.net" />
+				<data android:host="mangakio.me" />
+				<data android:host="mangakiss.org" />
+				<data android:host="mangakita.net" />
+				<data android:host="mangakomi.io" />
+				<data android:host="mangakyo.org" />
+				<data android:host="mangalek.com" />
+				<data android:host="mangaleks.com" />
+				<data android:host="mangaleveling.com" />
+				<data android:host="mangalib.me" />
+				<data android:host="mangalike.me" />
+				<data android:host="mangalink.online" />
+				<data android:host="mangalionz.com" />
+				<data android:host="mangamammy.ru" />
+				<data android:host="mangamanhua.online" />
+				<data android:host="mangamaniacs.org" />
+				<data android:host="manganato.com" />
+				<data android:host="mangaokutr.com" />
+				<data android:host="mangaonelove.site" />
+				<data android:host="mangaonlineteam.com" />
+				<data android:host="mangaowl.to" />
+				<data android:host="mangaprotm.com" />
+				<data android:host="mangapt.com" />
+				<data android:host="mangapuma.com" />
+				<data android:host="mangaread.co" />
+				<data android:host="mangareaderpro.com" />
+				<data android:host="mangareading.org" />
+				<data android:host="mangarockteam.com" />
+				<data android:host="mangarocky.com" />
+				<data android:host="mangarolls.net" />
+				<data android:host="mangarosie.in" />
+				<data android:host="mangas-origines.fr" />
+				<data android:host="mangas-origines.xyz" />
+				<data android:host="mangaschan.com" />
+				<data android:host="mangasehri.com" />
+				<data android:host="mangaspark.com" />
+				<data android:host="mangastarz.com" />
+				<data android:host="mangastic.cc" />
+				<data android:host="mangastic.cc" />
+				<data android:host="mangasushi.org" />
+				<data android:host="mangasusuku.xyz" />
+				<data android:host="mangatale.co" />
+				<data android:host="mangatone.com" />
+				<data android:host="mangatoto.com" />
+				<data android:host="mangatoto.net" />
+				<data android:host="mangatoto.org" />
+				<data android:host="mangatx.com" />
+				<data android:host="mangaus.xyz" />
+				<data android:host="mangavisa.com" />
+				<data android:host="mangaweebs.in" />
+				<data android:host="mangawt.com" />
+				<data android:host="mangax1.com" />
+				<data android:host="mangaxyz.com" />
+				<data android:host="mangayaro.net" />
+				<data android:host="mangazavr.ru" />
+				<data android:host="mangazodiac.com" />
+				<data android:host="manhatic.com" />
+				<data android:host="manhuaes.com" />
+				<data android:host="manhuafast.com" />
+				<data android:host="manhuafast.net" />
+				<data android:host="manhuaga.com" />
+				<data android:host="manhuahot.com" />
+				<data android:host="manhuamix.com" />
+				<data android:host="manhuaplus.com" />
+				<data android:host="manhuascan.us" />
+				<data android:host="manhuaus.com" />
+				<data android:host="manhuazone.net" />
+				<data android:host="manhwa18.app" />
+				<data android:host="manhwa18.com" />
+				<data android:host="manhwa18.net" />
+				<data android:host="manhwa18.org" />
+				<data android:host="manhwa68.com" />
+				<data android:host="manhwa-latino.com" />
+				<data android:host="manhwaclan.com" />
+				<data android:host="manhwadesu.top" />
+				<data android:host="manhwafull.com" />
+				<data android:host="manhwahentai.me" />
+				<data android:host="manhwaindo.icu" />
+				<data android:host="manhwaindo.id" />
+				<data android:host="manhwakool.com" />
+				<data android:host="manhwalist.xyz" />
+				<data android:host="manhwalover.com" />
+				<data android:host="manhwaplus.pro" />
+				<data android:host="manhwasco.net" />
+				<data android:host="manhwatop.com" />
+				<data android:host="manhwaworld.com" />
+				<data android:host="manhwax.org" />
+				<data android:host="manhwaz.com" />
+				<data android:host="mantrazscan.com" />
+				<data android:host="manwe.pro" />
+				<data android:host="manycomic.com" />
+				<data android:host="manytoon.com" />
+				<data android:host="manytoon.me" />
+				<data android:host="masterkomik.com" />
+				<data android:host="melokomik.xyz" />
+				<data android:host="mgkomik.com" />
+				<data android:host="miauscans.com" />
+				<data android:host="milftoon.xxx" />
+				<data android:host="mintmanga.com" />
+				<data android:host="mintmanga.live" />
+				<data android:host="mirrordesu.ink" />
+				<data android:host="mm-scans.org" />
+				<data android:host="momonohanascan.com" />
+				<data android:host="monarcamanga.com" />
+				<data android:host="moonloversscan.com.br" />
+				<data android:host="moonwitchinlovescan.com" />
+				<data android:host="mortalsgroove.com" />
+				<data android:host="mto.to" />
+				<data android:host="mundomangakun.com.br" />
+				<data android:host="mundomanhwa.com" />
+				<data android:host="murimscan.run" />
+				<data android:host="neatmangas.com" />
+				<data android:host="neoxscans.net" />
+				<data android:host="nettruyenin.com" />
+				<data android:host="nettruyento.com" />
+				<data android:host="neumanga.net" />
+				<data android:host="neumanga.xyz" />
+				<data android:host="nhattruyenmin.com" />
+				<data android:host="nhentai.net" />
+				<data android:host="nicovideo.jp" />
+				<data android:host="nightscans.org" />
+				<data android:host="niji-translations.com" />
+				<data android:host="ninjascan.site" />
+				<data android:host="niverafansub.com" />
+				<data android:host="nocsummer.com.br" />
+				<data android:host="noindexscan.com" />
+				<data android:host="nonbiri.space" />
+				<data android:host="novelcrow.com" />
+				<data android:host="novelmic.com" />
+				<data android:host="novelstown.cyou" />
+				<data android:host="nude-moon.net" />
+				<data android:host="nude-moon.org" />
+				<data android:host="nyxmanga.com" />
+				<data android:host="origami-orpheans.com.br" />
+				<data android:host="otsugami.id" />
+				<data android:host="oxapk.com" />
+				<data android:host="ozulmanga.com" />
+				<data android:host="painfulnightz.com" />
+				<data android:host="pantheon-scan.com" />
+				<data android:host="papscan.com" />
+				<data android:host="paragonscans.com" />
+				<data android:host="peacescans.com" />
+				<data android:host="phantomscans.com" />
+				<data android:host="phenixscans.fr" />
+				<data android:host="pianmanga.me" />
+				<data android:host="pirulitorosa.site" />
+				<data android:host="piscans.in" />
+				<data android:host="platinumscans.com" />
+				<data android:host="pojokmanga.net" />
+				<data android:host="popsmanga.com" />
+				<data android:host="portalyaoi.com" />
+				<data android:host="prismahentai.com" />
+				<data android:host="prismascans.net" />
+				<data android:host="projetoscanlator.com" />
+				<data android:host="psunicorn.com" />
+				<data android:host="queenscans.com" />
+				<data android:host="ragnarokscan.com" />
+				<data android:host="ragnarokscanlation.com" />
+				<data android:host="raijinscans.fr" />
+				<data android:host="raikiscan.com" />
+				<data android:host="rainbowfairyscan.com" />
+				<data android:host="randomscans.com" />
+				<data android:host="ravenscans.com" />
+				<data android:host="rawdex.net" />
+				<data android:host="rawkuma.com" />
+				<data android:host="read-nifteam.info" />
+				<data android:host="read.babelwuxia.com" />
+				<data android:host="readcomicsonline.ru" />
+				<data android:host="reader.deathtollscans.net" />
+				<data android:host="reader.decadencescans.com" />
+				<data android:host="reader.evilflowers.com" />
+				<data android:host="reader.mangatellers.gr" />
+				<data android:host="reader.onepiecenakama.pl" />
+				<data android:host="reader.powermanga.org" />
+				<data android:host="reader.silentsky-scans.net" />
+				<data android:host="readfreecomics.com" />
+				<data android:host="readkomik.com" />
+				<data android:host="readmanga.io" />
+				<data android:host="readmanga.live" />
+				<data android:host="readmanga.me" />
+				<data android:host="readmangabat.com" />
+				<data android:host="readmanhua.net" />
+				<data android:host="readtoto.com" />
+				<data android:host="readtoto.net" />
+				<data android:host="readtoto.org" />
+				<data android:host="realmscans.xyz" />
+				<data android:host="reaperscans.fr" />
+				<data android:host="remanga.org" />
+				<data android:host="rightdark-scan.com" />
+				<data android:host="rio2manga.com" />
+				<data android:host="rio2manga.net" />
+				<data android:host="rogmangas.com" />
+				<data android:host="romantikmanga.com" />
+				<data android:host="ru.ninemanga.com" />
+				<data android:host="s2manga.com" />
+				<data android:host="samuraiscan.com" />
+				<data android:host="sawamics.com" />
+				<data android:host="saytruyenhay.com" />
+				<data android:host="scambertraslator.com" />
+				<data android:host="scan.hentai.menu" />
+				<data android:host="scanmanga-vf.ws" />
+				<data android:host="scansmangas.me" />
+				<data android:host="scansraw.com" />
+				<data android:host="scantrad-union.com" />
+				<data android:host="scantrad-vf.co" />
+				<data android:host="sekaikomik.pro" />
+				<data android:host="sektedoujin.cc" />
+				<data android:host="sektekomik.xyz" />
+				<data android:host="selfmanga.live" />
+				<data android:host="senpaiediciones.com" />
+				<data android:host="shadowmangas.com" />
+				<data android:host="shadowtrad.net" />
+				<data android:host="sheakomik.com" />
+				<data android:host="shibamanga.com" />
+				<data android:host="shinigami.id" />
+				<data android:host="shirodoujin.com" />
+				<data android:host="shootingstarscans.com" />
+				<data android:host="silencescan.com.br" />
+				<data android:host="sinensisscans.com" />
+				<data android:host="skanlacje-feniksy.pl" />
+				<data android:host="skymanga.work" />
+				<data android:host="skymangas.com" />
+				<data android:host="sleepytranslations.com" />
+				<data android:host="soulscans.my.id" />
+				<data android:host="spartanmanga.com.tr" />
+				<data android:host="sssscanlator.com" />
+				<data android:host="summanga.com" />
+				<data android:host="suryascans.com" />
+				<data android:host="sushiscan.fr" />
+				<data android:host="sushiscan.net" />
+				<data android:host="swatop.club" />
+				<data android:host="tankouhentai.com" />
+				<data android:host="tatakaescan.com" />
+				<data android:host="tecnoscann.com" />
+				<data android:host="teenmanhua.com" />
+				<data android:host="tempestfansub.com" />
+				<data android:host="templescan.net" />
+				<data android:host="templescanesp.com" />
+				<data android:host="tenkaiscan.net" />
+				<data android:host="theguildscans.com" />
+				<data android:host="thesugarscan.com" />
+				<data android:host="timenaight.com" />
+				<data android:host="todaymic.com" />
+				<data android:host="tonizutoon.com" />
+				<data android:host="toonchill.com" />
+				<data android:host="toonfr.com" />
+				<data android:host="toonhunter.com" />
+				<data android:host="toonily.com" />
+				<data android:host="toonily.me" />
+				<data android:host="toonily.net" />
+				<data android:host="toonitube.com" />
+				<data android:host="tortuga-ceviri.com" />
+				<data android:host="traduccionesmoonlight.com" />
+				<data android:host="treemanga.com" />
+				<data android:host="tritinia.org" />
+				<data android:host="truemanga.com" />
+				<data android:host="truyentranhlh.net" />
+				<data android:host="tsundoku.com.br" />
+				<data android:host="tukangkomik.id" />
+				<data android:host="tumanhwas.club" />
+				<data android:host="turktoon.com" />
+				<data android:host="v2.comiz.net" />
+				<data android:host="valkyriescan.com" />
+				<data android:host="vercomicsporno.com" />
+				<data android:host="vermangasporno.com" />
+				<data android:host="vermanhwa.es" />
+				<data android:host="viyafansub.com" />
+				<data android:host="void-scans.com" />
+				<data android:host="w.mangairo.com" />
+				<data android:host="wakamics.net" />
+				<data android:host="webcomic.me" />
+				<data android:host="webtoon-tr.com" />
+				<data android:host="webtoon.uk" />
+				<data android:host="webtoonempire.org" />
+				<data android:host="webtoonhatti.com" />
+				<data android:host="webtoons.top" />
+				<data android:host="webtoonscan.com" />
+				<data android:host="weloma.art" />
+				<data android:host="welovemanga.one" />
+				<data android:host="westmanga.info" />
+				<data android:host="wickedwitchscan.com" />
+				<data android:host="winterscan.com" />
+				<data android:host="wonderlandscan.com" />
+				<data android:host="woopread.com" />
+				<data android:host="worldmanhwas.bar" />
+				<data android:host="wto.to" />
+				<data android:host="www1.bluesolo.org" />
+				<data android:host="www.areascans.net" />
+				<data android:host="www.bentomanga.com" />
+				<data android:host="www.eromiau.com" />
+				<data android:host="www.inu-manga.com" />
+				<data android:host="www.japscan.lol" />
+				<data android:host="www.kuroimanga.com" />
+				<data android:host="www.lami-manga.com" />
+				<data android:host="www.lelmanga.com" />
+				<data android:host="www.lianscans.my.id" />
+				<data android:host="www.maid.my.id" />
+				<data android:host="www.majorscans.com" />
+				<data android:host="www.mangadods.com" />
+				<data android:host="www.mangaread.org" />
+				<data android:host="www.mangascantrad.fr" />
+				<data android:host="www.mangatown.com" />
+				<data android:host="www.manhuabug.com" />
+				<data android:host="www.manhuakey.com" />
+				<data android:host="www.manhuasy.com" />
+				<data android:host="www.menudo-fansub.com" />
+				<data android:host="www.nettruyenmax.com" />
+				<data android:host="www.nettruyento.com" />
+				<data android:host="www.nightcomic.com" />
+				<data android:host="www.ninemanga.com" />
+				<data android:host="www.noblessetranslations.com" />
+				<data android:host="www.pantheon-scan.fr" />
+				<data android:host="www.paritehaber.com" />
+				<data android:host="www.peachscan.com" />
+				<data android:host="www.petrotechsociety.org" />
+				<data android:host="www.petrotechsociety.org" />
+				<data android:host="www.ramareader.it" />
+				<data android:host="www.rh2plusmanga.com" />
+				<data android:host="www.ruyamanga.com" />
+				<data android:host="www.scan-fr.org" />
+				<data android:host="www.scan-vf.net" />
+				<data android:host="www.thaimanga.net" />
+				<data android:host="www.topmanhua.com" />
+				<data android:host="www.vfscan.com" />
+				<data android:host="www.walpurgiscan.it" />
+				<data android:host="www.webtoon.xyz" />
+				<data android:host="www.witcomics.net" />
+				<data android:host="www.xn--l3c0azab5a2gta.com" />
+				<data android:host="www.yaoitoshokan.net" />
+				<data android:host="xbato.com" />
+				<data android:host="xbato.net" />
+				<data android:host="xbato.org" />
+				<data android:host="xoxocomics.net" />
+				<data android:host="xx.hentaichan.live" />
+				<data android:host="xxx.hentaichan.live" />
+				<data android:host="y.hentaichan.live" />
+				<data android:host="yaoi-chan.me" />
+				<data android:host="yaoi.mobi" />
+				<data android:host="yaoilib.me" />
+				<data android:host="yaoiscan.com" />
+				<data android:host="ycscan.com" />
+				<data android:host="yugenmangas.com.br" />
+				<data android:host="yuri.live" />
+				<data android:host="zahard.xyz" />
+				<data android:host="zandynofansub.aishiteru.org" />
+				<data android:host="zbato.com" />
+				<data android:host="zbato.net" />
+				<data android:host="zbato.org" />
+				<data android:host="zeroscan.com.br" />
+				<data android:host="zinmanga.com" />
+				<data android:host="zinmanhwa.com" />
+				<data android:host="zuttomanga.com" />
+				<data android:host="реманга.орг" />
+			</intent-filter>
+		</activity-alias>
 
 	</application>
 
-</manifest>
+</manifest>

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

@@ -1,140 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.app.Application
-import android.content.Context
-import android.os.StrictMode
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.fragment.app.strictmode.FragmentStrictMode
-import org.acra.ReportField
-import org.acra.config.dialog
-import org.acra.config.mailSender
-import org.acra.data.StringFormat
-import org.acra.ktx.initAcra
-import org.koin.android.ext.android.get
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
-import org.koitharu.kotatsu.base.ui.util.ActivityRecreationHandle
-import org.koitharu.kotatsu.bookmarks.bookmarksModule
-import org.koitharu.kotatsu.core.db.databaseModule
-import org.koitharu.kotatsu.core.github.githubModule
-import org.koitharu.kotatsu.core.network.networkModule
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.uiModule
-import org.koitharu.kotatsu.details.detailsModule
-import org.koitharu.kotatsu.favourites.favouritesModule
-import org.koitharu.kotatsu.history.historyModule
-import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.local.localModule
-import org.koitharu.kotatsu.main.mainModule
-import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.readerModule
-import org.koitharu.kotatsu.remotelist.remoteListModule
-import org.koitharu.kotatsu.scrobbling.shikimori.shikimoriModule
-import org.koitharu.kotatsu.search.searchModule
-import org.koitharu.kotatsu.settings.settingsModule
-import org.koitharu.kotatsu.suggestions.suggestionsModule
-import org.koitharu.kotatsu.tracker.trackerModule
-import org.koitharu.kotatsu.widget.WidgetUpdater
-import org.koitharu.kotatsu.widget.appWidgetModule
-
-class KotatsuApp : Application() {
-
-	override fun onCreate() {
-		super.onCreate()
-		if (BuildConfig.DEBUG) {
-			enableStrictMode()
-		}
-		initKoin()
-		AppCompatDelegate.setDefaultNightMode(get<AppSettings>().theme)
-		registerActivityLifecycleCallbacks(get<AppProtectHelper>())
-		registerActivityLifecycleCallbacks(get<ActivityRecreationHandle>())
-		val widgetUpdater = WidgetUpdater(applicationContext)
-		widgetUpdater.subscribeToFavourites(get())
-		widgetUpdater.subscribeToHistory(get())
-	}
-
-	private fun initKoin() {
-		startKoin {
-			androidContext(this@KotatsuApp)
-			modules(
-				networkModule,
-				databaseModule,
-				githubModule,
-				uiModule,
-				mainModule,
-				searchModule,
-				localModule,
-				favouritesModule,
-				historyModule,
-				remoteListModule,
-				detailsModule,
-				trackerModule,
-				settingsModule,
-				readerModule,
-				appWidgetModule,
-				suggestionsModule,
-				shikimoriModule,
-				bookmarksModule,
-			)
-		}
-	}
-
-	override fun attachBaseContext(base: Context?) {
-		super.attachBaseContext(base)
-		initAcra {
-			buildConfigClass = BuildConfig::class.java
-			reportFormat = StringFormat.KEY_VALUE_LIST
-			reportContent = listOf(
-				ReportField.PACKAGE_NAME,
-				ReportField.APP_VERSION_CODE,
-				ReportField.APP_VERSION_NAME,
-				ReportField.ANDROID_VERSION,
-				ReportField.PHONE_MODEL,
-				ReportField.CRASH_CONFIGURATION,
-				ReportField.STACK_TRACE,
-				ReportField.CUSTOM_DATA,
-				ReportField.SHARED_PREFERENCES,
-			)
-			dialog {
-				text = getString(R.string.crash_text)
-				title = getString(R.string.error_occurred)
-				positiveButtonText = getString(R.string.send)
-				resIcon = R.drawable.ic_alert_outline
-				resTheme = android.R.style.Theme_Material_Light_Dialog_Alert
-			}
-			mailSender {
-				mailTo = getString(R.string.email_error_report)
-				reportAsFile = true
-				reportFileName = "stacktrace.txt"
-			}
-		}
-	}
-
-	private fun enableStrictMode() {
-		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder()
-				.detectAll()
-				.penaltyLog()
-				.build()
-		)
-		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder()
-				.detectAll()
-				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
-				.setClassInstanceLimit(PagesCache::class.java, 1)
-				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
-				.penaltyLog()
-				.build()
-		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
-			.penaltyDeath()
-			.detectFragmentReuse()
-			.detectWrongFragmentContainer()
-			.detectRetainInstanceUsage()
-			.detectSetUserVisibleHint()
-			.detectFragmentTagUsage()
-			.build()
-	}
-}

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

@@ -1,52 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import androidx.room.withTransaction
-import org.koitharu.kotatsu.core.db.MangaDatabase
-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.toEntities()
-		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
-			db.preferencesDao.upsert(
-				MangaPrefsEntity(
-					mangaId = manga.id,
-					mode = mode.id
-				)
-			)
-		}
-	}
-
-	suspend fun getReaderMode(mangaId: Long): ReaderMode? {
-		return db.preferencesDao.find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
-	}
-
-	suspend fun findMangaById(mangaId: Long): Manga? {
-		return db.mangaDao.find(mangaId)?.toManga()
-	}
-
-	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
-		intent.manga != null -> intent.manga
-		intent.mangaId != 0L -> findMangaById(intent.mangaId)
-		else -> null // TODO resolve uri
-	}
-
-	suspend fun storeManga(manga: Manga) {
-		val tags = manga.tags.toEntities()
-		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
-		}
-	}
-
-	suspend fun findTags(source: MangaSource): Set<MangaTag> {
-		return db.tagsDao.findTags(source.name).toMangaTags()
-	}
-}

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

@@ -1,34 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.parsers.model.Manga
-
-class MangaIntent private constructor(
-	val manga: Manga?,
-	val mangaId: Long,
-	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 {
-
-		const val ID_NONE = 0L
-
-		const val KEY_MANGA = "manga"
-		const val KEY_ID = "id"
-	}
-}

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

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

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

@@ -1,19 +0,0 @@
-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

@@ -1,45 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.annotation.CallSuper
-import androidx.fragment.app.DialogFragment
-import androidx.viewbinding.ViewBinding
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
-
-	private var viewBinding: B? = null
-
-	protected val binding: B
-		get() = checkNotNull(viewBinding)
-
-	final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		val binding = onInflateView(layoutInflater, null)
-		viewBinding = binding
-		return MaterialAlertDialogBuilder(requireContext(), theme)
-			.setView(binding.root)
-			.also(::onBuildDialog)
-			.create()
-	}
-
-	final override fun onCreateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-		savedInstanceState: Bundle?
-	) = viewBinding?.root
-
-	@CallSuper
-	override fun onDestroyView() {
-		viewBinding = null
-		super.onDestroyView()
-	}
-
-	open fun onBuildDialog(builder: MaterialAlertDialogBuilder) = Unit
-
-	protected fun bindingOrNull(): B? = viewBinding
-
-	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,37 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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/StorageSelectDialog.kt

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

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

@@ -1,87 +0,0 @@
-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/TypedSpacingItemDecoration.kt

@@ -1,35 +0,0 @@
-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/CountedBooleanLiveData.kt

@@ -1,31 +0,0 @@
-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/widgets/CheckableButtonGroup.kt

@@ -1,42 +0,0 @@
-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/FadingSnackbar.kt

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

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

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

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

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

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

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

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

@@ -1,26 +0,0 @@
-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/domain/Bookmark.kt

@@ -1,46 +0,0 @@
-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,
-	val percent: Float,
-) {
-
-	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
-		if (percent != other.percent) 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()
-		result = 31 * result + percent.hashCode()
-		return result
-	}
-}

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

@@ -1,38 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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/cloudflare/CloudFlareCallback.kt

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.browser.cloudflare
-
-interface CloudFlareCallback {
-
-	fun onPageLoaded()
-
-	fun onCheckPassed()
-}

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

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

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

@@ -1,93 +0,0 @@
-package org.koitharu.kotatsu.browser.cloudflare
-
-import android.annotation.SuppressLint
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.CookieManager
-import android.webkit.WebSettings
-import androidx.core.view.isInvisible
-import androidx.fragment.app.setFragmentResult
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koin.android.ext.android.get
-import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.network.UserAgentInterceptor
-import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
-import org.koitharu.kotatsu.utils.ext.stringArgument
-import org.koitharu.kotatsu.utils.ext.withArgs
-
-class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
-
-	private val url by stringArgument(ARG_URL)
-	private val pendingResult = Bundle(1)
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?
-	) = FragmentCloudflareBinding.inflate(inflater, container, false)
-
-	@SuppressLint("SetJavaScriptEnabled")
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		with(binding.webView.settings) {
-			javaScriptEnabled = true
-			cacheMode = WebSettings.LOAD_DEFAULT
-			domStorageEnabled = true
-			databaseEnabled = true
-			userAgentString = UserAgentInterceptor.userAgent
-		}
-		binding.webView.webViewClient = CloudFlareClient(get(), this, url.orEmpty())
-		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
-		if (url.isNullOrEmpty()) {
-			dismissAllowingStateLoss()
-		} else {
-			binding.webView.loadUrl(url.orEmpty())
-		}
-	}
-
-	override fun onDestroyView() {
-		binding.webView.stopLoading()
-		super.onDestroyView()
-	}
-
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder) {
-		builder.setNegativeButton(android.R.string.cancel, null)
-	}
-
-	override fun onResume() {
-		super.onResume()
-		binding.webView.onResume()
-	}
-
-	override fun onPause() {
-		binding.webView.onPause()
-		super.onPause()
-	}
-
-	override fun onDismiss(dialog: DialogInterface) {
-		setFragmentResult(TAG, pendingResult)
-		super.onDismiss(dialog)
-	}
-
-	override fun onPageLoaded() {
-		bindingOrNull()?.progressBar?.isInvisible = true
-	}
-
-	override fun onCheckPassed() {
-		pendingResult.putBoolean(EXTRA_RESULT, true)
-		dismiss()
-	}
-
-	companion object {
-
-		const val TAG = "CloudFlareDialog"
-		const val EXTRA_RESULT = "result"
-		private const val ARG_URL = "url"
-
-		fun newInstance(url: String) = CloudFlareDialog().withArgs(1) {
-			putString(ARG_URL, url)
-		}
-	}
-}

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

@@ -1,136 +0,0 @@
-package org.koitharu.kotatsu.core.backup
-
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
-import org.koitharu.kotatsu.history.data.HistoryEntity
-
-private const val PAGE_SIZE = 10
-
-class BackupRepository(private val db: MangaDatabase) {
-
-	suspend fun dumpHistory(): BackupEntry {
-		var offset = 0
-		val entry = BackupEntry(BackupEntry.HISTORY, JSONArray())
-		while (true) {
-			val history = db.historyDao.findAll(offset, PAGE_SIZE)
-			if (history.isEmpty()) {
-				break
-			}
-			offset += history.size
-			for (item in history) {
-				val manga = item.manga.toJson()
-				val tags = JSONArray()
-				item.tags.forEach { tags.put(it.toJson()) }
-				manga.put("tags", tags)
-				val json = item.history.toJson()
-				json.put("manga", manga)
-				entry.data.put(json)
-			}
-		}
-		return entry
-	}
-
-	suspend fun dumpCategories(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
-		val categories = db.favouriteCategoriesDao.findAll()
-		for (item in categories) {
-			entry.data.put(item.toJson())
-		}
-		return entry
-	}
-
-	suspend fun dumpFavourites(): BackupEntry {
-		var offset = 0
-		val entry = BackupEntry(BackupEntry.FAVOURITES, JSONArray())
-		while (true) {
-			val favourites = db.favouritesDao.findAll(offset, PAGE_SIZE)
-			if (favourites.isEmpty()) {
-				break
-			}
-			offset += favourites.size
-			for (item in favourites) {
-				val manga = item.manga.toJson()
-				val tags = JSONArray()
-				item.tags.forEach { tags.put(it.toJson()) }
-				manga.put("tags", tags)
-				val json = item.favourite.toJson()
-				json.put("manga", manga)
-				entry.data.put(json)
-			}
-		}
-		return entry
-	}
-
-	fun createIndex(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.INDEX, JSONArray())
-		val json = JSONObject()
-		json.put("app_id", BuildConfig.APPLICATION_ID)
-		json.put("app_version", BuildConfig.VERSION_CODE)
-		json.put("created_at", System.currentTimeMillis())
-		entry.data.put(json)
-		return entry
-	}
-
-	private fun MangaEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("id", id)
-		jo.put("title", title)
-		jo.put("alt_title", altTitle)
-		jo.put("url", url)
-		jo.put("public_url", publicUrl)
-		jo.put("rating", rating)
-		jo.put("nsfw", isNsfw)
-		jo.put("cover_url", coverUrl)
-		jo.put("large_cover_url", largeCoverUrl)
-		jo.put("state", state)
-		jo.put("author", author)
-		jo.put("source", source)
-		return jo
-	}
-
-	private fun TagEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("id", id)
-		jo.put("title", title)
-		jo.put("key", key)
-		jo.put("source", source)
-		return jo
-	}
-
-	private fun HistoryEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("manga_id", mangaId)
-		jo.put("created_at", createdAt)
-		jo.put("updated_at", updatedAt)
-		jo.put("chapter_id", chapterId)
-		jo.put("page", page)
-		jo.put("scroll", scroll)
-		jo.put("percent", percent)
-		return jo
-	}
-
-	private fun FavouriteCategoryEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("category_id", categoryId)
-		jo.put("created_at", createdAt)
-		jo.put("sort_key", sortKey)
-		jo.put("title", title)
-		jo.put("order", order)
-		jo.put("track", track)
-		return jo
-	}
-
-	private fun FavouriteEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("manga_id", mangaId)
-		jo.put("category_id", categoryId)
-		jo.put("created_at", createdAt)
-		return jo
-	}
-}

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

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

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

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

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

@@ -1,84 +0,0 @@
-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.MangaDao
-import org.koitharu.kotatsu.core.db.dao.PreferencesDao
-import org.koitharu.kotatsu.core.db.dao.TagsDao
-import org.koitharu.kotatsu.core.db.dao.TrackLogsDao
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
-import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-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.scrobbling.data.ScrobblingDao
-import org.koitharu.kotatsu.scrobbling.data.ScrobblingEntity
-import org.koitharu.kotatsu.suggestions.data.SuggestionDao
-import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
-import org.koitharu.kotatsu.tracker.data.TrackEntity
-import org.koitharu.kotatsu.tracker.data.TrackLogEntity
-import org.koitharu.kotatsu.tracker.data.TracksDao
-
-@Database(
-	entities = [
-		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
-		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
-		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
-		ScrobblingEntity::class,
-	],
-	version = 12,
-)
-abstract class MangaDatabase : RoomDatabase() {
-
-	abstract val historyDao: HistoryDao
-
-	abstract val tagsDao: TagsDao
-
-	abstract val mangaDao: MangaDao
-
-	abstract val favouritesDao: FavouritesDao
-
-	abstract val preferencesDao: PreferencesDao
-
-	abstract val favouriteCategoriesDao: FavouriteCategoriesDao
-
-	abstract val tracksDao: TracksDao
-
-	abstract val trackLogsDao: TrackLogsDao
-
-	abstract val suggestionDao: SuggestionDao
-
-	abstract val bookmarksDao: BookmarksDao
-
-	abstract val scrobblingDao: ScrobblingDao
-}
-
-fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
-	context,
-	MangaDatabase::class.java,
-	"kotatsu-db"
-).addMigrations(
-	Migration1To2(),
-	Migration2To3(),
-	Migration3To4(),
-	Migration4To5(),
-	Migration5To6(),
-	Migration6To7(),
-	Migration7To8(),
-	Migration8To9(),
-	Migration9To10(),
-	Migration10To11(),
-	Migration11To12(),
-).addCallback(
-	DatabasePrePopulateCallback(context.resources)
-).build()

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

@@ -1,24 +0,0 @@
-package org.koitharu.kotatsu.core.db.dao
-
-import androidx.room.*
-import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
-
-@Dao
-abstract class PreferencesDao {
-
-	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
-	abstract suspend fun find(mangaId: Long): MangaPrefsEntity?
-
-	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	abstract suspend fun insert(pref: MangaPrefsEntity): Long
-
-	@Update
-	abstract suspend fun update(pref: MangaPrefsEntity): Int
-
-	@Transaction
-	open suspend fun upsert(pref: MangaPrefsEntity) {
-		if (update(pref) == 0) {
-			insert(pref)
-		}
-	}
-}

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

@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration3To4 : Migration(3, 4) {
-
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE IF NOT EXISTS tracks (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
-	}
-}

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

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration5To6 : Migration(5, 6) {
-
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE IF NOT EXISTS track_logs (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, manga_id INTEGER NOT NULL, chapters TEXT NOT NULL, created_at INTEGER NOT NULL, FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_track_logs_manga_id ON track_logs (manga_id)")
-	}
-}

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

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration7To8 : Migration(7, 8) {
-
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE manga ADD COLUMN nsfw INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("CREATE TABLE IF NOT EXISTS suggestions (manga_id INTEGER NOT NULL, relevance REAL NOT NULL, created_at INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_suggestions_manga_id ON suggestions (manga_id)")
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt

@@ -1,7 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import okio.IOException
-
-class CloudFlareProtectedException(
-	val url: String
-) : IOException("Protected by CloudFlare")

app/src/main/java/org/koitharu/kotatsu/core/exceptions/MangaNotFoundException.kt

@@ -1,3 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-class MangaNotFoundException(s: String? = null) : RuntimeException(s)

app/src/main/java/org/koitharu/kotatsu/core/exceptions/WrongPasswordException.kt

@@ -1,3 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-class WrongPasswordException : SecurityException()

app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt

@@ -1,85 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions.resolve
-
-import android.util.ArrayMap
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.ActivityResultLauncher
-import androidx.annotation.StringRes
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import kotlinx.coroutines.suspendCancellableCoroutine
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
-import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
-import org.koitharu.kotatsu.utils.TaggedActivityResult
-import org.koitharu.kotatsu.utils.isSuccess
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-class ExceptionResolver private constructor(
-	private val activity: FragmentActivity?,
-	private val fragment: Fragment?,
-) : ActivityResultCallback<TaggedActivityResult> {
-
-	private val continuations = ArrayMap<String, Continuation<Boolean>>(1)
-	private lateinit var sourceAuthContract: ActivityResultLauncher<MangaSource>
-
-	constructor(activity: FragmentActivity) : this(activity = activity, fragment = null) {
-		sourceAuthContract = activity.registerForActivityResult(SourceAuthActivity.Contract(), this)
-	}
-
-	constructor(fragment: Fragment) : this(activity = null, fragment = fragment) {
-		sourceAuthContract = fragment.registerForActivityResult(SourceAuthActivity.Contract(), this)
-	}
-
-	override fun onActivityResult(result: TaggedActivityResult?) {
-		result ?: return
-		continuations.remove(result.tag)?.resume(result.isSuccess)
-	}
-
-	suspend fun resolve(e: Throwable): Boolean = when (e) {
-		is CloudFlareProtectedException -> resolveCF(e.url)
-		is AuthRequiredException -> resolveAuthException(e.source)
-		else -> false
-	}
-
-	private suspend fun resolveCF(url: String): Boolean {
-		val dialog = CloudFlareDialog.newInstance(url)
-		val fm = getFragmentManager()
-		return suspendCancellableCoroutine { cont ->
-			fm.clearFragmentResult(CloudFlareDialog.TAG)
-			continuations[CloudFlareDialog.TAG] = cont
-			fm.setFragmentResultListener(CloudFlareDialog.TAG, checkNotNull(fragment ?: activity)) { key, result ->
-				continuations.remove(key)?.resume(result.getBoolean(CloudFlareDialog.EXTRA_RESULT))
-			}
-			dialog.show(fm, CloudFlareDialog.TAG)
-			cont.invokeOnCancellation {
-				continuations.remove(CloudFlareDialog.TAG, cont)
-				fm.clearFragmentResultListener(CloudFlareDialog.TAG)
-				dialog.dismiss()
-			}
-		}
-	}
-
-	private suspend fun resolveAuthException(source: MangaSource): Boolean = suspendCoroutine { cont ->
-		continuations[SourceAuthActivity.TAG] = cont
-		sourceAuthContract.launch(source)
-	}
-
-	private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
-
-	companion object {
-
-		@StringRes
-		fun getResolveStringId(e: Throwable) = when (e) {
-			is CloudFlareProtectedException -> R.string.captcha_solve
-			is AuthRequiredException -> R.string.sign_in
-			else -> 0
-		}
-
-		fun canResolve(e: Throwable) = getResolveStringId(e) != 0
-	}
-}

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

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.core.github
-
-import org.koin.dsl.module
-
-val githubModule
-	get() = module {
-		factory { GithubRepository(get()) }
-	}

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

@@ -1,25 +0,0 @@
-package org.koitharu.kotatsu.core.github
-
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.parsers.util.parseJson
-
-class GithubRepository(private val okHttp: OkHttpClient) {
-
-	suspend fun getLatestVersion(): AppVersion {
-		val request = Request.Builder()
-			.get()
-			.url("https://api.github.com/repos/nv95/Kotatsu/releases/latest")
-		val json = okHttp.newCall(request.build()).await().parseJson()
-		val asset = json.getJSONArray("assets").getJSONObject(0)
-		return AppVersion(
-			id = json.getLong("id"),
-			url = json.getString("html_url"),
-			name = json.getString("name").removePrefix("v"),
-			apkSize = asset.getLong("size"),
-			apkUrl = asset.getString("browser_download_url"),
-			description = json.getString("body")
-		)
-	}
-}

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

@@ -1,16 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import java.util.*
-import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.parsers.model.SortOrder
-
-@Parcelize
-data class FavouriteCategory(
-	val id: Long,
-	val title: String,
-	val sortKey: Int,
-	val order: SortOrder,
-	val createdAt: Date,
-	val isTrackingEnabled: Boolean,
-) : Parcelable

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

@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.util.mapToSet
-
-fun Collection<Manga>.ids() = mapToSet { it.id }

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

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.toTitleCase
-import java.util.*
-
-fun MangaSource.getLocaleTitle(): String? {
-	val lc = Locale(locale ?: return null)
-	return lc.getDisplayLanguage(lc).toTitleCase(lc)
-}

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

@@ -1,95 +0,0 @@
-package org.koitharu.kotatsu.core.model.parcelable
-
-import android.os.Parcel
-import androidx.core.os.ParcelCompat
-import org.koitharu.kotatsu.parsers.model.*
-
-fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
-	out.writeLong(id)
-	out.writeString(title)
-	out.writeString(altTitle)
-	out.writeString(url)
-	out.writeString(publicUrl)
-	out.writeFloat(rating)
-	ParcelCompat.writeBoolean(out, isNsfw)
-	out.writeString(coverUrl)
-	out.writeString(largeCoverUrl)
-	out.writeString(description)
-	out.writeParcelable(ParcelableMangaTags(tags), flags)
-	out.writeSerializable(state)
-	out.writeString(author)
-	if (withChapters) {
-		out.writeParcelable(chapters?.let(::ParcelableMangaChapters), flags)
-	} else {
-		out.writeString(null)
-	}
-	out.writeSerializable(source)
-}
-
-fun Parcel.readManga() = Manga(
-	id = readLong(),
-	title = requireNotNull(readString()),
-	altTitle = readString(),
-	url = requireNotNull(readString()),
-	publicUrl = requireNotNull(readString()),
-	rating = readFloat(),
-	isNsfw = ParcelCompat.readBoolean(this),
-	coverUrl = requireNotNull(readString()),
-	largeCoverUrl = readString(),
-	description = readString(),
-	tags = requireNotNull(readParcelable<ParcelableMangaTags>(ParcelableMangaTags::class.java.classLoader)).tags,
-	state = readSerializable() as MangaState?,
-	author = readString(),
-	chapters = readParcelable<ParcelableMangaChapters>(ParcelableMangaChapters::class.java.classLoader)?.chapters,
-	source = readSerializable() as MangaSource,
-)
-
-fun MangaPage.writeToParcel(out: Parcel) {
-	out.writeLong(id)
-	out.writeString(url)
-	out.writeString(referer)
-	out.writeString(preview)
-	out.writeSerializable(source)
-}
-
-fun Parcel.readMangaPage() = MangaPage(
-	id = readLong(),
-	url = requireNotNull(readString()),
-	referer = requireNotNull(readString()),
-	preview = readString(),
-	source = readSerializable() as MangaSource,
-)
-
-fun MangaChapter.writeToParcel(out: Parcel) {
-	out.writeLong(id)
-	out.writeString(name)
-	out.writeInt(number)
-	out.writeString(url)
-	out.writeString(scanlator)
-	out.writeLong(uploadDate)
-	out.writeString(branch)
-	out.writeSerializable(source)
-}
-
-fun Parcel.readMangaChapter() = MangaChapter(
-	id = readLong(),
-	name = requireNotNull(readString()),
-	number = readInt(),
-	url = requireNotNull(readString()),
-	scanlator = readString(),
-	uploadDate = readLong(),
-	branch = readString(),
-	source = readSerializable() as MangaSource,
-)
-
-fun MangaTag.writeToParcel(out: Parcel) {
-	out.writeString(title)
-	out.writeString(key)
-	out.writeSerializable(source)
-}
-
-fun Parcel.readMangaTag() = MangaTag(
-	title = requireNotNull(readString()),
-	key = requireNotNull(readString()),
-	source = readSerializable() as MangaSource,
-)

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

@@ -1,53 +0,0 @@
-package org.koitharu.kotatsu.core.model.parcelable
-
-import android.os.Parcel
-import android.os.Parcelable
-import org.koitharu.kotatsu.parsers.model.Manga
-
-// Limits to avoid TransactionTooLargeException
-private const val MAX_SAFE_SIZE = 1024 * 512 // Assume that 512 kb is safe parcel size
-private const val MAX_SAFE_CHAPTERS_COUNT = 40 // this is 100% safe
-
-class ParcelableManga(
-	val manga: Manga,
-	private val withChapters: Boolean,
-) : Parcelable {
-
-	constructor(parcel: Parcel) : this(parcel.readManga(), true)
-
-	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		val chapters = manga.chapters
-		if (!withChapters || chapters == null) {
-			manga.writeToParcel(parcel, flags, withChapters = false)
-			return
-		}
-		if (chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
-			// fast path
-			manga.writeToParcel(parcel, flags, withChapters = true)
-			return
-		}
-		val tempParcel = Parcel.obtain()
-		manga.writeToParcel(tempParcel, flags, withChapters = true)
-		val size = tempParcel.dataSize()
-		if (size < MAX_SAFE_SIZE) {
-			parcel.appendFrom(tempParcel, 0, size)
-		} else {
-			manga.writeToParcel(parcel, flags, withChapters = false)
-		}
-		tempParcel.recycle()
-	}
-
-	override fun describeContents(): Int {
-		return 0
-	}
-
-	companion object CREATOR : Parcelable.Creator<ParcelableManga> {
-		override fun createFromParcel(parcel: Parcel): ParcelableManga {
-			return ParcelableManga(parcel)
-		}
-
-		override fun newArray(size: Int): Array<ParcelableManga?> {
-			return arrayOfNulls(size)
-		}
-	}
-}

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

@@ -1,35 +0,0 @@
-package org.koitharu.kotatsu.core.model.parcelable
-
-import android.os.Parcel
-import android.os.Parcelable
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-
-class ParcelableMangaChapters(
-	val chapters: List<MangaChapter>,
-) : Parcelable {
-
-	constructor(parcel: Parcel) : this(
-		List(parcel.readInt()) { parcel.readMangaChapter() }
-	)
-
-	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		parcel.writeInt(chapters.size)
-		for (chapter in chapters) {
-			chapter.writeToParcel(parcel)
-		}
-	}
-
-	override fun describeContents(): Int {
-		return 0
-	}
-
-	companion object CREATOR : Parcelable.Creator<ParcelableMangaChapters> {
-		override fun createFromParcel(parcel: Parcel): ParcelableMangaChapters {
-			return ParcelableMangaChapters(parcel)
-		}
-
-		override fun newArray(size: Int): Array<ParcelableMangaChapters?> {
-			return arrayOfNulls(size)
-		}
-	}
-}

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

@@ -1,35 +0,0 @@
-package org.koitharu.kotatsu.core.model.parcelable
-
-import android.os.Parcel
-import android.os.Parcelable
-import org.koitharu.kotatsu.parsers.model.MangaPage
-
-class ParcelableMangaPages(
-	val pages: List<MangaPage>,
-) : Parcelable {
-
-	constructor(parcel: Parcel) : this(
-		List(parcel.readInt()) { parcel.readMangaPage() }
-	)
-
-	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		parcel.writeInt(pages.size)
-		for (page in pages) {
-			page.writeToParcel(parcel)
-		}
-	}
-
-	override fun describeContents(): Int {
-		return 0
-	}
-
-	companion object CREATOR : Parcelable.Creator<ParcelableMangaPages> {
-		override fun createFromParcel(parcel: Parcel): ParcelableMangaPages {
-			return ParcelableMangaPages(parcel)
-		}
-
-		override fun newArray(size: Int): Array<ParcelableMangaPages?> {
-			return arrayOfNulls(size)
-		}
-	}
-}

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

@@ -1,36 +0,0 @@
-package org.koitharu.kotatsu.core.model.parcelable
-
-import android.os.Parcel
-import android.os.Parcelable
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.Set
-
-class ParcelableMangaTags(
-	val tags: Set<MangaTag>,
-) : Parcelable {
-
-	constructor(parcel: Parcel) : this(
-		Set(parcel.readInt()) { parcel.readMangaTag() }
-	)
-
-	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		parcel.writeInt(tags.size)
-		for (tag in tags) {
-			tag.writeToParcel(parcel)
-		}
-	}
-
-	override fun describeContents(): Int {
-		return 0
-	}
-
-	companion object CREATOR : Parcelable.Creator<ParcelableMangaTags> {
-		override fun createFromParcel(parcel: Parcel): ParcelableMangaTags {
-			return ParcelableMangaTags(parcel)
-		}
-
-		override fun newArray(size: Int): Array<ParcelableMangaTags?> {
-			return arrayOfNulls(size)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/network/AndroidCookieJar.kt

@@ -1,34 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.webkit.CookieManager
-import okhttp3.Cookie
-import okhttp3.CookieJar
-import okhttp3.HttpUrl
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-class AndroidCookieJar : CookieJar {
-
-	private val cookieManager = CookieManager.getInstance()
-
-	override fun loadForRequest(url: HttpUrl): List<Cookie> {
-		val rawCookie = cookieManager.getCookie(url.toString()) ?: return emptyList()
-		return rawCookie.split(';').mapNotNull {
-			Cookie.parse(url, it)
-		}
-	}
-
-	override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
-		if (cookies.isEmpty()) {
-			return
-		}
-		val urlString = url.toString()
-		for (cookie in cookies) {
-			cookieManager.setCookie(urlString, cookie.toString())
-		}
-	}
-
-	suspend fun clear() = suspendCoroutine<Boolean> { continuation ->
-		cookieManager.removeAllCookies(continuation::resume)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt

@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import okhttp3.CookieJar
-import okhttp3.OkHttpClient
-import org.koin.dsl.bind
-import org.koin.dsl.module
-import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import java.util.concurrent.TimeUnit
-
-val networkModule
-	get() = module {
-		single { AndroidCookieJar() } bind CookieJar::class
-		single {
-			val cache = get<LocalStorageManager>().createHttpCache()
-			OkHttpClient.Builder().apply {
-				connectTimeout(20, TimeUnit.SECONDS)
-				readTimeout(60, TimeUnit.SECONDS)
-				writeTimeout(20, TimeUnit.SECONDS)
-				cookieJar(get())
-				dns(DoHManager(cache, get()))
-				cache(cache)
-				addInterceptor(UserAgentInterceptor())
-				addInterceptor(CloudFlareInterceptor())
-			}.build()
-		}
-		single<MangaLoaderContext> { MangaLoaderContextImpl(get(), get(), get()) }
-	}

app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt

@@ -1,43 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.os.Build
-import java.util.*
-import okhttp3.Interceptor
-import okhttp3.Response
-import org.koitharu.kotatsu.BuildConfig
-
-class UserAgentInterceptor : Interceptor {
-
-	override fun intercept(chain: Interceptor.Chain): Response {
-		val request = chain.request()
-		return chain.proceed(
-			if (request.header(CommonHeaders.USER_AGENT) == null) {
-				request.newBuilder()
-					.addHeader(CommonHeaders.USER_AGENT, userAgent)
-					.build()
-			} else request
-		)
-	}
-
-	companion object {
-
-		val userAgent
-			get() = "Kotatsu/%s (Android %s; %s; %s %s; %s)".format(
-				BuildConfig.VERSION_NAME,
-				Build.VERSION.RELEASE,
-				Build.MODEL,
-				Build.BRAND,
-				Build.DEVICE,
-				Locale.getDefault().language
-			)
-
-		val userAgentChrome
-			get() = (
-				"Mozilla/5.0 (Linux; Android %s; %s) AppleWebKit/537.36 (KHTML, like Gecko) " +
-					"Chrome/100.0.4896.127 Mobile Safari/537.36"
-				).format(
-				Build.VERSION.RELEASE,
-				Build.MODEL,
-			)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/network/WebViewClientCompat.kt

@@ -1,86 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.annotation.TargetApi
-import android.os.Build
-import android.webkit.*
-
-@Suppress("OverridingDeprecatedMember")
-abstract class WebViewClientCompat : WebViewClient() {
-
-	open fun shouldOverrideUrlCompat(view: WebView, url: String): Boolean {
-		return false
-	}
-
-	open fun shouldInterceptRequestCompat(view: WebView, url: String): WebResourceResponse? {
-		return null
-	}
-
-	open fun onReceivedErrorCompat(
-		view: WebView,
-		errorCode: Int,
-		description: String?,
-		failingUrl: String,
-		isMainFrame: Boolean
-	) {
-	}
-
-	@TargetApi(Build.VERSION_CODES.N)
-	final override fun shouldOverrideUrlLoading(
-		view: WebView,
-		request: WebResourceRequest
-	): Boolean = shouldOverrideUrlCompat(view, request.url.toString())
-
-	final override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
-		return shouldOverrideUrlCompat(view, url)
-	}
-
-	final override fun shouldInterceptRequest(
-		view: WebView,
-		request: WebResourceRequest
-	): WebResourceResponse? = shouldInterceptRequestCompat(view, request.url.toString())
-
-	final override fun shouldInterceptRequest(
-		view: WebView,
-		url: String
-	): WebResourceResponse? = shouldInterceptRequestCompat(view, url)
-
-	@TargetApi(Build.VERSION_CODES.M)
-	final override fun onReceivedError(
-		view: WebView,
-		request: WebResourceRequest,
-		error: WebResourceError
-	) {
-		onReceivedErrorCompat(
-			view,
-			error.errorCode,
-			error.description?.toString(),
-			request.url.toString(),
-			request.isForMainFrame
-		)
-	}
-
-	final override fun onReceivedError(
-		view: WebView,
-		errorCode: Int,
-		description: String?,
-		failingUrl: String
-	) {
-		onReceivedErrorCompat(view, errorCode, description, failingUrl, failingUrl == view.url)
-	}
-
-	@TargetApi(Build.VERSION_CODES.M)
-	final override fun onReceivedHttpError(
-		view: WebView,
-		request: WebResourceRequest,
-		error: WebResourceResponse
-	) {
-		onReceivedErrorCompat(
-			view,
-			error.statusCode,
-			error.reasonPhrase,
-			request.url
-				.toString(),
-			request.isForMainFrame
-		)
-	}
-}

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

@@ -1,88 +0,0 @@
-package org.koitharu.kotatsu.core.os
-
-import android.app.ActivityManager
-import android.content.Context
-import android.content.pm.ShortcutManager
-import android.media.ThumbnailUtils
-import android.os.Build
-import android.util.Size
-import androidx.core.content.pm.ShortcutInfoCompat
-import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.graphics.drawable.IconCompat
-import coil.ImageLoader
-import coil.request.ImageRequest
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.history.domain.HistoryRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.utils.ext.requireBitmap
-
-class ShortcutsRepository(
-	private val context: Context,
-	private val coil: ImageLoader,
-	private val historyRepository: HistoryRepository,
-	private val mangaRepository: MangaDataRepository,
-) {
-
-	private val iconSize by lazy {
-		getIconSize(context)
-	}
-
-	suspend fun updateShortcuts() {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return
-		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
-		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
-			.filter { x -> x.title.isNotEmpty() }
-			.map { buildShortcutInfo(it).build().toShortcutInfo() }
-		manager.dynamicShortcuts = shortcuts
-	}
-
-	suspend fun requestPinShortcut(manga: Manga): Boolean {
-		return ShortcutManagerCompat.requestPinShortcut(
-			context,
-			buildShortcutInfo(manga).build(),
-			null
-		)
-	}
-
-	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat.Builder {
-		val icon = runCatching {
-			withContext(Dispatchers.IO) {
-				val bmp = coil.execute(
-					ImageRequest.Builder(context)
-						.data(manga.coverUrl)
-						.size(iconSize.width, iconSize.height)
-						.build()
-				).requireBitmap()
-				ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
-			}
-		}.fold(
-			onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
-			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) }
-		)
-		mangaRepository.storeManga(manga)
-		return ShortcutInfoCompat.Builder(context, manga.id.toString())
-			.setShortLabel(manga.title)
-			.setLongLabel(manga.title)
-			.setIcon(icon)
-			.setIntent(
-				ReaderActivity.newIntent(context, manga.id)
-					.setAction(ReaderActivity.ACTION_MANGA_READ)
-			)
-	}
-
-	private fun getIconSize(context: Context): Size {
-		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-			(context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager).let {
-				Size(it.iconMaxWidth, it.iconMaxHeight)
-			}
-		} else {
-			(context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).launcherLargeIconSize.let {
-				Size(it, it)
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt

@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import android.net.Uri
-import coil.map.Mapper
-import coil.request.Options
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-class FaviconMapper : Mapper<Uri, HttpUrl> {
-
-	override fun map(data: Uri, options: Options): HttpUrl? {
-		if (data.scheme != "favicon") {
-			return null
-		}
-		val mangaSource = MangaSource.valueOf(data.schemeSpecificPart)
-		val repo = MangaRepository(mangaSource) as RemoteMangaRepository
-		return repo.getFaviconUrl().toHttpUrl()
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt

@@ -1,45 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import java.lang.ref.WeakReference
-import java.util.*
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.model.*
-
-interface MangaRepository {
-
-	val source: MangaSource
-
-	val sortOrders: Set<SortOrder>
-
-	suspend fun getList(offset: Int, query: String): List<Manga>
-
-	suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga>
-
-	suspend fun getDetails(manga: Manga): Manga
-
-	suspend fun getPages(chapter: MangaChapter): List<MangaPage>
-
-	suspend fun getPageUrl(page: MangaPage): String
-
-	suspend fun getTags(): Set<MangaTag>
-
-	companion object : KoinComponent {
-
-		private val cache = EnumMap<MangaSource, WeakReference<RemoteMangaRepository>>(MangaSource::class.java)
-
-		operator fun invoke(source: MangaSource): MangaRepository {
-			if (source == MangaSource.LOCAL) {
-				return get<LocalMangaRepository>()
-			}
-			cache[source]?.get()?.let { return it }
-			return synchronized(cache) {
-				cache[source]?.get()?.let { return it }
-				val repository = RemoteMangaRepository(MangaParser(source, get()))
-				cache[source] = WeakReference(repository)
-				repository
-			}
-		}
-	}
-}

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

@@ -1,48 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-
-class RemoteMangaRepository(private val parser: MangaParser) : MangaRepository {
-
-	override val source: MangaSource
-		get() = parser.source
-
-	override val sortOrders: Set<SortOrder>
-		get() = parser.sortOrders
-
-	var defaultSortOrder: SortOrder?
-		get() = getConfig().defaultSortOrder ?: sortOrders.firstOrNull()
-		set(value) {
-			getConfig().defaultSortOrder = value
-		}
-
-	override suspend fun getList(offset: Int, query: String): List<Manga> {
-		return parser.getList(offset, query)
-	}
-
-	override suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
-		return parser.getList(offset, tags, sortOrder)
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = parser.getDetails(manga)
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = parser.getPages(chapter)
-
-	override suspend fun getPageUrl(page: MangaPage): String = parser.getPageUrl(page)
-
-	override suspend fun getTags(): Set<MangaTag> = parser.getTags()
-
-	fun getFaviconUrl(): String = parser.getFaviconUrl()
-
-	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
-
-	fun getConfigKeys(): List<ConfigKey<*>> = ArrayList<ConfigKey<*>>().also {
-		parser.onCreateConfig(it)
-	}
-
-	private fun getConfig() = parser.config as SourceSettings
-}

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

@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.core.prefs
-
-enum class AppSection {
-
-	LOCAL, FAVOURITES, HISTORY, FEED, SUGGESTIONS
-}

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

@@ -1,327 +0,0 @@
-package org.koitharu.kotatsu.core.prefs
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.net.ConnectivityManager
-import android.net.Uri
-import android.provider.Settings
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.collection.arraySetOf
-import androidx.core.content.edit
-import androidx.preference.PreferenceManager
-import com.google.android.material.color.DynamicColors
-import java.io.File
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.channels.trySendBlocking
-import kotlinx.coroutines.flow.callbackFlow
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.model.ZoomMode
-import org.koitharu.kotatsu.core.network.DoHProvider
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.utils.ext.getEnumValue
-import org.koitharu.kotatsu.utils.ext.observe
-import org.koitharu.kotatsu.utils.ext.putEnumValue
-import org.koitharu.kotatsu.utils.ext.toUriOrNull
-
-class AppSettings(context: Context) {
-
-	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-
-	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
-		remove(MangaSource.LOCAL)
-		if (!BuildConfig.DEBUG) {
-			remove(MangaSource.DUMMY)
-		}
-	}
-
-	val remoteMangaSources: Set<MangaSource>
-		get() = Collections.unmodifiableSet(remoteSources)
-
-	var listMode: ListMode
-		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.GRID)
-		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE, value) }
-
-	var defaultSection: AppSection
-		get() = prefs.getEnumValue(KEY_APP_SECTION, AppSection.HISTORY)
-		set(value) = prefs.edit { putEnumValue(KEY_APP_SECTION, value) }
-
-	val theme: Int
-		get() = prefs.getString(KEY_THEME, null)?.toIntOrNull() ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-
-	val isDynamicTheme: Boolean
-		get() = DynamicColors.isDynamicColorAvailable() && prefs.getBoolean(KEY_DYNAMIC_THEME, false)
-
-	val isAmoledTheme: Boolean
-		get() = prefs.getBoolean(KEY_THEME_AMOLED, false)
-
-	var gridSize: Int
-		get() = prefs.getInt(KEY_GRID_SIZE, 100)
-		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
-
-	val readerPageSwitch: Set<String>
-		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
-
-	var isTrafficWarningEnabled: Boolean
-		get() = prefs.getBoolean(KEY_TRAFFIC_WARNING, true)
-		set(value) = prefs.edit { putBoolean(KEY_TRAFFIC_WARNING, value) }
-
-	var isAllFavouritesVisible: Boolean
-		get() = prefs.getBoolean(KEY_ALL_FAVOURITES_VISIBLE, true)
-		set(value) = prefs.edit { putBoolean(KEY_ALL_FAVOURITES_VISIBLE, value) }
-
-	val isUpdateCheckingEnabled: Boolean
-		get() = prefs.getBoolean(KEY_APP_UPDATE_AUTO, true)
-
-	var lastUpdateCheckTimestamp: Long
-		get() = prefs.getLong(KEY_APP_UPDATE, 0L)
-		set(value) = prefs.edit { putLong(KEY_APP_UPDATE, value) }
-
-	val isTrackerEnabled: Boolean
-		get() = prefs.getBoolean(KEY_TRACKER_ENABLED, true)
-
-	val isTrackerNotificationsEnabled: Boolean
-		get() = prefs.getBoolean(KEY_TRACKER_NOTIFICATIONS, true)
-
-	var notificationSound: Uri
-		get() = prefs.getString(KEY_NOTIFICATIONS_SOUND, null)?.toUriOrNull()
-			?: Settings.System.DEFAULT_NOTIFICATION_URI
-		set(value) = prefs.edit { putString(KEY_NOTIFICATIONS_SOUND, value.toString()) }
-
-	val notificationVibrate: Boolean
-		get() = prefs.getBoolean(KEY_NOTIFICATIONS_VIBRATE, false)
-
-	val notificationLight: Boolean
-		get() = prefs.getBoolean(KEY_NOTIFICATIONS_LIGHT, true)
-
-	val readerAnimation: Boolean
-		get() = prefs.getBoolean(KEY_READER_ANIMATION, false)
-
-	val defaultReaderMode: ReaderMode
-		get() = prefs.getEnumValue(KEY_READER_MODE, ReaderMode.STANDARD)
-
-	val isReaderModeDetectionEnabled: Boolean
-		get() = prefs.getBoolean(KEY_READER_MODE_DETECT, true)
-
-	var isHistoryGroupingEnabled: Boolean
-		get() = prefs.getBoolean(KEY_HISTORY_GROUPING, true)
-		set(value) = prefs.edit { putBoolean(KEY_HISTORY_GROUPING, value) }
-
-	val isReadingIndicatorsEnabled: Boolean
-		get() = prefs.getBoolean(KEY_READING_INDICATORS, true)
-
-	val isHistoryExcludeNsfw: Boolean
-		get() = prefs.getBoolean(KEY_HISTORY_EXCLUDE_NSFW, false)
-
-	var chaptersReverse: Boolean
-		get() = prefs.getBoolean(KEY_REVERSE_CHAPTERS, false)
-		set(value) = prefs.edit { putBoolean(KEY_REVERSE_CHAPTERS, value) }
-
-	val zoomMode: ZoomMode
-		get() = prefs.getEnumValue(KEY_ZOOM_MODE, ZoomMode.FIT_CENTER)
-
-	val trackSources: Set<String>
-		get() = prefs.getStringSet(KEY_TRACK_SOURCES, null) ?: arraySetOf(TRACK_FAVOURITES, TRACK_HISTORY)
-
-	var appPassword: String?
-		get() = prefs.getString(KEY_APP_PASSWORD, null)
-		set(value) = prefs.edit { if (value != null) putString(KEY_APP_PASSWORD, value) else remove(KEY_APP_PASSWORD) }
-
-	var isBiometricProtectionEnabled: Boolean
-		get() = prefs.getBoolean(KEY_PROTECT_APP_BIOMETRIC, true)
-		set(value) = prefs.edit { putBoolean(KEY_PROTECT_APP_BIOMETRIC, value) }
-
-	var sourcesOrder: List<String>
-		get() = prefs.getString(KEY_SOURCES_ORDER, null)
-			?.split('|')
-			.orEmpty()
-		set(value) = prefs.edit {
-			putString(KEY_SOURCES_ORDER, value.joinToString("|"))
-		}
-
-	var hiddenSources: Set<String>
-		get() = prefs.getStringSet(KEY_SOURCES_HIDDEN, null) ?: emptySet()
-		set(value) = prefs.edit { putStringSet(KEY_SOURCES_HIDDEN, value) }
-
-	val isSourcesSelected: Boolean
-		get() = KEY_SOURCES_HIDDEN in prefs
-
-	val newSources: Set<MangaSource>
-		get() {
-			val known = sourcesOrder.toSet()
-			val hidden = hiddenSources
-			return remoteMangaSources
-				.filterNotTo(EnumSet.noneOf(MangaSource::class.java)) { x ->
-					x.name in known || x.name in hidden
-				}
-		}
-
-	fun markKnownSources(sources: Collection<MangaSource>) {
-		sourcesOrder = (sourcesOrder + sources.map { it.name }).distinct()
-	}
-
-	val isPagesNumbersEnabled: Boolean
-		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
-
-	val screenshotsPolicy: ScreenshotsPolicy
-		get() = runCatching {
-			val key = prefs.getString(KEY_SCREENSHOTS_POLICY, null)?.uppercase(Locale.ROOT)
-			if (key == null) ScreenshotsPolicy.ALLOW else ScreenshotsPolicy.valueOf(key)
-		}.getOrDefault(ScreenshotsPolicy.ALLOW)
-
-	var mangaStorageDir: File?
-		get() = prefs.getString(KEY_LOCAL_STORAGE, null)?.let {
-			File(it)
-		}?.takeIf { it.exists() }
-		set(value) = prefs.edit {
-			if (value == null) {
-				remove(KEY_LOCAL_STORAGE)
-			} else {
-				putString(KEY_LOCAL_STORAGE, value.path)
-			}
-		}
-
-	val isDownloadsSlowdownEnabled: Boolean
-		get() = prefs.getBoolean(KEY_DOWNLOADS_SLOWDOWN, false)
-
-	val downloadsParallelism: Int
-		get() = prefs.getInt(KEY_DOWNLOADS_PARALLELISM, 2)
-
-	val isSuggestionsEnabled: Boolean
-		get() = prefs.getBoolean(KEY_SUGGESTIONS, false)
-
-	val isSuggestionsExcludeNsfw: Boolean
-		get() = prefs.getBoolean(KEY_SUGGESTIONS_EXCLUDE_NSFW, false)
-
-	var isSearchSingleSource: Boolean
-		get() = prefs.getBoolean(KEY_SEARCH_SINGLE_SOURCE, false)
-		set(value) = prefs.edit { putBoolean(KEY_SEARCH_SINGLE_SOURCE, value) }
-
-	val dnsOverHttps: DoHProvider
-		get() = prefs.getEnumValue(KEY_DOH, DoHProvider.NONE)
-
-	fun isPagesPreloadAllowed(cm: ConnectivityManager): Boolean {
-		return when (prefs.getString(KEY_PAGES_PRELOAD, null)?.toIntOrNull()) {
-			NETWORK_ALWAYS -> true
-			NETWORK_NEVER -> false
-			else -> cm.isActiveNetworkMetered
-		}
-	}
-
-	fun getDateFormat(format: String = prefs.getString(KEY_DATE_FORMAT, "").orEmpty()): DateFormat =
-		when (format) {
-			"" -> DateFormat.getDateInstance(DateFormat.SHORT)
-			else -> SimpleDateFormat(format, Locale.getDefault())
-		}
-
-	fun getSuggestionsTagsBlacklistRegex(): Regex? {
-		val string = prefs.getString(KEY_SUGGESTIONS_EXCLUDE_TAGS, null)?.trimEnd(' ', ',')
-		if (string.isNullOrEmpty()) {
-			return null
-		}
-		val tags = string.split(',')
-		val regex = tags.joinToString(prefix = "(", separator = "|", postfix = ")") { tag ->
-			Regex.escape(tag.trim())
-		}
-		return Regex(regex, RegexOption.IGNORE_CASE)
-	}
-
-	fun getMangaSources(includeHidden: Boolean): List<MangaSource> {
-		val list = remoteSources.toMutableList()
-		val order = sourcesOrder
-		list.sortBy { x ->
-			val e = order.indexOf(x.name)
-			if (e == -1) order.size + x.ordinal else e
-		}
-		if (!includeHidden) {
-			val hidden = hiddenSources
-			list.removeAll { x -> x.name in hidden }
-		}
-		return list
-	}
-
-	fun subscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
-		prefs.registerOnSharedPreferenceChangeListener(listener)
-	}
-
-	fun unsubscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
-		prefs.unregisterOnSharedPreferenceChangeListener(listener)
-	}
-
-	fun observe() = prefs.observe()
-
-	companion object {
-
-		const val PAGE_SWITCH_TAPS = "taps"
-		const val PAGE_SWITCH_VOLUME_KEYS = "volume"
-
-		const val TRACK_HISTORY = "history"
-		const val TRACK_FAVOURITES = "favourites"
-
-		const val KEY_LIST_MODE = "list_mode_2"
-		const val KEY_APP_SECTION = "app_section_2"
-		const val KEY_THEME = "theme"
-		const val KEY_DYNAMIC_THEME = "dynamic_theme"
-		const val KEY_THEME_AMOLED = "amoled_theme"
-		const val KEY_DATE_FORMAT = "date_format"
-		const val KEY_SOURCES_ORDER = "sources_order_2"
-		const val KEY_SOURCES_HIDDEN = "sources_hidden"
-		const val KEY_TRAFFIC_WARNING = "traffic_warning"
-		const val KEY_PAGES_CACHE_CLEAR = "pages_cache_clear"
-		const val KEY_COOKIES_CLEAR = "cookies_clear"
-		const val KEY_THUMBS_CACHE_CLEAR = "thumbs_cache_clear"
-		const val KEY_SEARCH_HISTORY_CLEAR = "search_history_clear"
-		const val KEY_UPDATES_FEED_CLEAR = "updates_feed_clear"
-		const val KEY_GRID_SIZE = "grid_size"
-		const val KEY_REMOTE_SOURCES = "remote_sources"
-		const val KEY_LOCAL_STORAGE = "local_storage"
-		const val KEY_READER_SWITCHERS = "reader_switchers"
-		const val KEY_TRACKER_ENABLED = "tracker_enabled"
-		const val KEY_TRACK_SOURCES = "track_sources"
-		const val KEY_TRACK_CATEGORIES = "track_categories"
-		const val KEY_TRACK_WARNING = "track_warning"
-		const val KEY_TRACKER_NOTIFICATIONS = "tracker_notifications"
-		const val KEY_NOTIFICATIONS_SETTINGS = "notifications_settings"
-		const val KEY_NOTIFICATIONS_SOUND = "notifications_sound"
-		const val KEY_NOTIFICATIONS_VIBRATE = "notifications_vibrate"
-		const val KEY_NOTIFICATIONS_LIGHT = "notifications_light"
-		const val KEY_NOTIFICATIONS_INFO = "tracker_notifications_info"
-		const val KEY_READER_ANIMATION = "reader_animation"
-		const val KEY_READER_MODE = "reader_mode"
-		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
-		const val KEY_APP_PASSWORD = "app_password"
-		const val KEY_PROTECT_APP = "protect_app"
-		const val KEY_PROTECT_APP_BIOMETRIC = "protect_app_bio"
-		const val KEY_APP_VERSION = "app_version"
-		const val KEY_ZOOM_MODE = "zoom_mode"
-		const val KEY_BACKUP = "backup"
-		const val KEY_RESTORE = "restore"
-		const val KEY_HISTORY_GROUPING = "history_grouping"
-		const val KEY_READING_INDICATORS = "reading_indicators"
-		const val KEY_REVERSE_CHAPTERS = "reverse_chapters"
-		const val KEY_HISTORY_EXCLUDE_NSFW = "history_exclude_nsfw"
-		const val KEY_PAGES_NUMBERS = "pages_numbers"
-		const val KEY_SCREENSHOTS_POLICY = "screenshots_policy"
-		const val KEY_PAGES_PRELOAD = "pages_preload"
-		const val KEY_SUGGESTIONS = "suggestions"
-		const val KEY_SUGGESTIONS_EXCLUDE_NSFW = "suggestions_exclude_nsfw"
-		const val KEY_SUGGESTIONS_EXCLUDE_TAGS = "suggestions_exclude_tags"
-		const val KEY_SEARCH_SINGLE_SOURCE = "search_single_source"
-		const val KEY_SHIKIMORI = "shikimori"
-		const val KEY_DOWNLOADS_PARALLELISM = "downloads_parallelism"
-		const val KEY_DOWNLOADS_SLOWDOWN = "downloads_slowdown"
-		const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible"
-		const val KEY_DOH = "doh"
-
-		// About
-		const val KEY_APP_UPDATE = "app_update"
-		const val KEY_APP_UPDATE_AUTO = "app_update_auto"
-		const val KEY_APP_TRANSLATION = "about_app_translation"
-
-		private const val NETWORK_NEVER = 0
-		private const val NETWORK_ALWAYS = 1
-		private const val NETWORK_NON_METERED = 2
-	}
-}

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

@@ -1,35 +0,0 @@
-package org.koitharu.kotatsu.core.prefs
-
-import androidx.lifecycle.liveData
-import kotlin.coroutines.CoroutineContext
-import kotlinx.coroutines.flow.flow
-
-fun <T> AppSettings.observeAsFlow(key: String, valueProducer: AppSettings.() -> T) = flow {
-	var lastValue: T = valueProducer()
-	emit(lastValue)
-	observe().collect {
-		if (it == key) {
-			val value = valueProducer()
-			if (value != lastValue) {
-				emit(value)
-			}
-			lastValue = value
-		}
-	}
-}
-
-fun <T> AppSettings.observeAsLiveData(
-	context: CoroutineContext,
-	key: String,
-	valueProducer: AppSettings.() -> T
-) = liveData(context) {
-	emit(valueProducer())
-	observe().collect {
-		if (it == key) {
-			val value = valueProducer()
-			if (value != latestValue) {
-				emit(value)
-			}
-		}
-	}
-}

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

@@ -1,15 +0,0 @@
-package org.koitharu.kotatsu.core.prefs
-
-import android.content.Context
-import androidx.core.content.edit
-
-private const val CATEGORY_ID = "cat_id"
-
-class AppWidgetConfig(context: Context, val widgetId: Int) {
-
-	private val prefs = context.getSharedPreferences("appwidget_$widgetId", Context.MODE_PRIVATE)
-
-	var categoryId: Long
-		get() = prefs.getLong(CATEGORY_ID, 0L)
-		set(value) = prefs.edit { putLong(CATEGORY_ID, value) }
-}

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

@@ -1,46 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.text.Html
-import coil.ComponentRegistry
-import coil.ImageLoader
-import coil.disk.DiskCache
-import kotlinx.coroutines.Dispatchers
-import okhttp3.OkHttpClient
-import org.koin.android.ext.koin.androidContext
-import org.koin.dsl.module
-import org.koitharu.kotatsu.core.parser.FaviconMapper
-import org.koitharu.kotatsu.local.data.CacheDir
-import org.koitharu.kotatsu.local.data.CbzFetcher
-import org.koitharu.kotatsu.utils.image.CoilImageGetter
-
-val uiModule
-	get() = module {
-		single {
-			val httpClientFactory = {
-				get<OkHttpClient>().newBuilder()
-					.cache(null)
-					.build()
-			}
-			val diskCacheFactory = {
-				val context = androidContext()
-				val rootDir = context.externalCacheDir ?: context.cacheDir
-				DiskCache.Builder()
-					.directory(rootDir.resolve(CacheDir.THUMBS.dir))
-					.build()
-			}
-			ImageLoader.Builder(androidContext())
-				.okHttpClient(httpClientFactory)
-				.interceptorDispatcher(Dispatchers.Default)
-				.fetcherDispatcher(Dispatchers.IO)
-				.decoderDispatcher(Dispatchers.Default)
-				.transformationDispatcher(Dispatchers.Default)
-				.diskCache(diskCacheFactory)
-				.components(
-					ComponentRegistry.Builder()
-						.add(CbzFetcher.Factory())
-						.add(FaviconMapper())
-						.build()
-				).build()
-		}
-		factory<Html.ImageGetter> { CoilImageGetter(androidContext(), get()) }
-	}