Merge branch 'devel'

Currently translated at 81.8% (356 of 435 strings)

Co-authored-by: qrynill <tryvseu@tuta.io>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/nn/
Translation: Kotatsu/Strings

.weblate

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

README.md

@@ -2,17 +2,12 @@
 
 Kotatsu is a free and open source manga reader for Android.
 
-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
 
 ### Download
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-alt="Get it on F-Droid"
-height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)
-
-Download APK directly from GitHub:
-
-- **[Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)**
+- **Recommended:** Download and install APK from **[GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest)**. Application has a built-in self-updating feature.
+- Get it on **[F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu)**. The F-Droid build may be a bit outdated and some fixes might be missing.
 
 ### Main Features
 

app/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 524
-		versionName '4.4.8'
+		versionCode 552
+		versionName '5.2'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -42,25 +42,25 @@ android {
 	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+		main.java.srcDirs += 'src/main/kotlin/'
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_1_8.toString()
+		jvmTarget = JavaVersion.VERSION_17.toString()
 		freeCompilerArgs += [
 			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
 			'-opt-in=coil.annotation.ExperimentalCoilApi',
-			'-opt-in=com.google.android.material.badge.ExperimentalBadgeUtils',
 		]
 	}
 	lint {
 		abortOnError true
-		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged', 'SetJavaScriptEnabled'
 	}
 	testOptions {
 		unitTests.includeAndroidResources true
@@ -79,50 +79,57 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:2340100999') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:f732582d55') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation 'androidx.core:core-ktx:1.9.0'
-	implementation 'androidx.activity:activity-ktx:1.6.1'
-	implementation 'androidx.fragment:fragment-ktx:1.5.5'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
+	implementation 'androidx.core:core-ktx:1.10.1'
+	implementation 'androidx.activity:activity-ktx:1.7.2'
+	implementation 'androidx.fragment:fragment-ktx:1.6.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.6.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.2.1'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+	implementation 'androidx.recyclerview:recyclerview:1.3.0'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
 	implementation 'androidx.preference:preference-ktx:1.2.0'
-	implementation 'androidx.work:work-runtime-ktx:2.8.0'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.8.0'
+	implementation 'com.google.android.material:material:1.9.0'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.6.1'
 
-	implementation 'androidx.room:room-runtime:2.5.0'
-	implementation 'androidx.room:room-ktx:2.5.0'
-	kapt 'androidx.room:room-compiler:2.5.0'
+	implementation 'androidx.work:work-runtime-ktx:2.8.1'
+	//noinspection GradleDependency
+	implementation('com.google.guava:guava:32.0.0-android') {
+		exclude group: 'com.google.guava', module: 'failureaccess'
+		exclude group: 'org.checkerframework', module: 'checker-qual'
+		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
+	}
 
-	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
+	implementation 'androidx.room:room-runtime:2.5.1'
+	implementation 'androidx.room:room-ktx:2.5.1'
+	kapt 'androidx.room:room-compiler:2.5.1'
+
+	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
 	implementation 'com.squareup.okio:okio:3.3.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'com.google.dagger:hilt-android:2.45'
-	kapt 'com.google.dagger:hilt-compiler:2.45'
+	implementation 'com.google.dagger:hilt-android:2.46.1'
+	kapt 'com.google.dagger:hilt-compiler:2.46.1'
 	implementation 'androidx.hilt:hilt-work:1.0.0'
 	kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
-	implementation 'io.coil-kt:coil-base:2.2.2'
-	implementation 'io.coil-kt:coil-svg:2.2.2'
+	implementation 'io.coil-kt:coil-base:2.4.0'
+	implementation 'io.coil-kt:coil-svg:2.4.0'
 	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:1b19231b2f'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
@@ -130,22 +137,22 @@ dependencies {
 	implementation 'ch.acra:acra-http:5.9.7'
 	implementation 'ch.acra:acra-dialog:5.9.7'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.json:json:20230227'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
 	androidTestImplementation 'androidx.test:runner:1.5.2'
 	androidTestImplementation 'androidx.test:rules:1.5.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
-	androidTestImplementation 'androidx.room:room-testing:2.5.0'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
+	androidTestImplementation 'androidx.room:room-testing:2.5.1'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.45'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.45'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.46.1'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.46.1'
 }

app/proguard-rules.pro

@@ -8,9 +8,12 @@
 	public static void checkParameterIsNotNull(...);
 	public static void checkNotNullParameter(...);
 }
--keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
+-keep public class ** extends org.koitharu.kotatsu.core.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
--dontwarn okhttp3.internal.platform.ConscryptPlatform
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
 
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
 -keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment

app/sampledata/genres

@@ -1,10 +0,0 @@
-Slice of Life, Mystery
-Slice of Life, Mystery
-Psychological, Romance, Comedy, Slice of Life, Supernatural
-Sci-Fi, Comedy
-Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
-Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
-Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
-Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
-Adventure, Slice of Life, Mystery
-Adventure, Slice of Life, Mystery

app/sampledata/titles

@@ -1,10 +0,0 @@
-Forget-me-not Vol. 1
-Forget-me-not Vol. 2
-La Pomme Prisoinniere
-Momo Kanchou no Himitsu Kichi
-Omoide Emanon
-Sasurai Emanon Vol. 1
-Sasurai Emanon Vol. 2
-Sasurai Emanon Vol. 3
-Wandering Island Vol. 1
-Wandering Island Vol. 2

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

@@ -8,7 +8,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
-import javax.inject.Inject
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
@@ -19,11 +18,12 @@ import org.junit.runner.RunWith
 import org.koitharu.kotatsu.SampleData
 import org.koitharu.kotatsu.awaitForIdle
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.history.data.HistoryRepository
+import javax.inject.Inject
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class ShortcutsUpdaterTest {
+class AppShortcutManagerTest {
 
 	@get:Rule
 	var hiltRule = HiltAndroidRule(this)
@@ -32,7 +32,7 @@ class ShortcutsUpdaterTest {
 	lateinit var historyRepository: HistoryRepository
 
 	@Inject
-	lateinit var shortcutsUpdater: ShortcutsUpdater
+	lateinit var appShortcutManager: AppShortcutManager
 
 	@Inject
 	lateinit var database: MangaDatabase
@@ -72,6 +72,6 @@ class ShortcutsUpdaterTest {
 	private suspend fun awaitUpdate() {
 		val instrumentation = InstrumentationRegistry.getInstrumentation()
 		instrumentation.awaitForIdle()
-		shortcutsUpdater.await()
+		appShortcutManager.await()
 	}
 }

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

@@ -5,8 +5,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
-import java.io.File
-import javax.inject.Inject
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.*
@@ -19,7 +17,9 @@ import org.koitharu.kotatsu.core.backup.BackupRepository
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.history.data.HistoryRepository
+import java.io.File
+import javax.inject.Inject
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
@@ -52,6 +52,7 @@ class AppBackupAgentTest {
 			title = SampleData.favouriteCategory.title,
 			sortOrder = SampleData.favouriteCategory.order,
 			isTrackerEnabled = SampleData.favouriteCategory.isTrackingEnabled,
+			isVisibleOnShelf = SampleData.favouriteCategory.isVisibleInLibrary,
 		)
 		favouritesRepository.addToCategory(categoryId = category.id, mangas = listOf(SampleData.manga))
 		historyRepository.addOrUpdate(

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

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.tracker.domain
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
-import javax.inject.Inject
 import junit.framework.TestCase.*
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
@@ -11,8 +10,9 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.parsers.model.Manga
+import javax.inject.Inject
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)

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

@@ -17,7 +17,7 @@ import java.util.EnumSet
 class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("", null)
+		get() = ConfigKey.Domain()
 
 	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)

app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt

@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.core.util
+
+import android.util.Log
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
+
+class LoggingAdapterDataObserver(
+	private val tag: String,
+) : AdapterDataObserver() {
+
+	override fun onChanged() {
+		Log.d(tag, "onChanged()")
+	}
+
+	override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
+		Log.d(tag, "onItemRangeChanged(positionStart=$positionStart, itemCount=$itemCount)")
+	}
+
+	override fun onItemRangeChanged(positionStart: Int, itemCount: Int, payload: Any?) {
+		Log.d(tag, "onItemRangeChanged(positionStart=$positionStart, itemCount=$itemCount, payload=$payload)")
+	}
+
+	override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+		Log.d(tag, "onItemRangeInserted(positionStart=$positionStart, itemCount=$itemCount)")
+	}
+
+	override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
+		Log.d(tag, "onItemRangeRemoved(positionStart=$positionStart, itemCount=$itemCount)")
+	}
+
+	override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
+		Log.d(tag, "onItemRangeMoved(fromPosition=$fromPosition, toPosition=$toPosition, itemCount=$itemCount)")
+	}
+
+	override fun onStateRestorationPolicyChanged() {
+		Log.d(tag, "onStateRestorationPolicyChanged()")
+	}
+}

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

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

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

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

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -86,11 +86,26 @@
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:exported="true"
-			android:label="@string/settings" />
+			android:label="@string/settings">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+				<data android:host="about" />
+				<data android:host="sync-settings" />
+			</intent-filter>
+		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
+		<activity
+			android:name="org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
+			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
@@ -118,7 +133,7 @@
 			android:name="org.koitharu.kotatsu.settings.protect.ProtectSetupActivity"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
+			android:name="org.koitharu.kotatsu.download.ui.list.DownloadsActivity"
 			android:label="@string/downloads"
 			android:launchMode="singleTop" />
 		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity" />
@@ -145,16 +160,14 @@
 				<category android:name="android.intent.category.BROWSABLE" />
 
 				<data android:scheme="kotatsu" />
+				<data android:host="shikimori-auth" />
+				<data android:host="anilist-auth" />
+				<data android:host="mal-auth" />
 			</intent-filter>
 
 		</activity>
 
-		<service
-			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
-			android:foregroundServiceType="dataSync"
-			android:stopWithTask="false" />
 		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
-		<service android:name="org.koitharu.kotatsu.local.ui.ImportService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
@@ -215,20 +228,26 @@
 		</provider>
 		<provider
 			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncProvider"
-			android:authorities="org.koitharu.kotatsu.favourites"
+			android:authorities="@string/sync_authority_favourites"
 			android:exported="false"
 			android:label="@string/favourites"
 			android:syncable="true" />
 		<provider
 			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncProvider"
-			android:authorities="org.koitharu.kotatsu.history"
+			android:authorities="@string/sync_authority_history"
 			android:exported="false"
 			android:label="@string/history"
 			android:syncable="true" />
 		<provider
 			android:name="androidx.startup.InitializationProvider"
 			android:authorities="${applicationId}.androidx-startup"
-			tools:node="remove" />
+			android:exported="false"
+			tools:node="remove">
+			<meta-data
+				android:name="androidx.work.WorkManagerInitializer"
+				android:value="androidx.startup"
+				tools:node="remove" />
+		</provider>
 
 		<receiver
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider"

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,122 +0,0 @@
-package org.koitharu.kotatsu.browser.cloudflare
-
-import android.annotation.SuppressLint
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.CookieManager
-import android.webkit.WebSettings
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isInvisible
-import androidx.fragment.app.setFragmentResult
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.hilt.android.AndroidEntryPoint
-import okhttp3.Headers
-import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
-import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
-import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
-import org.koitharu.kotatsu.utils.ext.stringArgument
-import org.koitharu.kotatsu.utils.ext.withArgs
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
-
-	private val url by stringArgument(ARG_URL)
-	private val pendingResult = Bundle(1)
-
-	@Inject
-	lateinit var cookieJar: MutableCookieJar
-
-	private var onBackPressedCallback: WebViewBackPressedCallback? = null
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = FragmentCloudflareBinding.inflate(inflater, container, false)
-
-	@SuppressLint("SetJavaScriptEnabled")
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		with(binding.webView.settings) {
-			javaScriptEnabled = true
-			cacheMode = WebSettings.LOAD_DEFAULT
-			domStorageEnabled = true
-			databaseEnabled = true
-			userAgentString = arguments?.getString(ARG_UA) ?: CommonHeadersInterceptor.userAgentChrome
-		}
-		binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url.orEmpty())
-		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
-		if (url.isNullOrEmpty()) {
-			dismissAllowingStateLoss()
-		} else {
-			binding.webView.loadUrl(url.orEmpty())
-		}
-	}
-
-	override fun onDestroyView() {
-		binding.webView.stopLoading()
-		binding.webView.destroy()
-		onBackPressedCallback = null
-		super.onDestroyView()
-	}
-
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder).setNegativeButton(android.R.string.cancel, null)
-	}
-
-	override fun onDialogCreated(dialog: AlertDialog) {
-		super.onDialogCreated(dialog)
-		onBackPressedCallback = WebViewBackPressedCallback(binding.webView).also {
-			dialog.onBackPressedDispatcher.addCallback(it)
-		}
-	}
-
-	override fun onResume() {
-		super.onResume()
-		binding.webView.onResume()
-	}
-
-	override fun onPause() {
-		binding.webView.onPause()
-		super.onPause()
-	}
-
-	override fun onDismiss(dialog: DialogInterface) {
-		setFragmentResult(TAG, pendingResult)
-		super.onDismiss(dialog)
-	}
-
-	override fun onPageLoaded() {
-		bindingOrNull()?.progressBar?.isInvisible = true
-	}
-
-	override fun onCheckPassed() {
-		pendingResult.putBoolean(EXTRA_RESULT, true)
-		dismissAllowingStateLoss()
-	}
-
-	override fun onHistoryChanged() {
-		onBackPressedCallback?.onHistoryChanged()
-	}
-
-	companion object {
-
-		const val TAG = "CloudFlareDialog"
-		const val EXTRA_RESULT = "result"
-		private const val ARG_URL = "url"
-		private const val ARG_UA = "ua"
-
-		fun newInstance(url: String, headers: Headers?) = CloudFlareDialog().withArgs(2) {
-			putString(ARG_URL, url)
-			headers?.get(CommonHeaders.USER_AGENT)?.let {
-				putString(ARG_UA, it)
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/core/cache/DeferredLruCache.kt

@@ -1,5 +0,0 @@
-package org.koitharu.kotatsu.core.cache
-
-import androidx.collection.LruCache
-
-class DeferredLruCache<T>(maxSize: Int) : LruCache<ContentCache.Key, SafeDeferred<T>>(maxSize)

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

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

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

@@ -1,34 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import androidx.core.os.LocaleListCompat
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.util.mapToSet
-import org.koitharu.kotatsu.parsers.util.toTitleCase
-import org.koitharu.kotatsu.utils.ext.iterator
-
-fun Collection<Manga>.ids() = mapToSet { it.id }
-
-fun Manga.getPreferredBranch(history: MangaHistory?): String? {
-	val ch = chapters
-	if (ch.isNullOrEmpty()) {
-		return null
-	}
-	if (history != null) {
-		val currentChapter = ch.find { it.id == history.chapterId }
-		if (currentChapter != null) {
-			return currentChapter.branch
-		}
-	}
-	val groups = ch.groupBy { it.branch }
-	for (locale in LocaleListCompat.getAdjustedDefault()) {
-		var language = locale.getDisplayLanguage(locale).toTitleCase(locale)
-		if (groups.containsKey(language)) {
-			return language
-		}
-		language = locale.getDisplayName(locale).toTitleCase(locale)
-		if (groups.containsKey(language)) {
-			return language
-		}
-	}
-	return groups.maxByOrNull { it.value.size }?.key
-}

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

@@ -1,72 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.text.HtmlCompat
-import androidx.core.text.htmlEncode
-import androidx.core.text.parseAsHtml
-import androidx.fragment.app.FragmentManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.databinding.DialogMangaErrorBinding
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.report
-import org.koitharu.kotatsu.utils.ext.requireParcelable
-import org.koitharu.kotatsu.utils.ext.requireSerializable
-import org.koitharu.kotatsu.utils.ext.withArgs
-
-class MangaErrorDialog : AlertDialogFragment<DialogMangaErrorBinding>() {
-
-	private lateinit var error: Throwable
-	private lateinit var manga: Manga
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		val args = requireArguments()
-		manga = args.requireParcelable<ParcelableManga>(ARG_MANGA).manga
-		error = args.requireSerializable(ARG_ERROR)
-	}
-
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): DialogMangaErrorBinding {
-		return DialogMangaErrorBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		with(binding.textViewMessage) {
-			movementMethod = LinkMovementMethod.getInstance()
-			text = context.getString(
-				R.string.manga_error_description_pattern,
-				this@MangaErrorDialog.error.message?.htmlEncode().orEmpty(),
-				manga.publicUrl,
-			).parseAsHtml(HtmlCompat.FROM_HTML_MODE_LEGACY)
-		}
-	}
-
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder)
-			.setCancelable(true)
-			.setNegativeButton(android.R.string.cancel, null)
-			.setPositiveButton(R.string.report) { _, _ ->
-				dismiss()
-				error.report()
-			}.setTitle(R.string.error_occurred)
-	}
-
-	companion object {
-
-		private const val TAG = "MangaErrorDialog"
-		private const val ARG_ERROR = "error"
-		private const val ARG_MANGA = "manga"
-
-		fun show(fm: FragmentManager, manga: Manga, error: Throwable) = MangaErrorDialog().withArgs(2) {
-			putParcelable(ARG_MANGA, ParcelableManga(manga, false))
-			putSerializable(ARG_ERROR, error)
-		}.show(fm, TAG)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/details/domain/BranchComparator.kt

@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.details.domain
-
-class BranchComparator : Comparator<String?> {
-
-	override fun compare(o1: String?, o2: String?): Int = compareValues(o1, o2)
-}

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

@@ -1,362 +0,0 @@
-package org.koitharu.kotatsu.details.ui
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.os.Bundle
-import android.transition.Slide
-import android.transition.TransitionManager
-import android.view.Gravity
-import android.view.Menu
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.AccelerateDecelerateInterpolator
-import android.widget.Toast
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.graphics.Insets
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
-import androidx.lifecycle.Observer
-import androidx.lifecycle.lifecycleScope
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.BaseTransientBottomBar
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.MangaIntent
-import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.base.ui.widgets.BottomSheetHeaderBar
-import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.os.ShortcutsUpdater
-import org.koitharu.kotatsu.core.ui.MangaErrorDialog
-import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
-import org.koitharu.kotatsu.details.service.MangaPrefetchService
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.details.ui.model.HistoryInfo
-import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.utils.ViewBadge
-import org.koitharu.kotatsu.utils.ext.assistedViewModels
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.isReportable
-import org.koitharu.kotatsu.utils.ext.setNavigationBarTransparentCompat
-import org.koitharu.kotatsu.utils.ext.textAndVisible
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class DetailsActivity :
-	BaseActivity<ActivityDetailsBinding>(),
-	View.OnClickListener,
-	BottomSheetHeaderBar.OnExpansionChangeListener,
-	NoModalBottomSheetOwner {
-
-	override val bsHeader: BottomSheetHeaderBar?
-		get() = binding.headerChapters
-
-	@Inject
-	lateinit var viewModelFactory: DetailsViewModel.Factory
-
-	@Inject
-	lateinit var shortcutsUpdater: ShortcutsUpdater
-
-	private lateinit var viewBadge: ViewBadge
-
-	private val viewModel: DetailsViewModel by assistedViewModels {
-		viewModelFactory.create(MangaIntent(intent))
-	}
-	private lateinit var chaptersMenuProvider: ChaptersMenuProvider
-
-	private val downloadReceiver = object : BroadcastReceiver() {
-		override fun onReceive(context: Context?, intent: Intent?) {
-			val downloadedManga = DownloadService.getDownloadedManga(intent) ?: return
-			viewModel.onDownloadComplete(downloadedManga)
-		}
-	}
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(ActivityDetailsBinding.inflate(layoutInflater))
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(true)
-			setDisplayShowTitleEnabled(false)
-		}
-		binding.buttonRead.setOnClickListener(this)
-		binding.buttonDropdown.setOnClickListener(this)
-		viewBadge = ViewBadge(binding.buttonRead, this)
-
-		chaptersMenuProvider = if (binding.layoutBottom != null) {
-			val bsMediator = ChaptersBottomSheetMediator(checkNotNull(binding.layoutBottom))
-			actionModeDelegate.addListener(bsMediator)
-			checkNotNull(binding.headerChapters).addOnExpansionChangeListener(bsMediator)
-			checkNotNull(binding.headerChapters).addOnLayoutChangeListener(bsMediator)
-			onBackPressedDispatcher.addCallback(bsMediator)
-			ChaptersMenuProvider(viewModel, bsMediator)
-		} else {
-			ChaptersMenuProvider(viewModel, null)
-		}
-
-		viewModel.manga.observe(this, ::onMangaUpdated)
-		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
-		viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
-		viewModel.onError.observe(this, ::onError)
-		viewModel.onShowToast.observe(this) {
-			makeSnackbar(getString(it), Snackbar.LENGTH_SHORT).show()
-		}
-		viewModel.historyInfo.observe(this, ::onHistoryChanged)
-		viewModel.selectedBranchName.observe(this) {
-			binding.headerChapters?.subtitle = it
-			binding.textViewSubtitle?.textAndVisible = it
-		}
-		viewModel.isChaptersReversed.observe(this) {
-			binding.headerChapters?.invalidateMenu() ?: invalidateOptionsMenu()
-		}
-		viewModel.favouriteCategories.observe(this) {
-			invalidateOptionsMenu()
-		}
-		viewModel.branches.observe(this) {
-			binding.buttonDropdown.isVisible = it.size > 1
-		}
-		viewModel.chapters.observe(this, PrefetchObserver(this))
-
-		registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
-		addMenuProvider(
-			DetailsMenuProvider(
-				activity = this,
-				viewModel = viewModel,
-				snackbarHost = binding.containerChapters,
-				shortcutsUpdater = shortcutsUpdater,
-			),
-		)
-		binding.headerChapters?.addOnExpansionChangeListener(this) ?: addMenuProvider(chaptersMenuProvider)
-	}
-
-	override fun onDestroy() {
-		unregisterReceiver(downloadReceiver)
-		super.onDestroy()
-	}
-
-	override fun onClick(v: View) {
-		val manga = viewModel.manga.value ?: return
-		when (v.id) {
-			R.id.button_read -> {
-				val chapterId = viewModel.historyInfo.value?.history?.chapterId
-				if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
-					showChapterMissingDialog(chapterId)
-				} else {
-					startActivity(
-						ReaderActivity.newIntent(
-							context = this,
-							manga = manga,
-							branch = viewModel.selectedBranchValue,
-						),
-					)
-				}
-			}
-
-			R.id.button_dropdown -> showBranchPopupMenu()
-		}
-	}
-
-	override fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean) {
-		if (isExpanded) {
-			headerBar.addMenuProvider(chaptersMenuProvider)
-		} else {
-			headerBar.removeMenuProvider(chaptersMenuProvider)
-		}
-		binding.buttonRead.isGone = isExpanded
-	}
-
-	private fun onMangaUpdated(manga: Manga) {
-		title = manga.title
-		val hasChapters = !manga.chapters.isNullOrEmpty()
-		binding.buttonRead.isEnabled = hasChapters
-		invalidateOptionsMenu()
-		showBottomSheet(manga.chapters != null)
-		binding.groupHeader?.isVisible = hasChapters
-	}
-
-	private fun onMangaRemoved(manga: Manga) {
-		Toast.makeText(
-			this,
-			getString(R.string._s_deleted_from_local_storage, manga.title),
-			Toast.LENGTH_SHORT,
-		).show()
-		finishAfterTransition()
-	}
-
-	private fun onError(e: Throwable) {
-		val manga = viewModel.manga.value
-		when {
-			ExceptionResolver.canResolve(e) -> {
-				resolveError(e)
-			}
-
-			manga == null -> {
-				Toast.makeText(this, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
-				finishAfterTransition()
-			}
-
-			else -> {
-				val snackbar = makeSnackbar(
-					e.getDisplayMessage(resources),
-					if (viewModel.manga.value?.chapters == null) {
-						Snackbar.LENGTH_INDEFINITE
-					} else {
-						Snackbar.LENGTH_LONG
-					},
-				)
-				if (e.isReportable()) {
-					snackbar.setAction(R.string.details) {
-						MangaErrorDialog.show(supportFragmentManager, manga, e)
-					}
-				}
-				snackbar.show()
-			}
-		}
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-		)
-		if (insets.bottom > 0) {
-			window.setNavigationBarTransparentCompat(this, binding.layoutBottom?.elevation ?: 0f, 0.9f)
-		}
-	}
-
-	private fun onHistoryChanged(info: HistoryInfo) {
-		with(binding.buttonRead) {
-			if (info.history != null) {
-				setText(R.string._continue)
-				setIconResource(if (info.isIncognitoMode) R.drawable.ic_incognito else R.drawable.ic_play)
-			} else {
-				setText(R.string.read)
-				setIconResource(if (info.isIncognitoMode) R.drawable.ic_incognito else R.drawable.ic_play)
-			}
-		}
-		val text = when {
-			!info.isValid -> getString(R.string.loading_)
-			info.currentChapter >= 0 -> getString(R.string.chapter_d_of_d, info.currentChapter + 1, info.totalChapters)
-			info.totalChapters == 0 -> getString(R.string.no_chapters)
-			else -> resources.getQuantityString(R.plurals.chapters, info.totalChapters, info.totalChapters)
-		}
-		binding.headerChapters?.title = text
-		binding.textViewTitle?.text = text
-	}
-
-	private fun onNewChaptersChanged(newChapters: Int) {
-		viewBadge.counter = newChapters
-	}
-
-	fun showChapterMissingDialog(chapterId: Long) {
-		val remoteManga = viewModel.getRemoteManga()
-		if (remoteManga == null) {
-			val snackbar = makeSnackbar(getString(R.string.chapter_is_missing), Snackbar.LENGTH_SHORT)
-			snackbar.show()
-			return
-		}
-		MaterialAlertDialogBuilder(this).apply {
-			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(
-						context = this@DetailsActivity,
-						manga = remoteManga,
-						state = ReaderState(chapterId, 0, 0),
-					),
-				)
-			}
-			setNeutralButton(R.string.download) { _, _ ->
-				DownloadService.start(binding.appbar, remoteManga, setOf(chapterId))
-			}
-			setCancelable(true)
-		}.show()
-	}
-
-	private fun showBranchPopupMenu() {
-		val menu = PopupMenu(this, binding.headerChapters ?: binding.buttonDropdown)
-		val currentBranch = viewModel.selectedBranchValue
-		for (branch in viewModel.branches.value ?: return) {
-			val item = menu.menu.add(R.id.group_branches, Menu.NONE, Menu.NONE, branch)
-			item.isChecked = branch == currentBranch
-		}
-		menu.menu.setGroupCheckable(R.id.group_branches, true, true)
-		menu.setOnMenuItemClickListener { item ->
-			viewModel.setSelectedBranch(item.title?.toString())
-			true
-		}
-		menu.show()
-	}
-
-	private fun resolveError(e: Throwable) {
-		lifecycleScope.launch {
-			if (exceptionResolver.resolve(e)) {
-				viewModel.reload()
-			} else if (viewModel.manga.value == null) {
-				Toast.makeText(this@DetailsActivity, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
-				finishAfterTransition()
-			}
-		}
-	}
-
-	private fun isTabletLayout() = binding.layoutBottom == null
-
-	private fun showBottomSheet(isVisible: Boolean) {
-		val view = binding.layoutBottom ?: return
-		if (view.isVisible == isVisible) return
-		val transition = Slide(Gravity.BOTTOM)
-		transition.addTarget(view)
-		transition.interpolator = AccelerateDecelerateInterpolator()
-		TransitionManager.beginDelayedTransition(binding.root as ViewGroup, transition)
-		view.isVisible = isVisible
-	}
-
-	private fun makeSnackbar(text: CharSequence, @BaseTransientBottomBar.Duration duration: Int): Snackbar {
-		val sb = Snackbar.make(binding.containerDetails, text, duration)
-		if (binding.layoutBottom?.isVisible == true) {
-			sb.anchorView = binding.headerChapters
-		}
-		return sb
-	}
-
-	private class PrefetchObserver(
-		private val context: Context,
-	) : Observer<List<ChapterListItem>> {
-
-		private var isCalled = false
-
-		override fun onChanged(t: List<ChapterListItem>?) {
-			if (t.isNullOrEmpty()) {
-				return
-			}
-			if (!isCalled) {
-				isCalled = true
-				val item = t.find { it.hasFlag(ChapterListItem.FLAG_CURRENT) } ?: t.first()
-				MangaPrefetchService.prefetchPages(context, item.chapter)
-			}
-		}
-	}
-
-	companion object {
-
-		fun newIntent(context: Context, manga: Manga): Intent {
-			return Intent(context, DetailsActivity::class.java)
-				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga, withChapters = true))
-		}
-
-		fun newIntent(context: Context, mangaId: Long): Intent {
-			return Intent(context, DetailsActivity::class.java)
-				.putExtra(MangaIntent.KEY_ID, mangaId)
-		}
-	}
-}

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

@@ -1,330 +0,0 @@
-package org.koitharu.kotatsu.details.ui
-
-import android.text.Html
-import android.text.SpannableString
-import android.text.Spanned
-import android.text.style.ForegroundColorSpan
-import androidx.core.text.getSpans
-import androidx.core.text.parseAsHtml
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.asFlow
-import androidx.lifecycle.asLiveData
-import androidx.lifecycle.viewModelScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChangedBy
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.transformLatest
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.base.domain.MangaIntent
-import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
-import org.koitharu.kotatsu.details.domain.BranchComparator
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.details.ui.model.HistoryInfo
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.history.domain.HistoryRepository
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.mapToSet
-import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
-import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
-import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
-import org.koitharu.kotatsu.tracker.domain.TrackingRepository
-import org.koitharu.kotatsu.utils.SingleLiveEvent
-import org.koitharu.kotatsu.utils.asFlowLiveData
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import java.io.IOException
-
-class DetailsViewModel @AssistedInject constructor(
-	@Assisted intent: MangaIntent,
-	private val historyRepository: HistoryRepository,
-	favouritesRepository: FavouritesRepository,
-	private val localMangaRepository: LocalMangaRepository,
-	trackingRepository: TrackingRepository,
-	mangaDataRepository: MangaDataRepository,
-	private val bookmarksRepository: BookmarksRepository,
-	private val settings: AppSettings,
-	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
-	private val imageGetter: Html.ImageGetter,
-	mangaRepositoryFactory: MangaRepository.Factory,
-) : BaseViewModel() {
-
-	private val delegate = MangaDetailsDelegate(
-		intent = intent,
-		mangaDataRepository = mangaDataRepository,
-		historyRepository = historyRepository,
-		localMangaRepository = localMangaRepository,
-		mangaRepositoryFactory = mangaRepositoryFactory,
-	)
-
-	private var loadingJob: Job
-
-	val onShowToast = SingleLiveEvent<Int>()
-
-	private val history = historyRepository.observeOne(delegate.mangaId)
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
-
-	private val favourite = favouritesRepository.observeCategoriesIds(delegate.mangaId).map { it.isNotEmpty() }
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
-
-	private val newChapters = settings.observeAsFlow(AppSettings.KEY_TRACKER_ENABLED) { isTrackerEnabled }
-		.flatMapLatest { isEnabled ->
-			if (isEnabled) {
-				trackingRepository.observeNewChaptersCount(delegate.mangaId)
-			} else {
-				flowOf(0)
-			}
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
-
-	private val chaptersQuery = MutableStateFlow("")
-
-	private val chaptersReversed = settings.observeAsFlow(AppSettings.KEY_REVERSE_CHAPTERS) { chaptersReverse }
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
-
-	val manga = delegate.manga.filterNotNull().asLiveData(viewModelScope.coroutineContext)
-	val favouriteCategories = favourite.asLiveData(viewModelScope.coroutineContext)
-	val newChaptersCount = newChapters.asLiveData(viewModelScope.coroutineContext)
-	val isChaptersReversed = chaptersReversed.asLiveData(viewModelScope.coroutineContext)
-
-	val historyInfo: LiveData<HistoryInfo> = combine(
-		delegate.manga,
-		history,
-		historyRepository.observeShouldSkip(delegate.manga),
-	) { m, h, im ->
-		HistoryInfo(m, h, im)
-	}.asFlowLiveData(
-		context = viewModelScope.coroutineContext + Dispatchers.Default,
-		defaultValue = HistoryInfo(null, null, false),
-	)
-
-	val bookmarks = delegate.manga.flatMapLatest {
-		if (it != null) bookmarksRepository.observeBookmarks(it) else flowOf(emptyList())
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
-
-	val description = delegate.manga
-		.distinctUntilChangedBy { it?.description.orEmpty() }
-		.transformLatest {
-			val description = it?.description
-			if (description.isNullOrEmpty()) {
-				emit(null)
-			} else {
-				emit(description.parseAsHtml().filterSpans())
-				emit(description.parseAsHtml(imageGetter = imageGetter).filterSpans())
-			}
-		}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
-
-	val onMangaRemoved = SingleLiveEvent<Manga>()
-	val isScrobblingAvailable: Boolean
-		get() = scrobblers.any { it.isAvailable }
-
-	val scrobblingInfo: LiveData<List<ScrobblingInfo>> = combine(
-		scrobblers.map { it.observeScrobblingInfo(delegate.mangaId) },
-	) { scrobblingInfo ->
-		scrobblingInfo.filterNotNull()
-	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
-
-	val branches: LiveData<List<String?>> = delegate.manga.map {
-		val chapters = it?.chapters ?: return@map emptyList()
-		chapters.mapToSet { x -> x.branch }.sortedWith(BranchComparator())
-	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
-
-	val selectedBranchIndex = combine(
-		branches.asFlow(),
-		delegate.selectedBranch,
-	) { branches, selected ->
-		branches.indexOf(selected)
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, -1)
-
-	val selectedBranchName = delegate.selectedBranch
-		.asFlowLiveData(viewModelScope.coroutineContext, null)
-
-	val isChaptersEmpty: LiveData<Boolean> = combine(
-		delegate.manga,
-		isLoading.asFlow(),
-	) { m, loading ->
-		m != null && m.chapters.isNullOrEmpty() && !loading
-	}.asLiveDataDistinct(viewModelScope.coroutineContext, false)
-
-	val chapters = combine(
-		combine(
-			delegate.manga,
-			delegate.relatedManga,
-			history,
-			delegate.selectedBranch,
-			newChapters,
-		) { manga, related, history, branch, news ->
-			delegate.mapChapters(manga, related, history, news, branch)
-		},
-		chaptersReversed,
-		chaptersQuery,
-	) { list, reversed, query ->
-		(if (reversed) list.asReversed() else list).filterSearch(query)
-	}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
-
-	val selectedBranchValue: String?
-		get() = delegate.selectedBranch.value
-
-	init {
-		loadingJob = doLoad()
-	}
-
-	fun reload() {
-		loadingJob.cancel()
-		loadingJob = doLoad()
-	}
-
-	fun deleteLocal() {
-		val m = delegate.manga.value
-		if (m == null) {
-			onShowToast.call(R.string.file_not_found)
-			return
-		}
-		launchLoadingJob(Dispatchers.Default) {
-			val manga = if (m.source == MangaSource.LOCAL) m else localMangaRepository.findSavedManga(m)
-			checkNotNull(manga) { "Cannot find saved manga for ${m.title}" }
-			val original = localMangaRepository.getRemoteManga(manga)
-			localMangaRepository.delete(manga) || throw IOException("Unable to delete file")
-			runCatchingCancellable {
-				historyRepository.deleteOrSwap(manga, original)
-			}
-			onMangaRemoved.postCall(manga)
-		}
-	}
-
-	fun removeBookmark(bookmark: Bookmark) {
-		launchJob {
-			bookmarksRepository.removeBookmark(bookmark.manga.id, bookmark.pageId)
-			onShowToast.call(R.string.bookmark_removed)
-		}
-	}
-
-	fun setChaptersReversed(newValue: Boolean) {
-		settings.chaptersReverse = newValue
-	}
-
-	fun setSelectedBranch(branch: String?) {
-		delegate.selectedBranch.value = branch
-	}
-
-	fun getRemoteManga(): Manga? {
-		return delegate.relatedManga.value?.takeUnless { it.source == MangaSource.LOCAL }
-	}
-
-	fun performChapterSearch(query: String?) {
-		chaptersQuery.value = query?.trim().orEmpty()
-	}
-
-	fun onDownloadComplete(downloadedManga: Manga) {
-		val currentManga = delegate.manga.value ?: return
-		if (currentManga.id != downloadedManga.id) {
-			return
-		}
-		if (currentManga.source == MangaSource.LOCAL) {
-			reload()
-		} else {
-			viewModelScope.launch(Dispatchers.Default) {
-				runCatchingCancellable {
-					localMangaRepository.getDetails(downloadedManga)
-				}.onSuccess {
-					delegate.relatedManga.value = it
-				}.onFailure {
-					it.printStackTraceDebug()
-				}
-			}
-		}
-	}
-
-	fun updateScrobbling(index: Int, rating: Float, status: ScrobblingStatus?) {
-		val scrobbler = getScrobbler(index) ?: return
-		launchJob(Dispatchers.Default) {
-			scrobbler.updateScrobblingInfo(
-				mangaId = delegate.mangaId,
-				rating = rating,
-				status = status,
-				comment = null,
-			)
-		}
-	}
-
-	fun unregisterScrobbling(index: Int) {
-		val scrobbler = getScrobbler(index) ?: return
-		launchJob(Dispatchers.Default) {
-			scrobbler.unregisterScrobbling(
-				mangaId = delegate.mangaId,
-			)
-		}
-	}
-
-	fun markChapterAsCurrent(chapterId: Long) {
-		launchJob(Dispatchers.Default) {
-			val manga = checkNotNull(delegate.manga.value)
-			val chapters = checkNotNull(manga.chapters)
-			val chapterIndex = chapters.indexOfFirst { it.id == chapterId }
-			check(chapterIndex in chapters.indices) { "Chapter not found" }
-			val percent = chapterIndex / chapters.size.toFloat()
-			historyRepository.addOrUpdate(manga = manga, chapterId = chapterId, page = 0, scroll = 0, percent = percent)
-		}
-	}
-
-	private fun doLoad() = launchLoadingJob(Dispatchers.Default) {
-		delegate.doLoad()
-	}
-
-	private fun List<ChapterListItem>.filterSearch(query: String): List<ChapterListItem> {
-		if (query.isEmpty() || this.isEmpty()) {
-			return this
-		}
-		return filter {
-			it.chapter.name.contains(query, ignoreCase = true)
-		}
-	}
-
-	private fun Spanned.filterSpans(): CharSequence {
-		val spannable = SpannableString.valueOf(this)
-		val spans = spannable.getSpans<ForegroundColorSpan>()
-		for (span in spans) {
-			spannable.removeSpan(span)
-		}
-		return spannable.trim()
-	}
-
-	private fun getScrobbler(index: Int): Scrobbler? {
-		val info = scrobblingInfo.value?.getOrNull(index)
-		val scrobbler = if (info != null) {
-			scrobblers.find { it.scrobblerService == info.scrobbler && it.isAvailable }
-		} else {
-			null
-		}
-		if (scrobbler == null) {
-			errorEvent.call(IllegalStateException("Scrobbler [$index] is not available"))
-		}
-		return scrobbler
-	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(intent: MangaIntent): DetailsViewModel
-	}
-}

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

@@ -1,158 +0,0 @@
-package org.koitharu.kotatsu.details.ui
-
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.base.domain.MangaIntent
-import org.koitharu.kotatsu.core.model.MangaHistory
-import org.koitharu.kotatsu.core.model.getPreferredBranch
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.details.ui.model.toListItem
-import org.koitharu.kotatsu.history.domain.HistoryRepository
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.exception.NotFoundException
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-
-class MangaDetailsDelegate(
-	private val intent: MangaIntent,
-	private val mangaDataRepository: MangaDataRepository,
-	private val historyRepository: HistoryRepository,
-	private val localMangaRepository: LocalMangaRepository,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-) {
-
-	private val mangaData = MutableStateFlow(intent.manga)
-
-	val selectedBranch = MutableStateFlow<String?>(null)
-
-	// Remote manga for saved and saved for remote
-	val relatedManga = MutableStateFlow<Manga?>(null)
-	val manga: StateFlow<Manga?>
-		get() = mangaData
-	val mangaId = intent.manga?.id ?: intent.mangaId
-
-	suspend fun doLoad() {
-		var manga = mangaDataRepository.resolveIntent(intent) ?: throw NotFoundException("Cannot find manga", "")
-		mangaData.value = manga
-		manga = mangaRepositoryFactory.create(manga.source).getDetails(manga)
-		// find default branch
-		val hist = historyRepository.getOne(manga)
-		selectedBranch.value = manga.getPreferredBranch(hist)
-		mangaData.value = manga
-		relatedManga.value = runCatchingCancellable {
-			if (manga.source == MangaSource.LOCAL) {
-				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatchingCancellable null
-				mangaRepositoryFactory.create(m.source).getDetails(m)
-			} else {
-				localMangaRepository.findSavedManga(manga)
-			}
-		}.onFailure { error ->
-			error.printStackTraceDebug()
-		}.getOrNull()
-	}
-
-	fun mapChapters(
-		manga: Manga?,
-		related: Manga?,
-		history: MangaHistory?,
-		newCount: Int,
-		branch: String?,
-	): List<ChapterListItem> {
-		val chapters = manga?.chapters ?: return emptyList()
-		val relatedChapters = related?.chapters
-		return if (related?.source != MangaSource.LOCAL && !relatedChapters.isNullOrEmpty()) {
-			mapChaptersWithSource(chapters, relatedChapters, history?.chapterId, newCount, branch)
-		} else {
-			mapChapters(chapters, relatedChapters, history?.chapterId, newCount, branch)
-		}
-	}
-
-	private fun mapChapters(
-		chapters: List<MangaChapter>,
-		downloadedChapters: List<MangaChapter>?,
-		currentId: Long?,
-		newCount: Int,
-		branch: String?,
-	): List<ChapterListItem> {
-		val result = ArrayList<ChapterListItem>(chapters.size)
-		val currentIndex = chapters.indexOfFirst { it.id == currentId }
-		val firstNewIndex = chapters.size - newCount
-		val downloadedIds = downloadedChapters?.mapTo(HashSet(downloadedChapters.size)) { it.id }
-		for (i in chapters.indices) {
-			val chapter = chapters[i]
-			if (chapter.branch != branch) {
-				continue
-			}
-			result += chapter.toListItem(
-				isCurrent = i == currentIndex,
-				isUnread = i > currentIndex,
-				isNew = i >= firstNewIndex,
-				isMissing = false,
-				isDownloaded = downloadedIds?.contains(chapter.id) == true,
-			)
-		}
-		if (result.size < chapters.size / 2) {
-			result.trimToSize()
-		}
-		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
-		for (i in sourceChapters.indices) {
-			val chapter = sourceChapters[i]
-			val localChapter = chaptersMap.remove(chapter.id)
-			if (chapter.branch != branch) {
-				continue
-			}
-			result += localChapter?.toListItem(
-				isCurrent = i == currentIndex,
-				isUnread = i > currentIndex,
-				isNew = i >= firstNewIndex,
-				isMissing = false,
-				isDownloaded = false,
-			) ?: chapter.toListItem(
-				isCurrent = i == currentIndex,
-				isUnread = i > currentIndex,
-				isNew = i >= firstNewIndex,
-				isMissing = true,
-				isDownloaded = false,
-			)
-		}
-		if (chaptersMap.isNotEmpty()) { // some chapters on device but not online source
-			result.ensureCapacity(result.size + chaptersMap.size)
-			chaptersMap.values.mapNotNullTo(result) {
-				if (it.branch == branch) {
-					it.toListItem(
-						isCurrent = false,
-						isUnread = true,
-						isNew = false,
-						isMissing = false,
-						isDownloaded = false,
-					)
-				} else {
-					null
-				}
-			}
-			result.sortBy { it.chapter.number }
-		}
-		if (result.size < sourceChapters.size / 2) {
-			result.trimToSize()
-		}
-		return result
-	}
-}

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

@@ -1,45 +0,0 @@
-package org.koitharu.kotatsu.details.ui.adapter
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.TextView
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.parsers.util.replaceWith
-
-class BranchesAdapter : BaseAdapter() {
-
-	private val dataSet = ArrayList<String?>()
-
-	override fun getCount(): Int {
-		return dataSet.size
-	}
-
-	override fun getItem(position: Int): Any? {
-		return dataSet[position]
-	}
-
-	override fun getItemId(position: Int): Long {
-		return dataSet[position].hashCode().toLong()
-	}
-
-	override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-		val view = convertView ?: LayoutInflater.from(parent.context)
-			.inflate(R.layout.item_branch, parent, false)
-		(view as TextView).text = dataSet[position]
-		return view
-	}
-
-	override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
-		val view = convertView ?: LayoutInflater.from(parent.context)
-			.inflate(R.layout.item_branch_dropdown, parent, false)
-		(view as TextView).text = dataSet[position]
-		return view
-	}
-
-	fun setItems(items: Collection<String?>) {
-		dataSet.replaceWith(items)
-		notifyDataSetChanged()
-	}
-}

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

@@ -1,56 +0,0 @@
-package org.koitharu.kotatsu.details.ui.adapter
-
-import androidx.core.view.isVisible
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.list.AdapterDelegateClickListenerAdapter
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.databinding.ItemChapterBinding
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_CURRENT
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_DOWNLOADED
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_MISSING
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_NEW
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_UNREAD
-import org.koitharu.kotatsu.utils.ext.getThemeColor
-import org.koitharu.kotatsu.utils.ext.textAndVisible
-
-fun chapterListItemAD(
-	clickListener: OnListItemClickListener<ChapterListItem>,
-) = adapterDelegateViewBinding<ChapterListItem, ChapterListItem, ItemChapterBinding>(
-	{ inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) }
-) {
-
-	val eventListener = AdapterDelegateClickListenerAdapter(this, clickListener)
-	itemView.setOnClickListener(eventListener)
-	itemView.setOnLongClickListener(eventListener)
-
-	bind { payloads ->
-		if (payloads.isEmpty()) {
-			binding.textViewTitle.text = item.chapter.name
-			binding.textViewNumber.text = item.chapter.number.toString()
-			binding.textViewDescription.textAndVisible = item.description()
-		}
-		when (item.status) {
-			FLAG_UNREAD -> {
-				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_default)
-				binding.textViewNumber.setTextColor(context.getThemeColor(com.google.android.material.R.attr.colorOnTertiary))
-			}
-			FLAG_CURRENT -> {
-				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_accent)
-				binding.textViewNumber.setTextColor(context.getThemeColor(android.R.attr.textColorPrimaryInverse))
-			}
-			else -> {
-				binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_outline)
-				binding.textViewNumber.setTextColor(context.getThemeColor(android.R.attr.textColorTertiary))
-			}
-		}
-		val isMissing = item.hasFlag(FLAG_MISSING)
-		binding.textViewTitle.alpha = if (isMissing) 0.3f else 1f
-		binding.textViewDescription.alpha = if (isMissing) 0.3f else 1f
-		binding.textViewNumber.alpha = if (isMissing) 0.3f else 1f
-
-		binding.imageViewDownloaded.isVisible = item.hasFlag(FLAG_DOWNLOADED)
-		binding.imageViewNew.isVisible = item.hasFlag(FLAG_NEW)
-	}
-}

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

@@ -1,269 +0,0 @@
-package org.koitharu.kotatsu.download.domain
-
-import android.content.Context
-import android.webkit.MimeTypeMap
-import coil.ImageLoader
-import coil.request.ImageRequest
-import coil.size.Scale
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Semaphore
-import kotlinx.coroutines.sync.withPermit
-import kotlinx.coroutines.withContext
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.internal.closeQuietly
-import okio.IOException
-import org.koitharu.kotatsu.R
-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.download.ui.service.PausingHandle
-import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.local.domain.CbzMangaOutput
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.utils.ext.copyToSuspending
-import org.koitharu.kotatsu.utils.ext.deleteAwait
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import org.koitharu.kotatsu.utils.progress.PausingProgressJob
-import java.io.File
-
-private const val MAX_FAILSAFE_ATTEMPTS = 2
-private const val DOWNLOAD_ERROR_DELAY = 500L
-private const val SLOWDOWN_DELAY = 200L
-
-class DownloadManager @AssistedInject constructor(
-	@Assisted private val coroutineScope: CoroutineScope,
-	@ApplicationContext private val context: Context,
-	private val imageLoader: ImageLoader,
-	private val okHttp: OkHttpClient,
-	private val cache: PagesCache,
-	private val localMangaRepository: LocalMangaRepository,
-	private val settings: AppSettings,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-) {
-
-	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,
-	)
-	private val semaphore = Semaphore(settings.downloadsParallelism)
-
-	fun downloadManga(
-		manga: Manga,
-		chaptersIds: LongArray?,
-		startId: Int,
-	): PausingProgressJob<DownloadState> {
-		val stateFlow = MutableStateFlow<DownloadState>(
-			DownloadState.Queued(startId = startId, manga = manga, cover = null),
-		)
-		val pausingHandle = PausingHandle()
-		val job = coroutineScope.launch(Dispatchers.Default + errorStateHandler(stateFlow)) {
-			try {
-				downloadMangaImpl(manga, chaptersIds?.takeUnless { it.isEmpty() }, stateFlow, pausingHandle, startId)
-			} catch (e: CancellationException) { // handle cancellation if not handled already
-				val state = stateFlow.value
-				if (state !is DownloadState.Cancelled) {
-					stateFlow.value = DownloadState.Cancelled(startId, state.manga, state.cover)
-				}
-				throw e
-			}
-		}
-		return PausingProgressJob(job, stateFlow, pausingHandle)
-	}
-
-	private suspend fun downloadMangaImpl(
-		manga: Manga,
-		chaptersIds: LongArray?,
-		outState: MutableStateFlow<DownloadState>,
-		pausingHandle: PausingHandle,
-		startId: Int,
-	) {
-		@Suppress("NAME_SHADOWING")
-		var manga = manga
-		val chaptersIdsSet = chaptersIds?.toMutableSet()
-		val cover = loadCover(manga)
-		outState.value = DownloadState.Queued(startId, manga, cover)
-		withMangaLock(manga) {
-			semaphore.withPermit {
-				outState.value = DownloadState.Preparing(startId, manga, null)
-				val destination = localMangaRepository.getOutputDir()
-				checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
-				val tempFileName = "${manga.id}_$startId.tmp"
-				var output: CbzMangaOutput? = null
-				try {
-					if (manga.source == MangaSource.LOCAL) {
-						manga = localMangaRepository.getRemoteManga(manga)
-							?: error("Cannot obtain remote manga instance")
-					}
-					val repo = mangaRepositoryFactory.create(manga.source)
-					outState.value = DownloadState.Preparing(startId, manga, cover)
-					val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
-					output = CbzMangaOutput.get(destination, data)
-					val coverUrl = data.largeCoverUrl ?: data.coverUrl
-					downloadFile(coverUrl, destination, tempFileName, repo.source).let { file ->
-						output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
-					}
-					val chapters = checkNotNull(
-						if (chaptersIdsSet == null) {
-							data.chapters
-						} else {
-							data.chapters?.filter { x -> chaptersIdsSet.remove(x.id) }
-						},
-					) { "Chapters list must not be null" }
-					check(chapters.isNotEmpty()) { "Chapters list must not be empty" }
-					check(chaptersIdsSet.isNullOrEmpty()) {
-						"${chaptersIdsSet?.size} of ${chaptersIds?.size} requested chapters not found in manga"
-					}
-					for ((chapterIndex, chapter) in chapters.withIndex()) {
-						val pages = runFailsafe(outState, pausingHandle) {
-							repo.getPages(chapter)
-						}
-						for ((pageIndex, page) in pages.withIndex()) {
-							runFailsafe(outState, pausingHandle) {
-								val url = repo.getPageUrl(page)
-								val file = cache.get(url)
-									?: downloadFile(url, destination, tempFileName, repo.source)
-								output.addPage(
-									chapter = chapter,
-									file = file,
-									pageNumber = pageIndex,
-									ext = MimeTypeMap.getFileExtensionFromUrl(url),
-								)
-							}
-							outState.value = DownloadState.Progress(
-								startId = startId,
-								manga = data,
-								cover = cover,
-								totalChapters = chapters.size,
-								currentChapter = chapterIndex,
-								totalPages = pages.size,
-								currentPage = pageIndex,
-							)
-
-							if (settings.isDownloadsSlowdownEnabled) {
-								delay(SLOWDOWN_DELAY)
-							}
-						}
-					}
-					outState.value = DownloadState.PostProcessing(startId, data, cover)
-					output.mergeWithExisting()
-					output.finish()
-					val localManga = localMangaRepository.getFromFile(output.file)
-					outState.value = DownloadState.Done(startId, data, cover, localManga)
-				} catch (e: CancellationException) {
-					outState.value = DownloadState.Cancelled(startId, manga, cover)
-					throw e
-				} catch (e: Throwable) {
-					e.printStackTraceDebug()
-					outState.value = DownloadState.Error(startId, manga, cover, e, false)
-				} finally {
-					withContext(NonCancellable) {
-						output?.closeQuietly()
-						output?.cleanup()
-						File(destination, tempFileName).deleteAwait()
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun <R> runFailsafe(
-		outState: MutableStateFlow<DownloadState>,
-		pausingHandle: PausingHandle,
-		block: suspend () -> R,
-	): R {
-		var countDown = MAX_FAILSAFE_ATTEMPTS
-		failsafe@ while (true) {
-			try {
-				return block()
-			} catch (e: IOException) {
-				if (countDown <= 0) {
-					val state = outState.value
-					outState.value = DownloadState.Error(state.startId, state.manga, state.cover, e, true)
-					countDown = MAX_FAILSAFE_ATTEMPTS
-					pausingHandle.pause()
-					pausingHandle.awaitResumed()
-					outState.value = state
-				} else {
-					countDown--
-					delay(DOWNLOAD_ERROR_DELAY)
-				}
-			}
-		}
-	}
-
-	private suspend fun downloadFile(
-		url: String,
-		destination: File,
-		tempFileName: String,
-		source: MangaSource,
-	): File {
-		val request = Request.Builder()
-			.url(url)
-			.tag(MangaSource::class.java, source)
-			.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
-			.get()
-			.build()
-		val call = okHttp.newCall(request)
-		val file = File(destination, tempFileName)
-		val response = call.clone().await()
-		file.outputStream().use { out ->
-			checkNotNull(response.body).byteStream().copyToSuspending(out)
-		}
-		return file
-	}
-
-	private fun errorStateHandler(outState: MutableStateFlow<DownloadState>) =
-		CoroutineExceptionHandler { _, throwable ->
-			throwable.printStackTraceDebug()
-			val prevValue = outState.value
-			outState.value = DownloadState.Error(
-				startId = prevValue.startId,
-				manga = prevValue.manga,
-				cover = prevValue.cover,
-				error = throwable,
-				canRetry = false,
-			)
-		}
-
-	private suspend fun loadCover(manga: Manga) = runCatchingCancellable {
-		imageLoader.execute(
-			ImageRequest.Builder(context)
-				.data(manga.coverUrl)
-				.tag(manga.source)
-				.size(coverWidth, coverHeight)
-				.scale(Scale.FILL)
-				.build(),
-		).drawable
-	}.getOrNull()
-
-	private suspend inline fun <T> withMangaLock(manga: Manga, block: () -> T) = try {
-		localMangaRepository.lockManga(manga.id)
-		block()
-	} finally {
-		localMangaRepository.unlockManga(manga.id)
-	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(coroutineScope: CoroutineScope): DownloadManager
-	}
-}

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

@@ -1,234 +0,0 @@
-package org.koitharu.kotatsu.download.domain
-
-import android.graphics.drawable.Drawable
-import org.koitharu.kotatsu.parsers.model.Manga
-
-sealed interface DownloadState {
-
-	val startId: Int
-	val manga: Manga
-	val cover: Drawable?
-
-	override fun equals(other: Any?): Boolean
-
-	override fun hashCode(): Int
-
-	val isTerminal: Boolean
-		get() = this is Done || this is Cancelled || (this is Error && !canRetry)
-
-	class Queued(
-		override val startId: Int,
-		override val manga: Manga,
-		override val cover: Drawable?,
-	) : DownloadState {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Queued
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			return result
-		}
-	}
-
-	class Preparing(
-		override val startId: Int,
-		override val manga: Manga,
-		override val cover: Drawable?,
-	) : DownloadState {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Preparing
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			return result
-		}
-	}
-
-	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,
-	) : DownloadState {
-
-		val max: Int = totalChapters * totalPages
-
-		val progress: Int = totalPages * currentChapter + currentPage + 1
-
-		val percent: Float = progress.toFloat() / max
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Progress
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-			if (totalChapters != other.totalChapters) return false
-			if (currentChapter != other.currentChapter) return false
-			if (totalPages != other.totalPages) return false
-			if (currentPage != other.currentPage) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			result = 31 * result + totalChapters
-			result = 31 * result + currentChapter
-			result = 31 * result + totalPages
-			result = 31 * result + currentPage
-			return result
-		}
-	}
-
-	class Done(
-		override val startId: Int,
-		override val manga: Manga,
-		override val cover: Drawable?,
-		val localManga: Manga,
-	) : DownloadState {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Done
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-			if (localManga != other.localManga) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			result = 31 * result + localManga.hashCode()
-			return result
-		}
-	}
-
-	class Error(
-		override val startId: Int,
-		override val manga: Manga,
-		override val cover: Drawable?,
-		val error: Throwable,
-		val canRetry: Boolean,
-	) : DownloadState {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Error
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-			if (error != other.error) return false
-			if (canRetry != other.canRetry) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			result = 31 * result + error.hashCode()
-			result = 31 * result + canRetry.hashCode()
-			return result
-		}
-	}
-
-	class Cancelled(
-		override val startId: Int,
-		override val manga: Manga,
-		override val cover: Drawable?,
-	) : DownloadState {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Cancelled
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			return result
-		}
-	}
-
-	class PostProcessing(
-		override val startId: Int,
-		override val manga: Manga,
-		override val cover: Drawable?,
-	) : DownloadState {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as PostProcessing
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			return result
-		}
-	}
-}

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

@@ -1,137 +0,0 @@
-package org.koitharu.kotatsu.download.ui
-
-import android.view.View
-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.details.ui.DetailsActivity
-import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.parsers.util.format
-import org.koitharu.kotatsu.utils.ext.enqueueWith
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.newImageRequest
-import org.koitharu.kotatsu.utils.ext.onFirst
-
-fun downloadItemAD(
-	scope: CoroutineScope,
-	coil: ImageLoader,
-) = adapterDelegateViewBinding<DownloadItem, DownloadItem, ItemDownloadBinding>(
-	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) },
-) {
-	var job: Job? = null
-	val percentPattern = context.resources.getString(R.string.percent_string_pattern)
-
-	val clickListener = View.OnClickListener { v ->
-		when (v.id) {
-			R.id.button_cancel -> item.cancel()
-			R.id.button_resume -> item.resume()
-			else -> context.startActivity(
-				DetailsActivity.newIntent(context, item.progressValue.manga),
-			)
-		}
-	}
-	binding.buttonCancel.setOnClickListener(clickListener)
-	binding.buttonResume.setOnClickListener(clickListener)
-	itemView.setOnClickListener(clickListener)
-
-	bind {
-		job?.cancel()
-		job = item.progressAsFlow().onFirst { state ->
-			binding.imageViewCover.newImageRequest(state.manga.coverUrl, state.manga.source)?.run {
-				placeholder(state.cover)
-				fallback(R.drawable.ic_placeholder)
-				error(R.drawable.ic_error_placeholder)
-				allowRgb565(true)
-				enqueueWith(coil)
-			}
-		}.onEach { state ->
-			binding.textViewTitle.text = state.manga.title
-			when (state) {
-				is DownloadState.Cancelled -> {
-					binding.textViewStatus.setText(R.string.cancelling_)
-					binding.progressBar.isIndeterminate = true
-					binding.progressBar.isVisible = true
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.isVisible = false
-					binding.buttonCancel.isVisible = false
-					binding.buttonResume.isVisible = false
-				}
-
-				is DownloadState.Done -> {
-					binding.textViewStatus.setText(R.string.download_complete)
-					binding.progressBar.isIndeterminate = false
-					binding.progressBar.isVisible = false
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.isVisible = false
-					binding.buttonCancel.isVisible = false
-					binding.buttonResume.isVisible = false
-				}
-
-				is DownloadState.Error -> {
-					binding.textViewStatus.setText(R.string.error_occurred)
-					binding.progressBar.isIndeterminate = false
-					binding.progressBar.isVisible = false
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.text = state.error.getDisplayMessage(context.resources)
-					binding.textViewDetails.isVisible = true
-					binding.buttonCancel.isVisible = state.canRetry
-					binding.buttonResume.isVisible = state.canRetry
-				}
-
-				is DownloadState.PostProcessing -> {
-					binding.textViewStatus.setText(R.string.processing_)
-					binding.progressBar.isIndeterminate = true
-					binding.progressBar.isVisible = true
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.isVisible = false
-					binding.buttonCancel.isVisible = false
-					binding.buttonResume.isVisible = false
-				}
-
-				is DownloadState.Preparing -> {
-					binding.textViewStatus.setText(R.string.preparing_)
-					binding.progressBar.isIndeterminate = true
-					binding.progressBar.isVisible = true
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.isVisible = false
-					binding.buttonCancel.isVisible = true
-					binding.buttonResume.isVisible = false
-				}
-
-				is DownloadState.Progress -> {
-					binding.textViewStatus.setText(R.string.manga_downloading_)
-					binding.progressBar.isIndeterminate = false
-					binding.progressBar.isVisible = true
-					binding.progressBar.max = state.max
-					binding.progressBar.setProgressCompat(state.progress, true)
-					binding.textViewPercent.text = percentPattern.format((state.percent * 100f).format(1))
-					binding.textViewPercent.isVisible = true
-					binding.textViewDetails.isVisible = false
-					binding.buttonCancel.isVisible = true
-					binding.buttonResume.isVisible = false
-				}
-
-				is DownloadState.Queued -> {
-					binding.textViewStatus.setText(R.string.queued)
-					binding.progressBar.isIndeterminate = false
-					binding.progressBar.isVisible = false
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.isVisible = false
-					binding.buttonCancel.isVisible = true
-					binding.buttonResume.isVisible = false
-				}
-			}
-		}.launchIn(scope)
-	}
-
-	onViewRecycled {
-		job?.cancel()
-		job = null
-	}
-}

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

@@ -1,59 +0,0 @@
-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 coil.ImageLoader
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.databinding.ActivityDownloadsBinding
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	private lateinit var serviceConnection: DownloadsConnection
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(ActivityDownloadsBinding.inflate(layoutInflater))
-		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		val adapter = DownloadsAdapter(lifecycleScope, coil)
-		val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
-		binding.recyclerView.addItemDecoration(SpacingItemDecoration(spacing))
-		binding.recyclerView.setHasFixedSize(true)
-		binding.recyclerView.adapter = adapter
-		serviceConnection = DownloadsConnection(this, this)
-		serviceConnection.items.observe(this) { items ->
-			adapter.items = items
-			binding.textViewHolder.isVisible = items.isNullOrEmpty()
-		}
-		serviceConnection.bind()
-	}
-
-	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,
-		)
-	}
-
-	companion object {
-
-		fun newIntent(context: Context) = Intent(context, DownloadsActivity::class.java)
-	}
-}

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

@@ -1,46 +0,0 @@
-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.DownloadState
-import org.koitharu.kotatsu.utils.progress.PausingProgressJob
-
-typealias DownloadItem = PausingProgressJob<DownloadState>
-
-class DownloadsAdapter(
-	scope: CoroutineScope,
-	coil: ImageLoader,
-) : AsyncListDifferDelegationAdapter<DownloadItem>(DiffCallback()) {
-
-	init {
-		delegatesManager.addDelegate(downloadItemAD(scope, coil))
-		setHasStableIds(true)
-	}
-
-	override fun getItemId(position: Int): Long {
-		return items[position].progressValue.startId.toLong()
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<DownloadItem>() {
-
-		override fun areItemsTheSame(
-			oldItem: DownloadItem,
-			newItem: DownloadItem,
-		): Boolean {
-			return oldItem.progressValue.startId == newItem.progressValue.startId
-		}
-
-		override fun areContentsTheSame(
-			oldItem: DownloadItem,
-			newItem: DownloadItem,
-		): Boolean {
-			return oldItem.progressValue == newItem.progressValue && oldItem.isPaused == newItem.isPaused
-		}
-
-		override fun getChangePayload(oldItem: DownloadItem, newItem: DownloadItem): Any {
-			return Unit
-		}
-	}
-}

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

@@ -1,76 +0,0 @@
-package org.koitharu.kotatsu.download.ui
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.os.IBinder
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.utils.asFlowLiveData
-import org.koitharu.kotatsu.utils.progress.PausingProgressJob
-
-class DownloadsConnection(
-	private val context: Context,
-	private val lifecycleOwner: LifecycleOwner,
-) : ServiceConnection {
-
-	private var bindingObserver: BindingLifecycleObserver? = null
-	private var collectJob: Job? = null
-	private val itemsFlow = MutableStateFlow<List<PausingProgressJob<DownloadState>>>(emptyList())
-
-	val items
-		get() = itemsFlow.asFlowLiveData()
-
-	override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-		collectJob?.cancel()
-		val binder = (service as? DownloadService.DownloadBinder)
-		collectJob = if (binder == null) {
-			null
-		} else {
-			lifecycleOwner.lifecycleScope.launch {
-				binder.downloads.collect {
-					itemsFlow.value = it
-				}
-			}
-		}
-	}
-
-	override fun onServiceDisconnected(name: ComponentName?) {
-		collectJob?.cancel()
-		collectJob = null
-		itemsFlow.value = itemsFlow.value.filter { it.progressValue.isTerminal }
-	}
-
-	fun bind() {
-		if (bindingObserver != null) {
-			return
-		}
-		bindingObserver = BindingLifecycleObserver().also {
-			lifecycleOwner.lifecycle.addObserver(it)
-		}
-		context.bindService(Intent(context, DownloadService::class.java), this, 0)
-	}
-
-	fun unbind() {
-		bindingObserver?.let {
-			lifecycleOwner.lifecycle.removeObserver(it)
-		}
-		bindingObserver = null
-		context.unbindService(this)
-	}
-
-	private inner class BindingLifecycleObserver : DefaultLifecycleObserver {
-
-		override fun onDestroy(owner: LifecycleOwner) {
-			super.onDestroy(owner)
-			unbind()
-		}
-	}
-}

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

@@ -1,339 +0,0 @@
-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 android.text.format.DateUtils
-import android.util.SparseArray
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import androidx.core.text.HtmlCompat
-import androidx.core.text.htmlEncode
-import androidx.core.text.parseAsHtml
-import androidx.core.util.forEach
-import androidx.core.util.isNotEmpty
-import androidx.core.util.size
-import com.google.android.material.R as materialR
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.download.ui.DownloadsActivity
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.ellipsize
-import org.koitharu.kotatsu.parsers.util.format
-import org.koitharu.kotatsu.search.ui.MangaListActivity
-import org.koitharu.kotatsu.utils.PendingIntentCompat
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-
-class DownloadNotification(private val context: Context) {
-
-	private val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-	private val states = SparseArray<DownloadState>()
-	private val groupBuilder = NotificationCompat.Builder(context, CHANNEL_ID)
-
-	private val queueIntent = PendingIntent.getActivity(
-		context,
-		REQUEST_QUEUE,
-		DownloadsActivity.newIntent(context),
-		PendingIntentCompat.FLAG_IMMUTABLE,
-	)
-
-	private val localListIntent = PendingIntent.getActivity(
-		context,
-		REQUEST_LIST_LOCAL,
-		MangaListActivity.newIntent(context, MangaSource.LOCAL),
-		PendingIntentCompat.FLAG_IMMUTABLE,
-	)
-
-	init {
-		groupBuilder.setOnlyAlertOnce(true)
-		groupBuilder.setDefaults(0)
-		groupBuilder.color = ContextCompat.getColor(context, R.color.blue_primary)
-		groupBuilder.foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
-		groupBuilder.setSilent(true)
-		groupBuilder.setGroup(GROUP_ID)
-		groupBuilder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-		groupBuilder.setGroupSummary(true)
-		groupBuilder.setContentTitle(context.getString(R.string.downloading_manga))
-	}
-
-	fun buildGroupNotification(): Notification {
-		val style = NotificationCompat.InboxStyle(groupBuilder)
-		var progress = 0f
-		var isAllDone = true
-		var isInProgress = false
-		groupBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-		states.forEach { _, state ->
-			if (state.manga.isNsfw) {
-				groupBuilder.setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
-			}
-			val summary = when (state) {
-				is DownloadState.Cancelled -> {
-					progress++
-					context.getString(R.string.cancelling_)
-				}
-				is DownloadState.Done -> {
-					progress++
-					context.getString(R.string.download_complete)
-				}
-				is DownloadState.Error -> {
-					isAllDone = false
-					context.getString(R.string.error)
-				}
-				is DownloadState.PostProcessing -> {
-					progress++
-					isInProgress = true
-					isAllDone = false
-					context.getString(R.string.processing_)
-				}
-				is DownloadState.Preparing -> {
-					isAllDone = false
-					isInProgress = true
-					context.getString(R.string.preparing_)
-				}
-				is DownloadState.Progress -> {
-					isAllDone = false
-					isInProgress = true
-					progress += state.percent
-					context.getString(R.string.percent_string_pattern, (state.percent * 100).format())
-				}
-				is DownloadState.Queued -> {
-					isAllDone = false
-					isInProgress = true
-					context.getString(R.string.queued)
-				}
-			}
-			style.addLine(
-				context.getString(
-					R.string.download_summary_pattern,
-					state.manga.title.ellipsize(16).htmlEncode(),
-					summary.htmlEncode(),
-				).parseAsHtml(HtmlCompat.FROM_HTML_MODE_LEGACY),
-			)
-		}
-		progress = if (isInProgress) {
-			progress / states.size.toFloat()
-		} else {
-			1f
-		}
-		style.setBigContentTitle(
-			context.getString(if (isAllDone) R.string.download_complete else R.string.downloading_manga),
-		)
-		groupBuilder.setContentText(context.resources.getQuantityString(R.plurals.items, states.size, states.size()))
-		groupBuilder.setNumber(states.size)
-		groupBuilder.setSmallIcon(
-			if (isInProgress) android.R.drawable.stat_sys_download else android.R.drawable.stat_sys_download_done,
-		)
-		groupBuilder.setContentIntent(if (isAllDone) localListIntent else queueIntent)
-		groupBuilder.setAutoCancel(isAllDone)
-		when (progress) {
-			1f -> groupBuilder.setProgress(0, 0, false)
-			0f -> groupBuilder.setProgress(1, 0, true)
-			else -> groupBuilder.setProgress(100, (progress * 100f).toInt(), false)
-		}
-		return groupBuilder.build()
-	}
-
-	fun detach() {
-		if (states.isNotEmpty()) {
-			val notification = buildGroupNotification()
-			manager.notify(ID_GROUP_DETACHED, notification)
-		}
-		manager.cancel(ID_GROUP)
-	}
-
-	fun newItem(startId: Int) = Item(startId)
-
-	inner class Item(
-		private val startId: Int,
-	) {
-
-		private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-		private val cancelAction = NotificationCompat.Action(
-			materialR.drawable.material_ic_clear_black_24dp,
-			context.getString(android.R.string.cancel),
-			PendingIntent.getBroadcast(
-				context,
-				startId * 2,
-				DownloadService.getCancelIntent(startId),
-				PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
-			),
-		)
-		private val retryAction = NotificationCompat.Action(
-			R.drawable.ic_restart_black,
-			context.getString(R.string.try_again),
-			PendingIntent.getBroadcast(
-				context,
-				startId * 2 + 1,
-				DownloadService.getResumeIntent(startId),
-				PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
-			),
-		)
-
-		init {
-			builder.setOnlyAlertOnce(true)
-			builder.setDefaults(0)
-			builder.color = ContextCompat.getColor(context, R.color.blue_primary)
-			builder.foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
-			builder.setSilent(true)
-			builder.setGroup(GROUP_ID)
-			builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-		}
-
-		fun notify(state: DownloadState, timeLeft: Long) {
-			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(queueIntent)
-			builder.setStyle(null)
-			builder.setLargeIcon(state.cover?.toBitmap())
-			builder.clearActions()
-			builder.setSubText(null)
-			builder.setShowWhen(false)
-			builder.setVisibility(
-				if (state.manga.isNsfw) {
-					NotificationCompat.VISIBILITY_PRIVATE
-				} else {
-					NotificationCompat.VISIBILITY_PUBLIC
-				},
-			)
-			when (state) {
-				is DownloadState.Cancelled -> {
-					builder.setProgress(1, 0, true)
-					builder.setContentText(context.getString(R.string.cancelling_))
-					builder.setContentIntent(null)
-					builder.setStyle(null)
-					builder.setOngoing(true)
-					builder.priority = NotificationCompat.PRIORITY_DEFAULT
-				}
-				is DownloadState.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)
-					builder.setOngoing(false)
-					builder.setShowWhen(true)
-					builder.setWhen(System.currentTimeMillis())
-					builder.priority = NotificationCompat.PRIORITY_DEFAULT
-				}
-				is DownloadState.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(!state.canRetry)
-					builder.setOngoing(state.canRetry)
-					builder.setCategory(NotificationCompat.CATEGORY_ERROR)
-					builder.setShowWhen(true)
-					builder.setWhen(System.currentTimeMillis())
-					builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
-					if (state.canRetry) {
-						builder.addAction(cancelAction)
-						builder.addAction(retryAction)
-					}
-					builder.priority = NotificationCompat.PRIORITY_DEFAULT
-				}
-				is DownloadState.PostProcessing -> {
-					builder.setProgress(1, 0, true)
-					builder.setContentText(context.getString(R.string.processing_))
-					builder.setStyle(null)
-					builder.setOngoing(true)
-					builder.priority = NotificationCompat.PRIORITY_DEFAULT
-				}
-				is DownloadState.Queued -> {
-					builder.setProgress(0, 0, false)
-					builder.setContentText(context.getString(R.string.queued))
-					builder.setStyle(null)
-					builder.setOngoing(true)
-					builder.addAction(cancelAction)
-					builder.priority = NotificationCompat.PRIORITY_LOW
-				}
-				is DownloadState.Preparing -> {
-					builder.setProgress(1, 0, true)
-					builder.setContentText(context.getString(R.string.preparing_))
-					builder.setStyle(null)
-					builder.setOngoing(true)
-					builder.addAction(cancelAction)
-					builder.priority = NotificationCompat.PRIORITY_DEFAULT
-				}
-				is DownloadState.Progress -> {
-					builder.setProgress(state.max, state.progress, false)
-					val percent = context.getString(R.string.percent_string_pattern, (state.percent * 100).format())
-					if (timeLeft > 0L) {
-						val eta = DateUtils.getRelativeTimeSpanString(timeLeft, 0L, DateUtils.SECOND_IN_MILLIS)
-						builder.setContentText(eta)
-						builder.setSubText(percent)
-					} else {
-						builder.setContentText(percent)
-					}
-					builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
-					builder.setStyle(null)
-					builder.setOngoing(true)
-					builder.addAction(cancelAction)
-					builder.priority = NotificationCompat.PRIORITY_DEFAULT
-				}
-			}
-			val notification = builder.build()
-			states.append(startId, state)
-			updateGroupNotification()
-			manager.notify(TAG, startId, notification)
-		}
-
-		fun dismiss() {
-			manager.cancel(TAG, startId)
-			states.remove(startId)
-			updateGroupNotification()
-		}
-	}
-
-	private fun updateGroupNotification() {
-		val notification = buildGroupNotification()
-		manager.notify(ID_GROUP, notification)
-	}
-
-	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 TAG = "download"
-		private const val CHANNEL_ID = "download"
-		private const val GROUP_ID = "downloads"
-		private const val REQUEST_QUEUE = 6
-		private const val REQUEST_LIST_LOCAL = 7
-		const val ID_GROUP = 9999
-		private const val ID_GROUP_DETACHED = 9998
-
-		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

@@ -1,278 +0,0 @@
-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.os.Binder
-import android.os.IBinder
-import android.os.PowerManager
-import android.view.View
-import androidx.annotation.MainThread
-import androidx.core.app.ServiceCompat
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.transformWhile
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseService
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.download.domain.DownloadManager
-import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.download.ui.DownloadsActivity
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
-import org.koitharu.kotatsu.utils.ext.throttle
-import org.koitharu.kotatsu.utils.progress.PausingProgressJob
-import org.koitharu.kotatsu.utils.progress.ProgressJob
-import org.koitharu.kotatsu.utils.progress.TimeLeftEstimator
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import kotlin.collections.set
-
-@AndroidEntryPoint
-class DownloadService : BaseService() {
-
-	private lateinit var downloadManager: DownloadManager
-	private lateinit var downloadNotification: DownloadNotification
-	private lateinit var wakeLock: PowerManager.WakeLock
-
-	@Inject
-	lateinit var downloadManagerFactory: DownloadManager.Factory
-
-	private val jobs = LinkedHashMap<Int, PausingProgressJob<DownloadState>>()
-	private val jobCount = MutableStateFlow(0)
-	private val controlReceiver = ControlReceiver()
-
-	override fun onCreate() {
-		super.onCreate()
-		isRunning = true
-		downloadNotification = DownloadNotification(this)
-		wakeLock = (applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager)
-			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
-		downloadManager = downloadManagerFactory.create(lifecycleScope)
-		wakeLock.acquire(TimeUnit.HOURS.toMillis(8))
-		DownloadNotification.createChannel(this)
-		startForeground(DownloadNotification.ID_GROUP, downloadNotification.buildGroupNotification())
-		val intentFilter = IntentFilter()
-		intentFilter.addAction(ACTION_DOWNLOAD_CANCEL)
-		intentFilter.addAction(ACTION_DOWNLOAD_RESUME)
-		ContextCompat.registerReceiver(this, controlReceiver, intentFilter, ContextCompat.RECEIVER_NOT_EXPORTED)
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
-		val manga = intent?.getParcelableExtraCompat<ParcelableManga>(EXTRA_MANGA)?.manga
-		val chapters = intent?.getLongArrayExtra(EXTRA_CHAPTERS_IDS)
-		return if (manga != null) {
-			jobs[startId] = downloadManga(startId, manga, chapters)
-			jobCount.value = jobs.size
-			START_REDELIVER_INTENT
-		} else {
-			stopSelfIfIdle()
-			START_NOT_STICKY
-		}
-	}
-
-	override fun onBind(intent: Intent): IBinder {
-		super.onBind(intent)
-		return DownloadBinder(this)
-	}
-
-	override fun onDestroy() {
-		unregisterReceiver(controlReceiver)
-		if (wakeLock.isHeld) {
-			wakeLock.release()
-		}
-		isRunning = false
-		super.onDestroy()
-	}
-
-	private fun downloadManga(
-		startId: Int,
-		manga: Manga,
-		chaptersIds: LongArray?,
-	): PausingProgressJob<DownloadState> {
-		val job = downloadManager.downloadManga(manga, chaptersIds, startId)
-		listenJob(job)
-		return job
-	}
-
-	private fun listenJob(job: ProgressJob<DownloadState>) {
-		lifecycleScope.launch {
-			val startId = job.progressValue.startId
-			val notificationItem = downloadNotification.newItem(startId)
-			try {
-				val timeLeftEstimator = TimeLeftEstimator()
-				notificationItem.notify(job.progressValue, -1L)
-				job.progressAsFlow()
-					.onEach { state ->
-						if (state is DownloadState.Progress) {
-							timeLeftEstimator.tick(value = state.progress, total = state.max)
-						} else {
-							timeLeftEstimator.emptyTick()
-						}
-					}
-					.throttle { state -> if (state is DownloadState.Progress) 400L else 0L }
-					.whileActive()
-					.collect { state ->
-						val timeLeft = timeLeftEstimator.getEstimatedTimeLeft()
-						notificationItem.notify(state, timeLeft)
-					}
-				job.join()
-			} finally {
-				(job.progressValue as? DownloadState.Done)?.let {
-					sendBroadcast(
-						Intent(ACTION_DOWNLOAD_COMPLETE)
-							.putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false)),
-					)
-				}
-				if (job.isCancelled) {
-					notificationItem.dismiss()
-					if (jobs.remove(startId) != null) {
-						jobCount.value = jobs.size
-					}
-				} else {
-					notificationItem.notify(job.progressValue, -1L)
-				}
-			}
-		}.invokeOnCompletion {
-			stopSelfIfIdle()
-		}
-	}
-
-	private fun Flow<DownloadState>.whileActive(): Flow<DownloadState> = transformWhile { state ->
-		emit(state)
-		!state.isTerminal
-	}
-
-	@MainThread
-	private fun stopSelfIfIdle() {
-		if (jobs.any { (_, job) -> job.isActive }) {
-			return
-		}
-		downloadNotification.detach()
-		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-		stopSelf()
-	}
-
-	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[cancelId]?.cancel()
-				}
-
-				ACTION_DOWNLOAD_RESUME -> {
-					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
-					jobs[cancelId]?.resume()
-				}
-			}
-		}
-	}
-
-	class DownloadBinder(service: DownloadService) : Binder(), DefaultLifecycleObserver {
-
-		private var downloadsStateFlow = MutableStateFlow<List<PausingProgressJob<DownloadState>>>(emptyList())
-
-		init {
-			service.lifecycle.addObserver(this)
-			service.jobCount.onEach {
-				downloadsStateFlow.value = service.jobs.values.toList()
-			}.launchIn(service.lifecycleScope)
-		}
-
-		override fun onDestroy(owner: LifecycleOwner) {
-			owner.lifecycle.removeObserver(this)
-			downloadsStateFlow.value = emptyList()
-			super.onDestroy(owner)
-		}
-
-		val downloads
-			get() = downloadsStateFlow.asStateFlow()
-	}
-
-	companion object {
-
-		var isRunning: Boolean = false
-			private set
-
-		@Deprecated("Use LocalMangaRepository.watchReadableDirs instead")
-		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 ACTION_DOWNLOAD_RESUME = "${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_RESUME"
-
-		const val EXTRA_MANGA = "manga"
-		private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
-		private const val EXTRA_CANCEL_ID = "cancel_id"
-
-		fun start(view: View, manga: Manga, chaptersIds: Collection<Long>? = null) {
-			if (chaptersIds?.isEmpty() == true) {
-				return
-			}
-			val intent = Intent(view.context, DownloadService::class.java)
-			intent.putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
-			if (chaptersIds != null) {
-				intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
-			}
-			ContextCompat.startForegroundService(view.context, intent)
-			showStartedSnackbar(view)
-		}
-
-		fun start(view: View, manga: Collection<Manga>) {
-			if (manga.isEmpty()) {
-				return
-			}
-			for (item in manga) {
-				val intent = Intent(view.context, DownloadService::class.java)
-				intent.putExtra(EXTRA_MANGA, ParcelableManga(item, withChapters = false))
-				ContextCompat.startForegroundService(view.context, intent)
-			}
-			showStartedSnackbar(view)
-		}
-
-		fun confirmAndStart(view: View, items: Set<Manga>) {
-			MaterialAlertDialogBuilder(view.context)
-				.setTitle(R.string.save_manga)
-				.setMessage(R.string.batch_manga_save_confirm)
-				.setNegativeButton(android.R.string.cancel, null)
-				.setPositiveButton(R.string.save) { _, _ ->
-					start(view, items)
-				}.show()
-		}
-
-		fun getCancelIntent(startId: Int) = Intent(ACTION_DOWNLOAD_CANCEL)
-			.putExtra(EXTRA_CANCEL_ID, startId)
-
-		fun getResumeIntent(startId: Int) = Intent(ACTION_DOWNLOAD_RESUME)
-			.putExtra(EXTRA_CANCEL_ID, startId)
-
-		fun getDownloadedManga(intent: Intent?): Manga? {
-			if (intent?.action == ACTION_DOWNLOAD_COMPLETE) {
-				return intent.getParcelableExtraCompat<ParcelableManga>(EXTRA_MANGA)?.manga
-			}
-			return null
-		}
-
-		private fun showStartedSnackbar(view: View) {
-			Snackbar.make(view, R.string.download_started, Snackbar.LENGTH_LONG)
-				.setAction(R.string.details) {
-					it.context.startActivity(DownloadsActivity.newIntent(it.context))
-				}.show()
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt

@@ -1,42 +0,0 @@
-package org.koitharu.kotatsu.explore.domain
-
-import javax.inject.Inject
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.history.domain.HistoryRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.SortOrder
-
-class ExploreRepository @Inject constructor(
-	private val settings: AppSettings,
-	private val historyRepository: HistoryRepository,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-) {
-
-	suspend fun findRandomManga(tagsLimit: Int): Manga {
-		val blacklistTagRegex = settings.getSuggestionsTagsBlacklistRegex()
-		val allTags = historyRepository.getPopularTags(tagsLimit).filterNot {
-			blacklistTagRegex?.containsMatchIn(it.title) ?: false
-		}
-		val tag = allTags.randomOrNull()
-		val source = checkNotNull(tag?.source ?: settings.getMangaSources(includeHidden = false).randomOrNull()) {
-			"No sources found"
-		}
-		val repo = mangaRepositoryFactory.create(source)
-		val list = repo.getList(
-			offset = 0,
-			sortOrder = if (SortOrder.UPDATED in repo.sortOrders) SortOrder.UPDATED else null,
-			tags = setOfNotNull(tag),
-		).shuffled()
-		for (item in list) {
-			if (settings.isSuggestionsExcludeNsfw && item.isNsfw) {
-				continue
-			}
-			if (blacklistTagRegex != null && item.tags.any { x -> blacklistTagRegex.containsMatchIn(x.title) }) {
-				continue
-			}
-			return item
-		}
-		return list.random()
-	}
-}

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

@@ -1,63 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories.edit
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.liveData
-import androidx.lifecycle.viewModelScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.utils.SingleLiveEvent
-
-private const val NO_ID = -1L
-
-class FavouritesCategoryEditViewModel @AssistedInject constructor(
-	@Assisted private val categoryId: Long,
-	private val repository: FavouritesRepository,
-	private val settings: AppSettings,
-) : BaseViewModel() {
-
-	val onSaved = SingleLiveEvent<Unit>()
-	val category = MutableLiveData<FavouriteCategory?>()
-
-	val isTrackerEnabled = liveData(viewModelScope.coroutineContext + Dispatchers.Default) {
-		emit(settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources)
-	}
-
-	init {
-		launchLoadingJob {
-			category.value = if (categoryId != NO_ID) {
-				repository.getCategory(categoryId)
-			} else {
-				null
-			}
-		}
-	}
-
-	fun save(
-		title: String,
-		sortOrder: SortOrder,
-		isTrackerEnabled: Boolean,
-	) {
-		launchLoadingJob {
-			check(title.isNotEmpty())
-			if (categoryId == NO_ID) {
-				repository.createCategory(title, sortOrder, isTrackerEnabled)
-			} else {
-				repository.updateCategory(categoryId, title, sortOrder, isTrackerEnabled)
-			}
-			onSaved.call(Unit)
-		}
-	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(categoryId: Long): FavouritesCategoryEditViewModel
-	}
-}

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

@@ -1,105 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories.select
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.appcompat.widget.Toolbar
-import androidx.fragment.app.FragmentManager
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseBottomSheet
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.databinding.SheetFavoriteCategoriesBinding
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
-import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
-import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.assistedViewModels
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.withArgs
-
-@AndroidEntryPoint
-class FavouriteCategoriesBottomSheet :
-	BaseBottomSheet<SheetFavoriteCategoriesBinding>(),
-	OnListItemClickListener<MangaCategoryItem>,
-	View.OnClickListener,
-	Toolbar.OnMenuItemClickListener {
-
-	@Inject
-	lateinit var viewModelFactory: MangaCategoriesViewModel.Factory
-
-	private val viewModel: MangaCategoriesViewModel by assistedViewModels {
-		viewModelFactory.create(
-			requireNotNull(arguments?.getParcelableArrayList<ParcelableManga>(KEY_MANGA_LIST)).map { it.manga },
-		)
-	}
-
-	private var adapter: MangaCategoriesAdapter? = null
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = SheetFavoriteCategoriesBinding.inflate(inflater, container, false)
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		adapter = MangaCategoriesAdapter(this)
-		binding.recyclerViewCategories.adapter = adapter
-		binding.buttonDone.setOnClickListener(this)
-		binding.headerBar.toolbar.setOnMenuItemClickListener(this)
-
-		viewModel.content.observe(viewLifecycleOwner, this::onContentChanged)
-		viewModel.onError.observe(viewLifecycleOwner, ::onError)
-	}
-
-	override fun onDestroyView() {
-		adapter = null
-		super.onDestroyView()
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_done -> dismiss()
-		}
-	}
-
-	override fun onMenuItemClick(item: MenuItem): Boolean {
-		when (item.itemId) {
-			R.id.action_create -> startActivity(FavouritesCategoryEditActivity.newIntent(requireContext()))
-			else -> return false
-		}
-		return true
-	}
-
-	override fun onItemClick(item: MangaCategoryItem, view: View) {
-		viewModel.setChecked(item.id, !item.isChecked)
-	}
-
-	private fun onContentChanged(categories: List<MangaCategoryItem>) {
-		adapter?.items = categories
-	}
-
-	private fun onError(e: Throwable) {
-		Toast.makeText(context ?: return, e.getDisplayMessage(resources), Toast.LENGTH_SHORT).show()
-	}
-
-	companion object {
-
-		private const val TAG = "FavouriteCategoriesDialog"
-		private const val KEY_MANGA_LIST = "manga_list"
-
-		fun show(fm: FragmentManager, manga: Manga) = Companion.show(fm, listOf(manga))
-
-		fun show(fm: FragmentManager, manga: Collection<Manga>) = FavouriteCategoriesBottomSheet().withArgs(1) {
-			putParcelableArrayList(
-				KEY_MANGA_LIST,
-				manga.mapTo(ArrayList(manga.size)) { ParcelableManga(it, withChapters = false) },
-			)
-		}.show(fm, TAG)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoriesAdapter.kt

@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories.select.adapter
-
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
-
-class MangaCategoriesAdapter(
-	clickListener: OnListItemClickListener<MangaCategoryItem>
-) : AsyncListDifferDelegationAdapter<MangaCategoryItem>(DiffCallback()) {
-
-	init {
-		delegatesManager.addDelegate(mangaCategoryAD(clickListener))
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<MangaCategoryItem>() {
-		override fun areItemsTheSame(
-			oldItem: MangaCategoryItem,
-			newItem: MangaCategoryItem
-		): Boolean = oldItem.id == newItem.id
-
-		override fun areContentsTheSame(
-			oldItem: MangaCategoryItem,
-			newItem: MangaCategoryItem
-		): Boolean = oldItem == newItem
-
-		override fun getChangePayload(
-			oldItem: MangaCategoryItem,
-			newItem: MangaCategoryItem
-		): Any? {
-			if (oldItem.isChecked != newItem.isChecked) {
-				return newItem.isChecked
-			}
-			return super.getChangePayload(oldItem, newItem)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/list/domain/ListExtraProvider.kt

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.list.domain
-
-interface ListExtraProvider {
-
-	suspend fun getCounter(mangaId: Long): Int
-
-	suspend fun getProgress(mangaId: Long): Float
-}

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

@@ -1,39 +0,0 @@
-package org.koitharu.kotatsu.list.ui
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.base.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
-import org.koitharu.kotatsu.core.prefs.observeAsLiveData
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.utils.SingleLiveEvent
-import org.koitharu.kotatsu.utils.asFlowLiveData
-
-abstract class MangaListViewModel(
-	private val settings: AppSettings,
-) : BaseViewModel() {
-
-	abstract val content: LiveData<List<ListModel>>
-	protected val listModeFlow = settings.observeAsFlow(AppSettings.KEY_LIST_MODE) { listMode }
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, settings.listMode)
-	val listMode = listModeFlow.asFlowLiveData(viewModelScope.coroutineContext)
-	val onActionDone = SingleLiveEvent<ReversibleAction>()
-	val gridScale = settings.observeAsLiveData(
-		context = viewModelScope.coroutineContext + Dispatchers.Default,
-		key = AppSettings.KEY_GRID_SIZE,
-		valueProducer = { gridSize / 100f },
-	)
-
-	open fun onUpdateFilter(tags: Set<MangaTag>) = Unit
-
-	abstract fun onRefresh()
-
-	abstract fun onRetry()
-}

app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapter.kt

@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.list.ui.filter
-
-import androidx.recyclerview.widget.AsyncListDiffer.ListListener
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-
-class FilterAdapter(
-	listener: OnFilterChangedListener,
-	listListener: ListListener<FilterItem>,
-) : AsyncListDifferDelegationAdapter<FilterItem>(
-	FilterDiffCallback(),
-	filterSortDelegate(listener),
-	filterTagDelegate(listener),
-	filterHeaderDelegate(),
-	filterLoadingDelegate(),
-	filterErrorDelegate(),
-) {
-
-	init {
-		differ.addListListener(listListener)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt

@@ -1,66 +0,0 @@
-package org.koitharu.kotatsu.list.ui.filter
-
-import android.widget.TextView
-import androidx.core.view.isVisible
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.titleRes
-import org.koitharu.kotatsu.databinding.ItemCheckableNewBinding
-import org.koitharu.kotatsu.databinding.ItemFilterHeaderBinding
-
-fun filterSortDelegate(
-	listener: OnFilterChangedListener,
-) = adapterDelegateViewBinding<FilterItem.Sort, FilterItem, ItemCheckableNewBinding>(
-	{ layoutInflater, parent -> ItemCheckableNewBinding.inflate(layoutInflater, parent, false) }
-) {
-
-	itemView.setOnClickListener {
-		listener.onSortItemClick(item)
-	}
-
-	bind {
-		binding.root.setText(item.order.titleRes)
-		binding.root.isChecked = item.isSelected
-	}
-}
-
-fun filterTagDelegate(
-	listener: OnFilterChangedListener,
-) = adapterDelegateViewBinding<FilterItem.Tag, FilterItem, ItemCheckableNewBinding>(
-	{ layoutInflater, parent -> ItemCheckableNewBinding.inflate(layoutInflater, parent, false) }
-) {
-
-	itemView.setOnClickListener {
-		listener.onTagItemClick(item)
-	}
-
-	bind {
-		binding.root.text = item.tag.title
-		binding.root.isChecked = item.isChecked
-	}
-}
-
-fun filterHeaderDelegate() = adapterDelegateViewBinding<FilterItem.Header, FilterItem, ItemFilterHeaderBinding>(
-	{ layoutInflater, parent -> ItemFilterHeaderBinding.inflate(layoutInflater, parent, false) }
-) {
-
-	bind {
-		binding.textViewTitle.setText(item.titleResId)
-		binding.badge.isVisible = if (item.counter == 0) {
-			false
-		} else {
-			binding.badge.text = item.counter.toString()
-			true
-		}
-	}
-}
-
-fun filterLoadingDelegate() = adapterDelegate<FilterItem.Loading, FilterItem>(R.layout.item_loading_footer) {}
-
-fun filterErrorDelegate() = adapterDelegate<FilterItem.Error, FilterItem>(R.layout.item_sources_empty) {
-
-	bind {
-		(itemView as TextView).setText(item.textResId)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterBottomSheet.kt

@@ -1,91 +0,0 @@
-package org.koitharu.kotatsu.list.ui.filter
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.widget.SearchView
-import androidx.fragment.app.FragmentManager
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.recyclerview.widget.LinearLayoutManager
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseBottomSheet
-import org.koitharu.kotatsu.base.ui.util.CollapseActionViewCallback
-import org.koitharu.kotatsu.databinding.SheetFilterBinding
-import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel
-import org.koitharu.kotatsu.utils.ext.parentFragmentViewModels
-
-class FilterBottomSheet :
-	BaseBottomSheet<SheetFilterBinding>(),
-	MenuItem.OnActionExpandListener,
-	SearchView.OnQueryTextListener,
-	AsyncListDiffer.ListListener<FilterItem> {
-
-	private val viewModel by parentFragmentViewModels<RemoteListViewModel>()
-	private var collapsibleActionViewCallback: CollapseActionViewCallback? = null
-
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetFilterBinding {
-		return SheetFilterBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		val adapter = FilterAdapter(viewModel, this)
-		binding.recyclerView.adapter = adapter
-		viewModel.filterItems.observe(viewLifecycleOwner, adapter::setItems)
-		initOptionsMenu()
-	}
-
-	override fun onDestroyView() {
-		super.onDestroyView()
-		collapsibleActionViewCallback = null
-	}
-
-	override fun onMenuItemActionExpand(item: MenuItem): Boolean {
-		setExpanded(isExpanded = true, isLocked = true)
-		collapsibleActionViewCallback?.onMenuItemActionExpand(item)
-		return true
-	}
-
-	override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
-		val searchView = (item.actionView as? SearchView) ?: return false
-		searchView.setQuery("", false)
-		searchView.post { setExpanded(isExpanded = false, isLocked = false) }
-		collapsibleActionViewCallback?.onMenuItemActionCollapse(item)
-		return true
-	}
-
-	override fun onQueryTextSubmit(query: String?): Boolean = false
-
-	override fun onQueryTextChange(newText: String?): Boolean {
-		viewModel.filterSearch(newText?.trim().orEmpty())
-		return true
-	}
-
-	override fun onCurrentListChanged(previousList: MutableList<FilterItem>, currentList: MutableList<FilterItem>) {
-		if (currentList.size > previousList.size && view != null) {
-			(binding.recyclerView.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(0, 0)
-		}
-	}
-
-	private fun initOptionsMenu() {
-		binding.headerBar.inflateMenu(R.menu.opt_filter)
-		val searchMenuItem = binding.headerBar.menu.findItem(R.id.action_search)
-		searchMenuItem.setOnActionExpandListener(this)
-		val searchView = searchMenuItem.actionView as SearchView
-		searchView.setOnQueryTextListener(this)
-		searchView.setIconifiedByDefault(false)
-		searchView.queryHint = searchMenuItem.title
-		collapsibleActionViewCallback = CollapseActionViewCallback(searchMenuItem).also {
-			onBackPressedDispatcher.addCallback(it)
-		}
-	}
-
-	companion object {
-
-		private const val TAG = "FilterBottomSheet"
-
-		fun show(fm: FragmentManager) = FilterBottomSheet().show(fm, TAG)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterDiffCallback.kt

@@ -1,59 +0,0 @@
-package org.koitharu.kotatsu.list.ui.filter
-
-import androidx.recyclerview.widget.DiffUtil
-
-class FilterDiffCallback : DiffUtil.ItemCallback<FilterItem>() {
-
-	override fun areItemsTheSame(oldItem: FilterItem, newItem: FilterItem): Boolean {
-		return when {
-			oldItem === newItem -> true
-			oldItem.javaClass != newItem.javaClass -> false
-			oldItem is FilterItem.Header && newItem is FilterItem.Header -> {
-				oldItem.titleResId == newItem.titleResId
-			}
-			oldItem is FilterItem.Tag && newItem is FilterItem.Tag -> {
-				oldItem.tag == newItem.tag
-			}
-			oldItem is FilterItem.Sort && newItem is FilterItem.Sort -> {
-				oldItem.order == newItem.order
-			}
-			oldItem is FilterItem.Error && newItem is FilterItem.Error -> {
-				oldItem.textResId == newItem.textResId
-			}
-			else -> false
-		}
-	}
-
-	override fun areContentsTheSame(oldItem: FilterItem, newItem: FilterItem): Boolean {
-		return when {
-			oldItem == FilterItem.Loading && newItem == FilterItem.Loading -> true
-			oldItem is FilterItem.Header && newItem is FilterItem.Header -> {
-				oldItem.counter == newItem.counter
-			}
-			oldItem is FilterItem.Error && newItem is FilterItem.Error -> true
-			oldItem is FilterItem.Tag && newItem is FilterItem.Tag -> {
-				oldItem.isChecked == newItem.isChecked
-			}
-			oldItem is FilterItem.Sort && newItem is FilterItem.Sort -> {
-				oldItem.isSelected == newItem.isSelected
-			}
-			else -> false
-		}
-	}
-
-	override fun getChangePayload(oldItem: FilterItem, newItem: FilterItem): Any? {
-		val hasPayload = when {
-			oldItem is FilterItem.Tag && newItem is FilterItem.Tag -> {
-				oldItem.isChecked != newItem.isChecked
-			}
-			oldItem is FilterItem.Sort && newItem is FilterItem.Sort -> {
-				oldItem.isSelected != newItem.isSelected
-			}
-			oldItem is FilterItem.Header && newItem is FilterItem.Header -> {
-				oldItem.counter != newItem.counter
-			}
-			else -> false
-		}
-		return if (hasPayload) Unit else super.getChangePayload(oldItem, newItem)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt

@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.list.ui.filter
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-
-sealed interface FilterItem {
-
-	class Header(
-		@StringRes val titleResId: Int,
-		val counter: Int,
-	) : FilterItem
-
-	class Sort(
-		val order: SortOrder,
-		val isSelected: Boolean,
-	) : FilterItem
-
-	class Tag(
-		val tag: MangaTag,
-		val isChecked: Boolean,
-	) : FilterItem
-
-	object Loading : FilterItem
-
-	class Error(
-		@StringRes val textResId: Int,
-	) : FilterItem
-}

app/src/main/java/org/koitharu/kotatsu/list/ui/model/LoadingFooter.kt

@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.list.ui.model
-
-object LoadingFooter : ListModel {
-
-	override fun equals(other: Any?): Boolean = other === LoadingFooter
-}

app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt

@@ -1 +0,0 @@
-package org.koitharu.kotatsu.local

app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt

@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.local.data
-
-import java.io.File
-import java.io.FilenameFilter
-import java.util.*
-
-class CbzFilter : FilenameFilter {
-
-	override fun accept(dir: File, name: String): Boolean {
-		return isFileSupported(name)
-	}
-
-	companion object {
-
-		fun isFileSupported(name: String): Boolean {
-			val ext = name.substringAfterLast('.', "").lowercase(Locale.ROOT)
-			return ext == "cbz" || ext == "zip"
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/local/data/FlowFileObserver.kt

@@ -1,27 +0,0 @@
-package org.koitharu.kotatsu.local.data
-
-import android.os.FileObserver
-import java.io.File
-import kotlinx.coroutines.channels.ProducerScope
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.channels.trySendBlocking
-import kotlinx.coroutines.flow.callbackFlow
-
-@Suppress("DEPRECATION")
-class FlowFileObserver(
-	private val producerScope: ProducerScope<File>,
-	private val file: File,
-) : FileObserver(file.absolutePath, CREATE or DELETE or CLOSE_WRITE) {
-
-	override fun onEvent(event: Int, path: String?) {
-		producerScope.trySendBlocking(
-			if (path == null) file else file.resolve(path),
-		)
-	}
-}
-
-fun File.observe() = callbackFlow {
-	val observer = FlowFileObserver(this, this@observe)
-	observer.startWatching()
-	awaitClose { observer.stopWatching() }
-}

app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt

@@ -1,66 +0,0 @@
-package org.koitharu.kotatsu.local.data
-
-import android.content.Context
-import com.tomclaw.cache.DiskLruCache
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.utils.FileSize
-import org.koitharu.kotatsu.utils.ext.copyToSuspending
-import org.koitharu.kotatsu.utils.ext.longHashCode
-import org.koitharu.kotatsu.utils.ext.subdir
-import org.koitharu.kotatsu.utils.ext.takeIfReadable
-import org.koitharu.kotatsu.utils.ext.takeIfWriteable
-import java.io.File
-import java.io.InputStream
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class PagesCache @Inject constructor(@ApplicationContext context: Context) {
-
-	private val cacheDir = checkNotNull(findSuitableDir(context)) {
-		val dirs = (context.externalCacheDirs + context.cacheDir).joinToString(";") {
-			it?.absolutePath.toString()
-		}
-		"Cannot find any suitable directory for PagesCache: [$dirs]"
-	}
-	private val lruCache = createDiskLruCacheSafe(
-		dir = cacheDir,
-		size = FileSize.MEGABYTES.convert(200, FileSize.BYTES),
-	)
-
-	suspend fun get(url: String): File? = runInterruptible(Dispatchers.IO) {
-		lruCache.get(url)?.takeIfReadable()
-	}
-
-	suspend fun put(url: String, inputStream: InputStream): File = withContext(Dispatchers.IO) {
-		val file = File(cacheDir.parentFile, url.longHashCode().toString())
-		try {
-			file.outputStream().use { out ->
-				inputStream.copyToSuspending(out)
-			}
-			lruCache.put(url, file)
-		} finally {
-			file.delete()
-		}
-	}
-}
-
-private fun createDiskLruCacheSafe(dir: File, size: Long): DiskLruCache {
-	return try {
-		DiskLruCache.create(dir, size)
-	} catch (e: Exception) {
-		dir.deleteRecursively()
-		dir.mkdir()
-		DiskLruCache.create(dir, size)
-	}
-}
-
-private fun findSuitableDir(context: Context): File? {
-	val dirs = context.externalCacheDirs + context.cacheDir
-	return dirs.firstNotNullOfOrNull {
-		it?.subdir(CacheDir.PAGES.dir)?.takeIfWriteable()
-	}
-}

app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt

@@ -1,348 +0,0 @@
-package org.koitharu.kotatsu.local.domain
-
-import android.annotation.SuppressLint
-import android.net.Uri
-import android.webkit.MimeTypeMap
-import androidx.annotation.WorkerThread
-import androidx.collection.ArraySet
-import androidx.core.net.toFile
-import androidx.core.net.toUri
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filterNot
-import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.local.data.CbzFilter
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.local.data.MangaIndex
-import org.koitharu.kotatsu.local.data.TempFileFilter
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.toCamelCase
-import org.koitharu.kotatsu.utils.AlphanumComparator
-import org.koitharu.kotatsu.utils.CompositeMutex
-import org.koitharu.kotatsu.utils.ext.deleteAwait
-import org.koitharu.kotatsu.utils.ext.longHashCode
-import org.koitharu.kotatsu.utils.ext.readText
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import java.io.File
-import java.util.Enumeration
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlin.coroutines.CoroutineContext
-
-private const val MAX_PARALLELISM = 4
-
-@Singleton
-class LocalMangaRepository @Inject constructor(private val storageManager: LocalStorageManager) : MangaRepository {
-
-	override val source = MangaSource.LOCAL
-	private val filenameFilter = CbzFilter()
-	private val locks = CompositeMutex<Long>()
-
-	override suspend fun getList(offset: Int, query: String): List<Manga> {
-		if (offset > 0) {
-			return emptyList()
-		}
-		val list = getRawList()
-		if (query.isNotEmpty()) {
-			list.retainAll { x -> x.isMatchesQuery(query) }
-		}
-		return list.unwrap()
-	}
-
-	override suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
-		if (offset > 0) {
-			return emptyList()
-		}
-		val list = getRawList()
-		if (!tags.isNullOrEmpty()) {
-			list.retainAll { x -> x.containsTags(tags) }
-		}
-		when (sortOrder) {
-			SortOrder.ALPHABETICAL -> list.sortWith(compareBy(AlphanumComparator()) { x -> x.manga.title })
-			SortOrder.RATING -> list.sortByDescending { it.manga.rating }
-			SortOrder.NEWEST,
-			SortOrder.UPDATED,
-			-> list.sortByDescending { it.createdAt }
-
-			else -> Unit
-		}
-		return list.unwrap()
-	}
-
-	override suspend fun getDetails(manga: Manga) = when {
-		manga.source != MangaSource.LOCAL -> requireNotNull(findSavedManga(manga)) {
-			"Manga is not local or saved"
-		}
-
-		else -> getFromFile(Uri.parse(manga.url).toFile())
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		return runInterruptible(Dispatchers.IO) {
-			val uri = Uri.parse(chapter.url)
-			val file = uri.toFile()
-			val zip = ZipFile(file)
-			val index = zip.getEntry(CbzMangaOutput.ENTRY_NAME_INDEX)?.let(zip::readText)?.let(::MangaIndex)
-			var entries = zip.entries().asSequence()
-			entries = if (index != null) {
-				val pattern = index.getChapterNamesPattern(chapter)
-				entries.filter { x -> !x.isDirectory && x.name.substringBefore('.').matches(pattern) }
-			} else {
-				val parent = uri.fragment.orEmpty()
-				entries.filter { x ->
-					!x.isDirectory && x.name.substringBeforeLast(
-						File.separatorChar,
-						"",
-					) == parent
-				}
-			}
-			entries
-				.toList()
-				.sortedWith(compareBy(AlphanumComparator()) { x -> x.name })
-				.map { x ->
-					val entryUri = zipUri(file, x.name)
-					MangaPage(
-						id = entryUri.longHashCode(),
-						url = entryUri,
-						preview = null,
-						source = MangaSource.LOCAL,
-					)
-				}
-		}
-	}
-
-	suspend fun delete(manga: Manga): Boolean {
-		val file = Uri.parse(manga.url).toFile()
-		return file.deleteAwait()
-	}
-
-	suspend fun deleteChapters(manga: Manga, ids: Set<Long>) {
-		lockManga(manga.id)
-		try {
-			runInterruptible(Dispatchers.IO) {
-				val uri = Uri.parse(manga.url)
-				val file = uri.toFile()
-				val cbz = CbzMangaOutput(file, manga)
-				CbzMangaOutput.filterChapters(cbz, ids)
-			}
-		} finally {
-			unlockManga(manga.id)
-		}
-	}
-
-	@WorkerThread
-	@SuppressLint("DefaultLocale")
-	fun getFromFile(file: File): Manga = ZipFile(file).use { zip ->
-		val fileUri = file.toUri().toString()
-		val entry = zip.getEntry(CbzMangaOutput.ENTRY_NAME_INDEX)
-		val index = entry?.let(zip::readText)?.let(::MangaIndex)
-		val info = index?.getMangaInfo()
-		if (index != null && info != null) {
-			return info.copy2(
-				source = MangaSource.LOCAL,
-				url = fileUri,
-				coverUrl = zipUri(
-					file,
-					entryName = index.getCoverEntry() ?: findFirstImageEntry(zip.entries())?.name.orEmpty(),
-				),
-				chapters = info.chapters?.map { c ->
-					c.copy(url = fileUri, source = MangaSource.LOCAL)
-				},
-			)
-		}
-		// fallback
-		val title = file.nameWithoutExtension.replace("_", " ").toCamelCase()
-		val chapters = ArraySet<String>()
-		for (x in zip.entries()) {
-			if (!x.isDirectory) {
-				chapters += x.name.substringBeforeLast(File.separatorChar, "")
-			}
-		}
-		val uriBuilder = file.toUri().buildUpon()
-		Manga(
-			id = file.absolutePath.longHashCode(),
-			title = title,
-			url = fileUri,
-			publicUrl = fileUri,
-			source = MangaSource.LOCAL,
-			coverUrl = zipUri(file, findFirstImageEntry(zip.entries())?.name.orEmpty()),
-			chapters = chapters.sortedWith(AlphanumComparator()).mapIndexed { i, s ->
-				MangaChapter(
-					id = "$i$s".longHashCode(),
-					name = s.ifEmpty { title },
-					number = i + 1,
-					source = MangaSource.LOCAL,
-					uploadDate = 0L,
-					url = uriBuilder.fragment(s).build().toString(),
-					scanlator = null,
-					branch = null,
-				)
-			},
-			altTitle = null,
-			rating = -1f,
-			isNsfw = false,
-			tags = setOf(),
-			state = null,
-			author = null,
-			largeCoverUrl = null,
-			description = null,
-		)
-	}
-
-	suspend fun getRemoteManga(localManga: Manga): Manga? {
-		val file = runCatching {
-			Uri.parse(localManga.url).toFile()
-		}.getOrNull() ?: return null
-		return runInterruptible(Dispatchers.IO) {
-			ZipFile(file).use { zip ->
-				val entry = zip.getEntry(CbzMangaOutput.ENTRY_NAME_INDEX)
-				val index = entry?.let(zip::readText)?.let(::MangaIndex)
-				index?.getMangaInfo()
-			}
-		}
-	}
-
-	suspend fun findSavedManga(remoteManga: Manga): Manga? {
-		val files = getAllFiles()
-		return runInterruptible(Dispatchers.IO) {
-			for (file in files) {
-				val index = ZipFile(file).use { zip ->
-					val entry = zip.getEntry(CbzMangaOutput.ENTRY_NAME_INDEX)
-					entry?.let(zip::readText)?.let(::MangaIndex)
-				} ?: continue
-				val info = index.getMangaInfo() ?: continue
-				if (info.id == remoteManga.id) {
-					val fileUri = file.toUri().toString()
-					return@runInterruptible info.copy2(
-						source = MangaSource.LOCAL,
-						url = fileUri,
-						chapters = info.chapters?.map { c -> c.copy(url = fileUri) },
-					)
-				}
-			}
-			null
-		}
-	}
-
-	suspend fun watchReadableDirs(): Flow<File> {
-		val filter = TempFileFilter()
-		val dirs = storageManager.getReadableDirs()
-		return storageManager.observe(dirs)
-			.filterNot { filter.accept(it, it.name) }
-	}
-
-	private fun CoroutineScope.getFromFileAsync(
-		file: File,
-		context: CoroutineContext,
-	): Deferred<LocalManga?> = async(context) {
-		runInterruptible {
-			runCatchingCancellable { LocalManga(getFromFile(file), file) }.getOrNull()
-		}
-	}
-
-	private fun zipUri(file: File, entryName: String) = "cbz://${file.path}#$entryName"
-
-	private fun findFirstImageEntry(entries: Enumeration<out ZipEntry>): ZipEntry? {
-		val list = entries.toList()
-			.filterNot { it.isDirectory }
-			.sortedWith(compareBy(AlphanumComparator()) { x -> x.name })
-		val map = MimeTypeMap.getSingleton()
-		return list.firstOrNull {
-			map.getMimeTypeFromExtension(it.name.substringAfterLast('.'))
-				?.startsWith("image/") == true
-		}
-	}
-
-	override val sortOrders = setOf(SortOrder.ALPHABETICAL, SortOrder.RATING)
-
-	override suspend fun getPageUrl(page: MangaPage) = page.url
-
-	override suspend fun getTags() = emptySet<MangaTag>()
-
-	suspend fun getOutputDir(): File? {
-		return storageManager.getDefaultWriteableDir()
-	}
-
-	suspend fun cleanup() {
-		val dirs = storageManager.getWriteableDirs()
-		runInterruptible(Dispatchers.IO) {
-			dirs.flatMap { dir ->
-				dir.listFiles(TempFileFilter())?.toList().orEmpty()
-			}.forEach { file ->
-				file.delete()
-			}
-		}
-	}
-
-	suspend fun lockManga(id: Long) {
-		locks.lock(id)
-	}
-
-	fun unlockManga(id: Long) {
-		locks.unlock(id)
-	}
-
-	private suspend fun getRawList(): ArrayList<LocalManga> {
-		val files = getAllFiles()
-		return coroutineScope {
-			val dispatcher = Dispatchers.IO.limitedParallelism(MAX_PARALLELISM)
-			files.map { file ->
-				getFromFileAsync(file, dispatcher)
-			}.awaitAll()
-		}.filterNotNullTo(ArrayList(files.size))
-	}
-
-	private suspend fun getAllFiles() = storageManager.getReadableDirs().flatMap { dir ->
-		dir.listFiles(filenameFilter)?.toList().orEmpty()
-	}
-
-	private fun Manga.copy2(
-		url: String = this.url,
-		coverUrl: String = this.coverUrl,
-		chapters: List<MangaChapter>? = this.chapters,
-		source: MangaSource = this.source,
-	) = Manga(
-		id = id,
-		title = title,
-		altTitle = altTitle,
-		url = url,
-		publicUrl = publicUrl,
-		rating = rating,
-		isNsfw = isNsfw,
-		coverUrl = coverUrl,
-		tags = tags,
-		state = state,
-		author = author,
-		largeCoverUrl = largeCoverUrl,
-		description = description,
-		chapters = chapters,
-		source = source,
-	)
-
-	private fun MangaChapter.copy(
-		url: String = this.url,
-		source: MangaSource = this.source,
-	) = MangaChapter(
-		id = id,
-		name = name,
-		number = number,
-		url = url,
-		scanlator = scanlator,
-		uploadDate = uploadDate,
-		branch = branch,
-		source = source,
-	)
-}

app/src/main/java/org/koitharu/kotatsu/local/domain/importer/DirMangaImporter.kt

@@ -1,143 +0,0 @@
-package org.koitharu.kotatsu.local.domain.importer
-
-import android.content.Context
-import android.net.Uri
-import android.webkit.MimeTypeMap
-import androidx.documentfile.provider.DocumentFile
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.local.domain.CbzMangaOutput
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.RATING_UNKNOWN
-import org.koitharu.kotatsu.utils.AlphanumComparator
-import org.koitharu.kotatsu.utils.ext.copyToSuspending
-import org.koitharu.kotatsu.utils.ext.deleteAwait
-import org.koitharu.kotatsu.utils.ext.longOf
-import java.io.File
-
-// TODO: Add support for chapters in cbz
-// https://github.com/KotatsuApp/Kotatsu/issues/31
-class DirMangaImporter(
-	private val context: Context,
-	storageManager: LocalStorageManager,
-	private val localMangaRepository: LocalMangaRepository,
-) : MangaImporter(storageManager) {
-
-	private val contentResolver = context.contentResolver
-
-	override suspend fun import(uri: Uri): Manga {
-		val root = requireNotNull(DocumentFile.fromTreeUri(context, uri)) {
-			"Provided uri $uri is not a tree"
-		}
-		val manga = Manga(root)
-		val output = CbzMangaOutput.get(getOutputDir(), manga)
-		try {
-			val dest = output.use {
-				addPages(
-					output = it,
-					root = root,
-					path = "",
-					state = State(uri.hashCode(), 0, false),
-				)
-				it.sortChaptersByName()
-				it.mergeWithExisting()
-				it.finish()
-				it.file
-			}
-			return localMangaRepository.getFromFile(dest)
-		} finally {
-			withContext(NonCancellable) {
-				output.cleanup()
-				File(getOutputDir(), "page.tmp").deleteAwait()
-			}
-		}
-	}
-
-	private suspend fun addPages(output: CbzMangaOutput, root: DocumentFile, path: String, state: State) {
-		var number = 0
-		for (file in root.listFiles().sortedWith(compareBy(AlphanumComparator()) { it.name.orEmpty() })) {
-			when {
-				file.isDirectory -> {
-					addPages(output, file, path + "/" + file.name, state)
-				}
-
-				file.isFile -> {
-					val tempFile = file.asTempFile()
-					if (!state.hasCover) {
-						output.addCover(tempFile, file.extension)
-						state.hasCover = true
-					}
-					output.addPage(
-						chapter = state.getChapter(path),
-						file = tempFile,
-						pageNumber = number,
-						ext = file.extension,
-					)
-					number++
-				}
-			}
-		}
-	}
-
-	private suspend fun DocumentFile.asTempFile(): File {
-		val file = File(getOutputDir(), "page.tmp")
-		checkNotNull(contentResolver.openInputStream(uri)) {
-			"Cannot open input stream for $uri"
-		}.use { input ->
-			file.outputStream().use { output ->
-				input.copyToSuspending(output)
-			}
-		}
-		return file
-	}
-
-	private fun Manga(file: DocumentFile) = Manga(
-		id = longOf(file.uri.hashCode(), 0),
-		title = checkNotNull(file.name),
-		altTitle = null,
-		url = file.uri.path.orEmpty(),
-		publicUrl = file.uri.toString(),
-		rating = RATING_UNKNOWN,
-		isNsfw = false,
-		coverUrl = "",
-		tags = emptySet(),
-		state = null,
-		author = null,
-		source = MangaSource.LOCAL,
-	)
-
-	private val DocumentFile.extension: String
-		get() = type?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) }
-			?: name?.substringAfterLast('.')?.takeIf { it.length in 2..4 }
-			?: error("Cannot obtain extension of $uri")
-
-	private class State(
-		private val rootId: Int,
-		private var counter: Int,
-		var hasCover: Boolean,
-	) {
-
-		private val chapters = HashMap<String, MangaChapter>()
-
-		@Synchronized
-		fun getChapter(path: String): MangaChapter {
-			return chapters.getOrPut(path) {
-				counter++
-				MangaChapter(
-					id = longOf(rootId, counter),
-					name = path.replace('/', ' ').trim(),
-					number = counter,
-					url = path.ifEmpty { "Default chapter" },
-					scanlator = null,
-					uploadDate = 0L,
-					branch = null,
-					source = MangaSource.LOCAL,
-				)
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/local/domain/importer/MangaImporter.kt

@@ -1,43 +0,0 @@
-package org.koitharu.kotatsu.local.domain.importer
-
-import android.content.Context
-import android.net.Uri
-import androidx.documentfile.provider.DocumentFile
-import dagger.hilt.android.qualifiers.ApplicationContext
-import java.io.File
-import java.io.IOException
-import javax.inject.Inject
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-
-abstract class MangaImporter(
-	protected val storageManager: LocalStorageManager,
-) {
-
-	abstract suspend fun import(uri: Uri): Manga
-
-	suspend fun getOutputDir(): File {
-		return storageManager.getDefaultWriteableDir() ?: throw IOException("External files dir unavailable")
-	}
-
-	class Factory @Inject constructor(
-		@ApplicationContext private val context: Context,
-		private val storageManager: LocalStorageManager,
-		private val localMangaRepository: LocalMangaRepository,
-	) {
-
-		fun create(uri: Uri): MangaImporter {
-			return when {
-				isDir(uri) -> DirMangaImporter(context, storageManager, localMangaRepository)
-				else -> ZipMangaImporter(storageManager, localMangaRepository)
-			}
-		}
-
-		private fun isDir(uri: Uri): Boolean {
-			return runCatching {
-				DocumentFile.fromTreeUri(context, uri)
-			}.isSuccess
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/local/domain/importer/ZipMangaImporter.kt

@@ -1,40 +0,0 @@
-package org.koitharu.kotatsu.local.domain.importer
-
-import android.net.Uri
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
-import org.koitharu.kotatsu.local.data.CbzFilter
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.copyToSuspending
-import org.koitharu.kotatsu.utils.ext.resolveName
-import java.io.File
-import java.io.IOException
-
-class ZipMangaImporter(
-	storageManager: LocalStorageManager,
-	private val localMangaRepository: LocalMangaRepository,
-) : MangaImporter(storageManager) {
-
-	override suspend fun import(uri: Uri): Manga {
-		val contentResolver = storageManager.contentResolver
-		return withContext(Dispatchers.IO) {
-			val name = contentResolver.resolveName(uri) ?: throw IOException("Cannot fetch name from uri: $uri")
-			if (!CbzFilter.isFileSupported(name)) {
-				throw UnsupportedFileException("Unsupported file on $uri")
-			}
-			val dest = File(getOutputDir(), name)
-			runInterruptible {
-				contentResolver.openInputStream(uri)
-			}?.use { source ->
-				dest.outputStream().use { output ->
-					source.copyToSuspending(output)
-				}
-			} ?: throw IOException("Cannot open input stream: $uri")
-			localMangaRepository.getFromFile(dest)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/local/ui/ImportService.kt

@@ -1,184 +0,0 @@
-package org.koitharu.kotatsu.local.ui
-
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.widget.Toast
-import androidx.core.app.NotificationCompat
-import androidx.core.app.ServiceCompat
-import androidx.core.content.ContextCompat
-import coil.ImageLoader
-import coil.request.ImageRequest
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CancellationException
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.CoroutineIntentService
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.local.domain.importer.MangaImporter
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.PendingIntentCompat
-import org.koitharu.kotatsu.utils.ext.asArrayList
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.report
-import org.koitharu.kotatsu.utils.ext.toBitmapOrNull
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ImportService : CoroutineIntentService() {
-
-	@Inject
-	lateinit var importerFactory: MangaImporter.Factory
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	private lateinit var notificationManager: NotificationManager
-
-	override fun onCreate() {
-		super.onCreate()
-		isRunning = true
-		notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-	}
-
-	override fun onDestroy() {
-		isRunning = false
-		super.onDestroy()
-	}
-
-	override suspend fun processIntent(startId: Int, intent: Intent) {
-		val uris = intent.getParcelableArrayListExtra<Uri>(EXTRA_URIS)
-		if (uris.isNullOrEmpty()) {
-			return
-		}
-		startForeground()
-		for (uri in uris) {
-			try {
-				val manga = importImpl(uri)
-				showNotification(uri, manga, null)
-				sendBroadcast(manga)
-			} catch (e: CancellationException) {
-				throw e
-			} catch (e: Throwable) {
-				e.printStackTraceDebug()
-				showNotification(uri, null, e)
-			}
-		}
-		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-	}
-
-	override fun onError(startId: Int, error: Throwable) {
-		error.report()
-	}
-
-	private suspend fun importImpl(uri: Uri): Manga {
-		val importer = importerFactory.create(uri)
-		return importer.import(uri)
-	}
-
-	private fun sendBroadcast(manga: Manga) {
-		sendBroadcast(
-			Intent(DownloadService.ACTION_DOWNLOAD_COMPLETE)
-				.putExtra(DownloadService.EXTRA_MANGA, ParcelableManga(manga, withChapters = false)),
-		)
-	}
-
-	private suspend fun showNotification(uri: Uri, manga: Manga?, error: Throwable?) {
-		val notification = NotificationCompat.Builder(this, CHANNEL_ID)
-			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
-			.setDefaults(0)
-			.setColor(ContextCompat.getColor(this, R.color.blue_primary_dark))
-			.setSilent(true)
-		if (manga != null) {
-			notification.setLargeIcon(
-				coil.execute(
-					ImageRequest.Builder(applicationContext)
-						.data(manga.coverUrl)
-						.tag(manga.source)
-						.build(),
-				).toBitmapOrNull(),
-			)
-			notification.setSubText(manga.title)
-			val intent = DetailsActivity.newIntent(applicationContext, manga)
-			notification.setContentIntent(
-				PendingIntent.getActivity(
-					applicationContext,
-					manga.id.toInt(),
-					intent,
-					PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
-				),
-			).setAutoCancel(true)
-				.setVisibility(
-					if (manga.isNsfw) {
-						NotificationCompat.VISIBILITY_SECRET
-					} else NotificationCompat.VISIBILITY_PUBLIC,
-				)
-		}
-		if (error != null) {
-			notification.setContentTitle(getString(R.string.error_occurred))
-				.setContentText(error.getDisplayMessage(resources))
-				.setSmallIcon(android.R.drawable.stat_notify_error)
-		} else {
-			notification.setContentTitle(getString(R.string.import_completed))
-				.setContentText(getString(R.string.import_completed_hint))
-				.setSmallIcon(R.drawable.ic_stat_done)
-			NotificationCompat.BigTextStyle(notification)
-				.bigText(getString(R.string.import_completed_hint))
-		}
-
-		notificationManager.notify(uri.hashCode(), notification.build())
-	}
-
-	private fun startForeground() {
-		val title = getString(R.string.importing_manga)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-			val channel = NotificationChannel(CHANNEL_ID, title, NotificationManager.IMPORTANCE_LOW)
-			channel.setShowBadge(false)
-			channel.enableVibration(false)
-			channel.setSound(null, null)
-			channel.enableLights(false)
-			manager.createNotificationChannel(channel)
-		}
-
-		val notification = NotificationCompat.Builder(this, CHANNEL_ID)
-			.setContentTitle(title)
-			.setPriority(NotificationCompat.PRIORITY_MIN)
-			.setDefaults(0)
-			.setColor(ContextCompat.getColor(this, R.color.blue_primary_dark))
-			.setSilent(true)
-			.setProgress(0, 0, true)
-			.setSmallIcon(android.R.drawable.stat_sys_download)
-			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
-			.setOngoing(true)
-			.build()
-		startForeground(NOTIFICATION_ID, notification)
-	}
-
-	companion object {
-
-		var isRunning: Boolean = false
-			private set
-
-		private const val CHANNEL_ID = "importing"
-		private const val NOTIFICATION_ID = 22
-
-		private const val EXTRA_URIS = "uris"
-
-		fun start(context: Context, uris: Collection<Uri>) {
-			if (uris.isEmpty()) {
-				return
-			}
-			val intent = Intent(context, ImportService::class.java)
-			intent.putParcelableArrayListExtra(EXTRA_URIS, uris.asArrayList())
-			ContextCompat.startForegroundService(context, intent)
-			Toast.makeText(context, R.string.import_will_start_soon, Toast.LENGTH_LONG).show()
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt

@@ -1,207 +0,0 @@
-package org.koitharu.kotatsu.local.ui
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.asFlow
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.history.domain.HistoryRepository
-import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
-import org.koitharu.kotatsu.list.domain.ListExtraProvider
-import org.koitharu.kotatsu.list.ui.MangaListViewModel
-import org.koitharu.kotatsu.list.ui.model.EmptyState
-import org.koitharu.kotatsu.list.ui.model.ListHeader2
-import org.koitharu.kotatsu.list.ui.model.LoadingState
-import org.koitharu.kotatsu.list.ui.model.toErrorState
-import org.koitharu.kotatsu.list.ui.model.toUi
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.tracker.domain.TrackingRepository
-import org.koitharu.kotatsu.utils.SingleLiveEvent
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import java.io.IOException
-import java.util.LinkedList
-import javax.inject.Inject
-
-@HiltViewModel
-class LocalListViewModel @Inject constructor(
-	private val repository: LocalMangaRepository,
-	private val historyRepository: HistoryRepository,
-	private val trackingRepository: TrackingRepository,
-	private val settings: AppSettings,
-) : MangaListViewModel(settings), ListExtraProvider {
-
-	val onMangaRemoved = SingleLiveEvent<Unit>()
-	val sortOrder = MutableLiveData(settings.localListOrder)
-	private val listError = MutableStateFlow<Throwable?>(null)
-	private val mangaList = MutableStateFlow<List<Manga>?>(null)
-	private val selectedTags = MutableStateFlow<Set<MangaTag>>(emptySet())
-	private var refreshJob: Job? = null
-
-	override val content = combine(
-		mangaList,
-		listModeFlow,
-		sortOrder.asFlow(),
-		selectedTags,
-		listError,
-	) { list, mode, order, tags, error ->
-		when {
-			error != null -> listOf(error.toErrorState(canRetry = true))
-			list == null -> listOf(LoadingState)
-			list.isEmpty() -> listOf(
-				EmptyState(
-					icon = R.drawable.ic_empty_local,
-					textPrimary = R.string.text_local_holder_primary,
-					textSecondary = R.string.text_local_holder_secondary,
-					actionStringRes = R.string._import,
-				),
-			)
-
-			else -> buildList(list.size + 1) {
-				add(createHeader(list, tags, order))
-				list.toUi(this, mode, this@LocalListViewModel)
-			}
-		}
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
-
-	init {
-		onRefresh()
-		cleanup()
-		watchDirectories()
-	}
-
-	override fun onUpdateFilter(tags: Set<MangaTag>) {
-		selectedTags.value = tags
-		onRefresh()
-	}
-
-	override fun onRefresh() {
-		val prevJob = refreshJob
-		refreshJob = launchLoadingJob(Dispatchers.Default) {
-			prevJob?.cancelAndJoin()
-			doRefresh()
-		}
-	}
-
-	override fun onRetry() = onRefresh()
-
-	fun setSortOrder(value: SortOrder) {
-		sortOrder.value = value
-		settings.localListOrder = value
-		onRefresh()
-	}
-
-	fun delete(ids: Set<Long>) {
-		launchLoadingJob {
-			withContext(Dispatchers.Default) {
-				val itemsToRemove = checkNotNull(mangaList.value).filter { it.id in ids }
-				for (manga in itemsToRemove) {
-					val original = repository.getRemoteManga(manga)
-					repository.delete(manga) || throw IOException("Unable to delete file")
-					runCatchingCancellable {
-						historyRepository.deleteOrSwap(manga, original)
-					}
-					mangaList.update { list ->
-						list?.filterNot { it.id == manga.id }
-					}
-				}
-			}
-			onMangaRemoved.call(Unit)
-		}
-	}
-
-	private suspend fun doRefresh() {
-		try {
-			listError.value = null
-			mangaList.value = repository.getList(0, selectedTags.value, sortOrder.value)
-		} catch (e: CancellationException) {
-			throw e
-		} catch (e: Throwable) {
-			listError.value = e
-		}
-	}
-
-	private fun cleanup() {
-		if (!DownloadService.isRunning && !ImportService.isRunning && !LocalChaptersRemoveService.isRunning) {
-			viewModelScope.launch {
-				runCatchingCancellable {
-					repository.cleanup()
-				}.onFailure { error ->
-					error.printStackTraceDebug()
-				}
-			}
-		}
-	}
-
-	private fun watchDirectories() {
-		viewModelScope.launch(Dispatchers.Default) {
-			repository.watchReadableDirs()
-				.collectLatest {
-					doRefresh()
-				}
-		}
-	}
-
-	private fun createHeader(mangaList: List<Manga>, selectedTags: Set<MangaTag>, order: SortOrder): ListHeader2 {
-		val tags = HashMap<MangaTag, Int>()
-		for (item in mangaList) {
-			for (tag in item.tags) {
-				tags[tag] = tags[tag]?.plus(1) ?: 1
-			}
-		}
-		val topTags = tags.entries.sortedByDescending { it.value }.take(6)
-		val chips = LinkedList<ChipsView.ChipModel>()
-		for ((tag, _) in topTags) {
-			val model = ChipsView.ChipModel(
-				icon = 0,
-				title = tag.title,
-				isCheckable = true,
-				isChecked = tag in selectedTags,
-				data = tag,
-			)
-			if (model.isChecked) {
-				chips.addFirst(model)
-			} else {
-				chips.addLast(model)
-			}
-		}
-		return ListHeader2(
-			chips = chips,
-			sortOrder = order,
-			hasSelectedTags = selectedTags.isNotEmpty(),
-		)
-	}
-
-	override suspend fun getCounter(mangaId: Long): Int {
-		return if (settings.isTrackerEnabled) {
-			trackingRepository.getNewChaptersCount(mangaId)
-		} else {
-			0
-		}
-	}
-
-	override suspend fun getProgress(mangaId: Long): Float {
-		return if (settings.isReadingIndicatorsEnabled) {
-			historyRepository.getProgress(mangaId)
-		} else {
-			PROGRESS_NONE
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/main/ui/owners/NoModalBottomSheetOwner.kt

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.main.ui.owners
-
-import org.koitharu.kotatsu.base.ui.widgets.BottomSheetHeaderBar
-
-interface NoModalBottomSheetOwner {
-
-	val bsHeader: BottomSheetHeaderBar?
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt

@@ -1,73 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.colorfilter
-
-import androidx.lifecycle.MutableLiveData
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
-import org.koitharu.kotatsu.utils.SingleLiveEvent
-
-class ColorFilterConfigViewModel @AssistedInject constructor(
-	@Assisted private val manga: Manga,
-	@Assisted page: MangaPage,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-	private val mangaDataRepository: MangaDataRepository,
-) : BaseViewModel() {
-
-	private var initialColorFilter: ReaderColorFilter? = null
-	val colorFilter = MutableLiveData<ReaderColorFilter?>(null)
-	val onDismiss = SingleLiveEvent<Unit>()
-	val preview = MutableLiveData<MangaPage?>(null)
-
-	val isChanged: Boolean
-		get() = colorFilter.value != initialColorFilter
-
-	init {
-		launchLoadingJob {
-			initialColorFilter = mangaDataRepository.getColorFilter(manga.id)
-			colorFilter.value = initialColorFilter
-		}
-		launchLoadingJob {
-			val repository = mangaRepositoryFactory.create(page.source)
-			val url = repository.getPageUrl(page)
-			preview.value = MangaPage(
-				id = page.id,
-				url = url,
-				preview = page.preview,
-				source = page.source,
-			)
-		}
-	}
-
-	fun setBrightness(brightness: Float) {
-		val cf = colorFilter.value
-		colorFilter.value = ReaderColorFilter(brightness, cf?.contrast ?: 0f).takeUnless { it.isEmpty }
-	}
-
-	fun setContrast(contrast: Float) {
-		val cf = colorFilter.value
-		colorFilter.value = ReaderColorFilter(cf?.brightness ?: 0f, contrast).takeUnless { it.isEmpty }
-	}
-
-	fun reset() {
-		colorFilter.value = null
-	}
-
-	fun save() {
-		launchLoadingJob {
-			mangaDataRepository.saveColorFilter(manga, colorFilter.value)
-			onDismiss.call(Unit)
-		}
-	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(manga: Manga, page: MangaPage): ColorFilterConfigViewModel
-	}
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/config/PageSwitchTimer.kt

@@ -1,74 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.config
-
-import android.content.res.Resources
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.coroutineScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.google.android.material.slider.LabelFormatter
-import kotlin.math.roundToLong
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.parsers.util.format
-import org.koitharu.kotatsu.reader.ui.ReaderControlDelegate
-
-class PageSwitchTimer(
-	private val listener: ReaderControlDelegate.OnInteractionListener,
-	private val lifecycleOwner: LifecycleOwner,
-) {
-
-	var delaySec: Float = 0f
-		set(value) {
-			field = value
-			delayMs = mapDelay(value)
-			restartJob()
-		}
-	private var delayMs = 0L
-
-	fun onUserInteraction() {
-		restartJob()
-	}
-
-	private var job: Job? = null
-
-	private fun restartJob() {
-		job?.cancel()
-		if (delayMs == 0L) {
-			job = null
-			return
-		}
-		job = lifecycleOwner.lifecycle.coroutineScope.launch {
-			// FIXME: pause when bs is opened
-			lifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
-				while (isActive) {
-					delay(delayMs)
-					listener.switchPageBy(1)
-				}
-			}
-		}
-	}
-
-	class DelayLabelFormatter(resources: Resources) : LabelFormatter {
-
-		private val textOff = resources.getString(R.string.off_short)
-		private val textSec = resources.getString(R.string.seconds_pattern)
-
-		override fun getFormattedValue(value: Float): String {
-			val ms = mapDelay(value)
-			return if (ms == 0L) textOff else textSec.format((ms / 1000.0).format(1))
-		}
-	}
-
-	companion object {
-
-		private const val DELAY_MIN = 2000L
-
-		fun mapDelay(value: Float): Long {
-			val delay = (value * 1000L).roundToLong()
-			return if (delay < DELAY_MIN) 0L else delay
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt

@@ -1,121 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.pager.reversed
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.children
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.async
-import org.koitharu.kotatsu.core.os.NetworkState
-import org.koitharu.kotatsu.databinding.FragmentReaderStandardBinding
-import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.reader.ui.pager.BaseReader
-import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
-import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
-import org.koitharu.kotatsu.reader.ui.pager.standard.PagerReaderFragment
-import org.koitharu.kotatsu.utils.ext.doOnPageChanged
-import org.koitharu.kotatsu.utils.ext.recyclerView
-import org.koitharu.kotatsu.utils.ext.resetTransformations
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
-import javax.inject.Inject
-import kotlin.math.absoluteValue
-
-@AndroidEntryPoint
-class ReversedReaderFragment : BaseReader<FragmentReaderStandardBinding>() {
-
-	@Inject
-	lateinit var networkState: NetworkState
-
-	private var pagerAdapter: ReversedPagesAdapter? = null
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = FragmentReaderStandardBinding.inflate(inflater, container, false)
-
-	@SuppressLint("NotifyDataSetChanged")
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		pagerAdapter = ReversedPagesAdapter(
-			lifecycleOwner = viewLifecycleOwner,
-			loader = viewModel.pageLoader,
-			settings = viewModel.readerSettings,
-			networkState = networkState,
-			exceptionResolver = exceptionResolver,
-		)
-		with(binding.pager) {
-			adapter = pagerAdapter
-			offscreenPageLimit = 2
-			doOnPageChanged(::notifyPageChanged)
-		}
-
-		viewModel.readerAnimation.observe(viewLifecycleOwner) {
-			val transformer = if (it) ReversedPageAnimTransformer() else null
-			binding.pager.setPageTransformer(transformer)
-			if (transformer == null) {
-				binding.pager.recyclerView?.children?.forEach { v ->
-					v.resetTransformations()
-				}
-			}
-		}
-	}
-
-	override fun onDestroyView() {
-		pagerAdapter = null
-		super.onDestroyView()
-	}
-
-	override fun switchPageBy(delta: Int) {
-		with(binding.pager) {
-			setCurrentItem(currentItem - delta, true)
-		}
-	}
-
-	override fun switchPageTo(position: Int, smooth: Boolean) {
-		binding.pager.setCurrentItem(
-			reversed(position),
-			smooth && (binding.pager.currentItem - position).absoluteValue < PagerReaderFragment.SMOOTH_SCROLL_LIMIT,
-		)
-	}
-
-	override fun onPagesChanged(pages: List<ReaderPage>, pendingState: ReaderState?) {
-		val reversedPages = pages.asReversed()
-		viewLifecycleScope.launchWhenCreated {
-			val items = async {
-				pagerAdapter?.setItems(reversedPages)
-			}
-			if (pendingState != null) {
-				val position = reversedPages.indexOfLast {
-					it.chapterId == pendingState.chapterId && it.index == pendingState.page
-				}
-				items.await() ?: return@launchWhenCreated
-				if (position != -1) {
-					binding.pager.setCurrentItem(position, false)
-					notifyPageChanged(position)
-				}
-			} else {
-				items.await()
-			}
-		}
-	}
-
-	override fun getCurrentState(): ReaderState? = bindingOrNull()?.run {
-		val adapter = pager.adapter as? BaseReaderAdapter<*>
-		val page = adapter?.getItemOrNull(pager.currentItem) ?: return@run null
-		ReaderState(
-			chapterId = page.chapterId,
-			page = page.index,
-			scroll = 0,
-		)
-	}
-
-	private fun notifyPageChanged(page: Int) {
-		viewModel.onCurrentPageChanged(reversed(page))
-	}
-
-	private fun reversed(position: Int): Int {
-		return ((pagerAdapter?.itemCount ?: 0) - position - 1).coerceAtLeast(0)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt

@@ -1,120 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.pager.standard
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.children
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.async
-import org.koitharu.kotatsu.core.os.NetworkState
-import org.koitharu.kotatsu.databinding.FragmentReaderStandardBinding
-import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.reader.ui.pager.BaseReader
-import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
-import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
-import org.koitharu.kotatsu.utils.ext.doOnPageChanged
-import org.koitharu.kotatsu.utils.ext.recyclerView
-import org.koitharu.kotatsu.utils.ext.resetTransformations
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
-import javax.inject.Inject
-import kotlin.math.absoluteValue
-
-@AndroidEntryPoint
-class PagerReaderFragment : BaseReader<FragmentReaderStandardBinding>() {
-
-	@Inject
-	lateinit var networkState: NetworkState
-
-	private var pagesAdapter: PagesAdapter? = null
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = FragmentReaderStandardBinding.inflate(inflater, container, false)
-
-	@SuppressLint("NotifyDataSetChanged")
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		pagesAdapter = PagesAdapter(
-			lifecycleOwner = viewLifecycleOwner,
-			loader = viewModel.pageLoader,
-			settings = viewModel.readerSettings,
-			networkState = networkState,
-			exceptionResolver = exceptionResolver,
-		)
-		with(binding.pager) {
-			adapter = pagesAdapter
-			offscreenPageLimit = 2
-			doOnPageChanged(::notifyPageChanged)
-		}
-
-		viewModel.readerAnimation.observe(viewLifecycleOwner) {
-			val transformer = if (it) PageAnimTransformer() else null
-			binding.pager.setPageTransformer(transformer)
-			if (transformer == null) {
-				binding.pager.recyclerView?.children?.forEach { view ->
-					view.resetTransformations()
-				}
-			}
-		}
-	}
-
-	override fun onDestroyView() {
-		pagesAdapter = null
-		super.onDestroyView()
-	}
-
-	override fun onPagesChanged(pages: List<ReaderPage>, pendingState: ReaderState?) {
-		viewLifecycleScope.launchWhenCreated {
-			val items = async {
-				pagesAdapter?.setItems(pages)
-			}
-			if (pendingState != null) {
-				val position = pages.indexOfFirst {
-					it.chapterId == pendingState.chapterId && it.index == pendingState.page
-				}
-				items.await() ?: return@launchWhenCreated
-				if (position != -1) {
-					binding.pager.setCurrentItem(position, false)
-					notifyPageChanged(position)
-				}
-			} else {
-				items.await()
-			}
-		}
-	}
-
-	override fun switchPageBy(delta: Int) {
-		with(binding.pager) {
-			setCurrentItem(currentItem + delta, true)
-		}
-	}
-
-	override fun switchPageTo(position: Int, smooth: Boolean) {
-		binding.pager.setCurrentItem(
-			position,
-			smooth && (binding.pager.currentItem - position).absoluteValue < SMOOTH_SCROLL_LIMIT,
-		)
-	}
-
-	override fun getCurrentState(): ReaderState? = bindingOrNull()?.run {
-		val adapter = pager.adapter as? BaseReaderAdapter<*>
-		val page = adapter?.getItemOrNull(pager.currentItem) ?: return@run null
-		ReaderState(
-			chapterId = page.chapterId,
-			page = page.index,
-			scroll = 0,
-		)
-	}
-
-	private fun notifyPageChanged(page: Int) {
-		viewModel.onCurrentPageChanged(page)
-	}
-
-	companion object {
-
-		const val SMOOTH_SCROLL_LIMIT = 3
-	}
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt

@@ -1,119 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.pager.webtoon
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.AccelerateDecelerateInterpolator
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.async
-import org.koitharu.kotatsu.core.os.NetworkState
-import org.koitharu.kotatsu.databinding.FragmentReaderWebtoonBinding
-import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.reader.ui.pager.BaseReader
-import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
-import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
-import org.koitharu.kotatsu.utils.ext.findCenterViewPosition
-import org.koitharu.kotatsu.utils.ext.firstVisibleItemPosition
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class WebtoonReaderFragment : BaseReader<FragmentReaderWebtoonBinding>() {
-
-	@Inject
-	lateinit var networkState: NetworkState
-
-	private val scrollInterpolator = AccelerateDecelerateInterpolator()
-	private var webtoonAdapter: WebtoonAdapter? = null
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = FragmentReaderWebtoonBinding.inflate(inflater, container, false)
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		webtoonAdapter = WebtoonAdapter(
-			lifecycleOwner = viewLifecycleOwner,
-			loader = viewModel.pageLoader,
-			settings = viewModel.readerSettings,
-			networkState = networkState,
-			exceptionResolver = exceptionResolver,
-		)
-		with(binding.recyclerView) {
-			setHasFixedSize(true)
-			adapter = webtoonAdapter
-			addOnPageScrollListener(PageScrollListener())
-		}
-
-		viewModel.isWebtoonZoomEnabled.observe(viewLifecycleOwner) {
-			binding.frame.isZoomEnable = it
-		}
-	}
-
-	override fun onDestroyView() {
-		webtoonAdapter = null
-		super.onDestroyView()
-	}
-
-	override fun onPagesChanged(pages: List<ReaderPage>, pendingState: ReaderState?) {
-		viewLifecycleScope.launchWhenCreated {
-			val setItems = async { webtoonAdapter?.setItems(pages) }
-			if (pendingState != null) {
-				val position = pages.indexOfFirst {
-					it.chapterId == pendingState.chapterId && it.index == pendingState.page
-				}
-				setItems.await() ?: return@launchWhenCreated
-				if (position != -1) {
-					with(binding.recyclerView) {
-						firstVisibleItemPosition = position
-						post {
-							(findViewHolderForAdapterPosition(position) as? WebtoonHolder)
-								?.restoreScroll(pendingState.scroll)
-						}
-					}
-					notifyPageChanged(position)
-				}
-			} else {
-				setItems.await()
-			}
-		}
-	}
-
-	override fun getCurrentState(): ReaderState? = bindingOrNull()?.run {
-		val currentItem = recyclerView.findCenterViewPosition()
-		val adapter = recyclerView.adapter as? BaseReaderAdapter<*>
-		val page = adapter?.getItemOrNull(currentItem) ?: return@run null
-		ReaderState(
-			chapterId = page.chapterId,
-			page = page.index,
-			scroll = (recyclerView.findViewHolderForAdapterPosition(currentItem) as? WebtoonHolder)
-				?.getScrollY() ?: 0,
-		)
-	}
-
-	private fun notifyPageChanged(page: Int) {
-		viewModel.onCurrentPageChanged(page)
-	}
-
-	override fun switchPageBy(delta: Int) {
-		binding.recyclerView.smoothScrollBy(
-			0,
-			(binding.recyclerView.height * 0.9).toInt() * delta,
-			scrollInterpolator,
-		)
-	}
-
-	override fun switchPageTo(position: Int, smooth: Boolean) {
-		binding.recyclerView.firstVisibleItemPosition = position
-	}
-
-	private inner class PageScrollListener : WebtoonRecyclerView.OnPageScrollListener() {
-
-		override fun onPageChanged(recyclerView: WebtoonRecyclerView, index: Int) {
-			super.onPageChanged(recyclerView, index)
-			notifyPageChanged(index)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/OnPageSelectListener.kt

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.thumbnails
-
-import org.koitharu.kotatsu.parsers.model.MangaPage
-
-fun interface OnPageSelectListener {
-
-	fun onPageSelected(page: MangaPage)
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt

@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.thumbnails
-
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.parsers.model.MangaPage
-
-data class PageThumbnail(
-	val number: Int,
-	val isCurrent: Boolean,
-	val repository: MangaRepository,
-	val page: MangaPage
-)

app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt

@@ -1,157 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.thumbnails
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
-import androidx.recyclerview.widget.GridLayoutManager
-import coil.ImageLoader
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import javax.inject.Provider
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseBottomSheet
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.base.ui.widgets.BottomSheetHeaderBar
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPages
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.databinding.SheetPagesBinding
-import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.reader.domain.PageLoader
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.PageThumbnailAdapter
-import org.koitharu.kotatsu.utils.ext.getParcelableCompat
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
-import org.koitharu.kotatsu.utils.ext.withArgs
-
-@AndroidEntryPoint
-class PagesThumbnailsSheet :
-	BaseBottomSheet<SheetPagesBinding>(),
-	OnListItemClickListener<MangaPage>,
-	BottomSheetHeaderBar.OnExpansionChangeListener {
-
-	@Inject
-	lateinit var mangaRepositoryFactory: MangaRepository.Factory
-
-	@Inject
-	lateinit var pageLoaderProvider: Provider<PageLoader>
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	@Inject
-	lateinit var settings: AppSettings
-
-	private lateinit var thumbnails: List<PageThumbnail>
-	private var spanResolver: MangaListSpanResolver? = null
-	private var currentPageIndex = -1
-	private var pageLoader: PageLoader? = null
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		val pages = arguments?.getParcelableCompat<ParcelableMangaPages>(ARG_PAGES)?.pages
-		if (pages.isNullOrEmpty()) {
-			dismissAllowingStateLoss()
-			return
-		}
-		currentPageIndex = requireArguments().getInt(ARG_CURRENT, currentPageIndex)
-		val repository = mangaRepositoryFactory.create(pages.first().source)
-		thumbnails = pages.mapIndexed { i, x ->
-			PageThumbnail(
-				number = i + 1,
-				isCurrent = i == currentPageIndex,
-				repository = repository,
-				page = x,
-			)
-		}
-	}
-
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetPagesBinding {
-		return SheetPagesBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-
-		val title = arguments?.getString(ARG_TITLE)
-		spanResolver = MangaListSpanResolver(view.resources)
-		with(binding.headerBar) {
-			toolbar.title = title
-			toolbar.subtitle = null
-			addOnExpansionChangeListener(this@PagesThumbnailsSheet)
-		}
-
-		with(binding.recyclerView) {
-			addItemDecoration(
-				SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)),
-			)
-			adapter = PageThumbnailAdapter(
-				dataSet = thumbnails,
-				coil = coil,
-				scope = viewLifecycleScope,
-				loader = getPageLoader(),
-				clickListener = this@PagesThumbnailsSheet,
-			)
-			addOnLayoutChangeListener(spanResolver)
-			spanResolver?.setGridSize(settings.gridSize / 100f, this)
-			if (currentPageIndex > 0) {
-				val offset = resources.getDimensionPixelOffset(R.dimen.preferred_grid_width)
-				(layoutManager as GridLayoutManager).scrollToPositionWithOffset(currentPageIndex, offset)
-			}
-		}
-	}
-
-	override fun onDestroyView() {
-		super.onDestroyView()
-		spanResolver = null
-		pageLoader?.close()
-		pageLoader = null
-	}
-
-	override fun onItemClick(item: MangaPage, view: View) {
-		(
-			(parentFragment as? OnPageSelectListener)
-				?: (activity as? OnPageSelectListener)
-			)?.run {
-			onPageSelected(item)
-			dismiss()
-		}
-	}
-
-	override fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean) {
-		if (isExpanded) {
-			headerBar.toolbar.subtitle = resources.getQuantityString(
-				R.plurals.pages,
-				thumbnails.size,
-				thumbnails.size,
-			)
-		} else {
-			headerBar.toolbar.subtitle = null
-		}
-	}
-
-	private fun getPageLoader(): PageLoader {
-		val viewModel = (activity as? ReaderActivity)?.viewModel
-		return viewModel?.pageLoader ?: pageLoaderProvider.get().also { pageLoader = it }
-	}
-
-	companion object {
-
-		private const val ARG_PAGES = "pages"
-		private const val ARG_TITLE = "title"
-		private const val ARG_CURRENT = "current"
-
-		private const val TAG = "PagesThumbnailsSheet"
-
-		fun show(fm: FragmentManager, pages: List<MangaPage>, title: String, currentPage: Int) =
-			PagesThumbnailsSheet().withArgs(3) {
-				putParcelable(ARG_PAGES, ParcelableMangaPages(pages))
-				putString(ARG_TITLE, title)
-				putInt(ARG_CURRENT, currentPage)
-			}.show(fm, TAG)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt

@@ -1,91 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.thumbnails.adapter
-
-import android.graphics.drawable.Drawable
-import coil.ImageLoader
-import coil.request.ImageRequest
-import coil.size.Scale
-import coil.size.Size
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.databinding.ItemPageThumbBinding
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.reader.domain.PageLoader
-import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
-import org.koitharu.kotatsu.utils.ext.decodeRegion
-import org.koitharu.kotatsu.utils.ext.isLowRamDevice
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import org.koitharu.kotatsu.utils.ext.setTextColorAttr
-import com.google.android.material.R as materialR
-
-fun pageThumbnailAD(
-	coil: ImageLoader,
-	scope: CoroutineScope,
-	loader: PageLoader,
-	clickListener: OnListItemClickListener<MangaPage>,
-) = adapterDelegateViewBinding<PageThumbnail, PageThumbnail, ItemPageThumbBinding>(
-	{ inflater, parent -> ItemPageThumbBinding.inflate(inflater, parent, false) },
-) {
-	var job: Job? = null
-	val gridWidth = itemView.context.resources.getDimensionPixelSize(R.dimen.preferred_grid_width)
-	val thumbSize = Size(
-		width = gridWidth,
-		height = (gridWidth / 13f * 18f).toInt(),
-	)
-
-	suspend fun loadPageThumbnail(item: PageThumbnail): Drawable? = withContext(Dispatchers.Default) {
-		item.page.preview?.let { url ->
-			coil.execute(
-				ImageRequest.Builder(context)
-					.data(url)
-					.tag(item.page.source)
-					.size(thumbSize)
-					.scale(Scale.FILL)
-					.allowRgb565(true)
-					.build(),
-			).drawable
-		}?.let { drawable ->
-			return@withContext drawable
-		}
-		val file = loader.loadPage(item.page, force = false)
-		coil.execute(
-			ImageRequest.Builder(context)
-				.data(file)
-				.size(thumbSize)
-				.decodeRegion()
-				.allowRgb565(isLowRamDevice(context))
-				.build(),
-		).drawable
-	}
-
-	binding.root.setOnClickListener {
-		clickListener.onItemClick(item.page, itemView)
-	}
-
-	bind {
-		job?.cancel()
-		binding.imageViewThumb.setImageDrawable(null)
-		with(binding.textViewNumber) {
-			setBackgroundResource(if (item.isCurrent) R.drawable.bg_badge_accent else R.drawable.bg_badge_empty)
-			setTextColorAttr(if (item.isCurrent) materialR.attr.colorOnTertiary else android.R.attr.textColorPrimary)
-			text = (item.number).toString()
-		}
-		job = scope.launch {
-			val drawable = runCatchingCancellable {
-				loadPageThumbnail(item)
-			}.getOrNull()
-			binding.imageViewThumb.setImageDrawable(drawable)
-		}
-	}
-
-	onViewRecycled {
-		job?.cancel()
-		job = null
-		binding.imageViewThumb.setImageDrawable(null)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt

@@ -1,23 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.thumbnails.adapter
-
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
-import kotlinx.coroutines.CoroutineScope
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.reader.domain.PageLoader
-import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
-
-class PageThumbnailAdapter(
-	dataSet: List<PageThumbnail>,
-	coil: ImageLoader,
-	scope: CoroutineScope,
-	loader: PageLoader,
-	clickListener: OnListItemClickListener<MangaPage>
-) : ListDelegationAdapter<List<PageThumbnail>>() {
-
-	init {
-		delegatesManager.addDelegate(pageThumbnailAD(coil, scope, loader, clickListener))
-		setItems(dataSet)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt

@@ -1,225 +0,0 @@
-package org.koitharu.kotatsu.remotelist.ui
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.viewModelScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.list.ui.MangaListViewModel
-import org.koitharu.kotatsu.list.ui.filter.FilterCoordinator
-import org.koitharu.kotatsu.list.ui.filter.FilterItem
-import org.koitharu.kotatsu.list.ui.filter.FilterState
-import org.koitharu.kotatsu.list.ui.filter.OnFilterChangedListener
-import org.koitharu.kotatsu.list.ui.model.EmptyState
-import org.koitharu.kotatsu.list.ui.model.ListHeader2
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
-import org.koitharu.kotatsu.list.ui.model.LoadingState
-import org.koitharu.kotatsu.list.ui.model.toErrorFooter
-import org.koitharu.kotatsu.list.ui.model.toErrorState
-import org.koitharu.kotatsu.list.ui.model.toUi
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.search.domain.MangaSearchRepository
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import java.util.LinkedList
-
-private const val FILTER_MIN_INTERVAL = 250L
-
-class RemoteListViewModel @AssistedInject constructor(
-	@Assisted source: MangaSource,
-	mangaRepositoryFactory: MangaRepository.Factory,
-	private val searchRepository: MangaSearchRepository,
-	settings: AppSettings,
-	dataRepository: MangaDataRepository,
-) : MangaListViewModel(settings), OnFilterChangedListener {
-
-	private val repository = mangaRepositoryFactory.create(source) as RemoteMangaRepository
-	private val filter = FilterCoordinator(repository, dataRepository, viewModelScope)
-	private val mangaList = MutableStateFlow<List<Manga>?>(null)
-	private val hasNextPage = MutableStateFlow(false)
-	private val listError = MutableStateFlow<Throwable?>(null)
-	private var loadingJob: Job? = null
-
-	val filterItems: LiveData<List<FilterItem>>
-		get() = filter.items
-
-	override val content = combine(
-		mangaList,
-		listModeFlow,
-		createHeaderFlow(),
-		listError,
-		hasNextPage,
-	) { list, mode, header, error, hasNext ->
-		buildList(list?.size?.plus(2) ?: 2) {
-			add(header)
-			when {
-				list.isNullOrEmpty() && error != null -> add(error.toErrorState(canRetry = true))
-				list == null -> add(LoadingState)
-				list.isEmpty() -> add(createEmptyState(header.hasSelectedTags))
-				else -> {
-					list.toUi(this, mode)
-					when {
-						error != null -> add(error.toErrorFooter())
-						hasNext -> add(LoadingFooter)
-					}
-				}
-			}
-		}
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
-
-	init {
-		filter.observeState()
-			.debounce(FILTER_MIN_INTERVAL)
-			.onEach { filterState ->
-				loadingJob?.cancelAndJoin()
-				mangaList.value = null
-				hasNextPage.value = false
-				loadList(filterState, false)
-			}.catch { error ->
-				listError.value = error
-			}.launchIn(viewModelScope)
-	}
-
-	override fun onRefresh() {
-		loadList(filter.snapshot(), append = false)
-	}
-
-	override fun onRetry() {
-		loadList(filter.snapshot(), append = !mangaList.value.isNullOrEmpty())
-	}
-
-	override fun onSortItemClick(item: FilterItem.Sort) {
-		filter.onSortItemClick(item)
-	}
-
-	override fun onTagItemClick(item: FilterItem.Tag) {
-		filter.onTagItemClick(item)
-	}
-
-	fun loadNextPage() {
-		if (hasNextPage.value && listError.value == null) {
-			loadList(filter.snapshot(), append = true)
-		}
-	}
-
-	fun filterSearch(query: String) = filter.performSearch(query)
-
-	fun resetFilter() = filter.reset()
-
-	override fun onUpdateFilter(tags: Set<MangaTag>) {
-		applyFilter(tags)
-	}
-
-	fun applyFilter(tags: Set<MangaTag>) {
-		filter.setTags(tags)
-	}
-
-	private fun loadList(filterState: FilterState, append: Boolean) {
-		if (loadingJob?.isActive == true) {
-			return
-		}
-		loadingJob = launchLoadingJob(Dispatchers.Default) {
-			try {
-				listError.value = null
-				val list = repository.getList(
-					offset = if (append) mangaList.value?.size ?: 0 else 0,
-					sortOrder = filterState.sortOrder,
-					tags = filterState.tags,
-				)
-				if (!append) {
-					mangaList.value = list
-				} else if (list.isNotEmpty()) {
-					mangaList.value = mangaList.value?.plus(list) ?: list
-				}
-				hasNextPage.value = list.isNotEmpty()
-			} catch (e: CancellationException) {
-				throw e
-			} catch (e: Throwable) {
-				e.printStackTraceDebug()
-				listError.value = e
-				if (!mangaList.value.isNullOrEmpty()) {
-					errorEvent.postCall(e)
-				}
-			}
-		}
-	}
-
-	private fun createEmptyState(canResetFilter: Boolean) = EmptyState(
-		icon = R.drawable.ic_empty_common,
-		textPrimary = R.string.nothing_found,
-		textSecondary = 0,
-		actionStringRes = if (canResetFilter) R.string.reset_filter else 0,
-	)
-
-	private fun createHeaderFlow() = combine(
-		filter.observeState(),
-		filter.observeAvailableTags(),
-	) { state, available ->
-		val chips = createChipsList(state, available.orEmpty())
-		ListHeader2(chips, state.sortOrder, state.tags.isNotEmpty())
-	}
-
-	private suspend fun createChipsList(
-		filterState: FilterState,
-		availableTags: Set<MangaTag>,
-	): List<ChipsView.ChipModel> {
-		val selectedTags = filterState.tags.toMutableSet()
-		var tags = searchRepository.getTagsSuggestion("", 6, repository.source)
-		if (tags.isEmpty()) {
-			tags = availableTags.take(6)
-		}
-		if (tags.isEmpty() && selectedTags.isEmpty()) {
-			return emptyList()
-		}
-		val result = LinkedList<ChipsView.ChipModel>()
-		for (tag in tags) {
-			val model = ChipsView.ChipModel(
-				icon = 0,
-				title = tag.title,
-				isCheckable = true,
-				isChecked = selectedTags.remove(tag),
-				data = tag,
-			)
-			if (model.isChecked) {
-				result.addFirst(model)
-			} else {
-				result.addLast(model)
-			}
-		}
-		for (tag in selectedTags) {
-			val model = ChipsView.ChipModel(
-				icon = 0,
-				title = tag.title,
-				isCheckable = true,
-				isChecked = true,
-				data = tag,
-			)
-			result.addFirst(model)
-		}
-		return result
-	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(source: MangaSource): RemoteListViewModel
-	}
-}

app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt

@@ -1,87 +0,0 @@
-package org.koitharu.kotatsu.search.ui
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.core.graphics.Insets
-import androidx.core.view.updatePadding
-import androidx.fragment.app.commit
-import com.google.android.material.appbar.AppBarLayout
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaTags
-import org.koitharu.kotatsu.databinding.ActivityContainerBinding
-import org.koitharu.kotatsu.local.ui.LocalListFragment
-import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
-import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
-import kotlin.text.Typography.dagger
-
-@AndroidEntryPoint
-class MangaListActivity :
-	BaseActivity<ActivityContainerBinding>(),
-	AppBarOwner {
-
-	override val appBar: AppBarLayout
-		get() = binding.appbar
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(ActivityContainerBinding.inflate(layoutInflater))
-		val tags = intent.getParcelableExtraCompat<ParcelableMangaTags>(EXTRA_TAGS)?.tags
-		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		val source = intent.getSerializableExtra(EXTRA_SOURCE) as? MangaSource ?: tags?.firstOrNull()?.source
-		if (source == null) {
-			finishAfterTransition()
-			return
-		}
-		title = if (source == MangaSource.LOCAL) getString(R.string.local_storage) else source.title
-		val fm = supportFragmentManager
-		if (fm.findFragmentById(R.id.container) == null) {
-			fm.commit {
-				setReorderingAllowed(true)
-				val fragment = if (source == MangaSource.LOCAL) {
-					LocalListFragment.newInstance()
-				} else {
-					RemoteListFragment.newInstance(source)
-				}
-				replace(R.id.container, fragment)
-				if (!tags.isNullOrEmpty() && fragment is RemoteListFragment) {
-					runOnCommit(ApplyFilterRunnable(fragment, tags))
-				}
-			}
-		}
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-		)
-	}
-
-	private class ApplyFilterRunnable(
-		private val fragment: RemoteListFragment,
-		private val tags: Set<MangaTag>,
-	) : Runnable {
-
-		override fun run() {
-			fragment.viewModel.applyFilter(tags)
-		}
-	}
-
-	companion object {
-
-		private const val EXTRA_TAGS = "tags"
-		private const val EXTRA_SOURCE = "source"
-
-		fun newIntent(context: Context, tags: Set<MangaTag>) = Intent(context, MangaListActivity::class.java)
-			.putExtra(EXTRA_TAGS, ParcelableMangaTags(tags))
-
-		fun newIntent(context: Context, source: MangaSource) = Intent(context, MangaListActivity::class.java)
-			.putExtra(EXTRA_SOURCE, source)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt

@@ -1,144 +0,0 @@
-package org.koitharu.kotatsu.search.ui.multi
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.viewModelScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.update
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.exceptions.CompositeException
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.ListMode
-import org.koitharu.kotatsu.list.ui.model.*
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-
-private const val MAX_PARALLELISM = 4
-private const val MIN_HAS_MORE_ITEMS = 8
-
-class MultiSearchViewModel @AssistedInject constructor(
-	@Assisted initialQuery: String,
-	private val settings: AppSettings,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-) : BaseViewModel() {
-
-	private var searchJob: Job? = null
-	private val listData = MutableStateFlow<List<MultiSearchListModel>>(emptyList())
-	private val loadingData = MutableStateFlow(false)
-	private var listError = MutableStateFlow<Throwable?>(null)
-
-	val query = MutableLiveData(initialQuery)
-	val list: LiveData<List<ListModel>> = combine(
-		listData,
-		loadingData,
-		listError,
-	) { list, loading, error ->
-		when {
-			list.isEmpty() -> listOf(
-				when {
-					loading -> LoadingState
-					error != null -> error.toErrorState(canRetry = true)
-					else -> EmptyState(
-						icon = R.drawable.ic_empty_common,
-						textPrimary = R.string.nothing_found,
-						textSecondary = R.string.text_search_holder_secondary,
-						actionStringRes = 0,
-					)
-				},
-			)
-
-			loading -> list + LoadingFooter
-			else -> list
-		}
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
-
-	init {
-		doSearch(initialQuery)
-	}
-
-	fun getItems(ids: Set<Long>): Set<Manga> {
-		val result = HashSet<Manga>(ids.size)
-		listData.value.forEach { x ->
-			for (item in x.list) {
-				if (item.id in ids) {
-					result.add(item.manga)
-				}
-			}
-		}
-		return result
-	}
-
-	fun doSearch(q: String) {
-		val prevJob = searchJob
-		searchJob = launchJob(Dispatchers.Default) {
-			prevJob?.cancelAndJoin()
-			try {
-				listError.value = null
-				listData.value = emptyList()
-				loadingData.value = true
-				query.postValue(q)
-				searchImpl(q)
-			} catch (e: CancellationException) {
-				throw e
-			} catch (e: Throwable) {
-				listError.value = e
-			} finally {
-				loadingData.value = false
-			}
-		}
-	}
-
-	private suspend fun searchImpl(q: String) = coroutineScope {
-		val sources = settings.getMangaSources(includeHidden = false)
-		val dispatcher = Dispatchers.Default.limitedParallelism(MAX_PARALLELISM)
-		val deferredList = sources.map { source ->
-			async(dispatcher) {
-				runCatchingCancellable {
-					val list = mangaRepositoryFactory.create(source).getList(offset = 0, query = q)
-						.toUi(ListMode.GRID)
-					if (list.isNotEmpty()) {
-						MultiSearchListModel(source, list.size > MIN_HAS_MORE_ITEMS, list)
-					} else {
-						null
-					}
-				}.onFailure {
-					it.printStackTraceDebug()
-				}
-			}
-		}
-
-		val errors = ArrayList<Throwable>()
-		for (deferred in deferredList) {
-			deferred.await()
-				.onSuccess { item ->
-					if (item != null) {
-						listData.update { x -> x + item }
-					}
-				}.onFailure {
-					errors.add(it)
-				}
-		}
-		if (listData.value.isEmpty()) {
-			when (errors.size) {
-				0 -> Unit
-				1 -> throw errors[0]
-				else -> throw CompositeException(errors)
-			}
-		}
-	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(initialQuery: String): MultiSearchViewModel
-	}
-}

app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt

@@ -1,129 +0,0 @@
-package org.koitharu.kotatsu.settings
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.View
-import androidx.preference.ListPreference
-import androidx.preference.Preference
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
-import org.koitharu.kotatsu.base.ui.dialog.StorageSelectDialog
-import org.koitharu.kotatsu.core.cache.ContentCache
-import org.koitharu.kotatsu.core.network.DoHProvider
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.parsers.util.names
-import org.koitharu.kotatsu.settings.utils.SliderPreference
-import org.koitharu.kotatsu.utils.ext.getStorageName
-import org.koitharu.kotatsu.utils.ext.setDefaultValueCompat
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
-import java.io.File
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ContentSettingsFragment :
-	BasePreferenceFragment(R.string.content),
-	SharedPreferences.OnSharedPreferenceChangeListener,
-	StorageSelectDialog.OnStorageSelectListener {
-
-	@Inject
-	lateinit var storageManager: LocalStorageManager
-
-	@Inject
-	lateinit var contentCache: ContentCache
-
-	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-		addPreferencesFromResource(R.xml.pref_content)
-		findPreference<Preference>(AppSettings.KEY_PREFETCH_CONTENT)?.isVisible = contentCache.isCachingEnabled
-		findPreference<SliderPreference>(AppSettings.KEY_DOWNLOADS_PARALLELISM)?.run {
-			summary = value.toString()
-			setOnPreferenceChangeListener { preference, newValue ->
-				preference.summary = newValue.toString()
-				true
-			}
-		}
-		findPreference<ListPreference>(AppSettings.KEY_DOH)?.run {
-			entryValues = arrayOf(
-				DoHProvider.NONE,
-				DoHProvider.GOOGLE,
-				DoHProvider.CLOUDFLARE,
-				DoHProvider.ADGUARD,
-			).names()
-			setDefaultValueCompat(DoHProvider.NONE.name)
-		}
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		findPreference<Preference>(AppSettings.KEY_LOCAL_STORAGE)?.bindStorageName()
-		findPreference<Preference>(AppSettings.KEY_SUGGESTIONS)?.setSummary(
-			if (settings.isSuggestionsEnabled) R.string.enabled else R.string.disabled,
-		)
-		bindRemoteSourcesSummary()
-		settings.subscribe(this)
-	}
-
-	override fun onDestroyView() {
-		settings.unsubscribe(this)
-		super.onDestroyView()
-	}
-
-	override fun onSharedPreferenceChanged(prefs: SharedPreferences?, key: String?) {
-		when (key) {
-			AppSettings.KEY_LOCAL_STORAGE -> {
-				findPreference<Preference>(key)?.bindStorageName()
-			}
-
-			AppSettings.KEY_SUGGESTIONS -> {
-				findPreference<Preference>(AppSettings.KEY_SUGGESTIONS)?.setSummary(
-					if (settings.isSuggestionsEnabled) R.string.enabled else R.string.disabled,
-				)
-			}
-
-			AppSettings.KEY_SOURCES_HIDDEN -> {
-				bindRemoteSourcesSummary()
-			}
-
-			AppSettings.KEY_SSL_BYPASS -> {
-				Snackbar.make(listView, R.string.settings_apply_restart_required, Snackbar.LENGTH_INDEFINITE).show()
-			}
-		}
-	}
-
-	override fun onPreferenceTreeClick(preference: Preference): Boolean {
-		return when (preference.key) {
-			AppSettings.KEY_LOCAL_STORAGE -> {
-				val ctx = context ?: return false
-				StorageSelectDialog.Builder(ctx, storageManager, this)
-					.setTitle(preference.title ?: "")
-					.setNegativeButton(android.R.string.cancel)
-					.create()
-					.show()
-				true
-			}
-
-			else -> super.onPreferenceTreeClick(preference)
-		}
-	}
-
-	override fun onStorageSelected(file: File) {
-		settings.mangaStorageDir = file
-	}
-
-	private fun Preference.bindStorageName() {
-		viewLifecycleScope.launch {
-			val storage = storageManager.getDefaultWriteableDir()
-			summary = storage?.getStorageName(context) ?: getString(R.string.not_available)
-		}
-	}
-
-	private fun bindRemoteSourcesSummary() {
-		findPreference<Preference>(AppSettings.KEY_REMOTE_SOURCES)?.run {
-			val total = settings.remoteMangaSources.size
-			summary = getString(R.string.enabled_d_of_d, total - settings.hiddenSources.size, total)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/settings/DomainValidator.kt

@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.settings
-
-import okhttp3.internal.toCanonicalHost
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.EditTextValidator
-
-class DomainValidator : EditTextValidator() {
-
-	override fun validate(text: String): ValidationResult {
-		val trimmed = text.trim()
-		if (trimmed.isEmpty()) {
-			return ValidationResult.Success
-		}
-		return if (!checkCharacters(trimmed) || trimmed.toCanonicalHost() == null) {
-			ValidationResult.Failed(context.getString(R.string.invalid_domain_message))
-		} else {
-			ValidationResult.Success
-		}
-	}
-
-	private fun checkCharacters(value: String): Boolean {
-		for (i in value.indices) {
-			val c = value[i]
-			if (c !in '\u0020'..'\u007e') {
-				return false
-			}
-		}
-		return true
-	}
-}

app/src/main/java/org/koitharu/kotatsu/settings/RootSettingsFragment.kt

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.settings
-
-import android.os.Bundle
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
-
-class RootSettingsFragment : BasePreferenceFragment(R.string.settings) {
-
-	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-		addPreferencesFromResource(R.xml.pref_root)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/settings/SettingsHeadersFragment.kt

@@ -1,49 +0,0 @@
-package org.koitharu.kotatsu.settings
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentTransaction
-import androidx.fragment.app.commit
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceHeaderFragmentCompat
-import androidx.slidingpanelayout.widget.SlidingPaneLayout
-import org.koitharu.kotatsu.R
-
-class SettingsHeadersFragment : PreferenceHeaderFragmentCompat(), SlidingPaneLayout.PanelSlideListener {
-
-	private var currentTitle: CharSequence? = null
-
-	override fun onCreatePreferenceHeader(): PreferenceFragmentCompat = RootSettingsFragment()
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		slidingPaneLayout.addPanelSlideListener(this)
-	}
-
-	override fun onPanelSlide(panel: View, slideOffset: Float) = Unit
-
-	override fun onPanelOpened(panel: View) {
-		activity?.title = currentTitle ?: getString(R.string.settings)
-	}
-
-	override fun onPanelClosed(panel: View) {
-		activity?.setTitle(R.string.settings)
-	}
-
-	fun setTitle(title: CharSequence?) {
-		currentTitle = title
-		if (slidingPaneLayout.width != 0 && slidingPaneLayout.isOpen) {
-			activity?.title = title
-		}
-	}
-
-	fun openFragment(fragment: Fragment) {
-		childFragmentManager.commit {
-			setReorderingAllowed(true)
-			replace(androidx.preference.R.id.preferences_detail, fragment)
-			setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
-			addToBackStack(null)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt

@@ -1,128 +0,0 @@
-package org.koitharu.kotatsu.settings
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import androidx.preference.Preference
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
-import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
-import org.koitharu.kotatsu.utils.ext.awaitViewLifecycle
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import org.koitharu.kotatsu.utils.ext.serializableArgument
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
-import org.koitharu.kotatsu.utils.ext.withArgs
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class SourceSettingsFragment : BasePreferenceFragment(0) {
-
-	@Inject
-	lateinit var mangaRepositoryFactory: MangaRepository.Factory
-
-	private val source by serializableArgument<MangaSource>(EXTRA_SOURCE)
-	private var repository: RemoteMangaRepository? = null
-	private val exceptionResolver = ExceptionResolver(this)
-
-	override fun onResume() {
-		super.onResume()
-		setTitle(source.title)
-	}
-
-	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-		preferenceManager.sharedPreferencesName = source.name
-		val repo = mangaRepositoryFactory.create(source) as? RemoteMangaRepository ?: return
-		repository = repo
-		addPreferencesFromResource(R.xml.pref_source)
-		addPreferencesFromRepository(repo)
-
-		findPreference<Preference>(KEY_AUTH)?.run {
-			val authProvider = repo.getAuthProvider()
-			isVisible = authProvider != null
-			isEnabled = authProvider?.isAuthorized == false
-		}
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		findPreference<Preference>(KEY_AUTH)?.run {
-			if (isVisible) {
-				loadUsername(viewLifecycleOwner, this)
-			}
-		}
-	}
-
-	override fun onPreferenceTreeClick(preference: Preference): Boolean {
-		return when (preference.key) {
-			KEY_AUTH -> {
-				startActivity(SourceAuthActivity.newIntent(preference.context, source))
-				true
-			}
-
-			else -> super.onPreferenceTreeClick(preference)
-		}
-	}
-
-	private fun loadUsername(owner: LifecycleOwner, preference: Preference) = owner.lifecycleScope.launch {
-		runCatchingCancellable {
-			preference.summary = null
-			withContext(Dispatchers.Default) {
-				requireNotNull(repository?.getAuthProvider()?.getUsername())
-			}
-		}.onSuccess { username ->
-			preference.title = getString(R.string.logged_in_as, username)
-		}.onFailure { error ->
-			when {
-				error is AuthRequiredException -> Unit
-				ExceptionResolver.canResolve(error) -> {
-					ensureActive()
-					Snackbar.make(
-						listView ?: return@onFailure,
-						error.getDisplayMessage(preference.context.resources),
-						Snackbar.LENGTH_INDEFINITE,
-					).setAction(ExceptionResolver.getResolveStringId(error)) { resolveError(error) }
-						.show()
-				}
-
-				else -> preference.summary = error.getDisplayMessage(preference.context.resources)
-			}
-			error.printStackTraceDebug()
-		}
-	}
-
-	private fun resolveError(error: Throwable) {
-		view ?: return
-		viewLifecycleScope.launch {
-			if (exceptionResolver.resolve(error)) {
-				val pref = findPreference<Preference>(KEY_AUTH) ?: return@launch
-				val lifecycleOwner = awaitViewLifecycle()
-				loadUsername(lifecycleOwner, pref)
-			}
-		}
-	}
-
-	companion object {
-
-		private const val KEY_AUTH = "auth"
-
-		private const val EXTRA_SOURCE = "source"
-
-		fun newInstance(source: MangaSource) = SourceSettingsFragment().withArgs(1) {
-			putSerializable(EXTRA_SOURCE, source)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupSettingsFragment.kt

@@ -1,53 +0,0 @@
-package org.koitharu.kotatsu.settings.backup
-
-import android.content.ActivityNotFoundException
-import android.net.Uri
-import android.os.Bundle
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.preference.Preference
-import com.google.android.material.snackbar.Snackbar
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-
-class BackupSettingsFragment :
-	BasePreferenceFragment(R.string.backup_restore),
-	ActivityResultCallback<Uri?> {
-
-	private val backupSelectCall = registerForActivityResult(
-		ActivityResultContracts.OpenDocument(),
-		this
-	)
-
-	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-		addPreferencesFromResource(R.xml.pref_backup)
-	}
-
-	override fun onPreferenceTreeClick(preference: Preference): Boolean {
-		return when (preference.key) {
-			AppSettings.KEY_BACKUP -> {
-				BackupDialogFragment().show(childFragmentManager, BackupDialogFragment.TAG)
-				true
-			}
-			AppSettings.KEY_RESTORE -> {
-				try {
-					backupSelectCall.launch(arrayOf("*/*"))
-				} catch (e: ActivityNotFoundException) {
-					e.printStackTraceDebug()
-					Snackbar.make(
-						listView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT
-					).show()
-				}
-				true
-			}
-			else -> super.onPreferenceTreeClick(preference)
-		}
-	}
-
-	override fun onActivityResult(result: Uri?) {
-		RestoreDialogFragment.newInstance(result ?: return)
-			.show(childFragmentManager, BackupDialogFragment.TAG)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/shelf/domain/ShelfSection.kt

@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.shelf.domain
-
-enum class ShelfSection {
-
-	HISTORY, LOCAL, UPDATED, FAVORITES;
-}

app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt

@@ -1,191 +0,0 @@
-package org.koitharu.kotatsu.suggestions.ui
-
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import android.os.Build
-import androidx.annotation.FloatRange
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import androidx.hilt.work.HiltWorker
-import androidx.work.*
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.history.domain.HistoryRepository
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.suggestions.domain.MangaSuggestion
-import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
-import org.koitharu.kotatsu.utils.ext.asArrayList
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import org.koitharu.kotatsu.utils.ext.trySetForeground
-import java.util.concurrent.TimeUnit
-import kotlin.math.pow
-
-@HiltWorker
-class SuggestionsWorker @AssistedInject constructor(
-	@Assisted appContext: Context,
-	@Assisted params: WorkerParameters,
-	private val suggestionRepository: SuggestionRepository,
-	private val historyRepository: HistoryRepository,
-	private val appSettings: AppSettings,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-) : CoroutineWorker(appContext, params) {
-
-	override suspend fun doWork(): Result {
-		val count = doWorkImpl()
-		val outputData = workDataOf(DATA_COUNT to count)
-		return Result.success(outputData)
-	}
-
-	override suspend fun getForegroundInfo(): ForegroundInfo {
-		val manager = applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-		val title = applicationContext.getString(R.string.suggestions_updating)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val channel = NotificationChannel(
-				WORKER_CHANNEL_ID,
-				title,
-				NotificationManager.IMPORTANCE_LOW,
-			)
-			channel.setShowBadge(false)
-			channel.enableVibration(false)
-			channel.setSound(null, null)
-			channel.enableLights(false)
-			manager.createNotificationChannel(channel)
-		}
-
-		val notification = NotificationCompat.Builder(applicationContext, WORKER_CHANNEL_ID)
-			.setContentTitle(title)
-			.setPriority(NotificationCompat.PRIORITY_MIN)
-			.setDefaults(0)
-			.setColor(ContextCompat.getColor(applicationContext, R.color.blue_primary_dark))
-			.setSilent(true)
-			.setProgress(0, 0, true)
-			.setSmallIcon(android.R.drawable.stat_notify_sync)
-			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_DEFERRED)
-			.setOngoing(true)
-			.build()
-
-		return ForegroundInfo(WORKER_NOTIFICATION_ID, notification)
-	}
-
-	private suspend fun doWorkImpl(): Int {
-		if (!appSettings.isSuggestionsEnabled) {
-			suggestionRepository.clear()
-			return 0
-		}
-		val blacklistTagRegex = appSettings.getSuggestionsTagsBlacklistRegex()
-		val allTags = historyRepository.getPopularTags(TAGS_LIMIT).filterNot {
-			blacklistTagRegex?.containsMatchIn(it.title) ?: false
-		}
-		if (allTags.isEmpty()) {
-			return 0
-		}
-		if (TAG in tags) { // not expedited
-			trySetForeground()
-		}
-		val tagsBySources = allTags.groupBy { x -> x.source }
-		val dispatcher = Dispatchers.Default.limitedParallelism(MAX_PARALLELISM)
-		val rawResults = coroutineScope {
-			tagsBySources.flatMap { (source, tags) ->
-				val repo = mangaRepositoryFactory.tryCreate(source) ?: return@flatMap emptyList()
-				tags.map { tag ->
-					async(dispatcher) {
-						repo.getListSafe(tag)
-					}
-				}
-			}.awaitAll().flatten().asArrayList()
-		}
-		if (appSettings.isSuggestionsExcludeNsfw) {
-			rawResults.removeAll { it.isNsfw }
-		}
-		if (blacklistTagRegex != null) {
-			rawResults.removeAll {
-				it.tags.any { x -> blacklistTagRegex.containsMatchIn(x.title) }
-			}
-		}
-		if (rawResults.isEmpty()) {
-			return 0
-		}
-		val suggestions = rawResults.distinctBy { manga ->
-			manga.id
-		}.map { manga ->
-			MangaSuggestion(
-				manga = manga,
-				relevance = computeRelevance(manga.tags, allTags),
-			)
-		}.sortedBy { it.relevance }.take(LIMIT)
-		suggestionRepository.replace(suggestions)
-		return suggestions.size
-	}
-
-	@FloatRange(from = 0.0, to = 1.0)
-	private fun computeRelevance(mangaTags: Set<MangaTag>, allTags: List<MangaTag>): Float {
-		val maxWeight = (allTags.size + allTags.size + 1 - mangaTags.size) * mangaTags.size / 2.0
-		val weight = mangaTags.sumOf { tag ->
-			val index = allTags.indexOf(tag)
-			if (index < 0) 0 else allTags.size - index
-		}
-		return (weight / maxWeight).pow(2.0).toFloat()
-	}
-
-	private suspend fun MangaRepository.getListSafe(tag: MangaTag) = runCatchingCancellable {
-		getList(offset = 0, sortOrder = SortOrder.UPDATED, tags = setOf(tag))
-	}.onFailure { error ->
-		error.printStackTraceDebug()
-	}.getOrDefault(emptyList())
-
-	private fun MangaRepository.Factory.tryCreate(source: MangaSource) = runCatching {
-		create(source)
-	}.onFailure { error ->
-		error.printStackTraceDebug()
-	}.getOrNull()
-
-	companion object {
-
-		private const val TAG = "suggestions"
-		private const val TAG_ONESHOT = "suggestions_oneshot"
-		private const val LIMIT = 140
-		private const val TAGS_LIMIT = 20
-		private const val MAX_PARALLELISM = 4
-		private const val DATA_COUNT = "count"
-		private const val WORKER_CHANNEL_ID = "suggestion_worker"
-		private const val WORKER_NOTIFICATION_ID = 36
-
-		fun setup(context: Context) {
-			val constraints = Constraints.Builder()
-				.setRequiredNetworkType(NetworkType.UNMETERED)
-				.setRequiresBatteryNotLow(true)
-				.build()
-			val request = PeriodicWorkRequestBuilder<SuggestionsWorker>(6, TimeUnit.HOURS)
-				.setConstraints(constraints)
-				.addTag(TAG)
-				.setBackoffCriteria(BackoffPolicy.LINEAR, 30, TimeUnit.MINUTES)
-				.build()
-			WorkManager.getInstance(context)
-				.enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.KEEP, request)
-		}
-
-		fun startNow(context: Context) {
-			val constraints = Constraints.Builder()
-				.setRequiredNetworkType(NetworkType.CONNECTED)
-				.build()
-			val request = OneTimeWorkRequestBuilder<SuggestionsWorker>()
-				.setConstraints(constraints)
-				.addTag(TAG_ONESHOT)
-				.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
-				.build()
-			WorkManager.getInstance(context)
-				.enqueue(request)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/sync/ui/SyncAuthViewModel.kt

@@ -1,25 +0,0 @@
-package org.koitharu.kotatsu.sync.ui
-
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-import kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.sync.data.SyncAuthApi
-import org.koitharu.kotatsu.sync.domain.SyncAuthResult
-import org.koitharu.kotatsu.utils.SingleLiveEvent
-
-@HiltViewModel
-class SyncAuthViewModel @Inject constructor(
-	private val api: SyncAuthApi,
-) : BaseViewModel() {
-
-	val onTokenObtained = SingleLiveEvent<SyncAuthResult>()
-
-	fun obtainToken(email: String, password: String) {
-		launchLoadingJob(Dispatchers.Default) {
-			val token = api.authenticate(email, password)
-			val result = SyncAuthResult(email, password, token)
-			onTokenObtained.postCall(result)
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/utils/CompositeMutex.kt

@@ -1,69 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import androidx.collection.ArrayMap
-import kotlinx.coroutines.CancellableContinuation
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import java.util.LinkedList
-import kotlin.coroutines.coroutineContext
-import kotlin.coroutines.resume
-
-class CompositeMutex<T : Any> : Set<T> {
-
-	private val data = ArrayMap<T, MutableList<CancellableContinuation<Unit>>>()
-	private val mutex = Mutex()
-
-	override val size: Int
-		get() = data.size
-
-	override fun contains(element: T): Boolean {
-		return data.containsKey(element)
-	}
-
-	override fun containsAll(elements: Collection<T>): Boolean {
-		return elements.all { x -> data.containsKey(x) }
-	}
-
-	override fun isEmpty(): Boolean {
-		return data.isEmpty
-	}
-
-	override fun iterator(): Iterator<T> {
-		return data.keys.iterator()
-	}
-
-	suspend fun lock(element: T) {
-		while (coroutineContext.isActive) {
-			waitForRemoval(element)
-			mutex.withLock {
-				if (data[element] == null) {
-					data[element] = LinkedList<CancellableContinuation<Unit>>()
-					return
-				}
-			}
-		}
-	}
-
-	fun unlock(element: T) {
-		val continuations = checkNotNull(data.remove(element)) {
-			"CompositeMutex is not locked for $element"
-		}
-		continuations.forEach { c ->
-			if (c.isActive) {
-				c.resume(Unit)
-			}
-		}
-	}
-
-	private suspend fun waitForRemoval(element: T) {
-		val list = data[element] ?: return
-		suspendCancellableCoroutine { continuation ->
-			list.add(continuation)
-			continuation.invokeOnCancellation {
-				list.remove(continuation)
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/utils/FlowLiveData.kt

@@ -1,75 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import androidx.lifecycle.LiveData
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.StateFlow
-
-private const val DEFAULT_TIMEOUT = 5_000L
-
-/**
- * Similar to a CoroutineLiveData but optimized for using within infinite flows
- */
-class FlowLiveData<T>(
-	private val flow: Flow<T>,
-	defaultValue: T,
-	context: CoroutineContext = EmptyCoroutineContext,
-	private val timeoutInMs: Long = DEFAULT_TIMEOUT,
-) : LiveData<T>(defaultValue) {
-
-	private val scope = CoroutineScope(Dispatchers.Main.immediate + context + SupervisorJob(context[Job]))
-	private var job: Job? = null
-	private var cancellationJob: Job? = null
-
-	override fun onActive() {
-		super.onActive()
-		cancellationJob?.cancel()
-		cancellationJob = null
-		if (job?.isActive == true) {
-			return
-		}
-		job = scope.launch {
-			flow.collect(Collector())
-		}
-	}
-
-	override fun onInactive() {
-		super.onInactive()
-		cancellationJob?.cancel()
-		cancellationJob = scope.launch(Dispatchers.Main.immediate) {
-			delay(timeoutInMs)
-			if (!hasActiveObservers()) {
-				job?.cancel()
-				job = null
-			}
-		}
-	}
-
-	private inner class Collector : FlowCollector<T> {
-
-		private var previousValue: Any? = value
-
-		override suspend fun emit(value: T) {
-			if (previousValue != value) {
-				previousValue = value
-				withContext(Dispatchers.Main.immediate) {
-					setValue(value)
-				}
-			}
-		}
-	}
-}
-
-fun <T> Flow<T>.asFlowLiveData(
-	context: CoroutineContext = EmptyCoroutineContext,
-	defaultValue: T,
-	timeoutInMs: Long = DEFAULT_TIMEOUT,
-): LiveData<T> = FlowLiveData(this, defaultValue, context, timeoutInMs)
-
-fun <T> StateFlow<T>.asFlowLiveData(
-	context: CoroutineContext = EmptyCoroutineContext,
-	timeoutInMs: Long = DEFAULT_TIMEOUT,
-): LiveData<T> = FlowLiveData(this, value, context, timeoutInMs)

app/src/main/java/org/koitharu/kotatsu/utils/GZipInterceptor.kt

@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import okhttp3.Interceptor
-import okhttp3.Response
-import org.koitharu.kotatsu.core.network.CommonHeaders.CONTENT_ENCODING
-
-class GZipInterceptor : Interceptor {
-
-	override fun intercept(chain: Interceptor.Chain): Response {
-		val newRequest = chain.request().newBuilder()
-		newRequest.addHeader(CONTENT_ENCODING, "gzip")
-		return chain.proceed(newRequest.build())
-	}
-}

app/src/main/java/org/koitharu/kotatsu/utils/InternalResourceHelper.kt

@@ -1,27 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import android.content.Context
-import android.content.res.Resources
-
-object InternalResourceHelper {
-
-	fun getBoolean(context: Context, resName: String, defaultValue: Boolean): Boolean {
-		val id = getResourceId(resName, "bool")
-		return if (id != 0) {
-			context.createPackageContext("android", 0).resources.getBoolean(id)
-		} else {
-			defaultValue
-		}
-	}
-
-	/**
-	 * Get resource id from system resources
-	 * @param resName resource name to get
-	 * @param type resource type of [resName] to get
-	 * @return 0 if not available
-	 */
-	private fun getResourceId(resName: String, type: String): Int {
-		return Resources.getSystem().getIdentifier(resName, type, "android")
-	}
-
-}