Fix crash on page loading

.editorconfig

@@ -5,11 +5,11 @@ charset = utf-8
 end_of_line = lf
 indent_size = 4
 indent_style = tab
-insert_final_newline = true
+insert_final_newline = false
 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,2 +1 @@
 custom: ["https://yoomoney.ru/to/410012543938752"]
-ko_fi: koitharu

.gitignore

@@ -11,6 +11,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
+/.idea/kotlinc.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/androidTestResultsUserPreferences.xml
 /.idea/render.experimental.xml

.idea/compiler.xml

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

.idea/inspectionProfiles/Project_Default.xml

@@ -3,9 +3,6 @@
     <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="FillClass" enabled="true" level="INFORMATION" enabled_by_default="true">
-      <option name="withoutDefaultValues" value="true" />
-    </inspection_tool>
     <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" />

.idea/kotlinc.xml

@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.10" />
+    <option name="version" value="1.6.21" />
   </component>
 </project>

.idea/ktlint.xml

@@ -1,13 +1,7 @@
 <?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>

README.md

@@ -21,12 +21,11 @@ Download APK directly from GitHub:
 * 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 You UI
+* Tablet-optimized material design UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
 * Shikimori integration (manga tracking)
 * Password/fingerprint protect access to the app
-* History and favourites synchronization across devices (coming soon)
 
 ### Screenshots
 

app/build.gradle

@@ -3,20 +3,19 @@ plugins {
 	id 'kotlin-android'
 	id 'kotlin-kapt'
 	id 'kotlin-parcelize'
-	id 'dagger.hilt.android.plugin'
 }
 
 android {
-	compileSdkVersion 33
-	buildToolsVersion '33.0.0'
+	compileSdkVersion 32
+	buildToolsVersion '32.0.0'
 	namespace 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
-		targetSdkVersion 33
-		versionCode 498
-		versionName '4.0-beta2'
+		targetSdkVersion 32
+		versionCode 430
+		versionName '3.5'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -82,15 +81,15 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation('com.github.KotatsuApp:kotatsu-parsers:b3a9c5fcda') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:5cb953eb86') {
 		exclude group: 'org.json', module: 'json'
 	}
 
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
-	implementation 'androidx.core:core-ktx:1.9.0'
+	implementation 'androidx.core:core-ktx:1.8.0'
 	implementation 'androidx.activity:activity-ktx:1.5.1'
-	implementation 'androidx.fragment:fragment-ktx:1.5.2'
+	implementation 'androidx.fragment:fragment-ktx:1.5.3'
 	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'
@@ -117,14 +116,9 @@ dependencies {
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation "com.google.dagger:hilt-android:2.43.2"
-	kapt "com.google.dagger:hilt-compiler:2.43.2"
-	implementation 'androidx.hilt:hilt-work:1.0.0'
-	kapt 'androidx.hilt:hilt-compiler:1.0.0'
-
+	implementation 'io.insert-koin:koin-android:3.2.0'
 	implementation 'io.coil-kt:coil-base:2.2.1'
-	implementation 'io.coil-kt:coil-svg:2.2.1'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:0ff0278f0f'
+	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
 	implementation 'ch.acra:acra-http:5.9.6'
@@ -142,10 +136,9 @@ dependencies {
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
 
 	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 'androidx.room:room-testing:2.4.3'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
-
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.43.2'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.43.2'
-}
+}

app/proguard-rules.pro

@@ -11,6 +11,5 @@
 -keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
-
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
--keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
+-keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment

app/sampledata/genres

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

app/sampledata/titles

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

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

@@ -4,6 +4,5 @@
 	"sortKey": 1,
 	"order": "NEWEST",
 	"createdAt": 1335906000000,
-	"isTrackingEnabled": true,
-	"isVisibleInLibrary": true
-}
+	"isTrackingEnabled": 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/ShortcutsUpdaterTest.kt

@@ -6,40 +6,28 @@ 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 javax.inject.Inject
 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
 
-@HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class ShortcutsUpdaterTest {
+class ShortcutsUpdaterTest : KoinTest {
 
-	@get:Rule
-	var hiltRule = HiltAndroidRule(this)
-
-	@Inject
-	lateinit var historyRepository: HistoryRepository
-
-	@Inject
-	lateinit var shortcutsUpdater: ShortcutsUpdater
-
-	@Inject
-	lateinit var database: MangaDatabase
+	private val historyRepository by inject<HistoryRepository>()
+	private val shortcutsUpdater by inject<ShortcutsUpdater>()
+	private val database by inject<MangaDatabase>()
 
 	@Before
 	fun setUp() {
-		hiltRule.inject()
 		database.clearAllTables()
 	}
 
@@ -55,7 +43,7 @@ class ShortcutsUpdaterTest {
 			chapterId = SampleData.chapter.id,
 			page = 4,
 			scroll = 2,
-			percent = 0.3f,
+			percent = 0.3f
 		)
 		awaitUpdate()
 
@@ -74,4 +62,4 @@ class ShortcutsUpdaterTest {
 		instrumentation.awaitForIdle()
 		shortcutsUpdater.await()
 	}
-}
+}

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

@@ -1,53 +1,36 @@
 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 java.io.File
-import javax.inject.Inject
-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.*
 
-@HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class AppBackupAgentTest {
+class AppBackupAgentTest : KoinTest {
 
-	@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
+	private val historyRepository by inject<HistoryRepository>()
+	private val favouritesRepository by inject<FavouritesRepository>()
+	private val backupRepository by inject<BackupRepository>()
+	private val database by inject<MangaDatabase>()
 
 	@Before
 	fun setUp() {
-		hiltRule.inject()
 		database.clearAllTables()
 	}
 
 	@Test
-	fun backupAndRestore() = runTest {
+	fun testBackupRestore() = runTest {
 		val category = favouritesRepository.createCategory(
 			title = SampleData.favouriteCategory.title,
 			sortOrder = SampleData.favouriteCategory.order,
@@ -64,10 +47,7 @@ class AppBackupAgentTest {
 		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
 
 		val agent = AppBackupAgent()
-		val backup = agent.createBackupFile(
-			context = InstrumentationRegistry.getInstrumentation().targetContext,
-			repository = backupRepository,
-		)
+		val backup = agent.createBackupFile(get(), backupRepository)
 
 		database.clearAllTables()
 		assertTrue(favouritesRepository.getAllManga().isEmpty())
@@ -79,30 +59,9 @@ class AppBackupAgentTest {
 
 		assertEquals(category, favouritesRepository.getCategory(category.id))
 		assertEquals(history, historyRepository.getOne(SampleData.manga))
-		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
+		assertContentEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
 
 		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
-		assertTrue(SampleData.tag in allTags)
+		assertContains(allTags, SampleData.tag)
 	}
-
-	@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,39 +1,24 @@
 package org.koitharu.kotatsu.tracker.domain
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import javax.inject.Inject
-import junit.framework.TestCase.*
 import kotlinx.coroutines.test.runTest
-import org.junit.Before
-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.parsers.model.Manga
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
-@HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class TrackerTest {
+class TrackerTest : KoinTest {
 
-	@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()
-	}
+	private val repository by inject<TrackingRepository>()
+	private val dataRepository by inject<MangaDataRepository>()
+	private val tracker by inject<Tracker>()
 
 	@Test
 	fun noUpdates() = runTest {
@@ -195,4 +180,4 @@ class TrackerTest {
 		dataRepository.storeManga(manga)
 		return manga
 	}
-}
+}

app/src/main/AndroidManifest.xml

@@ -10,14 +10,6 @@
 	<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" />
 
 	<application
 		android:name="org.koitharu.kotatsu.KotatsuApp"
@@ -65,28 +57,14 @@
 		<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.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" />
 			</intent-filter>
 		</activity>
@@ -99,8 +77,8 @@
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name="org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity"
-			android:label="@string/favourites"
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity"
+			android:label="@string/favourites_categories"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
@@ -130,60 +108,18 @@
 		<activity
 			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
 			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
-		<activity
-			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" />
 
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
-			android:foregroundServiceType="dataSync"
-			android:stopWithTask="false" />
+			android:stopWithTask="false"
+			android:foregroundServiceType="dataSync" />
 		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
-		<service android:name="org.koitharu.kotatsu.local.ui.ImportService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
 		<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"
-			android:process=":sync">
-			<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"
-			android:process=":sync">
-			<intent-filter>
-				<action android:name="android.content.SyncAdapter" />
-			</intent-filter>
-			<meta-data
-				android:name="android.content.SyncAdapter"
-				android:resource="@xml/sync_history" />
-		</service>
 
 		<provider
 			android:name="org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider"
@@ -198,22 +134,6 @@
 				android:name="android.support.FILE_PROVIDER_PATHS"
 				android:resource="@xml/filepaths" />
 		</provider>
-		<provider
-			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncProvider"
-			android:authorities="org.koitharu.kotatsu.favourites"
-			android:exported="false"
-			android:label="@string/favourites"
-			android:syncable="true" />
-		<provider
-			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncProvider"
-			android:authorities="org.koitharu.kotatsu.history"
-			android:exported="false"
-			android:label="@string/history"
-			android:syncable="true" />
-		<provider
-			android:name="androidx.startup.InitializationProvider"
-			android:authorities="${applicationId}.androidx-startup"
-			tools:node="remove" />
 
 		<receiver
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider"
@@ -247,4 +167,4 @@
 
 	</application>
 
-</manifest>
+</manifest>

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

@@ -3,56 +3,79 @@ package org.koitharu.kotatsu
 import android.app.Application
 import android.content.Context
 import android.os.StrictMode
-import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.strictmode.FragmentStrictMode
-import androidx.hilt.work.HiltWorkerFactory
 import androidx.room.InvalidationTracker
-import androidx.work.Configuration
-import dagger.hilt.android.HiltAndroidApp
-import javax.inject.Inject
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import org.acra.ReportField
 import org.acra.config.dialog
 import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
+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.utils.ext.processLifecycleScope
+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
 
-@HiltAndroidApp
-class KotatsuApp : Application(), Configuration.Provider {
-
-	@Inject
-	lateinit var databaseObservers: Set<@JvmSuppressWildcards InvalidationTracker.Observer>
-
-	@Inject
-	lateinit var activityLifecycleCallbacks: Set<@JvmSuppressWildcards ActivityLifecycleCallbacks>
-
-	@Inject
-	lateinit var database: MangaDatabase
-
-	@Inject
-	lateinit var settings: AppSettings
-
-	@Inject
-	lateinit var workerFactory: HiltWorkerFactory
+class KotatsuApp : Application() {
 
 	override fun onCreate() {
 		super.onCreate()
 		if (BuildConfig.DEBUG) {
 			enableStrictMode()
 		}
-		AppCompatDelegate.setDefaultNightMode(settings.theme)
+		initKoin()
+		AppCompatDelegate.setDefaultNightMode(get<AppSettings>().theme)
 		setupActivityLifecycleCallbacks()
-		processLifecycleScope.launch(Dispatchers.Default) {
-			setupDatabaseObservers()
+		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,
+			)
 		}
 	}
 
@@ -90,22 +113,18 @@ class KotatsuApp : Application(), Configuration.Provider {
 		}
 	}
 
-	override fun getWorkManagerConfiguration(): Configuration {
-		return Configuration.Builder()
-			.setWorkerFactory(workerFactory)
-			.build()
-	}
-
-	@WorkerThread
 	private fun setupDatabaseObservers() {
+		val observers = getKoin().getAll<InvalidationTracker.Observer>()
+		val database = get<MangaDatabase>()
 		val tracker = database.invalidationTracker
-		databaseObservers.forEach {
+		observers.forEach {
 			tracker.addObserver(it)
 		}
 	}
 
 	private fun setupActivityLifecycleCallbacks() {
-		activityLifecycleCallbacks.forEach {
+		val callbacks = getKoin().getAll<ActivityLifecycleCallbacks>()
+		callbacks.forEach {
 			registerActivityLifecycleCallbacks(it)
 		}
 	}
@@ -135,4 +154,4 @@ class KotatsuApp : Application(), Configuration.Provider {
 			.detectFragmentTagUsage()
 			.build()
 	}
-}
+}

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

@@ -1,57 +1,25 @@
 package org.koitharu.kotatsu.base.domain
 
-import android.graphics.BitmapFactory
-import android.net.Uri
-import android.util.Size
 import androidx.room.withTransaction
-import java.io.File
-import java.io.InputStream
-import java.util.zip.ZipFile
-import javax.inject.Inject
-import kotlin.math.roundToInt
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runInterruptible
-import okhttp3.OkHttpClient
-import okhttp3.Request
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.*
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.parsers.model.Manga
-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.util.await
-import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 
-private const val MIN_WEBTOON_RATIO = 2
+class MangaDataRepository(private val db: MangaDatabase) {
 
-class MangaDataRepository @Inject constructor(
-	private val okHttpClient: OkHttpClient,
-	private val db: MangaDatabase,
-) {
-
-	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
+	suspend fun savePreferences(manga: Manga, mode: ReaderMode) {
+		val tags = manga.tags.toEntities()
 		db.withTransaction {
-			storeManga(manga)
-			val entity = db.preferencesDao.find(manga.id) ?: newEntity(manga.id)
-			db.preferencesDao.upsert(entity.copy(mode = mode.id))
-		}
-	}
-
-	suspend fun saveColorFilter(manga: Manga, colorFilter: ReaderColorFilter?) {
-		db.withTransaction {
-			storeManga(manga)
-			val entity = db.preferencesDao.find(manga.id) ?: newEntity(manga.id)
+			db.tagsDao.upsert(tags)
+			db.mangaDao.upsert(manga.toEntity(), tags)
 			db.preferencesDao.upsert(
-				entity.copy(
-					cfBrightness = colorFilter?.brightness ?: 0f,
-					cfContrast = colorFilter?.contrast ?: 0f,
-				),
+				MangaPrefsEntity(
+					mangaId = manga.id,
+					mode = mode.id
+				)
 			)
 		}
 	}
@@ -60,16 +28,6 @@ class MangaDataRepository @Inject constructor(
 		return db.preferencesDao.find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
 	}
 
-	suspend fun getColorFilter(mangaId: Long): ReaderColorFilter? {
-		return db.preferencesDao.find(mangaId)?.getColorFilterOrNull()
-	}
-
-	fun observeColorFilter(mangaId: Long): Flow<ReaderColorFilter?> {
-		return db.preferencesDao.observe(mangaId)
-			.map { it?.getColorFilterOrNull() }
-			.distinctUntilChanged()
-	}
-
 	suspend fun findMangaById(mangaId: Long): Manga? {
 		return db.mangaDao.find(mangaId)?.toManga()
 	}
@@ -91,74 +49,4 @@ class MangaDataRepository @Inject constructor(
 	suspend fun findTags(source: MangaSource): Set<MangaTag> {
 		return db.tagsDao.findTags(source.name).toMangaTags()
 	}
-
-	private fun MangaPrefsEntity.getColorFilterOrNull(): ReaderColorFilter? {
-		return if (cfBrightness != 0f || cfContrast != 0f) {
-			ReaderColorFilter(cfBrightness, cfContrast)
-		} else {
-			null
-		}
-	}
-
-	/**
-	 * Automatic determine type of manga by page size
-	 * @return ReaderMode.WEBTOON if page is wide
-	 */
-	suspend fun determineMangaIsWebtoon(repository: MangaRepository, pages: List<MangaPage>): Boolean {
-		val pageIndex = (pages.size * 0.3).roundToInt()
-		val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
-		val url = repository.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()
-			okHttpClient.newCall(request).await().use {
-				runInterruptible(Dispatchers.IO) {
-					getBitmapSize(it.body?.byteStream())
-				}
-			}
-		}
-		return size.width * MIN_WEBTOON_RATIO < size.height
-	}
-
-	private fun newEntity(mangaId: Long) = MangaPrefsEntity(
-		mangaId = mangaId,
-		mode = -1,
-		cfBrightness = 0f,
-		cfContrast = 0f,
-	)
-
-	companion object {
-
-		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/MangaIntent.kt

@@ -5,8 +5,6 @@ import android.net.Uri
 import android.os.Bundle
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.getParcelableCompat
-import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
 
 class MangaIntent private constructor(
 	val manga: Manga?,
@@ -15,15 +13,15 @@ class MangaIntent private constructor(
 ) {
 
 	constructor(intent: Intent?) : this(
-		manga = intent?.getParcelableExtraCompat<ParcelableManga>(KEY_MANGA)?.manga,
+		manga = intent?.getParcelableExtra<ParcelableManga>(KEY_MANGA)?.manga,
 		mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
-		uri = intent?.data,
+		uri = intent?.data
 	)
 
 	constructor(args: Bundle?) : this(
-		manga = args?.getParcelableCompat<ParcelableManga>(KEY_MANGA)?.manga,
+		manga = args?.getParcelable<ParcelableManga>(KEY_MANGA)?.manga,
 		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
-		uri = null,
+		uri = null
 	)
 
 	companion object {

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

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

@@ -26,4 +26,4 @@ fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.D
 operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {
 	this.reverse()
 	other.reverse()
-}
+}

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

@@ -21,14 +21,14 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 		viewBinding = binding
 		return MaterialAlertDialogBuilder(requireContext(), theme)
 			.setView(binding.root)
-			.run(::onBuildDialog)
+			.also(::onBuildDialog)
 			.create()
 	}
 
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
-		savedInstanceState: Bundle?,
+		savedInstanceState: Bundle?
 	) = viewBinding?.root
 
 	@CallSuper
@@ -37,9 +37,9 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 		super.onDestroyView()
 	}
 
-	open fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder = builder
+	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/BaseActivity.kt

@@ -12,32 +12,24 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.ActionBarContextView
 import androidx.appcompat.widget.Toolbar
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
+import androidx.core.app.ActivityCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
-import dagger.hilt.android.EntryPointAccessors
+import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
-import org.koitharu.kotatsu.base.ui.util.BaseActivityEntryPoint
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
-import org.koitharu.kotatsu.base.ui.util.inject
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.utils.ext.getThemeColor
-import javax.inject.Inject
 
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
 	WindowInsetsDelegate.WindowInsetsListener {
 
-	@Inject
-	lateinit var settings: AppSettings
-
 	protected lateinit var binding: B
 		private set
 
@@ -50,7 +42,7 @@ abstract class BaseActivity<B : ViewBinding> :
 	val actionModeDelegate = ActionModeDelegate()
 
 	override fun onCreate(savedInstanceState: Bundle?) {
-		EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).inject(this)
+		val settings = get<AppSettings>()
 		val isAmoled = settings.isAmoledTheme
 		val isDynamic = settings.isDynamicTheme
 		// TODO support DialogWhenLarge theme
@@ -91,8 +83,7 @@ abstract class BaseActivity<B : ViewBinding> :
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) { // TODO remove
-			// ActivityCompat.recreate(this)
-			TODO("Test error")
+			ActivityCompat.recreate(this)
 			return true
 		}
 		return super.onKeyDown(keyCode, event)
@@ -105,36 +96,27 @@ abstract class BaseActivity<B : ViewBinding> :
 	protected fun isDarkAmoledTheme(): Boolean {
 		val uiMode = resources.configuration.uiMode
 		val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-		return isNight && settings.isAmoledTheme
+		return isNight && get<AppSettings>().isAmoledTheme
 	}
 
 	@CallSuper
 	override fun onSupportActionModeStarted(mode: ActionMode) {
 		super.onSupportActionModeStarted(mode)
 		actionModeDelegate.onSupportActionModeStarted(mode)
-		val actionModeColor = ColorUtils.compositeColors(
-			ContextCompat.getColor(this, com.google.android.material.R.color.m3_appbar_overlay_color),
-			getThemeColor(com.google.android.material.R.attr.colorSurface),
-		)
 		val insets = ViewCompat.getRootWindowInsets(binding.root)
 			?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
-		findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar).apply {
-			setBackgroundColor(actionModeColor)
-			updateLayoutParams<ViewGroup.MarginLayoutParams> {
-				topMargin = insets.top
-			}
+		val view = findViewById<ActionBarContextView?>(androidx.appcompat.R.id.action_mode_bar)
+		view?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+			topMargin = insets.top
 		}
-		window.statusBarColor = actionModeColor
 	}
 
 	@CallSuper
 	override fun onSupportActionModeFinished(mode: ActionMode) {
 		super.onSupportActionModeFinished(mode)
 		actionModeDelegate.onSupportActionModeFinished(mode)
-		window.statusBarColor = getThemeColor(android.R.attr.statusBarColor)
 	}
 
-	@Suppress("OVERRIDE_DEPRECATION", "DEPRECATION")
 	override fun onBackPressed() {
 		if ( // https://issuetracker.google.com/issues/139738913
 			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&
@@ -146,4 +128,4 @@ abstract class BaseActivity<B : ViewBinding> :
 			super.onBackPressed()
 		}
 	}
-}
+}

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

@@ -9,13 +9,13 @@ import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
-import com.google.android.material.R as materialR
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
 import org.koitharu.kotatsu.utils.ext.displayCompat
+import com.google.android.material.R as materialR
 
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 
@@ -30,7 +30,7 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
-		savedInstanceState: Bundle?,
+		savedInstanceState: Bundle?
 	): View {
 		val binding = onInflateView(inflater, container)
 		viewBinding = binding
@@ -83,4 +83,4 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		}
 		b.isDraggable = !isLocked
 	}
-}
+}

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

@@ -52,4 +52,4 @@ abstract class BaseFragment<B : ViewBinding> :
 	protected fun bindingOrNull() = viewBinding
 
 	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-}
+}

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

@@ -8,21 +8,18 @@ import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.settings.SettingsHeadersFragment
 
-@AndroidEntryPoint
 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	PreferenceFragmentCompat(),
 	WindowInsetsDelegate.WindowInsetsListener,
 	RecyclerViewOwner {
 
-	@Inject
-	lateinit var settings: AppSettings
+	protected val settings by inject<AppSettings>(mode = LazyThreadSafetyMode.NONE)
 
 	@Suppress("LeakingThis")
 	protected val insetsDelegate = WindowInsetsDelegate(this)
@@ -51,7 +48,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	@CallSuper
 	override fun onWindowInsetsChanged(insets: Insets) {
 		listView.updatePadding(
-			bottom = insets.bottom,
+			bottom = insets.bottom
 		)
 	}
 
@@ -60,4 +57,4 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 		(parentFragment as? SettingsHeadersFragment)?.setTitle(title)
 			?: activity?.setTitle(title)
 	}
-}
+}

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

@@ -15,7 +15,7 @@ abstract class CoroutineIntentService : BaseService() {
 	private val mutex = Mutex()
 	protected open val dispatcher: CoroutineDispatcher = Dispatchers.Default
 
-	final override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
 		launchCoroutine(intent, startId)
 		return Service.START_REDELIVER_INTENT
@@ -34,4 +34,4 @@ abstract class CoroutineIntentService : BaseService() {
 	}
 
 	protected abstract suspend fun processIntent(intent: Intent?)
-}
+}

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

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.base.ui.dialog
-
-import android.content.DialogInterface
-
-class RememberSelectionDialogListener(initialValue: Int) : DialogInterface.OnClickListener {
-
-	var selection: Int = initialValue
-		private set
-
-	override fun onClick(dialog: DialogInterface?, which: Int) {
-		selection = which
-	}
-}

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

@@ -12,9 +12,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
 import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryOwner
-import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.Dispatchers
 import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+import kotlin.coroutines.EmptyCoroutineContext
 
 private const val KEY_SELECTION = "selection"
 private const val PROVIDER_NAME = "selection_decoration"
@@ -23,18 +23,15 @@ class ListSelectionController(
 	private val activity: Activity,
 	private val decoration: AbstractSelectionItemDecoration,
 	private val registryOwner: SavedStateRegistryOwner,
-	private val callback: Callback2,
+	private val callback: Callback,
 ) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
 
 	private var actionMode: ActionMode? = null
+	private val stateEventObserver = StateEventObserver()
 
 	val count: Int
 		get() = decoration.checkedItemsCount
 
-	init {
-		registryOwner.lifecycle.addObserver(StateEventObserver())
-	}
-
 	fun snapshot(): Set<Long> {
 		return peekCheckedIds().toSet()
 	}
@@ -58,6 +55,7 @@ class ListSelectionController(
 
 	fun attachToRecyclerView(recyclerView: RecyclerView) {
 		recyclerView.addItemDecoration(decoration)
+		registryOwner.lifecycle.addObserver(stateEventObserver)
 	}
 
 	override fun saveState(): Bundle {
@@ -89,19 +87,19 @@ class ListSelectionController(
 	}
 
 	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onCreateActionMode(this, mode, menu)
+		return callback.onCreateActionMode(mode, menu)
 	}
 
 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onPrepareActionMode(this, mode, menu)
+		return callback.onPrepareActionMode(mode, menu)
 	}
 
 	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-		return callback.onActionItemClicked(this, mode, item)
+		return callback.onActionItemClicked(mode, item)
 	}
 
 	override fun onDestroyActionMode(mode: ActionMode) {
-		callback.onDestroyActionMode(this, mode)
+		callback.onDestroyActionMode(mode)
 		clear()
 		actionMode = null
 	}
@@ -114,7 +112,7 @@ class ListSelectionController(
 
 	private fun notifySelectionChanged() {
 		val count = decoration.checkedItemsCount
-		callback.onSelectionChanged(this, count)
+		callback.onSelectionChanged(count)
 		if (count == 0) {
 			actionMode?.finish()
 		} else {
@@ -131,56 +129,17 @@ class ListSelectionController(
 		notifySelectionChanged()
 	}
 
-	@Deprecated("")
-	interface Callback : Callback2 {
+	interface Callback : ActionMode.Callback {
 
 		fun onSelectionChanged(count: Int)
 
-		fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
+		override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
 
-		fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
+		override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
 
-		fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
+		override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
 
-		fun onDestroyActionMode(mode: ActionMode) = Unit
-
-		override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
-			onSelectionChanged(count)
-		}
-
-		override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-			return onCreateActionMode(mode, menu)
-		}
-
-		override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-			return onPrepareActionMode(mode, menu)
-		}
-
-		override fun onActionItemClicked(
-			controller: ListSelectionController,
-			mode: ActionMode,
-			item: MenuItem,
-		): Boolean = onActionItemClicked(mode, item)
-
-		override fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) {
-			onDestroyActionMode(mode)
-		}
-	}
-
-	interface Callback2 {
-
-		fun onSelectionChanged(controller: ListSelectionController, count: Int)
-
-		fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean
-
-		fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-			mode.title = controller.count.toString()
-			return true
-		}
-
-		fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean
-
-		fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) = Unit
+		override fun onDestroyActionMode(mode: ActionMode) = Unit
 	}
 
 	private inner class StateEventObserver : LifecycleEventObserver {
@@ -200,4 +159,4 @@ class ListSelectionController(
 			}
 		}
 	}
-}
+}

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

@@ -1,237 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list
-
-import android.app.Activity
-import android.os.Bundle
-import android.util.ArrayMap
-import android.view.Menu
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.ActionMode
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import androidx.savedstate.SavedStateRegistry
-import androidx.savedstate.SavedStateRegistryOwner
-import kotlin.coroutines.EmptyCoroutineContext
-import kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
-
-private const val PROVIDER_NAME = "selection_decoration_sectioned"
-
-class SectionedSelectionController<T : Any>(
-	private val activity: Activity,
-	private val owner: SavedStateRegistryOwner,
-	private val callback: Callback<T>,
-) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
-
-	private var actionMode: ActionMode? = null
-
-	private var pendingData: MutableMap<String, Collection<Long>>? = null
-	private val decorations = ArrayMap<T, AbstractSelectionItemDecoration>()
-
-	val count: Int
-		get() = decorations.values.sumOf { it.checkedItemsCount }
-
-	init {
-		owner.lifecycle.addObserver(StateEventObserver())
-	}
-
-	fun snapshot(): Map<T, Set<Long>> {
-		return decorations.mapValues { it.value.checkedItemsIds.toSet() }
-	}
-
-	fun peekCheckedIds(): Map<T, Set<Long>> {
-		return decorations.mapValues { it.value.checkedItemsIds }
-	}
-
-	fun clear() {
-		decorations.values.forEach {
-			it.clearSelection()
-		}
-		notifySelectionChanged()
-	}
-
-	fun attachToRecyclerView(section: T, recyclerView: RecyclerView) {
-		val decoration = getDecoration(section)
-		val pendingIds = pendingData?.remove(section.toString())
-		if (!pendingIds.isNullOrEmpty()) {
-			decoration.checkAll(pendingIds)
-			startActionMode()
-			notifySelectionChanged()
-		}
-		var shouldAddDecoration = true
-		for (i in (0 until recyclerView.itemDecorationCount).reversed()) {
-			val decor = recyclerView.getItemDecorationAt(i)
-			if (decor === decoration) {
-				shouldAddDecoration = false
-				break
-			} else if (decor.javaClass == decoration.javaClass) {
-				recyclerView.removeItemDecorationAt(i)
-			}
-		}
-		if (shouldAddDecoration) {
-			recyclerView.addItemDecoration(decoration)
-		}
-		if (pendingData?.isEmpty() == true) {
-			pendingData = null
-		}
-	}
-
-	override fun saveState(): Bundle {
-		val bundle = Bundle(decorations.size)
-		for ((k, v) in decorations) {
-			bundle.putLongArray(k.toString(), v.checkedItemsIds.toLongArray())
-		}
-		return bundle
-	}
-
-	fun onItemClick(section: T, id: Long): Boolean {
-		val decoration = getDecoration(section)
-		if (isInSelectionMode()) {
-			decoration.toggleItemChecked(id)
-			if (isInSelectionMode()) {
-				actionMode?.invalidate()
-			} else {
-				actionMode?.finish()
-			}
-			notifySelectionChanged()
-			return true
-		}
-		return false
-	}
-
-	fun onItemLongClick(section: T, id: Long): Boolean {
-		val decoration = getDecoration(section)
-		startActionMode()
-		return actionMode?.also {
-			decoration.setItemIsChecked(id, true)
-			notifySelectionChanged()
-		} != null
-	}
-
-	fun getSectionCount(section: T): Int {
-		return decorations[section]?.checkedItemsCount ?: 0
-	}
-
-	fun addToSelection(section: T, ids: Collection<Long>): Boolean {
-		val decoration = getDecoration(section)
-		startActionMode()
-		return actionMode?.also {
-			decoration.checkAll(ids)
-			notifySelectionChanged()
-		} != null
-	}
-
-	fun clearSelection(section: T) {
-		decorations[section]?.clearSelection() ?: return
-		notifySelectionChanged()
-	}
-
-	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onCreateActionMode(this, mode, menu)
-	}
-
-	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onPrepareActionMode(this, mode, menu)
-	}
-
-	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-		return callback.onActionItemClicked(this, mode, item)
-	}
-
-	override fun onDestroyActionMode(mode: ActionMode) {
-		callback.onDestroyActionMode(this, mode)
-		clear()
-		actionMode = null
-	}
-
-	private fun startActionMode() {
-		if (actionMode == null) {
-			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
-		}
-	}
-
-	private fun isInSelectionMode(): Boolean {
-		return decorations.values.any { x -> x.checkedItemsCount > 0 }
-	}
-
-	private fun notifySelectionChanged() {
-		val count = this.count
-		callback.onSelectionChanged(this, count)
-		if (count == 0) {
-			actionMode?.finish()
-		} else {
-			actionMode?.invalidate()
-		}
-	}
-
-	private fun restoreState(ids: MutableMap<String, Collection<Long>>) {
-		if (ids.isEmpty() || isInSelectionMode()) {
-			return
-		}
-		for ((k, v) in decorations) {
-			val items = ids.remove(k.toString())
-			if (!items.isNullOrEmpty()) {
-				v.checkAll(items)
-			}
-		}
-		pendingData = ids
-		if (isInSelectionMode()) {
-			startActionMode()
-			notifySelectionChanged()
-		}
-	}
-
-	private fun getDecoration(section: T): AbstractSelectionItemDecoration {
-		return decorations.getOrPut(section) {
-			callback.onCreateItemDecoration(this, section)
-		}
-	}
-
-	interface Callback<T : Any> {
-
-		fun onSelectionChanged(controller: SectionedSelectionController<T>, count: Int)
-
-		fun onCreateActionMode(controller: SectionedSelectionController<T>, mode: ActionMode, menu: Menu): Boolean
-
-		fun onPrepareActionMode(controller: SectionedSelectionController<T>, mode: ActionMode, menu: Menu): Boolean {
-			mode.title = controller.count.toString()
-			return true
-		}
-
-		fun onDestroyActionMode(controller: SectionedSelectionController<T>, mode: ActionMode) = Unit
-
-		fun onActionItemClicked(
-			controller: SectionedSelectionController<T>,
-			mode: ActionMode,
-			item: MenuItem,
-		): Boolean
-
-		fun onCreateItemDecoration(
-			controller: SectionedSelectionController<T>,
-			section: T,
-		): AbstractSelectionItemDecoration
-	}
-
-	private inner class StateEventObserver : LifecycleEventObserver {
-
-		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-			if (event == Lifecycle.Event.ON_CREATE) {
-				val registry = owner.savedStateRegistry
-				registry.registerSavedStateProvider(PROVIDER_NAME, this@SectionedSelectionController)
-				val state = registry.consumeRestoredStateForKey(PROVIDER_NAME)
-				if (state != null) {
-					Dispatchers.Main.dispatch(EmptyCoroutineContext) { // == Handler.post
-						if (source.lifecycle.currentState.isAtLeast(Lifecycle.State.CREATED)) {
-							restoreState(
-								state.keySet()
-									.associateWithTo(HashMap()) { state.getLongArray(it)?.toList().orEmpty() },
-							)
-						}
-					}
-				}
-			}
-		}
-	}
-}

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

@@ -11,8 +11,8 @@ class SpacingItemDecoration(@Px private val spacing: Int) : RecyclerView.ItemDec
 		outRect: Rect,
 		view: View,
 		parent: RecyclerView,
-		state: RecyclerView.State,
+		state: RecyclerView.State
 	) {
 		outRect.set(spacing, spacing, spacing, spacing)
 	}
-}
+}

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

@@ -1,84 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.fastscroll
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.view.View
-import android.view.ViewAnimationUtils
-import android.view.animation.AccelerateInterpolator
-import android.view.animation.DecelerateInterpolator
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import kotlin.math.hypot
-import org.koitharu.kotatsu.utils.ext.animatorDurationScale
-import org.koitharu.kotatsu.utils.ext.measureWidth
-
-class BubbleAnimator(
-	private val bubble: View,
-) {
-
-	private val animationDuration = (
-		bubble.resources.getInteger(android.R.integer.config_shortAnimTime) *
-			bubble.context.animatorDurationScale
-		).toLong()
-	private var animator: Animator? = null
-	private var isHiding = false
-
-	fun show() {
-		if (bubble.isVisible && !isHiding) {
-			return
-		}
-		isHiding = false
-		animator?.cancel()
-		animator = ViewAnimationUtils.createCircularReveal(
-			bubble,
-			bubble.measureWidth(),
-			bubble.measuredHeight,
-			0f,
-			hypot(bubble.width.toDouble(), bubble.height.toDouble()).toFloat(),
-		).apply {
-			bubble.isVisible = true
-			duration = animationDuration
-			interpolator = DecelerateInterpolator()
-			start()
-		}
-	}
-
-	fun hide() {
-		if (!bubble.isVisible || isHiding) {
-			return
-		}
-		animator?.cancel()
-		isHiding = true
-		animator = ViewAnimationUtils.createCircularReveal(
-			bubble,
-			bubble.width,
-			bubble.height,
-			hypot(bubble.width.toDouble(), bubble.height.toDouble()).toFloat(),
-			0f,
-		).apply {
-			duration = animationDuration
-			interpolator = AccelerateInterpolator()
-			addListener(HideListener())
-			start()
-		}
-	}
-
-	private inner class HideListener : AnimatorListenerAdapter() {
-
-		private var isCancelled = false
-
-		override fun onAnimationCancel(animation: Animator) {
-			super.onAnimationCancel(animation)
-			isCancelled = true
-		}
-
-		override fun onAnimationEnd(animation: Animator) {
-			super.onAnimationEnd(animation)
-			if (!isCancelled && animation === this@BubbleAnimator.animator) {
-				bubble.isInvisible = true
-				isHiding = false
-				this@BubbleAnimator.animator = null
-			}
-		}
-	}
-}

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

@@ -1,45 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.fastscroll
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.ViewGroup
-import androidx.annotation.AttrRes
-import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.R
-
-class FastScrollRecyclerView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = androidx.recyclerview.R.attr.recyclerViewStyle,
-) : RecyclerView(context, attrs, defStyleAttr) {
-
-	val fastScroller = FastScroller(context, attrs)
-
-	init {
-		fastScroller.id = R.id.fast_scroller
-		fastScroller.layoutParams = ViewGroup.LayoutParams(
-			ViewGroup.LayoutParams.WRAP_CONTENT,
-			ViewGroup.LayoutParams.MATCH_PARENT,
-		)
-	}
-
-	override fun setAdapter(adapter: Adapter<*>?) {
-		super.setAdapter(adapter)
-		fastScroller.setSectionIndexer(adapter as? FastScroller.SectionIndexer)
-	}
-
-	override fun setVisibility(visibility: Int) {
-		super.setVisibility(visibility)
-		fastScroller.visibility = visibility
-	}
-
-	override fun onAttachedToWindow() {
-		super.onAttachedToWindow()
-		fastScroller.attachRecyclerView(this)
-	}
-
-	override fun onDetachedFromWindow() {
-		fastScroller.detachRecyclerView()
-		super.onDetachedFromWindow()
-	}
-}

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

@@ -1,521 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.fastscroll
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.res.TypedArray
-import android.graphics.Color
-import android.graphics.drawable.Drawable
-import android.util.AttributeSet
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.ViewGroup
-import android.widget.*
-import androidx.annotation.*
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.ConstraintSet
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.content.ContextCompat
-import androidx.core.content.withStyledAttributes
-import androidx.core.view.GravityCompat
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.FastScrollerBinding
-import org.koitharu.kotatsu.utils.ext.getThemeColor
-import org.koitharu.kotatsu.utils.ext.isLayoutReversed
-import kotlin.math.roundToInt
-import com.google.android.material.R as materialR
-
-private const val SCROLLBAR_HIDE_DELAY = 1000L
-private const val TRACK_SNAP_RANGE = 5
-
-@Suppress("MemberVisibilityCanBePrivate", "unused")
-class FastScroller @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = R.attr.fastScrollerStyle,
-) : LinearLayout(context, attrs, defStyleAttr) {
-
-	enum class BubbleSize(@DrawableRes val drawableId: Int, @DimenRes val textSizeId: Int) {
-		NORMAL(R.drawable.fastscroll_bubble, R.dimen.fastscroll_bubble_text_size),
-		SMALL(R.drawable.fastscroll_bubble_small, R.dimen.fastscroll_bubble_text_size_small)
-	}
-
-	private val binding = FastScrollerBinding.inflate(LayoutInflater.from(context), this)
-
-	private val scrollbarPaddingEnd = context.resources.getDimension(R.dimen.fastscroll_scrollbar_padding_end)
-
-	@ColorInt
-	private var bubbleColor = 0
-
-	@ColorInt
-	private var handleColor = 0
-
-	private var bubbleHeight = 0
-	private var handleHeight = 0
-	private var viewHeight = 0
-	private var hideScrollbar = true
-	private var showBubble = true
-	private var showBubbleAlways = false
-	private var bubbleSize = BubbleSize.NORMAL
-	private var bubbleImage: Drawable? = null
-	private var handleImage: Drawable? = null
-	private var trackImage: Drawable? = null
-	private var recyclerView: RecyclerView? = null
-	private val scrollbarAnimator = ScrollbarAnimator(binding.scrollbar, scrollbarPaddingEnd)
-	private val bubbleAnimator = BubbleAnimator(binding.bubble)
-
-	private var fastScrollListener: FastScrollListener? = null
-	private var sectionIndexer: SectionIndexer? = null
-
-	private val scrollbarHider = Runnable {
-		hideBubble()
-		hideScrollbar()
-	}
-
-	private val scrollListener: RecyclerView.OnScrollListener = object : RecyclerView.OnScrollListener() {
-		override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-			if (!binding.thumb.isSelected && isEnabled) {
-				val y = recyclerView.scrollProportion
-				setViewPositions(y)
-
-				if (showBubbleAlways) {
-					val targetPos = getRecyclerViewTargetPosition(y)
-					sectionIndexer?.let { binding.bubble.text = it.getSectionText(recyclerView.context, targetPos) }
-				}
-			}
-		}
-
-		override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-			super.onScrollStateChanged(recyclerView, newState)
-
-			if (isEnabled) {
-				when (newState) {
-					RecyclerView.SCROLL_STATE_DRAGGING -> {
-						handler.removeCallbacks(scrollbarHider)
-						showScrollbar()
-						if (showBubbleAlways && sectionIndexer != null) showBubble()
-					}
-					RecyclerView.SCROLL_STATE_IDLE -> if (hideScrollbar && !binding.thumb.isSelected) {
-						handler.postDelayed(scrollbarHider, SCROLLBAR_HIDE_DELAY)
-					}
-				}
-			}
-		}
-	}
-
-	private val RecyclerView.scrollProportion: Float
-		get() {
-			val rangeDiff = computeVerticalScrollRange() - computeVerticalScrollExtent()
-			val proportion = computeVerticalScrollOffset() / if (rangeDiff > 0) rangeDiff.toFloat() else 1f
-			return viewHeight * proportion
-		}
-
-	init {
-		clipChildren = false
-		orientation = HORIZONTAL
-
-		@ColorInt var bubbleColor = context.getThemeColor(materialR.attr.colorControlNormal, Color.DKGRAY)
-		@ColorInt var handleColor = bubbleColor
-		@ColorInt var trackColor = context.getThemeColor(materialR.attr.colorOutline, Color.LTGRAY)
-		@ColorInt var textColor = context.getThemeColor(android.R.attr.textColorPrimaryInverse, Color.WHITE)
-
-		var showTrack = false
-
-		context.withStyledAttributes(attrs, R.styleable.FastScroller, defStyleAttr) {
-			bubbleColor = getColor(R.styleable.FastScroller_bubbleColor, bubbleColor)
-			handleColor = getColor(R.styleable.FastScroller_thumbColor, handleColor)
-			trackColor = getColor(R.styleable.FastScroller_trackColor, trackColor)
-			textColor = getColor(R.styleable.FastScroller_bubbleTextColor, textColor)
-			hideScrollbar = getBoolean(R.styleable.FastScroller_hideScrollbar, hideScrollbar)
-			showBubble = getBoolean(R.styleable.FastScroller_showBubble, showBubble)
-			showBubbleAlways = getBoolean(R.styleable.FastScroller_showBubbleAlways, showBubbleAlways)
-			showTrack = getBoolean(R.styleable.FastScroller_showTrack, showTrack)
-			bubbleSize = getBubbleSize(R.styleable.FastScroller_bubbleSize, BubbleSize.NORMAL)
-			val textSize = getDimension(R.styleable.FastScroller_bubbleTextSize, bubbleSize.textSize)
-			binding.bubble.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
-		}
-
-		setTrackColor(trackColor)
-		setHandleColor(handleColor)
-		setBubbleColor(bubbleColor)
-		setBubbleTextColor(textColor)
-		setHideScrollbar(hideScrollbar)
-		setBubbleVisible(showBubble, showBubbleAlways)
-		setTrackVisible(showTrack)
-	}
-
-	override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) {
-		super.onSizeChanged(w, h, oldW, oldH)
-		viewHeight = h
-	}
-
-	@SuppressLint("ClickableViewAccessibility")
-	override fun onTouchEvent(event: MotionEvent): Boolean {
-		val setYPositions: () -> Unit = {
-			val y = event.y
-			setViewPositions(y)
-			setRecyclerViewPosition(y)
-		}
-
-		when (event.actionMasked) {
-			MotionEvent.ACTION_DOWN -> {
-				if (event.x.toInt() !in binding.scrollbar.left..binding.scrollbar.right) return false
-
-				requestDisallowInterceptTouchEvent(true)
-				setHandleSelected(true)
-
-				handler.removeCallbacks(scrollbarHider)
-				showScrollbar()
-				if (showBubble && sectionIndexer != null) showBubble()
-
-				fastScrollListener?.onFastScrollStart(this)
-
-				setYPositions()
-				return true
-			}
-			MotionEvent.ACTION_MOVE -> {
-				setYPositions()
-				return true
-			}
-			MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
-				requestDisallowInterceptTouchEvent(false)
-				setHandleSelected(false)
-
-				if (hideScrollbar) handler.postDelayed(scrollbarHider, SCROLLBAR_HIDE_DELAY)
-				if (!showBubbleAlways) hideBubble()
-
-				fastScrollListener?.onFastScrollStop(this)
-
-				return true
-			}
-		}
-
-		return super.onTouchEvent(event)
-	}
-
-	/**
-	 * Set the enabled state of this view.
-	 *
-	 * @param enabled True if this view is enabled, false otherwise
-	 */
-	override fun setEnabled(enabled: Boolean) {
-		super.setEnabled(enabled)
-		isVisible = enabled
-	}
-
-	/**
-	 * Set the [ViewGroup.LayoutParams] associated with this view. These supply
-	 * parameters to the *parent* of this view specifying how it should be arranged.
-	 *
-	 * @param params The [ViewGroup.LayoutParams] for this view, cannot be null
-	 */
-	override fun setLayoutParams(params: ViewGroup.LayoutParams) {
-		params.width = LayoutParams.WRAP_CONTENT
-		super.setLayoutParams(params)
-	}
-
-	/**
-	 * Set the [ViewGroup.LayoutParams] associated with this view. These supply
-	 * parameters to the *parent* of this view specifying how it should be arranged.
-	 *
-	 * @param viewGroup The parent [ViewGroup] for this view, cannot be null
-	 */
-	fun setLayoutParams(viewGroup: ViewGroup) {
-		val recyclerViewId = recyclerView?.id ?: NO_ID
-		val marginTop = resources.getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_top)
-		val marginBottom = resources.getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_bottom)
-
-		require(recyclerViewId != NO_ID) { "RecyclerView must have a view ID" }
-
-		when (viewGroup) {
-			is ConstraintLayout -> {
-				val endId = if (recyclerView?.parent === parent) recyclerViewId else ConstraintSet.PARENT_ID
-				val startId = id
-
-				ConstraintSet().apply {
-					clone(viewGroup)
-					connect(startId, ConstraintSet.TOP, endId, ConstraintSet.TOP)
-					connect(startId, ConstraintSet.BOTTOM, endId, ConstraintSet.BOTTOM)
-					connect(startId, ConstraintSet.END, endId, ConstraintSet.END)
-					applyTo(viewGroup)
-				}
-
-				layoutParams = (layoutParams as ConstraintLayout.LayoutParams).apply {
-					height = 0
-					setMargins(0, marginTop, 0, marginBottom)
-				}
-			}
-			is CoordinatorLayout -> layoutParams = (layoutParams as CoordinatorLayout.LayoutParams).apply {
-				height = LayoutParams.MATCH_PARENT
-				anchorGravity = GravityCompat.END
-				anchorId = recyclerViewId
-				setMargins(0, marginTop, 0, marginBottom)
-			}
-			is FrameLayout -> layoutParams = (layoutParams as FrameLayout.LayoutParams).apply {
-				height = LayoutParams.MATCH_PARENT
-				gravity = GravityCompat.END
-				setMargins(0, marginTop, 0, marginBottom)
-			}
-			is RelativeLayout -> layoutParams = (layoutParams as RelativeLayout.LayoutParams).apply {
-				height = 0
-				addRule(RelativeLayout.ALIGN_TOP, recyclerViewId)
-				addRule(RelativeLayout.ALIGN_BOTTOM, recyclerViewId)
-				addRule(RelativeLayout.ALIGN_END, recyclerViewId)
-				setMargins(0, marginTop, 0, marginBottom)
-			}
-			else -> throw IllegalArgumentException("Parent ViewGroup must be a ConstraintLayout, CoordinatorLayout, FrameLayout, or RelativeLayout")
-		}
-
-		updateViewHeights()
-	}
-
-	/**
-	 * Set the [RecyclerView] associated with this [FastScroller]. This allows the
-	 * FastScroller to set its layout parameters and listen for scroll changes.
-	 *
-	 * @param recyclerView The [RecyclerView] to attach, cannot be null
-	 * @see detachRecyclerView
-	 */
-	fun attachRecyclerView(recyclerView: RecyclerView) {
-		if (this.recyclerView != null) {
-			detachRecyclerView()
-		}
-		this.recyclerView = recyclerView
-
-		if (parent is ViewGroup) {
-			setLayoutParams(parent as ViewGroup)
-		} else if (recyclerView.parent is ViewGroup) {
-			val viewGroup = recyclerView.parent as ViewGroup
-			viewGroup.addView(this)
-			setLayoutParams(viewGroup)
-		}
-
-		recyclerView.addOnScrollListener(scrollListener)
-
-		// set initial positions for bubble and thumb
-		post { setViewPositions(this.recyclerView?.scrollProportion ?: 0f) }
-	}
-
-	/**
-	 * Clears references to the attached [RecyclerView] and stops listening for scroll changes.
-	 *
-	 * @see attachRecyclerView
-	 */
-	fun detachRecyclerView() {
-		recyclerView?.removeOnScrollListener(scrollListener)
-		recyclerView = null
-	}
-
-	/**
-	 * Set a new [FastScrollListener] that will listen to fast scroll events.
-	 *
-	 * @param fastScrollListener The new [FastScrollListener] to set, or null to set none
-	 */
-	fun setFastScrollListener(fastScrollListener: FastScrollListener?) {
-		this.fastScrollListener = fastScrollListener
-	}
-
-	/**
-	 * Set a new [SectionIndexer] that provides section text for this [FastScroller].
-	 *
-	 * @param sectionIndexer The new [SectionIndexer] to set, or null to set none
-	 */
-	fun setSectionIndexer(sectionIndexer: SectionIndexer?) {
-		this.sectionIndexer = sectionIndexer
-	}
-
-	/**
-	 * Hide the scrollbar when not scrolling.
-	 *
-	 * @param hideScrollbar True to hide the scrollbar, false to show
-	 */
-	fun setHideScrollbar(hideScrollbar: Boolean) {
-		if (this.hideScrollbar != hideScrollbar) {
-			this.hideScrollbar = hideScrollbar
-			binding.scrollbar.isGone = hideScrollbar
-		}
-	}
-
-	/**
-	 * Show the scroll track while scrolling.
-	 *
-	 * @param visible True to show scroll track, false to hide
-	 */
-	fun setTrackVisible(visible: Boolean) {
-		binding.track.isVisible = visible
-	}
-
-	/**
-	 * Set the color of the scroll track.
-	 *
-	 * @param color The color for the scroll track
-	 */
-	fun setTrackColor(@ColorInt color: Int) {
-		if (trackImage == null) {
-			trackImage = ContextCompat.getDrawable(context, R.drawable.fastscroll_track)
-		}
-
-		trackImage?.let {
-			it.setTint(color)
-			binding.track.setImageDrawable(it)
-		}
-	}
-
-	/**
-	 * Set the color of the scroll thumb.
-	 *
-	 * @param color The color for the scroll thumb
-	 */
-	fun setHandleColor(@ColorInt color: Int) {
-		handleColor = color
-
-		if (handleImage == null) {
-			handleImage = ContextCompat.getDrawable(context, R.drawable.fastscroll_handle)
-		}
-
-		handleImage?.let {
-			it.setTint(handleColor)
-			binding.thumb.setImageDrawable(it)
-		}
-	}
-
-	/**
-	 * Show the section bubble while scrolling.
-	 *
-	 * @param visible True to show the bubble, false to hide
-	 * @param always  True to always show the bubble, false to only show on thumb touch
-	 */
-	@JvmOverloads
-	fun setBubbleVisible(visible: Boolean, always: Boolean = false) {
-		showBubble = visible
-		showBubbleAlways = visible && always
-	}
-
-	/**
-	 * Set the background color of the section bubble.
-	 *
-	 * @param color The background color for the section bubble
-	 */
-	fun setBubbleColor(@ColorInt color: Int) {
-		bubbleColor = color
-
-		if (bubbleImage == null) {
-			bubbleImage = ContextCompat.getDrawable(context, bubbleSize.drawableId)
-		}
-
-		bubbleImage?.let {
-			it.setTint(bubbleColor)
-			binding.bubble.background = it
-		}
-	}
-
-	/**
-	 * Set the text color of the section bubble.
-	 *
-	 * @param color The text color for the section bubble
-	 */
-	fun setBubbleTextColor(@ColorInt color: Int) = binding.bubble.setTextColor(color)
-
-	/**
-	 * Set the scaled pixel text size of the section bubble.
-	 *
-	 * @param size The scaled pixel text size for the section bubble
-	 */
-	fun setBubbleTextSize(size: Int) {
-		binding.bubble.textSize = size.toFloat()
-	}
-
-	private fun getRecyclerViewTargetPosition(y: Float) = recyclerView?.let { recyclerView ->
-		val itemCount = recyclerView.adapter?.itemCount ?: 0
-
-		val proportion = when {
-			binding.thumb.y == 0f -> 0f
-			binding.thumb.y + handleHeight >= viewHeight - TRACK_SNAP_RANGE -> 1f
-			else -> y / viewHeight.toFloat()
-		}
-
-		var scrolledItemCount = (proportion * itemCount).roundToInt()
-
-		if (recyclerView.layoutManager.isLayoutReversed) {
-			scrolledItemCount = itemCount - scrolledItemCount
-		}
-
-		if (itemCount > 0) scrolledItemCount.coerceIn(0, itemCount - 1) else 0
-	} ?: 0
-
-	private fun setRecyclerViewPosition(y: Float) {
-		val layoutManager = recyclerView?.layoutManager ?: return
-		val targetPos = getRecyclerViewTargetPosition(y)
-		layoutManager.scrollToPosition(targetPos)
-		if (showBubble) sectionIndexer?.let { binding.bubble.text = it.getSectionText(context, targetPos) }
-	}
-
-	private fun setViewPositions(y: Float) {
-		bubbleHeight = binding.bubble.measuredHeight
-		handleHeight = binding.thumb.measuredHeight
-
-		val bubbleHandleHeight = bubbleHeight + handleHeight / 2f
-
-		if (showBubble && viewHeight >= bubbleHandleHeight) {
-			binding.bubble.y = (y - bubbleHeight).coerceIn(0f, viewHeight - bubbleHandleHeight)
-		}
-
-		if (viewHeight >= handleHeight) {
-			binding.thumb.y = (y - handleHeight / 2).coerceIn(0f, viewHeight - handleHeight.toFloat())
-		}
-	}
-
-	private fun updateViewHeights() {
-		val measureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED)
-		binding.bubble.measure(measureSpec, measureSpec)
-		bubbleHeight = binding.bubble.measuredHeight
-		binding.thumb.measure(measureSpec, measureSpec)
-		handleHeight = binding.thumb.measuredHeight
-	}
-
-	private fun showBubble() {
-		bubbleAnimator.show()
-	}
-
-	private fun hideBubble() {
-		bubbleAnimator.hide()
-	}
-
-	private fun showScrollbar() {
-		if (recyclerView?.run { canScrollVertically(1) || canScrollVertically(-1) } == true) {
-			scrollbarAnimator.show()
-		}
-	}
-
-	private fun hideScrollbar() {
-		scrollbarAnimator.hide()
-	}
-
-	private fun setHandleSelected(selected: Boolean) {
-		binding.thumb.isSelected = selected
-		handleImage?.setTint(if (selected) bubbleColor else handleColor)
-	}
-
-	private fun TypedArray.getBubbleSize(@StyleableRes index: Int, defaultValue: BubbleSize): BubbleSize {
-		val ordinal = getInt(index, -1)
-		return BubbleSize.values().getOrNull(ordinal) ?: defaultValue
-	}
-
-	private val BubbleSize.textSize
-		@Px get() = resources.getDimension(textSizeId)
-
-	interface FastScrollListener {
-
-		fun onFastScrollStart(fastScroller: FastScroller)
-
-		fun onFastScrollStop(fastScroller: FastScroller)
-	}
-
-	interface SectionIndexer {
-
-		fun getSectionText(context: Context, position: Int): CharSequence
-	}
-}

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

@@ -1,74 +0,0 @@
-package org.koitharu.kotatsu.base.ui.list.fastscroll
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.view.View
-import android.view.ViewPropertyAnimator
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.animatorDurationScale
-
-class ScrollbarAnimator(
-	private val scrollbar: View,
-	private val scrollbarPaddingEnd: Float,
-) {
-
-	private val animationDuration = (
-		scrollbar.resources.getInteger(R.integer.config_defaultAnimTime) *
-			scrollbar.context.animatorDurationScale
-		).toLong()
-	private var animator: ViewPropertyAnimator? = null
-	private var isHiding = false
-
-	fun show() {
-		if (scrollbar.isVisible && !isHiding) {
-			return
-		}
-		isHiding = false
-		animator?.cancel()
-		scrollbar.translationX = scrollbarPaddingEnd
-		scrollbar.isVisible = true
-		animator = scrollbar
-			.animate()
-			.translationX(0f)
-			.alpha(1f)
-			.setListener(null)
-			.setDuration(animationDuration)
-	}
-
-	fun hide() {
-		if (!scrollbar.isVisible || isHiding) {
-			return
-		}
-		animator?.cancel()
-		isHiding = true
-		animator = scrollbar.animate().apply {
-			translationX(scrollbarPaddingEnd)
-			alpha(0f)
-			duration = animationDuration
-			setListener(HideListener(this))
-		}
-	}
-
-	private inner class HideListener(
-		private val viewPropertyAnimator: ViewPropertyAnimator,
-	) : AnimatorListenerAdapter() {
-
-		private var isCancelled = false
-
-		override fun onAnimationCancel(animation: Animator) {
-			super.onAnimationCancel(animation)
-			isCancelled = true
-		}
-
-		override fun onAnimationEnd(animation: Animator) {
-			super.onAnimationEnd(animation)
-			if (!isCancelled && this@ScrollbarAnimator.animator === viewPropertyAnimator) {
-				scrollbar.isInvisible = true
-				isHiding = false
-				this@ScrollbarAnimator.animator = null
-			}
-		}
-	}
-}

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

@@ -4,11 +4,8 @@ import android.app.Activity
 import android.app.Application.ActivityLifecycleCallbacks
 import android.os.Bundle
 import java.util.*
-import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
-class ActivityRecreationHandle @Inject constructor() : ActivityLifecycleCallbacks {
+class ActivityRecreationHandle : ActivityLifecycleCallbacks {
 
 	private val activities = WeakHashMap<Activity, Unit>()
 
@@ -34,4 +31,4 @@ class ActivityRecreationHandle @Inject constructor() : ActivityLifecycleCallback
 		val snapshot = activities.keys.toList()
 		snapshot.forEach { it.recreate() }
 	}
-}
+}

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

@@ -1,18 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import dagger.hilt.EntryPoint
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.core.prefs.AppSettings
-
-@EntryPoint
-@InstallIn(SingletonComponent::class)
-interface BaseActivityEntryPoint {
-	val settings: AppSettings
-}
-
-// Hilt cannot inject into parametrized classes
-fun BaseActivityEntryPoint.inject(activity: BaseActivity<*>) {
-	activity.settings = settings
-}

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

@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.base.domain.ReversibleHandle
-
-class ReversibleAction(
-	@StringRes val stringResId: Int,
-	val handle: ReversibleHandle?,
-)

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

@@ -1,42 +0,0 @@
-package org.koitharu.kotatsu.base.ui.util
-
-import android.animation.ValueAnimator
-import android.view.animation.AccelerateDecelerateInterpolator
-import com.google.android.material.R as materialR
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.shape.MaterialShapeDrawable
-import org.koitharu.kotatsu.utils.ext.getAnimationDuration
-
-class StatusBarDimHelper : AppBarLayout.OnOffsetChangedListener {
-
-	private var animator: ValueAnimator? = null
-	private val interpolator = AccelerateDecelerateInterpolator()
-
-	override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
-		val foreground = appBarLayout.statusBarForeground ?: return
-		val start = foreground.alpha
-		val collapsed = verticalOffset != 0
-		val end = if (collapsed) 255 else 0
-		animator?.cancel()
-		if (start == end) {
-			animator = null
-			return
-		}
-		animator = ValueAnimator.ofInt(start, end).apply {
-			duration = appBarLayout.context.getAnimationDuration(materialR.integer.app_bar_elevation_anim_duration)
-			interpolator = this@StatusBarDimHelper.interpolator
-			addUpdateListener {
-				foreground.alpha = it.animatedValue as Int
-			}
-			start()
-		}
-	}
-
-	fun attachToAppBar(appBarLayout: AppBarLayout) {
-		appBarLayout.addOnOffsetChangedListener(this)
-		appBarLayout.statusBarForeground =
-			MaterialShapeDrawable.createWithElevationOverlay(appBarLayout.context).apply {
-				alpha = 0
-			}
-	}
-}

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

@@ -1,302 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.animation.LayoutTransition
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowInsets
-import androidx.annotation.AttrRes
-import androidx.annotation.StringRes
-import androidx.appcompat.widget.Toolbar
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.content.withStyledAttributes
-import androidx.core.view.*
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import com.google.android.material.R as materialR
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.MaterialToolbar
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import java.util.*
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.LayoutSheetHeaderBinding
-import org.koitharu.kotatsu.utils.ext.getAnimationDuration
-import org.koitharu.kotatsu.utils.ext.getThemeDrawable
-import org.koitharu.kotatsu.utils.ext.parents
-
-private const val THROTTLE_DELAY = 200L
-
-class BottomSheetHeaderBar @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = materialR.attr.appBarLayoutStyle,
-) : AppBarLayout(context, attrs, defStyleAttr), MenuHost {
-
-	private val binding = LayoutSheetHeaderBinding.inflate(LayoutInflater.from(context), this)
-	private val closeDrawable = context.getThemeDrawable(materialR.attr.actionModeCloseDrawable)
-	private val bottomSheetCallback = Callback()
-	private val adjustStateRunnable = Runnable { adjustState() }
-	private var bottomSheetBehavior: BottomSheetBehavior<*>? = null
-	private val locationBuffer = IntArray(2)
-	private val expansionListeners = LinkedList<OnExpansionChangeListener>()
-	private var fitStatusBar = false
-	private val minHandleHeight = context.resources.getDimensionPixelSize(R.dimen.bottom_sheet_handle_size_min)
-	private val maxHandleHeight = context.resources.getDimensionPixelSize(R.dimen.bottom_sheet_handle_size_max)
-	private var isLayoutSuppressedCompat = false
-	private var isLayoutCalledWhileSuppressed = false
-	private var isBsExpanded = false
-	private var stateAdjustedAt = 0L
-
-	@Deprecated("")
-	val toolbar: MaterialToolbar
-		get() = binding.toolbar
-
-	var title: CharSequence?
-		get() = binding.toolbar.title
-		set(value) {
-			binding.toolbar.title = value
-		}
-
-	var subtitle: CharSequence?
-		get() = binding.toolbar.subtitle
-		set(value) {
-			binding.toolbar.subtitle = value
-		}
-
-	init {
-		setBackgroundResource(R.drawable.sheet_toolbar_background)
-		layoutTransition = LayoutTransition().apply {
-			setDuration(context.getAnimationDuration(R.integer.config_tinyAnimTime))
-		}
-		context.withStyledAttributes(attrs, R.styleable.BottomSheetHeaderBar, defStyleAttr) {
-			binding.toolbar.title = getString(R.styleable.BottomSheetHeaderBar_title)
-			fitStatusBar = getBoolean(R.styleable.BottomSheetHeaderBar_fitStatusBar, fitStatusBar)
-			val menuResId = getResourceId(R.styleable.BottomSheetHeaderBar_menu, 0)
-			if (menuResId != 0) {
-				binding.toolbar.inflateMenu(menuResId)
-			}
-		}
-		binding.toolbar.setNavigationOnClickListener(bottomSheetCallback)
-	}
-
-	override fun onAttachedToWindow() {
-		super.onAttachedToWindow()
-		setBottomSheetBehavior(findParentBottomSheetBehavior())
-	}
-
-	override fun onDetachedFromWindow() {
-		setBottomSheetBehavior(null)
-		super.onDetachedFromWindow()
-	}
-
-	override fun addView(child: View?, index: Int) {
-		if (shouldAddView(child)) {
-			super.addView(child, index)
-		} else {
-			binding.toolbar.addView(child, index)
-		}
-	}
-
-	override fun addView(child: View?, width: Int, height: Int) {
-		if (shouldAddView(child)) {
-			super.addView(child, width, height)
-		} else {
-			binding.toolbar.addView(child, width, height)
-		}
-	}
-
-	override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
-		if (shouldAddView(child)) {
-			super.addView(child, index, params)
-		} else {
-			binding.toolbar.addView(child, index, convertLayoutParams(params))
-		}
-	}
-
-	override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets {
-		dispatchInsets(if (insets != null) WindowInsetsCompat.toWindowInsetsCompat(insets) else null)
-		return super.onApplyWindowInsets(insets)
-	}
-
-	override fun addMenuProvider(provider: MenuProvider) {
-		binding.toolbar.addMenuProvider(provider)
-	}
-
-	override fun addMenuProvider(provider: MenuProvider, owner: LifecycleOwner) {
-		binding.toolbar.addMenuProvider(provider, owner)
-	}
-
-	override fun addMenuProvider(provider: MenuProvider, owner: LifecycleOwner, state: Lifecycle.State) {
-		binding.toolbar.addMenuProvider(provider, owner, state)
-	}
-
-	override fun removeMenuProvider(provider: MenuProvider) {
-		binding.toolbar.removeMenuProvider(provider)
-	}
-
-	override fun invalidateMenu() {
-		binding.toolbar.invalidateMenu()
-	}
-
-	fun setNavigationOnClickListener(onClickListener: OnClickListener) {
-		binding.toolbar.setNavigationOnClickListener(onClickListener)
-	}
-
-	fun addOnExpansionChangeListener(listener: OnExpansionChangeListener) {
-		expansionListeners.add(listener)
-	}
-
-	fun removeOnExpansionChangeListener(listener: OnExpansionChangeListener) {
-		expansionListeners.remove(listener)
-	}
-
-	fun setTitle(@StringRes resId: Int) {
-		binding.toolbar.setTitle(resId)
-	}
-
-	fun setSubtitle(@StringRes resId: Int) {
-		binding.toolbar.setSubtitle(resId)
-	}
-
-	override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-		if (isLayoutSuppressedCompat) {
-			isLayoutCalledWhileSuppressed = true
-		} else {
-			super.onLayout(changed, l, t, r, b)
-		}
-	}
-
-	private fun setBottomSheetBehavior(behavior: BottomSheetBehavior<*>?) {
-		bottomSheetBehavior?.removeBottomSheetCallback(bottomSheetCallback)
-		bottomSheetBehavior = behavior
-		if (behavior != null) {
-			onBottomSheetStateChanged(behavior.state)
-			behavior.addBottomSheetCallback(bottomSheetCallback)
-		}
-	}
-
-	private fun onBottomSheetStateChanged(newState: Int) {
-		val expanded = newState == BottomSheetBehavior.STATE_EXPANDED && isOnTopOfScreen()
-		if (isBsExpanded != expanded) {
-			isBsExpanded = expanded
-			postAdjustState()
-		}
-	}
-
-	private fun suppressLayoutCompat(suppress: Boolean) {
-		if (suppress == isLayoutSuppressedCompat) return
-		isLayoutSuppressedCompat = suppress
-		if (!suppress && isLayoutCalledWhileSuppressed) {
-			requestLayout()
-		}
-		isLayoutCalledWhileSuppressed = false
-	}
-
-	private fun dispatchInsets(insets: WindowInsetsCompat?) {
-		if (!fitStatusBar) {
-			return
-		}
-		val isExpanded = binding.dragHandle.isGone
-		val topInset = insets?.getInsets(WindowInsetsCompat.Type.systemBars())?.top ?: 0
-		if (isExpanded) {
-			updatePadding(top = topInset)
-		} else {
-			updatePadding(top = 0)
-			binding.dragHandle.updateLayoutParams {
-				height = topInset.coerceIn(minHandleHeight, maxHandleHeight)
-			}
-		}
-	}
-
-	private fun findParentBottomSheetBehavior(): BottomSheetBehavior<*>? {
-		for (p in parents) {
-			val layoutParams = (p as? View)?.layoutParams
-			if (layoutParams is CoordinatorLayout.LayoutParams) {
-				val behavior = layoutParams.behavior
-				if (behavior is BottomSheetBehavior<*>) {
-					return behavior
-				}
-			}
-		}
-		return null
-	}
-
-	private fun isOnTopOfScreen(): Boolean {
-		getLocationInWindow(locationBuffer)
-		val topInset = ViewCompat.getRootWindowInsets(this)
-			?.getInsets(WindowInsetsCompat.Type.systemBars())?.top ?: 0
-		val zeroTop = (layoutParams as? MarginLayoutParams)?.topMargin ?: 0
-		return (locationBuffer[1] - topInset) <= zeroTop
-	}
-
-	private fun dismissBottomSheet() {
-		val behavior = bottomSheetBehavior ?: return
-		if (behavior.isHideable) {
-			behavior.state = BottomSheetBehavior.STATE_HIDDEN
-		} else {
-			behavior.state = BottomSheetBehavior.STATE_COLLAPSED
-		}
-	}
-
-	private fun shouldAddView(child: View?): Boolean {
-		if (child == null) {
-			return true
-		}
-		val viewId = child.id
-		return viewId == R.id.dragHandle || viewId == R.id.toolbar
-	}
-
-	private fun convertLayoutParams(params: ViewGroup.LayoutParams?): Toolbar.LayoutParams? {
-		return when (params) {
-			null -> null
-			is MarginLayoutParams -> {
-				val lp = Toolbar.LayoutParams(params)
-				if (params is LayoutParams) {
-					lp.gravity = params.gravity
-				}
-				lp
-			}
-			else -> Toolbar.LayoutParams(params)
-		}
-	}
-
-	private fun postAdjustState() {
-		removeCallbacks(adjustStateRunnable)
-		val now = System.currentTimeMillis()
-		if (stateAdjustedAt + THROTTLE_DELAY < now) {
-			adjustState()
-		} else {
-			postDelayed(adjustStateRunnable, THROTTLE_DELAY)
-		}
-	}
-
-	private fun adjustState() {
-		suppressLayoutCompat(true)
-		binding.toolbar.navigationIcon = (if (isBsExpanded) closeDrawable else null)
-		binding.dragHandle.isGone = isBsExpanded
-		expansionListeners.forEach { it.onExpansionStateChanged(this, isBsExpanded) }
-		dispatchInsets(ViewCompat.getRootWindowInsets(this))
-		stateAdjustedAt = System.currentTimeMillis()
-		suppressLayoutCompat(false)
-	}
-
-	private inner class Callback : BottomSheetBehavior.BottomSheetCallback(), View.OnClickListener {
-
-		override fun onStateChanged(bottomSheet: View, newState: Int) {
-			onBottomSheetStateChanged(newState)
-		}
-
-		override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
-
-		override fun onClick(v: View?) {
-			dismissBottomSheet()
-		}
-	}
-
-	fun interface OnExpansionChangeListener {
-
-		fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean)
-	}
-}

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

@@ -8,33 +8,23 @@ import android.widget.LinearLayout
 import androidx.annotation.AttrRes
 import androidx.annotation.IdRes
 import androidx.core.view.children
-import com.google.android.material.R as materialR
 import com.google.android.material.button.MaterialButton
-import com.google.android.material.shape.ShapeAppearanceModel
 
 class CheckableButtonGroup @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = materialR.attr.materialButtonToggleGroupStyle,
-) : LinearLayout(context, attrs, defStyleAttr, materialR.style.Widget_MaterialComponents_MaterialButtonToggleGroup),
-	View.OnClickListener {
-
-	private val originalCornerData = ArrayList<CornerData>()
+	@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) {
-			setupButton(child)
+			child.setOnClickListener(this)
 		}
 		super.addView(child, index, params)
 	}
 
-	override fun onFinishInflate() {
-		super.onFinishInflate()
-		updateChildShapes()
-	}
-
 	override fun onClick(v: View) {
 		setCheckedId(v.id)
 	}
@@ -46,74 +36,7 @@ class CheckableButtonGroup @JvmOverloads constructor(
 		onCheckedChangeListener?.onCheckedChanged(this, viewRes)
 	}
 
-	private fun updateChildShapes() {
-		val childCount = childCount
-		val firstVisibleChildIndex = 0
-		val lastVisibleChildIndex = childCount - 1
-		for (i in 0 until childCount) {
-			val button: MaterialButton = getChildAt(i) as? MaterialButton ?: continue
-			if (button.visibility == GONE) {
-				continue
-			}
-			val builder = button.shapeAppearanceModel.toBuilder()
-			val newCornerData: CornerData? =
-				getNewCornerData(i, firstVisibleChildIndex, lastVisibleChildIndex)
-			updateBuilderWithCornerData(builder, newCornerData)
-			button.shapeAppearanceModel = builder.build()
-		}
-	}
-
-	private fun setupButton(button: MaterialButton) {
-		button.setOnClickListener(this)
-		button.isElegantTextHeight = false
-		// Saves original corner data
-		val shapeAppearanceModel: ShapeAppearanceModel = button.shapeAppearanceModel
-		originalCornerData.add(
-			CornerData(
-				shapeAppearanceModel.topLeftCornerSize,
-				shapeAppearanceModel.bottomLeftCornerSize,
-				shapeAppearanceModel.topRightCornerSize,
-				shapeAppearanceModel.bottomRightCornerSize,
-			),
-		)
-	}
-
-	private fun getNewCornerData(
-		index: Int,
-		firstVisibleChildIndex: Int,
-		lastVisibleChildIndex: Int,
-	): CornerData? {
-		val cornerData: CornerData = originalCornerData.get(index)
-
-		// If only one (visible) child exists, use its original corners
-		if (firstVisibleChildIndex == lastVisibleChildIndex) {
-			return cornerData
-		}
-		val isHorizontal = orientation == HORIZONTAL
-		if (index == firstVisibleChildIndex) {
-			return if (isHorizontal) cornerData.start(this) else cornerData.top()
-		}
-		return if (index == lastVisibleChildIndex) {
-			if (isHorizontal) cornerData.end(this) else cornerData.bottom()
-		} else null
-	}
-
-	private fun updateBuilderWithCornerData(
-		shapeAppearanceModelBuilder: ShapeAppearanceModel.Builder,
-		cornerData: CornerData?,
-	) {
-		if (cornerData == null) {
-			shapeAppearanceModelBuilder.setAllCornerSizes(0f)
-			return
-		}
-		shapeAppearanceModelBuilder
-			.setTopLeftCornerSize(cornerData.topLeft)
-			.setBottomLeftCornerSize(cornerData.bottomLeft)
-			.setTopRightCornerSize(cornerData.topRight)
-			.setBottomRightCornerSize(cornerData.bottomRight)
-	}
-
 	fun interface OnCheckedChangeListener {
 		fun onCheckedChanged(group: CheckableButtonGroup, checkedId: Int)
 	}
-}
+}

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

@@ -5,26 +5,23 @@ import android.util.AttributeSet
 import android.view.View.OnClickListener
 import androidx.annotation.DrawableRes
 import androidx.core.view.children
-import com.google.android.material.R as materialR
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.castOrNull
-import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
 
 class ChipsView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle,
+	defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle
 ) : ChipGroup(context, attrs, defStyleAttr) {
 
 	private var isLayoutSuppressedCompat = false
 	private var isLayoutCalledOnSuppressed = false
-	private val chipOnClickListener = OnClickListener {
+	private var chipOnClickListener = OnClickListener {
 		onChipClickListener?.onChipClick(it as Chip, it.tag)
 	}
-	private val chipOnCloseListener = OnClickListener {
+	private var chipOnCloseListener = OnClickListener {
 		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
 	}
 	var onChipClickListener: OnChipClickListener? = null
@@ -63,27 +60,15 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}
 
-	fun <T> getCheckedData(cls: Class<T>): Set<T> {
-		val result = LinkedHashSet<T>(childCount)
-		for (child in children) {
-			if (child is Chip && child.isChecked) {
-				result += cls.castOrNull(child.tag) ?: continue
-			}
-		}
-		return result
-	}
-
 	private fun bindChip(chip: Chip, model: ChipModel) {
 		chip.text = model.title
 		if (model.icon == 0) {
 			chip.isChipIconVisible = false
 		} else {
-			chip.isChipIconVisible = true
+			chip.isCheckedIconVisible = true
 			chip.setChipIconResource(model.icon)
 		}
-		chip.isClickable = onChipClickListener != null || model.isCheckable
-		chip.isCheckable = model.isCheckable
-		chip.isChecked = model.isChecked
+		chip.isClickable = onChipClickListener != null
 		chip.tag = model.data
 	}
 
@@ -91,13 +76,11 @@ class ChipsView @JvmOverloads constructor(
 		val chip = Chip(context)
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
 		chip.setChipDrawable(drawable)
-		chip.isCheckedIconVisible = true
-		chip.setCheckedIconResource(R.drawable.ic_check)
-		chip.checkedIconTint = context.getThemeColorStateList(materialR.attr.colorControlNormal)
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
+		chip.isCheckable = false
 		addView(chip)
 		return chip
 	}
@@ -115,9 +98,7 @@ class ChipsView @JvmOverloads constructor(
 	class ChipModel(
 		@DrawableRes val icon: Int,
 		val title: CharSequence,
-		val isCheckable: Boolean,
-		val isChecked: Boolean,
-		val data: Any? = null,
+		val data: Any? = null
 	) {
 
 		override fun equals(other: Any?): Boolean {
@@ -128,8 +109,6 @@ class ChipsView @JvmOverloads constructor(
 
 			if (icon != other.icon) return false
 			if (title != other.title) return false
-			if (isCheckable != other.isCheckable) return false
-			if (isChecked != other.isChecked) return false
 			if (data != other.data) return false
 
 			return true
@@ -138,9 +117,7 @@ class ChipsView @JvmOverloads constructor(
 		override fun hashCode(): Int {
 			var result = icon
 			result = 31 * result + title.hashCode()
-			result = 31 * result + isCheckable.hashCode()
-			result = 31 * result + isChecked.hashCode()
-			result = 31 * result + (data?.hashCode() ?: 0)
+			result = 31 * result + data.hashCode()
 			return result
 		}
 	}
@@ -154,4 +131,4 @@ class ChipsView @JvmOverloads constructor(
 
 		fun onChipCloseClick(chip: Chip, data: Any?)
 	}
-}
+}

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

@@ -1,47 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.view.View
-import androidx.core.view.ViewCompat
-import com.google.android.material.shape.AbsoluteCornerSize
-import com.google.android.material.shape.CornerSize
-
-class CornerData(
-	var topLeft: CornerSize,
-	var bottomLeft: CornerSize,
-	var topRight: CornerSize,
-	var bottomRight: CornerSize,
-) {
-
-	fun start(view: View): CornerData {
-		return if (isLayoutRtl(view)) right() else left()
-	}
-
-	fun end(view: View): CornerData {
-		return if (isLayoutRtl(view)) left() else right()
-	}
-
-	fun left(): CornerData {
-		return CornerData(topLeft, bottomLeft, noCorner, noCorner)
-	}
-
-	fun right(): CornerData {
-		return CornerData(noCorner, noCorner, topRight, bottomRight)
-	}
-
-	fun top(): CornerData {
-		return CornerData(topLeft, noCorner, topRight, noCorner)
-	}
-
-	fun bottom(): CornerData {
-		return CornerData(noCorner, bottomLeft, noCorner, bottomRight)
-	}
-
-	private companion object {
-
-		val noCorner: CornerSize = AbsoluteCornerSize(0f)
-
-		fun isLayoutRtl(view: View): Boolean {
-			return ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_RTL
-		}
-	}
-}

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

@@ -0,0 +1,133 @@
+/*
+ * 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/HideBottomNavigationOnScrollBehavior.kt

@@ -1,101 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.animation.ValueAnimator
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.view.animation.DecelerateInterpolator
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.view.ViewCompat
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.getAnimationDuration
-import org.koitharu.kotatsu.utils.ext.measureHeight
-
-class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor(
-	context: Context? = null,
-	attrs: AttributeSet? = null,
-) : CoordinatorLayout.Behavior<BottomNavigationView>(context, attrs) {
-
-	@ViewCompat.NestedScrollType
-	private var lastStartedType: Int = 0
-
-	private var offsetAnimator: ValueAnimator? = null
-
-	private var dyRatio = 1F
-
-	override fun layoutDependsOn(parent: CoordinatorLayout, child: BottomNavigationView, dependency: View): Boolean {
-		return dependency is AppBarLayout
-	}
-
-	override fun onDependentViewChanged(
-		parent: CoordinatorLayout,
-		child: BottomNavigationView,
-		dependency: View,
-	): Boolean {
-		val appBarSize = dependency.measureHeight()
-		dyRatio = if (appBarSize > 0) {
-			child.measureHeight().toFloat() / appBarSize
-		} else {
-			1F
-		}
-		return false
-	}
-
-	override fun onStartNestedScroll(
-		coordinatorLayout: CoordinatorLayout,
-		child: BottomNavigationView,
-		directTargetChild: View,
-		target: View,
-		axes: Int,
-		type: Int,
-	): Boolean {
-		if (axes != ViewCompat.SCROLL_AXIS_VERTICAL) {
-			return false
-		}
-		lastStartedType = type
-		offsetAnimator?.cancel()
-		return true
-	}
-
-	override fun onNestedPreScroll(
-		coordinatorLayout: CoordinatorLayout,
-		child: BottomNavigationView,
-		target: View,
-		dx: Int,
-		dy: Int,
-		consumed: IntArray,
-		type: Int,
-	) {
-		super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type)
-		child.translationY = (child.translationY + (dy * dyRatio)).coerceIn(0F, child.height.toFloat())
-	}
-
-	override fun onStopNestedScroll(
-		coordinatorLayout: CoordinatorLayout,
-		child: BottomNavigationView,
-		target: View,
-		type: Int,
-	) {
-		if (lastStartedType == ViewCompat.TYPE_TOUCH || type == ViewCompat.TYPE_NON_TOUCH) {
-			animateBottomNavigationVisibility(child, child.translationY < child.height / 2)
-		}
-	}
-
-	private fun animateBottomNavigationVisibility(child: BottomNavigationView, isVisible: Boolean) {
-		offsetAnimator?.cancel()
-		offsetAnimator = ValueAnimator().apply {
-			interpolator = DecelerateInterpolator()
-			duration = child.context.getAnimationDuration(R.integer.config_shorterAnimTime)
-			addUpdateListener {
-				child.translationY = it.animatedValue as Float
-			}
-		}
-		offsetAnimator?.setFloatValues(
-			child.translationY,
-			if (isVisible) 0F else child.height.toFloat(),
-		)
-		offsetAnimator?.start()
-	}
-}

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

@@ -9,17 +9,16 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.InsetDrawable
 import android.graphics.drawable.RippleDrawable
 import android.graphics.drawable.ShapeDrawable
-import android.graphics.drawable.shapes.RoundRectShape
+import android.graphics.drawable.shapes.RectShape
 import android.util.AttributeSet
 import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatCheckedTextView
-import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
 import com.google.android.material.ripple.RippleUtils
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.resolveDp
+import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
 
 @SuppressLint("RestrictedApi")
 class ListItemTextView @JvmOverloads constructor(
@@ -39,11 +38,10 @@ class ListItemTextView @JvmOverloads constructor(
 		context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) {
 			val itemRippleColor = getRippleColor(context)
 			val shape = createShapeDrawable(this)
-			val roundCorners = FloatArray(8) { resources.resolveDp(32f) }
 			background = RippleDrawable(
 				RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
 				shape,
-				ShapeDrawable(RoundRectShape(roundCorners, null, null)),
+				ShapeDrawable(RectShape()),
 			)
 			checkedDrawableStart = getDrawable(R.styleable.ListItemTextView_checkedDrawableStart)
 			checkedDrawableEnd = getDrawable(R.styleable.ListItemTextView_checkedDrawableEnd)
@@ -120,7 +118,7 @@ class ListItemTextView @JvmOverloads constructor(
 	}
 
 	private fun getRippleColor(context: Context): ColorStateList {
-		return ContextCompat.getColorStateList(context, R.color.selector_overlay)
+		return context.getThemeColorStateList(android.R.attr.colorControlHighlight)
 			?: ColorStateList.valueOf(Color.TRANSPARENT)
 	}
-}
+}

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

@@ -1,123 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Outline
-import android.graphics.Paint
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewOutlineProvider
-import androidx.annotation.ColorInt
-import androidx.annotation.FloatRange
-import androidx.core.graphics.ColorUtils
-import com.google.android.material.R as materialR
-import kotlin.random.Random
-import org.koitharu.kotatsu.parsers.util.replaceWith
-import org.koitharu.kotatsu.utils.ext.getThemeColor
-import org.koitharu.kotatsu.utils.ext.resolveDp
-
-class SegmentedBarView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	defStyleAttr: Int = 0,
-) : View(context, attrs, defStyleAttr) {
-
-	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-	private val segmentsData = ArrayList<Segment>()
-	private val segmentsSizes = ArrayList<Float>()
-	private val outlineColor = context.getThemeColor(materialR.attr.colorOutline)
-	private var cornerSize = 0f
-
-	var segments: List<Segment>
-		get() = segmentsData
-		set(value) {
-			segmentsData.replaceWith(value)
-			updateSizes()
-			invalidate()
-		}
-
-	init {
-		paint.strokeWidth = context.resources.resolveDp(1f)
-		outlineProvider = OutlineProvider()
-		clipToOutline = true
-
-		if (isInEditMode) {
-			segments = List(Random.nextInt(3, 5)) {
-				Segment(
-					percent = Random.nextFloat(),
-					color = ColorUtils.HSLToColor(floatArrayOf(Random.nextInt(0, 360).toFloat(), 0.5f, 0.5f)),
-				)
-			}
-		}
-	}
-
-	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-		super.onSizeChanged(w, h, oldw, oldh)
-		cornerSize = h / 2f
-		updateSizes()
-	}
-
-	override fun onDraw(canvas: Canvas) {
-		if (segmentsSizes.isEmpty()) {
-			return
-		}
-		val w = width.toFloat()
-		var x = w - segmentsSizes.last()
-		for (i in (0 until segmentsData.size).reversed()) {
-			val segment = segmentsData[i]
-			paint.color = segment.color
-			paint.style = Paint.Style.FILL
-			val segmentWidth = segmentsSizes[i]
-			canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
-			paint.color = outlineColor
-			paint.style = Paint.Style.STROKE
-			canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
-			x -= segmentWidth
-		}
-		paint.color = outlineColor
-		paint.style = Paint.Style.STROKE
-		canvas.drawRoundRect(0f, 0f, w, height.toFloat(), cornerSize, cornerSize, paint)
-	}
-
-	private fun updateSizes() {
-		segmentsSizes.clear()
-		segmentsSizes.ensureCapacity(segmentsData.size + 1)
-		var w = width.toFloat()
-		for (segment in segmentsData) {
-			val segmentWidth = (w * segment.percent).coerceAtLeast(cornerSize)
-			segmentsSizes.add(segmentWidth)
-			w -= segmentWidth
-		}
-		segmentsSizes.add(w)
-	}
-
-	class Segment(
-		@FloatRange(from = 0.0, to = 1.0) val percent: Float,
-		@ColorInt val color: Int,
-	) {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Segment
-
-			if (percent != other.percent) return false
-			if (color != other.color) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = percent.hashCode()
-			result = 31 * result + color
-			return result
-		}
-	}
-
-	private class OutlineProvider : ViewOutlineProvider() {
-		override fun getOutline(view: View, outline: Outline) {
-			outline.setRoundRect(0, 0, view.width, view.height, view.height / 2f)
-		}
-	}
-}

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

@@ -1,142 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.animation.TimeInterpolator
-import android.content.Context
-import android.os.Parcel
-import android.os.Parcelable
-import android.util.AttributeSet
-import android.view.ViewPropertyAnimator
-import androidx.annotation.AttrRes
-import androidx.annotation.StyleRes
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.customview.view.AbsSavedState
-import androidx.interpolator.view.animation.FastOutLinearInInterpolator
-import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
-import com.google.android.material.R as materialR
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import org.koitharu.kotatsu.utils.ext.applySystemAnimatorScale
-import org.koitharu.kotatsu.utils.ext.measureHeight
-
-private const val STATE_DOWN = 1
-private const val STATE_UP = 2
-
-private const val SLIDE_UP_ANIMATION_DURATION = 225L
-private const val SLIDE_DOWN_ANIMATION_DURATION = 175L
-
-class SlidingBottomNavigationView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = materialR.attr.bottomNavigationStyle,
-	@StyleRes defStyleRes: Int = materialR.style.Widget_Design_BottomNavigationView,
-) : BottomNavigationView(context, attrs, defStyleAttr, defStyleRes),
-	CoordinatorLayout.AttachedBehavior {
-
-	private var currentAnimator: ViewPropertyAnimator? = null
-
-	private var currentState = STATE_UP
-	private var behavior = HideBottomNavigationOnScrollBehavior()
-
-	override fun getBehavior(): CoordinatorLayout.Behavior<*> {
-		return behavior
-	}
-
-	override fun onSaveInstanceState(): Parcelable {
-		val superState = super.onSaveInstanceState()
-		return SavedState(superState, currentState, translationY)
-	}
-
-	override fun onRestoreInstanceState(state: Parcelable?) {
-		if (state is SavedState) {
-			super.onRestoreInstanceState(state.superState)
-			super.setTranslationY(state.translationY)
-			currentState = state.currentState
-		} else {
-			super.onRestoreInstanceState(state)
-		}
-	}
-
-	override fun setTranslationY(translationY: Float) {
-		// Disallow translation change when state down
-		if (currentState != STATE_DOWN) {
-			super.setTranslationY(translationY)
-		}
-	}
-
-	fun show() {
-		currentAnimator?.cancel()
-		clearAnimation()
-
-		currentState = STATE_UP
-		animateTranslation(
-			0F,
-			SLIDE_UP_ANIMATION_DURATION,
-			LinearOutSlowInInterpolator(),
-		)
-	}
-
-	fun hide() {
-		currentAnimator?.cancel()
-		clearAnimation()
-
-		currentState = STATE_DOWN
-		val target = measureHeight()
-		if (target == 0) {
-			return
-		}
-		animateTranslation(
-			target.toFloat(),
-			SLIDE_DOWN_ANIMATION_DURATION,
-			FastOutLinearInInterpolator(),
-		)
-	}
-
-	private fun animateTranslation(targetY: Float, duration: Long, interpolator: TimeInterpolator) {
-		currentAnimator = animate()
-			.translationY(targetY)
-			.setInterpolator(interpolator)
-			.setDuration(duration)
-			.applySystemAnimatorScale(context)
-			.setListener(
-				object : AnimatorListenerAdapter() {
-					override fun onAnimationEnd(animation: Animator) {
-						currentAnimator = null
-						postInvalidate()
-					}
-				},
-			)
-	}
-
-	internal class SavedState : AbsSavedState {
-		var currentState = STATE_UP
-		var translationY = 0F
-
-		constructor(superState: Parcelable, currentState: Int, translationY: Float) : super(superState) {
-			this.currentState = currentState
-			this.translationY = translationY
-		}
-
-		constructor(source: Parcel, loader: ClassLoader?) : super(source, loader) {
-			currentState = source.readInt()
-			translationY = source.readFloat()
-		}
-
-		override fun writeToParcel(out: Parcel, flags: Int) {
-			super.writeToParcel(out, flags)
-			out.writeInt(currentState)
-			out.writeFloat(translationY)
-		}
-
-		companion object {
-
-			@Suppress("unused")
-			@JvmField
-			val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> {
-				override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader)
-
-				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
-			}
-		}
-	}
-}

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

@@ -0,0 +1,14 @@
+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/base/ui/widgets/WindowInsetHolder.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.base.ui.widgets
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.Gravity
@@ -20,7 +21,8 @@ class WindowInsetHolder @JvmOverloads constructor(
 	private var desiredHeight = 0
 	private var desiredWidth = 0
 
-	override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets {
+	@SuppressLint("RtlHardcoded")
+	override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
 		val barsInsets = WindowInsetsCompat.toWindowInsetsCompat(insets, this)
 			.getInsets(WindowInsetsCompat.Type.systemBars())
 		val gravity = getLayoutGravity()
@@ -39,26 +41,24 @@ class WindowInsetHolder @JvmOverloads constructor(
 			desiredHeight = newHeight
 			requestLayout()
 		}
-		return super.onApplyWindowInsets(insets)
+		return super.dispatchApplyWindowInsets(insets)
 	}
 
 	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
 		val widthMode = MeasureSpec.getMode(widthMeasureSpec)
-		val widthSize = MeasureSpec.getSize(widthMeasureSpec)
 		val heightMode = MeasureSpec.getMode(heightMeasureSpec)
-		val heightSize = MeasureSpec.getSize(heightMeasureSpec)
-
-		val width: Int = when (widthMode) {
-			MeasureSpec.EXACTLY -> widthSize
-			MeasureSpec.AT_MOST -> minOf(desiredWidth, widthSize)
-			else -> desiredWidth
-		}
-		val height = when (heightMode) {
-			MeasureSpec.EXACTLY -> heightSize
-			MeasureSpec.AT_MOST -> minOf(desiredHeight, heightSize)
-			else -> desiredHeight
-		}
-		setMeasuredDimension(width, height)
+		super.onMeasure(
+			if (desiredWidth == 0 || widthMode == MeasureSpec.EXACTLY) {
+				widthMeasureSpec
+			} else {
+				MeasureSpec.makeMeasureSpec(desiredWidth, widthMode)
+			},
+			if (desiredHeight == 0 || heightMode == MeasureSpec.EXACTLY) {
+				heightMeasureSpec
+			} else {
+				MeasureSpec.makeMeasureSpec(desiredHeight, heightMode)
+			},
+		)
 	}
 
 	private fun getLayoutGravity(): Int {
@@ -69,4 +69,4 @@ class WindowInsetHolder @JvmOverloads constructor(
 			else -> Gravity.NO_GRAVITY
 		}
 	}
-}
+}

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

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

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

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

@@ -1,27 +1,20 @@
 package org.koitharu.kotatsu.bookmarks.data
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
 import kotlinx.coroutines.flow.Flow
-import org.koitharu.kotatsu.core.db.entity.MangaWithTags
 
 @Dao
 abstract class BookmarksDao {
 
-	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
-	abstract suspend fun find(mangaId: Long, pageId: Long): BookmarkEntity?
-
 	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
 	abstract fun observe(mangaId: Long, chapterId: Long, page: Int): Flow<BookmarkEntity?>
 
 	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
 	abstract fun observe(mangaId: Long): Flow<List<BookmarkEntity>>
 
-	@Transaction
-	@Query(
-		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY bookmarks.created_at"
-	)
-	abstract fun observe(): Flow<Map<MangaWithTags, List<BookmarkEntity>>>
-
 	@Insert
 	abstract suspend fun insert(entity: BookmarkEntity)
 

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

@@ -1,9 +1,15 @@
 package org.koitharu.kotatsu.bookmarks.data
 
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.db.entity.toManga
+import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.parsers.model.Manga
 import java.util.*
 
+fun BookmarkWithManga.toBookmark() = bookmark.toBookmark(
+	manga.toManga(tags.toMangaTags())
+)
+
 fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	manga = manga,
 	pageId = pageId,
@@ -24,10 +30,4 @@ fun Bookmark.toEntity() = BookmarkEntity(
 	imageUrl = imageUrl,
 	createdAt = createdAt.time,
 	percent = percent,
-)
-
-fun Collection<BookmarkEntity>.toBookmarks(manga: Manga) = map {
-	it.toBookmark(manga)
-}
-
-fun Collection<Bookmark>.ids() = map { it.pageId }
+)

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

@@ -1,24 +1,17 @@
 package org.koitharu.kotatsu.bookmarks.domain
 
-import android.database.SQLException
 import androidx.room.withTransaction
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import org.koitharu.kotatsu.base.domain.ReversibleHandle
-import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.toBookmark
-import org.koitharu.kotatsu.bookmarks.data.toBookmarks
 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.core.db.entity.toManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.mapItems
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 
-class BookmarksRepository @Inject constructor(
+class BookmarksRepository(
 	private val db: MangaDatabase,
 ) {
 
@@ -30,17 +23,6 @@ class BookmarksRepository @Inject constructor(
 		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
 	}
 
-	fun observeBookmarks(): Flow<Map<Manga, List<Bookmark>>> {
-		return db.bookmarksDao.observe().map { map ->
-			val res = LinkedHashMap<Manga, List<Bookmark>>(map.size)
-			for ((k, v) in map) {
-				val manga = k.toManga()
-				res[manga] = v.toBookmarks(manga)
-			}
-			res
-		}
-	}
-
 	suspend fun addBookmark(bookmark: Bookmark) {
 		db.withTransaction {
 			val tags = bookmark.manga.tags.toEntities()
@@ -53,38 +35,4 @@ class BookmarksRepository @Inject constructor(
 	suspend fun removeBookmark(mangaId: Long, pageId: Long) {
 		db.bookmarksDao.delete(mangaId, pageId)
 	}
-
-	suspend fun removeBookmarks(ids: Map<Manga, Set<Long>>): ReversibleHandle {
-		val entities = ArrayList<BookmarkEntity>(ids.size)
-		db.withTransaction {
-			val dao = db.bookmarksDao
-			for ((manga, idSet) in ids) {
-				for (pageId in idSet) {
-					val e = dao.find(manga.id, pageId)
-					if (e != null) {
-						entities.add(e)
-					}
-					dao.delete(manga.id, pageId)
-				}
-			}
-		}
-		return BookmarksRestorer(entities)
-	}
-
-	private inner class BookmarksRestorer(
-		private val entities: Collection<BookmarkEntity>,
-	) : ReversibleHandle {
-
-		override suspend fun reverse() {
-			db.withTransaction {
-				for (e in entities) {
-					try {
-						db.bookmarksDao.insert(e)
-					} catch (e: SQLException) {
-						e.printStackTraceDebug()
-					}
-				}
-			}
-		}
-	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarkListAD.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
+package org.koitharu.kotatsu.bookmarks.ui
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
@@ -18,8 +18,9 @@ fun bookmarkListAD(
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Bookmark>,
 ) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
-	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) },
+	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) }
 ) {
+
 	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
 
 	binding.root.setOnClickListener(listener)
@@ -30,7 +31,7 @@ fun bookmarkListAD(
 			referer(item.manga.publicUrl)
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
+			error(R.drawable.ic_placeholder)
 			allowRgb565(true)
 			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
@@ -40,4 +41,4 @@ fun bookmarkListAD(
 	onViewRecycled {
 		binding.imageViewThumb.disposeImageRequest()
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt

@@ -1,56 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.ViewGroup
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.graphics.Insets
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import androidx.fragment.app.commit
-import com.google.android.material.appbar.AppBarLayout
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.databinding.ActivityContainerBinding
-import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
-
-@AndroidEntryPoint
-class BookmarksActivity :
-	BaseActivity<ActivityContainerBinding>(),
-	AppBarOwner,
-	SnackbarOwner {
-
-	override val appBar: AppBarLayout
-		get() = binding.appbar
-
-	override val snackbarHost: CoordinatorLayout
-		get() = binding.root
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(ActivityContainerBinding.inflate(layoutInflater))
-		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		val fm = supportFragmentManager
-		if (fm.findFragmentById(R.id.container) == null) {
-			fm.commit {
-				val fragment = BookmarksFragment.newInstance()
-				replace(R.id.container, fragment)
-			}
-		}
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-		)
-	}
-
-	companion object {
-
-		fun newIntent(context: Context) = Intent(context, BookmarksActivity::class.java)
-	}
-}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksAdapter.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
+package org.koitharu.kotatsu.bookmarks.ui
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
@@ -19,7 +19,7 @@ class BookmarksAdapter(
 	private class DiffCallback : DiffUtil.ItemCallback<Bookmark>() {
 
 		override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
-			return oldItem.manga.id == newItem.manga.id && oldItem.pageId == newItem.pageId
+			return oldItem.manga.id == newItem.manga.id && oldItem.chapterId == newItem.chapterId
 		}
 
 		override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt

@@ -1,200 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui
-
-import android.os.Bundle
-import android.view.*
-import androidx.appcompat.view.ActionMode
-import androidx.core.graphics.Insets
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import androidx.fragment.app.viewModels
-import coil.ImageLoader
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.reverseAsync
-import org.koitharu.kotatsu.base.ui.BaseFragment
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
-import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.base.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.base.ui.util.ReversibleAction
-import org.koitharu.kotatsu.bookmarks.data.ids
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksGroupAdapter
-import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.invalidateNestedItemDecorations
-import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
-
-@AndroidEntryPoint
-class BookmarksFragment :
-	BaseFragment<FragmentListSimpleBinding>(),
-	ListStateHolderListener,
-	OnListItemClickListener<Bookmark>,
-	SectionedSelectionController.Callback<Manga>,
-	FastScroller.FastScrollListener {
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	private val viewModel by viewModels<BookmarksViewModel>()
-	private var adapter: BookmarksGroupAdapter? = null
-	private var selectionController: SectionedSelectionController<Manga>? = null
-
-	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
-		return FragmentListSimpleBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		selectionController = SectionedSelectionController(
-			activity = requireActivity(),
-			owner = this,
-			callback = this,
-		)
-		adapter = BookmarksGroupAdapter(
-			lifecycleOwner = viewLifecycleOwner,
-			coil = coil,
-			listener = this,
-			selectionController = checkNotNull(selectionController),
-			bookmarkClickListener = this,
-			groupClickListener = OnGroupClickListener(),
-		)
-		binding.recyclerView.adapter = adapter
-		binding.recyclerView.setHasFixedSize(true)
-		val spacingDecoration = SpacingItemDecoration(view.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
-		binding.recyclerView.addItemDecoration(spacingDecoration)
-
-		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
-		viewModel.onError.observe(viewLifecycleOwner, ::onError)
-		viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone)
-	}
-
-	override fun onDestroyView() {
-		super.onDestroyView()
-		adapter = null
-		selectionController = null
-	}
-
-	override fun onItemClick(item: Bookmark, view: View) {
-		if (selectionController?.onItemClick(item.manga, item.pageId) != true) {
-			val intent = ReaderActivity.newIntent(view.context, item)
-			startActivity(intent, scaleUpActivityOptionsOf(view).toBundle())
-		}
-	}
-
-	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemLongClick(item.manga, item.pageId) ?: false
-	}
-
-	override fun onRetryClick(error: Throwable) = Unit
-
-	override fun onEmptyActionClick() = Unit
-
-	override fun onFastScrollStart(fastScroller: FastScroller) {
-		(activity as? AppBarOwner)?.appBar?.setExpanded(false, true)
-	}
-
-	override fun onFastScrollStop(fastScroller: FastScroller) = Unit
-
-	override fun onSelectionChanged(controller: SectionedSelectionController<Manga>, count: Int) {
-		binding.recyclerView.invalidateNestedItemDecorations()
-	}
-
-	override fun onCreateActionMode(
-		controller: SectionedSelectionController<Manga>,
-		mode: ActionMode,
-		menu: Menu,
-	): Boolean {
-		mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
-		return true
-	}
-
-	override fun onActionItemClicked(
-		controller: SectionedSelectionController<Manga>,
-		mode: ActionMode,
-		item: MenuItem,
-	): Boolean {
-		return when (item.itemId) {
-			R.id.action_remove -> {
-				val ids = selectionController?.snapshot() ?: return false
-				viewModel.removeBookmarks(ids)
-				mode.finish()
-				true
-			}
-			else -> false
-		}
-	}
-
-	override fun onCreateItemDecoration(
-		controller: SectionedSelectionController<Manga>,
-		section: Manga,
-	): AbstractSelectionItemDecoration = BookmarksSelectionDecoration(requireContext())
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.recyclerView.updatePadding(
-			bottom = insets.bottom,
-		)
-		binding.recyclerView.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			bottomMargin = insets.bottom
-		}
-	}
-
-	private fun onListChanged(list: List<ListModel>) {
-		adapter?.items = list
-	}
-
-	private fun onError(e: Throwable) {
-		Snackbar.make(
-			binding.recyclerView,
-			e.getDisplayMessage(resources),
-			Snackbar.LENGTH_SHORT,
-		).show()
-	}
-
-	private fun onActionDone(action: ReversibleAction) {
-		val handle = action.handle
-		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
-		val snackbar = Snackbar.make((activity as SnackbarOwner).snackbarHost, action.stringResId, length)
-		if (handle != null) {
-			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
-		}
-		snackbar.show()
-	}
-
-	private inner class OnGroupClickListener : OnListItemClickListener<BookmarksGroup> {
-
-		override fun onItemClick(item: BookmarksGroup, view: View) {
-			val controller = selectionController
-			if (controller != null && controller.count > 0) {
-				if (controller.getSectionCount(item.manga) == item.bookmarks.size) {
-					controller.clearSelection(item.manga)
-				} else {
-					controller.addToSelection(item.manga, item.bookmarks.ids())
-				}
-				return
-			}
-			val intent = DetailsActivity.newIntent(view.context, item.manga)
-			startActivity(intent)
-		}
-
-		override fun onItemLongClick(item: BookmarksGroup, view: View): Boolean {
-			return selectionController?.addToSelection(item.manga, item.bookmarks.ids()) ?: false
-		}
-	}
-
-	companion object {
-
-		fun newInstance() = BookmarksFragment()
-	}
-}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksSelectionDecoration.kt

@@ -1,18 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui
-
-import android.content.Context
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
-import org.koitharu.kotatsu.utils.ext.getItem
-
-class BookmarksSelectionDecoration(context: Context) : MangaSelectionDecoration(context) {
-
-	override fun getItemId(parent: RecyclerView, child: View): Long {
-		val holder = parent.getChildViewHolder(child) ?: return RecyclerView.NO_ID
-		val item = holder.getItem(Bookmark::class.java) ?: return RecyclerView.NO_ID
-		return item.pageId
-	}
-
-}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt

@@ -1,54 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.base.ui.util.ReversibleAction
-import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.list.ui.model.EmptyState
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingState
-import org.koitharu.kotatsu.list.ui.model.toErrorState
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.SingleLiveEvent
-import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-
-@HiltViewModel
-class BookmarksViewModel @Inject constructor(
-	private val repository: BookmarksRepository,
-) : BaseViewModel() {
-
-	val onActionDone = SingleLiveEvent<ReversibleAction>()
-
-	val content: LiveData<List<ListModel>> = repository.observeBookmarks()
-		.map { list ->
-			if (list.isEmpty()) {
-				listOf(
-					EmptyState(
-						icon = R.drawable.ic_empty_favourites,
-						textPrimary = R.string.no_bookmarks_yet,
-						textSecondary = R.string.no_bookmarks_summary,
-						actionStringRes = 0,
-					),
-				)
-			} else list.map { (manga, bookmarks) ->
-				BookmarksGroup(manga, bookmarks)
-			}
-		}
-		.catch { e -> emit(listOf(e.toErrorState(canRetry = false))) }
-		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
-
-	fun removeBookmarks(ids: Map<Manga, Set<Long>>) {
-		launchJob(Dispatchers.Default) {
-			val handle = repository.removeBookmarks(ids)
-			onActionDone.postCall(ReversibleAction(R.string.bookmarks_removed, handle))
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAD.kt

@@ -1,64 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
-
-import android.view.View
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.databinding.ItemBookmarksGroupBinding
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.*
-
-fun bookmarksGroupAD(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	sharedPool: RecyclerView.RecycledViewPool,
-	selectionController: SectionedSelectionController<Manga>,
-	bookmarkClickListener: OnListItemClickListener<Bookmark>,
-	groupClickListener: OnListItemClickListener<BookmarksGroup>,
-) = adapterDelegateViewBinding<BookmarksGroup, ListModel, ItemBookmarksGroupBinding>(
-	{ layoutInflater, parent -> ItemBookmarksGroupBinding.inflate(layoutInflater, parent, false) },
-) {
-	val viewListenerAdapter = object : View.OnClickListener, View.OnLongClickListener {
-		override fun onClick(v: View) = groupClickListener.onItemClick(item, v)
-		override fun onLongClick(v: View) = groupClickListener.onItemLongClick(item, v)
-	}
-
-	val adapter = BookmarksAdapter(coil, lifecycleOwner, bookmarkClickListener)
-	binding.recyclerView.setRecycledViewPool(sharedPool)
-	binding.recyclerView.adapter = adapter
-	val spacingDecoration = SpacingItemDecoration(context.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
-	binding.recyclerView.addItemDecoration(spacingDecoration)
-	binding.root.setOnClickListener(viewListenerAdapter)
-	binding.root.setOnLongClickListener(viewListenerAdapter)
-
-	bind { payloads ->
-		if (payloads.isEmpty()) {
-			binding.recyclerView.clearItemDecorations()
-			binding.recyclerView.addItemDecoration(spacingDecoration)
-			selectionController.attachToRecyclerView(item.manga, binding.recyclerView)
-		}
-		binding.imageViewCover.newImageRequest(item.manga.coverUrl)?.run {
-			referer(item.manga.publicUrl)
-			placeholder(R.drawable.ic_placeholder)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
-			allowRgb565(true)
-			lifecycle(lifecycleOwner)
-			enqueueWith(coil)
-		}
-		binding.textViewTitle.text = item.manga.title
-		adapter.items = item.bookmarks
-	}
-
-	onViewRecycled {
-		binding.imageViewCover.disposeImageRequest()
-	}
-}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAdapter.kt

@@ -1,67 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
-
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import kotlin.jvm.internal.Intrinsics
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.list.ui.adapter.*
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-
-class BookmarksGroupAdapter(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	selectionController: SectionedSelectionController<Manga>,
-	listener: ListStateHolderListener,
-	bookmarkClickListener: OnListItemClickListener<Bookmark>,
-	groupClickListener: OnListItemClickListener<BookmarksGroup>,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
-
-	init {
-		val pool = RecyclerView.RecycledViewPool()
-		delegatesManager
-			.addDelegate(
-				bookmarksGroupAD(
-					coil = coil,
-					lifecycleOwner = lifecycleOwner,
-					sharedPool = pool,
-					selectionController = selectionController,
-					bookmarkClickListener = bookmarkClickListener,
-					groupClickListener = groupClickListener,
-				),
-			)
-			.addDelegate(loadingStateAD())
-			.addDelegate(loadingFooterAD())
-			.addDelegate(emptyStateListAD(coil, listener))
-			.addDelegate(errorStateListAD(listener))
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return when {
-				oldItem is BookmarksGroup && newItem is BookmarksGroup -> {
-					oldItem.manga.id == newItem.manga.id
-				}
-				else -> oldItem.javaClass == newItem.javaClass
-			}
-		}
-
-		override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return Intrinsics.areEqual(oldItem, newItem)
-		}
-
-		override fun getChangePayload(oldItem: ListModel, newItem: ListModel): Any? {
-			return when {
-				oldItem is BookmarksGroup && newItem is BookmarksGroup -> Unit
-				else -> super.getChangePayload(oldItem, newItem)
-			}
-		}
-	}
-}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/model/BookmarksGroup.kt

@@ -1,31 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.model
-
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.util.areItemsEquals
-
-class BookmarksGroup(
-	val manga: Manga,
-	val bookmarks: List<Bookmark>,
-) : ListModel {
-
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as BookmarksGroup
-
-		if (manga != other.manga) return false
-
-		return bookmarks.areItemsEquals(other.bookmarks) { a, b ->
-			a.imageUrl == b.imageUrl
-		}
-	}
-
-	override fun hashCode(): Int {
-		var result = manga.hashCode()
-		result = 31 * result + bookmarks.sumOf { it.imageUrl.hashCode() }
-		return result
-	}
-}

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

@@ -8,10 +8,8 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.ViewGroup
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
@@ -44,7 +42,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		} else {
 			onTitleChanged(
 				intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
-				url,
+				url
 			)
 			binding.webView.loadUrl(url)
 		}
@@ -61,9 +59,8 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		super.onCreateOptionsMenu(menu)
 		menuInflater.inflate(R.menu.opt_browser, menu)
-		return true
+		return super.onCreateOptionsMenu(menu)
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
@@ -119,6 +116,8 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.appbar.updatePadding(
 			top = insets.top,
+			left = insets.left,
+			right = insets.right,
 		)
 		binding.root.updatePadding(
 			left = insets.left,
@@ -137,4 +136,4 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 				.putExtra(EXTRA_TITLE, title)
 		}
 	}
-}
+}

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

@@ -11,24 +11,18 @@ import android.webkit.WebSettings
 import androidx.core.view.isInvisible
 import androidx.fragment.app.setFragmentResult
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.network.AndroidCookieJar
 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
 
-@AndroidEntryPoint
 class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
 
 	private val url by stringArgument(ARG_URL)
 	private val pendingResult = Bundle(1)
 
-	@Inject
-	lateinit var cookieJar: AndroidCookieJar
-
 	override fun onInflateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -44,7 +38,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 			databaseEnabled = true
 			userAgentString = UserAgentInterceptor.userAgent
 		}
-		binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url.orEmpty())
+		binding.webView.webViewClient = CloudFlareClient(get(), this, url.orEmpty())
 		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
 		if (url.isNullOrEmpty()) {
 			dismissAllowingStateLoss()
@@ -59,8 +53,8 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 		super.onDestroyView()
 	}
 
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder).setNegativeButton(android.R.string.cancel, null)
+	override fun onBuildDialog(builder: MaterialAlertDialogBuilder) {
+		builder.setNegativeButton(android.R.string.cancel, null)
 	}
 
 	override fun onResume() {
@@ -97,4 +91,4 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 			putString(ARG_URL, url)
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/core/AppModule.kt

@@ -1,160 +0,0 @@
-package org.koitharu.kotatsu.core
-
-import android.app.Application
-import android.content.Context
-import android.provider.SearchRecentSuggestions
-import android.text.Html
-import androidx.collection.arraySetOf
-import androidx.room.InvalidationTracker
-import coil.ComponentRegistry
-import coil.ImageLoader
-import coil.decode.SvgDecoder
-import coil.disk.DiskCache
-import coil.util.DebugLogger
-import dagger.Binds
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import dagger.multibindings.ElementsIntoSet
-import java.util.concurrent.TimeUnit
-import javax.inject.Singleton
-import kotlinx.coroutines.Dispatchers
-import okhttp3.CookieJar
-import okhttp3.OkHttpClient
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.base.ui.util.ActivityRecreationHandle
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.network.*
-import org.koitharu.kotatsu.core.os.ShortcutsUpdater
-import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.local.data.CacheDir
-import org.koitharu.kotatsu.local.data.CbzFetcher
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
-import org.koitharu.kotatsu.settings.backup.BackupObserver
-import org.koitharu.kotatsu.sync.domain.SyncController
-import org.koitharu.kotatsu.utils.ext.isLowRamDevice
-import org.koitharu.kotatsu.utils.image.CoilImageGetter
-import org.koitharu.kotatsu.widget.WidgetUpdater
-
-@Module
-@InstallIn(SingletonComponent::class)
-interface AppModule {
-
-	@Binds
-	fun bindCookieJar(androidCookieJar: AndroidCookieJar): CookieJar
-
-	@Binds
-	fun bindMangaLoaderContext(mangaLoaderContextImpl: MangaLoaderContextImpl): MangaLoaderContext
-
-	@Binds
-	fun bindImageGetter(coilImageGetter: CoilImageGetter): Html.ImageGetter
-
-	companion object {
-
-		@Provides
-		@Singleton
-		fun provideOkHttpClient(
-			localStorageManager: LocalStorageManager,
-			cookieJar: CookieJar,
-			settings: AppSettings,
-		): OkHttpClient {
-			val cache = localStorageManager.createHttpCache()
-			return OkHttpClient.Builder().apply {
-				connectTimeout(20, TimeUnit.SECONDS)
-				readTimeout(60, TimeUnit.SECONDS)
-				writeTimeout(20, TimeUnit.SECONDS)
-				cookieJar(cookieJar)
-				dns(DoHManager(cache, settings))
-				cache(cache)
-				addInterceptor(GZipInterceptor())
-				addInterceptor(UserAgentInterceptor())
-				addInterceptor(CloudFlareInterceptor())
-			}.build()
-		}
-
-		@Provides
-		@Singleton
-		fun provideMangaDatabase(
-			@ApplicationContext context: Context,
-		): MangaDatabase {
-			return MangaDatabase(context)
-		}
-
-		@Provides
-		@Singleton
-		fun provideCoil(
-			@ApplicationContext context: Context,
-			okHttpClient: OkHttpClient,
-			mangaRepositoryFactory: MangaRepository.Factory,
-		): ImageLoader {
-			val httpClientFactory = {
-				okHttpClient.newBuilder()
-					.cache(null)
-					.build()
-			}
-			val diskCacheFactory = {
-				val rootDir = context.externalCacheDir ?: context.cacheDir
-				DiskCache.Builder()
-					.directory(rootDir.resolve(CacheDir.THUMBS.dir))
-					.build()
-			}
-			return ImageLoader.Builder(context)
-				.okHttpClient(httpClientFactory)
-				.interceptorDispatcher(Dispatchers.Default)
-				.fetcherDispatcher(Dispatchers.IO)
-				.decoderDispatcher(Dispatchers.Default)
-				.transformationDispatcher(Dispatchers.Default)
-				.diskCache(diskCacheFactory)
-				.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
-				.allowRgb565(isLowRamDevice(context))
-				.components(
-					ComponentRegistry.Builder()
-						.add(SvgDecoder.Factory())
-						.add(CbzFetcher.Factory())
-						.add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
-						.build(),
-				).build()
-		}
-
-		@Provides
-		fun provideSearchSuggestions(
-			@ApplicationContext context: Context,
-		): SearchRecentSuggestions {
-			return MangaSuggestionsProvider.createSuggestions(context)
-		}
-
-		@Provides
-		@Singleton
-		@ElementsIntoSet
-		fun provideDatabaseObservers(
-			widgetUpdater: WidgetUpdater,
-			shortcutsUpdater: ShortcutsUpdater,
-			backupObserver: BackupObserver,
-			syncController: SyncController,
-		): Set<@JvmSuppressWildcards InvalidationTracker.Observer> = arraySetOf(
-			widgetUpdater,
-			shortcutsUpdater,
-			backupObserver,
-			syncController,
-		)
-
-		@Provides
-		@Singleton
-		@ElementsIntoSet
-		fun provideActivityLifecycleCallbacks(
-			appProtectHelper: AppProtectHelper,
-			activityRecreationHandle: ActivityRecreationHandle,
-		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
-			appProtectHelper,
-			activityRecreationHandle,
-		)
-	}
-}

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

@@ -8,11 +8,10 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.parsers.util.json.JSONIterator
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import javax.inject.Inject
 
 private const val PAGE_SIZE = 10
 
-class BackupRepository @Inject constructor(private val db: MangaDatabase) {
+class BackupRepository(private val db: MangaDatabase) {
 
 	suspend fun dumpHistory(): BackupEntry {
 		var offset = 0
@@ -127,4 +126,4 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 		}
 		return result
 	}
-}
+}

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

@@ -9,7 +9,6 @@ import org.koitharu.kotatsu.history.data.HistoryEntity
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault
-import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
 
 class JsonDeserializer(private val json: JSONObject) {
@@ -17,9 +16,7 @@ class JsonDeserializer(private val json: JSONObject) {
 	fun toFavouriteEntity() = FavouriteEntity(
 		mangaId = json.getLong("manga_id"),
 		categoryId = json.getLong("category_id"),
-		sortKey = json.getIntOrDefault("sort_key", 0),
 		createdAt = json.getLong("created_at"),
-		deletedAt = 0L,
 	)
 
 	fun toMangaEntity() = MangaEntity(
@@ -52,7 +49,6 @@ class JsonDeserializer(private val json: JSONObject) {
 		page = json.getInt("page"),
 		scroll = json.getDouble("scroll").toFloat(),
 		percent = json.getFloatOrDefault("percent", -1f),
-		deletedAt = 0L,
 	)
 
 	fun toFavouriteCategoryEntity() = FavouriteCategoryEntity(
@@ -62,7 +58,5 @@ class JsonDeserializer(private val json: JSONObject) {
 		title = json.getString("title"),
 		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
 		track = json.getBooleanOrDefault("track", true),
-		isVisibleInLibrary = json.getBooleanOrDefault("show_in_lib", true),
-		deletedAt = 0L,
 	)
-}
+}

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

@@ -13,7 +13,6 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 		JSONObject().apply {
 			put("manga_id", e.mangaId)
 			put("category_id", e.categoryId)
-			put("sort_key", e.sortKey)
 			put("created_at", e.createdAt)
 		}
 	)
@@ -26,7 +25,6 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("title", e.title)
 			put("order", e.order)
 			put("track", e.track)
-			put("show_in_lib", e.isVisibleInLibrary)
 		}
 	)
 

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

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

@@ -10,16 +10,8 @@ class DatabasePrePopulateCallback(private val resources: Resources) : RoomDataba
 
 	override fun onCreate(db: SupportSQLiteDatabase) {
 		db.execSQL(
-			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track, show_in_lib, `deleted_at`) VALUES (?,?,?,?,?,?,?)",
-			arrayOf(
-				System.currentTimeMillis(),
-				1,
-				resources.getString(R.string.read_later),
-				SortOrder.NEWEST.name,
-				1,
-				1,
-				0L,
-			)
+			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track) VALUES (?,?,?,?,?)",
+			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name, 1)
 		)
 	}
-}
+}

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

@@ -2,13 +2,9 @@ package org.koitharu.kotatsu.core.db
 
 import android.content.Context
 import androidx.room.Database
-import androidx.room.InvalidationTracker
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
 import org.koitharu.kotatsu.core.db.dao.MangaDao
@@ -33,9 +29,8 @@ import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
-import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 
-const val DATABASE_VERSION = 15
+const val DATABASE_VERSION = 12
 
 @Database(
 	entities = [
@@ -84,22 +79,10 @@ val databaseMigrations: Array<Migration>
 		Migration9To10(),
 		Migration10To11(),
 		Migration11To12(),
-		Migration12To13(),
-		Migration13To14(),
-		Migration14To15(),
 	)
 
 fun MangaDatabase(context: Context): MangaDatabase = Room
 	.databaseBuilder(context, MangaDatabase::class.java, "kotatsu-db")
 	.addMigrations(*databaseMigrations)
 	.addCallback(DatabasePrePopulateCallback(context.resources))
-	.build()
-
-fun InvalidationTracker.removeObserverAsync(observer: InvalidationTracker.Observer) {
-	val scope = processLifecycleScope
-	if (scope.isActive) {
-		processLifecycleScope.launch(Dispatchers.Default) {
-			removeObserver(observer)
-		}
-	}
-}
+	.build()

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.db
 
+
 const val TABLE_FAVOURITES = "favourites"
 const val TABLE_MANGA = "manga"
 const val TABLE_TAGS = "tags"

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
-import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 
 @Dao
@@ -10,9 +9,6 @@ abstract class PreferencesDao {
 	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
 	abstract suspend fun find(mangaId: Long): MangaPrefsEntity?
 
-	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
-	abstract fun observe(mangaId: Long): Flow<MangaPrefsEntity?>
-
 	@Insert(onConflict = OnConflictStrategy.IGNORE)
 	abstract suspend fun insert(pref: MangaPrefsEntity): Long
 
@@ -25,4 +21,4 @@ abstract class PreferencesDao {
 			insert(pref)
 		}
 	}
-}
+}

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
-import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogWithManga
 
@@ -9,8 +8,8 @@ import org.koitharu.kotatsu.tracker.data.TrackLogWithManga
 interface TrackLogsDao {
 
 	@Transaction
-	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET 0")
-	fun observeAll(limit: Int): Flow<List<TrackLogWithManga>>
+	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
+	suspend fun findAll(offset: Int, limit: Int): List<TrackLogWithManga>
 
 	@Query("DELETE FROM track_logs")
 	suspend fun clear()
@@ -26,4 +25,4 @@ interface TrackLogsDao {
 
 	@Query("SELECT COUNT(*) FROM track_logs")
 	suspend fun count(): Int
-}
+}

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.core.db.entity
 
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
@@ -11,7 +10,7 @@ import org.koitharu.kotatsu.utils.ext.longHashCode
 fun TagEntity.toMangaTag() = MangaTag(
 	key = this.key,
 	title = this.title.toTitleCase(),
-	source = MangaSource(this.source) ?: MangaSource.DUMMY,
+	source = MangaSource.valueOf(this.source),
 )
 
 fun Collection<TagEntity>.toMangaTags() = mapToSet(TagEntity::toMangaTag)
@@ -20,7 +19,7 @@ fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 	id = this.id,
 	title = this.title,
 	altTitle = this.altTitle,
-	state = this.state?.let { MangaState(it) },
+	state = this.state?.let { MangaState.valueOf(it) },
 	rating = this.rating,
 	isNsfw = this.isNsfw,
 	url = this.url,
@@ -28,8 +27,8 @@ fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 	coverUrl = this.coverUrl,
 	largeCoverUrl = this.largeCoverUrl,
 	author = this.author,
-	source = MangaSource(this.source) ?: MangaSource.DUMMY,
-	tags = tags,
+	source = MangaSource.valueOf(this.source),
+	tags = tags
 )
 
 fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())
@@ -55,18 +54,14 @@ fun MangaTag.toEntity() = TagEntity(
 	title = title,
 	key = key,
 	source = source.name,
-	id = "${key}_${source.name}".longHashCode(),
+	id = "${key}_${source.name}".longHashCode()
 )
 
 fun Collection<MangaTag>.toEntities() = map(MangaTag::toEntity)
 
 // Other
 
+@Suppress("FunctionName")
 fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {
 	SortOrder.valueOf(name)
-}.getOrDefault(fallback)
-
-@Suppress("FunctionName")
-fun MangaState(name: String): MangaState? = runCatching {
-	MangaState.valueOf(name)
-}.getOrNull()
+}.getOrDefault(fallback)

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

@@ -20,4 +20,4 @@ data class MangaEntity(
 	@ColumnInfo(name = "state") val state: String?,
 	@ColumnInfo(name = "author") val author: String?,
 	@ColumnInfo(name = "source") val source: String,
-)
+)

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

@@ -12,15 +12,12 @@ import androidx.room.PrimaryKey
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
 			childColumns = ["manga_id"],
-			onDelete = ForeignKey.CASCADE,
-		),
-	],
+			onDelete = ForeignKey.CASCADE
+		)
+	]
 )
-data class MangaPrefsEntity(
+class MangaPrefsEntity(
 	@PrimaryKey(autoGenerate = false)
-	@ColumnInfo(name = "manga_id")
-	val mangaId: Long,
-	@ColumnInfo(name = "mode") val mode: Int,
-	@ColumnInfo(name = "cf_brightness") val cfBrightness: Float,
-	@ColumnInfo(name = "cf_contrast") val cfContrast: Float,
-)
+	@ColumnInfo(name = "manga_id") val mangaId: Long,
+	@ColumnInfo(name = "mode") val mode: Int
+)

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

@@ -13,13 +13,13 @@ import org.koitharu.kotatsu.core.db.TABLE_MANGA_TAGS
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
 			childColumns = ["manga_id"],
-			onDelete = ForeignKey.CASCADE,
+			onDelete = ForeignKey.CASCADE
 		),
 		ForeignKey(
 			entity = TagEntity::class,
 			parentColumns = ["tag_id"],
 			childColumns = ["tag_id"],
-			onDelete = ForeignKey.CASCADE,
+			onDelete = ForeignKey.CASCADE
 		)
 	]
 )

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

@@ -12,23 +12,4 @@ class MangaWithTags(
 		associateBy = Junction(MangaTagsEntity::class)
 	)
 	val tags: List<TagEntity>,
-) {
-
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as MangaWithTags
-
-		if (manga != other.manga) return false
-		if (tags != other.tags) return false
-
-		return true
-	}
-
-	override fun hashCode(): Int {
-		var result = manga.hashCode()
-		result = 31 * result + tags.hashCode()
-		return result
-	}
-}
+)

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

@@ -12,4 +12,4 @@ data class TagEntity(
 	@ColumnInfo(name = "title") val title: String,
 	@ColumnInfo(name = "key") val key: String,
 	@ColumnInfo(name = "source") val source: String,
-)
+)

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

@@ -24,4 +24,4 @@ class Migration11To12 : Migration(11, 12) {
 		database.execSQL("ALTER TABLE history ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
 		database.execSQL("ALTER TABLE bookmarks ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
 	}
-}
+}

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

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration12To13 : Migration(12, 13) {
-
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `show_in_lib` INTEGER NOT NULL DEFAULT 1")
-		database.execSQL("ALTER TABLE favourites ADD COLUMN `sort_key` INTEGER NOT NULL DEFAULT 0")
-	}
-}

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

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration13To14 : Migration(13, 14) {
-
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE favourites ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE history ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-	}
-}

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

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration14To15 : Migration(14, 15) {
-
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
-	}
-}