Translated using Weblate (Russian)

Currently translated at 100.0% (443 of 443 strings)

Co-authored-by: Koitharu <nvasya95@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ru/
Translation: Kotatsu/Strings

.editorconfig

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

.github/FUNDING.yml

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

.gitignore

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

.idea/.gitignore

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

.idea/compiler.xml

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

.idea/gradle.xml

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

.idea/inspectionProfiles/Project_Default.xml

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

.idea/kotlinc.xml

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

.idea/ktlint.xml

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

.weblate

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

README.md

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

app/build.gradle

@@ -3,19 +3,20 @@ plugins {
 	id 'kotlin-android'
 	id 'kotlin-kapt'
 	id 'kotlin-parcelize'
+	id 'dagger.hilt.android.plugin'
 }
 
 android {
-	compileSdkVersion 32
-	buildToolsVersion '32.0.0'
-	namespace 'org.koitharu.kotatsu'
+	compileSdk = 33
+	buildToolsVersion = '33.0.2'
+	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
-		targetSdkVersion 32
-		versionCode 421
-		versionName '3.4.9'
+		targetSdkVersion 33
+		versionCode 556
+		versionName '5.3'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -24,10 +25,6 @@ android {
 				arg 'room.schemaLocation', "$projectDir/schemas".toString()
 			}
 		}
-
-		// define this values in your local.properties file
-		buildConfigField 'String', 'SHIKIMORI_CLIENT_ID', "\"${localProperty('shikimori.clientId')}\""
-		buildConfigField 'String', 'SHIKIMORI_CLIENT_SECRET', "\"${localProperty('shikimori.clientSecret')}\""
 	}
 	buildTypes {
 		debug {
@@ -45,14 +42,16 @@ 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',
@@ -60,8 +59,8 @@ android {
 		]
 	}
 	lint {
-		abortOnError false
-		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
+		abortOnError true
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged', 'SetJavaScriptEnabled'
 	}
 	testOptions {
 		unitTests.includeAndroidResources true
@@ -79,64 +78,83 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation('com.github.KotatsuApp:kotatsu-parsers:8709c3dd0c') {
+	//noinspection GradleDependency
+	implementation('com.github.KotatsuApp:kotatsu-parsers:c2b79b55f8') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	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.core:core-ktx:1.8.0'
-	implementation 'androidx.activity:activity-ktx:1.5.1'
-	implementation 'androidx.fragment:fragment-ktx:1.5.1'
-	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.appcompat:appcompat:1.6.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.7.1'
-	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
-	implementation 'com.google.android.material:material:1.7.0-alpha03'
+	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
+	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.4.3'
-	implementation 'androidx.room:room-ktx:2.4.3'
-	kapt 'androidx.room:room-compiler:2.4.3'
+	// TODO https://issuetracker.google.com/issues/254846063
+	implementation 'androidx.work:work-runtime-ktx:2.8.1'
+	//noinspection GradleDependency
+	implementation('com.google.guava:guava:32.0.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 'com.squareup.okio:okio:3.2.0'
+	implementation 'androidx.room:room-runtime:2.5.2'
+	implementation 'androidx.room:room-ktx:2.5.2'
+	//noinspection KaptUsageInsteadOfKsp
+	kapt 'androidx.room:room-compiler:2.5.2'
+
+	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 'io.insert-koin:koin-android:3.2.0'
-	implementation 'io.coil-kt:coil-base:2.1.0'
-	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
+	implementation 'com.google.dagger:hilt-android:2.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.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'
 
-	implementation 'ch.acra:acra-mail:5.9.5'
-	implementation 'ch.acra:acra-dialog:5.9.5'
+	implementation 'ch.acra:acra-http:5.9.7'
+	implementation 'ch.acra:acra-dialog:5.9.7'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20220320'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+	testImplementation 'org.json:json:20230618'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
-	androidTestImplementation 'androidx.test:runner:1.4.0'
-	androidTestImplementation 'androidx.test:rules:1.4.0'
-	androidTestImplementation 'androidx.test:core-ktx:1.4.0'
-	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+	androidTestImplementation 'androidx.test:runner:1.5.2'
+	androidTestImplementation 'androidx.test:rules:1.5.0'
+	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
-	androidTestImplementation 'io.insert-koin:koin-test:3.2.0'
-	androidTestImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
-	androidTestImplementation 'androidx.room:room-testing:2.4.3'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.13.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.46.1'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.46.1'
+}

app/proguard-rules.pro

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

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

@@ -4,5 +4,6 @@
 	"sortKey": 1,
 	"order": "NEWEST",
 	"createdAt": 1335906000000,
-	"isTrackingEnabled": true
-}
+	"isTrackingEnabled": true,
+	"isVisibleInLibrary": true
+}

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

@@ -6,4 +6,4 @@ import kotlin.coroutines.suspendCoroutine
 
 suspend fun Instrumentation.awaitForIdle() = suspendCoroutine<Unit> { cont ->
 	waitForIdle { cont.resume(Unit) }
-}
+}

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

@@ -3,10 +3,10 @@ package org.koitharu.kotatsu.core.db
 import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
 class MangaDatabaseTest {
@@ -37,7 +37,7 @@ class MangaDatabaseTest {
 				TEST_DB,
 				migration.endVersion,
 				true,
-				migration
+				migration,
 			).close()
 		}
 	}

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

@@ -6,28 +6,40 @@ import android.os.Build
 import androidx.core.content.getSystemService
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
 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 kotlin.test.assertEquals
-import kotlin.test.assertTrue
+import org.koitharu.kotatsu.history.data.HistoryRepository
+import javax.inject.Inject
 
+@HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class ShortcutsUpdaterTest : KoinTest {
+class AppShortcutManagerTest {
 
-	private val historyRepository by inject<HistoryRepository>()
-	private val shortcutsUpdater by inject<ShortcutsUpdater>()
-	private val database by inject<MangaDatabase>()
+	@get:Rule
+	var hiltRule = HiltAndroidRule(this)
+
+	@Inject
+	lateinit var historyRepository: HistoryRepository
+
+	@Inject
+	lateinit var appShortcutManager: AppShortcutManager
+
+	@Inject
+	lateinit var database: MangaDatabase
 
 	@Before
 	fun setUp() {
+		hiltRule.inject()
 		database.clearAllTables()
 	}
 
@@ -43,7 +55,7 @@ class ShortcutsUpdaterTest : KoinTest {
 			chapterId = SampleData.chapter.id,
 			page = 4,
 			scroll = 2,
-			percent = 0.3f
+			percent = 0.3f,
 		)
 		awaitUpdate()
 
@@ -60,6 +72,6 @@ class ShortcutsUpdaterTest : KoinTest {
 	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

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

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

@@ -1,24 +1,39 @@
 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 junit.framework.TestCase.*
 import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
 import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.base.domain.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.parsers.model.Manga
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+import javax.inject.Inject
 
+@HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class TrackerTest : KoinTest {
+class TrackerTest {
 
-	private val repository by inject<TrackingRepository>()
-	private val dataRepository by inject<MangaDataRepository>()
-	private val tracker by inject<Tracker>()
+	@get:Rule
+	var hiltRule = HiltAndroidRule(this)
+
+	@Inject
+	lateinit var repository: TrackingRepository
+
+	@Inject
+	lateinit var dataRepository: MangaDataRepository
+
+	@Inject
+	lateinit var tracker: Tracker
+
+	@Before
+	fun setUp() {
+		hiltRule.inject()
+	}
 
 	@Test
 	fun noUpdates() = runTest {
@@ -180,4 +195,4 @@ class TrackerTest : KoinTest {
 		dataRepository.storeManga(manga)
 		return manga
 	}
-}
+}

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

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

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

@@ -1,18 +1,23 @@
 package org.koitharu.kotatsu.core.parser
 
-import java.util.*
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
+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 java.util.EnumSet
 
 /**
  * This parser is just for parser development, it should not be used in releases
  */
-class DummyParser(override val context: MangaLoaderContext) : MangaParser(MangaSource.DUMMY) {
+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)
@@ -37,4 +42,4 @@ class DummyParser(override val context: MangaLoaderContext) : MangaParser(MangaS
 	override suspend fun getTags(): Set<MangaTag> {
 		TODO("Not yet implemented")
 	}
-}
+}

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

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

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

app/src/main/AndroidManifest.xml

@@ -10,17 +10,45 @@
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
+	<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
+	<uses-permission android:name="android.permission.READ_SYNC_STATS" />
+	<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+	<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+	<uses-permission
+		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+		android:maxSdkVersion="29" />
+	<uses-permission
+		android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+		tools:ignore="ScopedStorage" />
+
+	<queries>
+		<intent>
+			<action android:name="android.intent.action.PROCESS_TEXT" />
+			<data android:mimeType="text/plain" />
+		</intent>
+		<intent>
+			<action android:name="android.speech.action.RECOGNIZE_SPEECH" />
+		</intent>
+	</queries>
 
 	<application
 		android:name="org.koitharu.kotatsu.KotatsuApp"
 		android:allowBackup="true"
 		android:backupAgent="org.koitharu.kotatsu.settings.backup.AppBackupAgent"
 		android:dataExtractionRules="@xml/backup_rules"
+		android:enableOnBackInvokedCallback="true"
 		android:fullBackupContent="@xml/backup_content"
 		android:fullBackupOnly="true"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
+		android:largeHeap="true"
+		android:localeConfig="@xml/locales"
 		android:networkSecurityConfig="@xml/network_security_config"
+		android:requestLegacyExternalStorage="true"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
 		android:theme="@style/Theme.Kotatsu"
@@ -57,34 +85,59 @@
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
 			android:label="@string/search_manga" />
+		<activity
+			android:name="org.koitharu.kotatsu.history.ui.HistoryActivity"
+			android:label="@string/history" />
+		<activity
+			android:name="org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity"
+			android:label="@string/updates" />
+		<activity
+			android:name="org.koitharu.kotatsu.favourites.ui.FavouritesActivity"
+			android:label="@string/favourites" />
+		<activity
+			android:name="org.koitharu.kotatsu.bookmarks.ui.BookmarksActivity"
+			android:label="@string/bookmarks" />
+		<activity
+			android:name="org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity"
+			android:label="@string/suggestions" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:exported="true"
 			android:label="@string/settings">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
+
 				<category android:name="android.intent.category.DEFAULT" />
 				<category android:name="android.intent.category.BROWSABLE" />
+
 				<data android:scheme="kotatsu" />
+				<data android:host="about" />
+				<data android:host="sync-settings" />
 			</intent-filter>
 		</activity>
+		<activity
+			android:name="org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity"
+			android:label="@string/local_manga_directories" />
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
+		<activity
+			android:name="org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
+			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name="org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity"
-			android:label="@string/favourites_categories"
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity"
+			android:label="@string/favourites"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
 			android:exported="true"
-			android:label="@string/manga_shelf"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge">
+			android:label="@string/manga_shelf">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
@@ -100,18 +153,40 @@
 			android:name="org.koitharu.kotatsu.settings.protect.ProtectSetupActivity"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
+			android:name="org.koitharu.kotatsu.download.ui.list.DownloadsActivity"
 			android:label="@string/downloads"
-			android:launchMode="singleTop"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+			android:launchMode="singleTop" />
 		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity" />
+		<activity android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity" />
 		<activity
-			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
-			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+			android:name="org.koitharu.kotatsu.sync.ui.SyncAuthActivity"
+			android:label="@string/sync" />
+		<activity
+			android:name="org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity"
+			android:label="@string/color_correction" />
+		<activity
+			android:name="org.koitharu.kotatsu.shelf.ui.config.ShelfSettingsActivity"
+			android:label="@string/settings" />
+		<activity
+			android:name="org.koitharu.kotatsu.scrobbling.common.ui.config.ScrobblerConfigActivity"
+			android:exported="true"
+			android:label="@string/settings"
+			android:launchMode="singleTop">
+
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+				<data android:host="shikimori-auth" />
+				<data android:host="anilist-auth" />
+				<data android:host="mal-auth" />
+			</intent-filter>
+
+		</activity>
 
-		<service
-			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
-			android:foregroundServiceType="dataSync" />
 		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
@@ -119,6 +194,42 @@
 		<service
 			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.SyncAuthenticatorService"
+			android:exported="true"
+			tools:ignore="ExportedService">
+			<intent-filter>
+				<action android:name="android.accounts.AccountAuthenticator" />
+			</intent-filter>
+			<meta-data
+				android:name="android.accounts.AccountAuthenticator"
+				android:resource="@xml/authenticator_sync" />
+		</service>
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncService"
+			android:exported="false"
+			android:label="@string/favourites">
+			<intent-filter>
+				<action android:name="android.content.SyncAdapter" />
+			</intent-filter>
+			<meta-data
+				android:name="android.content.SyncAdapter"
+				android:resource="@xml/sync_favourites" />
+		</service>
+		<service
+			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncService"
+			android:exported="false"
+			android:label="@string/history">
+			<intent-filter>
+				<action android:name="android.content.SyncAdapter" />
+			</intent-filter>
+			<meta-data
+				android:name="android.content.SyncAdapter"
+				android:resource="@xml/sync_history" />
+		</service>
+		<service
+			android:name="org.koitharu.kotatsu.details.service.MangaPrefetchService"
+			android:exported="false" />
 
 		<provider
 			android:name="org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider"
@@ -133,6 +244,28 @@
 				android:name="android.support.FILE_PROVIDER_PATHS"
 				android:resource="@xml/filepaths" />
 		</provider>
+		<provider
+			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncProvider"
+			android:authorities="@string/sync_authority_favourites"
+			android:exported="false"
+			android:label="@string/favourites"
+			android:syncable="true" />
+		<provider
+			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncProvider"
+			android:authorities="@string/sync_authority_history"
+			android:exported="false"
+			android:label="@string/history"
+			android:syncable="true" />
+		<provider
+			android:name="androidx.startup.InitializationProvider"
+			android:authorities="${applicationId}.androidx-startup"
+			android:exported="false"
+			tools:node="remove">
+			<meta-data
+				android:name="androidx.work.WorkManagerInitializer"
+				android:value="androidx.startup"
+				tools:node="remove" />
+		</provider>
 
 		<receiver
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider"
@@ -163,7 +296,10 @@
 		<meta-data
 			android:name="android.webkit.WebView.MetricsOptOut"
 			android:value="true" />
+		<meta-data
+			android:name="com.samsung.android.icon_container.has_icon_container"
+			android:value="@bool/com_samsung_android_icon_container_has_icon_container" />
 
 	</application>
 
-</manifest>
+</manifest>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.base.ui
-
-import android.app.Service
-import android.content.Intent
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-
-abstract class CoroutineIntentService : BaseService() {
-
-	private val mutex = Mutex()
-	protected open val dispatcher: CoroutineDispatcher = Dispatchers.Default
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
-		launchCoroutine(intent, startId)
-		return Service.START_REDELIVER_INTENT
-	}
-
-	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch {
-		mutex.withLock {
-			try {
-				withContext(dispatcher) {
-					processIntent(intent)
-				}
-			} finally {
-				stopSelf(startId)
-			}
-		}
-	}
-
-	protected abstract suspend fun processIntent(intent: Intent?)
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/src/main/java/org/koitharu/kotatsu/core/model/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/network/NetworkModule.kt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.details
-
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.dsl.module
-import org.koitharu.kotatsu.details.ui.DetailsViewModel
-
-val detailsModule
-	get() = module {
-
-		viewModel { intent ->
-			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
-		}
-	}

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

@@ -1,286 +0,0 @@
-package org.koitharu.kotatsu.details.ui
-
-import android.app.ActivityOptions
-import android.os.Bundle
-import android.view.*
-import android.widget.AdapterView
-import android.widget.Spinner
-import androidx.appcompat.view.ActionMode
-import androidx.appcompat.widget.SearchView
-import androidx.core.graphics.Insets
-import androidx.core.view.MenuProvider
-import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
-import com.google.android.material.snackbar.Snackbar
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseFragment
-import org.koitharu.kotatsu.base.ui.list.ListSelectionController
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
-import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
-import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
-import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.utils.RecyclerViewScrollCallback
-import org.koitharu.kotatsu.utils.ext.addMenuProvider
-import kotlin.math.roundToInt
-
-class ChaptersFragment :
-	BaseFragment<FragmentChaptersBinding>(),
-	OnListItemClickListener<ChapterListItem>,
-	AdapterView.OnItemSelectedListener,
-	MenuItem.OnActionExpandListener,
-	SearchView.OnQueryTextListener,
-	ListSelectionController.Callback {
-
-	private val viewModel by sharedViewModel<DetailsViewModel>()
-
-	private var chaptersAdapter: ChaptersAdapter? = null
-	private var selectionController: ListSelectionController? = null
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?
-	) = FragmentChaptersBinding.inflate(inflater, container, false)
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		chaptersAdapter = ChaptersAdapter(this)
-		selectionController = ListSelectionController(
-			activity = requireActivity(),
-			decoration = ChaptersSelectionDecoration(view.context),
-			registryOwner = this,
-			callback = this,
-		)
-		with(binding.recyclerViewChapters) {
-			checkNotNull(selectionController).attachToRecyclerView(this)
-			setHasFixedSize(true)
-			adapter = chaptersAdapter
-		}
-		binding.spinnerBranches?.let(::initSpinner)
-		viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
-		viewModel.chapters.observe(viewLifecycleOwner, this::onChaptersChanged)
-		viewModel.isChaptersReversed.observe(viewLifecycleOwner) {
-			activity?.invalidateOptionsMenu()
-		}
-		viewModel.isChaptersEmpty.observe(viewLifecycleOwner) {
-			binding.textViewHolder.isVisible = it
-			activity?.invalidateOptionsMenu()
-		}
-		addMenuProvider(ChaptersMenuProvider())
-	}
-
-	override fun onDestroyView() {
-		chaptersAdapter = null
-		selectionController = null
-		binding.spinnerBranches?.adapter = null
-		super.onDestroyView()
-	}
-
-	override fun onItemClick(item: ChapterListItem, view: View) {
-		if (selectionController?.onItemClick(item.chapter.id) == true) {
-			return
-		}
-		if (item.hasFlag(ChapterListItem.FLAG_MISSING)) {
-			(activity as? DetailsActivity)?.showChapterMissingDialog(item.chapter.id)
-			return
-		}
-		val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height)
-		startActivity(
-			ReaderActivity.newIntent(
-				context = view.context,
-				manga = viewModel.manga.value ?: return,
-				state = ReaderState(item.chapter.id, 0, 0),
-			),
-			options.toBundle()
-		)
-	}
-
-	override fun onItemLongClick(item: ChapterListItem, view: View): Boolean {
-		return selectionController?.onItemLongClick(item.chapter.id) ?: false
-	}
-
-	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-		return when (item.itemId) {
-			R.id.action_save -> {
-				DownloadService.start(
-					context ?: return false,
-					viewModel.getRemoteManga() ?: viewModel.manga.value ?: return false,
-					selectionController?.snapshot(),
-				)
-				mode.finish()
-				true
-			}
-			R.id.action_delete -> {
-				val ids = selectionController?.peekCheckedIds()
-				val manga = viewModel.manga.value
-				when {
-					ids.isNullOrEmpty() || manga == null -> Unit
-					ids.size == manga.chapters?.size -> viewModel.deleteLocal()
-					else -> {
-						LocalChaptersRemoveService.start(requireContext(), manga, ids)
-						Snackbar.make(
-							binding.recyclerViewChapters,
-							R.string.chapters_will_removed_background,
-							Snackbar.LENGTH_LONG
-						).show()
-					}
-				}
-				mode.finish()
-				true
-			}
-			R.id.action_select_range -> {
-				val controller = selectionController ?: return false
-				val items = chaptersAdapter?.items ?: return false
-				val ids = HashSet(controller.peekCheckedIds())
-				val buffer = HashSet<Long>()
-				var isAdding = false
-				for (x in items) {
-					if (x.chapter.id in ids) {
-						isAdding = true
-						if (buffer.isNotEmpty()) {
-							ids.addAll(buffer)
-							buffer.clear()
-						}
-					} else if (isAdding) {
-						buffer.add(x.chapter.id)
-					}
-				}
-				controller.addAll(ids)
-				true
-			}
-			R.id.action_select_all -> {
-				val ids = chaptersAdapter?.items?.map { it.chapter.id } ?: return false
-				selectionController?.addAll(ids)
-				true
-			}
-			else -> false
-		}
-	}
-
-	override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-		val spinner = binding.spinnerBranches ?: return
-		viewModel.setSelectedBranch(spinner.selectedItem as String?)
-	}
-
-	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
-
-	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-		mode.menuInflater.inflate(R.menu.mode_chapters, menu)
-		return true
-	}
-
-	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		val selectedIds = selectionController?.peekCheckedIds() ?: return false
-		val allItems = chaptersAdapter?.items.orEmpty()
-		val items = allItems.withIndex().filter { (_, x) -> x.chapter.id in selectedIds }
-		menu.findItem(R.id.action_save).isVisible = items.none { (_, x) ->
-			x.chapter.source == MangaSource.LOCAL
-		}
-		menu.findItem(R.id.action_delete).isVisible = items.all { (_, x) ->
-			x.chapter.source == MangaSource.LOCAL
-		}
-		menu.findItem(R.id.action_select_all).isVisible = items.size < allItems.size
-		mode.title = items.size.toString()
-		var hasGap = false
-		for (i in 0 until items.size - 1) {
-			if (items[i].index + 1 != items[i + 1].index) {
-				hasGap = true
-				break
-			}
-		}
-		menu.findItem(R.id.action_select_range).isVisible = hasGap
-		return true
-	}
-
-	override fun onSelectionChanged(count: Int) {
-		binding.recyclerViewChapters.invalidateItemDecorations()
-	}
-
-	override fun onMenuItemActionExpand(item: MenuItem?): Boolean = true
-
-	override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
-		(item?.actionView as? SearchView)?.setQuery("", false)
-		viewModel.performChapterSearch(null)
-		return true
-	}
-
-	override fun onQueryTextSubmit(query: String?): Boolean = false
-
-	override fun onQueryTextChange(newText: String?): Boolean {
-		viewModel.performChapterSearch(newText)
-		return true
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.recyclerViewChapters.updatePadding(
-			bottom = insets.bottom + (binding.spinnerBranches?.height ?: 0),
-		)
-	}
-
-	private fun initSpinner(spinner: Spinner) {
-		val branchesAdapter = BranchesAdapter()
-		spinner.adapter = branchesAdapter
-		spinner.onItemSelectedListener = this
-		viewModel.branches.observe(viewLifecycleOwner) {
-			branchesAdapter.setItems(it)
-			spinner.isVisible = it.size > 1
-		}
-		viewModel.selectedBranchIndex.observe(viewLifecycleOwner) {
-			if (it != -1 && it != spinner.selectedItemPosition) {
-				spinner.setSelection(it)
-			}
-		}
-	}
-
-	private fun onChaptersChanged(list: List<ChapterListItem>) {
-		val adapter = chaptersAdapter ?: return
-		if (adapter.itemCount == 0) {
-			val position = list.indexOfFirst { it.hasFlag(ChapterListItem.FLAG_CURRENT) } - 1
-			if (position > 0) {
-				val offset = (resources.getDimensionPixelSize(R.dimen.chapter_list_item_height) * 0.6).roundToInt()
-				adapter.setItems(list, RecyclerViewScrollCallback(binding.recyclerViewChapters, position, offset))
-			} else {
-				adapter.items = list
-			}
-		} else {
-			adapter.items = list
-		}
-	}
-
-	private fun onLoadingStateChanged(isLoading: Boolean) {
-		binding.progressBar.isVisible = isLoading
-	}
-
-	private inner class ChaptersMenuProvider : MenuProvider {
-
-		override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-			menuInflater.inflate(R.menu.opt_chapters, menu)
-			val searchMenuItem = menu.findItem(R.id.action_search)
-			searchMenuItem.setOnActionExpandListener(this@ChaptersFragment)
-			val searchView = searchMenuItem.actionView as SearchView
-			searchView.setOnQueryTextListener(this@ChaptersFragment)
-			searchView.setIconifiedByDefault(false)
-			searchView.queryHint = searchMenuItem.title
-		}
-
-		override fun onPrepareMenu(menu: Menu) {
-			menu.findItem(R.id.action_reversed).isChecked = viewModel.isChaptersReversed.value == true
-			menu.findItem(R.id.action_search).isVisible = viewModel.isChaptersEmpty.value == false
-		}
-
-		override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
-			R.id.action_reversed -> {
-				viewModel.setChaptersReversed(!menuItem.isChecked)
-				true
-			}
-			else -> false
-		}
-	}
-}

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

@@ -1,375 +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.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.Spinner
-import android.widget.Toast
-import androidx.appcompat.view.ActionMode
-import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.graphics.Insets
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import androidx.fragment.app.commit
-import androidx.lifecycle.lifecycleScope
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import kotlinx.coroutines.launch
-import org.koin.android.ext.android.get
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.MangaIntent
-import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.browser.BrowserActivity
-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.databinding.ActivityDetailsBinding
-import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
-import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
-import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.isReportable
-import org.koitharu.kotatsu.utils.ext.report
-
-class DetailsActivity :
-	BaseActivity<ActivityDetailsBinding>(),
-	TabLayoutMediator.TabConfigurationStrategy,
-	AdapterView.OnItemSelectedListener {
-
-	private val viewModel by viewModel<DetailsViewModel> {
-		parametersOf(MangaIntent(intent))
-	}
-
-	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)
-		}
-		val pager = binding.pager
-		if (pager != null) {
-			pager.adapter = MangaDetailsAdapter(this)
-			TabLayoutMediator(checkNotNull(binding.tabs), pager, this).attach()
-		}
-		gcFragments()
-		binding.spinnerBranches?.let(::initSpinner)
-
-		viewModel.manga.observe(this, ::onMangaUpdated)
-		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
-		viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
-		viewModel.onError.observe(this, ::onError)
-		viewModel.onShowToast.observe(this) {
-			binding.snackbar.show(messageText = getString(it))
-		}
-
-		registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
-	}
-
-	override fun onDestroy() {
-		unregisterReceiver(downloadReceiver)
-		super.onDestroy()
-	}
-
-	private fun onMangaUpdated(manga: Manga) {
-		title = manga.title
-		invalidateOptionsMenu()
-	}
-
-	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) {
-		when {
-			ExceptionResolver.canResolve(e) -> {
-				resolveError(e)
-			}
-			viewModel.manga.value == null -> {
-				Toast.makeText(this, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
-				finishAfterTransition()
-			}
-			e.isReportable() -> {
-				binding.snackbar.show(
-					messageText = e.getDisplayMessage(resources),
-					actionId = R.string.report,
-					duration = if (viewModel.manga.value?.chapters == null) {
-						Snackbar.LENGTH_INDEFINITE
-					} else {
-						Snackbar.LENGTH_LONG
-					},
-					onActionClick = {
-						e.report("DetailsActivity::onError")
-						dismiss()
-					},
-				)
-			}
-			else -> {
-				binding.snackbar.show(e.getDisplayMessage(resources))
-			}
-		}
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.snackbar.updatePadding(
-			bottom = insets.bottom,
-		)
-		binding.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			topMargin = insets.top
-		}
-		binding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-		)
-	}
-
-	private fun onNewChaptersChanged(newChapters: Int) {
-		val tab = binding.tabs?.getTabAt(1) ?: return
-		if (newChapters == 0) {
-			tab.removeBadge()
-		} else {
-			val badge = tab.orCreateBadge
-			badge.maxCharacterCount = 3
-			badge.number = newChapters
-			badge.isVisible = true
-		}
-	}
-
-	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		menuInflater.inflate(R.menu.opt_details, menu)
-		return super.onCreateOptionsMenu(menu)
-	}
-
-	override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-		val manga = viewModel.manga.value
-		menu.findItem(R.id.action_save).isVisible = manga?.source != null && manga.source != MangaSource.LOCAL
-		menu.findItem(R.id.action_delete).isVisible = manga?.source == MangaSource.LOCAL
-		menu.findItem(R.id.action_browser).isVisible = manga?.source != MangaSource.LOCAL
-		menu.findItem(R.id.action_shortcut).isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(this)
-		menu.findItem(R.id.action_shiki_track).isVisible = viewModel.isScrobblingAvailable
-		return super.onPrepareOptionsMenu(menu)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_delete -> {
-			val title = viewModel.manga.value?.title.orEmpty()
-			MaterialAlertDialogBuilder(this)
-				.setTitle(R.string.delete_manga)
-				.setMessage(getString(R.string.text_delete_local_manga, title))
-				.setPositiveButton(R.string.delete) { _, _ ->
-					viewModel.deleteLocal()
-				}
-				.setNegativeButton(android.R.string.cancel, null)
-				.show()
-			true
-		}
-		R.id.action_save -> {
-			viewModel.manga.value?.let {
-				val chaptersCount = it.chapters?.size ?: 0
-				val branches = viewModel.branches.value.orEmpty()
-				if (chaptersCount > 5 || branches.size > 1) {
-					showSaveConfirmation(it, chaptersCount, branches)
-				} else {
-					DownloadService.start(this, it)
-				}
-			}
-			true
-		}
-		R.id.action_browser -> {
-			viewModel.manga.value?.let {
-				startActivity(BrowserActivity.newIntent(this, it.publicUrl, it.title))
-			}
-			true
-		}
-		R.id.action_related -> {
-			viewModel.manga.value?.let {
-				startActivity(MultiSearchActivity.newIntent(this, it.title))
-			}
-			true
-		}
-		R.id.action_shiki_track -> {
-			viewModel.manga.value?.let {
-				ScrobblingSelectorBottomSheet.show(supportFragmentManager, it)
-			}
-			true
-		}
-		R.id.action_shortcut -> {
-			viewModel.manga.value?.let {
-				lifecycleScope.launch {
-					if (!get<ShortcutsUpdater>().requestPinShortcut(it)) {
-						binding.snackbar.show(getString(R.string.operation_not_supported))
-					}
-				}
-			}
-			true
-		}
-		else -> super.onOptionsItemSelected(item)
-	}
-
-	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
-		tab.text = when (position) {
-			0 -> getString(R.string.details)
-			1 -> getString(R.string.chapters)
-			else -> null
-		}
-	}
-
-	override fun onSupportActionModeStarted(mode: ActionMode) {
-		super.onSupportActionModeStarted(mode)
-		binding.pager?.isUserInputEnabled = false
-	}
-
-	override fun onSupportActionModeFinished(mode: ActionMode) {
-		super.onSupportActionModeFinished(mode)
-		binding.pager?.isUserInputEnabled = true
-	}
-
-	override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-		val spinner = binding.spinnerBranches ?: return
-		viewModel.setSelectedBranch(spinner.selectedItem as String?)
-	}
-
-	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
-
-	fun showChapterMissingDialog(chapterId: Long) {
-		val remoteManga = viewModel.getRemoteManga()
-		if (remoteManga == null) {
-			binding.snackbar.show(getString(R.string.chapter_is_missing))
-			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(this@DetailsActivity, remoteManga, setOf(chapterId))
-			}
-			setCancelable(true)
-		}.show()
-	}
-
-	private fun initSpinner(spinner: Spinner) {
-		val branchesAdapter = BranchesAdapter()
-		spinner.adapter = branchesAdapter
-		spinner.onItemSelectedListener = this
-		viewModel.branches.observe(this) {
-			branchesAdapter.setItems(it)
-			spinner.isVisible = it.size > 1
-		}
-		viewModel.selectedBranchIndex.observe(this) {
-			if (it != -1 && it != spinner.selectedItemPosition) {
-				spinner.setSelection(it)
-			}
-		}
-	}
-
-	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 gcFragments() {
-		val mustHaveId = binding.pager == null
-		val fm = supportFragmentManager
-		val fragmentsToRemove = fm.fragments.filter { f ->
-			(f.id == 0) == mustHaveId
-		}
-		if (fragmentsToRemove.isEmpty()) {
-			return
-		}
-		fm.commit {
-			setReorderingAllowed(true)
-			for (f in fragmentsToRemove) {
-				remove(f)
-			}
-		}
-	}
-
-	private fun showSaveConfirmation(manga: Manga, chaptersCount: Int, branches: List<String?>) {
-		val dialogBuilder = MaterialAlertDialogBuilder(this)
-			.setTitle(R.string.save_manga)
-			.setNegativeButton(android.R.string.cancel, null)
-		if (branches.size > 1) {
-			val items = Array(branches.size) { i -> branches[i].orEmpty() }
-			val currentBranch = viewModel.selectedBranchIndex.value ?: -1
-			val checkedIndices = BooleanArray(branches.size) { i -> i == currentBranch }
-			dialogBuilder.setMultiChoiceItems(items, checkedIndices) { _, i, checked ->
-				checkedIndices[i] = checked
-			}.setPositiveButton(R.string.save) { _, _ ->
-				val selectedBranches = branches.filterIndexedTo(HashSet()) { i, _ -> checkedIndices[i] }
-				val chaptersIds = manga.chapters?.mapNotNullToSet { c ->
-					if (c.branch in selectedBranches) c.id else null
-				}
-				DownloadService.start(this, manga, chaptersIds)
-			}
-		} else {
-			dialogBuilder.setMessage(
-				getString(
-					R.string.large_manga_save_confirm,
-					resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount),
-				),
-			).setPositiveButton(R.string.save) { _, _ ->
-				DownloadService.start(this, manga)
-			}
-		}
-		dialogBuilder.show()
-	}
-
-	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/DetailsFragment.kt

@@ -1,398 +0,0 @@
-package org.koitharu.kotatsu.details.ui
-
-import android.app.ActivityOptions
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.*
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.Insets
-import androidx.core.net.toFile
-import androidx.core.net.toUri
-import androidx.core.view.MenuProvider
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
-import coil.ImageLoader
-import coil.request.ImageRequest
-import coil.util.CoilUtils
-import com.google.android.material.chip.Chip
-import kotlinx.coroutines.launch
-import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseFragment
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.BookmarksAdapter
-import org.koitharu.kotatsu.core.model.MangaHistory
-import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
-import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingInfoBottomSheet
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesBottomSheet
-import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
-import org.koitharu.kotatsu.image.ui.ImageActivity
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaState
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
-import org.koitharu.kotatsu.search.ui.MangaListActivity
-import org.koitharu.kotatsu.search.ui.SearchActivity
-import org.koitharu.kotatsu.utils.FileSize
-import org.koitharu.kotatsu.utils.ShareHelper
-import org.koitharu.kotatsu.utils.ext.*
-import org.koitharu.kotatsu.utils.image.CoverSizeResolver
-
-class DetailsFragment :
-	BaseFragment<FragmentDetailsBinding>(),
-	View.OnClickListener,
-	View.OnLongClickListener,
-	ChipsView.OnChipClickListener,
-	OnListItemClickListener<Bookmark> {
-
-	private val viewModel by sharedViewModel<DetailsViewModel>()
-	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = FragmentDetailsBinding.inflate(inflater, container, false)
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		binding.textViewAuthor.setOnClickListener(this)
-		binding.buttonFavorite.setOnClickListener(this)
-		binding.buttonRead.setOnClickListener(this)
-		binding.buttonRead.setOnLongClickListener(this)
-		binding.imageViewCover.setOnClickListener(this)
-		binding.scrobblingLayout.root.setOnClickListener(this)
-		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
-		binding.chipsTags.onChipClickListener = this
-		viewModel.manga.observe(viewLifecycleOwner, ::onMangaUpdated)
-		viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
-		viewModel.favouriteCategories.observe(viewLifecycleOwner, ::onFavouriteChanged)
-		viewModel.readingHistory.observe(viewLifecycleOwner, ::onHistoryChanged)
-		viewModel.bookmarks.observe(viewLifecycleOwner, ::onBookmarksChanged)
-		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
-		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
-		viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
-		addMenuProvider(DetailsMenuProvider())
-	}
-
-	override fun onItemClick(item: Bookmark, view: View) {
-		val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height)
-		startActivity(ReaderActivity.newIntent(view.context, item), options.toBundle())
-	}
-
-	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
-		val menu = PopupMenu(view.context, view)
-		menu.inflate(R.menu.popup_bookmark)
-		menu.setOnMenuItemClickListener { menuItem ->
-			when (menuItem.itemId) {
-				R.id.action_remove -> viewModel.removeBookmark(item)
-			}
-			true
-		}
-		menu.show()
-		return true
-	}
-
-	private fun onMangaUpdated(manga: Manga) {
-		with(binding) {
-			// Main
-			loadCover(manga)
-			textViewTitle.text = manga.title
-			textViewSubtitle.textAndVisible = manga.altTitle
-			textViewAuthor.textAndVisible = manga.author
-			when (manga.state) {
-				MangaState.FINISHED -> {
-					textViewState.apply {
-						textAndVisible = resources.getString(R.string.state_finished)
-						drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_state_finished)
-					}
-				}
-				MangaState.ONGOING -> {
-					textViewState.apply {
-						textAndVisible = resources.getString(R.string.state_ongoing)
-						drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_state_ongoing)
-					}
-				}
-				else -> textViewState.isVisible = false
-			}
-
-			if (manga.hasRating) {
-				infoLayout.textViewRating.text = String.format("%.1f", manga.rating * 5)
-				infoLayout.ratingContainer.isVisible = true
-			} else {
-				infoLayout.ratingContainer.isVisible = false
-			}
-			if (manga.source == MangaSource.LOCAL) {
-				infoLayout.textViewSource.isVisible = false
-				val file = manga.url.toUri().toFileOrNull()
-				if (file != null) {
-					viewLifecycleScope.launch {
-						val size = file.computeSize()
-						infoLayout.textViewSize.text = FileSize.BYTES.format(requireContext(), size)
-						infoLayout.textViewSize.isVisible = true
-					}
-				} else {
-					infoLayout.textViewSize.isVisible = false
-				}
-			} else {
-				infoLayout.textViewSource.text = manga.source.title
-				infoLayout.textViewSource.isVisible = true
-				infoLayout.textViewSize.isVisible = false
-			}
-
-			infoLayout.textViewNsfw.isVisible = manga.isNsfw
-
-			// Chips
-			bindTags(manga)
-		}
-	}
-
-	private fun onChaptersChanged(chapters: List<ChapterListItem>?) {
-		val infoLayout = binding.infoLayout
-		if (chapters.isNullOrEmpty()) {
-			infoLayout.textViewChapters.isVisible = false
-		} else {
-			infoLayout.textViewChapters.isVisible = true
-			infoLayout.textViewChapters.text = resources.getQuantityString(
-				R.plurals.chapters,
-				chapters.size,
-				chapters.size,
-			)
-		}
-		// Buttons
-		binding.buttonRead.isEnabled = !chapters.isNullOrEmpty()
-	}
-
-	private fun onDescriptionChanged(description: CharSequence?) {
-		if (description.isNullOrBlank()) {
-			binding.textViewDescription.setText(R.string.no_description)
-		} else {
-			binding.textViewDescription.text = description
-		}
-	}
-
-	private fun onHistoryChanged(history: MangaHistory?) {
-		with(binding.buttonRead) {
-			if (history == null) {
-				setText(R.string.read)
-				setIconResource(R.drawable.ic_read)
-			} else {
-				setText(R.string._continue)
-				setIconResource(R.drawable.ic_play)
-			}
-		}
-		binding.progressView.setPercent(history?.percent ?: PROGRESS_NONE, animate = true)
-	}
-
-	private fun onFavouriteChanged(isFavourite: Boolean) {
-		val iconRes = if (isFavourite) {
-			R.drawable.ic_heart
-		} else {
-			R.drawable.ic_heart_outline
-		}
-		binding.buttonFavorite.setIconResource(iconRes)
-	}
-
-	private fun onLoadingStateChanged(isLoading: Boolean) {
-		if (isLoading) {
-			binding.progressBar.show()
-		} else {
-			binding.progressBar.hide()
-		}
-	}
-
-	private fun onBookmarksChanged(bookmarks: List<Bookmark>) {
-		var adapter = binding.recyclerViewBookmarks.adapter as? BookmarksAdapter
-		binding.groupBookmarks.isGone = bookmarks.isEmpty()
-		if (adapter != null) {
-			adapter.items = bookmarks
-		} else {
-			adapter = BookmarksAdapter(coil, viewLifecycleOwner, this)
-			adapter.items = bookmarks
-			binding.recyclerViewBookmarks.adapter = adapter
-			val spacing = resources.getDimensionPixelOffset(R.dimen.bookmark_list_spacing)
-			binding.recyclerViewBookmarks.addItemDecoration(SpacingItemDecoration(spacing))
-		}
-	}
-
-	private fun onScrobblingInfoChanged(scrobbling: ScrobblingInfo?) {
-		with(binding.scrobblingLayout) {
-			root.isVisible = scrobbling != null
-			if (scrobbling == null) {
-				CoilUtils.dispose(imageViewCover)
-				return
-			}
-			imageViewCover.newImageRequest(scrobbling.coverUrl)?.run {
-				placeholder(R.drawable.ic_placeholder)
-				fallback(R.drawable.ic_placeholder)
-				error(R.drawable.ic_placeholder)
-				lifecycle(viewLifecycleOwner)
-				enqueueWith(coil)
-			}
-			textViewTitle.text = scrobbling.title
-			textViewTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, scrobbling.scrobbler.iconResId, 0)
-			ratingBar.rating = scrobbling.rating * ratingBar.numStars
-			textViewStatus.text = scrobbling.status?.let {
-				resources.getStringArray(R.array.scrobbling_statuses).getOrNull(it.ordinal)
-			}
-		}
-	}
-
-	override fun onClick(v: View) {
-		val manga = viewModel.manga.value ?: return
-		when (v.id) {
-			R.id.button_favorite -> {
-				FavouriteCategoriesBottomSheet.show(childFragmentManager, manga)
-			}
-			R.id.scrobbling_layout -> {
-				ScrobblingInfoBottomSheet.show(childFragmentManager)
-			}
-			R.id.button_read -> {
-				val chapterId = viewModel.readingHistory.value?.chapterId
-				if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
-					(activity as? DetailsActivity)?.showChapterMissingDialog(chapterId)
-				} else {
-					startActivity(
-						ReaderActivity.newIntent(
-							context = context ?: return,
-							manga = manga,
-							branch = viewModel.selectedBranchValue,
-						),
-					)
-				}
-			}
-			R.id.textView_author -> {
-				startActivity(
-					SearchActivity.newIntent(
-						context = v.context,
-						source = manga.source,
-						query = manga.author ?: return,
-					),
-				)
-			}
-			R.id.imageView_cover -> {
-				val options = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.width, v.height)
-				startActivity(
-					ImageActivity.newIntent(v.context, manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }),
-					options.toBundle(),
-				)
-			}
-		}
-	}
-
-	override fun onLongClick(v: View): Boolean {
-		when (v.id) {
-			R.id.button_read -> {
-				if (viewModel.readingHistory.value == null) {
-					return false
-				}
-				val menu = PopupMenu(v.context, v)
-				menu.inflate(R.menu.popup_read)
-				menu.setOnMenuItemClickListener { menuItem ->
-					when (menuItem.itemId) {
-						R.id.action_read -> {
-							val branch = viewModel.selectedBranchValue
-							startActivity(
-								ReaderActivity.newIntent(
-									context = context ?: return@setOnMenuItemClickListener false,
-									manga = viewModel.manga.value ?: return@setOnMenuItemClickListener false,
-									state = viewModel.chapters.value?.firstOrNull { c ->
-										c.chapter.branch == branch
-									}?.let { c ->
-										ReaderState(c.chapter.id, 0, 0)
-									},
-								),
-							)
-							true
-						}
-						else -> false
-					}
-				}
-				menu.show()
-				return true
-			}
-			else -> return false
-		}
-	}
-
-	override fun onChipClick(chip: Chip, data: Any?) {
-		val tag = data as? MangaTag ?: return
-		startActivity(MangaListActivity.newIntent(requireContext(), setOf(tag)))
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.root.updatePadding(
-			bottom = insets.bottom,
-		)
-	}
-
-	private fun bindTags(manga: Manga) {
-		binding.chipsTags.setChips(
-			manga.tags.map { tag ->
-				ChipsView.ChipModel(
-					title = tag.title,
-					icon = 0,
-					data = tag,
-				)
-			},
-		)
-	}
-
-	private fun loadCover(manga: Manga) {
-		val imageUrl = manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }
-		val lastResult = CoilUtils.result(binding.imageViewCover)
-		if (lastResult?.request?.data == imageUrl) {
-			return
-		}
-		val request = ImageRequest.Builder(context ?: return)
-			.target(binding.imageViewCover)
-			.size(CoverSizeResolver(binding.imageViewCover))
-			.data(imageUrl)
-			.crossfade(true)
-			.referer(manga.publicUrl)
-			.lifecycle(viewLifecycleOwner)
-			.placeholderMemoryCacheKey(manga.coverUrl)
-		val previousDrawable = lastResult?.drawable
-		if (previousDrawable != null) {
-			request.fallback(previousDrawable)
-				.placeholder(previousDrawable)
-				.error(previousDrawable)
-		} else {
-			request.fallback(R.drawable.ic_placeholder)
-				.placeholder(R.drawable.ic_placeholder)
-				.error(R.drawable.ic_placeholder)
-		}
-		request.enqueueWith(coil)
-	}
-
-	private inner class DetailsMenuProvider : MenuProvider {
-
-		override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-			menuInflater.inflate(R.menu.opt_details_info, menu)
-		}
-
-		override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
-			R.id.action_share -> {
-				viewModel.manga.value?.let {
-					val context = requireContext()
-					if (it.source == MangaSource.LOCAL) {
-						ShareHelper(context).shareCbz(listOf(it.url.toUri().toFile()))
-					} else {
-						ShareHelper(context).shareMangaLink(it)
-					}
-				}
-				true
-			}
-			else -> false
-		}
-	}
-}

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

@@ -1,258 +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 java.io.IOException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.*
-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.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.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.domain.Scrobbler
-import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
-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
-
-class DetailsViewModel(
-	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 scrobbler: Scrobbler,
-	private val imageGetter: Html.ImageGetter,
-) : BaseViewModel() {
-
-	private val delegate = MangaDetailsDelegate(
-		intent = intent,
-		settings = settings,
-		mangaDataRepository = mangaDataRepository,
-		historyRepository = historyRepository,
-		localMangaRepository = localMangaRepository,
-	)
-
-	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 = trackingRepository.observeNewChaptersCount(delegate.mangaId)
-		.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 readingHistory = history.asLiveData(viewModelScope.coroutineContext)
-	val isChaptersReversed = chaptersReversed.asLiveData(viewModelScope.coroutineContext)
-
-	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() = scrobbler.isAvailable
-
-	val scrobblingInfo = scrobbler.observeScrobblingInfo(delegate.mangaId)
-		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
-
-	val branches: LiveData<List<String?>> = delegate.manga.map {
-		val chapters = it?.chapters ?: return@map emptyList()
-		chapters.mapToSet { x -> x.branch }.sortedWith(BranchComparator())
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
-
-	val selectedBranchIndex = combine(
-		branches.asFlow(),
-		delegate.selectedBranch,
-	) { branches, selected ->
-		branches.indexOf(selected)
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
-
-	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")
-			runCatching {
-				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) {
-				runCatching {
-					localMangaRepository.getDetails(downloadedManga)
-				}.onSuccess {
-					delegate.relatedManga.value = it
-				}.onFailure {
-					it.printStackTraceDebug()
-				}
-			}
-		}
-	}
-
-	fun updateScrobbling(rating: Float, status: ScrobblingStatus?) {
-		launchJob(Dispatchers.Default) {
-			scrobbler.updateScrobblingInfo(
-				mangaId = delegate.mangaId,
-				rating = rating,
-				status = status,
-				comment = null,
-			)
-		}
-	}
-
-	fun unregisterScrobbling() {
-		launchJob(Dispatchers.Default) {
-			scrobbler.unregisterScrobbling(
-				mangaId = delegate.mangaId,
-			)
-		}
-	}
-
-	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()
-	}
-}

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

@@ -1,164 +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.core.prefs.AppSettings
-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
-
-class MangaDetailsDelegate(
-	private val intent: MangaIntent,
-	private val settings: AppSettings,
-	private val mangaDataRepository: MangaDataRepository,
-	private val historyRepository: HistoryRepository,
-	private val localMangaRepository: LocalMangaRepository,
-) {
-
-	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 = MangaRepository(manga.source).getDetails(manga)
-		// find default branch
-		val hist = historyRepository.getOne(manga)
-		selectedBranch.value = manga.getPreferredBranch(hist)
-		mangaData.value = manga
-		relatedManga.value = runCatching {
-			if (manga.source == MangaSource.LOCAL) {
-				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
-				MangaRepository(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 dateFormat = settings.getDateFormat()
-		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,
-				dateFormat = dateFormat,
-			)
-		}
-		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
-		val dateFormat = settings.getDateFormat()
-		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,
-				dateFormat = dateFormat,
-			) ?: chapter.toListItem(
-				isCurrent = i == currentIndex,
-				isUnread = i > currentIndex,
-				isNew = i >= firstNewIndex,
-				isMissing = true,
-				isDownloaded = false,
-				dateFormat = dateFormat,
-			)
-		}
-		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,
-						dateFormat = dateFormat,
-					)
-				} 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/scrobbling/ScrobblingInfoBottomSheet.kt

@@ -1,150 +0,0 @@
-package org.koitharu.kotatsu.details.ui.scrobbling
-
-import android.app.ActivityOptions
-import android.content.Intent
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.RatingBar
-import android.widget.Toast
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.net.toUri
-import androidx.fragment.app.FragmentManager
-import coil.ImageLoader
-import coil.request.ImageRequest
-import coil.size.Scale
-import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseBottomSheet
-import org.koitharu.kotatsu.databinding.SheetScrobblingBinding
-import org.koitharu.kotatsu.details.ui.DetailsViewModel
-import org.koitharu.kotatsu.image.ui.ImageActivity
-import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
-import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
-import org.koitharu.kotatsu.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
-import org.koitharu.kotatsu.utils.ext.enqueueWith
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-
-class ScrobblingInfoBottomSheet :
-	BaseBottomSheet<SheetScrobblingBinding>(),
-	AdapterView.OnItemSelectedListener,
-	RatingBar.OnRatingBarChangeListener,
-	View.OnClickListener,
-	PopupMenu.OnMenuItemClickListener {
-
-	private val viewModel by sharedViewModel<DetailsViewModel>()
-	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
-	private var menu: PopupMenu? = null
-
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetScrobblingBinding {
-		return SheetScrobblingBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
-		viewModel.onError.observe(viewLifecycleOwner) {
-			Toast.makeText(view.context, it.getDisplayMessage(view.resources), Toast.LENGTH_SHORT).show()
-		}
-
-		binding.spinnerStatus.onItemSelectedListener = this
-		binding.ratingBar.onRatingBarChangeListener = this
-		binding.buttonMenu.setOnClickListener(this)
-		binding.imageViewCover.setOnClickListener(this)
-		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
-
-		menu = PopupMenu(view.context, binding.buttonMenu).apply {
-			inflate(R.menu.opt_scrobbling)
-			setOnMenuItemClickListener(this@ScrobblingInfoBottomSheet)
-		}
-	}
-
-	override fun onDestroyView() {
-		super.onDestroyView()
-		menu = null
-	}
-
-	override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-		viewModel.updateScrobbling(
-			rating = binding.ratingBar.rating / binding.ratingBar.numStars,
-			status = enumValues<ScrobblingStatus>().getOrNull(position),
-		)
-	}
-
-	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
-
-	override fun onRatingChanged(ratingBar: RatingBar, rating: Float, fromUser: Boolean) {
-		if (fromUser) {
-			viewModel.updateScrobbling(
-				rating = rating / ratingBar.numStars,
-				status = enumValues<ScrobblingStatus>().getOrNull(binding.spinnerStatus.selectedItemPosition),
-			)
-		}
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_menu -> menu?.show()
-			R.id.imageView_cover -> {
-				val coverUrl = viewModel.scrobblingInfo.value?.coverUrl ?: return
-				val options = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.width, v.height)
-				startActivity(ImageActivity.newIntent(v.context, coverUrl), options.toBundle())
-			}
-		}
-	}
-
-	private fun onScrobblingInfoChanged(scrobbling: ScrobblingInfo?) {
-		if (scrobbling == null) {
-			dismissAllowingStateLoss()
-			return
-		}
-		binding.textViewTitle.text = scrobbling.title
-		binding.ratingBar.rating = scrobbling.rating * binding.ratingBar.numStars
-		binding.textViewDescription.text = scrobbling.description
-		binding.spinnerStatus.setSelection(scrobbling.status?.ordinal ?: -1)
-		ImageRequest.Builder(context ?: return)
-			.target(binding.imageViewCover)
-			.data(scrobbling.coverUrl)
-			.crossfade(true)
-			.lifecycle(viewLifecycleOwner)
-			.placeholder(R.drawable.ic_placeholder)
-			.fallback(R.drawable.ic_placeholder)
-			.error(R.drawable.ic_placeholder)
-			.scale(Scale.FILL)
-			.enqueueWith(coil)
-	}
-
-	companion object {
-
-		private const val TAG = "ScrobblingInfoBottomSheet"
-
-		fun show(fm: FragmentManager) = ScrobblingInfoBottomSheet().show(fm, TAG)
-	}
-
-	override fun onMenuItemClick(item: MenuItem): Boolean {
-		when (item.itemId) {
-			R.id.action_browser -> {
-				val url = viewModel.scrobblingInfo.value?.externalUrl ?: return false
-				val intent = Intent(Intent.ACTION_VIEW, url.toUri())
-				startActivity(
-					Intent.createChooser(intent, getString(R.string.open_in_browser))
-				)
-			}
-			R.id.action_unregister -> {
-				viewModel.unregisterScrobbling()
-				dismiss()
-			}
-			R.id.action_edit -> {
-				val manga = viewModel.manga.value ?: return false
-				ScrobblingSelectorBottomSheet.show(parentFragmentManager, manga)
-				dismiss()
-			}
-		}
-		return true
-	}
-}

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

@@ -1,246 +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 java.io.File
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.sync.Semaphore
-import okhttp3.OkHttpClient
-import okhttp3.Request
-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.deleteAwait
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import org.koitharu.kotatsu.utils.ext.referer
-import org.koitharu.kotatsu.utils.progress.PausingProgressJob
-
-private const val MAX_FAILSAFE_ATTEMPTS = 2
-private const val DOWNLOAD_ERROR_DELAY = 500L
-private const val SLOWDOWN_DELAY = 200L
-
-class DownloadManager(
-	private val coroutineScope: CoroutineScope,
-	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 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 = downloadMangaImpl(manga, chaptersIds?.takeUnless { it.isEmpty() }, stateFlow, pausingHandle, startId)
-		return PausingProgressJob(job, stateFlow, pausingHandle)
-	}
-
-	private fun downloadMangaImpl(
-		manga: Manga,
-		chaptersIds: LongArray?,
-		outState: MutableStateFlow<DownloadState>,
-		pausingHandle: PausingHandle,
-		startId: Int,
-	): Job = coroutineScope.launch(Dispatchers.Default + errorStateHandler(outState)) {
-		@Suppress("NAME_SHADOWING")
-		var manga = manga
-		val chaptersIdsSet = chaptersIds?.toMutableSet()
-		val cover = loadCover(manga)
-		outState.value = DownloadState.Queued(startId, manga, cover)
-		localMangaRepository.lockManga(manga.id)
-		semaphore.acquire()
-		coroutineContext[WakeLockNode]?.acquire()
-		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 = MangaRepository(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, data.publicUrl, destination, tempFileName).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[url] ?: downloadFile(url, page.referer, destination, tempFileName)
-						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.finalize()
-			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?.cleanup()
-				File(destination, tempFileName).deleteAwait()
-				coroutineContext[WakeLockNode]?.release()
-				semaphore.release()
-				localMangaRepository.unlockManga(manga.id)
-			}
-		}
-	}
-
-	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, referer: String, destination: File, tempFileName: String): File {
-		val request = Request.Builder()
-			.url(url)
-			.header(CommonHeaders.REFERER, referer)
-			.cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
-			.get()
-			.build()
-		val call = okHttp.newCall(request)
-		val file = File(destination, tempFileName)
-		val response = call.clone().await()
-		runInterruptible(Dispatchers.IO) {
-			file.outputStream().use { out ->
-				checkNotNull(response.body).byteStream().copyTo(out)
-			}
-		}
-		return file
-	}
-
-	private fun errorStateHandler(outState: MutableStateFlow<DownloadState>) =
-		CoroutineExceptionHandler { _, throwable ->
-			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) = runCatching {
-		imageLoader.execute(
-			ImageRequest.Builder(context)
-				.data(manga.coverUrl)
-				.referer(manga.publicUrl)
-				.size(coverWidth, coverHeight)
-				.scale(Scale.FILL)
-				.build()
-		).drawable
-	}.getOrNull()
-
-	class Factory(
-		private val context: Context,
-		private val imageLoader: ImageLoader,
-		private val okHttp: OkHttpClient,
-		private val cache: PagesCache,
-		private val localMangaRepository: LocalMangaRepository,
-		private val settings: AppSettings,
-	) {
-
-		fun create(coroutineScope: CoroutineScope) = DownloadManager(
-			coroutineScope = coroutineScope,
-			context = context,
-			imageLoader = imageLoader,
-			okHttp = okHttp,
-			cache = cache,
-			localMangaRepository = localMangaRepository,
-			settings = settings
-		)
-	}
-}

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

@@ -1,255 +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?
-
-	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
-		}
-	}
-
-	@Deprecated("TODO: remove")
-	class WaitingForNetwork(
-		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 WaitingForNetwork
-
-			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 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/domain/WakeLockNode.kt

@@ -1,25 +0,0 @@
-package org.koitharu.kotatsu.download.domain
-
-import android.os.PowerManager
-import kotlin.coroutines.AbstractCoroutineContextElement
-import kotlin.coroutines.CoroutineContext
-
-class WakeLockNode(
-	private val wakeLock: PowerManager.WakeLock,
-	private val timeout: Long,
-) : AbstractCoroutineContextElement(Key) {
-
-	init {
-		wakeLock.setReferenceCounted(true)
-	}
-
-	fun acquire() {
-		wakeLock.acquire(timeout)
-	}
-
-	fun release() {
-		wakeLock.release()
-	}
-
-	companion object Key : CoroutineContext.Key<WakeLockNode>
-}

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

@@ -1,109 +0,0 @@
-package org.koitharu.kotatsu.download.ui
-
-import androidx.core.view.isVisible
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.ItemDownloadBinding
-import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.parsers.util.format
-import org.koitharu.kotatsu.utils.ext.*
-import org.koitharu.kotatsu.utils.progress.ProgressJob
-
-fun downloadItemAD(
-	scope: CoroutineScope,
-	coil: ImageLoader,
-) = adapterDelegateViewBinding<ProgressJob<DownloadState>, ProgressJob<DownloadState>, ItemDownloadBinding>(
-	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) }
-) {
-
-	var job: Job? = null
-	val percentPattern = context.resources.getString(R.string.percent_string_pattern)
-
-	bind {
-		job?.cancel()
-		job = item.progressAsFlow().onFirst { state ->
-			binding.imageViewCover.newImageRequest(state.manga.coverUrl)?.run {
-				referer(state.manga.publicUrl)
-				placeholder(state.cover)
-				fallback(R.drawable.ic_placeholder)
-				error(R.drawable.ic_placeholder)
-				allowRgb565(true)
-				enqueueWith(coil)
-			}
-		}.onEach { state ->
-			binding.textViewTitle.text = state.manga.title
-			when (state) {
-				is DownloadState.Cancelled -> {
-					binding.textViewStatus.setText(R.string.cancelling_)
-					binding.progressBar.isIndeterminate = true
-					binding.progressBar.isVisible = true
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.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
-				}
-				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
-				}
-				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
-				}
-				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
-				}
-				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
-				}
-				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
-				}
-				is DownloadState.WaitingForNetwork -> {
-					binding.textViewStatus.setText(R.string.waiting_for_network)
-					binding.progressBar.isIndeterminate = false
-					binding.progressBar.isVisible = false
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.isVisible = false
-				}
-			}
-		}.launchIn(scope)
-	}
-
-	onViewRecycled {
-		job?.cancel()
-		job = null
-	}
-}

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

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

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

@@ -1,40 +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.ProgressJob
-
-class DownloadsAdapter(
-	scope: CoroutineScope,
-	coil: ImageLoader,
-) : AsyncListDifferDelegationAdapter<ProgressJob<DownloadState>>(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<ProgressJob<DownloadState>>() {
-
-		override fun areItemsTheSame(
-			oldItem: ProgressJob<DownloadState>,
-			newItem: ProgressJob<DownloadState>,
-		): Boolean {
-			return oldItem.progressValue.startId == newItem.progressValue.startId
-		}
-
-		override fun areContentsTheSame(
-			oldItem: ProgressJob<DownloadState>,
-			newItem: ProgressJob<DownloadState>,
-		): Boolean {
-			return oldItem.progressValue == newItem.progressValue
-		}
-	}
-}

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

@@ -1,185 +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 androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-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.util.format
-import org.koitharu.kotatsu.utils.PendingIntentCompat
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-
-class DownloadNotification(private val context: Context, startId: Int) {
-
-	private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-	private val cancelAction = NotificationCompat.Action(
-		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
-		)
-	)
-	private val listIntent = PendingIntent.getActivity(
-		context,
-		REQUEST_LIST,
-		DownloadsActivity.newIntent(context),
-		PendingIntentCompat.FLAG_IMMUTABLE
-	)
-
-	init {
-		builder.setOnlyAlertOnce(true)
-		builder.setDefaults(0)
-		builder.color = ContextCompat.getColor(context, R.color.blue_primary)
-		builder.foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
-		builder.setSilent(true)
-	}
-
-	fun create(state: DownloadState, timeLeft: Long): Notification {
-		builder.setContentTitle(state.manga.title)
-		builder.setContentText(context.getString(R.string.manga_downloading_))
-		builder.setProgress(1, 0, true)
-		builder.setSmallIcon(android.R.drawable.stat_sys_download)
-		builder.setContentIntent(listIntent)
-		builder.setStyle(null)
-		builder.setLargeIcon(state.cover?.toBitmap())
-		builder.clearActions()
-		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)
-			}
-			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)
-			}
-			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.setStyle(NotificationCompat.BigTextStyle().bigText(message))
-				if (state.canRetry) {
-					builder.addAction(cancelAction)
-					builder.addAction(retryAction)
-				}
-			}
-			is DownloadState.PostProcessing -> {
-				builder.setProgress(1, 0, true)
-				builder.setContentText(context.getString(R.string.processing_))
-				builder.setStyle(null)
-				builder.setOngoing(true)
-			}
-			is DownloadState.Queued -> {
-				builder.setProgress(0, 0, false)
-				builder.setContentText(context.getString(R.string.queued))
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
-			is DownloadState.Preparing -> {
-				builder.setProgress(1, 0, true)
-				builder.setContentText(context.getString(R.string.preparing_))
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
-			is DownloadState.Progress -> {
-				builder.setProgress(state.max, state.progress, false)
-				if (timeLeft > 0L) {
-					val eta = DateUtils.getRelativeTimeSpanString(timeLeft, 0L, DateUtils.SECOND_IN_MILLIS)
-					builder.setContentText(eta)
-				} else {
-					val percent = (state.percent * 100).format()
-					builder.setContentText(context.getString(R.string.percent_string_pattern, percent))
-				}
-				builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
-			is DownloadState.WaitingForNetwork -> {
-				builder.setProgress(0, 0, false)
-				builder.setContentText(context.getString(R.string.waiting_for_network))
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
-		}
-		return builder.build()
-	}
-
-	private fun createMangaIntent(context: Context, manga: Manga) = PendingIntent.getActivity(
-		context,
-		manga.hashCode(),
-		DetailsActivity.newIntent(context, manga),
-		PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-	)
-
-	companion object {
-
-		private const val CHANNEL_ID = "download"
-		private const val REQUEST_LIST = 6
-
-		fun createChannel(context: Context) {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				val manager = NotificationManagerCompat.from(context)
-				if (manager.getNotificationChannel(CHANNEL_ID) == null) {
-					val channel = NotificationChannel(
-						CHANNEL_ID,
-						context.getString(R.string.downloads),
-						NotificationManager.IMPORTANCE_LOW
-					)
-					channel.enableVibration(false)
-					channel.enableLights(false)
-					channel.setSound(null, null)
-					manager.createNotificationChannel(channel)
-				}
-			}
-		}
-	}
-}

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

@@ -1,260 +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.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.util.concurrent.TimeUnit
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.plus
-import org.koin.android.ext.android.get
-import org.koin.core.context.GlobalContext
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseService
-import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.download.domain.DownloadManager
-import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.download.domain.WakeLockNode
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.connectivityManager
-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
-
-class DownloadService : BaseService() {
-
-	private lateinit var downloadManager: DownloadManager
-	private lateinit var notificationSwitcher: ForegroundNotificationSwitcher
-
-	private val jobs = LinkedHashMap<Int, PausingProgressJob<DownloadState>>()
-	private val jobCount = MutableStateFlow(0)
-	private val controlReceiver = ControlReceiver()
-	private var binder: DownloadBinder? = null
-
-	override fun onCreate() {
-		super.onCreate()
-		isRunning = true
-		notificationSwitcher = ForegroundNotificationSwitcher(this)
-		val wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
-			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
-		downloadManager = get<DownloadManager.Factory>().create(
-			coroutineScope = lifecycleScope + WakeLockNode(wakeLock, TimeUnit.HOURS.toMillis(1))
-		)
-		DownloadNotification.createChannel(this)
-		val intentFilter = IntentFilter()
-		intentFilter.addAction(ACTION_DOWNLOAD_CANCEL)
-		intentFilter.addAction(ACTION_DOWNLOAD_RESUME)
-		registerReceiver(controlReceiver, intentFilter)
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
-		val manga = intent?.getParcelableExtra<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 {
-			stopSelf(startId)
-			START_NOT_STICKY
-		}
-	}
-
-	override fun onBind(intent: Intent): IBinder {
-		super.onBind(intent)
-		return binder ?: DownloadBinder(this).also { binder = it }
-	}
-
-	override fun onUnbind(intent: Intent?): Boolean {
-		binder = null
-		return super.onUnbind(intent)
-	}
-
-	override fun onDestroy() {
-		unregisterReceiver(controlReceiver)
-		binder = null
-		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 notification = DownloadNotification(this@DownloadService, startId)
-			try {
-				val timeLeftEstimator = TimeLeftEstimator()
-				notificationSwitcher.notify(startId, notification.create(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()
-						notificationSwitcher.notify(startId, notification.create(state, timeLeft))
-					}
-				job.join()
-			} finally {
-				(job.progressValue as? DownloadState.Done)?.let {
-					sendBroadcast(
-						Intent(ACTION_DOWNLOAD_COMPLETE)
-							.putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false))
-					)
-				}
-				notificationSwitcher.detach(
-					startId,
-					if (job.isCancelled) {
-						null
-					} else {
-						notification.create(job.progressValue, -1L)
-					}
-				)
-				stopSelf(startId)
-			}
-		}
-	}
-
-	private fun Flow<DownloadState>.whileActive(): Flow<DownloadState> = transformWhile { state ->
-		emit(state)
-		!state.isTerminal
-	}
-
-	private val DownloadState.isTerminal: Boolean
-		get() = this is DownloadState.Done || this is DownloadState.Cancelled || (this is DownloadState.Error && !canRetry)
-
-	inner class ControlReceiver : BroadcastReceiver() {
-
-		override fun onReceive(context: Context, intent: Intent?) {
-			when (intent?.action) {
-				ACTION_DOWNLOAD_CANCEL -> {
-					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
-					jobs.remove(cancelId)?.cancel()
-					jobCount.value = jobs.size
-				}
-				ACTION_DOWNLOAD_RESUME -> {
-					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
-					jobs[cancelId]?.resume()
-				}
-			}
-		}
-	}
-
-	class DownloadBinder(private val service: DownloadService) : Binder() {
-
-		val downloads: Flow<Collection<ProgressJob<DownloadState>>>
-			get() = service.jobCount.mapLatest { service.jobs.values }
-	}
-
-	companion object {
-
-		var isRunning: Boolean = false
-			private set
-
-		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"
-
-		private const val EXTRA_MANGA = "manga"
-		private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
-		private const val EXTRA_CANCEL_ID = "cancel_id"
-
-		fun start(context: Context, manga: Manga, chaptersIds: Collection<Long>? = null) {
-			if (chaptersIds?.isEmpty() == true) {
-				return
-			}
-			confirmDataTransfer(context) {
-				val intent = Intent(context, DownloadService::class.java)
-				intent.putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
-				if (chaptersIds != null) {
-					intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
-				}
-				ContextCompat.startForegroundService(context, intent)
-				Toast.makeText(context, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
-			}
-		}
-
-		fun start(context: Context, manga: Collection<Manga>) {
-			if (manga.isEmpty()) {
-				return
-			}
-			confirmDataTransfer(context) {
-				for (item in manga) {
-					val intent = Intent(context, DownloadService::class.java)
-					intent.putExtra(EXTRA_MANGA, ParcelableManga(item, withChapters = false))
-					ContextCompat.startForegroundService(context, intent)
-				}
-			}
-		}
-
-		fun confirmAndStart(context: Context, items: Set<Manga>) {
-			MaterialAlertDialogBuilder(context)
-				.setTitle(R.string.save_manga)
-				.setMessage(R.string.batch_manga_save_confirm)
-				.setNegativeButton(android.R.string.cancel, null)
-				.setPositiveButton(R.string.save) { _, _ ->
-					start(context, 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.getParcelableExtra<ParcelableManga>(EXTRA_MANGA)?.manga
-			}
-			return null
-		}
-
-		private fun confirmDataTransfer(context: Context, callback: () -> Unit) {
-			val settings = GlobalContext.get().get<AppSettings>()
-			if (context.connectivityManager.isActiveNetworkMetered && settings.isTrafficWarningEnabled) {
-				CheckBoxAlertDialog.Builder(context)
-					.setTitle(R.string.warning)
-					.setMessage(R.string.network_consumption_warning)
-					.setCheckBoxText(R.string.dont_ask_again)
-					.setCheckBoxChecked(false)
-					.setNegativeButton(android.R.string.cancel, null)
-					.setPositiveButton(R.string._continue) { _, doNotAsk ->
-						settings.isTrafficWarningEnabled = !doNotAsk
-						callback()
-					}.create()
-					.show()
-			} else {
-				callback()
-			}
-		}
-	}
-}

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

@@ -1,62 +0,0 @@
-package org.koitharu.kotatsu.download.ui.service
-
-import android.app.Notification
-import android.app.NotificationManager
-import android.app.Service
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import android.util.SparseArray
-import androidx.core.app.ServiceCompat
-import androidx.core.util.isEmpty
-import androidx.core.util.size
-
-private const val DEFAULT_DELAY = 500L
-
-class ForegroundNotificationSwitcher(
-	private val service: Service,
-) {
-
-	private val notificationManager = service.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-	private val notifications = SparseArray<Notification>()
-	private val handler = Handler(Looper.getMainLooper())
-
-	@Synchronized
-	fun notify(startId: Int, notification: Notification) {
-		if (notifications.isEmpty()) {
-			service.startForeground(startId, notification)
-		} else {
-			notificationManager.notify(startId, notification)
-		}
-		notifications[startId] = notification
-	}
-
-	@Synchronized
-	fun detach(startId: Int, notification: Notification?) {
-		notifications.remove(startId)
-		if (notifications.isEmpty()) {
-			ServiceCompat.stopForeground(service, ServiceCompat.STOP_FOREGROUND_DETACH)
-		}
-		val nextIndex = notifications.size - 1
-		if (nextIndex >= 0) {
-			val nextStartId = notifications.keyAt(nextIndex)
-			val nextNotification = notifications.valueAt(nextIndex)
-			service.startForeground(nextStartId, nextNotification)
-		}
-		handler.postDelayed(NotifyRunnable(startId, notification), DEFAULT_DELAY)
-	}
-
-	private inner class NotifyRunnable(
-		private val startId: Int,
-		private val notification: Notification?,
-	) : Runnable {
-
-		override fun run() {
-			if (notification != null) {
-				notificationManager.notify(startId, notification)
-			} else {
-				notificationManager.cancel(startId)
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt

@@ -1,24 +0,0 @@
-package org.koitharu.kotatsu.favourites
-
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.dsl.module
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditViewModel
-import org.koitharu.kotatsu.favourites.ui.categories.select.MangaCategoriesViewModel
-import org.koitharu.kotatsu.favourites.ui.list.FavouritesListViewModel
-
-val favouritesModule
-	get() = module {
-
-		single { FavouritesRepository(get(), get()) }
-
-		viewModel { categoryId ->
-			FavouritesListViewModel(categoryId.get(), get(), get(), get(), get())
-		}
-		viewModel { FavouritesCategoriesViewModel(get(), get()) }
-		viewModel { manga ->
-			MangaCategoriesViewModel(manga.get(), get())
-		}
-		viewModel { params -> FavouritesCategoryEditViewModel(params[0], get(), get()) }
-	}

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

@@ -1,17 +0,0 @@
-package org.koitharu.kotatsu.favourites.data
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.db.TABLE_FAVOURITE_CATEGORIES
-
-@Entity(tableName = TABLE_FAVOURITE_CATEGORIES)
-data class FavouriteCategoryEntity(
-	@PrimaryKey(autoGenerate = true)
-	@ColumnInfo(name = "category_id") val categoryId: Int,
-	@ColumnInfo(name = "created_at") val createdAt: Long,
-	@ColumnInfo(name = "sort_key") val sortKey: Int,
-	@ColumnInfo(name = "title") val title: String,
-	@ColumnInfo(name = "order") val order: String,
-	@ColumnInfo(name = "track") val track: Boolean,
-)

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

@@ -1,93 +0,0 @@
-package org.koitharu.kotatsu.favourites.data
-
-import androidx.room.*
-import androidx.sqlite.db.SimpleSQLiteQuery
-import androidx.sqlite.db.SupportSQLiteQuery
-import kotlinx.coroutines.flow.Flow
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.parsers.model.SortOrder
-
-@Dao
-abstract class FavouritesDao {
-
-	@Transaction
-	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC")
-	abstract suspend fun findAll(): List<FavouriteManga>
-
-	fun observeAll(order: SortOrder): Flow<List<FavouriteManga>> {
-		val orderBy = getOrderBy(order)
-		val query = SimpleSQLiteQuery(
-			"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id GROUP BY favourites.manga_id ORDER BY $orderBy",
-		)
-		return observeAllRaw(query)
-	}
-
-	@Transaction
-	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
-	abstract suspend fun findAll(offset: Int, limit: Int): List<FavouriteManga>
-
-	@Transaction
-	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC")
-	abstract suspend fun findAll(categoryId: Long): List<FavouriteManga>
-
-	fun observeAll(categoryId: Long, order: SortOrder): Flow<List<FavouriteManga>> {
-		val orderBy = getOrderBy(order)
-		val query = SimpleSQLiteQuery(
-			"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id WHERE category_id = ? GROUP BY favourites.manga_id ORDER BY $orderBy",
-			arrayOf<Any>(categoryId),
-		)
-		return observeAllRaw(query)
-	}
-
-	@Transaction
-	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
-	abstract suspend fun findAll(categoryId: Long, offset: Int, limit: Int): List<FavouriteManga>
-
-	@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites WHERE category_id = :categoryId)")
-	abstract suspend fun findAllManga(categoryId: Int): List<MangaEntity>
-
-	@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites)")
-	abstract suspend fun findAllManga(): List<MangaEntity>
-
-	@Transaction
-	@Query("SELECT * FROM favourites WHERE manga_id = :id GROUP BY manga_id")
-	abstract suspend fun find(id: Long): FavouriteManga?
-
-	@Transaction
-	@Query("SELECT * FROM favourites WHERE manga_id = :id GROUP BY manga_id")
-	abstract fun observe(id: Long): Flow<FavouriteManga?>
-
-	@Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id = :id")
-	abstract fun observeIds(id: Long): Flow<List<Long>>
-
-	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	abstract suspend fun insert(favourite: FavouriteEntity)
-
-	@Update
-	abstract suspend fun update(favourite: FavouriteEntity): Int
-
-	@Query("DELETE FROM favourites WHERE manga_id = :mangaId")
-	abstract suspend fun delete(mangaId: Long)
-
-	@Query("DELETE FROM favourites WHERE manga_id = :mangaId AND category_id = :categoryId")
-	abstract suspend fun delete(categoryId: Long, mangaId: Long)
-
-	@Transaction
-	open suspend fun upsert(entity: FavouriteEntity) {
-		if (update(entity) == 0) {
-			insert(entity)
-		}
-	}
-
-	@Transaction
-	@RawQuery(observedEntities = [FavouriteEntity::class])
-	protected abstract fun observeAllRaw(query: SupportSQLiteQuery): Flow<List<FavouriteManga>>
-
-	private fun getOrderBy(sortOrder: SortOrder) = when(sortOrder) {
-		SortOrder.RATING -> "rating DESC"
-		SortOrder.NEWEST,
-		SortOrder.UPDATED -> "created_at DESC"
-		SortOrder.ALPHABETICAL -> "title ASC"
-		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
-	}
-}

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

@@ -1,193 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.view.ActionMode
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.graphics.Insets
-import androidx.core.view.children
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseFragment
-import org.koitharu.kotatsu.base.ui.util.ActionModeListener
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
-import org.koitharu.kotatsu.databinding.ItemEmptyStateBinding
-import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
-import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
-import org.koitharu.kotatsu.main.ui.AppBarOwner
-import org.koitharu.kotatsu.utils.ext.addMenuProvider
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.measureHeight
-import org.koitharu.kotatsu.utils.ext.resolveDp
-
-class FavouritesContainerFragment :
-	BaseFragment<FragmentFavouritesBinding>(),
-	FavouritesTabLongClickListener,
-	CategoriesEditDelegate.CategoriesEditCallback,
-	ActionModeListener,
-	View.OnClickListener {
-
-	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
-	private val editDelegate by lazy(LazyThreadSafetyMode.NONE) {
-		CategoriesEditDelegate(requireContext(), this)
-	}
-	private var pagerAdapter: FavouritesPagerAdapter? = null
-	private var stubBinding: ItemEmptyStateBinding? = null
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?
-	) = FragmentFavouritesBinding.inflate(inflater, container, false)
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		val adapter = FavouritesPagerAdapter(this, this)
-		viewModel.visibleCategories.value?.let(::onCategoriesChanged)
-		binding.pager.adapter = adapter
-		pagerAdapter = adapter
-		TabLayoutMediator(binding.tabs, binding.pager, adapter).attach()
-		actionModeDelegate.addListener(this, viewLifecycleOwner)
-		addMenuProvider(FavouritesContainerMenuProvider(view.context))
-
-		viewModel.visibleCategories.observe(viewLifecycleOwner, ::onCategoriesChanged)
-		viewModel.onError.observe(viewLifecycleOwner, ::onError)
-	}
-
-	override fun onDestroyView() {
-		pagerAdapter = null
-		stubBinding = null
-		super.onDestroyView()
-	}
-
-	override fun onActionModeStarted(mode: ActionMode) {
-		binding.pager.isUserInputEnabled = false
-		binding.tabs.setTabsEnabled(false)
-	}
-
-	override fun onActionModeFinished(mode: ActionMode) {
-		binding.pager.isUserInputEnabled = true
-		binding.tabs.setTabsEnabled(true)
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
-		binding.root.updatePadding(
-			top = headerHeight - insets.top
-		)
-		binding.pager.updatePadding(
-			// 8 dp is needed so that the top of the list is not attached to tabs (visible when ActionMode is active)
-			top = -headerHeight + resources.resolveDp(8)
-		)
-		binding.tabs.apply {
-			updatePadding(
-				left = insets.left,
-				right = insets.right
-			)
-			updateLayoutParams<ViewGroup.MarginLayoutParams> {
-				topMargin = insets.top
-			}
-		}
-	}
-
-	private fun onCategoriesChanged(categories: List<CategoryListModel>) {
-		pagerAdapter?.replaceData(categories)
-		if (categories.isEmpty()) {
-			binding.pager.isVisible = false
-			binding.tabs.isVisible = false
-			showStub()
-		} else {
-			binding.pager.isVisible = true
-			binding.tabs.isVisible = true
-			(stubBinding?.root ?: binding.stubEmptyState).isVisible = false
-		}
-	}
-
-	private fun onError(e: Throwable) {
-		Snackbar.make(binding.pager, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
-	}
-
-	override fun onTabLongClick(tabView: View, item: CategoryListModel): Boolean {
-		when (item) {
-			is CategoryListModel.All -> showAllCategoriesMenu(tabView)
-			is CategoryListModel.CategoryItem -> showCategoryMenu(tabView, item.category)
-		}
-		return true
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_retry -> startActivity(FavouritesCategoryEditActivity.newIntent(v.context))
-		}
-	}
-
-	override fun onDeleteCategory(category: FavouriteCategory) {
-		viewModel.deleteCategory(category.id)
-	}
-
-	private fun TabLayout.setTabsEnabled(enabled: Boolean) {
-		val tabStrip = getChildAt(0) as? ViewGroup ?: return
-		for (tab in tabStrip.children) {
-			tab.isEnabled = enabled
-		}
-	}
-
-	private fun showCategoryMenu(tabView: View, category: FavouriteCategory) {
-		val menu = PopupMenu(tabView.context, tabView)
-		menu.inflate(R.menu.popup_category)
-		menu.setOnMenuItemClickListener {
-			when (it.itemId) {
-				R.id.action_remove -> editDelegate.deleteCategory(category)
-				R.id.action_edit -> startActivity(
-					FavouritesCategoryEditActivity.newIntent(
-						tabView.context,
-						category.id
-					)
-				)
-				else -> return@setOnMenuItemClickListener false
-			}
-			true
-		}
-		menu.show()
-	}
-
-	private fun showAllCategoriesMenu(tabView: View) {
-		val menu = PopupMenu(tabView.context, tabView)
-		menu.inflate(R.menu.popup_category_all)
-		menu.setOnMenuItemClickListener {
-			when (it.itemId) {
-				R.id.action_create -> startActivity(FavouritesCategoryEditActivity.newIntent(requireContext()))
-				R.id.action_hide -> viewModel.setAllCategoriesVisible(false)
-			}
-			true
-		}
-		menu.show()
-	}
-
-	private fun showStub() {
-		val stub = stubBinding ?: ItemEmptyStateBinding.bind(binding.stubEmptyState.inflate())
-		stub.root.isVisible = true
-		stub.icon.setImageResource(R.drawable.ic_empty_favourites)
-		stub.textPrimary.setText(R.string.text_empty_holder_primary)
-		stub.textSecondary.setText(R.string.empty_favourite_categories)
-		stub.buttonRetry.setText(R.string.add)
-		stub.buttonRetry.isVisible = true
-		stub.buttonRetry.setOnClickListener(this)
-		stubBinding = stub
-	}
-
-	companion object {
-
-		fun newInstance() = FavouritesContainerFragment()
-	}
-}

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

@@ -1,76 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui
-
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.recyclerview.widget.DiffUtil
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
-
-class FavouritesPagerAdapter(
-	fragment: Fragment,
-	private val longClickListener: FavouritesTabLongClickListener
-) : FragmentStateAdapter(fragment.childFragmentManager, fragment.viewLifecycleOwner.lifecycle),
-	TabLayoutMediator.TabConfigurationStrategy,
-	View.OnLongClickListener {
-
-	private val differ = AsyncListDiffer(this, DiffCallback())
-
-	override fun getItemCount() = differ.currentList.size
-
-	override fun createFragment(position: Int): Fragment {
-		val item = differ.currentList[position]
-		return FavouritesListFragment.newInstance(item.id)
-	}
-
-	override fun getItemId(position: Int): Long {
-		return differ.currentList[position].id
-	}
-
-	override fun containsItem(itemId: Long): Boolean {
-		return differ.currentList.any { it.id == itemId }
-	}
-
-	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
-		val item = differ.currentList[position]
-		tab.text = when (item) {
-			is CategoryListModel.All -> tab.view.context.getString(R.string.all_favourites)
-			is CategoryListModel.CategoryItem -> item.category.title
-		}
-		tab.view.tag = item.id
-		tab.view.setOnLongClickListener(this)
-	}
-
-	fun replaceData(data: List<CategoryListModel>) {
-		differ.submitList(data)
-	}
-
-	override fun onLongClick(v: View): Boolean {
-		val itemId = v.tag as? Long ?: return false
-		val item = differ.currentList.find { x -> x.id == itemId } ?: return false
-		return longClickListener.onTabLongClick(v, item)
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<CategoryListModel>() {
-
-		override fun areItemsTheSame(
-			oldItem: CategoryListModel,
-			newItem: CategoryListModel
-		): Boolean = when {
-			oldItem is CategoryListModel.All && newItem is CategoryListModel.All -> true
-			oldItem is CategoryListModel.CategoryItem && newItem is CategoryListModel.CategoryItem -> {
-				oldItem.category.id == newItem.category.id
-			}
-			else -> false
-		}
-
-		override fun areContentsTheSame(
-			oldItem: CategoryListModel,
-			newItem: CategoryListModel
-		): Boolean = oldItem == newItem
-	}
-}

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

@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui
-
-import android.view.View
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-
-fun interface FavouritesTabLongClickListener {
-
-	fun onTabLongClick(tabView: View, item: CategoryListModel): Boolean
-}

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

@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-interface AllCategoriesToggleListener {
-
-	fun onAllCategoriesToggle(isVisible: Boolean)
-}

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

@@ -1,157 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.graphics.Insets
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.snackbar.Snackbar
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.measureHeight
-
-class CategoriesActivity :
-	BaseActivity<ActivityCategoriesBinding>(),
-	OnListItemClickListener<FavouriteCategory>,
-	View.OnClickListener,
-	CategoriesEditDelegate.CategoriesEditCallback,
-	AllCategoriesToggleListener {
-
-	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
-
-	private lateinit var adapter: CategoriesAdapter
-	private lateinit var reorderHelper: ItemTouchHelper
-	private lateinit var editDelegate: CategoriesEditDelegate
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(ActivityCategoriesBinding.inflate(layoutInflater))
-		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		adapter = CategoriesAdapter(this, this)
-		editDelegate = CategoriesEditDelegate(this, this)
-		binding.recyclerView.setHasFixedSize(true)
-		binding.recyclerView.adapter = adapter
-		binding.fabAdd.setOnClickListener(this)
-		reorderHelper = ItemTouchHelper(ReorderHelperCallback())
-		reorderHelper.attachToRecyclerView(binding.recyclerView)
-
-		viewModel.allCategories.observe(this, ::onCategoriesChanged)
-		viewModel.onError.observe(this, ::onError)
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.fab_add -> startActivity(FavouritesCategoryEditActivity.newIntent(this))
-		}
-	}
-
-	override fun onItemClick(item: FavouriteCategory, view: View) {
-		val menu = PopupMenu(view.context, view)
-		menu.inflate(R.menu.popup_category)
-		menu.setOnMenuItemClickListener { menuItem ->
-			when (menuItem.itemId) {
-				R.id.action_remove -> editDelegate.deleteCategory(item)
-				R.id.action_edit -> startActivity(FavouritesCategoryEditActivity.newIntent(this, item.id))
-			}
-			true
-		}
-		menu.show()
-	}
-
-	override fun onItemLongClick(item: FavouriteCategory, view: View): Boolean {
-		val viewHolder = binding.recyclerView.findContainingViewHolder(view) ?: return false
-		reorderHelper.startDrag(viewHolder)
-		return true
-	}
-
-	override fun onAllCategoriesToggle(isVisible: Boolean) {
-		viewModel.setAllCategoriesVisible(isVisible)
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.fabAdd.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			rightMargin = topMargin + insets.right
-			leftMargin = topMargin + insets.left
-			bottomMargin = topMargin + insets.bottom
-		}
-		binding.recyclerView.updatePadding(
-			left = insets.left,
-			right = insets.right,
-			bottom = 2 * insets.bottom + binding.fabAdd.measureHeight(),
-		)
-	}
-
-	private fun onCategoriesChanged(categories: List<CategoryListModel>) {
-		adapter.items = categories
-		binding.textViewHolder.isVisible = categories.isEmpty()
-	}
-
-	private fun onError(e: Throwable) {
-		Snackbar.make(binding.recyclerView, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG)
-			.show()
-	}
-
-	override fun onDeleteCategory(category: FavouriteCategory) {
-		viewModel.deleteCategory(category.id)
-	}
-
-	private inner class ReorderHelperCallback : ItemTouchHelper.SimpleCallback(
-		ItemTouchHelper.DOWN or ItemTouchHelper.UP, 0
-	) {
-
-		override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
-
-		override fun onMove(
-			recyclerView: RecyclerView,
-			viewHolder: RecyclerView.ViewHolder,
-			target: RecyclerView.ViewHolder,
-		): Boolean = viewHolder.itemViewType == target.itemViewType
-
-		override fun canDropOver(
-			recyclerView: RecyclerView,
-			current: RecyclerView.ViewHolder,
-			target: RecyclerView.ViewHolder,
-		): Boolean = current.itemViewType == target.itemViewType
-
-		override fun onMoved(
-			recyclerView: RecyclerView,
-			viewHolder: RecyclerView.ViewHolder,
-			fromPos: Int,
-			target: RecyclerView.ViewHolder,
-			toPos: Int,
-			x: Int,
-			y: Int,
-		) {
-			super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y)
-			viewModel.reorderCategories(fromPos, toPos)
-		}
-
-		override fun isLongPressDragEnabled(): Boolean = false
-	}
-
-	companion object {
-
-		val SORT_ORDERS = arrayOf(
-			SortOrder.ALPHABETICAL,
-			SortOrder.NEWEST,
-			SortOrder.RATING,
-		)
-
-		fun newIntent(context: Context) = Intent(context, CategoriesActivity::class.java)
-	}
-}

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

@@ -1,49 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.allCategoriesAD
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.categoryAD
-
-class CategoriesAdapter(
-	onItemClickListener: OnListItemClickListener<FavouriteCategory>,
-	allCategoriesToggleListener: AllCategoriesToggleListener,
-) : AsyncListDifferDelegationAdapter<CategoryListModel>(DiffCallback()) {
-
-	init {
-		delegatesManager.addDelegate(categoryAD(onItemClickListener))
-			.addDelegate(allCategoriesAD(allCategoriesToggleListener))
-		setHasStableIds(true)
-	}
-
-	override fun getItemId(position: Int): Long {
-		return items[position].id
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<CategoryListModel>() {
-
-		override fun areItemsTheSame(
-			oldItem: CategoryListModel,
-			newItem: CategoryListModel,
-		): Boolean = oldItem.id == newItem.id
-
-		override fun areContentsTheSame(
-			oldItem: CategoryListModel,
-			newItem: CategoryListModel,
-		): Boolean = oldItem == newItem
-
-		override fun getChangePayload(
-			oldItem: CategoryListModel,
-			newItem: CategoryListModel,
-		): Any? = when {
-			oldItem is CategoryListModel.All && newItem is CategoryListModel.All -> Unit
-			oldItem is CategoryListModel.CategoryItem &&
-				newItem is CategoryListModel.CategoryItem &&
-				oldItem.category.title != newItem.category.title -> null
-			else -> Unit
-		}
-	}
-}

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

@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-import android.content.Context
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import com.google.android.material.R as materialR
-
-class CategoriesEditDelegate(
-	private val context: Context,
-	private val callback: CategoriesEditCallback
-) {
-
-	fun deleteCategory(category: FavouriteCategory) {
-		MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
-			.setMessage(context.getString(R.string.category_delete_confirm, category.title))
-			.setTitle(R.string.remove_category)
-			.setIcon(R.drawable.ic_delete)
-			.setNegativeButton(android.R.string.cancel, null)
-			.setPositiveButton(R.string.remove) { _, _ ->
-				callback.onDeleteCategory(category)
-			}.create()
-			.show()
-	}
-
-	interface CategoriesEditCallback {
-
-		fun onDeleteCategory(category: FavouriteCategory)
-	}
-}

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

@@ -1,77 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.combine
-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.core.prefs.observeAsFlow
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import java.util.*
-
-class FavouritesCategoriesViewModel(
-	private val repository: FavouritesRepository,
-	private val settings: AppSettings,
-) : BaseViewModel() {
-
-	private var reorderJob: Job? = null
-
-	val allCategories = combine(
-		repository.observeCategories(),
-		observeAllCategoriesVisible(),
-	) { list, showAll ->
-		mapCategories(list, showAll, true)
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
-	
-	val visibleCategories = combine(
-		repository.observeCategories(),
-		observeAllCategoriesVisible(),
-	) { list, showAll ->
-		mapCategories(list, showAll, showAll && list.isNotEmpty())
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
-
-	fun deleteCategory(id: Long) {
-		launchJob {
-			repository.removeCategory(id)
-		}
-	}
-
-	fun setAllCategoriesVisible(isVisible: Boolean) {
-		settings.isAllFavouritesVisible = isVisible
-	}
-
-	fun reorderCategories(oldPos: Int, newPos: Int) {
-		val prevJob = reorderJob
-		reorderJob = launchJob(Dispatchers.Default) {
-			prevJob?.join()
-			val items = allCategories.value ?: error("This should not happen")
-			val ids = items.mapTo(ArrayList(items.size)) { it.id }
-			Collections.swap(ids, oldPos, newPos)
-			ids.remove(0L)
-			repository.reorderCategories(ids)
-		}
-	}
-
-	private fun mapCategories(
-		categories: List<FavouriteCategory>,
-		isAllCategoriesVisible: Boolean,
-		withAllCategoriesItem: Boolean,
-	): List<CategoryListModel> {
-		val result = ArrayList<CategoryListModel>(categories.size + 1)
-		if (withAllCategoriesItem) {
-			result.add(CategoryListModel.All(isAllCategoriesVisible))
-		}
-		categories.mapTo(result) {
-			CategoryListModel.CategoryItem(it)
-		}
-		return result
-	}
-
-	private fun observeAllCategoriesVisible() = settings.observeAsFlow(AppSettings.KEY_ALL_FAVOURITES_VISIBLE) {
-		isAllFavouritesVisible
-	}
-}

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

@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories.adapter
-
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.databinding.ItemCategoriesAllBinding
-import org.koitharu.kotatsu.favourites.ui.categories.AllCategoriesToggleListener
-
-fun allCategoriesAD(
-	allCategoriesToggleListener: AllCategoriesToggleListener,
-) = adapterDelegateViewBinding<CategoryListModel.All, CategoryListModel, ItemCategoriesAllBinding>(
-	{ inflater, parent -> ItemCategoriesAllBinding.inflate(inflater, parent, false) }
-) {
-
-	binding.imageViewToggle.setOnClickListener {
-		allCategoriesToggleListener.onAllCategoriesToggle(!item.isVisible)
-	}
-
-	bind {
-		binding.imageViewToggle.isChecked = item.isVisible
-	}
-}

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

@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories.adapter
-
-import android.view.MotionEvent
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.databinding.ItemCategoryBinding
-
-fun categoryAD(
-	clickListener: OnListItemClickListener<FavouriteCategory>
-) = adapterDelegateViewBinding<CategoryListModel.CategoryItem, CategoryListModel, ItemCategoryBinding>(
-	{ inflater, parent -> ItemCategoryBinding.inflate(inflater, parent, false) }
-) {
-
-	binding.imageViewMore.setOnClickListener {
-		clickListener.onItemClick(item.category, it)
-	}
-	@Suppress("ClickableViewAccessibility")
-	binding.imageViewHandle.setOnTouchListener { _, event ->
-		if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-			clickListener.onItemLongClick(item.category, itemView)
-		} else {
-			false
-		}
-	}
-
-	bind {
-		binding.textViewTitle.text = item.category.title
-	}
-}

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

@@ -1,61 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories.adapter
-
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-sealed interface CategoryListModel : ListModel {
-
-	val id: Long
-
-	class All(
-		val isVisible: Boolean,
-	) : CategoryListModel {
-
-		override val id: Long = 0L
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as All
-
-			if (isVisible != other.isVisible) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			return isVisible.hashCode()
-		}
-	}
-
-	class CategoryItem(
-		val category: FavouriteCategory,
-	) : CategoryListModel {
-
-		override val id: Long
-			get() = category.id
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as CategoryItem
-
-			if (category.id != other.category.id) return false
-			if (category.title != other.category.title) return false
-			if (category.order != other.category.order) return false
-			if (category.isTrackingEnabled != other.category.isTrackingEnabled) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = category.id.hashCode()
-			result = 31 * result + category.title.hashCode()
-			result = 31 * result + category.order.hashCode()
-			result = 31 * result + category.isTrackingEnabled.hashCode()
-			return result
-		}
-	}
-}

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

@@ -1,54 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories.edit
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.liveData
-import androidx.lifecycle.viewModelScope
-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(
-	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)
-		}
-	}
-}

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

@@ -1,103 +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 org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-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.FavouriteCategory
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.databinding.DialogFavoriteCategoriesBinding
-import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
-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.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.withArgs
-
-class FavouriteCategoriesBottomSheet :
-	BaseBottomSheet<DialogFavoriteCategoriesBinding>(),
-	OnListItemClickListener<MangaCategoryItem>,
-	CategoriesEditDelegate.CategoriesEditCallback,
-	View.OnClickListener,
-	Toolbar.OnMenuItemClickListener {
-
-	private val viewModel by viewModel<MangaCategoriesViewModel> {
-		parametersOf(requireNotNull(arguments?.getParcelableArrayList<ParcelableManga>(KEY_MANGA_LIST)).map { it.manga })
-	}
-
-	private var adapter: MangaCategoriesAdapter? = null
-
-	override fun onInflateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = DialogFavoriteCategoriesBinding.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.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)
-	}
-
-	override fun onDeleteCategory(category: FavouriteCategory) = Unit
-
-	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/MangaCategoriesViewModel.kt

@@ -1,61 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories.select
-
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.combine
-import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.ids
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-
-class MangaCategoriesViewModel(
-	private val manga: List<Manga>,
-	private val favouritesRepository: FavouritesRepository
-) : BaseViewModel() {
-
-	val content = combine(
-		favouritesRepository.observeCategories(),
-		observeCategoriesIds(),
-	) { all, checked ->
-		all.map {
-			MangaCategoryItem(
-				id = it.id,
-				name = it.title,
-				isChecked = it.id in checked
-			)
-		}
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
-
-	fun setChecked(categoryId: Long, isChecked: Boolean) {
-		launchJob(Dispatchers.Default) {
-			if (isChecked) {
-				favouritesRepository.addToCategory(categoryId, manga)
-			} else {
-				favouritesRepository.removeFromCategory(categoryId, manga.ids())
-			}
-		}
-	}
-
-	private fun observeCategoriesIds() = if (manga.size == 1) {
-		// Fast path
-		favouritesRepository.observeCategoriesIds(manga[0].id)
-	} else {
-		combine(
-			manga.map { favouritesRepository.observeCategoriesIds(it.id) }
-		) { array ->
-			val result = HashSet<Long>()
-			var isFirst = true
-			for (ids in array) {
-				if (isFirst) {
-					result.addAll(ids)
-					isFirst = false
-				} else {
-					result.retainAll(ids.toSet())
-				}
-			}
-			result
-		}
-	}
-}