Fix toolbar icons color

Currently translated at 99.2% (268 of 270 strings)

Co-authored-by: Aliaksiej Razumaŭ <belarusaed@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/be/
Translation: Kotatsu/Strings

.editorconfig

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

.github/FUNDING.yml

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

.idea/jarRepositories.xml

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

.idea/ktlint.xml

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

README.md

@@ -2,7 +2,7 @@
 
 Kotatsu is a free and open source manga reader for Android.
 
-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) [![Build Status](https://travis-ci.org/nv95/Kotatsu.svg?branch=master)](https://travis-ci.org/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) [![Build Status](https://travis-ci.org/nv95/Kotatsu.svg?branch=master)](https://travis-ci.org/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
 
 ### Download
 
@@ -28,12 +28,12 @@ Download APK from Github Releases:
 
 ### Screenshots
 
-| ![Screenshot_20200226-210337](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png) | ![Screenshot_20200226-210232](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
-|---|---|---|
-| ![Screenshot_20200226-210405](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png)  | ![Screenshot_20200226-210151](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
+| ![Screenshot_20200226-210337](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png)                           | ![Screenshot_20200226-210232](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
+|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
+| ![Screenshot_20200226-210405](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png) | ![Screenshot_20200226-210151](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
 
 | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/nv95/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/2.png) |
-|---|---|
+|-----------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
 
 ### License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

app/build.gradle

@@ -6,15 +6,16 @@ plugins {
 }
 
 android {
-	compileSdkVersion 31
-	buildToolsVersion '30.0.3'
+	compileSdkVersion 32
+	buildToolsVersion '32.0.0'
+	namespace 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
-		targetSdkVersion 31
-		versionCode 376
-		versionName '2.1'
+		targetSdkVersion 32
+		versionCode 400
+		versionName '3.0'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -24,10 +25,6 @@ android {
 			}
 		}
 	}
-	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
-	}
 	buildTypes {
 		debug {
 			applicationIdSuffix = '.debug'
@@ -45,75 +42,78 @@ android {
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
 	}
-	lintOptions {
-		disable 'MissingTranslation'
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
+	}
+	kotlinOptions {
+		jvmTarget = JavaVersion.VERSION_1_8.toString()
+		freeCompilerArgs += [
+				'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+				'-opt-in=kotlinx.coroutines.FlowPreview',
+				'-opt-in=kotlin.contracts.ExperimentalContracts',
+		]
+	}
+	lint {
 		abortOnError false
+		disable 'MissingTranslation', 'PrivateResource'
 	}
 	testOptions {
 		unitTests.includeAndroidResources = true
 		unitTests.returnDefaultValues = false
 	}
 }
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_1_8.toString()
-		freeCompilerArgs += [
-				'-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-				'-Xopt-in=kotlin.contracts.ExperimentalContracts',
-		]
-	}
-}
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+	implementation('com.github.nv95:kotatsu-parsers:3ea7e92e64') {
+		exclude group: 'org.json', module: 'json'
+	}
+
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
 
 	implementation 'androidx.core:core-ktx:1.7.0'
 	implementation 'androidx.activity:activity-ktx:1.4.0'
-	implementation 'androidx.fragment:fragment-ktx:1.4.0'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-service:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-process:2.4.0'
-	implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+	implementation 'androidx.fragment:fragment-ktx:1.4.1'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.4.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
+	implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.2.1'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-	implementation 'androidx.preference:preference-ktx:1.1.1'
+	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
-	implementation 'com.google.android.material:material:1.4.0'
+	implementation 'com.google.android.material:material:1.6.0-beta01'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.0'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
 
-	implementation 'androidx.room:room-runtime:2.4.0'
-	implementation 'androidx.room:room-ktx:2.4.0'
-	kapt 'androidx.room:room-compiler:2.4.0'
+	implementation 'androidx.room:room-runtime:2.4.2'
+	implementation 'androidx.room:room-ktx:2.4.2'
+	kapt 'androidx.room:room-compiler:2.4.2'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.9.1'
-	implementation 'com.squareup.okio:okio:2.10.0'
-	implementation 'org.jsoup:jsoup:1.14.3'
+	implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+	implementation 'com.squareup.okio:okio:3.0.0'
 
-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.1'
-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.1'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'io.insert-koin:koin-android:3.1.4'
+	implementation 'io.insert-koin:koin-android:3.1.5'
 	implementation 'io.coil-kt:coil-base:1.4.0'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
-	implementation 'com.github.solkin:disk-lru-cache:1.3'
+	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'com.google.truth:truth:1.1.3'
-	testImplementation 'org.json:json:20211205'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0'
-	testImplementation 'io.insert-koin:koin-test-junit4:3.1.4'
+	testImplementation 'io.insert-koin:koin-test-junit4:3.1.5'
 
 	androidTestImplementation 'androidx.test:runner:1.4.0'
 	androidTestImplementation 'androidx.test:rules:1.4.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.4.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
-	androidTestImplementation 'androidx.room:room-testing:2.4.0'
-	androidTestImplementation 'com.google.truth:truth:1.1.3'
+	androidTestImplementation 'androidx.room:room-testing:2.4.2'
 }

app/proguard-rules.pro

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

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="org.koitharu.kotatsu">
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission
+		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+		android:maxSdkVersion="28"
+		tools:ignore="ScopedStorage" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
 	<application
@@ -20,7 +22,7 @@
 		android:label="@string/app_name"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
-		android:theme="@style/AppTheme"
+		android:theme="@style/Theme.Kotatsu"
 		android:networkSecurityConfig="@xml/network_security_config"
 		tools:ignore="UnusedAttribute">
 		<activity
@@ -32,7 +34,7 @@
 			</intent-filter>
 			<meta-data
 				android:name="android.app.default_searchable"
-				android:value=".ui.search.SearchActivity" />
+				android:value="org.koitharu.kotatsu.ui.search.SearchActivity" />
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.details.ui.DetailsActivity"
@@ -51,6 +53,8 @@
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
 			android:label="@string/search" />
+		<activity android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
+			android:label="@string/search_manga" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:label="@string/settings" />
@@ -65,9 +69,11 @@
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.core.ui.CrashActivity"
@@ -94,12 +100,12 @@
 			android:noHistory="true"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name=".settings.protect.ProtectSetupActivity"
+			android:name="org.koitharu.kotatsu.settings.protect.ProtectSetupActivity"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
 			android:label="@string/downloads" />
-		<activity android:name=".image.ui.ImageActivity"/>
+		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity"/>
 
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"

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

@@ -7,11 +7,9 @@ import androidx.fragment.app.strictmode.FragmentStrictMode
 import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
 import org.koitharu.kotatsu.core.db.databaseModule
 import org.koitharu.kotatsu.core.github.githubModule
 import org.koitharu.kotatsu.core.network.networkModule
-import org.koitharu.kotatsu.core.parser.parserModule
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.AppCrashHandler
 import org.koitharu.kotatsu.core.ui.uiModule
@@ -23,10 +21,12 @@ import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.local.localModule
 import org.koitharu.kotatsu.main.mainModule
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.reader.readerModule
 import org.koitharu.kotatsu.remotelist.remoteListModule
 import org.koitharu.kotatsu.search.searchModule
 import org.koitharu.kotatsu.settings.settingsModule
+import org.koitharu.kotatsu.suggestions.suggestionsModule
 import org.koitharu.kotatsu.tracker.trackerModule
 import org.koitharu.kotatsu.widget.WidgetUpdater
 import org.koitharu.kotatsu.widget.appWidgetModule
@@ -55,7 +55,6 @@ class KotatsuApp : Application() {
 				databaseModule,
 				githubModule,
 				uiModule,
-				parserModule,
 				mainModule,
 				searchModule,
 				localModule,
@@ -67,6 +66,7 @@ class KotatsuApp : Application() {
 				settingsModule,
 				readerModule,
 				appWidgetModule,
+				suggestionsModule,
 			)
 		}
 	}
@@ -93,6 +93,7 @@ class KotatsuApp : Application() {
 			.detectWrongFragmentContainer()
 			.detectRetainInstanceUsage()
 			.detectSetUserVisibleHint()
+			.detectFragmentTagUsage()
 			.build()
 	}
 }

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

@@ -5,8 +5,11 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.prefs.ReaderMode
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.utils.ext.mapToSet
 
 class MangaDataRepository(private val db: MangaDatabase) {
 
@@ -34,7 +37,7 @@ class MangaDataRepository(private val db: MangaDatabase) {
 
 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
 		intent.manga != null -> intent.manga
-		intent.mangaId != MangaIntent.ID_NONE -> db.mangaDao.find(intent.mangaId)?.toManga()
+		intent.mangaId != 0L -> db.mangaDao.find(intent.mangaId)?.toManga()
 		else -> null // TODO resolve uri
 	}
 
@@ -45,4 +48,10 @@ class MangaDataRepository(private val db: MangaDatabase) {
 			db.mangaDao.upsert(MangaEntity.from(manga), tags)
 		}
 	}
+
+	suspend fun findTags(source: MangaSource): Set<MangaTag> {
+		return db.tagsDao.findTags(source.name).mapToSet {
+			it.toMangaTag()
+		}
+	}
 }

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

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

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

@@ -1,84 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import okhttp3.*
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.json.JSONObject
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koitharu.kotatsu.core.exceptions.GraphQLException
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.utils.ext.await
-import org.koitharu.kotatsu.utils.ext.parseJson
-
-
-open class MangaLoaderContext(
-	private val okHttp: OkHttpClient,
-	val cookieJar: CookieJar,
-) : KoinComponent {
-
-	suspend fun httpGet(url: String, headers: Headers? = null): Response {
-		val request = Request.Builder()
-			.get()
-			.url(url)
-		if (headers != null) {
-			request.headers(headers)
-		}
-		return okHttp.newCall(request.build()).await()
-	}
-
-	suspend fun httpPost(
-		url: String,
-		form: Map<String, String>,
-	): Response {
-		val body = FormBody.Builder()
-		form.forEach { (k, v) ->
-			body.addEncoded(k, v)
-		}
-		val request = Request.Builder()
-			.post(body.build())
-			.url(url)
-		return okHttp.newCall(request.build()).await()
-	}
-
-	suspend fun httpPost(
-		url: String,
-		payload: String,
-	): Response {
-		val body = FormBody.Builder()
-		payload.split('&').forEach {
-			val pos = it.indexOf('=')
-			if (pos != -1) {
-				val k = it.substring(0, pos)
-				val v = it.substring(pos + 1)
-				body.addEncoded(k, v)
-			}
-		}
-		val request = Request.Builder()
-			.post(body.build())
-			.url(url)
-		return okHttp.newCall(request.build()).await()
-	}
-
-	suspend fun graphQLQuery(endpoint: String, query: String): JSONObject {
-		val body = JSONObject()
-		body.put("operationName", null)
-		body.put("variables", JSONObject())
-		body.put("query", "{${query}}")
-		val mediaType = "application/json; charset=utf-8".toMediaType()
-		val requestBody = body.toString().toRequestBody(mediaType)
-		val request = Request.Builder()
-			.post(requestBody)
-			.url(endpoint)
-		val json = okHttp.newCall(request.build()).await().parseJson()
-		json.optJSONArray("errors")?.let {
-			if (it.length() != 0) {
-				throw GraphQLException(it)
-			}
-		}
-		return json
-	}
-
-	open fun getSettings(source: MangaSource) = SourceSettings(get(), source)
-}

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

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

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

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

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

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

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

@@ -12,34 +12,39 @@ import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.ActionBarContextView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
-import androidx.core.graphics.Insets
-import androidx.core.view.*
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.*
 import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 
-abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindowInsetsListener {
+abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(),
+	WindowInsetsDelegate.WindowInsetsListener {
 
 	protected lateinit var binding: B
 		private set
 
-	protected val exceptionResolver by lazy(LazyThreadSafetyMode.NONE) {
-		ExceptionResolver(this, supportFragmentManager)
-	}
+	@Suppress("LeakingThis")
+	protected val exceptionResolver = ExceptionResolver(this)
 
-	private var lastInsets: Insets = Insets.NONE
+	@Suppress("LeakingThis")
+	protected val insetsDelegate = WindowInsetsDelegate(this)
 
 	override fun onCreate(savedInstanceState: Bundle?) {
-		if (get<AppSettings>().isAmoledTheme) {
-			setTheme(R.style.AppTheme_AMOLED)
+		val settings = get<AppSettings>()
+		when {
+			settings.isAmoledTheme -> setTheme(R.style.ThemeOverlay_Kotatsu_AMOLED)
+			settings.isDynamicTheme -> setTheme(R.style.Theme_Kotatsu_Monet)
 		}
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)
+		insetsDelegate.handleImeInsets = true
 	}
 
 	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
@@ -59,28 +64,7 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		super.setContentView(binding.root)
 		val toolbar = (binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)
 		toolbar?.let(this::setSupportActionBar)
-		ViewCompat.setOnApplyWindowInsetsListener(binding.root, this)
-
-		val toolbarParams = (binding.root.findViewById<View>(R.id.toolbar_card) ?: toolbar)
-			?.layoutParams as? AppBarLayout.LayoutParams
-		if (toolbarParams != null) {
-			if (get<AppSettings>().isToolbarHideWhenScrolling) {
-				toolbarParams.scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS or SCROLL_FLAG_SNAP
-			} else {
-				toolbarParams.scrollFlags = SCROLL_FLAG_NO_SCROLL
-			}
-		}
-	}
-
-	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
-		val baseInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-		val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
-		val newInsets = Insets.max(baseInsets, imeInsets)
-		if (newInsets != lastInsets) {
-			onWindowInsetsChanged(newInsets)
-			lastInsets = newInsets
-		}
-		return insets
+		insetsDelegate.onViewCreated(binding.root)
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
@@ -96,8 +80,6 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		return super.onKeyDown(keyCode, event)
 	}
 
-	protected abstract fun onWindowInsetsChanged(insets: Insets)
-
 	private fun setupToolbar() {
 		(findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
 	}
@@ -129,4 +111,4 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 			super.onBackPressed()
 		}
 	}
-}
+}

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

@@ -5,19 +5,26 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams
 import androidx.appcompat.app.AppCompatDialog
+import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
+import com.google.android.material.R as materialR
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
 
-abstract class BaseBottomSheet<B : ViewBinding> :
-	BottomSheetDialogFragment() {
+abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 
 	private var viewBinding: B? = null
 
 	protected val binding: B
 		get() = checkNotNull(viewBinding)
 
+	protected val behavior: BottomSheetBehavior<*>?
+		get() = (dialog as? BottomSheetDialog)?.behavior
+
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -35,9 +42,22 @@ abstract class BaseBottomSheet<B : ViewBinding> :
 
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 		return if (resources.getBoolean(R.bool.is_tablet)) {
-			AppCompatDialog(context, theme)
+			AppCompatDialog(context, R.style.Theme_Kotatsu_Dialog)
 		} else super.onCreateDialog(savedInstanceState)
 	}
 
 	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
+
+	protected fun setExpanded(isExpanded: Boolean, isLocked: Boolean) {
+		val b = behavior ?: return
+		if (isExpanded) {
+			b.state = BottomSheetBehavior.STATE_EXPANDED
+		}
+		b.isFitToContents = !isExpanded
+		val rootView = dialog?.findViewById<View>(materialR.id.design_bottom_sheet)
+		rootView?.updateLayoutParams {
+			height = if (isExpanded) LayoutParams.MATCH_PARENT else LayoutParams.WRAP_CONTENT
+		}
+		b.isDraggable = !isLocked
+	}
 }

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

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

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

@@ -7,6 +7,16 @@ import android.view.View
 import android.view.WindowManager
 import androidx.viewbinding.ViewBinding
 
+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
+
+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 {
@@ -25,6 +35,7 @@ abstract class BaseFullscreenActivity<B : ViewBinding> : BaseActivity<B>(),
 		showSystemUI()
 	}
 
+	@Deprecated("Deprecated in Java")
 	final override fun onSystemUiVisibilityChange(visibility: Int) {
 		onSystemUiVisibilityChanged(visibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0)
 	}
@@ -39,19 +50,4 @@ abstract class BaseFullscreenActivity<B : ViewBinding> : BaseActivity<B>(),
 	}
 
 	protected open fun onSystemUiVisibilityChanged(isVisible: Boolean) = Unit
-
-	@Suppress("DEPRECATION")
-	private companion object {
-
-		const val SYSTEM_UI_FLAGS_SHOWN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-				View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-
-		const val SYSTEM_UI_FLAGS_HIDDEN = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-				View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
-				View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
-				View.SYSTEM_UI_FLAG_FULLSCREEN or
-				View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-	}
 }

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

@@ -2,38 +2,53 @@ package org.koitharu.kotatsu.base.ui
 
 import android.os.Bundle
 import android.view.View
+import androidx.annotation.CallSuper
 import androidx.annotation.StringRes
-import androidx.core.view.OnApplyWindowInsetsListener
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
+import androidx.recyclerview.widget.RecyclerView
 import org.koin.android.ext.android.inject
+import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.prefs.AppSettings
 
-abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
-	PreferenceFragmentCompat(), OnApplyWindowInsetsListener {
+abstract class BasePreferenceFragment(@StringRes private val titleId: Int) : PreferenceFragmentCompat(),
+	WindowInsetsDelegate.WindowInsetsListener,
+	RecyclerViewOwner {
 
 	protected val settings by inject<AppSettings>(mode = LazyThreadSafetyMode.NONE)
 
+	@Suppress("LeakingThis")
+	protected val insetsDelegate = WindowInsetsDelegate(this)
+
+	override val recyclerView: RecyclerView
+		get() = listView
+
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		listView.clipToPadding = false
-		ViewCompat.setOnApplyWindowInsetsListener(view, this)
+		insetsDelegate.onViewCreated(view)
+	}
+
+	override fun onDestroyView() {
+		insetsDelegate.onDestroyView()
+		super.onDestroyView()
 	}
 
 	override fun onResume() {
 		super.onResume()
-		activity?.setTitle(titleId)
+		if (titleId != 0) {
+			activity?.setTitle(titleId)
+		}
 	}
 
-	override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat): WindowInsetsCompat {
-		val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+	@CallSuper
+	override fun onWindowInsetsChanged(insets: Insets) {
 		listView.updatePadding(
-			left = systemBars.left,
-			right = systemBars.right,
-			bottom = systemBars.bottom
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom
 		)
-		return insets
 	}
-}
+}

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

@@ -3,11 +3,11 @@ package org.koitharu.kotatsu.base.ui
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.*
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.utils.SingleLiveEvent
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 
 abstract class BaseViewModel : ViewModel() {
 

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

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.databinding.DialogCheckboxBinding
 
 class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog) :
@@ -17,7 +18,7 @@ class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog)
 
 		private val binding = DialogCheckboxBinding.inflate(LayoutInflater.from(context))
 
-		private val delegate = AlertDialog.Builder(context)
+		private val delegate = MaterialAlertDialogBuilder(context)
 			.setView(binding.root)
 
 		fun setTitle(@StringRes titleResId: Int): Builder {

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

@@ -7,12 +7,12 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.runBlocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.databinding.ItemStorageBinding
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.utils.ext.getStorageName
+import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.utils.ext.inflate
-import org.koitharu.kotatsu.utils.ext.longHashCode
 import java.io.File
 
 class StorageSelectDialog private constructor(private val delegate: AlertDialog) :
@@ -20,19 +20,22 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 
 	fun show() = delegate.show()
 
-	class Builder(context: Context, defaultValue: File?, listener: OnStorageSelectListener) {
+	class Builder(context: Context, storageManager: LocalStorageManager, listener: OnStorageSelectListener) {
 
-		private val adapter = VolumesAdapter(context)
-		private val delegate = AlertDialog.Builder(context)
+		private val adapter = VolumesAdapter(storageManager)
+		private val delegate = MaterialAlertDialogBuilder(context)
 
 		init {
 			if (adapter.isEmpty) {
 				delegate.setMessage(R.string.cannot_find_available_storage)
 			} else {
-				val checked = adapter.volumes.indexOfFirst {
+				val defaultValue = runBlocking {
+					storageManager.getDefaultWriteableDir()
+				}
+				adapter.selectedItemPosition = adapter.volumes.indexOfFirst {
 					it.first.canonicalPath == defaultValue?.canonicalPath
 				}
-				delegate.setSingleChoiceItems(adapter, checked) { d, i ->
+				delegate.setAdapter(adapter) { d, i ->
 					listener.onStorageSelected(adapter.getItem(i).first)
 					d.dismiss()
 				}
@@ -57,14 +60,18 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 		fun create() = StorageSelectDialog(delegate.create())
 	}
 
-	private class VolumesAdapter(context: Context) : BaseAdapter() {
+	private class VolumesAdapter(storageManager: LocalStorageManager) : BaseAdapter() {
 
-		val volumes = getAvailableVolumes(context)
+		var selectedItemPosition: Int = -1
+		val volumes = getAvailableVolumes(storageManager)
 
 		override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
 			val view = convertView ?: parent.inflate(R.layout.item_storage)
+			val binding = (view.tag as? ItemStorageBinding) ?: ItemStorageBinding.bind(view).also {
+				view.tag = it
+			}
 			val item = volumes[position]
-			val binding = ItemStorageBinding.bind(view)
+			binding.imageViewIndicator.isChecked = selectedItemPosition == position
 			binding.textViewTitle.text = item.second
 			binding.textViewSubtitle.text = item.first.path
 			return view
@@ -72,23 +79,23 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 
 		override fun getItem(position: Int): Pair<File, String> = volumes[position]
 
-		override fun getItemId(position: Int) = volumes[position].first.absolutePath.longHashCode()
+		override fun getItemId(position: Int) = position.toLong()
 
 		override fun getCount() = volumes.size
 
+		override fun hasStableIds() = true
+
+		private fun getAvailableVolumes(storageManager: LocalStorageManager): List<Pair<File, String>> {
+			return runBlocking {
+				storageManager.getWriteableDirs().map {
+					it to storageManager.getStorageDisplayName(it)
+				}
+			}
+		}
 	}
 
 	fun interface OnStorageSelectListener {
 
 		fun onStorageSelected(file: File)
 	}
-
-	private companion object {
-
-		fun getAvailableVolumes(context: Context): List<Pair<File, String>> {
-			return LocalMangaRepository.getAvailableStorageDirs(context).map {
-				it to it.getStorageName(context)
-			}
-		}
-	}
 }

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

@@ -6,6 +6,7 @@ import android.text.InputFilter
 import android.view.LayoutInflater
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.databinding.DialogInputBinding
 
 class TextInputDialog private constructor(
@@ -18,7 +19,7 @@ class TextInputDialog private constructor(
 
 		private val binding = DialogInputBinding.inflate(LayoutInflater.from(context))
 
-		private val delegate = AlertDialog.Builder(context)
+		private val delegate = MaterialAlertDialogBuilder(context)
 			.setView(binding.root)
 
 		fun setTitle(@StringRes titleResId: Int): Builder {

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

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

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

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

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

@@ -1,18 +1,39 @@
 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 org.koitharu.kotatsu.utils.ext.getThemeDrawable
-import kotlin.math.roundToInt
+import com.google.android.material.R as materialR
 
+@SuppressLint("PrivateResource")
 abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
 
 	private val bounds = Rect()
-	private val divider = context.getThemeDrawable(android.R.attr.listDivider)
+	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,
@@ -20,27 +41,29 @@ abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.It
 		parent: RecyclerView,
 		state: RecyclerView.State,
 	) {
-		outRect.set(0, divider?.intrinsicHeight ?: 0, 0, 0)
+		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 || divider == null) {
+		if (parent.layoutManager == null || thickness == 0) {
 			return
 		}
 		canvas.save()
-		val left: Int
-		val right: Int
+		val left: Float
+		val right: Float
 		if (parent.clipToPadding) {
-			left = parent.paddingLeft
-			right = parent.width - parent.paddingRight
+			left = parent.paddingLeft.toFloat()
+			right = (parent.width - parent.paddingRight).toFloat()
 			canvas.clipRect(
-				left, parent.paddingTop, right,
-				parent.height - parent.paddingBottom
+				left,
+				parent.paddingTop.toFloat(),
+				right,
+				(parent.height - parent.paddingBottom).toFloat()
 			)
 		} else {
-			left = 0
-			right = parent.width
+			left = 0f
+			right = parent.width.toFloat()
 		}
 
 		var previous: RecyclerView.ViewHolder? = null
@@ -48,10 +71,9 @@ abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.It
 			val holder = parent.getChildViewHolder(child)
 			if (previous != null && shouldDrawDivider(previous, holder)) {
 				parent.getDecoratedBoundsWithMargins(child, bounds)
-				val top: Int = bounds.top + child.translationY.roundToInt()
-				val bottom: Int = top + divider.intrinsicHeight
-				divider.setBounds(left, top, right, bottom)
-				divider.draw(canvas)
+				val top: Float = bounds.top + child.translationY
+				val bottom: Float = top + thickness
+				canvas.drawRect(left, top, right, bottom, paint)
 			}
 			previous = holder
 		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,14 +1,15 @@
 package org.koitharu.kotatsu.core.backup
 
 import android.content.Context
+import java.io.File
+import java.util.*
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.withContext
 import org.json.JSONArray
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.utils.MutableZipFile
 import org.koitharu.kotatsu.utils.ext.format
-import java.io.File
-import java.util.*
 
 class BackupArchive(file: File) : MutableZipFile(file) {
 
@@ -33,14 +34,13 @@ class BackupArchive(file: File) : MutableZipFile(file) {
 
 		private const val DIR_BACKUPS = "backups"
 
-		@Suppress("BlockingMethodInNonBlockingContext")
-		suspend fun createNew(context: Context): BackupArchive = withContext(Dispatchers.IO) {
+		suspend fun createNew(context: Context): BackupArchive = runInterruptible(Dispatchers.IO) {
 			val dir = context.run {
 				getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
 			}
 			dir.mkdirs()
 			val filename = buildString {
-				append(context.getString(R.string.app_name).toLowerCase(Locale.ROOT))
+				append(context.getString(R.string.app_name).lowercase(Locale.ROOT))
 				append('_')
 				append(Date().format("ddMMyyyy"))
 				append(".bak")

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

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

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

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

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

@@ -4,7 +4,7 @@ import android.content.res.Resources
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class DatabasePrePopulateCallback(private val resources: Resources) : RoomDatabase.Callback() {
 

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

@@ -10,13 +10,16 @@ import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.favourites.data.FavouritesDao
 import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.suggestions.data.SuggestionDao
+import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class
-	], version = 9
+	],
+	version = 9
 )
 abstract class MangaDatabase : RoomDatabase() {
 
@@ -35,4 +38,6 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val tracksDao: TracksDao
 
 	abstract val trackLogsDao: TrackLogsDao
+
+	abstract val suggestionDao: SuggestionDao
 }

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

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

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

@@ -13,6 +13,9 @@ abstract class TracksDao {
 	@Query("SELECT * FROM tracks WHERE manga_id = :mangaId")
 	abstract suspend fun find(mangaId: Long): TrackEntity?
 
+	@Query("SELECT chapters_new FROM tracks WHERE manga_id = :mangaId")
+	abstract suspend fun findNewChapters(mangaId: Long): Int?
+
 	@Query("DELETE FROM tracks")
 	abstract suspend fun clear()
 

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

@@ -3,10 +3,10 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaState
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaState
+import org.koitharu.kotatsu.parsers.model.MangaTag
 
 @Entity(tableName = "manga")
 class MangaEntity(

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

@@ -3,9 +3,10 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.longHashCode
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.longHashCode
+import org.koitharu.kotatsu.parsers.util.toTitleCase
 
 @Entity(tableName = "tags")
 class TagEntity(
@@ -18,7 +19,7 @@ class TagEntity(
 
 	fun toMangaTag() = MangaTag(
 		key = this.key,
-		title = this.title,
+		title = this.title.toTitleCase(),
 		source = MangaSource.valueOf(this.source)
 	)
 

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

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

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

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-
-class AuthRequiredException(
-	val url: String
-) : RuntimeException("Authorization required"), ResolvableException {
-
-	@StringRes
-	override val resolveTextId: Int = R.string.sign_in
-}

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

@@ -3,12 +3,7 @@ package org.koitharu.kotatsu.core.exceptions
 import androidx.annotation.StringRes
 import okio.IOException
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
 
 class CloudFlareProtectedException(
 	val url: String
-) : IOException("Protected by CloudFlare"), ResolvableException {
-
-	@StringRes
-	override val resolveTextId: Int = R.string.captcha_solve
-}
+) : IOException("Protected by CloudFlare")

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

@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import org.json.JSONArray
-import org.koitharu.kotatsu.utils.ext.map
-
-class GraphQLException(private val errors: JSONArray) : RuntimeException() {
-
-	val messages = errors.map {
-		it.getString("message")
-	}
-
-	override val message: String
-		get() = messages.joinToString("\n")
-}

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

@@ -1,4 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-class ParseException(message: String? = null, cause: Throwable? = null) :
-	RuntimeException(message, cause)

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

@@ -1,40 +1,85 @@
 package org.koitharu.kotatsu.core.exceptions.resolve
 
 import android.util.ArrayMap
-import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.LifecycleOwner
+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.AuthRequiredException
 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 val lifecycleOwner: LifecycleOwner,
-	private val fm: FragmentManager
-) {
+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>
 
-	suspend fun resolve(e: ResolvableException): Boolean = when (e) {
+	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 -> false //TODO
+		is AuthRequiredException -> resolveAuthException(e.source)
 		else -> false
 	}
 
-	private suspend fun resolveCF(url: String) = suspendCancellableCoroutine<Boolean> { cont ->
+	private suspend fun resolveCF(url: String): Boolean {
 		val dialog = CloudFlareDialog.newInstance(url)
-		fm.clearFragmentResult(CloudFlareDialog.TAG)
-		continuations[CloudFlareDialog.TAG] = cont
-		fm.setFragmentResultListener(CloudFlareDialog.TAG, lifecycleOwner) { 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()
+		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/exceptions/resolve/ResolvableException.kt

@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions.resolve
-
-interface ResolvableException {
-
-	val resolveTextId: Int
-}

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

@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.core.github
 
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koitharu.kotatsu.utils.ext.await
-import org.koitharu.kotatsu.utils.ext.parseJson
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.parseJson
 
 class GithubRepository(private val okHttp: OkHttpClient) {
 

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.*
 
 @Parcelize

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

@@ -1,29 +1,25 @@
 package org.koitharu.kotatsu.core.model
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.Manga
 
-@Parcelize
-data class Manga(
-	val id: Long,
-	val title: String,
-	val altTitle: String? = null,
-	val url: String, // relative url for internal use
-	val publicUrl: String,
-	val rating: Float = NO_RATING, //normalized value [0..1] or -1
-	val isNsfw: Boolean = false,
-	val coverUrl: String,
-	val largeCoverUrl: String? = null,
-	val description: String? = null, //HTML
-	val tags: Set<MangaTag> = emptySet(),
-	val state: MangaState? = null,
-	val author: String? = null,
-	val chapters: List<MangaChapter>? = null,
-	val source: MangaSource
-) : Parcelable {
-
-	companion object {
-
-		const val NO_RATING = -1f
-	}
+fun Manga.withoutChapters() = if (chapters.isNullOrEmpty()) {
+	this
+} else {
+	Manga(
+		id = id,
+		title = title,
+		altTitle = altTitle,
+		url = url,
+		publicUrl = publicUrl,
+		rating = rating,
+		isNsfw = isNsfw,
+		coverUrl = coverUrl,
+		tags = tags,
+		state = state,
+		author = author,
+		largeCoverUrl = largeCoverUrl,
+		description = description,
+		chapters = null,
+		source = source,
+	)
 }

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

@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaChapter(
-	val id: Long,
-	val name: String,
-	val number: Int,
-	val url: String,
-	val scanlator: String?,
-	val uploadDate: Long,
-	val branch: String?,
-	val source: MangaSource,
-) : Parcelable, Comparable<MangaChapter> {
-
-	override fun compareTo(other: MangaChapter): Int {
-		return number.compareTo(other.number)
-	}
-}

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

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaFilter(
-	val sortOrder: SortOrder?,
-	val tags: Set<MangaTag>,
-) : Parcelable

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

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaPage(
-	val id: Long,
-	val url: String,
-	val referer: String,
-	val preview: String?,
-	val source: MangaSource,
-) : Parcelable

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

@@ -1,52 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-import org.koin.core.context.GlobalContext
-import org.koin.core.error.NoBeanDefFoundException
-import org.koin.core.qualifier.named
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.site.*
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-
-@Suppress("SpellCheckingInspection")
-@Parcelize
-enum class MangaSource(
-	val title: String,
-	val locale: String?,
-	val cls: Class<out MangaRepository>,
-) : Parcelable {
-	LOCAL("Local", null, LocalMangaRepository::class.java),
-	READMANGA_RU("ReadManga", "ru", ReadmangaRepository::class.java),
-	MINTMANGA("MintManga", "ru", MintMangaRepository::class.java),
-	SELFMANGA("SelfManga", "ru", SelfMangaRepository::class.java),
-	MANGACHAN("Манга-тян", "ru", MangaChanRepository::class.java),
-	DESUME("Desu.me", "ru", DesuMeRepository::class.java),
-	HENCHAN("Хентай-тян", "ru", HenChanRepository::class.java),
-	YAOICHAN("Яой-тян", "ru", YaoiChanRepository::class.java),
-	MANGATOWN("MangaTown", "en", MangaTownRepository::class.java),
-	MANGALIB("MangaLib", "ru", MangaLibRepository::class.java),
-
-	// NUDEMOON("Nude-Moon", "ru", NudeMoonRepository::class.java),
-	MANGAREAD("MangaRead", "en", MangareadRepository::class.java),
-	REMANGA("Remanga", "ru", RemangaRepository::class.java),
-	HENTAILIB("HentaiLib", "ru", HentaiLibRepository::class.java),
-	ANIBEL("Anibel", "be", AnibelRepository::class.java),
-	NINEMANGA_EN("NineManga English", "en", NineMangaRepository.English::class.java),
-	NINEMANGA_ES("NineManga Español", "es", NineMangaRepository.Spanish::class.java),
-	NINEMANGA_RU("NineManga Русский", "ru", NineMangaRepository.Russian::class.java),
-	NINEMANGA_DE("NineManga Deutsch", "de", NineMangaRepository.Deutsch::class.java),
-	NINEMANGA_IT("NineManga Italiano", "it", NineMangaRepository.Italiano::class.java),
-	NINEMANGA_BR("NineManga Brasil", "pt", NineMangaRepository.Brazil::class.java),
-	NINEMANGA_FR("NineManga Français", "fr", NineMangaRepository.Francais::class.java),
-	EXHENTAI("ExHentai", null, ExHentaiRepository::class.java),
-	MANGAOWL("MangaOwl", "en", MangaOwlRepository::class.java),
-	MANGADEX("MangaDex", null, MangaDexRepository::class.java),
-	;
-
-	@get:Throws(NoBeanDefFoundException::class)
-	@Deprecated("", ReplaceWith("MangaRepository(this)",
-		"org.koitharu.kotatsu.core.parser.MangaRepository"))
-	val repository: MangaRepository
-		get() = GlobalContext.get().get(named(this))
-}

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

@@ -1,5 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-enum class MangaState {
-	ONGOING, FINISHED
-}

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

@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaTag(
-	val title: String,
-	val key: String,
-	val source: MangaSource,
-) : Parcelable

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

@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.Manga
 import java.util.*
 
-@Parcelize
 data class MangaTracking(
 	val manga: Manga,
 	val knownChaptersCount: Int,
 	val lastChapterId: Long,
 	val lastNotifiedChapterId: Long,
 	val lastCheck: Date?
-) : Parcelable
+)

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

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-
-enum class SortOrder(@StringRes val titleRes: Int) {
-	UPDATED(R.string.updated),
-	POPULARITY(R.string.popular),
-	RATING(R.string.by_rating),
-	NEWEST(R.string.newest),
-	ALPHABETICAL(R.string.by_name)
-}

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

@@ -2,12 +2,12 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.Manga
 import java.util.*
 
-@Parcelize
 data class TrackingLogItem(
 	val id: Long,
 	val manga: Manga,
 	val chapters: List<String>,
 	val createdAt: Date
-) : Parcelable
+)

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

@@ -0,0 +1,91 @@
+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) {
+	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)
+	out.writeParcelable(chapters?.let(::ParcelableMangaChapters), flags)
+	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

@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import android.util.Log
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.parsers.model.Manga
+
+class ParcelableManga(
+	val manga: Manga,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(parcel.readManga())
+
+	init {
+		if (BuildConfig.DEBUG && manga.chapters != null) {
+			Log.w("ParcelableManga", "Passing manga with chapters as Parcelable is dangerous!")
+		}
+	}
+
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		manga.writeToParcel(parcel, flags)
+	}
+
+	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

@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.utils.ext.createList
+
+class ParcelableMangaChapters(
+	val chapters: List<MangaChapter>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		createList(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

@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.utils.ext.createList
+
+class ParcelableMangaPages(
+	val pages: List<MangaPage>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		createList(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

@@ -0,0 +1,36 @@
+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.createSet
+
+class ParcelableMangaTags(
+	val tags: Set<MangaTag>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		createSet(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/CloudFlareInterceptor.kt

@@ -7,6 +7,9 @@ import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import java.net.HttpURLConnection.HTTP_FORBIDDEN
 import java.net.HttpURLConnection.HTTP_UNAVAILABLE
 
+private const val HEADER_SERVER = "Server"
+private const val SERVER_CLOUDFLARE = "cloudflare"
+
 class CloudFlareInterceptor : Interceptor {
 
 	override fun intercept(chain: Interceptor.Chain): Response {
@@ -19,10 +22,4 @@ class CloudFlareInterceptor : Interceptor {
 		}
 		return response
 	}
-
-	private companion object {
-
-		private const val HEADER_SERVER = "Server"
-		private const val SERVER_CLOUDFLARE = "cloudflare"
-	}
 }

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

@@ -1,5 +1,7 @@
 package org.koitharu.kotatsu.core.network
 
+import okhttp3.CacheControl
+
 object CommonHeaders {
 
 	const val REFERER = "Referer"
@@ -7,4 +9,7 @@ object CommonHeaders {
 	const val ACCEPT = "Accept"
 	const val CONTENT_DISPOSITION = "Content-Disposition"
 	const val COOKIE = "Cookie"
-}
+
+	val CACHE_CONTROL_DISABLED: CacheControl
+		get() = CacheControl.Builder().noStore().build()
+}

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

@@ -8,6 +8,8 @@ import okio.Buffer
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 
+private const val TAG = "CURL"
+
 class CurlLoggingInterceptor(
 	private val extraCurlOptions: String? = null,
 ) : Interceptor {
@@ -51,9 +53,4 @@ class CurlLoggingInterceptor(
 		Log.d(TAG, "╰--- (copy and paste the above line to a terminal)")
 		return chain.proceed(request)
 	}
-
-	private companion object {
-
-		const val TAG = "CURL"
-	}
 }

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

@@ -1,27 +1,25 @@
 package org.koitharu.kotatsu.core.network
 
+import java.util.concurrent.TimeUnit
 import okhttp3.CookieJar
 import okhttp3.OkHttpClient
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.qualifier.named
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.utils.CacheUtils
-import org.koitharu.kotatsu.utils.DownloadManagerHelper
-import java.util.concurrent.TimeUnit
+import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
+import org.koitharu.kotatsu.local.data.LocalStorageManager
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
 
 val networkModule
 	get() = module {
 		single { AndroidCookieJar() } bind CookieJar::class
-		single(named(CacheUtils.QUALIFIER_HTTP)) { CacheUtils.createHttpCache(androidContext()) }
 		single {
 			OkHttpClient.Builder().apply {
 				connectTimeout(20, TimeUnit.SECONDS)
 				readTimeout(60, TimeUnit.SECONDS)
 				writeTimeout(20, TimeUnit.SECONDS)
 				cookieJar(get())
-				cache(get(named(CacheUtils.QUALIFIER_HTTP)))
+				cache(get<LocalStorageManager>().createHttpCache())
 				addInterceptor(UserAgentInterceptor())
 				addInterceptor(CloudFlareInterceptor())
 				if (BuildConfig.DEBUG) {
@@ -29,5 +27,5 @@ val networkModule
 				}
 			}.build()
 		}
-		factory { DownloadManagerHelper(get(), get()) }
+		single<MangaLoaderContext> { MangaLoaderContextImpl(get(), get(), get()) }
 	}

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

@@ -15,8 +15,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.core.model.Manga
 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
 
@@ -69,7 +69,7 @@ class ShortcutsRepository(
 			.setLongLabel(manga.title)
 			.setIcon(icon)
 			.setIntent(
-				ReaderActivity.newIntent(context, manga.id, null)
+				ReaderActivity.newIntent(context, manga.id)
 					.setAction(ReaderActivity.ACTION_MANGA_READ)
 			)
 	}

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

@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.net.Uri
+import coil.map.Mapper
+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): HttpUrl {
+		val mangaSource = MangaSource.valueOf(data.schemeSpecificPart)
+		val repo = MangaRepository(mangaSource) as RemoteMangaRepository
+		return repo.getFaviconUrl().toHttpUrl()
+	}
+
+	override fun handles(data: Uri) = data.scheme == "favicon"
+}

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

@@ -0,0 +1,53 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.Base64
+import android.webkit.WebView
+import androidx.core.os.LocaleListCompat
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import org.koitharu.kotatsu.core.network.AndroidCookieJar
+import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.utils.ext.toList
+import java.util.*
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+class MangaLoaderContextImpl(
+	override val httpClient: OkHttpClient,
+	override val cookieJar: AndroidCookieJar,
+	private val androidContext: Context,
+) : MangaLoaderContext() {
+
+	@SuppressLint("SetJavaScriptEnabled")
+	override suspend fun evaluateJs(script: String): String? = withContext(Dispatchers.Main) {
+		val webView = WebView(androidContext)
+		webView.settings.javaScriptEnabled = true
+		suspendCoroutine { cont ->
+			webView.evaluateJavascript(script) { result ->
+				cont.resume(result?.takeUnless { it == "null" })
+			}
+		}
+	}
+
+	override fun getConfig(source: MangaSource): MangaSourceConfig {
+		return SourceSettings(androidContext, source)
+	}
+
+	override fun encodeBase64(data: ByteArray): String {
+		return Base64.encodeToString(data, Base64.NO_PADDING)
+	}
+
+	override fun decodeBase64(data: String): ByteArray {
+		return Base64.decode(data, Base64.DEFAULT)
+	}
+
+	override fun getPreferredLocales(): List<Locale> {
+		return LocaleListCompat.getAdjustedDefault().toList()
+	}
+}

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

@@ -2,14 +2,16 @@ package org.koitharu.kotatsu.core.parser
 
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
-import org.koin.core.qualifier.named
-import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.*
 
 interface MangaRepository {
 
+	val source: MangaSource
+
 	val sortOrders: Set<SortOrder>
 
-	suspend fun getList2(
+	suspend fun getList(
 		offset: Int,
 		query: String? = null,
 		tags: Set<MangaTag>? = null,
@@ -27,7 +29,11 @@ interface MangaRepository {
 	companion object : KoinComponent {
 
 		operator fun invoke(source: MangaSource): MangaRepository {
-			return get(named(source))
+			return if (source == MangaSource.LOCAL) {
+				get<LocalMangaRepository>()
+			} else {
+				RemoteMangaRepository(source, get())
+			}
 		}
 	}
 }

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

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-interface MangaRepositoryAuthProvider {
-
-	val authUrl: String
-
-	fun isAuthorized(): Boolean
-}

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

@@ -1,38 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koin.core.qualifier.named
-import org.koin.dsl.module
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.site.*
-
-val parserModule
-	get() = module {
-
-		single { MangaLoaderContext(get(), get()) }
-
-		factory<MangaRepository>(named(MangaSource.READMANGA_RU)) { ReadmangaRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MINTMANGA)) { MintMangaRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.SELFMANGA)) { SelfMangaRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGACHAN)) { MangaChanRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.DESUME)) { DesuMeRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.HENCHAN)) { HenChanRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.YAOICHAN)) { YaoiChanRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGATOWN)) { MangaTownRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGALIB)) { MangaLibRepository(get()) }
-		// factory<MangaRepository>(named(MangaSource.NUDEMOON)) { NudeMoonRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGAREAD)) { MangareadRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.REMANGA)) { RemangaRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.HENTAILIB)) { HentaiLibRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.ANIBEL)) { AnibelRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_EN)) { NineMangaRepository.English(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_BR)) { NineMangaRepository.Brazil(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_DE)) { NineMangaRepository.Deutsch(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_ES)) { NineMangaRepository.Spanish(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_RU)) { NineMangaRepository.Russian(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_IT)) { NineMangaRepository.Italiano(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_FR)) { NineMangaRepository.Francais(get()) }
-		factory<MangaRepository>(named(MangaSource.EXHENTAI)) { ExHentaiRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGAOWL)) { MangaOwlRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGADEX)) { MangaDexRepository(get()) }
-	}

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

@@ -1,86 +1,51 @@
 package org.koitharu.kotatsu.core.parser
 
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.MangaPage
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+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.*
+import org.koitharu.kotatsu.parsers.newParser
 
-abstract class RemoteMangaRepository(
-	protected val loaderContext: MangaLoaderContext
+class RemoteMangaRepository(
+	override val source: MangaSource,
+	loaderContext: MangaLoaderContext,
 ) : MangaRepository {
 
-	protected abstract val source: MangaSource
+	private val parser: MangaParser = source.newParser(loaderContext)
 
-	protected abstract val defaultDomain: String
+	override val sortOrders: Set<SortOrder>
+		get() = parser.sortOrders
 
-	private val conf by lazy {
-		loaderContext.getSettings(source)
-	}
-
-	val title: String
-		get() = source.title
-
-	override val sortOrders: Set<SortOrder> get() = emptySet()
-
-	override suspend fun getPageUrl(page: MangaPage): String = page.url.withDomain()
-
-	override suspend fun getTags(): Set<MangaTag> = emptySet()
-
-	open fun onCreatePreferences(map: MutableMap<String, Any>) {
-		map[SourceSettings.KEY_DOMAIN] = defaultDomain
-	}
-
-	protected fun getDomain() = conf.getDomain(defaultDomain)
-
-	protected fun String.withDomain(subdomain: String? = null) = when {
-		this.startsWith("//") -> buildString {
-			append("http")
-			if (conf.isUseSsl(true)) {
-				append('s')
-			}
-			append(":")
-			append(this@withDomain)
+	var defaultSortOrder: SortOrder?
+		get() = getConfig().defaultSortOrder ?: sortOrders.firstOrNull()
+		set(value) {
+			getConfig().defaultSortOrder = value
 		}
-		this.startsWith("/") -> buildString {
-			append("http")
-			if (conf.isUseSsl(true)) {
-				append('s')
-			}
-			append("://")
-			if (subdomain != null) {
-				append(subdomain)
-				append('.')
-			}
-			append(conf.getDomain(defaultDomain))
-			append(this@withDomain)
-		}
-		else -> this
+
+	override suspend fun getList(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
+	): List<Manga> = parser.getList(offset, query, 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)
 	}
 
-	protected fun generateUid(url: String): Long {
-		var h = 1125899906842597L
-		source.name.forEach { c ->
-			h = 31 * h + c.toLong()
-		}
-		url.forEach { c ->
-			h = 31 * h + c.toLong()
-		}
-		return h
-	}
-
-	protected fun generateUid(id: Long): Long {
-		var h = 1125899906842597L
-		source.name.forEach { c ->
-			h = 31 * h + c.toLong()
-		}
-		h = 31 * h + id
-		return h
-	}
-
-	protected fun parseFailed(message: String? = null): Nothing {
-		throw ParseException(message)
-	}
-}
+	private fun getConfig() = parser.config as SourceSettings
+}

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

@@ -1,259 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.map
-import org.koitharu.kotatsu.utils.ext.mapIndexed
-import org.koitharu.kotatsu.utils.ext.stringIterator
-import java.util.*
-
-class AnibelRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.ANIBEL
-
-	override val defaultDomain = "anibel.net"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.NEWEST
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		if (!query.isNullOrEmpty()) {
-			return if (offset == 0) {
-				search(query)
-			} else {
-				emptyList()
-			}
-		}
-		val filters = tags?.takeUnless { it.isEmpty() }?.joinToString(
-			separator = ",",
-			prefix = "genres: [",
-			postfix = "]"
-		) { "\"it.key\"" }.orEmpty()
-		val array = apiCall(
-			"""
-			getMediaList(offset: $offset, limit: 20, mediaType: manga, filters: {$filters}) {
-				docs {
-					mediaId
-					title {
-						be
-						alt
-					}
-					rating
-					poster
-					genres
-					slug
-					mediaType
-          			status
-				}
-			}
-			""".trimIndent()
-		).getJSONObject("getMediaList").getJSONArray("docs")
-		return array.map { jo ->
-			val mediaId = jo.getString("mediaId")
-			val title = jo.getJSONObject("title")
-			val href = "${jo.getString("mediaType")}/${jo.getString("slug")}"
-			Manga(
-				id = generateUid(mediaId),
-				title = title.getString("be"),
-				coverUrl = jo.getString("poster").removePrefix("/cdn")
-					.withDomain("cdn") + "?width=200&height=280",
-				altTitle = title.getString("alt").takeUnless(String::isEmpty),
-				author = null,
-				rating = jo.getDouble("rating").toFloat() / 10f,
-				url = href,
-				publicUrl = "https://${getDomain()}/${href}",
-				tags = jo.getJSONArray("genres").mapToTags(),
-				state = when (jo.getString("status")) {
-					"ongoing" -> MangaState.ONGOING
-					"finished" -> MangaState.FINISHED
-					else -> null
-				},
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val (type, slug) = manga.url.split('/')
-		val details = apiCall(
-			"""
-			media(mediaType: $type, slug: "$slug") {
-				mediaId
-				title {
-					be
-					alt
-				}
-				description {
-					be
-				}
-				status
-				poster
-				rating
-				genres
-			}
-			""".trimIndent()
-		).getJSONObject("media")
-		val title = details.getJSONObject("title")
-		val poster = details.getString("poster").removePrefix("/cdn")
-			.withDomain("cdn")
-		val chapters = apiCall(
-			"""
-			chapters(mediaId: "${details.getString("mediaId")}") {
-				id
-				chapter
-				released
-			}
-			""".trimIndent()
-		).getJSONArray("chapters")
-		return manga.copy(
-			title = title.getString("be"),
-			altTitle = title.getString("alt"),
-			coverUrl = "$poster?width=200&height=280",
-			largeCoverUrl = poster,
-			description = details.getJSONObject("description").getString("be"),
-			rating = details.getDouble("rating").toFloat() / 10f,
-			tags = details.getJSONArray("genres").mapToTags(),
-			state = when (details.getString("status")) {
-				"ongoing" -> MangaState.ONGOING
-				"finished" -> MangaState.FINISHED
-				else -> null
-			},
-			chapters = chapters.map { jo ->
-				val number = jo.getInt("chapter")
-				MangaChapter(
-					id = generateUid(jo.getString("id")),
-					name = "Глава $number",
-					number = number,
-					url = "${manga.url}/read/$number",
-					scanlator = null,
-					uploadDate = jo.getLong("released"),
-					branch = null,
-					source = source,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val (_, slug, _, number) = chapter.url.split('/')
-		val chapterJson = apiCall(
-			"""
-			chapter(slug: "$slug", chapter: $number) {
-				id
-				images {
-					large
-					thumbnail
-				}
-			}
-			""".trimIndent()
-		).getJSONObject("chapter")
-		val pages = chapterJson.getJSONArray("images")
-		val chapterUrl = "https://${getDomain()}/${chapter.url}"
-		return pages.mapIndexed { i, jo ->
-			MangaPage(
-				id = generateUid("${chapter.url}/$i"),
-				url = jo.getString("large"),
-				referer = chapterUrl,
-				preview = jo.getString("thumbnail"),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val json = apiCall(
-			"""
-			getFilters(mediaType: manga) {
-				genres
-			}
-			""".trimIndent()
-		)
-		val array = json.getJSONObject("getFilters").getJSONArray("genres")
-		return array.mapToTags()
-	}
-
-	private suspend fun search(query: String): List<Manga> {
-		val json = apiCall(
-			"""
-			search(query: "$query", limit: 40) {
-				id
-				title {
-					be
-					en
-				}
-				poster
-				url
-				type
-			}
-			""".trimIndent()
-		)
-		val array = json.getJSONArray("search")
-		return array.map { jo ->
-			val mediaId = jo.getString("id")
-			val title = jo.getJSONObject("title")
-			val href = "${jo.getString("type").lowercase()}/${jo.getString("url")}"
-			Manga(
-				id = generateUid(mediaId),
-				title = title.getString("be"),
-				coverUrl = jo.getString("poster").removePrefix("/cdn")
-					.withDomain("cdn") + "?width=200&height=280",
-				altTitle = title.getString("en").takeUnless(String::isEmpty),
-				author = null,
-				rating = Manga.NO_RATING,
-				url = href,
-				publicUrl = "https://${getDomain()}/${href}",
-				tags = emptySet(),
-				state = null,
-				source = source,
-			)
-		}
-	}
-
-	private suspend fun apiCall(request: String): JSONObject {
-		return loaderContext.graphQLQuery("https://api.${getDomain()}/graphql", request)
-			.getJSONObject("data")
-	}
-
-	private fun JSONArray.mapToTags(): Set<MangaTag> {
-
-		fun toTitle(slug: String): String {
-			val builder = StringBuilder(slug)
-			var capitalize = true
-			for ((i, c) in builder.withIndex()) {
-				when {
-					c == '-' -> {
-						builder.setCharAt(i, ' ')
-						capitalize = true
-					}
-					capitalize -> {
-						builder.setCharAt(i, c.uppercaseChar())
-						capitalize = false
-					}
-				}
-			}
-			return builder.toString()
-		}
-
-		val result = ArraySet<MangaTag>(length())
-		stringIterator().forEach {
-			result.add(
-				MangaTag(
-					title = toTitle(it),
-					key = it,
-					source = source,
-				)
-			)
-		}
-		return result
-	}
-}

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

@@ -1,162 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(
-	loaderContext
-) {
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.NEWEST,
-		SortOrder.POPULARITY,
-		SortOrder.ALPHABETICAL
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val domain = getDomain()
-		val url = when {
-			!query.isNullOrEmpty() -> {
-				if (offset != 0) {
-					return emptyList()
-				}
-				"https://$domain/?do=search&subaction=search&story=${query.urlEncoded()}"
-			}
-			!tags.isNullOrEmpty() -> tags.joinToString(
-				prefix = "https://$domain/tags/",
-				postfix = "&n=${getSortKey2(sortOrder)}?offset=$offset",
-				separator = "+",
-			) { tag -> tag.key }
-			else -> "https://$domain/${getSortKey(sortOrder)}?offset=$offset"
-		}
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val root = doc.body().selectFirst("div.main_fon")?.getElementById("content")
-			?: throw ParseException("Cannot find root")
-		return root.select("div.content_row").mapNotNull { row ->
-			val a = row.selectFirst("div.manga_row1")?.selectFirst("h2")?.selectFirst("a")
-				?: return@mapNotNull null
-			val href = a.relUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.inContextOf(a),
-				altTitle = a.attr("title"),
-				title = a.text().substringAfterLast('(').substringBeforeLast(')'),
-				author = row.getElementsByAttributeValueStarting(
-					"href",
-					"/mangaka"
-				).firstOrNull()?.text(),
-				coverUrl = row.selectFirst("div.manga_images")?.selectFirst("img")
-					?.absUrl("src").orEmpty(),
-				tags = runCatching {
-					row.selectFirst("div.genre")?.select("a")?.mapToSet {
-						MangaTag(
-							title = it.text(),
-							key = it.attr("href").substringAfterLast('/').urlEncoded(),
-							source = source
-						)
-					}
-				}.getOrNull().orEmpty(),
-				source = source
-			)
-		}
-	}
-
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root =
-			doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
-		val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
-		return manga.copy(
-			description = root.getElementById("description")?.html()?.substringBeforeLast("<div"),
-			largeCoverUrl = root.getElementById("cover")?.absUrl("src"),
-			chapters = root.select("table.table_cha tr:gt(1)").reversed().mapIndexedNotNull { i, tr ->
-				val href = tr?.selectFirst("a")?.relUrl("href") ?: return@mapIndexedNotNull null
-				MangaChapter(
-					id = generateUid(href),
-					name = tr.selectFirst("a")?.text().orEmpty(),
-					number = i + 1,
-					url = href,
-					scanlator = null,
-					branch = null,
-					uploadDate = dateFormat.tryParse(tr.selectFirst("div.date")?.text()),
-					source = source,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val scripts = doc.select("script")
-		for (script in scripts) {
-			val data = script.html()
-			val pos = data.indexOf("\"fullimg")
-			if (pos == -1) {
-				continue
-			}
-			val json = data.substring(pos).substringAfter('[').substringBefore(';')
-				.substringBeforeLast(']')
-			val domain = getDomain()
-			return json.split(",").mapNotNull {
-				it.trim()
-					.removeSurrounding('"', '\'')
-					.toRelativeUrl(domain)
-					.takeUnless(String::isBlank)
-			}.map { url ->
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					referer = fullUrl,
-					source = source,
-				)
-			}
-		}
-		throw ParseException("Pages list not found at ${chapter.url}")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val domain = getDomain()
-		val doc = loaderContext.httpGet("https://$domain/catalog").parseHtml()
-		val root = doc.body().selectFirst("div.main_fon")?.getElementById("side")
-			?.select("ul")?.last() ?: throw ParseException("Cannot find root")
-		return root.select("li.sidetag").mapToSet { li ->
-			val a = li.children().last() ?: throw ParseException("a is null")
-			MangaTag(
-				title = a.text().toCamelCase(),
-				key = a.attr("href").substringAfterLast('/'),
-				source = source
-			)
-		}
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.ALPHABETICAL -> "catalog"
-			SortOrder.POPULARITY -> "mostfavorites"
-			SortOrder.NEWEST -> "manga/new"
-			else -> "mostfavorites"
-		}
-
-	private fun getSortKey2(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.ALPHABETICAL -> "abcasc"
-			SortOrder.POPULARITY -> "favdesc"
-			SortOrder.NEWEST -> "datedesc"
-			else -> "favdesc"
-		}
-
-}

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

@@ -1,149 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.util.*
-
-class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.DESUME
-
-	override val defaultDomain = "desu.me"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY,
-		SortOrder.NEWEST,
-		SortOrder.ALPHABETICAL
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		if (query != null && offset != 0) {
-			return emptyList()
-		}
-		val domain = getDomain()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			append("/manga/api/?limit=20&order=")
-			append(getSortKey(sortOrder))
-			append("&page=")
-			append((offset / 20) + 1)
-			if (!tags.isNullOrEmpty()) {
-				append("&genres=")
-				appendAll(tags, ",") { it.key }
-			}
-			if (query != null) {
-				append("&search=")
-				append(query)
-			}
-		}
-		val json = loaderContext.httpGet(url).parseJson().getJSONArray("response")
-			?: throw ParseException("Invalid response")
-		val total = json.length()
-		val list = ArrayList<Manga>(total)
-		for (i in 0 until total) {
-			val jo = json.getJSONObject(i)
-			val cover = jo.getJSONObject("image")
-			val id = jo.getLong("id")
-			list += Manga(
-				url = "/manga/api/$id",
-				publicUrl = jo.getString("url"),
-				source = MangaSource.DESUME,
-				title = jo.getString("russian"),
-				altTitle = jo.getString("name"),
-				coverUrl = cover.getString("preview"),
-				largeCoverUrl = cover.getString("original"),
-				state = when {
-					jo.getInt("ongoing") == 1 -> MangaState.ONGOING
-					else -> null
-				},
-				rating = jo.getDouble("score").toFloat().coerceIn(0f, 1f),
-				id = generateUid(id),
-				description = jo.getString("description")
-			)
-		}
-		return list
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val url = manga.url.withDomain()
-		val json = loaderContext.httpGet(url).parseJson().getJSONObject("response")
-			?: throw ParseException("Invalid response")
-		val baseChapterUrl = manga.url + "/chapter/"
-		val chaptersList = json.getJSONObject("chapters").getJSONArray("list")
-		val totalChapters = chaptersList.length()
-		return manga.copy(
-			tags = json.getJSONArray("genres").mapToSet {
-				MangaTag(
-					key = it.getString("text"),
-					title = it.getString("russian"),
-					source = manga.source
-				)
-			},
-			publicUrl = json.getString("url"),
-			description = json.getString("description"),
-			chapters = chaptersList.mapIndexed { i, it ->
-				val chid = it.getLong("id")
-				val volChap = "Том " + it.getString("vol") + ". " + "Глава " + it.getString("ch")
-				val title = if (it.getString("title") == "null") "" else it.getString("title")
-				MangaChapter(
-					id = generateUid(chid),
-					source = manga.source,
-					url = "$baseChapterUrl$chid",
-					uploadDate = it.getLong("date") * 1000,
-					name = if (title.isEmpty()) volChap else "$volChap: $title",
-					number = totalChapters - i,
-					scanlator = null,
-					branch = null,
-				)
-			}.reversed()
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val json = loaderContext.httpGet(fullUrl)
-			.parseJson()
-			.getJSONObject("response") ?: throw ParseException("Invalid response")
-		return json.getJSONObject("pages").getJSONArray("list").map { jo ->
-			MangaPage(
-				id = generateUid(jo.getLong("id")),
-				referer = fullUrl,
-				preview = null,
-				source = chapter.source,
-				url = jo.getString("img"),
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
-		val root = doc.body().getElementById("animeFilter")
-			?.selectFirst(".catalog-genres") ?: throw ParseException("Root not found")
-		return root.select("li").mapToSet {
-			MangaTag(
-				source = source,
-				key = it.selectFirst("input")?.attr("data-genre") ?: parseFailed(),
-				title = it.selectFirst("label")?.text() ?: parseFailed()
-			)
-		}
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder) {
-			SortOrder.ALPHABETICAL -> "name"
-			SortOrder.POPULARITY -> "popular"
-			SortOrder.UPDATED -> "updated"
-			SortOrder.NEWEST -> "id"
-			else -> "updated"
-		}
-}

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

@@ -1,260 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.jsoup.nodes.Element
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import kotlin.math.pow
-
-private const val DOMAIN_UNAUTHORIZED = "e-hentai.org"
-private const val DOMAIN_AUTHORIZED = "exhentai.org"
-
-class ExHentaiRepository(
-	loaderContext: MangaLoaderContext,
-) : RemoteMangaRepository(loaderContext), MangaRepositoryAuthProvider {
-
-	override val source = MangaSource.EXHENTAI
-
-	override val defaultDomain: String
-		get() = if (isAuthorized()) DOMAIN_AUTHORIZED else DOMAIN_UNAUTHORIZED
-
-	override val authUrl: String
-		get() = "https://${getDomain()}/bounce_login.php"
-
-	private val ratingPattern = Regex("-?[0-9]+px")
-	private val authCookies = arrayOf("ipb_member_id", "ipb_pass_hash")
-	private var updateDm = false
-
-	init {
-		loaderContext.cookieJar.insertCookies(DOMAIN_AUTHORIZED, "nw=1", "sl=dm_2")
-		loaderContext.cookieJar.insertCookies(DOMAIN_UNAUTHORIZED, "nw=1", "sl=dm_2")
-	}
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		val page = (offset / 25f).toIntUp()
-		var search = query?.urlEncoded().orEmpty()
-		val url = buildString {
-			append("https://")
-			append(getDomain())
-			append("/?page=")
-			append(page)
-			if (!tags.isNullOrEmpty()) {
-				var fCats = 0
-				for (tag in tags) {
-					tag.key.toIntOrNull()?.let { fCats = fCats or it } ?: run {
-						search += tag.key + " "
-					}
-				}
-				if (fCats != 0) {
-					append("&f_cats=")
-					append(1023 - fCats)
-				}
-			}
-			if (search.isNotEmpty()) {
-				append("&f_search=")
-				append(search.trim().replace(' ', '+'))
-			}
-			// by unknown reason cookie "sl=dm_2" is ignored, so, we should request it again
-			if (updateDm) {
-				append("&inline_set=dm_e")
-			}
-		}
-		val body = loaderContext.httpGet(url).parseHtml().body()
-		val root = body.selectFirst("table.itg")
-			?.selectFirst("tbody")
-			?: if (updateDm) {
-				parseFailed("Cannot find root")
-			} else {
-				updateDm = true
-				return getList2(offset, query, tags, sortOrder)
-			}
-		updateDm = false
-		return root.children().mapNotNull { tr ->
-			if (tr.childrenSize() != 2) return@mapNotNull null
-			val (td1, td2) = tr.children()
-			val glink = td2.selectFirst("div.glink") ?: parseFailed("glink not found")
-			val a = glink.parents().select("a").first() ?: parseFailed("link not found")
-			val href = a.relUrl("href")
-			val tagsDiv = glink.nextElementSibling() ?: parseFailed("tags div not found")
-			val mainTag = td2.selectFirst("div.cn")?.let { div ->
-				MangaTag(
-					title = div.text(),
-					key = tagIdByClass(div.classNames()) ?: return@let null,
-					source = source,
-				)
-			}
-			Manga(
-				id = generateUid(href),
-				title = glink.text().cleanupTitle(),
-				altTitle = null,
-				url = href,
-				publicUrl = a.absUrl("href"),
-				rating = td2.selectFirst("div.ir")?.parseRating() ?: Manga.NO_RATING,
-				isNsfw = true,
-				coverUrl = td1.selectFirst("img")?.absUrl("src").orEmpty(),
-				tags = setOfNotNull(mainTag),
-				state = null,
-				author = tagsDiv.getElementsContainingOwnText("artist:").first()
-					?.nextElementSibling()?.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root = doc.body().selectFirst("div.gm") ?: parseFailed("Cannot find root")
-		val cover = root.getElementById("gd1")?.children()?.first()
-		val title = root.getElementById("gd2")
-		val taglist = root.getElementById("taglist")
-		val tabs = doc.body().selectFirst("table.ptt")?.selectFirst("tr")
-		return manga.copy(
-			title = title?.getElementById("gn")?.text()?.cleanupTitle() ?: manga.title,
-			altTitle = title?.getElementById("gj")?.text()?.cleanupTitle() ?: manga.altTitle,
-			publicUrl = doc.baseUri().ifEmpty { manga.publicUrl },
-			rating = root.getElementById("rating_label")?.text()
-				?.substringAfterLast(' ')
-				?.toFloatOrNull()
-				?.div(5f) ?: manga.rating,
-			largeCoverUrl = cover?.css("background")?.cssUrl(),
-			description = taglist?.select("tr")?.joinToString("<br>") { tr ->
-				val (tc, td) = tr.children()
-				val subtags = td.select("a").joinToString { it.html() }
-				"<b>${tc.html()}</b> $subtags"
-			},
-			chapters = tabs?.select("a")?.findLast { a ->
-				a.text().toIntOrNull() != null
-			}?.let { a ->
-				val count = a.text().toInt()
-				val chapters = ArrayList<MangaChapter>(count)
-				for (i in 1..count) {
-					val url = "${manga.url}?p=$i"
-					chapters += MangaChapter(
-						id = generateUid(url),
-						name = "${manga.title} #$i",
-						number = i,
-						url = url,
-						uploadDate = 0L,
-						source = source,
-						scanlator = null,
-						branch = null,
-					)
-				}
-				chapters
-			},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = loaderContext.httpGet(chapter.url.withDomain()).parseHtml()
-		val root = doc.body().getElementById("gdt") ?: parseFailed("Root not found")
-		return root.select("a").mapNotNull { a ->
-			val url = a.relUrl("href")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				referer = a.absUrl("href"),
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String {
-		val doc = loaderContext.httpGet(page.url.withDomain()).parseHtml()
-		return doc.body().getElementById("img")?.absUrl("src")
-			?: parseFailed("Image not found")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}").parseHtml()
-		val root = doc.body().getElementById("searchbox")?.selectFirst("table")
-			?: parseFailed("Root not found")
-		return root.select("div.cs").mapNotNullToSet { div ->
-			val id = div.id().substringAfterLast('_').toIntOrNull()
-				?: return@mapNotNullToSet null
-			MangaTag(
-				title = div.text(),
-				key = id.toString(),
-				source = source
-			)
-		}
-	}
-
-	override fun isAuthorized(): Boolean {
-		val authorized = isAuthorized(DOMAIN_UNAUTHORIZED)
-		if (authorized) {
-			if (!isAuthorized(DOMAIN_AUTHORIZED)) {
-				loaderContext.cookieJar.copyCookies(
-					DOMAIN_UNAUTHORIZED,
-					DOMAIN_AUTHORIZED,
-					authCookies,
-				)
-				loaderContext.cookieJar.insertCookies(DOMAIN_AUTHORIZED, "yay=louder")
-			}
-			return true
-		}
-		return false
-	}
-
-	private fun isAuthorized(domain: String): Boolean {
-		val cookies = loaderContext.cookieJar.getCookies(domain).mapToSet { x -> x.name }
-		return authCookies.all { it in cookies }
-	}
-
-	private fun Element.parseRating(): Float {
-		return runCatching {
-			val style = requireNotNull(attr("style"))
-			val (v1, v2) = ratingPattern.find(style)!!.destructured
-			var p1 = v1.dropLast(2).toInt()
-			val p2 = v2.dropLast(2).toInt()
-			if (p2 != -1) {
-				p1 += 8
-			}
-			(80 - p1) / 80f
-		}.getOrDefault(Manga.NO_RATING)
-	}
-
-	private fun String.cleanupTitle(): String {
-		val result = StringBuilder(length)
-		var skip = false
-		for (c in this) {
-			when {
-				c == '[' -> skip = true
-				c == ']' -> skip = false
-				c.isWhitespace() && result.isEmpty() -> continue
-				!skip -> result.append(c)
-			}
-		}
-		while (result.lastOrNull()?.isWhitespace() == true) {
-			result.deleteCharAt(result.lastIndex)
-		}
-		return result.toString()
-	}
-
-	private fun String.cssUrl(): String? {
-		val fromIndex = indexOf("url(")
-		if (fromIndex == -1) {
-			return null
-		}
-		val toIndex = indexOf(')', startIndex = fromIndex)
-		return if (toIndex == -1) {
-			null
-		} else {
-			substring(fromIndex + 4, toIndex).trim()
-		}
-	}
-
-	private fun tagIdByClass(classNames: Collection<String>): String? {
-		val className = classNames.find { x -> x.startsWith("ct") } ?: return null
-		val num = className.drop(2).toIntOrNull(16) ?: return null
-		return 2.0.pow(num).toInt().toString()
-	}
-}

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

@@ -1,249 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Response
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
-	RemoteMangaRepository(loaderContext) {
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY,
-		SortOrder.NEWEST,
-		SortOrder.RATING
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val domain = getDomain()
-		val doc = when {
-			!query.isNullOrEmpty() -> loaderContext.httpPost(
-				"https://$domain/search",
-				mapOf(
-					"q" to query.urlEncoded(),
-					"offset" to (offset upBy PAGE_SIZE_SEARCH).toString()
-				)
-			)
-			tags.isNullOrEmpty() -> loaderContext.httpGet(
-				"https://$domain/list?sortType=${
-					getSortKey(
-						sortOrder
-					)
-				}&offset=${offset upBy PAGE_SIZE}", HEADER
-			)
-			tags.size == 1 -> loaderContext.httpGet(
-				"https://$domain/list/genre/${tags.first().key}?sortType=${
-					getSortKey(
-						sortOrder
-					)
-				}&offset=${offset upBy PAGE_SIZE}", HEADER
-			)
-			offset > 0 -> return emptyList()
-			else -> advancedSearch(domain, tags)
-		}.parseHtml().body()
-		val root = (doc.getElementById("mangaBox") ?: doc.getElementById("mangaResults"))
-			?.selectFirst("div.tiles.row") ?: throw ParseException("Cannot find root")
-		val baseHost = root.baseUri().toHttpUrl().host
-		return root.select("div.tile").mapNotNull { node ->
-			val imgDiv = node.selectFirst("div.img") ?: return@mapNotNull null
-			val descDiv = node.selectFirst("div.desc") ?: return@mapNotNull null
-			if (descDiv.selectFirst("i.fa-user") != null) {
-				return@mapNotNull null //skip author
-			}
-			val href = imgDiv.selectFirst("a")?.attr("href")?.inContextOf(node)
-			if (href == null || href.toHttpUrl().host != baseHost) {
-				return@mapNotNull null // skip external links
-			}
-			val title = descDiv.selectFirst("h3")?.selectFirst("a")?.text()
-				?: return@mapNotNull null
-			val tileInfo = descDiv.selectFirst("div.tile-info")
-			val relUrl = href.toRelativeUrl(baseHost)
-			Manga(
-				id = generateUid(relUrl),
-				url = relUrl,
-				publicUrl = href,
-				title = title,
-				altTitle = descDiv.selectFirst("h4")?.text(),
-				coverUrl = imgDiv.selectFirst("img.lazy")?.attr("data-original").orEmpty(),
-				rating = runCatching {
-					node.selectFirst("div.rating")
-						?.attr("title")
-						?.substringBefore(' ')
-						?.toFloatOrNull()
-						?.div(10f)
-				}.getOrNull() ?: Manga.NO_RATING,
-				author = tileInfo?.selectFirst("a.person-link")?.text(),
-				tags = runCatching {
-					tileInfo?.select("a.element-link")
-						?.mapToSet {
-							MangaTag(
-								title = it.text(),
-								key = it.attr("href").substringAfterLast('/'),
-								source = source
-							)
-						}
-				}.getOrNull().orEmpty(),
-				state = when {
-					node.selectFirst("div.tags")
-						?.selectFirst("span.mangaCompleted") != null -> MangaState.FINISHED
-					else -> null
-				},
-				source = source
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain(), HEADER).parseHtml()
-		val root = doc.body().getElementById("mangaBox")?.selectFirst("div.leftContent")
-			?: throw ParseException("Cannot find root")
-		val dateFormat = SimpleDateFormat("dd.MM.yy", Locale.US)
-		val coverImg = root.selectFirst("div.subject-cover")?.selectFirst("img")
-		return manga.copy(
-			description = root.selectFirst("div.manga-description")?.html(),
-			largeCoverUrl = coverImg?.attr("data-full"),
-			coverUrl = coverImg?.attr("data-thumb") ?: manga.coverUrl,
-			tags = manga.tags + root.select("div.subject-meta").select("span.elem_genre ")
-				.mapNotNull {
-					val a = it.selectFirst("a.element-link") ?: return@mapNotNull null
-					MangaTag(
-						title = a.text(),
-						key = a.attr("href").substringAfterLast('/'),
-						source = source
-					)
-				},
-			chapters = root.selectFirst("div.chapters-link")?.selectFirst("table")
-				?.select("tr:has(td > a)")?.asReversed()?.mapIndexedNotNull { i, tr ->
-					val a = tr.selectFirst("a") ?: return@mapIndexedNotNull null
-					val href = a.relUrl("href")
-					var translators = ""
-					val translatorElement = a.attr("title")
-					if (!translatorElement.isNullOrBlank()) {
-						translators = translatorElement
-							.replace("(Переводчик),", "&")
-							.removeSuffix(" (Переводчик)")
-					}
-					MangaChapter(
-						id = generateUid(href),
-						name = tr.selectFirst("a")?.text().orEmpty().removePrefix(manga.title).trim(),
-						number = i + 1,
-						url = href,
-						uploadDate = dateFormat.tryParse(tr.selectFirst("td.d-none")?.text()),
-						scanlator = translators,
-						source = source,
-						branch = null,
-					)
-				}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = loaderContext.httpGet(chapter.url.withDomain() + "?mtr=1", HEADER).parseHtml()
-		val scripts = doc.select("script")
-		for (script in scripts) {
-			val data = script.html()
-			val pos = data.indexOf("rm_h.init")
-			if (pos == -1) {
-				continue
-			}
-			val json = data.substring(pos).substringAfter('[').substringBeforeLast(']')
-			val matches = Regex("\\[.*?]").findAll(json).toList()
-			val regex = Regex("['\"].*?['\"]")
-			return matches.map { x ->
-				val parts = regex.findAll(x.value).toList()
-				val url = parts[0].value.removeSurrounding('"', '\'') +
-						parts[2].value.removeSurrounding('"', '\'')
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					referer = chapter.url,
-					source = source,
-				)
-			}
-		}
-		throw ParseException("Pages list not found at ${chapter.url}")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/list/genres/sort_name", HEADER).parseHtml()
-		val root = doc.body().getElementById("mangaBox")?.selectFirst("div.leftContent")
-			?.selectFirst("table.table") ?: parseFailed("Cannot find root")
-		return root.select("a.element-link").mapToSet { a ->
-			MangaTag(
-				title = a.text().toCamelCase(),
-				key = a.attr("href").substringAfterLast('/'),
-				source = source
-			)
-		}
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.ALPHABETICAL -> "name"
-			SortOrder.POPULARITY -> "rate"
-			SortOrder.UPDATED -> "updated"
-			SortOrder.NEWEST -> "created"
-			SortOrder.RATING -> "votes"
-			null -> "updated"
-		}
-
-	private suspend fun advancedSearch(domain: String, tags: Set<MangaTag>): Response {
-		val url = "https://$domain/search/advanced"
-		// Step 1: map catalog genres names to advanced-search genres ids
-		val tagsIndex = loaderContext.httpGet(url, HEADER).parseHtml()
-			.body().selectFirst("form.search-form")
-			?.select("div.form-group")
-			?.get(1) ?: parseFailed("Genres filter element not found")
-		val tagNames = tags.map { it.title.lowercase() }
-		val payload = HashMap<String, String>()
-		var foundGenres = 0
-		tagsIndex.select("li.property").forEach { li ->
-			val name = li.text().trim().lowercase()
-			val id = li.selectFirst("input")?.id()
-				?: parseFailed("Id for tag $name not found")
-			payload[id] = if (name in tagNames) {
-				foundGenres++
-				"in"
-			} else ""
-		}
-		if (foundGenres != tags.size) {
-			parseFailed("Some genres are not found")
-		}
-		// Step 2: advanced search
-		payload["q"] = ""
-		payload["s_high_rate"] = ""
-		payload["s_single"] = ""
-		payload["s_mature"] = ""
-		payload["s_completed"] = ""
-		payload["s_translated"] = ""
-		payload["s_many_chapters"] = ""
-		payload["s_wait_upload"] = ""
-		payload["s_sale"] = ""
-		payload["years"] = "1900,2099"
-		payload["+"] = "Искать".urlEncoded()
-		return loaderContext.httpPost(url, payload)
-	}
-
-	private companion object {
-
-		private const val PAGE_SIZE = 70
-		private const val PAGE_SIZE_SEARCH = 50
-		private val HEADER = Headers.Builder()
-			.add("User-Agent", "readmangafun")
-			.build()
-	}
-
-}

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

@@ -1,58 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.utils.ext.mapToSet
-import org.koitharu.kotatsu.utils.ext.parseHtml
-
-class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
-
-	override val defaultDomain = "hentaichan.live"
-	override val source = MangaSource.HENCHAN
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		return super.getList2(offset, query, tags, sortOrder).map {
-			it.copy(
-				coverUrl = it.coverUrl.replace("_blur", ""),
-				isNsfw = true,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root =
-			doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
-		val readLink = manga.url.replace("manga", "online")
-		return manga.copy(
-			description = root.getElementById("description")?.html()?.substringBeforeLast("<div"),
-			largeCoverUrl = root.getElementById("cover")?.absUrl("src"),
-			tags = root.selectFirst("div.sidetags")?.select("li.sidetag")?.mapToSet {
-				val a = it.children().last() ?: parseFailed("Invalid tag")
-				MangaTag(
-					title = a.text(),
-					key = a.attr("href").substringAfterLast('/'),
-					source = source
-				)
-			} ?: manga.tags,
-			chapters = listOf(
-				MangaChapter(
-					id = generateUid(readLink),
-					url = readLink,
-					source = source,
-					number = 1,
-					uploadDate = 0L,
-					name = manga.title,
-					scanlator = null,
-					branch = null,
-				)
-			)
-		)
-	}
-}

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

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class HentaiLibRepository(loaderContext: MangaLoaderContext) : MangaLibRepository(loaderContext) {
-
-	override val defaultDomain = "hentailib.me"
-
-	override val source = MangaSource.HENTAILIB
-
-}

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

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class MangaChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
-
-	override val defaultDomain = "manga-chan.me"
-	override val source = MangaSource.MANGACHAN
-}

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

@@ -1,216 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.os.Build
-import androidx.core.os.LocaleListCompat
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 20
-private const val CONTENT_RATING =
-	"contentRating[]=safe&contentRating[]=suggestive&contentRating[]=erotica&contentRating[]=pornographic"
-private const val LOCALE_FALLBACK = "en"
-
-class MangaDexRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.MANGADEX
-	override val defaultDomain = "mangadex.org"
-
-	override val sortOrders: EnumSet<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.ALPHABETICAL,
-		SortOrder.NEWEST,
-		SortOrder.POPULARITY,
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		val domain = getDomain()
-		val url = buildString {
-			append("https://api.")
-			append(domain)
-			append("/manga?limit=")
-			append(PAGE_SIZE)
-			append("&offset=")
-			append(offset)
-			append("&includes[]=cover_art&includes[]=author&includes[]=artist&")
-			tags?.forEach { tag ->
-				append("includedTags[]=")
-				append(tag.key)
-				append('&')
-			}
-			if (!query.isNullOrEmpty()) {
-				append("title=")
-				append(query.urlEncoded())
-				append('&')
-			}
-			append(CONTENT_RATING)
-			append("&order")
-			append(when (sortOrder) {
-				null,
-				SortOrder.UPDATED,
-				-> "[latestUploadedChapter]=desc"
-				SortOrder.ALPHABETICAL -> "[title]=asc"
-				SortOrder.NEWEST -> "[createdAt]=desc"
-				SortOrder.POPULARITY -> "[followedCount]=desc"
-				else -> "[followedCount]=desc"
-			})
-		}
-		val json = loaderContext.httpGet(url).parseJson().getJSONArray("data")
-		return json.map { jo ->
-			val id = jo.getString("id")
-			val attrs = jo.getJSONObject("attributes")
-			val relations = jo.getJSONArray("relationships").associateByKey("type")
-			val cover = relations["cover_art"]
-				?.getJSONObject("attributes")
-				?.getString("fileName")
-				?.let {
-					"https://uploads.$domain/covers/$id/$it"
-				}
-			Manga(
-				id = generateUid(id),
-				title = requireNotNull(attrs.getJSONObject("title").selectByLocale()) {
-					"Title should not be null"
-				},
-				altTitle = attrs.optJSONObject("altTitles")?.selectByLocale(),
-				url = id,
-				publicUrl = "https://$domain/title/$id",
-				rating = Manga.NO_RATING,
-				isNsfw = attrs.getStringOrNull("contentRating") == "erotica",
-				coverUrl = cover?.plus(".256.jpg").orEmpty(),
-				largeCoverUrl = cover,
-				description = attrs.optJSONObject("description")?.selectByLocale(),
-				tags = attrs.getJSONArray("tags").mapToSet { tag ->
-					MangaTag(
-						title = tag.getJSONObject("attributes")
-							.getJSONObject("name")
-							.firstStringValue(),
-						key = tag.getString("id"),
-						source = source,
-					)
-				},
-				state = when (jo.getStringOrNull("status")) {
-					"ongoing" -> MangaState.ONGOING
-					"completed" -> MangaState.FINISHED
-					else -> null
-				},
-				author = (relations["author"] ?: relations["artist"])
-					?.getJSONObject("attributes")
-					?.getStringOrNull("name"),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope<Manga> {
-		val domain = getDomain()
-		val attrsDeferred = async {
-			loaderContext.httpGet(
-				"https://api.$domain/manga/${manga.url}?includes[]=artist&includes[]=author&includes[]=cover_art"
-			).parseJson().getJSONObject("data").getJSONObject("attributes")
-		}
-		val feedDeferred = async {
-			val url = buildString {
-				append("https://api.")
-				append(domain)
-				append("/manga/")
-				append(manga.url)
-				append("/feed")
-				append("?limit=96&includes[]=scanlation_group&order[volume]=asc&order[chapter]=asc&offset=0&")
-				append(CONTENT_RATING)
-			}
-			loaderContext.httpGet(url).parseJson().getJSONArray("data")
-		}
-		val mangaAttrs = attrsDeferred.await()
-		val feed = feedDeferred.await()
-		//2022-01-02T00:27:11+00:00
-		val dateFormat = SimpleDateFormat(
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-				"yyyy-MM-dd'T'HH:mm:ssX"
-			} else {
-				"yyyy-MM-dd'T'HH:mm:ss'+00:00'"
-			},
-			Locale.ROOT
-		)
-		manga.copy(
-			description = mangaAttrs.getJSONObject("description").selectByLocale()
-				?: manga.description,
-			chapters = feed.mapNotNull { jo ->
-				val id = jo.getString("id")
-				val attrs = jo.getJSONObject("attributes")
-				if (attrs.optJSONArray("data").isNullOrEmpty()) {
-					return@mapNotNull null
-				}
-				val locale = Locale.forLanguageTag(attrs.getString("translatedLanguage"))
-				val relations = jo.getJSONArray("relationships").associateByKey("type")
-				val number = attrs.optInt("chapter", 0)
-				MangaChapter(
-					id = generateUid(id),
-					name = attrs.getStringOrNull("title")?.takeUnless(String::isEmpty)
-						?: "Chapter #$number",
-					number = number,
-					url = id,
-					scanlator = relations["scanlation_group"]?.getStringOrNull("name"),
-					uploadDate = dateFormat.tryParse(attrs.getString("publishAt")),
-					branch = locale.displayName.toTitleCase(locale),
-					source = source,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val domain = getDomain()
-		val attrs = loaderContext.httpGet("https://api.$domain/chapter/${chapter.url}")
-			.parseJson()
-			.getJSONObject("data")
-			.getJSONObject("attributes")
-		val data = attrs.getJSONArray("data")
-		val prefix = "https://uploads.$domain/data/${attrs.getString("hash")}/"
-		val referer = "https://$domain/"
-		return List(data.length()) { i ->
-			val url = prefix + data.getString(i)
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				referer = referer,
-				preview = null, // TODO prefix + dataSaver.getString(i),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val tags = loaderContext.httpGet("https://api.${getDomain()}/manga/tag").parseJson()
-			.getJSONArray("data")
-		return tags.mapToSet { jo ->
-			MangaTag(
-				title = jo.getJSONObject("attributes").getJSONObject("name").firstStringValue(),
-				key = jo.getString("id"),
-				source = source,
-			)
-		}
-	}
-
-	private fun JSONObject.firstStringValue() = values().next() as String
-
-	private fun JSONObject.selectByLocale(): String? {
-		val preferredLocales = LocaleListCompat.getAdjustedDefault()
-		repeat(preferredLocales.size()) { i ->
-			val locale = preferredLocales.get(i)
-			getStringOrNull(locale.language)?.let { return it }
-			getStringOrNull(locale.toLanguageTag())?.let { return it }
-		}
-		return getStringOrNull(LOCALE_FALLBACK) ?: values().nextOrNull() as? String
-	}
-}

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

@@ -1,249 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-open class MangaLibRepository(loaderContext: MangaLoaderContext) :
-	RemoteMangaRepository(loaderContext) {
-
-	override val defaultDomain = "mangalib.me"
-
-	override val source = MangaSource.MANGALIB
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.RATING,
-		SortOrder.ALPHABETICAL,
-		SortOrder.POPULARITY,
-		SortOrder.UPDATED,
-		SortOrder.NEWEST
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		if (!query.isNullOrEmpty()) {
-			return if (offset == 0) search(query) else emptyList()
-		}
-		val page = (offset / 60f).toIntUp()
-		val url = buildString {
-			append("https://")
-			append(getDomain())
-			append("/manga-list?dir=")
-			append(getSortKey(sortOrder))
-			append("&page=")
-			append(page)
-			tags?.forEach { tag ->
-				append("&genres[include][]=")
-				append(tag.key)
-			}
-		}
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val root = doc.body().getElementById("manga-list") ?: throw ParseException("Root not found")
-		val items = root.selectFirst("div.media-cards-grid")?.select("div.media-card-wrap")
-			?: return emptyList()
-		return items.mapNotNull { card ->
-			val a = card.selectFirst("a.media-card") ?: return@mapNotNull null
-			val href = a.relUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = card.selectFirst("h3")?.text().orEmpty(),
-				coverUrl = a.absUrl("data-src"),
-				altTitle = null,
-				author = null,
-				rating = Manga.NO_RATING,
-				url = href,
-				publicUrl = href.inContextOf(a),
-				tags = emptySet(),
-				state = null,
-				source = source
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val fullUrl = manga.url.withDomain()
-		val doc = loaderContext.httpGet("$fullUrl?section=info").parseHtml()
-		val root = doc.body().getElementById("main-page") ?: throw ParseException("Root not found")
-		val title = root.selectFirst("div.media-header__wrap")?.children()
-		val info = root.selectFirst("div.media-content")
-		val chaptersDoc = loaderContext.httpGet("$fullUrl?section=chapters").parseHtml()
-		val scripts = chaptersDoc.select("script")
-		val dateFormat = SimpleDateFormat("yyy-MM-dd", Locale.US)
-		var chapters: ArrayList<MangaChapter>? = null
-		scripts@ for (script in scripts) {
-			val raw = script.html().lines()
-			for (line in raw) {
-				if (line.startsWith("window.__DATA__")) {
-					val json = JSONObject(line.substringAfter('=').substringBeforeLast(';'))
-					val list = json.getJSONObject("chapters").getJSONArray("list")
-					val total = list.length()
-					chapters = ArrayList(total)
-					for (i in 0 until total) {
-						val item = list.getJSONObject(i)
-						val chapterId = item.getLong("chapter_id")
-						val scanlator = item.getStringOrNull("username")
-						val url = buildString {
-							append(manga.url)
-							append("/v")
-							append(item.getInt("chapter_volume"))
-							append("/c")
-							append(item.getString("chapter_number"))
-							@Suppress("BlockingMethodInNonBlockingContext") // lint issue
-							append('/')
-							append(item.optString("chapter_string"))
-						}
-						val nameChapter = item.getStringOrNull("chapter_name")
-						val volume = item.getInt("chapter_volume")
-						val number = item.getString("chapter_number")
-						val fullNameChapter = "Том $volume. Глава $number"
-						chapters.add(
-							MangaChapter(
-								id = generateUid(chapterId),
-								url = url,
-								source = source,
-								number = total - i,
-								uploadDate = dateFormat.tryParse(
-									item.getString("chapter_created_at").substringBefore(" ")
-								),
-								scanlator = scanlator,
-								branch = null,
-								name = if (nameChapter.isNullOrBlank()) fullNameChapter else "$fullNameChapter - $nameChapter",
-							)
-						)
-					}
-					chapters.reverse()
-					break@scripts
-				}
-			}
-		}
-		return manga.copy(
-			title = title?.getOrNull(0)?.text()?.takeUnless(String::isBlank) ?: manga.title,
-			altTitle = title?.getOrNull(1)?.text()?.substringBefore('/')?.trim(),
-			rating = root.selectFirst("div.media-stats-item__score")
-				?.selectFirst("span")
-				?.text()?.toFloatOrNull()?.div(5f) ?: manga.rating,
-			author = info?.getElementsMatchingOwnText("Автор")?.firstOrNull()
-				?.nextElementSibling()?.text() ?: manga.author,
-			tags = info?.selectFirst("div.media-tags")
-				?.select("a.media-tag-item")?.mapToSet { a ->
-					MangaTag(
-						title = a.text().toCamelCase(),
-						key = a.attr("href").substringAfterLast('='),
-						source = source
-					)
-				} ?: manga.tags,
-			description = info?.selectFirst("div.media-description__text")?.html(),
-			chapters = chapters
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		if (doc.location().endsWith("/register")) {
-			throw AuthRequiredException("/login".inContextOf(doc))
-		}
-		val scripts = doc.head().select("script")
-		val pg = (doc.body().getElementById("pg")?.html() ?: parseFailed("Element #pg not found"))
-			.substringAfter('=')
-			.substringBeforeLast(';')
-		val pages = JSONArray(pg)
-		for (script in scripts) {
-			val raw = script.html().trim()
-			if (raw.contains("window.__info")) {
-				val json = JSONObject(
-					raw.substringAfter("window.__info")
-						.substringAfter('=')
-						.substringBeforeLast(';')
-				)
-				val domain = json.getJSONObject("servers").run {
-					getStringOrNull("main") ?: getString(
-						json.getJSONObject("img").getString("server")
-					)
-				}
-				val url = json.getJSONObject("img").getString("url")
-				return pages.map { x ->
-					val pageUrl = "$domain/$url${x.getString("u")}"
-					MangaPage(
-						id = generateUid(pageUrl),
-						url = pageUrl,
-						preview = null,
-						referer = fullUrl,
-						source = source,
-					)
-				}
-			}
-		}
-		throw ParseException("Script with info not found")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val url = "https://${getDomain()}/manga-list"
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val scripts = doc.body().select("script")
-		for (script in scripts) {
-			val raw = script.html().trim()
-			if (raw.startsWith("window.__DATA")) {
-				val json = JSONObject(raw.substringAfter('=').substringBeforeLast(';'))
-				val genres = json.getJSONObject("filters").getJSONArray("genres")
-				val result = ArraySet<MangaTag>(genres.length())
-				for (x in genres) {
-					result += MangaTag(
-						source = source,
-						key = x.getInt("id").toString(),
-						title = x.getString("name").toCamelCase()
-					)
-				}
-				return result
-			}
-		}
-		throw ParseException("Script with genres not found")
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) = when (sortOrder) {
-		SortOrder.RATING -> "desc&sort=rate"
-		SortOrder.ALPHABETICAL -> "asc&sort=name"
-		SortOrder.POPULARITY -> "desc&sort=views"
-		SortOrder.UPDATED -> "desc&sort=last_chapter_at"
-		SortOrder.NEWEST -> "desc&sort=created_at"
-		else -> "desc&sort=last_chapter_at"
-	}
-
-	private suspend fun search(query: String): List<Manga> {
-		val domain = getDomain()
-		val json = loaderContext.httpGet("https://$domain/search?type=manga&q=$query")
-			.parseJsonArray()
-		return json.map { jo ->
-			val slug = jo.getString("slug")
-			val url = "/$slug"
-			val covers = jo.getJSONObject("covers")
-			Manga(
-				id = generateUid(url),
-				url = url,
-				publicUrl = "https://$domain/$slug",
-				title = jo.getString("rus_name"),
-				altTitle = jo.getString("name"),
-				author = null,
-				tags = emptySet(),
-				rating = jo.getString("rate_avg")
-					.toFloatOrNull()?.div(5f) ?: Manga.NO_RATING,
-				state = null,
-				source = source,
-				coverUrl = covers.getString("thumbnail"),
-				largeCoverUrl = covers.getString("default")
-			)
-		}
-	}
-}

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

@@ -1,164 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-class MangaOwlRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.MANGAOWL
-
-	override val defaultDomain = "mangaowls.com"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.POPULARITY,
-		SortOrder.NEWEST,
-		SortOrder.UPDATED
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		val page = (offset / 36f).toIntUp().inc()
-		val link = buildString {
-			append("https://")
-			append(getDomain())
-			when {
-				!query.isNullOrEmpty() -> {
-					append("/search/${page}?search=")
-					append(query.urlEncoded())
-				}
-				!tags.isNullOrEmpty() -> {
-					for (tag in tags) {
-						append(tag.key)
-					}
-					append("/${page}?type=${getAlternativeSortKey(sortOrder)}")
-				}
-				else -> {
-					append("/${getSortKey(sortOrder)}/${page}")
-				}
-			}
-		}
-		val doc = loaderContext.httpGet(link).parseHtml()
-		val slides = doc.body().select("ul.slides") ?: parseFailed("An error occurred while parsing")
-		val items = slides.select("div.col-md-2")
-		return items.mapNotNull { item ->
-			val href = item.selectFirst("h6 a")?.relUrl("href") ?: return@mapNotNull null
-			Manga(
-				id = generateUid(href),
-				title = item.selectFirst("h6 a")?.text() ?: return@mapNotNull null,
-				coverUrl = item.select("div.img-responsive").attr("abs:data-background-image"),
-				altTitle = null,
-				author = null,
-				rating = runCatching {
-					item.selectFirst("div.block-stars")
-						?.text()
-						?.toFloatOrNull()
-						?.div(10f)
-				}.getOrNull() ?: Manga.NO_RATING,
-				url = href,
-				publicUrl = href.withDomain(),
-				source = source
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.publicUrl).parseHtml()
-		val info = doc.body().selectFirst("div.single_detail") ?: parseFailed("An error occurred while parsing")
-		val table = doc.body().selectFirst("div.single-grid-right") ?: parseFailed("An error occurred while parsing")
-		val dateFormat = SimpleDateFormat("MM/dd/yyyy", Locale.US)
-		return manga.copy(
-			description = info.selectFirst(".description")?.html(),
-			largeCoverUrl = info.select("img").first()?.let { img ->
-				if (img.hasAttr("data-src")) img.attr("abs:data-src") else img.attr("abs:src")
-			},
-			author = info.selectFirst("p.fexi_header_para a.author_link")?.text(),
-			state = parseStatus(info.select("p.fexi_header_para:contains(status)").first()?.ownText()),
-			tags = manga.tags + info.select("div.col-xs-12.col-md-8.single-right-grid-right > p > a[href*=genres]")
-				.mapNotNull {
-					val a = it.selectFirst("a") ?: return@mapNotNull null
-					MangaTag(
-						title = a.text(),
-						key = a.attr("href"),
-						source = source
-					)
-				},
-			chapters = table.select("div.table.table-chapter-list").select("li.list-group-item.chapter_list").asReversed().mapIndexed { i, li ->
-				val a = li.select("a")
-				val href = a.attr("data-href").ifEmpty {
-					parseFailed("Link is missing")
-				}
-				MangaChapter(
-					id = generateUid(href),
-					name = a.select("label").text(),
-					number = i + 1,
-					url = href,
-					scanlator = null,
-					branch = null,
-					uploadDate = dateFormat.tryParse(li.selectFirst("small:last-of-type")?.text()),
-					source = MangaSource.MANGAOWL,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().select("div.item img.owl-lazy") ?: throw ParseException("Root not found")
-		return root.map { div ->
-			val url = div?.relUrl("data-src") ?: parseFailed("Page image not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				referer = fullUrl,
-				source = MangaSource.MANGAOWL,
-			)
-		}
-	}
-
-	private fun parseStatus(status: String?) = when {
-		status == null -> null
-		status.contains("Ongoing") -> MangaState.ONGOING
-		status.contains("Completed") -> MangaState.FINISHED
-		else -> null
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/").parseHtml()
-		val root = doc.body().select("ul.dropdown-menu.multi-column.columns-3").select("li")
-		return root.mapToSet { p ->
-			val a = p.selectFirst("a") ?: parseFailed("a is null")
-			MangaTag(
-				title = a.text().toCamelCase(),
-				key = a.attr("href"),
-				source = source
-			)
-		}
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.POPULARITY -> "popular"
-			SortOrder.NEWEST -> "new_release"
-			SortOrder.UPDATED -> "lastest"
-			else -> "lastest"
-		}
-
-	private fun getAlternativeSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.POPULARITY -> "0"
-			SortOrder.NEWEST -> "2"
-			SortOrder.UPDATED -> "3"
-			else -> "3"
-		}
-}

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

@@ -1,201 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.intellij.lang.annotations.Language
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-class MangaTownRepository(loaderContext: MangaLoaderContext) :
-	RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.MANGATOWN
-
-	override val defaultDomain = "www.mangatown.com"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.ALPHABETICAL,
-		SortOrder.RATING,
-		SortOrder.POPULARITY,
-		SortOrder.UPDATED
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val sortKey = when (sortOrder) {
-			SortOrder.ALPHABETICAL -> "?name.az"
-			SortOrder.RATING -> "?rating.za"
-			SortOrder.UPDATED -> "?last_chapter_time.za"
-			else -> ""
-		}
-		val page = (offset / 30) + 1
-		val url = when {
-			!query.isNullOrEmpty() -> {
-				if (offset != 0) {
-					return emptyList()
-				}
-				"/search?name=${query.urlEncoded()}".withDomain()
-			}
-			tags.isNullOrEmpty() -> "/directory/$page.htm$sortKey".withDomain()
-			tags.size == 1 -> "/directory/${tags.first().key}/$page.htm$sortKey".withDomain()
-			else -> tags.joinToString(
-				prefix = "/search?page=$page".withDomain()
-			) { tag ->
-				"&genres[${tag.key}]=1"
-			}
-		}
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val root = doc.body().selectFirst("ul.manga_pic_list")
-			?: throw ParseException("Root not found")
-		return root.select("li").mapNotNull { li ->
-			val a = li.selectFirst("a.manga_cover")
-			val href = a?.relUrl("href")
-				?: return@mapNotNull null
-			val views = li.select("p.view")
-			val status = views.findOwnText { x -> x.startsWith("Status:") }
-				?.substringAfter(':')?.trim()?.lowercase(Locale.ROOT)
-			Manga(
-				id = generateUid(href),
-				title = a.attr("title"),
-				coverUrl = a.selectFirst("img")?.absUrl("src").orEmpty(),
-				source = MangaSource.MANGATOWN,
-				altTitle = null,
-				rating = li.selectFirst("p.score")?.selectFirst("b")
-					?.ownText()?.toFloatOrNull()?.div(5f) ?: Manga.NO_RATING,
-				author = views.findText { x -> x.startsWith("Author:") }?.substringAfter(':')
-					?.trim(),
-				state = when (status) {
-					"ongoing" -> MangaState.ONGOING
-					"completed" -> MangaState.FINISHED
-					else -> null
-				},
-				tags = li.selectFirst("p.keyWord")?.select("a")?.mapNotNullToSet tags@{ x ->
-					MangaTag(
-						title = x.attr("title"),
-						key = x.attr("href").parseTagKey() ?: return@tags null,
-						source = MangaSource.MANGATOWN
-					)
-				}.orEmpty(),
-				url = href,
-				publicUrl = href.inContextOf(a)
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root = doc.body().selectFirst("section.main")
-			?.selectFirst("div.article_content") ?: throw ParseException("Cannot find root")
-		val info = root.selectFirst("div.detail_info")?.selectFirst("ul")
-		val chaptersList = root.selectFirst("div.chapter_content")
-			?.selectFirst("ul.chapter_list")?.select("li")?.asReversed()
-		val dateFormat = SimpleDateFormat("MMM dd,yyyy", Locale.US)
-		return manga.copy(
-			tags = manga.tags + info?.select("li")?.find { x ->
-				x.selectFirst("b")?.ownText() == "Genre(s):"
-			}?.select("a")?.mapNotNull { a ->
-				MangaTag(
-					title = a.attr("title"),
-					key = a.attr("href").parseTagKey() ?: return@mapNotNull null,
-					source = MangaSource.MANGATOWN
-				)
-			}.orEmpty(),
-			description = info?.getElementById("show")?.ownText(),
-			chapters = chaptersList?.mapIndexedNotNull { i, li ->
-				val href = li.selectFirst("a")?.relUrl("href")
-					?: return@mapIndexedNotNull null
-				val name = li.select("span").filter { it.className().isEmpty() }
-					.joinToString(" - ") { it.text() }.trim()
-				MangaChapter(
-					id = generateUid(href),
-					url = href,
-					source = MangaSource.MANGATOWN,
-					number = i + 1,
-					uploadDate = parseChapterDate(
-						dateFormat,
-						li.selectFirst("span.time")?.text()
-					),
-					name = name.ifEmpty { "${manga.title} - ${i + 1}" },
-					scanlator = null,
-					branch = null,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().selectFirst("div.page_select")
-			?: throw ParseException("Cannot find root")
-		return root.selectFirst("select")?.select("option")?.mapNotNull {
-			val href = it.relUrl("value")
-			if (href.endsWith("featured.html")) {
-				return@mapNotNull null
-			}
-			MangaPage(
-				id = generateUid(href),
-				url = href,
-				preview = null,
-				referer = fullUrl,
-				source = MangaSource.MANGATOWN,
-			)
-		} ?: parseFailed("Pages list not found")
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String {
-		val doc = loaderContext.httpGet(page.url.withDomain()).parseHtml()
-		return doc.getElementById("image")?.absUrl("src") ?: parseFailed("Image not found")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("/directory/".withDomain()).parseHtml()
-		val root = doc.body().selectFirst("aside.right")
-			?.getElementsContainingOwnText("Genres")
-			?.first()
-			?.nextElementSibling() ?: parseFailed("Root not found")
-		return root.select("li").mapNotNullToSet { li ->
-			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
-			val key = a.attr("href").parseTagKey()
-			if (key.isNullOrEmpty()) {
-				return@mapNotNullToSet null
-			}
-			MangaTag(
-				source = MangaSource.MANGATOWN,
-				key = key,
-				title = a.text()
-			)
-		}
-	}
-
-	private fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
-		return when {
-			date.isNullOrEmpty() -> 0L
-			date.contains("Today") -> Calendar.getInstance().timeInMillis
-			date.contains("Yesterday") -> Calendar.getInstance().apply { add(Calendar.DAY_OF_MONTH, -1) }.timeInMillis
-			else -> dateFormat.tryParse(date)
-		}
-	}
-
-	override fun onCreatePreferences(map: MutableMap<String, Any>) {
-		super.onCreatePreferences(map)
-		map[SourceSettings.KEY_USE_SSL] = true
-	}
-
-	private fun String.parseTagKey() = split('/').findLast { TAG_REGEX matches it }
-
-	private companion object {
-
-		@Language("RegExp")
-		val TAG_REGEX = Regex("[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+")
-	}
-}

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

@@ -1,253 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.WordSet
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-class MangareadRepository(
-	loaderContext: MangaLoaderContext
-) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.MANGAREAD
-
-	override val defaultDomain = "www.mangaread.org"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val tag = when {
-			tags.isNullOrEmpty() -> null
-			tags.size == 1 -> tags.first()
-			else -> throw NotImplementedError("Multiple genres are not supported by this source")
-		}
-		val payload = createRequestTemplate()
-		payload["page"] = (offset / PAGE_SIZE.toFloat()).toIntUp().toString()
-		payload["vars[meta_key]"] = when (sortOrder) {
-			SortOrder.POPULARITY -> "_wp_manga_views"
-			SortOrder.UPDATED -> "_latest_update"
-			else -> "_wp_manga_views"
-		}
-		payload["vars[wp-manga-genre]"] = tag?.key.orEmpty()
-		payload["vars[s]"] = query.orEmpty()
-		val doc = loaderContext.httpPost(
-			"https://${getDomain()}/wp-admin/admin-ajax.php",
-			payload
-		).parseHtml()
-		return doc.select("div.row.c-tabs-item__content").map { div ->
-			val href = div.selectFirst("a")?.relUrl("href")
-				?: parseFailed("Link not found")
-			val summary = div.selectFirst(".tab-summary")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.inContextOf(div),
-				coverUrl = div.selectFirst("img")?.absUrl("src").orEmpty(),
-				title = summary?.selectFirst("h3")?.text().orEmpty(),
-				rating = div.selectFirst("span.total_votes")?.ownText()
-					?.toFloatOrNull()?.div(5f) ?: -1f,
-				tags = summary?.selectFirst(".mg_genres")?.select("a")?.mapToSet { a ->
-					MangaTag(
-						key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
-						title = a.text(),
-						source = MangaSource.MANGAREAD
-					)
-				}.orEmpty(),
-				author = summary?.selectFirst(".mg_author")?.selectFirst("a")?.ownText(),
-				state = when (summary?.selectFirst(".mg_status")?.selectFirst(".summary-content")
-					?.ownText()?.trim()) {
-					"OnGoing" -> MangaState.ONGOING
-					"Completed" -> MangaState.FINISHED
-					else -> null
-				},
-				source = MangaSource.MANGAREAD
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
-		val root = doc.body().selectFirst("header")
-			?.selectFirst("ul.second-menu") ?: parseFailed("Root not found")
-		return root.select("li").mapNotNullToSet { li ->
-			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
-			val href = a.attr("href").removeSuffix("/")
-				.substringAfterLast("genres/", "")
-			if (href.isEmpty()) {
-				return@mapNotNullToSet null
-			}
-			MangaTag(
-				key = href,
-				title = a.text(),
-				source = MangaSource.MANGAREAD
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val fullUrl = manga.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().selectFirst("div.profile-manga")
-			?.selectFirst("div.summary_content")
-			?.selectFirst("div.post-content")
-			?: throw ParseException("Root not found")
-		val root2 = doc.body().selectFirst("div.content-area")
-			?.selectFirst("div.c-page")
-			?: throw ParseException("Root2 not found")
-		val mangaId = doc.getElementsByAttribute("data-post").firstOrNull()
-			?.attr("data-post")?.toLongOrNull()
-			?: throw ParseException("Cannot obtain manga id")
-		val doc2 = loaderContext.httpPost(
-			"https://${getDomain()}/wp-admin/admin-ajax.php",
-			mapOf(
-				"action" to "manga_get_chapters",
-				"manga" to mangaId.toString()
-			)
-		).parseHtml()
-		val dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.US)
-		return manga.copy(
-			tags = root.selectFirst("div.genres-content")?.select("a")
-				?.mapNotNullToSet { a ->
-					MangaTag(
-						key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
-						title = a.text(),
-						source = MangaSource.MANGAREAD
-					)
-				} ?: manga.tags,
-			description = root2.selectFirst("div.description-summary")
-				?.selectFirst("div.summary__content")
-				?.select("p")
-				?.filterNot { it.ownText().startsWith("A brief description") }
-				?.joinToString { it.html() },
-			chapters = doc2.select("li").asReversed().mapIndexed { i, li ->
-				val a = li.selectFirst("a")
-				val href = a?.relUrl("href").orEmpty().ifEmpty {
-					parseFailed("Link is missing")
-				}
-				MangaChapter(
-					id = generateUid(href),
-					name = a!!.ownText(),
-					number = i + 1,
-					url = href,
-					uploadDate = parseChapterDate(
-						dateFormat,
-						doc2.selectFirst("span.chapter-release-date i")?.text()
-					),
-					source = MangaSource.MANGAREAD,
-					scanlator = null,
-					branch = null,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().selectFirst("div.main-col-inner")
-			?.selectFirst("div.reading-content")
-			?: throw ParseException("Root not found")
-		return root.select("div.page-break").map { div ->
-			val img = div.selectFirst("img")
-			val url = img?.relUrl("src") ?: parseFailed("Page image not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				referer = fullUrl,
-				source = MangaSource.MANGAREAD,
-			)
-		}
-	}
-
-	private fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
-
-		date ?: return 0
-		return when {
-			date.endsWith(" ago", ignoreCase = true) -> {
-				parseRelativeDate(date)
-			}
-			// Handle translated 'ago' in Portuguese.
-			date.endsWith(" atrás", ignoreCase = true) -> {
-				parseRelativeDate(date)
-			}
-			// Handle translated 'ago' in Turkish.
-			date.endsWith(" önce", ignoreCase = true) -> {
-				parseRelativeDate(date)
-			}
-			// Handle 'yesterday' and 'today', using midnight
-			date.startsWith("year", ignoreCase = true) -> {
-				Calendar.getInstance().apply {
-					add(Calendar.DAY_OF_MONTH, -1) // yesterday
-					set(Calendar.HOUR_OF_DAY, 0)
-					set(Calendar.MINUTE, 0)
-					set(Calendar.SECOND, 0)
-					set(Calendar.MILLISECOND, 0)
-				}.timeInMillis
-			}
-			date.startsWith("today", ignoreCase = true) -> {
-				Calendar.getInstance().apply {
-					set(Calendar.HOUR_OF_DAY, 0)
-					set(Calendar.MINUTE, 0)
-					set(Calendar.SECOND, 0)
-					set(Calendar.MILLISECOND, 0)
-				}.timeInMillis
-			}
-			date.contains(Regex("""\d(st|nd|rd|th)""")) -> {
-				// Clean date (e.g. 5th December 2019 to 5 December 2019) before parsing it
-				date.split(" ").map {
-					if (it.contains(Regex("""\d\D\D"""))) {
-						it.replace(Regex("""\D"""), "")
-					} else {
-						it
-					}
-				}
-					.let { dateFormat.tryParse(it.joinToString(" ")) }
-			}
-			else -> dateFormat.tryParse(date)
-		}
-	}
-
-	// Parses dates in this form:
-	// 21 hours ago
-	private fun parseRelativeDate(date: String): Long {
-		val number = Regex("""(\d+)""").find(date)?.value?.toIntOrNull() ?: return 0
-		val cal = Calendar.getInstance()
-
-		return when {
-			WordSet("hari", "gün", "jour", "día", "dia", "day").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
-			WordSet("jam", "saat", "heure", "hora", "hour").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
-			WordSet("menit", "dakika", "min", "minute", "minuto").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
-			WordSet("detik", "segundo", "second").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
-			WordSet("month").anyWordIn(date) -> cal.apply { add(Calendar.MONTH, -number) }.timeInMillis
-			WordSet("year").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis
-			else -> 0
-		}
-	}
-
-	private companion object {
-
-		private const val PAGE_SIZE = 12
-
-		private fun createRequestTemplate() =
-			"action=madara_load_more&page=1&template=madara-core%2Fcontent%2Fcontent-search&vars%5Bs%5D=&vars%5Borderby%5D=meta_value_num&vars%5Bpaged%5D=1&vars%5Btemplate%5D=search&vars%5Bmeta_query%5D%5B0%5D%5Brelation%5D=AND&vars%5Bmeta_query%5D%5Brelation%5D=OR&vars%5Bpost_type%5D=wp-manga&vars%5Bpost_status%5D=publish&vars%5Bmeta_key%5D=_latest_update&vars%5Border%5D=desc&vars%5Bmanga_archives_item_layout%5D=default"
-				.split('&')
-				.map {
-					val pos = it.indexOf('=')
-					it.substring(0, pos) to it.substring(pos + 1)
-				}.toMutableMap()
-	}
-}