Respect display cutout in reader bar

app/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 492
-		versionName '4.0-a3'
+		versionCode 494
+		versionName '4.0-a5'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/proguard-rules.pro

@@ -13,3 +13,4 @@
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
 
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
+-keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment

app/src/main/AndroidManifest.xml

@@ -133,6 +133,9 @@
 		<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"

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

@@ -10,6 +10,9 @@ 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
@@ -23,6 +26,7 @@ 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
 
@@ -31,15 +35,22 @@ class MangaDataRepository @Inject constructor(
 	private val db: MangaDatabase,
 ) {
 
-	suspend fun savePreferences(manga: Manga, mode: ReaderMode) {
-		val tags = manga.tags.toEntities()
+	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
 		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
+			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.preferencesDao.upsert(
-				MangaPrefsEntity(
-					mangaId = manga.id,
-					mode = mode.id,
+				entity.copy(
+					cfBrightness = colorFilter?.brightness ?: 0f,
+					cfContrast = colorFilter?.contrast ?: 0f,
 				),
 			)
 		}
@@ -49,6 +60,16 @@ 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()
 	}
@@ -71,6 +92,14 @@ class MangaDataRepository @Inject constructor(
 		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
@@ -104,6 +133,13 @@ class MangaDataRepository @Inject constructor(
 		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) {

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

@@ -26,6 +26,8 @@ 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,
@@ -35,6 +37,7 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 	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>()
@@ -43,6 +46,8 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 	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
@@ -173,16 +178,11 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 	}
 
 	private fun onBottomSheetStateChanged(newState: Int) {
-		val isExpanded = newState == BottomSheetBehavior.STATE_EXPANDED && isOnTopOfScreen()
-		if (isExpanded == binding.dragHandle.isGone) {
-			return
+		val expanded = newState == BottomSheetBehavior.STATE_EXPANDED && isOnTopOfScreen()
+		if (isBsExpanded != expanded) {
+			isBsExpanded = expanded
+			postAdjustState()
 		}
-		suppressLayoutCompat(true)
-		binding.toolbar.navigationIcon = (if (isExpanded) closeDrawable else null)
-		binding.dragHandle.isGone = isExpanded
-		expansionListeners.forEach { it.onExpansionStateChanged(this, isExpanded) }
-		dispatchInsets(ViewCompat.getRootWindowInsets(this))
-		suppressLayoutCompat(false)
 	}
 
 	private fun suppressLayoutCompat(suppress: Boolean) {
@@ -262,6 +262,26 @@ class BottomSheetHeaderBar @JvmOverloads constructor(
 		}
 	}
 
+	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) {

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

@@ -55,6 +55,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	override fun onDestroyView() {
 		binding.webView.stopLoading()
+		binding.webView.destroy()
 		super.onDestroyView()
 	}
 
@@ -83,7 +84,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	override fun onCheckPassed() {
 		pendingResult.putBoolean(EXTRA_RESULT, true)
-		dismiss()
+		dismissAllowingStateLoss()
 	}
 
 	companion object {

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

@@ -35,7 +35,7 @@ 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 = 14
+const val DATABASE_VERSION = 15
 
 @Database(
 	entities = [
@@ -86,6 +86,7 @@ val databaseMigrations: Array<Migration>
 		Migration11To12(),
 		Migration12To13(),
 		Migration13To14(),
+		Migration14To15(),
 	)
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.*
+import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 
 @Dao
@@ -9,6 +10,9 @@ 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
 
@@ -21,4 +25,4 @@ abstract class PreferencesDao {
 			insert(pref)
 		}
 	}
-}
+}

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

@@ -12,12 +12,15 @@ import androidx.room.PrimaryKey
 			entity = MangaEntity::class,
 			parentColumns = ["manga_id"],
 			childColumns = ["manga_id"],
-			onDelete = ForeignKey.CASCADE
-		)
-	]
+			onDelete = ForeignKey.CASCADE,
+		),
+	],
 )
-class MangaPrefsEntity(
+data class MangaPrefsEntity(
 	@PrimaryKey(autoGenerate = false)
-	@ColumnInfo(name = "manga_id") val mangaId: Long,
-	@ColumnInfo(name = "mode") val mode: Int
-)
+	@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,
+)

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

@@ -0,0 +1,12 @@
+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")
+	}
+}

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

@@ -2,10 +2,12 @@ package org.koitharu.kotatsu.core.os
 
 import android.app.ActivityManager
 import android.content.Context
+import android.content.SharedPreferences
 import android.content.pm.ShortcutManager
 import android.media.ThumbnailUtils
 import android.os.Build
 import android.util.Size
+import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
@@ -22,6 +24,7 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.core.db.TABLE_HISTORY
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
@@ -35,13 +38,18 @@ class ShortcutsUpdater @Inject constructor(
 	private val coil: ImageLoader,
 	private val historyRepository: HistoryRepository,
 	private val mangaRepository: MangaDataRepository,
-) : InvalidationTracker.Observer(TABLE_HISTORY) {
+	private val settings: AppSettings,
+) : InvalidationTracker.Observer(TABLE_HISTORY), SharedPreferences.OnSharedPreferenceChangeListener {
 
 	private val iconSize by lazy { getIconSize(context) }
 	private var shortcutsUpdateJob: Job? = null
 
-	override fun onInvalidated(tables: MutableSet<String>) {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
+	init {
+		settings.subscribe(this)
+	}
+
+	override fun onInvalidated(tables: Set<String>) {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1 || !settings.isDynamicShortcutsEnabled) {
 			return
 		}
 		val prevJob = shortcutsUpdateJob
@@ -51,6 +59,16 @@ class ShortcutsUpdater @Inject constructor(
 		}
 	}
 
+	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && key == AppSettings.KEY_SHORTCUTS) {
+			if (settings.isDynamicShortcutsEnabled) {
+				onInvalidated(emptySet())
+			} else {
+				clearShortcuts()
+			}
+		}
+	}
+
 	suspend fun requestPinShortcut(manga: Manga): Boolean {
 		return ShortcutManagerCompat.requestPinShortcut(
 			context,
@@ -64,6 +82,15 @@ class ShortcutsUpdater @Inject constructor(
 		return shortcutsUpdateJob?.join() != null
 	}
 
+	fun isDynamicShortcutsAvailable(): Boolean {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
+			return false
+		}
+		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
+		return manager.maxShortcutCountPerActivity > 0
+	}
+
+	@RequiresApi(Build.VERSION_CODES.N_MR1)
 	private suspend fun updateShortcutsImpl() = runCatching {
 		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
 		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
@@ -74,6 +101,15 @@ class ShortcutsUpdater @Inject constructor(
 		it.printStackTraceDebug()
 	}
 
+	@RequiresApi(Build.VERSION_CODES.N_MR1)
+	private fun clearShortcuts() {
+		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
+		try {
+			manager.removeAllDynamicShortcuts()
+		} catch (_: IllegalStateException) {
+		}
+	}
+
 	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat.Builder {
 		val icon = runCatching {
 			val bmp = coil.execute(

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

@@ -65,6 +65,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val readerPageSwitch: Set<String>
 		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
 
+	val isReaderTapsAdaptive: Boolean
+		get() = !prefs.getBoolean(KEY_READER_TAPS_LTR, false)
+
 	var isTrafficWarningEnabled: Boolean
 		get() = prefs.getBoolean(KEY_TRAFFIC_WARNING, true)
 		set(value) = prefs.edit { putBoolean(KEY_TRAFFIC_WARNING, value) }
@@ -134,6 +137,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isExitConfirmationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_EXIT_CONFIRM, false)
 
+	val isDynamicShortcutsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_SHORTCUTS, true)
+
 	var sourcesOrder: List<String>
 		get() = prefs.getString(KEY_SOURCES_ORDER, null)
 			?.split('|')
@@ -317,6 +323,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_INCOGNITO_MODE = "incognito"
 		const val KEY_SYNC = "sync"
 		const val KEY_READER_BAR = "reader_bar"
+		const val KEY_SHORTCUTS = "dynamic_shortcuts"
+		const val KEY_READER_TAPS_LTR = "reader_taps_ltr"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

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

@@ -14,6 +14,7 @@ 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 dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import org.koitharu.kotatsu.R
@@ -47,7 +48,7 @@ class FavouritesCategoryEditActivity :
 		setContentView(ActivityCategoryEditBinding.inflate(layoutInflater))
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(true)
-			setHomeAsUpIndicator(com.google.android.material.R.drawable.abc_ic_clear_material)
+			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
 		initSortSpinner()
 		binding.buttonDone.setOnClickListener(this)

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

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

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

@@ -6,17 +6,21 @@ import android.os.Bundle
 import android.view.*
 import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.FragmentManager
+import androidx.recyclerview.widget.AsyncListDiffer
+import androidx.recyclerview.widget.LinearLayoutManager
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.databinding.SheetFilterBinding
 import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel
+import org.koitharu.kotatsu.utils.ext.isScrolledToTop
 import org.koitharu.kotatsu.utils.ext.parentFragmentViewModels
 
 class FilterBottomSheet :
 	BaseBottomSheet<SheetFilterBinding>(),
 	MenuItem.OnActionExpandListener,
 	SearchView.OnQueryTextListener,
-	DialogInterface.OnKeyListener {
+	DialogInterface.OnKeyListener,
+	AsyncListDiffer.ListListener<FilterItem> {
 
 	private val viewModel by parentFragmentViewModels<RemoteListViewModel>()
 
@@ -32,7 +36,7 @@ class FilterBottomSheet :
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		val adapter = FilterAdapter(viewModel)
+		val adapter = FilterAdapter(viewModel, this)
 		binding.recyclerView.adapter = adapter
 		viewModel.filterItems.observe(viewLifecycleOwner, adapter::setItems)
 		initOptionsMenu()
@@ -70,6 +74,12 @@ class FilterBottomSheet :
 		return false
 	}
 
+	override fun onCurrentListChanged(previousList: MutableList<FilterItem>, currentList: MutableList<FilterItem>) {
+		if (currentList.size > previousList.size && view != null) {
+			(binding.recyclerView.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(0, 0)
+		}
+	}
+
 	private fun initOptionsMenu() {
 		binding.headerBar.toolbar.inflateMenu(R.menu.opt_filter)
 		val searchMenuItem = binding.headerBar.toolbar.menu.findItem(R.id.action_search)

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

@@ -63,6 +63,10 @@ class LocalMangaRepository @Inject constructor(private val storageManager: Local
 				x.tags.containsAll(tags)
 			}
 		}
+		when (sortOrder) {
+			SortOrder.ALPHABETICAL -> list.sortBy { it.title }
+			SortOrder.RATING -> list.sortBy { it.rating }
+		}
 		return list
 	}
 
@@ -250,7 +254,7 @@ class LocalMangaRepository @Inject constructor(private val storageManager: Local
 		}
 	}
 
-	override val sortOrders = setOf(SortOrder.ALPHABETICAL)
+	override val sortOrders = setOf(SortOrder.ALPHABETICAL, SortOrder.RATING)
 
 	override suspend fun getPageUrl(page: MangaPage) = page.url
 

app/src/main/java/org/koitharu/kotatsu/main/ui/MainViewModel.kt

@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.sync.domain.SyncController
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
+import org.koitharu.kotatsu.utils.asFlowLiveData
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
 @HiltViewModel
@@ -32,7 +33,7 @@ class MainViewModel @Inject constructor(
 
 	val isResumeEnabled = historyRepository
 		.observeHasItems()
-		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, false)
+		.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, false)
 
 	val counters = combine(
 		appUpdateRepository.observeAvailableUpdate(),

app/src/main/java/org/koitharu/kotatsu/main/ui/protect/AppProtectHelper.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Bundle
 import javax.inject.Inject
 import javax.inject.Singleton
+import org.acra.dialog.CrashReportDialog
 import org.koitharu.kotatsu.core.prefs.AppSettings
 
 @Singleton
@@ -14,7 +15,7 @@ class AppProtectHelper @Inject constructor(private val settings: AppSettings) :
 	private var isUnlocked = settings.appPassword.isNullOrEmpty()
 
 	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-		if (activity !is ProtectActivity && !isUnlocked) {
+		if (!isUnlocked && activity !is ProtectActivity && activity !is CrashReportDialog) {
 			val sourceIntent = Intent(activity, activity.javaClass)
 			activity.intent?.let {
 				sourceIntent.putExtras(it)

app/src/main/java/org/koitharu/kotatsu/reader/domain/ReaderColorFilter.kt

@@ -0,0 +1,52 @@
+package org.koitharu.kotatsu.reader.domain
+
+import android.graphics.ColorMatrix
+import android.graphics.ColorMatrixColorFilter
+
+class ReaderColorFilter(
+	val brightness: Float,
+	val contrast: Float,
+) {
+
+	val isEmpty: Boolean
+		get() = brightness == 0f && contrast == 0f
+
+	fun toColorFilter(): ColorMatrixColorFilter {
+		val cm = ColorMatrix()
+		val scale = brightness + 1f
+		cm.setScale(scale, scale, scale, 1f)
+		cm.setContrast(contrast)
+		return ColorMatrixColorFilter(cm)
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as ReaderColorFilter
+
+		if (brightness != other.brightness) return false
+		if (contrast != other.contrast) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		var result = brightness.hashCode()
+		result = 31 * result + contrast.hashCode()
+		return result
+	}
+
+	private fun ColorMatrix.setContrast(contrast: Float) {
+		val scale = contrast + 1f
+		val translate = (-.5f * scale + .5f) * 255f
+		val array = floatArrayOf(
+			scale, 0f, 0f, 0f, translate,
+			0f, scale, 0f, 0f, translate,
+			0f, 0f, scale, 0f, translate,
+			0f, 0f, 0f, 1f, 0f,
+		)
+		val matrix = ColorMatrix(array)
+		postConcat(matrix)
+	}
+}

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

@@ -74,6 +74,9 @@ class ReaderActivity :
 			pageSwitchTimer.delaySec = value
 		}
 
+	override val readerMode: ReaderMode?
+		get() = readerManager.currentMode
+
 	private lateinit var pageSwitchTimer: PageSwitchTimer
 	private lateinit var touchHelper: GridTouchHelper
 	private lateinit var controlDelegate: ReaderControlDelegate
@@ -88,7 +91,7 @@ class ReaderActivity :
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		touchHelper = GridTouchHelper(this, this)
 		pageSwitchTimer = PageSwitchTimer(this, this)
-		controlDelegate = ReaderControlDelegate(lifecycleScope, settings, this)
+		controlDelegate = ReaderControlDelegate(settings, this, this)
 		binding.toolbarBottom.setOnMenuItemClickListener(::onOptionsItemSelected)
 		binding.slider.setLabelFormatter(PageLabelFormatter())
 		ReaderSliderListener(this, viewModel).attachToSlider(binding.slider)

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

@@ -1,33 +1,39 @@
 package org.koitharu.kotatsu.reader.ui
 
+import android.content.SharedPreferences
 import android.view.KeyEvent
 import android.view.SoundEffectConstants
 import android.view.View
-import androidx.lifecycle.LifecycleCoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.utils.GridTouchHelper
 
 class ReaderControlDelegate(
-	scope: LifecycleCoroutineScope,
-	settings: AppSettings,
+	private val settings: AppSettings,
 	private val listener: OnInteractionListener,
-) {
+	owner: LifecycleOwner,
+) : DefaultLifecycleObserver, SharedPreferences.OnSharedPreferenceChangeListener {
 
 	private var isTapSwitchEnabled: Boolean = true
 	private var isVolumeKeysSwitchEnabled: Boolean = false
+	private var isReaderTapsAdaptive: Boolean = true
 
 	init {
-		settings.observeAsFlow(AppSettings.KEY_READER_SWITCHERS) { readerPageSwitch }
-			.flowOn(Dispatchers.Default)
-			.onEach {
-				isTapSwitchEnabled = AppSettings.PAGE_SWITCH_TAPS in it
-				isVolumeKeysSwitchEnabled = AppSettings.PAGE_SWITCH_VOLUME_KEYS in it
-			}.launchIn(scope)
+		owner.lifecycle.addObserver(this)
+		settings.subscribe(this)
+		updateSettings()
+	}
+
+	override fun onDestroy(owner: LifecycleOwner) {
+		settings.unsubscribe(this)
+		owner.lifecycle.removeObserver(this)
+		super.onDestroy(owner)
+	}
+
+	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+		updateSettings()
 	}
 
 	fun onGridTouch(area: Int, view: View) {
@@ -41,7 +47,7 @@ class ReaderControlDelegate(
 				view.playSoundEffect(SoundEffectConstants.NAVIGATION_UP)
 			}
 			GridTouchHelper.AREA_LEFT -> if (isTapSwitchEnabled) {
-				listener.switchPageBy(-1)
+				listener.switchPageBy(if (isReaderTapsReversed()) 1 else -1)
 				view.playSoundEffect(SoundEffectConstants.NAVIGATION_LEFT)
 			}
 			GridTouchHelper.AREA_BOTTOM -> if (isTapSwitchEnabled) {
@@ -49,7 +55,7 @@ class ReaderControlDelegate(
 				view.playSoundEffect(SoundEffectConstants.NAVIGATION_DOWN)
 			}
 			GridTouchHelper.AREA_RIGHT -> if (isTapSwitchEnabled) {
-				listener.switchPageBy(1)
+				listener.switchPageBy(if (isReaderTapsReversed()) -1 else 1)
 				view.playSoundEffect(SoundEffectConstants.NAVIGATION_RIGHT)
 			}
 		}
@@ -72,19 +78,25 @@ class ReaderControlDelegate(
 		KeyEvent.KEYCODE_PAGE_DOWN,
 		KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN,
 		KeyEvent.KEYCODE_DPAD_DOWN,
-		KeyEvent.KEYCODE_DPAD_RIGHT,
 		-> {
 			listener.switchPageBy(1)
 			true
 		}
+		KeyEvent.KEYCODE_DPAD_RIGHT -> {
+			listener.switchPageBy(if (isReaderTapsReversed()) -1 else 1)
+			true
+		}
 		KeyEvent.KEYCODE_PAGE_UP,
 		KeyEvent.KEYCODE_SYSTEM_NAVIGATION_UP,
 		KeyEvent.KEYCODE_DPAD_UP,
-		KeyEvent.KEYCODE_DPAD_LEFT,
 		-> {
 			listener.switchPageBy(-1)
 			true
 		}
+		KeyEvent.KEYCODE_DPAD_LEFT -> {
+			listener.switchPageBy(if (isReaderTapsReversed()) 1 else -1)
+			true
+		}
 		KeyEvent.KEYCODE_DPAD_CENTER -> {
 			listener.toggleUiVisibility()
 			true
@@ -99,8 +111,21 @@ class ReaderControlDelegate(
 			)
 	}
 
+	private fun updateSettings() {
+		val switch = settings.readerPageSwitch
+		isTapSwitchEnabled = AppSettings.PAGE_SWITCH_TAPS in switch
+		isVolumeKeysSwitchEnabled = AppSettings.PAGE_SWITCH_VOLUME_KEYS in switch
+		isReaderTapsAdaptive = settings.isReaderTapsAdaptive
+	}
+
+	private fun isReaderTapsReversed(): Boolean {
+		return isReaderTapsAdaptive && listener.readerMode == ReaderMode.REVERSED
+	}
+
 	interface OnInteractionListener {
 
+		val readerMode: ReaderMode?
+
 		fun switchPageBy(delta: Int)
 
 		fun toggleUiVisibility()

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

@@ -10,8 +10,11 @@ import android.graphics.Paint
 import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.View
+import android.view.WindowInsets
 import androidx.annotation.AttrRes
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.google.android.material.R as materialR
 import java.text.SimpleDateFormat
 import java.util.*
@@ -36,6 +39,8 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	private var insetLeft: Int = 0
 	private var insetRight: Int = 0
 	private var insetTop: Int = 0
+	private var cutoutInsetLeft = 0
+	private var cutoutInsetRight = 0
 	private val colorText = ColorUtils.setAlphaComponent(
 		context.getThemeColor(materialR.attr.colorOnSurface, Color.BLACK),
 		200,
@@ -78,19 +83,34 @@ class ReaderInfoBarView @JvmOverloads constructor(
 		super.onDraw(canvas)
 		val ty = innerHeight / 2f + textBounds.height() / 2f - textBounds.bottom
 		paint.textAlign = Paint.Align.LEFT
-		canvas.drawTextOutline(text, (paddingLeft + insetLeft).toFloat(), paddingTop + insetTop + ty)
+		canvas.drawTextOutline(
+			text,
+			(paddingLeft + insetLeft + cutoutInsetLeft).toFloat(),
+			paddingTop + insetTop + ty,
+		)
 		paint.textAlign = Paint.Align.RIGHT
-		canvas.drawTextOutline(timeText, (width - paddingRight - insetRight).toFloat(), paddingTop + insetTop + ty)
+		canvas.drawTextOutline(
+			timeText,
+			(width - paddingRight - insetRight - cutoutInsetRight).toFloat(),
+			paddingTop + insetTop + ty,
+		)
 	}
 
 	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
 		super.onSizeChanged(w, h, oldw, oldh)
+		updateCutoutInsets(ViewCompat.getRootWindowInsets(this))
 		updateTextSize()
 	}
 
+	override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets {
+		updateCutoutInsets(WindowInsetsCompat.toWindowInsetsCompat(insets))
+		return super.onApplyWindowInsets(insets)
+	}
+
 	override fun onAttachedToWindow() {
 		super.onAttachedToWindow()
 		context.registerReceiver(timeReceiver, IntentFilter(Intent.ACTION_TIME_TICK))
+		updateCutoutInsets(ViewCompat.getRootWindowInsets(this))
 	}
 
 	override fun onDetachedFromWindow() {
@@ -137,6 +157,20 @@ class ReaderInfoBarView @JvmOverloads constructor(
 		drawText(text, x, y, paint)
 	}
 
+	private fun updateCutoutInsets(insetsCompat: WindowInsetsCompat?) {
+		val cutouts = (insetsCompat ?: return).displayCutout?.boundingRects.orEmpty()
+		cutoutInsetLeft = 0
+		cutoutInsetRight = 0
+		for (rect in cutouts) {
+			if (rect.left <= paddingLeft) {
+				cutoutInsetLeft += rect.width()
+			}
+			if (rect.right >= width - paddingRight) {
+				cutoutInsetRight += rect.width()
+			}
+		}
+	}
+
 	private inner class TimeReceiver : BroadcastReceiver() {
 
 		override fun onReceive(context: Context?, intent: Intent?) {

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

@@ -31,6 +31,7 @@ import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.data.filterChapters
 import org.koitharu.kotatsu.reader.domain.ChaptersLoader
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.asFlowLiveData
@@ -86,6 +87,14 @@ class ReaderViewModel @AssistedInject constructor(
 		valueProducer = { isReaderBarEnabled },
 	)
 
+	val readerSettings = ReaderSettings(
+		parentScope = viewModelScope,
+		settings = settings,
+		colorFilterFlow = mangaData.flatMapLatest {
+			if (it == null) flowOf(null) else dataRepository.observeColorFilter(it.id)
+		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null),
+	)
+
 	val isScreenshotsBlockEnabled = combine(
 		mangaData,
 		settings.observeAsFlow(AppSettings.KEY_SCREENSHOTS_POLICY) { screenshotsPolicy },
@@ -94,8 +103,6 @@ class ReaderViewModel @AssistedInject constructor(
 			(policy == ScreenshotsPolicy.BLOCK_NSFW && manga != null && manga.isNsfw)
 	}.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, false)
 
-	val onZoomChanged = SingleLiveEvent<Unit>()
-
 	val isBookmarkAdded: LiveData<Boolean> = currentState.flatMapLatest { state ->
 		val manga = mangaData.value
 		if (state == null || manga == null) {
@@ -108,7 +115,6 @@ class ReaderViewModel @AssistedInject constructor(
 
 	init {
 		loadImpl()
-		subscribeToSettings()
 	}
 
 	override fun onCleared() {
@@ -124,7 +130,7 @@ class ReaderViewModel @AssistedInject constructor(
 	fun switchMode(newMode: ReaderMode) {
 		launchJob {
 			val manga = checkNotNull(mangaData.value)
-			dataRepository.savePreferences(
+			dataRepository.saveReaderMode(
 				manga = manga,
 				mode = newMode,
 			)
@@ -300,13 +306,6 @@ class ReaderViewModel @AssistedInject constructor(
 		}
 	}
 
-	private fun subscribeToSettings() {
-		settings.observe()
-			.onEach { key ->
-				if (key == AppSettings.KEY_ZOOM_MODE) onZoomChanged.postCall(Unit)
-			}.launchIn(viewModelScope + Dispatchers.Default)
-	}
-
 	private fun <T> List<T>.trySublist(fromIndex: Int, toIndex: Int): List<T> {
 		val fromIndexBounded = fromIndex.coerceAtMost(lastIndex)
 		val toIndexBounded = toIndex.coerceIn(fromIndexBounded, lastIndex)
@@ -331,7 +330,7 @@ class ReaderViewModel @AssistedInject constructor(
 			val isWebtoon = dataRepository.determineMangaIsWebtoon(repo, pages)
 			if (isWebtoon) ReaderMode.WEBTOON else defaultMode
 		}.onSuccess {
-			dataRepository.savePreferences(manga, it)
+			dataRepository.saveReaderMode(manga, it)
 		}.onFailure {
 			it.printStackTraceDebug()
 		}.getOrDefault(defaultMode)

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

@@ -0,0 +1,151 @@
+package org.koitharu.kotatsu.reader.ui.colorfilter
+
+import android.content.Context
+import android.content.Intent
+import android.content.res.Resources
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.size.Scale
+import coil.size.ViewSizeResolver
+import com.google.android.material.R as materialR
+import com.google.android.material.slider.LabelFormatter
+import com.google.android.material.slider.Slider
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPages
+import org.koitharu.kotatsu.databinding.ActivityColorFilterBinding
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.util.format
+import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
+import org.koitharu.kotatsu.utils.ext.*
+
+@AndroidEntryPoint
+class ColorFilterConfigActivity :
+	BaseActivity<ActivityColorFilterBinding>(),
+	Slider.OnChangeListener,
+	View.OnClickListener {
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	@Inject
+	lateinit var viewModelFactory: ColorFilterConfigViewModel.Factory
+
+	private val viewModel: ColorFilterConfigViewModel by assistedViewModels {
+		viewModelFactory.create(
+			manga = checkNotNull(intent.getParcelableExtraCompat<ParcelableManga>(EXTRA_MANGA)?.manga),
+			page = checkNotNull(intent.getParcelableExtraCompat<ParcelableMangaPages>(EXTRA_PAGES)?.pages?.firstOrNull()),
+		)
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityColorFilterBinding.inflate(layoutInflater))
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
+		}
+		binding.sliderBrightness.addOnChangeListener(this)
+		binding.sliderContrast.addOnChangeListener(this)
+		val formatter = PercentLabelFormatter(resources)
+		binding.sliderContrast.setLabelFormatter(formatter)
+		binding.sliderBrightness.setLabelFormatter(formatter)
+		binding.buttonDone.setOnClickListener(this)
+		binding.buttonReset.setOnClickListener(this)
+
+		onBackPressedDispatcher.addCallback(ColorFilterConfigBackPressedDispatcher(this, viewModel))
+
+		viewModel.colorFilter.observe(this, this::onColorFilterChanged)
+		viewModel.isLoading.observe(this, this::onLoadingChanged)
+		viewModel.preview.observe(this, this::onPreviewChanged)
+		viewModel.onDismiss.observe(this) {
+			finishAfterTransition()
+		}
+	}
+
+	override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
+		if (fromUser) {
+			when (slider.id) {
+				R.id.slider_brightness -> viewModel.setBrightness(value)
+				R.id.slider_contrast -> viewModel.setContrast(value)
+			}
+		}
+	}
+
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_done -> viewModel.save()
+			R.id.button_reset -> viewModel.reset()
+		}
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
+		binding.scrollView.updatePadding(
+			bottom = insets.bottom,
+		)
+		binding.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+			topMargin = insets.top
+		}
+	}
+
+	private fun onColorFilterChanged(readerColorFilter: ReaderColorFilter?) {
+		binding.sliderBrightness.value = readerColorFilter?.brightness ?: 0f
+		binding.sliderContrast.value = readerColorFilter?.contrast ?: 0f
+		binding.imageViewAfter.colorFilter = readerColorFilter?.toColorFilter()
+	}
+
+	private fun onPreviewChanged(preview: MangaPage?) {
+		if (preview == null) return
+		ImageRequest.Builder(this@ColorFilterConfigActivity)
+			.data(preview.url)
+			.referer(preview.referer)
+			.scale(Scale.FILL)
+			.decodeRegion()
+			.error(R.drawable.ic_error_placeholder)
+			.size(ViewSizeResolver(binding.imageViewBefore))
+			.allowRgb565(false)
+			.target(ShadowViewTarget(binding.imageViewBefore, binding.imageViewAfter))
+			.enqueueWith(coil)
+	}
+
+	private fun onLoadingChanged(isLoading: Boolean) {
+		binding.sliderContrast.isEnabled = !isLoading
+		binding.sliderBrightness.isEnabled = !isLoading
+		binding.buttonDone.isEnabled = !isLoading
+	}
+
+	private class PercentLabelFormatter(resources: Resources) : LabelFormatter {
+
+		private val pattern = resources.getString(R.string.percent_string_pattern)
+
+		override fun getFormattedValue(value: Float): String {
+			val percent = ((value + 1f) * 100).format(0)
+			return pattern.format(percent)
+		}
+	}
+
+	companion object {
+
+		private const val EXTRA_PAGES = "pages"
+		private const val EXTRA_MANGA = "manga_id"
+
+		fun newIntent(context: Context, manga: Manga, page: MangaPage) =
+			Intent(context, ColorFilterConfigActivity::class.java)
+				.putExtra(EXTRA_MANGA, ParcelableManga(manga, false))
+				.putExtra(EXTRA_PAGES, ParcelableMangaPages(listOf(page)))
+	}
+}

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

@@ -0,0 +1,39 @@
+package org.koitharu.kotatsu.reader.ui.colorfilter
+
+import android.content.Context
+import android.content.DialogInterface
+import androidx.activity.OnBackPressedCallback
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.koitharu.kotatsu.R
+
+class ColorFilterConfigBackPressedDispatcher(
+	private val context: Context,
+	private val viewModel: ColorFilterConfigViewModel,
+) : OnBackPressedCallback(true), DialogInterface.OnClickListener {
+
+	override fun handleOnBackPressed() {
+		if (viewModel.isChanged) {
+			showConfirmation()
+		} else {
+			viewModel.onDismiss.call(Unit)
+		}
+	}
+
+	override fun onClick(dialog: DialogInterface, which: Int) {
+		when (which) {
+			DialogInterface.BUTTON_NEGATIVE -> viewModel.onDismiss.call(Unit)
+			DialogInterface.BUTTON_NEUTRAL -> dialog.dismiss()
+			DialogInterface.BUTTON_POSITIVE -> viewModel.save()
+		}
+	}
+
+	private fun showConfirmation() {
+		MaterialAlertDialogBuilder(context)
+			.setTitle(R.string.color_correction)
+			.setMessage(R.string.text_unsaved_changes_prompt)
+			.setNegativeButton(R.string.discard, this)
+			.setNeutralButton(android.R.string.cancel, this)
+			.setPositiveButton(R.string.save, this)
+			.show()
+	}
+}

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

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

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

@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.reader.ui.colorfilter
+
+import android.graphics.drawable.Drawable
+import android.widget.ImageView
+import coil.target.ImageViewTarget
+
+class ShadowViewTarget(
+	view: ImageView,
+	private val shadowView: ImageView,
+) : ImageViewTarget(view) {
+
+	override var drawable: Drawable?
+		get() = super.drawable
+		set(value) {
+			super.drawable = value
+			shadowView.setImageDrawable(value?.constantState?.newDrawable())
+		}
+}

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

@@ -20,6 +20,7 @@ import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.databinding.SheetReaderConfigBinding
 import org.koitharu.kotatsu.reader.ui.PageSaveContract
 import org.koitharu.kotatsu.reader.ui.ReaderViewModel
+import org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.utils.ScreenOrientationHelper
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
@@ -59,6 +60,7 @@ class ReaderConfigBottomSheet :
 		binding.buttonSavePage.setOnClickListener(this)
 		binding.buttonScreenRotate.setOnClickListener(this)
 		binding.buttonSettings.setOnClickListener(this)
+		binding.buttonColorFilter.setOnClickListener(this)
 		binding.sliderTimer.addOnSliderTouchListener(this)
 		binding.sliderTimer.setLabelFormatter(PageSwitchTimer.DelayLabelFormatter(view.resources))
 
@@ -80,6 +82,11 @@ class ReaderConfigBottomSheet :
 			R.id.button_screen_rotate -> {
 				orientationHelper?.toggleOrientation()
 			}
+			R.id.button_color_filter -> {
+				val page = viewModel.getCurrentPage() ?: return
+				val manga = viewModel.manga ?: return
+				startActivity(ColorFilterConfigActivity.newIntent(v.context, manga, page))
+			}
 		}
 	}
 

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

@@ -0,0 +1,68 @@
+package org.koitharu.kotatsu.reader.ui.config
+
+import android.content.SharedPreferences
+import androidx.lifecycle.MediatorLiveData
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.StateFlow
+import org.koitharu.kotatsu.core.model.ZoomMode
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
+
+class ReaderSettings(
+	private val parentScope: CoroutineScope,
+	private val settings: AppSettings,
+	private val colorFilterFlow: StateFlow<ReaderColorFilter?>,
+) : MediatorLiveData<ReaderSettings>() {
+
+	private val internalObserver = InternalObserver()
+	private var collectJob: Job? = null
+
+	val zoomMode: ZoomMode
+		get() = settings.zoomMode
+
+	val colorFilter: ReaderColorFilter?
+		get() = colorFilterFlow.value
+
+	val isPagesNumbersEnabled: Boolean
+		get() = settings.isPagesNumbersEnabled
+
+	override fun onInactive() {
+		super.onInactive()
+		settings.unsubscribe(internalObserver)
+		collectJob?.cancel()
+		collectJob = null
+	}
+
+	override fun onActive() {
+		super.onActive()
+		settings.subscribe(internalObserver)
+		collectJob?.cancel()
+		collectJob = parentScope.launch {
+			colorFilterFlow.collect(internalObserver)
+		}
+	}
+
+	override fun getValue() = this
+
+	private fun notifyChanged() {
+		value = value
+	}
+
+	private inner class InternalObserver :
+		FlowCollector<ReaderColorFilter?>,
+		SharedPreferences.OnSharedPreferenceChangeListener {
+
+		override suspend fun emit(value: ReaderColorFilter?) {
+			withContext(Dispatchers.Main.immediate) {
+				notifyChanged()
+			}
+		}
+
+		override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+			if (key == AppSettings.KEY_ZOOM_MODE || key == AppSettings.KEY_PAGES_NUMBERS) {
+				notifyChanged()
+			}
+		}
+	}
+}

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

@@ -5,15 +5,15 @@ import androidx.annotation.CallSuper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.LayoutPageInfoBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 
 abstract class BasePageHolder<B : ViewBinding>(
 	protected val binding: B,
 	loader: PageLoader,
-	settings: AppSettings,
-	exceptionResolver: ExceptionResolver
+	settings: ReaderSettings,
+	exceptionResolver: ExceptionResolver,
 ) : RecyclerView.ViewHolder(binding.root), PageHolderDelegate.Callback {
 
 	@Suppress("LeakingThis")
@@ -37,8 +37,16 @@ abstract class BasePageHolder<B : ViewBinding>(
 
 	protected abstract fun onBind(data: ReaderPage)
 
+	fun onAttachedToWindow() {
+		delegate.onAttachedToWindow()
+	}
+
+	fun onDetachedFromWindow() {
+		delegate.onDetachedFromWindow()
+	}
+
 	@CallSuper
 	open fun onRecycled() {
 		delegate.onRecycle()
 	}
-}
+}

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

@@ -4,17 +4,17 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.reader.domain.PageLoader
-import org.koitharu.kotatsu.utils.ext.resetTransformations
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
+import org.koitharu.kotatsu.utils.ext.resetTransformations
 
 @Suppress("LeakingThis")
 abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 	private val loader: PageLoader,
-	private val settings: AppSettings,
+	private val readerSettings: ReaderSettings,
 	private val exceptionResolver: ExceptionResolver,
 ) : RecyclerView.Adapter<H>() {
 
@@ -35,6 +35,16 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 		super.onViewRecycled(holder)
 	}
 
+	override fun onViewAttachedToWindow(holder: H) {
+		super.onViewAttachedToWindow(holder)
+		holder.onAttachedToWindow()
+	}
+
+	override fun onViewDetachedFromWindow(holder: H) {
+		holder.onDetachedFromWindow()
+		super.onViewDetachedFromWindow(holder)
+	}
+
 	open fun getItem(position: Int): ReaderPage = differ.currentList[position]
 
 	open fun getItemOrNull(position: Int) = differ.currentList.getOrNull(position)
@@ -45,8 +55,8 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 
 	final override fun onCreateViewHolder(
 		parent: ViewGroup,
-		viewType: Int
-	): H = onCreateViewHolder(parent, loader, settings, exceptionResolver)
+		viewType: Int,
+	): H = onCreateViewHolder(parent, loader, readerSettings, exceptionResolver)
 
 	suspend fun setItems(items: List<ReaderPage>) = suspendCoroutine<Unit> { cont ->
 		differ.submitList(items) {
@@ -57,8 +67,8 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 	protected abstract fun onCreateViewHolder(
 		parent: ViewGroup,
 		loader: PageLoader,
-		settings: AppSettings,
-		exceptionResolver: ExceptionResolver
+		settings: ReaderSettings,
+		exceptionResolver: ExceptionResolver,
 	): H
 
 	private class DiffCallback : DiffUtil.ItemCallback<ReaderPage>() {
@@ -70,6 +80,5 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 		override fun areContentsTheSame(oldItem: ReaderPage, newItem: ReaderPage): Boolean {
 			return oldItem == newItem
 		}
-
 	}
-}
+}

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

@@ -2,26 +2,26 @@ package org.koitharu.kotatsu.reader.ui.pager
 
 import android.net.Uri
 import androidx.core.net.toUri
+import androidx.lifecycle.Observer
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import java.io.File
+import java.io.IOException
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.model.ZoomMode
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
-import java.io.File
-import java.io.IOException
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 
 class PageHolderDelegate(
 	private val loader: PageLoader,
-	private val settings: AppSettings,
+	private val readerSettings: ReaderSettings,
 	private val callback: Callback,
-	private val exceptionResolver: ExceptionResolver
-) : SubsamplingScaleImageView.DefaultOnImageEventListener() {
+	private val exceptionResolver: ExceptionResolver,
+) : SubsamplingScaleImageView.DefaultOnImageEventListener(), Observer<ReaderSettings> {
 
 	private val scope = loader.loaderScope + Dispatchers.Main.immediate
 	private var state = State.EMPTY
@@ -49,6 +49,14 @@ class PageHolderDelegate(
 		}
 	}
 
+	fun onAttachedToWindow() {
+		readerSettings.observeForever(this)
+	}
+
+	fun onDetachedFromWindow() {
+		readerSettings.removeObserver(this)
+	}
+
 	fun onRecycle() {
 		state = State.EMPTY
 		file = null
@@ -59,7 +67,7 @@ class PageHolderDelegate(
 	override fun onReady() {
 		state = State.SHOWING
 		error = null
-		callback.onImageShowing(settings.zoomMode)
+		callback.onImageShowing(readerSettings)
 	}
 
 	override fun onImageLoaded() {
@@ -79,6 +87,12 @@ class PageHolderDelegate(
 		}
 	}
 
+	override fun onChanged(t: ReaderSettings?) {
+		if (state == State.SHOWN) {
+			callback.onImageShowing(readerSettings)
+		}
+	}
+
 	private fun tryConvert(file: File, e: Exception) {
 		val prevJob = job
 		job = scope.launch {
@@ -134,10 +148,10 @@ class PageHolderDelegate(
 
 		fun onImageReady(uri: Uri)
 
-		fun onImageShowing(zoom: ZoomMode)
+		fun onImageShowing(settings: ReaderSettings)
 
 		fun onImageShown()
 
 		fun onProgressChanged(progress: Int)
 	}
-}
+}

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

@@ -6,16 +6,16 @@ import android.widget.FrameLayout
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.model.ZoomMode
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ItemPageBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.standard.PageHolder
 
 class ReversedPageHolder(
 	binding: ItemPageBinding,
 	loader: PageLoader,
-	settings: AppSettings,
-	exceptionResolver: ExceptionResolver
+	settings: ReaderSettings,
+	exceptionResolver: ExceptionResolver,
 ) : PageHolder(binding, loader, settings, exceptionResolver) {
 
 	init {
@@ -23,13 +23,14 @@ class ReversedPageHolder(
 			.gravity = Gravity.START or Gravity.BOTTOM
 	}
 
-	override fun onImageShowing(zoom: ZoomMode) {
+	override fun onImageShowing(settings: ReaderSettings) {
 		with(binding.ssiv) {
 			maxScale = 2f * maxOf(
 				width / sWidth.toFloat(),
-				height / sHeight.toFloat()
+				height / sHeight.toFloat(),
 			)
-			when (zoom) {
+			binding.ssiv.colorFilter = settings.colorFilter?.toColorFilter()
+			when (settings.zoomMode) {
 				ZoomMode.FIT_CENTER -> {
 					setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE)
 					resetScaleAndCenter()
@@ -39,7 +40,7 @@ class ReversedPageHolder(
 					minScale = height / sHeight.toFloat()
 					setScaleAndCenter(
 						minScale,
-						PointF(sWidth.toFloat(), sHeight / 2f)
+						PointF(sWidth.toFloat(), sHeight / 2f),
 					)
 				}
 				ZoomMode.FIT_WIDTH -> {
@@ -47,17 +48,17 @@ class ReversedPageHolder(
 					minScale = width / sWidth.toFloat()
 					setScaleAndCenter(
 						minScale,
-						PointF(sWidth / 2f, 0f)
+						PointF(sWidth / 2f, 0f),
 					)
 				}
 				ZoomMode.KEEP_START -> {
 					setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE)
 					setScaleAndCenter(
 						maxScale,
-						PointF(sWidth.toFloat(), 0f)
+						PointF(sWidth.toFloat(), 0f),
 					)
 				}
 			}
 		}
 	}
-}
+}

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

@@ -3,26 +3,26 @@ package org.koitharu.kotatsu.reader.ui.pager.reversed
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ItemPageBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
 
 class ReversedPagesAdapter(
 	loader: PageLoader,
-	settings: AppSettings,
-	exceptionResolver: ExceptionResolver
+	settings: ReaderSettings,
+	exceptionResolver: ExceptionResolver,
 ) : BaseReaderAdapter<ReversedPageHolder>(loader, settings, exceptionResolver) {
 
 	override fun onCreateViewHolder(
 		parent: ViewGroup,
 		loader: PageLoader,
-		settings: AppSettings,
-		exceptionResolver: ExceptionResolver
+		settings: ReaderSettings,
+		exceptionResolver: ExceptionResolver,
 	) = ReversedPageHolder(
 		binding = ItemPageBinding.inflate(LayoutInflater.from(parent.context), parent, false),
 		loader = loader,
 		settings = settings,
-		exceptionResolver = exceptionResolver
+		exceptionResolver = exceptionResolver,
 	)
-}
+}

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

@@ -7,10 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.children
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlin.math.absoluteValue
 import kotlinx.coroutines.async
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.FragmentReaderStandardBinding
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.pager.BaseReader
@@ -25,9 +23,6 @@ import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 @AndroidEntryPoint
 class ReversedReaderFragment : BaseReader<FragmentReaderStandardBinding>() {
 
-	@Inject
-	lateinit var settings: AppSettings
-
 	private var pagerAdapter: ReversedPagesAdapter? = null
 
 	override fun onInflateView(
@@ -38,7 +33,7 @@ class ReversedReaderFragment : BaseReader<FragmentReaderStandardBinding>() {
 	@SuppressLint("NotifyDataSetChanged")
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		pagerAdapter = ReversedPagesAdapter(viewModel.pageLoader, settings, exceptionResolver)
+		pagerAdapter = ReversedPagesAdapter(viewModel.pageLoader, viewModel.readerSettings, exceptionResolver)
 		with(binding.pager) {
 			adapter = pagerAdapter
 			offscreenPageLimit = 2
@@ -54,9 +49,6 @@ class ReversedReaderFragment : BaseReader<FragmentReaderStandardBinding>() {
 				}
 			}
 		}
-		viewModel.onZoomChanged.observe(viewLifecycleOwner) {
-			pagerAdapter?.notifyDataSetChanged()
-		}
 	}
 
 	override fun onDestroyView() {

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

@@ -12,9 +12,9 @@ import kotlinx.coroutines.asExecutor
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.model.ZoomMode
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ItemPageBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.BasePageHolder
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.utils.ext.*
@@ -22,7 +22,7 @@ import org.koitharu.kotatsu.utils.ext.*
 open class PageHolder(
 	binding: ItemPageBinding,
 	loader: PageLoader,
-	settings: AppSettings,
+	settings: ReaderSettings,
 	exceptionResolver: ExceptionResolver,
 ) : BasePageHolder<ItemPageBinding>(binding, loader, settings, exceptionResolver),
 	View.OnClickListener {
@@ -66,12 +66,13 @@ open class PageHolder(
 		binding.ssiv.setImage(ImageSource.uri(uri))
 	}
 
-	override fun onImageShowing(zoom: ZoomMode) {
+	override fun onImageShowing(settings: ReaderSettings) {
 		binding.ssiv.maxScale = 2f * maxOf(
 			binding.ssiv.width / binding.ssiv.sWidth.toFloat(),
 			binding.ssiv.height / binding.ssiv.sHeight.toFloat(),
 		)
-		when (zoom) {
+		binding.ssiv.colorFilter = settings.colorFilter?.toColorFilter()
+		when (settings.zoomMode) {
 			ZoomMode.FIT_CENTER -> {
 				binding.ssiv.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE)
 				binding.ssiv.resetScaleAndCenter()

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

@@ -7,10 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.children
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlin.math.absoluteValue
 import kotlinx.coroutines.async
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.FragmentReaderStandardBinding
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.pager.BaseReader
@@ -24,9 +22,6 @@ import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 @AndroidEntryPoint
 class PagerReaderFragment : BaseReader<FragmentReaderStandardBinding>() {
 
-	@Inject
-	lateinit var settings: AppSettings
-
 	private var pagesAdapter: PagesAdapter? = null
 
 	override fun onInflateView(
@@ -37,7 +32,7 @@ class PagerReaderFragment : BaseReader<FragmentReaderStandardBinding>() {
 	@SuppressLint("NotifyDataSetChanged")
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		pagesAdapter = PagesAdapter(viewModel.pageLoader, settings, exceptionResolver)
+		pagesAdapter = PagesAdapter(viewModel.pageLoader, viewModel.readerSettings, exceptionResolver)
 		with(binding.pager) {
 			adapter = pagesAdapter
 			offscreenPageLimit = 2
@@ -53,9 +48,6 @@ class PagerReaderFragment : BaseReader<FragmentReaderStandardBinding>() {
 				}
 			}
 		}
-		viewModel.onZoomChanged.observe(viewLifecycleOwner) {
-			pagesAdapter?.notifyDataSetChanged()
-		}
 	}
 
 	override fun onDestroyView() {

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

@@ -3,26 +3,26 @@ package org.koitharu.kotatsu.reader.ui.pager.standard
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ItemPageBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
 
 class PagesAdapter(
 	loader: PageLoader,
-	settings: AppSettings,
-	exceptionResolver: ExceptionResolver
+	settings: ReaderSettings,
+	exceptionResolver: ExceptionResolver,
 ) : BaseReaderAdapter<PageHolder>(loader, settings, exceptionResolver) {
 
 	override fun onCreateViewHolder(
 		parent: ViewGroup,
 		loader: PageLoader,
-		settings: AppSettings,
-		exceptionResolver: ExceptionResolver
+		settings: ReaderSettings,
+		exceptionResolver: ExceptionResolver,
 	) = PageHolder(
 		binding = ItemPageBinding.inflate(LayoutInflater.from(parent.context), parent, false),
 		loader = loader,
 		settings = settings,
-		exceptionResolver = exceptionResolver
+		exceptionResolver = exceptionResolver,
 	)
-}
+}

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

@@ -6,27 +6,28 @@ import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ItemPageWebtoonBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
 
 class WebtoonAdapter(
 	loader: PageLoader,
-	settings: AppSettings,
-	exceptionResolver: ExceptionResolver
+	settings: ReaderSettings,
+	exceptionResolver: ExceptionResolver,
 ) : BaseReaderAdapter<WebtoonHolder>(loader, settings, exceptionResolver) {
 
 	override fun onCreateViewHolder(
 		parent: ViewGroup,
 		loader: PageLoader,
-		settings: AppSettings,
-		exceptionResolver: ExceptionResolver
+		settings: ReaderSettings,
+		exceptionResolver: ExceptionResolver,
 	) = WebtoonHolder(
 		binding = ItemPageWebtoonBinding.inflate(
 			LayoutInflater.from(parent.context),
 			parent,
-			false
+			false,
 		),
 		loader = loader,
 		settings = settings,
-		exceptionResolver = exceptionResolver
+		exceptionResolver = exceptionResolver,
 	)
-}
+}

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

@@ -7,10 +7,9 @@ import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.model.ZoomMode
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ItemPageWebtoonBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 import org.koitharu.kotatsu.reader.ui.pager.BasePageHolder
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.utils.GoneOnInvisibleListener
@@ -19,7 +18,7 @@ import org.koitharu.kotatsu.utils.ext.*
 class WebtoonHolder(
 	binding: ItemPageWebtoonBinding,
 	loader: PageLoader,
-	settings: AppSettings,
+	settings: ReaderSettings,
 	exceptionResolver: ExceptionResolver,
 ) : BasePageHolder<ItemPageWebtoonBinding>(binding, loader, settings, exceptionResolver),
 	View.OnClickListener {
@@ -60,7 +59,8 @@ class WebtoonHolder(
 		binding.ssiv.setImage(ImageSource.uri(uri))
 	}
 
-	override fun onImageShowing(zoom: ZoomMode) {
+	override fun onImageShowing(settings: ReaderSettings) {
+		binding.ssiv.colorFilter = settings.colorFilter?.toColorFilter()
 		with(binding.ssiv) {
 			setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CUSTOM)
 			minScale = width / sWidth.toFloat()
@@ -70,7 +70,7 @@ class WebtoonHolder(
 					scrollToRestore != 0 -> scrollToRestore
 					itemView.top < 0 -> getScrollRange()
 					else -> 0
-				}
+				},
 			)
 			scrollToRestore = 0
 		}
@@ -89,7 +89,7 @@ class WebtoonHolder(
 	override fun onError(e: Throwable) {
 		bindingInfo.textViewError.text = e.getDisplayMessage(context.resources)
 		bindingInfo.buttonRetry.setText(
-			ExceptionResolver.getResolveStringId(e).ifZero { R.string.try_again }
+			ExceptionResolver.getResolveStringId(e).ifZero { R.string.try_again },
 		)
 		bindingInfo.layoutError.isVisible = true
 		bindingInfo.progressBar.hideCompat()
@@ -104,4 +104,4 @@ class WebtoonHolder(
 			scrollToRestore = scroll
 		}
 	}
-}
+}

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

@@ -6,9 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.async
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.FragmentReaderWebtoonBinding
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.pager.BaseReader
@@ -21,9 +19,6 @@ import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 @AndroidEntryPoint
 class WebtoonReaderFragment : BaseReader<FragmentReaderWebtoonBinding>() {
 
-	@Inject
-	lateinit var settings: AppSettings
-
 	private val scrollInterpolator = AccelerateDecelerateInterpolator()
 	private var webtoonAdapter: WebtoonAdapter? = null
 
@@ -34,7 +29,7 @@ class WebtoonReaderFragment : BaseReader<FragmentReaderWebtoonBinding>() {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		webtoonAdapter = WebtoonAdapter(viewModel.pageLoader, settings, exceptionResolver)
+		webtoonAdapter = WebtoonAdapter(viewModel.pageLoader, viewModel.readerSettings, exceptionResolver)
 		with(binding.recyclerView) {
 			setHasFixedSize(true)
 			adapter = webtoonAdapter

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

@@ -14,6 +14,7 @@ import org.koitharu.kotatsu.databinding.ItemPageThumbBinding
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
+import org.koitharu.kotatsu.utils.ext.decodeRegion
 import org.koitharu.kotatsu.utils.ext.isLowRamDevice
 import org.koitharu.kotatsu.utils.ext.referer
 import org.koitharu.kotatsu.utils.ext.setTextColorAttr
@@ -30,7 +31,7 @@ fun pageThumbnailAD(
 	val gridWidth = itemView.context.resources.getDimensionPixelSize(R.dimen.preferred_grid_width)
 	val thumbSize = Size(
 		width = gridWidth,
-		height = (gridWidth * 13f / 18f).toInt(),
+		height = (gridWidth / 13f * 18f).toInt(),
 	)
 
 	suspend fun loadPageThumbnail(item: PageThumbnail): Drawable? = withContext(Dispatchers.Default) {
@@ -52,6 +53,7 @@ fun pageThumbnailAD(
 			ImageRequest.Builder(context)
 				.data(file)
 				.size(thumbSize)
+				.decodeRegion()
 				.allowRgb565(isLowRamDevice(context))
 				.build(),
 		).drawable

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

@@ -13,6 +13,7 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.network.AndroidCookieJar
+import org.koitharu.kotatsu.core.os.ShortcutsUpdater
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.LocalStorageManager
@@ -41,8 +42,13 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 	@Inject
 	lateinit var cookieJar: AndroidCookieJar
 
+	@Inject
+	lateinit var shortcutsUpdater: ShortcutsUpdater
+
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_history)
+		findPreference<Preference>(AppSettings.KEY_SHORTCUTS)?.isVisible =
+			shortcutsUpdater.isDynamicShortcutsAvailable()
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

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

@@ -2,6 +2,8 @@ package org.koitharu.kotatsu.settings
 
 import android.os.Bundle
 import android.view.View
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
@@ -53,7 +55,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
 		super.onViewCreated(view, savedInstanceState)
 		findPreference<Preference>(KEY_AUTH)?.run {
 			if (isVisible) {
-				loadUsername(this)
+				loadUsername(viewLifecycleOwner, this)
 			}
 		}
 	}
@@ -68,7 +70,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
 		}
 	}
 
-	private fun loadUsername(preference: Preference) = viewLifecycleScope.launch {
+	private fun loadUsername(owner: LifecycleOwner, preference: Preference) = owner.lifecycleScope.launch {
 		runCatching {
 			preference.summary = null
 			withContext(Dispatchers.Default) {
@@ -99,7 +101,8 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
 		viewLifecycleScope.launch {
 			if (exceptionResolver.resolve(error)) {
 				val pref = findPreference<Preference>(KEY_AUTH) ?: return@launch
-				loadUsername(pref)
+				val lifecycleOwner = awaitViewLifecycle()
+				loadUsername(lifecycleOwner, pref)
 			}
 		}
 	}

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

@@ -7,7 +7,7 @@ import kotlin.math.roundToInt
 
 class GridTouchHelper(
 	context: Context,
-	private val listener: OnGridTouchListener
+	private val listener: OnGridTouchListener,
 ) : GestureDetector.SimpleOnGestureListener() {
 
 	private val detector = GestureDetector(context, this)
@@ -16,7 +16,7 @@ class GridTouchHelper(
 	private var isDispatching = false
 
 	init {
-		detector.setIsLongpressEnabled(false)
+		detector.setIsLongpressEnabled(true)
 		detector.setOnDoubleTapListener(this)
 	}
 
@@ -46,7 +46,7 @@ class GridTouchHelper(
 				}
 				2 -> AREA_RIGHT
 				else -> return false
-			}
+			},
 		)
 		return true
 	}
@@ -66,4 +66,4 @@ class GridTouchHelper(
 
 		fun onProcessTouch(rawX: Int, rawY: Int): Boolean
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/utils/ext/CoilExt.kt

@@ -10,8 +10,10 @@ import coil.request.ImageResult
 import coil.request.SuccessResult
 import coil.util.CoilUtils
 import com.google.android.material.progressindicator.BaseProgressIndicator
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.utils.image.RegionBitmapDecoder
 import org.koitharu.kotatsu.utils.progress.ImageRequestIndicatorListener
 
 fun ImageView.newImageRequest(url: Any?): ImageRequest.Builder? {
@@ -47,13 +49,28 @@ fun ImageResult.toBitmapOrNull() = when (this) {
 }
 
 fun ImageRequest.Builder.referer(referer: String): ImageRequest.Builder {
-	return setHeader(CommonHeaders.REFERER, referer)
+	if (referer.isEmpty()) {
+		return this
+	}
+	try {
+		setHeader(CommonHeaders.REFERER, referer)
+	} catch (e: IllegalArgumentException) {
+		val baseUrl = referer.baseUrl()
+		if (baseUrl != null) {
+			setHeader(CommonHeaders.REFERER, baseUrl)
+		}
+	}
+	return this
 }
 
 fun ImageRequest.Builder.indicator(indicator: BaseProgressIndicator<*>): ImageRequest.Builder {
 	return listener(ImageRequestIndicatorListener(indicator))
 }
 
+fun ImageRequest.Builder.decodeRegion(): ImageRequest.Builder {
+	return decoderFactory(RegionBitmapDecoder.Factory())
+}
+
 @Suppress("SpellCheckingInspection")
 fun ImageRequest.Builder.crossfade(context: Context?): ImageRequest.Builder {
 	if (context == null) {
@@ -63,3 +80,11 @@ fun ImageRequest.Builder.crossfade(context: Context?): ImageRequest.Builder {
 	val duration = context.resources.getInteger(R.integer.config_defaultAnimTime) * context.animatorDurationScale
 	return crossfade(duration.toInt())
 }
+
+private fun String.baseUrl(): String? {
+	return (this.toHttpUrlOrNull()?.newBuilder("/") ?: return null)
+		.username("")
+		.password("")
+		.build()
+		.toString()
+}

app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt

@@ -6,8 +6,12 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
 import androidx.lifecycle.coroutineScope
 import java.io.Serializable
+import kotlin.coroutines.resume
+import kotlinx.coroutines.suspendCancellableCoroutine
 
 inline fun <T : Fragment> T.withArgs(size: Int, block: Bundle.() -> Unit): T {
 	val b = Bundle(size)
@@ -22,7 +26,7 @@ val Fragment.viewLifecycleScope
 fun <T : Serializable> Fragment.serializableArgument(name: String): Lazy<T> {
 	return lazy(LazyThreadSafetyMode.NONE) {
 		@Suppress("UNCHECKED_CAST")
-		requireNotNull(arguments?.getSerializable(name)) {
+		requireNotNull(arguments?.getSerializableCompat(name)) {
 			"No argument $name passed into ${javaClass.simpleName}"
 		} as T
 	}
@@ -41,3 +45,19 @@ fun DialogFragment.showAllowStateLoss(manager: FragmentManager, tag: String?) {
 fun Fragment.addMenuProvider(provider: MenuProvider) {
 	requireActivity().addMenuProvider(provider, viewLifecycleOwner, Lifecycle.State.STARTED)
 }
+
+suspend fun Fragment.awaitViewLifecycle(): LifecycleOwner = suspendCancellableCoroutine { cont ->
+	val liveData = viewLifecycleOwnerLiveData
+	val observer = object : Observer<LifecycleOwner> {
+		override fun onChanged(result: LifecycleOwner?) {
+			if (result != null) {
+				liveData.removeObserver(this)
+				cont.resume(result)
+			}
+		}
+	}
+	liveData.observeForever(observer)
+	cont.invokeOnCancellation {
+		liveData.removeObserver(observer)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/utils/image/RegionBitmapDecoder.kt

@@ -0,0 +1,168 @@
+package org.koitharu.kotatsu.utils.image
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.BitmapRegionDecoder
+import android.graphics.Rect
+import android.os.Build
+import androidx.core.graphics.drawable.toDrawable
+import coil.ImageLoader
+import coil.decode.DecodeResult
+import coil.decode.DecodeUtils
+import coil.decode.Decoder
+import coil.decode.ImageSource
+import coil.fetch.SourceResult
+import coil.request.Options
+import coil.size.*
+import kotlin.math.roundToInt
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
+
+class RegionBitmapDecoder(
+	private val source: ImageSource,
+	private val options: Options,
+	private val parallelismLock: Semaphore,
+) : Decoder {
+
+	override suspend fun decode() = parallelismLock.withPermit {
+		runInterruptible { BitmapFactory.Options().decode() }
+	}
+
+	private fun BitmapFactory.Options.decode(): DecodeResult {
+		val regionDecoder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+			BitmapRegionDecoder.newInstance(source.source().inputStream())
+		} else {
+			@Suppress("DEPRECATION")
+			BitmapRegionDecoder.newInstance(source.source().inputStream(), false)
+		}
+		checkNotNull(regionDecoder)
+		try {
+			val rect = configureScale(regionDecoder.width, regionDecoder.height)
+			configureConfig()
+			val bitmap = regionDecoder.decodeRegion(rect, this)
+			bitmap.density = options.context.resources.displayMetrics.densityDpi
+			return DecodeResult(
+				drawable = bitmap.toDrawable(options.context.resources),
+				isSampled = true,
+			)
+		} finally {
+			regionDecoder.recycle()
+		}
+	}
+
+	private fun BitmapFactory.Options.configureConfig() {
+		var config = options.config
+
+		inMutable = false
+
+		if (Build.VERSION.SDK_INT >= 26 && options.colorSpace != null) {
+			inPreferredColorSpace = options.colorSpace
+		}
+		inPremultiplied = options.premultipliedAlpha
+
+		// Decode the image as RGB_565 as an optimization if allowed.
+		if (options.allowRgb565 && config == Bitmap.Config.ARGB_8888 && outMimeType == "image/jpeg") {
+			config = Bitmap.Config.RGB_565
+		}
+
+		// High color depth images must be decoded as either RGBA_F16 or HARDWARE.
+		if (Build.VERSION.SDK_INT >= 26 && outConfig == Bitmap.Config.RGBA_F16 && config != Bitmap.Config.HARDWARE) {
+			config = Bitmap.Config.RGBA_F16
+		}
+
+		inPreferredConfig = config
+	}
+
+	/** Compute and set the scaling properties for [BitmapFactory.Options]. */
+	private fun BitmapFactory.Options.configureScale(srcWidth: Int, srcHeight: Int): Rect {
+		val dstWidth = options.size.widthPx(options.scale) { srcWidth }
+		val dstHeight = options.size.heightPx(options.scale) { srcHeight }
+
+		val srcRatio = srcWidth / srcHeight.toDouble()
+		val dstRatio = dstWidth / dstHeight.toDouble()
+		val rect = if (srcRatio < dstRatio) {
+			// probably manga
+			Rect(0, 0, srcWidth, (srcWidth / dstRatio).toInt())
+		} else {
+			Rect(0, 0, (srcHeight / dstRatio).toInt(), srcHeight)
+		}
+		rect.offsetTo(
+			(srcWidth - rect.width()) / 2,
+			(srcHeight - rect.height()) / 2,
+		)
+
+		// Calculate the image's sample size.
+		inSampleSize = DecodeUtils.calculateInSampleSize(
+			srcWidth = rect.width(),
+			srcHeight = rect.height(),
+			dstWidth = dstWidth,
+			dstHeight = dstHeight,
+			scale = options.scale,
+		)
+
+		// Calculate the image's density scaling multiple.
+		var scale = DecodeUtils.computeSizeMultiplier(
+			srcWidth = rect.width() / inSampleSize.toDouble(),
+			srcHeight = rect.height() / inSampleSize.toDouble(),
+			dstWidth = dstWidth.toDouble(),
+			dstHeight = dstHeight.toDouble(),
+			scale = options.scale,
+		)
+
+		// Only upscale the image if the options require an exact size.
+		if (options.allowInexactSize) {
+			scale = scale.coerceAtMost(1.0)
+		}
+
+		inScaled = scale != 1.0
+		if (inScaled) {
+			if (scale > 1) {
+				// Upscale
+				inDensity = (Int.MAX_VALUE / scale).roundToInt()
+				inTargetDensity = Int.MAX_VALUE
+			} else {
+				// Downscale
+				inDensity = Int.MAX_VALUE
+				inTargetDensity = (Int.MAX_VALUE * scale).roundToInt()
+			}
+		}
+		return rect
+	}
+
+	class Factory(
+		maxParallelism: Int = DEFAULT_MAX_PARALLELISM,
+	) : Decoder.Factory {
+
+		@Suppress("NEWER_VERSION_IN_SINCE_KOTLIN")
+		@SinceKotlin("999.9") // Only public in Java.
+		constructor() : this()
+
+		private val parallelismLock = Semaphore(maxParallelism)
+
+		override fun create(result: SourceResult, options: Options, imageLoader: ImageLoader): Decoder {
+			return RegionBitmapDecoder(result.source, options, parallelismLock)
+		}
+
+		override fun equals(other: Any?) = other is Factory
+
+		override fun hashCode() = javaClass.hashCode()
+	}
+}
+
+private const val DEFAULT_MAX_PARALLELISM = 4
+
+private inline fun Size.widthPx(scale: Scale, original: () -> Int): Int {
+	return if (isOriginal) original() else width.toPx(scale)
+}
+
+private inline fun Size.heightPx(scale: Scale, original: () -> Int): Int {
+	return if (isOriginal) original() else height.toPx(scale)
+}
+
+private fun Dimension.toPx(scale: Scale) = pxOrElse {
+	when (scale) {
+		Scale.FILL -> Int.MIN_VALUE
+		Scale.FIT -> Int.MAX_VALUE
+	}
+}

app/src/main/res/drawable/ic_arrow_forward.xml

@@ -1,5 +1,12 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#000000" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:autoMirrored="true"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z" />
 </vector>

app/src/main/res/layout/activity_color_filter.xml

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.MaterialToolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?attr/actionBarSize"
+		tools:navigationIcon="@drawable/abc_ic_clear_material"
+		tools:title="@string/color_correction">
+
+		<Button
+			android:id="@+id/button_done"
+			style="@style/Widget.Material3.Button.UnelevatedButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end"
+			android:layout_marginHorizontal="@dimen/toolbar_button_margin"
+			android:text="@string/done" />
+
+	</com.google.android.material.appbar.MaterialToolbar>
+
+	<ScrollView
+		android:id="@+id/scrollView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:clipToPadding="false"
+		android:overScrollMode="ifContentScrolls">
+
+		<androidx.constraintlayout.widget.ConstraintLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:padding="@dimen/margin_normal">
+
+			<com.google.android.material.imageview.ShapeableImageView
+				android:id="@+id/imageView_before"
+				android:layout_width="0dp"
+				android:layout_height="0dp"
+				android:padding="2dp"
+				android:scaleType="centerCrop"
+				app:layout_constraintDimensionRatio="W,14:9"
+				app:layout_constraintEnd_toStartOf="@id/imageView_arrow"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				app:shapeAppearance="?shapeAppearanceCornerLarge"
+				app:strokeColor="?colorOutline"
+				app:strokeWidth="1dp"
+				tools:src="@sample/covers" />
+
+			<ImageView
+				android:id="@+id/imageView_arrow"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:contentDescription="@null"
+				android:padding="@dimen/margin_normal"
+				android:src="@drawable/ic_arrow_forward"
+				app:layout_constraintBottom_toBottomOf="@id/imageView_before"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="@id/imageView_before" />
+
+			<com.google.android.material.imageview.ShapeableImageView
+				android:id="@+id/imageView_after"
+				android:layout_width="0dp"
+				android:layout_height="0dp"
+				android:padding="2dp"
+				android:scaleType="centerCrop"
+				app:layout_constraintDimensionRatio="W,14:9"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toEndOf="@id/imageView_arrow"
+				app:layout_constraintTop_toTopOf="parent"
+				app:shapeAppearance="?shapeAppearanceCornerLarge"
+				app:strokeColor="?colorOutline"
+				app:strokeWidth="1dp"
+				tools:src="@sample/covers" />
+
+			<TextView
+				android:id="@+id/textView_brightness"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_marginTop="@dimen/margin_normal"
+				android:text="@string/brightness"
+				android:textAppearance="?textAppearanceTitleMedium"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/imageView_before" />
+
+			<com.google.android.material.slider.Slider
+				android:id="@+id/slider_brightness"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_small"
+				android:labelFor="@id/textView_brightness"
+				android:value="0.0"
+				android:valueFrom="-1.0"
+				android:valueTo="1.0"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/textView_brightness" />
+
+			<TextView
+				android:id="@+id/textView_contrast"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_marginTop="@dimen/margin_small"
+				android:text="@string/contrast"
+				android:textAppearance="?textAppearanceTitleMedium"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/slider_brightness" />
+
+			<com.google.android.material.slider.Slider
+				android:id="@+id/slider_contrast"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_small"
+				android:value="0.0"
+				android:valueFrom="-1.0"
+				android:valueTo="1.0"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/textView_contrast" />
+
+			<Button
+				android:id="@+id/button_reset"
+				style="?materialButtonOutlinedStyle"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_normal"
+				android:text="@string/reset"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/slider_contrast" />
+
+			<TextView
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="@dimen/margin_normal"
+				android:text="@string/color_correction_hint"
+				android:textAppearance="?textAppearanceBodySmall"
+				app:layout_constraintEnd_toStartOf="@id/button_reset"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="@id/button_reset" />
+
+		</androidx.constraintlayout.widget.ConstraintLayout>
+
+	</ScrollView>
+
+</LinearLayout>

app/src/main/res/layout/item_main_header.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:id="@+id/textView"
-	android:padding="8dp"
-	android:textAppearance="@style/TextAppearance.AppCompat"
-	android:textSize="20sp"
-	app:drawableEndCompat="@drawable/ic_arrow_forward"
-	app:drawableTint="?attr/colorPrimary"
-	tools:text="History" />

app/src/main/res/layout/sheet_reader_config.xml

@@ -103,7 +103,7 @@
 				android:text="@string/reader_mode_hint"
 				android:textAppearance="?attr/textAppearanceBodySmall" />
 
-			<LinearLayout
+			<androidx.constraintlayout.widget.ConstraintLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/margin_normal"
@@ -115,23 +115,50 @@
 				android:paddingEnd="?android:listPreferredItemPaddingEnd">
 
 				<TextView
-					android:layout_width="wrap_content"
+					android:id="@+id/textView_timer"
+					android:layout_width="0dp"
 					android:layout_height="wrap_content"
 					android:drawablePadding="?android:listPreferredItemPaddingStart"
+					android:ellipsize="end"
+					android:singleLine="true"
 					android:text="@string/automatic_scroll"
 					android:textAppearance="?attr/textAppearanceButton"
-					app:drawableStartCompat="@drawable/ic_timer" />
+					android:textColor="@color/list_item_text_color"
+					app:drawableStartCompat="@drawable/ic_timer"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintEnd_toStartOf="@id/slider_timer"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
+					app:layout_constraintWidth_default="wrap" />
 
 				<com.google.android.material.slider.Slider
 					android:id="@+id/slider_timer"
-					android:layout_width="match_parent"
+					android:layout_width="0dp"
 					android:layout_height="wrap_content"
 					android:layout_marginStart="@dimen/margin_normal"
+					android:contentDescription="@string/automatic_scroll"
+					android:labelFor="@id/textView_timer"
 					android:valueFrom="0"
 					android:valueTo="20"
-					app:labelBehavior="floating" />
+					app:labelBehavior="floating"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toEndOf="@id/textView_timer"
+					app:layout_constraintTop_toTopOf="parent"
+					app:layout_constraintWidth_min="120dp" />
 
-			</LinearLayout>
+			</androidx.constraintlayout.widget.ConstraintLayout>
+
+			<org.koitharu.kotatsu.base.ui.widgets.ListItemTextView
+				android:id="@+id/button_color_filter"
+				android:layout_width="match_parent"
+				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:paddingStart="?android:listPreferredItemPaddingStart"
+				android:paddingEnd="?android:listPreferredItemPaddingEnd"
+				android:text="@string/color_correction"
+				android:textAppearance="?attr/textAppearanceButton"
+				app:drawableStartCompat="@drawable/ic_appearance" />
 
 			<org.koitharu.kotatsu.base.ui.widgets.ListItemTextView
 				android:id="@+id/button_settings"

app/src/main/res/values/strings.xml

@@ -377,4 +377,15 @@
 	<string name="import_will_start_soon">Import will start soon</string>
 	<string name="feed">Feed</string>
 	<string name="manga_error_description_pattern">Error details:&lt;br>&lt;tt>%1$s&lt;/tt>&lt;br>&lt;br>1. Try to &lt;a href="%2$s">open manga in a web browser&lt;/a> to ensure it is available on its source&lt;br>2. If it is available, send an error report to the developers.</string>
+	<string name="history_shortcuts">Show recent manga shortcuts</string>
+	<string name="history_shortcuts_summary">Make recent manga available by long pressing on application icon</string>
+	<string name="reader_control_ltr_summary">Tap on the right edge or pressing the right key always switches to the next page</string>
+	<string name="reader_control_ltr">Ergonomic reader control</string>
+	<string name="color_correction">Color correction</string>
+	<string name="brightness">Brightness</string>
+	<string name="contrast">Contrast</string>
+	<string name="reset">Reset</string>
+	<string name="color_correction_hint">The chosen color settings will be remembered for this manga</string>
+	<string name="text_unsaved_changes_prompt">You have unsaved changes, do you want to save or discard them?</string>
+	<string name="discard">Discard</string>
 </resources>

app/src/main/res/xml/pref_history.xml

@@ -13,6 +13,12 @@
 		android:summary="@string/exclude_nsfw_from_history_summary"
 		android:title="@string/exclude_nsfw_from_history" />
 
+	<SwitchPreferenceCompat
+		android:defaultValue="true"
+		android:key="dynamic_shortcuts"
+		android:summary="@string/history_shortcuts_summary"
+		android:title="@string/history_shortcuts" />
+
 	<PreferenceCategory android:title="@string/tracking">
 
 		<PreferenceScreen
@@ -56,4 +62,4 @@
 
 	</PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>

app/src/main/res/xml/pref_reader.xml

@@ -29,6 +29,12 @@
 		android:title="@string/switch_pages"
 		app:allowDividerAbove="true" />
 
+	<SwitchPreferenceCompat
+		android:defaultValue="false"
+		android:key="reader_taps_ltr"
+		android:summary="@string/reader_control_ltr_summary"
+		android:title="@string/reader_control_ltr" />
+
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="reader_animation"