Merge branch 'devel' into patch-1

.gitignore

@@ -3,6 +3,7 @@
 /local.properties
 /.idea/caches
 /.idea/libraries
+/.idea/dictionaries
 /.idea/modules.xml
 /.idea/misc.xml
 /.idea/workspace.xml

.idea/dictionaries/admin.xml

@@ -1,16 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="admin">
-    <words>
-      <w>amoled</w>
-      <w>chucker</w>
-      <w>desu</w>
-      <w>failsafe</w>
-      <w>koin</w>
-      <w>kotatsu</w>
-      <w>manga</w>
-      <w>snackbar</w>
-      <w>upsert</w>
-      <w>webtoon</w>
-    </words>
-  </dictionary>
-</component>

.idea/gradle.xml

@@ -14,7 +14,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

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) [![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)
 
 ### Download
 

app/build.gradle

@@ -6,16 +6,17 @@ plugins {
 }
 
 android {
-	compileSdkVersion 30
+	compileSdkVersion 31
 	buildToolsVersion '30.0.3'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
-		targetSdkVersion 30
+		targetSdkVersion 31
-		versionCode 367
+		versionCode 375
-		versionName '1.1.2'
+		versionName '2.1-b1'
 		generatedDensities = []
+		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
 		kapt {
 			arguments {
@@ -41,6 +42,9 @@ android {
 	buildFeatures {
 		viewBinding true
 	}
+	sourceSets {
+		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+	}
 	lintOptions {
 		disable 'MissingTranslation'
 		abortOnError false
@@ -55,53 +59,61 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 		jvmTarget = JavaVersion.VERSION_1_8.toString()
 		freeCompilerArgs += [
 				'-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-				'-Xopt-in=kotlinx.coroutines.FlowPreview',
+				'-Xopt-in=kotlin.contracts.ExperimentalContracts',
-				'-Xopt-in=org.koin.core.component.KoinApiExtension'
 		]
 	}
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
 
-	implementation 'androidx.core:core-ktx:1.5.0'
+	implementation 'androidx.core:core-ktx:1.7.0'
-	implementation 'androidx.activity:activity-ktx:1.2.3'
+	implementation 'androidx.activity:activity-ktx:1.4.0'
-	implementation 'androidx.fragment:fragment-ktx:1.3.5'
+	implementation 'androidx.fragment:fragment-ktx:1.4.0'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-service:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.4.0'
-	implementation 'androidx.lifecycle:lifecycle-process:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.4.0'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+	implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.2.1'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 	implementation 'androidx.preference:preference-ktx:1.1.1'
-	implementation 'androidx.work:work-runtime-ktx:2.6.0-beta01'
+	implementation 'androidx.work:work-runtime-ktx:2.7.1'
-	implementation 'com.google.android.material:material:1.3.0'
+	implementation 'com.google.android.material:material:1.4.0'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.1'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.0'
 
-	implementation 'androidx.room:room-runtime:2.3.0'
+	implementation 'androidx.room:room-runtime:2.4.0'
-	implementation 'androidx.room:room-ktx:2.3.0'
+	implementation 'androidx.room:room-ktx:2.4.0'
-	kapt 'androidx.room:room-compiler:2.3.0'
+	kapt 'androidx.room:room-compiler:2.4.0'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.9.1'
 	implementation 'com.squareup.okio:okio:2.10.0'
-	implementation 'org.jsoup:jsoup:1.13.1'
+	implementation 'org.jsoup:jsoup:1.14.3'
 
-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.0'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.1'
-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.0'
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.1'
 
-	implementation 'io.insert-koin:koin-android:3.1.2'
+	implementation 'io.insert-koin:koin-android:3.1.4'
-	implementation 'io.coil-kt:coil-base:1.2.2'
+	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.2'
+	implementation 'com.github.solkin:disk-lru-cache:1.3'
 
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20210307'
+	testImplementation 'com.google.truth:truth:1.1.3'
-	testImplementation 'io.insert-koin:koin-test-junit4:3.1.2'
+	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'
+
+	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'
 }

app/proguard-rules.pro

@@ -5,9 +5,7 @@
 	public static void checkReturnedValueIsNotNull(...);
 	public static void checkFieldIsNotNull(...);
 	public static void checkParameterIsNotNull(...);
+	public static void checkNotNullParameter(...);
 }
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
--keepclassmembers public class * extends org.koitharu.kotatsu.core.parser.MangaRepository {
-	public <init>(...);
-}
 -dontwarn okhttp3.internal.platform.ConscryptPlatform

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

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

app/src/main/AndroidManifest.xml

@@ -21,9 +21,11 @@
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
 		android:theme="@style/AppTheme"
-		android:usesCleartextTraffic="true"
+		android:networkSecurityConfig="@xml/network_security_config"
 		tools:ignore="UnusedAttribute">
-		<activity android:name="org.koitharu.kotatsu.main.ui.MainActivity">
+		<activity
+			android:name="org.koitharu.kotatsu.main.ui.MainActivity"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -32,12 +34,16 @@
 				android:name="android.app.default_searchable"
 				android:value=".ui.search.SearchActivity" />
 		</activity>
-		<activity android:name="org.koitharu.kotatsu.details.ui.DetailsActivity">
+		<activity
+			android:name="org.koitharu.kotatsu.details.ui.DetailsActivity"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="${applicationId}.action.VIEW_MANGA" />
 			</intent-filter>
 		</activity>
-		<activity android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity">
+		<activity
+			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="${applicationId}.action.READ_MANGA" />
 			</intent-filter>
@@ -50,13 +56,19 @@
 			android:label="@string/settings" />
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.SimpleSettingsActivity"
+			android:exported="true"
 			android:label="@string/settings">
 			<intent-filter>
 				<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
-		<activity android:name="org.koitharu.kotatsu.browser.BrowserActivity" />
+		<activity
+			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
+			android:windowSoftInputMode="adjustResize" />
+		<activity
+			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
+			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.core.ui.CrashActivity"
 			android:label="@string/error_occurred"
@@ -68,6 +80,7 @@
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
+			android:exported="true"
 			android:label="@string/manga_shelf">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -83,9 +96,13 @@
 		<activity
 			android:name=".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"/>
 
 		<service
-			android:name="org.koitharu.kotatsu.download.DownloadService"
+			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
 			android:foregroundServiceType="dataSync" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu
 import android.app.Application
 import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.strictmode.FragmentStrictMode
 import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
@@ -65,7 +66,7 @@ class KotatsuApp : Application() {
 				trackerModule,
 				settingsModule,
 				readerModule,
-				appWidgetModule
+				appWidgetModule,
 			)
 		}
 	}
@@ -86,5 +87,12 @@ class KotatsuApp : Application() {
 				.penaltyLog()
 				.build()
 		)
+		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
+			.penaltyDeath()
+			.detectFragmentReuse()
+			.detectWrongFragmentContainer()
+			.detectRetainInstanceUsage()
+			.detectSetUserVisibleHint()
+			.build()
 	}
 }

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

@@ -5,7 +5,7 @@ import android.net.Uri
 import android.os.Bundle
 import org.koitharu.kotatsu.core.model.Manga
 
-data class MangaIntent(
+class MangaIntent(
 	val manga: Manga?,
 	val mangaId: Long,
 	val uri: Uri?

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

@@ -1,15 +1,21 @@
 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,
-	private val cookieJar: CookieJar
+	val cookieJar: CookieJar,
 ) : KoinComponent {
 
 	suspend fun httpGet(url: String, headers: Headers? = null): Response {
@@ -24,7 +30,7 @@ open class MangaLoaderContext(
 
 	suspend fun httpPost(
 		url: String,
-		form: Map<String, String>
+		form: Map<String, String>,
 	): Response {
 		val body = FormBody.Builder()
 		form.forEach { (k, v) ->
@@ -38,7 +44,7 @@ open class MangaLoaderContext(
 
 	suspend fun httpPost(
 		url: String,
-		payload: String
+		payload: String,
 	): Response {
 		val body = FormBody.Builder()
 		payload.split('&').forEach {
@@ -55,20 +61,24 @@ open class MangaLoaderContext(
 		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)
-
-	fun insertCookies(domain: String, vararg cookies: String) {
-		val url = HttpUrl.Builder()
-			.scheme(SCHEME_HTTP)
-			.host(domain)
-			.build()
-		cookieJar.saveFromResponse(url, cookies.mapNotNull {
-			Cookie.parse(url, it)
-		})
-	}
-
-	private companion object {
-
-		private const val SCHEME_HTTP = "http"
-	}
 }

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

@@ -8,7 +8,6 @@ object MangaProviderFactory {
 	fun getSources(settings: AppSettings, includeHidden: Boolean): List<MangaSource> {
 		val list = MangaSource.values().toList() - MangaSource.LOCAL
 		val order = settings.sourcesOrder
-		val hidden = settings.hiddenSources
 		val sorted = list.sortedBy { x ->
 			val e = order.indexOf(x.ordinal)
 			if (e == -1) order.size + x.ordinal else e
@@ -16,6 +15,7 @@ object MangaProviderFactory {
 		return if (includeHidden) {
 			sorted
 		} else {
+			val hidden = settings.hiddenSources
 			sorted.filterNot { x ->
 				x.name in hidden
 			}

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.base.ui
 
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
@@ -60,11 +61,11 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		toolbar?.let(this::setSupportActionBar)
 		ViewCompat.setOnApplyWindowInsetsListener(binding.root, this)
 
-		val toolbarParams = (toolbar ?: binding.root.findViewById<View>(R.id.toolbar_card))
+		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
+				toolbarParams.scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS or SCROLL_FLAG_SNAP
 			} else {
 				toolbarParams.scrollFlags = SCROLL_FLAG_NO_SCROLL
 			}
@@ -101,6 +102,12 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		(findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
 	}
 
+	protected fun isDarkAmoledTheme(): Boolean {
+		val uiMode = resources.configuration.uiMode
+		val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+		return isNight && get<AppSettings>().isAmoledTheme
+	}
+
 	override fun onSupportActionModeStarted(mode: ActionMode) {
 		super.onSupportActionModeStarted(mode)
 		val insets = ViewCompat.getRootWindowInsets(binding.root)

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

@@ -38,6 +38,7 @@ 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)
 	}
 

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

@@ -7,7 +7,6 @@ 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 org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.databinding.ItemStorageBinding
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository

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

@@ -6,11 +6,10 @@ 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(
-	private val delegate: AlertDialog
+	private val delegate: AlertDialog,
 ) : DialogInterface by delegate {
 
 	fun show() = delegate.show()
@@ -33,7 +32,7 @@ class TextInputDialog private constructor(
 		}
 
 		fun setHint(@StringRes hintResId: Int): Builder {
-			binding.inputLayout.hint = binding.root.context.getString(hintResId)
+			binding.inputEdit.hint = binding.root.context.getString(hintResId)
 			return this
 		}
 
@@ -64,7 +63,7 @@ class TextInputDialog private constructor(
 			listener: (DialogInterface, String) -> Unit
 		): Builder {
 			delegate.setPositiveButton(textId) { dialog, _ ->
-				listener(dialog, binding.inputEdit.text.toString().orEmpty())
+				listener(dialog, binding.inputEdit.text?.toString().orEmpty())
 			}
 			return this
 		}

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

@@ -1,26 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import java.util.*
-
-@Deprecated("")
-class AdapterUpdater<T>(oldList: List<T>, newList: List<T>, getId: (T) -> Long) {
-
-	private val diff = DiffUtil.calculateDiff(object : DiffUtil.Callback() {
-
-		override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-			getId(oldList[oldItemPosition]) == getId(newList[newItemPosition])
-
-		override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-			Objects.equals(oldList[oldItemPosition], newList[newItemPosition])
-
-		override fun getOldListSize() = oldList.size
-
-		override fun getNewListSize() = newList.size
-	})
-
-	operator fun invoke(adapter: RecyclerView.Adapter<*>) {
-		diff.dispatchUpdatesTo(adapter)
-	}
-}

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

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

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

@@ -0,0 +1,65 @@
+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
+
+abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
+
+	private val bounds = Rect()
+	private val divider = context.getThemeDrawable(android.R.attr.listDivider)
+
+	override fun getItemOffsets(
+		outRect: Rect,
+		view: View,
+		parent: RecyclerView,
+		state: RecyclerView.State,
+	) {
+		outRect.set(0, divider?.intrinsicHeight ?: 0, 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) {
+			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 previous: RecyclerView.ViewHolder? = null
+		for (child in parent.children) {
+			val holder = parent.getChildViewHolder(child)
+			if (previous != null && shouldDrawDivider(previous, holder)) {
+				parent.getDecoratedBoundsWithMargins(child, bounds)
+				val top: Int = bounds.top + child.translationY.roundToInt()
+				val bottom: Int = top + divider.intrinsicHeight
+				divider.setBounds(left, top, right, bottom)
+				divider.draw(canvas)
+			}
+			previous = holder
+		}
+		canvas.restore()
+	}
+
+	protected abstract fun shouldDrawDivider(
+		above: RecyclerView.ViewHolder,
+		below: RecyclerView.ViewHolder,
+	): Boolean
+}

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

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

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

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

@@ -22,12 +22,21 @@ class ChipsView @JvmOverloads constructor(
 	private var chipOnClickListener = OnClickListener {
 		onChipClickListener?.onChipClick(it as Chip, it.tag)
 	}
+	private var chipOnCloseListener = OnClickListener {
+		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
+	}
 	var onChipClickListener: OnChipClickListener? = null
 		set(value) {
 			field = value
 			val isChipClickable = value != null
 			children.forEach { it.isClickable = isChipClickable }
 		}
+	var onChipCloseClickListener: OnChipCloseClickListener? = null
+		set(value) {
+			field = value
+			val isCloseIconVisible = value != null
+			children.forEach { (it as? Chip)?.isCloseIconVisible = isCloseIconVisible }
+		}
 
 	override fun requestLayout() {
 		if (isLayoutSuppressedCompat) {
@@ -37,15 +46,15 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}
 
-	fun setChips(items: List<ChipModel>) {
+	fun setChips(items: Collection<ChipModel>) {
 		suppressLayoutCompat(true)
 		try {
 			for ((i, model) in items.withIndex()) {
 				val chip = getChildAt(i) as Chip? ?: addChip()
 				bindChip(chip, model)
 			}
-			for (i in items.size until childCount) {
+			if (childCount > items.size) {
-				removeViewAt(i)
+				removeViews(items.size, childCount - items.size)
 			}
 		} finally {
 			suppressLayoutCompat(false)
@@ -60,6 +69,7 @@ class ChipsView @JvmOverloads constructor(
 			chip.isCheckedIconVisible = true
 			chip.setChipIconResource(model.icon)
 		}
+		chip.isClickable = onChipClickListener != null
 		chip.tag = model.data
 	}
 
@@ -67,11 +77,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.blue_primary))
+		chip.setTextColor(ContextCompat.getColor(context, R.color.color_primary))
-		chip.isCloseIconVisible = false
+		chip.isCloseIconVisible = onChipCloseClickListener != null
+		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
-		chip.isClickable = onChipClickListener != null
 		addView(chip)
 		return chip
 	}
@@ -86,14 +96,40 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}
 
-	data class ChipModel(
+	class ChipModel(
 		@DrawableRes val icon: Int,
 		val title: CharSequence,
 		val data: Any? = null
-	)
+	) {
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as ChipModel
+
+			if (icon != other.icon) return false
+			if (title != other.title) return false
+			if (data != other.data) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			var result = icon
+			result = 31 * result + title.hashCode()
+			result = 31 * result + data.hashCode()
+			return result
+		}
+	}
 
 	fun interface OnChipClickListener {
 
 		fun onChipClick(chip: Chip, data: Any?)
 	}
+
+	fun interface OnChipCloseClickListener {
+
+		fun onChipCloseClick(chip: Chip, data: Any?)
+	}
 }

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

@@ -6,40 +6,33 @@ import android.widget.LinearLayout
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.content.withStyledAttributes
 import org.koitharu.kotatsu.R
+import kotlin.math.roundToInt
 
 
 class CoverImageView @JvmOverloads constructor(
-	context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+	context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0,
 ) : AppCompatImageView(context, attrs, defStyleAttr) {
 
 	private var orientation: Int = HORIZONTAL
 
 	init {
 		context.withStyledAttributes(attrs, R.styleable.CoverImageView, defStyleAttr) {
-			orientation = getInt(R.styleable.CoverImageView_android_orientation, HORIZONTAL)
+			orientation = getInt(R.styleable.CoverImageView_android_orientation, orientation)
 		}
 	}
 
 	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+		val desiredWidth: Int
+		val desiredHeight: Int
 		if (orientation == VERTICAL) {
-			val originalHeight = MeasureSpec.getSize(heightMeasureSpec)
+			desiredHeight = measuredHeight
-			super.onMeasure(
+			desiredWidth = (desiredHeight * ASPECT_RATIO_WIDTH / ASPECT_RATIO_HEIGHT).roundToInt()
-				MeasureSpec.makeMeasureSpec(
-					(originalHeight * ASPECT_RATIO_WIDTH / ASPECT_RATIO_HEIGHT).toInt(),
-					MeasureSpec.EXACTLY
-				),
-				MeasureSpec.makeMeasureSpec(originalHeight, MeasureSpec.EXACTLY)
-			)
 		} else {
-			val originalWidth = MeasureSpec.getSize(widthMeasureSpec)
+			desiredWidth = measuredWidth
-			super.onMeasure(
+			desiredHeight = (desiredWidth * ASPECT_RATIO_HEIGHT / ASPECT_RATIO_WIDTH).roundToInt()
-				MeasureSpec.makeMeasureSpec(originalWidth, MeasureSpec.EXACTLY),
-				MeasureSpec.makeMeasureSpec(
-					(originalWidth * ASPECT_RATIO_HEIGHT / ASPECT_RATIO_WIDTH).toInt(),
-					MeasureSpec.EXACTLY
-				)
-			)
 		}
+		setMeasuredDimension(desiredWidth, desiredHeight)
 	}
 
 	companion object {

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.core.view.postDelayed
+import org.koitharu.kotatsu.R
+
+/**
+ * A custom snackbar implementation allowing more control over placement and entry/exit animations.
+ *
+ * Xtimms: Well, my sufferings over the Snackbar in [DetailsActivity] will go away forever... Thanks, Google.
+ *
+ * https://github.com/google/iosched/blob/main/mobile/src/main/java/com/google/samples/apps/iosched/widget/FadingSnackbar.kt
+ */
+class FadingSnackbar @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+	private val message: TextView
+	private val action: Button
+
+	init {
+		val view = LayoutInflater.from(context).inflate(R.layout.fading_snackbar_layout, this, true)
+		message = view.findViewById(R.id.snackbar_text)
+		action = view.findViewById(R.id.snackbar_action)
+	}
+
+	fun dismiss() {
+		if (visibility == VISIBLE && alpha == 1f) {
+			animate()
+				.alpha(0f)
+				.withEndAction { visibility = GONE }
+				.duration = EXIT_DURATION
+		}
+	}
+
+	fun show(
+		messageText: CharSequence? = null,
+		@StringRes actionId: Int? = null,
+		longDuration: Boolean = true,
+		actionClick: () -> Unit = { dismiss() },
+		dismissListener: () -> Unit = { }
+	) {
+		message.text = messageText
+		if (actionId != null) {
+			action.run {
+				visibility = VISIBLE
+				text = context.getString(actionId)
+				setOnClickListener {
+					actionClick()
+				}
+			}
+		} else {
+			action.visibility = GONE
+		}
+		alpha = 0f
+		visibility = VISIBLE
+		animate()
+			.alpha(1f)
+			.duration = ENTER_DURATION
+		val showDuration = ENTER_DURATION + if (longDuration) LONG_DURATION else SHORT_DURATION
+		postDelayed(showDuration) {
+			dismiss()
+			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/browser/BrowserActivity.kt

@@ -92,8 +92,16 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.appbar.updatePadding(top = insets.top)
+		binding.appbar.updatePadding(
-		binding.webView.updatePadding(bottom = insets.bottom)
+			top = insets.top,
+			left = insets.left,
+			right = insets.right,
+		)
+		binding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom,
+		)
 	}
 
 	companion object {

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

@@ -1,10 +1,8 @@
 package org.koitharu.kotatsu.browser
 
 import android.graphics.Bitmap
-import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.network.WebViewClientCompat
@@ -27,19 +25,4 @@ class BrowserClient(private val callback: BrowserCallback) : WebViewClientCompat
 		super.onPageCommitVisible(view, url)
 		callback.onTitleChanged(view.title.orEmpty(), url)
 	}
-
-	override fun shouldInterceptRequestCompat(view: WebView, url: String): WebResourceResponse? {
-		return runCatching {
-			val request = Request.Builder()
-				.url(url)
-				.build()
-			val response = okHttp.newCall(request).execute()
-			val ct = response.body?.contentType()
-			WebResourceResponse(
-				"${ct?.type}/${ct?.subtype}",
-				ct?.charset()?.name() ?: "utf-8",
-				response.body?.byteStream()
-			)
-		}.getOrNull()
-	}
 }

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

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.backup
 
 import org.json.JSONArray
 
-data class BackupEntry(
+class BackupEntry(
 	val name: String,
 	val data: JSONArray
 ) {

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

@@ -118,6 +118,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		jo.put("created_at", createdAt)
 		jo.put("sort_key", sortKey)
 		jo.put("title", title)
+		jo.put("order", order)
 		return jo
 	}
 

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

@@ -5,6 +5,7 @@ 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
@@ -101,7 +102,8 @@ class RestoreRepository(private val db: MangaDatabase) {
 		categoryId = json.getInt("category_id"),
 		createdAt = json.getLong("created_at"),
 		sortKey = json.getInt("sort_key"),
-		title = json.getString("title")
+		title = json.getString("title"),
+		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
 	)
 
 	private fun parseFavourite(json: JSONObject) = FavouriteEntity(

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

@@ -20,6 +20,7 @@ val databaseModule
 				Migration5To6(),
 				Migration6To7(),
 				Migration7To8(),
+				Migration8To9(),
 			).addCallback(
 				DatabasePrePopulateCallback(androidContext().resources)
 			).build()

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

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

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

@@ -16,7 +16,7 @@ import org.koitharu.kotatsu.history.data.HistoryEntity
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class
-	], version = 8
+	], version = 9
 )
 abstract class MangaDatabase : RoomDatabase() {
 

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

@@ -9,7 +9,7 @@ import org.koitharu.kotatsu.core.model.MangaState
 import org.koitharu.kotatsu.core.model.MangaTag
 
 @Entity(tableName = "manga")
-data class MangaEntity(
+class MangaEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,

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

@@ -14,7 +14,7 @@ import androidx.room.PrimaryKey
 			onDelete = ForeignKey.CASCADE
 		)]
 )
-data class MangaPrefsEntity(
+class MangaPrefsEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val mangaId: Long,
 	@ColumnInfo(name = "mode") val mode: Int

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

@@ -20,7 +20,7 @@ import androidx.room.ForeignKey
 		)
 	]
 )
-data class MangaTagsEntity(
+class MangaTagsEntity(
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
 	@ColumnInfo(name = "tag_id", index = true) val tagId: Long
 )

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

@@ -5,7 +5,7 @@ import androidx.room.Junction
 import androidx.room.Relation
 import org.koitharu.kotatsu.utils.ext.mapToSet
 
-data class MangaWithTags(
+class MangaWithTags(
 	@Embedded val manga: MangaEntity,
 	@Relation(
 		parentColumn = "manga_id",

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

@@ -16,7 +16,7 @@ import androidx.room.PrimaryKey
 		)
 	]
 )
-data class SuggestionEntity(
+class SuggestionEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
 	@ColumnInfo(name = "relevance") val relevance: Float,

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

@@ -8,7 +8,7 @@ import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.longHashCode
 
 @Entity(tableName = "tags")
-data class TagEntity(
+class TagEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "tag_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,

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

@@ -15,7 +15,7 @@ import androidx.room.PrimaryKey
 		)
 	]
 )
-data class TrackEntity(
+class TrackEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val mangaId: Long,
 	@ColumnInfo(name = "chapters_total") val totalChapters: Int,

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

@@ -15,7 +15,7 @@ import androidx.room.PrimaryKey
 		)
 	]
 )
-data class TrackLogEntity(
+class TrackLogEntity(
 	@PrimaryKey(autoGenerate = true)
 	@ColumnInfo(name = "id") val id: Long = 0L,
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,

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

@@ -7,7 +7,7 @@ import org.koitharu.kotatsu.core.model.TrackingLogItem
 import org.koitharu.kotatsu.utils.ext.mapToSet
 import java.util.*
 
-data class TrackLogWithManga(
+class TrackLogWithManga(
 	@Embedded val trackLog: TrackLogEntity,
 	@Relation(
 		parentColumn = "manga_id",

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import org.koitharu.kotatsu.core.model.SortOrder
+
+class Migration8To9 : Migration(8, 9) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `order` TEXT NOT NULL DEFAULT ${SortOrder.NEWEST.name}")
+	}
+}

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

@@ -0,0 +1,14 @@
+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/github/VersionId.kt

@@ -2,12 +2,12 @@ package org.koitharu.kotatsu.core.github
 
 import java.util.*
 
-data class VersionId(
+class VersionId(
 	val major: Int,
 	val minor: Int,
 	val build: Int,
 	val variantType: String,
-	val variantNumber: Int
+	val variantNumber: Int,
 ) : Comparable<VersionId> {
 
 	override fun compareTo(other: VersionId): Int {
@@ -30,10 +30,34 @@ data class VersionId(
 		return variantNumber.compareTo(other.variantNumber)
 	}
 
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as VersionId
+
+		if (major != other.major) return false
+		if (minor != other.minor) return false
+		if (build != other.build) return false
+		if (variantType != other.variantType) return false
+		if (variantNumber != other.variantNumber) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		var result = major
+		result = 31 * result + minor
+		result = 31 * result + build
+		result = 31 * result + variantType.hashCode()
+		result = 31 * result + variantNumber
+		return result
+	}
+
 	companion object {
 
 		private fun variantWeight(variantType: String) =
-			when (variantType.toLowerCase(Locale.ROOT)) {
+			when (variantType.lowercase(Locale.ROOT)) {
 				"a", "alpha" -> 1
 				"b", "beta" -> 2
 				"rc" -> 4

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

@@ -9,5 +9,6 @@ data class FavouriteCategory(
 	val id: Long,
 	val title: String,
 	val sortKey: Int,
-	val createdAt: Date
+	val order: SortOrder,
+	val createdAt: Date,
 ) : Parcelable

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

@@ -9,6 +9,13 @@ data class MangaChapter(
 	val name: String,
 	val number: Int,
 	val url: String,
-	val branch: String? = null,
+	val scanlator: String?,
-	val source: MangaSource
+	val uploadDate: Long,
-) : Parcelable
+	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

@@ -5,6 +5,6 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MangaFilter(
-	val sortOrder: SortOrder,
+	val sortOrder: SortOrder?,
-	val tag: MangaTag?
+	val tags: Set<MangaTag>,
 ) : Parcelable

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

@@ -10,5 +10,5 @@ data class MangaHistory(
 	val updatedAt: Date,
 	val chapterId: Long,
 	val page: Int,
-	val scroll: Int
+	val scroll: Int,
 ) : Parcelable

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

@@ -8,6 +8,6 @@ data class MangaPage(
 	val id: Long,
 	val url: String,
 	val referer: String,
-	val preview: String? = null,
+	val preview: String?,
-	val source: MangaSource
+	val source: MangaSource,
 ) : Parcelable

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

@@ -14,7 +14,7 @@ import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 enum class MangaSource(
 	val title: String,
 	val locale: String?,
-	val cls: Class<out MangaRepository>
+	val cls: Class<out MangaRepository>,
 ) : Parcelable {
 	LOCAL("Local", null, LocalMangaRepository::class.java),
 	READMANGA_RU("ReadManga", "ru", ReadmangaRepository::class.java),
@@ -39,10 +39,14 @@ enum class MangaSource(
 	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("")
+	@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/MangaTag.kt

@@ -7,5 +7,5 @@ import kotlinx.parcelize.Parcelize
 data class MangaTag(
 	val title: String,
 	val key: String,
-	val source: MangaSource
+	val source: MangaSource,
 ) : Parcelable

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

@@ -6,4 +6,5 @@ object CommonHeaders {
 	const val USER_AGENT = "User-Agent"
 	const val ACCEPT = "Accept"
 	const val CONTENT_DISPOSITION = "Content-Disposition"
+	const val COOKIE = "Cookie"
 }

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

@@ -8,6 +8,7 @@ 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
 
 val networkModule
@@ -28,4 +29,5 @@ val networkModule
 				}
 			}.build()
 		}
+		factory { DownloadManagerHelper(get(), get()) }
 	}

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

@@ -1,16 +1,19 @@
 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.*
 
 interface MangaRepository {
 
 	val sortOrders: Set<SortOrder>
 
-	suspend fun getList(
+	suspend fun getList2(
 		offset: Int,
 		query: String? = null,
+		tags: Set<MangaTag>? = null,
 		sortOrder: SortOrder? = null,
-		tag: MangaTag? = null
 	): List<Manga>
 
 	suspend fun getDetails(manga: Manga): Manga
@@ -20,4 +23,11 @@ interface MangaRepository {
 	suspend fun getPageUrl(page: MangaPage): String
 
 	suspend fun getTags(): Set<MangaTag>
+
+	companion object : KoinComponent {
+
+		operator fun invoke(source: MangaSource): MangaRepository {
+			return get(named(source))
+		}
+	}
 }

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

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

@@ -32,4 +32,7 @@ val parserModule
 		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,6 +1,7 @@
 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
@@ -19,6 +20,9 @@ abstract class RemoteMangaRepository(
 		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()
@@ -75,4 +79,8 @@ abstract class RemoteMangaRepository(
 		h = 31 * h + id
 		return h
 	}
+
+	protected fun parseFailed(message: String? = null): Nothing {
+		throw ParseException(message)
+	}
 }

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

@@ -1,10 +1,14 @@
 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.ParseException
 import org.koitharu.kotatsu.core.model.*
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
+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) {
@@ -17,151 +21,239 @@ class AnibelRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
 		SortOrder.NEWEST
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
+		tags: Set<MangaTag>?,
 		sortOrder: SortOrder?,
-		tag: MangaTag?
 	): List<Manga> {
 		if (!query.isNullOrEmpty()) {
-			return if (offset == 0) search(query) else emptyList()
+			return if (offset == 0) {
+				search(query)
+			} else {
+				emptyList()
+			}
 		}
-		val page = (offset / 12f).toIntUp().inc()
+		val filters = tags?.takeUnless { it.isEmpty() }?.joinToString(
-		val link = when {
+			separator = ",",
-			tag != null -> "/manga?genre[]=${tag.key}&page=$page".withDomain()
+			prefix = "genres: [",
-			else -> "/manga?page=$page".withDomain()
+			postfix = "]"
-		}
+		) { "\"it.key\"" }.orEmpty()
-		val doc = loaderContext.httpGet(link).parseHtml()
+		val array = apiCall(
-		val root = doc.body().select("div.manga-block") ?: throw ParseException("Cannot find root")
+			"""
-		val items = root.select("div.anime-card")
+			getMediaList(offset: $offset, limit: 20, mediaType: manga, filters: {$filters}) {
-		return items.mapNotNull { card ->
+				docs {
-			val href = card.selectFirst("a").attr("href")
+					mediaId
-			val status = card.select("tr")[2].text()
+					title {
-			val fullTitle = card.selectFirst("h1.anime-card-title").text()
+						be
-				.substringBeforeLast('[')
+						alt
-			val titleParts = fullTitle.splitTwoParts('/')
+					}
+					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(href),
+				id = generateUid(mediaId),
-				title = titleParts?.first?.trim() ?: fullTitle,
+				title = title.getString("be"),
-				coverUrl = card.selectFirst("img").attr("data-src").withDomain(),
+				coverUrl = jo.getString("poster").removePrefix("/cdn")
-				altTitle = titleParts?.second?.trim(),
+					.withDomain("cdn") + "?width=200&height=280",
+				altTitle = title.getString("alt").takeUnless(String::isEmpty),
 				author = null,
-				rating = Manga.NO_RATING,
+				rating = jo.getDouble("rating").toFloat() / 10f,
 				url = href,
-				publicUrl = href.withDomain(),
+				publicUrl = "https://${getDomain()}/${href}",
-				tags = card.select("p.tupe.tag")?.select("a")?.mapNotNullToSet tags@{ x ->
+				tags = jo.getJSONArray("genres").mapToTags(),
-					MangaTag(
+				state = when (jo.getString("status")) {
-						title = x.text(),
+					"ongoing" -> MangaState.ONGOING
-						key = x.attr("href")?.substringAfterLast("=") ?: return@tags null,
+					"finished" -> MangaState.FINISHED
-						source = source
-					)
-				}.orEmpty(),
-				state = when (status) {
-					"выпускаецца" -> MangaState.ONGOING
-					"завершанае" -> MangaState.FINISHED
 					else -> null
 				},
-				source = source
+				source = source,
 			)
 		}
 	}
 
 	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.publicUrl).parseHtml()
+		val (type, slug) = manga.url.split('/')
-		val root = doc.body().select("div.container") ?: throw ParseException("Cannot find root")
+		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(
-			description = root.select("div.manga-block.grid-12")[2].select("p").text(),
+			title = title.getString("be"),
-			chapters = root.select("ul.series").flatMap { table ->
+			altTitle = title.getString("alt"),
-				table.select("li")
+			coverUrl = "$poster?width=200&height=280",
-			}.map { it.selectFirst("a") }.mapIndexedNotNull { i, a ->
+			largeCoverUrl = poster,
-				val href = a.select("a").first().attr("href").toRelativeUrl(getDomain())
+			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(href),
+					id = generateUid(jo.getString("id")),
-					name = a.select("a").first().text(),
+					name = "Глава $number",
-					number = i + 1,
+					number = number,
-					url = href,
+					url = "${manga.url}/read/$number",
-					source = source
+					scanlator = null,
+					uploadDate = jo.getLong("released"),
+					branch = null,
+					source = source,
 				)
 			}
 		)
 	}
 
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
+		val (_, slug, _, number) = chapter.url.split('/')
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
+		val chapterJson = apiCall(
-		val scripts = doc.select("script")
+			"""
-		for (script in scripts) {
+			chapter(slug: "$slug", chapter: $number) {
-			val data = script.html()
+				id
-			val pos = data.indexOf("dataSource")
+				images {
-			if (pos == -1) {
+					large
-				continue
+					thumbnail
-			}
+				}
-			val json = data.substring(pos).substringAfter('[').substringBefore(']')
-			val domain = getDomain()
-			return json.split(",").mapNotNull {
-				it.trim()
-					.removeSurrounding('"', '\'')
-					.toRelativeUrl(domain)
-					.takeUnless(String::isBlank)
-			}.map { url ->
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					referer = fullUrl,
-					source = source
-				)
 			}
+			""".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,
+			)
 		}
-		throw ParseException("Pages list not found at ${chapter.url.withDomain()}")
 	}
 
 	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/manga").parseHtml()
+		val json = apiCall(
-		val root = doc.body().select("div#tabs-genres").select("ul#list.ul-three-colums")
+			"""
-		return root.select("p.menu-tags.tupe").mapToSet { a ->
+			getFilters(mediaType: manga) {
-			MangaTag(
+				genres
-				title = a.select("a").text().capitalize(Locale.ROOT),
+			}
-				key = a.select("a").attr("data-name"),
+			""".trimIndent()
-				source = source
+		)
-			)
+		val array = json.getJSONObject("getFilters").getJSONArray("genres")
-		}
+		return array.mapToTags()
 	}
 
 	private suspend fun search(query: String): List<Manga> {
-		val domain = getDomain()
+		val json = apiCall(
-		val doc = loaderContext.httpGet("https://$domain/search?q=$query").parseHtml()
+			"""
-		val root = doc.body().select("div.manga-block").select("article.tab-2") ?: throw ParseException("Cannot find root")
+			search(query: "$query", limit: 40) {
-		val items = root.select("div.anime-card")
+				id
-		return items.mapNotNull { card ->
+				title {
-			val href = card.select("a").attr("href")
+					be
-			val status = card.select("tr")[2].text()
+					en
-			val fullTitle = card.selectFirst("h1.anime-card-title").text()
+				}
-				.substringBeforeLast('[')
+				poster
-			val titleParts = fullTitle.splitTwoParts('/')
+				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(href),
+				id = generateUid(mediaId),
-				title = titleParts?.first?.trim() ?: fullTitle,
+				title = title.getString("be"),
-				coverUrl = card.selectFirst("img").attr("src").withDomain(),
+				coverUrl = jo.getString("poster").removePrefix("/cdn")
-				altTitle = titleParts?.second?.trim(),
+					.withDomain("cdn") + "?width=200&height=280",
+				altTitle = title.getString("en").takeUnless(String::isEmpty),
 				author = null,
 				rating = Manga.NO_RATING,
 				url = href,
-				publicUrl = href.withDomain(),
+				publicUrl = "https://${getDomain()}/${href}",
-				tags = card.select("p.tupe.tag")?.select("a")?.mapNotNullToSet tags@{ x ->
+				tags = emptySet(),
-					MangaTag(
+				state = null,
-						title = x.text(),
+				source = source,
-						key = x.attr("href")?.substringAfterLast("=") ?: return@tags null,
-						source = source
-					)
-				}.orEmpty(),
-				state = when (status) {
-					"выпускаецца" -> MangaState.ONGOING
-					"завершанае" -> MangaState.FINISHED
-					else -> 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

@@ -5,6 +5,7 @@ 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(
@@ -17,11 +18,11 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 		SortOrder.ALPHABETICAL
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?
+		sortOrder: SortOrder?
 	): List<Manga> {
 		val domain = getDomain()
 		val url = when {
@@ -31,11 +32,15 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 				}
 				"https://$domain/?do=search&subaction=search&story=${query.urlEncoded()}"
 			}
-			tag != null -> "https://$domain/tags/${tag.key}&n=${getSortKey2(sortOrder)}?offset=$offset"
+			!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")
+		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")
@@ -72,19 +77,21 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 		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").flatMap { table ->
+			chapters = root.select("table.table_cha tr:gt(1)").reversed().mapIndexedNotNull { i, tr ->
-				table.select("div.manga2")
+				val href = tr?.selectFirst("a")?.relUrl("href") ?: return@mapIndexedNotNull null
-			}.map { it.selectFirst("a") }.reversed().mapIndexedNotNull { i, a ->
-				val href = a.relUrl("href")
 				MangaChapter(
 					id = generateUid(href),
-					name = a.text().trim(),
+					name = tr.selectFirst("a")?.text().orEmpty(),
 					number = i + 1,
 					url = href,
-					source = source
+					scanlator = null,
+					branch = null,
+					uploadDate = dateFormat.tryParse(tr.selectFirst("div.date")?.text()),
+					source = source,
 				)
 			}
 		)
@@ -112,8 +119,9 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 				MangaPage(
 					id = generateUid(url),
 					url = url,
+					preview = null,
 					referer = fullUrl,
-					source = source
+					source = source,
 				)
 			}
 		}
@@ -123,12 +131,12 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 	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")
+		val root = doc.body().selectFirst("div.main_fon")?.getElementById("side")
-			.select("ul").last()
+			?.select("ul")?.last() ?: throw ParseException("Cannot find root")
 		return root.select("li.sidetag").mapToSet { li ->
-			val a = li.children().last()
+			val a = li.children().last() ?: throw ParseException("a is null")
 			MangaTag(
-				title = a.text().capitalize(),
+				title = a.text().toCamelCase(),
 				key = a.attr("href").substringAfterLast('/'),
 				source = source
 			)
@@ -150,4 +158,5 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 			SortOrder.NEWEST -> "datedesc"
 			else -> "favdesc"
 		}
+
 }

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

@@ -6,7 +6,6 @@ import org.koitharu.kotatsu.core.model.*
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.utils.ext.*
 import java.util.*
-import kotlin.collections.ArrayList
 
 class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
 
@@ -21,11 +20,11 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
 		SortOrder.ALPHABETICAL
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?
+		sortOrder: SortOrder?
 	): List<Manga> {
 		if (query != null && offset != 0) {
 			return emptyList()
@@ -38,9 +37,9 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
 			append(getSortKey(sortOrder))
 			append("&page=")
 			append((offset / 20) + 1)
-			if (tag != null) {
+			if (!tags.isNullOrEmpty()) {
 				append("&genres=")
-				append(tag.key)
+				appendAll(tags, ",") { it.key }
 			}
 			if (query != null) {
 				append("&search=")
@@ -94,12 +93,17 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
 			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",
-					name = it.getStringOrNull("title") ?: "${manga.title} #${it.getDouble("ch")}",
+					uploadDate = it.getLong("date") * 1000,
-					number = totalChapters - i
+					name = if (title.isEmpty()) volChap else "$volChap: $title",
+					number = totalChapters - i,
+					scanlator = null,
+					branch = null,
 				)
 			}.reversed()
 		)
@@ -114,20 +118,22 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
 			MangaPage(
 				id = generateUid(jo.getLong("id")),
 				referer = fullUrl,
+				preview = null,
 				source = chapter.source,
-				url = jo.getString("img")
+				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")
+		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"),
+				key = it.selectFirst("input")?.attr("data-genre") ?: parseFailed(),
-				title = it.selectFirst("label").text()
+				title = it.selectFirst("label")?.text() ?: parseFailed()
 			)
 		}
 	}

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

@@ -0,0 +1,260 @@
+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,11 +1,14 @@
 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) :
@@ -18,11 +21,11 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 		SortOrder.RATING
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?
+		sortOrder: SortOrder?
 	): List<Manga> {
 		val domain = getDomain()
 		val doc = when {
@@ -33,22 +36,24 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 					"offset" to (offset upBy PAGE_SIZE_SEARCH).toString()
 				)
 			)
-			tag == null -> loaderContext.httpGet(
+			tags.isNullOrEmpty() -> loaderContext.httpGet(
 				"https://$domain/list?sortType=${
 					getSortKey(
 						sortOrder
 					)
-				}&offset=${offset upBy PAGE_SIZE}"
+				}&offset=${offset upBy PAGE_SIZE}", HEADER
 			)
-			else -> loaderContext.httpGet(
+			tags.size == 1 -> loaderContext.httpGet(
-				"https://$domain/list/genre/${tag.key}?sortType=${
+				"https://$domain/list/genre/${tags.first().key}?sortType=${
 					getSortKey(
 						sortOrder
 					)
-				}&offset=${offset upBy PAGE_SIZE}"
+				}&offset=${offset upBy PAGE_SIZE}", HEADER
 			)
-		}.parseHtml()
+			offset > 0 -> return emptyList()
-		val root = doc.body().getElementById("mangaBox")
+			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 ->
@@ -57,7 +62,7 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 			if (descDiv.selectFirst("i.fa-user") != null) {
 				return@mapNotNull null //skip author
 			}
-			val href = imgDiv.selectFirst("a").attr("href")?.inContextOf(node)
+			val href = imgDiv.selectFirst("a")?.attr("href")?.inContextOf(node)
 			if (href == null || href.toHttpUrl().host != baseHost) {
 				return@mapNotNull null // skip external links
 			}
@@ -101,14 +106,15 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 	}
 
 	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
+		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 = root.selectFirst("div.subject-cower")?.selectFirst("img")?.attr(
+			largeCoverUrl = coverImg?.attr("data-full"),
-				"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
@@ -119,21 +125,32 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 					)
 				},
 			chapters = root.selectFirst("div.chapters-link")?.selectFirst("table")
-				?.select("a")?.asReversed()?.mapIndexed { i, a ->
+				?.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 = a.ownText().removePrefix(manga.title).trim(),
+						name = tr.selectFirst("a")?.text().orEmpty().removePrefix(manga.title).trim(),
 						number = i + 1,
 						url = href,
-						source = source
+						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").parseHtml()
+		val doc = loaderContext.httpGet(chapter.url.withDomain() + "?mtr=1", HEADER).parseHtml()
 		val scripts = doc.select("script")
 		for (script in scripts) {
 			val data = script.html()
@@ -151,8 +168,9 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 				MangaPage(
 					id = generateUid(url),
 					url = url,
+					preview = null,
 					referer = chapter.url,
-					source = source
+					source = source,
 				)
 			}
 		}
@@ -160,12 +178,12 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 	}
 
 	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/list/genres/sort_name").parseHtml()
+		val doc = loaderContext.httpGet("https://${getDomain()}/list/genres/sort_name", HEADER).parseHtml()
-		val root = doc.body().getElementById("mangaBox").selectFirst("div.leftContent")
+		val root = doc.body().getElementById("mangaBox")?.selectFirst("div.leftContent")
-			.selectFirst("table.table")
+			?.selectFirst("table.table") ?: parseFailed("Cannot find root")
 		return root.select("a.element-link").mapToSet { a ->
 			MangaTag(
-				title = a.text().capitalize(),
+				title = a.text().toCamelCase(),
 				key = a.attr("href").substringAfterLast('/'),
 				source = source
 			)
@@ -182,9 +200,50 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 			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

@@ -8,22 +8,20 @@ import org.koitharu.kotatsu.utils.ext.parseHtml
 
 class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
 
-	override val defaultDomain = "hentaichan.pro"
+	override val defaultDomain = "hentaichan.live"
 	override val source = MangaSource.HENCHAN
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?
+		sortOrder: SortOrder?
 	): List<Manga> {
-		return super.getList(offset, query, sortOrder, tag).map {
+		return super.getList2(offset, query, tags, sortOrder).map {
-			val cover = it.coverUrl
+			it.copy(
-			if (cover.contains("_blur")) {
+				coverUrl = it.coverUrl.replace("_blur", ""),
-				it.copy(coverUrl = cover.replace("_blur", ""))
+				isNsfw = true,
-			} else {
+			)
-				it
-			}
 		}
 	}
 
@@ -36,7 +34,7 @@ class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(load
 			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()
+				val a = it.children().last() ?: parseFailed("Invalid tag")
 				MangaTag(
 					title = a.text(),
 					key = a.attr("href").substringAfterLast('/'),
@@ -49,7 +47,10 @@ class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(load
 					url = readLink,
 					source = source,
 					number = 1,
-					name = manga.title
+					uploadDate = 0L,
+					name = manga.title,
+					scanlator = null,
+					branch = null,
 				)
 			)
 		)

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

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

@@ -9,8 +9,8 @@ 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.*
-import kotlin.collections.ArrayList
 
 open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 	RemoteMangaRepository(loaderContext) {
@@ -27,11 +27,11 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 		SortOrder.NEWEST
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?
+		sortOrder: SortOrder?
 	): List<Manga> {
 		if (!query.isNullOrEmpty()) {
 			return if (offset == 0) search(query) else emptyList()
@@ -44,20 +44,21 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 			append(getSortKey(sortOrder))
 			append("&page=")
 			append(page)
-			if (tag != null) {
+			tags?.forEach { tag ->
-				append("&includeGenres[]=")
+				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")
+		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(),
+				title = card.selectFirst("h3")?.text().orEmpty(),
 				coverUrl = a.absUrl("data-src"),
 				altTitle = null,
 				author = null,
@@ -79,6 +80,7 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 		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()
@@ -91,29 +93,33 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 					for (i in 0 until total) {
 						val item = list.getJSONObject(i)
 						val chapterId = item.getLong("chapter_id")
-						val branchName = item.getStringOrNull("username")
+						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"))
 						}
-						var name = item.getString("chapter_name")
+						val nameChapter = item.getStringOrNull("chapter_name")
-						if (name.isNullOrBlank() || name == "null") {
+						val volume = item.getInt("chapter_volume")
-							name = "Том " + item.getInt("chapter_volume") +
+						val number = item.getString("chapter_number")
-									" Глава " + item.getString("chapter_number")
+						val fullNameChapter = "Том $volume. Глава $number"
-						}
 						chapters.add(
 							MangaChapter(
 								id = generateUid(chapterId),
 								url = url,
 								source = source,
-								branch = branchName,
 								number = total - i,
-								name = name
+								uploadDate = dateFormat.tryParse(
+									item.getString("chapter_created_at").substringBefore(" ")
+								),
+								scanlator = scanlator,
+								branch = null,
+								name = if (nameChapter.isNullOrBlank()) fullNameChapter else "$fullNameChapter - $nameChapter",
 							)
 						)
 					}
@@ -128,17 +134,17 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 			rating = root.selectFirst("div.media-stats-item__score")
 				?.selectFirst("span")
 				?.text()?.toFloatOrNull()?.div(5f) ?: manga.rating,
-			author = info.getElementsMatchingOwnText("Автор").firstOrNull()
+			author = info?.getElementsMatchingOwnText("Автор")?.firstOrNull()
 				?.nextElementSibling()?.text() ?: manga.author,
-			tags = info.selectFirst("div.media-tags")
+			tags = info?.selectFirst("div.media-tags")
 				?.select("a.media-tag-item")?.mapToSet { a ->
 					MangaTag(
-						title = a.text().capitalize(),
+						title = a.text().toCamelCase(),
 						key = a.attr("href").substringAfterLast('='),
 						source = source
 					)
 				} ?: manga.tags,
-			description = info.selectFirst("div.media-description__text")?.html(),
+			description = info?.selectFirst("div.media-description__text")?.html(),
 			chapters = chapters
 		)
 	}
@@ -146,11 +152,11 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
 		val fullUrl = chapter.url.withDomain()
 		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		if (doc.location()?.endsWith("/register") == true) {
+		if (doc.location().endsWith("/register")) {
 			throw AuthRequiredException("/login".inContextOf(doc))
 		}
 		val scripts = doc.head().select("script")
-		val pg = doc.body().getElementById("pg").html()
+		val pg = (doc.body().getElementById("pg")?.html() ?: parseFailed("Element #pg not found"))
 			.substringAfter('=')
 			.substringBeforeLast(';')
 		val pages = JSONArray(pg)
@@ -173,8 +179,9 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 					MangaPage(
 						id = generateUid(pageUrl),
 						url = pageUrl,
+						preview = null,
 						referer = fullUrl,
-						source = source
+						source = source,
 					)
 				}
 			}
@@ -196,7 +203,7 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 					result += MangaTag(
 						source = source,
 						key = x.getInt("id").toString(),
-						title = x.getString("name").capitalize()
+						title = x.getString("name").toCamelCase()
 					)
 				}
 				return result
@@ -234,8 +241,8 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 					.toFloatOrNull()?.div(5f) ?: Manga.NO_RATING,
 				state = null,
 				source = source,
-				coverUrl = "https://$domain${covers.getString("thumbnail")}",
+				coverUrl = covers.getString("thumbnail"),
-				largeCoverUrl = "https://$domain${covers.getString("default")}"
+				largeCoverUrl = covers.getString("default")
 			)
 		}
 	}

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

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

@@ -7,6 +7,8 @@ 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) :
@@ -23,11 +25,11 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 		SortOrder.UPDATED
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?
+		sortOrder: SortOrder?
 	): List<Manga> {
 		val sortKey = when (sortOrder) {
 			SortOrder.ALPHABETICAL -> "?name.az"
@@ -43,22 +45,28 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 				}
 				"/search?name=${query.urlEncoded()}".withDomain()
 			}
-			tag != null -> "/directory/${tag.key}/$page.htm$sortKey".withDomain()
+			tags.isNullOrEmpty() -> "/directory/$page.htm$sortKey".withDomain()
-			else -> "/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")
+			val href = a?.relUrl("href")
+				?: return@mapNotNull null
 			val views = li.select("p.view")
 			val status = views.findOwnText { x -> x.startsWith("Status:") }
-				?.substringAfter(':')?.trim()?.toLowerCase(Locale.ROOT)
+				?.substringAfter(':')?.trim()?.lowercase(Locale.ROOT)
 			Manga(
 				id = generateUid(href),
 				title = a.attr("title"),
-				coverUrl = a.selectFirst("img").absUrl("src"),
+				coverUrl = a.selectFirst("img")?.absUrl("src").orEmpty(),
 				source = MangaSource.MANGATOWN,
 				altTitle = null,
 				rating = li.selectFirst("p.score")?.selectFirst("b")
@@ -87,11 +95,12 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 		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 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 ->
+			tags = manga.tags + info?.select("li")?.find { x ->
 				x.selectFirst("b")?.ownText() == "Genre(s):"
 			}?.select("a")?.mapNotNull { a ->
 				MangaTag(
@@ -100,9 +109,10 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 					source = MangaSource.MANGATOWN
 				)
 			}.orEmpty(),
-			description = info.getElementById("show")?.ownText(),
+			description = info?.getElementById("show")?.ownText(),
 			chapters = chaptersList?.mapIndexedNotNull { i, li ->
-				val href = li.selectFirst("a").relUrl("href")
+				val href = li.selectFirst("a")?.relUrl("href")
+					?: return@mapIndexedNotNull null
 				val name = li.select("span").filter { it.className().isEmpty() }
 					.joinToString(" - ") { it.text() }.trim()
 				MangaChapter(
@@ -110,7 +120,13 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 					url = href,
 					source = MangaSource.MANGATOWN,
 					number = i + 1,
-					name = if (name.isEmpty()) "${manga.title} - ${i + 1}" else name
+					uploadDate = parseChapterDate(
+						dateFormat,
+						li.selectFirst("span.time")?.text()
+					),
+					name = name.ifEmpty { "${manga.title} - ${i + 1}" },
+					scanlator = null,
+					branch = null,
 				)
 			}
 		)
@@ -121,7 +137,7 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 		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 {
+		return root.selectFirst("select")?.select("option")?.mapNotNull {
 			val href = it.relUrl("value")
 			if (href.endsWith("featured.html")) {
 				return@mapNotNull null
@@ -129,23 +145,24 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 			MangaPage(
 				id = generateUid(href),
 				url = href,
+				preview = null,
 				referer = fullUrl,
-				source = MangaSource.MANGATOWN
+				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")
+		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")
+			?.getElementsContainingOwnText("Genres")
-			.first()
+			?.first()
-			.nextElementSibling()
+			?.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()
@@ -160,6 +177,15 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 		}
 	}
 
+	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

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

@@ -4,7 +4,10 @@ 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(
@@ -20,17 +23,19 @@ class MangareadRepository(
 		SortOrder.POPULARITY
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?
+		sortOrder: SortOrder?
 	): List<Manga> {
-		if (offset % PAGE_SIZE != 0) {
+		val tag = when {
-			return emptyList()
+			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).toString()
+		payload["page"] = (offset / PAGE_SIZE.toFloat()).toIntUp().toString()
 		payload["vars[meta_key]"] = when (sortOrder) {
 			SortOrder.POPULARITY -> "_wp_manga_views"
 			SortOrder.UPDATED -> "_latest_update"
@@ -43,25 +48,26 @@ class MangareadRepository(
 			payload
 		).parseHtml()
 		return doc.select("div.row.c-tabs-item__content").map { div ->
-			val href = div.selectFirst("a").relUrl("href")
+			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"),
+				coverUrl = div.selectFirst("img")?.absUrl("src").orEmpty(),
-				title = summary.selectFirst("h3").text(),
+				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 ->
+				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(),
+				author = summary?.selectFirst(".mg_author")?.selectFirst("a")?.ownText(),
-				state = when (summary.selectFirst(".mg_status")?.selectFirst(".summary-content")
+				state = when (summary?.selectFirst(".mg_status")?.selectFirst(".summary-content")
 					?.ownText()?.trim()) {
 					"OnGoing" -> MangaState.ONGOING
 					"Completed" -> MangaState.FINISHED
@@ -75,9 +81,9 @@ class MangareadRepository(
 	override suspend fun getTags(): Set<MangaTag> {
 		val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
 		val root = doc.body().selectFirst("header")
-			.selectFirst("ul.second-menu")
+			?.selectFirst("ul.second-menu") ?: parseFailed("Root not found")
 		return root.select("li").mapNotNullToSet { li ->
-			val a = li.selectFirst("a")
+			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
 			val href = a.attr("href").removeSuffix("/")
 				.substringAfterLast("genres/", "")
 			if (href.isEmpty()) {
@@ -101,8 +107,8 @@ class MangareadRepository(
 		val root2 = doc.body().selectFirst("div.content-area")
 			?.selectFirst("div.c-page")
 			?: throw ParseException("Root2 not found")
-		val mangaId = doc.getElementsByAttribute("data-postid").firstOrNull()
+		val mangaId = doc.getElementsByAttribute("data-post").firstOrNull()
-			?.attr("data-postid")?.toLongOrNull()
+			?.attr("data-post")?.toLongOrNull()
 			?: throw ParseException("Cannot obtain manga id")
 		val doc2 = loaderContext.httpPost(
 			"https://${getDomain()}/wp-admin/admin-ajax.php",
@@ -111,6 +117,7 @@ class MangareadRepository(
 				"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 ->
@@ -127,13 +134,21 @@ class MangareadRepository(
 				?.joinToString { it.html() },
 			chapters = doc2.select("li").asReversed().mapIndexed { i, li ->
 				val a = li.selectFirst("a")
-				val href = a.relUrl("href")
+				val href = a?.relUrl("href").orEmpty().ifEmpty {
+					parseFailed("Link is missing")
+				}
 				MangaChapter(
 					id = generateUid(href),
-					name = a.ownText(),
+					name = a!!.ownText(),
 					number = i + 1,
 					url = href,
-					source = MangaSource.MANGAREAD
+					uploadDate = parseChapterDate(
+						dateFormat,
+						doc2.selectFirst("span.chapter-release-date i")?.text()
+					),
+					source = MangaSource.MANGAREAD,
+					scanlator = null,
+					branch = null,
 				)
 			}
 		)
@@ -147,16 +162,82 @@ class MangareadRepository(
 			?: throw ParseException("Root not found")
 		return root.select("div.page-break").map { div ->
 			val img = div.selectFirst("img")
-			val url = img.relUrl("src")
+			val url = img?.relUrl("src") ?: parseFailed("Page image not found")
 			MangaPage(
 				id = generateUid(url),
 				url = url,
+				preview = null,
 				referer = fullUrl,
-				source = MangaSource.MANGAREAD
+				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
@@ -169,4 +250,4 @@ class MangareadRepository(
 					it.substring(0, pos) to it.substring(pos + 1)
 				}.toMutableMap()
 	}
-}
+}

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

@@ -7,6 +7,7 @@ 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 NineMangaRepository(
@@ -16,62 +17,66 @@ abstract class NineMangaRepository(
 ) : RemoteMangaRepository(loaderContext) {
 
 	init {
-		loaderContext.insertCookies(getDomain(), "ninemanga_template_desk=yes")
+		loaderContext.cookieJar.insertCookies(getDomain(), "ninemanga_template_desk=yes")
 	}
 
 	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.POPULARITY,
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?,
+		sortOrder: SortOrder?
 	): List<Manga> {
 		val page = (offset / PAGE_SIZE.toFloat()).toIntUp() + 1
 		val url = buildString {
 			append("https://")
 			append(getDomain())
-			if (query.isNullOrEmpty()) {
+			when {
-				append("/category/")
+				!query.isNullOrEmpty() -> {
-				if (tag != null) {
+					append("/search/?name_sel=&wd=")
-					append(tag.key)
+					append(query.urlEncoded())
-				} else {
+					append("&page=")
-					append("index")
+				}
+				!tags.isNullOrEmpty() -> {
+					append("/search/?category_id=")
+					for (tag in tags) {
+						append(tag.key)
+						append(',')
+					}
+					append("&page=")
+				}
+				else -> {
+					append("/category/index_")
 				}
-				append("_")
-				append(page)
-				append(".html")
-			} else {
-				append("/search/?name_sel=&wd=")
-				append(query.urlEncoded())
-				append("&page=")
-				append(page)
-				append(".html")
 			}
+			append(page)
+			append(".html")
 		}
 		val doc = loaderContext.httpGet(url, PREDEFINED_HEADERS).parseHtml()
 		val root = doc.body().selectFirst("ul.direlist")
 			?: throw ParseException("Cannot find root")
 		val baseHost = root.baseUri().toHttpUrl().host
 		return root.select("li").map { node ->
-			val href = node.selectFirst("a").absUrl("href")
+			val href = node.selectFirst("a")?.absUrl("href")
+				?: parseFailed("Link not found")
 			val relUrl = href.toRelativeUrl(baseHost)
 			val dd = node.selectFirst("dd")
 			Manga(
 				id = generateUid(relUrl),
 				url = relUrl,
 				publicUrl = href,
-				title = dd.selectFirst("a.bookname").text().toCamelCase(),
+				title = dd?.selectFirst("a.bookname")?.text()?.toCamelCase().orEmpty(),
 				altTitle = null,
-				coverUrl = node.selectFirst("img").absUrl("src"),
+				coverUrl = node.selectFirst("img")?.absUrl("src").orEmpty(),
 				rating = Manga.NO_RATING,
 				author = null,
 				tags = emptySet(),
 				state = null,
 				source = source,
-				description = dd.selectFirst("p").html(),
+				description = dd?.selectFirst("p")?.html(),
 			)
 		}
 	}
@@ -86,7 +91,7 @@ abstract class NineMangaRepository(
 		val infoRoot = root.selectFirst("div.bookintro")
 			?: throw ParseException("Cannot find info")
 		return manga.copy(
-			tags = infoRoot.getElementsByAttributeValue("itemprop", "genre")?.first()
+			tags = infoRoot.getElementsByAttributeValue("itemprop", "genre").first()
 				?.select("a")?.mapToSet { a ->
 					MangaTag(
 						title = a.text(),
@@ -94,20 +99,23 @@ abstract class NineMangaRepository(
 						source = source,
 					)
 				}.orEmpty(),
-			author = infoRoot.getElementsByAttributeValue("itemprop", "author")?.first()?.text(),
+			author = infoRoot.getElementsByAttributeValue("itemprop", "author").first()?.text(),
-			description = infoRoot.getElementsByAttributeValue("itemprop", "description")?.first()
+			state = parseStatus(infoRoot.select("li a.red").text()),
+			description = infoRoot.getElementsByAttributeValue("itemprop", "description").first()
 				?.html()?.substringAfter("</b>"),
-			chapters = root.selectFirst("div.chapterbox")?.selectFirst("ul")
+			chapters = root.selectFirst("div.chapterbox")?.select("ul.sub_vol_ul > li")
-				?.select("li")?.asReversed()?.mapIndexed { i, li ->
+				?.asReversed()?.mapIndexed { i, li ->
-					val a = li.selectFirst("a")
+					val a = li.selectFirst("a.chapter_list_a")
-					val href = a.relUrl("href")
+					val href = a?.relUrl("href")?.replace("%20", " ") ?: parseFailed("Link not found")
 					MangaChapter(
 						id = generateUid(href),
 						name = a.text(),
 						number = i + 1,
 						url = href,
-						branch = null,
+						uploadDate = parseChapterDateByLang(li.selectFirst("span")?.text().orEmpty()),
 						source = source,
+						scanlator = null,
+						branch = null,
 					)
 				}
 		)
@@ -135,17 +143,62 @@ abstract class NineMangaRepository(
 	}
 
 	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/category/", PREDEFINED_HEADERS)
+		val doc = loaderContext.httpGet("https://${getDomain()}/search/?type=high", PREDEFINED_HEADERS)
 			.parseHtml()
-		val root = doc.body().selectFirst("ul.genreidex")
+		val root = doc.body().getElementById("search_form")
-		return root.select("li").mapToSet { li ->
+		return root?.select("li.cate_list")?.mapNotNullToSet { li ->
-			val a = li.selectFirst("a")
+			val cateId = li.attr("cate_id") ?: return@mapNotNullToSet null
+			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
 			MangaTag(
-				title = a.text(),
+				title = a.text().toTitleCase(),
-				key = a.attr("href").substringBetweenLast("/", "."),
+				key = cateId,
 				source = source
 			)
+		} ?: parseFailed("Root not found")
+	}
+
+	private fun parseStatus(status: String) = when {
+		status.contains("Ongoing") -> MangaState.ONGOING
+		status.contains("Completed") -> MangaState.FINISHED
+		else -> null
+	}
+
+	private fun parseChapterDateByLang(date: String): Long {
+		val dateWords = date.split(" ")
+
+		if (dateWords.size == 3) {
+			if (dateWords[1].contains(",")) {
+				SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).tryParse(date)
+			} else {
+				val timeAgo = Integer.parseInt(dateWords[0])
+				return Calendar.getInstance().apply {
+					when (dateWords[1]) {
+						"minutes" -> Calendar.MINUTE // EN-FR
+						"hours" -> Calendar.HOUR // EN
+
+						"minutos" -> Calendar.MINUTE // ES
+						"horas" -> Calendar.HOUR
+
+						// "minutos" -> Calendar.MINUTE // BR
+						"hora" -> Calendar.HOUR
+
+						"минут" -> Calendar.MINUTE // RU
+						"часа" -> Calendar.HOUR
+
+						"Stunden" -> Calendar.HOUR // DE
+
+						"minuti" -> Calendar.MINUTE // IT
+						"ore" -> Calendar.HOUR
+
+						"heures" -> Calendar.HOUR // FR ("minutes" also French word)
+						else -> null
+					}?.let {
+						add(it, -timeAgo)
+					}
+				}.timeInMillis
+			}
 		}
+		return 0L
 	}
 
 	class English(loaderContext: MangaLoaderContext) : NineMangaRepository(

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

@@ -5,6 +5,6 @@ import org.koitharu.kotatsu.core.model.MangaSource
 
 class ReadmangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
 
-	override val defaultDomain = "readmanga.live"
+	override val defaultDomain = "readmanga.io"
 	override val source = MangaSource.READMANGA_RU
 }

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

@@ -6,16 +6,20 @@ import org.json.JSONObject
 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.MangaRepositoryAuthProvider
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.utils.ext.*
+import java.text.SimpleDateFormat
 import java.util.*
-import kotlin.collections.ArrayList
 
-class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
+class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext),
+	MangaRepositoryAuthProvider {
 
 	override val source = MangaSource.REMANGA
 
 	override val defaultDomain = "remanga.org"
+	override val authUrl: String
+		get() = "https://${getDomain()}/user/login"
 
 	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.UPDATED,
@@ -24,12 +28,13 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 		SortOrder.NEWEST
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
+		tags: Set<MangaTag>?,
-		tag: MangaTag?
+		sortOrder: SortOrder?
 	): List<Manga> {
+		copyCookies()
 		val domain = getDomain()
 		val urlBuilder = StringBuilder()
 			.append("https://api.")
@@ -40,8 +45,9 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 		} else {
 			urlBuilder.append("/api/search/catalog/?ordering=")
 				.append(getSortKey(sortOrder))
-			if (tag != null) {
+			tags?.forEach { tag ->
-				urlBuilder.append("&genres=" + tag.key)
+				urlBuilder.append("&genres=")
+				urlBuilder.append(tag.key)
 			}
 		}
 		urlBuilder
@@ -77,6 +83,7 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 	}
 
 	override suspend fun getDetails(manga: Manga): Manga {
+		copyCookies()
 		val domain = getDomain()
 		val slug = manga.url.find(LAST_URL_PATH_REGEX)
 			?: throw ParseException("Cannot obtain slug from ${manga.url}")
@@ -93,6 +100,7 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 		val chapters = loaderContext.httpGet(
 			url = "https://api.$domain/api/titles/chapters/?branch_id=$branchId"
 		).parseJson().getJSONArray("content")
+		val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US)
 		return manga.copy(
 			description = content.getString("description"),
 			state = when (content.optJSONObject("status")?.getInt("id")) {
@@ -109,12 +117,16 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 			},
 			chapters = chapters.mapIndexed { i, jo ->
 				val id = jo.getLong("id")
-				val name = jo.getString("name")
+				val name = jo.getString("name").toTitleCase(Locale.ROOT)
+				val publishers = jo.getJSONArray("publishers")
 				MangaChapter(
 					id = generateUid(id),
 					url = "/api/titles/chapters/$id/",
 					number = chapters.length() - i,
 					name = buildString {
+						append("Том ")
+						append(jo.getString("tome"))
+						append(". ")
 						append("Глава ")
 						append(jo.getString("chapter"))
 						if (name.isNotEmpty()) {
@@ -122,7 +134,10 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 							append(name)
 						}
 					},
-					source = MangaSource.REMANGA
+					uploadDate = dateFormat.tryParse(jo.getString("upload_date")),
+					scanlator = publishers.optJSONObject(0)?.getStringOrNull("name"),
+					source = MangaSource.REMANGA,
+					branch = null,
 				)
 			}.asReversed()
 		)
@@ -156,6 +171,17 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 		}
 	}
 
+	override fun isAuthorized(): Boolean {
+		return loaderContext.cookieJar.getCookies(getDomain()).any {
+			it.name == "user"
+		}
+	}
+
+	private fun copyCookies() {
+		val domain = getDomain()
+		loaderContext.cookieJar.copyCookies(domain, "api.$domain")
+	}
+
 	private fun getSortKey(order: SortOrder?) = when (order) {
 		SortOrder.UPDATED -> "-chapter_date"
 		SortOrder.POPULARITY -> "-rating"
@@ -167,8 +193,9 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 	private fun parsePage(jo: JSONObject, referer: String) = MangaPage(
 		id = generateUid(jo.getLong("id")),
 		url = jo.getString("link"),
+		preview = null,
 		referer = referer,
-		source = source
+		source = source,
 	)
 
 	private companion object {

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

@@ -29,7 +29,10 @@ class YaoiChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loa
 					name = a.text().trim(),
 					number = i + 1,
 					url = href,
-					source = source
+					uploadDate = 0L,
+					source = source,
+					scanlator = null,
+					branch = null,
 				)
 			}
 		)

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

@@ -8,12 +8,15 @@ import androidx.collection.arraySetOf
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.channels.sendBlocking
+import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.callbackFlow
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.utils.delegates.prefs.*
 import java.io.File
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
 
 class AppSettings private constructor(private val prefs: SharedPreferences) :
 	SharedPreferences by prefs {
@@ -76,6 +79,8 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 
 	var historyGrouping by BoolPreferenceDelegate(KEY_HISTORY_GROUPING, true)
 
+	var isHistoryExcludeNsfw by BoolPreferenceDelegate(KEY_HISTORY_EXCLUDE_NSFW, false)
+
 	var chaptersReverse by BoolPreferenceDelegate(KEY_REVERSE_CHAPTERS, false)
 
 	val zoomMode by EnumPreferenceDelegate(
@@ -104,6 +109,8 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 	val isSourcesSelected: Boolean
 		get() = KEY_SOURCES_HIDDEN in prefs
 
+	val isPagesNumbersEnabled by BoolPreferenceDelegate(KEY_PAGES_NUMBERS, false)
+
 	fun getStorageDir(context: Context): File? {
 		val value = prefs.getString(KEY_LOCAL_STORAGE, null)?.let {
 			File(it)
@@ -121,6 +128,12 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		}
 	}
 
+	fun dateFormat(format: String? = prefs.getString(KEY_DATE_FORMAT, "")): DateFormat =
+		when (format) {
+			"" -> DateFormat.getDateInstance(DateFormat.SHORT)
+			else -> SimpleDateFormat(format, Locale.getDefault())
+		}
+
 	@Deprecated("Use observe()")
 	fun subscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
 		prefs.registerOnSharedPreferenceChangeListener(listener)
@@ -132,7 +145,7 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 
 	fun observe() = callbackFlow<String> {
 		val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-			sendBlocking(key)
+			trySendBlocking(key)
 		}
 		prefs.registerOnSharedPreferenceChangeListener(listener)
 		awaitClose {
@@ -152,6 +165,7 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		const val KEY_APP_SECTION = "app_section"
 		const val KEY_THEME = "theme"
 		const val KEY_THEME_AMOLED = "amoled_theme"
+		const val KEY_DATE_FORMAT = "date_format"
 		const val KEY_HIDE_TOOLBAR = "hide_toolbar"
 		const val KEY_SOURCES_ORDER = "sources_order"
 		const val KEY_SOURCES_HIDDEN = "sources_hidden"
@@ -167,8 +181,6 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		const val KEY_READER_SWITCHERS = "reader_switchers"
 		const val KEY_TRACK_SOURCES = "track_sources"
 		const val KEY_TRACK_WARNING = "track_warning"
-		const val KEY_APP_UPDATE = "app_update"
-		const val KEY_APP_UPDATE_AUTO = "app_update_auto"
 		const val KEY_TRACKER_NOTIFICATIONS = "tracker_notifications"
 		const val KEY_NOTIFICATIONS_SETTINGS = "notifications_settings"
 		const val KEY_NOTIFICATIONS_SOUND = "notifications_sound"
@@ -184,5 +196,16 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		const val KEY_RESTORE = "restore"
 		const val KEY_HISTORY_GROUPING = "history_grouping"
 		const val KEY_REVERSE_CHAPTERS = "reverse_chapters"
+		const val KEY_HISTORY_EXCLUDE_NSFW = "history_exclude_nsfw"
+		const val KEY_PAGES_NUMBERS = "pages_numbers"
+
+		// About
+		const val KEY_APP_UPDATE = "app_update"
+		const val KEY_APP_UPDATE_AUTO = "app_update_auto"
+		const val KEY_APP_TRANSLATION = "about_app_translation"
+		const val KEY_APP_GRATITUDES = "about_gratitudes"
+		const val KEY_FEEDBACK_4PDA = "about_feedback_4pda"
+		const val KEY_FEEDBACK_GITHUB = "about_feedback_github"
+		const val KEY_SUPPORT_DEVELOPER = "about_support_developer"
 	}
 }

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

@@ -27,5 +27,6 @@ interface SourceSettings {
 
 		const val KEY_DOMAIN = "domain"
 		const val KEY_USE_SSL = "ssl"
+		const val KEY_AUTH = "auth"
 	}
 }

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

@@ -14,16 +14,35 @@ sealed class DateTimeAgo : ListModel {
 		}
 	}
 
-	data class MinutesAgo(val minutes: Int) : DateTimeAgo() {
+	class MinutesAgo(val minutes: Int) : DateTimeAgo() {
+
 		override fun format(resources: Resources): String {
 			return resources.getQuantityString(R.plurals.minutes_ago, minutes, minutes)
 		}
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+			other as MinutesAgo
+			return minutes == other.minutes
+		}
+
+		override fun hashCode(): Int = minutes
 	}
 
-	data class HoursAgo(val hours: Int) : DateTimeAgo() {
+	class HoursAgo(val hours: Int) : DateTimeAgo() {
 		override fun format(resources: Resources): String {
 			return resources.getQuantityString(R.plurals.hours_ago, hours, hours)
 		}
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+			other as HoursAgo
+			return hours == other.hours
+		}
+
+		override fun hashCode(): Int = hours
 	}
 
 	object Today : DateTimeAgo() {
@@ -38,10 +57,19 @@ sealed class DateTimeAgo : ListModel {
 		}
 	}
 
-	data class DaysAgo(val days: Int) : DateTimeAgo() {
+	class DaysAgo(val days: Int) : DateTimeAgo() {
 		override fun format(resources: Resources): String {
 			return resources.getQuantityString(R.plurals.days_ago, days, days)
 		}
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+			other as DaysAgo
+			return days == other.days
+		}
+
+		override fun hashCode(): Int = days
 	}
 
 	object LongAgo : DateTimeAgo() {

app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt

@@ -15,19 +15,20 @@ import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
 import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.download.DownloadService
+import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 
 class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
-	OnListItemClickListener<MangaChapter>, ActionMode.Callback, AdapterView.OnItemSelectedListener {
+	OnListItemClickListener<ChapterListItem>,
+	ActionMode.Callback,
+	AdapterView.OnItemSelectedListener {
 
 	private val viewModel by sharedViewModel<DetailsViewModel>()
 
@@ -105,9 +106,9 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 		else -> super.onOptionsItemSelected(item)
 	}
 
-	override fun onItemClick(item: MangaChapter, view: View) {
+	override fun onItemClick(item: ChapterListItem, view: View) {
 		if (selectionDecoration?.checkedItemsCount != 0) {
-			selectionDecoration?.toggleItemChecked(item.id)
+			selectionDecoration?.toggleItemChecked(item.chapter.id)
 			if (selectionDecoration?.checkedItemsCount == 0) {
 				actionMode?.finish()
 			} else {
@@ -116,6 +117,10 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 			}
 			return
 		}
+		if (item.isMissing) {
+			(activity as? DetailsActivity)?.showChapterMissingDialog(item.chapter.id)
+			return
+		}
 		val options = ActivityOptions.makeScaleUpAnimation(
 			view,
 			0,
@@ -127,17 +132,17 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 			ReaderActivity.newIntent(
 				view.context,
 				viewModel.manga.value ?: return,
-				ReaderState(item.id, 0, 0)
+				ReaderState(item.chapter.id, 0, 0)
 			), options.toBundle()
 		)
 	}
 
-	override fun onItemLongClick(item: MangaChapter, view: View): Boolean {
+	override fun onItemLongClick(item: ChapterListItem, view: View): Boolean {
 		if (actionMode == null) {
 			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
 		}
 		return actionMode?.also {
-			selectionDecoration?.setItemIsChecked(item.id, true)
+			selectionDecoration?.setItemIsChecked(item.chapter.id, true)
 			binding.recyclerViewChapters.invalidateItemDecorations()
 			it.invalidate()
 		} != null
@@ -148,7 +153,7 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 			R.id.action_save -> {
 				DownloadService.start(
 					context ?: return false,
-					viewModel.manga.value ?: return false,
+					viewModel.getRemoteManga() ?: viewModel.manga.value ?: return false,
 					selectionDecoration?.checkedItemsIds
 				)
 				mode.finish()
@@ -174,17 +179,20 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
 		val manga = viewModel.manga.value
 		mode.menuInflater.inflate(R.menu.mode_chapters, menu)
-		menu.findItem(R.id.action_save).isVisible = manga?.source != MangaSource.LOCAL
 		mode.title = manga?.title
 		return true
 	}
 
 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		val count = selectionDecoration?.checkedItemsCount ?: return false
+		val selectedIds = selectionDecoration?.checkedItemsIds ?: return false
+		val items = chaptersAdapter?.items?.filter { x -> x.chapter.id in selectedIds }.orEmpty()
+		menu.findItem(R.id.action_save).isVisible = items.none { x ->
+			x.chapter.source == MangaSource.LOCAL
+		}
 		mode.subtitle = resources.getQuantityString(
 			R.plurals.chapters_from_x,
-			count,
+			items.size,
-			count,
+			items.size,
 			chaptersAdapter?.itemCount ?: 0
 		)
 		return true

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt

@@ -33,15 +33,18 @@ import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
-import org.koitharu.kotatsu.download.DownloadService
+import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity
 import org.koitharu.kotatsu.utils.ShareHelper
+import org.koitharu.kotatsu.utils.ext.buildAlertDialog
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
 class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
 	TabLayoutMediator.TabConfigurationStrategy {
 
-	private val viewModel by viewModel<DetailsViewModel>(mode = LazyThreadSafetyMode.NONE) {
+	private val viewModel by viewModel<DetailsViewModel> {
 		parametersOf(MangaIntent.from(intent))
 	}
 
@@ -82,13 +85,15 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
 				finishAfterTransition()
 			}
 			else -> {
-				Snackbar.make(binding.pager, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG)
+				binding.snackbar.show(e.getDisplayMessage(resources))
-					.show()
 			}
 		}
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.snackbar.updatePadding(
+			bottom = insets.bottom
+		)
 		binding.toolbar.updatePadding(
 			top = insets.top,
 			left = insets.left,
@@ -228,6 +233,33 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
 		binding.pager.isUserInputEnabled = true
 	}
 
+	fun showChapterMissingDialog(chapterId: Long) {
+		val remoteManga = viewModel.getRemoteManga()
+		if (remoteManga == null) {
+			Snackbar.make(binding.pager, R.string.chapter_is_missing, Snackbar.LENGTH_LONG)
+				.show()
+			return
+		}
+		buildAlertDialog(this) {
+			setMessage(R.string.chapter_is_missing_text)
+			setTitle(R.string.chapter_is_missing)
+			setNegativeButton(android.R.string.cancel, null)
+			setPositiveButton(R.string.read) { _, _ ->
+				startActivity(
+					ReaderActivity.newIntent(
+						this@DetailsActivity,
+						remoteManga,
+						ReaderState(chapterId, 0, 0)
+					)
+				)
+			}
+			setNeutralButton(R.string.download) { _, _ ->
+				DownloadService.start(this@DetailsActivity, remoteManga, setOf(chapterId))
+			}
+			setCancelable(true)
+		}.show()
+	}
+
 	companion object {
 
 		const val ACTION_MANGA_VIEW = "${BuildConfig.APPLICATION_ID}.action.VIEW_MANGA"

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -1,19 +1,21 @@
 package org.koitharu.kotatsu.details.ui
 
+import android.app.ActivityOptions
 import android.os.Bundle
 import android.text.Spanned
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.Insets
 import androidx.core.net.toUri
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import coil.ImageLoader
+import coil.request.ImageRequest
 import coil.util.CoilUtils
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
@@ -23,20 +25,22 @@ import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.model.MangaState
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesDialog
+import org.koitharu.kotatsu.image.ui.ImageActivity
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
+import org.koitharu.kotatsu.search.ui.SearchActivity
 import org.koitharu.kotatsu.utils.FileSizeUtils
 import org.koitharu.kotatsu.utils.ext.*
-import kotlin.math.roundToInt
 
 class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickListener,
 	View.OnLongClickListener {
 
 	private val viewModel by sharedViewModel<DetailsViewModel>()
 	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
-	private var tagsJob: Job? = null
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
@@ -45,6 +49,11 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		binding.textViewAuthor.setOnClickListener(this)
+		binding.buttonFavorite.setOnClickListener(this)
+		binding.buttonRead.setOnClickListener(this)
+		binding.buttonRead.setOnLongClickListener(this)
+		binding.coverCard.setOnClickListener(this)
 		viewModel.manga.observe(viewLifecycleOwner, ::onMangaUpdated)
 		viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
 		viewModel.favouriteCategories.observe(viewLifecycleOwner, ::onFavouriteChanged)
@@ -53,19 +62,33 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 
 	private fun onMangaUpdated(manga: Manga) {
 		with(binding) {
-			imageViewCover.newImageRequest(manga.largeCoverUrl ?: manga.coverUrl)
+			// Main
-				.referer(manga.publicUrl)
+			loadCover(manga)
-				.fallback(R.drawable.ic_placeholder)
-				.placeholderMemoryCacheKey(CoilUtils.metadata(imageViewCover)?.memoryCacheKey)
-				.lifecycle(viewLifecycleOwner)
-				.enqueueWith(coil)
 			textViewTitle.text = manga.title
 			textViewSubtitle.textAndVisible = manga.altTitle
 			textViewAuthor.textAndVisible = manga.author
+			sourceContainer.isVisible = manga.source != MangaSource.LOCAL
 			textViewSource.text = manga.source.title
 			textViewDescription.text =
 				manga.description?.parseAsHtml()?.takeUnless(Spanned::isBlank)
 					?: getString(R.string.no_description)
+			when (manga.state) {
+				MangaState.FINISHED -> {
+					textViewState.apply {
+						textAndVisible = resources.getString(R.string.state_finished)
+						drawableStart = ResourcesCompat.getDrawable(resources, R.drawable.ic_state_finished, context.theme)
+					}
+				}
+				MangaState.ONGOING -> {
+					textViewState.apply {
+						textAndVisible = resources.getString(R.string.state_ongoing)
+						drawableStart = ResourcesCompat.getDrawable(resources, R.drawable.ic_state_ongoing, context.theme)
+					}
+				}
+				else -> textViewState.isVisible = false
+			}
+
+			// Info containers
 			if (manga.chapters?.isNotEmpty() == true) {
 				chaptersContainer.isVisible = true
 				textViewChapters.text = manga.chapters.let {
@@ -96,10 +119,11 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 			} else {
 				sizeContainer.isVisible = false
 			}
-			buttonFavorite.setOnClickListener(this@DetailsFragment)
+
-			buttonRead.setOnClickListener(this@DetailsFragment)
+			// Buttons
-			buttonRead.setOnLongClickListener(this@DetailsFragment)
 			buttonRead.isEnabled = !manga.chapters.isNullOrEmpty()
+
+			// Chips
 			bindTags(manga)
 		}
 	}
@@ -127,22 +151,51 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 	}
 
 	private fun onLoadingStateChanged(isLoading: Boolean) {
-		binding.progressBar.isVisible = isLoading
+		if (isLoading) {
+			binding.progressBar.show()
+		} else {
+			binding.progressBar.hide()
+		}
 	}
 
 	override fun onClick(v: View) {
-		val manga = viewModel.manga.value
+		val manga = viewModel.manga.value ?: return
 		when (v.id) {
 			R.id.button_favorite -> {
-				FavouriteCategoriesDialog.show(childFragmentManager, manga ?: return)
+				FavouriteCategoriesDialog.show(childFragmentManager, manga)
 			}
 			R.id.button_read -> {
-				startActivity(
+				val chapterId = viewModel.readingHistory.value?.chapterId
-					ReaderActivity.newIntent(
+				if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
-						context ?: return,
+					(activity as? DetailsActivity)?.showChapterMissingDialog(chapterId)
-						manga ?: return,
+				} else {
-						null
+					startActivity(
+						ReaderActivity.newIntent(
+							context ?: return,
+							manga,
+							null
+						)
 					)
+				}
+			}
+			R.id.textView_author -> {
+				startActivity(
+					SearchActivity.newIntent(
+						context = v.context,
+						source = manga.source,
+						query = manga.author ?: return,
+					)
+				)
+			}
+			R.id.cover_card -> {
+				val options = ActivityOptions.makeSceneTransitionAnimation(
+					requireActivity(),
+					binding.imageViewCover,
+					binding.imageViewCover.transitionName,
+				)
+				startActivity(
+					ImageActivity.newIntent(v.context, manga.largeCoverUrl ?: manga.coverUrl),
+					options.toBundle()
 				)
 			}
 		}
@@ -186,16 +239,31 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 	}
 
 	private fun bindTags(manga: Manga) {
-		tagsJob?.cancel()
+		binding.chipsTags.setChips(
-		tagsJob = viewLifecycleScope.launch {
+			manga.tags.map { tag ->
-			val tags = ArrayList<ChipsView.ChipModel>(manga.tags.size + 2)
+				ChipsView.ChipModel(
-			for (tag in manga.tags) {
-				tags += ChipsView.ChipModel(
 					title = tag.title,
 					icon = 0
 				)
 			}
-			binding.chipsTags.setChips(tags)
+		)
+	}
+
+	private fun loadCover(manga: Manga) {
+		val currentCover = binding.imageViewCover.drawable
+		val request = ImageRequest.Builder(context ?: return)
+			.target(binding.imageViewCover)
+		if (currentCover != null) {
+			request.data(manga.largeCoverUrl ?: return)
+				.placeholderMemoryCacheKey(CoilUtils.metadata(binding.imageViewCover)?.memoryCacheKey)
+				.fallback(currentCover)
+		} else {
+			request.crossfade(true)
+				.data(manga.coverUrl)
+				.fallback(R.drawable.ic_placeholder)
 		}
+		request.referer(manga.publicUrl)
+			.lifecycle(viewLifecycleOwner)
+			.enqueueWith(coil)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt

@@ -11,7 +11,11 @@ import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.exceptions.MangaNotFoundException
 import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.MangaChapter
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.toListItem
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.ChapterExtra
@@ -20,7 +24,9 @@ import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.mapToSet
+import org.koitharu.kotatsu.utils.ext.toTitleCase
 import java.io.IOException
+import java.util.*
 
 class DetailsViewModel(
 	intent: MangaIntent,
@@ -29,7 +35,7 @@ class DetailsViewModel(
 	private val localMangaRepository: LocalMangaRepository,
 	private val trackingRepository: TrackingRepository,
 	private val mangaDataRepository: MangaDataRepository,
-	private val settings: AppSettings
+	private val settings: AppSettings,
 ) : BaseViewModel() {
 
 	private val mangaData = MutableStateFlow<Manga?>(intent.manga)
@@ -53,6 +59,18 @@ class DetailsViewModel(
 			trackingRepository.getNewChaptersCount(mangaId)
 		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
 
+	private val remoteManga = MutableStateFlow<Manga?>(null)
+	/*private val remoteManga = mangaData.mapLatest {
+		if (it?.source == MangaSource.LOCAL) {
+			runCatching {
+				val m = localMangaRepository.getRemoteManga(it) ?: return@mapLatest null
+				MangaRepository(m.source).getDetails(m)
+			}.getOrNull()
+		} else {
+			null
+		}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)*/
+
 	private val chaptersReversed = settings.observe()
 		.filter { it == AppSettings.KEY_REVERSE_CHAPTERS }
 		.map { settings.chaptersReverse }
@@ -85,24 +103,19 @@ class DetailsViewModel(
 
 	val chapters = combine(
 		mangaData.map { it?.chapters.orEmpty() },
+		remoteManga,
 		history.map { it?.chapterId },
 		newChapters,
-		chaptersReversed,
 		selectedBranch
-	) { chapters, currentId, newCount, reversed, branch ->
+	) { chapters, sourceManga, currentId, newCount, branch ->
-		val currentIndex = chapters.indexOfFirst { it.id == currentId }
+		val sourceChapters = sourceManga?.chapters
-		val firstNewIndex = chapters.size - newCount
+		if (sourceChapters.isNullOrEmpty()) {
-		val res = chapters.mapIndexed { index, chapter ->
+			mapChapters(chapters, currentId, newCount, branch)
-			chapter.toListItem(
+		} else {
-				when {
+			mapChaptersWithSource(chapters, sourceChapters, currentId, newCount, branch)
-					index >= firstNewIndex -> ChapterExtra.NEW
+		}
-					index == currentIndex -> ChapterExtra.CURRENT
+	}.combine(chaptersReversed) { list, reversed ->
-					index < currentIndex -> ChapterExtra.READ
+		if (reversed) list.asReversed() else list
-					else -> ChapterExtra.UNREAD
-				}
-			)
-		}.filter { it.chapter.branch == branch }
-		if (reversed) res.asReversed() else res
 	}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
 
 	init {
@@ -116,11 +129,15 @@ class DetailsViewModel(
 			selectedBranch.value = if (hist != null) {
 				manga.chapters?.find { it.id == hist.chapterId }?.branch
 			} else {
-				manga.chapters
+				predictBranch(manga.chapters)
-					?.groupBy { it.branch }
-					?.maxByOrNull { it.value.size }?.key
 			}
 			mangaData.value = manga
+			if (manga.source == MangaSource.LOCAL) {
+				remoteManga.value = runCatching {
+					val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
+					MangaRepository(m.source).getDetails(m)
+				}.getOrNull()
+			}
 		}
 	}
 
@@ -142,4 +159,102 @@ class DetailsViewModel(
 	fun setSelectedBranch(branch: String?) {
 		selectedBranch.value = branch
 	}
+
+	fun getRemoteManga(): Manga? {
+		return remoteManga.value
+	}
+
+	private fun mapChapters(
+		chapters: List<MangaChapter>,
+		currentId: Long?,
+		newCount: Int,
+		branch: String?,
+	): List<ChapterListItem> {
+		val result = ArrayList<ChapterListItem>(chapters.size)
+		val dateFormat = settings.dateFormat()
+		val currentIndex = chapters.indexOfFirst { it.id == currentId }
+		val firstNewIndex = chapters.size - newCount
+		for (i in chapters.indices) {
+			val chapter = chapters[i]
+			if (chapter.branch != branch) {
+				continue
+			}
+			result += chapter.toListItem(
+				extra = when {
+					i >= firstNewIndex -> ChapterExtra.NEW
+					i == currentIndex -> ChapterExtra.CURRENT
+					i < currentIndex -> ChapterExtra.READ
+					else -> ChapterExtra.UNREAD
+				},
+				isMissing = false,
+				dateFormat = dateFormat,
+			)
+		}
+		return result
+	}
+
+	private fun mapChaptersWithSource(
+		chapters: List<MangaChapter>,
+		sourceChapters: List<MangaChapter>,
+		currentId: Long?,
+		newCount: Int,
+		branch: String?,
+	): List<ChapterListItem> {
+		val chaptersMap = chapters.associateByTo(HashMap(chapters.size)) { it.id }
+		val result = ArrayList<ChapterListItem>(sourceChapters.size)
+		val currentIndex = sourceChapters.indexOfFirst { it.id == currentId }
+		val firstNewIndex = sourceChapters.size - newCount
+		val dateFormat = settings.dateFormat()
+		for (i in sourceChapters.indices) {
+			val chapter = sourceChapters[i]
+			if (chapter.branch != branch) {
+				continue
+			}
+			val localChapter = chaptersMap.remove(chapter.id)
+			result += localChapter?.toListItem(
+				extra = when {
+					i >= firstNewIndex -> ChapterExtra.NEW
+					i == currentIndex -> ChapterExtra.CURRENT
+					i < currentIndex -> ChapterExtra.READ
+					else -> ChapterExtra.UNREAD
+				},
+				isMissing = false,
+				dateFormat = dateFormat,
+			) ?: chapter.toListItem(
+				extra = when {
+					i >= firstNewIndex -> ChapterExtra.NEW
+					i == currentIndex -> ChapterExtra.CURRENT
+					i < currentIndex -> ChapterExtra.READ
+					else -> ChapterExtra.UNREAD
+				},
+				isMissing = true,
+				dateFormat = dateFormat,
+			)
+		}
+		if (chaptersMap.isNotEmpty()) { // some chapters on device but not online source
+			result.ensureCapacity(result.size + chaptersMap.size)
+			chaptersMap.values.mapTo(result) {
+				it.toListItem(ChapterExtra.UNREAD, false, dateFormat)
+			}
+			result.sortBy { it.chapter.number }
+		}
+		return result
+	}
+
+	private fun predictBranch(chapters: List<MangaChapter>?): String? {
+		if (chapters.isNullOrEmpty()) {
+			return null
+		}
+		val groups = chapters.groupBy { it.branch }
+		val locale = Locale.getDefault()
+		var language = locale.displayLanguage.toTitleCase(locale)
+		if (groups.containsKey(language)) {
+			return language
+		}
+		language = locale.displayName.toTitleCase(locale)
+		if (groups.containsKey(language)) {
+			return language
+		}
+		return groups.maxByOrNull { it.value.size }?.key
+	}
 }

app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt

@@ -3,28 +3,29 @@ package org.koitharu.kotatsu.details.ui.adapter
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.databinding.ItemChapterBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.history.domain.ChapterExtra
 import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.textAndVisible
 
 fun chapterListItemAD(
-	clickListener: OnListItemClickListener<MangaChapter>
+	clickListener: OnListItemClickListener<ChapterListItem>,
 ) = adapterDelegateViewBinding<ChapterListItem, ChapterListItem, ItemChapterBinding>(
 	{ inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) }
 ) {
 
 	itemView.setOnClickListener {
-		clickListener.onItemClick(item.chapter, it)
+		clickListener.onItemClick(item, it)
 	}
 	itemView.setOnLongClickListener {
-		clickListener.onItemLongClick(item.chapter, it)
+		clickListener.onItemLongClick(item, it)
 	}
 
-	bind { payload ->
+	bind {
 		binding.textViewTitle.text = item.chapter.name
 		binding.textViewNumber.text = item.chapter.number.toString()
+		binding.textViewDescription.textAndVisible = item.description()
 		when (item.extra) {
 			ChapterExtra.UNREAD -> {
 				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_default)
@@ -43,5 +44,8 @@ fun chapterListItemAD(
 				binding.textViewNumber.setTextColor(context.getThemeColor(android.R.attr.textColorPrimaryInverse))
 			}
 		}
+		binding.textViewTitle.alpha = if (item.isMissing) 0.3f else 1f
+		binding.textViewDescription.alpha = if (item.isMissing) 0.3f else 1f
+		binding.textViewNumber.alpha = if (item.isMissing) 0.3f else 1f
 	}
 }

app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt

@@ -3,12 +3,11 @@ package org.koitharu.kotatsu.details.ui.adapter
 import androidx.recyclerview.widget.DiffUtil
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import kotlin.jvm.internal.Intrinsics
 
 class ChaptersAdapter(
-	onItemClickListener: OnListItemClickListener<MangaChapter>
+	onItemClickListener: OnListItemClickListener<ChapterListItem>,
 ) :	AsyncListDifferDelegationAdapter<ChapterListItem>(DiffCallback()) {
 
 	init {
@@ -20,10 +19,6 @@ class ChaptersAdapter(
 		return items[position].chapter.id
 	}
 
-	fun setItems(newItems: List<ChapterListItem>, callback: Runnable) {
-		differ.submitList(newItems, callback)
-	}
-
 	private class DiffCallback : DiffUtil.ItemCallback<ChapterListItem>() {
 
 		override fun areItemsTheSame(oldItem: ChapterListItem, newItem: ChapterListItem): Boolean {
@@ -38,7 +33,7 @@ class ChaptersAdapter(
 		}
 
 		override fun getChangePayload(oldItem: ChapterListItem, newItem: ChapterListItem): Any? {
-			if (oldItem.extra != newItem.extra) {
+			if (oldItem.extra != newItem.extra && oldItem.chapter == newItem.chapter) {
 				return newItem.extra
 			}
 			return null

app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt

@@ -5,5 +5,17 @@ import org.koitharu.kotatsu.history.domain.ChapterExtra
 
 data class ChapterListItem(
 	val chapter: MangaChapter,
-	val extra: ChapterExtra
+	val extra: ChapterExtra,
-)
+	val isMissing: Boolean,
+	val uploadDate: String?,
+) {
+
+	fun description(): CharSequence? {
+		val scanlator = chapter.scanlator?.takeUnless { it.isBlank() }
+		return when {
+			uploadDate != null && scanlator != null -> "$uploadDate • $scanlator"
+			scanlator != null -> scanlator
+			else -> uploadDate
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt

@@ -2,8 +2,15 @@ package org.koitharu.kotatsu.details.ui.model
 
 import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.history.domain.ChapterExtra
+import java.text.DateFormat
 
-fun MangaChapter.toListItem(extra: ChapterExtra) = ChapterListItem(
+fun MangaChapter.toListItem(
+	extra: ChapterExtra,
+	isMissing: Boolean,
+	dateFormat: DateFormat,
+) = ChapterListItem(
 	chapter = this,
-	extra = extra
+	extra = extra,
+	isMissing = isMissing,
+	uploadDate = if (uploadDate != 0L) dateFormat.format(uploadDate) else null
 )

app/src/main/java/org/koitharu/kotatsu/download/DownloadNotification.kt

@@ -1,153 +0,0 @@
-package org.koitharu.kotatsu.download
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.graphics.drawable.Drawable
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.utils.PendingIntentCompat
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import kotlin.math.roundToInt
-
-class DownloadNotification(private val context: Context) {
-
-	private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-	private val manager =
-		context.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-	init {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-			&& manager.getNotificationChannel(CHANNEL_ID) == null
-		) {
-			val channel = NotificationChannel(
-				CHANNEL_ID,
-				context.getString(R.string.downloads),
-				NotificationManager.IMPORTANCE_LOW
-			)
-			channel.enableVibration(false)
-			channel.enableLights(false)
-			channel.setSound(null, null)
-			manager.createNotificationChannel(channel)
-		}
-		builder.setOnlyAlertOnce(true)
-		builder.setDefaults(0)
-		builder.color = ContextCompat.getColor(context, R.color.blue_primary)
-	}
-
-	fun fillFrom(manga: Manga) {
-		builder.setContentTitle(manga.title)
-		builder.setContentText(context.getString(R.string.manga_downloading_))
-		builder.setProgress(1, 0, true)
-		builder.setSmallIcon(android.R.drawable.stat_sys_download)
-		builder.setLargeIcon(null)
-		builder.setContentIntent(null)
-		builder.setStyle(null)
-	}
-
-	fun setCancelId(startId: Int) {
-		if (startId == 0) {
-			builder.clearActions()
-		} else {
-			val intent = DownloadService.getCancelIntent(context, startId)
-			builder.addAction(
-				R.drawable.ic_cross,
-				context.getString(android.R.string.cancel),
-				PendingIntent.getService(
-					context,
-					startId,
-					intent,
-					PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-				)
-			)
-		}
-	}
-
-	fun setError(e: Throwable) {
-		val message = e.getDisplayMessage(context.resources)
-		builder.setProgress(0, 0, false)
-		builder.setSmallIcon(android.R.drawable.stat_notify_error)
-		builder.setSubText(context.getString(R.string.error))
-		builder.setContentText(message)
-		builder.setAutoCancel(true)
-		builder.setContentIntent(null)
-		builder.setCategory(NotificationCompat.CATEGORY_ERROR)
-		builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
-	}
-
-	fun setLargeIcon(icon: Drawable?) {
-		builder.setLargeIcon(icon?.toBitmap())
-	}
-
-	fun setProgress(chaptersTotal: Int, pagesTotal: Int, chapter: Int, page: Int) {
-		val max = chaptersTotal * PROGRESS_STEP
-		val progress =
-			chapter * PROGRESS_STEP + (page / pagesTotal.toFloat() * PROGRESS_STEP).roundToInt()
-		val percent = (progress / max.toFloat() * 100).roundToInt()
-		builder.setProgress(max, progress, false)
-		builder.setContentText("%d%%".format(percent))
-		builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
-		builder.setStyle(null)
-	}
-
-	fun setWaitingForNetwork() {
-		builder.setProgress(0, 0, false)
-		builder.setContentText(context.getString(R.string.waiting_for_network))
-		builder.setStyle(null)
-	}
-
-	fun setPostProcessing() {
-		builder.setProgress(1, 0, true)
-		builder.setContentText(context.getString(R.string.processing_))
-		builder.setStyle(null)
-	}
-
-	fun setDone(manga: Manga) {
-		builder.setProgress(0, 0, false)
-		builder.setContentText(context.getString(R.string.download_complete))
-		builder.setContentIntent(createIntent(context, manga))
-		builder.setAutoCancel(true)
-		builder.setSmallIcon(android.R.drawable.stat_sys_download_done)
-		builder.setCategory(null)
-		builder.setStyle(null)
-	}
-
-	fun setCancelling() {
-		builder.setProgress(1, 0, true)
-		builder.setContentText(context.getString(R.string.cancelling_))
-		builder.setContentIntent(null)
-		builder.setStyle(null)
-	}
-
-	fun update(id: Int = NOTIFICATION_ID) {
-		manager.notify(id, builder.build())
-	}
-
-	fun dismiss(id: Int = NOTIFICATION_ID) {
-		manager.cancel(id)
-	}
-
-	operator fun invoke(): Notification = builder.build()
-
-	companion object {
-
-		const val NOTIFICATION_ID = 201
-		const val CHANNEL_ID = "download"
-
-		private const val PROGRESS_STEP = 20
-
-		private fun createIntent(context: Context, manga: Manga) = PendingIntent.getActivity(
-			context,
-			manga.hashCode(),
-			DetailsActivity.newIntent(context, manga),
-			PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-		)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/download/DownloadService.kt

@@ -1,274 +0,0 @@
-package org.koitharu.kotatsu.download
-
-import android.content.Context
-import android.content.Intent
-import android.net.ConnectivityManager
-import android.os.PowerManager
-import android.webkit.MimeTypeMap
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import coil.ImageLoader
-import coil.request.ImageRequest
-import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okio.IOException
-import org.koin.android.ext.android.get
-import org.koin.android.ext.android.inject
-import org.koin.core.context.GlobalContext
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseService
-import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.local.data.MangaZip
-import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.utils.CacheUtils
-import org.koitharu.kotatsu.utils.ext.*
-import java.io.File
-import java.util.concurrent.TimeUnit
-import kotlin.collections.set
-import kotlin.math.absoluteValue
-
-class DownloadService : BaseService() {
-
-	private lateinit var notification: DownloadNotification
-	private lateinit var wakeLock: PowerManager.WakeLock
-	private lateinit var connectivityManager: ConnectivityManager
-
-	private val okHttp by inject<OkHttpClient>()
-	private val cache by inject<PagesCache>()
-	private val settings by inject<AppSettings>()
-	private val imageLoader by inject<ImageLoader>()
-	private val jobs = HashMap<Int, Job>()
-	private val mutex = Mutex()
-
-	override fun onCreate() {
-		super.onCreate()
-		notification = DownloadNotification(this)
-		connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-		wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
-			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
-		when (intent?.action) {
-			ACTION_DOWNLOAD_START -> {
-				val manga = intent.getParcelableExtra<Manga>(EXTRA_MANGA)
-				val chapters = intent.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toArraySet()
-				if (manga != null) {
-					jobs[startId] = downloadManga(manga, chapters, startId)
-					Toast.makeText(this, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
-				} else {
-					stopSelf(startId)
-				}
-			}
-			ACTION_DOWNLOAD_CANCEL -> {
-				val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
-				jobs.remove(cancelId)?.cancel()
-				stopSelf(startId)
-			}
-			else -> stopSelf(startId)
-		}
-		return START_NOT_STICKY
-	}
-
-	private fun downloadManga(manga: Manga, chaptersIds: Set<Long>?, startId: Int): Job {
-		return lifecycleScope.launch(Dispatchers.Default) {
-			mutex.lock()
-			wakeLock.acquire(TimeUnit.HOURS.toMillis(1))
-			notification.fillFrom(manga)
-			notification.setCancelId(startId)
-			withContext(Dispatchers.Main) {
-				startForeground(DownloadNotification.NOTIFICATION_ID, notification())
-			}
-			val destination = settings.getStorageDir(this@DownloadService)
-			checkNotNull(destination) { getString(R.string.cannot_find_available_storage) }
-			var output: MangaZip? = null
-			try {
-				val repo = mangaRepositoryOf(manga.source)
-				val cover = runCatching {
-					imageLoader.execute(
-						ImageRequest.Builder(this@DownloadService)
-							.data(manga.coverUrl)
-							.build()
-					).drawable
-				}.getOrNull()
-				notification.setLargeIcon(cover)
-				notification.update()
-				val data = if (manga.chapters == null) repo.getDetails(manga) else manga
-				output = MangaZip.findInDir(destination, data)
-				output.prepare(data)
-				val coverUrl = data.largeCoverUrl ?: data.coverUrl
-				downloadFile(coverUrl, data.publicUrl, destination).let { file ->
-					output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
-				}
-				val chapters = if (chaptersIds == null) {
-					data.chapters.orEmpty()
-				} else {
-					data.chapters.orEmpty().filter { x -> x.id in chaptersIds }
-				}
-				for ((chapterIndex, chapter) in chapters.withIndex()) {
-					if (chaptersIds == null || chapter.id in chaptersIds) {
-						val pages = repo.getPages(chapter)
-						for ((pageIndex, page) in pages.withIndex()) {
-							failsafe@ do {
-								try {
-									val url = repo.getPageUrl(page)
-									val file =
-										cache[url] ?: downloadFile(url, page.referer, destination)
-									output.addPage(
-										chapter,
-										file,
-										pageIndex,
-										MimeTypeMap.getFileExtensionFromUrl(url)
-									)
-								} catch (e: IOException) {
-									notification.setWaitingForNetwork()
-									notification.update()
-									connectivityManager.waitForNetwork()
-									continue@failsafe
-								}
-							} while (false)
-							notification.setProgress(
-								chapters.size,
-								pages.size,
-								chapterIndex,
-								pageIndex
-							)
-							notification.update()
-						}
-					}
-				}
-				notification.setCancelId(0)
-				notification.setPostProcessing()
-				notification.update()
-				if (!output.compress()) {
-					throw RuntimeException("Cannot create target file")
-				}
-				val result = get<LocalMangaRepository>().getFromFile(output.file)
-				notification.setDone(result)
-				notification.dismiss()
-				notification.update(manga.id.toInt().absoluteValue)
-			} catch (_: CancellationException) {
-				withContext(NonCancellable) {
-					notification.setCancelling()
-					notification.setCancelId(0)
-					notification.update()
-				}
-			} catch (e: Throwable) {
-				if (BuildConfig.DEBUG) {
-					e.printStackTrace()
-				}
-				notification.setError(e)
-				notification.setCancelId(0)
-				notification.dismiss()
-				notification.update(manga.id.toInt().absoluteValue)
-			} finally {
-				withContext(NonCancellable) {
-					jobs.remove(startId)
-					output?.cleanup()
-					destination.sub(TEMP_PAGE_FILE).deleteAwait()
-					withContext(Dispatchers.Main) {
-						stopForeground(true)
-						notification.dismiss()
-						stopSelf(startId)
-					}
-					if (wakeLock.isHeld) {
-						wakeLock.release()
-					}
-					mutex.unlock()
-				}
-			}
-		}
-	}
-
-	private suspend fun downloadFile(url: String, referer: String, destination: File): File {
-		val request = Request.Builder()
-			.url(url)
-			.header(CommonHeaders.REFERER, referer)
-			.cacheControl(CacheUtils.CONTROL_DISABLED)
-			.get()
-			.build()
-		val call = okHttp.newCall(request)
-		var attempts = MAX_DOWNLOAD_ATTEMPTS
-		val file = destination.sub(TEMP_PAGE_FILE)
-		while (true) {
-			try {
-				val response = call.clone().await()
-				withContext(Dispatchers.IO) {
-					file.outputStream().use { out ->
-						checkNotNull(response.body).byteStream().copyTo(out)
-					}
-				}
-				return file
-			} catch (e: IOException) {
-				attempts--
-				if (attempts <= 0) {
-					throw e
-				} else {
-					delay(DOWNLOAD_ERROR_DELAY)
-				}
-			}
-		}
-	}
-
-	companion object {
-
-		private const val ACTION_DOWNLOAD_START =
-			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_START"
-		private const val ACTION_DOWNLOAD_CANCEL =
-			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_CANCEL"
-
-		private const val EXTRA_MANGA = "manga"
-		private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
-		private const val EXTRA_CANCEL_ID = "cancel_id"
-
-		private const val MAX_DOWNLOAD_ATTEMPTS = 3
-		private const val DOWNLOAD_ERROR_DELAY = 500L
-		private const val TEMP_PAGE_FILE = "page.tmp"
-
-		fun start(context: Context, manga: Manga, chaptersIds: Collection<Long>? = null) {
-			confirmDataTransfer(context) {
-				val intent = Intent(context, DownloadService::class.java)
-				intent.action = ACTION_DOWNLOAD_START
-				intent.putExtra(EXTRA_MANGA, manga)
-				if (chaptersIds != null) {
-					intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
-				}
-				ContextCompat.startForegroundService(context, intent)
-			}
-		}
-
-		fun getCancelIntent(context: Context, startId: Int) =
-			Intent(context, DownloadService::class.java)
-				.setAction(ACTION_DOWNLOAD_CANCEL)
-				.putExtra(ACTION_DOWNLOAD_CANCEL, startId)
-
-		private fun confirmDataTransfer(context: Context, callback: () -> Unit) {
-			val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-			val settings = GlobalContext.get().get<AppSettings>()
-			if (cm.isActiveNetworkMetered && settings.isTrafficWarningEnabled) {
-				CheckBoxAlertDialog.Builder(context)
-					.setTitle(R.string.warning)
-					.setMessage(R.string.network_consumption_warning)
-					.setCheckBoxText(R.string.dont_ask_again)
-					.setCheckBoxChecked(false)
-					.setNegativeButton(android.R.string.cancel, null)
-					.setPositiveButton(R.string._continue) { _, doNotAsk ->
-						settings.isTrafficWarningEnabled = !doNotAsk
-						callback()
-					}.create()
-					.show()
-			} else {
-				callback()
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt

@@ -0,0 +1,239 @@
+package org.koitharu.kotatsu.download.domain
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.net.ConnectivityManager
+import android.webkit.MimeTypeMap
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.size.Scale
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okio.IOException
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.local.data.MangaZip
+import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.utils.CacheUtils
+import org.koitharu.kotatsu.utils.ext.await
+import org.koitharu.kotatsu.utils.ext.deleteAwait
+import org.koitharu.kotatsu.utils.ext.waitForNetwork
+import java.io.File
+
+class DownloadManager(
+	private val context: Context,
+	private val settings: AppSettings,
+	private val imageLoader: ImageLoader,
+	private val okHttp: OkHttpClient,
+	private val cache: PagesCache,
+	private val localMangaRepository: LocalMangaRepository,
+) {
+
+	private val connectivityManager = context.getSystemService(
+		Context.CONNECTIVITY_SERVICE
+	) as ConnectivityManager
+	private val coverWidth = context.resources.getDimensionPixelSize(
+		androidx.core.R.dimen.compat_notification_large_icon_max_width
+	)
+	private val coverHeight = context.resources.getDimensionPixelSize(
+		androidx.core.R.dimen.compat_notification_large_icon_max_height
+	)
+
+	fun downloadManga(manga: Manga, chaptersIds: Set<Long>?, startId: Int) = flow<State> {
+		emit(State.Preparing(startId, manga, null))
+		var cover: Drawable? = null
+		val destination = settings.getStorageDir(context)
+		checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
+		var output: MangaZip? = null
+		try {
+			val repo = MangaRepository(manga.source)
+			cover = runCatching {
+				imageLoader.execute(
+					ImageRequest.Builder(context)
+						.data(manga.coverUrl)
+						.size(coverWidth, coverHeight)
+						.scale(Scale.FILL)
+						.build()
+				).drawable
+			}.getOrNull()
+			emit(State.Preparing(startId, manga, cover))
+			val data = if (manga.chapters == null) repo.getDetails(manga) else manga
+			output = MangaZip.findInDir(destination, data)
+			output.prepare(data)
+			val coverUrl = data.largeCoverUrl ?: data.coverUrl
+			downloadFile(coverUrl, data.publicUrl, destination).let { file ->
+				output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
+			}
+			val chapters = if (chaptersIds == null) {
+				data.chapters.orEmpty()
+			} else {
+				data.chapters.orEmpty().filter { x -> x.id in chaptersIds }
+			}
+			for ((chapterIndex, chapter) in chapters.withIndex()) {
+				if (chaptersIds == null || chapter.id in chaptersIds) {
+					val pages = repo.getPages(chapter)
+					for ((pageIndex, page) in pages.withIndex()) {
+						failsafe@ do {
+							try {
+								val url = repo.getPageUrl(page)
+								val file =
+									cache[url] ?: downloadFile(url, page.referer, destination)
+								output.addPage(
+									chapter,
+									file,
+									pageIndex,
+									MimeTypeMap.getFileExtensionFromUrl(url)
+								)
+							} catch (e: IOException) {
+								emit(State.WaitingForNetwork(startId, manga, cover))
+								connectivityManager.waitForNetwork()
+								continue@failsafe
+							}
+						} while (false)
+
+						emit(State.Progress(
+							startId, manga, cover,
+							totalChapters = chapters.size,
+							currentChapter = chapterIndex,
+							totalPages = pages.size,
+							currentPage = pageIndex,
+						))
+					}
+				}
+			}
+			emit(State.PostProcessing(startId, manga, cover))
+			if (!output.compress()) {
+				throw RuntimeException("Cannot create target file")
+			}
+			val localManga = localMangaRepository.getFromFile(output.file)
+			emit(State.Done(startId, manga, cover, localManga))
+		} catch (_: CancellationException) {
+			emit(State.Cancelling(startId, manga, cover))
+		} catch (e: Throwable) {
+			if (BuildConfig.DEBUG) {
+				e.printStackTrace()
+			}
+			emit(State.Error(startId, manga, cover, e))
+		} finally {
+			withContext(NonCancellable) {
+				output?.cleanup()
+				File(destination, TEMP_PAGE_FILE).deleteAwait()
+			}
+		}
+	}.catch { e ->
+		emit(State.Error(startId, manga, null, e))
+	}
+
+	private suspend fun downloadFile(url: String, referer: String, destination: File): File {
+		val request = Request.Builder()
+			.url(url)
+			.header(CommonHeaders.REFERER, referer)
+			.cacheControl(CacheUtils.CONTROL_DISABLED)
+			.get()
+			.build()
+		val call = okHttp.newCall(request)
+		var attempts = MAX_DOWNLOAD_ATTEMPTS
+		val file = File(destination, TEMP_PAGE_FILE)
+		while (true) {
+			try {
+				val response = call.clone().await()
+				withContext(Dispatchers.IO) {
+					file.outputStream().use { out ->
+						checkNotNull(response.body).byteStream().copyTo(out)
+					}
+				}
+				return file
+			} catch (e: IOException) {
+				attempts--
+				if (attempts <= 0) {
+					throw e
+				} else {
+					delay(DOWNLOAD_ERROR_DELAY)
+				}
+			}
+		}
+	}
+
+	sealed interface State {
+
+		val startId: Int
+		val manga: Manga
+		val cover: Drawable?
+
+		data class Queued(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		) : State
+
+		data class Preparing(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		) : State
+
+		data class Progress(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+			val totalChapters: Int,
+			val currentChapter: Int,
+			val totalPages: Int,
+			val currentPage: Int,
+		): State {
+
+			val max: Int = totalChapters * totalPages
+
+			val progress: Int = totalPages * currentChapter + currentPage + 1
+
+			val percent: Float = progress.toFloat() / max
+		}
+
+		data class WaitingForNetwork(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		): State
+
+		data class Done(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+			val localManga: Manga,
+		) : State
+
+		data class Error(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+			val error: Throwable,
+		) : State
+
+		data class Cancelling(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		): State
+
+		data class PostProcessing(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		) : State
+	}
+
+	private companion object {
+
+		private const val MAX_DOWNLOAD_ATTEMPTS = 3
+		private const val DOWNLOAD_ERROR_DELAY = 500L
+		private const val TEMP_PAGE_FILE = "page.tmp"
+	}
+}

app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt

@@ -0,0 +1,106 @@
+package org.koitharu.kotatsu.download.ui
+
+import androidx.core.view.isVisible
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ItemDownloadBinding
+import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.utils.JobStateFlow
+import org.koitharu.kotatsu.utils.ext.*
+
+fun downloadItemAD(
+	scope: CoroutineScope,
+	coil: ImageLoader,
+) = adapterDelegateViewBinding<JobStateFlow<DownloadManager.State>, JobStateFlow<DownloadManager.State>, ItemDownloadBinding>(
+	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) }
+) {
+
+	var job: Job? = null
+
+	bind {
+		job?.cancel()
+		job = item.onFirst { state ->
+			binding.imageViewCover.newImageRequest(state.manga.coverUrl)
+				.referer(state.manga.publicUrl)
+				.placeholder(state.cover)
+				.fallback(R.drawable.ic_placeholder)
+				.error(R.drawable.ic_placeholder)
+				.allowRgb565(true)
+				.enqueueWith(coil)
+		}.onEach { state ->
+			binding.textViewTitle.text = state.manga.title
+			when (state) {
+				is DownloadManager.State.Cancelling -> {
+					binding.textViewStatus.setText(R.string.cancelling_)
+					binding.progressBar.setIndeterminateCompat(true)
+					binding.progressBar.isVisible = true
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Done -> {
+					binding.textViewStatus.setText(R.string.download_complete)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = false
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Error -> {
+					binding.textViewStatus.setText(R.string.error_occurred)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = false
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.text = state.error.getDisplayMessage(context.resources)
+					binding.textViewDetails.isVisible = true
+				}
+				is DownloadManager.State.PostProcessing -> {
+					binding.textViewStatus.setText(R.string.processing_)
+					binding.progressBar.setIndeterminateCompat(true)
+					binding.progressBar.isVisible = true
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Preparing -> {
+					binding.textViewStatus.setText(R.string.preparing_)
+					binding.progressBar.setIndeterminateCompat(true)
+					binding.progressBar.isVisible = true
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Progress -> {
+					binding.textViewStatus.setText(R.string.manga_downloading_)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = true
+					binding.progressBar.max = state.max
+					binding.progressBar.setProgressCompat(state.progress, true)
+					binding.textViewPercent.text = (state.percent * 100f).format(1) + "%"
+					binding.textViewPercent.isVisible = true
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Queued -> {
+					binding.textViewStatus.setText(R.string.queued)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = false
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.WaitingForNetwork -> {
+					binding.textViewStatus.setText(R.string.waiting_for_network)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = false
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+			}
+		}.launchIn(scope)
+	}
+
+	onViewRecycled {
+		job?.cancel()
+		job = null
+	}
+}

app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt

@@ -0,0 +1,59 @@
+package org.koitharu.kotatsu.download.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.koin.android.ext.android.get
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityDownloadsBinding
+import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.utils.LifecycleAwareServiceConnection
+
+class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityDownloadsBinding.inflate(layoutInflater))
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		val adapter = DownloadsAdapter(lifecycleScope, get())
+		binding.recyclerView.setHasFixedSize(true)
+		binding.recyclerView.adapter = adapter
+		LifecycleAwareServiceConnection.bindService(
+			this,
+			this,
+			Intent(this, DownloadService::class.java),
+			0
+		).service.flatMapLatest { binder ->
+			(binder as? DownloadService.DownloadBinder)?.downloads ?: flowOf(null)
+		}.onEach {
+			adapter.items = it?.toList().orEmpty()
+			binding.textViewHolder.isVisible = it.isNullOrEmpty()
+		}.launchIn(lifecycleScope)
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.recyclerView.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom
+		)
+		binding.toolbar.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			top = insets.top
+		)
+	}
+
+	companion object {
+
+		fun newIntent(context: Context) = Intent(context, DownloadsActivity::class.java)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt

@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.download.ui
+
+import androidx.recyclerview.widget.DiffUtil
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlinx.coroutines.CoroutineScope
+import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.utils.JobStateFlow
+
+class DownloadsAdapter(
+	scope: CoroutineScope,
+	coil: ImageLoader,
+) : AsyncListDifferDelegationAdapter<JobStateFlow<DownloadManager.State>>(DiffCallback()) {
+
+	init {
+		delegatesManager.addDelegate(downloadItemAD(scope, coil))
+		setHasStableIds(true)
+	}
+
+	override fun getItemId(position: Int): Long {
+		return items[position].value.startId.toLong()
+	}
+
+	private class DiffCallback : DiffUtil.ItemCallback<JobStateFlow<DownloadManager.State>>() {
+
+		override fun areItemsTheSame(
+			oldItem: JobStateFlow<DownloadManager.State>,
+			newItem: JobStateFlow<DownloadManager.State>,
+		): Boolean {
+			return oldItem.value.startId == newItem.value.startId
+		}
+
+		override fun areContentsTheSame(
+			oldItem: JobStateFlow<DownloadManager.State>,
+			newItem: JobStateFlow<DownloadManager.State>,
+		): Boolean {
+			return oldItem.value == newItem.value
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt

@@ -0,0 +1,144 @@
+package org.koitharu.kotatsu.download.ui.service
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.toBitmap
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.download.ui.DownloadsActivity
+import org.koitharu.kotatsu.utils.PendingIntentCompat
+import org.koitharu.kotatsu.utils.ext.format
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+
+class DownloadNotification(
+	private val context: Context,
+	startId: Int,
+) {
+
+	private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+	private val cancelAction = NotificationCompat.Action(
+		R.drawable.ic_cross,
+		context.getString(android.R.string.cancel),
+		PendingIntent.getBroadcast(
+			context,
+			startId,
+			DownloadService.getCancelIntent(startId),
+			PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+		)
+	)
+	private val listIntent = PendingIntent.getActivity(
+		context,
+		REQUEST_LIST,
+		DownloadsActivity.newIntent(context),
+		PendingIntentCompat.FLAG_IMMUTABLE,
+	)
+
+	init {
+		builder.setOnlyAlertOnce(true)
+		builder.setDefaults(0)
+		builder.color = ContextCompat.getColor(context, R.color.blue_primary)
+	}
+
+	fun create(state: DownloadManager.State): Notification {
+		builder.setContentTitle(state.manga.title)
+		builder.setContentText(context.getString(R.string.manga_downloading_))
+		builder.setProgress(1, 0, true)
+		builder.setSmallIcon(android.R.drawable.stat_sys_download)
+		builder.setContentIntent(listIntent)
+		builder.setStyle(null)
+		builder.setLargeIcon(state.cover?.toBitmap())
+		builder.clearActions()
+		when (state) {
+			is DownloadManager.State.Cancelling -> {
+				builder.setProgress(1, 0, true)
+				builder.setContentText(context.getString(R.string.cancelling_))
+				builder.setContentIntent(null)
+				builder.setStyle(null)
+			}
+			is DownloadManager.State.Done -> {
+				builder.setProgress(0, 0, false)
+				builder.setContentText(context.getString(R.string.download_complete))
+				builder.setContentIntent(createMangaIntent(context, state.localManga))
+				builder.setAutoCancel(true)
+				builder.setSmallIcon(android.R.drawable.stat_sys_download_done)
+				builder.setCategory(null)
+				builder.setStyle(null)
+			}
+			is DownloadManager.State.Error -> {
+				val message = state.error.getDisplayMessage(context.resources)
+				builder.setProgress(0, 0, false)
+				builder.setSmallIcon(android.R.drawable.stat_notify_error)
+				builder.setSubText(context.getString(R.string.error))
+				builder.setContentText(message)
+				builder.setAutoCancel(true)
+				builder.setCategory(NotificationCompat.CATEGORY_ERROR)
+				builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
+			}
+			is DownloadManager.State.PostProcessing -> {
+				builder.setProgress(1, 0, true)
+				builder.setContentText(context.getString(R.string.processing_))
+				builder.setStyle(null)
+			}
+			is DownloadManager.State.Queued,
+			is DownloadManager.State.Preparing -> {
+				builder.setProgress(1, 0, true)
+				builder.setContentText(context.getString(R.string.preparing_))
+				builder.setStyle(null)
+				builder.addAction(cancelAction)
+			}
+			is DownloadManager.State.Progress -> {
+				builder.setProgress(state.max, state.progress, false)
+				builder.setContentText((state.percent * 100).format() + "%")
+				builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
+				builder.setStyle(null)
+				builder.addAction(cancelAction)
+			}
+			is DownloadManager.State.WaitingForNetwork -> {
+				builder.setProgress(0, 0, false)
+				builder.setContentText(context.getString(R.string.waiting_for_network))
+				builder.setStyle(null)
+				builder.addAction(cancelAction)
+			}
+		}
+		return builder.build()
+	}
+
+	private fun createMangaIntent(context: Context, manga: Manga) = PendingIntent.getActivity(
+		context,
+		manga.hashCode(),
+		DetailsActivity.newIntent(context, manga),
+		PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+	)
+
+	companion object {
+
+		private const val CHANNEL_ID = "download"
+		private const val REQUEST_LIST = 6
+
+		fun createChannel(context: Context) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				val manager = NotificationManagerCompat.from(context)
+				if (manager.getNotificationChannel(CHANNEL_ID) == null) {
+					val channel = NotificationChannel(
+						CHANNEL_ID,
+						context.getString(R.string.downloads),
+						NotificationManager.IMPORTANCE_LOW
+					)
+					channel.enableVibration(false)
+					channel.enableLights(false)
+					channel.setSound(null, null)
+					manager.createNotificationChannel(channel)
+				}
+			}
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt

@@ -0,0 +1,201 @@
+package org.koitharu.kotatsu.download.ui.service
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.os.Binder
+import android.os.IBinder
+import android.os.PowerManager
+import android.widget.Toast
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.ServiceCompat
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.koin.android.ext.android.get
+import org.koin.core.context.GlobalContext
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseService
+import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.utils.JobStateFlow
+import org.koitharu.kotatsu.utils.ext.toArraySet
+import java.util.concurrent.TimeUnit
+import kotlin.collections.set
+
+class DownloadService : BaseService() {
+
+	private lateinit var notificationManager: NotificationManagerCompat
+	private lateinit var wakeLock: PowerManager.WakeLock
+	private lateinit var downloadManager: DownloadManager
+
+	private val jobs = LinkedHashMap<Int, JobStateFlow<DownloadManager.State>>()
+	private val jobCount = MutableStateFlow(0)
+	private val mutex = Mutex()
+	private val controlReceiver = ControlReceiver()
+	private var binder: DownloadBinder? = null
+
+	override fun onCreate() {
+		super.onCreate()
+		notificationManager = NotificationManagerCompat.from(this)
+		wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
+			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
+		downloadManager = DownloadManager(this, get(), get(), get(), get(), get())
+		DownloadNotification.createChannel(this)
+		registerReceiver(controlReceiver, IntentFilter(ACTION_DOWNLOAD_CANCEL))
+	}
+
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
+		val manga = intent?.getParcelableExtra<Manga>(EXTRA_MANGA)
+		val chapters = intent?.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toArraySet()
+		return if (manga != null) {
+			jobs[startId] = downloadManga(startId, manga, chapters)
+			jobCount.value = jobs.size
+			Toast.makeText(this, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
+			START_REDELIVER_INTENT
+		} else {
+			stopSelf(startId)
+			START_NOT_STICKY
+		}
+	}
+
+	override fun onBind(intent: Intent): IBinder {
+		super.onBind(intent)
+		return binder ?: DownloadBinder(this).also { binder = it }
+	}
+
+	override fun onDestroy() {
+		unregisterReceiver(controlReceiver)
+		binder = null
+		super.onDestroy()
+	}
+
+	private fun downloadManga(
+		startId: Int,
+		manga: Manga,
+		chaptersIds: Set<Long>?,
+	): JobStateFlow<DownloadManager.State> {
+		val initialState = DownloadManager.State.Queued(startId, manga, null)
+		val stateFlow = MutableStateFlow<DownloadManager.State>(initialState)
+		val job = lifecycleScope.launch {
+			mutex.withLock {
+				wakeLock.acquire(TimeUnit.HOURS.toMillis(1))
+				val notification = DownloadNotification(this@DownloadService, startId)
+				startForeground(startId, notification.create(initialState))
+				try {
+					withContext(Dispatchers.Default) {
+						downloadManager.downloadManga(manga, chaptersIds, startId)
+							.collect { state ->
+								stateFlow.value = state
+								notificationManager.notify(startId, notification.create(state))
+							}
+					}
+					if (stateFlow.value is DownloadManager.State.Done) {
+						sendBroadcast(
+							Intent(ACTION_DOWNLOAD_COMPLETE)
+								.putExtra(EXTRA_MANGA, manga)
+						)
+					}
+				} finally {
+					ServiceCompat.stopForeground(
+						this@DownloadService,
+						if (isActive) {
+							ServiceCompat.STOP_FOREGROUND_DETACH
+						} else {
+							ServiceCompat.STOP_FOREGROUND_REMOVE
+						}
+					)
+					if (wakeLock.isHeld) {
+						wakeLock.release()
+					}
+					stopSelf(startId)
+				}
+			}
+		}
+		return JobStateFlow(stateFlow, job)
+	}
+
+	inner class ControlReceiver : BroadcastReceiver() {
+
+		override fun onReceive(context: Context, intent: Intent?) {
+			when (intent?.action) {
+				ACTION_DOWNLOAD_CANCEL -> {
+					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
+					jobs.remove(cancelId)?.cancel()
+					jobCount.value = jobs.size
+				}
+			}
+		}
+	}
+
+	class DownloadBinder(private val service: DownloadService) : Binder() {
+
+		val downloads: Flow<Collection<JobStateFlow<DownloadManager.State>>>
+			get() = service.jobCount.mapLatest { service.jobs.values }
+	}
+
+	companion object {
+
+		const val ACTION_DOWNLOAD_COMPLETE =
+			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_COMPLETE"
+
+		private const val ACTION_DOWNLOAD_CANCEL =
+			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_CANCEL"
+
+		private const val EXTRA_MANGA = "manga"
+		private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
+		private const val EXTRA_CANCEL_ID = "cancel_id"
+
+		fun start(context: Context, manga: Manga, chaptersIds: Collection<Long>? = null) {
+			if (chaptersIds?.isEmpty() == true) {
+				return
+			}
+			confirmDataTransfer(context) {
+				val intent = Intent(context, DownloadService::class.java)
+				intent.putExtra(EXTRA_MANGA, manga)
+				if (chaptersIds != null) {
+					intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
+				}
+				ContextCompat.startForegroundService(context, intent)
+			}
+		}
+
+		fun getCancelIntent(startId: Int) = Intent(ACTION_DOWNLOAD_CANCEL)
+			.putExtra(ACTION_DOWNLOAD_CANCEL, startId)
+
+		private fun confirmDataTransfer(context: Context, callback: () -> Unit) {
+			val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+			val settings = GlobalContext.get().get<AppSettings>()
+			if (cm.isActiveNetworkMetered && settings.isTrafficWarningEnabled) {
+				CheckBoxAlertDialog.Builder(context)
+					.setTitle(R.string.warning)
+					.setMessage(R.string.network_consumption_warning)
+					.setCheckBoxText(R.string.dont_ask_again)
+					.setCheckBoxChecked(false)
+					.setNegativeButton(android.R.string.cancel, null)
+					.setPositiveButton(R.string._continue) { _, doNotAsk ->
+						settings.isTrafficWarningEnabled = !doNotAsk
+						callback()
+					}.create()
+					.show()
+			} else {
+				callback()
+			}
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.favourites.data
 
 import androidx.room.*
 import kotlinx.coroutines.flow.Flow
-import org.koitharu.kotatsu.core.model.FavouriteCategory
 
 @Dao
 abstract class FavouriteCategoriesDao {
@@ -13,6 +12,9 @@ abstract class FavouriteCategoriesDao {
 	@Query("SELECT * FROM favourite_categories ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<FavouriteCategoryEntity>>
 
+	@Query("SELECT * FROM favourite_categories WHERE category_id = :id")
+	abstract fun observe(id: Long): Flow<FavouriteCategoryEntity>
+
 	@Insert(onConflict = OnConflictStrategy.ABORT)
 	abstract suspend fun insert(category: FavouriteCategoryEntity): Long
 
@@ -23,10 +25,13 @@ abstract class FavouriteCategoriesDao {
 	abstract suspend fun delete(id: Long)
 
 	@Query("UPDATE favourite_categories SET title = :title WHERE category_id = :id")
-	abstract suspend fun update(id: Long, title: String)
+	abstract suspend fun updateTitle(id: Long, title: String)
+
+	@Query("UPDATE favourite_categories SET `order` = :order WHERE category_id = :id")
+	abstract suspend fun updateOrder(id: Long, order: String)
 
 	@Query("UPDATE favourite_categories SET sort_key = :sortKey WHERE category_id = :id")
-	abstract suspend fun update(id: Long, sortKey: Int)
+	abstract suspend fun updateSortKey(id: Long, sortKey: Int)
 
 	@Query("SELECT MAX(sort_key) FROM favourite_categories")
 	protected abstract suspend fun getMaxSortKey(): Int?

app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt

@@ -4,21 +4,24 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.model.SortOrder
 import java.util.*
 
 @Entity(tableName = "favourite_categories")
-data class FavouriteCategoryEntity(
+class FavouriteCategoryEntity(
 	@PrimaryKey(autoGenerate = true)
 	@ColumnInfo(name = "category_id") val categoryId: Int,
 	@ColumnInfo(name = "created_at") val createdAt: Long,
 	@ColumnInfo(name = "sort_key") val sortKey: Int,
-	@ColumnInfo(name = "title") val title: String
+	@ColumnInfo(name = "title") val title: String,
+	@ColumnInfo(name = "order") val order: String,
 ) {
 
 	fun toFavouriteCategory(id: Long? = null) = FavouriteCategory(
 		id = id ?: categoryId.toLong(),
 		title = title,
 		sortKey = sortKey,
-		createdAt = Date(createdAt)
+		order = SortOrder.values().find { x -> x.name == order } ?: SortOrder.NEWEST,
+		createdAt = Date(createdAt),
 	)
 }

app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt

@@ -21,7 +21,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 		)
 	]
 )
-data class FavouriteEntity(
+class FavouriteEntity(
 	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
 	@ColumnInfo(name = "category_id", index = true) val categoryId: Long,
 	@ColumnInfo(name = "created_at") val createdAt: Long

app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteManga.kt

@@ -7,7 +7,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 
-data class FavouriteManga(
+class FavouriteManga(
 	@Embedded val favourite: FavouriteEntity,
 	@Relation(
 		parentColumn = "manga_id",

app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt

@@ -1,8 +1,11 @@
 package org.koitharu.kotatsu.favourites.data
 
 import androidx.room.*
+import androidx.sqlite.db.SimpleSQLiteQuery
+import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.model.SortOrder
 
 @Dao
 abstract class FavouritesDao {
@@ -11,9 +14,13 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC")
 	abstract suspend fun findAll(): List<FavouriteManga>
 
-	@Transaction
+	fun observeAll(order: SortOrder): Flow<List<FavouriteManga>> {
-	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC")
+		val orderBy = getOrderBy(order)
-	abstract fun observeAll(): Flow<List<FavouriteManga>>
+		val query = SimpleSQLiteQuery(
+			"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id GROUP BY favourites.manga_id ORDER BY $orderBy",
+		)
+		return observeAllRaw(query)
+	}
 
 	@Transaction
 	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
@@ -23,9 +30,14 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC")
 	abstract suspend fun findAll(categoryId: Long): List<FavouriteManga>
 
-	@Transaction
+	fun observeAll(categoryId: Long, order: SortOrder): Flow<List<FavouriteManga>> {
-	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC")
+		val orderBy = getOrderBy(order)
-	abstract fun observeAll(categoryId: Long): Flow<List<FavouriteManga>>
+		val query = SimpleSQLiteQuery(
+			"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id WHERE category_id = ? GROUP BY favourites.manga_id ORDER BY $orderBy",
+			arrayOf<Any>(categoryId),
+		)
+		return observeAllRaw(query)
+	}
 
 	@Transaction
 	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
@@ -63,4 +75,16 @@ abstract class FavouritesDao {
 			insert(entity)
 		}
 	}
+
+	@Transaction
+	@RawQuery(observedEntities = [FavouriteEntity::class])
+	protected abstract fun observeAllRaw(query: SupportSQLiteQuery): Flow<List<FavouriteManga>>
+
+	private fun getOrderBy(sortOrder: SortOrder) = when(sortOrder) {
+		SortOrder.RATING -> "rating DESC"
+		SortOrder.NEWEST,
+		SortOrder.UPDATED -> "created_at DESC"
+		SortOrder.ALPHABETICAL -> "title ASC"
+		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
+	}
 }

app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt

@@ -3,12 +3,14 @@ package org.koitharu.kotatsu.favourites.domain
 import androidx.room.withTransaction
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 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.FavouriteCategory
 import org.koitharu.kotatsu.core.model.Manga
+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.utils.ext.mapItems
@@ -21,26 +23,26 @@ class FavouritesRepository(private val db: MangaDatabase) {
 		return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
 	}
 
-	fun observeAll(): Flow<List<Manga>> {
+	fun observeAll(order: SortOrder): Flow<List<Manga>> {
-		return db.favouritesDao.observeAll()
+		return db.favouritesDao.observeAll(order)
 			.mapItems { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
 	}
 
-	suspend fun getAllManga(offset: Int): List<Manga> {
-		val entities = db.favouritesDao.findAll(offset, 20)
-		return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
-	}
-
 	suspend fun getManga(categoryId: Long): List<Manga> {
 		val entities = db.favouritesDao.findAll(categoryId)
 		return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
 	}
 
-	fun observeAll(categoryId: Long): Flow<List<Manga>> {
+	fun observeAll(categoryId: Long, order: SortOrder): Flow<List<Manga>> {
-		return db.favouritesDao.observeAll(categoryId)
+		return db.favouritesDao.observeAll(categoryId, order)
 			.mapItems { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
 	}
 
+	fun observeAll(categoryId: Long): Flow<List<Manga>> {
+		return observeOrder(categoryId)
+			.flatMapLatest { order -> observeAll(categoryId, order) }
+	}
+
 	suspend fun getManga(categoryId: Long, offset: Int): List<Manga> {
 		val entities = db.favouritesDao.findAll(categoryId, offset, 20)
 		return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
@@ -77,25 +79,30 @@ class FavouritesRepository(private val db: MangaDatabase) {
 			title = title,
 			createdAt = System.currentTimeMillis(),
 			sortKey = db.favouriteCategoriesDao.getNextSortKey(),
-			categoryId = 0
+			categoryId = 0,
+			order = SortOrder.UPDATED.name,
 		)
 		val id = db.favouriteCategoriesDao.insert(entity)
 		return entity.toFavouriteCategory(id)
 	}
 
 	suspend fun renameCategory(id: Long, title: String) {
-		db.favouriteCategoriesDao.update(id, title)
+		db.favouriteCategoriesDao.updateTitle(id, title)
 	}
 
 	suspend fun removeCategory(id: Long) {
 		db.favouriteCategoriesDao.delete(id)
 	}
 
+	suspend fun setCategoryOrder(id: Long, order: SortOrder) {
+		db.favouriteCategoriesDao.updateOrder(id, order.name)
+	}
+
 	suspend fun reorderCategories(orderedIds: List<Long>) {
 		val dao = db.favouriteCategoriesDao
 		db.withTransaction {
 			for ((i, id) in orderedIds.withIndex()) {
-				dao.update(id, i)
+				dao.updateSortKey(id, i)
 			}
 		}
 	}
@@ -117,4 +124,10 @@ class FavouritesRepository(private val db: MangaDatabase) {
 	suspend fun removeFromFavourites(manga: Manga) {
 		db.favouritesDao.delete(manga.id)
 	}
+
+	private fun observeOrder(categoryId: Long): Flow<SortOrder> {
+		return db.favouriteCategoriesDao.observe(categoryId)
+			.map { x -> SortOrder.values().find { it.name == x.order } ?: SortOrder.NEWEST }
+			.distinctUntilChanged()
+	}
 }

app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.favourites.ui
 import android.os.Bundle
 import android.view.*
 import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
@@ -11,15 +12,17 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
+import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.utils.RecycledViewPoolHolder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.measureHeight
 import org.koitharu.kotatsu.utils.ext.showPopupMenu
 import java.util.*
-import kotlin.collections.ArrayList
 
 class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 	FavouritesTabLongClickListener, CategoriesEditDelegate.CategoriesEditCallback,
@@ -27,9 +30,7 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 
 	override val recycledViewPool = RecyclerView.RecycledViewPool()
 
-	private val viewModel by viewModel<FavouritesCategoriesViewModel>(
+	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
-		mode = LazyThreadSafetyMode.NONE
-	)
 	private val editDelegate by lazy(LazyThreadSafetyMode.NONE) {
 		CategoriesEditDelegate(requireContext(), this)
 	}
@@ -65,10 +66,22 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.tabs.updatePadding(
+		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
-			left = insets.left,
+		binding.root.updatePadding(
-			right = insets.right
+			top = headerHeight - insets.top
 		)
+		binding.pager.updatePadding(
+			top = -headerHeight
+		)
+		binding.tabs.apply {
+			updatePadding(
+				left = insets.left,
+				right = insets.right
+			)
+			updateLayoutParams<ViewGroup.MarginLayoutParams> {
+				topMargin = insets.top
+			}
+		}
 	}
 
 	private fun onCategoriesChanged(categories: List<FavouriteCategory>) {
@@ -100,11 +113,19 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 
 	override fun onTabLongClick(tabView: View, category: FavouriteCategory): Boolean {
 		val menuRes = if (category.id == 0L) R.menu.popup_category_empty else R.menu.popup_category
-		tabView.showPopupMenu(menuRes) {
+		tabView.showPopupMenu(menuRes, { menu ->
+			createOrderSubmenu(menu, category)
+		}) {
 			when (it.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(category)
 				R.id.action_rename -> editDelegate.renameCategory(category)
 				R.id.action_create -> editDelegate.createCategory()
+				R.id.action_order -> return@showPopupMenu false
+				else -> {
+					val order = CategoriesActivity.SORT_ORDERS.getOrNull(it.order)
+						?: return@showPopupMenu false
+					viewModel.setCategoryOrder(category.id, order)
+				}
 			}
 			true
 		}
@@ -125,11 +146,26 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 
 	private fun wrapCategories(categories: List<FavouriteCategory>): List<FavouriteCategory> {
 		val data = ArrayList<FavouriteCategory>(categories.size + 1)
-		data += FavouriteCategory(0L, getString(R.string.all_favourites), -1, Date())
+		data += FavouriteCategory(0L, getString(R.string.all_favourites), -1, SortOrder.NEWEST, Date())
 		data += categories
 		return data
 	}
 
+	private fun createOrderSubmenu(menu: Menu, category: FavouriteCategory) {
+		val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
+		for ((i, item) in CategoriesActivity.SORT_ORDERS.withIndex()) {
+			val menuItem = submenu.add(
+				R.id.group_order,
+				Menu.NONE,
+				i,
+				item.titleRes
+			)
+			menuItem.isCheckable = true
+			menuItem.isChecked = item == category.order
+		}
+		submenu.setGroupCheckable(R.id.group_order, true, true)
+	}
+
 	companion object {
 
 		fun newInstance() = FavouritesContainerFragment()

app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt

@@ -36,7 +36,7 @@ class FavouritesPagerAdapter(
 	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
 		val item = differ.currentList[position]
 		tab.text = item.title
-		tab.view.tag = item
+		tab.view.tag = item.id
 		tab.view.setOnLongClickListener(this)
 	}
 
@@ -45,7 +45,8 @@ class FavouritesPagerAdapter(
 	}
 
 	override fun onLongClick(v: View): Boolean {
-		val item = v.tag as? FavouriteCategory ?: return false
+		val itemId = v.tag as? Long ?: return false
+		val item = differ.currentList.find { x -> x.id == itemId } ?: return false
 		return longClickListener.onTabLongClick(v, item)
 	}
 

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
+import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.Insets
@@ -20,6 +21,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.showPopupMenu
@@ -28,9 +30,7 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 	OnListItemClickListener<FavouriteCategory>,
 	View.OnClickListener, CategoriesEditDelegate.CategoriesEditCallback {
 
-	private val viewModel by viewModel<FavouritesCategoriesViewModel>(
+	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
-		mode = LazyThreadSafetyMode.NONE
-	)
 
 	private lateinit var adapter: CategoriesAdapter
 	private lateinit var reorderHelper: ItemTouchHelper
@@ -44,6 +44,7 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 		adapter = CategoriesAdapter(this)
 		editDelegate = CategoriesEditDelegate(this, this)
 		binding.recyclerView.addItemDecoration(DividerItemDecoration(this, RecyclerView.VERTICAL))
+		binding.recyclerView.setHasFixedSize(true)
 		binding.recyclerView.adapter = adapter
 		binding.fabAdd.setOnClickListener(this)
 		reorderHelper = ItemTouchHelper(ReorderHelperCallback())
@@ -60,10 +61,17 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 	}
 
 	override fun onItemClick(item: FavouriteCategory, view: View) {
-		view.showPopupMenu(R.menu.popup_category) {
+		view.showPopupMenu(R.menu.popup_category, { menu ->
+			createOrderSubmenu(menu, item)
+		}) {
 			when (it.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(item)
 				R.id.action_rename -> editDelegate.renameCategory(item)
+				R.id.action_order -> return@showPopupMenu false
+				else -> {
+					val order = SORT_ORDERS.getOrNull(it.order) ?: return@showPopupMenu false
+					viewModel.setCategoryOrder(item.id, order)
+				}
 			}
 			true
 		}
@@ -116,6 +124,21 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 		viewModel.createCategory(name)
 	}
 
+	private fun createOrderSubmenu(menu: Menu, category: FavouriteCategory) {
+		val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
+		for ((i, item) in SORT_ORDERS.withIndex()) {
+			val menuItem = submenu.add(
+				R.id.group_order,
+				Menu.NONE,
+				i,
+				item.titleRes
+			)
+			menuItem.isCheckable = true
+			menuItem.isChecked = item == category.order
+		}
+		submenu.setGroupCheckable(R.id.group_order, true, true)
+	}
+
 	private inner class ReorderHelperCallback : ItemTouchHelper.SimpleCallback(
 		ItemTouchHelper.DOWN or ItemTouchHelper.UP, 0
 	) {
@@ -144,6 +167,12 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 
 	companion object {
 
+		val SORT_ORDERS = arrayOf(
+			SortOrder.ALPHABETICAL,
+			SortOrder.NEWEST,
+			SortOrder.RATING,
+		)
+
 		fun newIntent(context: Context) = Intent(context, CategoriesActivity::class.java)
 	}
 }